From a8d229fe5d568270ff365e31fc03ae3be3e9bd20 Mon Sep 17 00:00:00 2001 From: hongawen <83944980@qq.com> Date: Mon, 13 May 2024 14:57:37 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E8=BF=90=E6=B5=81=E7=A8=8B=E7=9A=84?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=96=87=E4=BB=B6=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/bpm/pojo/param/BpmModelParam.java | 2 +- .../com/njcn/autocode/utils/GenerateCode.java | 8 +- .../param/device/QuitRunningDeviceParam.java | 96 +++++++++++++++++++ .../pojo/param/user/UserReportParam.java | 1 - .../pojo/po/device/QuitRunningDevice.java | 67 +++++++++++++ .../device/QuitRunningDeviceController.java | 54 +++++++++++ .../user/UserReportManageController.java | 1 - .../mapper/QuitRunningDeviceMapper.java | 16 ++++ .../mapping/QuitRunningDeviceMapper.xml | 5 + .../device/IQuitRunningDeviceService.java | 18 ++++ .../impl/QuitRunningDeviceServiceImpl.java | 70 ++++++++++++++ 11 files changed, 331 insertions(+), 7 deletions(-) create mode 100644 pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/QuitRunningDeviceParam.java create mode 100644 pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/QuitRunningDevice.java create mode 100644 pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/QuitRunningDeviceController.java create mode 100644 pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/mapper/QuitRunningDeviceMapper.java create mode 100644 pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/mapper/mapping/QuitRunningDeviceMapper.xml create mode 100644 pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/IQuitRunningDeviceService.java create mode 100644 pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/QuitRunningDeviceServiceImpl.java diff --git a/pqs-bpm/bpm-api/src/main/java/com/njcn/bpm/pojo/param/BpmModelParam.java b/pqs-bpm/bpm-api/src/main/java/com/njcn/bpm/pojo/param/BpmModelParam.java index e9ea14e9e..dae3c76c7 100644 --- a/pqs-bpm/bpm-api/src/main/java/com/njcn/bpm/pojo/param/BpmModelParam.java +++ b/pqs-bpm/bpm-api/src/main/java/com/njcn/bpm/pojo/param/BpmModelParam.java @@ -42,7 +42,7 @@ public class BpmModelParam implements Serializable { @ApiModelProperty("流程描述") private String description; - private Integer formType = 10; + private Integer formType; @ApiModelProperty("表单提交路由") private String formCustomCreatePath; diff --git a/pqs-common/common-autocode/src/main/java/com/njcn/autocode/utils/GenerateCode.java b/pqs-common/common-autocode/src/main/java/com/njcn/autocode/utils/GenerateCode.java index 8fa80a5ca..08e4f5372 100644 --- a/pqs-common/common-autocode/src/main/java/com/njcn/autocode/utils/GenerateCode.java +++ b/pqs-common/common-autocode/src/main/java/com/njcn/autocode/utils/GenerateCode.java @@ -21,7 +21,7 @@ public class GenerateCode { private static final String TARGET_DIR = "D://code"; - private static final String DB_URL = "jdbc:mysql://192.168.1.24:13306/bpm"; + private static final String DB_URL = "jdbc:mysql://192.168.1.24:13306/pqsinfo_jb"; // private static final String DB_URL = "jdbc:oracle:thin:@192.168.1.170:1521:pqsbase"; private static final String USERNAME = "root"; @@ -30,9 +30,9 @@ public class GenerateCode { public static void main(String[] args) { List modules = Stream.of( - new Module("hongawen", "com.njcn.bpm", "workflow", Stream.of( - "bpm_process_instance_copy" - ).collect(Collectors.toList()), "bpm_") + new Module("hongawen", "com.njcn.supervision", "device", Stream.of( + "supervision_quit_running_device" + ).collect(Collectors.toList()), "supervision_") ).collect(Collectors.toList()); generateJavaFile(modules); } diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/QuitRunningDeviceParam.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/QuitRunningDeviceParam.java new file mode 100644 index 000000000..c9c76ef66 --- /dev/null +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/QuitRunningDeviceParam.java @@ -0,0 +1,96 @@ +package com.njcn.supervision.pojo.param.device; + +import com.njcn.db.bo.BaseEntity; +import com.njcn.web.pojo.param.BaseParam; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +/** + *

+ * + *

+ * + * @author hongawen + * @since 2024-05-13 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class QuitRunningDeviceParam extends BaseEntity implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 设备编号 + */ + @ApiModelProperty(value = "设备编号") + @NotBlank(message = "设备编号不能为空") + private String deviceId; + + /** + * 设备类型 1:装置；2:监测点 + */ + @ApiModelProperty(value = "设备类型") + @NotNull(message = "设备编号不能为空") + private Integer deviceType; + + /** + * 资产编号 + */ + @ApiModelProperty(value = "资产编号") + private String propertyNo; + + /** + * 报告文件地址 + */ + @ApiModelProperty(value = "报告文件地址") + private String reportPath; + + /** + * 1:审批中；2：审批通过；3：审批不通过；4：已取消 + */ + @ApiModelProperty(value = "审批状态") + private Integer status; + + /** + * 流程实例的编号 + */ + @ApiModelProperty(value = "流程实例的编号") + private String processInstanceId; + + @ApiModelProperty("发起人自选审批人 Map") + private Map> startUserSelectAssignees; + + + @Data + @EqualsAndHashCode(callSuper = true) + public static class QuitRunningDeviceUpdateParam extends QuitRunningDeviceParam { + + @ApiModelProperty("id") + @NotBlank(message = "索引不能为空") + private String Id; + + } + + + /** + * 分页查询实体 + */ + @Data + @EqualsAndHashCode(callSuper = true) + public static class QuitRunningDeviceQueryParam extends BaseParam { + + + } + + +} diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/UserReportParam.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/UserReportParam.java index 208ff2743..e055defa3 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/UserReportParam.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/UserReportParam.java @@ -141,7 +141,6 @@ public class UserReportParam extends BaseEntity { @ApiModelProperty(value="所属区域") private String city; - } diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/QuitRunningDevice.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/QuitRunningDevice.java new file mode 100644 index 000000000..14e636823 --- /dev/null +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/QuitRunningDevice.java @@ -0,0 +1,67 @@ +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.Data; +import lombok.Getter; +import lombok.Setter; + +/** + *

+ * + *

+ * + * @author hongawen + * @since 2024-05-13 + */ +@Data +@TableName("supervision_quit_running_device") +public class QuitRunningDevice extends BaseEntity implements Serializable{ + + private static final long serialVersionUID = 1L; + + /** + * 设备退运表索引 + */ + private String id; + + /** + * 设备编号 + */ + private String deviceId; + + /** + * 设备类型 1:装置；2:监测点 + */ + private Integer deviceType; + + /** + * 资产编号 + */ + private String propertyNo; + + /** + * 报告文件地址 + */ + private String reportPath; + + /** + * 1:审批中；2：审批通过；3：审批不通过；4：已取消 + */ + private Integer status; + + /** + * 流程实例的编号 + */ + private String processInstanceId; + + /** + * 状态：0-删除 1-正常 + */ + private Integer state; + + +} diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/QuitRunningDeviceController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/QuitRunningDeviceController.java new file mode 100644 index 000000000..75ceeae57 --- /dev/null +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/QuitRunningDeviceController.java @@ -0,0 +1,54 @@ +package com.njcn.supervision.controller.device; + + +import com.njcn.common.pojo.annotation.OperateInfo; +import com.njcn.common.pojo.constant.OperateType; +import com.njcn.common.pojo.enums.common.LogEnum; +import com.njcn.common.pojo.enums.response.CommonResponseEnum; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.common.utils.HttpResultUtil; +import com.njcn.supervision.pojo.param.device.QuitRunningDeviceParam; +import com.njcn.supervision.pojo.param.user.UserReportParam; +import com.njcn.supervision.service.device.IQuitRunningDeviceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.web.bind.annotation.RestController; +import com.njcn.web.controller.BaseController; + +/** + *

+ * 前端控制器 + *

+ * + * @author hongawen + * @since 2024-05-13 + */ +@Slf4j +@RestController +@RequestMapping("/quitRunningDevice") +@Api(tags = "干扰源用户管理") +@AllArgsConstructor +public class QuitRunningDeviceController extends BaseController { + + private final IQuitRunningDeviceService quitRunningDeviceService; + + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType= OperateType.ADD) + @PostMapping("/add") + @ApiOperation("新增设备退运") + @ApiImplicitParam(name = "quitRunningDeviceParam", value = "实体参数", required = true) + public HttpResult addRunningDevice(@RequestBody @Validated QuitRunningDeviceParam quitRunningDeviceParam){ + String methodDescribe = getMethodDescribe("addRunningDevice"); + String runningDeviceId = quitRunningDeviceService.addRunningDevice(quitRunningDeviceParam); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, runningDeviceId, methodDescribe); + } + +} + diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportManageController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportManageController.java index 1897974bf..a41ec0493 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportManageController.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportManageController.java @@ -46,7 +46,6 @@ public class UserReportManageController extends BaseController { String methodDescribe = getMethodDescribe("addUserReport"); String userReportId = userReportPOService.addUserReport(userReportParam); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, userReportId, methodDescribe); - } @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType= OperateType.ADD) diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/mapper/QuitRunningDeviceMapper.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/mapper/QuitRunningDeviceMapper.java new file mode 100644 index 000000000..77b16a104 --- /dev/null +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/mapper/QuitRunningDeviceMapper.java @@ -0,0 +1,16 @@ +package com.njcn.supervision.mapper.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njcn.supervision.pojo.po.device.QuitRunningDevice; + +/** + *

+ * Mapper 接口 + *

+ * + * @author hongawen + * @since 2024-05-13 + */ +public interface QuitRunningDeviceMapper extends BaseMapper { + +} diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/mapper/mapping/QuitRunningDeviceMapper.xml b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/mapper/mapping/QuitRunningDeviceMapper.xml new file mode 100644 index 000000000..9d9e91746 --- /dev/null +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/mapper/mapping/QuitRunningDeviceMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/IQuitRunningDeviceService.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/IQuitRunningDeviceService.java new file mode 100644 index 000000000..1981ec2aa --- /dev/null +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/IQuitRunningDeviceService.java @@ -0,0 +1,18 @@ +package com.njcn.supervision.service.device; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.njcn.supervision.pojo.param.device.QuitRunningDeviceParam; +import com.njcn.supervision.pojo.po.device.QuitRunningDevice; + +/** + *

+ * 服务类 + *

+ * + * @author hongawen + * @since 2024-05-13 + */ +public interface IQuitRunningDeviceService extends IService { + + String addRunningDevice(QuitRunningDeviceParam quitRunningDeviceParam); +} diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/QuitRunningDeviceServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/QuitRunningDeviceServiceImpl.java new file mode 100644 index 000000000..df9a223d0 --- /dev/null +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/QuitRunningDeviceServiceImpl.java @@ -0,0 +1,70 @@ +package com.njcn.supervision.service.device.impl; + +import cn.hutool.core.collection.CollectionUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.bpm.api.BpmProcessFeignClient; +import com.njcn.bpm.enums.BpmTaskStatusEnum; +import com.njcn.bpm.pojo.dto.BpmProcessInstanceCreateReqDTO; +import com.njcn.common.pojo.enums.common.DataStateEnum; +import com.njcn.supervision.enums.UserNatureEnum; +import com.njcn.supervision.mapper.mapper.QuitRunningDeviceMapper; +import com.njcn.supervision.pojo.param.device.QuitRunningDeviceParam; +import com.njcn.supervision.pojo.po.device.QuitRunningDevice; +import com.njcn.supervision.pojo.po.user.UserReportPO; +import com.njcn.supervision.pojo.po.user.UserReportProjectPO; +import com.njcn.supervision.pojo.po.user.UserReportSensitivePO; +import com.njcn.supervision.pojo.po.user.UserReportSubstationPO; +import com.njcn.supervision.service.device.IQuitRunningDeviceService; +import lombok.RequiredArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import java.util.HashMap; +import java.util.Map; + +/** + *

+ * 服务实现类 + *

+ * + * @author hongawen + * @since 2024-05-13 + */ +@Service +@RequiredArgsConstructor +public class QuitRunningDeviceServiceImpl extends ServiceImpl implements IQuitRunningDeviceService { + + private final BpmProcessFeignClient bpmProcessFeignClient; + + /** + * 设备退运对应的流程定义 KEY + */ + public static final String PROCESS_KEY = "quit_running_device"; + + @Override + public String addRunningDevice(QuitRunningDeviceParam quitRunningDeviceParam) { + //判断设备状态，是不是已经退运了 + checkDeviceStatus(quitRunningDeviceParam); + QuitRunningDevice quitRunningDevice = new QuitRunningDevice(); + BeanUtils.copyProperties(quitRunningDeviceParam, quitRunningDevice); + quitRunningDevice.setState(DataStateEnum.ENABLE.getCode()); + quitRunningDevice.setStatus(BpmTaskStatusEnum.RUNNING.getStatus()); + this.save(quitRunningDevice); + // 发起 BPM 流程 + Map processInstanceVariables = new HashMap<>(); + BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO(); + bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(PROCESS_KEY); + bpmProcessInstanceCreateReqDTO.setBusinessKey(quitRunningDevice.getId()); + bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(quitRunningDeviceParam.getStartUserSelectAssignees()); + bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables); + String processInstanceId = bpmProcessFeignClient.createProcessInstance(quitRunningDevice.getCreateBy(),bpmProcessInstanceCreateReqDTO).getData(); + // 将工作流的编号，更新到流程单中 + quitRunningDevice.setProcessInstanceId(processInstanceId); + this.baseMapper.updateById(quitRunningDevice); + return quitRunningDevice.getId(); + } + + private void checkDeviceStatus(QuitRunningDeviceParam quitRunningDeviceParam) { + //todo... + } +}