From 1d5ceca9dc5eb22002f09af05991181ec1fc15b1 Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Thu, 28 Nov 2024 08:38:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E5=85=B8=E6=A0=91=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/DictTreeController.java | 15 +++++-- .../system/service/SysDicTreePOService.java | 4 +- .../service/impl/SysDicTreePOServiceImpl.java | 41 ++++++++++++++----- 3 files changed, 46 insertions(+), 14 deletions(-) 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 50222e054..352b04a45 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 @@ -8,6 +8,7 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.common.utils.LogUtil; +import com.njcn.system.mapper.SysDicTreePOMapper; import com.njcn.system.pojo.param.DictTreeParam; import com.njcn.system.pojo.po.SysDicTreePO; import com.njcn.system.pojo.vo.DictTreeVO; @@ -55,9 +56,7 @@ public class DictTreeController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe); } } - - - + /** * 修改 * @param dicParam 修改参数 @@ -176,5 +175,15 @@ public class DictTreeController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); } + @OperateInfo(info = LogEnum.SYSTEM_COMMON) + @GetMapping("/queryDictType") + @ApiOperation("获取指标类型") + @ApiImplicitParam(name = "lineId", value = "监测点id", required = true) + public HttpResult> queryDictType(@RequestParam @Validated String lineId) { + String methodDescribe = getMethodDescribe("queryDictType"); + List result = sysDicTreePOService.queryDictType(lineId); + 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 dd241182c..0ce5c6c78 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 @@ -1,8 +1,8 @@ package com.njcn.system.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.system.pojo.param.DictTreeParam; import com.njcn.system.pojo.po.SysDicTreePO; -import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.system.pojo.vo.DictTreeVO; import java.util.List; @@ -63,4 +63,6 @@ public interface SysDicTreePOService extends IService { * @param code code */ List queryByCodeList(String code); + + List queryDictType(String lineId); } 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 091b7e54d..738fab426 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 @@ -4,28 +4,27 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.text.StrPool; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.common.pojo.constant.BizParamConstant; -import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO; import com.njcn.redis.pojo.enums.AppRedisKey; import com.njcn.redis.utils.RedisUtil; import com.njcn.system.enums.DicDataTypeEnum; +import com.njcn.system.mapper.SysDicTreePOMapper; import com.njcn.system.pojo.constant.DicState; -import com.njcn.system.pojo.dto.EpdDTO; import com.njcn.system.pojo.param.DictTreeParam; +import com.njcn.system.pojo.po.SysDicTreePO; import com.njcn.system.pojo.vo.DictTreeVO; +import com.njcn.system.service.SysDicTreePOService; import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; - -import java.util.*; -import java.util.stream.Collectors; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.njcn.system.mapper.SysDicTreePOMapper; -import com.njcn.system.pojo.po.SysDicTreePO; -import com.njcn.system.service.SysDicTreePOService; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; + /** * Description: * Date: 2023/6/9 14:00【需求编号】 @@ -66,6 +65,9 @@ public class SysDicTreePOServiceImpl extends ServiceImpl queryDictType(String lineId) { + DictTreeVO vo = queryByCode("Statistical_Type"); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(SysDicTreePO::getPid,vo.getId()) + .eq(SysDicTreePO::getStatus,0) + .orderByDesc(SysDicTreePO::getSort); + char lastChar = lineId.charAt(lineId.length() - 1); + //治理APF指标 + if (Objects.equals(lastChar,'0')) { + queryWrapper.eq(SysDicTreePO::getType,3); + } + //通用指标 + else { + queryWrapper.eq(SysDicTreePO::getType,2); + } + return this.list(queryWrapper); + } + private List getChildren(SysDicTreePO sysDicTreePO, List all) { return all.stream().filter(item -> item.getPid().equals(sysDicTreePO.getId())).peek(item -> {