From 579a4915d227e9071fdfd9cbfa6dc86a6ce6a243 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Thu, 13 Oct 2022 11:15:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AD=BB=E4=BA=A1=E6=AD=BB=E4=BA=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DataSyncConfigServiceImpl.java       | 57 ++-----------------
 1 file changed, 4 insertions(+), 53 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java
index e89d012f1b..d70289b0fb 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java
@@ -3,9 +3,7 @@ package com.epmet.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.form.PageFormDTO;
@@ -71,15 +69,6 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl<DataSyncConfigDao
     @Autowired
     private DataSyncRecordDisabilityService dataSyncRecordDisabilityService;
 
-    private QueryWrapper<DataSyncConfigEntity> getWrapper(Map<String, Object> params) {
-        String id = (String) params.get(FieldConstant.ID_HUMP);
-
-        QueryWrapper<DataSyncConfigEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
-
-        return wrapper;
-    }
-
     @Override
     public DataSyncConfigDTO get(String id) {
         DataSyncConfigEntity entity = baseDao.selectById(id);
@@ -243,8 +232,7 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl<DataSyncConfigDao
 
     }
 
-    @Transactional(rollbackFor = Exception.class)
-    public void siWang(List<NatUserInfoResultDTO> dbResiList) {
+    private void siWang(List<NatUserInfoResultDTO> dbResiList) {
         List<DataSyncRecordDeathEntity> list = new ArrayList<>();
         for (NatUserInfoResultDTO dbResi : dbResiList) {
             YtDataSyncResDTO thirdResult = YtHsResUtils.siWang(dbResi.getIdCard(), dbResi.getName());
@@ -252,24 +240,7 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl<DataSyncConfigDao
                 log.warn("canJi 调用蓝图接口失败了 继续处理下一个人");
                 continue;
             }
-            /*{
-            "AGE": "73",
-            "CARD_TYPE": "9",
-            "CREATE_ORGAN_NAME": "菏泽市巨野县殡仪馆",
-            "CREMATION_TIME": "2014-04-17 14:46",
-            "DEAD_ID": "SZ-371724-2012-1006560",
-            "DEATH_DATE": "2014-04-17",
-            "FAMILY_ADD": "菏泽市巨野县开发区马庄村",
-            "FOLK": "01",
-            "ID_CARD": "1",
-            "NAME": "郭**",
-            "NATION": "156",
-            "POPULACE": "3381C3014B60439FE05319003C0A0897",
-            "POPULACE_NAME": "菏泽市巨野县开发区马庄村",
-            "RECORD_ID": "E-371724-2012-100000000000407849",
-            "RN": "1",
-            "SEX": "1"
-        }*/
+
             String thirdResultData = thirdResult.getData();
             JSONObject thirdResultObject = JSON.parseObject(thirdResultData);
 
@@ -278,10 +249,6 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl<DataSyncConfigDao
             //获取数据库里的记录
             DataSyncRecordDeathDTO dbDeathEntity = dataSyncRecordDeathService.selectOne(queryWrapper);
 
-
-
-
-
             JudgeDealStatus judgeDealStatus= new JudgeDealStatus(thirdResultObject,dbDeathEntity).invokeDeath();
             if (judgeDealStatus.isStop()) {
                 continue;
@@ -351,22 +318,7 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl<DataSyncConfigDao
         return dbResiList;
     }
 
-    /*\"code\":300,
-		\"name\":\"姓名\",
-		\"genderName\":\"性别\",
-		\"citizenId\":\"身份证号\",
-		\"cardNum\":\"残疾证号\",
-		\"idtKindName\":\"残疾类别\",
-		\"idtLevelName\":\"残疾等级\",
-		\"eduLevelName\":\"教育程度\",
-		\"marriagerName\":\"婚姻状况\",
-		\"guardian\":\"监护人\",
-		\"guardianPhone\":\"监护人联系方式\",
-		\"residentAdd\":\"户籍地址\",
-		\"nowAdd\":'现居住地\",
-		\"phoneNo\":'联系电话\",*/
-    @Transactional(rollbackFor = Exception.class)
-    public void canJi(List<NatUserInfoResultDTO> resiList) {
+    private void canJi(List<NatUserInfoResultDTO> resiList) {
         List<DataSyncRecordDisabilityEntity> list = new ArrayList<>();
         for (NatUserInfoResultDTO dbResi : resiList) {
             YtDataSyncResDTO thirdResult = YtHsResUtils.canji(dbResi.getIdCard(), dbResi.getName());
@@ -462,8 +414,7 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl<DataSyncConfigDao
      * @author zxc
      * @date 2022/9/27 11:08
      */
-    @Transactional(rollbackFor = Exception.class)
-    public void hsjc(List<NatUserInfoResultDTO> idCards, String customerId) {
+    private void hsjc(List<NatUserInfoResultDTO> idCards, String customerId) {
         List<IcNatEntity> entities = new ArrayList<>();
         idCards.forEach(idCard -> {
             YtHsjcResDTO natInfoResult = YtHsResUtils.hsjc(idCard.getIdCard(), NumConstant.ONE, NumConstant.ONE);