From 66e5861ebba054437c9dff9d9ff2e84d961d4cf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com> Date: Tue, 19 Dec 2023 08:45:25 +0800 Subject: [PATCH] =?UTF-8?q?pms=E5=9B=BD=E7=BD=91=E4=B8=8A=E9=80=81?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/njcn/device/pms/pojo/po/Monitor.java | 5 +--- .../system/controller/DictTreeController.java | 17 ++++++++++++ .../system/service/SysDicTreePOService.java | 11 +++++++- .../service/impl/SysDicTreePOServiceImpl.java | 26 +++++++++++++++++-- 4 files changed, 52 insertions(+), 7 deletions(-) diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Monitor.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Monitor.java index 5696defb0..e795d3386 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Monitor.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Monitor.java @@ -231,10 +231,7 @@ public class Monitor extends BaseEntity { * 0.未上送 1.已上送 2.取消上送 3.待重新上送 */ private Integer isUploadHead; - /** - * 行业分类 - */ - private String tradeCode; + /** * 牵引站id diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/DictTreeController.java b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/DictTreeController.java index 166e37899..d6fe7af6c 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/DictTreeController.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/DictTreeController.java @@ -121,7 +121,24 @@ public class DictTreeController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); } + @OperateInfo(info = LogEnum.SYSTEM_COMMON) + @GetMapping("/queryAll") + @ApiOperation("查询所有树形字典") + public HttpResult> queryAll() { + String methodDescribe = getMethodDescribe("queryAll"); + List result = sysDicTreePOService.queryAll(); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } + @OperateInfo(info = LogEnum.SYSTEM_COMMON) + @GetMapping("/queryTree") + @ApiOperation("树形字典树结构展示") + public HttpResult> queryTree() { + String methodDescribe = getMethodDescribe("queryTree"); + List result = sysDicTreePOService.queryTree(); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } + } diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/SysDicTreePOService.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/SysDicTreePOService.java index e8b6feee7..a886785a3 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/SysDicTreePOService.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/SysDicTreePOService.java @@ -8,7 +8,7 @@ import com.njcn.system.pojo.vo.DictTreeVO; import java.util.List; /** - * + * * Description: * Date: 2023/6/9 14:00【需求编号】 * @@ -32,4 +32,13 @@ public interface SysDicTreePOService extends IService{ * @return */ SysDicTreePO queryById(String id); + + /** + * 查询所有树形字典 + * @author cdf + * @date 2023/12/18 + */ + List queryAll(); + + List queryTree(); } diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/SysDicTreePOServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/SysDicTreePOServiceImpl.java index 02130dffb..37b2e57b7 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/SysDicTreePOServiceImpl.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/SysDicTreePOServiceImpl.java @@ -2,6 +2,7 @@ package com.njcn.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.njcn.common.pojo.enums.common.DataStateEnum; import com.njcn.system.pojo.param.DictTreeParam; import com.njcn.system.pojo.vo.DictTreeVO; import org.springframework.beans.BeanUtils; @@ -18,7 +19,7 @@ import com.njcn.system.service.SysDicTreePOService; import org.springframework.transaction.annotation.Transactional; /** - * + * * Description: * Date: 2023/6/9 14:00【需求编号】 * @@ -45,7 +46,7 @@ public class SysDicTreePOServiceImpl extends ServiceImpl queryAll() { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(SysDicTreePO::getStatus, 0); + return this.list(lambdaQueryWrapper); + } + + @Override + public List queryTree() { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(SysDicTreePO::getStatus, 0); + List sysDicTreePOList = this.list(lambdaQueryWrapper); + List parent = sysDicTreePOList.stream().filter(item->item.getPid().equals("0") && !item.getCode().equals("Device_Unit")).peek(item->item.setChildren(getChildren(item,sysDicTreePOList))).collect(Collectors.toList()); + return parent.stream().peek(item->item.setChildren(getChildren(item,sysDicTreePOList))).collect(Collectors.toList()); + } + + + private List getChildren(SysDicTreePO sysDicTreePO,List all){ + return all.stream().filter(item->item.getPid().equals(sysDicTreePO.getId())).peek(item->item.setChildren(getChildren(item,all))).collect(Collectors.toList()); + } + }