From dda268997ca8f8a364f7c19b45d7a43a50a98efe Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 25 十月 2022 18:00:11 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityEquipmentService.java | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityEquipmentService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityEquipmentService.java
index 9667ea6..31bb0d9 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityEquipmentService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityEquipmentService.java
@@ -9,6 +9,7 @@
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.dto.WaterQualityDataDto;
import com.sandu.ximon.admin.security.SecurityUtils;
+import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.admin.vo.EquipmentInfomation;
import com.sandu.ximon.dao.bo.WaterQualityEquipmentBo;
import com.sandu.ximon.dao.domain.WaterQualityEquipment;
@@ -16,6 +17,7 @@
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.List;
@Service
@@ -65,6 +67,18 @@
//鍒犻櫎鎽勬按璐ㄨ澶囧墠闇�瑕佸厛瑙ｇ粦
poleBindingService.unBindPole(null, waterQualityEquipment.getWaterQualityEquipmentCode());
+ /**
+ * 鍒犻櫎姘磋川璁惧 鏃ュ織璁板綍寮�濮�
+ */
+ List<String> listCode = new ArrayList<>(1);
+ listCode.add(waterQualityEquipment.getWaterQualityEquipmentCode());
+ String content = "{ 璁惧id:" + waterQualityEquipment.getId() + "璁惧code锛�" + waterQualityEquipment.getWaterQualityEquipmentCode() +
+ "}";
+
+ StoreOperationRecordsUtils.storeOperationData(listCode, null, "鍒犻櫎姘磋川璁惧", content);
+ /**
+ * 鍒犻櫎姘磋川璁惧 鏃ュ織璁板綍缁撴潫
+ */
return removeById(Id);
}
@@ -84,7 +98,20 @@
if (one == null) {
WaterQualityEquipment result = new WaterQualityEquipment();
result.setWaterQualityEquipmentCode(waterQualityEquipment.getWaterQualityEquipmentCode());
- return save(result);
+ boolean save = save(result);
+ /**
+ * 娣诲姞姘磋川璁惧 鏃ュ織璁板綍寮�濮�
+ */
+ List<String> listCode = new ArrayList<>(1);
+ listCode.add(waterQualityEquipment.getWaterQualityEquipmentCode());
+ String content = "{ 璁惧id:" + waterQualityEquipment.getId() + "璁惧code锛�" + waterQualityEquipment.getWaterQualityEquipmentCode() +
+ "}";
+
+ StoreOperationRecordsUtils.storeOperationData(listCode, null, "娣诲姞姘磋川璁惧", content);
+ /**
+ * 娣诲姞姘磋川璁惧 鏃ュ織璁板綍缁撴潫
+ */
+ return save;
} else {
throw new BusinessException("璇ユ按璐ㄨ澶囧凡瀛樺湪锛�");
}
@@ -109,8 +136,11 @@
try {
String s = HttpUtil.get(WATER_QUALITY_DATA_URL + waterQualityEquipmentCode + ".json");
- System.out.println(s);
-
+ System.out.println(waterQualityEquipmentCode + "-------------------------------" + s);
+ if (!s.startsWith("{")) {
+ equipmentInfo.setEquipmentState("鏈煡");
+ return equipmentInfo;
+ }
WaterQualityDataDto waterQualityDataDto = JSON.parseObject(s, WaterQualityDataDto.class);
//璁剧疆姘磋川璁惧鐘舵��
if (waterQualityDataDto != null) {
--
Gitblit v1.9.3