From 947d016e4bd349b78d540e3a869f55d68b2c610c Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期二, 08 十一月 2022 18:16:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 399 ++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 298 insertions(+), 101 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..b02143a 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
@@ -3,18 +3,16 @@
import java.util.List;
import com.panzhihua.common.model.dtos.PageBaseDTO;
-import com.panzhihua.common.model.dtos.community.ActivityInviteDTO;
-import com.panzhihua.common.model.dtos.community.DiscussVoteOptionDTO;
-import com.panzhihua.common.model.dtos.community.PageActivityInviteDTO;
-import com.panzhihua.common.model.dtos.community.PageVoteSituationDTO;
+import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.dtos.community.acid.*;
+import com.panzhihua.common.model.dtos.community.convenient.*;
import com.panzhihua.common.model.dtos.community.dpc.AddDpcDTO;
import com.panzhihua.common.model.dtos.community.dpc.EditDpcDTO;
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;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussDetailDTO;
@@ -35,6 +33,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;
@@ -65,85 +64,6 @@
import com.panzhihua.common.model.dtos.common.PageComMngVolunteerOrgTeamDto;
import com.panzhihua.common.model.dtos.common.PageComMngVolunteerServiceTypeDto;
import com.panzhihua.common.model.dtos.common.PageComMngVolunteerSkillDto;
-import com.panzhihua.common.model.dtos.community.AddComActDynTypeDTO;
-import com.panzhihua.common.model.dtos.community.AddIdentityAuthDTO;
-import com.panzhihua.common.model.dtos.community.CancelRecordDTO;
-import com.panzhihua.common.model.dtos.community.CascadeHouseDTO;
-import com.panzhihua.common.model.dtos.community.ComActDiscussCommentDTO;
-import com.panzhihua.common.model.dtos.community.ComActDiscussCommentUserDTO;
-import com.panzhihua.common.model.dtos.community.ComActDiscussDTO;
-import com.panzhihua.common.model.dtos.community.ComActDiscussOptionUserDTO;
-import com.panzhihua.common.model.dtos.community.ComActDiscussUserDTO;
-import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentDTO;
-import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentUserDTO;
-import com.panzhihua.common.model.dtos.community.ComCvtBusinessDTO;
-import com.panzhihua.common.model.dtos.community.ComCvtCategoryDTO;
-import com.panzhihua.common.model.dtos.community.ComCvtServeDTO;
-import com.panzhihua.common.model.dtos.community.ComExServicemanDTO;
-import com.panzhihua.common.model.dtos.community.ComMngCarAppletDTO;
-import com.panzhihua.common.model.dtos.community.ComMngCarSaveDTO;
-import com.panzhihua.common.model.dtos.community.ComMngPopulationDTO;
-import com.panzhihua.common.model.dtos.community.ComMngPopulationEditDTO;
-import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseAdminDTO;
-import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseEditAdminDTO;
-import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseInsertAdminDTO;
-import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseUserVO;
-import com.panzhihua.common.model.dtos.community.ComMngPopulationTagDTO;
-import com.panzhihua.common.model.dtos.community.ComMngRealCompanyBelongsDTO;
-import com.panzhihua.common.model.dtos.community.ComOpsHouseDTO;
-import com.panzhihua.common.model.dtos.community.ComPropertyPublicityDTO;
-import com.panzhihua.common.model.dtos.community.ComSwDangerReportEditDTO;
-import com.panzhihua.common.model.dtos.community.ComSwDangerReportHandleDTO;
-import com.panzhihua.common.model.dtos.community.ComSwDangerReportRectifyDTO;
-import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordAddDTO;
-import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordEditDTO;
-import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordPageDTO;
-import com.panzhihua.common.model.dtos.community.ComSwRotaPageDTO;
-import com.panzhihua.common.model.dtos.community.ComSwRotaSaveDTO;
-import com.panzhihua.common.model.dtos.community.ComSwSafetyWorkEditDTO;
-import com.panzhihua.common.model.dtos.community.DisabledPersonsDTO;
-import com.panzhihua.common.model.dtos.community.EditComActDynTypeDTO;
-import com.panzhihua.common.model.dtos.community.EldersAuthAddByFamilyDTO;
-import com.panzhihua.common.model.dtos.community.EldersAuthAddDTO;
-import com.panzhihua.common.model.dtos.community.EldersAuthDeleteDTO;
-import com.panzhihua.common.model.dtos.community.EldersAuthEditDTO;
-import com.panzhihua.common.model.dtos.community.EldersAuthElderlyDTO;
-import com.panzhihua.common.model.dtos.community.EldersAuthFeedbackAddDTO;
-import com.panzhihua.common.model.dtos.community.EldersAuthTypeQueryDTO;
-import com.panzhihua.common.model.dtos.community.ExportComMngCarExcelDTO;
-import com.panzhihua.common.model.dtos.community.ExportRealAssetsExcelDTO;
-import com.panzhihua.common.model.dtos.community.ExportRealCompanyExcelDTO;
-import com.panzhihua.common.model.dtos.community.GrantRewardDTO;
-import com.panzhihua.common.model.dtos.community.KeyPersonInfoDTO;
-import com.panzhihua.common.model.dtos.community.OperationDetailDTO;
-import com.panzhihua.common.model.dtos.community.PageActWorkGuideDTO;
-import com.panzhihua.common.model.dtos.community.PageComActDTO;
-import com.panzhihua.common.model.dtos.community.PageComActDiscussCommentDTO;
-import com.panzhihua.common.model.dtos.community.PageComActDiscussDTO;
-import com.panzhihua.common.model.dtos.community.PageComActDynTypeDTO;
-import com.panzhihua.common.model.dtos.community.PageComActEasyPhotoCommentDTO;
-import com.panzhihua.common.model.dtos.community.PageComCvtBusinessAppletsDTO;
-import com.panzhihua.common.model.dtos.community.PageComCvtBusinessDTO;
-import com.panzhihua.common.model.dtos.community.PageComCvtCategoryDTO;
-import com.panzhihua.common.model.dtos.community.PageComCvtServeDTO;
-import com.panzhihua.common.model.dtos.community.PageComEldersRecordsDTO;
-import com.panzhihua.common.model.dtos.community.PageComMngCarDTO;
-import com.panzhihua.common.model.dtos.community.PageComMngRealAssetsDTO;
-import com.panzhihua.common.model.dtos.community.PageComMngRealCompanyDTO;
-import com.panzhihua.common.model.dtos.community.PageComMngVillageDTO;
-import com.panzhihua.common.model.dtos.community.PageComOpsHouseDTO;
-import com.panzhihua.common.model.dtos.community.PageComPropertyPublicityDTO;
-import com.panzhihua.common.model.dtos.community.PageComStreetDTO;
-import com.panzhihua.common.model.dtos.community.PageElderAuthRecordsDTO;
-import com.panzhihua.common.model.dtos.community.PageEldersAuthDTO;
-import com.panzhihua.common.model.dtos.community.PageEldersAuthElderlyDTO;
-import com.panzhihua.common.model.dtos.community.PageEldersAuthHistoryDTO;
-import com.panzhihua.common.model.dtos.community.PageEldersAuthRecordDTO;
-import com.panzhihua.common.model.dtos.community.PageIdentityAuthRecordDTO;
-import com.panzhihua.common.model.dtos.community.PageQuestnaireAnswerDTO;
-import com.panzhihua.common.model.dtos.community.PageQuestnaireDTO;
-import com.panzhihua.common.model.dtos.community.PageQuestnaireSubDetailsDTO;
-import com.panzhihua.common.model.dtos.community.PageUserReserveDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDetailDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenStatisticAgeGenderDTO;
@@ -166,22 +86,6 @@
import com.panzhihua.common.model.dtos.community.cluster.admin.EditClusterMemberAdminDto;
import com.panzhihua.common.model.dtos.community.cluster.admin.PageClusterAdminDto;
import com.panzhihua.common.model.dtos.community.cluster.admin.PageClusterMemberAdminDto;
-import com.panzhihua.common.model.dtos.community.convenient.ConvenientMerchantDTO;
-import com.panzhihua.common.model.dtos.community.convenient.ConvenientProductCategoryDTO;
-import com.panzhihua.common.model.dtos.community.convenient.ConvenientProductDTO;
-import com.panzhihua.common.model.dtos.community.convenient.ConvenientServiceCategoryDTO;
-import com.panzhihua.common.model.dtos.community.convenient.DeleteConvenientProductDTO;
-import com.panzhihua.common.model.dtos.community.convenient.DisableOrEnableConvenientMerchantDTO;
-import com.panzhihua.common.model.dtos.community.convenient.ExportMerchantDTO;
-import com.panzhihua.common.model.dtos.community.convenient.OnShelfOrOffShelfProductDTO;
-import com.panzhihua.common.model.dtos.community.convenient.PageClassifyMerchantDTO;
-import com.panzhihua.common.model.dtos.community.convenient.PageConvenientMerchantDTO;
-import com.panzhihua.common.model.dtos.community.convenient.PageConvenientProductCategoryDTO;
-import com.panzhihua.common.model.dtos.community.convenient.PageConvenientProductDTO;
-import com.panzhihua.common.model.dtos.community.convenient.PageConvenientServiceCategoryDTO;
-import com.panzhihua.common.model.dtos.community.convenient.PagePopularMerchantDTO;
-import com.panzhihua.common.model.dtos.community.convenient.PageSearchDTO;
-import com.panzhihua.common.model.dtos.community.convenient.ResetPasswordConvenientMerchantDTO;
import com.panzhihua.common.model.dtos.community.easyPhoto.AddEasyPhotoActivityDTO;
import com.panzhihua.common.model.dtos.community.easyPhoto.AddEasyPhotoClassifyDTO;
import com.panzhihua.common.model.dtos.community.easyPhoto.EditEasyPhotoActivityDTO;
@@ -430,6 +334,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 +1183,7 @@
* @return
*/
@PostMapping("listadvertisement")
- R listAdvertisement();
+ R listAdvertisement(@RequestParam("type") Integer type);
/**
* 新增广告
@@ -10348,6 +10253,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
@@ -10362,4 +10466,97 @@
*/
@GetMapping("selectAutomessageSysUserById")
R selectAutomessageSysUserById(@RequestParam("id") Long id);
+
+ /**
+ * 分页查询议事委员会列表
+ * */
+ @GetMapping("/proceedings/list")
+ R proceedingsList(@RequestParam(value = "page",required = false) Integer page,
+ @RequestParam(value = "size",required = false) Integer size,
+ @RequestParam(value = "keyWord",required = false) String keyWord);
+ /**
+ * 添加或修改议事委员会
+ * */
+ @PostMapping("/proceedings")
+ R addOrUpdateProceedings(@RequestBody ComActProceedingsDTO comActProceedingsDTO);
+
+ /**
+ * 自提点分页查询
+ * @param pageConvenientElevatingPointDTO
+ * @return
+ */
+ @PostMapping("/convenient/point/page")
+ R pagePoint(PageConvenientElevatingPointDTO pageConvenientElevatingPointDTO);
+
+ /**
+ * 新增自提点
+ * @param convenientElevatingPointDTO
+ * @return
+ */
+ @PostMapping("/convenient/point/add")
+ R addPoint(ConvenientElevatingPointDTO convenientElevatingPointDTO);
+
+ /**
+ * 编辑自提点
+ * @param convenientElevatingPointDTO
+ * @return
+ */
+ @PutMapping("/convenient/point/put")
+ R putPoint(ConvenientElevatingPointDTO convenientElevatingPointDTO);
+
+ /**
+ * 删除便民服务 自提点
+ * @param pointId
+ * @param operator
+ * @return
+ */
+ @DeleteMapping("/point/delete")
+ R deletePoint(@RequestParam("pointId") Long pointId, @RequestParam("operator") Long operator);
+
+
+ /**
+ * 新增商品分类
+ * @param convenientGoodsCategoryDTO
+ * @return
+ */
+ @PostMapping("/goodsCategory/add")
+ R addGoodsCategory(@RequestBody ConvenientGoodsCategoryDTO convenientGoodsCategoryDTO);
+
+ /**
+ * 编辑
+ * @param convenientGoodsCategoryDTO
+ * @return
+ */
+ @PutMapping("/goodsCategory/put")
+ R putGoodsCategory(@RequestBody ConvenientGoodsCategoryDTO convenientGoodsCategoryDTO);
+
+ /**
+ * 删除商品分类
+ * @param categoryId
+ * @return
+ */
+ @DeleteMapping("/goodsCategory/delete")
+ R deleteGoodsCategory(@RequestParam("categoryId") Long categoryId, @RequestParam("operator") Long operator);
+
+ /**
+ * 获取商品分类详情
+ * @param categoryId
+ * @return
+ */
+ @GetMapping("/goodsCategory/get")
+ R getGoodsCategory(@RequestParam("categoryId") Long categoryId);
+
+ /**
+ * 分页查询商品分类
+ * @param pageConvenientGoodsCategoryDTO
+ * @return
+ */
+ @PostMapping("/goodsCategory/page")
+ R pageGoodsCategory(@RequestBody PageConvenientGoodsCategoryDTO pageConvenientGoodsCategoryDTO);
+
+ @GetMapping("/dataCount")
+ R dataCount();
+
+ @DeleteMapping("/proceedings/remove")
+ R removeProceedings(@RequestParam("id") Long id);
}
--
Gitblit v1.7.1