fix

zhanzhiqin

2022-04-28 72ce25c9c0a03c9279248dc473dbe3497b2d97dc

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

@@ -5,6 +5,7 @@
import com.sandu.common.object.BaseConditionVO;
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;
@@ -18,6 +19,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;

@@ -71,6 +73,9 @@
        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());
@@ -127,11 +132,8 @@
     * 设置功率
     */
    @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);
    public ResponseVO<Object> setPower(@RequestBody LightPowerSettingParam lightPowerSettingParam) {
        boolean resule= lightService.setPower(lightPowerSettingParam);
        return ResponseUtil.success(resule);
    }
}