From c88d1658a2b6b51ed1a81c3be3e9102b661970f3 Mon Sep 17 00:00:00 2001
From: luoxinwu <934743099@qq.com>
Date: 星期二, 05 三月 2024 09:42:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/LargeScreenApi.java | 72 +++++++++++++++++++++++++++++++++++-
1 files changed, 70 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/LargeScreenApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/LargeScreenApi.java
index 5ee5792..2b2961a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/LargeScreenApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/LargeScreenApi.java
@@ -1,14 +1,82 @@
package com.panzhihua.service_community.api;
+import com.panzhihua.common.model.dtos.community.building.BuildingDto;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComActDynVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.service_community.service.ComActDynService;
+import com.panzhihua.service_community.service.ComStreetService;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
@Slf4j
@RestController
@RequestMapping("/largeScreen")
public class LargeScreenApi {
+ @Autowired
+ private ComStreetService comStreetService;
+ @Autowired
+ private CommunityService communityService;
+ @Autowired
+ private ComActDynService comActDynService;
+
+ /**
+ * 地图
+ */
+ @GetMapping("/panzhihuaMap")
+ public R panzhihuaMap(@RequestParam("areaCode")String areaCode){
+ return comStreetService.panzhihuaMap(areaCode);
+ }
+
+ @GetMapping("/oneTagThreeReal")
+ public R oneTagThreeReal(@RequestParam("streetId") Long streetId){
+ return comStreetService.oneTagThreeReal(streetId);
+ }
+
+ /**
+ * 根据行政区查询街道
+ */
+ @PostMapping("/searchStreet")
+ public R searchStreet(@RequestBody BuildingDto buildingDto){
+ return comStreetService.searchStreet(buildingDto);
+ }
+
+ /**
+ * 花城资讯
+ */
+ @PostMapping("/huachengDyn")
+ public R huachengDyn(@RequestBody ComActDynVO comActDynVO){
+ return comActDynService.pageDynamicByAdmin(comActDynVO);
+// return communityService.pageDynamicByAdmin(comActDynVO);
+ }
+
+ /**
+ * 综合数据
+ */
+ @GetMapping("/getScreenStatics")
+ public R getScreenStatics(){
+ return comStreetService.getScreenStatics();
+ }
+
+ /**
+ * 特殊人群统计
+ */
+ @GetMapping("/populationStatics")
+ public R populationStatics(@RequestParam("streetId") Long streetId){
+
+ return comStreetService.populationStatics(streetId);
+ }
+
+ /**
+ * 花城党建大屏
+ */
+ @GetMapping("/probably")
+ public R probably(@RequestParam("year") Integer year,@RequestParam("belongTo") String belongTo){
+ return comStreetService.probably(year, belongTo);
+ }
+
}
--
Gitblit v1.7.1