From d3ed5d915bfdddfaaad81559d6dd4906ba8381f8 Mon Sep 17 00:00:00 2001 From: walton <1239357677@qq.com> Date: Tue, 24 Sep 2024 19:56:11 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9=E4=BB=A5=E5=8F=8A?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hnac/hzims/equipment/feign/IEmInfoClient.java | 2 +- .../operational/duty/entity/ImsDutyRecEntity.java | 3 +- .../operational/duty/vo/ExchangeGroupLeader.java | 24 +++ .../message_alarm/entity/PlanFlowResultInfo.java | 52 +++++ .../hzims/message_alarm/entity/PlanResultInfo.java | 12 +- .../message_alarm/vo/MessageWaterDispatchVo.java | 3 +- .../com/hnac/hzims/message_alarm/vo/ReportVo.java | 12 ++ .../safeproduct/feign/IDangerSourceClient.java | 9 +- .../feign/IDangerSourceClientFallBack.java | 5 + .../spare/service/impl/WtSpBasicServiceImpl.java | 44 +++-- .../hnac/hzims/baseinfo/feign/BaseInfoClient.java | 8 +- .../service/impl/ReservoirDataServiceImpl.java | 6 +- .../service/impl/DamSafetyDataServiceImpl.java | 4 +- .../hnac/hzims/equipment/feign/EmInfoClient.java | 8 +- .../lib/blade-starter-oss-minio-2.7.3.RELEASE.jar | Bin 0 -> 14351 bytes hzims-service/inspect/pom.xml | 38 ++-- .../inspect/obj/services/IObjectDangerService.java | 3 + .../obj/services/impl/ObjectDangerServiceImpl.java | 42 ++++- .../inspect/task/controller/TaskController.java | 102 ++++++---- .../com/hnac/hzinfo/inspect/task/job/TaskJob.java | 60 +++--- .../task/job/service/impl/SeizeTaskService.java | 44 ++--- .../hzinfo/inspect/task/mapper/TaskMapper.java | 29 +-- .../hnac/hzinfo/inspect/task/mapper/TaskMapper.xml | 209 ++++++++++++--------- .../service/ITaskObjectProjectContentService.java | 4 +- .../hzinfo/inspect/task/service/ITaskService.java | 2 + .../impl/TaskObjectProjectContentServiceImpl.java | 11 +- .../task/service/impl/TaskObjectServiceImpl.java | 51 ++++- .../inspect/task/service/impl/TaskServiceImpl.java | 21 ++- .../hzims/message_alarm/dto/HisDataResultDTO.java | 1 - .../mapper/PlanFlowResultInfoMapper.java | 7 + .../mapper/PlanFlowResultInfoMapper.xml | 4 + .../service/IPlanFlowResultInfoService.java | 7 + .../service/impl/MessageWaterLevelServiceImpl.java | 8 +- .../impl/PlanFlowResultInfoServiceImpl.java | 11 ++ .../service/impl/PlanInfoServiceImpl.java | 189 +++++++++++++++++-- .../message_alarm/xxljob/ForecastOperationJob.java | 50 ++++- .../impl/HistoryAbnormalAlarmServiceImpl.java | 16 +- .../duty/controller/ImsDutyMainController.java | 9 + .../duty/controller/ImsDutyRecController.java | 13 ++ .../duty/service/IImsDutyMainService.java | 2 + .../duty/service/IImsDutyRecService.java | 3 + .../duty/service/impl/ImsDutyMainServiceImpl.java | 156 ++++++++++++--- .../duty/service/impl/ImsDutyRecServiceImpl.java | 17 ++ .../main/service/impl/HydropowerServiceImpl.java | 52 +++-- .../hzims/operational/main/vo/AppAreaDutyVo.java | 6 + .../safeproduct/feign/DangerSourceClient.java | 13 ++ hzims-service/ticket/lib/spire.xls.free-3.9.1.jar | Bin 0 -> 33242657 bytes hzims-service/ticket/pom.xml | 4 +- .../service/impl/OperationTicketServiceImpl.java | 4 +- .../service/impl/FirstWorkTicketServiceImpl.java | 165 ++++++++-------- 50 files changed, 1126 insertions(+), 419 deletions(-) create mode 100644 hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/duty/vo/ExchangeGroupLeader.java create mode 100644 hzims-service-api/message-alarm-api/src/main/java/com/hnac/hzims/message_alarm/entity/PlanFlowResultInfo.java create mode 100644 hzims-service/inspect/lib/blade-starter-oss-minio-2.7.3.RELEASE.jar create mode 100644 hzims-service/message-alarm-service/src/main/java/com/hnac/hzims/message_alarm/mapper/PlanFlowResultInfoMapper.java create mode 100644 hzims-service/message-alarm-service/src/main/java/com/hnac/hzims/message_alarm/mapper/PlanFlowResultInfoMapper.xml create mode 100644 hzims-service/message-alarm-service/src/main/java/com/hnac/hzims/message_alarm/service/IPlanFlowResultInfoService.java create mode 100644 hzims-service/message-alarm-service/src/main/java/com/hnac/hzims/message_alarm/service/impl/PlanFlowResultInfoServiceImpl.java create mode 100644 hzims-service/ticket/lib/spire.xls.free-3.9.1.jar diff --git a/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/equipment/feign/IEmInfoClient.java b/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/equipment/feign/IEmInfoClient.java index 74af894..bf94ad0 100644 --- a/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/equipment/feign/IEmInfoClient.java +++ b/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/equipment/feign/IEmInfoClient.java @@ -59,7 +59,7 @@ import java.util.List; * @author Chill */ @FeignClient( - value = EquipmentConstants.APP_NAME + value = EquipmentConstants.APP_NAME ) public interface IEmInfoClient { diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/duty/entity/ImsDutyRecEntity.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/duty/entity/ImsDutyRecEntity.java index 7fd2b1c..5b0b0db 100644 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/duty/entity/ImsDutyRecEntity.java +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/duty/entity/ImsDutyRecEntity.java @@ -102,5 +102,6 @@ public class ImsDutyRecEntity extends TenantEntity { @QueryField(condition = SqlCondition.LIKE) private String dealChain; - + @ApiModelProperty(value = "补充说明") + private String content; } diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/duty/vo/ExchangeGroupLeader.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/duty/vo/ExchangeGroupLeader.java new file mode 100644 index 0000000..b38cc23 --- /dev/null +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/duty/vo/ExchangeGroupLeader.java @@ -0,0 +1,24 @@ +package com.hnac.hzims.operational.duty.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import org.springblade.core.tool.utils.DateUtil; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; + +@Data +public class ExchangeGroupLeader implements Serializable { + @DateTimeFormat(pattern = DateUtil.PATTERN_DATE) + @JsonFormat(pattern = DateUtil.PATTERN_DATE) + private Date fromDate; + private Long fromClassId; + private Long fromDeptId; + + @DateTimeFormat(pattern = DateUtil.PATTERN_DATE) + @JsonFormat(pattern = DateUtil.PATTERN_DATE) + private Date toDate; + private Long toClassId; + private Long toDeptId; +} diff --git a/hzims-service-api/message-alarm-api/src/main/java/com/hnac/hzims/message_alarm/entity/PlanFlowResultInfo.java b/hzims-service-api/message-alarm-api/src/main/java/com/hnac/hzims/message_alarm/entity/PlanFlowResultInfo.java new file mode 100644 index 0000000..35d256d --- /dev/null +++ b/hzims-service-api/message-alarm-api/src/main/java/com/hnac/hzims/message_alarm/entity/PlanFlowResultInfo.java @@ -0,0 +1,52 @@ +package com.hnac.hzims.message_alarm.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +@Data +@TableName("plan_flow_result_info") +public class PlanFlowResultInfo { + /** + * id + */ + @TableId( + value = "id", + type = IdType.ASSIGN_ID + ) + private Long id; + + /** + * 方案id + */ + @TableField("plan_id") + private Long planId; + + /** + * 水库编码 + */ + @TableField("stcd") + private String stcd; + + /** + * 时间 + */ + @TableField("time") + private LocalDateTime time; + + /** + * 反推入库 + */ + @TableField("reverse_flow") + private BigDecimal reverseFlow; + /** + * 模拟流量 + */ + @TableField("simulated_flow") + private BigDecimal simulatedFlow; +} diff --git a/hzims-service-api/message-alarm-api/src/main/java/com/hnac/hzims/message_alarm/entity/PlanResultInfo.java b/hzims-service-api/message-alarm-api/src/main/java/com/hnac/hzims/message_alarm/entity/PlanResultInfo.java index 4943e78..c13196e 100644 --- a/hzims-service-api/message-alarm-api/src/main/java/com/hnac/hzims/message_alarm/entity/PlanResultInfo.java +++ b/hzims-service-api/message-alarm-api/src/main/java/com/hnac/hzims/message_alarm/entity/PlanResultInfo.java @@ -3,11 +3,14 @@ package com.hnac.hzims.message_alarm.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import java.math.BigDecimal; import java.time.LocalDateTime; @Data +@TableName("plan_result_info") public class PlanResultInfo { /** * id @@ -40,29 +43,30 @@ public class PlanResultInfo { * 降雨量 */ @TableField("rain_fall") - private Double rainFall; + private BigDecimal rainFall; /** * 来流量 */ @TableField("income_fall") - private Double incomeFall; + private BigDecimal incomeFall; /** * 水位 */ @TableField("water_level") - private Double waterLevel; + private BigDecimal waterLevel; /** * 发电流量 */ @TableField("power_flow") - private Double powerFlow; + private BigDecimal powerFlow; /** * 机组负荷 */ @TableField("unit_load") private Float unitLoad; + } diff --git a/hzims-service-api/message-alarm-api/src/main/java/com/hnac/hzims/message_alarm/vo/MessageWaterDispatchVo.java b/hzims-service-api/message-alarm-api/src/main/java/com/hnac/hzims/message_alarm/vo/MessageWaterDispatchVo.java index 05ccdf4..8082cfd 100644 --- a/hzims-service-api/message-alarm-api/src/main/java/com/hnac/hzims/message_alarm/vo/MessageWaterDispatchVo.java +++ b/hzims-service-api/message-alarm-api/src/main/java/com/hnac/hzims/message_alarm/vo/MessageWaterDispatchVo.java @@ -3,6 +3,7 @@ package com.hnac.hzims.message_alarm.vo; import com.alibaba.fastjson.annotation.JSONField; import lombok.Data; +import java.math.BigDecimal; import java.util.List; /** @@ -19,7 +20,7 @@ public class MessageWaterDispatchVo { * 来水流量，5天就需要有121个 */ @JSONField(name = "q_in") - List qIn; + List qIn; /** * 水位库容曲线 */ diff --git a/hzims-service-api/message-alarm-api/src/main/java/com/hnac/hzims/message_alarm/vo/ReportVo.java b/hzims-service-api/message-alarm-api/src/main/java/com/hnac/hzims/message_alarm/vo/ReportVo.java index acc483f..51dff09 100644 --- a/hzims-service-api/message-alarm-api/src/main/java/com/hnac/hzims/message_alarm/vo/ReportVo.java +++ b/hzims-service-api/message-alarm-api/src/main/java/com/hnac/hzims/message_alarm/vo/ReportVo.java @@ -18,4 +18,16 @@ public class ReportVo { private String actualLoad; //实际负荷 private String forecasLoad; //预测负荷 private List setLoad; //机组负荷 + /** + * 反推入库 + */ + private String reverseFlow; + /** + * 模拟流量 + */ + private String simulatedFlow; + /** + * 径流深 + */ +// private String runoffDepth; } diff --git a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/feign/IDangerSourceClient.java b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/feign/IDangerSourceClient.java index 2433e6c..0ee3bd1 100644 --- a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/feign/IDangerSourceClient.java +++ b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/feign/IDangerSourceClient.java @@ -12,12 +12,13 @@ import org.springframework.web.bind.annotation.RequestParam; import java.util.List; @FeignClient( - value = Constants.APP_NAME, - fallback = IDangerSourceClientFallBack.class + value = Constants.APP_NAME, + fallback = IDangerSourceClientFallBack.class ) public interface IDangerSourceClient { String API_PREFIX = "/feign/dangerSource"; String DETAILS = API_PREFIX + "/details"; + String LIST = API_PREFIX + "/list"; String LIST_BY_TENANT_ID = API_PREFIX + "/listByTenantId"; String GET_SAFE_CREATE_TABLE = API_PREFIX + "/getSafeCreateTable"; @@ -29,6 +30,9 @@ public interface IDangerSourceClient { @GetMapping(DETAILS) List details(@RequestParam("ids") String[] ids); + @GetMapping(LIST) + List list(); + /** * 根据条件查询危险源 * @@ -37,6 +41,7 @@ public interface IDangerSourceClient { @GetMapping(LIST_BY_TENANT_ID) List listByTenantId(@RequestParam("tenantId") String tenantId); + @PostMapping(GET_SAFE_CREATE_TABLE) List getSafeCreateTable(@RequestParam("list") List tableNames); } diff --git a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/feign/IDangerSourceClientFallBack.java b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/feign/IDangerSourceClientFallBack.java index 6ac99ad..b9f14ec 100644 --- a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/feign/IDangerSourceClientFallBack.java +++ b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/feign/IDangerSourceClientFallBack.java @@ -20,6 +20,11 @@ public class IDangerSourceClientFallBack implements IDangerSourceClient { } @Override + public List list() { + return null; + } + + @Override public List listByTenantId(String tenantId) { log.error("远程调用失败，接口：" + LIST_BY_TENANT_ID); return new ArrayList<>(); diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/WtSpBasicServiceImpl.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/WtSpBasicServiceImpl.java index 434e30e..f4ea805 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/WtSpBasicServiceImpl.java +++ b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/WtSpBasicServiceImpl.java @@ -177,25 +177,35 @@ public class WtSpBasicServiceImpl extends BaseServiceImpl list = managementService.list(Wrappers.query().lambda(). - eq(WtSpManagementEntity::getName, spBasicEntity.getName())); - if (list.size() == 0) { - return null; - } - List result = managementService.list(Wrappers.query().lambda().like(WtSpManagementEntity::getAncestors, list.get(0).getId())); + eq(WtSpManagementEntity::getName, spBasicEntity.getName()) + .eq(WtSpManagementEntity::getId,spBasicEntity.getManagementId())); + List longList = new ArrayList<>(); - if (result.size() > 0) { - for (int i = 0; i < result.size(); i++) { - longList.add(result.get(i).getId()); + if (list==null && list.size() == 0) { + if(spBasicEntity.getManagementId() != null) { + longList.add(spBasicEntity.getManagementId()); + queryWrapper.lambda().in(WtSpBasicEntity::getManagementId, longList); + }else{ + return null; + } + }else{ + List result = managementService.list(Wrappers.query().lambda().like(WtSpManagementEntity::getAncestors, list.get(0).getId())); + + if (result.size() > 0) { + for (int i = 0; i < result.size(); i++) { + longList.add(result.get(i).getId()); + } + } + if (longList.size() > 0) { + // 把参数的ManagementId传入 + longList.add(spBasicEntity.getManagementId()); + queryWrapper.lambda().in(WtSpBasicEntity::getManagementId, longList); + } else { + return voPages; } } - if (longList.size() > 0) { - // 把参数的ManagementId传入 - longList.add(spBasicEntity.getManagementId()); - queryWrapper.lambda().in(WtSpBasicEntity::getManagementId, longList); - } else { - return voPages; - } - spBasicEntity.setName(null); + +// spBasicEntity.setName(null); } //调拨单新增特殊处理 if (Func.isNotEmpty(sign)) { @@ -247,7 +257,7 @@ public class WtSpBasicServiceImpl extends BaseServiceImpl ticketVOS = ticketInfoAllClient.getTicketStatistic("2022-02"); +// List ticketVOS = ticketInfoAllClient.getTicketStatistic("2022-02"); // R deptR = sysClient.getDept(basicEntity.getWaterPlantId()); // if(Func.isNotEmpty(deptR.getData())){ diff --git a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/feign/BaseInfoClient.java b/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/feign/BaseInfoClient.java index 086ff21..4b79f3d 100644 --- a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/feign/BaseInfoClient.java +++ b/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/feign/BaseInfoClient.java @@ -45,10 +45,10 @@ public class BaseInfoClient implements IBaseInfoClient { return R.data(baseInfoService.basin()); } - @Override - public R> selectSchemeContent(Long schemeId) { - return R.data(previewSchemeContentService.selectSchemeContent(schemeId)); - } + @Override + public R> selectSchemeContent(Long schemeId) { + return R.data(previewSchemeContentService.selectSchemeContent(schemeId)); + } @Override public R> selectSchemeInfo(String startTime, String endTime) { diff --git a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/service/impl/ReservoirDataServiceImpl.java b/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/service/impl/ReservoirDataServiceImpl.java index e6f8930..f505a57 100644 --- a/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/service/impl/ReservoirDataServiceImpl.java +++ b/hzims-service/base-info/src/main/java/com/hnac/hzims/baseinfo/service/impl/ReservoirDataServiceImpl.java @@ -89,13 +89,13 @@ public class ReservoirDataServiceImpl implements IReservoirDataService { String rz=null; String date=null; - for(FieldsData data:list){ + for(FieldsData data:list){ if("rz".equals(data.getSignage())){ rz = data.getValue(); date = data.getTime(); break; } - } + } if(rz!=null) {//计算库容 BigDecimal w=stZvarlBService.getWValue(stcd,new BigDecimal(rz)); FieldsData data=new FieldsData(); @@ -121,7 +121,7 @@ public class ReservoirDataServiceImpl implements IReservoirDataService { } } - return list; + return list; } @Override diff --git a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/impl/DamSafetyDataServiceImpl.java b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/impl/DamSafetyDataServiceImpl.java index 8e677bc..db74e16 100644 --- a/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/impl/DamSafetyDataServiceImpl.java +++ b/hzims-service/dam-safety/src/main/java/com/hnac/hzims/damsafety/service/impl/DamSafetyDataServiceImpl.java @@ -725,8 +725,8 @@ public class DamSafetyDataServiceImpl implements IDamSafetyDataService { } for(AnalyzeDataConditionVO vo:datas){ List dataTaosVOs=vo.getList(); - for (AnalyseDataTaosVO vv : dataTaosVOs) { - if(vo.getSignage().equals(col)) { + for (AnalyseDataTaosVO vv : dataTaosVOs) { + if(vo.getSignage().equals(col)) { ReportData data = new ReportData(); data.setKeyStr(CommonUtil.getKeyBySaveTimeType(vv.getTs(), saveTimeType)); data.setKeyDate(vv.getTs()); diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/feign/EmInfoClient.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/feign/EmInfoClient.java index cf65860..dfedcd5 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/feign/EmInfoClient.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/feign/EmInfoClient.java @@ -30,11 +30,11 @@ import java.util.stream.Collectors; @RestController public class EmInfoClient implements IEmInfoClient { @Autowired - IEmInfoService service; + private IEmInfoService service; @Autowired - IEmParamService paramService; + private IEmParamService paramService; @Autowired - IEmAttachService attachService; + private IEmAttachService attachService; @RequestMapping(value = DETAIL) @@ -148,7 +148,7 @@ public class EmInfoClient implements IEmInfoClient { @PostMapping(UPDATE_BY_EM_CODE) public R updateByEmCode(EmInfoEntity emInfoEntity) { service.update(new LambdaUpdateWrapper().set(EmInfoEntity::getRunStatus, emInfoEntity.getRunStatus()) - .eq(EmInfoEntity::getNumber, emInfoEntity.getNumber())); + .eq(EmInfoEntity::getNumber, emInfoEntity.getNumber())); return R.success("保存成功"); } diff --git a/hzims-service/inspect/lib/blade-starter-oss-minio-2.7.3.RELEASE.jar b/hzims-service/inspect/lib/blade-starter-oss-minio-2.7.3.RELEASE.jar new file mode 100644 index 0000000000000000000000000000000000000000..aebae8bd26bdb751549c3101161460a74eecf8f3 GIT binary patch literal 14351 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 literal 0 HcmV?d00001 diff --git a/hzims-service/inspect/pom.xml b/hzims-service/inspect/pom.xml index 10ea22b..f4e8843 100644 --- a/hzims-service/inspect/pom.xml +++ b/hzims-service/inspect/pom.xml @@ -66,9 +66,9 @@ 4.5.3.RELEASE - - - + + + com.xuxueli @@ -122,6 +122,8 @@ org.springblade blade-starter-oss-minio 2.7.3.RELEASE + system + ${project.basedir}/lib/blade-starter-oss-minio-2.7.3.RELEASE.jar com.hnac.hzims @@ -186,14 +188,14 @@ blade-common - - - org.apache.commons - commons-compress - 1.18 - + + + org.apache.commons + commons-compress + 1.18 + - + @@ -236,10 +238,18 @@ false - - - - + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + true + + org.mybatis.generator mybatis-generator-maven-plugin diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/IObjectDangerService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/IObjectDangerService.java index 5a0c8fa..8a179fb 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/IObjectDangerService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/IObjectDangerService.java @@ -5,6 +5,7 @@ import org.springblade.core.mp.base.BaseService; import com.hnac.hzinfo.inspect.obj.entity.ObjectDangerEntity; import java.util.List; +import java.util.Map; /** @@ -21,4 +22,6 @@ public interface IObjectDangerService extends BaseService { */ List getDangerDetailByObjectId(Long objectId); + Map> getDangerDetail(List objectIds); + } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/ObjectDangerServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/ObjectDangerServiceImpl.java index 2e12126..21b361a 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/ObjectDangerServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/ObjectDangerServiceImpl.java @@ -11,7 +11,9 @@ import com.hnac.hzinfo.inspect.obj.services.IObjectDangerService; import org.springframework.stereotype.Service; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * 服务实现类 @@ -27,7 +29,7 @@ public class ObjectDangerServiceImpl extends BaseServiceImpl getDangerDetailByObjectId(Long objectId) { List dangers = this.list(Wrappers.lambdaQuery() - .eq(ObjectDangerEntity::getObjectId, objectId).orderByAsc(ObjectDangerEntity::getSort)); + .eq(ObjectDangerEntity::getObjectId, objectId).orderByAsc(ObjectDangerEntity::getSort)); List dangerIds = new ArrayList<>(); dangers.stream().forEach(t -> { dangerIds.add(t.getDangerId().toString()); @@ -38,4 +40,42 @@ public class ObjectDangerServiceImpl extends BaseServiceImpl(); } } + + @Override + public Map> getDangerDetail(List objectIds) { + Map> res=new HashMap<>(); + List dangers = this.list(Wrappers.lambdaQuery() + .in(ObjectDangerEntity::getObjectId, objectIds).orderByAsc(ObjectDangerEntity::getSort)); + List dangerSourceEntityList=sourceClient.list(); + for(Long objId:objectIds){ + List dangerIds =getDangerIds(dangers,objId); + List tmp=getDangerSourceEntity(dangerIds,dangerSourceEntityList); + res.put(objId,tmp); + } + return res; + } + + private List getDangerIds(List dangers,Long objId){ + List ids=new ArrayList<>(); + if(dangers!=null && !dangers.isEmpty()){ + for(ObjectDangerEntity entity:dangers){ + if(entity.getObjectId().equals(objId)){ + ids.add(entity.getDangerId()); + } + } + } + return ids; + } + + private List getDangerSourceEntity(List dangerIds,List dangerSourceEntityList){ + List dangerSourceEntities=new ArrayList<>(); + if(dangerSourceEntityList!=null && !dangerSourceEntityList.isEmpty()){ + for(DangerSourceEntity entity:dangerSourceEntityList){ + if(dangerIds.contains(entity.getId())){ + dangerSourceEntities.add(entity); + } + } + } + return dangerSourceEntities; + } } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/TaskController.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/TaskController.java index 4eb82fc..61bc737 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/TaskController.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/TaskController.java @@ -1,6 +1,8 @@ package com.hnac.hzinfo.inspect.task.controller; import com.alibaba.excel.EasyExcel; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -141,6 +143,10 @@ public class TaskController extends BladeController { } if (task.getCurUserId() == -1) { task.setCurUserId(null); +// if(task.getCreateDept()==null) { +// String deptId=AuthUtil.getDeptId(); +// task.setCreateDept(Long.valueOf(deptId)); +// } } List list = taskService.getListPage(pages,task); pages.setRecords(list); @@ -221,6 +227,15 @@ public class TaskController extends BladeController { task.setCurUserId(AuthUtil.getUserId()); task.setTenantId(AuthUtil.getTenantId()); } + +// if (task.getCurUserId() == -1) { +// task.setCurUserId(null); +// if(task.getCreateDept()==null) { +// String deptId=AuthUtil.getDeptId(); +// task.setCreateDept(Long.valueOf(deptId)); +// } +// } + List list = taskService.getListPageOfPhone(pages,task); pages.setRecords(list); return R.data(pages); @@ -239,6 +254,19 @@ public class TaskController extends BladeController { return R.data(pages); } + @RequestMapping(value = "/getDeptTaskList", method = {RequestMethod.GET, RequestMethod.POST}) + @ApiOperation(value = "获取机构下的所有巡检任务列表", notes = "传入task") + public R> getDeptTaskList(TaskListQuery task, Query query) { + IPage pages = Condition.getPage(query); + if(task.getCreateDept()==null) {//默认当前登录人机构 + String deptId = AuthUtil.getDeptId(); + task.setCreateDept(Long.valueOf(deptId)); + } + List list = taskService.getDeptTaskList(pages,task); + pages.setRecords(list); + return R.data(pages); + } + /** * 开始任务 */ @@ -254,8 +282,8 @@ public class TaskController extends BladeController { @RequestMapping(value = "/modifyTaskStatus", method = {RequestMethod.GET, RequestMethod.POST}) @ApiOperation(value = "修改任务状态 0未开始 1进行中 2暂停 3已完成 4未完成", notes = "修改任务状态") @ApiImplicitParams({ - @ApiImplicitParam(name="id",value="计划id"), - @ApiImplicitParam(name="status",value="0未开始 1进行中 2暂停 3已完成 4未完成") + @ApiImplicitParam(name="id",value="计划id"), + @ApiImplicitParam(name="status",value="0未开始 1进行中 2暂停 3已完成 4未完成") }) public R modifyTaskStatus(@RequestParam Long id,@RequestParam Integer status) { return R.status(taskService.modifyTaskStatus(id,status)); @@ -326,43 +354,43 @@ public class TaskController extends BladeController { return R.data(list); } - @Autowired - private IPushClient pushClient; +// @Autowired +// private IPushClient pushClient; /** * 测试消息推送 */ - @GetMapping("/testPush") - @ApiOperation(value = "测试消息推送", notes = "测试消息推送") - public R testPush(@ApiParam(value = "tags 多个,隔开", required = false) @RequestParam String tags, - @ApiParam(value = "tenantId", required = false) @RequestParam String tenantId) { - // 移动端消息推送 : 使用 用户id做TAG，前端注册用户id为TAG - PushInfoVO pushInfoVO = new PushInfoVO(); - if(Func.isNotEmpty(tenantId)){ - pushInfoVO.setTenantId(tenantId); - } else { - pushInfoVO.setTenantId(AuthUtil.getTenantId()); - } - - PushPlatform platform = PushPlatform.all(); - Map> audienceMap = new HashMap<>(); - if(Func.isNotEmpty(tags)){ - audienceMap.put(PushAudienceType.TAG, Arrays.asList(tags)); - } else { - audienceMap.put(PushAudienceType.TAG, Arrays.asList("test")); - } - PushAudience audience = new PushAudience(false, audienceMap); - PushInfo pushInfo = new PushInfo("hzinfo-inspect" - , "测试后。。。。1" - , "测试内容" - , "测试后。。。。2" - , null - , platform - , audience); - pushInfoVO.setPushInfo(pushInfo); - pushClient.tenantPush(pushInfoVO); - return R.status(true); - } +// @GetMapping("/testPush") +// @ApiOperation(value = "测试消息推送", notes = "测试消息推送") +// public R testPush(@ApiParam(value = "tags 多个,隔开", required = false) @RequestParam String tags, +// @ApiParam(value = "tenantId", required = false) @RequestParam String tenantId) { +// // 移动端消息推送 : 使用 用户id做TAG，前端注册用户id为TAG +// PushInfoVO pushInfoVO = new PushInfoVO(); +// if(Func.isNotEmpty(tenantId)){ +// pushInfoVO.setTenantId(tenantId); +// } else { +// pushInfoVO.setTenantId(AuthUtil.getTenantId()); +// } +// +// PushPlatform platform = PushPlatform.all(); +// Map> audienceMap = new HashMap<>(); +// if(Func.isNotEmpty(tags)){ +// audienceMap.put(PushAudienceType.TAG, Arrays.asList(tags)); +// } else { +// audienceMap.put(PushAudienceType.TAG, Arrays.asList("test")); +// } +// PushAudience audience = new PushAudience(false, audienceMap); +// PushInfo pushInfo = new PushInfo("hzinfo-inspect" +// , "测试后。。。。1" +// , "测试内容" +// , "测试后。。。。2" +// , null +// , platform +// , audience); +// pushInfoVO.setPushInfo(pushInfo); +// pushClient.tenantPush(pushInfoVO); +// return R.status(true); +// } @@ -413,8 +441,8 @@ public class TaskController extends BladeController { response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(filename + ".xlsx", "UTF-8")); //创建一个输出流 EasyExcel.write(response.getOutputStream(), VoteChartVo.class).autoCloseStream(Boolean.TRUE).sheet(1,"巡检计划统计表") - .doWrite(list); - response.getOutputStream().close(); + .doWrite(list); + response.getOutputStream().close(); } catch (IOException e) { e.printStackTrace(); } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/job/TaskJob.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/job/TaskJob.java index 2f6f69b..dc6a5f9 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/job/TaskJob.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/job/TaskJob.java @@ -30,6 +30,7 @@ import org.springframework.transaction.annotation.Transactional; import java.time.LocalDate; import java.time.LocalDateTime; +import java.util.Date; import java.util.List; /** @@ -63,10 +64,10 @@ public class TaskJob { closePassedPlansAndTasks(); //将已审核状态且开始时间在当前时间之前的计划改成派发中 UpdateWrapper uwPlan = new UpdateWrapper<>(); - uwPlan.lambda().set(PlanEntity::getStatus, Integer.valueOf(PlanStatusEnum.UNDERWAY_STATUS.getStatus())) - .eq(PlanEntity::getStatus, Integer.valueOf(PlanStatusEnum.CHECK_STATUS.getStatus())) - .le(PlanEntity::getStartTime, LocalDate.now()); - planService.update(uwPlan); + uwPlan.lambda().set(PlanEntity::getStatus, Integer.valueOf(PlanStatusEnum.UNDERWAY_STATUS.getStatus())) + .eq(PlanEntity::getStatus, Integer.valueOf(PlanStatusEnum.CHECK_STATUS.getStatus())) + .le(PlanEntity::getStartTime, LocalDate.now()); + planService.update(uwPlan); //处理派发中（已经生成了一次任务）的计划 QueryWrapper planQw = new QueryWrapper<>(); planQw.lambda().eq(PlanEntity::getStatus,Integer.valueOf(PlanStatusEnum.UNDERWAY_STATUS.getStatus())); @@ -87,28 +88,29 @@ public class TaskJob { return ReturnT.SUCCESS; } - /** - * 定期关闭超过计划结束时间的巡检任务以及已审核状态的巡检计划 - * @param - * @return - */ + /** + * 定期关闭超过计划结束时间的巡检任务以及已审核状态的巡检计划 + * @param + * @return + */ // @Scheduled(cron = "0 0 0 0 30 ?") - private void closePassedPlansAndTasks() { - //关闭超过计划结束时间暂停状态或者已审核或者派发中的巡检计划 - UpdateWrapper uwPlan = new UpdateWrapper<>(); - uwPlan.lambda().set(PlanEntity::getStatus, Integer.valueOf(PlanStatusEnum.FINISH_STATUS.getStatus())) - .in(PlanEntity::getStatus, Integer.valueOf(PlanStatusEnum.PAUSE_STATUS.getStatus()), - Integer.valueOf(PlanStatusEnum.CHECK_STATUS.getStatus()), - Integer.valueOf(PlanStatusEnum.UNDERWAY_STATUS.getStatus())) - .lt(PlanEntity::getEndTime, LocalDate.now()); - planService.update(uwPlan); - //关闭超过计划结束时间的巡检任务 - UpdateWrapper uwTask = new UpdateWrapper<>(); - uwTask.lambda().set(TaskEntity::getStatus, Integer.valueOf(TaskStatusEnum.UNFINISH_STATUS.getStatus())) - .ne(TaskEntity::getStatus, Integer.valueOf(TaskStatusEnum.FINISH_STATUS.getStatus())) - .lt(TaskEntity::getPlanEndTime, LocalDate.now()); - taskService.update(uwTask); - } + private void closePassedPlansAndTasks() { + //关闭超过计划结束时间暂停状态或者已审核或者派发中的巡检计划 + UpdateWrapper uwPlan = new UpdateWrapper<>(); + uwPlan.lambda().set(PlanEntity::getStatus, Integer.valueOf(PlanStatusEnum.FINISH_STATUS.getStatus())) + .set(PlanEntity::getUpdateTime,new Date()) + .in(PlanEntity::getStatus, Integer.valueOf(PlanStatusEnum.PAUSE_STATUS.getStatus()), + Integer.valueOf(PlanStatusEnum.CHECK_STATUS.getStatus()), + Integer.valueOf(PlanStatusEnum.UNDERWAY_STATUS.getStatus())) + .lt(PlanEntity::getEndTime, LocalDate.now()); + planService.update(uwPlan); + //关闭超过计划结束时间的巡检任务 + UpdateWrapper uwTask = new UpdateWrapper<>(); + uwTask.lambda().set(TaskEntity::getStatus, Integer.valueOf(TaskStatusEnum.UNFINISH_STATUS.getStatus())) + .ne(TaskEntity::getStatus, Integer.valueOf(TaskStatusEnum.FINISH_STATUS.getStatus())) + .lt(TaskEntity::getPlanEndTime, LocalDate.now()); + taskService.update(uwTask); + } /** * 任务开始、结束前提醒、发短信 @@ -143,11 +145,11 @@ public class TaskJob { @XxlJob("resetCache") public ReturnT resetCache(String param) throws Exception { List beginList = taskService.list(Wrappers.lambdaQuery() - .ge(TaskEntity::getStartRemindTime, LocalDateTime.now()) - .eq(TaskEntity::getStartRemindFlag, true)); + .ge(TaskEntity::getStartRemindTime, LocalDateTime.now()) + .eq(TaskEntity::getStartRemindFlag, true)); List endList = taskService.list(Wrappers.lambdaQuery() - .ge(TaskEntity::getEndRemindTime, LocalDateTime.now()) - .eq(TaskEntity::getEndRemindFlag, true)); + .ge(TaskEntity::getEndRemindTime, LocalDateTime.now()) + .eq(TaskEntity::getEndRemindFlag, true)); remindManager.replaceBeginTaskCacheList(beginList); remindManager.replaceEndTaskCacheList(endList); return ReturnT.SUCCESS; diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/job/service/impl/SeizeTaskService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/job/service/impl/SeizeTaskService.java index e499c96..7e19533 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/job/service/impl/SeizeTaskService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/job/service/impl/SeizeTaskService.java @@ -41,10 +41,10 @@ import java.util.stream.Collectors; @Slf4j public class SeizeTaskService extends TaskJobService implements ITaskJobService { - @Autowired - private ITaskUserService taskUserService; - @Autowired - private ITaskResultService taskResultService; + @Autowired + private ITaskUserService taskUserService; + @Autowired + private ITaskResultService taskResultService; @Autowired private TaskRemindManager remindCacheManager; @Autowired @@ -54,14 +54,14 @@ public class SeizeTaskService extends TaskJobService implements ITaskJobService @Autowired private IDutyMainClient dutyMainClient; - /** - * 派发任务 - * @param plan 计划 - */ - @Override - public void sendTaskOther(PlanEntity plan) { + /** + * 派发任务 + * @param plan 计划 + */ + @Override + public void sendTaskOther(PlanEntity plan) { plan = planService.getById(plan.getId()); - List users = this.getUsersByPlan(plan); + List users = this.getUsersByPlan(plan); List taskUserList = Lists.newArrayList(); JSONArray timeJsonArray = null; @@ -102,13 +102,13 @@ public class SeizeTaskService extends TaskJobService implements ITaskJobService taskResultService.save(taskResultEntity); } - if(taskUserList.size()>0){ - taskUserService.saveBatch(taskUserList); - } else { - log.error("没有用户: plan = " + plan.toString()); - XxlJobLogger.log("SeizeTaskService...没有任务用户: plan = " + plan.toString()); - } - } + if(taskUserList.size()>0){ + taskUserService.saveBatch(taskUserList); + } else { + log.error("没有用户: plan = " + JSONObject.toJSONString(plan)); + XxlJobLogger.log("SeizeTaskService...没有任务用户: plan = " + JSONObject.toJSONString(plan)); + } + } /** * 巡检计划为班次时，生成任务 @@ -126,7 +126,7 @@ public class SeizeTaskService extends TaskJobService implements ITaskJobService /** 多次计划执行时间 **/ timeJsonArray = JSON.parseArray(plan.getExecTimeJson()); } else { - log.error("巡检计划未设置值班班次: plan = " + plan.toString()); + log.error("巡检计划未设置值班班次: plan = " + JSONObject.toJSONString(plan)); return taskIds; } /** 多次任务 **/ @@ -157,7 +157,7 @@ public class SeizeTaskService extends TaskJobService implements ITaskJobService } } } else { - log.error("获取该班次值班人员为空, plan = " + plan.toString()); + log.error("获取该班次值班人员为空, plan = " + JSONObject.toJSONString(plan)); return taskIds; } String reason = this.distributeTaskObjs(plan,task); @@ -229,8 +229,8 @@ public class SeizeTaskService extends TaskJobService implements ITaskJobService if(taskUserList.size()>0){ taskUserService.saveBatch(taskUserList); } else { - log.error("没有用户: plan = " + plan.toString()); - XxlJobLogger.log("SeizeTaskService...没有任务用户: plan = " + plan.toString()); + log.error("没有用户: plan = " + JSONObject.toJSONString(plan)); + XxlJobLogger.log("SeizeTaskService...没有任务用户: plan = " + JSONObject.toJSONString(plan)); } return taskIds; } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskMapper.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskMapper.java index c2a70ef..f7b6878 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskMapper.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskMapper.java @@ -21,11 +21,11 @@ import java.util.List; @Mapper public interface TaskMapper extends UserDataScopeBaseMapper { - /** - * PC端任务列表 - * @return - */ - List getListPage(@Param("page") IPage page, @Param("task") TaskListQuery task); + /** + * PC端任务列表 + * @return + */ + List getListPage(@Param("page") IPage page, @Param("task") TaskListQuery task); List mainQueryPage(@Param("page") IPage page, @Param("task") TaskListQuery task); @@ -38,17 +38,17 @@ public interface TaskMapper extends UserDataScopeBaseMapper { /** - * 任务报备列表 - * @return - */ - @UserDataAuth - List getListPageOfTaskRecord(@Param("page") IPage page, @Param("task") TaskListQuery task); + * 任务报备列表 + * @return + */ + @UserDataAuth + List getListPageOfTaskRecord(@Param("page") IPage page, @Param("task") TaskListQuery task); - /** - * phone端任务列表 - * @return - */ + /** + * phone端任务列表 + * @return + */ List getListPageOfPhone(@Param("page") IPage page,@Param("task") TaskListQuery task); /** @@ -58,6 +58,7 @@ public interface TaskMapper extends UserDataScopeBaseMapper { * @return */ List getFinishTaskList(@Param("page") IPage page,@Param("task") TaskListQuery task); + List getDeptTaskList(@Param("page") IPage page,@Param("task") TaskListQuery task); /** * phone端任务列表 不分页 diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskMapper.xml b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskMapper.xml index 02bd105..9c2bbf7 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskMapper.xml +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskMapper.xml @@ -35,50 +35,50 @@ + + + and t.AUTO_VIDEO=#{task.autoVideo} + + + and t.CREATE_DEPT=#{task.createDept} + + order by t.UPDATE_TIME desc + + + + + and t.CREATE_DEPT like concat(#{task.createDept}, '%') + + + and t.PLAN_NAME like concat('%', #{task.planName}, '%') + + + and t.BATCH_NUMBER like concat('%', #{task.batchNumber}, '%') + + + and t.PLAN_START_TIME >= #{task.planStartTime} + + + and t.PLAN_END_TIME <= #{task.planEndTime} + + + and t.PLAN_END_TIME >= #{task.startTime} + + + and t.CYCLE=#{task.cycle} + + + and tobj.OBJECT_ID=#{task.objectId} + + + and t.AUTO_VIDEO=#{task.autoVideo} + + + and t.STATUS=#{task.status} + + GROUP BY t.ID + order by t.UPDATE_TIME desc + - + - +