From b9276c27abdac33f7e3fefccb4600a98db465c6e Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 11 五月 2022 16:49:10 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityEquipmentService.java | 96 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 69 insertions(+), 27 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 ea77199..fcb937d 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,14 +1,17 @@
package com.sandu.ximon.admin.service;
-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.dao.domain.AirEquipment;
-import com.sandu.ximon.dao.domain.Monitor;
+import com.sandu.ximon.admin.dto.WaterQualityDataDto;
+import com.sandu.ximon.admin.security.SecurityUtils;
+import com.sandu.ximon.admin.vo.EquipmentInfomation;
+import com.sandu.ximon.dao.bo.WaterQualityEquipmentBo;
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;
@@ -18,35 +21,34 @@
@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;
+
/**
* 鏌ヨ鍏ㄩ儴姘磋川璁惧
*/
- public List<WaterQualityEquipment> listWaterQualityEquipment() {
- LambdaQueryWrapper<WaterQualityEquipment> wrapper = Wrappers.lambdaQuery(WaterQualityEquipment.class);
- List<WaterQualityEquipment> list = list(wrapper);
-
- return list;
+ public List<WaterQualityEquipmentBo> listWaterQualityEquipment() {
+ return waterQualityEquipmentMapper.listWaterQualityEquipment();
}
/**
* 妯＄硦鏌ヨ
*/
- public List<WaterQualityEquipment> listWaterQualityEquipmentByKeyword(String keyword) {
- if(keyword == null || keyword.trim().length() == 0){
- return listWaterQualityEquipment();
-
- }else{
- return waterQualityEquipmentMapper.listWaterQualityEquipmentByKeyword(keyword);
+ public List<WaterQualityEquipmentBo> listWaterQualityEquipmentByKeyword(BaseConditionVO baseConditionVO, String keyword) {
+ Long userId = SecurityUtils.getUserId();
+ if (baseConditionVO != null) {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
}
-
-// LambdaQueryWrapper<WaterQualityEquipment> wrapper = Wrappers.lambdaQuery(WaterQualityEquipment.class);
-//// if (keyword != null) {
-//// wrapper.like(WaterQualityEquipment::getBelongTo, keyword);
-//// }
-// List<WaterQualityEquipment> airDataList = list(wrapper);
-// waterQualityEquipmentMapper.listWaterQualityEquipmentByKeyword(keyword);
+ List<WaterQualityEquipmentBo> waterQualityEquipmentBoList;
+ //涓虹┖鏄秴绠�
+ if (SecurityUtils.getClientId() == null) {
+ waterQualityEquipmentBoList = waterQualityEquipmentMapper.listWaterQualityEquipmentByIds(keyword, null);
+ } else {
+ waterQualityEquipmentBoList = waterQualityEquipmentMapper.listWaterQualityEquipmentByIds(keyword, userId);
+ }
+ return waterQualityEquipmentBoList;
}
/**
@@ -61,7 +63,7 @@
throw new BusinessException("鎵句笉鍒版按璐ㄨ澶�");
}
//鍒犻櫎鎽勬按璐ㄨ澶囧墠闇�瑕佸厛瑙ｇ粦
- poleBindingService.unBindPole(waterQualityEquipment.getWaterQualityEquipmentCode());
+ poleBindingService.unBindPole(null, waterQualityEquipment.getWaterQualityEquipmentCode());
return removeById(Id);
}
@@ -80,10 +82,50 @@
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());
+ return save(result);
} 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