用户listsql增加相机操控优先级字段

‘liusuyi’

2023-06-25 be6191688920d3927fff16ddb0709d205d784468

用户listsql增加相机操控优先级字段

 ard-work/pom.xml

@@ -14,7 +14,6 @@
    </description>

    <dependencies>

        <!-- 通用工具-->
        <dependency>
            <groupId>com.ruoyi</groupId>

 ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java

@@ -605,7 +605,7 @@
        } else {
            int code = hCNetSDK.NET_DVR_GetLastError();
            log.info("控制失败,请稍后重试" + code);
            return null;
            return new HashMap<>();
        }

    }

 ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SdkTask.java

@@ -7,11 +7,13 @@
import com.ruoyi.device.camera.service.IArdCamerasService;
import com.ruoyi.device.hiksdk.service.IHikClientService;
import org.springframework.stereotype.Component;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import static com.ruoyi.common.websocket.util.WebSocketUtils.ONLINE_USER_SESSIONS;

/**
@@ -50,8 +52,8 @@
            }
        }
        if (ONLINE_USER_SESSIONS.size() > 0) {
            Map<String, Object> sendMap=new HashMap<>();
            sendMap.put("10000",list);
            Map<String, Object> sendMap = new HashMap<>();
            sendMap.put("10000", list);
            WebSocketUtils.sendMessageAll(sendMap);
        }
    }

 ruoyi-system/src/main/java/com/ruoyi/authorize/common/AuthorizeUtil.java

@@ -1,10 +1,8 @@
package com.ruoyi.authorize.common;

import com.sun.org.apache.xerces.internal.impl.dv.util.HexBin;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.codec.binary.Hex;
import org.apache.commons.compress.utils.IOUtils;

import java.io.*;
import java.net.InetAddress;
import java.net.NetworkInterface;
@@ -13,7 +11,6 @@
import java.util.Date;
import java.util.GregorianCalendar;
import java.util.Scanner;

import javax.crypto.Cipher;
import javax.crypto.KeyGenerator;
import javax.crypto.SecretKey;

 ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -86,7 +86,7 @@

    <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
        select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status,
        u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user
        u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,u.camera_priority, d.dept_name, d.leader from sys_user
        u
        left join sys_dept d on u.dept_id = d.dept_id
        where u.del_flag = '0'