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/MonitorService.java | 94 ++++++++++++++++++-----------------------------
1 files changed, 36 insertions(+), 58 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 2ccd48e..ebca42b 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
@@ -56,67 +56,21 @@
public List<MonitorBo> listMonitorByKeyword(BaseConditionVO baseConditionVO, MonitorParam monitorParam) {
Long clientId = SecurityUtils.getClientId();
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
- List<Long> listAirEquipmentId;
-
+ List<MonitorBo> monitorList;
//缁戝畾鐘舵�侊細宸茬粦瀹�/鏈粦瀹�/鍏ㄩ儴
- if (monitorParam.getBindingState() == null || 2 == monitorParam.getBindingState()) {
+ if (monitorParam.getBindingState() == null) {
//鍏ㄩ儴
- int bindingState = 2;
- listAirEquipmentId = monitorMapper.listMonitorId(monitorParam.getKeyword(), clientId, bindingState);
- } else {
- listAirEquipmentId = monitorMapper.listMonitorId(monitorParam.getKeyword(), clientId, monitorParam.getBindingState());
+ monitorParam.setBindingState(2);
}
- if (CollUtil.isEmpty(listAirEquipmentId)) {
- return CollUtil.newArrayList();
+ if (monitorParam.getEquipmentState() == null) {
+ //鍏ㄩ儴
+ monitorParam.setEquipmentState(2);
}
- List<MonitorBo> monitorList = monitorMapper.listMonitorByIds(listAirEquipmentId);
+ monitorList = monitorMapper.listMonitorByIds(monitorParam.getKeyword(), clientId, monitorParam.getBindingState(), monitorParam.getEquipmentState());
+
return monitorList;
}
-
-
-// /**
-// * 鏌ヨ鍏ㄩ儴鎽勫儚澶�
-// */
-// public List<Monitor> listMonitor() {
-// LambdaQueryWrapper<Monitor> wrapper = Wrappers.lambdaQuery(Monitor.class);
-// List<Monitor> list = list(wrapper);
-//
-// return list;
-// }
-//
-// /**
-// * 妯＄硦鏌ヨ
-// */
-// public List<Monitor> listMonitorByKeyword(MonitorParam monitorParam) {
-// //璁惧鐘舵��:鍦ㄧ嚎/绂荤嚎/鍏ㄩ儴
-// int equipmentState1;
-// int equipmentState2;
-// if (2 == monitorParam.getEquipmentState()) {
-// //鍦ㄧ嚎
-// equipmentState1 = 1;
-// //绂荤嚎
-// equipmentState2 = 0;
-// } else {
-// equipmentState1 = monitorParam.getEquipmentState();
-// equipmentState2 = monitorParam.getEquipmentState();
-// }
-//
-// //缁戝畾鐘舵�侊細宸茬粦瀹�/鏈粦瀹�/鍏ㄩ儴
-// int bindingState1;
-// int bindingState2;
-// if (2 == monitorParam.getBindingState()) {
-// //宸茬粦瀹�
-// bindingState1 = 1;
-// //鏈粦瀹�
-// bindingState2 = 0;
-// } else {
-// bindingState1 = monitorParam.getBindingState();
-// bindingState2 = monitorParam.getBindingState();
-// }
-//// return monitorMapper.listMonitorByKeyword(monitorParam.getKeyword(), equipmentState1, equipmentState2, bindingState1, bindingState2);
-// return monitorMapper.listMonitorByKeyword1(baseConditionVO, monitorParam.getKeyword(), bindingState1, bindingState2);
-// }
/**
* 鍒犻櫎鎽勫儚澶�
@@ -131,7 +85,7 @@
}
//鍒犻櫎鎽勫儚澶磋澶囧墠闇�瑕佸厛瑙ｇ粦
- poleBindingService.unBindPole(monitor.getDeviceSerial());
+ poleBindingService.unBindPole(null, monitor.getDeviceSerial());
return removeById(Id);
}
@@ -153,14 +107,15 @@
*
* @param accessToken 鎺堟潈杩囩▼鑾峰彇鐨刟ccess_token
* @param deviceSerial 璁惧搴忓垪鍙�,瀛樺湪鑻辨枃瀛楁瘝鐨勮澶囧簭鍒楀彿锛屽瓧姣嶉渶涓哄ぇ鍐�
- * @param validateCode 璁惧楠岃瘉鐮侊紝璁惧鏈鸿韩涓婄殑鍏綅澶у啓瀛楁瘝
+ * // * @param validateCode 璁惧楠岃瘉鐮侊紝璁惧鏈鸿韩涓婄殑鍏綅澶у啓瀛楁瘝
*/
- public YSY_MonitorDto addYSYMonitor(String accessToken, String deviceSerial, String validateCode) {
+// public YSY_MonitorDto addYSYMonitor(String accessToken, String deviceSerial, String validateCode) {
+ public YSY_MonitorDto addYSYMonitor(String accessToken, String deviceSerial) {
Map<String, Object> paramMap = new HashMap<>();
paramMap.put("accessToken", accessToken);
paramMap.put("deviceSerial", deviceSerial);
- paramMap.put("validateCode", validateCode);
+// 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);
@@ -267,5 +222,28 @@
}
}
+ /**
+ * 淇敼璁惧缁戝畾鐘舵��
+ *
+ * @param flag true涓虹粦瀹� false 涓鸿В缁�
+ */
+ public void updateBingdingState(boolean flag, String deviceCode) {
+ if (flag) {//缁戝畾
+ Monitor monitor = getOne(Wrappers.lambdaQuery(Monitor.class).eq(Monitor::getDeviceSerial, deviceCode));
+ if (monitor == null) {
+ return;
+ }
+ monitor.setBindingState(1);
+ updateById(monitor);
+ } else {//瑙ｇ粦
+ Monitor monitor = getOne(Wrappers.lambdaQuery(Monitor.class).eq(Monitor::getDeviceSerial, deviceCode));
+ if (monitor == null) {
+ return;
+ }
+ monitor.setBindingState(0);
+ updateById(monitor);
+ }
+ }
+
}
--
Gitblit v1.9.3