1

src/main/java/com/fdkankan/fusion/controller/CaseFusionController.java

@@ -79,7 +79,7 @@ public class CaseFusionController extends BaseController{
         if( param.getFusionId() == null ){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
-        if((param.getIsObj() == null || StringUtils.isBlank(param.getNum())) && param.getUploadId() == null){
+        if(param.getIsObj() == null || StringUtils.isBlank(param.getNum())){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
         ScenePlus scenePlus = scenePlusService.getByNum(param.getNum());
@@ -148,5 +148,11 @@ public class CaseFusionController extends BaseController{
     public ResultData process(@RequestParam(required = false) Integer fusionId){
         return ResultData.ok(fusionDownService.process(fusionId));
     }
+
+
+    @GetMapping("/refreshTraceEvidenceInfoList/{fusionId}")
+    public ResultData refreshTraceEvidenceInfoList(@PathVariable Integer fusionId){
+        return ResultData.ok();
+    }
 }
 

src/main/java/com/fdkankan/fusion/controller/DictController.java

@@ -27,7 +27,10 @@ public class DictController extends BaseController{
     public ResultData getByKey(@PathVariable String dictKey){
         return ResultData.ok(dictService.getByKey(dictKey));
     }
-
+    @GetMapping("/getByUseType/{useType}")
+    public ResultData getByUseType(@PathVariable String useType){
+        return ResultData.ok();
+    }
     @PostMapping("/pageList/{dictKey}")
     public ResultData pageList(@RequestBody DictParam param, @PathVariable String dictKey){
         param.setDictKey(dictKey);

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

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