2.2.0

src/main/java/com/fdkankan/contro/service/ICommonService.java

@@ -54,7 +54,7 @@ public interface ICommonService {
 
     void removeSceneAsynOperLog(String num);
 
-    void sendSceneStatus(String num, String uuid, String batchId, Integer status);
+    Integer getShootCount(String num);
 
     void uploadFloorplanAi(String num, String path) throws IOException;
 

src/main/java/com/fdkankan/contro/service/impl/CommonServiceImpl.java

@@ -28,6 +28,7 @@ import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.model.constants.ConstantFilePath;
 import com.fdkankan.model.constants.UploadFilePath;
 import com.fdkankan.model.utils.FloorPlanUserUtil;
+import com.fdkankan.model.utils.SceneUtil;
 import com.fdkankan.rabbitmq.bean.BuildSceneCallMessage;
 import com.fdkankan.rabbitmq.util.RabbitMqProducer;
 import com.fdkankan.redis.constant.RedisKey;
@@ -564,25 +565,23 @@ public class CommonServiceImpl implements ICommonService {
         });
     }
 
-    /**
-     * status 1-开始上传 2-通知计算， 3-开始计算 ， 4-计算成功， 5-计算失败，
-     * @param num
-     * @param uuid
-     * @param batchId
-     * @param status
-     */
     @Override
-    public void sendSceneStatus(String num, String uuid, String batchId,Integer status) {
-        Map<String, Object> playload = new HashMap<>();
-        try {
-            playload.put("num", num);
-            playload.put("uuid", uuid);
-            playload.put("status", status);
-            playload.put("batchId", batchId);
-            HttpUtil.post(sceneStatusUrl, playload, 2000);
-        }catch (Exception exception){
-            log.error("推送计算状态失败, content：{}", playload);
+    public Integer getShootCount(String num) {
+
+        ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
+        ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
+
+        Integer shootCount = null;
+        String homePath = SceneUtil.getHomePath(scenePlusExt.getDataSource());
+        JSONObject dataFdageObj = JSON.parseObject(fYunFileService.getFileContent(homePath.concat("data.fdage")));
+        if(Objects.nonNull(dataFdageObj)){
+            JSONArray points = dataFdageObj.getJSONArray("points");
+            if(CollUtil.isNotEmpty(points)){
+                shootCount = points.size();
+            }
         }
+
+        return shootCount;
     }
 
     @Override

src/main/java/com/fdkankan/contro/service/impl/JmgaServiceImpl.java

@@ -29,6 +29,7 @@ import com.fdkankan.contro.vo.SendCallAlgorithmParam;
 import com.fdkankan.contro.vo.UploadSceneOrigParamVo;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.model.constants.ConstantFilePath;
+import com.fdkankan.model.utils.SceneUtil;
 import com.fdkankan.rabbitmq.util.RabbitMqProducer;
 import lombok.extern.slf4j.Slf4j;
 import net.lingala.zip4j.exception.ZipException;
@@ -98,6 +99,8 @@ public class JmgaServiceImpl implements IJmgaService {
     private ISceneEditInfoExtService sceneEditInfoExtService;
     @Autowired
     private ISceneEditControlsService sceneEditControlsService;
+    @Autowired
+    private ICommonService commonService;
 
     @Override
     public void checkFileWhole(String uuid, String dataSource, JSONObject fdageData) {
@@ -315,8 +318,10 @@ public class JmgaServiceImpl implements IJmgaService {
                         && sdTilesSceneSourceList.contains(scenePlus.getSceneSource())){
                     scenePlusExt.setModelKind(modelKind);
                 }
-                scenePlusExtService.save(scenePlusExt);
             }
+            JSONArray points = dataFdage.getJSONArray("points");
+            scenePlusExt.setShootCount(points.size());
+            scenePlusExtService.saveOrUpdate(scenePlusExt);
 
             SceneEditInfo sceneEditInfo = sceneEditInfoService.getByScenePlusId(scenePlus.getId());
             if(sceneEditInfo == null){