获取添加人、更新人代码变更到common

taphole-admin/src/main/java/com/sckj/admin/TapholeAdminInterceptor.java

@@ -23,6 +23,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.List;
+import com.sckj.common.TapholeAdminThreadLocal;
 
 /**
  * 拦截器

taphole-admin/src/main/java/com/sckj/admin/TapholeAdminThreadLocal.java

@@ -1,77 +1,77 @@
-package com.sckj.admin;
-
-
-
-import com.sckj.common.util.ListUtils;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentSkipListMap;
-
-/**
- * 本地线程
- */
-public class TapholeAdminThreadLocal {
-
-    /**
-     * 构造方法
-     */
-    public TapholeAdminThreadLocal() {}
-
-    /**
-     * 取得本地线程对象
-     */
-    private static final ThreadLocal<Map<String, Object>> MY_LOCAL = new ThreadLocal<>();
-
-    /**
-     * 写入本地线程
-     */
-    public static void put(String key, Object val) {
-        Map<String, Object> map = MY_LOCAL.get();
-        if (map == null) {
-            synchronized (MY_LOCAL) {
-                map = new ConcurrentSkipListMap<>();
-            }
-        }
-        map.put(key, val);
-        MY_LOCAL.set(map);
-    }
-
-    /**
-     * 获取本地线程
-     */
-    public static Object get(String key) {
-        return MY_LOCAL.get().getOrDefault(key, "");
-    }
-
-    /**
-     * 获取管理员ID
-     */
-    public static Integer getAdminId() {
-        String adminId = TapholeAdminThreadLocal.get("adminId").toString();
-        if (adminId.equals("")) {
-            return 0;
-        }
-        return Integer.parseInt(adminId);
-    }
-
-    /**
-     * 获取角色ID
-     */
-    public static List<Integer> getRoleIds() {
-        String roleIds = TapholeAdminThreadLocal.get("roleIds").toString();
-        if (roleIds.equals("") || roleIds.equals("0")) {
-            return Collections.emptyList();
-        }
-        return ListUtils.stringToListAsInt(roleIds, ",");
-    }
-
-    /**
-     * 删除本地线程
-     */
-    public static void remove() {
-        MY_LOCAL.remove();
-    }
-
-}
+//package com.sckj.admin;
+//
+//
+//
+//import com.sckj.common.util.ListUtils;
+//
+//import java.util.Collections;
+//import java.util.List;
+//import java.util.Map;
+//import java.util.concurrent.ConcurrentSkipListMap;
+//
+///**
+// * 本地线程
+// */
+//public class TapholeAdminThreadLocal {
+//
+//    /**
+//     * 构造方法
+//     */
+//    public TapholeAdminThreadLocal() {}
+//
+//    /**
+//     * 取得本地线程对象
+//     */
+//    private static final ThreadLocal<Map<String, Object>> MY_LOCAL = new ThreadLocal<>();
+//
+//    /**
+//     * 写入本地线程
+//     */
+//    public static void put(String key, Object val) {
+//        Map<String, Object> map = MY_LOCAL.get();
+//        if (map == null) {
+//            synchronized (MY_LOCAL) {
+//                map = new ConcurrentSkipListMap<>();
+//            }
+//        }
+//        map.put(key, val);
+//        MY_LOCAL.set(map);
+//    }
+//
+//    /**
+//     * 获取本地线程
+//     */
+//    public static Object get(String key) {
+//        return MY_LOCAL.get().getOrDefault(key, "");
+//    }
+//
+//    /**
+//     * 获取管理员ID
+//     */
+//    public static Integer getAdminId() {
+//        String adminId = TapholeAdminThreadLocal.get("adminId").toString();
+//        if (adminId.equals("")) {
+//            return 0;
+//        }
+//        return Integer.parseInt(adminId);
+//    }
+//
+//    /**
+//     * 获取角色ID
+//     */
+//    public static List<Integer> getRoleIds() {
+//        String roleIds = TapholeAdminThreadLocal.get("roleIds").toString();
+//        if (roleIds.equals("") || roleIds.equals("0")) {
+//            return Collections.emptyList();
+//        }
+//        return ListUtils.stringToListAsInt(roleIds, ",");
+//    }
+//
+//    /**
+//     * 删除本地线程
+//     */
+//    public static void remove() {
+//        MY_LOCAL.remove();
+//    }
+//
+//}

taphole-admin/src/main/java/com/sckj/admin/aop/aspect/LogAspect.java

@@ -1,7 +1,7 @@
 package com.sckj.admin.aop.aspect;
 
 import com.alibaba.fastjson2.JSON;
-import com.sckj.admin.TapholeAdminThreadLocal;
+import com.sckj.common.TapholeAdminThreadLocal;
 import com.sckj.common.aop.Log;
 import com.sckj.common.aop.RequestType;
 import com.sckj.common.entity.system.SystemLogOperate;

taphole-admin/src/main/java/com/sckj/admin/config/stp/StpInterConfig.java

@@ -2,7 +2,7 @@ package com.sckj.admin.config.stp;
 
 import cn.dev33.satoken.stp.StpInterface;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.sckj.admin.TapholeAdminThreadLocal;
