Changes

liuhaonan

2022-05-06 4f0c98099f43028d29546c7000ef48bc89282dc4

 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;

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

    /**
@@ -103,28 +116,26 @@
        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());
    }

    /**
     * 获取设备码
     */
    @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);
    @PostMapping("/setPower")
    public ResponseVO<Object> setPower(@RequestBody LightPowerSettingParam lightPowerSettingParam) {
        boolean resule = lightService.setPower(lightPowerSettingParam);
        return ResponseUtil.success(resule);
    }
}