From 61a9a99e4782ec5f1e999a976c270c77f9550ea1 Mon Sep 17 00:00:00 2001 From: xuyang <748613696@qq.com> Date: Tue, 5 Sep 2023 13:56:59 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=AE=9E=E4=BD=93=E8=B0=83=E6=95=B4=202.?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E8=A7=A3=E6=9E=90=E5=AF=B9=E5=A4=96=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../csdevice/api/CsDeviceUserFeignClient.java | 4 ++++ .../csdevice/api/EquipmentFeignClient.java | 9 ++++++++ .../CsDeviceUserClientFallbackFactory.java | 6 ++++++ .../EquipmentFeignClientFallbackFactory.java | 7 +++++++ .../pojo/po/CsEquipmentDeliveryPO.java | 8 +++---- .../equipment/DeviceUserController.java | 10 +++++++++ .../EquipmentDeliveryController.java | 11 ++++++++++ .../service/CsDeviceUserPOService.java | 7 +++++++ .../service/CsEquipmentDeliveryService.java | 7 +++++++ .../impl/CsDeviceUserPOServiceImpl.java | 21 +++++++++++-------- .../impl/CsEquipmentDeliveryServiceImpl.java | 5 +++++ .../njcn/csharmonic/pojo/po/CsEventPO.java | 20 +++++++----------- .../csharmonic/pojo/po/CsEventUserPO.java | 17 --------------- 13 files changed, 89 insertions(+), 43 deletions(-) diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/CsDeviceUserFeignClient.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/CsDeviceUserFeignClient.java index d8a4e6c..a3e310b 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/CsDeviceUserFeignClient.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/CsDeviceUserFeignClient.java @@ -7,6 +7,7 @@ import com.njcn.csdevice.pojo.po.CsDeviceUserPO; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; import java.util.List; @@ -18,4 +19,7 @@ public interface CsDeviceUserFeignClient { @PostMapping("/addList") HttpResult add(@RequestBody List list); + + @PostMapping("/findUserById") + HttpResult> findUserById(@RequestParam("id") String id); } 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 ec80c1d..9021996 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 @@ -4,6 +4,7 @@ import com.njcn.common.pojo.constant.ServerInfo; import com.njcn.common.pojo.response.HttpResult; import com.njcn.csdevice.api.fallback.EquipmentFeignClientFallbackFactory; import com.njcn.csdevice.pojo.dto.CsEquipmentDeliveryDTO; +import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO; import com.njcn.csdevice.pojo.vo.CsEquipmentDeliveryVO; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; @@ -27,4 +28,12 @@ public interface EquipmentFeignClient { @PostMapping("/updateSoftInfoBynDid") HttpResult updateSoftInfoBynDid(@RequestParam("nDId") String nDid, @RequestParam("id") String id, @RequestParam("module") Integer module); + + /** + * 根据nDid查询设备信息 + * @param nDid + * @return + */ + @PostMapping("/findDevByNDid") + HttpResult findDevByNDid(@RequestParam("nDid") String nDid); } diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/CsDeviceUserClientFallbackFactory.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/CsDeviceUserClientFallbackFactory.java index d061f73..f8718b6 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/CsDeviceUserClientFallbackFactory.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/CsDeviceUserClientFallbackFactory.java @@ -32,6 +32,12 @@ public class CsDeviceUserClientFallbackFactory implements FallbackFactory> findUserById(String id) { + log.error("{}异常，降级处理，异常为：{}","根据装置查询用户",cause.toString()); + throw new BusinessException(finalExceptionEnum); + } + }; } } 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 90be12f..45b1a5f 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 @@ -5,6 +5,7 @@ import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.pojo.response.HttpResult; import com.njcn.csdevice.api.EquipmentFeignClient; import com.njcn.csdevice.pojo.dto.CsEquipmentDeliveryDTO; +import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO; import com.njcn.csdevice.pojo.vo.CsEquipmentDeliveryVO; import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; @@ -52,6 +53,12 @@ public class EquipmentFeignClientFallbackFactory implements FallbackFactory findDevByNDid(String nDid) { + log.error("{}异常，降级处理，异常为：{}","通过nDid查询设备信息",cause.toString()); + throw new BusinessException(finalExceptionEnum); + } }; } } diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEquipmentDeliveryPO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEquipmentDeliveryPO.java index 3ad4bd9..7b38b41 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEquipmentDeliveryPO.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEquipmentDeliveryPO.java @@ -6,7 +6,7 @@ import com.njcn.db.bo.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; +import java.time.LocalDateTime; /** * @@ -88,19 +88,19 @@ public class CsEquipmentDeliveryPO extends BaseEntity { * 出厂日期 */ @TableField(value = "producte_time") - private Date producteTime; + private LocalDateTime producteTime; /** * 检修日期 */ @TableField(value = "check_time") - private Date checkTime; + private LocalDateTime checkTime; /** * 调试日期 */ @TableField(value = "debug_time") - private Date debugTime; + private LocalDateTime debugTime; /** * 合同号 diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/DeviceUserController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/DeviceUserController.java index ea2c210..43fa7d6 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/DeviceUserController.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/DeviceUserController.java @@ -130,4 +130,14 @@ public class DeviceUserController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, devUserVO, methodDescribe); } + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/findUserById") + @ApiOperation("根据设备Id查询用户集合") + @ApiImplicitParam(name = "id", value = "设备Id", required = true) + public HttpResult> findUserById(@RequestParam("id") String id){ + String methodDescribe = getMethodDescribe("findUserById"); + List list = csDeviceUserPOService.findUserById(id); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); + } + } 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 2cb71df..ca1b7ff 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 @@ -179,4 +179,15 @@ public class EquipmentDeliveryController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/findDevByNDid") + @ApiOperation("通过nDid查询设备信息") + @ApiImplicitParam(name = "nDid", value = "网关识别码", required = true) + public HttpResult findDevByNDid(@RequestParam("nDid")String nDid){ + String methodDescribe = getMethodDescribe("findDevByNDid"); + CsEquipmentDeliveryPO po = csEquipmentDeliveryService.findDevByNDid(nDid); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, po, methodDescribe); + } + + } diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsDeviceUserPOService.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsDeviceUserPOService.java index f731d73..31f890b 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsDeviceUserPOService.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsDeviceUserPOService.java @@ -41,4 +41,11 @@ public interface CsDeviceUserPOService extends IService{ Boolean recovery(String eid); DevUserVO queryUserById(String devId); + + /** + * 根据设备id查询用户集合(主用户和子用户) + * @param devId + * @return + */ + List findUserById(String devId); } 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 9acd585..af3f9dc 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 @@ -82,4 +82,11 @@ public interface CsEquipmentDeliveryService extends IService findUserById(String devId) { + List result = new ArrayList<>(); + List list = this.lambdaQuery().eq(CsDeviceUserPO::getDeviceId,devId).list(); + if (CollectionUtil.isNotEmpty(list)){ + result = list.stream().map(CsDeviceUserPO::getSubUserId).collect(Collectors.toList()); + } + return result; + } } 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 fe45a8d..aa1e2da 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 @@ -306,6 +306,11 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl