1

doc/local-fusion-3.0.0.sql

@@ -137,7 +137,7 @@ ALTER TABLE `t_case_settings`
     ADD COLUMN `map_id` int NULL AFTER `rotate`;
 
 ALTER TABLE `t_case_tag`
-    ADD COLUMN `tq_status` int NULL AFTER `file_name`;
+    ADD COLUMN `tq_status` varchar(255) NULL AFTER `file_name`;
 
 ALTER TABLE `t_case_tag`
     ADD COLUMN `tq_time` timestamp NULL AFTER `tq_status`;

src/main/java/com/fdkankan/fusion/service/impl/CaseFusionServiceImpl.java

@@ -78,7 +78,6 @@ public class CaseFusionServiceImpl extends ServiceImpl<ICaseFusionMapper, CaseFu
         HashMap<Integer,Model> modelMap = new HashMap<>();
         listByModelIds.stream().forEach(e -> modelMap.put(e.getModelId(),e));
 
-
         List<String> numList = listByModelIds.stream().filter(e -> e.getNum() != null).map(Model::getNum).collect(Collectors.toList());
         List<ScenePlus> scenePlusList = scenePlusService.getByNumList(numList);
         HashMap<String,ScenePlus> map = new HashMap<>();
@@ -114,14 +113,14 @@ public class CaseFusionServiceImpl extends ServiceImpl<ICaseFusionMapper, CaseFu
                             sceneVo.setOrientation(scenePlusExt.getOrientation());
                         }
                         sceneVo.setMapping( mappingMap.get(scenePlus.getNum()));
+
+                        sceneVo.setSourceName(CameraUtil.getSourceName(model.getType()));
+                        vo.setSceneData(sceneVo);
+                        sceneVos.add(vo);
+
                     }
-                }else {
-                    sceneVo.setStatus(2);
                 }
-                sceneVo.setSourceName(CameraUtil.getSourceName(model.getType()));
             }
-            vo.setSceneData(sceneVo);
-            sceneVos.add(vo);
         }
 
         return sceneVos;

src/main/java/com/fdkankan/fusion/service/impl/SceneCommonService.java

@@ -148,6 +148,7 @@ public class SceneCommonService implements ISceneCommonService {
             vo.setWebPath(scene.getWebPath());
             vo.setIsObj(param.getIsObj());
             SceneVo rtkVo = rtkInfoMap.get(scene.getSceneCode());
+
             if(rtkVo != null){
                 vo.setOrientation(rtkVo.getOrientation());
                 vo.setRtkLocation(rtkVo.getRtkLocation());

src/main/java/com/fdkankan/fusion/task/InitService.java

@@ -52,7 +52,7 @@ public class InitService {
     public void run()  {
         getSettingJson();
         initConfig();
-        checkDefaultImag();
+        //checkDefaultImag();
         delMediaLibrary();
         writerStateFile();
         delRedisKey();