From a74982b14a8502e946765ec12b31174d6c0995ac Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期六, 07 五月 2022 18:22:40 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java | 32 ++++++++++++++++++--------------
1 files changed, 18 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 620b967..3c4576f 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;
@@ -18,6 +20,7 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -69,8 +72,11 @@
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) {
+ return ResponseUtil.success(CommonPage.restPage(new ArrayList<>()));
+ }
CommonPage commonPage1 = CommonPage.restPage(lightReportDataBos);
commonPage1.setTotal(commonPage.getTotal());
commonPage1.setTotalPage(commonPage.getTotalPage());
@@ -110,28 +116,26 @@
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涓虹┖鎴栬�呭姛鐜囦负绌�");
- }
- boolean resule= lightService.setPower(ids,power1,power2);
+ @PostMapping("/setPower")
+ public ResponseVO<Object> setPower(@RequestBody LightPowerSettingParam lightPowerSettingParam) {
+ boolean resule = lightService.setPower(lightPowerSettingParam);
return ResponseUtil.success(resule);
}
}
--
Gitblit v1.9.3