From d877cf557db5452093087fabb4479a10497ee218 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 28 二月 2022 18:25:32 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java | 70 +++++++++++++++--------------------
1 files changed, 30 insertions(+), 40 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 58d05ff..345b129 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
@@ -1,13 +1,19 @@
package com.sandu.ximon.admin.service;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson.JSON;
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;
+import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.param.MonitorParam;
+import com.sandu.ximon.admin.security.SecurityUtils;
+import com.sandu.ximon.dao.bo.AirEquipmentBo;
+import com.sandu.ximon.dao.bo.MonitorBo;
import com.sandu.ximon.dao.domain.Monitor;
import com.sandu.ximon.admin.dto.YSY_AccessTokenDto;
import com.sandu.ximon.admin.dto.YSY_MonitorDto;
@@ -45,46 +51,25 @@
private final PoleBindingService poleBindingService;
/**
- * 鏌ヨ鍏ㄩ儴鎽勫儚澶�
- */
- 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();
+ public List<MonitorBo> listMonitorByKeyword(BaseConditionVO baseConditionVO, MonitorParam monitorParam) {
+ Long clientId = SecurityUtils.getClientId();
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ List<MonitorBo> monitorList;
+ //缁戝畾鐘舵�侊細宸茬粦瀹�/鏈粦瀹�/鍏ㄩ儴
+ if (monitorParam.getBindingState() == null) {
+ //鍏ㄩ儴
+ monitorParam.setBindingState(2);
+ }
+ if (monitorParam.getEquipmentState() == null) {
+ //鍏ㄩ儴
+ monitorParam.setEquipmentState(2);
}
- //缁戝畾鐘舵�侊細宸茬粦瀹�/鏈粦瀹�/鍏ㄩ儴
- 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(monitorParam.getKeyword(), bindingState1, bindingState2);
+ monitorList = monitorMapper.listMonitorByIds(monitorParam.getKeyword(), clientId, monitorParam.getBindingState(), monitorParam.getEquipmentState());
+
+ return monitorList;
}
/**
@@ -122,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);
@@ -217,11 +203,15 @@
* @param deviceSerial
* @return
*/
- public String getMonitorVideoUrl(String accessToken, String deviceSerial, int protocol) {
+ public String getMonitorVideoUrl(String accessToken, String deviceSerial, int protocol, int expireTime) {
+ if (expireTime < 30 || expireTime > 62208000) {
+ throw new BusinessException("璁剧疆鐨刄RL鎾斁鍦板潃杩囨湡鏃堕暱鏁版嵁閿欒");
+ }
Map<String, Object> paramMap = new HashMap<>();
paramMap.put("accessToken", accessToken);
paramMap.put("deviceSerial", deviceSerial);
paramMap.put("protocol", protocol);
+ paramMap.put("expireTime", expireTime);
String s = HttpUtil.post(YSY_URL + GET_VEDIO_URL, paramMap);
System.out.println(s);
YSY_MonitorDto monitor = JSON.parseObject(s, YSY_MonitorDto.class);
--
Gitblit v1.9.3