From 9ad1c8159544ed36729cffa66cb13b7e60fa46ec Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期三, 04 二月 2026 17:22:45 +0800
Subject: [PATCH] 客户问题优3-云台控制及监控同步
---
fzzy-igdss-web/src/main/resources/templates/security/video-list-dept.html | 2
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SecCameraService.java | 2
fzzy-igdss-web/src/main/resources/application-pro.yml | 50 ++++++++++++++++
fzzy-igdss-web/src/main/resources/application.yml | 4
fzzy-igdss-web/src/main/resources/static/security/video-control.js | 21 ++++++-
fzzy-igdss-web/src/main/resources/application-pro5372.yml | 50 ++++++++++++++++
fzzy-igdss-core/src/main/java/com/fzzy/igds/camera/impl/ApiPlayYdQlyService.java | 1
fzzy-igdss-web/src/main/java/com/fzzy/security/SecurityController.java | 4 +
8 files changed, 126 insertions(+), 8 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/camera/impl/ApiPlayYdQlyService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/camera/impl/ApiPlayYdQlyService.java
index d858cf5..bfbe417 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/camera/impl/ApiPlayYdQlyService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/camera/impl/ApiPlayYdQlyService.java
@@ -142,6 +142,7 @@
camera.setSn(dto.getDeviceId());
camera.setName(dto.getDeviceName());
camera.setType("01");
+ camera.setOrderNum(null);
camera.setPlayType(CameraPlayType.PLAY_TYPE_YD_QLY.getCode());
cameraService.pullUpdateCamera(camera);
}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SecCameraService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SecCameraService.java
index cfb1b9c..9ef68de 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SecCameraService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SecCameraService.java
@@ -51,7 +51,7 @@
if(StringUtils.isNotBlank(param.getSpdwlx())){
queryWrapper.eq("spdwlx", param.getSpdwlx());
}
-
+ queryWrapper.orderByAsc("order_num");
cameraMapper.selectPage(page, queryWrapper);
}
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/security/SecurityController.java b/fzzy-igdss-web/src/main/java/com/fzzy/security/SecurityController.java
index e82d168..7df183d 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/security/SecurityController.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/security/SecurityController.java
@@ -90,6 +90,10 @@
}
view.put("showDeptList", showDeptList);
+ //搴撳尯缃戝叧淇℃伅
+ GatewaySer gatewaySer = commonManager.getGatewaySerByDeptId(deptId);
+ view.put("gatewaySer", gatewaySer);
+
//榛樿鐩戞帶鍒楄〃椤甸潰
String viewUrl = prefix + "/video-list-dept";
diff --git a/fzzy-igdss-web/src/main/resources/application-pro.yml b/fzzy-igdss-web/src/main/resources/application-pro.yml
index 41e972a..4c6663d 100644
--- a/fzzy-igdss-web/src/main/resources/application-pro.yml
+++ b/fzzy-igdss-web/src/main/resources/application-pro.yml
@@ -116,4 +116,52 @@
email: business@fzzygf.com
phone: 400-627-1116
website: http://www.fzzygf.com
- address: 閮戝窞甯傞珮鏂板尯闀挎た璺�11鍙锋渤鍗楃渷鍥藉澶у绉戞妧鍥鍖�1鍙锋ゼ
\ No newline at end of file
+ address: 閮戝窞甯傞珮鏂板尯闀挎た璺�11鍙锋渤鍗楃渷鍥藉澶у绉戞妧鍥鍖�1鍙锋ゼ
+
+# Shiro
+shiro:
+ user:
+ # 鐧诲綍鍦板潃
+ loginUrl: /login
+ # 鏉冮檺璁よ瘉澶辫触鍦板潃
+ unauthorizedUrl: /unauth
+ # 棣栭〉鍦板潃
+ indexUrl: /index
+ # 楠岃瘉鐮佸紑鍏�
+ captchaEnabled: true
+ # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
+ captchaType: math
+ cookie:
+ # 璁剧疆Cookie鐨勫煙鍚� 榛樿绌猴紝鍗冲綋鍓嶈闂殑鍩熷悕
+ domain:
+ # 璁剧疆cookie鐨勬湁鏁堣闂矾寰�
+ path: /
+ # 璁剧疆HttpOnly灞炴��
+ httpOnly: true
+ # 璁剧疆Cookie鐨勮繃鏈熸椂闂达紝澶╀负鍗曚綅
+ maxAge: 30
+ # 璁剧疆瀵嗛挜锛屽姟蹇呬繚鎸佸敮涓�鎬э紙鐢熸垚鏂瑰紡锛岀洿鎺ユ嫹璐濆埌main杩愯鍗冲彲锛塀ase64.encodeToString(CipherUtils.generateNewKey(128, "AES").getEncoded()) 锛堥粯璁ゅ惎鍔ㄧ敓鎴愰殢鏈虹閽ワ紝闅忔満绉橀挜浼氬鑷翠箣鍓嶅鎴风RememberMe Cookie鏃犳晥锛屽璁剧疆鍥哄畾绉橀挜RememberMe Cookie鍒欐湁鏁堬級
+ cipherKey:
+ session:
+ # Session瓒呮椂鏃堕棿锛�-1浠ｈ〃姘镐笉杩囨湡锛堥粯璁�30鍒嗛挓锛�
+ expireTime: -1
+ # 鍚屾session鍒版暟鎹簱鐨勫懆鏈燂紙榛樿1鍒嗛挓锛�
+ dbSyncPeriod: 1
+ # 鐩搁殧澶氫箙妫�鏌ヤ竴娆ession鐨勬湁鏁堟�э紝榛樿灏辨槸10鍒嗛挓
+ validationInterval: 10
+ # 鍚屼竴涓敤鎴锋渶澶т細璇濇暟锛屾瘮濡�2鐨勬剰鎬濇槸鍚屼竴涓处鍙峰厑璁告渶澶氬悓鏃朵袱涓汉鐧诲綍锛堥粯璁�-1涓嶉檺鍒讹級
+ maxSession: -1
+ # 韪㈠嚭涔嬪墠鐧诲綍鐨�/涔嬪悗鐧诲綍鐨勭敤鎴凤紝榛樿韪㈠嚭涔嬪墠鐧诲綍鐨勭敤鎴�
+ kickoutAfter: false
+ rememberMe:
+ # 鏄惁寮�鍚浣忔垜
+ enabled: true
+
+# 闃叉XSS鏀诲嚮
+xss:
+ # 杩囨护寮�鍏�
+ enabled: true
+ # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
+ excludes: /system/notice/*
+ # 鍖归厤閾炬帴
+ urlPatterns: /system/*,/monitor/*,/tool/*
\ No newline at end of file
diff --git a/fzzy-igdss-web/src/main/resources/application-pro5372.yml b/fzzy-igdss-web/src/main/resources/application-pro5372.yml
index 41e972a..4c6663d 100644
--- a/fzzy-igdss-web/src/main/resources/application-pro5372.yml
+++ b/fzzy-igdss-web/src/main/resources/application-pro5372.yml
@@ -116,4 +116,52 @@
email: business@fzzygf.com
phone: 400-627-1116
website: http://www.fzzygf.com
- address: 閮戝窞甯傞珮鏂板尯闀挎た璺�11鍙锋渤鍗楃渷鍥藉澶у绉戞妧鍥鍖�1鍙锋ゼ
\ No newline at end of file
+ address: 閮戝窞甯傞珮鏂板尯闀挎た璺�11鍙锋渤鍗楃渷鍥藉澶у绉戞妧鍥鍖�1鍙锋ゼ
+
+# Shiro
+shiro:
+ user:
+ # 鐧诲綍鍦板潃
+ loginUrl: /login
+ # 鏉冮檺璁よ瘉澶辫触鍦板潃
+ unauthorizedUrl: /unauth
+ # 棣栭〉鍦板潃
+ indexUrl: /index
+ # 楠岃瘉鐮佸紑鍏�
+ captchaEnabled: true
+ # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
+ captchaType: math
+ cookie:
+ # 璁剧疆Cookie鐨勫煙鍚� 榛樿绌猴紝鍗冲綋鍓嶈闂殑鍩熷悕
+ domain:
+ # 璁剧疆cookie鐨勬湁鏁堣闂矾寰�
+ path: /
+ # 璁剧疆HttpOnly灞炴��
+ httpOnly: true
+ # 璁剧疆Cookie鐨勮繃鏈熸椂闂达紝澶╀负鍗曚綅
+ maxAge: 30
+ # 璁剧疆瀵嗛挜锛屽姟蹇呬繚鎸佸敮涓�鎬э紙鐢熸垚鏂瑰紡锛岀洿鎺ユ嫹璐濆埌main杩愯鍗冲彲锛塀ase64.encodeToString(CipherUtils.generateNewKey(128, "AES").getEncoded()) 锛堥粯璁ゅ惎鍔ㄧ敓鎴愰殢鏈虹閽ワ紝闅忔満绉橀挜浼氬鑷翠箣鍓嶅鎴风RememberMe Cookie鏃犳晥锛屽璁剧疆鍥哄畾绉橀挜RememberMe Cookie鍒欐湁鏁堬級
+ cipherKey:
+ session:
+ # Session瓒呮椂鏃堕棿锛�-1浠ｈ〃姘镐笉杩囨湡锛堥粯璁�30鍒嗛挓锛�
+ expireTime: -1
+ # 鍚屾session鍒版暟鎹簱鐨勫懆鏈燂紙榛樿1鍒嗛挓锛�
+ dbSyncPeriod: 1
+ # 鐩搁殧澶氫箙妫�鏌ヤ竴娆ession鐨勬湁鏁堟�э紝榛樿灏辨槸10鍒嗛挓
+ validationInterval: 10
+ # 鍚屼竴涓敤鎴锋渶澶т細璇濇暟锛屾瘮濡�2鐨勬剰鎬濇槸鍚屼竴涓处鍙峰厑璁告渶澶氬悓鏃朵袱涓汉鐧诲綍锛堥粯璁�-1涓嶉檺鍒讹級
+ maxSession: -1
+ # 韪㈠嚭涔嬪墠鐧诲綍鐨�/涔嬪悗鐧诲綍鐨勭敤鎴凤紝榛樿韪㈠嚭涔嬪墠鐧诲綍鐨勭敤鎴�
+ kickoutAfter: false
+ rememberMe:
+ # 鏄惁寮�鍚浣忔垜
+ enabled: true
+
+# 闃叉XSS鏀诲嚮
+xss:
+ # 杩囨护寮�鍏�
+ enabled: true
+ # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
+ excludes: /system/notice/*
+ # 鍖归厤閾炬帴
+ urlPatterns: /system/*,/monitor/*,/tool/*
\ No newline at end of file
diff --git a/fzzy-igdss-web/src/main/resources/application.yml b/fzzy-igdss-web/src/main/resources/application.yml
index 08bf4b5..1a6adb9 100644
--- a/fzzy-igdss-web/src/main/resources/application.yml
+++ b/fzzy-igdss-web/src/main/resources/application.yml
@@ -20,7 +20,7 @@
# Spring鍩虹閰嶇疆
spring:
profiles:
- active: dev
+ active: pro
main:
allow-bean-definition-overriding: true
thymeleaf:
@@ -156,7 +156,7 @@
cipherKey:
session:
# Session瓒呮椂鏃堕棿锛�-1浠ｈ〃姘镐笉杩囨湡锛堥粯璁�30鍒嗛挓锛�
- expireTime: 30
+ expireTime: -1
# 鍚屾session鍒版暟鎹簱鐨勫懆鏈燂紙榛樿1鍒嗛挓锛�
dbSyncPeriod: 1
# 鐩搁殧澶氫箙妫�鏌ヤ竴娆ession鐨勬湁鏁堟�э紝榛樿灏辨槸10鍒嗛挓
diff --git a/fzzy-igdss-web/src/main/resources/static/security/video-control.js b/fzzy-igdss-web/src/main/resources/static/security/video-control.js
index c2b107f..cb15b21 100644
--- a/fzzy-igdss-web/src/main/resources/static/security/video-control.js
+++ b/fzzy-igdss-web/src/main/resources/static/security/video-control.js
@@ -30,26 +30,41 @@
//浜戝彴鎺у埗
function ptzControl(command) {
+ if (!gatewaySer) {
+ layer.msg("鏈幏鍙栧埌搴撳尯缃戝叧淇℃伅锛屼簯鍙版帶鍒跺け璐ワ紒");
+ return;
+ }
+ var url = "http://" + gatewaySer.ip + ":" + gatewaySer.apiPort + gatewaySer.ptzUrl;
+
// layer.msg('寮�濮嬭皟鐢ㄤ簯鍙扳�︹��', {icon: 1, time: 1200,offset:'rb'});
const param = getParam(command, null);
- const url = "/security/ptz-media";
sendControlCommand(url, param);
}
//棰勭疆浣嶆帶鍒�
function presetControl(command) {
+ if (!gatewaySer) {
+ layer.msg("鏈幏鍙栧埌搴撳尯缃戝叧淇℃伅锛屼簯鍙版帶鍒跺け璐ワ紒");
+ return;
+ }
+ var url = "http://" + gatewaySer.ip + ":" + gatewaySer.apiPort + gatewaySer.ptzUrl;
+
//layer.msg('寮�濮嬫墽琛屸�︹��', {icon: 1, time: 1200,offset:'rb'});
const preset = $("#preset").val();
const param = getParam(command, preset);
- const url = "/security/ptz-media";
sendControlCommand(url, param);
}
//鍋滄绉诲姩
function moveStop() {
+ if (!gatewaySer) {
+ layer.msg("鏈幏鍙栧埌搴撳尯缃戝叧淇℃伅锛屼簯鍙版帶鍒跺け璐ワ紒");
+ return;
+ }
+ var url = "http://" + gatewaySer.ip + ":" + gatewaySer.apiPort + gatewaySer.ptzUrl;
+
//layer.msg('寮�濮嬭皟鐢ㄤ簯鍙扳�︹��', {icon: 1, time: 1200,offset:'rb'});
const param = getParam(0, null);
- const url = "/security/ptz-media";
sendControlCommand(url, param);
}
diff --git a/fzzy-igdss-web/src/main/resources/templates/security/video-list-dept.html b/fzzy-igdss-web/src/main/resources/templates/security/video-list-dept.html
index 489bad1..8c36899 100644
--- a/fzzy-igdss-web/src/main/resources/templates/security/video-list-dept.html
+++ b/fzzy-igdss-web/src/main/resources/templates/security/video-list-dept.html
@@ -470,6 +470,8 @@
var listCamera = [[${listCamera}]];
var type = [[${type}]];
var lan = [[${lan}]];
+ //缃戝叧淇℃伅
+ var gatewaySer = [[${gatewaySer}]];
</script>
<script th:src="@{/js/jquery.min.js}"></script>
<script th:src="@{/ajax/libs/layui/layui.js}"></script>
--
Gitblit v1.9.3