核酸统计

boman-web-core/src/main/java/com/boman/web/core/controller/TaskController.java

@@ -49,5 +49,11 @@ public class TaskController {
         taskService.insertAccountingData();
     }
 
+    @GetMapping("/pphshj")
+    private void pphshj() {
+        taskService.pphshj();
+    }
+
+
 
 }

boman-web-core/src/main/java/com/boman/web/core/domain/TSampling514.java

@@ -0,0 +1,277 @@
+package com.boman.web.core.domain;
+
+
+public class TSampling514 {
+
+  private String oid;
+  private String name;
+  private String idCard;
+  private String tel;
+  private String collectOid;
+  private java.sql.Timestamp collectTime;
+  private String verifyOid;
+  private java.sql.Timestamp verifyFinishTime;
+  private String verifyResult;
+  private String mixOid;
+  private String type;
+  private String objectDistrictOid;
+  private String objectDistrictName;
+  private String objectAddress;
+  private java.sql.Timestamp createDate;
+  private java.sql.Timestamp modifyDate;
+  private String source;
+  private String batchNumber;
+  private String collectorName;
+  private String useFlag;
+  private String verifyPointName;
+  private String certificateNoType;
+  private String focusPerson;
+  private String fromCity;
+  private String toCity;
+  private String address;
+  private String transit;
+
+
+  public String getOid() {
+    return oid;
+  }
+
+  public void setOid(String oid) {
+    this.oid = oid;
+  }
+
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+
+  public String getIdCard() {
+    return idCard;
+  }
+
+  public void setIdCard(String idCard) {
+    this.idCard = idCard;
+  }
+
+
+  public String getTel() {
+    return tel;
+  }
+
+  public void setTel(String tel) {
+    this.tel = tel;
+  }
+
+
+  public String getCollectOid() {
+    return collectOid;
+  }
+
+  public void setCollectOid(String collectOid) {
+    this.collectOid = collectOid;
+  }
+
+
+  public java.sql.Timestamp getCollectTime() {
+    return collectTime;
+  }
+
+  public void setCollectTime(java.sql.Timestamp collectTime) {
+    this.collectTime = collectTime;
+  }
+
+
+  public String getVerifyOid() {
+    return verifyOid;
+  }
+
+  public void setVerifyOid(String verifyOid) {
+    this.verifyOid = verifyOid;
+  }
+
+
+  public java.sql.Timestamp getVerifyFinishTime() {
+    return verifyFinishTime;
+  }
+
+  public void setVerifyFinishTime(java.sql.Timestamp verifyFinishTime) {
+    this.verifyFinishTime = verifyFinishTime;
+  }
+
+
+  public String getVerifyResult() {
+    return verifyResult;
+  }
+
+  public void setVerifyResult(String verifyResult) {
+    this.verifyResult = verifyResult;
+  }
+
+
+  public String getMixOid() {
+    return mixOid;
+  }
+
+  public void setMixOid(String mixOid) {
+    this.mixOid = mixOid;
+  }
+
+
+  public String getType() {
+    return type;
+  }
+
+  public void setType(String type) {
+    this.type = type;
+  }
+
+
+  public String getObjectDistrictOid() {
+    return objectDistrictOid;
+  }
+
+  public void setObjectDistrictOid(String objectDistrictOid) {
+    this.objectDistrictOid = objectDistrictOid;
+  }
+
+
+  public String getObjectDistrictName() {
+    return objectDistrictName;
+  }
+
+  public void setObjectDistrictName(String objectDistrictName) {
+    this.objectDistrictName = objectDistrictName;
+  }
+
+
+  public String getObjectAddress() {
+    return objectAddress;
+  }
+
+  public void setObjectAddress(String objectAddress) {
+    this.objectAddress = objectAddress;
+  }
+
+
+  public java.sql.Timestamp getCreateDate() {
+    return createDate;
+  }
+
+  public void setCreateDate(java.sql.Timestamp createDate) {
+    this.createDate = createDate;
+  }
+
+
+  public java.sql.Timestamp getModifyDate() {
+    return modifyDate;
+  }
+
+  public void setModifyDate(java.sql.Timestamp modifyDate) {
+    this.modifyDate = modifyDate;
+  }
+
+
+  public String getSource() {
+    return source;
+  }
+
+  public void setSource(String source) {
+    this.source = source;
+  }
+
+
+  public String getBatchNumber() {
+    return batchNumber;
+  }
+
+  public void setBatchNumber(String batchNumber) {
+    this.batchNumber = batchNumber;
+  }
+
+
+  public String getCollectorName() {
+    return collectorName;
+  }
+
+  public void setCollectorName(String collectorName) {
+    this.collectorName = collectorName;
+  }
+
+
+  public String getUseFlag() {
+    return useFlag;
+  }
+
+  public void setUseFlag(String useFlag) {
+    this.useFlag = useFlag;
+  }
+
+
+  public String getVerifyPointName() {
+    return verifyPointName;
+  }
+
+  public void setVerifyPointName(String verifyPointName) {
+    this.verifyPointName = verifyPointName;
+  }
+
+
+  public String getCertificateNoType() {
+    return certificateNoType;
+  }
+
+  public void setCertificateNoType(String certificateNoType) {
+    this.certificateNoType = certificateNoType;
+  }
+
+
+  public String getFocusPerson() {
+    return focusPerson;
+  }
+
+  public void setFocusPerson(String focusPerson) {
+    this.focusPerson = focusPerson;
+  }
+
+
+  public String getFromCity() {
+    return fromCity;
+  }
+
+  public void setFromCity(String fromCity) {
+    this.fromCity = fromCity;
+  }
+
+
+  public String getToCity() {
+    return toCity;
+  }
+
+  public void setToCity(String toCity) {
+    this.toCity = toCity;
+  }
+
+
+  public String getAddress() {
+    return address;
+  }
+
+  public void setAddress(String address) {
+    this.address = address;
+  }
+
+
+  public String getTransit() {
+    return transit;
+  }
+
+  public void setTransit(String transit) {
+    this.transit = transit;
+  }
+
+}

