From 51508c8c63bb072739a0e3ae45cb11e7599c8f66 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期五, 20 八月 2021 10:12:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 248 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 240 insertions(+), 8 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 7ee14de..31c40fc 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
@@ -19,6 +19,8 @@
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;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthPageDTO;
@@ -1700,7 +1702,107 @@
* @return 导入结果
*/
@PostMapping("/common/data/population/import")
- R listSavePopulationServeExcelVO(@RequestBody List<ComMngPopulationServeExcelVO> list, @RequestParam(value = "communityId") Long communityId);
+ R listSavePopulationServeExcelVO(@RequestBody List<ComMngPopulationServeExcelVO> list, @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+
+ /**
+ * 批量导入吸毒人员
+ *
+ * @param list 吸毒人员数据
+ * @param communityId 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/common/data/population/importDrug")
+ R listSavePopulationDrugExcelVO(@RequestBody List<ComMngPopulationDrugExcelVO> list, @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+
+ /**
+ * 批量导入社区矫正人员
+ *
+ * @param list 社区矫正人员数据
+ * @param communityId 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/common/data/population/importCorrect")
+ R listSavePopulationCorrectExcelVO(@RequestBody List<ComMngPopulationCorrectExcelVO> list, @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+
+ /**
+ * 批量导入重精人员
+ *
+ * @param list 重精人员数据
+ * @param communityId 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/common/data/population/importMajor")
+ R listSavePopulationMajorExcelVO(@RequestBody List<ComMngPopulationMajorExcelVO> list, @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+
+ /**
+ * 批量导入邪教人员
+ *
+ * @param list 邪教人员数据
+ * @param communityId 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/common/data/population/importCult")
+ R listSavePopulationCultExcelVO(@RequestBody List<ComMngPopulationCultExcelVO> list, @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+
+ /**
+ * 批量导入刑释人员
+ *
+ * @param list 刑释人员数据
+ * @param communityId 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/common/data/population/importRehabilitation")
+ R listSavePopulationRehabilitationExcelVO(@RequestBody List<ComMngPopulationRehabilitationExcelVO> list, @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+
+ /**
+ * 批量导入重点上访人员
+ *
+ * @param list 重点上访人员数据
+ * @param communityId 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/common/data/population/importKey")
+ R listSavePopulationKeyExcelVO(@RequestBody List<ComMngPopulationKeyExcelVO> list, @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+
+ /**
+ * 批量导入服刑人员
+ *
+ * @param list 服刑人员数据
+ * @param communityId 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/common/data/population/importSentence")
+ R listSavePopulationSentenceExcelVO(@RequestBody List<ComMngPopulationSentenceExcelVO> list, @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+
+ /**
+ * 批量导入退役军人
+ *
+ * @param list 退役军人数据
+ * @param communityId 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/common/data/population/importVeterans")
+ R listSavePopulationVeteransExcelVO(@RequestBody List<ComMngPopulationVeteransExcelVO> list, @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+
+ /**
+ * 批量导入残疾人
+ *
+ * @param list 残疾人数据
+ * @param communityId 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/common/data/population/importDisability")
+ R listSavePopulationDisabilityExcelVO(@RequestBody List<ComMngPopulationDisabilityExcelVO> list, @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+
+ /**
+ * 批量导入低保户
+ *
+ * @param list 低保户数据
+ * @param communityId 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/common/data/population/importLowSecurity")
+ R listSavePopulationLowSecurityExcelVO(@RequestBody List<ComMngPopulationLowSecurityExcelVO> list, @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
/**
* 确认导入实有人口（有则更新，无则新建）
@@ -1792,16 +1894,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 +1932,7 @@
* @return
*/
@PostMapping("/questnaire/editquestnairedo")
- R editQuestnaireDO(@RequestBody EditComActQuestnaireVo editComActQuestnaireVo, @RequestParam("userId") Long userId);
+ R editQuestnaireDO(@RequestBody EditComActQuestnaireVo editComActQuestnaireVo);
/**
* 删除问卷 ——隐藏
@@ -1849,6 +1960,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 +2040,7 @@
* @param usersAnswerQuestnaireVO 填写情况
*/
@PostMapping("/questnaire/usersanswequestnaire")
- R usersAnsweQuestnaire(@RequestBody UsersAnswerQuestnaireVO usersAnswerQuestnaireVO, @RequestParam("userId") Long userId);
+ R usersAnsweQuestnaire(@RequestBody UsersAnswerQuestnaireVO usersAnswerQuestnaireVO);
/**
* 店铺列表-分页查询
@@ -3647,6 +3792,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 统计结果
@@ -4034,4 +4211,59 @@
@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);
}
--
Gitblit v1.7.1