From 4167b21d9f2ad8774c248ef160910bea5311c002 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期三, 13 四月 2022 18:14:10 +0800
Subject: [PATCH] 设备汇总
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java | 11 ++
dao/src/main/java/com/sandu/ximon/dao/domain/Light.java | 8 ++
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirEquipmentController.java | 6 +
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java | 116 ++++++++++++++++++++--------
ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java | 18 +++
dao/src/main/java/com/sandu/ximon/dao/domain/PoleBinding.java | 2
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java | 8 ++
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedPlayerEntityService.java | 2
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightPoleHeelingService.java | 7 +
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java | 2
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java | 7 +
ximon-admin/src/main/java/com/sandu/ximon/admin/vo/PoleBindVO.java | 14 ++-
dao/src/main/java/com/sandu/ximon/dao/domain/LightPoleHeeling.java | 2
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java | 16 ++++
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java | 5 +
15 files changed, 178 insertions(+), 46 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/Light.java b/dao/src/main/java/com/sandu/ximon/dao/domain/Light.java
index 50ec96d..88c435c 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/Light.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/domain/Light.java
@@ -6,6 +6,8 @@
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data;
/**
@@ -51,6 +53,12 @@
*/
private LocalDateTime updateTime;
+ /**
+ * 鍦ㄧ嚎鐘舵�� 0锛氱绾� 1锛氬湪绾�
+ */
+ @TableField(exist = false)
+ private Integer onlineStatus;
+
@TableField(exist = false)
private static final long serialVersionUID = 1L;
}
diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/LightPoleHeeling.java b/dao/src/main/java/com/sandu/ximon/dao/domain/LightPoleHeeling.java
index 1c8ea27..61f32f5 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/LightPoleHeeling.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/domain/LightPoleHeeling.java
@@ -59,11 +59,13 @@
/**
* 鐏潌缂栧彿
*/
+ @TableField(exist = false)
private Long poleCode;
/**
* 鐏潌鍚嶇О
*/
+ @TableField(exist = false)
private String poleName;
@TableField(exist = false)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/PoleBinding.java b/dao/src/main/java/com/sandu/ximon/dao/domain/PoleBinding.java
index bf15c04..624d4e3 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/PoleBinding.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/domain/PoleBinding.java
@@ -37,7 +37,7 @@
private String deviceCode;
/**
- * 璁惧绫诲瀷锛�0璺伅锛�1led灞忓箷锛�2鍏呯數妗╋紝3澶ф皵鐩戞祴锛�4姘磋川鐩戞祴锛�5ip闊虫煴锛�6lcd骞垮憡鏈猴紝7鎽勫儚澶达紝8鏉嗕綋鍊炬祴锛�9涓�閿晳鍔�
+ * 璁惧绫诲瀷锛�0璺伅锛�1璇虹摝锛�2鍏呯數妗╋紝3澶ф皵鐩戞祴锛�4姘磋川鐩戞祴锛�5ip闊虫煴锛�6lcd骞垮憡鏈猴紝7鎽勫儚澶达紝8鏉嗕綋鍊炬祴锛�9涓�閿晳鍔� ,10 鐔欒
*/
private Integer deviceType;
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirEquipmentController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirEquipmentController.java
index 33be8db..a096766 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirEquipmentController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirEquipmentController.java
@@ -5,7 +5,6 @@
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.service.AirEquipmentService;
import com.sandu.ximon.dao.bo.AirEquipmentBo;
-import com.sandu.ximon.dao.domain.AirEquipment;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -40,4 +39,9 @@
return ResponseUtil.fail("鎿嶄綔澶辫触");
}
}
+
+ @GetMapping("/getAirEquipment/{mac}")
+ public ResponseVO<Object> getAirEquipment(@PathVariable String mac) {
+ return ResponseUtil.success(airEquipmentService.getAirEquipment(mac));
+ }
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java
index e9ac80b..eac56c2 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java
@@ -90,6 +90,17 @@
}
/**
+ * 鑾峰彇钀ょ煶浜戞憚鍍忓ご淇℃伅
+ *
+ * @param
+ * @return
+ */
+ @GetMapping("/getYSYInfo/{deviceSerial}")
+ public ResponseVO<Object> getMonitorInfo(@PathVariable String deviceSerial) {
+ return ResponseUtil.success(monitorService.getMonitorInfo(deviceSerial));
+ }
+
+ /**
* 娣诲姞钀ょ煶浜戞憚鍍忓ご
*
* @param monitorParam 娣诲姞鎽勫儚澶寸粨鏋�
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java
index 4ee399b..0f43a70 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java
@@ -223,5 +223,13 @@
return ResponseUtil.success(results);
}
+ /**
+ * 鏌ョ湅鐏潌缁戝畾鐨勮澶�
+ */
+ @PostMapping("/getPoleBindDevice/{poleId}")
+ public ResponseVO<Object> getPoleBindDevice(@PathVariable Long poleId) {
+ return ResponseUtil.success(poleService.getBindByPoleId(poleId));
+ }
+
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java
index 5dc0884..39f6d1c 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java
@@ -187,6 +187,6 @@
@GetMapping("/getVnnoxInfo/{sn}")
public ResponseVO<Object> getBySnAndPlayerId(@PathVariable String sn) {
- return ResponseUtil.success(ledPlayerEntityService.getBySnAndPlayerId(sn));
+ return ResponseUtil.success(ledPlayerEntityService.getBySnAndPlayerSn(sn));
}
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java
index 10868e2..5a993ef 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java
@@ -63,4 +63,11 @@
}
return removeById(Id);
}
+
+ /**
+ * 鏍规嵁Mac澶ф皵璁惧鏁版嵁璇︽儏
+ */
+ public AirEquipment getAirEquipment(String mac) {
+ return getOne(Wrappers.lambdaQuery(AirEquipment.class).eq(AirEquipment::getMac, mac));
+ }
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedPlayerEntityService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedPlayerEntityService.java
index ce25411..0d4d03a 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedPlayerEntityService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedPlayerEntityService.java
@@ -38,7 +38,7 @@
/**
* 璇虹摝纭欢璁惧
*/
- public LedPlayerEntity getBySnAndPlayerId(String sn){
+ public LedPlayerEntity getBySnAndPlayerSn(String sn){
LedPlayerEntity one = getOne(Wrappers.lambdaQuery(LedPlayerEntity.class).eq(LedPlayerEntity::getSn, sn));
if(one==null){
throw new RuntimeException("璇虹摝璁惧涓嶅瓨鍦�");
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightPoleHeelingService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightPoleHeelingService.java
index 9002ac9..c357215 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightPoleHeelingService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightPoleHeelingService.java
@@ -48,6 +48,13 @@
}
/**
+ * 鏍规嵁Mac鑾峰彇鏈�鏂版暟鎹�
+ */
+ public LightPoleHeeling getLightPoleHeelingByMac(String mac) {
+ return getOne(Wrappers.lambdaQuery(LightPoleHeeling.class).eq(LightPoleHeeling::getMac, mac));
+ }
+
+ /**
* 鐏潌鍊炬枩蹇冭烦鍖�
*
* @param deviceName
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java
index d966d0f..fa7e706 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java
@@ -121,6 +121,22 @@
return listLight;
}
+ /**
+ * 鑾峰彇鍗曚釜璺伅淇℃伅
+ * @param deviceCode 璁惧鐮�
+ * @return
+ */
+ public Light getLight(String deviceCode) {
+ Light one = getOne(Wrappers.<Light>lambdaQuery().eq(Light::getDeviceCode, deviceCode));
+ Object o = redisService.get(LightKey.REPORT_MAC.key(deviceCode));
+ if (o != null) {
+ one.setOnlineStatus(1);
+ }else {
+ one.setOnlineStatus(0);
+ }
+ return one;
+ }
+
public boolean addRemark(LightRemarkParam param) {
Light light = getById(param.getLightId());
if (light == null) {
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 73c845e..325d0fe 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,7 +10,6 @@
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;
@@ -102,6 +99,21 @@
return accessTokenDto.getData().getAccessToken();
}
+
+ /**
+ * 鑾峰彇钀ょ煶浜戞憚鍍忓ご淇℃伅 鏃犻渶楠岃瘉accessToken
+ * @return
+ */
+ public YSY_MonitorDto.MonitorDto getMonitorInfo(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 = JSON.parseObject(s, YSY_MonitorDto.class);
+ return monitorDto.getData();
+ }
+
/**
* 娣诲姞钀ょ煶浜戞憚鍍忓ご
*
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java
index f5bd1c8..bb903df 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java
@@ -206,6 +206,11 @@
}
+ /**
+ * 鏌ヨ鍗曚釜LED
+ * @param lightControlCode
+ * @return
+ */
public PoleLightemitEntity getLedByLightControlCode(String lightControlCode) {
PoleLightemitEntity xiXun = getOne(Wrappers.lambdaQuery(PoleLightemitEntity.class).eq(PoleLightemitEntity::getLightemitControlCode, lightControlCode));
if(xiXun==null){
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
index 9a6d314..8e72e1e 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
@@ -11,6 +11,7 @@
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.redis.RedisService;
import com.sandu.common.service.impl.BaseServiceImpl;
+import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.dto.DeviceStatus;
import com.sandu.ximon.admin.manager.iot.frame.A1Frame;
import com.sandu.ximon.admin.manager.iot.frame.FrameBuilder;
@@ -32,6 +33,7 @@
import com.sandu.ximon.admin.param.PoleStatesParam;
import com.sandu.ximon.admin.redis.LightKey;
import com.sandu.ximon.admin.security.SecurityUtils;
+import com.sandu.ximon.admin.vo.PoleBindVO;
import com.sandu.ximon.dao.domain.Pole;
import com.sandu.ximon.dao.domain.PoleBinding;
import com.sandu.ximon.dao.domain.PoleGroupRelation;
@@ -148,18 +150,18 @@
if (param.getOnLineStates() != 2) {//缁戝畾鐨勭湡瀹炵伅鏉嗘槸鍚﹀湪绾�
list = isOnLine(list, param);
}
- }else {//鍏ㄩ儴鐏潌 瀹炰綋/铏氭嫙
+ } else {//鍏ㄩ儴鐏潌 瀹炰綋/铏氭嫙
if (param.getOnLineStates() != 2) { //鏌ヨ鍏ㄩ儴鐏潌鏄惁鍦ㄧ嚎
list = isOnLine(list, param);
}
}
- }else {//鍏ㄩ儴 缁戝畾/鏈粦瀹�
+ } else {//鍏ㄩ儴 缁戝畾/鏈粦瀹�
if (param.getIsTrue() != 2) {// 鍒ゆ柇鐏潌绫诲瀷
list = isTrue(list, param);// 瀹炰綋/铏氭嫙
if (param.getOnLineStates() != 2) {// 鐏潌鐨勫湪绾垮垽鏂�
list = isOnLine(list, param);//鍦ㄧ嚎/绂荤嚎
}
- }else {//鍏ㄧ被鍨嬬伅鏉�
+ } else {//鍏ㄧ被鍨嬬伅鏉�
if (param.getOnLineStates() != 2) {//鍒ゆ柇鍦ㄧ嚎鐘舵��
list = isOnLine(list, param);//鍦ㄧ嚎/绂荤嚎
}
@@ -502,23 +504,22 @@
String Code = uniqueMac.substring(0, uniqueMac.length() - 2);*/
pole.setDeviceCode(uniqueMac);
pole.setPoleName(uniqueMac);
- /* int i = Integer.parseInt(strm);*/
- if("00".equals(a1DeviceMacRespInnerFrame.getType())){
+ /* int i = Integer.parseInt(strm);*/
+ if ("00".equals(a1DeviceMacRespInnerFrame.getType())) {
pole.setDeviceType(0);
- }else if("01".equals(a1DeviceMacRespInnerFrame.getType())){
+ } else if ("01".equals(a1DeviceMacRespInnerFrame.getType())) {
pole.setDeviceType(1);
}
pole.setPoleCode(generatePoleCode());
Pole one = getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getDeviceCode, uniqueMac));
// setMac = save(pole);
- if(one==null){
+ if (one == null) {
return save(pole);
- }else {
+ } else {
pole.setId(one.getId());
return updateById(pole);
}
-
}
@@ -571,7 +572,7 @@
throw new BusinessException("鐏潌涓嶅瓨鍦�");
}
pole.setUserId(clientId);
- if(!clientService.findClientId(clientId)){
+ if (!clientService.findClientId(clientId)) {
pole.setClientId(clientService.getClientId(clientId));
}
r = updateById(pole);
@@ -585,40 +586,40 @@
}
- public List<Pole> getOwnerPole(BaseConditionVO baseConditionVO, String keyword,Long cilentId) {
+ public List<Pole> getOwnerPole(BaseConditionVO baseConditionVO, String keyword, Long cilentId) {
LambdaQueryWrapper<Pole> eq;
// if(SecurityUtils.getClientId()!=null){
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ if (clientService.findClientId(cilentId)) {
+ eq = Wrappers.lambdaQuery(Pole.class).eq(Pole::getUserId, cilentId);
+ } else {
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
- if(clientService.findClientId(cilentId)){
- eq = Wrappers.lambdaQuery(Pole.class).eq(Pole::getUserId, cilentId);
- }else{
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
- eq = Wrappers.lambdaQuery(Pole.class).eq(Pole::getClientId, cilentId)
- .or(
- pole->{
- pole.eq(Pole::getUserId, cilentId);
- }
- );
- }
+ eq = Wrappers.lambdaQuery(Pole.class).eq(Pole::getClientId, cilentId)
+ .or(
+ pole -> {
+ pole.eq(Pole::getUserId, cilentId);
+ }
+ );
+ }
// }else {
// PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
// eq = Wrappers.lambdaQuery(Pole.class);
// }
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
- if (!keyword.isEmpty()){
- eq.like(Pole::getPoleName,keyword).or(
- code->{
- code.like(Pole::getPoleCode,keyword);
+ if (!keyword.isEmpty()) {
+ eq.like(Pole::getPoleName, keyword).or(
+ code -> {
+ code.like(Pole::getPoleCode, keyword);
}
).or(
- deviceCode->{
- deviceCode.like(Pole::getDeviceCode,keyword);
+ deviceCode -> {
+ deviceCode.like(Pole::getDeviceCode, keyword);
}
);
}
- List<Pole> list ;
- list =list(eq);
+ List<Pole> list;
+ list = list(eq);
setCount(list);
setOnline(list);
return list;
@@ -627,12 +628,61 @@
/**
* 鏍规嵁鐏潌id鏌ヨ鐏潌缁戝畾璁惧
+ *
+ * @return
*/
- public List<Pole> getBindByPoleId(Long poleId){
+ public PoleBindVO getBindByPoleId(Long poleId) {
List<PoleBinding> bind = poleBindingService.list(Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getPoleId, poleId));
- return list(Wrappers.lambdaQuery(Pole.class).eq(Pole::getId,poleId));
+ PoleBindVO bindVO = new PoleBindVO();
+ bindVO.setPole(getPoleByMac(poleId));
+ bind.forEach(poleBinding -> {
+ if (poleBinding.getDeviceType() == 0) {//鍗曠伅
+ bindVO.setLight(SpringContextHolder.getBean(LightService.class).getLight(poleBinding.getDeviceCode()));
+ } else if (poleBinding.getDeviceType() == 1) {//璇虹摝
+ bindVO.setNova(SpringContextHolder.getBean(LedPlayerEntityService.class).getBySnAndPlayerSn(poleBinding.getDeviceCode()));
+ } else if (poleBinding.getDeviceType() == 2) {//鍏呯數妗�
+ bindVO.setC3mCharging(SpringContextHolder.getBean(C3ChargingService.class).getByC3Mac(poleBinding.getDeviceCode()));
+ } else if (poleBinding.getDeviceType() == 3) {//澶ф皵
+ bindVO.setAirMonitoring(SpringContextHolder.getBean(AirEquipmentService.class).getAirEquipment(poleBinding.getDeviceCode()));
+ } else if (poleBinding.getDeviceType() == 4) {//姘磋川
+ bindVO.setWaterMonitoring(SpringContextHolder.getBean(WaterQualityDataService.class).getWaterQualityDataInfo(poleBinding.getDeviceCode()));
+ } else if (poleBinding.getDeviceType() == 5) {//闊虫煴
+ bindVO.setIpVolume(SpringContextHolder.getBean(IpVolumeService.class).getIpTerminalDetail(Integer.valueOf(poleBinding.getDeviceCode())));
+ } else if (poleBinding.getDeviceType() == 6) {//LCD
+ //lcd鏆傛棤
+ } else if (poleBinding.getDeviceType() == 7) {//鎽勫儚澶�
+ bindVO.setMonitor(SpringContextHolder.getBean(MonitorService.class).getMonitorInfo(poleBinding.getDeviceCode()));
+ } else if (poleBinding.getDeviceType() == 8) {//鏉嗕綋鍊炬祴
+ bindVO.setLightPoleHeeling(SpringContextHolder.getBean(LightPoleHeelingService.class).getLightPoleHeelingByMac(poleBinding.getDeviceCode()));
+ } else if (poleBinding.getDeviceType() == 9) {//涓�閿眰鍔�
+ //涓�閿眰鍔╂殏鏃�
+ } else if (poleBinding.getDeviceType() == 10) {//鐔欒
+ bindVO.setXiXun(SpringContextHolder.getBean(PoleLightemitService.class).getLedByLightControlCode(poleBinding.getDeviceCode()));
+ } else {
+ throw new BusinessException("鏈煡璁惧绫诲瀷");
+ }
+ });
+ return bindVO;
}
-}
+ public Pole getPoleByMac(Long poleId) {
+ Pole one = getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getId, poleId));
+ ArrayList<String> macs = new ArrayList<>();
+ macs.add(one.getDeviceCode());
+ List<DeviceStatus> deviceStatuses = listStatusByDeviceCode(macs);
+ if (deviceStatuses.get(0).getStatus() == 0) {
+ one.setOnLineState("绂荤嚎");
+ } else if (deviceStatuses.get(0).getStatus() == 1) {
+ one.setOnLineState("鍦ㄧ嚎");
+ } else if (deviceStatuses.get(0).getStatus() == 2) {
+ one.setOnLineState("鏈縺娲�");
+ } else if (deviceStatuses.get(0).getStatus() == 3) {
+ one.setOnLineState("涓嶅彲鐢�");
+ } else {
+ one.setOnLineState("鏈煡");
+ }
+ return one;
+ }
+}
\ No newline at end of file
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/vo/PoleBindVO.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/vo/PoleBindVO.java
index dc1a6cc..161cc26 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/vo/PoleBindVO.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/vo/PoleBindVO.java
@@ -1,5 +1,7 @@
package com.sandu.ximon.admin.vo;
+import com.sandu.ximon.admin.dto.WaterQualityDataDto;
+import com.sandu.ximon.admin.dto.YSY_MonitorDto;
import com.sandu.ximon.dao.domain.*;
import lombok.Data;
@@ -12,13 +14,13 @@
public class PoleBindVO {
- private Pole pole;
+ private Pole pole; //
/**
* 澶ф皵鐩戞祴
*/
- private AirMonitoring airMonitoring;
+ private AirEquipment airMonitoring; //
/**
* ip闊虫煴
@@ -34,17 +36,17 @@
/**
* 璺伅
*/
- private Light light;
+ private Light light; //
/**
* 鏉嗕綋鍊炬祴
*/
- private LightPoleHeeling lightPoleHeeling;
+ private LightPoleHeeling lightPoleHeeling; //
/**
* 鎽勫儚澶�
*/
- private Monitor monitor;
+ private YSY_MonitorDto.MonitorDto monitor; //
/**
* LED璇虹摝
@@ -59,5 +61,5 @@
/**
* 姘磋川鐩戞祴
*/
- private WaterMonitoring waterMonitoring;
+ private WaterQualityDataDto waterMonitoring;
}
--
Gitblit v1.9.3