redis工具迁移到commoen-redis工程

4dkankan-center-auth/src/main/java/com/fdkankan/auth/schedul/DeveloperSchedul.java

@@ -21,7 +21,7 @@ public class DeveloperSchedul {
     private ITmDeveloperService tmDeveloperService;
 
     @Autowired
-    private RedisTemplate<String, String> redisTemplate;
+    private RedisTemplate redisTemplate;
 
 
     /**

4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/ModelingApplication.java

@@ -9,7 +9,7 @@ import org.springframework.context.annotation.ComponentScan;
 @SpringBootApplication
 @EnableDiscoveryClient
 @EnableFeignClients("com.fdkankan.*.api.feign")
-@ComponentScan(basePackages = {"com.fdkankan.common", "com.fdkankan.modeling","com.fdkankan.oss"})
+@ComponentScan(basePackages = {"com.fdkankan.common", "com.fdkankan.modeling","com.fdkankan.oss","com.fdkankan.redis"})
 public class ModelingApplication {
 
 	public static void main(String[] args) {

4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/receiver/BuildSceneReceiver.java

@@ -20,6 +20,7 @@ import com.fdkankan.modeling.utils.PushMsgUtil;
 import com.fdkankan.mq.message.BuildSceneMqMessage;
 import com.fdkankan.oss.UploadUtils;
 import com.fdkankan.platform.api.vo.User;
+import com.fdkankan.redis.util.RedisUtil;
 import com.fdkankan.utils.constant.ConstantFilePath;
 import com.fdkankan.utils.constant.ConstantUrl;
 import com.fdkankan.utils.utils.CreateObjUtil;
@@ -73,7 +74,9 @@ public class BuildSceneReceiver implements MessageListenerConcurrently {
     private ISceneProExtService sceneProExtService;
 
     @Autowired
-    private RedisTemplate<String,String> redisTemplate;
+    RedisUtil redisUtil;
+    @Autowired
+    RedisTemplate redisTemplate;
 
     private RestTemplate restTemplate = new RestTemplate();
 
@@ -112,7 +115,7 @@ public class BuildSceneReceiver implements MessageListenerConcurrently {
             try {
                 String key = RedisKey.SCENE_BUILDING + message.getSceneNum();
                 // 获取缓存锁，防止重复消费
-                Long building = redisTemplate.opsForValue().increment(key, 1);
+                Long building = redisUtil.incr(key, 1);
                 if (building.compareTo(1L) != 0) {
                     log.error("场景正在构建中,退出构建,当前服务器id:{},参数：{}", SysConstants.hostName, JSONObject.toJSONString(message));
                 } else {
@@ -133,7 +136,7 @@ public class BuildSceneReceiver implements MessageListenerConcurrently {
                 }
 
                 buildScene(message);
-                redisTemplate.delete(key);
+                redisUtil.del(key);
                 try {
                     FileUtils.deleteFile("/opt/hosts/running.txt");
                     String tomcatLog = "scenenum:" + message.getSceneNum() + "\ntime:" + DateUtil.formatDateTime(new Date()) +

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/Scene3dNumServiceImpl.java

@@ -8,6 +8,8 @@ import com.fdkankan.common.constant.RecStatus;
 import com.fdkankan.common.constant.RedisKey;
 import com.fdkankan.common.constant.TbStatus;
 import com.fdkankan.common.exception.BusinessException;
+import com.fdkankan.redis.util.RedisLockUtil;
+import com.fdkankan.redis.util.RedisUtil;
 import com.fdkankan.scene.entity.Scene3dNum;
 import com.fdkankan.scene.mapper.IScene3dNumMapper;
 import com.fdkankan.scene.service.IScene3dNumService;
@@ -34,7 +36,9 @@ import java.util.Objects;
 public class Scene3dNumServiceImpl extends ServiceImpl<IScene3dNumMapper, Scene3dNum> implements IScene3dNumService {
 
     @Autowired
-    RedisTemplate redisTemplate;
+    RedisUtil redisUtil;
+    @Autowired
+    RedisLockUtil redisLockUtil;
 
     @Override
     public List<String> findSceneNum() {
@@ -61,23 +65,23 @@ public class Scene3dNumServiceImpl extends ServiceImpl<IScene3dNumMapper, Scene3
     @Override
     public String generateSceneNum(){
         // 从缓存中获取
-        String sceneNum = (String)redisTemplate.opsForList().leftPop(RedisKey.FDKANKAN_SCENE_NUMS);
+        String sceneNum = (String)redisUtil.lLeftPop(RedisKey.FDKANKAN_SCENE_NUMS);
         if(Objects.nonNull(sceneNum)){
             return sceneNum;
         }
         // 分布式加锁
-        Long loading =  redisTemplate.opsForValue().increment(RedisKey.LOCK_FDKANKAN_SCENE_NUMS);
+        Long loading =  redisUtil.incr(RedisKey.LOCK_FDKANKAN_SCENE_NUMS, 1);
         if (loading.compareTo(1L) == 0) {
             try {
                 log.info("开始从数据库加载场景码");
                 List<String> nums = this.findSceneNum();
                 this.updateUsedStatus(nums);
-                redisTemplate.opsForList().rightPushAll(RedisKey.FDKANKAN_SCENE_NUMS, nums.toArray(new String[]{}));
+                redisUtil.lRightPushAll(RedisKey.FDKANKAN_SCENE_NUMS, nums);
                 log.info("场景码加载完成");
             } catch (Exception e) {
                 e.printStackTrace();
             } finally {
-                redisTemplate.opsForValue().decrement(RedisKey.LOCK_FDKANKAN_SCENE_NUMS);
+                redisUtil.decr(RedisKey.LOCK_FDKANKAN_SCENE_NUMS, 1);
             }
         }else{
             // 等待1秒加载缓存
@@ -87,7 +91,7 @@ public class Scene3dNumServiceImpl extends ServiceImpl<IScene3dNumMapper, Scene3
                 e.printStackTrace();
             }
         }
-        sceneNum = (String)redisTemplate.opsForList().leftPop(RedisKey.FDKANKAN_SCENE_NUMS);
+        sceneNum = (String)redisUtil.lLeftPop(RedisKey.FDKANKAN_SCENE_NUMS);
         if(StrUtil.isEmpty(sceneNum)){
             log.error("场景码加载失败");
             throw new BusinessException(ErrorCode.FAILURE_CODE_5053);

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneFileBuildServiceImpl.java

@@ -19,6 +19,7 @@ import com.fdkankan.platform.api.feign.PlatformClient;
 import com.fdkankan.platform.api.vo.Camera;
 import com.fdkankan.platform.api.vo.CameraDetail;
 import com.fdkankan.platform.api.vo.Company;
+import com.fdkankan.redis.util.RedisUtil;
 import com.fdkankan.scene.entity.*;
 import com.fdkankan.scene.mapper.ISceneFileBuildMapper;
 import com.fdkankan.scene.rocketmq.producer.MqSendMessage;
@@ -87,8 +88,6 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
     @Autowired
     ISceneFileUploadService sceneFileUploadService;
     @Autowired
-    RedisTemplate redisTemplate;
-    @Autowired
     ISceneProService sceneProService;
     @Autowired
     private FileRouteConfig routeConfig;
@@ -110,6 +109,10 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
     ISceneResourceCooperationService sceneResourceCooperationService;
     @Autowired
     MqSendMessage mqSendMessage;
+    @Autowired
+    RedisUtil redisUtil;
+    @Autowired
+    RedisTemplate redisTemplate;
 
     @Override
     public SceneFileBuild findByFileId(String fileId) {

4dkankan-common-redis/src/main/java/com/fdkankan/redis/util/RedisUtil.java

@@ -493,6 +493,21 @@ public class RedisUtil<K, V> {
             return false;
         }
     }
+
+    /**
+     *
+     * @param key   键
+     * @return
+     */
+    public Object lLeftPop(String key) {
+        try {
+            return redisTemplate.opsForList().leftPop(key);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
     /**
      * 根据索引修改list中的某条数据
      *

4dkankan-gateway/src/main/java/com/fdkankan/gateway/filter/AppAuthFilter.java

@@ -35,7 +35,7 @@ import java.util.Map;
 public class AppAuthFilter implements GatewayFilter, Ordered {
 
     @Autowired
-    private RedisTemplate<String, String> redisTemplate;
+    private RedisTemplate redisTemplate;
 
     @Override
     public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
@@ -48,7 +48,7 @@ public class AppAuthFilter implements GatewayFilter, Ordered {
             Long timeStamp = DataUtils.getLongReturnNullIfNotExit(params.get("timeStamp"));
             log.info("鉴权流程获取到的appid={}，请求路径:{}" , appId , exchange.getRequest().getURI());
             //先获取校验app id的合法性
-            String developerJson = redisTemplate.opsForValue().get(String.format(RedisKey.TM_DEVELOPER, appId));
+            String developerJson = (String) redisTemplate.opsForValue().get(String.format(RedisKey.TM_DEVELOPER, appId));
             if(StrUtil.isBlank(developerJson)){
                 throw new BusinessException(ErrorCode.APP_ID_ILLEGAL);
             }

4dkankan-gateway/src/main/java/com/fdkankan/gateway/filter/TokenFilter.java

@@ -40,7 +40,7 @@ public class TokenFilter implements GlobalFilter, Ordered {
 //    @Resource
 //    private RedisUtil redisUtil;
     @Autowired
-    private RedisTemplate<String, String> redisTemplate;
+    private RedisTemplate redisTemplate;
 
     static {
         List<String> userPermissions = new ArrayList<>();