From 098dd2ed33b90a8a14ff0b04bace845ec119244c Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 09 五月 2022 10:40:21 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java | 11 +++++
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/RemoteUpdateController.java | 7 +++
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java | 9 ++++
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirEquipmentController.java | 3 +
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataController.java | 1
dao/src/main/java/com/sandu/ximon/dao/enums/MenuEnum.java | 21 ++++++++++
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/WaterQualityEquipmentController.java | 4 ++
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/BannerController.java | 13 ++++++
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IPBroadcastController.java | 15 ++++++-
9 files changed, 79 insertions(+), 5 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 aea6008..759b4e4 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
@@ -48,7 +48,26 @@
PAY_CONFIG("鏀粯閰嶇疆"),
BANNER("寰俊logo"),
POLE_LIST("鐏潌鍒楄〃"),
- LIGHT_POLE_HEELING_LIST("鐏潌鍊炬枩");
+ LIGHT_POLE_HEELING_LIST("鐏潌鍊炬枩"),
+
+ //鎸夐挳鏉冮檺
+ ADMIN_ADD("鏂板绠＄悊鍛�"),
+ ADMIN_INFO_UPDATE("缂栬緫绠＄悊鍛樹俊鎭�"),
+ ADMIN_DELETE("鍒犻櫎绠＄悊鍛�"),
+ AIR_EQUIPMENT_DELETE("鍒犻櫎澶ф皵璁惧"),
+ BANNER_ADD("娣诲姞寰俊logo"),
+ BANNER_UPDATE("缂栬緫寰俊logo"),
+ BANNER_DETAIL("鑾峰彇寰俊logo璇︽儏"),
+ BANNER_DELETE("鍒犻櫎寰俊logo"),
+ CLIENT_ADD("鏂板瀹㈡埛"),
+ CLIENT_INFO_UPDATE("缂栬緫瀹㈡埛淇℃伅"),
+ CLIENT_DELETE("鍒犻櫎瀹㈡埛"),
+ IP_BROADCAST_SYNCH("鍚屾IP闊虫煴"),
+ IP_BROADCAST_INFO_UPDATE("淇敼IP闊虫煴鍚嶇О"),
+ IP_BROADCAST_CHANGE_VOL("淇敼IP闊虫煴闊抽噺"),
+
+
+ WATER_EQUIPMENT_ADD("鏂板姘磋川璁惧");
private final String code;
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java
index d5cbb74..0b69b22 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java
@@ -76,7 +76,7 @@
}
// String session_vcode = (String) request.getSession().getAttribute(loginParam.getKey());
String s = RedisUtils.getBean().get(loginParam.getKey());
- System.out.println(s+"===========================");
+ System.out.println(s + "===========================");
if (!loginParam.getVlue().equals(s)) {
log.error(loginParam.getVlue() + "楠岃瘉鐮�");
return ResponseUtil.error(ResponseStatusEnums.BAD_AUTHENTICATION.getCode(), ResponseStatusEnums.BAD_AUTHENTICATION.getMessage());
@@ -226,6 +226,9 @@
@Log("鍚庡彴鐢ㄦ埛娉ㄥ唽")
@PostMapping("/register")
public ResponseVO<Object> register(@Validated @RequestBody AdminParam param) {
+ if (!permissionConfig.check(MenuEnum.ADMIN_ADD.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
boolean result = adminService.register(param);
if (result) {
return ResponseUtil.success("娉ㄥ唽鐢ㄦ埛鎴愬姛");
@@ -242,6 +245,9 @@
@Log("鍚庡彴鐢ㄦ埛淇敼淇℃伅")
@PostMapping("/update/{adminId}")
public ResponseVO<Object> updateAdmin(@RequestBody AdminParam param, @PathVariable Long adminId) {
+ if (!permissionConfig.check(MenuEnum.ADMIN_INFO_UPDATE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
boolean result = adminService.updateAdmin(adminId, param);
if (result) {
return ResponseUtil.success("淇敼鎴愬姛");
@@ -302,6 +308,9 @@
@Log("鍚庡彴鐢ㄦ埛鍒犻櫎")
@PostMapping("/del/{adminId}")
public ResponseVO<Object> deleteAdmin(@PathVariable Long adminId) {
+ if (!permissionConfig.check(MenuEnum.ADMIN_DELETE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
boolean result = adminService.deleteAdmin(adminId);
if (result) {
return ResponseUtil.success("淇敼鎴愬姛");
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 60a3952..5ac63ce 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
@@ -54,6 +54,7 @@
*/
@GetMapping("/listAirEquipmentMAC")
public ResponseVO<Object> listAirEquipmentMAC() {
+ //TODO
List<String> list = airDataService.listAirEquipmentMAC();
return ResponseUtil.success(list);
}
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 d53c732..d94667b 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
@@ -38,6 +38,9 @@
@PostMapping("/delete/{id}")
public ResponseVO<Object> deleteAirEquipment(@PathVariable Long id) {
+ if (!permissionConfig.check(MenuEnum.AIR_EQUIPMENT_DELETE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
boolean result = airEquipmentService.deleteAirEquipment(id);
if (result) {
return ResponseUtil.success(null);
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/BannerController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/BannerController.java
index 5d24770..53743b6 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/BannerController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/BannerController.java
@@ -32,8 +32,10 @@
@PostMapping("/addbanner")
public ResponseVO<Object> addBanner(@Validated @RequestBody BannerParam bannerParam) {
+ if (!permissionConfig.check(MenuEnum.BANNER_ADD.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
Client client = clientService.getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getId, bannerParam.getBinding_author()));
-
boolean result = contentBannerService.addBanner(bannerParam, client);
if (result) {
@@ -51,6 +53,9 @@
@PostMapping("/{bannerId}")
public ResponseVO<Object> updateBanner(@PathVariable Long bannerId, @Validated @RequestBody BannerParam bannerParam) {
+ if (!permissionConfig.check(MenuEnum.BANNER_UPDATE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
boolean result = contentBannerService.updateBanner(bannerId, bannerParam);
if (result) {
return ResponseUtil.success("鏇存柊鎴愬姛");
@@ -61,6 +66,9 @@
@GetMapping("/{bannerId}")
public ResponseVO<Object> detailBanner(@PathVariable Long bannerId) {
+ if (!permissionConfig.check(MenuEnum.BANNER_DETAIL.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
BannerDto result = contentBannerService.detailBanner(bannerId);
return ResponseUtil.success(result);
}
@@ -81,6 +89,9 @@
@PostMapping("/delete/{bannerId}")
public ResponseVO<Object> deleteBanner(@PathVariable Long bannerId) {
+ if (!permissionConfig.check(MenuEnum.BANNER_DELETE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
boolean result = contentBannerService.deleteBanner(bannerId);
if (result) {
return ResponseUtil.success("鍒犻櫎鎴愬姛");
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java
index 0b8b177..6dab943 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java
@@ -57,6 +57,9 @@
@PostMapping("/add")
public ResponseVO<Object> addClient(@RequestBody @Validated AddClientPrarm addClientPrarm) {
+ if (!permissionConfig.check(MenuEnum.CLIENT_ADD.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
boolean b = clientService.addClient(addClientPrarm);
if (b) {
return ResponseUtil.success("娣诲姞鎴愬姛");
@@ -68,6 +71,9 @@
@PostMapping("/update/{id}")
public ResponseVO<Object> updateClient(@PathVariable Long id, @RequestBody @Validated UpdateClientPrarm updateClientPrarm) {
+ if (!permissionConfig.check(MenuEnum.CLIENT_INFO_UPDATE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
boolean b = clientService.updateClient(id, updateClientPrarm);
if (b) {
return ResponseUtil.success("鏇存柊鎴愬姛");
@@ -110,6 +116,9 @@
@PostMapping("/delete/{id}")
public ResponseVO<Object> deleteClient(@PathVariable Long id) {
+ if (!permissionConfig.check(MenuEnum.CLIENT_DELETE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
boolean b = clientService.deleteClient(id);
if (b) {
return ResponseUtil.success("鍒犻櫎鎴愬姛");
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IPBroadcastController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IPBroadcastController.java
index 757a59c..9ba9af9 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IPBroadcastController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IPBroadcastController.java
@@ -26,8 +26,12 @@
private IpVolumeService broadcastTerminalV2Service;
private PermissionConfig permissionConfig;
+ //TODO
@PostMapping("/synchTerminal")
public ResponseVO<Object> synchTerminal() {
+ if (!permissionConfig.check(MenuEnum.IP_BROADCAST_SYNCH.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
broadcastTerminalV2Service.synchTerminal();
return ResponseUtil.success("鍚屾瀹屾垚锛�");
}
@@ -49,12 +53,16 @@
/**
* 淇敼闊虫煴鍚嶇О
+ *
* @param
* @return
*/
@PostMapping("/updateBroadcastTerminalName/{id}")
- public ResponseVO<Object> updateBroadcastTerminalName(@PathVariable Integer id,@RequestBody ReceiveParam param) {
- boolean flag = broadcastTerminalV2Service.updateBroadcastTerminalName(param.getName(),id);
+ public ResponseVO<Object> updateBroadcastTerminalName(@PathVariable Integer id, @RequestBody ReceiveParam param) {
+ if (!permissionConfig.check(MenuEnum.IP_BROADCAST_INFO_UPDATE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ boolean flag = broadcastTerminalV2Service.updateBroadcastTerminalName(param.getName(), id);
if (flag) {
return ResponseUtil.success("鎴愬姛淇敼闊虫煴鍚嶇О锛�");
} else {
@@ -64,6 +72,9 @@
@PostMapping("/changeVol")
public ResponseVO<Object> changeVol(@RequestBody BroadcastTerminalV2Param broadcastTerminalV2Param) {
+ if (!permissionConfig.check(MenuEnum.IP_BROADCAST_CHANGE_VOL.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
boolean flag = broadcastTerminalV2Service.changeVol(broadcastTerminalV2Param);
if (flag) {
return ResponseUtil.success("鎴愬姛淇敼闊抽噺锛�");
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/RemoteUpdateController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/RemoteUpdateController.java
index 674d261..9146987 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/RemoteUpdateController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/RemoteUpdateController.java
@@ -8,9 +8,11 @@
import com.sandu.ximon.admin.manager.iot.rrpc.enums.A5OrderEnum;
import com.sandu.ximon.admin.param.RemotePrarm;
import com.sandu.ximon.admin.param.RemoteUpdateParam;
+import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.admin.service.RemoteUpdateService;
import com.sandu.ximon.admin.utils.HexUtils;
import com.sandu.ximon.admin.utils.StringUtil;
+import com.sandu.ximon.dao.enums.MenuEnum;
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -29,6 +31,8 @@
@RequestMapping("/v1/remoteupdate")
public class RemoteUpdateController {
private RemoteUpdateService remoteUpdateService;
+ private PermissionConfig permissionConfig;
+
@AnonymousAccess
@PostMapping("/add")
@@ -58,6 +62,9 @@
@AnonymousAccess
@PostMapping("/StartRemoteUpdate")
public ResponseVO<Object> startRemoteUpdate(@RequestBody @Validated RemotePrarm remotePrarm) {
+// if (!permissionConfig.check(MenuEnum.MENU_LIST.getCode())) {
+// return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+// }
String orderType;
boolean UpdateFlag = false;
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/WaterQualityEquipmentController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/WaterQualityEquipmentController.java
index dde756d..2883350 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/WaterQualityEquipmentController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/WaterQualityEquipmentController.java
@@ -40,6 +40,7 @@
/**
* 鍒犻櫎姘磋川璁惧
+ *
* @param id
* @return
*/
@@ -55,6 +56,9 @@
@PostMapping("/add")
public ResponseVO<Object> addQualityEquipment(@RequestBody WaterQualityEquipment waterQualityEquipment) {
+ if (!permissionConfig.check(MenuEnum.WATER_EQUIPMENT_ADD.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
boolean result = waterQualityEquipmentService.addWaterQualityEquipment(waterQualityEquipment);
if (result) {
return ResponseUtil.success("鎴愬姛娣诲姞姘磋川璁惧");
--
Gitblit v1.9.3