From 59a2bb5e621a9d150328df8c8464dc40ab0af9e8 Mon Sep 17 00:00:00 2001 From: chendaofei <857448963@qq.com> Date: Fri, 15 Nov 2024 16:12:49 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E5=AF=B9=E5=A4=96=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/njcn/csdevice/api/WlRecordFeignClient.java | 3 +++ .../api/fallback/WlRecordClientFallbackFactory.java | 6 ++++++ .../controller/scheme/WlRecordController.java | 13 +++++++++++++ .../com/njcn/csdevice/mapper/WlRecordMapper.java | 2 ++ .../njcn/csdevice/mapper/mapping/WlRecordMapper.xml | 4 ++++ .../com/njcn/csdevice/service/IWlRecordService.java | 2 ++ .../csdevice/service/impl/WlRecordServiceImpl.java | 5 +++++ 7 files changed, 35 insertions(+) diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/WlRecordFeignClient.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/WlRecordFeignClient.java index bd4f26a..04ddce5 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/WlRecordFeignClient.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/WlRecordFeignClient.java @@ -47,4 +47,7 @@ public interface WlRecordFeignClient { @GetMapping("/dayDealNoEndTimeEvent") void dayDealNoEndTimeEvent(@RequestParam("date") String date); + + @GetMapping("/getWlAssByWlId") + HttpResult> getWlAssByWlId(@RequestParam("wlId")String wlId); } diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/WlRecordClientFallbackFactory.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/WlRecordClientFallbackFactory.java index c5c8c4a..7a7ee05 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/WlRecordClientFallbackFactory.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/WlRecordClientFallbackFactory.java @@ -57,6 +57,12 @@ public class WlRecordClientFallbackFactory implements FallbackFactory> getWlAssByWlId(String wlId) { + log.error("{}异常，降级处理，异常为：{}","根据测试项id获取测试项详细条目",cause.toString()); + throw new BusinessException(finalExceptionEnum); + } }; } } diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/scheme/WlRecordController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/scheme/WlRecordController.java index 657d979..5cc1831 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/scheme/WlRecordController.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/scheme/WlRecordController.java @@ -207,5 +207,18 @@ public class WlRecordController extends BaseController { String methodDescribe = getMethodDescribe("dayDealNoEndTimeEvent"); wlRecordService.dayDealNoEndTimeEvent(date); } + + /** + * 根据测试项获取测试项绑定测点数据 + */ + @OperateInfo(info = LogEnum.SYSTEM_COMMON) + @GetMapping("/getWlAssByWlId") + @ApiOperation("根据测试项获取测试项绑定测点数据") + public HttpResult> getWlAssByWlId(@RequestParam("wlId") String wlId) { + String methodDescribe = getMethodDescribe("getWlAssByWlId"); + List result = wlRecordService.getWlAssByWlId(wlId); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } + } diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/WlRecordMapper.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/WlRecordMapper.java index 24129f3..59402b3 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/WlRecordMapper.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/WlRecordMapper.java @@ -48,4 +48,6 @@ public interface WlRecordMapper extends BaseMapper { List getAll(); List getAllLine(@Param("devId") String devId); + + List getWlAssByWlId(String wlId); } diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/WlRecordMapper.xml b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/WlRecordMapper.xml index f168e39..140b8a3 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/WlRecordMapper.xml +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/WlRecordMapper.xml @@ -93,4 +93,8 @@ ) order by start_time + + \ No newline at end of file diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/IWlRecordService.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/IWlRecordService.java index fb72058..39fa01a 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/IWlRecordService.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/IWlRecordService.java @@ -108,4 +108,6 @@ public interface IWlRecordService extends IService { */ void dayDealNoEndTimeEvent(String date); + List getWlAssByWlId(String wlId); + } diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/WlRecordServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/WlRecordServiceImpl.java index 57e0f9c..abd5303 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/WlRecordServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/WlRecordServiceImpl.java @@ -615,6 +615,11 @@ public class WlRecordServiceImpl extends ServiceImpl i } + @Override + public List getWlAssByWlId(String wlId) { + return this.baseMapper.getDataRecordByTestId(wlId,0); + } + /** * 数据项内的时间进行覆盖:解决多个数据项的startTime及endTime之间存在时间冲突 * @param data 数据项