From 72ce25c9c0a03c9279248dc473dbe3497b2d97dc Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 28 四月 2022 14:54:09 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 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..1e14ff3 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
@@ -5,6 +5,7 @@
import com.sandu.common.object.BaseConditionVO;
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 +19,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;
@@ -71,6 +73,9 @@
CommonPage commonPage = lightReportDataService.listReportData(conditionVO.getPageNo(), conditionVO.getPageSize(), keyword, deviceCode);
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());
@@ -115,23 +120,20 @@
return ResponseUtil.success(lightService.controlEnergySaving());
}
- /**
- * 鑾峰彇璁惧鐮�
- */
- @GetMapping("/deviceCode")
- public ResponseVO<Object> getDeviceCode(BaseConditionVO baseConditionVO) {
- return ResponseUtil.success(lightService.listDeviceCode(baseConditionVO.getPageNo() , baseConditionVO.getPageSize()));
- }
+// /**
+// * 鑾峰彇璁惧鐮�
+// */
+// @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);
+ public ResponseVO<Object> setPower(@RequestBody LightPowerSettingParam lightPowerSettingParam) {
+ boolean resule= lightService.setPower(lightPowerSettingParam);
return ResponseUtil.success(resule);
}
}
--
Gitblit v1.9.3