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 | 104 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 87 insertions(+), 17 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 a8ba748..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
@@ -1,29 +1,30 @@
package com.sandu.ximon.admin.service;
-import cn.hutool.core.collection.CollUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
-import com.sandu.ximon.admin.param.WaterQualityEquipmentParam;
+import com.sandu.ximon.admin.dto.WaterQualityDataDto;
import com.sandu.ximon.admin.security.SecurityUtils;
-import com.sandu.ximon.dao.bo.AirEquipmentBo;
+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.AirEquipment;
-import com.sandu.ximon.dao.domain.Monitor;
import com.sandu.ximon.dao.domain.WaterQualityEquipment;
-import com.sandu.ximon.dao.mapper.AirEquipmentMapper;
import com.sandu.ximon.dao.mapper.WaterQualityEquipmentMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.List;
@Service
@AllArgsConstructor
public class WaterQualityEquipmentService extends BaseServiceImpl<WaterQualityEquipmentMapper, WaterQualityEquipment> {
+ //姘磋川鍙傛暟鑾峰彇缃戝潃锛屼緥濡傦細"http://iot.ainongye.cn/json/璁惧缂栧彿.json"
+ private final String WATER_QUALITY_DATA_URL = "http://iot.ainongye.cn/json/";
private WaterQualityEquipmentMapper waterQualityEquipmentMapper;
private final PoleBindingService poleBindingService;
@@ -38,13 +39,17 @@
* 妯＄硦鏌ヨ
*/
public List<WaterQualityEquipmentBo> listWaterQualityEquipmentByKeyword(BaseConditionVO baseConditionVO, String keyword) {
- Long clientId = SecurityUtils.getClientId();
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
- List<Long> listAirEquipmentId = waterQualityEquipmentMapper.WaterQualityEquipmentId(keyword, clientId);
- if (CollUtil.isEmpty(listAirEquipmentId)) {
- return CollUtil.newArrayList();
+ Long userId = SecurityUtils.getUserId();
+ if (baseConditionVO != null) {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
}
- List<WaterQualityEquipmentBo> waterQualityEquipmentBoList = waterQualityEquipmentMapper.listWaterQualityEquipmentByIds(listAirEquipmentId);
+ List<WaterQualityEquipmentBo> waterQualityEquipmentBoList;
+ //涓虹┖鏄秴绠�
+ if (SecurityUtils.getClientId() == null) {
+ waterQualityEquipmentBoList = waterQualityEquipmentMapper.listWaterQualityEquipmentByIds(keyword, null);
+ } else {
+ waterQualityEquipmentBoList = waterQualityEquipmentMapper.listWaterQualityEquipmentByIds(keyword, userId);
+ }
return waterQualityEquipmentBoList;
}
@@ -60,8 +65,20 @@
throw new BusinessException("鎵句笉鍒版按璐ㄨ澶�");
}
//鍒犻櫎鎽勬按璐ㄨ澶囧墠闇�瑕佸厛瑙ｇ粦
- poleBindingService.unBindPole(waterQualityEquipment.getWaterQualityEquipmentCode());
+ 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);
}
@@ -79,10 +96,63 @@
WaterQualityEquipment one = getOne(Wrappers.lambdaQuery(WaterQualityEquipment.class).eq(WaterQualityEquipment::getWaterQualityEquipmentCode,
waterQualityEquipment.getWaterQualityEquipmentCode()));
if (one == null) {
- return save(waterQualityEquipment);
+ WaterQualityEquipment result = new WaterQualityEquipment();
+ result.setWaterQualityEquipmentCode(waterQualityEquipment.getWaterQualityEquipmentCode());
+ 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 {
- waterQualityEquipment.setId(one.getId());
- return updateById(waterQualityEquipment);
+ throw new BusinessException("璇ユ按璐ㄨ澶囧凡瀛樺湪锛�");
}
}
+
+ /**
+ * 棣栭〉鐏潌缁戝畾淇℃伅
+ */
+ public EquipmentInfomation getWaterQualityDataInfo(String waterQualityEquipmentCode) {
+ EquipmentInfomation equipmentInfo = new EquipmentInfomation();
+ equipmentInfo.setEquipmentType("姘磋川璁惧");
+ if (waterQualityEquipmentCode == null || waterQualityEquipmentCode.trim().length() == 0) {
+ return equipmentInfo;
+ }
+
+ WaterQualityEquipment one = getOne(Wrappers.lambdaQuery(WaterQualityEquipment.class).eq(WaterQualityEquipment::getWaterQualityEquipmentCode,
+ waterQualityEquipmentCode));
+ if (one != null) {
+ equipmentInfo.setEquipmentCreateTime(one.getCreateTime());
+ equipmentInfo.setEquipmentMac(one.getWaterQualityEquipmentCode());
+ }
+
+ try {
+ String s = HttpUtil.get(WATER_QUALITY_DATA_URL + waterQualityEquipmentCode + ".json");
+ System.out.println(waterQualityEquipmentCode + "-------------------------------" + s);
+ if (!s.startsWith("{")) {
+ equipmentInfo.setEquipmentState("鏈煡");
+ return equipmentInfo;
+ }
+ WaterQualityDataDto waterQualityDataDto = JSON.parseObject(s, WaterQualityDataDto.class);
+ //璁剧疆姘磋川璁惧鐘舵��
+ if (waterQualityDataDto != null) {
+ equipmentInfo.setEquipmentState("鍦ㄧ嚎");
+ } else {
+ equipmentInfo.setEquipmentState("绂荤嚎");
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("姘磋川璁惧鍙蜂笉姝ｇ‘");
+ equipmentInfo.setEquipmentState("鏈煡");
+ }
+ return equipmentInfo;
+ }
}
--
Gitblit v1.9.3