From ae455820d8b96accda128907abe47fcd359ad4af Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 28 二月 2022 14:57:32 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java | 37 +++++++++++++++---
dao/src/main/java/com/sandu/ximon/dao/mapper/MonitorMapper.java | 4 +
ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java | 58 ++++------------------------
dao/src/main/java/com/sandu/ximon/dao/bo/MonitorBo.java | 4 ++
dao/src/main/resources/mapper/MonitorMapper.xml | 8 +++
dao/src/main/java/com/sandu/ximon/dao/domain/Monitor.java | 2
6 files changed, 54 insertions(+), 59 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/bo/MonitorBo.java b/dao/src/main/java/com/sandu/ximon/dao/bo/MonitorBo.java
index e6ef0c6..f9b43a4 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/bo/MonitorBo.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/bo/MonitorBo.java
@@ -11,4 +11,8 @@
public class MonitorBo extends Monitor {
private String poleId;
private String PoleName;
+ private String province;
+ private String city;
+ private String region;
+ private String address;
}
diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/Monitor.java b/dao/src/main/java/com/sandu/ximon/dao/domain/Monitor.java
index e209875..837dd60 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/Monitor.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/domain/Monitor.java
@@ -44,7 +44,7 @@
/**
* 鍦ㄧ嚎鐘舵�侊細0-涓嶅湪绾匡紝1-鍦ㄧ嚎
*/
- private Integer equipmentStatus;
+ private Integer equipmentState;
/**
* 鏄惁鍔犲瘑锛�0-涓嶅姞瀵嗭紝1-鍔犲瘑
diff --git a/dao/src/main/java/com/sandu/ximon/dao/mapper/MonitorMapper.java b/dao/src/main/java/com/sandu/ximon/dao/mapper/MonitorMapper.java
index 8667ec6..7e6d0e3 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/mapper/MonitorMapper.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/mapper/MonitorMapper.java
@@ -15,7 +15,9 @@
List<Monitor> listMonitorByKeyword1(String keyword, int bindingState1, int bindingState2);
- List<MonitorBo> listMonitorByIds(String keyword, Long clientId, int bindingState);
+ List<MonitorBo> listMonitorByIds(String keyword, Long clientId, int bindingState, int equipmentState);
+
+ List<String> listMonitorDeviceSerial();
}
diff --git a/dao/src/main/resources/mapper/MonitorMapper.xml b/dao/src/main/resources/mapper/MonitorMapper.xml
index 1838635..6a7365d 100644
--- a/dao/src/main/resources/mapper/MonitorMapper.xml
+++ b/dao/src/main/resources/mapper/MonitorMapper.xml
@@ -49,7 +49,7 @@
<select id="listMonitorByIds" resultType="com.sandu.ximon.dao.bo.MonitorBo">
SELECT
t1.*, t2.pole_id,
- t3.pole_name
+ t3.pole_name, t3.province,t3.city,t3.region,t3.address
FROM
monitor t1
LEFT JOIN pole_binding t2 ON t1.device_serial = t2.device_code
@@ -68,7 +68,13 @@
<if test="bindingState != 2">
AND t1.binding_state = #{bindingState}
</if>
+ <if test="equipmentState != 2">
+ AND t1.equipment_state = #{equipmentState}
+ </if>
</where>
</select>
+ <select id="listMonitorDeviceSerial" resultType="java.lang.String">
+ SELECT device_serial FROM monitor;
+ </select>
</mapper>
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 6fd0983..d2ac93f 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
@@ -9,6 +9,7 @@
import com.sandu.ximon.admin.service.MonitorService;
import com.sandu.ximon.dao.bo.MonitorBo;
import com.sandu.ximon.dao.domain.Monitor;
+import com.sandu.ximon.dao.mapper.MonitorMapper;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -23,6 +24,9 @@
public class MonitorController {
private final MonitorService monitorService;
+ private final MonitorMapper monitorMapper;
+
+
/**
* 妯＄硦鏌ヨ
*
@@ -30,13 +34,32 @@
*/
@PostMapping("/listMonitor")
public ResponseVO<Object> listMonitorByKeyword(BaseConditionVO baseConditionVO, @RequestBody(required = false) MonitorParam monitorParam) {
- List<MonitorBo> list;
- if (monitorParam == null) {
- list = monitorService.listMonitorByKeyword(baseConditionVO, new MonitorParam());
- } else {
- list = monitorService.listMonitorByKeyword(baseConditionVO, monitorParam);
+// //鏌ヨ鏁版嵁搴撶殑鎽勫儚澶翠俊鎭垪琛�
+// if (monitorParam == null) {
+// list = monitorService.listMonitorByKeyword(baseConditionVO, new MonitorParam());
+// } else {
+// list = monitorService.listMonitorByKeyword(baseConditionVO, monitorParam);
+// }
+
+ List<String> list;
+ list = monitorMapper.listMonitorDeviceSerial();
+
+ MonitorParam monitorParam1;
+ for (String devices_serial : list) {
+ monitorParam1 = new MonitorParam();
+ monitorParam1.setAccessToken(monitorService.getAccessToken());
+ monitorParam1.setDeviceSerial(devices_serial);
+ getYSYMonitorInfoAndaddMonitorToTable(monitorParam1);
}
- return ResponseUtil.successPage(list);
+ //杩斿洖鏌ヨ鐨勬憚鍍忓ご淇℃伅鍒楄〃
+ List<MonitorBo> listresult;
+ if (monitorParam == null) {
+ listresult = monitorService.listMonitorByKeyword(baseConditionVO, new MonitorParam());
+ } else {
+ listresult = monitorService.listMonitorByKeyword(baseConditionVO, monitorParam);
+ }
+
+ return ResponseUtil.successPage(listresult);
}
@@ -141,7 +164,7 @@
monitor.setDevicesCode(monitorParam.getValidateCode());
monitor.setDeviceName(getMonitorDto.getData().getDeviceName());
monitor.setDeviceType(getMonitorDto.getData().getModel());
- monitor.setEquipmentStatus(getMonitorDto.getData().getStatus());
+ monitor.setEquipmentState(getMonitorDto.getData().getStatus());
monitor.setIsEncrypt(getMonitorDto.getData().getIsEncrypt());
monitor.setAddTime(getMonitorDto.getData().getUpdateTime());
monitor.setNetAddress(getMonitorDto.getData().getNetAddress());
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 7e9cbd8..777ba66 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
@@ -58,59 +58,19 @@
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
List<MonitorBo> monitorList;
//缁戝畾鐘舵�侊細宸茬粦瀹�/鏈粦瀹�/鍏ㄩ儴
- if (monitorParam.getBindingState() == null || 2 == monitorParam.getBindingState()) {
+ if (monitorParam.getBindingState() == null) {
//鍏ㄩ儴
- int bindingState = 2;
- monitorList = monitorMapper.listMonitorByIds(monitorParam.getKeyword(), clientId, bindingState);
- } else {
- monitorList = monitorMapper.listMonitorByIds(monitorParam.getKeyword(), clientId, monitorParam.getBindingState());
+ monitorParam.setBindingState(2);
}
+ if (monitorParam.getEquipmentState() == null) {
+ //鍏ㄩ儴
+ monitorParam.setEquipmentState(2);
+ }
+
+ 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);
-// }
/**
* 鍒犻櫎鎽勫儚澶�
--
Gitblit v1.9.3