From 9c8735c70d86a31081340ca78bb2b538ed11a6e5 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期二, 27 七月 2021 18:39:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridDataApi.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridDataApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridDataApi.java
index e73810c..9a21aed 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridDataApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridDataApi.java
@@ -7,6 +7,7 @@
import com.panzhihua.common.model.vos.grid.EventGridDataDetailsVO;
import com.panzhihua.common.model.vos.grid.EventGridDataVO;
import com.panzhihua.service_grid.service.EventGridDataService;
+import com.panzhihua.service_grid.service.LcCompareCodeService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
@@ -27,6 +28,8 @@
@Resource
private EventGridDataService eventGridDataService;
+ @Resource
+ private LcCompareCodeService lcCompareCodeService;
/**
@@ -95,7 +98,7 @@
* @return 网格员列表
*/
@PostMapping("/member/list")
- public R getGridMemberLists(@RequestParam("communityId") Long communityId){
+ public R getGridMemberLists(@RequestParam(value = "communityId",required = false) Long communityId){
return eventGridDataService.getGridMemberLists(communityId);
}
@@ -166,4 +169,15 @@
public R deleteGridDataByAdmin(@RequestBody List<Long> Ids){
return eventGridDataService.deleteGridDataByAdmin(Ids);
}
+
+ /**
+ * 综治后台-查询所有市平台网格列表
+ * @return 市平台网格列表
+ */
+ @GetMapping("/lc/list")
+ public R getLcGridLists(){
+ return lcCompareCodeService.getLcGridLists();
+ }
+
+
}
--
Gitblit v1.7.1