1111

pom.xml

@@ -58,11 +58,6 @@
 
         <dependency>
             <groupId>com.fdkankan</groupId>
-            <artifactId>4dkankan-utils-rabbitmq</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fdkankan</groupId>
             <artifactId>4dkankan-utils-redis</artifactId>
             <version>2.0.0-SNAPSHOT</version>
         </dependency>

src/main/java/com/fdkankan/scene/SceneApplication.java

@@ -11,7 +11,6 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 @SpringBootApplication
 @EnableTransactionManagement//开启事务
-//@EnableFeignClients("com.fdkankan.*.api.feign")
 @EnableDiscoveryClient
 @EnableScheduling
 @ComponentScan(basePackages = {"com.fdkankan.*"})

src/main/java/com/fdkankan/scene/controller/V3Controller.java

@@ -36,20 +36,20 @@ public class V3Controller extends BaseController {
     @Autowired
     private IScenePlusService scenePlusService;
 
-    /**
-     * <p>
-     场景升级
-     此接口用于V3\V4系统并存过渡期，场景升级v4做数据迁移用，待V3关闭可以删除
-     * </p>
-     * @author dengsixing
-     * @date 2022/4/21
-     * @return com.fdkankan.common.response.ResultData
-     **/
-    @PostMapping(value = "/upgradeToV4")
-    public ResultData upgradeToV4(@RequestBody @Validated UpgradeToV4ParamVO param){
-        ResultData resultData = sceneUpgradeToV4Service.upgradeToV4(param);
-        return resultData;
-    }
+//    /**
+//     * <p>
+//     场景升级
+//     此接口用于V3\V4系统并存过渡期，场景升级v4做数据迁移用，待V3关闭可以删除
+//     * </p>
+//     * @author dengsixing
+//     * @date 2022/4/21
+//     * @return com.fdkankan.common.response.ResultData
+//     **/
+//    @PostMapping(value = "/upgradeToV4")
+//    public ResultData upgradeToV4(@RequestBody @Validated UpgradeToV4ParamVO param){
+//        ResultData resultData = sceneUpgradeToV4Service.upgradeToV4(param);
+//        return resultData;
+//    }
 
     /**
      * <p>

src/main/java/com/fdkankan/scene/service/ISceneUpgradeToV4Service.java

@@ -13,7 +13,7 @@ import com.fdkankan.scene.vo.UpgradeToV4ParamVO;
  **/
 public interface ISceneUpgradeToV4Service {
 
-    ResultData upgradeToV4(UpgradeToV4ParamVO param);
+//    ResultData upgradeToV4(UpgradeToV4ParamVO param);
 
     ResultData getUpgradeToV4Progress(String num);
 

src/main/java/com/fdkankan/scene/service/impl/SceneUpgradeToV4Service.java

@@ -2,22 +2,14 @@ package com.fdkankan.scene.service.impl;
 
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fdkankan.common.constant.ConstantFilePath;
-import com.fdkankan.common.constant.ErrorCode;
-import com.fdkankan.common.constant.SceneResolution;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.fyun.oss.UploadToOssUtil;
-import com.fdkankan.rabbitmq.util.RabbitMqProducer;
 import com.fdkankan.redis.constant.RedisKey;
-import com.fdkankan.redis.constant.RedisLockKey;
 import com.fdkankan.redis.util.RedisLockUtil;
 import com.fdkankan.redis.util.RedisUtil;
 import com.fdkankan.scene.bean.SceneUpgradeProgressBean;
 import com.fdkankan.scene.entity.ScenePlus;
-import com.fdkankan.scene.entity.ScenePlusExt;
-import com.fdkankan.scene.entity.ScenePro;
-import com.fdkankan.scene.entity.SceneRepairLog;
 import com.fdkankan.scene.mapper.ISceneUpgradeMapper;
 import com.fdkankan.scene.service.IScenePlusExtService;
 import com.fdkankan.scene.service.IScenePlusService;
@@ -25,9 +17,6 @@ import com.fdkankan.scene.service.ISceneProService;
 import com.fdkankan.scene.service.ISceneRepairLogService;
 import com.fdkankan.scene.service.ISceneUpgradeToV4Service;
 import com.fdkankan.scene.vo.SceneInfoVO;
-import com.fdkankan.scene.vo.UpgradeToV4ParamVO;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.Objects;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -46,8 +35,8 @@ import org.springframework.stereotype.Service;
 @Service
 public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
 
-    @Value("${queue.scene.upgrade-to-v4}")
-    private String upgradeToV4;
+//    @Value("${queue.scene.upgrade-to-v4}")
+//    private String upgradeToV4;
     @Value("${oss.bucket:4dkankan}")
     private String bucket;
 
@@ -57,8 +46,8 @@ public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
     private RedisLockUtil redisLockUtil;
     @Autowired
     private ISceneRepairLogService sceneRepairLogService;
-    @Autowired
-    private RabbitMqProducer rabbitMqProducer;
+//    @Autowired
+//    private RabbitMqProducer rabbitMqProducer;
     @Autowired
     private RedisUtil redisUtil;
     @Autowired
@@ -70,68 +59,68 @@ public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
     @Autowired
     private UploadToOssUtil uploadToOssUtil;
 
-    @Override
-    public ResultData upgradeToV4(UpgradeToV4ParamVO param) {
-
-        String num = param.getNum();
-        ScenePro scenePro = sceneProService.findBySceneNum(num);
-
-        //加锁
-        String lockKey = String.format(RedisLockKey.LOCK_SCENE_UPGRADE_V4, num);
-        boolean lock = redisLockUtil.lock(lockKey,RedisKey.EXPIRE_TIME_2_HOUR);
-        if(!lock){
-            return ResultData.error(ErrorCode.FAILURE_CODE_7019);
-        }
-
-        try {
-            //查询升级日志，如果已经升级成功，不允许重复升级
-            SceneRepairLog sceneRepairLog = sceneRepairLogService.getOne(
-                new LambdaQueryWrapper<SceneRepairLog>()
-                    .eq(SceneRepairLog::getNum, num));
-            if(Objects.nonNull(sceneRepairLog)){
-                if(sceneRepairLog.getState() == 0){
-                    redisLockUtil.unlockLua(lockKey);
-                    return ResultData.error(ErrorCode.FAILURE_CODE_7019);
-                }
-                if(!param.isReUpgrade()){
-                    if(sceneRepairLog.getState() == 1){
-                        redisLockUtil.unlockLua(lockKey);
-                        return ResultData.error(ErrorCode.FAILURE_CODE_7020);
-                    }
-                }
-            }
-
-
-            //同步到scenePlus、scenePlus
-            sceneUpgradeMapper.deleteScenePlus(scenePro.getId());
-            sceneUpgradeMapper.transferScenePlus(scenePro.getId());
-            sceneUpgradeMapper.deleteScenePlusExt(scenePro.getId());
-            sceneUpgradeMapper.transferScenePlusExt(scenePro.getId());
-
-            //国际版需要兼容切片图
-            ScenePlus scenePlus = scenePlusService.getById(scenePro.getId());
-            ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
-            if(scenePlusExt.getSceneScheme() == 3){
-                scenePlusExt.setSceneResolution(SceneResolution.TILES.code());
-                scenePlusExtService.updateById(scenePlusExt);
-            }
-
-            //发送mq
-            rabbitMqProducer.sendByWorkQueue(upgradeToV4, scenePro.getId());
-
-            //写入进度条
-            Map<String, Integer> progress = new HashMap<>();
-            progress.put("status", 0);
-            progress.put("progress", 0);
-            redisUtil.set(RedisKey.scene_upgrade_progress_num, JSON.toJSONString(progress));
-
-        }catch (Exception e){
-            log.error("场景升级失败", e);
-            return ResultData.error(ErrorCode.FAILURE_CODE_7021);
-        }
-
-        return ResultData.ok();
-    }
+//    @Override
+//    public ResultData upgradeToV4(UpgradeToV4ParamVO param) {
+//
+//        String num = param.getNum();
+//        ScenePro scenePro = sceneProService.findBySceneNum(num);
+//
+//        //加锁
+//        String lockKey = String.format(RedisLockKey.LOCK_SCENE_UPGRADE_V4, num);
+//        boolean lock = redisLockUtil.lock(lockKey,RedisKey.EXPIRE_TIME_2_HOUR);
+//        if(!lock){
+//            return ResultData.error(ErrorCode.FAILURE_CODE_7019);
+//        }
+//
+//        try {
+//            //查询升级日志，如果已经升级成功，不允许重复升级
+//            SceneRepairLog sceneRepairLog = sceneRepairLogService.getOne(
+//                new LambdaQueryWrapper<SceneRepairLog>()
+//                    .eq(SceneRepairLog::getNum, num));
+//            if(Objects.nonNull(sceneRepairLog)){
+//                if(sceneRepairLog.getState() == 0){
+//                    redisLockUtil.unlockLua(lockKey);
+//                    return ResultData.error(ErrorCode.FAILURE_CODE_7019);
+//                }
+//                if(!param.isReUpgrade()){
+//                    if(sceneRepairLog.getState() == 1){
+//                        redisLockUtil.unlockLua(lockKey);
+//                        return ResultData.error(ErrorCode.FAILURE_CODE_7020);
+//                    }
+//                }
+//            }
+//
+//
+//            //同步到scenePlus、scenePlus
+//            sceneUpgradeMapper.deleteScenePlus(scenePro.getId());
+//            sceneUpgradeMapper.transferScenePlus(scenePro.getId());
+//            sceneUpgradeMapper.deleteScenePlusExt(scenePro.getId());
+//            sceneUpgradeMapper.transferScenePlusExt(scenePro.getId());
+//
+//            //国际版需要兼容切片图
+//            ScenePlus scenePlus = scenePlusService.getById(scenePro.getId());
+//            ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
+//            if(scenePlusExt.getSceneScheme() == 3){
+//                scenePlusExt.setSceneResolution(SceneResolution.TILES.code());
+//                scenePlusExtService.updateById(scenePlusExt);
+//            }
+//
+//            //发送mq
+//            rabbitMqProducer.sendByWorkQueue(upgradeToV4, scenePro.getId());
+//
+//            //写入进度条
+//            Map<String, Integer> progress = new HashMap<>();
+//            progress.put("status", 0);
+//            progress.put("progress", 0);
+//            redisUtil.set(RedisKey.scene_upgrade_progress_num, JSON.toJSONString(progress));
+//
+//        }catch (Exception e){
+//            log.error("场景升级失败", e);
+//            return ResultData.error(ErrorCode.FAILURE_CODE_7021);
+//        }
+//
+//        return ResultData.ok();
+//    }
 
     @Override
     public ResultData getUpgradeToV4Progress(String num) {

src/main/resources/META-INF/services/com.alibaba.csp.sentinel.init.InitFunc

@@ -1,2 +0,0 @@
-#如果用本地文件的作为sentinel数据持久化，需要在这里写明持久化逻辑实现类是哪个
-#com.fdkankan.common.config.SentinelFileDataSourceInitFunc

src/main/resources/bootstrap-dev-eur.yml

@@ -20,10 +20,6 @@ spring:
             group: DEFAULT_GROUP
             refresh: true
 
-          - data-id: common-rabbitmq-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
           - data-id: other-config.yaml
             group: DEFAULT_GROUP
             refresh: true

src/main/resources/bootstrap-dev.yml

@@ -20,10 +20,6 @@ spring:
             group: DEFAULT_GROUP
             refresh: true
 
-          - data-id: common-rabbitmq-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
           - data-id: other-config.yaml
             group: DEFAULT_GROUP
             refresh: true

src/main/resources/bootstrap-pro-eur.yml

@@ -20,10 +20,6 @@ spring:
             group: DEFAULT_GROUP
             refresh: true
 
-          - data-id: common-rabbitmq-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
           - data-id: other-config.yaml
             group: DEFAULT_GROUP
             refresh: true

src/main/resources/bootstrap-pro.yml

@@ -20,10 +20,6 @@ spring:
             group: DEFAULT_GROUP
             refresh: true
 
-          - data-id: common-rabbitmq-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
           - data-id: other-config.yaml
             group: DEFAULT_GROUP
             refresh: true

src/main/resources/bootstrap-test-eur.yml

@@ -20,10 +20,6 @@ spring:
             group: DEFAULT_GROUP
             refresh: true
 
-          - data-id: common-rabbitmq-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
           - data-id: other-config.yaml
             group: DEFAULT_GROUP
             refresh: true

src/main/resources/bootstrap-test.yml

@@ -1,16 +1,16 @@
 spring:
   application:
-    name: 4dkankan-center-scene-v4
+    name: 4dkankan-center-scene
   cloud:
     nacos:
       config:
         server-addr: 120.24.144.164:8848
         file-extension: yaml
-        namespace: 4dkankan-test
-#        extension-configs:
-#          - data-id: 4dkankan-center-scene-v4.yaml
-#            group: DEFAULT_GROUP
-#            refresh: true
+        namespace: 4dkankan-qczj
+        extension-configs:
+          - data-id: 4dkankan-center-scene.yaml
+            group: DEFAULT_GROUP
+            refresh: true
         shared-configs:
           - data-id: common-db-config.yaml
             group: DEFAULT_GROUP
@@ -20,10 +20,6 @@ spring:
             group: DEFAULT_GROUP
             refresh: true
 
-          - data-id: common-rabbitmq-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
           - data-id: other-config.yaml
             group: DEFAULT_GROUP
             refresh: true
@@ -33,7 +29,7 @@ spring:
             refresh: true
       discovery:
         server-addr: 120.24.144.164:8848
-        namespace: 4dkankan-dev
+        namespace: 4dkankan-qczj
 #    sentinel:
 #      transport:
 #        dashboard: 120.24.144.164:8888

src/main/resources/logback-spring.xml

@@ -41,7 +41,7 @@
 		<file>${log.path}/log_debug.log</file>
 		<!--日志文件输出格式 -->
 		<encoder>
-			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50}[%L] - %msg%n</pattern>
+			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
 			<charset>UTF-8</charset> <!-- 设置字符集 -->
 		</encoder>
 		<!-- 日志记录器的滚动策略，按日期，按大小记录 -->
@@ -79,7 +79,7 @@
 		<file>${log.path}/log_info.log</file>
 		<!--日志文件输出格式 -->
 		<encoder>
-			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50}[%L] - %msg%n</pattern>
+			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
 			<charset>UTF-8</charset>
 		</encoder>
 		<!-- 日志记录器的滚动策略，按日期，按大小记录 -->
@@ -117,7 +117,7 @@
 		<file>${log.path}/log_warn.log</file>
 		<!--日志文件输出格式 -->
 		<encoder>
-			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50}[%L] - %msg%n</pattern>
+			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
 			<charset>UTF-8</charset> <!-- 此处设置字符集 -->
 		</encoder>
 		<!-- 日志记录器的滚动策略，按日期，按大小记录 -->
@@ -155,7 +155,7 @@
 		<file>${log.path}/log_error.log</file>
 		<!--日志文件输出格式 -->
 		<encoder>
-			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50}[%L] - %msg%n</pattern>
+			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
 			<charset>UTF-8</charset> <!-- 此处设置字符集 -->
 		</encoder>
 		<!-- 日志记录器的滚动策略，按日期，按大小记录 -->
@@ -192,7 +192,7 @@
 		<file>${log.path}/visit/log_visit.log</file>
 		<!--日志文件输出格式 -->
 		<encoder>
-			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50}[%L] - %msg%n</pattern>
+			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
 			<charset>UTF-8</charset> <!-- 此处设置字符集 -->
 		</encoder>
 		<!-- 日志记录器的滚动策略，按日期，按大小记录 -->