Merge remote-tracking branch 'origin/master'

liuhaonan

2022-05-17 53d4c0d723402840c3a591664a839f7ce044bd2d

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

@@ -1,5 +1,6 @@
package com.sandu.ximon.admin.controller;

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper;
@@ -44,8 +45,7 @@
    private final PoleLightemitService poleLightemitService;
    private final LightemitUtils lightemitUtils;
    private final LedScheduleService scheduleService;
    private final PoleBindingService bindingService;
    private final PoleService poleService;

    private PermissionConfig permissionConfig;
    // private final ListPageUtil listPageUtil;

@@ -259,11 +259,9 @@
        return ResponseUtil.success(poleLightemitService.getLedByLightControlCode(lightemitControlCode));
    }

    /*
    设置屏幕开关
    /**
     * 设置屏幕开关
     */

    @AnonymousAccess
    @PostMapping("/setScreenOpen")
    public ResponseVO<Object> setScreenOpen(@RequestBody SetScreenOpenParam setScreenOpenEntity) {
        if (!permissionConfig.check(MenuEnum.XIXUN_ON_OFF.getCode())) {
@@ -510,6 +508,22 @@
        for (PoleLightemitEntity playerId : list) {
            lightemitUtils.clear(playerId.getLightemitControlCode());
        }

        /**
         * 熙汛清屏 日志记录开始
         */
        //获取listCode
        List<String> listCode = new ArrayList<>();
        List<String> msg = new ArrayList<>();
        for (PoleLightemitEntity poleLightemitEntity : list) {
            listCode.add(poleLightemitEntity.getLightemitControlCode());
            msg.add("[屏幕名称" + poleLightemitEntity.getLightemitName() + "设备编码" + poleLightemitEntity.getLightemitControlCode() + "],");
        }
        String content = JSON.toJSONString(msg);
        StoreOperationRecordsUtils.storeOperationData(listCode, null, "熙汛清屏", content);
        /**
         * 熙汛清屏 日志记录结束
         */
        return ResponseUtil.success("清屏成功");
    }
}