From 1e3b97098151f2d0471de6e8103b6cdaa6b5099d Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期六, 18 九月 2021 09:15:59 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into auth
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 322 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 316 insertions(+), 6 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 58f4250..3c9f2ae 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
@@ -2,7 +2,10 @@
import java.util.List;
+import com.panzhihua.common.model.dtos.community.GetIdentityEidTokenDTO;
import com.panzhihua.common.model.dtos.community.*;
+import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussDetailDTO;
+import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussPublishResultDTO;
import com.panzhihua.common.model.dtos.neighbor.*;
import com.panzhihua.common.model.vos.community.*;
import io.swagger.annotations.ApiOperation;
@@ -19,6 +22,77 @@
import com.panzhihua.common.model.dtos.PageDTO;
import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvDTO;
import com.panzhihua.common.model.dtos.advertisement.PageComOpsAdvDTO;
+import com.panzhihua.common.model.dtos.community.AddComActDynTypeDTO;
+import com.panzhihua.common.model.dtos.community.AddIdentityAuthDTO;
+import com.panzhihua.common.model.dtos.community.CancelRecordDTO;
+import com.panzhihua.common.model.dtos.community.CascadeHouseDTO;
+import com.panzhihua.common.model.dtos.community.ComActDiscussCommentDTO;
+import com.panzhihua.common.model.dtos.community.ComActDiscussCommentUserDTO;
+import com.panzhihua.common.model.dtos.community.ComActDiscussDTO;
+import com.panzhihua.common.model.dtos.community.ComActDiscussOptionUserDTO;
+import com.panzhihua.common.model.dtos.community.ComActDiscussUserDTO;
+import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentDTO;
+import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentUserDTO;
+import com.panzhihua.common.model.dtos.community.ComCvtBusinessDTO;
+import com.panzhihua.common.model.dtos.community.ComCvtCategoryDTO;
+import com.panzhihua.common.model.dtos.community.ComCvtServeDTO;
+import com.panzhihua.common.model.dtos.community.ComExServicemanDTO;
+import com.panzhihua.common.model.dtos.community.ComMngCarAppletDTO;
+import com.panzhihua.common.model.dtos.community.ComMngCarSaveDTO;
+import com.panzhihua.common.model.dtos.community.ComMngPopulationDTO;
+import com.panzhihua.common.model.dtos.community.ComMngPopulationEditDTO;
+import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseAdminDTO;
+import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseEditAdminDTO;
+import com.panzhihua.common.model.dtos.community.ComMngPopulationTagDTO;
+import com.panzhihua.common.model.dtos.community.ComMngRealCompanyBelongsDTO;
+import com.panzhihua.common.model.dtos.community.ComOpsHouseDTO;
+import com.panzhihua.common.model.dtos.community.ComSwDangerReportHandleDTO;
+import com.panzhihua.common.model.dtos.community.ComSwDangerReportRectifyDTO;
+import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordAddDTO;
+import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordPageDTO;
+import com.panzhihua.common.model.dtos.community.ComSwRotaPageDTO;
+import com.panzhihua.common.model.dtos.community.ComSwRotaSaveDTO;
+import com.panzhihua.common.model.dtos.community.DisabledPersonsDTO;
+import com.panzhihua.common.model.dtos.community.EditComActDynTypeDTO;
+import com.panzhihua.common.model.dtos.community.EldersAuthAddByFamilyDTO;
+import com.panzhihua.common.model.dtos.community.EldersAuthAddDTO;
+import com.panzhihua.common.model.dtos.community.EldersAuthDeleteDTO;
+import com.panzhihua.common.model.dtos.community.EldersAuthEditDTO;
+import com.panzhihua.common.model.dtos.community.EldersAuthElderlyDTO;
+import com.panzhihua.common.model.dtos.community.EldersAuthFeedbackAddDTO;
+import com.panzhihua.common.model.dtos.community.EldersAuthTypeQueryDTO;
+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.GrantRewardDTO;
+import com.panzhihua.common.model.dtos.community.KeyPersonInfoDTO;
+import com.panzhihua.common.model.dtos.community.OperationDetailDTO;
+import com.panzhihua.common.model.dtos.community.PageActWorkGuideDTO;
+import com.panzhihua.common.model.dtos.community.PageComActDTO;
+import com.panzhihua.common.model.dtos.community.PageComActDiscussCommentDTO;
+import com.panzhihua.common.model.dtos.community.PageComActDiscussDTO;
+import com.panzhihua.common.model.dtos.community.PageComActDynTypeDTO;
+import com.panzhihua.common.model.dtos.community.PageComActEasyPhotoCommentDTO;
+import com.panzhihua.common.model.dtos.community.PageComCvtBusinessAppletsDTO;
+import com.panzhihua.common.model.dtos.community.PageComCvtBusinessDTO;
+import com.panzhihua.common.model.dtos.community.PageComCvtCategoryDTO;
+import com.panzhihua.common.model.dtos.community.PageComCvtServeDTO;
+import com.panzhihua.common.model.dtos.community.PageComEldersRecordsDTO;
+import com.panzhihua.common.model.dtos.community.PageComMngCarDTO;
+import com.panzhihua.common.model.dtos.community.PageComMngRealAssetsDTO;
+import com.panzhihua.common.model.dtos.community.PageComMngRealCompanyDTO;
+import com.panzhihua.common.model.dtos.community.PageComMngVillageDTO;
+import com.panzhihua.common.model.dtos.community.PageComOpsHouseDTO;
+import com.panzhihua.common.model.dtos.community.PageComStreetDTO;
+import com.panzhihua.common.model.dtos.community.PageEldersAuthDTO;
+import com.panzhihua.common.model.dtos.community.PageEldersAuthElderlyDTO;
+import com.panzhihua.common.model.dtos.community.PageEldersAuthHistoryDTO;
+import com.panzhihua.common.model.dtos.community.PageEldersAuthRecordDTO;
+import com.panzhihua.common.model.dtos.community.PageIdentityAuthRecordDTO;
+import com.panzhihua.common.model.dtos.community.PageQuestnaireAnswerDTO;
+import com.panzhihua.common.model.dtos.community.PageQuestnaireDTO;
+import com.panzhihua.common.model.dtos.community.PageQuestnaireSubDetailsDTO;
+import com.panzhihua.common.model.dtos.community.PageUserReserveDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDetailDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenStatisticAgeGenderDTO;
@@ -40,7 +114,18 @@
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.reserve.AddReserveAdminDTO;
+import com.panzhihua.common.model.dtos.community.reserve.CancelReserveRecordDTO;
+import com.panzhihua.common.model.dtos.community.reserve.ComActReserveMakeStatisticsDTO;
+import com.panzhihua.common.model.dtos.community.reserve.ComActReserveRegisterStatisticsDTO;
+import com.panzhihua.common.model.dtos.community.reserve.EditComActReserveInfoDTO;
+import com.panzhihua.common.model.dtos.community.reserve.EditComActReserveStatusDTO;
+import com.panzhihua.common.model.dtos.community.reserve.EditReserveAdminDTO;
+import com.panzhihua.common.model.dtos.community.reserve.MakeHandleAdminDTO;
+import com.panzhihua.common.model.dtos.community.reserve.PageReserveAdminDTO;
+import com.panzhihua.common.model.dtos.community.reserve.PageReserveMakeAdminDTO;
+import com.panzhihua.common.model.dtos.community.reserve.PageReserveMakeHandleAdminDTO;
+import com.panzhihua.common.model.dtos.community.reserve.PageReserveRegisterDetailedAdminDTO;
import com.panzhihua.common.model.dtos.community.switchs.SearchCommunityDTO;
import com.panzhihua.common.model.dtos.community.wallet.ComActWalletDetailDTO;
import com.panzhihua.common.model.dtos.community.wallet.ComActWalletSettlementAdminDTO;
@@ -95,6 +180,53 @@
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.community.ActivitySignVO;
+import com.panzhihua.common.model.vos.community.BatchhouseVO;
+import com.panzhihua.common.model.vos.community.ComActActEvaluateVO;
+import com.panzhihua.common.model.vos.community.ComActActRegistVO;
+import com.panzhihua.common.model.vos.community.ComActActivityVO;
+import com.panzhihua.common.model.vos.community.ComActDynVO;
+import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
+import com.panzhihua.common.model.vos.community.ComActMessageBackVO;
+import com.panzhihua.common.model.vos.community.ComActMessageVO;
+import com.panzhihua.common.model.vos.community.ComActMicroWishVO;
+import com.panzhihua.common.model.vos.community.ComActReserveCommitVO;
+import com.panzhihua.common.model.vos.community.ComActVO;
+import com.panzhihua.common.model.vos.community.ComActWorkGuideVO;
+import com.panzhihua.common.model.vos.community.ComCvtServeExcelVO;
+import com.panzhihua.common.model.vos.community.ComEldersAuthElderlyDetailsVO;
+import com.panzhihua.common.model.vos.community.ComMngBuildingExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngCarExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngPopulationCorrectExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngPopulationCultExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngPopulationDisabilityExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngPopulationDrugExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngPopulationKeyExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngPopulationLowSecurityExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngPopulationMajorExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngPopulationRehabilitationExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngPopulationSentenceExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngPopulationServeExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngPopulationVO;
+import com.panzhihua.common.model.vos.community.ComMngPopulationVeteransExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngRealAssetsExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngRealAssetsVO;
+import com.panzhihua.common.model.vos.community.ComMngRealCompanyExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngRealCompanyVO;
+import com.panzhihua.common.model.vos.community.ComMngStructAreaVO;
+import com.panzhihua.common.model.vos.community.ComMngStructHouseVO;
+import com.panzhihua.common.model.vos.community.ComMngStructOtherBuildVO;
+import com.panzhihua.common.model.vos.community.ComMngVillageServeExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngVillageVO;
+import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;
+import com.panzhihua.common.model.vos.community.ComOpsHouseUndercarriageVO;
+import com.panzhihua.common.model.vos.community.ComOpsHouseVO;
+import com.panzhihua.common.model.vos.community.ComStreetVO;
+import com.panzhihua.common.model.vos.community.ComSwRotaExcelVO;
+import com.panzhihua.common.model.vos.community.EldersAuthDetailsVO;
+import com.panzhihua.common.model.vos.community.EldersAuthElderlyExcelVO;
+import com.panzhihua.common.model.vos.community.ResetComActMessageVO;
+import com.panzhihua.common.model.vos.community.SignactivityVO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticAgeGender;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyActivity;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyBuild;
@@ -102,7 +234,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.reserve.*;
import com.panzhihua.common.model.vos.neighbor.AddNeighborCircleAdminVO;
import com.panzhihua.common.model.vos.neighbor.ChangeCommentReplyStatusByAdminVO;
import com.panzhihua.common.model.vos.neighbor.ChangeCommentStatusByAdminVO;
@@ -191,7 +322,7 @@
* @return 详情
*/
@PostMapping("detailactivity")
- R detailActivity(@RequestParam("id") Long id, @RequestParam(value = "userId", required = false) Long userId);
+ R detailActivity(@RequestParam("id") Long id, @RequestParam(value = "userId", required = false) Long userId,@RequestParam(value = "pageNum", required = false) Long pageNum,@RequestParam(value = "pageSize", required = false) Long pageSize);
/**
* 分页活动报名名单
@@ -1160,12 +1291,20 @@
/**
* 议事投票-详情
*
- * @param id
- * 主键
+ * @param discussDetailDTO
+ * 请求参数
* @return ComActDiscussVO
*/
@PostMapping("detaildiscuss")
- R detailDiscuss(@RequestParam("id") Long id);
+ R detailDiscuss(@RequestBody ComActDiscussDetailDTO discussDetailDTO);
+
+ /**
+ * 分页查询评论下回复列表
+ * @param discussDetailDTO 请求参数
+ * @return 回复列表
+ */
+ @PostMapping("discussCommentReplyAdmin")
+ R discussCommentReplyAdmin(@RequestBody ComActDiscussDetailDTO discussDetailDTO);
/**
* 议事投票-删除
@@ -1198,6 +1337,16 @@
R pageDiscuss(@RequestBody PageComActDiscussDTO pageComActDiscussDTO);
/**
+ * 议事投票-后台分页查询
+ *
+ * @param pageComActDiscussDTO
+ * 查询参数
+ * @return ComActDiscussVO
+ */
+ @PostMapping("pagediscussAdmin")
+ R pageDiscussAdmin(@RequestBody PageComActDiscussDTO pageComActDiscussDTO);
+
+ /**
* 议事投票-评论-查看
*
* @param id
@@ -1206,6 +1355,14 @@
*/
@PostMapping("detaildiscusscomment")
R detailDiscussComment(@RequestParam("id") Long id);
+
+ /**
+ * 议事投票评论详情
+ * @param pageComActDiscussCommentDTO 请求参数
+ * @return 议事投票详情
+ */
+ @PostMapping("detaildiscusscommentAdmin")
+ R detailDiscussCommentAdmin(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO);
/**
* 议事投票-评论-置顶
@@ -1236,6 +1393,16 @@
*/
@PostMapping("pagediscusscomment")
R pageDiscussComment(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO);
+
+ /**
+ * 议事投票-评论-后台分页查询
+ *
+ * @param pageComActDiscussCommentDTO
+ * 分页查询参数
+ * @return ComActDiscussCommentVO
+ */
+ @PostMapping("pagediscusscommentAdmin")
+ R pageDiscussCommentAdmin(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO);
/**
* 议事投票-分页查询 小程序
@@ -3635,6 +3802,27 @@
R exportPensionAuthRecordsStatistic(@RequestBody PageElderAuthRecordsDTO pageElderAuthRecordsDTO);
/**
+ * 查询养老认证社区认证方式 setPensionAuthType 查询养老认证社区认证方式
+ * @param eldersAuthTypeQueryDTO 查询参数
+ * @return R 查询结果
+ * @author txb
+ * @date 2021/9/10 16:03
+ */
+ @PostMapping("/elders/pensionAuthRecords/authtype")
+ R communityPensionAuthType(@RequestBody EldersAuthTypeQueryDTO eldersAuthTypeQueryDTO);
+
+ /**
+ * 设置当前社区养老认证方式:核验类型（1.视频认证 2.人脸核验） setPensionAuthType 设置当前社区养老认证方式:核验类型（1.视频认证 2.人脸核验）
+ * @param communityId 社区id
+ * @param type 检验类型
+ * @return R 设置结果
+ * @author txb
+ * @date 2021/9/10 16:03
+ */
+ @PutMapping("/elders/pensionAuthRecords/authType/{type}")
+ R setPensionAuthType(@RequestParam("communityId") Long communityId, @RequestParam("type") Integer type);
+
+ /**
* 小程序-查询疫苗分类列表
*
* @return 疫苗分类列表
@@ -5506,6 +5694,67 @@
R editSysConfValue(@RequestParam("communityId") Long communityId,@RequestParam("status") Integer status);
/**
+ * 议事投票后台公布结果
+ * @param publishResultDTO 请求参数
+ * @return 公布结果
+ */
+ @PostMapping("publishResultAdmin")
+ R publishResultAdmin(@RequestBody ComActDiscussPublishResultDTO publishResultDTO);
+
+ /**
+ * 议事投票-评论/回复删除
+ * @param id 评论/回复id
+ * @return 删除结果
+ */
+ @GetMapping("deleteDiscussCommentAdmin")
+ R deleteDiscussCommentAdmin(@RequestParam("id") Long id);
+
+ /**
+ * 查询社区可发布议事投票权限配置
+ * @param communityId 社区id
+ * @return 社区可发布议事投票权限配置
+ */
+ @GetMapping("discussJurisdictionGet")
+ R discussJurisdictionGet(@RequestParam("communityId") Long communityId,@RequestParam("userId") Long userId);
+
+ /**
+ * 设置当前社区议事投票小程序身份验证参数(1.全部 2.党员 3.志愿者 4.社区工作人员)
+ * @param communityId 社区id
+ * @param value 需要设置的参数值
+ * @return 设置结果
+ */
+ @GetMapping("discussJurisdictionSet")
+ R discussJurisdictionSet(@RequestParam("communityId") Long communityId, @RequestParam("value") String value);
+
+ /**
+ * 议事投票检测状态定时任务
+ * @return 执行结果
+ */
+ @GetMapping("timedTaskDiscussInspectStatus")
+ R timedTaskDiscussInspectStatus();
+
+ /**
+ * 一起议增加浏览量
+ * @param discussId 一起议主键id
+ */
+ @PostMapping("discuss/increase-view-num")
+ void increaseViewNum(@RequestParam("discussId") Long discussId);
+
+ /**
+ * 定时任务每半小时执行一次将一起议浏览量写入到表中
+ */
+ @PostMapping("discuss/write-view-num")
+ R timedTaskWriteDiscussViewNumToTable();
+
+ /**
+ * 公布/编辑一起议投票结果
+ * @param comActDiscussDTO
+ * @return 请求结果
+ */
+ @PostMapping("discuss/edit-result")
+ R editDiscussResult(@RequestBody ComActDiscussDTO comActDiscussDTO);
+
+ /**
* 定时任务扫描高龄认证记录信息
* @return 执行结果
*/
@@ -5556,4 +5805,65 @@
*/
@GetMapping("/reserve/list")
R reserveListApplets(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 查询社区高龄认证方式（1.视频认证 2.人脸核验）
+ * @param eldersAuthTypeQueryDTO 请求参数
+ * @return 社区高龄认证方式（1.视频认证 2.人脸核验）
+ */
+ @PostMapping("/elders/new/authtype")
+ R communityEldersAuthType(@RequestBody EldersAuthTypeQueryDTO eldersAuthTypeQueryDTO);
+
+ /**
+ * 设置当前社区高龄认证方式:核验类型（1.视频认证 2.人脸核验）
+ * @param communityId 社区id
+ * @param type 检验类型
+ * @return R 设置结果
+ */
+ @PutMapping("/elders/new/authType/{type}")
+ R setEldersAuthType(@RequestParam("communityId") Long communityId, @RequestParam("type") Integer type);
+
+ /**
+ * 新增身份认证
+ * @param addIdentityAuthDTO 新增身份认证请求参数
+ * @return 新增结果结果
+ */
+ @PostMapping("/identity-auth/add")
+ R addIdentityAuth(@RequestBody AddIdentityAuthDTO addIdentityAuthDTO);
+
+ /**
+ * 分页查询身份认证记录
+ * @param pageIdentityAuthRecordDTO 分页查询身份认证记录参数
+ * @return 身份认证记录列表
+ */
+ @PostMapping("/identity-auth/record/page")
+ R queryRecordWithPage(@RequestBody PageIdentityAuthRecordDTO pageIdentityAuthRecordDTO);
+
+ /**
+ * 获取身份认证详情
+ * @param authType 认证类型
+ * @param identityAuthId 认证id
+ * @return 认证记录详情
+ */
+ @GetMapping("/identity-auth/detail")
+ R retrieveIdentityAuthDetail(@RequestParam("authType") Integer authType,
+ @RequestParam("identityAuthId") Long identityAuthId);
+
+ /**
+ * 获取身份认证方式
+ * @param communityId
+ * @param identityAuthType
+ * @return 认证方式
+ */
+ @GetMapping("/identity-auth/mode")
+ R getIdentityAuthMode(@RequestParam(value = "communityId") Long communityId,
+ @RequestParam(value = "identityAuthType") Integer identityAuthType);
+
+ /**
+ * 获取身份认证人脸核验token
+ * @param getIdentityEidTokenDTO
+ * @return token
+ */
+ @PostMapping("/identity-auth/getEidToken")
+ R getEidToken(@RequestBody GetIdentityEidTokenDTO getIdentityEidTokenDTO);
}
--
Gitblit v1.7.1