From f92e7a801cb5e59bd2391641eccad67036513b8a Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 15 四月 2022 15:00:14 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java | 318 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 237 insertions(+), 81 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 8a50bbb..73b7fb2 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
@@ -8,8 +8,10 @@
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.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;
@@ -31,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;
@@ -60,6 +63,7 @@
private final RedisService redisService;
private final PoleBindingService poleBindingService;
private final PoleGroupRelationService groupRelationService;
+ private final ClientService clientService;
public boolean addPole(PoleParam param) {
Pole pole = new Pole();
@@ -111,15 +115,15 @@
public List<Pole> queryAllStatesAndList(Integer pageNo, Integer pageSize, PoleStatesParam param) {
- // List<LampPost> list = list(Wrappers.lambdaQuery(LampPost.class).eq(LampPost::getClientId, SecurityUtils.getUserId()));
- //List<Pole> list = list(Wrappers.lambdaQuery(Pole.class));
-// PageHelper.startPage(pageNo, pageSize);
List<Pole> list = new ArrayList<>();
LambdaQueryWrapper<Pole> wrapper = new LambdaQueryWrapper<>();
if (SecurityUtils.getClientId() == null) {
wrapper = Wrappers.lambdaQuery(Pole.class);
} else {
- wrapper = Wrappers.lambdaQuery(Pole.class).eq(Pole::getClientId, SecurityUtils.getUserId());
+ wrapper = Wrappers.lambdaQuery(Pole.class).eq(Pole::getClientId, SecurityUtils.getUserId()).or(
+ w -> {
+ w.eq(Pole::getUserId, SecurityUtils.getUserId());
+ });
}
if (!param.getKeyword().isEmpty()) {
wrapper.like(Pole::getPoleCode, param.getKeyword()).or(
@@ -130,12 +134,6 @@
}
list = list(wrapper);
- List<Pole> bindList = new ArrayList<>();//宸茬粦瀹氬鎴�
- List<Pole> unbindList = new ArrayList<>();//鏈粦瀹氬鎴�
- List<Pole> isTrue = new ArrayList<>();//瀹炰綋鐏潌
- List<Pole> isFalse = new ArrayList<>();//铏氭嫙鐏潌
- List<Pole> online = new ArrayList<>();//鍦ㄧ嚎
- List<Pole> offline = new ArrayList<>();//绂荤嚎
if (param.getGroupid() != null) {
// List<Long> poleIds = new ArrayList<>();
List<Pole> pole = new ArrayList<>();
@@ -148,68 +146,38 @@
list = pole;
}
- list.forEach(bindwarpper -> {
-// Long clientId = bindwarpper.getClientId();
- if (bindwarpper.getClientId() == null) {//鍒ゆ柇鏄惁缁戝畾
- unbindList.add(bindwarpper);
- if (bindwarpper.getDeviceCode() == null) {//鍒ゆ柇鐏潌绫诲瀷
- isFalse.add(bindwarpper);
- } else {
- isTrue.add(bindwarpper);
+ if (param.getBingStates() != 2) {//鏄惁缁戝畾
+ list = isBind(list, param);// 缁戝畾/鏈粦瀹�
+ if (param.getIsTrue() != 2) {//宸茬粦瀹氱殑鏄惁鏄湡瀹炵伅鏉�
+ list = isTrue(list, param);
+ if (param.getOnLineStates() != 2) {//缁戝畾鐨勭湡瀹炵伅鏉嗘槸鍚﹀湪绾�
+ list = isOnLine(list, param);
}
- } else {
- bindList.add(bindwarpper);
- if (bindwarpper.getDeviceCode() == null) {
- isFalse.add(bindwarpper);
- } else {
- isTrue.add(bindwarpper);
+ } else {//鍏ㄩ儴鐏潌 瀹炰綋/铏氭嫙
+ if (param.getOnLineStates() != 2) { //鏌ヨ鍏ㄩ儴鐏潌鏄惁鍦ㄧ嚎
+ list = isOnLine(list, param);
}
}
- });
- if (param.getBingStates() == 1) { //鏈粦瀹�
- list = unbindList;
- } else if (param.getBingStates() == 0) {//宸茬粦瀹�
- list = bindList;
- }// else {//鍏ㄩ儴
-// list = list(wrapper);
-// }
-
- setOnline(list);
- if (param.getIsTrue() == 1) { //铏氭嫙鐏潌
- list = isFalse;
- } else if (param.getIsTrue() == 0) {//瀹炰綋鐏潌
- list = isTrue;
- list.forEach(onLinePole -> {
-// System.out.println("online-----------------------"+onLinePole.getOnLineState());
- if (("ONLINAE").equals(onLinePole.getOnLineState())) {
- online.add(onLinePole);
- } else if (("OFFLINE").equals(onLinePole.getOnLineState())) {
- offline.add(onLinePole);
+ } else {//鍏ㄩ儴 缁戝畾/鏈粦瀹�
+ if (param.getIsTrue() != 2) {// 鍒ゆ柇鐏潌绫诲瀷
+ list = isTrue(list, param);// 瀹炰綋/铏氭嫙
+ if (param.getOnLineStates() != 2) {// 鐏潌鐨勫湪绾垮垽鏂�
+ list = isOnLine(list, param);//鍦ㄧ嚎/绂荤嚎
}
- });
- } else {//鍏ㄩ儴
- // setOnline(list);
- list.forEach(onLinePole -> {
-// System.out.println("online-----------------------"+onLinePole.getOnLineState());
- if (("ONLINE").equals(onLinePole.getOnLineState())) {
- online.add(onLinePole);
- } else if (("OFFLINE").equals(onLinePole.getOnLineState())) {
- offline.add(onLinePole);
+ } else {//鍏ㄧ被鍨嬬伅鏉�
+ if (param.getOnLineStates() != 2) {//鍒ゆ柇鍦ㄧ嚎鐘舵��
+ list = isOnLine(list, param);//鍦ㄧ嚎/绂荤嚎
}
- });
- }
-
- if (param.getOnLineStates() == 1) { //绂荤嚎
- list = offline;
- } else if (param.getOnLineStates() == 0) {//鍦ㄧ嚎
- list = online;
+ }
}
+
setCount(list);
return list;
}
/**
* 璁剧疆缁戝畾璁惧鏁伴噺
+ *
* @param list
* @return
*/
@@ -222,8 +190,85 @@
return list;
}
+
+ /**
+ * 鍦ㄧ嚎鐘舵�佸鐞�
+ *
+ * @param list
+ * @param param
+ * @return
+ */
+ public List<Pole> isOnLine(List<Pole> list, PoleStatesParam param) {
+ setOnline(list);
+ List<Pole> online = new ArrayList<>();//鍦ㄧ嚎
+ List<Pole> offline = new ArrayList<>();//绂荤嚎
+ list.forEach(onLinePole -> {
+ System.out.println("online---------------------------------------------------" + ("ONLINE").equals(onLinePole.getOnLineState()));
+ System.out.println("online---------------------------------------------------" + (onLinePole.getOnLineState()));
+ if (("ONLINE").equals(onLinePole.getOnLineState())) {
+ online.add(onLinePole);
+ } else if (("OFFLINE").equals(onLinePole.getOnLineState())) {
+ offline.add(onLinePole);
+ }
+ });
+
+ if (param.getOnLineStates() == 0) {
+ return online;
+ } else if (param.getOnLineStates() == 1) {
+ return offline;
+ }
+ return list;
+ }
+
+ /**
+ * 鏌ヨ缁戝畾鐘舵��
+ *
+ * @param list
+ * @param param
+ * @return
+ */
+ public List<Pole> isBind(List<Pole> list, PoleStatesParam param) {
+ List<Pole> bindList = new ArrayList<>();//宸茬粦瀹氬鎴�
+ List<Pole> unbindList = new ArrayList<>();//鏈粦瀹氬鎴�
+ list.forEach(bindwarpper -> {
+// Long clientId = bindwarpper.getClientId();
+ if (bindwarpper.getClientId() == null) {//鍒ゆ柇鏄惁缁戝畾
+ unbindList.add(bindwarpper);
+ } else {
+ bindList.add(bindwarpper);
+ }
+ });
+ if (param.getBingStates() == 0) {
+ return bindList;
+ } else if (param.getBingStates() == 1) {
+ return unbindList;
+ }
+ return list;
+ }
+
+ public List<Pole> isTrue(List<Pole> list, PoleStatesParam param) {
+ List<Pole> isTrue = new ArrayList<>();//瀹炰綋鐏潌
+ List<Pole> isFalse = new ArrayList<>();//铏氭嫙鐏潌
+ list.forEach(bindwarpper -> {
+// Long clientId = bindwarpper.getClientId();
+ if (bindwarpper.getDeviceCode() == null) {
+ isFalse.add(bindwarpper);
+ } else {
+ isTrue.add(bindwarpper);
+ }
+ });
+ if (param.getIsTrue() == 0) {
+ return isTrue;
+ } else if (param.getIsTrue() == 1) {
+ return isFalse;
+ }
+ return list;
+ }
+
+
/**
* 璁剧疆鍦ㄧ嚎鐘舵��
+ *
* @param list
* @return
*/
@@ -327,8 +372,8 @@
*
* @return 鏄惁鎴愬姛
*/
- public boolean unBindPole(String deviceCode) {
- return poleBindingService.unBindPole(deviceCode);
+ public boolean unBindPole(Long poleId, String deviceCode) {
+ return poleBindingService.unBindPole(poleId, deviceCode);
}
@@ -353,22 +398,17 @@
.build();
CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance()
.sendRRPC(deviceName, build);
+
System.out.println(commonFrame.toString());
+
CommonFrame rebootFrame = MainBoardInvokeSyncService.getInstance()
.sendRRPC(deviceName,
FrameBuilder.builderA2().innerFrame(new EmptyRequestInnerFrame())
.orderType(A2OrderEnum.REQUEST_MAIN_BOARD_RESET.getCode()).build());
- if ("00".equals(rebootFrame.getPayload())) {
- System.out.println("閲嶅惎鎴愬姛");
- }
- CommonFrame result = MainBoardInvokeSyncService.getInstance()
- .sendRRPC(deviceName,
- FrameBuilder.builderA2().innerFrame(new EmptyRequestInnerFrame())
- .orderType(A2OrderEnum.REQUEST_MAIN_BOARD_RESET.getCode()).build());
boolean b = false;
- if ("00".equals(result.getPayload())) {
+ if ("00".equals(rebootFrame.getPayload())) {
byId.setDeviceCode(null);
b = updateById(byId);
System.out.println("閲嶅惎鎴愬姛");
@@ -463,16 +503,28 @@
}
Pole pole = new Pole();
- String strh = uniqueMac.substring(uniqueMac.length() - 2, uniqueMac.length());
- pole.setDeviceCode(strh);
- pole.setPoleName(strh);
- String strm = uniqueMac.substring(0, uniqueMac.length() - 2);
- int i = Integer.parseInt(strm);
- pole.setPoleCode(generatePoleCode());
- pole.setDeviceType(i);
- setMac = save(pole);
+ /* String type = uniqueMac.substring(uniqueMac.length() - 2, uniqueMac.length());
+ String Code = uniqueMac.substring(0, uniqueMac.length() - 2);*/
+ pole.setDeviceCode(uniqueMac);
+ pole.setPoleName(uniqueMac);
+ /* int i = Integer.parseInt(strm);*/
+ if ("00".equals(a1DeviceMacRespInnerFrame.getType())) {
+ pole.setDeviceType(0);
+ } else if ("01".equals(a1DeviceMacRespInnerFrame.getType())) {
+ pole.setDeviceType(1);
+ }
- return setMac;
+ pole.setPoleCode(generatePoleCode());
+ Pole one = getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getDeviceCode, uniqueMac));
+// setMac = save(pole);
+ if (one == null) {
+ return save(pole);
+ } else {
+ pole.setId(one.getId());
+ return updateById(pole);
+ }
+
+
}
public List<String> listDeviceCodeByIds(List<Long> poleIdList) {
@@ -522,7 +574,10 @@
if (pole == null) {
throw new BusinessException("鐏潌涓嶅瓨鍦�");
}
- pole.setClientId(clientId);
+ pole.setUserId(clientId);
+ if (!clientService.findClientId(clientId)) {
+ pole.setClientId(clientService.getClientId(clientId));
+ }
r = updateById(pole);
if (!r) {
@@ -532,4 +587,105 @@
}
return r;
}
-}
+
+
+ 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());
+ 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);
+ }
+ ).or(
+ deviceCode -> {
+ deviceCode.like(Pole::getDeviceCode, keyword);
+ }
+ );
+ }
+ List<Pole> list;
+ list = list(eq);
+ setCount(list);
+ setOnline(list);
+ return list;
+ }
+
+
+ /**
+ * 鏍规嵁鐏潌id鏌ヨ鐏潌缁戝畾璁惧
+ *
+ * @return
+ */
+ public PoleBindVO getBindByPoleId(Long poleId) {
+ List<PoleBinding> bind = poleBindingService.list(Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getPoleId, 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