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 0000000..aebae8b Binary files /dev/null and b/hzims-service/inspect/lib/blade-starter-oss-minio-2.7.3.RELEASE.jar differ 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 + - + - +