1

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

@@ -16,6 +16,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -97,4 +98,9 @@ public class SceneController extends BaseController{
             os.close();
         }
     }
+
+    @PostMapping("/uploadObj")
+    public ResultData uploadObj(@RequestParam(required = false) MultipartFile file) throws Exception {
+        return ResultData.ok(sceneService.uploadObj(file,getUserName()));
+    }
 }

src/main/java/com/fdkankan/fusion/service/ISceneService.java

@@ -4,6 +4,7 @@ import com.fdkankan.fusion.common.PageInfo;
 import com.fdkankan.fusion.httpClient.request.LaserSceneParam;
 import com.fdkankan.fusion.request.ScenePram;
 import com.fdkankan.fusion.response.SceneVo;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
@@ -22,4 +23,6 @@ public interface ISceneService {
     Object sceneDetail(LaserSceneParam param);
 
     void copyScene(ScenePram param);
+
+    Object uploadObj(MultipartFile file, String userName);
 }

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

@@ -33,13 +33,10 @@ public class CaseInquestServiceImpl extends ServiceImpl<ICaseInquestMapper, Case
         if(caseInquest.getCaseId() == null){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
-        if(caseInquest.getId() == null){
-            CaseInquest dbCaseInquest = this.getByCaseId(caseInquest.getCaseId());
-            if(dbCaseInquest != null){
-                throw new BusinessException(ResultCode.INQUEST_ERROR);
-            }
+        CaseInquest dbCaseInquest = this.getByCaseId(caseInquest.getCaseId());
+        if(dbCaseInquest != null){
+            caseInquest.setId(dbCaseInquest.getId());
         }
-
         this.saveOrUpdate(caseInquest);
 
     }

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

@@ -23,6 +23,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import java.security.Security;
@@ -309,4 +310,10 @@ public class SceneService implements ISceneService {
 
         fdService.copyScene(param.getNum());
     }
+
+    @Override
+    public Object uploadObj(MultipartFile file, String userName) {
+
+        return null;
+    }
 }