From cfb17d6e329f3cc7afe3018d6cc8784ebafd5965 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 14 九月 2022 16:08:57 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentNongGengService.java | 45 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 42 insertions(+), 3 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentNongGengService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentNongGengService.java
index 6c6d1d2..d361a03 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentNongGengService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentNongGengService.java
@@ -8,15 +8,14 @@
import com.sandu.ximon.admin.manager.iot.rrpc.enums.AtmoFunctionCode;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.RedisUtils;
-import com.sandu.ximon.dao.bo.AirEquipmentBo;
+import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.dao.bo.AirEquipmentNongGengBo;
-import com.sandu.ximon.dao.domain.AirEquipment;
import com.sandu.ximon.dao.domain.AirEquipmentNongGeng;
-import com.sandu.ximon.dao.mapper.AirEquipmentMapper;
import com.sandu.ximon.dao.mapper.AirEquipmentNongGengMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -37,7 +36,20 @@
public void addAirEquipment(AirEquipmentNongGeng airEquipmentNongGeng) {
AirEquipmentNongGeng one = getOne(Wrappers.lambdaQuery(AirEquipmentNongGeng.class).eq(AirEquipmentNongGeng::getMac, airEquipmentNongGeng.getMac()));
if (one == null) {
+ //TODO
save(airEquipmentNongGeng);
+ /**
+ * 娣诲姞鍐滆�曞ぇ姘旇澶� 鏃ュ織璁板綍寮�濮�
+ */
+ List<String> listCode = new ArrayList<>(1);
+ listCode.add(airEquipmentNongGeng.getMac());
+ String content = "{ 璁惧id:" + airEquipmentNongGeng.getId() + "璁惧code锛�" + airEquipmentNongGeng.getMac() +
+ "}";
+
+ StoreOperationRecordsUtils.storeOperationData(listCode, null, "娣诲姞鍐滆�曞ぇ姘旇澶�", content);
+ /**
+ * 娣诲姞鍐滆�曞ぇ姘旇澶� 鏃ュ織璁板綍缁撴潫
+ */
}
}
@@ -59,6 +71,20 @@
}
/**
+ * 澶ф皵璁惧鍒楄〃锛堝啘鑰曪紝鐢ㄤ簬棣栭〉鏁版嵁缁熻锛�
+ */
+ public List<AirEquipmentNongGengBo> listAirEquipmentOnHome() {
+ List<AirEquipmentNongGengBo> airEquipmentBos;
+ if (SecurityUtils.getClientId() == null) {
+ airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(null, null);
+ } else {
+ airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(null, SecurityUtils.getUserId());
+ }
+
+ return airEquipmentBos;
+ }
+
+ /**
* 鍒犻櫎澶ф皵璁惧鏁版嵁
*
* @param Id
@@ -69,6 +95,19 @@
if (airEquipmentNongGeng == null) {
throw new BusinessException("鎵句笉鍒板ぇ姘旇澶囨暟鎹�");
}
+
+ /**
+ * 鍒犻櫎鍐滆�曞ぇ姘旇澶� 鏃ュ織璁板綍寮�濮�
+ */
+ List<String> listCode = new ArrayList<>(1);
+ listCode.add(airEquipmentNongGeng.getMac());
+ String content = "{ 璁惧id:" + airEquipmentNongGeng.getId() + "璁惧code锛�" + airEquipmentNongGeng.getMac() +
+ "}";
+
+ StoreOperationRecordsUtils.storeOperationData(listCode, null, "鍒犻櫎鍐滆�曞ぇ姘旇澶�", content);
+ /**
+ * 鍒犻櫎鍐滆�曞ぇ姘旇澶� 鏃ュ織璁板綍缁撴潫
+ */
return removeById(Id);
}
--
Gitblit v1.9.3