fix

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java

@@ -68,12 +68,12 @@ public class SysMenuController extends BaseController {
      */
     @GetMapping(value = "/roleMenuTreeselect/{roleId}")
     @Security
-    public AjaxResult roleMenuTreeselect(@PathVariable("roleId") String roleId) {
+    public Map<String, Object> roleMenuTreeselect(@PathVariable("roleId") String roleId) {
         List<SysMenu> menus = menuService.selectMenuList(getUserId());
         Map<String, Object> ajax = new HashMap<>();
         ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
         ajax.put("menus", menuService.buildMenuTreeSelect(menus));
-        return AjaxResult.success(ajax);
+        return ajax;
     }
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -121,7 +121,8 @@ public class SysUserController extends BaseController {
 //        userService.checkUserDataScope(userId);
         Map<String, Object> ajax = new HashMap<>();
         List<SysRole> roles = roleService.selectRoleAll();
-        ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
+//        ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
+        ajax.put("roles", roles);
 //        ajax.put("posts", postService.selectPostAll());
         ajax.put("posts", new ArrayList<>());
         if (StringUtils.isNotNull(userId)) {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/ScheduleTask.java

@@ -70,18 +70,18 @@ public class ScheduleTask {
         boolean hdToken = RedisUtils.exist(Constants.CACHE_DH_VIDEO_HD_TOKEN);
         if (pcToken) {
             long ttl = RedisUtils.getTtl(Constants.CACHE_DH_VIDEO_TOKEN);
-            if (NumberUtil.compare(ttl, 0) == 1 && NumberUtil.compare(ttl, 20) == -1) {
+            if (NumberUtil.compare(ttl, 0) == 1 && NumberUtil.compare(ttl, 30000) == -1) {
                 // 保活token
-                Map<String, Object> token = RedisUtils.getCacheObject(Constants.CACHE_DH_VIDEO_TOKEN);
-                dhService.tokenKeepalive(Convert.toStr(token.get("token")), 120);
+                Map<String, Object> token = RedisUtils.getCacheMap(Constants.CACHE_DH_VIDEO_TOKEN);
+                dhService.tokenKeepalive(Convert.toStr(token.get("token")), 120, Constants.CACHE_DH_VIDEO_TOKEN);
             }
         }
         if (hdToken) {
             long ttl = RedisUtils.getTtl(Constants.CACHE_DH_VIDEO_HD_TOKEN);
-            if (NumberUtil.compare(ttl, 0) == 1 && NumberUtil.compare(ttl, 20) == -1) {
+            if (NumberUtil.compare(ttl, 0) == 1 && NumberUtil.compare(ttl, 30000) == -1) {
                 // 保活token
-                Map<String, Object> token = RedisUtils.getCacheObject(Constants.CACHE_DH_VIDEO_HD_TOKEN);
-                dhService.tokenKeepalive(Convert.toStr(token.get("token")), 120);
+                Map<String, Object> token = RedisUtils.getCacheMap(Constants.CACHE_DH_VIDEO_HD_TOKEN);
+                dhService.tokenKeepalive(Convert.toStr(token.get("token")), 120, Constants.CACHE_DH_VIDEO_HD_TOKEN);
             }
         }
     }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhdd/DutyEmpController.java

@@ -104,7 +104,7 @@ public class DutyEmpController extends BaseController {
                 result.put("current", dutyEmpVo);
                 continue;
             }
-            if (nowTime > endTime && tempEmp == null) {
+            if (nowTime < startTime && tempEmp == null) {
                 tempEmp = dutyEmpVo;
             }
         }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java

@@ -39,7 +39,7 @@ public interface SysRoleMapper extends BaseMapperPlus<SysRole> {
      * @param userId 用户ID
      * @return 选中角色ID列表
      */
-    public List<Integer> selectRoleListByUserId(String userId);
+    public List<String> selectRoleListByUserId(String userId);
 
     /**
      * 根据用户ID查询角色

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java

@@ -55,7 +55,7 @@ public interface ISysRoleService extends IService<SysRole> {
      * @param userId 用户ID
      * @return 选中角色ID列表
      */
-    public List<Integer> selectRoleListByUserId(String userId);
+    public List<String> selectRoleListByUserId(String userId);
 
     /**
      * 通过角色ID查询角色
@@ -162,7 +162,7 @@ public interface ISysRoleService extends IService<SysRole> {
     /**
      * 批量取消授权用户角色
      *
-     * @param roleId 角色ID
+     * @param roleId  角色ID
      * @param userIds 需要取消授权的用户数据ID
      * @return 结果
      */
@@ -171,7 +171,7 @@ public interface ISysRoleService extends IService<SysRole> {
     /**
      * 批量选择授权用户角色
      *
-     * @param roleId 角色ID
+     * @param roleId  角色ID
      * @param userIds 需要删除的用户数据ID
      * @return 结果
      */

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java

@@ -121,7 +121,7 @@ public class SysRoleServiceImpl extends ServicePlusImpl<SysRoleMapper, SysRole,
      * @return 选中角色ID列表
      */
     @Override
-    public List<Integer> selectRoleListByUserId(String userId) {
+    public List<String> selectRoleListByUserId(String userId) {
         return baseMapper.selectRoleListByUserId(userId);
     }
 

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+    PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysRoleMapper">
 
     <resultMap type="SysRole" id="SysRoleResult">
@@ -100,7 +100,7 @@
         WHERE r.del_flag = '0' and ur.user_id = #{userId}
     </select>
 
-    <select id="selectRoleListByUserId" parameterType="string" resultType="Integer">
+    <select id="selectRoleListByUserId" parameterType="string" resultType="string">
         select r.role_id
         from sys_role r
                  left join sys_user_role ur on ur.role_id = r.role_id

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/IDhService.java

@@ -21,7 +21,7 @@ public interface IDhService {
 
     String authorize();
 
-    void tokenKeepalive(String token, int duration);
+    void tokenKeepalive(String token, int duration, String tokenKey);
 
     Object getDeviceTree();
 

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/impl/DhServiceImpl.java

@@ -80,7 +80,7 @@ public class DhServiceImpl implements IDhService {
             String realm = postOneJson.getStr("realm");
             String encryptType = postOneJson.getStr("encryptType");
             // 第二次交互
-            String password = "dh123456";
+            String password = "Dahua@4002";
             String signature = SecureUtil.md5(
                 SecureUtil.md5(userName + ":" + realm + ":" +
                     SecureUtil.md5(
@@ -121,17 +121,17 @@ public class DhServiceImpl implements IDhService {
      *
      * @param token
      */
-    public void tokenKeepalive(String token, int duration) {
+    public void tokenKeepalive(String token, int duration, String tokenKey) {
         JSONObject json = new JSONObject();
         json.set("token", token);
         json.set("duration", duration);
-        String put = HttpRequest.put(keepaliveUrl).timeout(-1).body(json.toString()).execute().body();
-        JSONObject putJson = JSONUtil.parseObj(put);
-        if (putJson.getInt("code") == 200) {
+        String put = HttpRequest.put(keepaliveUrl).header("X-Subject-Token", token).contentType("application/json").timeout(-1).body(json.toString()).execute().body();
+
+        if ("".equals(put)) {
             // 存入redis缓存
-            RedisUtils.setCacheObject(Constants.CACHE_DH_TOKEN, token, duration, TimeUnit.SECONDS);
+            RedisUtils.expire(tokenKey, Convert.toInt(duration), TimeUnit.SECONDS);
         } else {
-            log.info("保活失败：{}。重新获取", putJson);
+            log.info("保活失败：{}。入参：{}", put, json);
 //            authorize();
         }
     }
@@ -215,7 +215,7 @@ public class DhServiceImpl implements IDhService {
                 String realm = postOneJson.getStr("realm");
                 String encryptType = postOneJson.getStr("encryptType");
                 // 第二次交互
-                String password = "huashe123";
+                String password = "Dahua@4002";
                 String signature = SecureUtil.md5(
                     SecureUtil.md5(account + ":" + realm + ":" +
                         SecureUtil.md5(

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/impl/ResourceServiceImpl.java

@@ -157,10 +157,6 @@ public class ResourceServiceImpl extends ServicePlusImpl<ResourceMapper, Resourc
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean insertResource(ResourceBo bo) {
-//        if (bo.getResourceType() == 3) {
-//            // 车牌号转大写
-//            bo.setName(bo.getName().toUpperCase());
-//        }
         Resource add = BeanUtil.toBean(bo, Resource.class);
         if (StrUtil.isNotBlank(add.getManageUnitId())) {
             // 查询管理单位对应的名称