boman-web-core/src/main/java/com/boman/web/core/mapper/AccountingDataMapper.java

@@ -48,4 +48,6 @@ public interface AccountingDataMapper {
    int selectById(@Param("id") String id);
 
     AccountingDataVo getAccountingDataOne();
+
+    List<AccountingDataVo> getAllData();
 }

boman-web-core/src/main/java/com/boman/web/core/mapper/CzrkMapper.java

@@ -240,4 +240,6 @@ public interface CzrkMapper {
     List<Czrk> getAllCzrkVillageTownsId(String areaId);
 
     List<Czrk> getAllCzrkVillageId(String areaId);
+
+    void updateCzrkHs(@Param("czrkList") List<Czrk> czrkList);
 }

boman-web-core/src/main/java/com/boman/web/core/mapper/TSampling514Mapper.java

@@ -0,0 +1,22 @@
+package com.boman.web.core.mapper;
+/**
+ * @author tjf
+ * @Date: 2022/05/13/10:27
+ */
+
+import com.boman.web.core.domain.AccountingData;
+import com.boman.web.core.domain.TSampling514;
+import com.boman.web.core.domain.vo.AccountingDataVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+
+/**
+ * @author tjf
+ * @Date: 2022/05/13/10:27
+ */
+public interface TSampling514Mapper {
+
+    List<TSampling514> getTSampling514AllData(@Param("startTime") String startTime,@Param("endTime")String endTime);
+}

boman-web-core/src/main/java/com/boman/web/core/service/TaskService.java

@@ -1,6 +1,7 @@
 package com.boman.web.core.service;
 
 
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
@@ -20,6 +21,7 @@ import com.boman.system.api.RemoteDeptService;
 import com.boman.system.api.RemoteUserService;
 import com.boman.web.core.domain.AccountingData;
 import com.boman.web.core.domain.BirthRecords;
