From e54ed79306362d81482a03e2d332fced35da56d4 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 09 五月 2022 11:54:29 +0800
Subject: [PATCH] 权限
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java | 15 +++
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightPoleHeelingController.java | 15 +++
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MenuController.java | 19 ++-
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirEquipmentController.java | 4
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataController.java | 13 --
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramFileController.java | 9 +
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramController.java | 38 ++-----
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java | 13 ++
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeFileController.java | 12 +
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LedSFileController.java | 9 +
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightTaskController.java | 15 +++
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeMissionController.java | 24 ++++
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightPoleHeelingProcessingController.java | 6 +
dao/src/main/java/com/sandu/ximon/dao/enums/MenuEnum.java | 43 ++++++++
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightPoleHeelingEquipmentController.java | 6 +
15 files changed, 187 insertions(+), 54 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/enums/MenuEnum.java b/dao/src/main/java/com/sandu/ximon/dao/enums/MenuEnum.java
index 759b4e4..3645479 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/enums/MenuEnum.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/enums/MenuEnum.java
@@ -30,7 +30,7 @@
LED_LIST("LED灞忓垪琛�"),
LED_PROGRAM_LIST("鑺傜洰鍒楄〃"),
PLAYPLAN_LIST("鎾斁璁″垝鍒楄〃"),
- LED_FILE_LIST("LED灞忕礌鏉愬垪琛�"),
+ LED_FILE_S_LIST("LED灞忕礌鏉愬垪琛�"),
AIR_EQUIPMENT_LIST("澶ф皵璁惧鍒楄〃"),
AIR_DATA_LIST("澶ф皵鏁版嵁鍒楄〃"),
AIR_EQUIPMENT_NONG_GENG_LIST("澶ф皵璁惧鍐滆�曞垪琛�"),
@@ -55,6 +55,7 @@
ADMIN_INFO_UPDATE("缂栬緫绠＄悊鍛樹俊鎭�"),
ADMIN_DELETE("鍒犻櫎绠＄悊鍛�"),
AIR_EQUIPMENT_DELETE("鍒犻櫎澶ф皵璁惧"),
+ AIR_DATA_UPDATE("鎵嬪姩鏇存柊澶ф皵鏁版嵁"),
BANNER_ADD("娣诲姞寰俊logo"),
BANNER_UPDATE("缂栬緫寰俊logo"),
BANNER_DETAIL("鑾峰彇寰俊logo璇︽儏"),
@@ -65,6 +66,46 @@
IP_BROADCAST_SYNCH("鍚屾IP闊虫煴"),
IP_BROADCAST_INFO_UPDATE("淇敼IP闊虫煴鍚嶇О"),
IP_BROADCAST_CHANGE_VOL("淇敼IP闊虫煴闊抽噺"),
+ IP_BROADCAST_FILE_ADD("娣诲姞IP闊虫煴鏂囦欢"),
+ IP_BROADCAST_FILE_DELETE("鍒犻櫎IP闊虫煴鏂囦欢"),
+ IP_BROADCAST_FILE_UPLOADING("涓婁紶IP闊虫煴鏂囦欢"),
+ IP_BROADCAST_TASK_ADD("娣诲姞IP闊虫煴浠诲姟"),
+ IP_BROADCAST_TASK_UPDATE("缂栬緫IP闊虫煴浠诲姟"),
+ IP_BROADCAST_TASK_DELETE("鍒犻櫎IP闊虫煴浠诲姟"),
+ IP_BROADCAST_TASK_DETAIL("鑾峰彇IP闊虫煴浠诲姟璇︽儏"),
+ IP_BROADCAST_TASK_PLAY("鎺ㄩ�両P闊虫煴浠诲姟"),
+ IP_BROADCAST_TASK_CONTINUE("缁х画IP闊虫煴浠诲姟"),
+ IP_BROADCAST_TASK_PAUSE("鏆傚仠IP闊虫煴浠诲姟"),
+ IP_BROADCAST_TASK_STOP("鍋滄IP闊虫煴浠诲姟"),
+ LED_N_ADD("鏂板璇虹摝鑺傜洰"),
+ LED_N_UPDATE("缂栬緫璇虹摝鑺傜洰"),
+ LED_N_DETAIL("鑾峰彇璇虹摝鑺傜洰璇︽儏"),
+ LED_N_DELETE("鍒犻櫎璇虹摝鑺傜洰"),
+ LED_FILE_N_ADD("鏂板璇虹摝鏂囦欢"),
+ LED_FILE_N_DELETE("鍒犻櫎璇虹摝鏂囦欢"),
+ LED_FILE_S_ADD("娣诲姞鐔欐睕鏂囦欢"),
+ LED_FILE_S_DELETE("鍒犻櫎鐔欐睕鏂囦欢"),
+ LIGHT_REMARK("娣诲姞鍗曠伅澶囨敞"),
+ LIGHT_EXPORT_LIST("瀵煎嚭鍗曠伅鏁版嵁"),
+ LIGHT_CONTROL("鍗曠伅鎺у埗"),
+ LIGHT_SET_POWER("璁剧疆鍗曠伅鍔熺巼"),
+ LIGHT_POLE_HEELING_HEARTBEAT_PACKAGE("鐏潌鍊炬枩蹇冭烦鍖�"),
+ LIGHT_POLE_HEELING_HEARTBEAT_PACKAGE_QUERY_TIME("鐏潌鍊炬枩蹇冭烦鍖呴棿闅旀椂闂�"),
+ LIGHT_POLE_HEELING_RESTART("鐏潌鍊炬枩杞噸鍚�"),
+ LIGHT_POLE_HEELING_HEARTBEAT_PACKAGE_SET_TIME("璁剧疆鐏潌鍊炬枩蹇冭烦鍖呴棿闅旀椂闂�"),
+ LIGHT_POLE_HEELING_SET_SENSORSTATE("璁剧疆浼犳劅鍣ㄤ负鍒濆鐘舵��"),
+ LIGHT_POLE_HEELING_EQUIPMENT_LIST("鍊炬枩璁惧"),
+ LIGHT_POLE_HEELING_PROCESSING("鍊炬枩璀﹀憡澶勭悊"),
+ LIGHT_TASK_ADD("娣诲姞璺伅浠诲姟"),
+ LIGHT_TASK_DELETE("鍒犻櫎璺伅浠诲姟"),
+ LIGHT_TASK_UPDATE("缂栬緫璺伅浠诲姟"),
+ LIGHT_TASK_DETAIL("璺伅浠诲姟璇︽儏"),
+ LIGHT_TASK_ISSUE("涓嬪彂璺伅浠诲姟"),
+ MONITOR_DELETE("鍒犻櫎鎽勫儚澶�"),
+ MONITOR_ADD("娣诲姞鎽勫儚澶�"),
+ MONITOR_INFO("鑾峰彇鎽勫儚澶翠俊鎭�"),
+ MONITOR_VIDEO_URL("鑾峰彇鎽勫儚澶碪RL鎾斁鍦板潃"),
+ MONITOR_NOTES("淇敼鎽勫儚澶村娉�"),
WATER_EQUIPMENT_ADD("鏂板姘磋川璁惧");
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataController.java
index 5ac63ce..4b7516a 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataController.java
@@ -59,19 +59,12 @@
return ResponseUtil.success(list);
}
- /**
- * 鏍规嵁鐏潌鏌ヨ澶ф皵鏁版嵁
- * @param
- * @return
- */
- @AnonymousAccess
- @GetMapping("/listAirDataByLamp")
- public ResponseVO<Object> listAirDataByLamp(@RequestParam Long lampId) {
- return ResponseUtil.success(airDataService.getDataByPoleid(lampId));
- }
@PostMapping("/updateAirEquipmentInfo")
public ResponseVO<Object> updataAirEquipmentInfo(@RequestBody List<String> listMac) {
+ if (!permissionConfig.check(MenuEnum.AIR_DATA_UPDATE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
AirDataReqInnerFrame airDataReqInnerFrame = new AirDataReqInnerFrame();
A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_ATMOSPHERE_DATA.getCode(), airDataReqInnerFrame);
System.out.println(a5Frame + " --------a5Frame");
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirEquipmentController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirEquipmentController.java
index d94667b..95000f7 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirEquipmentController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirEquipmentController.java
@@ -49,8 +49,4 @@
}
}
- @GetMapping("/getAirEquipment/{mac}")
- public ResponseVO<Object> getAirEquipment(@PathVariable String mac) {
- return ResponseUtil.success(airEquipmentService.getAirEquipment(mac));
- }
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeFileController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeFileController.java
index 62432bc..1df4c32 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeFileController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeFileController.java
@@ -37,11 +37,17 @@
@PostMapping("/add")
public ResponseVO<Object> addFile(@RequestBody @Validated IpVolumeFileParam fileParam) {
+ if (!permissionConfig.check(MenuEnum.IP_BROADCAST_FILE_ADD.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
return ResponseUtil.success(ipVolumeFileService.addFile(fileParam));
}
@PostMapping("/delete/{fileId}")
public ResponseVO<Object> deleteFile(@PathVariable Long fileId) {
+ if (!permissionConfig.check(MenuEnum.IP_BROADCAST_FILE_DELETE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
List<BroadcastV2TaskFile> list = v2TaskFileService.list(Wrappers.lambdaQuery(BroadcastV2TaskFile.class).eq(BroadcastV2TaskFile::getFileId, fileId));
if (list.size() != 0) {
throw new BusinessException("姝ゆ枃浠舵鍦ㄨ鍏朵粬浠诲姟鍗犵敤");
@@ -56,19 +62,19 @@
}
LambdaQueryWrapper<IpVolumeFile> wrapper = ipVolumeFileService.listFile(baseConditionVO, keyword);
-
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
/* if (null != keyword) {
wrapper.like(IpVolumeFile::getFileName, keyword);
}*/
-
-
return ResponseUtil.success(ipVolumeFileService.list(wrapper));
}
@PostMapping("/IpVolumeFileUploading")
public ResponseVO<Object> uploadingFile(@RequestParam("file") MultipartFile file) {
+ if (!permissionConfig.check(MenuEnum.IP_BROADCAST_FILE_UPLOADING.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
return ResponseUtil.success(ipVolumeFileService.upload(file));
}
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeMissionController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeMissionController.java
index c08915a..5b0dfab 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeMissionController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeMissionController.java
@@ -34,6 +34,9 @@
*/
@PostMapping("/add")
public ResponseVO<Object> addMission(@RequestBody IpVolumeMissionParam missionParam) {
+ if (!permissionConfig.check(MenuEnum.IP_BROADCAST_TASK_ADD.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
return ResponseUtil.success(ipVolumeMissionService.addMission(missionParam));
}
@@ -50,6 +53,9 @@
*/
@PostMapping("/update/{taskId}")
public ResponseVO<Object> updateMission(@PathVariable Integer taskId, @RequestBody IpVolumeMissionParam missionParam) {
+ if (!permissionConfig.check(MenuEnum.IP_BROADCAST_TASK_UPDATE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
Integer result = ipVolumeMissionService.updateMission(taskId, missionParam);
if (result == 0) {
return ResponseUtil.success("淇敼鎴愬姛");
@@ -73,6 +79,9 @@
@PostMapping("/delete/{taskId}")
public ResponseVO<Object> deleteMission(@PathVariable Integer taskId) {
+ if (!permissionConfig.check(MenuEnum.IP_BROADCAST_TASK_DELETE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
// 0锛氭垚鍔� 1锛氫换鍔′笉澶勪簬绌洪棽鐘舵�� 2:鏈嶅姟鍣ㄥ垹闄ゅけ璐�
Integer result = ipVolumeMissionService.deleteMission(taskId);
if (result == 0) {
@@ -102,27 +111,42 @@
//鑾峰彇浠诲姟璇︽儏
@GetMapping("/getByTaskId/{taskId}")
public ResponseVO<Object> getByTaskId(@PathVariable Integer taskId) {
+ if (!permissionConfig.check(MenuEnum.IP_BROADCAST_TASK_DETAIL.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
return ResponseUtil.success(ipVolumeMissionService.getByTaskId(taskId));
}
@GetMapping("/playTask/{taskId}")
public ResponseVO<Object> playTask(@PathVariable Integer taskId) {
+ if (!permissionConfig.check(MenuEnum.IP_BROADCAST_TASK_PLAY.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
return ResponseUtil.success(ipVolumeMissionService.playTask(taskId));
}
@GetMapping("/continueTask/{taskId}")
public ResponseVO<Object> continueTask(@PathVariable Integer taskId) {
+ if (!permissionConfig.check(MenuEnum.IP_BROADCAST_TASK_CONTINUE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
return ResponseUtil.success(ipVolumeMissionService.continueTask(taskId));
}
@GetMapping("/pauseTask/{taskId}")
public ResponseVO<Object> pauseTask(@PathVariable Integer taskId) {
+ if (!permissionConfig.check(MenuEnum.IP_BROADCAST_TASK_PAUSE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
return ResponseUtil.success(ipVolumeMissionService.pauseTask(taskId));
}
@GetMapping("/stopTask/{taskId}")
public ResponseVO<Object> stopTask(@PathVariable Integer taskId) {
+ if (!permissionConfig.check(MenuEnum.IP_BROADCAST_TASK_STOP.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
return ResponseUtil.success(ipVolumeMissionService.stopTask(taskId));
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramController.java
index 1964f00..cc8f0ff 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramController.java
@@ -6,7 +6,6 @@
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.param.LEDProgramParam;
-import com.sandu.ximon.admin.param.ReceiveParam;
import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.admin.service.LEDProgramService;
import com.sandu.ximon.dao.domain.LEDProgram;
@@ -27,22 +26,34 @@
@PostMapping("/add")
public ResponseVO<Object> addLEDProgram(@RequestBody @Validated LEDProgramParam ledProgramParam) {
+ if (!permissionConfig.check(MenuEnum.LED_N_ADD.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
return ResponseUtil.success(ledProgramService.addProgram(ledProgramParam));
}
@PostMapping("/update/{pid}")
public ResponseVO<Object> updateLEDProgram(@PathVariable Long pid, @RequestBody @Validated LEDProgramParam ledProgramParam) {
+ if (!permissionConfig.check(MenuEnum.LED_N_UPDATE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
return ResponseUtil.success(ledProgramService.updateProgram(pid, ledProgramParam));
}
@GetMapping("/getbypid/{pid}")
public ResponseVO<Object> getByPid(@PathVariable Long pid) {
+ if (!permissionConfig.check(MenuEnum.LED_N_DETAIL.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
return ResponseUtil.success(ledProgramService.getByPid(pid));
}
@PostMapping("/delete/{pid}")
public ResponseVO<Object> deleteLEDProgram(@PathVariable Long pid) {
+ if (!permissionConfig.check(MenuEnum.LED_N_DELETE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
return ResponseUtil.success(ledProgramService.deleteProgram(pid));
}
@@ -60,29 +71,4 @@
return ResponseUtil.successPage(ledProgramService.list(wrapper));
}
-
-// /**
-// * 妯＄硦鏌ヨ
-// *
-// * @return
-// */
-// @GetMapping("/listLike")
-// public ResponseVO<Object> listLikeProgram(@RequestBody ReceiveParam receiveParam) {
-// LambdaQueryWrapper<LEDProgram> wrapper = ledProgramService.listProgram();
-// if (receiveParam.getKind() != null || receiveParam.getName() != null) {
-//
-// wrapper.like(LEDProgram::getName, receiveParam.getName())
-// .or(
-// ledProgramLambdaQueryWrapper -> {
-// ledProgramLambdaQueryWrapper.like(LEDProgram::getKind, receiveParam.getKind());
-// }
-// );
-//
-// }
-//
-// // List<LEDProgram> list = ledProgramService.list(wrapper);
-// return ResponseUtil.success(ledProgramService.list(wrapper));
-//
-// }
-
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramFileController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramFileController.java
index eb243c1..fe5fa1c 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramFileController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramFileController.java
@@ -7,7 +7,6 @@
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.param.LEDProgramFileParam;
import com.sandu.ximon.admin.security.PermissionConfig;
-import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.service.LEDProgramFileService;
import com.sandu.ximon.dao.domain.LEDProgramFile;
import com.sandu.ximon.dao.enums.MenuEnum;
@@ -31,17 +30,23 @@
@PostMapping("/add")
public ResponseVO<Object> addLEDProgram(@RequestBody @Validated LEDProgramFileParam param) {
+ if (!permissionConfig.check(MenuEnum.LED_FILE_N_ADD.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
return ResponseUtil.success(ledProgramFileService.addProgramFile(param));
}
@PostMapping("/delete/{fileId}")
public ResponseVO<Object> deleteLEDProgram(@PathVariable Long fileId) {
+ if (!permissionConfig.check(MenuEnum.LED_FILE_N_DELETE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
return ResponseUtil.success(ledProgramFileService.deleteFile(fileId));
}
@GetMapping("/list")
public ResponseVO<Object> listfile(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
- if (!permissionConfig.check(MenuEnum.LED_FILE_LIST.getCode())) {
+ if (!permissionConfig.check(MenuEnum.LED_FILE_S_LIST.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LedSFileController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LedSFileController.java
index 718b271..caf7bc8 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LedSFileController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LedSFileController.java
@@ -38,19 +38,24 @@
@PostMapping("/add")
public ResponseVO<Object> addLEDProgram(@RequestParam("file") MultipartFile file) {
-
+ if (!permissionConfig.check(MenuEnum.LED_FILE_S_ADD.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
return ResponseUtil.success(ledProgramFileService.addProgramFile(file));
// return ResponseUtil.success(aliOssFileService.uploadFile(file));
}
@PostMapping("/delete/{fileId}")
public ResponseVO<Object> deleteLEDProgram(@PathVariable Long fileId) {
+ if (!permissionConfig.check(MenuEnum.LED_FILE_S_DELETE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
return ResponseUtil.success(ledProgramFileService.deleteFile(fileId));
}
@GetMapping("/list")
public ResponseVO<Object> listfile(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
- if (!permissionConfig.check(MenuEnum.LED_FILE_LIST.getCode())) {
+ if (!permissionConfig.check(MenuEnum.LED_FILE_S_LIST.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
LambdaQueryWrapper<LedSFile> wrapper = ledProgramFileService.listFile();
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java
index 3c4576f..da0bab3 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java
@@ -51,6 +51,9 @@
@PostMapping("/remark")
public ResponseVO<Object> addRemark(@RequestBody @Validated LightRemarkParam param) {
+ if (!permissionConfig.check(MenuEnum.LIGHT_REMARK.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
boolean result = lightService.addRemark(param);
if (result) {
return ResponseUtil.success("娣诲姞鎴愬姛");
@@ -94,6 +97,9 @@
*/
@GetMapping("/report/exportList")
public ResponseVO<Object> exportList(BaseConditionVO conditionVO, @RequestParam(required = false) String keyword, @RequestParam(required = false) String deviceCode) {
+ if (!permissionConfig.check(MenuEnum.LIGHT_EXPORT_LIST.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
String url = lightReportDataService.exportList(conditionVO.getPageNo(), conditionVO.getPageSize(), keyword, deviceCode);
return ResponseUtil.success(url);
}
@@ -112,6 +118,9 @@
// 浜害鎺у埗
@PostMapping("/control")
public ResponseVO<Object> controlBrightness(@RequestBody @Validated List<LightControlParam> paramList) {
+ if (!permissionConfig.check(MenuEnum.LIGHT_CONTROL.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
List<Map<String, Object>> list = lightService.controlBrightness(paramList);
return ResponseUtil.success(list);
}
@@ -129,12 +138,14 @@
}
-
/**
* 璁剧疆鍔熺巼
*/
@PostMapping("/setPower")
public ResponseVO<Object> setPower(@RequestBody LightPowerSettingParam lightPowerSettingParam) {
+ if (!permissionConfig.check(MenuEnum.LIGHT_SET_POWER.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
boolean resule = lightService.setPower(lightPowerSettingParam);
return ResponseUtil.success(resule);
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightPoleHeelingController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightPoleHeelingController.java
index ca4b4f0..e1266b7 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightPoleHeelingController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightPoleHeelingController.java
@@ -48,6 +48,9 @@
*/
@PostMapping("/LightPoleHeelingHeartbeatPackage")
public ResponseVO<Object> LightPoleHeelingHeartbeatPackage(@RequestBody @Validated LightPoleHeelingParam lightPoleHeelingParam) {
+ if (!permissionConfig.check(MenuEnum.LIGHT_POLE_HEELING_HEARTBEAT_PACKAGE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
return ResponseUtil.success(lightPoleHeelingService.LightPoleHeelingHeartbeatPackage(lightPoleHeelingParam.getDeviceName()));
}
@@ -59,6 +62,9 @@
*/
@PostMapping("/QueryIntervalTime")
public ResponseVO<Object> QueryIntervalTime(@RequestBody @Validated LightPoleHeelingParam lightPoleHeelingParam) {
+ if (!permissionConfig.check(MenuEnum.LIGHT_POLE_HEELING_HEARTBEAT_PACKAGE_QUERY_TIME.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
return ResponseUtil.success(lightPoleHeelingService.QueryIntervalTime(lightPoleHeelingParam.getDeviceName()));
}
@@ -70,6 +76,9 @@
*/
@PostMapping("/RestartLightPoleHeeling")
public ResponseVO<Object> RestartLightPoleHeeling(@RequestBody @Validated LightPoleHeelingParam lightPoleHeelingParam) {
+ if (!permissionConfig.check(MenuEnum.LIGHT_POLE_HEELING_RESTART.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
String result = lightPoleHeelingService.RestartLightPoleHeeling(lightPoleHeelingParam.getDeviceName());
if ("鎿嶄綔鎴愬姛".equals(result)) {
return ResponseUtil.success(result);
@@ -84,6 +93,9 @@
*/
@PostMapping("/SetHeartbeatPacketTime")
public ResponseVO<Object> SetHeartbeatPacketTime(@RequestBody @Validated LightPoleHeelingParam lightPoleHeelingParam) {
+ if (!permissionConfig.check(MenuEnum.LIGHT_POLE_HEELING_HEARTBEAT_PACKAGE_SET_TIME.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
String result = lightPoleHeelingService.SetHeartbeatPacketTime(lightPoleHeelingParam.getDeviceName(), lightPoleHeelingParam.getTime());
if ("鎿嶄綔鎴愬姛".equals(result)) {
return ResponseUtil.success(result);
@@ -98,6 +110,9 @@
*/
@PostMapping("/SetSensorState")
public ResponseVO<Object> SetSensorState(@RequestBody @Validated LightPoleHeelingParam lightPoleHeelingParam) {
+ if (!permissionConfig.check(MenuEnum.LIGHT_POLE_HEELING_SET_SENSORSTATE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
String result = lightPoleHeelingService.SetSensorState(lightPoleHeelingParam.getDeviceName());
if ("鎿嶄綔鎴愬姛".equals(result)) {
return ResponseUtil.success(result);
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightPoleHeelingEquipmentController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightPoleHeelingEquipmentController.java
index 3c3f010..470c0e5 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightPoleHeelingEquipmentController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightPoleHeelingEquipmentController.java
@@ -3,7 +3,9 @@
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.util.ResponseUtil;
+import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.admin.service.LightPoleHeelingEquipmentService;
+import com.sandu.ximon.dao.enums.MenuEnum;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -21,9 +23,13 @@
@RequestMapping("/v1/admin/LightPoleHeelingEquipment")
public class LightPoleHeelingEquipmentController {
private LightPoleHeelingEquipmentService lightPoleHeelingEquipmentService;
+ private PermissionConfig permissionConfig;
@PostMapping("/list")
public ResponseVO<Object> LightPoleHeelingEquipmentList(BaseConditionVO baseConditionVO) {
+ if (!permissionConfig.check(MenuEnum.LIGHT_POLE_HEELING_EQUIPMENT_LIST.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
return ResponseUtil.successPage(lightPoleHeelingEquipmentService.LightPoleHeelingEquipmentList(baseConditionVO));
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightPoleHeelingProcessingController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightPoleHeelingProcessingController.java
index f3c0eae..955b5c6 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightPoleHeelingProcessingController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightPoleHeelingProcessingController.java
@@ -8,7 +8,9 @@
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.param.LightPoleHeelingProcessingParam;
+import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.admin.service.LightPoleHeelingProcessingServices;
+import com.sandu.ximon.dao.enums.MenuEnum;
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
@@ -24,6 +26,7 @@
@RequestMapping("/v1/admin/LightPoleHeelingProcessing")
public class LightPoleHeelingProcessingController {
private LightPoleHeelingProcessingServices lightPoleHeelingProcessingServices;
+ private PermissionConfig permissionConfig;
/**
* 鐏潌鍊炬枩璀﹀憡澶勭悊
@@ -32,6 +35,9 @@
*/
@PostMapping("/Processing")
public ResponseVO<Object> ProcessingLightPoleHeeling(@RequestBody @Validated LightPoleHeelingProcessingParam param) {
+ if (!permissionConfig.check(MenuEnum.LIGHT_POLE_HEELING_PROCESSING.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
return ResponseUtil.success(lightPoleHeelingProcessingServices.ProcessingLightPoleHeeling(param));
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightTaskController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightTaskController.java
index 27e5a79..9c91e2e 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightTaskController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightTaskController.java
@@ -33,6 +33,9 @@
@PostMapping("/add")
public ResponseVO<Object> addLightTask(@RequestBody @Validated LightTaskParam param) {
+ if (!permissionConfig.check(MenuEnum.LIGHT_TASK_ADD.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
boolean result = lightTaskService.addLightTask(param);
if (result) {
return ResponseUtil.success("鏂板鎴愬姛");
@@ -52,6 +55,9 @@
@PostMapping("/del")
public ResponseVO<Object> delLightTask(@RequestBody @Validated LightTaskDelParam param) {
+ if (!permissionConfig.check(MenuEnum.LIGHT_TASK_DELETE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
boolean result = lightTaskService.delLightTask(param.getTaskIdList());
if (result) {
return ResponseUtil.success("鍒犻櫎鎴愬姛");
@@ -62,6 +68,9 @@
@PostMapping("/update/{taskId}")
public ResponseVO<Object> updateLightTask(@PathVariable Long taskId, @RequestBody @Validated LightTaskParam param) {
+ if (!permissionConfig.check(MenuEnum.LIGHT_TASK_UPDATE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
boolean result = lightTaskService.updateLightTask(taskId, param);
if (result) {
return ResponseUtil.success("缂栬緫鎴愬姛");
@@ -72,12 +81,18 @@
@GetMapping("/{taskId}")
public ResponseVO<Object> detailLightTask(@PathVariable Long taskId) {
+ if (!permissionConfig.check(MenuEnum.LIGHT_TASK_DETAIL.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
Map<Object, Object> objectObjectMap = lightTaskService.detailLightTask(taskId);
return ResponseUtil.success(objectObjectMap);
}
@PostMapping("/issue")
public ResponseVO<Object> issueLightTask(@RequestBody @Validated LightTaskIssueParam param) {
+ if (!permissionConfig.check(MenuEnum.LIGHT_TASK_ISSUE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
boolean result = lightTaskService.issueLightTask(param);
if (result) {
return ResponseUtil.success("涓嬪彂鎴愬姛");
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MenuController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MenuController.java
index 491cff1..a09bf91 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MenuController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MenuController.java
@@ -1,11 +1,14 @@
package com.sandu.ximon.admin.controller;
import com.sandu.common.domain.ResponseVO;
+import com.sandu.common.execption.BusinessException;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.param.MenuParam;
import com.sandu.ximon.admin.security.PermissionConfig;
+import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.service.MenuService;
import com.sandu.ximon.dao.bo.MenuNode;
+import com.sandu.ximon.dao.enums.AdministratorEnums;
import com.sandu.ximon.dao.enums.MenuEnum;
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
@@ -37,7 +40,7 @@
@GetMapping("/treeList")
public ResponseVO<Object> treeList() {
- if(!permissionConfig.check(MenuEnum.MENU_LIST.getCode())){
+ if (!permissionConfig.check(MenuEnum.MENU_LIST.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
List<MenuNode> menuTrees = menuService.treeList();
@@ -46,8 +49,10 @@
@PostMapping("/update/{menuId}")
public ResponseVO<Object> update(@PathVariable Long menuId, @Validated @RequestBody MenuParam param) {
-
- boolean result = menuService.updateMenu(menuId,param);
+ if (!SecurityUtils.getUserDetails().getAdministratorType().equals(AdministratorEnums.ADMIN.getCode())) {
+ throw new BusinessException("闈炶秴绾х鐞嗗憳鏃犳硶鎿嶄綔锛�");
+ }
+ boolean result = menuService.updateMenu(menuId, param);
if (result) {
return ResponseUtil.success("缂栬緫鎴愬姛");
} else {
@@ -57,7 +62,9 @@
@PostMapping("/del/{menuId}")
public ResponseVO<Object> delMenu(@PathVariable Long menuId) {
-
+ if (!SecurityUtils.getUserDetails().getAdministratorType().equals(AdministratorEnums.ADMIN.getCode())) {
+ throw new BusinessException("闈炶秴绾х鐞嗗憳鏃犳硶鎿嶄綔锛�");
+ }
boolean result = menuService.delMenu(menuId);
if (result) {
return ResponseUtil.success("鍒犻櫎鎴愬姛");
@@ -68,7 +75,9 @@
@PostMapping("/add")
public ResponseVO<Object> addMenu(@Validated @RequestBody MenuParam param) {
-
+ if (!SecurityUtils.getUserDetails().getAdministratorType().equals(AdministratorEnums.ADMIN.getCode())) {
+ throw new BusinessException("闈炶秴绾х鐞嗗憳鏃犳硶鎿嶄綔锛�");
+ }
boolean result = menuService.addMenu(param);
if (result) {
return ResponseUtil.success("娣诲姞鎴愬姛");
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 fba1c84..28f992b 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
@@ -60,6 +60,9 @@
*/
@PostMapping("/delete/{id}")
public ResponseVO<Object> deleteMonitor(@PathVariable Long id) {
+ if (!permissionConfig.check(MenuEnum.MONITOR_DELETE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
boolean result = monitorService.deleteMonitor(id);
if (result) {
return ResponseUtil.success(null);
@@ -86,6 +89,9 @@
*/
@PostMapping("/addYSYMonitor")
public ResponseVO<Object> addYSYMonitor(@RequestBody MonitorParam monitorParam) {
+ if (!permissionConfig.check(MenuEnum.MONITOR_ADD.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
if (monitorParam == null || monitorParam.getDeviceSerial() == null) {
throw new BusinessException("鍙傛暟涓嶆纭紒");
}
@@ -104,6 +110,9 @@
*/
@PostMapping("/getYSYMonitorInfo")
public ResponseVO<Object> getYSYMonitorInfo(@RequestBody MonitorParam monitorParam) {
+ if (!permissionConfig.check(MenuEnum.MONITOR_INFO.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
YSY_MonitorDto getMonitorDto = monitorService.getYSYMonitorInfo(monitorService.getAccessToken(), monitorParam.getDeviceSerial());
if ("200".equals(getMonitorDto.getCode())) {
@@ -129,6 +138,9 @@
*/
@PostMapping("/getMonitorVideoUrl")
public ResponseVO<Object> getMonitorVideoUrl(@RequestBody MonitorParam monitorParam) {
+ if (!permissionConfig.check(MenuEnum.MONITOR_VIDEO_URL.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
String URL = monitorService.getMonitorVideoUrl(monitorService.getAccessToken(),
monitorParam.getDeviceSerial(), monitorParam.getProtocol(), monitorParam.getExpireTime());
@@ -144,6 +156,9 @@
*/
@PostMapping("/updateNotes")
public ResponseVO<Object> updateNotes(@RequestBody MonitorParam monitorParam) {
+ if (!permissionConfig.check(MenuEnum.MONITOR_NOTES.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
boolean flag = monitorService.updateNotes(monitorParam.getDeviceSerial(), monitorParam.getNotes());
if (flag) {
return ResponseUtil.success("淇敼澶囨敞鎴愬姛锛�");
--
Gitblit v1.9.3