From 3eda4de769e0852dd051182efe74c2a49865fa84 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 06 六月 2022 18:46:32 +0800
Subject: [PATCH] 灯杆倾斜处理
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java | 78 ++++++++++++++++++++++++++------------
1 files changed, 53 insertions(+), 25 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..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
@@ -3,10 +3,13 @@
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;
@@ -18,6 +21,9 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -31,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;
@@ -38,16 +45,22 @@
@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);
}
@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("娣诲姞鎴愬姛");
@@ -64,13 +77,16 @@
*/
@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("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
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());
@@ -81,20 +97,29 @@
/**
* 瀵煎嚭Excel
*
- * @param conditionVO
- * @param keyword
* @param deviceCode
* @return
*/
@GetMapping("/report/exportList")
- public ResponseVO<Object> exportList(BaseConditionVO conditionVO, @RequestParam(required = false) String keyword, @RequestParam(required = false) String deviceCode) {
- String url = lightReportDataService.exportList(conditionVO.getPageNo(), conditionVO.getPageSize(), keyword, deviceCode);
- return ResponseUtil.success(url);
+ 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("璁惧缂栧彿涓嶈兘涓虹┖");
+ }
+ 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("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
@@ -106,32 +131,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("/EnergySaving")
- public ResponseVO<Object> controlEnergySaving() {
- return ResponseUtil.success(lightService.controlEnergySaving());
+ @PostMapping("/Energy")
+ public ResponseVO<Object> Energy() {
+ return ResponseUtil.success(lightEnergyDataService.energy(0));
+// return ResponseUtil.success(lightService.controlEnergy());
}
- /**
- * 鑾峰彇璁惧鐮�
- */
- @GetMapping("/deviceCode")
- public ResponseVO<Object> getDeviceCode(BaseConditionVO baseConditionVO) {
- return ResponseUtil.success(lightService.listDeviceCode(baseConditionVO.getPageNo() , baseConditionVO.getPageSize()));
+ @PostMapping("/EnergySaving")
+ public ResponseVO<Object> controlEnergySaving() {
+ return ResponseUtil.success(lightEnergyDataService.energy(1));
+// return ResponseUtil.success(lightService.controlEnergySaving());
}
+
/**
* 璁剧疆鍔熺巼
*/
- @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