From 9b87eeaa4c66ac791da8936acb8bd632257dd934 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 27 十月 2022 16:48:42 +0800
Subject: [PATCH] Merge branch 'local_20221024' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 80 +++++++++++++++++++++++++++++++++++++--
1 files changed, 75 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index 05985e6..0baf55b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -432,6 +432,7 @@
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.common.model.vos.user.UserElectronicFileVO;
import com.panzhihua.common.model.vos.user.UserPhoneVO;
+import org.springframework.web.multipart.MultipartFile;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -1280,7 +1281,7 @@
* @return
*/
@PostMapping("listadvertisement")
- R listAdvertisement();
+ R listAdvertisement(@RequestParam("type") Integer type);
/**
* 新增广告
@@ -9694,6 +9695,9 @@
@PostMapping("/comActAcidRecord/export")
R exportComActAcidRecord(@RequestBody ComActAcidRecordDTO comActAcidRecordDTO);
+ @GetMapping("/comActAcidRecord/checkCommit")
+ R checkCommit(@RequestParam(value = "userId",required = false)Long userId);
+
/**
* 5项常规统计
@@ -10397,7 +10401,8 @@
@GetMapping("/sanshuo/expert/backstageList")
R backExpertList(@RequestParam(value = "keyWord",required = false)@ApiParam("搜索关键字") String keyWord,
@RequestParam(value = "page",required = false)Integer page,
- @RequestParam(value = "size",required = false)Integer size);
+ @RequestParam(value = "size",required = false)Integer size,
+ @RequestParam(value = "level",required = false)Integer level);
/**
* 添加专家
@@ -10427,7 +10432,7 @@
* 小程序获取可选择专家列表
* */
@GetMapping("/sanshuo/expert/appletsList")
- R expertAppList();
+ R expertAppList(@RequestParam (value = "type",required = false)Integer type,@RequestParam(value = "id",required = false)Long id);
/**
* 获取专家详情
@@ -10492,6 +10497,71 @@
/**
* 事件占比统计饼图
* */
- @GetMapping("/indexData/event")
- R eventIndexData(@RequestParam Integer type);
+ @GetMapping("sanshuo/comEvent/indexData/event")
+ R eventIndexData(@RequestParam("type") Integer type);
+
+ /**
+ * 专家风采列表
+ * */
+ @GetMapping("/sanshuo/expert/expertShowList")
+ R expertShowList(@RequestParam(value = "level",required = false)Integer level,@RequestParam(value = "id",required = false)Long id);
+
+ /**
+ * 修改街道信息
+ * */
+ @PostMapping("/updateStreet")
+ R updateStreet(@RequestBody ComStreetVO comStreetVO);
+
+ /**
+ * 删除街道
+ * */
+ @GetMapping("/removeStreet")
+ R removeStreet(@RequestParam(value = "id",required = false)Long id);
+
+ /***
+ * 删除社区
+ * */
+ @GetMapping("/removeCommunity")
+ R removeCommunity(@RequestParam(value = "id",required = false)Long id);
+
+ @PostMapping("/repassCommunity")
+ R repassCommunity(@RequestBody ComActVO comActVO);
+
+ @PostMapping("/repassStreet")
+ R repassStreet(@RequestBody ComStreetVO comActVO);
+
+ /**
+ * 是否有绑定手机号码的专家账号
+ * */
+ @GetMapping("/sanshuo/expert/checkExpert")
+ R isExpert(@RequestParam(value = "number",required = false) String number);
+
+ @GetMapping("/sanshuo/comEvent/streetList")
+ R streetList();
+
+ @PostMapping("/sanshuo/expert/importExpert")
+ R importExpert(@RequestBody MultipartFile file);
+
+ @GetMapping("/sanshuo/comEvent/communityList")
+ R westList();
+
+ @GetMapping("/sanshuo/expert/backstageList2")
+ R expertBackStageList(@RequestParam(value = "level",required = false)Integer level,@RequestParam(value = "page",required = false)Integer page,
+ @RequestParam(value = "size",required = false)Integer size);
+
+ /**
+ * 查询社区id集合
+ * @param id
+ * @return
+ */
+ @GetMapping("selectCommunityIds")
+ R selectCommunityIds(@RequestParam("id") Long id);
+
+ /**
+ * 查询社区id集合
+ * @param id
+ * @return
+ */
+ @GetMapping("selectAutomessageSysUserById")
+ R selectAutomessageSysUserById(@RequestParam("id") Long id);
}
--
Gitblit v1.7.1