dengsixing 6 月之前
父節點
當前提交
38940da818

+ 26 - 0
src/main/java/com/fdkankan/contro/controller/HaixinController.java

@@ -0,0 +1,26 @@
+package com.fdkankan.contro.controller;
+
+import com.fdkankan.contro.dto.UploadSceneDTO;
+import com.fdkankan.contro.service.IHaixinService;
+import com.fdkankan.web.response.ResultData;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+@RestController
+@RequestMapping("/api/scene/file")
+public class HaixinController {
+
+    @Autowired
+    private IHaixinService haixinService;
+
+    @PostMapping("uploadScene")
+    public ResultData uploadScene(@RequestBody @Valid UploadSceneDTO dto) throws Exception {
+        return haixinService.uploadScene(dto);
+    }
+
+}

+ 2 - 1
src/main/java/com/fdkankan/contro/controller/SceneFileController.java

@@ -12,6 +12,7 @@ import com.fdkankan.common.constant.RecStatus;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.util.CmdUtils;
 import com.fdkankan.common.util.DateExtUtil;
+import com.fdkankan.contro.dto.UploadSceneDTO;
 import com.fdkankan.contro.entity.SceneFileBuild;
 import com.fdkankan.contro.service.GzZcdjzxService;
 import com.fdkankan.contro.service.ISceneFileBuildService;
@@ -31,6 +32,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import javax.validation.Valid;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.*;
@@ -111,7 +113,6 @@ public class SceneFileController{
         return sceneFileBuildService.uploadFile(file, params);
     }
 
-
     /**
      * 国际八目相机调用
      * @param params

+ 19 - 0
src/main/java/com/fdkankan/contro/dto/UploadSceneDTO.java

@@ -0,0 +1,19 @@
+package com.fdkankan.contro.dto;
+
+import lombok.Data;
+
+@Data
+public class UploadSceneDTO {
+
+    /**
+     * 原始资源压缩包url
+     */
+    private String fileUrl;
+
+    private String taskId;
+
+    private String kNo;
+
+
+
+}

+ 3 - 3
src/main/java/com/fdkankan/contro/generate/AutoGenerate.java

@@ -17,7 +17,7 @@ public class AutoGenerate {
         String path =System.getProperty("user.dir");
 
         generate(path,"contro", getTables(new String[]{
-                "t_scene_info_sync_mq_config"
+                "t_scene_orig_bd"
         }));
 
 //        generate(path,"goods", getTables(new String[]{
@@ -45,8 +45,8 @@ public class AutoGenerate {
 
 
     public static void  generate(String path,String moduleName,  List<String> tables){
-        FastAutoGenerator.create("jdbc:mysql://120.24.144.164:3306/4dkankan_v4",
-            "root","4Dage@4Dage#@168")
+        FastAutoGenerator.create("jdbc:mysql://192.168.0.125:3306/4dkankan_haixin",
+            "root","mysql123!ROOT.")
                 .globalConfig(builder -> {
                     builder.author("")               //作者
                             .outputDir(path+"\\src\\main\\java")    //输出路径(写到java目录)

+ 10 - 0
src/main/java/com/fdkankan/contro/service/IHaixinService.java

@@ -0,0 +1,10 @@
+package com.fdkankan.contro.service;
+
+import com.fdkankan.contro.dto.UploadSceneDTO;
+import com.fdkankan.web.response.ResultData;
+
+public interface IHaixinService {
+
+    ResultData uploadScene(UploadSceneDTO dto);
+
+}

+ 2 - 0
src/main/java/com/fdkankan/contro/service/ISceneFileBuildService.java

@@ -2,6 +2,7 @@ package com.fdkankan.contro.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.contro.dto.UploadSceneDTO;
 import com.fdkankan.contro.entity.SceneFileBuild;
 import com.fdkankan.contro.vo.ResponseSceneFile;
 import com.fdkankan.web.response.ResultData;
@@ -34,4 +35,5 @@ public interface ISceneFileBuildService extends IService<SceneFileBuild> {
     ResultData uploadFile(MultipartFile file, String params) throws Exception;
 
     ResultData reverseScene(JSONObject params) throws Exception;
+
 }

+ 23 - 0
src/main/java/com/fdkankan/contro/service/impl/HaixinServiceImpl.java

@@ -0,0 +1,23 @@
+package com.fdkankan.contro.service.impl;
+
+import com.fdkankan.contro.dto.UploadSceneDTO;
+import com.fdkankan.contro.service.IHaixinService;
+import com.fdkankan.web.response.ResultData;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+public class HaixinServiceImpl implements IHaixinService {
+
+    @Override
+    public ResultData uploadScene(UploadSceneDTO dto) {
+
+
+
+        return null;
+    }
+
+
+
+}

+ 2 - 0
src/main/java/com/fdkankan/contro/service/impl/SceneFileBuildServiceImpl.java

@@ -2143,4 +2143,6 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         return result;
     }
 
+
+
 }