Browse Source

modify:删除多余功能

master
luyie 5 days ago
parent
commit
15ad990f6d
  1. 71
      HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service-api/hzinfo-inspect-service-api/src/main/java/org/springblade/hzinfo_inspect/duty/entity/DutyGroupGeneratingCapacityEntity.java
  2. 16
      HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/mapper/DutyGroupGeneratingCapacityMapper.java
  3. 30
      HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/mapper/DutyGroupGeneratingCapacityMapper.xml
  4. 13
      HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/service/impl/ImsDutyMainPersonServiceImpl.java
  5. 13
      HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/service/impl/ImsDutyMainServiceImpl.java
  6. 10
      HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/utils/ExcelMergeHandler.java
  7. 39
      HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/report/entity/InspectMonthReportExcel.java

71
HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service-api/hzinfo-inspect-service-api/src/main/java/org/springblade/hzinfo_inspect/duty/entity/DutyGroupGeneratingCapacityEntity.java

@ -1,71 +0,0 @@
package org.springblade.hzinfo_inspect.duty.entity;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.springblade.core.mp.base.BaseEntity;
import org.springblade.core.tool.utils.DateUtil;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.sql.Time;
/**
* <p>
* 班组发电量
* </p>
*
* @author lx
* @since 2022-02-24
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("hzims_duty_group_generating_capacity")
@ApiModel(value = "DutyGroupGeneratingCapacityEntity对象", description = "班组发电量")
public class DutyGroupGeneratingCapacityEntity extends BaseEntity implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "站点ID")
@TableField("DUTY_DEPT")
private Long dutyDept;
@ApiModelProperty(value = "年月")
@TableField("DATE_TIME")
private String dateTime;
@ApiModelProperty(value = "班组ID")
@TableField("GROUP_ID")
private Long groupId;
@ApiModelProperty(value = "设备Code")
@TableField("EM_CODE")
private String emCode;
@DateTimeFormat(pattern = DateUtil.PATTERN_TIME)
@JsonFormat(pattern = DateUtil.PATTERN_TIME)
@ApiModelProperty(value = "开始时间")
@TableField("START_TIME")
private Time startTime;
@DateTimeFormat(pattern = DateUtil.PATTERN_TIME)
@JsonFormat(pattern = DateUtil.PATTERN_TIME)
@ApiModelProperty(value = "开始时间")
@TableField("END_TIME")
private Time endTime;
@ApiModelProperty(value = "发电量")
@TableField("GENERATING_CAPACITY")
private float generatingCapacity;
@ApiModelProperty(value = "租户ID")
private String tenantId;
}

16
HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/mapper/DutyGroupGeneratingCapacityMapper.java

@ -1,16 +0,0 @@
package org.springblade.hzinfo_inspect.duty.mapper;
import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
import org.springblade.hzinfo_inspect.duty.entity.DutyGroupGeneratingCapacityEntity;
/**
* <p>
* 班组发电量 Mapper 接口
* </p>
*
* @author lx
* @since 2022-02-24
*/
public interface DutyGroupGeneratingCapacityMapper extends UserDataScopeBaseMapper<DutyGroupGeneratingCapacityEntity> {
}

30
HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/mapper/DutyGroupGeneratingCapacityMapper.xml

@ -1,30 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.springblade.hzinfo_inspect.duty.mapper.DutyGroupGeneratingCapacityMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="org.springblade.hzinfo_inspect.duty.entity.DutyGroupGeneratingCapacityEntity">
<id column="ID" property="id" />
<result column="DUTY_DEPT" property="dutyDept" />
<result column="DATE_TIME" property="dateTime" />
<result column="GROUP_ID" property="groupId" />
<result column="EM_CODE" property="emCode" />
<result column="START_TIME" property="startTime" />
<result column="END_TIME" property="endTime" />
<result column="GENERATING_CAPACITY" property="generatingCapacity" />
<result column="TENANT_ID" property="tenantId" />
<result column="CREATE_TIME" property="createTime" />
<result column="UPDATE_TIME" property="updateTime" />
<result column="CREATE_USER" property="createUser" />
<result column="UPDATE_USER" property="updateUser" />
<result column="IS_DELETED" property="isDeleted" />
<result column="STATUS" property="status" />
<result column="CREATE_DEPT" property="createDept" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
ID, STATION_ID, DATE_TIME, GROUP_ID,EM_CODE, START_TIME, END_TIME, GENERATING_CAPACITY, TENANT_ID, CREATE_TIME, UPDATE_TIME, CREATE_USER, UPDATE_USER, IS_DELETED, STATUS, CREATE_DEPT
</sql>
</mapper>

