Merge branch 'project-jmga-2.2.0' into project-jmga-dev

src/main/java/com/fdkankan/contro/bean/SceneJsonBean.java

@@ -257,5 +257,10 @@ public class SceneJsonBean implements Serializable {
 
     private Integer evidence;
 
+    //offline-离线包上传
+    private String uploadType;
+
+    private Integer hasSegAi;
+
 
 }

src/main/java/com/fdkankan/contro/mq/listener/UploadSceneListener.java

@@ -59,6 +59,8 @@ public class UploadSceneListener {
     private ISceneEditInfoExtService sceneEditInfoExtService;
     @Autowired
     private ISceneEditControlsService sceneEditControlsService;
+    @Autowired
+    private ICommonService commonService;
 
 
     /**
@@ -143,9 +145,6 @@ public class UploadSceneListener {
         }
     }
 
-    @Autowired
-    private ICommonService commonService;
-
     private void uploadSceneOffline(String num, String sourcePath) throws Exception {
         ScenePlus scenePlusDb = scenePlusService.getScenePlusByNum(num);
         ScenePlusExt scenePlusExtDb = scenePlusExtService.getScenePlusExtByPlusId(scenePlusDb.getId());
@@ -163,6 +162,8 @@ public class UploadSceneListener {
         String cpCmd = "cp -p -r " + sourcePath + "/* " + sceneViewDataPath;
         CmdUtils.callLineSh(cpCmd);
 
+        sceneJsonBean.setUploadType("offline");
+
         //容量统计
         Long space = commonService.getSpace(num);