From 34cc9fb821d30b64947c8a62d952f1621a515149 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 21 三月 2022 10:32:51 +0800
Subject: [PATCH] 普通用户修改密码
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java | 384 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 358 insertions(+), 26 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 bc8b7a7..d591e72 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
@@ -4,6 +4,7 @@
import cn.hutool.core.util.StrUtil;
import com.aliyuncs.iot.model.v20180120.BatchGetDeviceStateResponse;
import com.aliyuncs.iot.model.v20180120.QueryDeviceDetailResponse;
+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;
@@ -27,9 +28,12 @@
import com.sandu.ximon.admin.manager.iot.rrpc.mainboard.MainBoardInvokeSyncService;
import com.sandu.ximon.admin.param.PoleBindingParam;
import com.sandu.ximon.admin.param.PoleParam;
+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.dao.domain.Pole;
+import com.sandu.ximon.dao.domain.PoleBinding;
+import com.sandu.ximon.dao.domain.PoleGroupRelation;
import com.sandu.ximon.dao.mapper.PoleMapper;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -55,6 +59,7 @@
private final RedisService redisService;
private final PoleBindingService poleBindingService;
+ private final PoleGroupRelationService groupRelationService;
public boolean addPole(PoleParam param) {
Pole pole = new Pole();
@@ -105,22 +110,287 @@
}
+ 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());
+ }
+ if (!param.getKeyword().isEmpty()) {
+ wrapper.like(Pole::getPoleCode, param.getKeyword()).or(
+ wrappers -> {
+ wrappers.like(Pole::getPoleName, param.getKeyword());
+ }
+ );
+ }
+
+ 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<>();
+ List<PoleGroupRelation> relations = groupRelationService.list(Wrappers.lambdaQuery(PoleGroupRelation.class)
+ .eq(PoleGroupRelation::getPoleGroupId, param.getGroupid()));
+ relations.forEach(relation -> {
+ pole.add(getById(relation.getPoleId()));
+ }
+ );
+ list = pole;
+ }
+
+// List<Pole> bind = isBind(list, param);
+// List<Pole> aTrue = isTrue(list, param);
+// List<Pole> onLine = isOnLine(list, param);
+
+ 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 {//鍏ㄩ儴鐏潌 瀹炰綋/铏氭嫙
+ if (param.getOnLineStates() != 2) { //鏌ヨ鍏ㄩ儴鐏潌鏄惁鍦ㄧ嚎
+ list = isOnLine(list, param);
+ }
+ }
+ }else {//鍏ㄩ儴 缁戝畾/鏈粦瀹�
+ if (param.getIsTrue() != 2) {// 鍒ゆ柇鐏潌绫诲瀷
+ list = isTrue(list, param);// 瀹炰綋/铏氭嫙
+ if (param.getOnLineStates() != 2) {// 鐏潌鐨勫湪绾垮垽鏂�
+ list = isOnLine(list, param);//鍦ㄧ嚎/绂荤嚎
+ }
+ }else {//鍏ㄧ被鍨嬬伅鏉�
+ if (param.getOnLineStates() != 2) {//鍒ゆ柇鍦ㄧ嚎鐘舵��
+ list = isOnLine(list, param);//鍦ㄧ嚎/绂荤嚎
+ }
+ }
+ }
+
+
+// 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);
+// }
+// } else {
+// bindList.add(bindwarpper);
+// if (bindwarpper.getDeviceCode() == null) {
+// isFalse.add(bindwarpper);
+// } else {
+// isTrue.add(bindwarpper);
+// }
+// }
+// });
+// if (param.getBingStates() == 1) { //鏈粦瀹�
+// list = unbindList;
+// } else if (param.getBingStates() == 0) {//宸茬粦瀹�
+// list = bindList;
+// }// else {//鍏ㄩ儴
+//// list = list(wrapper);
+//// }
+//
+// if (param.getIsTrue() == 1) { //铏氭嫙鐏潌
+// list = isFalse;
+// } else if (param.getIsTrue() == 0) {//瀹炰綋鐏潌
+// setOnline(list);
+// list = isTrue;
+// 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);
+// }
+// });
+// } 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);
+// }
+// });
+// }
+//
+// if (param.getOnLineStates() == 1) { //绂荤嚎
+// list = offline;
+// } else if (param.getOnLineStates() == 0) {//鍦ㄧ嚎
+// list = online;
+// }
+ setCount(list);
+ return list;
+ }
+
+ /**
+ * 璁剧疆缁戝畾璁惧鏁伴噺
+ *
+ * @param list
+ * @return
+ */
+ public List<Pole> setCount(List<Pole> list) {
+ for (Pole post : list) {
+ int size = poleBindingService.list(Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getPoleId, post.getId())).size();
+// System.out.println("size:----------------------"+size);
+ post.setBindingCount(size);
+ }
+ 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
+ */
+ public List<Pole> setOnline(List<Pole> list) {
+
+ List<String> MacCodes = new ArrayList<>();
+
+ for (Pole post : list) {
+ if (post.getDeviceCode() != null) {
+ MacCodes.add(post.getDeviceCode());
+ }
+ }
+//
+ List<BatchGetDeviceStateResponse.DeviceStatus> deviceStatuses = MainBoardInvokeSyncService.getInstance().batchGetDeviceState(MacCodes);
+ if (deviceStatuses != null) {
+ for (Pole post : list) {
+ for (BatchGetDeviceStateResponse.DeviceStatus deviceStatus : deviceStatuses) {
+// System.out.println("DeviceCode:---------------------"+post.getDeviceCode());
+// System.out.println("DeviceName:---------------------"+deviceStatus.getDeviceName());
+ if (post.getDeviceCode() != null && post.getDeviceCode().equals(deviceStatus.getDeviceName())) {
+ post.setOnLineState(deviceStatus.getStatus());
+// int size = poleBindingService.list(Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getPoleId, post.getId())).size();
+//// System.out.println("size:----------------------"+size);
+// post.setBindingCount(size);
+ }
+ }
+ // MacCodes.add(post.getDeviceCode());
+ }
+ }
+
+ return list;
+ }
+
+
/**
* 鏌ヨ鐏潌鐨勫湪绾跨姸鎬佸苟璧嬪��
*
* @return
*/
- public List<Pole> queryStatesAndList(Integer pageNo,Integer pageSize) {
+ public List<Pole> queryStatesAndList(Integer pageNo, Integer pageSize, String keyword, Long groupid) {
// 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);
+ PageHelper.startPage(pageNo, pageSize);
List<Pole> list = new ArrayList<>();
+ LambdaQueryWrapper<Pole> wrapper = new LambdaQueryWrapper<>();
if (SecurityUtils.getClientId() == null) {
- list = list(Wrappers.lambdaQuery(Pole.class));
+ wrapper = Wrappers.lambdaQuery(Pole.class);
} else {
- list = list(Wrappers.lambdaQuery(Pole.class).eq(Pole::getClientId, SecurityUtils.getUserId()));
+ wrapper = Wrappers.lambdaQuery(Pole.class).eq(Pole::getClientId, SecurityUtils.getUserId());
}
-
+ if (!keyword.isEmpty()) {
+ wrapper.like(Pole::getPoleCode, keyword).or(
+ wrappers -> {
+ wrappers.like(Pole::getPoleName, keyword);
+ }
+ );
+ }
+ list = list(wrapper);
List<String> MacCodes = new ArrayList<>();
for (Pole post : list) {
@@ -129,8 +399,13 @@
List<BatchGetDeviceStateResponse.DeviceStatus> deviceStatuses = MainBoardInvokeSyncService.getInstance().batchGetDeviceState(MacCodes);
for (Pole post : list) {
for (BatchGetDeviceStateResponse.DeviceStatus deviceStatus : deviceStatuses) {
- if (post.getDeviceCode().equals(deviceStatus.getDeviceName())) {
+// System.out.println("DeviceCode:---------------------"+post.getDeviceCode());
+// System.out.println("DeviceName:---------------------"+deviceStatus.getDeviceName());
+ if (post.getDeviceCode() != null && post.getDeviceCode().equals(deviceStatus.getDeviceName())) {
post.setOnLineState(deviceStatus.getStatus());
+ int size = poleBindingService.list(Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getPoleId, post.getId())).size();
+// System.out.println("size:----------------------"+size);
+ post.setBindingCount(size);
}
}
// MacCodes.add(post.getDeviceCode());
@@ -156,6 +431,15 @@
return poleBindingService.bindPole(poleId, param);
}
+ /**
+ * 鐏潌瑙ｇ粦缁戝畾璁惧
+ *
+ * @return 鏄惁鎴愬姛
+ */
+ public boolean unBindPole(Long poleId, String deviceCode) {
+ return poleBindingService.unBindPole(poleId, deviceCode);
+ }
+
/**
* 鐏潌鎭㈠鍑哄巶璁剧疆
@@ -178,22 +462,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("閲嶅惎鎴愬姛");
@@ -205,16 +484,15 @@
/**
* 缁欑伅鏉嗘敞鍐屼笁鍏冪爜
*/
-
-
- public boolean setMac(Long poleId) {
- Pole pole = getById(poleId);
- if (pole == null) {
+ public boolean setMac(String baseMac) {
+ // public boolean setMac() {
+ //Pole pole = getById(poleId);
+ /* if (pole == null) {
throw new BusinessException("鏈壘鍒拌鐏潌");
- }
+ }*/
boolean setMac = false;
- String baseMac = "baseDevice";
+ //String baseMac = "baseDevice";
A1Frame a1Frame = new A1Frame(A1OrderEnum.REQUEST_READ_DEVICE_UNIQUE_MAC.getCode(), new EmptyRequestInnerFrame());
CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance()
.sendRRPC(baseMac, a1Frame);
@@ -225,6 +503,10 @@
log.info(commonFrame.toString());
String uniqueMac = a1DeviceMacRespInnerFrame.getMac();
uniqueMac = uniqueMac.toLowerCase();
+
+ if (uniqueMac.isEmpty()) {
+ throw new BusinessException("璇诲彇璁惧鍞竴ID澶辫触!");
+ }
log.info("鍞竴鐮亄}", uniqueMac);
// 2 浠庨樋閲屾敞鍐�
@@ -277,17 +559,41 @@
FrameBuilder.builderA2().innerFrame(new EmptyRequestInnerFrame())
.orderType(A2OrderEnum.REQUEST_MAIN_BOARD_RESET.getCode()).build());
if ("00".equals(rebootFrame.getPayload())) {
- pole.setDeviceCode(uniqueMac);
+ // pole.setDeviceCode(uniqueMac);
- setMac = updateById(pole);
+ // setMac = updateById(pole);
System.out.println("閲嶅惎鎴愬姛");
}
- return setMac;
+
+ Pole pole = new 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);
+ }
+
+ 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) {
- if(CollectionUtil.isEmpty(poleIdList)){
+ if (CollectionUtil.isEmpty(poleIdList)) {
return null;
}
List<Pole> list = list(Wrappers.lambdaQuery(Pole.class).in(Pole::getId, poleIdList).select(Pole::getDeviceCode));
@@ -297,6 +603,7 @@
/**
* 鎵归噺鑾峰彇闃块噷浜戣澶囩殑鐘舵��
+ *
* @param deviceCodeList 闃块噷浜戣澶囩爜
* @return 璁惧鐘舵�佸垪琛�
*/
@@ -306,7 +613,7 @@
List<DeviceStatus> statusList = new ArrayList<>();
for (List<String> list : split) {
List<BatchGetDeviceStateResponse.DeviceStatus> deviceStatuses = MainBoardInvokeSyncService.getInstance().batchGetDeviceState(list);
- if(CollectionUtil.isNotEmpty(deviceStatuses)){
+ if (CollectionUtil.isNotEmpty(deviceStatuses)) {
for (BatchGetDeviceStateResponse.DeviceStatus d : deviceStatuses) {
DeviceStatus deviceStatus = new DeviceStatus();
deviceStatus.setDeviceCode(d.getDeviceName());
@@ -317,4 +624,29 @@
}
return statusList;
}
+
+ /**
+ * 鐢ㄦ埛缁戝畾鐏潌
+ *
+ * @param clientId 鐢ㄦ埛ID
+ * @param poleIds 鐏潌ID
+ * @return
+ */
+ public boolean ClientBindingPole(long clientId, int[] poleIds) {
+ boolean r = false;
+ for (int poleId : poleIds) {
+ Pole pole = getById(poleId);
+ if (pole == null) {
+ throw new BusinessException("鐏潌涓嶅瓨鍦�");
+ }
+ pole.setClientId(clientId);
+ r = updateById(pole);
+
+ if (!r) {
+ throw new BusinessException("鐏潌ID涓�" + poleId + "璁剧疆澶辫触,鑷姩鍋滄");
+ }
+
+ }
+ return r;
+ }
}
--
Gitblit v1.9.3