fix

zhanzhiqin

2022-05-11 4bc9e8a3962a01dd204185039c29c40b734ea4a4

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

@@ -1,9 +1,12 @@
package com.sandu.ximon.admin.controller;

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.LightReportDataService;
@@ -17,6 +20,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;

@@ -47,6 +51,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("添加成功");
@@ -67,8 +74,17 @@
        if (!permissionConfig.check(MenuEnum.LIGHT_DATA.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        List<LightReportDataBo> list = lightReportDataService.listReportData(conditionVO.getPageNo(), conditionVO.getPageSize(), keyword, deviceCode);
        return ResponseUtil.success(list);
        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());

        return ResponseUtil.success(commonPage1);
    }

    /**
@@ -81,13 +97,16 @@
     */
    @GetMapping("/report/exportList")
    public ResponseVO<Object> exportList(BaseConditionVO conditionVO, @RequestParam(required = false) String keyword, @RequestParam(required = false) String deviceCode) {
        if (!permissionConfig.check(MenuEnum.LIGHT_EXPORT_LIST.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        String url = lightReportDataService.exportList(conditionVO.getPageNo(), conditionVO.getPageSize(), keyword, deviceCode);
        return ResponseUtil.success(url);
    }

    @GetMapping("/error/list")
    public ResponseVO<Object> listReportError(BaseConditionVO conditionVO, @RequestParam(required = false) String keyword
            , @RequestParam(required = false) int errorCode) {
            , @RequestParam(required = false) Integer errorCode) {
        if (!permissionConfig.check(MenuEnum.LIGHT_ERROR_LIST.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
@@ -99,12 +118,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("/Energy")
    @AnonymousAccess
    public ResponseVO<Object> Energy() {
        return ResponseUtil.success(lightService.controlEnergy());
    }

    @AnonymousAccess
    @PostMapping("/EnergySaving")
    public ResponseVO<Object> controlEnergySaving() {
        return ResponseUtil.success(lightService.controlEnergySaving());
    }


    /**
     * 设置功率
     */
    @PostMapping("/setPower")
    public ResponseVO<Object> setPower(@RequestBody LightPowerSettingParam lightPowerSettingParam) {
        if (!permissionConfig.check(MenuEnum.LIGHT_SET_POWER.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        boolean resule = lightService.setPower(lightPowerSettingParam);
        return ResponseUtil.success(resule);
    }
}