From b2c975094e4a3cac5ba67c154e9b7b4fd0ce35c9 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 25 四月 2022 17:34:36 +0800
Subject: [PATCH] 花城E+防疫修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActAcidRecordServiceImpl.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActAcidRecordServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActAcidRecordServiceImpl.java
index 1e4b019..aaeb717 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActAcidRecordServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActAcidRecordServiceImpl.java
@@ -1,5 +1,6 @@
package com.panzhihua.service_community.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.community.acid.ComActAcidRecordDTO;
@@ -8,6 +9,7 @@
import com.panzhihua.common.model.vos.community.acid.ComAcidAreaVO;
import com.panzhihua.common.model.vos.community.acid.ComAcidStaticVO;
import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordVO;
+import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.entity.ComActAcidRecord;
import com.panzhihua.service_community.dao.ComActAcidRecordDao;
@@ -48,6 +50,10 @@
@Override
public R insertRecord(ComActAcidRecordVO comActAcidRecordVO) {
+ Integer count= this.baseMapper.selectCount(new QueryWrapper<ComActAcidRecord>().lambda().eq(ComActAcidRecord::getIdCard,comActAcidRecordVO.getIdCard()).ge(ComActAcidRecord::getCreateTime, DateUtils.getCurrentDate(DateUtils.yyyyMMdd_format)));
+ if(count>0){
+ return R.ok();
+ }
if(StringUtils.isEmpty(comActAcidRecordVO.getLocalCity())){
rabbitTemplate.convertAndSend("huacheng.acid.exchange", "huacheng.acid.key", comActAcidRecordVO, message -> {
message.getMessageProperties().setHeader("x-delay", 24*60*60*1000);
@@ -72,14 +78,14 @@
@Override
public R statics(String date) {
List<ComAcidStaticVO> comAcidStaticVOS=new ArrayList<>();
- String[] area={"东区","西区","仁和区","米易县","延边县","钒钛新城"};
+ String[] area={"东区","西区","仁和区","米易县","盐边县","钒钛新城"};
String[] country={"上海市","吉林省","广东省","江苏省","浙江省","山东省","湖北省","山西省","黑龙江省","广西壮族自治区","河北省","辽宁省","河南省","福建省","安徽省","南昌市","西宁市","西安市","文山州","兰州市","邵阳市"};
for(String areaName:area){
ComAcidStaticVO comAcidStaticVO=this.baseMapper.areaStatics(areaName,date);
comAcidStaticVO.setAreaName(areaName);
List<ComAcidAreaVO> comAcidAreaVOS=new ArrayList<>();
for(String countryName:country){
- Integer count=this.baseMapper.countryStatics(countryName,date);
+ Integer count=this.baseMapper.countryStatics(countryName,date,areaName);
ComAcidAreaVO comAcidAreaVO=new ComAcidAreaVO();
comAcidAreaVO.setName(countryName);
comAcidAreaVO.setCount(count);
--
Gitblit v1.7.1