From 7c3738df442e6b456ca68670e086357fbb08d521 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期四, 28 四月 2022 18:25:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java | 171 +++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 136 insertions(+), 35 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java
index 68b63fa..b54253a 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java
@@ -1,10 +1,8 @@
package com.sandu.ximon.admin.service;
-import cn.hutool.core.collection.CollUtil;
import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.sandu.common.execption.BusinessException;
@@ -12,15 +10,17 @@
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.param.MonitorParam;
import com.sandu.ximon.admin.security.SecurityUtils;
-import com.sandu.ximon.dao.bo.AirEquipmentBo;
import com.sandu.ximon.dao.bo.MonitorBo;
import com.sandu.ximon.dao.domain.Monitor;
import com.sandu.ximon.admin.dto.YSY_AccessTokenDto;
import com.sandu.ximon.admin.dto.YSY_MonitorDto;
+import com.sandu.ximon.dao.domain.PoleBinding;
import com.sandu.ximon.dao.mapper.MonitorMapper;
import lombok.AllArgsConstructor;
+import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -54,8 +54,32 @@
* 妯＄硦鏌ヨ
*/
public List<MonitorBo> listMonitorByKeyword(BaseConditionVO baseConditionVO, MonitorParam monitorParam) {
- Long clientId = SecurityUtils.getClientId();
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ List<Monitor> list;
+ if (SecurityUtils.getClientId() == null) {
+ list = monitorMapper.listMonitorDeviceSerial1(null, monitorParam.getKeyword());
+ } else {
+ list = monitorMapper.listMonitorDeviceSerial1(SecurityUtils.getUserId(), monitorParam.getKeyword());
+ }
+
+ //娌℃湁鏁版嵁鏃跺�欑洿鎺ヨ繑鍥炵┖鏁扮粍
+ if (list.size() == 0 || list == null) {
+ List<MonitorBo> nullList = new ArrayList<>();
+ return nullList;
+ }
+ List<String> device_serialList = new ArrayList<>(list.size());
+ for (Monitor demo : list) {
+ device_serialList.add(demo.getDeviceSerial());
+
+ YSY_MonitorDto.MonitorDto monitorInfo = getMonitorInfo_Async(demo.getDeviceSerial());
+ if (monitorInfo != null) {
+ demo.setEquipmentState(monitorInfo.getStatus());
+ }
+ }
+ updateBatchById(list);
+
+ if (baseConditionVO != null) {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ }
List<MonitorBo> monitorList;
//缁戝畾鐘舵�侊細宸茬粦瀹�/鏈粦瀹�/鍏ㄩ儴
if (monitorParam.getBindingState() == null) {
@@ -67,9 +91,44 @@
monitorParam.setEquipmentState(2);
}
- monitorList = monitorMapper.listMonitorByIds(monitorParam.getKeyword(), monitorParam.getBindingState(), monitorParam.getEquipmentState(), clientId);
+ monitorList = monitorMapper.listMonitorByIds(device_serialList, monitorParam.getBindingState(), monitorParam.getEquipmentState());
return monitorList;
+ }
+
+ public Monitor getYSYMonitorInfoAndaddMonitorToTable(String deviceSerial) {
+ YSY_MonitorDto getMonitorDto = getYSYMonitorInfo(getAccessToken(), deviceSerial);
+
+ if ("200".equals(getMonitorDto.getCode())) {
+ Monitor monitor = getOne(Wrappers.lambdaQuery(Monitor.class).eq(Monitor::getDeviceSerial, deviceSerial));
+ if (monitor != null) {
+ monitor.setDeviceSerial(getMonitorDto.getData().getDeviceSerial());
+
+ monitor.setDeviceName(getMonitorDto.getData().getDeviceName());
+ monitor.setDeviceType(getMonitorDto.getData().getModel());
+ monitor.setEquipmentState(getMonitorDto.getData().getStatus());
+ monitor.setIsEncrypt(getMonitorDto.getData().getIsEncrypt());
+ monitor.setAddTime(getMonitorDto.getData().getUpdateTime());
+ monitor.setNetAddress(getMonitorDto.getData().getNetAddress());
+ //鏇存柊鎽勫儚澶寸姸鎬�
+ updateById(monitor);
+ } else {
+ monitor = new Monitor();
+ monitor.setDeviceSerial(getMonitorDto.getData().getDeviceSerial());
+ monitor.setDeviceName(getMonitorDto.getData().getDeviceName());
+ monitor.setDeviceType(getMonitorDto.getData().getModel());
+ monitor.setEquipmentState(getMonitorDto.getData().getStatus());
+ monitor.setIsEncrypt(getMonitorDto.getData().getIsEncrypt());
+ monitor.setAddTime(getMonitorDto.getData().getUpdateTime());
+ monitor.setNetAddress(getMonitorDto.getData().getNetAddress());
+ //鏇存柊鎽勫儚澶寸姸鎬�
+ save(monitor);
+ }
+
+ return monitor;
+ } else {
+ return null;
+ }
}
/**
@@ -83,9 +142,11 @@
if (monitor == null) {
throw new BusinessException("鎵句笉鍒版憚鍍忓ご");
}
-
- //鍒犻櫎鎽勫儚澶磋澶囧墠闇�瑕佸厛瑙ｇ粦
- poleBindingService.unBindPole(null, monitor.getDeviceSerial());
+ PoleBinding one = poleBindingService.getOne(Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getDeviceCode, monitor.getDeviceSerial()));
+ if (one != null) {
+ //鍒犻櫎鎽勫儚澶磋澶囧墠闇�瑕佸厛瑙ｇ粦
+ poleBindingService.unBindPole(null, monitor.getDeviceSerial());
+ }
return removeById(Id);
}
@@ -104,6 +165,28 @@
/**
+ * 鑾峰彇钀ょ煶浜戞憚鍍忓ご淇℃伅(寮傛)
+ *
+ * @return
+ */
+ @Async("taskExecutor")
+ public YSY_MonitorDto.MonitorDto getMonitorInfo_Async(String deviceSerial) {
+ String token = getAccessToken();
+ Map<String, Object> paramMap = new HashMap<>();
+ paramMap.put("accessToken", token);
+ paramMap.put("deviceSerial", deviceSerial);
+ String s = HttpUtil.post(YSY_URL + GET_DEVICE_URL, paramMap);
+ YSY_MonitorDto monitorDto = null;
+ try {
+ monitorDto = JSON.parseObject(s, YSY_MonitorDto.class);
+ return monitorDto.getData();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ /**
* 鑾峰彇钀ょ煶浜戞憚鍍忓ご淇℃伅 鏃犻渶楠岃瘉accessToken
*
* @return
@@ -114,48 +197,45 @@
paramMap.put("accessToken", token);
paramMap.put("deviceSerial", deviceSerial);
String s = HttpUtil.post(YSY_URL + GET_DEVICE_URL, paramMap);
- YSY_MonitorDto monitorDto = JSON.parseObject(s, YSY_MonitorDto.class);
- return monitorDto.getData();
+ YSY_MonitorDto monitorDto = null;
+ try {
+ monitorDto = JSON.parseObject(s, YSY_MonitorDto.class);
+ return monitorDto.getData();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return null;
}
/**
* 娣诲姞钀ょ煶浜戞憚鍍忓ご
*
- * @param accessToken 鎺堟潈杩囩▼鑾峰彇鐨刟ccess_token
* @param deviceSerial 璁惧搴忓垪鍙�,瀛樺湪鑻辨枃瀛楁瘝鐨勮澶囧簭鍒楀彿锛屽瓧姣嶉渶涓哄ぇ鍐�
* // * @param validateCode 璁惧楠岃瘉鐮侊紝璁惧鏈鸿韩涓婄殑鍏綅澶у啓瀛楁瘝
*/
- public YSY_MonitorDto addYSYMonitor(String accessToken, String deviceSerial, String validateCode) {
-// public YSY_MonitorDto addYSYMonitor(String accessToken, String deviceSerial) {
-
+ public boolean addYSYMonitor(String deviceSerial, String validateCode) {
Map<String, Object> paramMap = new HashMap<>();
- paramMap.put("accessToken", accessToken);
+ paramMap.put("accessToken", getAccessToken());
paramMap.put("deviceSerial", deviceSerial);
if (validateCode != null && validateCode.trim().length() != 0) {
paramMap.put("validateCode", validateCode);
}
String s = HttpUtil.post(YSY_URL + ADD_DEVICE_URL, paramMap);
- System.out.println(s);
YSY_MonitorDto monitorDto = JSON.parseObject(s, YSY_MonitorDto.class);
- return monitorDto;
- }
-
- /**
- * 鍒犻櫎钀ょ煶浜戞憚鍍忓ご
- *
- * @param accessToken 鎺堟潈杩囩▼鑾峰彇鐨刟ccess_token
- * @param deviceSerial 璁惧搴忓垪鍙�,瀛樺湪鑻辨枃瀛楁瘝鐨勮澶囧簭鍒楀彿锛屽瓧姣嶉渶涓哄ぇ鍐�
- */
- public YSY_MonitorDto deleteYSYMonitor(String accessToken, String deviceSerial) {
-
- Map<String, Object> paramMap = new HashMap<>();
- paramMap.put("accessToken", accessToken);
- paramMap.put("deviceSerial", deviceSerial);
- String s = HttpUtil.post(YSY_URL + DELETE_DEVICE_URL, paramMap);
- System.out.println(s);
- YSY_MonitorDto monitorDto = JSON.parseObject(s, YSY_MonitorDto.class);
- return monitorDto;
+ if ("200".equals(monitorDto.getCode()) || "20017".equals(monitorDto.getCode())) {
+ Monitor monitor = new Monitor();
+ monitor.setDeviceSerial(monitorDto.getData().getDeviceSerial());
+ monitor.setDevicesCode(validateCode);
+ monitor.setDeviceName(monitorDto.getData().getDeviceName());
+ monitor.setEquipmentState(monitorDto.getData().getStatus());
+ monitor.setIsEncrypt(monitorDto.getData().getIsEncrypt());
+ monitor.setDeviceType(monitorDto.getData().getModel());
+ monitor.setNetAddress(monitorDto.getData().getNetAddress());
+ return addMonitorInfoToTable(monitor);
+ } else {
+ return false;
+ }
}
/**
@@ -264,4 +344,25 @@
}
+ /**
+ * 淇敼note
+ *
+ * @param deviceSerial
+ * @param notes
+ * @return
+ */
+ public boolean updateNotes(String deviceSerial, String notes) {
+ if (deviceSerial == null || deviceSerial.trim().length() == 0 || notes == null) {
+ throw new BusinessException("淇敼澶囨敞鍙傛暟鏈夎锛�");
+ }
+ Monitor one = getOne(Wrappers.lambdaQuery(Monitor.class).eq(Monitor::getDeviceSerial, deviceSerial));
+ if (one != null) {
+ one.setNote(notes);
+ return updateById(one);
+ } else {
+ throw new BusinessException("鎽勫儚澶磋澶囦笉瀛樺湪锛�");
+ }
+ }
+
+
}
--
Gitblit v1.9.3