v2.0-场景营造-社区活动(V1)

README.md

@@ -4,4 +4,9 @@
 
 甲方接口文档：
 大屏BI接口：https://docs.qq.com/doc/DWlNlZkJLTEdNZ0N3
-开房平台API文档：https://docs.qq.com/doc/DZFh1eUtNcXhEUHlx
+开房平台API文档：https://docs.qq.com/doc/DZFh1eUtNcXhEUHlx
+
+
+2022-6-27 二期接口文档
+https://xtpt.yuque.com/books/share/826c2d4f-1ddb-4bd3-95d8-94729984d695?# 
+《数据开放平台》密码：ympb

gis_web/src/main/java/com/gis/web/controller/ScreenController.java

@@ -1,6 +1,7 @@
 package com.gis.web.controller;
 
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.gis.common.deyuan.util.ResultUtils;
 import com.gis.common.util.Result;
@@ -22,7 +23,7 @@ import java.util.HashMap;
  * Created by owen on 2020/10/18 0018 12:17
  */
 @Slf4j
-@Api(tags = "大屏BI接口")
+@Api(tags = "v2.0-大屏BI接口")
 @RestController
 @RequestMapping("screen")
 public class ScreenController  {
@@ -103,17 +104,45 @@ public class ScreenController  {
     }
 
 
+//    @ApiOperationSupport(order=2)
+//    @ApiOperation("场景营造-社区活动")
+//    @GetMapping("activityData/{code}")
+//    public Result activityData(@PathVariable String code) {
+//        String apiUrl = "/open/api/v1/community/activity-data";
+//        HashMap<String, Object> param = new HashMap<>();
+//        param.put("code", code);
+//        param.put("children", "true");
+//        return resultUtils.doGetResult(apiUrl, param);
+//    }
+
+
+    /**
+     * by owen 2022-6-28
+     * @param code
+     * @param children
+     * @param topType
+     * @return
+     */
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "code", value = "城市/社区编码 (必传)", dataType = "String", required = true),
+            @ApiImplicitParam(name = "children", value = "查询下级节点 (必传), ", dataType = "String", required = true),
+            @ApiImplicitParam(name = "topType", value = "topType=all  查全部。  不传就默认查询进行中的", dataType = "String")
+    })
     @ApiOperationSupport(order=2)
-    @ApiOperation("场景营造-社区活动")
-    @GetMapping("activityData/{code}")
-    public Result activityData(@PathVariable String code) {
+    @ApiOperation("v2.0-场景营造-社区活动(V1)")
+    @GetMapping("activityData/{code}/{children}")
+    public Result activityData(@PathVariable String code, @PathVariable Boolean children, String topType) {
         String apiUrl = "/open/api/v1/community/activity-data";
         HashMap<String, Object> param = new HashMap<>();
         param.put("code", code);
-        param.put("children", "true");
+        param.put("children", children);
+        if (StrUtil.isNotBlank(topType)){
+            param.put("topType", topType);
+        }
         return resultUtils.doGetResult(apiUrl, param);
     }
 
+
     @ApiOperationSupport(order=2)
     @ApiOperation("场景营造-邻里交流，cityCode:510124112")
     @GetMapping("interFlow/{cityCode}")

gis_web/src/main/java/com/gis/web/controller/dafengSmartCommunityController/SmartLife.java

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.HashMap;
 
-@Log4j2
+
 @Api(tags = "云平台-智慧生活")
 @RestController
 @RequestMapping("smartLife")
@@ -98,8 +98,8 @@ public class SmartLife {
     }
 
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "code", value = "社区编码,如：510115001076", dataType = "String"),
-            @ApiImplicitParam(name = "children", value = "是否查询街道及其以下社区", dataType = "Boolean")
+            @ApiImplicitParam(name = "code", value = "社区编码,如：510115001076", dataType = "String", required = true),
+            @ApiImplicitParam(name = "children", value = "是否查询街道及其以下社区", dataType = "Boolean", required = true)
     })
     @ApiOperation("报名中活动")
     @GetMapping("communityActivitydata/{code}/{children}")