From 31d6121e522abe2e445b67123b67d57fa28dfc55 Mon Sep 17 00:00:00 2001 From: hongawen <83944980@qq.com> Date: Mon, 13 May 2024 18:07:31 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=88=E7=AB=AF=E6=96=87=E4=BB=B6=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/pojo/vo/TerminalSelectTreeVO.java | 18 +++++ .../pq/controller/TerminalTreeController.java | 13 ++++ .../pq/service/TerminalTreeService.java | 2 + .../service/impl/TerminalTreeServiceImpl.java | 12 ++++ .../param/device/QuitRunningDeviceParam.java | 13 +++- .../pojo/vo/device/QuitRunningDeviceVO.java | 70 +++++++++++++++++++ .../device/QuitRunningDeviceController.java | 15 ++++ .../device/QuitRunningDeviceMapper.java | 5 ++ .../mapping/QuitRunningDeviceMapper.xml | 15 +++- .../device/IQuitRunningDeviceService.java | 4 ++ .../impl/QuitRunningDeviceServiceImpl.java | 25 +++++++ .../user/impl/UserReportPOServiceImpl.java | 5 ++ 12 files changed, 195 insertions(+), 2 deletions(-) create mode 100644 pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/vo/TerminalSelectTreeVO.java create mode 100644 pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/QuitRunningDeviceVO.java diff --git a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/vo/TerminalSelectTreeVO.java b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/vo/TerminalSelectTreeVO.java new file mode 100644 index 000000000..14a05f0bc --- /dev/null +++ b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/vo/TerminalSelectTreeVO.java @@ -0,0 +1,18 @@ +package com.njcn.device.biz.pojo.vo; + +import lombok.Data; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +@Data +public class TerminalSelectTreeVO implements Serializable { + + private String value; + + private String label; + + private List children = new ArrayList<>(); + +} diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalTreeController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalTreeController.java index 6175a2fcb..ac51d19e8 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalTreeController.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalTreeController.java @@ -53,6 +53,19 @@ public class TerminalTreeController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, tree, methodDescribe); } + /** + * 获取设备树给前端下拉选择 + */ + @ApiOperation("获取终端树") + @OperateInfo(info = LogEnum.BUSINESS_MEDIUM) + @GetMapping("getTerminalSelectTree") + public HttpResult> getTerminalSelectTree(Integer level){ + String methodDescribe = getMethodDescribe("getTerminalSelectTree"); + List tree = terminalTreeService.getTerminalSelectTree(level); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, tree, methodDescribe); + } + + /** * 获取终端台账设备树 * @author cdf diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/TerminalTreeService.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/TerminalTreeService.java index f57e76169..7baba6e99 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/TerminalTreeService.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/TerminalTreeService.java @@ -40,4 +40,6 @@ public interface TerminalTreeService { * @date 2022/1/14 */ List getDeptBindDeptLineTree(String deptId, Integer deptType, String id, Integer type); + + List getTerminalSelectTree(Integer level); } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalTreeServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalTreeServiceImpl.java index 8c285f8d0..b3c6b6090 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalTreeServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalTreeServiceImpl.java @@ -212,6 +212,18 @@ public class TerminalTreeServiceImpl implements TerminalTreeService { return deptLineTreeVOS; } + /** + * 等级：0-项目名称；1- 工程名称；2-单位；3-部门；4-终端；5-母线；6-监测点 + * level为终端时 + * 返回的是 2-3-4 + * level为监测点时 + * 返回的是 2-3-(5+6) + */ + @Override + public List getTerminalSelectTree(Integer level) { + return null; + } + /** * 获取全部子节点 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 c9c76ef66..9b61407f1 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 @@ -40,7 +40,7 @@ public class QuitRunningDeviceParam extends BaseEntity implements Serializable { * 设备类型 1:装置；2:监测点 */ @ApiModelProperty(value = "设备类型") - @NotNull(message = "设备编号不能为空") + @NotNull(message = "设备类型不能为空") private Integer deviceType; /** @@ -89,6 +89,17 @@ public class QuitRunningDeviceParam extends BaseEntity implements Serializable { @EqualsAndHashCode(callSuper = true) public static class QuitRunningDeviceQueryParam extends BaseParam { + /** + * 设备类型 1:装置；2:监测点 + */ + @ApiModelProperty(value = "设备类型") + private Integer deviceType; + + /** + * 设备编号 + */ + @ApiModelProperty(value = "设备编号") + private String deviceId; } 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 new file mode 100644 index 000000000..cc956c653 --- /dev/null +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/QuitRunningDeviceVO.java @@ -0,0 +1,70 @@ +package com.njcn.supervision.pojo.vo.device; + +import com.njcn.db.bo.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author hongawen + * @since 2024-05-13 + */ +@Data +public class QuitRunningDeviceVO extends BaseEntity implements Serializable{ + + private static final long serialVersionUID = 1L; + + /** + * 设备退运表索引 + */ + private String id; + + /** + * 设备编号 + */ + @ApiModelProperty(value = "设备编号") + private String deviceId; + + /** + * 设备名称 + */ + @ApiModelProperty(value = "设备名称") + private String deviceName; + + /** + * 设备类型 1:装置；2:监测点 + */ + @ApiModelProperty(value = "设备类型") + 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; + + +} 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 index 75ceeae57..0a05bcc3c 100644 --- 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 @@ -1,6 +1,7 @@ package com.njcn.supervision.controller.device; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.constant.OperateType; import com.njcn.common.pojo.enums.common.LogEnum; @@ -9,6 +10,8 @@ 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.pojo.vo.device.QuitRunningDeviceVO; +import com.njcn.supervision.pojo.vo.user.UserReportVO; import com.njcn.supervision.service.device.IQuitRunningDeviceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -40,6 +43,16 @@ public class QuitRunningDeviceController extends BaseController { private final IQuitRunningDeviceService quitRunningDeviceService; + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/list") + @ApiOperation("分页查询当前用户能看到的退运设备数据") + @ApiImplicitParam(name = "quitRunningDeviceQueryParam", value = "参数", required = true) + public HttpResult> getQuitRunningDevice(@RequestBody @Validated QuitRunningDeviceParam.QuitRunningDeviceQueryParam quitRunningDeviceQueryParam){ + String methodDescribe = getMethodDescribe("getQuitRunningDevice"); + Page out = quitRunningDeviceService.getQuitRunningDevice(quitRunningDeviceQueryParam); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, out, methodDescribe); + } + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType= OperateType.ADD) @PostMapping("/add") @ApiOperation("新增设备退运") @@ -50,5 +63,7 @@ public class QuitRunningDeviceController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, runningDeviceId, methodDescribe); } + + } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/QuitRunningDeviceMapper.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/QuitRunningDeviceMapper.java index e05988f27..815f7d34b 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/QuitRunningDeviceMapper.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/QuitRunningDeviceMapper.java @@ -1,7 +1,11 @@ package com.njcn.supervision.mapper.device; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.supervision.pojo.po.device.QuitRunningDevice; +import com.njcn.supervision.pojo.vo.device.QuitRunningDeviceVO; +import org.apache.ibatis.annotations.Param; /** *

@@ -13,4 +17,5 @@ import com.njcn.supervision.pojo.po.device.QuitRunningDevice; */ public interface QuitRunningDeviceMapper extends BaseMapper { + Page page(@Param("page")Page objectPage, @Param("ew")QueryWrapper quitRunningDeviceVOQueryWrapper); } 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 a5ed7a135..e6e2b9b93 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 @@ -1,5 +1,18 @@ - + + 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 index 1981ec2aa..9d42f79dd 100644 --- 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 @@ -1,8 +1,10 @@ package com.njcn.supervision.service.device; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.supervision.pojo.param.device.QuitRunningDeviceParam; import com.njcn.supervision.pojo.po.device.QuitRunningDevice; +import com.njcn.supervision.pojo.vo.device.QuitRunningDeviceVO; /** *

@@ -15,4 +17,6 @@ import com.njcn.supervision.pojo.po.device.QuitRunningDevice; public interface IQuitRunningDeviceService extends IService { String addRunningDevice(QuitRunningDeviceParam quitRunningDeviceParam); + + Page getQuitRunningDevice(QuitRunningDeviceParam.QuitRunningDeviceQueryParam quitRunningDeviceQueryParam); } 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 cfb508bba..6e435327f 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 @@ -1,5 +1,8 @@ package com.njcn.supervision.service.device.impl; +import cn.hutool.core.date.DateUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.bpm.api.BpmProcessFeignClient; import com.njcn.bpm.enums.BpmTaskStatusEnum; @@ -8,13 +11,16 @@ import com.njcn.common.pojo.enums.common.DataStateEnum; import com.njcn.supervision.mapper.device.QuitRunningDeviceMapper; import com.njcn.supervision.pojo.param.device.QuitRunningDeviceParam; import com.njcn.supervision.pojo.po.device.QuitRunningDevice; +import com.njcn.supervision.pojo.vo.device.QuitRunningDeviceVO; import com.njcn.supervision.service.device.IQuitRunningDeviceService; +import com.njcn.web.factory.PageFactory; import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import java.util.HashMap; import java.util.Map; +import java.util.Objects; /** *

@@ -58,6 +64,25 @@ public class QuitRunningDeviceServiceImpl extends ServiceImpl getQuitRunningDevice(QuitRunningDeviceParam.QuitRunningDeviceQueryParam quitRunningDeviceQueryParam) { + QueryWrapper 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()); + } + //添加上时间范围 + quitRunningDeviceVOQueryWrapper.between("supervision_quit_running_device.Create_Time", + DateUtil.beginOfDay(DateUtil.parse(quitRunningDeviceQueryParam.getSearchBeginTime())), + DateUtil.endOfDay(DateUtil.parse(quitRunningDeviceQueryParam.getSearchEndTime()))); + } + quitRunningDeviceVOQueryWrapper.orderByDesc("supervision_quit_running_device.create_time"); + //todo...根据设备id获取详细数据用于回显，待会做 + return this.baseMapper.page(new Page<>(PageFactory.getPageNum(quitRunningDeviceQueryParam), PageFactory.getPageSize(quitRunningDeviceQueryParam)), quitRunningDeviceVOQueryWrapper); + } + private void checkDeviceStatus(QuitRunningDeviceParam quitRunningDeviceParam) { //todo... } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java index e9534fe89..94b049002 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java @@ -2,6 +2,7 @@ package com.njcn.supervision.service.user.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -169,6 +170,10 @@ public class UserReportPOServiceImpl extends ServiceImpl(PageFactory.getPageNum(userReportQueryParam), PageFactory.getPageSize(userReportQueryParam)), userReportVOQueryWrapper);