1

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

@@ -1,6 +1,7 @@
 package com.fdkankan.fusion.controller;
 
 
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.fusion.common.ResultCode;
 import com.fdkankan.fusion.common.ResultData;
@@ -22,10 +23,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -90,14 +88,15 @@ public class CaseFusionController extends BaseController{
         return ResultData.ok(fusionNumService.add(param,scenePlus,param.getIsObj()));
     }
 
-    @PostMapping("/updateInfo")
-    public ResultData updateInfo(@RequestBody CaseFusion caseFusion){
-        if(caseFusion.getFusionId() == null){
-            throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
+    @PostMapping("/addOrUpdate")
+    public ResultData addOrUpdate(@RequestBody CaseFusion caseFusion){
+        if(caseFusion.getFusionId() == null && StringUtils.isBlank(caseFusion.getFusionTitle())){
+            Long no = caseFusionService.count();
+            caseFusion.setFusionTitle("多元融合"+ DateUtil.format(new Date(),"yyyyMMdd")+"_"+no +1);
         }
         caseFusion.setUpdateTime(null);
-        caseFusionService.updateById(caseFusion);
-        return ResultData.ok();
+        caseFusionService.saveOrUpdate(caseFusion);
+        return ResultData.ok(caseFusion);
     }
 
     @PostMapping("/delFusion")