From 0227d0731c9b6ec9ad777e047f848850097d83e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B4=BE=E5=90=8C=E5=AD=A6?= Date: Thu, 20 Nov 2025 08:50:46 +0800 Subject: [PATCH] =?UTF-8?q?feat(cs-device):=20=E5=A2=9E=E5=8A=A0=E7=9B=91?= =?UTF-8?q?=E6=B5=8B=E7=82=B9=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=8F=8A=E5=8F=82=E6=95=B0=E8=BF=87=E6=BB=A4=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/njcn/csdevice/api/CsLineFeignClient.java | 5 ++++- .../api/fallback/CsLineClientFallbackFactory.java | 5 +++++ .../njcn/csdevice/controller/line/CslineController.java | 8 ++++++-- 3 files changed, 15 insertions(+), 3 deletions(-) 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 7c17ac7..8e911f2 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 @@ -53,10 +53,13 @@ public interface CsLineFeignClient { @PostMapping("/getLineByName") HttpResult> getLineByName(@RequestParam("lineName") String lineName); - @PostMapping("/getAllLine") HttpResult> getAllLine(); @PostMapping("/getOverLimitDataByIds") HttpResult> getOverLimitData(@RequestBody List ids); + + @PostMapping("/list") + HttpResult> list(@RequestBody CsLinePO 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 a2835c3..3239954 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 @@ -104,6 +104,11 @@ public class CsLineClientFallbackFactory implements FallbackFactory> list(CsLinePO param) { + log.error("{}异常,降级处理,异常为:{}","查询监测点列表异常",cause.toString()); + throw new BusinessException(finalExceptionEnum); + } }; } } 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 499a607..60754d7 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 @@ -1,5 +1,6 @@ package com.njcn.csdevice.controller.line; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.enums.common.LogEnum; @@ -243,9 +244,12 @@ public class CslineController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/list") @ApiOperation("查询监测点列表") - public HttpResult> list() { + @ApiImplicitParam(name = "param", value = "param", required = true) + public HttpResult> list(@RequestBody CsLinePO param) { String methodDescribe = getMethodDescribe("list"); - List list = csLinePOService.list(new LambdaQueryWrapper().orderByAsc(CsLinePO::getName)); + List list = csLinePOService.list(new LambdaQueryWrapper() + .eq(StrUtil.isNotBlank(param.getPosition()), CsLinePO::getPosition, param.getPosition()) + .orderByAsc(CsLinePO::getName)); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); }