From b1067240fac484e30ba6f57f3f93a87bd1016a30 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 28 七月 2021 17:03:41 +0800
Subject: [PATCH] 修改bug
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 470 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 449 insertions(+), 21 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 8f17649..25f2214 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
@@ -5,28 +5,26 @@
import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvDTO;
import com.panzhihua.common.model.dtos.advertisement.PageComOpsAdvDTO;
import com.panzhihua.common.model.dtos.community.*;
-import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDetailDTO;
-import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenStatisticAgeGenderDTO;
-import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenStatisticPartyActivityDTO;
-import com.panzhihua.common.model.dtos.community.bigscreen.PageBigScreenStatisticPartyOrg;
+import com.panzhihua.common.model.dtos.community.bigscreen.*;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityListDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityPeopleListDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenDiscussListDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenMicroListDTO;
-import com.panzhihua.common.model.dtos.community.wallet.ComActWalletDetailDTO;
-import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeDTO;
+import com.panzhihua.common.model.dtos.community.easyPhoto.AddEasyPhotoActivityDTO;
+import com.panzhihua.common.model.dtos.community.easyPhoto.EditEasyPhotoActivityDTO;
+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.wallet.*;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthGetResultDTO;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthPageDTO;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthUserAddAppDTO;
-import com.panzhihua.common.model.dtos.grid.PagePopulationListDTO;
+import com.panzhihua.common.model.dtos.grid.*;
+import com.panzhihua.common.model.dtos.grid.admin.*;
import com.panzhihua.common.model.dtos.neighbor.*;
import com.panzhihua.common.model.dtos.shop.*;
import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
import com.panzhihua.common.model.dtos.vaccines.*;
-import com.panzhihua.common.model.vos.BcDictionaryItemVO;
-import com.panzhihua.common.model.vos.BcDictionaryVO;
-import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
+import com.panzhihua.common.model.vos.*;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticAgeGender;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyActivity;
@@ -44,6 +42,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 io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
@@ -119,7 +118,16 @@
* @return 详情
*/
@PostMapping("detailactivity")
- R detailActivity(@RequestParam("id") Long id, @RequestParam("userId") Long userId);
+ R detailActivity(@RequestParam("id") Long id, @RequestParam(value = "userId",required = false) Long userId);
+
+ /**
+ * 分页活动报名名单
+ *
+ * @param activitySignVO 查询参数
+ * @return 报名人员集合
+ */
+ @PostMapping("listactivitysign")
+ R listActivitySign(@RequestBody ActivitySignVO activitySignVO);
/**
* 活动报名名单
@@ -127,8 +135,8 @@
* @param activitySignVO 查询参数
* @return 报名人员集合
*/
- @PostMapping("listactivitysign")
- R listActivitySign(@RequestBody ActivitySignVO activitySignVO);
+ @PostMapping("listactivitysigns")
+ R listActivitySigns(@RequestBody ActivitySignVO activitySignVO);
/**
* 新增社区动态
@@ -1429,6 +1437,15 @@
R listSaveMngCarExcelVO(@RequestBody List<ComMngCarExcelVO> list, @RequestParam("communityId") Long communityId);
/**
+ * 车辆导出
+ *
+ * @param exportComMngCarExcelDTO
+ * @return
+ */
+ @PostMapping("/common/data/car/export")
+ R exportRealCar(@RequestBody ExportComMngCarExcelDTO exportComMngCarExcelDTO);
+
+ /**
* 社区后台实有单位管理列表
*
* @param pageComMngRealCompanyDTO
@@ -1436,6 +1453,15 @@
*/
@PostMapping("/common/data/company/page")
R pageQueryComMngRealCompany(@RequestBody PageComMngRealCompanyDTO pageComMngRealCompanyDTO);
+
+ /**
+ * 社区后台实有单位统计
+ *
+ * @param communityId 社区id
+ * @return 统计结果
+ */
+ @PostMapping("/common/data/company/statistics")
+ R getComMngRealCompanyTotalByAdmin(@RequestParam("communityId") Long communityId);
/**
* 社区后台添加修改实有单位
@@ -1642,6 +1668,15 @@
R listVillage(ComMngVillageVO comMngVillageVO);
/**
+ * 根据房屋id查询实有房屋
+ *
+ * @param villageId 查询条件
+ * @return 查询结果
+ */
+ @PostMapping("/getVillageById")
+ R getVillageById(@RequestParam(value = "villageId")Long villageId);
+
+ /**
* 批量导入实有房屋
*
* @param list 实有房屋数据
@@ -1735,6 +1770,15 @@
*/
@PostMapping("/common/data/population/getList")
R getPopulationLists(@RequestBody List<Long> Ids);
+
+ /**
+ * 根据小区id查询实有人口
+ *
+ * @param villageId 小区id
+ * @return 查询结果
+ */
+ @PostMapping("/common/data/population/getListByVillageId")
+ R getPopulationListByVillageId(@RequestParam("villageId") Long villageId);
/**
* 创建调查问卷
@@ -2326,7 +2370,7 @@
* @return 详情
*/
@GetMapping("/detailworkguide")
- R detailWorkGuide(@RequestParam("workGuideId") Long workGuideId);
+ R detailWorkGuide(@RequestParam("workGuideId") Long workGuideId, @RequestParam("conmunityId") Long conmunityId);
/**
* 办事指南_分页
@@ -2929,6 +2973,24 @@
R listSaveBuildingExcelVO(@RequestBody List<ComMngBuildingExcelVO> newVoList, @RequestParam("communityId") Long communityId);
/**
+ * 插入字典
+ * @param dictionaryVO 字典数据
+ * @return R 是否保存成功
+ * @author manailin
+ * @date 2021/6/10 17:00
+ */
+ @PostMapping("/dictionary/insertDiction")
+ R insertDiction(@RequestBody DictionaryVO dictionaryVO);
+ /**
+ * 插入字典项
+ * @param dictionaryVO 字典数据
+ * @return R 是否保存成功
+ * @author manailin
+ * @date 2021/6/10 17:00
+ */
+ @PostMapping("/dictionary/insertDictionItem")
+ R insertDictionItem(@RequestBody BcDictionaryVO dictionaryVO);
+ /**
* 根据字典key查询字典项
*
* @param key
@@ -3114,11 +3176,11 @@
/**
* 事件大屏统计接口
*
- * @param communityId 社区id
+ * @param screenEventDTO 请求参数
* @return 统计结果
*/
- @GetMapping("/screen/getScreenEvent")
- R getScreenEvent(@RequestParam("communityId") Long communityId);
+ @PostMapping("/screen/getScreenEvent")
+ R getScreenEvent(@RequestBody BigScreenEventDTO screenEventDTO);
/**
* 民生大屏统计接口
@@ -3256,7 +3318,7 @@
R getConf(@RequestParam("code") String code);
/**
- * 根据社区id获取社区下人口数据信息
+ * 获取人口数据信息
*
* @param populationListDTO 请求参数
* @return 人口数据
@@ -3267,8 +3329,8 @@
/**
* 根据人口id获取人口详情
*
- * @param populationId
- * @return
+ * @param populationId 人口id
+ * @return 人口详情
*/
@GetMapping("/population/detail/app")
R getPopulationDetailByApp(@RequestParam("populationId") Long populationId);
@@ -3316,4 +3378,370 @@
*/
@PostMapping("/wallet/get/ranking")
R getWalletRanking(@RequestBody PageComActWalletTradeDTO walletTradeDTO);
+
+ /**
+ * 综治后台-居民列表
+ * @param populationListDTO 请求参数
+ * @return 居民列表
+ */
+ @PostMapping("/population/grid/list")
+ R getGridPopulationList(@RequestBody ComMngPopulationListDTO populationListDTO);
+
+ /**
+ * 综治后台-删除居民
+ * @param ids 居民id集合
+ * @return 删除结果
+ */
+ @PostMapping("/population/grid/del")
+ R delGridPopulation(@RequestBody List<Long> ids);
+
+ /**
+ * 综治后台-居民详情
+ * @param populationId 居民id
+ * @return 居民详情
+ */
+ @GetMapping("/population/grid/get")
+ R getGridPopulationDetail(@RequestParam("populationId")Long populationId);
+
+ /**
+ * 综治app-小区列表
+ * @param villageListAppDTO 请求参数
+ * @return 小区列表
+ */
+ @PostMapping("/village/grid/list")
+ R getGridVillageList(@RequestBody ComMngVillageListAppDTO villageListAppDTO);
+
+ /**
+ * 综治app-根据小区id查询小区下楼栋列表
+ * @param villageId 小区id
+ * @return 楼栋列表
+ */
+ @PostMapping("/village/grid/building/list")
+ R getGridVillageBuildingList(@RequestParam("villageId")Long villageId);
+
+ /**
+ * 小区楼栋下房屋列表
+ * @param buildHouseAppDTO 请求参数
+ * @return 房屋列表
+ */
+ @PostMapping("/village/grid/building/house/list")
+ R getGridVillageBuildingHouseList(@RequestBody PageComMngVillageBuildHouseAppDTO buildHouseAppDTO);
+
+ /**
+ * 小区楼栋下房屋信息
+ * @param houseId 房屋id
+ * @return 房屋信息
+ */
+ @PostMapping("/village/grid/building/house/detail")
+ R getGridVillageBuildingHouseDetail(@RequestParam("houseId")Long houseId);
+
+ /**
+ * 查询平台人口列表
+ * @param populationDTO 请求参数
+ * @return 人口列表
+ */
+ @PostMapping("/village/grid/building/house/population/list")
+ R getBuildingHousePopulationList(@RequestBody PageComMngPopulationDTO populationDTO);
+
+ /**
+ * 批量向房屋新增人员
+ * @param housePopulationDTO 请求参数
+ * @return 添加结果
+ */
+ @PostMapping("/village/grid/building/house/add/population")
+ R addBuildingHousePopulation(@RequestBody AddComMngHousePopulationDTO housePopulationDTO);
+
+ /**
+ * 批量删除房屋内人员
+ * @param housePopulationDTO 请求参数
+ * @return 删除结果
+ */
+ @PostMapping("/village/grid/building/house/del/population")
+ R delBuildingHousePopulation(@RequestBody DelComMngHousePopulationDTO housePopulationDTO);
+
+ /**
+ * 综治后台-居民标签栏统计
+ * @return 居民统计
+ */
+ @GetMapping("/population/grid/statistics")
+ R getGridPopulationStatistics(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 综治后台-居民导出查询居民数据
+ * @param populationExportDTO 请求参数
+ * @return 导出结果
+ */
+ @PostMapping("/population/grid/export")
+ R getGridPopulationExport(@RequestBody ComMngPopulationExportDTO populationExportDTO);
+
+ /**
+ * 综治后台-居民管理小区列表
+ * @param name 小区名字
+ * @return 小区列表
+ */
+ @GetMapping("/population/village/relation")
+ R relationVillage(@RequestParam("name") String name);
+
+ /**
+ * 综治后台-居民管理-级联列表
+ * @param subordinateDTO 请求参数
+ * @return 级联列表
+ */
+ @PostMapping("/population/subordinate")
+ R subordinate(@RequestBody ComMngPopulationSubordinateDTO subordinateDTO);
+
+ /**
+ * 综治后台-居民关联房屋
+ * @param relationHouseDTO 请求参数
+ * @return 关联结果
+ */
+ @PostMapping("/population/relation/house")
+ R populationRelationHouse(@RequestBody ComMngPopulationRelationHouseDTO relationHouseDTO);
+
+ /**
+ * 综治后台-批量删除小区
+ * @param villageIds 小区id集合
+ * @return 删除结果
+ */
+ @PostMapping("/village/admin/del")
+ R delGridVillage(@RequestBody List<Long> villageIds);
+
+ /**
+ * 综治后台-小区内居民列表
+ * @param villagePopulationDTO 请求参数
+ * @return 居民列表
+ */
+ @PostMapping("/village/admin/population/list")
+ R getVillagePopulationAdmin(@RequestBody PageComMngVillagePopulationDTO villagePopulationDTO);
+
+ /**
+ * 综治后台-居民下房屋列表
+ * @param villagePopulationHouseDTO 请求参数
+ * @return 房屋列表
+ */
+ @PostMapping("/village/admin/population/house/list")
+ R getVillagePopulationHouseAdmin(@RequestBody PageComMngVillagePopulationHouseDTO villagePopulationHouseDTO);
+
+ /**
+ * 综治后台-小区统计
+ * @return 小区统计结果
+ */
+ @GetMapping("/village/admin/statistics")
+ R getGridVillageStatistics();
+
+ /**
+ * 综治后台-小区列表导出
+ * @param villageListAppDTO 请求参数
+ * @return 小区列表
+ */
+ @PostMapping("/village/admin/export")
+ R getGridVillageListExport(@RequestBody ComMngVillageListExportAdminDTO villageListAppDTO);
+
+ /**
+ * 社区后台-分页查询随手拍活动列表
+ * @param pageEasyPhotoActivityDTO 请求参数
+ * @return 随手拍活动列表
+ */
+ @PostMapping("/easy/photo/activity/page")
+ R pageEasyPhotoActivity(@RequestBody PageEasyPhotoActivityDTO pageEasyPhotoActivityDTO);
+
+ /**
+ * 社区后台-添加随手拍活动
+ * @param addEasyPhotoActivityDTO 请求参数
+ * @return 添加结果
+ */
+ @PostMapping("/easy/photo/activity/add")
+ R addEasyPhotoActivity(@RequestBody AddEasyPhotoActivityDTO addEasyPhotoActivityDTO);
+
+ /**
+ * 社区后台-编辑随手拍活动
+ * @param editEasyPhotoActivityDTO 请求参数
+ * @return 编辑结果
+ */
+ @PostMapping("/easy/photo/activity/edit")
+ R editEasyPhotoActivity(@RequestBody EditEasyPhotoActivityDTO editEasyPhotoActivityDTO);
+
+ /**
+ * 社区后台-取消随手拍活动
+ * @param id 随手拍活动id
+ * @return 取消结果
+ */
+ @GetMapping("/easy/photo/activity/cancel")
+ R cancelEasyPhotoActivity(@RequestParam("id") Long id);
+
+ /**
+ * 分页查询随手拍活动下居民参与记录
+ * @param pageEasyPhotoActivityUserDTO 请求参数
+ * @return 居民参与记录
+ */
+ @PostMapping("/easy/photo/activity/page/user")
+ R pageEasyPhotoActivityUser(@RequestBody PageEasyPhotoActivityUserDTO pageEasyPhotoActivityUserDTO);
+
+ /**
+ * 随手拍活动定时任务
+ * @return 执行结果
+ */
+ @PostMapping("timeTaskEasyPhotoActivity")
+ R timedTaskEasyPhotoActivity();
+
+ /**
+ * 分页查询收益结算列表
+ * @param pageWalletAdminDTO 请求参数
+ * @return 收益结算列表
+ */
+ @PostMapping("/user/wallet/page")
+ R pageUserWalletAdmin(@RequestBody PageComActWalletAdminDTO pageWalletAdminDTO);
+
+ /**
+ * 用户结算收益
+ * @param settlementAdminDTO 请求参数
+ * @return 结算结果
+ */
+ @PostMapping("/user/wallet/settlement")
+ R userWalletSettlementAdmin(@RequestBody ComActWalletSettlementAdminDTO settlementAdminDTO);
+
+ /**
+ * 分页查询交易记录
+ * @param pageTradeAdminDTO 请求参数
+ * @return 交易记录列表
+ */
+ @PostMapping("/user/wallet/trade/page")
+ R pageUserWalletTradeAdmin(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO);
+
+ /**
+ * 社区随手拍列表统计
+ * @param communityId 社区id
+ * @return 统计结果
+ */
+ @GetMapping("/easyphoto/statistics")
+ R easyPhotoStatistics(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 分页查询邻里圈话题列表
+ * @param circleTopicAdminDTO 请求参数
+ * @return 邻里圈话题列表
+ */
+ @PostMapping("/neighbor/pageNeighborTopicByAdmin")
+ R pageNeighborTopicByAdmin(@RequestBody ComActNeighborCircleTopicAdminDTO circleTopicAdminDTO);
+
+ /**
+ * 添加邻里圈话题
+ * @param addCircleTopicAdminDTO 请求参数
+ * @return 添加结果
+ */
+ @PostMapping("/neighbor/addNeighborTopicByAdmin")
+ R addNeighborTopicByAdmin(@RequestBody AddNeighborCircleTopicAdminDTO addCircleTopicAdminDTO);
+
+ /**
+ * 编辑邻里圈话题
+ * @param addCircleTopicAdminDTO 请求参数
+ * @return 编辑结果
+ */
+ @PostMapping("/neighbor/editNeighborTopicByAdmin")
+ R editNeighborTopicByAdmin(@RequestBody AddNeighborCircleTopicAdminDTO addCircleTopicAdminDTO);
+
+ /**
+ * 小程序查询邻里圈话题列表
+ * @param communityId 社区id
+ * @return 邻里圈话题列表
+ */
+ @GetMapping("/neighbor/getNeighborTopicByApp")
+ R getNeighborTopicByApp(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 综治后台-查询社区列表
+ * @return 社区列表
+ */
+ @GetMapping("/eventgrid/community/list")
+ R getCommunityLists();
+
+ /**
+ * 分页查询退役军人列表
+ *
+ * @param comExServicemanDTO 请求参数
+ * @return 退役军人列表
+ */
+ @PostMapping("/population/page/exServiceman")
+ R pageExServiceman(@RequestBody ComExServicemanDTO comExServicemanDTO);
+
+ /**
+ * 分页查询社区动态分类列表
+ * @param comActDynTypeDTO 请求参数
+ * @return 动态分类列表
+ */
+ @PostMapping("/dyn/type/page")
+ R pageDynTypeByAdmin(@RequestBody PageComActDynTypeDTO comActDynTypeDTO);
+
+ /**
+ * 查询社区下所有动态分类列表
+ * @param comActDynTypeDTO 请求参数
+ * @return 动态分类列表
+ */
+ @PostMapping("/dyn/type/list")
+ R getDynTypeListByAdmin(@RequestBody PageComActDynTypeDTO comActDynTypeDTO);
+
+ /**
+ * 添加社区动态分类
+ * @param comActDynTypeDTO 请求参数
+ * @return 添加结果
+ */
+ @PostMapping("/dyn/type/add")
+ R addDynTypeByAdmin(@RequestBody AddComActDynTypeDTO comActDynTypeDTO);
+
+ /**
+ * 编辑社区动态分类
+ * @param comActDynTypeDTO 请求参数
+ * @return 编辑结果
+ */
+ @PostMapping("/dyn/type/edit")
+ R editDynTypeByAdmin(@RequestBody EditComActDynTypeDTO comActDynTypeDTO);
+
+ /**
+ * 删除社区动态分类
+ * @param ids 社区动态分类id集合
+ * @return 删除结果
+ */
+ @PostMapping("/dyn/type/delete")
+ R deleteDynTypeByAdmin(@RequestBody List<Long> ids);
+
+ /**
+ * 随手拍发放奖励
+ * @param grantRewardDTO 请求参数
+ * @return 发放结果
+ */
+ @PostMapping("/easyphoto/grantReward")
+ R grantReward(@RequestBody GrantRewardDTO grantRewardDTO);
+
+ /**
+ * 获取最新活动和用户最新收益
+ * @param userId 用户id
+ * @param communityId 社区id
+ * @return 最新活动和用户最新收益
+ */
+ @PostMapping("/easyphoto/getUserReward")
+ R getUserReward(@RequestParam("userId") Long userId,@RequestParam("communityId") Long communityId);
+
+ /**
+ * 读取用户随手拍奖励
+ * @param userId 用户id
+ * @return 读取结果
+ */
+ @PostMapping("/easyphoto/readUserReward")
+ R readUserReward(@RequestParam("userId") Long userId,@RequestParam("communityId") Long communityId);
+
+ /**
+ * 分页查询巡查记录
+ * @param comSwPatrolRecordPageDTO 查询参数
+ * @return 分页集合
+ */
+ @PostMapping("/patrolRecord/page")
+ R pagePatrolRecord(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO);
+
+ /**
+ * 新增巡查记录
+ * @param comSwPatrolRecordAddDTO 新增参数
+ * @return 新增结果
+ */
+ @PostMapping("/patrolRecord/addPatrolRecord")
+ R addPatrolRecord(@RequestBody ComSwPatrolRecordAddDTO comSwPatrolRecordAddDTO);
}
--
Gitblit v1.7.1