bug修复

liuhaonan

2022-04-26 d57d96ce51231734aa0b4979abeea17271660c1e

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

@@ -1,5 +1,6 @@
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.util.ResponseUtil;
@@ -17,6 +18,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;

@@ -67,8 +69,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);
    }

    /**
@@ -87,7 +98,7 @@

    @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("缺少对应用户权限");
        }
@@ -107,4 +118,24 @@
    public ResponseVO<Object> controlEnergySaving() {
        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}")
    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为空或者功率为空");
        }
        boolean resule= lightService.setPower(ids,power1,power2);
        return ResponseUtil.success(resule);
    }
}