From 8b4c0b2fbbad5dfedeaf1c295088d6df243d2cd0 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期一, 16 五月 2022 17:14:13 +0800
Subject: [PATCH] 日志
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
index ad0012e..33091ae 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
@@ -15,7 +15,6 @@
import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.dto.DeviceStatus;
import com.sandu.ximon.admin.dto.WaterQualityDataDto;
-import com.sandu.ximon.admin.entity.Command;
import com.sandu.ximon.admin.manager.iot.frame.A1Frame;
import com.sandu.ximon.admin.manager.iot.frame.FrameBuilder;
import com.sandu.ximon.admin.manager.iot.frame.IRequestFrame;
@@ -35,6 +34,7 @@
import com.sandu.ximon.admin.utils.LightemitUtils;
import com.sandu.ximon.admin.utils.ListPagingUtils;
import com.sandu.ximon.admin.utils.RedisUtils;
+import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.admin.utils.response.VnnoxResult;
import com.sandu.ximon.admin.vo.PoleBindVO;
import com.sandu.ximon.dao.bo.*;
@@ -70,7 +70,18 @@
BeanUtils.copyProperties(param, pole);
pole.setPoleCode(generatePoleCode());
pole.setDeviceType(-1);
- return save(pole);
+ boolean save = save(pole);
+
+ /**
+ * 鏂板铏氭嫙鐏潌鏃ュ織璁板綍寮�濮�
+ */
+ String content = "{鐏潌ID锛�" + pole.getId()
+ + "锛� 鐏潌鍚嶏細" + param.getPoleName() + "}";
+ StoreOperationRecordsUtils.storeOperationData(null, null, "鏂板铏氭嫙鐏潌", content);
+ /**
+ * 鏂板铏氭嫙鐏潌鏃ュ織璁板綍缁撴潫
+ */
+ return save;
}
public boolean updatePole(Long poleId, PoleParam param) {
@@ -88,6 +99,14 @@
Pole update = new Pole();
BeanUtils.copyProperties(param, update);
update.setId(poleId);
+ /**
+ * 淇敼鐏潌鏃ュ織璁板綍寮�濮�
+ */
+ String content = "缂栬緫鐏潌锛�" + poleId;
+ StoreOperationRecordsUtils.storeOperationData(null, null, "缂栬緫鐏潌", content);
+ /**
+ * 淇敼鐏潌鏃ュ織璁板綍缁撴潫
+ */
return updateById(update);
}
@@ -101,6 +120,16 @@
}
// 鍒犻櫎鐏潌缁戝畾鍏崇郴
poleBindingService.remove(Wrappers.<PoleBinding>lambdaQuery().eq(PoleBinding::getPoleId, poleId));
+
+ /**
+ * 鍒犻櫎鐏潌鏃ュ織璁板綍寮�濮�
+ */
+ String content = "{鐏潌Code锛�" + pole.getDeviceCode() + "锛� 鐏潌鍚嶇О锛�" + pole.getPoleName() + " }";
+
+ StoreOperationRecordsUtils.storeOperationData(null, null, "鍒犻櫎鐏潌", content);
+ /**
+ * 鍒犻櫎鐏潌鏃ュ織璁板綍缁撴潫
+ */
return removeById(poleId);
}
@@ -255,7 +284,7 @@
//鐔欒
List<PoleLightemitEntity> poleLightemitEntities = SpringContextHolder.getBean(PoleLightemitService.class).listLed(null, false);
- List<PoleLightemitEntity> poleLightemitEntityOnlineList = SpringContextHolder.getBean(PoleLightemitService.class).ledOnline(poleLightemitEntities);
+ List<PoleLightemitEntity> poleLightemitEntityOnlineList = SpringContextHolder.getBean(PoleLightemitService.class).listLed(null, true);
result.put("XiXunOnlineCount", poleLightemitEntityOnlineList.size());
result.put("XiXunTotalCount", poleLightemitEntities.size());
--
Gitblit v1.9.3