From 728a03afde61c0f2cd7f6974937c12ac4d332677 Mon Sep 17 00:00:00 2001 From: xuyang <748613696@qq.com> Date: Tue, 18 Apr 2023 11:42:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/njcn/algorithm/api/DevModelFeignClient.java | 3 ++- .../njcn/algorithm/api/EquipmentFeignClient.java | 3 +++ .../DevModelFeignClientFallbackFactory.java | 3 ++- .../EquipmentFeignClientFallbackFactory.java | 7 +++++++ .../controller/Equipment/DevModelController.java | 6 +++--- .../Equipment/EquipmentDeliveryController.java | 13 +++++++++++++ .../njcn/algorithm/service/CsDevModelService.java | 4 ++-- .../service/CsEquipmentDeliveryService.java | 6 ++++++ .../service/impl/CsDevModelServiceImpl.java | 7 +++---- .../impl/CsEquipmentDeliveryServiceImpl.java | 9 +++++++++ 10 files changed, 50 insertions(+), 11 deletions(-) diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/api/DevModelFeignClient.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/api/DevModelFeignClient.java index 12d2496f6..f9fd325d3 100644 --- a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/api/DevModelFeignClient.java +++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/api/DevModelFeignClient.java @@ -3,6 +3,7 @@ package com.njcn.algorithm.api; import com.njcn.algorithm.api.fallback.DevModelFeignClientFallbackFactory; import com.njcn.algorithm.pojo.param.CsDevModelAddParm; import com.njcn.algorithm.pojo.param.CsDevModelQueryListParm; +import com.njcn.algorithm.pojo.po.CsDevModelPO; import com.njcn.algorithm.pojo.vo.CsDevModelPageVO; import com.njcn.common.pojo.constant.ServerInfo; import com.njcn.common.pojo.response.HttpResult; @@ -19,7 +20,7 @@ import org.springframework.web.bind.annotation.RequestBody; public interface DevModelFeignClient { @PostMapping("/addDevModel") - HttpResult addDevModel(@RequestBody @Validated CsDevModelAddParm csDevModelAddParm); + HttpResult addDevModel(@RequestBody @Validated CsDevModelAddParm csDevModelAddParm); @PostMapping("/queryDevModelOne") HttpResult queryDevModelOne(@RequestBody CsDevModelQueryListParm csDevModelQueryListParm); diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/api/EquipmentFeignClient.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/api/EquipmentFeignClient.java index 61f192864..d69fec602 100644 --- a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/api/EquipmentFeignClient.java +++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/api/EquipmentFeignClient.java @@ -18,4 +18,7 @@ public interface EquipmentFeignClient { @PostMapping("/queryEquipmentByndid") HttpResult queryEquipmentByndid(@RequestParam("ndid") String ndid); + @PostMapping("/updateStatusBynDid") + HttpResult updateStatusBynDid(@RequestParam("nDId") String nDid,@RequestParam("status") Integer status); + } diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/api/fallback/DevModelFeignClientFallbackFactory.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/api/fallback/DevModelFeignClientFallbackFactory.java index d3e24b9c1..a688fed43 100644 --- a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/api/fallback/DevModelFeignClientFallbackFactory.java +++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/api/fallback/DevModelFeignClientFallbackFactory.java @@ -3,6 +3,7 @@ package com.njcn.algorithm.api.fallback; import com.njcn.algorithm.api.DevModelFeignClient; import com.njcn.algorithm.pojo.param.CsDevModelAddParm; import com.njcn.algorithm.pojo.param.CsDevModelQueryListParm; +import com.njcn.algorithm.pojo.po.CsDevModelPO; import com.njcn.algorithm.pojo.vo.CsDevModelPageVO; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.exception.BusinessException; @@ -35,7 +36,7 @@ public class DevModelFeignClientFallbackFactory implements FallbackFactory addDevModel(CsDevModelAddParm csDevModelAddParm) { + public HttpResult addDevModel(CsDevModelAddParm csDevModelAddParm) { log.error("{}异常，降级处理，异常为：{}","新增装置模板版本信息",cause.toString()); throw new BusinessException(finalExceptionEnum); } diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/api/fallback/EquipmentFeignClientFallbackFactory.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/api/fallback/EquipmentFeignClientFallbackFactory.java index d204e56fc..52a5fdb99 100644 --- a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/api/fallback/EquipmentFeignClientFallbackFactory.java +++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/api/fallback/EquipmentFeignClientFallbackFactory.java @@ -8,6 +8,7 @@ import com.njcn.common.pojo.response.HttpResult; import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; +import org.springframework.web.bind.annotation.RequestParam; /** * @author xy @@ -31,6 +32,12 @@ public class EquipmentFeignClientFallbackFactory implements FallbackFactory updateStatusBynDid(String nDid, Integer status) { + log.error("{}异常，降级处理，异常为：{}","通过ndid修改装置的状态",cause.toString()); + throw new BusinessException(finalExceptionEnum); + } }; } } diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/Equipment/DevModelController.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/Equipment/DevModelController.java index a68f57fb5..f3e2725f0 100644 --- a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/Equipment/DevModelController.java +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/Equipment/DevModelController.java @@ -5,6 +5,7 @@ import com.njcn.algorithm.pojo.param.CsDevModelAddParm; import com.njcn.algorithm.pojo.param.CsDevModelAuditParm; import com.njcn.algorithm.pojo.param.CsDevModelQueryListParm; import com.njcn.algorithm.pojo.param.CsDevModelQueryParm; +import com.njcn.algorithm.pojo.po.CsDevModelPO; import com.njcn.algorithm.pojo.vo.CsDevModelPageVO; import com.njcn.algorithm.service.CsDevModelService; import com.njcn.common.pojo.annotation.OperateInfo; @@ -45,10 +46,9 @@ public class DevModelController extends BaseController { @PostMapping("/addDevModel") @ApiOperation("新增设备模板") @ApiImplicitParam(name = "csDevModelAddParm", value = "新增设备模板参数", required = true) - public HttpResult addDevModel(@RequestBody @Validated CsDevModelAddParm csDevModelAddParm){ + public HttpResult addDevModel(@RequestBody @Validated CsDevModelAddParm csDevModelAddParm){ String methodDescribe = getMethodDescribe("addDevModel"); - - Boolean flag = csDevModelService.addDevModel (csDevModelAddParm); + CsDevModelPO flag = csDevModelService.addDevModel (csDevModelAddParm); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe); } diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/Equipment/EquipmentDeliveryController.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/Equipment/EquipmentDeliveryController.java index 9d816f355..3258486f1 100644 --- a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/Equipment/EquipmentDeliveryController.java +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/Equipment/EquipmentDeliveryController.java @@ -15,6 +15,7 @@ import com.njcn.common.utils.HttpResultUtil; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -95,6 +96,18 @@ public class EquipmentDeliveryController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, projectEquipmentVOS, methodDescribe); } + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/updateStatusBynDid") + @ApiOperation("根据网关id调整设备状态") + @ApiImplicitParams({ + @ApiImplicitParam(name = "nDId", value = "网关id", required = true), + @ApiImplicitParam(name = "status", value = "状态", required = true) + }) + public HttpResult updateStatusBynDid(@RequestParam("nDId") String nDid,@RequestParam("status") Integer status){ + String methodDescribe = getMethodDescribe("updateStatusBynDid"); + csEquipmentDeliveryService.updateStatusBynDid(nDid,status); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); + } } diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/CsDevModelService.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/CsDevModelService.java index e938b4481..54e158556 100644 --- a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/CsDevModelService.java +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/CsDevModelService.java @@ -26,8 +26,8 @@ public interface CsDevModelService extends IService{ * @return: java.lang.Boolean * @Author: clam * @Date: 2023/4/10 - */ - Boolean addDevModel(CsDevModelAddParm csDevModelAddParm); + */ + CsDevModelPO addDevModel(CsDevModelAddParm csDevModelAddParm); /** * @Description: AuditDevModel * @Param: [csDevModelAuditParm] diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/CsEquipmentDeliveryService.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/CsEquipmentDeliveryService.java index 1e7e7e54c..dce9a4973 100644 --- a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/CsEquipmentDeliveryService.java +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/CsEquipmentDeliveryService.java @@ -54,4 +54,10 @@ public interface CsEquipmentDeliveryService extends IService queryEquipmentByProject(ProjectEquipmentQueryParm projectEquipmentQueryParm); Boolean updateEquipmentDelivery(CsEquipmentDeliveryAuditParm csEquipmentDeliveryAuditParm); + + /** + * 根据网关id修改装置的状态 + * @param nDid 网关id + */ + void updateStatusBynDid(String nDid,Integer status); } diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/CsDevModelServiceImpl.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/CsDevModelServiceImpl.java index b77bf3a1e..7c949fbcf 100644 --- a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/CsDevModelServiceImpl.java +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/CsDevModelServiceImpl.java @@ -29,13 +29,12 @@ public class CsDevModelServiceImpl extends ServiceImpl lambdaUpdateWrapper = new LambdaUpdateWrapper<>(); + lambdaUpdateWrapper.set(CsEquipmentDeliveryPO::getStatus,status).eq(CsEquipmentDeliveryPO::getNdid,nDId); + this.update(lambdaUpdateWrapper); + } + }