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/ComActAcidRecordApi.java | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 106 insertions(+), 7 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActAcidRecordApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActAcidRecordApi.java index 95930b9..4a8985d 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActAcidRecordApi.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActAcidRecordApi.java @@ -3,18 +3,22 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.api.ApiController; +import com.panzhihua.common.model.dtos.community.acid.BatchCheckAcidRecordDTO; import com.panzhihua.common.model.dtos.community.acid.ComActAcidRecordDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.dtos.property.CommonPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordVO; +import com.panzhihua.common.utlis.StringUtils; import com.panzhihua.service_community.entity.ComActAcidRecord; import com.panzhihua.service_community.service.ComActAcidRecordService; +import com.panzhihua.service_community.service.ComActActRegistService; import org.springframework.beans.BeanUtils; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.io.Serializable; +import java.util.Date; import java.util.List; /** @@ -33,6 +37,10 @@ */ @Resource private ComActAcidRecordService comActAcidRecordService; + + + @Resource + private ComActActRegistService comActActRegistService; /** * 分页查询所有数据 @@ -57,6 +65,17 @@ } /** + * 分页查询所有数据 + * + * @param comActAcidRecordDTO 查询实体 + * @return 所有数据 + */ + @PostMapping("exportNew") + public R exportNew(@RequestBody ComActAcidRecordDTO comActAcidRecordDTO) { + return this.comActAcidRecordService.exportNew(comActAcidRecordDTO); + } + + /** * 通过主键查询单条数据 * * @param id 主键 @@ -64,7 +83,7 @@ */ @GetMapping("{id}") public R selectOne(@PathVariable("id") Long id) { - return R.ok(this.comActAcidRecordService.getById(id)); + return this.comActAcidRecordService.detailByCommunity(id); } /** @@ -86,10 +105,30 @@ */ @PostMapping("/update") public R update(@RequestBody ComActAcidRecordVO comActAcidRecordVO) { - ComActAcidRecord comActAcidRecord=new ComActAcidRecord(); - BeanUtils.copyProperties(comActAcidRecordVO,comActAcidRecord); - return R.ok(this.comActAcidRecordService.updateById(comActAcidRecord)); + return this.comActAcidRecordService.updateLocalCity(comActAcidRecordVO); } + + /** + * 批量核对防疫信息数据 + * @param batchCheckAcidRecordDTO + * @return + */ + @PostMapping("/batchCheck") + public R batchCheck(@RequestBody BatchCheckAcidRecordDTO batchCheckAcidRecordDTO) { + return this.comActAcidRecordService.batchCheck(batchCheckAcidRecordDTO); + } + + /** + * 小程序修改填报记录 + * + * @param comActAcidRecordVO 实体对象 + * @return 修改结果 + */ + @PostMapping("/updateApplets") + public R updateApplets(@RequestBody ComActAcidRecordVO comActAcidRecordVO) { + return this.comActAcidRecordService.updateApplets(comActAcidRecordVO); + } + /** * 删除数据 @@ -99,7 +138,7 @@ */ @GetMapping("del") public R delete(@RequestParam("id") Long id) { - return R.ok(this.comActAcidRecordService.removeById(id)); + return this.comActAcidRecordService.delete(id); } /** @@ -107,7 +146,67 @@ * @return */ @GetMapping("fiveCount") - public R fiveCount(){ - return this.comActAcidRecordService.fiveCount(); + public R fiveCount(@RequestParam("localCity")String localCity){ + return this.comActAcidRecordService.fiveCount(localCity); } + + /** + * 7项常规统计 + * @return + */ + @GetMapping("fiveCountPlus") + public R fiveCountPlus(@RequestParam("date")String date,@RequestParam("localCity")String localCity,@RequestParam(value = "loginAccount",required = false)String loginAccount){ + return this.comActAcidRecordService.fiveCountPlus(date,localCity,loginAccount); + } + + /** + * 图标统计 + * @return + */ + @GetMapping("charts") + public R charts(@RequestParam("date")String date,@RequestParam("localCity")String localCity){ + return this.comActAcidRecordService.charts(date,localCity); + } + + @GetMapping("/statics") + public R statics(@RequestParam("date")String date){ + return this.comActAcidRecordService.statics(date); + } + + @GetMapping("/detailByApp") + public R detailByApp(@RequestParam("id")Long id,@RequestParam("localCity")String localCity){ + return this.comActAcidRecordService.detailByApp(id,localCity); + } + @GetMapping("/test") + public R test(){ + return this.comActAcidRecordService.test(); + } + + + @GetMapping("/checkCommit") + public R checkCommit(@RequestParam(value = "userId",required = false)Long userId){ + return this.comActAcidRecordService.checkCommit(userId); + } + + @GetMapping("/selectColorMarkGroup") + public R selectColorMarkGroup(){ + return this.comActAcidRecordService.selectColorMarkGroup(); + } + + + /** + * 社区活动自动定时更新用户未签退时间 + * @return + */ + @GetMapping("/comActActRegistUpdateEndTime") + public R comActActRegistUpdateEndTime(){ + return comActActRegistService.updateEndTime(); + } + + + + + + + } -- Gitblit v1.7.1