From 6741baac0cdaa19e0ab9fa8ccd595337abb6dbaa Mon Sep 17 00:00:00 2001 From: 101captain <237651143@qq.com> Date: 星期一, 30 八月 2021 14:18:30 +0800 Subject: [PATCH] 微心愿改版 --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 543 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 530 insertions(+), 13 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 cff8933..3fdd625 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 @@ -10,15 +10,15 @@ 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.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.easyPhoto.*; import com.panzhihua.common.model.dtos.community.integral.ComActIntegralCommunityRankDTO; import com.panzhihua.common.model.dtos.community.integral.admin.AddComActIntegralUserDTO; import com.panzhihua.common.model.dtos.community.integral.admin.EditComActIntegralRuleDTO; import com.panzhihua.common.model.dtos.community.integral.admin.PageComActIntegralRuleDTO; import com.panzhihua.common.model.dtos.community.integral.admin.PageComActIntegralTradeDTO; +import com.panzhihua.common.model.dtos.community.questnaire.StatisticsSummaryDTO; +import com.panzhihua.common.model.dtos.community.reserve.*; +import com.panzhihua.common.model.dtos.community.switchs.SearchCommunityDTO; import com.panzhihua.common.model.dtos.community.wallet.*; import com.panzhihua.common.model.dtos.elders.ComEldersAuthGetResultDTO; import com.panzhihua.common.model.dtos.elders.ComEldersAuthPageDTO; @@ -335,6 +335,24 @@ @PostMapping("puteasyphotostatus") R putEasypHotoStatus(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO); + /** + * 城管随手拍统计 + */ + @PostMapping("/esayPhotoCount") + R esayphotoCount(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO); + + /** + * + * 城管安排 + */ + @PostMapping("updatePageeasyphoto") + R updatePageeasyphoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO); + /** + * + * 随手拍城管导出 + */ + @PostMapping("exportEasyPhoto") + R exportEasyPhoto(@RequestBody ExportEasyPhotoDTO exportEasyPhotoDTO); /** * 新增社区 * @@ -1703,6 +1721,106 @@ R listSavePopulationServeExcelVO(@RequestBody List<ComMngPopulationServeExcelVO> list, @RequestParam(value = "communityId") Long communityId); /** + * 批量导入吸毒人员 + * + * @param list 吸毒人员数据 + * @param communityId 社区id + * @return 导入结果 + */ + @PostMapping("/common/data/population/importDrug") + R listSavePopulationDrugExcelVO(@RequestBody List<ComMngPopulationDrugExcelVO> list, @RequestParam(value = "communityId") Long communityId); + + /** + * 批量导入社区矫正人员 + * + * @param list 社区矫正人员数据 + * @param communityId 社区id + * @return 导入结果 + */ + @PostMapping("/common/data/population/importCorrect") + R listSavePopulationCorrectExcelVO(@RequestBody List<ComMngPopulationCorrectExcelVO> list, @RequestParam(value = "communityId") Long communityId); + + /** + * 批量导入重精人员 + * + * @param list 重精人员数据 + * @param communityId 社区id + * @return 导入结果 + */ + @PostMapping("/common/data/population/importMajor") + R listSavePopulationMajorExcelVO(@RequestBody List<ComMngPopulationMajorExcelVO> list, @RequestParam(value = "communityId") Long communityId); + + /** + * 批量导入邪教人员 + * + * @param list 邪教人员数据 + * @param communityId 社区id + * @return 导入结果 + */ + @PostMapping("/common/data/population/importCult") + R listSavePopulationCultExcelVO(@RequestBody List<ComMngPopulationCultExcelVO> list, @RequestParam(value = "communityId") Long communityId); + + /** + * 批量导入刑释人员 + * + * @param list 刑释人员数据 + * @param communityId 社区id + * @return 导入结果 + */ + @PostMapping("/common/data/population/importRehabilitation") + R listSavePopulationRehabilitationExcelVO(@RequestBody List<ComMngPopulationRehabilitationExcelVO> list, @RequestParam(value = "communityId") Long communityId); + + /** + * 批量导入重点上访人员 + * + * @param list 重点上访人员数据 + * @param communityId 社区id + * @return 导入结果 + */ + @PostMapping("/common/data/population/importKey") + R listSavePopulationKeyExcelVO(@RequestBody List<ComMngPopulationKeyExcelVO> list, @RequestParam(value = "communityId") Long communityId); + + /** + * 批量导入服刑人员 + * + * @param list 服刑人员数据 + * @param communityId 社区id + * @return 导入结果 + */ + @PostMapping("/common/data/population/importSentence") + R listSavePopulationSentenceExcelVO(@RequestBody List<ComMngPopulationSentenceExcelVO> list, @RequestParam(value = "communityId") Long communityId); + + /** + * 批量导入退役军人 + * + * @param list 退役军人数据 + * @param communityId 社区id + * @return 导入结果 + */ + @PostMapping("/common/data/population/importVeterans") + R listSavePopulationVeteransExcelVO(@RequestBody List<ComMngPopulationVeteransExcelVO> list, @RequestParam(value = "communityId") Long communityId); + + /** + * 批量导入残疾人 + * + * @param list 残疾人数据 + * @param communityId 社区id + * @return 导入结果 + */ + @PostMapping("/common/data/population/importDisability") + R listSavePopulationDisabilityExcelVO(@RequestBody List<ComMngPopulationDisabilityExcelVO> list, @RequestParam(value = "communityId") Long communityId); + + /** + * 批量导入低保户 + * + * @param list 低保户数据 + * @param communityId 社区id + * @return 导入结果 + */ + @PostMapping("/common/data/population/importLowSecurity") + R listSavePopulationLowSecurityExcelVO(@RequestBody List<ComMngPopulationLowSecurityExcelVO> list, @RequestParam(value = "communityId") Long communityId); + + /** * 确认导入实有人口(有则更新,无则新建) * * @param list 用户信息 @@ -1792,16 +1910,25 @@ * @return */ @PostMapping("/questnaire/addquestnaire") - R addQuestnaire(@RequestBody QuestnaireVO questnaireVO, @RequestParam("communityId") Long communityId, @RequestParam("userId") Long userId); + R addQuestnaire(@RequestBody QuestnaireVO questnaireVO); /** - * 社区问卷列表 + * 小程序-社区问卷列表 * - * @param pageQuestnaireDTO - * @return + * @param pageQuestnaireDTO 请求参数 + * @return 社区问卷列表 */ @PostMapping("/questnaire/pagequestnaire") - R pageQuestnaire(@RequestBody PageQuestnaireDTO pageQuestnaireDTO, @RequestParam("communityId") Long communityId); + R pageQuestnaire(@RequestBody PageQuestnaireDTO pageQuestnaireDTO); + + /** + * 社区后台-社区问卷列表 + * + * @param pageQuestnaireDTO 请求参数 + * @return 社区问卷列表 + */ + @PostMapping("/questnaire/admin/pagequestnaire") + R pageQuestnaireAdmin(@RequestBody PageQuestnaireDTO pageQuestnaireDTO); /** @@ -1821,7 +1948,7 @@ * @return */ @PostMapping("/questnaire/editquestnairedo") - R editQuestnaireDO(@RequestBody EditComActQuestnaireVo editComActQuestnaireVo, @RequestParam("userId") Long userId); + R editQuestnaireDO(@RequestBody EditComActQuestnaireVo editComActQuestnaireVo); /** * 删除问卷 ——隐藏 @@ -1849,6 +1976,40 @@ */ @GetMapping("/questnaire/view") R view(@RequestParam("userId") Long userId, @RequestParam("questId") Long questId); + + /** + * 小程序-问卷调查详情 + * @param userId 用户id + * @param questId 问卷id + * @return 问卷调查详情 + */ + @GetMapping("/questnaire/view/detail") + R viewDetail(@RequestParam("userId") Long userId, @RequestParam("questId") Long questId); + + /** + * 小程序-新增问卷调查浏览数量 + * @param questId 问卷调查id + * @return 增加结果 + */ + @GetMapping("/questnaire/add/view") + R addView(@RequestParam("questId") Long questId); + + /** + * 小程序-用户弹窗添加不在提醒接口 + * @param questId 问卷id + * @param userId 用户id + * @return 添加结果 + */ + @GetMapping("/questnaire/add/noNotice") + R addNoNotice(@RequestParam("questId") Long questId,@RequestParam("userId") Long userId); + + /** + * 社区后台-查询问卷调查详情 + * @param questId 问卷id + * @return 问卷调查详情 + */ + @GetMapping("/questnaire/admin/detail") + R QuesDetail(@RequestParam("questId") Long questId); /** * 用户问卷调查详细 @@ -1895,7 +2056,7 @@ * @param usersAnswerQuestnaireVO 填写情况 */ @PostMapping("/questnaire/usersanswequestnaire") - R usersAnsweQuestnaire(@RequestBody UsersAnswerQuestnaireVO usersAnswerQuestnaireVO, @RequestParam("userId") Long userId); + R usersAnsweQuestnaire(@RequestBody UsersAnswerQuestnaireVO usersAnswerQuestnaireVO); /** * 店铺列表-分页查询 @@ -3647,6 +3808,38 @@ R pageUserWalletTradeAdmin(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO); /** + * 查询用户交易记录总额 + * @param pageTradeAdminDTO 请求参数 + * @return 交易记录总额 + */ + @PostMapping("/user/wallet/trade/total") + R getTradeUserTotalWalletTradeAdmin(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO); + + /** + * 查询用户导出数据 + * @param pageTradeAdminDTO 请求参数 + * @return 用户导出数据 + */ + @PostMapping("/user/wallet/trade/export") + R getTradeUserTotalWalletTradeExportAdmin(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO); + + /** + * 导出奖励台账数据 + * @param pageTradeAdminDTO 请求参数 + * @return 奖励台账数据 + */ + @PostMapping("/user/wallet/trade/reward/export") + R getTradeUserTotalJLWalletTradeExportAdmin(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO); + + /** + * 查询社区统计数据 + * @param pageTradeAdminDTO 查询社区统计数据 + * @return 社区统计数据 + */ + @PostMapping("/user/wallet/trade/statistics") + R getTradeUserStatisticsAdmin(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO); + + /** * 社区随手拍列表统计 * @param communityId 社区id * @return 统计结果 @@ -3823,7 +4016,7 @@ * @return 安全工作记录详情查询结果 */ @GetMapping("/patrolRecord/safetyWorkRecord/detail") - R detailSafetyWorkRecord(@RequestParam(value = "safetyWorkRecordId") Long safetyWorkRecordId); + R detailSafetyWorkRecord(@RequestParam(value = "safetyWorkRecordId") Long safetyWorkRecordId, @RequestParam(value = "communityId", required = false) Long communityId); /** * 根据巡查记录id查询安全工作记录详情 @@ -3832,7 +4025,7 @@ * @return 安全工作记录详情查询结果 */ @GetMapping("/patrolRecord/safetyWorkRecord/detailByPrId") - R detailSafetyWorkRecordByPrId(@RequestParam(value = "patrolRecordId") Long patrolRecordId); + R detailSafetyWorkRecordByPrId(@RequestParam(value = "patrolRecordId") Long patrolRecordId, @RequestParam(value = "communityId", required = false) Long communityId); /** * 分页查询隐患报告 @@ -4034,4 +4227,328 @@ @PostMapping("/patrolRecord/rota/import") R listSaveSwRotaExcelVO(@RequestBody List<ComSwRotaExcelVO> list, @RequestParam("communityId") Long communityId); + /** + * 定时任务检测即将开始的社区活动,并使用订阅消息通知用户 + */ + @PostMapping("timedTaskActivityNotice") + R timedTaskActivityNotice(); + + /** + * 定时任务检测待发布,调研中的问卷调查状态 + */ + @PostMapping("timedTaskQuestionnaire") + R timedTaskQuestionnaire(); + + /** + * 查询社区所有列表 + * @return 社区列表 + */ + @GetMapping("/switch/community/all/list") + R communitySwitchList(); + + /** + * 根据名字查询所有社区列表 + * @param name 社区名字 + * @return 社区列表 + */ + @GetMapping("/switch/community/search/list") + R communitySwitchSearchList(@RequestParam(value = "name") String name); + + /** + * 根据经纬度以及距离搜索附近社区列表 + * @param communityDTO 请求参数 + * @return 社区列表 + */ + @PostMapping("/switch/community/search/distance/list") + R communitySwitchSearchDistanceList(@RequestBody SearchCommunityDTO communityDTO); + + /** + * 问卷调查统计汇总 + * @param summaryDTO 请求参数 + * @return 统计汇总 + */ + @PostMapping("/questnaire/statisticsSummary") + R statisticsSummary(@RequestBody StatisticsSummaryDTO summaryDTO); + + /** + * 问卷调查统计汇总导出数据查询 + * @param questId 调查问卷id + * @return 调查统计汇总导出数据 + */ + @GetMapping("/questnaire/statisticsSummary/export") + R statisticsSummaryExport(@RequestParam("questId") Long questId); + + /** + * 问卷调查统计汇总表头统计 + * @param questId 调查问卷id + * @return 问卷调查统计汇总表头统计数据 + */ + @GetMapping("/questnaire/statisticsSummary/header") + R statisticsSummaryHeader(@RequestParam("questId") Long questId,@RequestParam("communityId") Long communityId); + + + /** + * 运营后台-新增随手拍分类 + * @param addPhotoClassify 请求参数 + * @return 新增结果 + */ + @PostMapping("/classify/admin/add") + R addPhotoClassify(@RequestBody AddEasyPhotoClassifyDTO addPhotoClassify); + + /** + * 运营后台-编辑随手拍分类 + * @param addPhotoClassify 请求参数 + * @return 编辑结果 + */ + @PostMapping("/classify/admin/edit") + R editPhotoClassify(@RequestBody AddEasyPhotoClassifyDTO addPhotoClassify); + + /** + * 运营后台-分页查询随手拍分类 + * @param addPhotoClassify 请求参数 + * @return 随手拍分类列表 + */ + @PostMapping("/classify/admin/page") + R pagePhotoClassify(@RequestBody AddEasyPhotoClassifyDTO addPhotoClassify); + + /** + * 运营后台-随手拍分类详情 + * @param id 随手拍分类id + * @return 随手拍分类 + */ + @GetMapping("/classify/admin/detail") + R detailPhotoClassify(@RequestParam("id") Long id); + + /** + * 运营后台-随手拍分类删除 + * @param id 随手拍分类id + * @return 删除结果 + */ + @GetMapping("/classify/admin/delete") + R deletePhotoClassify(@RequestParam("id") Long id); + + /** + * 运营后台-查询随手拍分类列表 + * @return 随手拍分类列表 + */ + @GetMapping("/classify/admin/list") + R listPhotoClassify(); + + /** + * 社区后台-切换随手拍公示状态 + * @param comActEasyPhotoVO 请求参数 + * @return 切换结果 + */ + @PostMapping("/easyphoto/switch/publicity") + R easyPhotoSwitchPublicity(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO); + + /** + * 查询社区待处理随手拍id集合 + * @param communityId 社区id + * @return 社区待处理随手拍id集合 + */ + @GetMapping("/easyphoto/noHandle/list") + R easyPhotoNoHandleList(@RequestParam("communityId") Long communityId); + + @GetMapping("/reserve/detail") + R reserveDetail(@RequestParam("id") Long id,@RequestParam("userId") Long userId,@RequestParam("recordId") Long recordId); + + @PostMapping("/reserve/commit") + R reserveCommit(@RequestBody ComActReserveCommitVO comActReserveCommitVO); + + /** + * 我的预约/登记 + * @param pageUserReserveDTO + * @return + */ + @PostMapping("/reserve/userReserveList") + R userReserveList(@RequestBody PageUserReserveDTO pageUserReserveDTO); + + /** + * 取消预约/登记 + */ + @PostMapping("/reserve/cancelReserve") + R userCancelReserve(@RequestBody CancelRecordDTO comActReserveRecordDO); + + /** + * 预约详情操作记录 + */ + @PostMapping("/reserve/detailOperation") + R reserveOperation(@RequestBody OperationDetailDTO comActReserveOperationRecordDO); + + /** + * 社区后台-分页查询预约登记列表 + * @param pageReserveDTO 请求参数 + * @return 预约登记列表 + */ + @PostMapping("/reserve/admin/page") + R pageReserveAdmin(@RequestBody PageReserveAdminDTO pageReserveDTO); + + /** + * 社区后台-新增预约登记信息 + * @param addReserveDTO 请求参数 + * @return 新增结果 + */ + @PostMapping("/reserve/admin/add") + R addReserveAdmin(@RequestBody AddReserveAdminDTO addReserveDTO); + + /** + * 社区后台-编辑预约登记信息 + * @param editReserveDTO 请求参数 + * @return 新增结果 + */ + @PostMapping("/reserve/admin/edit") + R editReserveAdmin(@RequestBody EditReserveAdminDTO editReserveDTO); + + /** + * 社区后台-修改预约登记状态 + * @param editReserveDTO 请求参数 + * @return 修改结果 + */ + @PostMapping("/reserve/admin/edit/status") + R editReserveStatusAdmin(@RequestBody EditComActReserveStatusDTO editReserveDTO); + + /** + * 社区后台-继续预约登记 + * @param editReserveDTO 请求参数 + * @return 修改结果 + */ + @PostMapping("/reserve/admin/edit/info") + R editReserveInfoAdmin(@RequestBody EditComActReserveInfoDTO editReserveDTO); + + /** + * 社区后台-根据预约登记id查询详情 + * @param reserveId 预约登记id + * @return 预约登记详情 + */ + @GetMapping("/reserve/admin/detail") + R detailReserveAdmin(@RequestParam("reserveId") Long reserveId); + + /** + * 社区后台-根据社区id统计预约类数据 + * @param makeStatisticsDTO 请求参数 + * @return 统计预约类数据 + */ + @PostMapping("/reserve/admin/make/statistics") + R makeStatisticsAdmin(@RequestBody ComActReserveMakeStatisticsDTO makeStatisticsDTO); + + /** + * 社区后台-查询导出预约统计汇总数据 + * @param makeStatisticsDTO 请求参数 + * @return 统计预约类数据 + */ + @PostMapping("/reserve/admin/make/statistics/export") + R makeStatisticsExportAdmin(@RequestBody ComActReserveMakeStatisticsDTO makeStatisticsDTO); + + /** + * 社区后台-根据预约id查询预约明细 + * @param pageMakeDTO 请求参数 + * @return 预约明细 + */ + @PostMapping("/reserve/admin/make/page") + R pageMakeAdmin(@RequestBody PageReserveMakeAdminDTO pageMakeDTO); + + /** + * 根据预约记录id查询预约明细操作记录 + * @param reserveRecordId 预约记录id + * @return 预约明细操作记录 + */ + @GetMapping("/reserve/admin/make/detail") + R detailMakeAdmin(@RequestParam("reserveRecordId") Long reserveRecordId); + + /** + * 批量取消预约记录 + * @param reserveRecordDTO 请求参数 + * @return 取消结果 + */ + @PostMapping("/reserve/admin/make/cancel") + R makeCancelAdmin(@RequestBody CancelReserveRecordDTO reserveRecordDTO); + + /** + * 预约明细导出数据查询 + * @param pageMakeDTO 请求参数 + * @return 预约明细数据 + */ + @PostMapping("/reserve/admin/make/list/export") + R exportMakeAdmin(@RequestBody PageReserveMakeAdminDTO pageMakeDTO); + + /** + * 分页查询登记统计汇总 + * @param registerStatisticsDTO 请求参数 + * @return 登记统计汇总 + */ + @PostMapping("/reserve/admin/register/page") + R registerStatisticsAdmin(@RequestBody ComActReserveRegisterStatisticsDTO registerStatisticsDTO); + + /** + * 导出登记统计汇总 + * @param registerStatisticsDTO 请求参数 + * @return 登记统计汇总 + */ + @PostMapping("/reserve/admin/register/export") + R registerStatisticsExportAdmin(@RequestBody ComActReserveRegisterStatisticsDTO registerStatisticsDTO); + + /** + * 分页查询预约处理列表 + * @param pageMakeHandleDTO 请求参数 + * @return 预约处理列表 + */ + @PostMapping("/reserve/admin/make/handle/page") + R pageMakeHandleAdmin(@RequestBody PageReserveMakeHandleAdminDTO pageMakeHandleDTO); + + /** + * 批量处理预约记录 + * @param makeHandleDTO 请求参数 + * @return 处理结果 + */ + @PostMapping("/reserve/admin/make/handle") + R makeHandleAdmin(@RequestBody MakeHandleAdminDTO makeHandleDTO); + + /** + * 导出预约处理列表数据查询 + * @param pageMakeHandleDTO 请求参数 + * @return 预约处理列表 + */ + @PostMapping("/reserve/admin/make/handle/export") + R exportMakeHandleAdmin(@RequestBody PageReserveMakeHandleAdminDTO pageMakeHandleDTO); + + /** + * 删除预约登记信息 + * @param reserveId 预约登记id + * @return 删除结果 + */ + @GetMapping("/reserve/admin/delete") + R deleteReserveAdmin(@RequestParam("reserveId") Long reserveId); + + /** + * 查询社区所有预约信息列表 + * @param communityId 社区id + * @return 预约信息列表 + */ + @GetMapping("/reserve/admin/make/list") + R listReserveAdmin(@RequestParam("communityId") Long communityId); + + /** + * 导出登记明细数据 + * @param reserveId 登记id + * @return 登记明细数据 + */ + @GetMapping("/reserve/admin/register/list/export") + R exportRegisterAdmin(@RequestParam("reserveId") Long reserveId); + + /** + * 查询预约登记题目列表 + * @param reserveId 预约登记id + * @return 约登记题目列表 + */ + @GetMapping("/reserve/admin/subject/list") + R subjectListAdmin(@RequestParam("reserveId") Long reserveId); + + /** + * 分页查询登记明细列表 + * @param detailedAdminDTO 请求参数 + * @return 登记明细列表 + */ + @PostMapping("/reserve/admin/register/detailed/list") + R registerDetailedListAdmin(@RequestBody PageReserveRegisterDetailedAdminDTO detailedAdminDTO); } -- Gitblit v1.7.1