From 7e49fc48065211df6bbb6b6f43fa747cdfbf4727 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期六, 23 十二月 2023 14:48:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/device/external/controller/ArdEquipExternalController.java | 12 +++
ard-work/src/main/java/com/ruoyi/device/tower/controller/ArdTowersController.java | 12 +++
ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java | 11 +++
ard-work/src/main/java/com/ruoyi/device/radar/controller/ArdEquipRadarController.java | 12 +++
ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectTaskController.java | 10 +++
ard-work/src/main/java/com/ruoyi/media/controller/VtduController.java | 43 +++++++++++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 8 ++
ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectRecordController.java | 7 ++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java | 65 +++++++++++++--------
9 files changed, 147 insertions(+), 33 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java b/ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java
index 9a28677..8ff1f37 100644
--- a/ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java
+++ b/ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java
@@ -61,7 +61,16 @@
List<ArdCameras> list = ardCamerasService.selectArdCamerasList(ardCamera);
return getDataTable(list);
}
-
+ /**
+ * 鏌ヨ鐩告満璁惧鍒楄〃锛堜笉鏍￠獙鏉冮檺锛�
+ */
+ @GetMapping("/list/noPerm")
+ @ApiOperation("鏌ヨ鐩告満璁惧鍒楄〃")
+ public TableDataInfo listNoPerm(ArdCameras ardCamera) {
+ startPage();
+ List<ArdCameras> list = ardCamerasService.selectArdCamerasList(ardCamera);
+ return getDataTable(list);
+ }
/**
* 瀵煎嚭鐩告満璁惧鍒楄〃
*/
diff --git a/ard-work/src/main/java/com/ruoyi/device/external/controller/ArdEquipExternalController.java b/ard-work/src/main/java/com/ruoyi/device/external/controller/ArdEquipExternalController.java
index 57eded5..034e56e 100644
--- a/ard-work/src/main/java/com/ruoyi/device/external/controller/ArdEquipExternalController.java
+++ b/ard-work/src/main/java/com/ruoyi/device/external/controller/ArdEquipExternalController.java
@@ -50,7 +50,17 @@
List<ArdEquipExternal> list = ardEquipExternalService.selectArdEquipExternalList(ardEquipExternal);
return getDataTable(list);
}
-
+ /**
+ * 鏌ヨexternal鍒楄〃(涓嶆牎楠屾潈闄�)
+ */
+ @ApiOperation(value = "鏌ヨ澶栬仈璁惧绠＄悊鍒楄〃")
+ @GetMapping("/list/noPerm")
+ public TableDataInfo listNoPerm(ArdEquipExternal ardEquipExternal)
+ {
+ startPage();
+ List<ArdEquipExternal> list = ardEquipExternalService.selectArdEquipExternalList(ardEquipExternal);
+ return getDataTable(list);
+ }
/**
* 瀵煎嚭external鍒楄〃
*/
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 658f2e2..3d561ff 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
@@ -56,7 +56,17 @@
List<ArdEquipRadar> list = ardEquipRadarService.selectArdEquipRadarList(ardEquipRadar);
return getDataTable(list);
}
-
+ /**
+ * 鏌ヨradar鍒楄〃锛堜笉鏍￠獙鏉冮檺锛�
+ */
+ @GetMapping("/list/noPerm")
+ @ApiOperation(value = "鏌ヨ闆疯揪绠＄悊鍒楄〃")
+ public TableDataInfo listNoPerm(ArdEquipRadar ardEquipRadar)
+ {
+ startPage();
+ List<ArdEquipRadar> list = ardEquipRadarService.selectArdEquipRadarList(ardEquipRadar);
+ return getDataTable(list);
+ }
/**
* 瀵煎嚭radar鍒楄〃
*/
diff --git a/ard-work/src/main/java/com/ruoyi/device/tower/controller/ArdTowersController.java b/ard-work/src/main/java/com/ruoyi/device/tower/controller/ArdTowersController.java
index 05acd57..c973a90 100644
--- a/ard-work/src/main/java/com/ruoyi/device/tower/controller/ArdTowersController.java
+++ b/ard-work/src/main/java/com/ruoyi/device/tower/controller/ArdTowersController.java
@@ -51,7 +51,17 @@
List<ArdTowers> list = ardTowersService.selectArdTowersList(ardTowers);
return getDataTable(list);
}
-
+ /**
+ * 鏌ヨ濉旂鐞嗗垪琛�(涓嶆牎楠屾潈闄�)
+ */
+ @GetMapping("/list/noPerm")
+ @ApiOperation(value = "鏌ヨ濉旂鐞嗗垪琛�(涓嶆牎楠屾潈闄�)")
+ public TableDataInfo listNoPerm(ArdTowers ardTowers)
+ {
+ startPage();
+ List<ArdTowers> list = ardTowersService.selectArdTowersList(ardTowers);
+ return getDataTable(list);
+ }
/**
* 瀵煎嚭濉旂鐞嗗垪琛�
*/
diff --git a/ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectRecordController.java b/ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectRecordController.java
index 6455a6b..e4c4d8e 100644
--- a/ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectRecordController.java
+++ b/ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectRecordController.java
@@ -47,6 +47,13 @@
return getDataTable(list);
}
+ //涓嶆牎楠屾潈闄�
+ @GetMapping("/listByStartTime/noPerm")
+ public TableDataInfo listByStartTimeNoPerm(ArdVideoInspectRecord ardVideoInspectRecord) {
+ startPage();
+ List<HashMap> list = ardVideoInspectRecordService.selectArdVideoInspectRecordListByStartTime(ardVideoInspectRecord);
+ return getDataTable(list);
+ }
@PreAuthorize("@ss.hasPermi('inspect:record:list')")
@GetMapping("/getFileCountByStartMonth")
public List getFileCountByStartMonth(@RequestParam("startMonth") String startMonth) {
diff --git a/ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectTaskController.java b/ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectTaskController.java
index fc30265..1d15f15 100644
--- a/ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectTaskController.java
+++ b/ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectTaskController.java
@@ -46,7 +46,15 @@
List<ArdVideoInspectTask> list = ardVideoInspectTaskService.selectArdVideoInspectTaskList(ardVideoInspectTask);
return getDataTable(list);
}
-
+ /**
+ * 鏌ヨ瑙嗛宸℃浠诲姟鍒楄〃锛堜笉鏍￠獙鏉冮檺锛�
+ */
+ @GetMapping("/list/noPerm")
+ public TableDataInfo listNoPerm(ArdVideoInspectTask ardVideoInspectTask) {
+ startPage();
+ List<ArdVideoInspectTask> list = ardVideoInspectTaskService.selectArdVideoInspectTaskList(ardVideoInspectTask);
+ return getDataTable(list);
+ }
/**
* 瀵煎嚭瑙嗛宸℃浠诲姟鍒楄〃
*/
diff --git a/ard-work/src/main/java/com/ruoyi/media/controller/VtduController.java b/ard-work/src/main/java/com/ruoyi/media/controller/VtduController.java
index 5bb831b..d61b746 100644
--- a/ard-work/src/main/java/com/ruoyi/media/controller/VtduController.java
+++ b/ard-work/src/main/java/com/ruoyi/media/controller/VtduController.java
@@ -55,7 +55,15 @@
List<Vtdu> list = vtduService.selectVtduList(vtdu);
return getDataTable(list);
}
-
+ /**
+ * 鏌ヨ娴佸獟浣撶鐞嗗垪琛紙涓嶆牎楠屾潈闄愶級
+ */
+ @GetMapping("/list/noPerm")
+ public TableDataInfo listNoPerm(Vtdu vtdu) {
+ startPage();
+ List<Vtdu> list = vtduService.selectVtduList(vtdu);
+ return getDataTable(list);
+ }
/**
* 瀵煎嚭娴佸獟浣撶鐞嗗垪琛�
*/
@@ -101,7 +109,38 @@
}
return success(vtdu);
}
-
+ /**
+ * 鑾峰彇娴佸獟浣撶鐞嗚缁嗕俊鎭紙涓嶆牎楠屾潈闄愶級
+ */
+ @GetMapping(value = "/{name}/noPerm")
+ public AjaxResult getInfoNoPerm(@PathVariable("name") String name) {
+ Vtdu vtdu = vtduService.selectVtduByName(name);
+ if (vtdu != null) {
+ String cameraId = name.split("_")[0];
+ Integer chanNo = Integer.valueOf(name.split("_")[1]);
+ CameraCmd cmd = new CameraCmd(cameraId, chanNo);
+ Map<String, Object> videoCompressionCfg = cameraSdkService.getVideoCompressionCfg(cmd);
+ String videoEncType = (String) videoCompressionCfg.get("videoEncType");
+ if (videoEncType != null) {
+ if (!videoEncType.equals("鏍囧噯h264")) {
+ vtdu.setIsCode("1");
+ } else {
+ vtdu.setIsCode("0");
+ }
+ }
+ else
+ {
+ vtdu.setIsCode("0");
+ }
+ //娴佸獟浣撲笉瀛樺湪鏂板锛屽瓨鍦ㄦ洿鏂�
+ if (!mediaService.checkNameExist(name)) {
+ mediaService.addPath(name, vtdu.getRtspSource(), vtdu.getMode(), vtdu.getIsCode());
+ } else {
+ vtduService.updateVtdu(vtdu);
+ }
+ }
+ return success(vtdu);
+ }
/**
* 鏂板娴佸獟浣撶鐞�
*/
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
index 78f0cac..6755675 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
@@ -28,14 +28,13 @@
/**
* 鍙傛暟閰嶇疆 淇℃伅鎿嶄綔澶勭悊
- *
+ *
* @author ruoyi
*/
@Api(tags = "鍙傛暟閰嶇疆")
@RestController
@RequestMapping("/system/config")
-public class SysConfigController extends BaseController
-{
+public class SysConfigController extends BaseController {
@Autowired
private ISysConfigService configService;
@@ -44,8 +43,17 @@
*/
@PreAuthorize("@ss.hasPermi('system:config:list')")
@GetMapping("/list")
- public TableDataInfo list(SysConfig config)
- {
+ public TableDataInfo list(SysConfig config) {
+ startPage();
+ List<SysConfig> list = configService.selectConfigList(config);
+ return getDataTable(list);
+ }
+
+ /**
+ * 鑾峰彇鍙傛暟閰嶇疆鍒楄〃(涓嶉獙璇佹潈闄�)
+ */
+ @GetMapping("/list/noPerm")
+ public TableDataInfo listNoPerm(SysConfig config) {
startPage();
List<SysConfig> list = configService.selectConfigList(config);
return getDataTable(list);
@@ -53,8 +61,16 @@
@PreAuthorize("@ss.hasPermi('system:config:list')")
@GetMapping("/lists")
- public AjaxResult lists(SysConfig config)
- {
+ public AjaxResult lists(SysConfig config) {
+ List<SysConfig> list = configService.selectConfigList(config);
+ return toAjaxList(list);
+ }
+
+ /**
+ * 鑾峰彇鍙傛暟閰嶇疆鍒楄〃涓嶅垎椤�(涓嶉獙璇佹潈闄�)
+ */
+ @GetMapping("/lists/noPerm")
+ public AjaxResult listsNoPerm(SysConfig config) {
List<SysConfig> list = configService.selectConfigList(config);
return toAjaxList(list);
}
@@ -62,8 +78,7 @@
@Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.EXPORT)
@PreAuthorize("@ss.hasPermi('system:config:export')")
@PostMapping("/export")
- public void export(HttpServletResponse response, SysConfig config)
- {
+ public void export(HttpServletResponse response, SysConfig config) {
List<SysConfig> list = configService.selectConfigList(config);
ExcelUtil<SysConfig> util = new ExcelUtil<SysConfig>(SysConfig.class);
util.exportExcel(response, list, "鍙傛暟鏁版嵁");
@@ -74,8 +89,15 @@
*/
@PreAuthorize("@ss.hasPermi('system:config:query')")
@GetMapping(value = "/{configId}")
- public AjaxResult getInfo(@PathVariable Long configId)
- {
+ public AjaxResult getInfo(@PathVariable Long configId) {
+ return success(configService.selectConfigById(configId));
+ }
+
+ /**
+ * 鏍规嵁鍙傛暟缂栧彿鑾峰彇璇︾粏淇℃伅(涓嶆牎楠屾潈闄�)
+ */
+ @GetMapping(value = "/{configId}/noPerm")
+ public AjaxResult getInfoNoPerm(@PathVariable Long configId) {
return success(configService.selectConfigById(configId));
}
@@ -84,8 +106,7 @@
*/
@ApiOperation("鏍规嵁鍙傛暟閿悕鏌ヨ鍙傛暟鍊�")
@GetMapping(value = "/configKey/{configKey}")
- public AjaxResult getConfigKey(@PathVariable String configKey)
- {
+ public AjaxResult getConfigKey(@PathVariable String configKey) {
return success(configService.selectConfigByKey(configKey));
}
@@ -95,10 +116,8 @@
@PreAuthorize("@ss.hasPermi('system:config:add')")
@Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.INSERT)
@PostMapping
- public AjaxResult add(@Validated @RequestBody SysConfig config)
- {
- if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
- {
+ public AjaxResult add(@Validated @RequestBody SysConfig config) {
+ if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) {
return error("鏂板鍙傛暟'" + config.getConfigName() + "'澶辫触锛屽弬鏁伴敭鍚嶅凡瀛樺湪");
}
config.setCreateBy(getUsername());
@@ -111,10 +130,8 @@
@PreAuthorize("@ss.hasPermi('system:config:edit')")
@Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping
- public AjaxResult edit(@Validated @RequestBody SysConfig config)
- {
- if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
- {
+ public AjaxResult edit(@Validated @RequestBody SysConfig config) {
+ if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) {
return error("淇敼鍙傛暟'" + config.getConfigName() + "'澶辫触锛屽弬鏁伴敭鍚嶅凡瀛樺湪");
}
config.setUpdateBy(getUsername());
@@ -127,8 +144,7 @@
@PreAuthorize("@ss.hasPermi('system:config:remove')")
@Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.DELETE)
@DeleteMapping("/{configIds}")
- public AjaxResult remove(@PathVariable Long[] configIds)
- {
+ public AjaxResult remove(@PathVariable Long[] configIds) {
configService.deleteConfigByIds(configIds);
return success();
}
@@ -139,8 +155,7 @@
@PreAuthorize("@ss.hasPermi('system:config:remove')")
@Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.CLEAN)
@DeleteMapping("/refreshCache")
- public AjaxResult refreshCache()
- {
+ public AjaxResult refreshCache() {
configService.resetConfigCache();
return success();
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index 80e6733..63b1505 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -238,7 +238,13 @@
public AjaxResult deptTree(SysDept dept) {
return success(deptService.selectDeptTreeList(dept));
}
-
+ /**
+ * 鑾峰彇閮ㄩ棬鏍戝垪琛�
+ */
+ @GetMapping("/deptTree/noPerm")
+ public AjaxResult deptTreeNoPerm(SysDept dept) {
+ return success(deptService.selectDeptTreeList(dept));
+ }
/**
* 淇敼瀵嗙爜
*/
--
Gitblit v1.9.3