From 9aa433aead578776e5936ebcf79c26d0ac0245f2 Mon Sep 17 00:00:00 2001 From: hongawen <83944980@qq.com> Date: Tue, 4 Jun 2024 18:36:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BB=88=E7=AB=AF=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/njcn/device/pq/pojo/po/Device.java | 2 +- .../param/device/QuitRunningDeviceParam.java | 12 +++++++ .../pojo/po/device/QuitRunningDevice.java | 11 ++++++ .../pojo/vo/device/QuitRunningDeviceVO.java | 12 +++++++ .../mapping/QuitRunningDeviceMapper.xml | 3 ++ .../impl/QuitRunningDeviceServiceImpl.java | 34 ++++++++++++------- 6 files changed, 60 insertions(+), 14 deletions(-) diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/Device.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/Device.java index e6a165b62..25875bbf1 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/Device.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/Device.java @@ -38,7 +38,7 @@ public class Device implements Serializable{ private Integer devDataType; /** - * 终端运行状态（0：投运；1：热备用；2：停运） + * 终端运行状态（0：运行；1：检修；2：停运；3：调试；4：退运） */ private Integer runFlag; 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 index 284fc076b..457246324 100644 --- 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 @@ -76,6 +76,18 @@ public class QuitRunningDeviceParam implements Serializable { @ApiModelProperty("发起人自选审批人 Map") private Map> startUserSelectAssignees; + /** + * 设备目标状态（0：运行；1：检修；2：停运；3：调试；4：退运） + */ + @ApiModelProperty(value = "设备目标状态") + private Integer devStatus; + + /** + * 设备当前状态（0：运行；1：检修；2：停运；3：调试；4：退运） + */ + @ApiModelProperty(value = "设备当前状态") + private Integer devOriginalStatus; + @Data @EqualsAndHashCode(callSuper = true) 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 index af6bb6885..89a1420e6 100644 --- 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 @@ -38,6 +38,17 @@ public class QuitRunningDevice extends BaseEntity implements Serializable{ */ private Integer deviceType; + /** + * 设备目标状态（0：运行；1：检修；2：停运；3：调试；4：退运） + */ + private Integer devStatus; + + /** + * 设备当前状态（0：运行；1：检修；2：停运；3：调试；4：退运） + */ + private Integer devOriginalStatus; + + /** * 资产编号 */ diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/QuitRunningDeviceVO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/QuitRunningDeviceVO.java index bfd676ffc..185d72b1b 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/QuitRunningDeviceVO.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/QuitRunningDeviceVO.java @@ -51,6 +51,18 @@ public class QuitRunningDeviceVO extends BaseEntity implements Serializable{ @ApiModelProperty(value = "设备类型") private Integer deviceType; + /** + * 设备目标状态（0：运行；1：检修；2：停运；3：调试；4：退运） + */ + @ApiModelProperty(value = "设备目标状态") + private Integer devStatus; + + /** + * 设备当前状态（0：运行；1：检修；2：停运；3：调试；4：退运） + */ + @ApiModelProperty(value = "设备当前状态") + private Integer devOriginalStatus; + /** * 设备状态 */ diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/QuitRunningDeviceMapper.xml b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/QuitRunningDeviceMapper.xml index 22e6bc74d..10d06e8cb 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/QuitRunningDeviceMapper.xml +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/QuitRunningDeviceMapper.xml @@ -12,6 +12,9 @@ supervision_quit_running_device.process_instance_id, supervision_quit_running_device.history_instance_id, supervision_quit_running_device.create_time, + supervision_quit_running_device.create_by, + supervision_quit_running_device.dev_status, + supervision_quit_running_device.dev_original_status, supervision_quit_running_device.status FROM supervision_quit_running_device supervision_quit_running_device WHERE ${ew.sqlSegment} 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 index e2884f82e..7b2af3b92 100644 --- 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 @@ -68,10 +68,13 @@ public class QuitRunningDeviceServiceImpl extends ServiceImpl quitRunningDeviceVOQueryWrapper = new QueryWrapper<>(); if (Objects.nonNull(quitRunningDeviceQueryParam)) { //判断监测点/设备的选择 - if (Objects.nonNull(quitRunningDeviceQueryParam.getDeviceType()) && Objects.nonNull(quitRunningDeviceQueryParam.getDeviceId())) { - quitRunningDeviceVOQueryWrapper.eq("supervision_quit_running_device.device_type", quitRunningDeviceQueryParam.getDeviceType()); - quitRunningDeviceVOQueryWrapper.eq("supervision_quit_running_device.device_id", quitRunningDeviceQueryParam.getDeviceId()); - } +// if (Objects.nonNull(quitRunningDeviceQueryParam.getDeviceType()) && Objects.nonNull(quitRunningDeviceQueryParam.getDeviceId())) { +// quitRunningDeviceVOQueryWrapper.eq("supervision_quit_running_device.device_type", quitRunningDeviceQueryParam.getDeviceType()); +// quitRunningDeviceVOQueryWrapper.eq("supervision_quit_running_device.device_id", quitRunningDeviceQueryParam.getDeviceId()); +// } //添加上时间范围 quitRunningDeviceVOQueryWrapper.between("supervision_quit_running_device.Create_Time", DateUtil.beginOfDay(DateUtil.parse(quitRunningDeviceQueryParam.getSearchBeginTime())), DateUtil.endOfDay(DateUtil.parse(quitRunningDeviceQueryParam.getSearchEndTime()))); + + //判断监测点/设备的选择 + quitRunningDeviceVOQueryWrapper.eq("supervision_quit_running_device.device_type", quitRunningDeviceQueryParam.getDeviceType()); + } //获取当前用户部门所有同事的id，查看该部门下所有的数据 @@ -176,12 +186,10 @@ public class QuitRunningDeviceServiceImpl extends ServiceImpl