From 5f3cf501f9f6c216df17ee8af6618b55b537d21a Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期五, 21 十月 2022 16:57:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into local_20221014
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 204 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 203 insertions(+), 1 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 edaae44..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
@@ -13,6 +13,7 @@
import com.panzhihua.common.model.dtos.community.dpc.PageDpcDTO;
import com.panzhihua.common.model.dtos.community.enterprise.*;
import com.panzhihua.common.model.dtos.community.reserve.*;
+import com.panzhihua.common.model.dtos.community.sanshuo.*;
import com.panzhihua.common.model.dtos.community.warehouse.ComActWarehouseApplyDTO;
import com.panzhihua.common.model.dtos.community.GetIdentityEidTokenDTO;
import com.panzhihua.common.model.dtos.community.cluster.PageClusterMemberDto;
@@ -35,6 +36,7 @@
import com.panzhihua.common.model.vos.community.raffle.ComActRaffleRecordVO;
import com.panzhihua.common.model.vos.community.raffle.ComActRaffleVO;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveDangerAreaVO;
+import io.swagger.annotations.ApiParam;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.scheduling.annotation.Async;
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -430,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
@@ -1278,7 +1281,7 @@
* @return
*/
@PostMapping("listadvertisement")
- R listAdvertisement();
+ R listAdvertisement(@RequestParam("type") Integer type);
/**
* 新增广告
@@ -10348,6 +10351,205 @@
R batchCheck(@RequestBody BatchCheckAcidRecordDTO batchCheckAcidRecordDTO);
/**
+ * 小程序获取可用的行业中心列表
+ * @return
+ * */
+ @GetMapping("/sanshuo/industryCenter/appletsList")
+ R industryCenterAppList();
+
+ /**
+ * 后台获取行业中心列表
+ * */
+ @GetMapping("/sanshuo/industryCenter/list")
+ R backIndustrytList(@RequestParam(value = "keyWord",required = false)String keyWord,
+ @RequestParam(value = "page",required = false)Integer page,
+ @RequestParam(value = "size",required = false)Integer size);
+
+ /**
+ * 添加业务中心
+ * */
+ @PostMapping("/sanshuo/industryCenter")
+ R addIndustry(@RequestBody ComSanShuoIndustryCenterDTO comSanShuoIndustryCenterDTO);
+
+ /**
+ * 修改业务中心
+ * */
+ @PutMapping("/sanshuo/industryCenter")
+ R updateIndustry(@RequestBody ComSanShuoIndustryCenterDTO comSanShuoIndustryCenterDTO);
+
+ /**
+ * 删除业务中心
+ * */
+ @DeleteMapping("/sanshuo/industryCenter/remove")
+ R removeIndustry(@RequestParam("id") Long id);
+
+ /**
+ * 重置业务中心密码
+ * */
+ @PostMapping("/sanshuo/industryCenter/resetPass")
+ R resetIndustryPassword(@RequestBody ComSanShuoIndustryCenterDTO comSanShuoIndustryCenterDTO);
+
+ /**
+ * 业务中心详情
+ * */
+ @GetMapping("/sanshuo/industryCenter/detail")
+ R industryCenterDetail(@RequestParam("id") Long id);
+
+ /**
+ * 后台获取专家列表
+ * */
+ @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 = "level",required = false)Integer level);
+
+ /**
+ * 添加专家
+ * */
+ @PostMapping("/sanshuo/expert")
+ R addExpert(@RequestBody ComSanshuoExpertDTO comSanshuoExpertDTO);
+
+ /**
+ * 修改专家
+ * */
+ @PutMapping("/sanshuo/expert")
+ R updateExpert(@RequestBody ComSanshuoExpertDTO comSanshuoExpertDTO);
+
+ /**
+ * 删除专家
+ * */
+ @DeleteMapping("/sanshuo/expert/remove")
+ R removeExpert(@RequestParam("id")Long id);
+
+ /**
+ * 重置专家登陆密码
+ * */
+ @PostMapping("/sanshuo/expert/resetPassword")
+ R resetExpertPassword(@RequestBody ComSanshuoExpertDTO comSanshuoExpertDTO);
+
+ /**
+ * 小程序获取可选择专家列表
+ * */
+ @GetMapping("/sanshuo/expert/appletsList")
+ R expertAppList(@RequestParam (value = "type",required = false)Integer type,@RequestParam(value = "id",required = false)Long id);
+
+ /**
+ * 获取专家详情
+ * */
+ @GetMapping("/sanshuo/expert/detail")
+ R expertDetail(@RequestParam("id") Long id);
+
+ /**
+ * 后台事件列表
+ * */
+ @GetMapping("/sanshuo/event/list")
+ R backEventList(@RequestParam(value = "keyWord",required = false)String keyWord,
+ @RequestParam(value = "page",required = false)Integer page,
+ @RequestParam(value = "size",required = false)Integer size);
+
+ /**
+ * 事件详情
+ * */
+ @GetMapping("/sanshuo/event/detail")
+ R eventDetail(@RequestParam(value = "id",required = false)Long id);
+
+ /**
+ * 小程序获取事件列表
+ * */
+ @GetMapping("/sanshuo/event/appletsList")
+ R eventAppList();
+
+ /**
+ * 新增事件类型
+ * */
+ @PostMapping("/sanshuo/event")
+ R addEvent(@RequestBody ComMediateTypeDTO comSanshuoEventDTO);
+
+ /**
+ * 新增事件类型
+ * */
+ @PutMapping("/sanshuo/event")
+ R updateEvent(@RequestBody ComMediateTypeDTO comSanshuoEventDTO);
+
+ /**
+ * 删除事件类型
+ * */
+ @DeleteMapping("/sanshuo/event/remove")
+ R removeEvent(@RequestParam(value = "id",required = false)Long id);
+
+ /**
+ * 专家风采
+ * */
+ @GetMapping("/sanshuo/expert/expertShow")
+ R expertShow();
+
+
+ @GetMapping("/sanshuo/expert/expertRange")
+ R expertRange();
+
+ /**
+ * 大屏事件统计
+ * */
+ @PostMapping("/sanshuo/comEvent/indexData")
+ R sanshuoIndexDate(IndexDateDTO indexDateDTO);
+
+ /**
+ * 事件占比统计饼图
+ * */
+ @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
--
Gitblit v1.7.1