diff --git a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmUserReportNormalTreatStatusListener.java b/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmUserReportNormalTreatStatusListener.java new file mode 100644 index 000000000..2179bce18 --- /dev/null +++ b/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmUserReportNormalTreatStatusListener.java @@ -0,0 +1,27 @@ +package com.njcn.bpm.listener.business; + +import com.njcn.bpm.listener.BpmProcessInstanceStatusEvent; +import com.njcn.bpm.listener.BpmProcessInstanceStatusEventListener; +import com.njcn.supervision.api.UserReportNormalFeignClient; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; + + +@Component +public class BpmUserReportNormalTreatStatusListener extends BpmProcessInstanceStatusEventListener { + + @Resource + private UserReportNormalFeignClient userReportNormalFeignClient; + + @Override + protected String getProcessDefinitionKey() { + return "user_treat_check"; + } + + @Override + protected void onEvent(BpmProcessInstanceStatusEvent event) { + userReportNormalFeignClient.updateUserReportNormalStatus(event.getBusinessKey(), event.getStatus()); + } + +} diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempLineDebugParam.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempLineDebugParam.java index a74cad53c..2bfeb9e55 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempLineDebugParam.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempLineDebugParam.java @@ -62,4 +62,4 @@ public class SupervisionTempLineDebugParam extends BaseEntity { private List statueList; } -} \ No newline at end of file +} diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/UserReportNormalParam.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/UserReportNormalParam.java index 903dc6479..f617ae929 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/UserReportNormalParam.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/UserReportNormalParam.java @@ -34,7 +34,7 @@ public class UserReportNormalParam extends BaseParam { /** * 类型0:方案审查 1:治理工程 */ - private Boolean type; + private Integer type; /** * 报告存放路径 diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionTempLineRunTest.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionTempLineRunTest.java new file mode 100644 index 000000000..52f3ffb30 --- /dev/null +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionTempLineRunTest.java @@ -0,0 +1,63 @@ +package com.njcn.supervision.pojo.po.device; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.njcn.db.bo.BaseEntity; +import java.io.Serializable; +import java.time.LocalDateTime; +import lombok.Getter; +import lombok.Setter; + +/** + *

+ * + *

+ * + * @author hongawen + * @since 2024-05-21 + */ +@Getter +@Setter +@TableName("supervision_temp_line_run_test") +public class SupervisionTempLineRunTest extends BaseEntity { + + private static final long serialVersionUID = 1L; + + private String id; + + /** + * 流程实例的编号 + */ + private String processInstanceId; + + /** + * 在线率 + */ + private Float onlineRate; + + /** + * 数据完整性 + */ + private Float integrityRate; + + /** + * 数据符合性 + */ + private Float suitRate; + + /** + * 1:审批中;2:审批通过;3:审批不通过;4:已取消 + */ + private Integer status; + + /** + * 状态:0-删除 1-正常 + */ + private Integer state; + + /** + * 0:未试运行 1:试运行中 2.试运行成功 3.试运行异常 + */ + private Integer testRunState; + + +} diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionTempLineDebugVO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionTempLineDebugVO.java index 69fa03827..859396d17 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionTempLineDebugVO.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionTempLineDebugVO.java @@ -16,8 +16,17 @@ public class SupervisionTempLineDebugVO extends BaseEntity { private String id; private String lineId; private String lineName; + private String userName; + private String connectedBus; + private String monitoringTerminalCode; + private String monitoringTerminalName; + private String powerSubstationName; private String reason; private String processInstanceId; private Integer status; + /** + * 0:未试运行 1:试运行中 2.试运行成功 3.试运行异常 + */ + private Integer testRunState; } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/SupervisionTempLineRunTestController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/SupervisionTempLineRunTestController.java new file mode 100644 index 000000000..d75566750 --- /dev/null +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/SupervisionTempLineRunTestController.java @@ -0,0 +1,27 @@ +package com.njcn.supervision.controller.device; + + +import com.njcn.supervision.service.device.ISupervisionTempLineRunTestService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.web.bind.annotation.RestController; +import com.njcn.web.controller.BaseController; + +/** + *

+ * 前端控制器 + *

+ * + * @author cdf + * @since 2024-05-21 + */ +@RestController +@RequestMapping("/supervisionTempLineRunTest") +@RequiredArgsConstructor +public class SupervisionTempLineRunTestController extends BaseController { + + private final ISupervisionTempLineRunTestService iSupervisionTempLineRunTestService; + +} + diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/TempLineDebugController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/TempLineDebugController.java index cf082aaee..ba9e2838b 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/TempLineDebugController.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/TempLineDebugController.java @@ -59,6 +59,17 @@ public class TempLineDebugController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, out, methodDescribe); } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/pageHasDebug") + @ApiOperation("查询已完成联调监测点") + @ApiImplicitParam(name = "supervisionTempLineDebugQuery", value = "参数", required = true) + public HttpResult> pageHasDebug(@RequestBody @Validated SupervisionTempLineDebugParam.SupervisionTempLineDebugQuery supervisionTempLineDebugQuery) { + String methodDescribe = getMethodDescribe("pageHasDebug"); + Page out = supervisionTempLineDebugPOService.pageHasDebug(supervisionTempLineDebugQuery); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, out, methodDescribe); + } + @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/getDetail") @ApiOperation("查询详情") diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/SupervisionTempLineDebugPOMapper.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/SupervisionTempLineDebugPOMapper.java index 852fb0241..d084a9371 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/SupervisionTempLineDebugPOMapper.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/SupervisionTempLineDebugPOMapper.java @@ -9,7 +9,7 @@ import com.njcn.supervision.pojo.vo.device.SupervisionTempLineDebugVO; import org.apache.ibatis.annotations.Param; /** - * + * * Description: * Date: 2024/5/17 15:26【需求编号】 * @@ -18,4 +18,7 @@ import org.apache.ibatis.annotations.Param; */ public interface SupervisionTempLineDebugPOMapper extends BaseMapper { Page page(@Param("page")Page objectPage, @Param("ew") QueryWrapper queryWrapper); -} \ No newline at end of file + + + Page pageHasDebug(@Param("page")Page objectPage, @Param("ew") QueryWrapper queryWrapper); +} diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/SupervisionTempLineRunTestMapper.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/SupervisionTempLineRunTestMapper.java new file mode 100644 index 000000000..c9d3d2789 --- /dev/null +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/SupervisionTempLineRunTestMapper.java @@ -0,0 +1,17 @@ +package com.njcn.supervision.mapper.device; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njcn.supervision.pojo.po.device.SupervisionTempLineRunTest; + +/** + *

+ * Mapper 接口 + *

+ * + * @author hongawen + * @since 2024-05-21 + */ +public interface SupervisionTempLineRunTestMapper extends BaseMapper { + +} diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempLineDebugPOMapper.xml b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempLineDebugPOMapper.xml index 6398ce7c6..161e91a4f 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempLineDebugPOMapper.xml +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempLineDebugPOMapper.xml @@ -16,7 +16,7 @@ - id, reason, process_instance_id, `status`, Create_By, Create_Time, Update_By, Update_Time, + id, reason, process_instance_id, `status`, Create_By, Create_Time, Update_By, Update_Time, `State` @@ -34,4 +34,27 @@ where supervision_temp_line_report.`status`=2 and ${ew.sqlSegment} - \ No newline at end of file + + + + diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempLineRunTestMapper.xml b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempLineRunTestMapper.xml new file mode 100644 index 000000000..cea157461 --- /dev/null +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempLineRunTestMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/ISupervisionTempLineRunTestService.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/ISupervisionTempLineRunTestService.java new file mode 100644 index 000000000..26864b497 --- /dev/null +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/ISupervisionTempLineRunTestService.java @@ -0,0 +1,17 @@ +package com.njcn.supervision.service.device; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.njcn.supervision.pojo.po.device.SupervisionTempLineRunTest; + +/** + *

+ * 服务类 + *

+ * + * @author hongawen + * @since 2024-05-21 + */ +public interface ISupervisionTempLineRunTestService extends IService { + +} diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/SupervisionTempLineDebugPOService.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/SupervisionTempLineDebugPOService.java index fbe32b98e..a2c3d3328 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/SupervisionTempLineDebugPOService.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/SupervisionTempLineDebugPOService.java @@ -7,19 +7,20 @@ import com.njcn.supervision.pojo.po.device.SupervisionTempLineDebugPO; import com.njcn.supervision.pojo.vo.device.SupervisionTempLineDebugVO; /** - * * Description: * Date: 2024/5/17 15:26【需求编号】 * * @author clam * @version V1.0.0 */ -public interface SupervisionTempLineDebugPOService extends IService{ +public interface SupervisionTempLineDebugPOService extends IService { - String addTempLineDebug(SupervisionTempLineDebugParam supervisionTempLineReportParam); + String addTempLineDebug(SupervisionTempLineDebugParam supervisionTempLineReportParam); - Page getTempLineDeug(SupervisionTempLineDebugParam.SupervisionTempLineDebugQuery supervisionTempLineDebugQuery); + Page getTempLineDeug(SupervisionTempLineDebugParam.SupervisionTempLineDebugQuery supervisionTempLineDebugQuery); + + Page pageHasDebug(SupervisionTempLineDebugParam.SupervisionTempLineDebugQuery supervisionTempLineDebugQuery); SupervisionTempLineDebugVO getDetailTempLineDebug(String id); diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java index 4151e8f54..f84f61724 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java @@ -33,7 +33,7 @@ import java.util.Map; import java.util.Objects; /** - * + * * Description: * Date: 2024/5/17 15:26【需求编号】 * @@ -105,6 +105,30 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl pageHasDebug(SupervisionTempLineDebugParam.SupervisionTempLineDebugQuery supervisionTempLineDebugQuery) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + + String userIndex = RequestUtil.getUserIndex(); + queryWrapper + .eq("supervision_temp_line_debug.state", DataStateEnum.ENABLE.getCode()); + if (StrUtil.isNotBlank(supervisionTempLineDebugQuery.getOrgId())) { + /*获取直接下属子单位*/ + List data = deptFeignClient.getDepSonIdtByDeptId(supervisionTempLineDebugQuery.getOrgId()).getData(); + queryWrapper.in("supervision_temp_line_debug.org_id", data); + + } + //添加上时间范围 + queryWrapper.between("supervision_temp_line_debug.Create_Time", + DateUtil.beginOfDay(DateUtil.parse(supervisionTempLineDebugQuery.getSearchBeginTime())), + DateUtil.endOfDay(DateUtil.parse(supervisionTempLineDebugQuery.getSearchEndTime()))); + queryWrapper.orderByDesc("supervision_temp_line_debug.Update_Time"); + + Page page =this.baseMapper.pageHasDebug(new Page<>(PageFactory.getPageNum(supervisionTempLineDebugQuery), PageFactory.getPageSize(supervisionTempLineDebugQuery)), queryWrapper); + + return page; + } + @Override public SupervisionTempLineDebugVO getDetailTempLineDebug(String id) { SupervisionTempLineDebugVO supervisionTempLineDebugVO = new SupervisionTempLineDebugVO(); diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineRunTestServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineRunTestServiceImpl.java new file mode 100644 index 000000000..e755bfd3e --- /dev/null +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineRunTestServiceImpl.java @@ -0,0 +1,21 @@ +package com.njcn.supervision.service.device.impl; + + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.supervision.mapper.device.SupervisionTempLineRunTestMapper; +import com.njcn.supervision.pojo.po.device.SupervisionTempLineRunTest; +import com.njcn.supervision.service.device.ISupervisionTempLineRunTestService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author hongawen + * @since 2024-05-21 + */ +@Service +public class SupervisionTempLineRunTestServiceImpl extends ServiceImpl implements ISupervisionTempLineRunTestService { + +} diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportNormalServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportNormalServiceImpl.java index e79ddf371..f729a4ba1 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportNormalServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportNormalServiceImpl.java @@ -50,6 +50,8 @@ public class UserReportNormalServiceImpl extends ServiceImpl processInstanceVariables = new HashMap<>(); BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO(); - bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(PROCESS_KEY); + if(userReportNormalParam.getType() == 0){ + bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(PROCESS_KEY); + }else { + bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(PROCESS_OTHER_KEY); + } + bpmProcessInstanceCreateReqDTO.setBusinessKey(userReportNormalPO.getId()); bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(userReportNormalParam.getStartUserSelectAssignees()); bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables); @@ -133,6 +140,7 @@ public class UserReportNormalServiceImpl extends ServiceImpl