Преглед на файлове

fix 处理常住人口数据

tjf преди 3 години
родител
ревизия
f9bbd9e414

+ 116 - 13
boman-web-core/src/main/java/com/boman/web/core/controller/TestController.java

@@ -3,16 +3,19 @@ package com.boman.web.core.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.boman.common.core.utils.obj.ObjectUtils;
 import com.boman.domain.Czrk;
+import com.boman.domain.CzrkJzdz;
 import com.boman.domain.VaccineInfoOperation;
 import com.boman.domain.dto.AjaxResult;
-import com.boman.web.core.mapper.StandardlyMapper;
-import com.boman.web.core.mapper.VaccineInfoMapper;
+import com.boman.web.core.domain.SysRegion;
+import com.boman.web.core.mapper.*;
 import com.boman.web.core.service.vaccineInfo.IVaccineInfoService;
 import com.boman.web.core.service.vaccineInfo.impl.VaccineInfoServiceImpl;
 import com.boman.web.core.utils.IdUtils;
 import com.google.common.base.Strings;
 import org.apache.commons.lang3.StringUtils;
+import org.checkerframework.checker.units.qual.A;
 import org.checkerframework.checker.units.qual.C;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -32,6 +35,14 @@ public class TestController {
     @Resource
     private VaccineInfoMapper mapper;
 
+    @Autowired
+    private SysRegionMapper sysRegionMapper;
+
+    @Autowired
+    private CzrkMapper czrkMapper;
+
+    @Autowired
+    private CzrkJzdzMapper czrkJzdzMapper;
     @GetMapping("/handleData")
     public AjaxResult handleData() {
         List<VaccineInfoOperation> list = mapper.handleData();
@@ -76,12 +87,12 @@ public class TestController {
      * 处理常驻人口数据
      * @return
      */
-    @PostMapping("/setCzrksetCzrk")
+    @PostMapping("/setCzrk")
     public AjaxResult setCzrk() {
         //587731
         for (int i = 0; i < 59; i++) {
-            int startPage = i*10000;
-            int endPage = 10000;
+            int startPage = i*1;
+            int endPage = 1;
             List<VaccineInfoOperation> vaccineInfoOperations = mapper.selectVaccineInfoListByPage(startPage, endPage);
             if (vaccineInfoOperations.size() > 0){
                 for (VaccineInfoOperation vaccineInfoOperation : vaccineInfoOperations) {
@@ -98,19 +109,111 @@ public class TestController {
                     czrk.setRlr(vaccineInfoOperation.getRlr());
                     czrk.setYhzgx(vaccineInfoOperation.getYhzgx());
                     czrk.setWorkUnit(vaccineInfoOperation.getWorkUnit());
+                    //户籍地镇
                     String villageTowns = vaccineInfoOperation.getVillageTowns();
-                    if (StringUtils.isNotEmpty(villageTowns)){
+                    if (StringUtils.isNotBlank(villageTowns)){
+                        czrk.setIsRl("是");
+                        List<SysRegion> sysRegions = sysRegionMapper.selectSysRegionByName(villageTowns);
+                        if (sysRegions .size() > 0){
+                            for (SysRegion sysRegion : sysRegions) {
+                                if ("340882000000".equals(sysRegion.getPid().toString())){
+                                    czrk.setVillageTownsId(sysRegion.getAreaId().toString());
+                                    czrk.setVillageTowns(villageTowns);
+                                }
+                            }
+                        }
+                    }
+                    String villagerGroup = vaccineInfoOperation.getVillagerGroup();
+                    if (StringUtils.isNotBlank(villagerGroup)){
+                        List<SysRegion> sysRegions = sysRegionMapper.selectSysRegionByName(villagerGroup);
+                        if (sysRegions .size() > 0){
+                            for (SysRegion sysRegion : sysRegions) {
+                                if (czrk.getVillageTownsId().equals(sysRegion.getPid().toString())){
+                                    czrk.setVillageId(sysRegion.getAreaId().toString());
+                                    czrk.setVillageTowns(villagerGroup);
+                                }
+                            }
+                        }
+                    }
+                    czrk.setIsDel(vaccineInfoOperation.getIsDel());
+                    czrk.setDeleteReason(vaccineInfoOperation.getDeleteReason());
+                    czrk.setNowIn(vaccineInfoOperation.getDomicile());
+                    czrk.setRemark(vaccineInfoOperation.getRemark());
+                    czrk.setCreateBy("admin");
+                    czrkMapper.insertCzrk(czrk);
+
+                    CzrkJzdz czrkJzdz = new CzrkJzdz();
+                    czrkJzdz.setCzrkId(czrk.getId());
+                    czrkJzdz.setIdCard(vaccineInfoOperation.getIdCard());
+                    czrkJzdz.setUserName(vaccineInfoOperation.getUserName());
+                    czrkJzdz.setDeptId(vaccineInfoOperation.getDeptId());
+                    //现在居住地省
+                    String province = vaccineInfoOperation.getProvince();
+                    if (StringUtils.isNotBlank(province)){
+                        List<SysRegion> sysRegions = sysRegionMapper.selectSysRegionByName(province);
+                        if (sysRegions.size() > 0){
+                            czrkJzdz.setProvinceId(sysRegions.get(0).getAreaId().toString());
+                            czrkJzdz.setProvince(province);
+                        }
+                    }
+                    //现在居住地市
+                    String city = vaccineInfoOperation.getCity();
+                    if (StringUtils.isNotBlank(city)){
+                        List<SysRegion> sysRegions = sysRegionMapper.selectSysRegionByName(city);
+                        if (sysRegions.size() > 0){
+                            czrkJzdz.setCityId(sysRegions.get(0).getAreaId().toString());
+                            czrkJzdz.setCity(city);
+                        }
+                    }
 
+                    //现在居住地区
+                    String region = vaccineInfoOperation.getRegion();
+                    if (StringUtils.isNotBlank(region)){
+                        List<SysRegion> sysRegions = sysRegionMapper.selectSysRegionByName(region);
+                        if (sysRegions.size() > 0){
+                            for (SysRegion sysRegion : sysRegions) {
+                                if (czrkJzdz.getCityId().equals(sysRegion.getPid().toString())){
+                                    czrkJzdz.setRegionId(sysRegion.getAreaId().toString());
+                                    czrkJzdz.setRegion(region);
+                                }
+                            }
+                        }
                     }
-                }
 
+                    //居住地的镇
+                    String residenceTown = vaccineInfoOperation.getResidenceTown();
+                    if (StringUtils.isNotBlank(residenceTown)){
+                        List<SysRegion> sysRegions = sysRegionMapper.selectSysRegionByName(residenceTown);
+                        if (sysRegions .size() > 0){
+                            for (SysRegion sysRegion : sysRegions) {
+                                if (czrkJzdz.getRegionId().equals(sysRegion.getPid().toString())){
+                                    czrkJzdz.setTownId(sysRegion.getAreaId().toString());
+                                    czrkJzdz.setTown(residenceTown);
+                                }
+                            }
+                        }
+                    }
+
+                    //居住地的村
+                    String residenceVillage = vaccineInfoOperation.getResidenceVillage();
+                    if (StringUtils.isNotBlank(residenceVillage)){
+                        List<SysRegion> sysRegions = sysRegionMapper.selectSysRegionByName(residenceVillage);
+                        if (sysRegions .size() > 0){
+                            for (SysRegion sysRegion : sysRegions) {
+                                if (czrkJzdz.getTownId().equals(sysRegion.getPid().toString())){
+                                    czrkJzdz.setVillageId(sysRegion.getAreaId().toString());
+                                    czrkJzdz.setVillage(residenceVillage);
+                                }
+                            }
+                        }
+                    }
+                    czrkJzdz.setNowIn(vaccineInfoOperation.getNowIn());
+                    czrkJzdz.setCreateBy("admin");
+                    czrkJzdzMapper.insertCzrkJzdz(czrkJzdz);
+                }
             }
+            System.out.println("处理完成"+startPage+"数据");
         }
-
-        return  AjaxResult.success();
-    }
-
-    public static void main(String[] args) {
-
+        return  AjaxResult.success("全部完成");
     }
 }

+ 3 - 0
boman-web-core/src/main/java/com/boman/web/core/mapper/SysRegionMapper.java

@@ -3,6 +3,7 @@ package com.boman.web.core.mapper;
 import com.boman.domain.VaccineInfoUser;
 import com.boman.web.core.domain.SysRegion;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -25,4 +26,6 @@ public interface SysRegionMapper {
      * @return
      */
     List<SysRegion> selectSysRegion(SysRegion sysRegion);
+
+    List<SysRegion> selectSysRegionByName(@Param("name")String name);
 }

+ 3 - 0
boman-web-core/src/main/java/com/boman/web/core/mapper/VaccineInfoMapper.java

@@ -135,4 +135,7 @@ public interface VaccineInfoMapper
 
     int setHouseType(@Param("idCard") String idCard, @Param("code") String code
     , @Param("yhzgx") String yhzgx, @Param("houseType") String houseType);
+
+
+
 }

+ 3 - 3
boman-web-core/src/main/resources/mapper/CzrkJzdzMapper.xml

@@ -81,10 +81,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="village != null">village,</if>
             <if test="nowIn != null">now_in,</if>
             <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="status != null">status,</if>
+            create_time
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="czrkId != null">#{czrkId},</if>
@@ -104,11 +104,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="village != null">#{village},</if>
             <if test="nowIn != null">#{nowIn},</if>
             <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="status != null">#{status},</if>
-         </trim>
+            sysdate()
+        </trim>
     </insert>
 
     <update id="updateCzrkJzdz" >

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

@@ -115,11 +115,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remark != null">remark,</if>
             <if test="status != null">status,</if>
             <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="isDel != null and isDel != ''">is_del,</if>
             <if test="deleteReason != null">delete_reason,</if>
+            create_time
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="userName != null">#{userName},</if>
@@ -150,12 +150,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remark != null">#{remark},</if>
             <if test="status != null">#{status},</if>
             <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="isDel != null and isDel != ''">#{isDel},</if>
             <if test="deleteReason != null">#{deleteReason},</if>
-         </trim>
+            sysdate()
+        </trim>
     </insert>
 
     <update id="updateCzrk" >

+ 4 - 0
boman-web-core/src/main/resources/mapper/SysRegionMapper.xml

@@ -18,4 +18,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select area_id,name,pid,sort from china_area where pid = #{pid}
     </select>
 
+    <select id="selectSysRegionByName" parameterType="string" resultMap="SysRegionResult">
+        select area_id,name,pid,sort from china_area where name = #{name} limit 1
+    </select>
+
 </mapper>