From 7413518e646b9e924ec7e305b282fcb88fc82c1d Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期六, 04 三月 2023 09:45:10 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/SiteController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index 78e8d0f..941bc9f 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -15,6 +15,7 @@
import com.zy.common.model.enums.WrkChargeType;
import com.zy.common.service.CommonService;
import com.zy.core.DevpThread;
+import com.zy.core.News;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
@@ -62,8 +63,8 @@
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
Map<String, Object> map1 = new HashMap<>();
map1.put("floor", 1);
- map1.put("modeVal", devpThread.charge0);
- map1.put("modeDesc", devpThread.charge0?"鍏呯數涓�":"鍏抽棴");
+ map1.put("modeVal", !devpThread.charge0);
+ map1.put("modeDesc", !devpThread.charge0?"鍏呯數涓�":"鍏抽棴");
res.add(map1);
Map<String, Object> map2 = new HashMap<>();
map2.put("floor", 2);
@@ -121,7 +122,7 @@
wrkCharge.setMemo("reset");
wrkCharge.setAppeTime(new Date());
if (!wrkChargeService.insert(wrkCharge)) {
- log.error("淇濆瓨{}鍙风┛姊溅澶嶄綅浠诲姟澶辫触!!!", steNo);
+ News.error("淇濆瓨{}鍙风┛姊溅澶嶄綅浠诲姟澶辫触!!!", steNo);
}
}
return R.ok(steNo + "鍙峰皬杞﹀噯澶囩寮�" + floor + "鍙峰厖鐢垫々");
--
Gitblit v1.9.1