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

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

@@ -139,6 +139,9 @@ 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());
@@ -156,6 +159,9 @@ public class UploadSceneListener {
         String cpCmd = "cp -p -r " + sourcePath + "/* " + sceneViewDataPath;
         CmdUtils.callLineSh(cpCmd);
 
+        //容量统计
+        Long space = commonService.getSpace(num);
+
         String sceneJsonStr = FileUtil.readUtf8String(sceneJsonFile);
         ScenePlus scenePlus = JSON.parseObject(sceneJsonStr, ScenePlus.class);
         scenePlus.setId(scenePlusDb.getId());
@@ -171,6 +177,7 @@ public class UploadSceneListener {
         scenePlusExt.setCreateTime(null);
         scenePlusExt.setWebSite("/" + sceneProNewUrl + scenePlus.getNum());
         scenePlusExt.setAlgorithmTime(new Date());
+        scenePlusExt.setSpace(space);
         scenePlusExtService.updateById(scenePlusExt);
 
         SceneEditInfo sceneEditInfo = JSON.parseObject(sceneJsonStr, SceneEditInfo.class);