From 93c45fae0c9cfe070048c3e2a347f6c2b17d7e6d Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期四, 28 四月 2022 14:40:46 +0800
Subject: [PATCH] 推送消息

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActAcidRecordServiceImpl.java |   60 ++++++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 38 insertions(+), 22 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 e446272..6f03b18 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
@@ -76,28 +76,17 @@
             String acidTest = comActAcidRecordVO.getAcidTest();
             if (StringUtils.inStringIgnoreCase(colorMark, "红码", "黄码") || travelCard.equals("是")
                     || dangerArea.equals("是") || outsideCity.equals("是") || acidTest.equals("阳性")) {
-                ComActAcidDangerMember dangerMember = comActAcidDangerMemberDao.selectOne(new LambdaQueryWrapper<ComActAcidDangerMember>()
-                        .eq(ComActAcidDangerMember::getIdCard, comActAcidRecordVO.getIdCard()));
-                if (isNull(dangerMember)) {
-                    dangerMember = new ComActAcidDangerMember();
-                    dangerMember.setName(comActAcidRecordVO.getName());
-                    dangerMember.setPhone(comActAcidRecordVO.getPhone());
-                    dangerMember.setRecordId(comActAcidRecord.getId());
-                    dangerMember.setSource(1);
-                    dangerMember.setStatus(6);
-                    dangerMember.setType(1);
-                    dangerMember.setCreateTime(new Date());
-                    comActAcidDangerMemberDao.insert(dangerMember);
-                } else {
-                    dangerMember.setName(comActAcidRecordVO.getName());
-                    dangerMember.setPhone(comActAcidRecordVO.getPhone());
-                    dangerMember.setRecordId(comActAcidRecord.getId());
-                    dangerMember.setSource(1);
-                    dangerMember.setStatus(6);
-                    dangerMember.setType(1);
-                    dangerMember.setUpdateTime(new Date());
-                    comActAcidDangerMemberDao.updateById(dangerMember);
-                }
+                //风险人员
+                saveAcidDangerMember(comActAcidRecordVO, comActAcidRecord.getId(), 1);
+//                rabbitTemplate.convertAndSend("huacheng.acid.danger.exchange", "huacheng.acid.danger.key", comActAcidRecordVO, message -> {
+//                    message.getMessageProperties().setHeader("x-delay", 24*60*60*1000);
+//                    return message;
+//                });
+                return R.ok();
+            }
+            if (StringUtils.isEmpty(comActAcidRecordVO.getLocalCity())) {
+                //未填住址人员
+                saveAcidDangerMember(comActAcidRecordVO, comActAcidRecord.getId(), 2);
             }
             return R.ok();
         }
@@ -105,6 +94,33 @@
         return R.fail("操作失败,请重新尝试");
     }
 
+    private void saveAcidDangerMember(ComActAcidRecordVO comActAcidRecordVO, Long recordId, Integer type) {
+        ComActAcidDangerMember dangerMember = comActAcidDangerMemberDao.selectOne(new LambdaQueryWrapper<ComActAcidDangerMember>()
+                .eq(ComActAcidDangerMember::getIdCard, comActAcidRecordVO.getIdCard()));
+        if (isNull(dangerMember)) {
+            dangerMember = new ComActAcidDangerMember();
+            dangerMember.setName(comActAcidRecordVO.getName());
+            dangerMember.setPhone(comActAcidRecordVO.getPhone());
+            dangerMember.setRecordId(recordId);
+            dangerMember.setIdCard(comActAcidRecordVO.getIdCard());
+            dangerMember.setSource(1);
+            dangerMember.setStatus(6);
+            dangerMember.setType(type);
+            dangerMember.setCreateTime(new Date());
+            comActAcidDangerMemberDao.insert(dangerMember);
+        } else {
+            dangerMember.setName(comActAcidRecordVO.getName());
+            dangerMember.setPhone(comActAcidRecordVO.getPhone());
+            dangerMember.setRecordId(recordId);
+            dangerMember.setIdCard(comActAcidRecordVO.getIdCard());
+            dangerMember.setSource(1);
+            dangerMember.setStatus(6);
+            dangerMember.setType(type);
+            dangerMember.setUpdateTime(new Date());
+            comActAcidDangerMemberDao.updateById(dangerMember);
+        }
+    }
+
     @Override
     public R fiveCount(String localCity) {
         return R.ok(this.baseMapper.fiveCount(localCity));

--
Gitblit v1.7.1