From eee37d696c4b5e1b2d1117e781e93eadc3c3fbe7 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期一, 27 六月 2022 18:15:25 +0800
Subject: [PATCH] 支付配置
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java | 35 ++++++++++++++++++++++-------------
1 files changed, 22 insertions(+), 13 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 a418960..e7fe9a9 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
@@ -9,6 +9,7 @@
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.LightEnergyDataService;
import com.sandu.ximon.admin.service.LightReportDataService;
import com.sandu.ximon.admin.service.LightReportErrorService;
import com.sandu.ximon.admin.service.LightService;
@@ -36,6 +37,7 @@
@RequestMapping("/v1/light")
public class LightController {
+ private final LightEnergyDataService lightEnergyDataService;
private final LightService lightService;
private final LightReportDataService lightReportDataService;
private final LightReportErrorService lightReportErrorService;
@@ -43,11 +45,14 @@
@GetMapping("/list")
- public ResponseVO<Object> listLight(BaseConditionVO conditionVO, @RequestParam(required = false) String keyword) {
+ public ResponseVO<Object> listLight(BaseConditionVO conditionVO,
+ @RequestParam(value = "keyword", required = false) String keyword,
+ @RequestParam(value = "order", required = false) Integer order,
+ @RequestParam(value = "seq", required = false) Integer seq) {
if (!permissionConfig.check(MenuEnum.LIGHT_LIST.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- List<LightBo> list = lightService.listLight(conditionVO.getPageNo(), conditionVO.getPageSize(), keyword);
+ List<LightBo> list = lightService.listLight(conditionVO.getPageNo(), conditionVO.getPageSize(), keyword, order, seq);
return ResponseUtil.successPage(list);
}
@@ -72,7 +77,7 @@
*/
@GetMapping("/report/list")
public ResponseVO<Object> listReportData(BaseConditionVO conditionVO
- , @RequestParam(required = false) String keyword, @RequestParam(required = false) String deviceCode) {
+ , @RequestParam(value = "keyword", required = false) String keyword, @RequestParam(value = "deviceCode", required = false) String deviceCode) {
if (!permissionConfig.check(MenuEnum.LIGHT_DATA.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
@@ -95,22 +100,26 @@
* @param deviceCode
* @return
*/
- @AnonymousAccess
@GetMapping("/report/exportList")
- public ResponseVO<Object> exportList(HttpServletRequest request, HttpServletResponse response, @RequestParam(required = false) String deviceCode) {
+ public ResponseVO<Object> exportList(HttpServletRequest request, HttpServletResponse response, @RequestParam(value = "deviceCode", required = false) String deviceCode) {
if (!permissionConfig.check(MenuEnum.LIGHT_EXPORT_LIST.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
if (deviceCode.isEmpty()) {
return ResponseUtil.fail("璁惧缂栧彿涓嶈兘涓虹┖");
}
- String url = lightReportDataService.exportList(request,response, deviceCode);
- return ResponseUtil.success(url);
+ int length = deviceCode.length();
+ if (length != 24) {
+ return ResponseUtil.fail("璁惧缂栧彿闀垮害涓嶆纭�");
+ }
+ lightReportDataService.exportList(request, response, deviceCode);
+
+ return ResponseUtil.success("瀵煎嚭鎴愬姛");
}
@GetMapping("/error/list")
- public ResponseVO<Object> listReportError(BaseConditionVO conditionVO, @RequestParam(required = false) String keyword
- , @RequestParam(required = false) Integer errorCode) {
+ public ResponseVO<Object> listReportError(BaseConditionVO conditionVO, @RequestParam(value = "keyword", required = false) String keyword
+ , @RequestParam(value = "errorCode", required = false) Integer errorCode) {
if (!permissionConfig.check(MenuEnum.LIGHT_ERROR_LIST.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
@@ -130,15 +139,15 @@
}
@PostMapping("/Energy")
- @AnonymousAccess
public ResponseVO<Object> Energy() {
- return ResponseUtil.success(lightService.controlEnergy());
+ return ResponseUtil.success(lightEnergyDataService.energy(0));
+// return ResponseUtil.success(lightService.controlEnergy());
}
- @AnonymousAccess
@PostMapping("/EnergySaving")
public ResponseVO<Object> controlEnergySaving() {
- return ResponseUtil.success(lightService.controlEnergySaving());
+ return ResponseUtil.success(lightEnergyDataService.energy(1));
+// return ResponseUtil.success(lightService.controlEnergySaving());
}
--
Gitblit v1.9.3