From 2e64c232ab6b51b2cecf1ee96e1e9b709234f326 Mon Sep 17 00:00:00 2001 From: huanghongfa <huanghongfa123456> Date: 星期六, 21 八月 2021 16:35:14 +0800 Subject: [PATCH] 随手拍改版接口开发 --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 216 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 205 insertions(+), 11 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 2d66207..6bc95e3 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,13 @@ 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.switchs.SearchCommunityDTO; import com.panzhihua.common.model.dtos.community.wallet.*; import com.panzhihua.common.model.dtos.elders.ComEldersAuthGetResultDTO; @@ -336,6 +334,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); /** * 新增社区 * @@ -1794,6 +1810,16 @@ 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 用户信息 @@ -1883,16 +1909,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); /** @@ -1912,7 +1947,7 @@ * @return */ @PostMapping("/questnaire/editquestnairedo") - R editQuestnaireDO(@RequestBody EditComActQuestnaireVo editComActQuestnaireVo, @RequestParam("userId") Long userId); + R editQuestnaireDO(@RequestBody EditComActQuestnaireVo editComActQuestnaireVo); /** * 删除问卷 ——隐藏 @@ -1940,6 +1975,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); /** * 用户问卷调查详细 @@ -1986,7 +2055,7 @@ * @param usersAnswerQuestnaireVO 填写情况 */ @PostMapping("/questnaire/usersanswequestnaire") - R usersAnsweQuestnaire(@RequestBody UsersAnswerQuestnaireVO usersAnswerQuestnaireVO, @RequestParam("userId") Long userId); + R usersAnsweQuestnaire(@RequestBody UsersAnswerQuestnaireVO usersAnswerQuestnaireVO); /** * 店铺列表-分页查询 @@ -3738,6 +3807,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 统计结果 @@ -4132,6 +4233,12 @@ R timedTaskActivityNotice(); /** + * 定时任务检测待发布,调研中的问卷调查状态 + */ + @PostMapping("timedTaskQuestionnaire") + R timedTaskQuestionnaire(); + + /** * 查询社区所有列表 * @return 社区列表 */ @@ -4154,4 +4261,91 @@ @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); } -- Gitblit v1.7.1