From d9765e031e100e1d8eea34e086cb9c81766e1a00 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期五, 21 二月 2025 09:52:14 +0800 Subject: [PATCH] 针对王江海制定的协议: 1、优化相关注释; 2、优化代码; 3、协议中报警信息有变化:外门报警改为电池电压报警、增加阀门开关状态、增加阀门堵转报警等。 --- pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerCtrl.java | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerCtrl.java index 9e38b46..d252cd4 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerCtrl.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerCtrl.java @@ -102,6 +102,7 @@ prController.setIntakeId(intakeId); prController.setRtuAddr(prControllerTramp.getRtuAddr()); prController.setProtocol(prControllerTramp.getProtocol()); + prController.setProtocolVersion(prControllerTramp.getProtocolVersion()); prController.setFindDt(prControllerTramp.getFindDt()); prController.setOrgTag(prControllerTramp.getOrgTag()); prController.setAddWays((byte) 1); @@ -322,7 +323,7 @@ * @param id * @return */ - @PostMapping("deleteTrampController") + @GetMapping("deleteTrampController") @Transactional(rollbackFor = Exception.class) @SsoAop() public BaseResponse<Boolean> deleteTrampController(Long id) { @@ -332,9 +333,9 @@ } Integer rows = intakeControllerSv.deleteTrampController(id); - if (rows == 0) { - return BaseResponseUtils.buildErrorMsg(ProjectResultCode.DELETE_TRAMP_CONTROLLER_FAIL.getMessage()); - } +// if (rows == 0) { +// return BaseResponseUtils.buildErrorMsg(ProjectResultCode.DELETE_TRAMP_CONTROLLER_FAIL.getMessage()); +// } return BaseResponseUtils.buildSuccess(true); } -- Gitblit v1.8.0