lyhzzz 3 лет назад
Родитель
Сommit
88ee625118

+ 2 - 1
src/main/java/com/cdf/config/WebAppConfig.java

@@ -30,7 +30,8 @@ public class WebAppConfig implements WebMvcConfigurer {
 		registry.addInterceptor(sceneInterceptor).addPathPatterns("/service/**")
 				.excludePathPatterns("/service/scene/edit/tag/save","/service/scene/edit/tag/delete"
 						,"/service/scene/edit/tag/list","/service/scene/edit/tag/getHotJson",
-						"/service/scene/edit/publicScene","/service/scene/edit/upload/files");
+						"/service/scene/edit/publicScene","/service/scene/edit/upload/files",
+						"/service/scene/getInfo");
 		WebMvcConfigurer.super.addInterceptors(registry);
 	}
 

+ 34 - 0
src/main/java/com/cdf/controller/service/FdkkSceneSceneController.java

@@ -0,0 +1,34 @@
+package com.cdf.controller.service;
+
+import com.cdf.aop.SysLog;
+import com.cdf.common.ResultData;
+import com.cdf.httpClient.client.FdkkClient;
+import com.cdf.httpClient.request.FdkkHotRequest;
+import com.cdf.httpClient.request.FdkkUploadRequest;
+import com.cdf.httpClient.response.FdkkResponse;
+import com.cdf.service.impl.FdkkSceneEditService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.util.HashMap;
+
+@RestController
+@RequestMapping("/service/scene")
+public class FdkkSceneSceneController {
+
+    @Resource
+    private FdkkClient fdkkClient;
+
+    @GetMapping("/getInfo")
+    public ResultData getInfo(@RequestParam(required = false) String num){
+        HashMap<String, String> map = new HashMap<>();
+        map.put("num",num);
+        FdkkResponse info = fdkkClient.getInfo(map);
+        return ResultData.ok(info.getMsg(),info.getData());
+    }
+
+
+}

+ 10 - 4
src/main/java/com/cdf/httpClient/client/FdkkClient.java

@@ -67,6 +67,12 @@ public interface FdkkClient {
     @Address(source = FdkkLoginAddressSource.class)
     FdkkResponse sceneMove(@JSONBody FdkkSceneFolderRequest fdkkSceneDeleteRequest , @Header("token")  String token);
     /**
+     * 全部场景列表
+     */
+    @Post("/api/user/scene/list")
+    @Address(source = FdkkLoginAddressSource.class)
+    FdkkResponse getAllScene(@JSONBody FdkkAllSceneRequest fdkkAllSceneRequest,@Header("token")String token);
+    /**
      * 添加热点
      */
     @Post("/service/scene/edit/tag/save")
@@ -97,11 +103,11 @@ public interface FdkkClient {
     @Address(source = FdkkSceneAddressSource.class)
     FdkkResponse uploadFiles(@Query FdkkUploadRequest fdkkUploadRequest, @DataFile("files") String files, @Header("token")String token);
     /**
-     * 全部场景列表
+     * 获取场景详情-查看页面
      */
-    @Post("/api/user/scene/list")
-    @Address(source = FdkkLoginAddressSource.class)
-    FdkkResponse getAllScene(@JSONBody FdkkAllSceneRequest fdkkAllSceneRequest,@Header("token")String token);
+    @Get("/service/scene/getInfo")
+    @Address(source = FdkkSceneAddressSource.class)
+    FdkkResponse getInfo(@Query Map<String,String> param);
 
     @Post("{url}")
     @Address(source = FdkkSceneAddressSource.class)