From d803609b8a2e43afcf5921f42f29ce7f6e68fb84 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期三, 08 十一月 2023 17:02:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/alarm/radar/service/impl/ArdRadarServiceImpl.java | 26 ++-
ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/controller/HikSdkController.java | 4
ard-work/src/main/java/com/ruoyi/device/radar/controller/ArdEquipRadarController.java | 5
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java | 53 ++----
ard-work/src/main/java/com/ruoyi/inspect/service/impl/InspectionTaskManager.java | 2
ard-work/src/main/resources/mapper/device/ArdEquipRadarMapper.xml | 11
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SyncTask.java | 8
ard-work/src/main/java/com/ruoyi/device/camera/factory/CameraSDK.java | 9
ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties | 2
ard-work/src/main/java/com/ruoyi/device/camera/service/impl/CameraSdkServiceImpl.java | 114 ++++++++--------
/dev/null | 43 ------
ard-work/src/main/java/com/ruoyi/device/radar/mapper/ArdEquipRadarMapper.java | 5
ruoyi-admin/src/main/resources/i18n/messages_en_US.properties | 3
ard-work/src/main/java/com/ruoyi/utils/gis/GisUtil.java | 8
ard-work/src/main/java/com/ruoyi/device/camera/factory/CameraSDKFactory.java | 42 ++++++
ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/service/impl/HikvisionSDK.java | 5
ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java | 13 +
ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/controller/DhSdkController.java | 4
ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/lib/LoginResultCallBack.java | 4
ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/service/impl/DahuaSDK.java | 6
20 files changed, 180 insertions(+), 187 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java b/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java
index cbfef91..317fd15 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java
@@ -39,6 +39,7 @@
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.DictUtils;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.device.camera.domain.CameraCmd;
import com.ruoyi.device.external.domain.ArdEquipExternal;
import com.ruoyi.device.external.mapper.ArdEquipExternalMapper;
import com.ruoyi.device.radar.mapper.ArdEquipRadarMapper;
@@ -51,6 +52,7 @@
import com.ruoyi.utils.tube.GeoPoint;
import com.ruoyi.utils.tube.TubeTools;
import lombok.extern.slf4j.Slf4j;
+import org.gavaghan.geodesy.GlobalCoordinates;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
@@ -1020,7 +1022,6 @@
} else {
//鍚﹀垯姣斿鏇存柊鏃堕棿
Date lastUpdateTime = lastMoveData.getUpdateTime();
-
Date lastGuideTime = lastMoveData.getGuideTime();
long secDatePoor = DateUtils.getSecDatePoor(alarmTime,lastUpdateTime);
if (secDatePoor <= radarMergeTime) {
@@ -1374,11 +1375,11 @@
int index = name.indexOf("(");
String alarmpointName = name.substring(0, index);
//鑾峰彇闆疯揪鎵�鍦ㄥ涓婄殑澶у厜鐢�
- String cameraIdWithTower = ardEquipRadarMapper.getCameraByRadar(radarId);
- if (StringUtils.isNotNull(cameraIdWithTower) && StringUtils.isNotEmpty(cameraIdWithTower)) {
- log.debug("鑾峰彇鍒伴浄杈惧涓婄殑鍏夌數:" + cameraIdWithTower);
+ ArdCameras cameraWithTower = ardEquipRadarMapper.getCameraByRadar(radarId);
+ if (StringUtils.isNotNull(cameraWithTower)) {
+ log.debug("鑾峰彇鍒伴浄杈惧涓婄殑鍏夌數:" + cameraWithTower.getId());
//濡傛灉闆疯揪濉斾笂鏈夊厜鐢�
- messagesEnqueued(cameraIdWithTower, alarmId, alarmType, createTime, 1, 1, coordinate);
+ messagesEnqueued(cameraWithTower.getId(), alarmId, alarmType, createTime, 1, 1, coordinate);
} else {
log.debug("鏈幏鍙栧埌闆疯揪濉斾笂鐨勫厜鐢�,鏃犳硶寮曞");
}
@@ -1386,7 +1387,7 @@
ArdAlarmpointsWell ardAlarmpointsWell = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(alarmpointName);
if (StringUtils.isNotNull(ardAlarmpointsWell) && StringUtils.isNotEmpty(ardAlarmpointsWell.getCameraId())) {
String cameraId = ardAlarmpointsWell.getCameraId();
- if (cameraId.equals(cameraIdWithTower)) {
+ if (cameraId.equals(cameraWithTower.getId())) {
return;
}
log.info("鑾峰彇鍒版姤璀︾偣鍏宠仈鐨勫厜鐢�:" + cameraId);
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/radar/service/impl/ArdRadarServiceImpl.java b/ard-work/src/main/java/com/ruoyi/alarm/radar/service/impl/ArdRadarServiceImpl.java
index 8abcf5c..4735513 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/radar/service/impl/ArdRadarServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/radar/service/impl/ArdRadarServiceImpl.java
@@ -3,11 +3,14 @@
import com.alibaba.fastjson2.JSONObject;
import com.ruoyi.alarm.radar.service.ArdRadarService;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.device.camera.domain.ArdCameras;
import com.ruoyi.device.camera.domain.CameraCmd;
import com.ruoyi.device.camera.service.ICameraSdkService;
import com.ruoyi.device.radar.mapper.ArdEquipRadarMapper;
import com.ruoyi.storage.minio.domain.jsonbean.JsonsRootBean;
+import com.ruoyi.utils.gis.GisUtil;
import lombok.extern.slf4j.Slf4j;
+import org.gavaghan.geodesy.GlobalCoordinates;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
@@ -42,19 +45,26 @@
if (msgMap != null) {
Double p = Double.parseDouble(msgMap.get("p").toString());
Double t = Double.parseDouble(msgMap.get("t").toString());
- Double z = Double.parseDouble(msgMap.get("z").toString());
+ Long distance = Long.parseLong(msgMap.get("distance").toString());
String radarId = msgMap.get("radarId").toString();
//鑾峰彇闆疯揪鎵�鍦ㄥ涓婄殑澶у厜鐢�
- String cameraIdWithTower = ardEquipRadarMapper.getCameraByRadar(radarId);
- if (StringUtils.isNotNull(cameraIdWithTower) && StringUtils.isNotEmpty(cameraIdWithTower)) {
- log.debug("鑾峰彇鍒伴浄杈惧涓婄殑鍏夌數:" + cameraIdWithTower);
+ ArdCameras camera = ardEquipRadarMapper.getCameraByRadar(radarId);
+ if (StringUtils.isNotNull(camera)) {
+ log.debug("鑾峰彇鍒伴浄杈惧涓婄殑鍏夌數:" + camera.getId());
+ //璁＄畻鐩爣鐐瑰潗鏍�
+ GlobalCoordinates cameraCoordinates = new GlobalCoordinates(camera.getLatitude(), camera.getLongitude());
+ GlobalCoordinates targetCoordinates = GisUtil.getGlobalCoordinates(cameraCoordinates, p, distance);
+ //鑾峰彇ptz
+ double[] cameraPoint = new double[]{ camera.getLongitude(), camera.getLatitude(),camera.getAltitude()};
+ double[] targetPoint = new double[]{targetCoordinates.getLongitude(), targetCoordinates.getLatitude()};
+ double[] cameraPTZ = GisUtil.getCameraPTZ(cameraPoint, targetPoint, 20, 150);
//濡傛灉闆疯揪濉斾笂鏈夊厜鐢�
- CameraCmd cmd = new CameraCmd(cameraIdWithTower, 1);
+ CameraCmd cmd = new CameraCmd(camera.getId(), 1);
cmd.setOperator("sys_radar_force");
Map<String, Double> ptzMap = new HashMap<>();
ptzMap.put("p", p);
ptzMap.put("t", t);
- ptzMap.put("z", z);
+ ptzMap.put("z", cameraPTZ[2]);
cmd.setPtzMap(ptzMap);
boolean res = iCameraSdkService.setPtz(cmd);
if (res) {
@@ -67,7 +77,7 @@
}
}
} catch (Exception ex) {
- log.error("寮哄埗寮曞寮傚父:"+ ex.getMessage());
+ log.error("寮哄埗寮曞寮傚父:" + ex.getMessage());
}
}
-}
+}
\ No newline at end of file
diff --git a/ard-work/src/main/java/com/ruoyi/device/camera/strategy/SdkStrategy.java b/ard-work/src/main/java/com/ruoyi/device/camera/factory/CameraSDK.java
similarity index 90%
rename from ard-work/src/main/java/com/ruoyi/device/camera/strategy/SdkStrategy.java
rename to ard-work/src/main/java/com/ruoyi/device/camera/factory/CameraSDK.java
index 3c9e278..1eea46a 100644
--- a/ard-work/src/main/java/com/ruoyi/device/camera/strategy/SdkStrategy.java
+++ b/ard-work/src/main/java/com/ruoyi/device/camera/factory/CameraSDK.java
@@ -1,4 +1,4 @@
-package com.ruoyi.device.camera.strategy;
+package com.ruoyi.device.camera.factory;
import com.ruoyi.device.camera.domain.ArdCameras;
import com.ruoyi.device.camera.domain.CameraCmd;
@@ -11,7 +11,7 @@
* 鍒樿嫃涔�
* 2023/11/7 10:48:52
*/
-public interface SdkStrategy {
+public interface CameraSDK {
//鍚屾鐧诲綍
boolean login(ArdCameras cameras);
@@ -85,7 +85,6 @@
//鎵嬪姩褰曞儚
String record(CameraCmd cmd);
-
//寮曞鐩爣浣嶇疆
boolean guideTargetPosition(CameraCmd cmd);
@@ -99,8 +98,8 @@
boolean recordStopNotToMinio(CameraCmd cmd);
//鑾峰彇鐩告満閫氶亾淇℃伅
- public List<ArdChannel> getCameraChannelList(ArdCameras camera);
+ List<ArdChannel> getCameraChannelList(ArdCameras camera);
//鑾峰彇GIS淇℃伅鏁版嵁
- public Map<String, Object> getGisInfo(CameraCmd cmd);
+ Map<String, Object> getGisInfo(CameraCmd cmd);
}
diff --git a/ard-work/src/main/java/com/ruoyi/device/camera/factory/CameraSDKFactory.java b/ard-work/src/main/java/com/ruoyi/device/camera/factory/CameraSDKFactory.java
new file mode 100644
index 0000000..b6f8813
--- /dev/null
+++ b/ard-work/src/main/java/com/ruoyi/device/camera/factory/CameraSDKFactory.java
@@ -0,0 +1,42 @@
+package com.ruoyi.device.camera.factory;
+
+import com.ruoyi.utils.sdk.dhsdk.service.impl.DahuaSDK;
+import com.ruoyi.utils.sdk.hiksdk.service.impl.HikvisionSDK;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+
+/**
+ * @Description: SDK绛栫暐宸ュ巶绫�
+ * @ClassName: SdkStrategyFactory
+ * @Author: 鍒樿嫃涔�
+ * @Date: 2023骞�11鏈�07鏃�10:53:00
+ **/
+@Component
+public class CameraSDKFactory {
+
+ @Resource
+ private HikvisionSDK hikvisionSDK;
+ @Resource
+ private DahuaSDK dahuaSDK;
+
+ /**
+ * 鏍规嵁浼犲叆鐨勫伐鍘傚弬鏁板垱寤虹浉搴旂殑鐩告満SDK瀹炰緥
+ *
+ * @param factory 宸ュ巶鍙傛暟锛岀敤浜庣‘瀹氳鍒涘缓鐨勭浉鏈篠DK绫诲瀷
+ * @return 鍒涘缓鐨勭浉鏈篠DK瀹炰緥
+ * @throws IllegalArgumentException 濡傛灉浼犲叆鐨勫伐鍘傚弬鏁颁笉鏀寔
+ */
+ public CameraSDK createCameraSDK(String factory) {
+ if (factory.equals("1")) {
+ return hikvisionSDK;
+ } else if (factory.equals("2")) {
+ return dahuaSDK;
+ } else {
+ throw new IllegalArgumentException("Unsupported device: " + factory);
+ }
+ }
+
+
+}
diff --git a/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/CameraSdkServiceImpl.java b/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/CameraSdkServiceImpl.java
index bd6a533..ef9e57d 100644
--- a/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/CameraSdkServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/CameraSdkServiceImpl.java
@@ -7,8 +7,8 @@
import com.ruoyi.device.camera.domain.CameraCmd;
import com.ruoyi.device.camera.service.IArdCamerasService;
import com.ruoyi.device.camera.service.ICameraSdkService;
-import com.ruoyi.device.camera.strategy.SdkStrategy;
-import com.ruoyi.device.camera.strategy.SdkStrategyFactory;
+import com.ruoyi.device.camera.factory.CameraSDK;
+import com.ruoyi.device.camera.factory.CameraSDKFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;
@@ -34,7 +34,7 @@
@Resource
private RedisCache redisCache;
@Resource
- private SdkStrategyFactory sdkStrategyFactory;
+ private CameraSDKFactory cameraSDKFactory;
/**
* 鍚姩绾跨▼鏂规硶锛岀敤浜庢墽琛屽垵濮嬪寲鐧诲綍鐩告満鐨勯�昏緫
@@ -64,9 +64,9 @@
try {
if (ardCamera != null) {
String factory = ardCamera.getFactory();
- SdkStrategy sdkStrategy = sdkStrategyFactory.getSdkStrategy(factory);
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
//sdkStrategy.login(ardCamera);//鍚屾鐧诲綍
- sdkStrategy.asyncLogin(ardCamera);//寮傛鐧诲綍
+ cameraSDK.asyncLogin(ardCamera);//寮傛鐧诲綍
result=true;
}
} catch (Exception ex) {
@@ -84,8 +84,8 @@
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
if (ardCamera != null) {
String factory = ardCamera.getFactory();
- SdkStrategy sdkStrategy = sdkStrategyFactory.getSdkStrategy(factory);
- result = sdkStrategy.logout(cameraId);
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ result = cameraSDK.logout(cameraId);
}
} catch (Exception ex) {
log.error("娉ㄩ攢寮傚父锛�" + ex.getMessage());
@@ -103,8 +103,8 @@
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
if (ardCamera != null) {
String factory = ardCamera.getFactory();
- SdkStrategy sdkStrategy = sdkStrategyFactory.getSdkStrategy(factory);
- onLine = sdkStrategy.isOnLine(cmd);
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ onLine = cameraSDK.isOnLine(cmd);
}
return onLine;
} catch (Exception ex) {
@@ -123,8 +123,8 @@
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
if (ardCamera != null) {
String factory = ardCamera.getFactory();
- SdkStrategy sdkStrategy = sdkStrategyFactory.getSdkStrategy(factory);
- result = sdkStrategy.pTZControl(cmd);
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ result = cameraSDK.pTZControl(cmd);
}
return result;
} catch (Exception ex) {
@@ -142,8 +142,8 @@
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
if (ardCamera != null) {
String factory = ardCamera.getFactory();
- SdkStrategy sdkStrategy = sdkStrategyFactory.getSdkStrategy(factory);
- result = sdkStrategy.setFocusPos(cmd);
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ result = cameraSDK.setFocusPos(cmd);
}
} catch (Exception ex) {
log.error("璁剧疆鑱氱劍鍊煎紓甯革細" + ex.getMessage());
@@ -161,8 +161,8 @@
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
if (ardCamera != null) {
String factory = ardCamera.getFactory();
- SdkStrategy sdkStrategy = sdkStrategyFactory.getSdkStrategy(factory);
- result = sdkStrategy.getFocusPos(cmd);
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ result = cameraSDK.getFocusPos(cmd);
}
} catch (Exception ex) {
log.error("鑾峰彇鑱氱劍鍊煎紓甯革細" + ex.getMessage());
@@ -180,8 +180,8 @@
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
if (ardCamera != null) {
String factory = ardCamera.getFactory();
- SdkStrategy sdkStrategy = sdkStrategyFactory.getSdkStrategy(factory);
- result = sdkStrategy.setPreset(cmd);
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ result = cameraSDK.setPreset(cmd);
}
} catch (Exception ex) {
log.error("璁剧疆棰勭疆浣嶅紓甯革細" + ex.getMessage());
@@ -199,8 +199,8 @@
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
if (ardCamera != null) {
String factory = ardCamera.getFactory();
- SdkStrategy sdkStrategy = sdkStrategyFactory.getSdkStrategy(factory);
- result = sdkStrategy.gotoPreset(cmd);
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ result = cameraSDK.gotoPreset(cmd);
}
} catch (Exception ex) {
log.error("璋冪敤棰勭疆浣嶅紓甯革細" + ex.getMessage());
@@ -217,8 +217,8 @@
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
if (ardCamera != null) {
String factory = ardCamera.getFactory();
- SdkStrategy sdkStrategy = sdkStrategyFactory.getSdkStrategy(factory);
- map = sdkStrategy.getVideoCompressionCfg(cmd);
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ map = cameraSDK.getVideoCompressionCfg(cmd);
}
} catch (Exception ex) {
log.error("鑾峰彇鐮佹祦鍘嬬缉鍙傛暟寮傚父锛�" + ex.getMessage());
@@ -235,8 +235,8 @@
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
if (ardCamera != null) {
String factory = ardCamera.getFactory();
- SdkStrategy sdkStrategy = sdkStrategyFactory.getSdkStrategy(factory);
- result = sdkStrategy.controlDefogcfg(cmd);
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ result = cameraSDK.controlDefogcfg(cmd);
}
} catch (Exception ex) {
log.error("鎿嶆帶閫忛浘寮傚父锛�" + ex.getMessage());
@@ -253,8 +253,8 @@
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
if (ardCamera != null) {
String factory = ardCamera.getFactory();
- SdkStrategy sdkStrategy = sdkStrategyFactory.getSdkStrategy(factory);
- result = sdkStrategy.controlInfrarecfg(cmd);
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ result = cameraSDK.controlInfrarecfg(cmd);
}
} catch (Exception ex) {
log.error("鎿嶆帶绾㈠寮傚父锛�" + ex.getMessage());
@@ -271,8 +271,8 @@
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
if (ardCamera != null) {
String factory = ardCamera.getFactory();
- SdkStrategy sdkStrategy = sdkStrategyFactory.getSdkStrategy(factory);
- result = sdkStrategy.controlFocusMode(cmd);
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ result = cameraSDK.controlFocusMode(cmd);
}
} catch (Exception ex) {
log.error("鎿嶆帶鑱氱劍妯″紡寮傚父锛�" + ex.getMessage());
@@ -289,8 +289,8 @@
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
if (ardCamera != null) {
String factory = ardCamera.getFactory();
- SdkStrategy sdkStrategy = sdkStrategyFactory.getSdkStrategy(factory);
- result = sdkStrategy.getFocusMode(cmd);
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ result = cameraSDK.getFocusMode(cmd);
}
} catch (Exception ex) {
log.error("鑾峰彇鑱氱劍妯″紡寮傚父锛�" + ex.getMessage());
@@ -307,8 +307,8 @@
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
if (ardCamera != null) {
String factory = ardCamera.getFactory();
- SdkStrategy sdkStrategy = sdkStrategyFactory.getSdkStrategy(factory);
- result = sdkStrategy.controlPTHeateRpwron(cmd);
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ result = cameraSDK.controlPTHeateRpwron(cmd);
}
} catch (Exception ex) {
log.error("鎿嶆帶浜戝彴鍔犵儹寮傚父锛�" + ex.getMessage());
@@ -325,8 +325,8 @@
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
if (ardCamera != null) {
String factory = ardCamera.getFactory();
- SdkStrategy sdkStrategy = sdkStrategyFactory.getSdkStrategy(factory);
- result = sdkStrategy.controlCameraDeicing(cmd);
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ result = cameraSDK.controlCameraDeicing(cmd);
}
} catch (Exception ex) {
log.error("鎿嶆帶浜戝彴鍔犵儹寮傚父锛�" + ex.getMessage());
@@ -343,8 +343,8 @@
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
if (ardCamera != null) {
String factory = ardCamera.getFactory();
- SdkStrategy sdkStrategy = sdkStrategyFactory.getSdkStrategy(factory);
- result = sdkStrategy.getPTZLockInfo(cmd);
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ result = cameraSDK.getPTZLockInfo(cmd);
}
} catch (Exception ex) {
log.error("鑾峰彇浜戝彴閿佸畾淇℃伅寮傚父锛�" + ex.getMessage());
@@ -370,8 +370,8 @@
if (ardCamera != null) {
//鑾峰彇鎽勫儚澶村伐鍘�
String factory = ardCamera.getFactory();
- SdkStrategy sdkStrategy = sdkStrategyFactory.getSdkStrategy(factory);
- url = sdkStrategy.picCutCate(cmd);
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ url = cameraSDK.picCutCate(cmd);
}
} catch (Exception ex) {
log.error("鎶撳浘寮傚父锛�" + ex.getMessage());
@@ -388,8 +388,8 @@
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
if (ardCamera != null) {
String factory = ardCamera.getFactory();
- SdkStrategy sdkStrategy = sdkStrategyFactory.getSdkStrategy(factory);
- map = sdkStrategy.getPtz(cmd);
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ map = cameraSDK.getPtz(cmd);
}
} catch (Exception ex) {
log.error("鑾峰彇ptz寮傚父锛�" + ex.getMessage());
@@ -406,8 +406,8 @@
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
if (ardCamera != null) {
String factory = ardCamera.getFactory();
- SdkStrategy sdkStrategy = sdkStrategyFactory.getSdkStrategy(factory);
- map = sdkStrategy.getPtzScope(cmd);
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ map = cameraSDK.getPtzScope(cmd);
}
} catch (Exception ex) {
log.error("鑾峰彇ptz鑼冨洿寮傚父锛�" + ex.getMessage());
@@ -425,8 +425,8 @@
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
if (ardCamera != null) {
String factory = ardCamera.getFactory();
- SdkStrategy sdkStrategy = sdkStrategyFactory.getSdkStrategy(factory);
- result = sdkStrategy.setPtz(cmd);
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ result = cameraSDK.setPtz(cmd);
}
} catch (Exception ex) {
log.error("璁剧疆ptz寮傚父锛�" + ex.getMessage());
@@ -444,8 +444,8 @@
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
if (ardCamera != null) {
String factory = ardCamera.getFactory();
- SdkStrategy sdkStrategy = sdkStrategyFactory.getSdkStrategy(factory);
- result = sdkStrategy.setZeroPtz(cmd);
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ result = cameraSDK.setZeroPtz(cmd);
}
} catch (Exception ex) {
log.error("璁剧疆闆舵柟浣嶈寮傚父锛�" + ex.getMessage());
@@ -463,8 +463,8 @@
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
if (ardCamera != null) {
String factory = ardCamera.getFactory();
- SdkStrategy sdkStrategy = sdkStrategyFactory.getSdkStrategy(factory);
- result = sdkStrategy.guideTargetPosition(cmd);
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ result = cameraSDK.guideTargetPosition(cmd);
}
} catch (Exception ex) {
log.error("寮曞鎸囧悜鐩爣寮傚父锛�" + ex.getMessage());
@@ -527,8 +527,8 @@
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
if (ardCamera != null) {
String factory = ardCamera.getFactory();
- SdkStrategy sdkStrategy = sdkStrategyFactory.getSdkStrategy(factory);
- url = sdkStrategy.record(cmd);
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ url = cameraSDK.record(cmd);
}
} catch (Exception ex) {
log.error("褰曞儚寮傚父锛�" + ex.getMessage());
@@ -545,8 +545,8 @@
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
if (ardCamera != null) {
String factory = ardCamera.getFactory();
- SdkStrategy sdkStrategy = sdkStrategyFactory.getSdkStrategy(factory);
- result = sdkStrategy.recordStart(cmd);
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ result = cameraSDK.recordStart(cmd);
}
} catch (Exception ex) {
log.error("寮�濮嬪綍鍍忓紓甯革細" + ex.getMessage());
@@ -563,8 +563,8 @@
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
if (ardCamera != null) {
String factory = ardCamera.getFactory();
- SdkStrategy sdkStrategy = sdkStrategyFactory.getSdkStrategy(factory);
- url = sdkStrategy.recordStopToMinio(cmd);
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ url = cameraSDK.recordStopToMinio(cmd);
}
} catch (Exception ex) {
log.error("鍋滄褰曞儚寮傚父锛�" + ex.getMessage());
@@ -581,8 +581,8 @@
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
if (ardCamera != null) {
String factory = ardCamera.getFactory();
- SdkStrategy sdkStrategy = sdkStrategyFactory.getSdkStrategy(factory);
- result = sdkStrategy.recordStopNotToMinio(cmd);
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ result = cameraSDK.recordStopNotToMinio(cmd);
}
} catch (Exception ex) {
log.error("鍋滄褰曞儚寮傚父锛�" + ex.getMessage());
@@ -599,8 +599,8 @@
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
if (ardCamera != null) {
String factory = ardCamera.getFactory();
- SdkStrategy sdkStrategy = sdkStrategyFactory.getSdkStrategy(factory);
- map = sdkStrategy.getGisInfo(cmd);
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ map = cameraSDK.getGisInfo(cmd);
}
} catch (Exception ex) {
log.error("鑾峰彇鐩告満鏋惰鍙傛暟寮傚父锛�" + ex.getMessage());
diff --git a/ard-work/src/main/java/com/ruoyi/device/camera/strategy/SdkStrategyFactory.java b/ard-work/src/main/java/com/ruoyi/device/camera/strategy/SdkStrategyFactory.java
deleted file mode 100644
index 56c01bf..0000000
--- a/ard-work/src/main/java/com/ruoyi/device/camera/strategy/SdkStrategyFactory.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.ruoyi.device.camera.strategy;
-
-import com.ruoyi.device.camera.domain.ArdCameras;
-import com.ruoyi.utils.sdk.dhsdk.service.impl.DhSdkStrategy;
-import com.ruoyi.utils.sdk.hiksdk.service.impl.HikSdkStrategy;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-
-
-/**
- * @Description: SDK绛栫暐宸ュ巶绫�
- * @ClassName: SdkStrategyFactory
- * @Author: 鍒樿嫃涔�
- * @Date: 2023骞�11鏈�07鏃�10:53:00
- **/
-@Component
-public class SdkStrategyFactory {
-
- @Resource
- private HikSdkStrategy hikSdkStrategy;
- @Resource
- private DhSdkStrategy dhSdkStrategy;
-
- /**
- * 鏍规嵁浼犲叆鐨勫伐鍘傚弬鏁拌幏鍙栧搴旂殑Sdk绛栫暐
- *
- * @param factory 宸ュ巶鍙傛暟
- * @return 瀵瑰簲鐨凷dk绛栫暐
- * @throws IllegalArgumentException 濡傛灉涓嶆敮鎸佽宸ュ巶鍙傛暟
- */
- public SdkStrategy getSdkStrategy(String factory) {
- if (factory.equals("1")) {
- return hikSdkStrategy;
- } else if (factory.equals("2")) {
- return dhSdkStrategy;
- } else {
- throw new IllegalArgumentException("Unsupported device: " + factory);
- }
- }
-
-}
diff --git a/ard-work/src/main/java/com/ruoyi/device/radar/controller/ArdEquipRadarController.java b/ard-work/src/main/java/com/ruoyi/device/radar/controller/ArdEquipRadarController.java
index 62de8d8..42ea28a 100644
--- a/ard-work/src/main/java/com/ruoyi/device/radar/controller/ArdEquipRadarController.java
+++ b/ard-work/src/main/java/com/ruoyi/device/radar/controller/ArdEquipRadarController.java
@@ -117,8 +117,11 @@
return toAjax(ardEquipRadarService.deleteArdEquipRadarByIds(ids));
}
+ /**
+ * 瑙掑害寮曞淇℃伅鍙嶉
+ */
@ApiOperation(value = "瑙掑害寮曞淇℃伅鍙嶉")
- @PostMapping("/guideInfo")
+ @PostMapping("/guideInfoBack")
public AjaxResult guideInfoBack(@RequestBody GuideInfo guideInfo)
{
return radarClient.guideInfoBack(guideInfo);
diff --git a/ard-work/src/main/java/com/ruoyi/device/radar/mapper/ArdEquipRadarMapper.java b/ard-work/src/main/java/com/ruoyi/device/radar/mapper/ArdEquipRadarMapper.java
index 0ef2b09..4bfb025 100644
--- a/ard-work/src/main/java/com/ruoyi/device/radar/mapper/ArdEquipRadarMapper.java
+++ b/ard-work/src/main/java/com/ruoyi/device/radar/mapper/ArdEquipRadarMapper.java
@@ -3,6 +3,7 @@
import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.device.camera.domain.ArdCameras;
import com.ruoyi.device.radar.domain.ArdEquipRadar;
/**
@@ -62,7 +63,7 @@
public int deleteArdEquipRadarByIds(String[] ids);
/**
- * 閫氳繃闆疯揪id鎵惧埌鍏宠仈濉斾笂鐨勫ぇ鍏夌數id
+ * 閫氳繃闆疯揪id鎵惧埌鍏宠仈濉斾笂鐨勫ぇ鍏夌數
*/
- String getCameraByRadar(String radarId);
+ ArdCameras getCameraByRadar(String radarId);
}
diff --git a/ard-work/src/main/java/com/ruoyi/inspect/service/impl/InspectionTaskManager.java b/ard-work/src/main/java/com/ruoyi/inspect/service/impl/InspectionTaskManager.java
index be01a5c..cda3474 100644
--- a/ard-work/src/main/java/com/ruoyi/inspect/service/impl/InspectionTaskManager.java
+++ b/ard-work/src/main/java/com/ruoyi/inspect/service/impl/InspectionTaskManager.java
@@ -2,11 +2,9 @@
import com.ruoyi.device.camera.domain.CameraCmd;
import com.ruoyi.device.camera.service.ICameraSdkService;
-import com.ruoyi.device.camera.service.impl.CameraSdkServiceImpl;
import com.ruoyi.utils.sdk.common.GlobalVariable;
import com.ruoyi.inspect.domain.ArdVideoInspectTask;
import com.ruoyi.inspect.mapper.ArdVideoInspectTaskMapper;
-import com.ruoyi.utils.sdk.hiksdk.service.impl.HikSdkStrategy;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
diff --git a/ard-work/src/main/java/com/ruoyi/utils/gis/GisUtil.java b/ard-work/src/main/java/com/ruoyi/utils/gis/GisUtil.java
index c8ec803..276d8bc 100644
--- a/ard-work/src/main/java/com/ruoyi/utils/gis/GisUtil.java
+++ b/ard-work/src/main/java/com/ruoyi/utils/gis/GisUtil.java
@@ -201,9 +201,9 @@
double[] ptz = GisUtil.getCameraPTZ(camera, lookAt, viewAngle, viewWidth);
System.out.println("ptz:" + Arrays.toString(ptz));*/
// double[] camera = {125.153903999999997,46.5600799999999992,258.430000000000007};
- GlobalCoordinates camera = new GlobalCoordinates(46.5600799999999992,125.153903999999997);
- double p = 212.70155;
- double distance = 4048.886568114861;
+ GlobalCoordinates camera = new GlobalCoordinates(45.755847,126.640557);
+ double p = 39.71;
+ double distance = 164;
GlobalCoordinates point = getGlobalCoordinates(camera, p, distance);
System.out.println("point:");
@@ -211,4 +211,4 @@
System.out.println("lat:"+point.getLatitude());
}
-}
+}
\ No newline at end of file
diff --git a/ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/controller/DhSdkController.java b/ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/controller/DhSdkController.java
index 19504fb..5ad5f7a 100644
--- a/ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/controller/DhSdkController.java
+++ b/ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/controller/DhSdkController.java
@@ -8,7 +8,7 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.device.camera.domain.CameraCmd;
-import com.ruoyi.utils.sdk.dhsdk.service.impl.DhSdkStrategy;
+import com.ruoyi.utils.sdk.dhsdk.service.impl.DahuaSDK;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.stereotype.Controller;
@@ -36,7 +36,7 @@
public class DhSdkController extends BaseController {
@Resource
- private DhSdkStrategy sdk;
+ private DahuaSDK sdk;
@ApiOperation(value = "浜戝彴鎺у埗", notes = "Code:1-宸︿笂 2-涓� 3-鍙充笂 4-宸� 5-宸¤埅 6-鍙� 7-宸︿笅 8-涓� 9-鍙充笅 10-鐒﹁窛鍙樺ぇ 11-鐒﹁窛鍙樺皬\n" +
diff --git a/ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/service/impl/DhSdkStrategy.java b/ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/service/impl/DahuaSDK.java
similarity index 99%
rename from ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/service/impl/DhSdkStrategy.java
rename to ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/service/impl/DahuaSDK.java
index d2a2a2a..1cced79 100644
--- a/ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/service/impl/DhSdkStrategy.java
+++ b/ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/service/impl/DahuaSDK.java
@@ -2,11 +2,10 @@
import com.ruoyi.alarm.global.domain.GuidePriorityQueue;
import com.ruoyi.alarm.global.domain.GuideTask;
-import com.ruoyi.common.annotation.SdkOperate;
import com.ruoyi.common.utils.file.FileUtils;
import com.ruoyi.common.utils.file.MimeTypeUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
-import com.ruoyi.device.camera.strategy.SdkStrategy;
+import com.ruoyi.device.camera.factory.CameraSDK;
import com.ruoyi.device.camera.domain.ArdCameras;
import com.ruoyi.device.camera.domain.CameraCmd;
import com.ruoyi.device.camera.service.IArdCamerasService;
@@ -25,7 +24,6 @@
import com.ruoyi.utils.sdk.dhsdk.module.*;
import com.sun.jna.Pointer;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
@@ -54,7 +52,7 @@
**/
@Slf4j(topic = "dhSdk")
@Service
-public class DhSdkStrategy implements SdkStrategy {
+public class DahuaSDK implements CameraSDK {
@Resource
private IArdCamerasService ardCamerasService;
diff --git a/ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/controller/HikSdkController.java b/ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/controller/HikSdkController.java
index 1701076..b0a3fd4 100644
--- a/ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/controller/HikSdkController.java
+++ b/ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/controller/HikSdkController.java
@@ -10,7 +10,7 @@
import com.ruoyi.device.camera.service.IArdCamerasService;
import com.ruoyi.common.annotation.Anonymous;
import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.utils.sdk.hiksdk.service.impl.HikSdkStrategy;
+import com.ruoyi.utils.sdk.hiksdk.service.impl.HikvisionSDK;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.stereotype.Controller;
@@ -35,7 +35,7 @@
public class HikSdkController extends BaseController {
@Resource
- private HikSdkStrategy sdk;
+ private HikvisionSDK sdk;
@Resource
private IArdCamerasService ardCamerasService;
diff --git a/ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/lib/LoginResultCallBack.java b/ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/lib/LoginResultCallBack.java
index 5185b86..14a235e 100644
--- a/ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/lib/LoginResultCallBack.java
+++ b/ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/lib/LoginResultCallBack.java
@@ -11,7 +11,7 @@
import com.ruoyi.utils.sdk.common.GlobalVariable;
import com.ruoyi.media.domain.Vtdu;
import com.ruoyi.media.service.IVtduService;
-import com.ruoyi.utils.sdk.hiksdk.service.impl.HikSdkStrategy;
+import com.ruoyi.utils.sdk.hiksdk.service.impl.HikvisionSDK;
import com.sun.jna.Pointer;
import lombok.extern.slf4j.Slf4j;
import java.util.Comparator;
@@ -38,7 +38,7 @@
public int invoke(int lUserID, int dwResult, HCNetSDK.NET_DVR_DEVICEINFO_V30 lpDeviceinfo, Pointer pUser) {
IVtduService vtduService = SpringUtils.getBean(IVtduService.class);
IArdChannelService ardChannelService = SpringUtils.getBean(IArdChannelService.class);
- HikSdkStrategy hikClientService = SpringUtils.getBean(HikSdkStrategy.class);
+ HikvisionSDK hikClientService = SpringUtils.getBean(HikvisionSDK.class);
IArdCamerasService ardCamerasService = SpringUtils.getBean(IArdCamerasService.class);
if (GlobalVariable.loginMap.containsKey(camera.getId())) {
GlobalVariable.loginMap.remove(camera.getId());
diff --git a/ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/service/impl/HikSdkStrategy.java b/ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/service/impl/HikvisionSDK.java
similarity index 99%
rename from ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/service/impl/HikSdkStrategy.java
rename to ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/service/impl/HikvisionSDK.java
index b3af56a..4992f17 100644
--- a/ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/service/impl/HikSdkStrategy.java
+++ b/ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/service/impl/HikvisionSDK.java
@@ -2,12 +2,11 @@
import com.ruoyi.alarm.global.domain.GuidePriorityQueue;
import com.ruoyi.alarm.global.domain.GuideTask;
-import com.ruoyi.common.annotation.SdkOperate;
import com.ruoyi.common.utils.file.FileUtils;
import com.ruoyi.common.utils.file.MimeTypeUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.device.camera.service.IArdCamerasService;
-import com.ruoyi.device.camera.strategy.SdkStrategy;
+import com.ruoyi.device.camera.factory.CameraSDK;
import com.ruoyi.device.camera.domain.ArdCameras;
import com.ruoyi.device.camera.domain.CameraCmd;
import com.ruoyi.device.channel.domain.ArdChannel;
@@ -46,7 +45,7 @@
**/
@Service
@Slf4j(topic = "hikSdk")
-public class HikSdkStrategy implements SdkStrategy {
+public class HikvisionSDK implements CameraSDK {
@Resource
private IArdCamerasService ardCamerasService;
@Resource
diff --git a/ard-work/src/main/resources/mapper/device/ArdEquipRadarMapper.xml b/ard-work/src/main/resources/mapper/device/ArdEquipRadarMapper.xml
index 63a35d5..f11397e 100644
--- a/ard-work/src/main/resources/mapper/device/ArdEquipRadarMapper.xml
+++ b/ard-work/src/main/resources/mapper/device/ArdEquipRadarMapper.xml
@@ -194,12 +194,11 @@
#{id}
</foreach>
</delete>
- <select id="getCameraByRadar" resultType="String">
- select ac.id
- from ard_equip_radar aer
- INNER JOIN ard_towers at
- on aer.tower_id= at.id
- INNER JOIN ard_cameras ac on aer.tower_id=ac.tower_id
+
+ <select id="getCameraByRadar" resultType="ArdCameras">
+ select ac.* from ard_equip_radar aer
+ INNER JOIN ard_towers at on aer.tower_id= at.id
+ INNER JOIN ard_cameras ac on aer.tower_id=ac.tower_id
where aer.id=#{radarId} limit 1
</select>
</mapper>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
index a375eeb..32a2326 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
@@ -1,7 +1,10 @@
package com.ruoyi.web.controller.system;
import java.util.List;
+
+import com.ruoyi.common.utils.MessageUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -23,13 +26,12 @@
/**
* 鑿滃崟淇℃伅
- *
+ *
* @author ruoyi
*/
@RestController
@RequestMapping("/system/menu")
-public class SysMenuController extends BaseController
-{
+public class SysMenuController extends BaseController {
@Autowired
private ISysMenuService menuService;
@@ -38,8 +40,7 @@
*/
@PreAuthorize("@ss.hasPermi('system:menu:list')")
@GetMapping("/list")
- public AjaxResult list(SysMenu menu)
- {
+ public AjaxResult list(SysMenu menu) {
List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
return success(menus);
}
@@ -49,8 +50,7 @@
*/
@PreAuthorize("@ss.hasPermi('system:menu:query')")
@GetMapping(value = "/{menuId}")
- public AjaxResult getInfo(@PathVariable Long menuId)
- {
+ public AjaxResult getInfo(@PathVariable Long menuId) {
return success(menuService.selectMenuById(menuId));
}
@@ -58,8 +58,7 @@
* 鑾峰彇鑿滃崟涓嬫媺鏍戝垪琛�
*/
@GetMapping("/treeselect")
- public AjaxResult treeselect(SysMenu menu)
- {
+ public AjaxResult treeselect(SysMenu menu) {
List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
return success(menuService.buildMenuTreeSelect(menus));
}
@@ -68,8 +67,7 @@
* 鍔犺浇瀵瑰簲瑙掕壊鑿滃崟鍒楄〃鏍�
*/
@GetMapping(value = "/roleMenuTreeselect/{roleId}")
- public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId)
- {
+ public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId) {
List<SysMenu> menus = menuService.selectMenuList(getUserId());
AjaxResult ajax = AjaxResult.success();
ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
@@ -83,14 +81,10 @@
@PreAuthorize("@ss.hasPermi('system:menu:add')")
@Log(title = "鑿滃崟绠＄悊", businessType = BusinessType.INSERT)
@PostMapping
- public AjaxResult add(@Validated @RequestBody SysMenu menu)
- {
- if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu)))
- {
+ public AjaxResult add(@Validated @RequestBody SysMenu menu) {
+ if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) {
return error("鏂板鑿滃崟'" + menu.getMenuName() + "'澶辫触锛岃彍鍗曞悕绉板凡瀛樺湪");
- }
- else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath()))
- {
+ } else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) {
return error("鏂板鑿滃崟'" + menu.getMenuName() + "'澶辫触锛屽湴鍧�蹇呴』浠ttp(s)://寮�澶�");
}
menu.setCreateBy(getUsername());
@@ -103,18 +97,12 @@
@PreAuthorize("@ss.hasPermi('system:menu:edit')")
@Log(title = "鑿滃崟绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping
- public AjaxResult edit(@Validated @RequestBody SysMenu menu)
- {
- if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu)))
- {
+ public AjaxResult edit(@Validated @RequestBody SysMenu menu) {
+ if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) {
return error("淇敼鑿滃崟'" + menu.getMenuName() + "'澶辫触锛岃彍鍗曞悕绉板凡瀛樺湪");
- }
- else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath()))
- {
+ } else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) {
return error("淇敼鑿滃崟'" + menu.getMenuName() + "'澶辫触锛屽湴鍧�蹇呴』浠ttp(s)://寮�澶�");
- }
- else if (menu.getMenuId().equals(menu.getParentId()))
- {
+ } else if (menu.getMenuId().equals(menu.getParentId())) {
return error("淇敼鑿滃崟'" + menu.getMenuName() + "'澶辫触锛屼笂绾ц彍鍗曚笉鑳介�夋嫨鑷繁");
}
menu.setUpdateBy(getUsername());
@@ -127,14 +115,11 @@
@PreAuthorize("@ss.hasPermi('system:menu:remove')")
@Log(title = "鑿滃崟绠＄悊", businessType = BusinessType.DELETE)
@DeleteMapping("/{menuId}")
- public AjaxResult remove(@PathVariable("menuId") Long menuId)
- {
- if (menuService.hasChildByMenuId(menuId))
- {
+ public AjaxResult remove(@PathVariable("menuId") Long menuId) {
+ if (menuService.hasChildByMenuId(menuId)) {
return warn("瀛樺湪瀛愯彍鍗�,涓嶅厑璁稿垹闄�");
}
- if (menuService.checkMenuExistRole(menuId))
- {
+ if (menuService.checkMenuExistRole(menuId)) {
return warn("鑿滃崟宸插垎閰�,涓嶅厑璁稿垹闄�");
}
return toAjax(menuService.deleteMenuById(menuId));
diff --git a/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties b/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties
index b7ceca4..82fc0f4 100644
--- a/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties
+++ b/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties
@@ -38,4 +38,5 @@
##\u7EDF\u4E00\u8FD4\u56DE
operation.failed=Operation failed
-operation.success=Operation successful
\ No newline at end of file
+operation.success=Operation successful
+
diff --git a/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties b/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties
index 95bb2b3..8769e7b 100644
--- a/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties
+++ b/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties
@@ -38,4 +38,4 @@
##\u7EDF\u4E00\u8FD4\u56DE
operation.failed=\u64CD\u4F5C\u5931\u8D25
-operation.success=\u64CD\u4F5C\u6210\u529F
\ No newline at end of file
+operation.success=\u64CD\u4F5C\u6210\u529F
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SyncTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SyncTask.java
index e857c30..3ca2b61 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SyncTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SyncTask.java
@@ -10,8 +10,8 @@
import com.ruoyi.media.service.IVtduService;
import com.ruoyi.rongcloud.service.RongCloudService;
import com.ruoyi.system.service.ISysUserService;
-import com.ruoyi.utils.sdk.dhsdk.service.impl.DhSdkStrategy;
-import com.ruoyi.utils.sdk.hiksdk.service.impl.HikSdkStrategy;
+import com.ruoyi.utils.sdk.dhsdk.service.impl.DahuaSDK;
+import com.ruoyi.utils.sdk.hiksdk.service.impl.HikvisionSDK;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
@@ -33,9 +33,9 @@
@Resource
IArdCamerasService iArdCamerasService;
@Resource
- HikSdkStrategy hikClientService;
+ HikvisionSDK hikClientService;
@Resource
- DhSdkStrategy dhClientService;
+ DahuaSDK dhClientService;
@Resource
IVtduService vtduService;
@Resource
--
Gitblit v1.9.3