Merge branch 'master' of http://192.168.0.115:3000/lyhzzz/4dkankan-center-user

src/main/java/com/fdkankan/ucenter/mapper/ISceneUpgradeMapper.java

@@ -14,13 +14,13 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface ISceneUpgradeMapper {
 
-    public void transferScenePlus(Long sceneProId);
+    public void transferScenePlus(String num);
 
-    public void transferScenePlusExt(@Param("sceneProId") Long sceneProId, @Param("sceneKind") String sceneKind);
+    public void transferScenePlusExt(@Param("num") String num, @Param("scenePlusId") Long scenePlusId, @Param("sceneKind") String sceneKind);
 
-    public void deleteScenePlus(Long sceneProId);
+    public void deleteScenePlus(String num);
 
-    public void deleteScenePlusExt(Long sceneProId);
+    public void deleteScenePlusExt(Long scenePlusId);
 
 
 

src/main/java/com/fdkankan/ucenter/service/impl/SceneProServiceImpl.java

@@ -44,6 +44,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.locks.Condition;
 import java.util.stream.Collectors;
@@ -1103,11 +1104,16 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         this.update(updateWrapper);
 
         //同步到scenePlus、scenePlus
-        sceneUpgradeMapper.deleteScenePlus(sceneProEntity.getId());
-        sceneUpgradeMapper.transferScenePlus(sceneProEntity.getId());
-        sceneUpgradeMapper.deleteScenePlusExt(sceneProEntity.getId());
-        String sceneKind = sceneProEntity.getSceneScheme() == 3 ? SceneKind.FACE.code(): SceneKind.TILES.code();
-        sceneUpgradeMapper.transferScenePlusExt(sceneProEntity.getId(), sceneKind);
+        //同步到scenePlus、scenePlus
+        ScenePlus scenePlus = scenePlusService.getByNum(num);
+        if(Objects.nonNull(scenePlus)){
+            sceneUpgradeMapper.deleteScenePlus(num);
+            sceneUpgradeMapper.deleteScenePlusExt(scenePlus.getId());
+        }
+        sceneUpgradeMapper.transferScenePlus(num);
+        scenePlus = scenePlusService.getByNum(num);
+        String sceneKind = sceneProEntity.getSceneScheme() == 3 ? SceneKind.FACE.code():SceneKind.TILES.code();
+        sceneUpgradeMapper.transferScenePlusExt(num, scenePlus.getId(), sceneKind);
 
         log.info("开始发送激光场景生成obj mq消息");
 

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

@@ -14,9 +14,13 @@ import com.fdkankan.redis.util.RedisLockUtil;
 import com.fdkankan.redis.util.RedisUtil;
 import com.fdkankan.ucenter.bean.SceneUpgradeProgressBean;
 import com.fdkankan.ucenter.common.Result;
+import com.fdkankan.ucenter.entity.ScenePlus;
+import com.fdkankan.ucenter.entity.ScenePlusExt;
 import com.fdkankan.ucenter.entity.ScenePro;
 import com.fdkankan.ucenter.entity.SceneRepairLog;
 import com.fdkankan.ucenter.mapper.ISceneUpgradeMapper;
+import com.fdkankan.ucenter.service.IScenePlusExtService;
+import com.fdkankan.ucenter.service.IScenePlusService;
 import com.fdkankan.ucenter.service.ISceneProService;
 import com.fdkankan.ucenter.service.ISceneRepairLogService;
 import com.fdkankan.ucenter.service.ISceneUpgradeToV4Service;
@@ -56,6 +60,10 @@ public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
     private RedisLockUtil redisLockUtil;
     @Autowired
     private RabbitMqProducer rabbitMqProducer;
+    @Autowired
+    private IScenePlusService scenePlusService;
+    @Autowired
+    private IScenePlusExtService scenePlusExtService;
 
     @Override
     public Result upgrade(String num)  throws Exception{
@@ -93,11 +101,15 @@ public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
             this.upgradeLog(null, num, 0, null);
 
             //同步到scenePlus、scenePlus
-            sceneUpgradeMapper.deleteScenePlus(scenePro.getId());
-            sceneUpgradeMapper.transferScenePlus(scenePro.getId());
-            sceneUpgradeMapper.deleteScenePlusExt(scenePro.getId());
+            ScenePlus scenePlus = scenePlusService.getByNum(num);
+            if(Objects.nonNull(scenePlus)){
+                sceneUpgradeMapper.deleteScenePlus(num);
+                sceneUpgradeMapper.deleteScenePlusExt(scenePlus.getId());
+            }
+            sceneUpgradeMapper.transferScenePlus(num);
+            scenePlus = scenePlusService.getByNum(num);
             String sceneKind = scenePro.getSceneScheme() == 3 ? SceneKind.FACE.code():SceneKind.TILES.code();
-            sceneUpgradeMapper.transferScenePlusExt(scenePro.getId(), sceneKind);
+            sceneUpgradeMapper.transferScenePlusExt(num, scenePlus.getId(), sceneKind);
 
             //写入进度条
             Map<String, Integer> progress = new HashMap<>();

src/main/resources/mapper/ucenter/SceneUpgradeMapper.xml

@@ -2,9 +2,8 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fdkankan.ucenter.mapper.ISceneUpgradeMapper">
 
-  <insert id="transferScenePlus" parameterType="java.lang.Long">
+  <insert id="transferScenePlus" parameterType="java.lang.String">
     INSERT INTO t_scene_plus (
-    `id`,
     `num`,
     `user_id`,
     `camera_id`,
@@ -21,7 +20,6 @@
     `rec_status`
   )
   SELECT
-     p.`id`,
     p.`num`,
     p.`user_id`,
     p.`camera_id`,
@@ -38,7 +36,7 @@
      p.rec_status
   FROM
     t_scene_pro p
-  WHERE p.id = #{sceneProId};
+  WHERE p.num = #{num};
   </insert>
 
   <insert id="transferScenePlusExt">
@@ -67,7 +65,7 @@
     is_obj
   )
   SELECT
-    p.id,
+    #{scenePlusId},
     p.`data_source`,
     p.`web_site`,
     p.`thumb`,
@@ -103,16 +101,16 @@
     p.is_obj
   FROM
     t_scene_pro p
-  WHERE p.id = #{sceneProId}
+  WHERE p.num = #{num}
   </insert>
 
 
-  <delete id="deleteScenePlus" parameterType="java.lang.Long">
-    delete from t_scene_plus where id = #{sceneProId}
+  <delete id="deleteScenePlus" parameterType="java.lang.String">
+    delete from t_scene_plus where num = #{num}
   </delete>
 
   <delete id="deleteScenePlusExt" parameterType="java.lang.Long">
-    delete from t_scene_plus_ext where plus_id = #{sceneProId}
+    delete from t_scene_plus_ext where plus_id = #{scenePlusId}
   </delete>
 
 </mapper>