+import com.sckj.common.TapholeAdminThreadLocal;
 import com.sckj.common.entity.system.SystemAuthMenu;
 import com.sckj.common.entity.system.SystemAuthPerm;
 import com.sckj.common.mapper.system.SystemAuthMenuMapper;

taphole-admin/src/main/java/com/sckj/admin/controller/UploadController.java

@@ -1,6 +1,6 @@
 package com.sckj.admin.controller;
 
-import com.sckj.admin.TapholeAdminThreadLocal;
+import com.sckj.common.TapholeAdminThreadLocal;
 import com.sckj.common.aop.Log;
 import com.sckj.common.aop.RequestType;
 import com.sckj.admin.service.IAlbumsService;

taphole-admin/src/main/java/com/sckj/admin/controller/finance/FinanceRechargerController.java

@@ -1,6 +1,6 @@
 package com.sckj.admin.controller.finance;
 
-import com.sckj.admin.TapholeAdminThreadLocal;
+import com.sckj.common.TapholeAdminThreadLocal;
 import com.sckj.admin.service.IFinanceRechargerService;
 import com.sckj.admin.validate.commons.IdValidate;
 import com.sckj.admin.validate.commons.PageValidate;

taphole-admin/src/main/java/com/sckj/admin/controller/system/SystemAuthAdminController.java

@@ -1,6 +1,6 @@
 package com.sckj.admin.controller.system;
 
-import com.sckj.admin.TapholeAdminThreadLocal;
+import com.sckj.common.TapholeAdminThreadLocal;
 import com.sckj.common.aop.Log;
 import com.sckj.admin.service.ISystemAuthAdminService;
 import com.sckj.admin.validate.commons.IdValidate;

taphole-admin/src/main/java/com/sckj/admin/controller/system/SystemAuthMenuController.java

@@ -1,7 +1,7 @@
 package com.sckj.admin.controller.system;
 
 import com.alibaba.fastjson2.JSONArray;
-import com.sckj.admin.TapholeAdminThreadLocal;
+import com.sckj.common.TapholeAdminThreadLocal;
 import com.sckj.common.aop.Log;
 import com.sckj.admin.service.ISystemAuthMenuService;
 import com.sckj.admin.validate.commons.IdValidate;

taphole-admin/src/main/java/com/sckj/admin/service/impl/SystemAuthMenuServiceImpl.java

@@ -3,7 +3,7 @@ package com.sckj.admin.service.impl;
 import com.alibaba.fastjson2.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Assert;
-import com.sckj.admin.TapholeAdminThreadLocal;
+import com.sckj.common.TapholeAdminThreadLocal;
 import com.sckj.admin.service.ISystemAuthMenuService;
 import com.sckj.admin.service.ISystemAuthPermService;
 import com.sckj.admin.validate.system.SystemMenuCreateValidate;

taphole-camera/src/main/java/com.sckj.camera/service/CameraServiceImpl.java

@@ -87,7 +87,7 @@ public class CameraServiceImpl extends ServiceImpl<CameraMapper, Camera> {
      * @param
      * @return ResultDTO
      */
-   // @PostConstruct
+    //@PostConstruct
     public List<ResultDTO> startTranscodeList() {
         logger.info("自动开启视频推送");
         QueryWrapper<Camera> queryWrapper = new QueryWrapper<>();

taphole-common/src/main/java/com/sckj/common/TapholeAdminThreadLocal.java

@@ -0,0 +1,77 @@
+package com.sckj.common;
+
+
+
+import com.sckj.common.util.ListUtils;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentSkipListMap;
+
+/**
+ * 本地线程
+ */
+public class TapholeAdminThreadLocal {
+
+    /**
+     * 构造方法
+     */
+    public TapholeAdminThreadLocal() {}
+
+    /**
+     * 取得本地线程对象
+     */
+    private static final ThreadLocal<Map<String, Object>> MY_LOCAL = new ThreadLocal<>();
+
+    /**
+     * 写入本地线程
+     */
+    public static void put(String key, Object val) {
+        Map<String, Object> map = MY_LOCAL.get();
+        if (map == null) {
+            synchronized (MY_LOCAL) {
+                map = new ConcurrentSkipListMap<>();
+            }
+        }
+        map.put(key, val);
+        MY_LOCAL.set(map);
+    }
+
+    /**
+     * 获取本地线程
+     */
+    public static Object get(String key) {
+        return MY_LOCAL.get().getOrDefault(key, "");
+    }
+
+    /**
+     * 获取管理员ID
+     */
+    public static Integer getAdminId() {
+        String adminId = TapholeAdminThreadLocal.get("adminId").toString();
+        if ("".equals(adminId)) {
+            return 0;
+        }
+        return Integer.parseInt(adminId);
+    }
+
+    /**
+     * 获取角色ID
+     */
+    public static List<Integer> getRoleIds() {
+        String roleIds = TapholeAdminThreadLocal.get("roleIds").toString();
+        if ("".equals(roleIds) || "0".equals(roleIds)) {
+            return Collections.emptyList();
+        }
+        return ListUtils.stringToListAsInt(roleIds, ",");
+    }
+
+    /**
+     * 删除本地线程
+     */
+    public static void remove() {
+        MY_LOCAL.remove();
+    }
+
+}