From 6a01f8e0b14e118f983f994ba2a8c98e55fff6e4 Mon Sep 17 00:00:00 2001 From: xuyang <748613696@qq.com> Date: Mon, 14 Aug 2023 21:08:03 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=B6=88=E6=81=AF=E8=B7=AF=E7=94=B1?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E3=80=81=E7=89=A9=E8=A7=A3=E6=9E=90=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E6=8F=90=E4=BE=9B=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/csdevice/api/CsLineFeignClient.java | 3 +++ .../csdevice/api/DataArrayFeignClient.java | 4 +++ .../fallback/CsLineClientFallbackFactory.java | 6 +++++ .../DataArrayFeignClientFallbackFactory.java | 7 +++++ .../csdevice/pojo/param/DataArrayParam.java | 27 +++++++++++++++++++ .../com/njcn/csdevice/pojo/po/CsDataSet.java | 2 +- .../equipment/CsDataArrayController.java | 13 +++++++++ .../controller/line/CslineController.java | 13 ++++++++- .../csdevice/mapper/CsDataArrayMapper.java | 3 +++ .../njcn/csdevice/mapper/CsLinePOMapper.java | 5 ++++ .../mapper/mapping/CsDataArrayMapper.xml | 18 +++++++++++++ .../mapper/mapping/CsLinePOMapper.xml | 14 ++++++++++ .../csdevice/service/CsLinePOService.java | 11 +++++--- .../csdevice/service/ICsDataArrayService.java | 8 ++++++ .../service/impl/CsDataArrayServiceImpl.java | 6 ++++- .../service/impl/CsLedgerServiceImpl.java | 3 --- .../service/impl/CsLinePOServiceImpl.java | 9 ++++--- 17 files changed, 138 insertions(+), 14 deletions(-) create mode 100644 cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/DataArrayParam.java diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/CsLineFeignClient.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/CsLineFeignClient.java index 8dd3204..d0e727e 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/CsLineFeignClient.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/CsLineFeignClient.java @@ -26,4 +26,7 @@ public interface CsLineFeignClient { @PostMapping("/addList") HttpResult addLineList(@RequestBody List list); + + @PostMapping("/findByNdid") + HttpResult> findByNdid(@RequestParam("id") String id); } diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/DataArrayFeignClient.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/DataArrayFeignClient.java index 9e83e55..459921f 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/DataArrayFeignClient.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/DataArrayFeignClient.java @@ -3,6 +3,7 @@ package com.njcn.csdevice.api; import com.njcn.common.pojo.constant.ServerInfo; import com.njcn.common.pojo.response.HttpResult; import com.njcn.csdevice.api.fallback.DataArrayFeignClientFallbackFactory; +import com.njcn.csdevice.pojo.param.DataArrayParam; import com.njcn.csdevice.pojo.po.CsDataArray; import com.njcn.csdevice.pojo.po.CsDataSet; import com.njcn.csdevice.pojo.vo.DataArrayTreeVO; @@ -31,4 +32,7 @@ public interface DataArrayFeignClient { @PostMapping("/getDataArrayByIds") HttpResult> getDataArrayByIds(@RequestParam("ids") List ids); + @PostMapping("/findListByParam") + HttpResult> findListByParam(@RequestBody DataArrayParam param); + } diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/CsLineClientFallbackFactory.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/CsLineClientFallbackFactory.java index 4ac43f7..45fee93 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/CsLineClientFallbackFactory.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/CsLineClientFallbackFactory.java @@ -44,6 +44,12 @@ public class CsLineClientFallbackFactory implements FallbackFactory> findByNdid(String id) { + log.error("{}异常，降级处理，异常为：{}","根据ndid查询监测点",cause.toString()); + throw new BusinessException(finalExceptionEnum); + } }; } } diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/DataArrayFeignClientFallbackFactory.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/DataArrayFeignClientFallbackFactory.java index 317947e..d2f135f 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/DataArrayFeignClientFallbackFactory.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/DataArrayFeignClientFallbackFactory.java @@ -4,6 +4,7 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.pojo.response.HttpResult; import com.njcn.csdevice.api.DataArrayFeignClient; +import com.njcn.csdevice.pojo.param.DataArrayParam; import com.njcn.csdevice.pojo.po.CsDataArray; import com.njcn.csdevice.pojo.po.CsDataSet; import com.njcn.csdevice.pojo.vo.DataArrayTreeVO; @@ -57,6 +58,12 @@ public class DataArrayFeignClientFallbackFactory implements FallbackFactory> findListByParam(DataArrayParam param) { + log.error("{}异常，降级处理，异常为：{}","根据条件查询详细数据",cause.toString()); + throw new BusinessException(finalExceptionEnum); + } }; } } diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/DataArrayParam.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/DataArrayParam.java new file mode 100644 index 0000000..4a922b6 --- /dev/null +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/DataArrayParam.java @@ -0,0 +1,27 @@ +package com.njcn.csdevice.pojo.param; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 类的介绍： + * + * @author xuyang + * @version 1.0.0 + * @createTime 2023/8/14 15:30 + */ +@Data +public class DataArrayParam { + + @ApiModelProperty("设备识别码") + private String id; + + @ApiModelProperty("逻辑设备id") + private Integer did; + + @ApiModelProperty("逻辑子设备id") + private Integer cldId; + + @ApiModelProperty("数据类型") + private String statMethod; +} diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDataSet.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDataSet.java index 2d7158c..80314f8 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDataSet.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDataSet.java @@ -63,7 +63,7 @@ public class CsDataSet extends BaseEntity { /** * 逻辑子设备id(从模板获取,主设备此字段没有值) */ - private String clDev; + private Integer clDev; /** * 数据集类型(0:主设备 1:模块 2:监测设备) diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsDataArrayController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsDataArrayController.java index e551ea4..462a3f2 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsDataArrayController.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsDataArrayController.java @@ -6,6 +6,7 @@ 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.csdevice.pojo.param.DataArrayParam; import com.njcn.csdevice.pojo.po.CsDataArray; import com.njcn.csdevice.pojo.vo.DataArrayTreeVO; import com.njcn.csdevice.pojo.vo.DeviceManagerDetailVO; @@ -18,6 +19,7 @@ import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; import java.util.List; @@ -95,5 +97,16 @@ public class CsDataArrayController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); } + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/findListByParam") + @ApiOperation("根据条件查询详细数据") + @ApiImplicitParam(name = "param", value = "参数集合", required = true) + @ApiIgnore + public HttpResult> findListByParam(@RequestBody DataArrayParam param){ + String methodDescribe = getMethodDescribe("findListByParam"); + List list = csDataArrayService.findListByParam(param); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); + } + } diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/line/CslineController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/line/CslineController.java index b4c2814..14184f1 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/line/CslineController.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/line/CslineController.java @@ -5,7 +5,6 @@ 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.csdevice.pojo.param.CsLineParm; import com.njcn.csdevice.pojo.po.CsLinePO; import com.njcn.csdevice.service.CsLinePOService; import com.njcn.web.controller.BaseController; @@ -15,6 +14,7 @@ import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; import java.util.List; @@ -74,4 +74,15 @@ public class CslineController extends BaseController { // return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); // } + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/findByNdid") + @ApiOperation("根据ndid查询监测点") + @ApiImplicitParam(name = "id", value = "ndid", required = true) + @ApiIgnore + public HttpResult> findByNdid(@RequestParam String id){ + String methodDescribe = getMethodDescribe("findByNdid"); + List lineList= csLinePOService.findByNdid(id); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, lineList, methodDescribe); + } + } diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsDataArrayMapper.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsDataArrayMapper.java index fce37d0..8696c36 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsDataArrayMapper.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsDataArrayMapper.java @@ -2,6 +2,7 @@ package com.njcn.csdevice.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.njcn.csdevice.pojo.dto.DataArrayDTO; +import com.njcn.csdevice.pojo.param.DataArrayParam; import com.njcn.csdevice.pojo.po.CsDataArray; import com.njcn.csdevice.pojo.vo.EnergyTemplateVO; import com.njcn.csdevice.pojo.vo.LineTargetVO; @@ -28,4 +29,6 @@ public interface CsDataArrayMapper extends BaseMapper { List getGroupData(@Param("id") String id); List getArrayByGroup(@Param("list") List list); + + List findListByParam(@Param("param") DataArrayParam param); } diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsLinePOMapper.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsLinePOMapper.java index 15f44ee..ec7fb36 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsLinePOMapper.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsLinePOMapper.java @@ -2,6 +2,9 @@ package com.njcn.csdevice.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.njcn.csdevice.pojo.po.CsLinePO; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * @@ -12,4 +15,6 @@ import com.njcn.csdevice.pojo.po.CsLinePO; * @version V1.0.0 */ public interface CsLinePOMapper extends BaseMapper { + + List findByNdid(@Param("id") String id); } \ No newline at end of file diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsDataArrayMapper.xml b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsDataArrayMapper.xml index a800cbe..f567d8a 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsDataArrayMapper.xml +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsDataArrayMapper.xml @@ -89,4 +89,22 @@ order by t1.sort + + \ No newline at end of file diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsLinePOMapper.xml b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsLinePOMapper.xml index ca2d83e..c8a409b 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsLinePOMapper.xml +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsLinePOMapper.xml @@ -22,4 +22,18 @@ line_id, dev_id, `name`, `position`, vol_grade, pt_ratio, ct_ratio, `status`, create_by, create_time, update_by, update_time + + \ No newline at end of file diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsLinePOService.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsLinePOService.java index 91a13d0..af67984 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsLinePOService.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsLinePOService.java @@ -1,11 +1,7 @@ package com.njcn.csdevice.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.njcn.csdevice.pojo.param.CsMarketDataParam; -import com.njcn.csdevice.pojo.po.CsLedger; import com.njcn.csdevice.pojo.po.CsLinePO; -import com.njcn.csdevice.pojo.po.CsMarketData; -import com.njcn.csdevice.pojo.vo.CsMarketDataVO; import java.util.List; @@ -30,4 +26,11 @@ public interface CsLinePOService extends IService{ List queryByDevId(String devId); + /** + * 根据ndid获取监测点 + * @param id + * @return + */ + List findByNdid(String id); + } diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/ICsDataArrayService.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/ICsDataArrayService.java index 820edaa..87e4281 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/ICsDataArrayService.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/ICsDataArrayService.java @@ -1,6 +1,7 @@ package com.njcn.csdevice.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.njcn.csdevice.pojo.param.DataArrayParam; import com.njcn.csdevice.pojo.po.CsDataArray; import com.njcn.csdevice.pojo.vo.DataArrayTreeVO; import com.njcn.csdevice.pojo.vo.DeviceManagerDetailVO; @@ -42,4 +43,11 @@ public interface ICsDataArrayService extends IService { List getDataArrayById(String pid, String name); List getDataArrayByIds(List ids); + + /** + * 根据条件获取详细数据集 + * @param param + * @return + */ + List findListByParam(DataArrayParam param); } diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDataArrayServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDataArrayServiceImpl.java index ba51010..fae8d33 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDataArrayServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDataArrayServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.csdevice.enums.AlgorithmResponseEnum; import com.njcn.csdevice.mapper.CsDataArrayMapper; import com.njcn.csdevice.pojo.dto.DataArrayDTO; +import com.njcn.csdevice.pojo.param.DataArrayParam; import com.njcn.csdevice.pojo.po.CsDataArray; import com.njcn.csdevice.pojo.vo.DataArrayTreeVO; import com.njcn.csdevice.pojo.vo.DeviceManagerDetailVO; @@ -169,5 +170,8 @@ public class CsDataArrayServiceImpl extends ServiceImpl findListByParam(DataArrayParam param) { + return this.baseMapper.findListByParam(param); + } } diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java index 82dcffd..680643e 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java @@ -72,7 +72,6 @@ public class CsLedgerServiceImpl extends ServiceImpl i public List getLineTree() { List engineeringList = new ArrayList<>(); List allList = this.baseMapper.getAll(); - //fixme 这边先根据登录的用户名称来区分是否展示所有的台账信息 /*获取用户工程，设备信息过滤*/ List roleengineer = roleEngineerDevService.getRoleengineer(); List device = roleEngineerDevService.getDevice(); @@ -103,7 +102,6 @@ public class CsLedgerServiceImpl extends ServiceImpl i List roleengineer = roleEngineerDevService.getRoleengineer(); List device = roleEngineerDevService.getDevice(); engineeringList = allList.stream().filter(item->roleengineer.contains(item.getId())).collect(Collectors.toList()); - //fixme 这边先根据登录的用户名称来区分是否展示所有的台账信息 // if (Objects.equals(RequestUtil.getUsername(),"root")){ // engineeringList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.ENGINEERING_LEVEL.getCode())).sorted(Comparator.comparing(CsLedgerVO::getSort)).collect(Collectors.toList()); // } else { @@ -168,7 +166,6 @@ public class CsLedgerServiceImpl extends ServiceImpl i public List getProjectTree() { List engineeringList = new ArrayList<>(); List allList = this.baseMapper.getAll(); - //fixme 这边先根据登录的用户名称来区分是否展示所有的台账信息 // if (Objects.equals(RequestUtil.getUsername(),"root") || Objects.equals(RequestUtil.getUsername(),"njcnser")){ // engineeringList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.ENGINEERING_LEVEL.getCode())).sorted(Comparator.comparing(CsLedgerVO::getSort)).collect(Collectors.toList()); // } else { diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java index 238b46f..5418418 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java @@ -5,15 +5,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.csdevice.mapper.CsLedgerMapper; import com.njcn.csdevice.mapper.CsLinePOMapper; -import com.njcn.csdevice.pojo.param.CsLineParm; -import com.njcn.csdevice.pojo.po.AppLineTopologyDiagramPO; import com.njcn.csdevice.pojo.po.CsLedger; import com.njcn.csdevice.pojo.po.CsLinePO; import com.njcn.csdevice.service.CsLinePOService; import lombok.RequiredArgsConstructor; -import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.List; @@ -56,6 +52,11 @@ public class CsLinePOServiceImpl extends ServiceImpl i return csLinePOS; } + @Override + public List findByNdid(String id) { + return this.baseMapper.findByNdid(id); + } + // /** // * 1.平台端默认配置拓扑图模板，包含拓扑图信息(cs_topology_diagram_template)和拓扑图上监测点的点位信息(cs_line_topology_template) // *