fix

zhanzhiqin

2022-06-17 0fef782539e375d8a3e6dbe376663d09c32ce77e

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

@@ -9,6 +9,7 @@
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.LightEnergyDataService;
import com.sandu.ximon.admin.service.LightReportDataService;
import com.sandu.ximon.admin.service.LightReportErrorService;
import com.sandu.ximon.admin.service.LightService;
@@ -36,6 +37,7 @@
@RequestMapping("/v1/light")
public class LightController {

    private final LightEnergyDataService lightEnergyDataService;
    private final LightService lightService;
    private final LightReportDataService lightReportDataService;
    private final LightReportErrorService lightReportErrorService;
@@ -43,11 +45,14 @@


    @GetMapping("/list")
    public ResponseVO<Object> listLight(BaseConditionVO conditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
    public ResponseVO<Object> listLight(BaseConditionVO conditionVO,
                                        @RequestParam(value = "keyword", required = false) String keyword,
                                        @RequestParam(value = "order", required = false) Integer order,
                                        @RequestParam(value = "seq", required = false) Integer seq) {
        if (!permissionConfig.check(MenuEnum.LIGHT_LIST.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        List<LightBo> list = lightService.listLight(conditionVO.getPageNo(), conditionVO.getPageSize(), keyword);
        List<LightBo> list = lightService.listLight(conditionVO.getPageNo(), conditionVO.getPageSize(), keyword, order, seq);
        return ResponseUtil.successPage(list);
    }

@@ -135,12 +140,14 @@

    @PostMapping("/Energy")
    public ResponseVO<Object> Energy() {
        return ResponseUtil.success(lightService.controlEnergy());
        return ResponseUtil.success(lightEnergyDataService.energy(0));
//        return ResponseUtil.success(lightService.controlEnergy());
    }

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