场景中心 test

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

@@ -72,7 +72,7 @@ public class Scene3dNumServiceImpl extends ServiceImpl<IScene3dNumMapper, Scene3
                 log.info("开始从数据库加载场景码");
                 List<String> nums = this.findSceneNum();
                 this.updateUsedStatus(nums);
-                redisTemplate.opsForList().rightPush(RedisKey.FDKANKAN_SCENE_NUMS, nums.toArray(new String[]{}));
+                redisTemplate.opsForList().rightPushAll(RedisKey.FDKANKAN_SCENE_NUMS, nums.toArray(new String[]{}));
                 log.info("场景码加载完成");
             } catch (Exception e) {
                 e.printStackTrace();

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

@@ -1193,6 +1193,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
                 if(sceneProPO != null){
                     JSONObject statusJson = new JSONObject();
                     //临时将-2改成1，app还没完全更新
+                    Object test = sceneProPO.getSceneStatus() == -2 ? 1 : sceneProPO.getSceneStatus();
                     statusJson.put("status", sceneProPO.getSceneStatus() == -2 ? 1 : sceneProPO.getSceneStatus());
                     statusJson.put("webSite", sceneProPO.getWebSite());
                     statusJson.put("sceneNum", sceneProPO.getSceneCode());
@@ -1448,6 +1449,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         if(type == 0){
             sceneProService.save(scenePro);
             sceneProExt.setSceneProId(scenePro.getId());
+            sceneProExt.setSceneStatus(SceneStatus.wait.code());
             sceneProExtService.save(sceneProExt);
 
             sceneProEdit.setNeedKey(0);
@@ -1468,6 +1470,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             sceneProEditService.save(sceneProEdit);
 
             sceneProEditExt.setProEditId(sceneProEdit.getId());
+            sceneProEditExt.setProId(scenePro.getId());
             sceneProEditExt.setMapVisi(1);
             sceneProEditExt.setTourVisi(1);
             sceneProEditExt.setVrVisi(1);
@@ -1713,15 +1716,17 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
     }
 
     public static void main(String[] args) {
-        ScenePro scenePro = new ScenePro();
-        scenePro.setCameraId(1l);
-        SceneProExt sceneProExt = new SceneProExt();
-        sceneProExt.setSceneStatus(2);
+//        ScenePro scenePro = new ScenePro();
+//        scenePro.setCameraId(1l);
+//        SceneProExt sceneProExt = new SceneProExt();
+//        sceneProExt.setSceneStatus(2);
         SceneProPO sceneProPO = new SceneProPO();
-        BeanUtil.copyProperties(scenePro, sceneProPO);
-        BeanUtil.copyProperties(sceneProExt, sceneProPO);
-        System.out.println(123);
+//        BeanUtil.copyProperties(scenePro, sceneProPO);
+//        BeanUtil.copyProperties(sceneProExt, sceneProPO);
+//        System.out.println(123);
 
+//        JSONObject jsonObject = new JSONObject();
+//        jsonObject.put("test", null);
     }
 
 }