fix

zhanzhiqin

2022-05-17 31e798604209979bb9e93652dc0b0ac8d4d61538

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

@@ -20,6 +20,8 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -90,18 +92,24 @@
    /**
     * 导出Excel
     *
     * @param conditionVO
     * @param keyword
     * @param deviceCode
     * @return
     */
    @GetMapping("/report/exportList")
    public ResponseVO<Object> exportList(BaseConditionVO conditionVO, @RequestParam(required = false) String keyword, @RequestParam(required = false) String deviceCode) {
    public ResponseVO<Object> exportList(HttpServletRequest request, HttpServletResponse response, @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);
        if (deviceCode.isEmpty()) {
            return ResponseUtil.fail("设备编号不能为空");
        }
        int length = deviceCode.length();
        if (length != 24) {
            return ResponseUtil.fail("设备编号长度不正确");
        }
        lightReportDataService.exportList(request, response, deviceCode);

        return ResponseUtil.success("导出成功");
    }

    @GetMapping("/error/list")
@@ -126,12 +134,10 @@
    }

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

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