Merge remote-tracking branch 'origin/master'

liuhaonan

2022-09-26 a36535db12500082c443ef86a0c53bc039f5b615

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

@@ -5,9 +5,9 @@
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.common.util.SpringContextHolder;
import com.sandu.ximon.admin.param.*;
import com.sandu.ximon.admin.schedule.LightTimeSynchronizationSchedule;
import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.admin.service.LightEnergyDataService;
import com.sandu.ximon.admin.service.LightReportDataService;
@@ -16,6 +16,7 @@
import com.sandu.ximon.dao.bo.LightBo;
import com.sandu.ximon.dao.bo.LightReportDataBo;
import com.sandu.ximon.dao.bo.LightReportErrorBo;
import com.sandu.ximon.dao.domain.LightReportData;
import com.sandu.ximon.dao.enums.MenuEnum;
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
@@ -77,11 +78,14 @@
     */
    @GetMapping("/report/list")
    public ResponseVO<Object> listReportData(BaseConditionVO conditionVO
            , @RequestParam(value = "keyword", required = false) String keyword, @RequestParam(value = "deviceCode", required = false) String deviceCode) {
            , @RequestParam(value = "keyword", required = false) String keyword
            , @RequestParam(value = "deviceCode", required = false) String deviceCode
            , @RequestParam(value = "order", required = false) Integer order
            ,@RequestParam(value = "seq", required = false) Integer seq) {
        if (!permissionConfig.check(MenuEnum.LIGHT_DATA.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        CommonPage commonPage = lightReportDataService.listReportData(conditionVO.getPageNo(), conditionVO.getPageSize(), keyword, deviceCode);
        CommonPage commonPage = lightReportDataService.listReportData(conditionVO.getPageNo(), conditionVO.getPageSize(), keyword, deviceCode,order,seq);
        List<LightReportDataBo> lightReportDataBos = (List<LightReportDataBo>) commonPage.getList();

        if (lightReportDataBos == null) {
@@ -162,4 +166,37 @@
        boolean resule = lightService.setPower(lightPowerSettingParam);
        return ResponseUtil.success(resule);
    }

    /**
     * 单灯数据列表
     */
    @GetMapping("/data/list")
    public ResponseVO<Object> listData(BaseConditionVO conditionVO, @RequestParam(value = "deviceCode", required = false) String deviceCode) {
        if (!permissionConfig.check(MenuEnum.LIGHT_DATA.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        List<LightReportData> reportDataList = lightReportDataService.getReportDataList(conditionVO, deviceCode);

        return ResponseUtil.success(reportDataList);
    }

    /**
     * 设置日历（同心跳包中的6字节日期时间）
     */
    @PostMapping("/SetCalendar")
    public ResponseVO<Object> SetCalendar(@RequestBody @Validated LightSetCalendarParam lightSetCalendarParam) {
        if (!permissionConfig.check(MenuEnum.LIGHT_SETCALENDAR.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }

        return ResponseUtil.success(lightService.SetCalendar(lightSetCalendarParam.getLightId(), lightSetCalendarParam.getAddress()));
    }

    @AnonymousAccess
    @GetMapping("/test")
    public ResponseVO<Object> test() {
        SpringContextHolder.getBean(LightTimeSynchronizationSchedule.class).UserSubjectRefund();

        return ResponseUtil.success(null);
    }
}