diff --git a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service-api/hzinfo-inspect-service-api/src/main/java/org/springblade/hzinfo_inspect/duty/entity/DutyGroupGeneratingCapacityEntity.java b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service-api/hzinfo-inspect-service-api/src/main/java/org/springblade/hzinfo_inspect/duty/entity/DutyGroupGeneratingCapacityEntity.java deleted file mode 100644 index 23c69d1..0000000 --- a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service-api/hzinfo-inspect-service-api/src/main/java/org/springblade/hzinfo_inspect/duty/entity/DutyGroupGeneratingCapacityEntity.java +++ /dev/null @@ -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; - -/** - *

- * 班组发电量 - *

- * - * @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; -} diff --git a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/mapper/DutyGroupGeneratingCapacityMapper.java b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/mapper/DutyGroupGeneratingCapacityMapper.java deleted file mode 100644 index 8cc9ee3..0000000 --- a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/mapper/DutyGroupGeneratingCapacityMapper.java +++ /dev/null @@ -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; - -/** - *

- * 班组发电量 Mapper 接口 - *

- * - * @author lx - * @since 2022-02-24 - */ -public interface DutyGroupGeneratingCapacityMapper extends UserDataScopeBaseMapper { - -} diff --git a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/mapper/DutyGroupGeneratingCapacityMapper.xml b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/mapper/DutyGroupGeneratingCapacityMapper.xml deleted file mode 100644 index 2f6da46..0000000 --- a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/mapper/DutyGroupGeneratingCapacityMapper.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - - diff --git a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/service/impl/ImsDutyMainPersonServiceImpl.java b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/service/impl/ImsDutyMainPersonServiceImpl.java index 1a63ac2..74a59d8 100644 --- a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/service/impl/ImsDutyMainPersonServiceImpl.java +++ b/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 @Slf4j public class ImsDutyMainPersonServiceImpl extends ServiceImpl 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 public void doSaveBasch(List list) { diff --git a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/service/impl/ImsDutyMainServiceImpl.java b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/service/impl/ImsDutyMainServiceImpl.java index 604e784..4b27a0f 100644 --- a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/service/impl/ImsDutyMainServiceImpl.java +++ b/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 generatingCapacityList = groupGeneratingCapacityMapper.selectList(new LambdaQueryWrapper() {{ - 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); DutyMainInfoVo corryVo = getNextDutyDataV2(dutyMainInfoVo.getId()); if (ObjectUtil.isNotEmpty(corryVo) && Func.isNotBlank(corryVo.getDutyPersonIds())) { diff --git a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/utils/ExcelMergeHandler.java b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/utils/ExcelMergeHandler.java index ef55809..02f63b4 100644 --- a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/utils/ExcelMergeHandler.java +++ b/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; +import com.alibaba.excel.metadata.CellData; import com.alibaba.excel.metadata.Head; import com.alibaba.excel.write.handler.CellWriteHandler; 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 cellDataList, Cell cell, Head head, Integer relativeRowIndex, Boolean isHead) { + + } /** diff --git a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/report/entity/InspectMonthReportExcel.java b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/report/entity/InspectMonthReportExcel.java index b716abd..075c3b6 100644 --- a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/report/entity/InspectMonthReportExcel.java +++ b/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; import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.*; -import com.alibaba.excel.enums.BooleanEnum; -import com.alibaba.excel.enums.poi.FillPatternTypeEnum; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; import io.swagger.annotations.ApiModel; import lombok.Data; -import org.apache.poi.ss.usermodel.FillPatternType; - -import java.util.Date; /** * @Author: py */ @ApiModel(value = "巡检月报-Excel-导出") @Data -@HeadStyle(fillPatternType = FillPatternTypeEnum.SOLID_FOREGROUND, fillForegroundColor = 22) @HeadRowHeight(45) @ColumnWidth(20) @ContentRowHeight(80) -@ContentStyle(wrapped = BooleanEnum.TRUE) public class InspectMonthReportExcel { - @ExcelProperty(value = "用户名称", index = 0) - private String userName; + @ExcelProperty(value = "用户名称", index = 0) + private String userName; - @ExcelProperty(value = "路径名称", index = 1) - private String routeName; + @ExcelProperty(value = "路径名称", index = 1) + private String routeName; - @ExcelProperty(value = "执行时间", index = 2) - private String time; + @ExcelProperty(value = "执行时间", index = 2) + private String time; - @ExcelProperty(value = "任务次数", index = 3) - private Long taskNum; + @ExcelProperty(value = "任务次数", index = 3) + private Long taskNum; - @ExcelProperty(value = "过检次数", index = 4) - private Long overNum; + @ExcelProperty(value = "过检次数", index = 4) + private Long overNum; - @ExcelProperty(value = "漏检次数", index = 5) - private Long missingNum; + @ExcelProperty(value = "漏检次数", index = 5) + private Long missingNum; - @ExcelProperty(value = "问题数", index = 6) - private Long problemNum; + @ExcelProperty(value = "问题数", index = 6) + private Long problemNum; }