From cb3dbc86d593be857874403b369245ace7b3e9ce Mon Sep 17 00:00:00 2001 From: hzj <826100833@qq.com> Date: Fri, 24 May 2024 16:02:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=9B=91=E6=B5=8B=E7=82=B9?= =?UTF-8?q?=E6=95=88=E7=8E=87=E4=BF=AE=E6=94=B9,=E7=9B=91=E6=B5=8B?= =?UTF-8?q?=E7=82=B9=E4=B8=8B=E6=9D=A5=E6=A1=86=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/biz/commApi/CommLineClient.java | 4 ++ .../CommLineClientFallbackFactory.java | 6 ++ .../pq/controller/CommLineController.java | 9 ++- .../pq/controller/DeptLineController.java | 11 ++++ .../device/pq/mapper/mapping/LineMapper.xml | 3 + .../device/pq/service/DeptLineService.java | 3 + .../njcn/device/pq/service/LineService.java | 2 + .../pq/service/impl/DeptLineServiceImpl.java | 12 +++- .../pq/service/impl/LineServiceImpl.java | 8 ++- .../RMpPartHarmonicDetailQueryParam.java | 3 +- .../SupervisionTempLineRunTestParam.java | 8 +-- .../pojo/po/plan/SupervisionPlanPO.java | 2 +- .../plan/SupervisionPlanController.java | 8 +++ .../plan/SupervisionPlanPOService.java | 2 + .../impl/SupervisionPlanPOServiceImpl.java | 55 +++++++++++++++++++ 15 files changed, 125 insertions(+), 11 deletions(-) diff --git a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/CommLineClient.java b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/CommLineClient.java index 1281a29bc..ac671e7e3 100644 --- a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/CommLineClient.java +++ b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/CommLineClient.java @@ -48,4 +48,8 @@ public interface CommLineClient { @GetMapping("/getLineAllDetail") HttpResult getLineAllDetail(@RequestParam("id") String id); + + + @GetMapping("/getLineAllDetailList") + HttpResult> getLineAllDetailList(@RequestParam("ids") List ids); } diff --git a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/fallback/CommLineClientFallbackFactory.java b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/fallback/CommLineClientFallbackFactory.java index 6ab1d847a..a83a9c407 100644 --- a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/fallback/CommLineClientFallbackFactory.java +++ b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/fallback/CommLineClientFallbackFactory.java @@ -50,6 +50,12 @@ public class CommLineClientFallbackFactory implements FallbackFactory> getLineAllDetailList(List ids) { + log.error("{}异常,降级处理,异常为:{}", "获取监测点列表信息", throwable.toString()); + throw new BusinessException(finalExceptionEnum); + } + }; } } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/CommLineController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/CommLineController.java index 1ea69e961..76b086642 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/CommLineController.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/CommLineController.java @@ -49,7 +49,14 @@ public class CommLineController extends BaseController { LineALLInfoDTO result = lineService.getLineAllDetail(id); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); } - + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @GetMapping("/getLineAllDetailList") + @ApiOperation("获取多监测点id取超标监测点信息") + public HttpResult> getLineAllDetailList(@RequestParam("ids") List ids) { + String methodDescribe = getMethodDescribe("getLineAllDetailList"); + List result = lineService.getLineAllDetailList(ids); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/getLineDetailBatch") diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/DeptLineController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/DeptLineController.java index c83ed44b9..1186fa3d2 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/DeptLineController.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/DeptLineController.java @@ -8,6 +8,7 @@ import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.common.utils.LogUtil; import com.njcn.device.pq.pojo.po.DeptLine; +import com.njcn.device.pq.pojo.vo.LineDeviceStateVO; import com.njcn.device.pq.service.DeptLineService; import com.njcn.web.controller.BaseController; import com.njcn.web.pojo.param.DeptLineParam; @@ -109,6 +110,16 @@ public class DeptLineController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); } + @OperateInfo(info = LogEnum.SYSTEM_COMMON) + @PostMapping("/getLineDetailByDeptId") + @ApiOperation("部门Id获取绑定监测点详情") + @ApiImplicitParam(name = "id", value = "部门id", required = true) + public HttpResult> getLineDetailByDeptId(@RequestParam("id") String id) { + String methodDescribe = getMethodDescribe("getLineDetailByDeptId"); + List list = deptLineService.getLineDetailByDeptId(id); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); + } + @PostMapping("/getLineByDeptRelation") @ApiOperation("获取部门和监测点的关系(分稳态暂态)") @ApiImplicitParam(name = "devDataType", value = "数据类型(0:暂态系统;1:稳态系统;)", required = true) diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml index 6946a6ac1..afec3e55a 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml @@ -623,10 +623,13 @@ AND device.id = subv.pid AND device1.id = device.id AND sub.id = device1.pid + + AND t.id in #{item} +