From 2c52eaf28f9b8a666547e1307a76c3032598e57f Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 11 五月 2022 16:50:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java | 39 +++++++++++++++++++++++++--------------
1 files changed, 25 insertions(+), 14 deletions(-)
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 b27bcc6..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
@@ -3,8 +3,10 @@
import com.sandu.common.domain.CommonPage;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.object.BaseConditionVO;
+import com.sandu.common.security.annotation.AnonymousAccess;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.param.LightControlParam;
+import com.sandu.ximon.admin.param.LightPowerSettingParam;
import com.sandu.ximon.admin.param.LightRemarkParam;
import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.admin.service.LightReportDataService;
@@ -49,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("娣诲姞鎴愬姛");
@@ -70,9 +75,9 @@
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
CommonPage commonPage = lightReportDataService.listReportData(conditionVO.getPageNo(), conditionVO.getPageSize(), keyword, deviceCode);
- List<LightReportDataBo> lightReportDataBos = ( List<LightReportDataBo>)commonPage.getList();
+ List<LightReportDataBo> lightReportDataBos = (List<LightReportDataBo>) commonPage.getList();
- if(lightReportDataBos == null){
+ if (lightReportDataBos == null) {
return ResponseUtil.success(CommonPage.restPage(new ArrayList<>()));
}
CommonPage commonPage1 = CommonPage.restPage(lightReportDataBos);
@@ -92,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);
}
@@ -110,32 +118,35 @@
// 浜害鎺у埗
@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);
}
+ @PostMapping("/Energy")
+ @AnonymousAccess
+ public ResponseVO<Object> Energy() {
+ return ResponseUtil.success(lightService.controlEnergy());
+ }
+
+ @AnonymousAccess
@PostMapping("/EnergySaving")
public ResponseVO<Object> controlEnergySaving() {
return ResponseUtil.success(lightService.controlEnergySaving());
}
-// /**
-// * 鑾峰彇璁惧鐮�
-// */
-// @GetMapping("/deviceCode")
-// public ResponseVO<Object> getDeviceCode(BaseConditionVO baseConditionVO) {
-// return ResponseUtil.success(lightService.listDeviceCode(baseConditionVO.getPageNo() , baseConditionVO.getPageSize()));
-// }
/**
* 璁剧疆鍔熺巼
*/
- @PostMapping("/setPower/{power1}/{power2}")
- public ResponseVO<Object> setPower(@RequestBody List<Long> ids, @PathVariable Integer power1,@PathVariable Integer power2) {
- if(ids.isEmpty()||power1==null||power2==null){
- return ResponseUtil.fail("id涓虹┖鎴栬�呭姛鐜囦负绌�");
+ @PostMapping("/setPower")
+ public ResponseVO<Object> setPower(@RequestBody LightPowerSettingParam lightPowerSettingParam) {
+ if (!permissionConfig.check(MenuEnum.LIGHT_SET_POWER.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- boolean resule= lightService.setPower(ids,power1,power2);
+ boolean resule = lightService.setPower(lightPowerSettingParam);
return ResponseUtil.success(resule);
}
}
--
Gitblit v1.9.3