+import com.boman.web.core.domain.TSampling514;
 import com.boman.web.core.domain.vo.AccountingDataVo;
 import com.boman.web.core.mapper.CzrkMapper;
 import com.boman.web.core.mapper.GridInfoMapper;
@@ -589,18 +591,21 @@ public class TaskService {
     /**
      * 抓取核酸数据每10分钟抓取一次,新增到accounting_data
      */
-    @Scheduled(cron = "0 0/10 * * * ? ")
+    //@Scheduled(cron = "0 0/10 * * * ? ")
     public void insertAccountingData() {
         String token = getToken();
         if (StringUtils.isNotBlank(token)) {
-            //String startTime = "2022-05-14%2010:00:59";
             String startTime = "2022-05-14 00:00:00.0";
             //去数据库取最新的一条数据
             AccountingDataVo accountingData = accountingDataService.getAccountingDataOne();
-            if(accountingData != null){
+            if (accountingData != null) {
                 startTime = accountingData.getCjsj();
+                Date parse = DateUtil.parse(startTime);
+                Date parseNew = DateUtil.offsetSecond(parse, 1);
+                startTime = DateUtil.format(parseNew, "yyyy-MM-dd HH:mm:ss");
             }
             //String startTime = redisService.getCacheObject("startTime");
+            //String startTime = "2022-05-14 10:47:00.0";
             Map<String, String> paramMap = new HashMap<>();
             paramMap.put("client_id", "acdf50bd13be4901b64c62b1fee862c0");
             paramMap.put("access_token", token);
@@ -622,11 +627,12 @@ public class TaskService {
             String http = "http://60.171.171.235:9090/service/api/wjw/qshssjsjc";
             try {
                 String data = HttpClientUtils.doGet(http, paramMap);
+
                 if (StringUtils.isNotBlank(data)) {
                     List<AccountingData> list = JSONObject.parseArray(data, AccountingData.class);
                     if (list != null && list.size() > 0) {
                         //插入数据
-                        accountingDataService.insertAccountingData(list);
+                        accountingDataService.insertAccountingData(list, accountingData);
                     }
                 }
             } catch (IOException e) {
@@ -635,6 +641,51 @@ public class TaskService {
         }
     }
 
+    /***
+     *  匹配核酸和户籍数据
+     */
+    public void pphshj() {
+        //String startTime = "2022-05-14 00:00:00.0";
+        String startTime = redisService.getCacheObject("startTime");
+        if (StringUtils.isBlank(startTime)) {
+            startTime = "2022-05-14 00:00:00.0";
+        }
+
+        Date parse = DateUtil.parse(startTime);
+        Date parseNew = DateUtil.offsetSecond(parse, 300);
+        String endTime = DateUtil.format(parseNew, "yyyy-MM-dd HH:mm:ss");
+        redisService.setCacheObject("startTime", endTime);
+
+        System.out.println("batchInsert 查询数据开始========");
+        long start1 = System.currentTimeMillis();
+        //获取所有核酸数据源
+        List<TSampling514> TSampling514List = accountingDataService.getTSampling514AllData(startTime,endTime);
+        //获取所有户籍数据
+        //List<Czrk> czrks = czrkMapper.listByCzrk(new Czrk());
+
+        long end1 = System.currentTimeMillis();
+        System.out.println("---------------查询数据耗时" + (end1 - start1) + "---------------");
+
+        //List<Czrk> czrkList = new ArrayList<>();
+        System.out.println("batchInsert 循环数据开始========");
+        long start2 = System.currentTimeMillis();
+        for (TSampling514 tSampling514 : TSampling514List) {
+            if(tSampling514.getCollectTime() != null){
+                Czrk czrk = new Czrk();
+                czrk.setNucleicAcidTime(String.valueOf(tSampling514.getCollectTime()));
+                czrk.setIdCard(tSampling514.getIdCard());
+                czrkMapper.updateCzrkByNucleicAcid(czrk);
+                //czrkList.add(czrk);
+            }
+
+        }
+
+        long end2 = System.currentTimeMillis();
+        System.out.println("---------------循环数据耗时"+(end2 -start2)+"---------------");
+    }
+
+
+
     /***
      * 核酸统计
      */

boman-web-core/src/main/java/com/boman/web/core/service/accounting/AccountingDataServiceImpl.java

@@ -19,9 +19,11 @@ import com.boman.domain.SysUser;
 import com.boman.domain.dto.AjaxResult;
 import com.boman.system.api.RemoteDeptService;
 import com.boman.web.core.domain.AccountingData;
+import com.boman.web.core.domain.TSampling514;
 import com.boman.web.core.domain.vo.AccountingDataVo;
 import com.boman.web.core.mapper.AccountingDataMapper;
 import com.boman.web.core.mapper.CzrkMapper;
+import com.boman.web.core.mapper.TSampling514Mapper;
 import com.boman.web.core.utils.*;
 import com.boman.web.core.utils.AuthUtils;
 import com.boman.web.core.utils.CzrkUtils;
@@ -61,6 +63,9 @@ public class AccountingDataServiceImpl implements IAccountingDataService {
     @Resource
     private CzrkMapper czrkMapper;
 
+    @Resource
+    private TSampling514Mapper TSampling514Mapper;
+
     /**
      * 潜山核酸数据列表页(户籍地址)
      *
@@ -274,28 +279,41 @@ public class AccountingDataServiceImpl implements IAccountingDataService {
      * @return
      */
     @Override
-    public int insertAccountingData(List<AccountingData> accountingDataList) {
+    public int insertAccountingData(List<AccountingData> accountingDataList,AccountingDataVo accountingDatav) {
         SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH,false);
         AccountingDataMapper mapper = sqlSession.getMapper(AccountingDataMapper.class);
 
         System.out.println("batchInsert 插入开始========");
         long start = System.currentTimeMillis();
         Czrk czrk = new Czrk();
+
+        Boolean bl = false;
+        if(accountingDatav == null){
+            bl = true;
+        }
+
         for (int i = 0; i < accountingDataList.size(); i++) {
-            AccountingData accountingData = accountingDataList.get(i);
-            String zjhm = accountingData.getZjhm();
-            if (StringUtils.isNotBlank(zjhm)){
-                czrk.setIdCard(zjhm);
-                czrk.setNucleicAcidTime(accountingData.getCjsj());
-                //去更新常住人口表中数据
-                czrkMapper.updateCzrkByNucleicAcid(czrk);
-            }
-            String mainKey = accountingData.getMainKey();
-            accountingData.setId(mainKey);
-            int result = mapper.selectById(mainKey);
-            if (result == 0){
-                mapper.insertAccountingData(accountingData);
+            if(bl){
+                AccountingData accountingData = accountingDataList.get(i);
+                String zjhm = accountingData.getZjhm();
+                if (StringUtils.isNotBlank(zjhm)){
+                    czrk.setIdCard(zjhm);
+                    czrk.setNucleicAcidTime(accountingData.getCjsj());
+                    //去更新常住人口表中数据
+                    czrkMapper.updateCzrkByNucleicAcid(czrk);
+                }
+                String mainKey = accountingData.getMainKey();
+                accountingData.setId(mainKey);
+                int result = accountingDataMapper.selectById(mainKey);
+                if (result == 0){
+                    accountingDataMapper.insertAccountingData(accountingData);
+                }
+            }else{
+                if(accountingDataList.get(i).getZjhm().equals(accountingDatav.getZjhm())){
+                    bl = true;
+                }
             }
+
         }
         sqlSession.flushStatements();
         long end = System.currentTimeMillis();
@@ -307,4 +325,14 @@ public class AccountingDataServiceImpl implements IAccountingDataService {
     public AccountingDataVo getAccountingDataOne() {
         return accountingDataMapper.getAccountingDataOne();
     }
+
+    @Override
+    public List<AccountingDataVo> getAllData() {
+        return accountingDataMapper.getAllData();
+    }
+
+    @Override
+    public List<TSampling514> getTSampling514AllData(String startTime,String endTime) {
+        return TSampling514Mapper.getTSampling514AllData(startTime,endTime);
+    }
 }

boman-web-core/src/main/java/com/boman/web/core/service/accounting/IAccountingDataService.java

@@ -2,6 +2,7 @@ package com.boman.web.core.service.accounting;
 
 import com.boman.domain.dto.AjaxResult;
 import com.boman.web.core.domain.AccountingData;
+import com.boman.web.core.domain.TSampling514;
 import com.boman.web.core.domain.vo.AccountingDataVo;
 
 import java.io.IOException;
@@ -40,7 +41,11 @@ public interface IAccountingDataService {
      * @param accountingDataVoList
      * @return
      */
-    int insertAccountingData(List<AccountingData> accountingDataVoList);
+    int insertAccountingData(List<AccountingData> accountingDataVoList,AccountingDataVo accountingData);
 
     AccountingDataVo getAccountingDataOne();
+
+    List<AccountingDataVo> getAllData();
+
+    List<TSampling514> getTSampling514AllData(String startTime,String endTime);
 }

boman-web-core/src/main/java/com/boman/web/core/service/czrk/CzrkServiceImpl.java

@@ -1281,10 +1281,9 @@ public class CzrkServiceImpl implements ICzrkService {
             List<String> roleKeySets = map(sysUser.getRoles(), SysRole::getRoleKey);
             if (roleKeySets.contains("province") || roleKeySets.contains("city") || roleKeySets.contains("region") || roleKeySets.contains("admin") || roleKeySets.contains("yanshi")) {
                 List<SysDept> allDepts = remoteDeptService.listChildrenDepts(1L);
-                //查找潜山市户籍人口总数
+                //查找户籍人口总数
                 List<Czrk> czrkList = czrkMapper.getAllCzrkRegionId("340882000000");
 
-
                /* //潜山市户籍人口总数
                 int hjzrs = czrkList.size();
 

boman-web-core/src/main/java/com/boman/web/core/utils/CzrkUtils.java

@@ -372,4 +372,7 @@ public class CzrkUtils {
         }
         return flag;
     }
+
+
+
 }

boman-web-core/src/main/resources/mapper/AccountingDateMapper.xml

@@ -159,4 +159,7 @@
     <select id="getAccountingDataOne" resultMap="AccountingDataResult">
         select id,cjsj,lxdh,create_date,modify_date FROM accounting_data order by cjsj desc limit 1;
     </select>
+    <select id="getAllData" resultMap="AccountingDataResult">
+        select id,cjsj,lxdh,create_date,zjhm,xm FROM accounting_data
+    </select>
 </mapper>

boman-web-core/src/main/resources/mapper/CzrkMapper.xml

@@ -53,6 +53,7 @@
         <result property="isDel" column="is_del"/>
         <result property="deleteReason" column="delete_reason"/>
         <result property="isNucleicAcid" column="is_nucleicAcid"/>
+        <result property="nucleicAcidTime" column="nucleicAcid_time"/>
 
 
         <result property="provinceXjd" column="provinceXjd"/>
@@ -113,7 +114,7 @@
     <select id="listByCzrk" resultMap="CzrkResult">
         select id, user_name, phone_num, id_card, gender, province, city, region, village_towns, village,
         villager_group, grid_id, house_type, code,is_rl,
-        rlr,rlr_nike,now_in,is_confirm,confirm_info_user,confirm_info_nike_user,confirm_info_user_time
+        rlr,rlr_nike,now_in,is_confirm,confirm_info_user,confirm_info_nike_user,confirm_info_user_time,is_nucleicAcid,nucleicAcid_time
         from czrk
         <where>
             is_del = 'N'
@@ -1033,16 +1034,27 @@
     <update id="confirmInfoByIds">
         update czrk
         <trim prefix="SET" suffixOverrides=",">
-            is_confirm = 'Y',
-            <if test="userName != null and userName !=''">confirm_info_user = #{userName},</if>
-            confirm_info_user_time = sysdate()
+            is_confirm = 'Y'
         </trim>
         where id in
-        <foreach collection="ids" item="id" open="(" separator="," close=")">
-            #{id}
+        <foreach collection="czrkList" item="czrk" open="(" separator="," close=")">
+            #{czrk.id}
         </foreach>
     </update>
 
+
+    <update id="updateCzrkHs">
+        <foreach collection="czrkList" item="czrk" index="index" open="" close="" separator=";">
+            update czrk
+            <set>
+                is_nucleicAcid= 'Y',
+                nucleicAcid_time = ${czrk.nucleicAcidTime}
+            </set>
+            where id_card = ${czrk.idCard}
+        </foreach>
+    </update>
+
+
     <insert id="insertConfirmInfoUser" useGeneratedKeys="true" keyProperty="id">
         insert into confim_info_user
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -1236,7 +1248,7 @@
         z.province as provinceXjd, z.city as cityXjd,z.region as regionXjd, z.town as villageTownsXjd, z.village as
         villageXjd,z.now_in,
         c.gender, c.grid_id, c.house_type, c.update_by, c.code, c.rlr,c.rlr_nike,
-        c.is_confirm,c.confirm_info_user,c.confirm_info_nike_user,c.confirm_info_user_time
+        c.is_confirm,c.confirm_info_user,c.confirm_info_nike_user,c.confirm_info_user_time,c.is_nucleicAcid,c.nucleicAcid_time
         from czrk c left join czrk_jzdz z on c.id =z.czrk_id
         <where>
             c.is_del = 'N'

boman-web-core/src/main/resources/mapper/TSampling514Mapper.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.boman.web.core.mapper.TSampling514Mapper">
+
+    <resultMap type="com.boman.web.core.domain.TSampling514" id="TSampling514Result">
+        <result property="oid" column="oid"/>
+        <result property="name" column="name"/>
+        <result property="idCard" column="id_card"/>
+        <result property="tel" column="address"/>
+        <result property="collectOid" column="collect_oid"/>
+        <result property="collectTime" column="collect_time"/>
+        <result property="verifyOid" column="verify_oid"/>
+        <result property="verifyFinishTime" column="verify_finish_time"/>
+        <result property="verifyResult" column="verify_result"/>
+        <result property="mixOid" column="mix_oid"/>
+        <result property="type" column="type"/>
+        <result property="objectDistrictOid" column="object_district_oid"/>
+        <result property="objectDistrictName" column="object_district_name"/>
+        <result property="objectAddress" column="object_address"/>
+        <result property="createDate" column="create_date"/>
+        <result property="modifyDate" column="modify_date"/>
+        <result property="source" column="source"/>
+        <result property="batchNumber" column="batch_number"/>
+        <result property="collectorName" column="collector_name"/>
+        <result property="useFlag" column="use_flag"/>
+        <result property="verifyPointName" column="verify_point_name"/>
+        <result property="certificateNoType" column="certificate_no_type"/>
+        <result property="focusPerson" column="focus_person"/>
+        <result property="fromCity" column="from_city"/>
+        <result property="toCity" column="to_city"/>
+        <result property="address" column="address"/>
+        <result property="transit" column="transit"/>
+    </resultMap>
+
+    <select id="getTSampling514AllData" resultMap="TSampling514Result">
+        select id_card,collect_time from t_sampling_514
+        where str_to_date(collect_time,'%Y-%m-%d %H:%i:%S') >= #{startTime}
+        and #{endTime} > str_to_date(collect_time,'%Y-%m-%d %H:%i:%S')
+    </select>
+
+
+</mapper>