From bd8da139decc60e8c7765e375ffda037f5209e3a Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 18 五月 2022 14:32:13 +0800
Subject: [PATCH] 日志
---
dao/src/main/resources/mapper/PoleBindingMapper.xml | 2 +-
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java | 4 ++--
ximon-admin/src/main/java/com/sandu/ximon/admin/service/VnnoxService.java | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dao/src/main/resources/mapper/PoleBindingMapper.xml b/dao/src/main/resources/mapper/PoleBindingMapper.xml
index acab21a..d23236e 100644
--- a/dao/src/main/resources/mapper/PoleBindingMapper.xml
+++ b/dao/src/main/resources/mapper/PoleBindingMapper.xml
@@ -24,8 +24,8 @@
SELECT t2.*
FROM `pole_binding` t1
LEFT JOIN pole t2 ON t1.pole_id = t2.id
- WHERE t1.device_code = #{Mac}
<where>
+ t1.device_code = #{Mac}
<if test="type != null">
AND t1.device_type = #{type}
</if>
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java
index 4a5b213..ad35832 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java
@@ -230,8 +230,8 @@
* 鐔欐睕led缂栬緫鏃ュ織璁板綍寮�濮�
*/
List<String> listCode = new ArrayList<>();
- listCode.add(poleLightemit.getLightemitControlCode());
- String content = "{灞忓箷id锛�" + poleLightemit.getLightemitId() + "锛� 灞忓箷鍘熷悕锛�" + byId.getLightemitName() + "锛� 灞忓箷鍚嶇О锛�" + poleLightemit.getLightemitName() + "锛� 灞忓箷缂栫爜锛�" + poleLightemit.getLightemitControlCode() + " }";
+ listCode.add(byId.getLightemitControlCode());
+ String content = "{灞忓箷id锛�" + byId.getLightemitId() + "锛� 灞忓箷鍘熷悕锛�" + byId.getLightemitName() + "锛� 灞忓箷鍚嶇О锛�" + poleLightemit.getLightemitName() + "锛� 灞忓箷缂栫爜锛�" + byId.getLightemitControlCode() + " }";
StoreOperationRecordsUtils.storeOperationData(listCode, null, "鐔欐睕LED缂栬緫", content);
/**
* 鐔欐睕led缂栬緫鏃ュ織璁板綍缁撴潫
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/VnnoxService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/VnnoxService.java
index c798cd6..b0c7ce0 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/VnnoxService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/VnnoxService.java
@@ -234,8 +234,8 @@
* 璇虹摝璁惧缂栬緫 鏃ュ織璁板綍寮�濮�
*/
List<String> listCode = new ArrayList<>(1);
- listCode.add(led.getSn());
- String content = "{ 璁惧id:" + led.getId() + "璁惧code锛�" + led.getSn() + "璇虹摝playId:" + led.getPlayerId() + "璇虹摝璁惧鍘熷悕:" + byId.getName() + "璇虹摝璁惧鏇存敼鍚庣殑鍚嶇О:" + led.getName() + "}";
+ listCode.add(byId.getSn());
+ String content = "{ 璁惧id:" + led.getId() + "璁惧code锛�" + byId.getSn() + "璇虹摝playId:" + led.getPlayerId() + "璇虹摝璁惧鍘熷悕:" + byId.getName() + "璇虹摝璁惧鏇存敼鍚庣殑鍚嶇О:" + led.getName() + "}";
StoreOperationRecordsUtils.storeOperationData(listCode, null, "璇虹摝璁惧缂栬緫", content);
/**
--
Gitblit v1.9.3