From 3004cc4dbee1216a73277da7fbf9e519735e7587 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 16 一月 2024 15:18:47 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerCtrl.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerCtrl.java
index 4f15979..0eab6fc 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerCtrl.java
@@ -95,9 +95,9 @@
})
@GetMapping(path = "controller_list")
@SsoAop()
- public BaseResponse<List<Map<String, Object>>> getControllersByCode(String controllerCode){
+ public BaseResponse<List<Map<String, Object>>> getControllersByCode(String rtuAddr){
try {
- List<Map<String, Object>> list = Optional.ofNullable(controllerSv.getControllersByCode(controllerCode)).orElse(new ArrayList<>());
+ List<Map<String, Object>> list = Optional.ofNullable(controllerSv.getControllersByAddr(rtuAddr)).orElse(new ArrayList<>());
if(list.size() <= 0) {
return BaseResponseUtils.buildFail(ProjectResultCode.NO_RECORDS.getMessage());
}
@@ -135,7 +135,6 @@
Date operateTime = new Date();
prController.setOperatedt(operateTime);
prController.setDeleted((byte)0);
- prController.setOnlinestate((byte)2);
prController.setReporttime(operateTime);
Integer rec = Optional.ofNullable(controllerSv.addController(prController)).orElse(0);
if(rec == 0) {
--
Gitblit v1.8.0