From 91f6317d381bb399d31781c59cb4d21194d36517 Mon Sep 17 00:00:00 2001 From: Administrator <zhubaomin> Date: 星期四, 20 六月 2024 17:45:51 +0800 Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV --- pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtu/RtuCtrl.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtu/RtuCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtu/RtuCtrl.java index 5afe421..86cc3c9 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtu/RtuCtrl.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtu/RtuCtrl.java @@ -75,7 +75,7 @@ // 鍙栨按鍙D鎹㈤榾鎺у櫒鍦板潃鍙婇�氳鍗忚 JSONObject job_rtu = getRtu(intakeId, null); if(job_rtu == null) { - return BaseResponseUtils.buildError(RemoteResultCode.RTU_NOT_EXIST.getMessage()); + return BaseResponseUtils.buildErrorMsg(RemoteResultCode.RTU_NOT_EXIST.getMessage()); } String rtuAddr = job_rtu.getString("rtuAddr"); String protocol = job_rtu.getString("protocol"); @@ -184,7 +184,7 @@ // 鍙栨按鍙D鎹㈤榾鎺у櫒鍦板潃鍙婇�氳鍗忚 //PrController prController = commandSv.getControllerByIntakeId(intakeId); //if(prController == null) { - // return BaseResponseUtils.buildError(RemoteResultCode.RTU_NOT_EXIST.getMessage()); + // return BaseResponseUtils.buildErrorMsg(RemoteResultCode.RTU_NOT_EXIST.getMessage()); //} //String rtuAddr = prController.getRtuAddr(); //String protocol = prController.getProtocol(); -- Gitblit v1.8.0