From 45fd613e4755f72be42aed683a47c197d79cc45e Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Wed, 8 Apr 2026 10:19:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/csdevice/api/EquipmentFeignClient.java | 3 --- .../EquipmentFeignClientFallbackFactory.java | 6 ------ .../equipment/EquipmentDeliveryController.java | 14 -------------- .../service/CsEquipmentDeliveryService.java | 3 --- .../impl/CsEquipmentDeliveryServiceImpl.java | 14 -------------- .../service/impl/CsAppReportServiceImpl.java | 9 +++++++-- 6 files changed, 7 insertions(+), 42 deletions(-) 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 7404d56..5726148 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 @@ -51,9 +51,6 @@ public interface EquipmentFeignClient { @PostMapping("/updateModuleNumber") HttpResult updateModuleNumber(@RequestParam("nDid") String nDid,@RequestParam("number") Integer number); - @PostMapping("/updateLedger") - HttpResult updateLedger(@RequestParam("nDid") String nDid,@RequestParam("engineeringId") String engineeringId,@RequestParam("projectId") String projectId); - @PostMapping("/getAll") HttpResult> getAll(); 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 5a7d9d5..ce06ffc 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 @@ -72,12 +72,6 @@ public class EquipmentFeignClientFallbackFactory implements FallbackFactory updateLedger(String nDid, String engineeringId, String projectId) { - log.error("{}异常，降级处理，异常为：{}","更新设备预设工程和项目id数据异常",cause.toString()); - throw new BusinessException(finalExceptionEnum); - } - @Override public HttpResult> getAll() { log.error("{}异常，降级处理，异常为：{}","获取所有装置",cause.toString()); 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 1afe3f1..a927afc 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 @@ -303,20 +303,6 @@ public class EquipmentDeliveryController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } - @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @PostMapping("/updateLedger") - @ApiOperation("更新设备预设工程和项目id") - @ApiImplicitParams({ - @ApiImplicitParam(name = "nDid", value = "网络设备码", required = true), - @ApiImplicitParam(name = "engineeringId", value = "工程id", required = true), - @ApiImplicitParam(name = "projectId", value = "项目id", required = true) - }) - public HttpResult updateLedger(@RequestParam("nDid") String nDid,@RequestParam("engineeringId") String engineeringId,@RequestParam("projectId") String projectId){ - String methodDescribe = getMethodDescribe("updateLedger"); - csEquipmentDeliveryService.updateLedger(nDid,engineeringId,projectId); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); - } - @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/rebootDevice") @ApiOperation("重启设备") 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 4eaa1bb..0d3b88a 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 @@ -11,7 +11,6 @@ import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO; import com.njcn.csdevice.pojo.vo.CsEquipmentDeliveryVO; import com.njcn.csdevice.pojo.vo.DeviceManagerVO; import com.njcn.csdevice.pojo.vo.ProjectEquipmentVO; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; @@ -122,8 +121,6 @@ public interface CsEquipmentDeliveryService extends IService lambdaUpdateWrapper = new LambdaUpdateWrapper<>(); - lambdaUpdateWrapper.eq(CsEquipmentDeliveryPO::getNdid,nDid) - .ne(CsEquipmentDeliveryPO::getRunStatus,0) - .set(CsEquipmentDeliveryPO::getAssociatedEngineering,engineeringId) - .set(CsEquipmentDeliveryPO::getAssociatedProject,projectId); - result = this.update(lambdaUpdateWrapper); - if (result) { - refreshDeviceDataCache(); - } - } - @Override public boolean rebootDevice(String nDid) { boolean result = false; diff --git a/cs-report/cs-report-boot/src/main/java/com/njcn/csreport/service/impl/CsAppReportServiceImpl.java b/cs-report/cs-report-boot/src/main/java/com/njcn/csreport/service/impl/CsAppReportServiceImpl.java index 7d13f3f..41e96c1 100644 --- a/cs-report/cs-report-boot/src/main/java/com/njcn/csreport/service/impl/CsAppReportServiceImpl.java +++ b/cs-report/cs-report-boot/src/main/java/com/njcn/csreport/service/impl/CsAppReportServiceImpl.java @@ -221,8 +221,13 @@ public class CsAppReportServiceImpl extends ServiceImpl