From 43f0578e80af82ecae6c61b51bd0539c6b960603 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期二, 16 八月 2022 19:08:32 +0800
Subject: [PATCH] 服务范围优化
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveApi.java | 196 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 184 insertions(+), 12 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 88154d4..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,15 +1,21 @@
package com.panzhihua.service_community.api;
-import com.panzhihua.common.model.dtos.community.reserve.*;
-import com.panzhihua.common.model.vos.R;
-import com.panzhihua.service_community.service.ComActReserveAnswerContentService;
-import com.panzhihua.service_community.service.ComActReserveRecordService;
-import com.panzhihua.service_community.service.ComActReserveService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
+import java.util.List;
import javax.annotation.Resource;
-import java.util.List;
+
+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.common.model.vos.community.reserve.ComActReserveDetailAdminVO;
+import com.panzhihua.service_community.service.*;
+
+import lombok.extern.slf4j.Slf4j;
/**
* 预约登记
@@ -25,6 +31,10 @@
private ComActReserveRecordService comActReserveRecordService;
@Resource
private ComActReserveAnswerContentService comActReserveAnswerContentService;
+ @Resource
+ private ComActReserveOperationRecordService comActReserveOperationRecordService;
+ @Resource
+ private ComActReserveSubService comActReserveSubService;
/**
* 社区后台-分页查询预约登记列表
@@ -82,10 +92,52 @@
* @return 预约登记详情
*/
@GetMapping("/admin/detail")
- public R detailReserveAdmin(@RequestParam("reserveId") Long reserveId){
+ public R<ComActReserveDetailAdminVO> detailReserveAdmin(@RequestParam("reserveId") Long reserveId) {
return comActReserveService.detailReserveAdmin(reserveId);
}
+ /**
+ * 预约登记详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/detail")
+ public R detail(@RequestParam("id") Long id,@RequestParam("userId") Long userId,@RequestParam("recordId") Long recordId,@RequestParam("isBack") Integer isBack){
+ if(id!=null){
+ return comActReserveService.getById(id,userId,recordId,isBack);
+ }
+ return R.fail();
+ }
+
+ /**
+ * 外部调用提交预约/登记
+ * @param comActReserveCommitVO
+ * @return
+ */
+ @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);
+ }
+
+ /**
+ * 小程序提交预约/登记
+ * @param comActReserveCommitVO
+ * @return
+ */
+ @PostMapping("/commit")
+ public R commit(@RequestBody ComActReserveCommitVO comActReserveCommitVO){
+ return comActReserveService.commit(comActReserveCommitVO);
+ }
/**
* 社区后台-根据社区id统计预约类数据
* @param makeStatisticsDTO 请求参数
@@ -216,9 +268,129 @@
return comActReserveService.listReserveAdmin(communityId);
}
- @GetMapping("/admin/register/list/export")
- public R exportRegisterAdmin(@RequestParam("reserveId") Long reserveId){
- return comActReserveAnswerContentService.exportRegisterAdmin(reserveId);
+ /**
+ * 导出登记明细数据
+ * @param pageReserveRegisterDetailedAdminDTO 登记id
+ * @return 登记明细数据
+ */
+ @PostMapping("/admin/register/list/export")
+ public R exportRegisterAdmin(@RequestBody PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO){
+ return comActReserveAnswerContentService.exportRegisterAdmin(pageReserveRegisterDetailedAdminDTO);
}
+ /**
+ * 我的预约/登记
+ * @param pageUserReserveDTO
+ * @return
+ */
+ @PostMapping("/userReserveList")
+ public R userReserveList(@RequestBody PageUserReserveDTO pageUserReserveDTO){
+ return comActReserveService.pageReserveList(pageUserReserveDTO);
+ }
+ /**
+ * 取消预约/登记
+ */
+ @PostMapping("/cancelReserve")
+ public R userCancelReserve(@RequestBody CancelRecordDTO cancelRecordDTO){
+ return comActReserveRecordService.cancel(cancelRecordDTO);
+ }
+
+ /**
+ * 预约详情操作记录
+ */
+ @PostMapping("/detailOperation")
+ public R reserveOperation(@RequestBody OperationDetailDTO comActReserveOperationRecordDO){
+ return comActReserveOperationRecordService.detailOperationRecord(comActReserveOperationRecordDO);
+ }
+
+ /**
+ * 查询预约登记题目列表
+ * @param reserveId 预约登记id
+ * @return 约登记题目列表
+ */
+ @GetMapping("/admin/subject/list")
+ public R subjectListAdmin(@RequestParam("reserveId") Long reserveId){
+ return comActReserveSubService.subjectListAdmin(reserveId);
+ }
+
+ /**
+ * 查询预约登记题目下属选择项列表
+ *
+ * @param reserveSubId
+ * 预约登记id
+ * @return 查询预约登记题目下属选择项列表
+ */
+ @GetMapping("/admin/subject/selection/list")
+ public List<String> subjectSelectionListAdmin(@RequestParam("reserveSubId") Long reserveSubId) {
+ return comActReserveSubService.subjectSelectionListAdmin(reserveSubId);
+ }
+ /**
+ * 分页查询登记明细列表
+ * @param detailedAdminDTO 请求参数
+ * @return 登记明细列表
+ */
+ @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")
+ public R registerDetailedDetailAdmin(@RequestParam("reserveRecordId") Long reserveRecordId){
+ return comActReserveRecordService.registerDetailedDetailAdmin(reserveRecordId);
+ }
+
+ /**
+ * 小程序查询所有进行中的预约登记
+ * @param communityId 社区id
+ * @return 社区所有进行中的预约登记列表
+ */
+ @GetMapping("/list")
+ public R list(@RequestParam("communityId") Long communityId){
+ return comActReserveService.reserveListApplets(communityId);
+ }
+
+ /**
+ * 分页查询居家隔离统计
+ * @param detailedAdminDTO
+ * @return
+ */
+ @PostMapping("/admin/register/homeQuarantine/page")
+ public R pageRegisterHomeQuarantine(@RequestBody PageReserveRegisterDetailedAdminDTO detailedAdminDTO) {
+ return comActReserveAnswerContentService.pageRegisterHomeQuarantine(detailedAdminDTO);
+ }
+
+ /**
+ * 居家隔离导出
+ * @param detailedAdminDTO
+ * @return
+ */
+ @PostMapping("/admin/homeQuarantine/export")
+ 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