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/service/PoleService.java | 116 +++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 83 insertions(+), 33 deletions(-)
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
--
Gitblit v1.9.3