13
HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/service/impl/ImsDutyMainPersonServiceImpl.java

@ -22,19 +22,6 @@ import java.util.List;
@Service @Service
@Slf4j @Slf4j
public class ImsDutyMainPersonServiceImpl extends ServiceImpl<ImsDutyMainPersonMapper, ImsDutyMainPersonEntity> implements IImsDutyMainPersonService { public class ImsDutyMainPersonServiceImpl extends ServiceImpl<ImsDutyMainPersonMapper, ImsDutyMainPersonEntity> implements IImsDutyMainPersonService {
@Autowired
private ImsDutyGroupPMapper imsDutyGroupPMapper;
@Autowired
private IImsDutyMainTemplateService iImsDutyMainTemplateService;
@Autowired
private ImsDutyGroupMapper dutyGroupMapper;
@Autowired
private ImsDutyRecMapper imsDutyRecMapper;
@Autowired
private IImsDutyGroupPService imsDutyGroupPService;
@Autowired
private DutyGroupGeneratingCapacityMapper groupGeneratingCapacityMapper;
@Override @Override
public void doSaveBasch(List<ImsDutyMainPersonEntity> list) { public void doSaveBasch(List<ImsDutyMainPersonEntity> list) {

13
HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/service/impl/ImsDutyMainServiceImpl.java

@ -66,8 +66,6 @@ public class ImsDutyMainServiceImpl extends ServiceImpl<ImsDutyMainMapper, ImsDu
private IImsDutyGroupPService imsDutyGroupPService; private IImsDutyGroupPService imsDutyGroupPService;
@Autowired @Autowired
private IImsDutyClassService iImsDutyClassService; private IImsDutyClassService iImsDutyClassService;
@Resource
private DutyGroupGeneratingCapacityMapper groupGeneratingCapacityMapper;
@Autowired @Autowired
private IUserClient userClient; private IUserClient userClient;
@ -1094,17 +1092,6 @@ public class ImsDutyMainServiceImpl extends ServiceImpl<ImsDutyMainMapper, ImsDu
dutyMainInfoVo.setManagerName(managerUser.getRealName()); dutyMainInfoVo.setManagerName(managerUser.getRealName());
dutyMainInfoVo.setManagerPhone(managerUser.getPhone()); dutyMainInfoVo.setManagerPhone(managerUser.getPhone());
} }
List<DutyGroupGeneratingCapacityEntity> generatingCapacityList = groupGeneratingCapacityMapper.selectList(new LambdaQueryWrapper<DutyGroupGeneratingCapacityEntity>() {{
eq(DutyGroupGeneratingCapacityEntity::getStartTime, dutyMainInfoVo.getStartTime());
eq(DutyGroupGeneratingCapacityEntity::getEndTime, dutyMainInfoVo.getEndTime());
eq(DutyGroupGeneratingCapacityEntity::getDutyDept, dutyMainInfoVo.getCreateDept());
eq(DutyGroupGeneratingCapacityEntity::getDateTime, DateUtil.format(dutyMainInfoVo.getDutyDate(), DateUtil.PATTERN_DATE));
}});
if (CollectionUtil.isNotEmpty(generatingCapacityList)) {
double generatingCapacity = generatingCapacityList.stream().mapToDouble(DutyGroupGeneratingCapacityEntity::getGeneratingCapacity).sum();
dutyMainInfoVo.setGeneratingCapacity(generatingCapacity);
}
vo.setHeadInfo(dutyMainInfoVo); vo.setHeadInfo(dutyMainInfoVo);
DutyMainInfoVo corryVo = getNextDutyDataV2(dutyMainInfoVo.getId()); DutyMainInfoVo corryVo = getNextDutyDataV2(dutyMainInfoVo.getId());
if (ObjectUtil.isNotEmpty(corryVo) && Func.isNotBlank(corryVo.getDutyPersonIds())) { if (ObjectUtil.isNotEmpty(corryVo) && Func.isNotBlank(corryVo.getDutyPersonIds())) {

10
HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/utils/ExcelMergeHandler.java

@ -1,5 +1,6 @@
package org.springblade.hzinfo_inspect.duty.utils; package org.springblade.hzinfo_inspect.duty.utils;
import com.alibaba.excel.metadata.CellData;
import com.alibaba.excel.metadata.Head; import com.alibaba.excel.metadata.Head;
import com.alibaba.excel.write.handler.CellWriteHandler; import com.alibaba.excel.write.handler.CellWriteHandler;
import com.alibaba.excel.write.metadata.holder.WriteSheetHolder; import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
@ -44,6 +45,15 @@ public class ExcelMergeHandler implements CellWriteHandler {
} }
@Override
public void afterCellDataConverted(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, CellData cellData, Cell cell, Head head, Integer relativeRowIndex, Boolean isHead) {
}
@Override
public void afterCellDispose(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, List<CellData> cellDataList, Cell cell, Head head, Integer relativeRowIndex, Boolean isHead) {
}
/** /**

39
HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/report/entity/InspectMonthReportExcel.java

@ -1,46 +1,41 @@
package org.springblade.hzinfo_inspect.report.entity; package org.springblade.hzinfo_inspect.report.entity;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.*; import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.enums.BooleanEnum; import com.alibaba.excel.annotation.write.style.ContentRowHeight;
import com.alibaba.excel.enums.poi.FillPatternTypeEnum; import com.alibaba.excel.annotation.write.style.HeadRowHeight;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import lombok.Data; import lombok.Data;
import org.apache.poi.ss.usermodel.FillPatternType;
import java.util.Date;
/** /**
* @Author: py * @Author: py
*/ */
@ApiModel(value = "巡检月报-Excel-导出") @ApiModel(value = "巡检月报-Excel-导出")
@Data @Data
@HeadStyle(fillPatternType = FillPatternTypeEnum.SOLID_FOREGROUND, fillForegroundColor = 22)
@HeadRowHeight(45) @HeadRowHeight(45)
@ColumnWidth(20) @ColumnWidth(20)
@ContentRowHeight(80) @ContentRowHeight(80)
@ContentStyle(wrapped = BooleanEnum.TRUE)
public class InspectMonthReportExcel { public class InspectMonthReportExcel {
@ExcelProperty(value = "用户名称", index = 0) @ExcelProperty(value = "用户名称", index = 0)
private String userName; private String userName;
@ExcelProperty(value = "路径名称", index = 1) @ExcelProperty(value = "路径名称", index = 1)
private String routeName; private String routeName;
@ExcelProperty(value = "执行时间", index = 2) @ExcelProperty(value = "执行时间", index = 2)
private String time; private String time;
@ExcelProperty(value = "任务次数", index = 3) @ExcelProperty(value = "任务次数", index = 3)
private Long taskNum; private Long taskNum;
@ExcelProperty(value = "过检次数", index = 4) @ExcelProperty(value = "过检次数", index = 4)
private Long overNum; private Long overNum;
@ExcelProperty(value = "漏检次数", index = 5) @ExcelProperty(value = "漏检次数", index = 5)
private Long missingNum; private Long missingNum;
@ExcelProperty(value = "问题数", index = 6) @ExcelProperty(value = "问题数", index = 6)
private Long problemNum; private Long problemNum;
} }

Loading…
Cancel
Save