From 43f0578e80af82ecae6c61b51bd0539c6b960603 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期二, 16 八月 2022 19:08:32 +0800
Subject: [PATCH] 服务范围优化
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 107 +++++++++++++++++++++++++++++++++++------------------
1 files changed, 70 insertions(+), 37 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 9d6afe1..e6935de 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,8 +3,8 @@
import java.util.List;
import com.panzhihua.common.model.dtos.PageBaseDTO;
-import com.panzhihua.common.model.dtos.civil.*;
-import com.panzhihua.common.model.dtos.common.*;
+import com.panzhihua.common.model.dtos.community.ActivityInviteDTO;
+import com.panzhihua.common.model.dtos.community.PageActivityInviteDTO;
import com.panzhihua.common.model.dtos.community.acid.*;
import com.panzhihua.common.model.dtos.community.dpc.AddDpcDTO;
import com.panzhihua.common.model.dtos.community.dpc.EditDpcDTO;
@@ -13,10 +13,7 @@
import com.panzhihua.common.model.dtos.community.reserve.*;
import com.panzhihua.common.model.dtos.community.warehouse.ComActWarehouseApplyDTO;
import com.panzhihua.common.model.dtos.community.GetIdentityEidTokenDTO;
-import com.panzhihua.common.model.dtos.community.*;
-import com.panzhihua.common.model.dtos.community.building.admin.*;
import com.panzhihua.common.model.dtos.community.cluster.PageClusterMemberDto;
-import com.panzhihua.common.model.dtos.community.cluster.admin.*;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussDetailDTO;
import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussPublishResultDTO;
@@ -27,10 +24,7 @@
import com.panzhihua.common.model.dtos.neighbor.*;
import com.panzhihua.common.model.dtos.property.PagePropertyWorkerDTO;
import com.panzhihua.common.model.dtos.property.PropertyWorkerDTO;
-import com.panzhihua.common.model.vos.*;
-import com.panzhihua.common.model.vos.civil.ComActSocialWorkerDetailsVO;
import com.panzhihua.common.model.vos.civil.ComActSocialWorkerVO;
-import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.community.acid.ComActAcidCheckRecordVO;
import com.panzhihua.common.model.vos.community.acid.ComActAcidMemberVO;
import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordVO;
@@ -39,12 +33,6 @@
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 com.panzhihua.common.model.vos.community.social.*;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import com.panzhihua.common.model.vos.community.*;
-import org.springframework.beans.BeanUtils;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.scheduling.annotation.Async;
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -56,7 +44,6 @@
import org.springframework.web.bind.annotation.RequestParam;
import com.panzhihua.common.model.dtos.AppletesBackstageConfigDTO;
-import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.PageDTO;
import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvDTO;
import com.panzhihua.common.model.dtos.advertisement.PageComOpsAdvDTO;
@@ -124,7 +111,6 @@
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.GetIdentityEidTokenDTO;
import com.panzhihua.common.model.dtos.community.GrantRewardDTO;
import com.panzhihua.common.model.dtos.community.KeyPersonInfoDTO;
import com.panzhihua.common.model.dtos.community.OperationDetailDTO;
@@ -172,7 +158,6 @@
import com.panzhihua.common.model.dtos.community.building.admin.EditBuildingUnitDto;
import com.panzhihua.common.model.dtos.community.building.admin.PageBuildingListDto;
import com.panzhihua.common.model.dtos.community.building.admin.PageBuildingUnitHouseListDto;
-import com.panzhihua.common.model.dtos.community.cluster.PageClusterMemberDto;
import com.panzhihua.common.model.dtos.community.cluster.admin.AddClusterAdminDto;
import com.panzhihua.common.model.dtos.community.cluster.admin.AddClusterMemberAdminDto;
import com.panzhihua.common.model.dtos.community.cluster.admin.EditClusterAdminDto;
@@ -195,18 +180,12 @@
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.discuss.ComActDiscussDetailDTO;
-import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussPublishResultDTO;
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;
import com.panzhihua.common.model.dtos.community.easyPhoto.ExportEasyPhotoDTO;
import com.panzhihua.common.model.dtos.community.easyPhoto.PageEasyPhotoActivityDTO;
import com.panzhihua.common.model.dtos.community.easyPhoto.PageEasyPhotoActivityUserDTO;
-import com.panzhihua.common.model.dtos.community.elder.ElderAuthStatisticHeaderDTO;
-import com.panzhihua.common.model.dtos.community.elder.PageElderAuthStatisticDTO;
-import com.panzhihua.common.model.dtos.community.elder.PagePensionAuthStatisticDTO;
-import com.panzhihua.common.model.dtos.community.elder.SignElderAuthStatisticDTO;
import com.panzhihua.common.model.dtos.community.fms.AddFmsClassroomAdminDTO;
import com.panzhihua.common.model.dtos.community.fms.AddFmsServiceAdminDTO;
import com.panzhihua.common.model.dtos.community.fms.AddTeamDTO;
@@ -283,7 +262,6 @@
import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletAdminDTO;
import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeAdminDTO;
import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeDTO;
-import com.panzhihua.common.model.dtos.community.warehouse.ComActWarehouseApplyDTO;
import com.panzhihua.common.model.dtos.community.warehouse.ComActWarehouseDonatesDTO;
import com.panzhihua.common.model.dtos.community.warehouse.ExportDonatesDTO;
import com.panzhihua.common.model.dtos.community.warehouse.PageDonatesDTO;
@@ -319,7 +297,6 @@
import com.panzhihua.common.model.dtos.neighbor.DeleteNeighborCircleAppDTO;
import com.panzhihua.common.model.dtos.neighbor.DetailNeighborAllCommentByAdminDTO;
import com.panzhihua.common.model.dtos.neighbor.DetailNeighborCommentReplyByAdminDTO;
-import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.dtos.shop.ComShopAddressDTO;
import com.panzhihua.common.model.dtos.shop.ComShopCartDTO;
import com.panzhihua.common.model.dtos.shop.ComShopEditNubCartDTO;
@@ -353,7 +330,6 @@
import com.panzhihua.common.model.vos.DictionaryVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
-import com.panzhihua.common.model.vos.civil.ComActSocialWorkerVO;
import com.panzhihua.common.model.vos.community.ActivitySignVO;
import com.panzhihua.common.model.vos.community.BatchhouseVO;
import com.panzhihua.common.model.vos.community.ComActActEvaluateVO;
@@ -420,7 +396,6 @@
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyActivity;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyBuild;
import com.panzhihua.common.model.vos.community.bigscreen.PartyBuildingMemberVO;
-import com.panzhihua.common.model.vos.community.cluster.admin.ComClusterMemberExcelVO;
import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
import com.panzhihua.common.model.vos.community.fms.ComFmsServiceImportExcelVO;
import com.panzhihua.common.model.vos.community.fms.ComFmsTeamMemberImportExcelVO;
@@ -429,8 +404,6 @@
import com.panzhihua.common.model.vos.community.questnaire.EditComActQuestnaireVo;
import com.panzhihua.common.model.vos.community.questnaire.QuestnaireVO;
import com.panzhihua.common.model.vos.community.questnaire.UsersAnswerQuestnaireVO;
-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.rentHouse.RentingHourseOrderVO;
import com.panzhihua.common.model.vos.community.rentHouse.RentingHoursePreOrderVO;
import com.panzhihua.common.model.vos.community.rentHouse.WxPayNotifyOrderVO;
@@ -5061,7 +5034,7 @@
* @return 邻里圈话题列表
*/
@GetMapping("/neighbor/getNeighborTopicByApp")
- R getNeighborTopicByApp(@RequestParam("name") String name, @RequestParam("belongType") Integer belongType);
+ R getNeighborTopicByApp(@RequestParam("name") String name);
/**
* 删除话题
@@ -5085,7 +5058,7 @@
* @return 社区列表
*/
@GetMapping("/eventgrid/community/westList")
- R getWestCommunityLists(@RequestParam("areaCode")String areaCode);
+ R getWestCommunityLists(@RequestParam(value = "areaCode",required = false)String areaCode);
/**
* 综治app-小区列表
@@ -5378,14 +5351,23 @@
R getIntegralReceiveApplets(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId);
/**
- * 小程序-查询用户积分列表
+ * 小程序-积分统计
*
* @param userId
* 用户id
* @return 用户积分列表
*/
- @PostMapping("/integral/user/list/applets")
- R getIntegralUserListApplets(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId);
+ @GetMapping("/integral/user/statistics")
+ R getIntegralUserListApplets(@RequestParam("userId") Long userId, @RequestParam(value = "communityId", required = false) Long communityId);
+
+ /**
+ * 查询我的积分余额
+ * @param userId
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/integral/user/balance")
+ R getUserIntegralBalance(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId);
/**
* 小程序-查询社区积分账户排行榜
@@ -5678,6 +5660,9 @@
@PostMapping("/reserve/commitNoToken")
R reserveCommitNoToken(@RequestBody ComActReserveCommitVO comActReserveCommitVO);
+
+ @PostMapping("/reserve/homeQuarantine/commitNoToken")
+ R homeQuarantineCommitNoToken(@RequestBody ComActReserveCommitVO comActReserveCommitVO);
/**
* 我的预约/登记
* @param pageUserReserveDTO
@@ -5980,6 +5965,14 @@
@PostMapping("/neighbor/serviceStatic")
R serviceStatic(@RequestBody ServiceStaticDTO serviceStaticDTO);
+ /**
+ * 求助我的问题数量统计
+ * @param type
+ * @param phone
+ * @return
+ */
+ @GetMapping("/neighbor/selectCount")
+ R selectCount(@RequestParam("type")Integer type,@RequestParam(value = "phone",required = false)String phone,@RequestParam("communityId")Long communityId);
/**
* 获取系统配置value
@@ -6360,7 +6353,7 @@
* @return 单条数据
*/
@GetMapping("/comActFourMember/{id}")
- R comActFourMemberSelectOne(@PathVariable("id") Integer id);
+ R comActFourMemberSelectOne(@PathVariable("id") Long id);
/**
* 新增数据
@@ -9710,7 +9703,7 @@
* @return
*/
@GetMapping("/comActAcidRecord/fiveCountPlus")
- R comActAcidRecordFiveCountPlus(@RequestParam("date")String date,@RequestParam("localCity")String localCity);
+ R comActAcidRecordFiveCountPlus(@RequestParam("date")String date,@RequestParam("localCity")String localCity,@RequestParam(value = "loginAccount",required = false)String loginAccount);
@GetMapping("/comActAcidRecord/statics")
R comActAcidRecordStatics(@RequestParam("date")String date);
@@ -9933,7 +9926,7 @@
@RequestParam(value = "page",required = false) Integer page,
@RequestParam(value = "size",required = false) Integer size,
@RequestParam(value = "belongTo",required = false) String belongTo,
- @RequestParam(value = "unitId",required = false) Long unitId);
+ @RequestParam(value = "unitId",required = false) Long unitId,@RequestParam(value = "loginAccount",required = false) String loginAccount);
/**
* 批量删除活动
* @param ids
@@ -10284,4 +10277,44 @@
*/
@GetMapping("/comActEasyPhotoHandler/detail")
R detailEasyPhotoHandler(@RequestParam("id") Long id);
+
+ /**
+ * 活动邀请列表
+ * @param pageActivityInviteDTO
+ * @return
+ */
+ @PostMapping("/activity/invite/list")
+ R pageActivityInviteList(@RequestBody PageActivityInviteDTO pageActivityInviteDTO);
+
+ /**
+ * 添加邀请人员
+ * @param list
+ * @return
+ */
+ @PostMapping("/activity/invite/add")
+ R activityInviteAdd(@RequestBody List<ActivityInviteDTO> list);
+
+ /**
+ * 删除邀请人员
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/activity/invite/delete")
+ R activityInviteDelete(@RequestParam("id") Long id);
+
+ /**
+ * 获取积分详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/integral/user/detail")
+ R getUserIntegralDetail(@RequestParam("id") Long id);
+
+ /**
+ * 分页查询可关联清单列表
+ * @param neighborCircleAppDTO
+ * @return
+ */
+ @PostMapping("/neighbor/pageRelationList")
+ R pageRelationList(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO);
}
--
Gitblit v1.7.1