From 35d44dcc08272090d49ce2078ff734c3179e363d Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Fri, 1 Nov 2024 11:20:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96=201.?= =?UTF-8?q?=E5=85=AC=E5=85=B1=E6=96=B9=E6=B3=95=E6=8F=90=E5=8F=96=202.?= =?UTF-8?q?=E8=A3=85=E7=BD=AE=E7=B1=BB=E5=9E=8B=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/csdevice/api/EquipmentFeignClient.java | 3 +++ .../EquipmentFeignClientFallbackFactory.java | 6 ++++++ .../njcn/csdevice/enums/AlgorithmResponseEnum.java | 1 + .../equipment/EquipmentDeliveryController.java | 9 +++++++++ .../service/CsEquipmentDeliveryService.java | 5 +++++ .../impl/CsEquipmentDeliveryServiceImpl.java | 14 ++++++++++++++ 6 files changed, 38 insertions(+) diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/EquipmentFeignClient.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/EquipmentFeignClient.java index 1b574f2..6cbfb0b 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/EquipmentFeignClient.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/EquipmentFeignClient.java @@ -58,4 +58,7 @@ public interface EquipmentFeignClient { @PostMapping("/getAll") HttpResult> getAll(); + + @PostMapping("/judgeDevModel") + HttpResult judgeDevModel(@RequestParam("nDid") String nDid); } diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/EquipmentFeignClientFallbackFactory.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/EquipmentFeignClientFallbackFactory.java index 56736e3..fe80172 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/EquipmentFeignClientFallbackFactory.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/EquipmentFeignClientFallbackFactory.java @@ -77,6 +77,12 @@ public class EquipmentFeignClientFallbackFactory implements FallbackFactory judgeDevModel(String nDid) { + log.error("{}异常，降级处理，异常为：{}","判断设备型号",cause.toString()); + throw new BusinessException(finalExceptionEnum); + } }; } } diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/enums/AlgorithmResponseEnum.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/enums/AlgorithmResponseEnum.java index 3c44a8e..9c58129 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/enums/AlgorithmResponseEnum.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/enums/AlgorithmResponseEnum.java @@ -47,6 +47,7 @@ public enum AlgorithmResponseEnum { FILE_BUSY("A00516","正在进行其他文件操作,请稍后重试"), RECORD_FILE_LOST("A00516","record.bin文件缺失，请检查上传文件夹"), LINE_NUM_MISMATCH("A00516","上传文件的监测点序号和选择的监测点不匹配，请检查"), + DEV_OFFLINE("A00516","装置未连接MQTT服务器"), ; diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java index b5cd00f..361d1c5 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java @@ -306,4 +306,13 @@ public class EquipmentDeliveryController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); } + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/judgeDevModel") + @ApiOperation("判断设备型号") + public HttpResult judgeDevModel(@RequestParam("nDid") String nDid){ + String methodDescribe = getMethodDescribe("judgeDevModel"); + boolean result = csEquipmentDeliveryService.judgeDevModel(nDid); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } + } diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEquipmentDeliveryService.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEquipmentDeliveryService.java index 3ebfea2..fb38fc3 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEquipmentDeliveryService.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEquipmentDeliveryService.java @@ -128,4 +128,9 @@ public interface CsEquipmentDeliveryService extends IService getAll(); + + /** + * 判断设备型号 + */ + boolean judgeDevModel(String nDid); } diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java index 3446905..1d6eefe 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java @@ -39,6 +39,7 @@ import com.njcn.redis.utils.RedisUtil; import com.njcn.system.api.DicDataFeignClient; import com.njcn.system.api.DictTreeFeignClient; import com.njcn.system.enums.DicDataEnum; +import com.njcn.system.enums.DicTreeEnum; import com.njcn.system.pojo.vo.DictTreeVO; import com.njcn.web.factory.PageFactory; import com.njcn.web.utils.RequestUtil; @@ -664,6 +665,19 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl