dengsixing 3 лет назад
Родитель
Сommit
3e2ea282fe

+ 38 - 0
4dkankan-center-scene/src/main/java/com/fdkankan/scene/controller/TestController.java

@@ -0,0 +1,38 @@
+package com.fdkankan.scene.controller;
+
+import com.fdkankan.common.response.Result;
+import com.fdkankan.common.response.ResultData;
+import com.fdkankan.fyun.oss.UploadToOssUtil;
+import com.fdkankan.scene.bean.TagBean;
+import com.fdkankan.scene.config.Test;
+import java.io.IOException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * TODO
+ * </p>
+ *
+ * @author dengsixing
+ * @since 2022/7/27
+ **/
+@RestController
+@RequestMapping("/service/scene/test")
+public class TestController {
+
+    @Autowired
+    private UploadToOssUtil uploadToOssUtil;
+
+//    @Autowired
+//    private TagBean tagBean;
+
+    @GetMapping("/testS3")
+    public ResultData testS3(String content, String key) throws IOException {
+//        uploadToOssUtil.upload(content.getBytes(), key);
+        return ResultData.ok(Test.test_aaa);
+    }
+
+}

+ 2 - 2
4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java

@@ -209,7 +209,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         String num = param.getNum();
 
         //根据场景码查询数据库
-        ScenePro scenePro = sceneProService.findBySceneNum(num);
+//        ScenePro scenePro = sceneProService.findBySceneNum(num);
         ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
         ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
         SceneEditInfo sceneEditInfo = this.getByScenePlusId(scenePlus.getId());
@@ -277,7 +277,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         }else{
             this.updateById(sceneEditInfo);
         }
-        sceneEditInfoExt.setSceneProId(scenePro.getId());
+//        sceneEditInfoExt.setSceneProId(scenePro.getId());
         sceneEditInfoExt.setScenePlusId(scenePlus.getId());
         sceneEditInfoExt.setEditInfoId(sceneEditInfo.getId());
         sceneEditInfoExtService.saveOrUpdate(sceneEditInfoExt);