fix

zhanzhiqin

2022-05-18 c060df1d22f23f059c03c432b6ff420bcb9801cf

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java

@@ -3,6 +3,7 @@
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;
@@ -19,6 +20,8 @@
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;
@@ -40,7 +43,7 @@


    @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) {
        if (!permissionConfig.check(MenuEnum.LIGHT_LIST.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
@@ -50,6 +53,9 @@

    @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("添加成功");
@@ -66,14 +72,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) {
        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){
        if (lightReportDataBos == null) {
            return ResponseUtil.success(CommonPage.restPage(new ArrayList<>()));
        }
        CommonPage commonPage1 = CommonPage.restPage(lightReportDataBos);
@@ -86,20 +92,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("缺少对应用户权限");
        }
@@ -111,8 +126,16 @@
    // 亮度控制
    @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("/Energy")
    public ResponseVO<Object> Energy() {
        return ResponseUtil.success(lightService.controlEnergy());
    }

    @PostMapping("/EnergySaving")
@@ -120,20 +143,16 @@
        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}")
    @PostMapping("/setPower")
    public ResponseVO<Object> setPower(@RequestBody LightPowerSettingParam lightPowerSettingParam) {
        boolean resule= lightService.setPower(lightPowerSettingParam);
        if (!permissionConfig.check(MenuEnum.LIGHT_SET_POWER.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        boolean resule = lightService.setPower(lightPowerSettingParam);
        return ResponseUtil.success(resule);
    }
}