From 1f203708b6018b57eaefc08951a476f9f6ea08f0 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期五, 02 十二月 2022 11:06:47 +0800
Subject: [PATCH] #feat 设置时间
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActAcidRecordServiceImpl.java | 90 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 83 insertions(+), 7 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 ba36654..cc6fc9e 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
@@ -8,6 +8,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+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.vos.community.acid.*;
@@ -28,9 +29,9 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
import static com.baomidou.mybatisplus.core.toolkit.ObjectUtils.isNotEmpty;
import static com.baomidou.mybatisplus.core.toolkit.ObjectUtils.isNull;
@@ -137,7 +138,7 @@
public R insertRecord(ComActAcidRecordVO comActAcidRecordVO) {
Integer count= this.baseMapper.selectCount(new QueryWrapper<ComActAcidRecord>().lambda().eq(ComActAcidRecord::getIsDel,0).eq(ComActAcidRecord::getIdCard,comActAcidRecordVO.getIdCard()).ge(ComActAcidRecord::getCreateTime, DateUtils.getCurrentDate(DateUtils.yyyyMMdd_format)));
if(count>0){
- return R.fail("请勿重复提交");
+ return R.fail("您的社区报备信息已填写完整，请勿重复提交！");
}
if(StringUtils.isEmpty(comActAcidRecordVO.getLocalCity())){
rabbitTemplate.convertAndSend("huacheng.acid.exchange", "huacheng.acid.key", comActAcidRecordVO, message -> {
@@ -175,7 +176,7 @@
//未填住址人员
saveAcidDangerMember(comActAcidRecordVO, comActAcidRecord.getId(), 2, null);
}
- return R.ok();
+ return R.ok(comActAcidRecord.getId().toString());
}
return R.fail("操作失败，请重新尝试");
@@ -264,8 +265,10 @@
}
@Override
public R fiveCountPlus(String date,String localCity,String loginAccount) {
- Integer type = isVilliage(loginAccount);
- log.info("type===="+type);
+ Integer type=3;
+ if (StringUtils.isNotEmpty(loginAccount)){
+ type = isVilliage(loginAccount);
+ }
return R.ok(this.baseMapper.fiveCountPlus(date,localCity,type));
}
@@ -563,6 +566,26 @@
return null;
}
+ /**
+ * 批量核对防疫信息数据
+ * @param batchCheckAcidRecordDTO
+ * @return
+ */
+ @Override
+ public R batchCheck(BatchCheckAcidRecordDTO batchCheckAcidRecordDTO) {
+ this.baseMapper.batchCheck(batchCheckAcidRecordDTO);
+ return R.ok();
+ }
+
+ @Override
+ public R checkCommit(Long userId) {
+ if(userId!=null){
+ List<ComActAcidRecord> comActAcidRecords= this.baseMapper.selectList(new QueryWrapper<ComActAcidRecord>().lambda().eq(ComActAcidRecord::getIsDel,0).eq(ComActAcidRecord::getUserId,userId).ge(ComActAcidRecord::getCreateTime, DateUtils.getCurrentDate(DateUtils.yyyyMMdd_format)).isNull(ComActAcidRecord::getColorImage));
+ return R.ok(comActAcidRecords);
+ }
+ return R.ok();
+ }
+
public static void areaCheck(ComCun area,ComStreetDO comStreetDO){
switch (area.getArea()){
case "西区": comStreetDO.setAreaCode(510423); break;
@@ -586,4 +609,57 @@
}
return 3;
}
+
+ /**
+ * 统计红黄绿码
+ * @return
+ */
+ public R selectColorMarkGroup(){
+ //所有
+ List<ComActAcidColorChartsVO> comActAcidColorChartsVOS = this.baseMapper.selectColorMarkGroup();
+ int all = comActAcidColorChartsVOS.stream().mapToInt(ComActAcidColorChartsVO::getCountNum).sum();
+ for (ComActAcidColorChartsVO comActAcidColorChartsVO : comActAcidColorChartsVOS) {
+ if (0!=all){
+ BigDecimal countNum = new BigDecimal(comActAcidColorChartsVO.getCountNum());
+ BigDecimal allDecimal = new BigDecimal(all);
+ BigDecimal percent = countNum.divide(allDecimal,2, BigDecimal.ROUND_HALF_DOWN);
+ comActAcidColorChartsVO.setPercent(percent);
+ }
+ }
+ Map<String, ComActAcidColorChartsVO> circleMap = comActAcidColorChartsVOS
+ .stream()
+ .collect(Collectors.toMap(ComActAcidColorChartsVO::getCountName, Function.identity()));
+
+ //月份
+ List<ComActAcidColorChartsVO> comActAcidColorChartsVOS1 = this.baseMapper.selectColorMarkGroupByMonth();
+ //按颜色分组求和
+ Map<String, IntSummaryStatistics> colorCollect = comActAcidColorChartsVOS1
+ .stream()
+ .collect(Collectors.groupingBy(ComActAcidColorChartsVO::getColorMark,
+ Collectors.summarizingInt(ComActAcidColorChartsVO::getCountNum)));
+
+ for (ComActAcidColorChartsVO comActAcidColorChartsVO : comActAcidColorChartsVOS1) {
+ String colorMark = comActAcidColorChartsVO.getColorMark();
+ if (colorCollect.containsKey(colorMark)){
+ IntSummaryStatistics intSummaryStatistics = colorCollect.get(colorMark);
+ long sum = intSummaryStatistics.getSum();
+ if (0L!=sum) {
+ BigDecimal countNum = new BigDecimal(comActAcidColorChartsVO.getCountNum());
+ BigDecimal sumDecimal = new BigDecimal(sum);
+ BigDecimal percent = countNum.divide(sumDecimal, 2, BigDecimal.ROUND_HALF_DOWN);
+ comActAcidColorChartsVO.setPercent(percent);
+ }
+ }
+ }
+ Map<String, Map<String, ComActAcidColorChartsVO>> chartMap = comActAcidColorChartsVOS1
+ .stream()
+ .collect(Collectors.groupingBy(ComActAcidColorChartsVO::getCountName,
+ Collectors.toMap(ComActAcidColorChartsVO::getColorMark, Function.identity())));
+
+ Map<String,Object> retMap = new HashMap<>();
+ retMap.put("circleMap",circleMap);
+ retMap.put("chartMap",chartMap);
+
+ return R.ok(retMap);
+ }
}
--
Gitblit v1.7.1