From 70d2a5d0f9c6951b2d4cac954041ed73582ff7eb Mon Sep 17 00:00:00 2001 From: liujie <1793218484@qq.com> Date: 星期一, 09 六月 2025 11:54:00 +0800 Subject: [PATCH] 6.9新增登录失败冻结逻辑 --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveApi.java | 67 ++++++++++++++++++++++++++++----- 1 files changed, 56 insertions(+), 11 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveApi.java index eb92507..f3f7169 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveApi.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveApi.java @@ -1,22 +1,21 @@ package com.panzhihua.service_community.api; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; + +import javax.annotation.Resource; + +import org.springframework.web.bind.annotation.*; + import com.panzhihua.common.model.dtos.community.CancelRecordDTO; import com.panzhihua.common.model.dtos.community.OperationDetailDTO; import com.panzhihua.common.model.dtos.community.PageUserReserveDTO; +import com.panzhihua.common.model.dtos.community.reserve.*; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActReserveCommitVO; -import com.panzhihua.service_community.dao.ComActReserveOperationRecordMapper; -import com.panzhihua.service_community.model.dos.ComActReserveOperationRecordDO; -import com.panzhihua.service_community.model.dos.ComActReserveRecordDO; +import com.panzhihua.common.model.vos.community.reserve.ComActReserveDetailAdminVO; import com.panzhihua.service_community.service.*; -import com.panzhihua.common.model.dtos.community.reserve.*; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import java.util.List; +import lombok.extern.slf4j.Slf4j; /** * 预约登记 @@ -93,7 +92,7 @@ * @return 预约登记详情 */ @GetMapping("/admin/detail") - public R detailReserveAdmin(@RequestParam("reserveId") Long reserveId){ + public R<ComActReserveDetailAdminVO> detailReserveAdmin(@RequestParam("reserveId") Long reserveId) { return comActReserveService.detailReserveAdmin(reserveId); } @@ -117,6 +116,16 @@ */ @PostMapping("/commitNoToken") public R commitNoToken(@RequestBody ComActReserveCommitVO comActReserveCommitVO){ + return comActReserveService.commitNoToken(comActReserveCommitVO); + } + + /** + * 外部调用提交居家隔离 + * @param comActReserveCommitVO + * @return + */ + @PostMapping("/homeQuarantine/commitNoToken") + public R homeQuarantineCommitNoToken(@RequestBody ComActReserveCommitVO comActReserveCommitVO){ return comActReserveService.commitNoToken(comActReserveCommitVO); } @@ -305,6 +314,17 @@ } /** + * 查询预约登记题目下属选择项列表 + * + * @param reserveSubId + * 预约登记id + * @return 查询预约登记题目下属选择项列表 + */ + @GetMapping("/admin/subject/selection/list") + public List<String> subjectSelectionListAdmin(@RequestParam("reserveSubId") Long reserveSubId) { + return comActReserveSubService.subjectSelectionListAdmin(reserveSubId); + } + /** * 分页查询登记明细列表 * @param detailedAdminDTO 请求参数 * @return 登记明细列表 @@ -312,6 +332,16 @@ @PostMapping("/admin/register/detailed/list") public R registerDetailedListAdmin(@RequestBody PageReserveRegisterDetailedAdminDTO detailedAdminDTO){ return comActReserveAnswerContentService.registerDetailedListAdmin(detailedAdminDTO); + } + + /** + * 导出登记明细列表 + * @param detailedAdminDTO 请求参数 + * @return 登记明细列表 + */ + @PostMapping("/admin/register/detailed/list/export") + public R registerDetailedListAdminExport(@RequestBody PageReserveRegisterDetailedAdminDTO detailedAdminDTO){ + return comActReserveAnswerContentService.registerDetailedListAdminExport(detailedAdminDTO); } @GetMapping("/admin/register/detailed/detail") @@ -348,4 +378,19 @@ public R exportHomeQuarantine(@RequestBody PageReserveRegisterDetailedAdminDTO detailedAdminDTO) { return comActReserveAnswerContentService.exportHomeQuarantine(detailedAdminDTO); } + + @GetMapping("/bigScreenStaticsReserve") + public R bigScreenStaticsReserve(@RequestParam("communityId") Long communityId){ + return comActReserveAnswerContentService.bigScreenStaticsReserve(communityId); + } + + @GetMapping("/record/delete") + public R deleteRecord(@RequestParam("recordId")Long recordId){ + return R.ok(comActReserveRecordService.removeById(recordId)); + } + + @GetMapping("/fiveCount") + public R fiveCount(@RequestParam("reserveId") Long reserveId){ + return comActReserveRecordService.fiveCount(reserveId); + } } -- Gitblit v1.7.1