Merge branch 'release-swsx' into test

src/main/java/com/fdkankan/contro/controller/InnerController.java

@@ -1,32 +1,12 @@
 package com.fdkankan.contro.controller;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.fdkankan.common.constant.ErrorCode;
-import com.fdkankan.common.constant.ModelingBuildStatus;
-import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.contro.service.IAppCameraFailLogService;
 import com.fdkankan.contro.service.IInnerService;
-import com.fdkankan.contro.service.ISceneFileBuildService;
-import com.fdkankan.contro.service.ISceneUploadCountService;
-import com.fdkankan.contro.vo.ReportFailLogVO;
-import com.fdkankan.contro.vo.ResponseSceneFile;
-import com.fdkankan.contro.vo.SceneUploadCountParamVO;
-import com.fdkankan.fyun.face.FYunFileServiceInterface;
-import com.fdkankan.rabbitmq.bean.BuildSceneResultMqMessage;
 import com.fdkankan.web.response.ResultData;
 import lombok.extern.log4j.Log4j2;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 场景文件上传模块
@@ -45,5 +25,16 @@ public class InnerController {
         return ResultData.ok();
     }
 
+    /**
+     * 内部用接口，修改场景为计算失败状态，app可以出发补拍重传
+     * @param num
+     * @return
+     * @throws Exception
+     */
+    @GetMapping("updateSceneFail")
+    public ResultData updateSceneFail(String num) throws Exception {
+        innerService.updateSceneFail(num);
+        return ResultData.ok();
+    }
 
 }

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

@@ -4,4 +4,6 @@ public interface IInnerService {
 
     void uploadArtificialResult(String num) throws Exception;
 
+    void updateSceneFail(String num);
+
 }

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

@@ -30,6 +30,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.io.File;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.*;
 
 @Service
@@ -173,6 +174,19 @@ public class InnerServiceImpl implements IInnerService {
         scenePlusExtService.updateById(scenePlusExt);
     }
 
+    @Override
+    public void updateSceneFail(String num) {
+        ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
+        scenePlus.setSceneStatus(500);
+        scenePlusService.updateById(scenePlus);
+
+        String statusJsonKey = String.format(UploadFilePath.DATA_VIEW_PATH, num) + "status.json";
+        String fileContent = fYunFileService.getFileContent(statusJsonKey);
+        JSONObject jsonObject = JSON.parseObject(fileContent);
+        jsonObject.put("status", -1);
+        fYunFileService.uploadFile(jsonObject.toJSONString().getBytes(StandardCharsets.UTF_8), statusJsonKey);
+    }
+
     private void uploadStatusJson(ScenePlus scenePlus, ScenePlusExt scenePlusExt){
         String num = scenePlus.getNum();
         String dataViewPath = String.format(UploadFilePath.DATA_VIEW_PATH, num);
@@ -336,4 +350,7 @@ public class InnerServiceImpl implements IInnerService {
 
         return result;
     }
+
+
+
 }