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); }