From 52a3bda95de2e73e5958644f57b2a3d32168a4a1 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期一, 22 八月 2022 16:04:26 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java | 55 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 40 insertions(+), 15 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..b093af9 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,18 +3,19 @@
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.LightEnergyDataService;
import com.sandu.ximon.admin.service.LightReportDataService;
import com.sandu.ximon.admin.service.LightReportErrorService;
import com.sandu.ximon.admin.service.LightService;
import com.sandu.ximon.dao.bo.LightBo;
import com.sandu.ximon.dao.bo.LightReportDataBo;
import com.sandu.ximon.dao.bo.LightReportErrorBo;
+import com.sandu.ximon.dao.domain.LightReportData;
import com.sandu.ximon.dao.enums.MenuEnum;
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
@@ -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,11 +77,14 @@
*/
@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
+ , @RequestParam(value = "order", required = false) Integer order
+ ,@RequestParam(value = "seq", required = false) Integer seq) {
if (!permissionConfig.check(MenuEnum.LIGHT_DATA.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- CommonPage commonPage = lightReportDataService.listReportData(conditionVO.getPageNo(), conditionVO.getPageSize(), keyword, deviceCode);
+ CommonPage commonPage = lightReportDataService.listReportData(conditionVO.getPageNo(), conditionVO.getPageSize(), keyword, deviceCode,order,seq);
List<LightReportDataBo> lightReportDataBos = (List<LightReportDataBo>) commonPage.getList();
if (lightReportDataBos == null) {
@@ -95,22 +103,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 +142,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());
}
@@ -153,4 +165,17 @@
boolean resule = lightService.setPower(lightPowerSettingParam);
return ResponseUtil.success(resule);
}
+
+ /**
+ * 鍗曠伅鏁版嵁鍒楄〃
+ */
+ @GetMapping("/data/list")
+ public ResponseVO<Object> listData(BaseConditionVO conditionVO, @RequestParam(value = "deviceCode", required = false) String deviceCode) {
+ if (!permissionConfig.check(MenuEnum.LIGHT_DATA.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ List<LightReportData> reportDataList = lightReportDataService.getReportDataList(conditionVO, deviceCode);
+
+ return ResponseUtil.success(reportDataList);
+ }
}
--
Gitblit v1.9.3