dengsixing 1 месяц назад
Родитель
Сommit
ea4a6360ac

+ 2 - 3
src/main/java/com/fdkankan/scene/controller/NjsSceneBoxModelController.java

@@ -57,9 +57,8 @@ public class NjsSceneBoxModelController {
     }
 
     @PostMapping("save")
-    public ResultData<Void> save(@RequestBody @Valid BaseJsonDataParamVO param){
-        sceneBoxModelService.saveBoxModel(param);
-        return ResultData.ok();
+    public ResultData<JSONObject> save(@RequestBody @Valid BaseJsonDataParamVO param){
+        return ResultData.ok(sceneBoxModelService.saveBoxModel(param));
     }
 
     @PostMapping("list")

+ 1 - 1
src/main/java/com/fdkankan/scene/service/INjsSceneBoxModelService.java

@@ -29,7 +29,7 @@ public interface INjsSceneBoxModelService extends IService<NjsSceneBoxModel> {
 
     NjsSceneBoxModel getBySid(String num, String sid);
 
-    void saveBoxModel(BaseJsonDataParamVO dto);
+    JSONObject saveBoxModel(BaseJsonDataParamVO dto);
 
     List<JSONObject> listNjsBoxModel(BaseSceneParamVO param);
 

+ 6 - 1
src/main/java/com/fdkankan/scene/service/impl/NjsSceneBoxModelServiceImpl.java

@@ -88,7 +88,7 @@ public class NjsSceneBoxModelServiceImpl extends ServiceImpl<INjsSceneBoxModelMa
     }
 
     @Override
-    public void saveBoxModel(BaseJsonDataParamVO dto) {
+    public JSONObject saveBoxModel(BaseJsonDataParamVO dto) {
         JSONObject data = dto.getData();
         String sid = data.getString("sid");
         if(StrUtil.isEmpty(sid)){
@@ -97,6 +97,7 @@ public class NjsSceneBoxModelServiceImpl extends ServiceImpl<INjsSceneBoxModelMa
         NjsSceneBoxModel bean = this.getBySid(dto.getNum(), sid);
         if(bean == null){
             bean = BeanUtil.toBean(dto, NjsSceneBoxModel.class);
+            bean.setCreateTime(new Date());
             bean.setSid(sid);
         }else{
             bean.setData(dto.getData());
@@ -104,6 +105,10 @@ public class NjsSceneBoxModelServiceImpl extends ServiceImpl<INjsSceneBoxModelMa
         }
 
         this.saveOrUpdate(bean);
+
+        bean.getData().put("createTime", bean.getCreateTime().getTime());
+        bean.getData().put("sourceType", "model");
+        return bean.getData();
     }