Merge remote-tracking branch 'origin/master'

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

@@ -43,6 +43,7 @@ public class TestController {
 
     @Autowired
     private CzrkJzdzMapper czrkJzdzMapper;
+
     @GetMapping("/handleData")
     public AjaxResult handleData() {
         List<VaccineInfoOperation> list = mapper.handleData();
@@ -85,135 +86,152 @@ public class TestController {
 
     /**
      * 处理常驻人口数据
+     *
      * @return
      */
     @PostMapping("/setCzrk")
     public AjaxResult setCzrk() {
         //587731
         for (int i = 0; i < 59; i++) {
-            int startPage = i*10000;
+            int startPage = i * 10000;
             int endPage = 10000;
             List<VaccineInfoOperation> vaccineInfoOperations = mapper.selectVaccineInfoListByPage(startPage, endPage);
-            if (vaccineInfoOperations.size() > 0){
+            if (vaccineInfoOperations.size() > 0) {
                 for (VaccineInfoOperation vaccineInfoOperation : vaccineInfoOperations) {
-                    Czrk czrk = new Czrk();
-                    czrk.setUserName(vaccineInfoOperation.getUserName());
-                    czrk.setGender(vaccineInfoOperation.getGender());
-                    czrk.setAge(vaccineInfoOperation.getAge());
-                    czrk.setBirthday(vaccineInfoOperation.getBirthday());
-                    czrk.setDeptId(vaccineInfoOperation.getDeptId());
-                    czrk.setIdCard(vaccineInfoOperation.getIdCard());
-                    czrk.setPhoneNum(vaccineInfoOperation.getPhoneNum());
-                    czrk.setCode(vaccineInfoOperation.getCode());
-                    czrk.setHouseType(vaccineInfoOperation.getHouseType());
-                    czrk.setRlr(vaccineInfoOperation.getRlr());
-                    czrk.setYhzgx(vaccineInfoOperation.getYhzgx());
-                    czrk.setWorkUnit(vaccineInfoOperation.getWorkUnit());
-                    //户籍地镇
-                    String villageTowns = vaccineInfoOperation.getVillageTowns();
-                    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());
-                                    czrk.setVillageTowns(villageTowns);
+                    if (vaccineInfoOperation != null) {
+                        Czrk czrk = new Czrk();
+                        czrk.setUserName(vaccineInfoOperation.getUserName());
+                        czrk.setGender(vaccineInfoOperation.getGender());
+                        czrk.setAge(vaccineInfoOperation.getAge());
+                        czrk.setBirthday(vaccineInfoOperation.getBirthday());
+                        czrk.setDeptId(vaccineInfoOperation.getDeptId());
+                        czrk.setIdCard(vaccineInfoOperation.getIdCard());
+                        czrk.setPhoneNum(vaccineInfoOperation.getPhoneNum());
+                        czrk.setCode(vaccineInfoOperation.getCode());
+                        czrk.setHouseType(vaccineInfoOperation.getHouseType());
+                        czrk.setRlr(vaccineInfoOperation.getRlr());
+                        czrk.setYhzgx(vaccineInfoOperation.getYhzgx());
+                        czrk.setWorkUnit(vaccineInfoOperation.getWorkUnit());
+                        //户籍地镇
+                        String villageTowns = vaccineInfoOperation.getVillageTowns();
+                        if (StringUtils.isNotBlank(villageTowns)) {
+                            czrk.setIsRl("是");
+                            List<SysRegion> sysRegions = sysRegionMapper.selectSysRegionByName(villageTowns);
+                            if (sysRegions.size() > 0) {
+                                for (SysRegion sysRegion : sysRegions) {
+                                    if (sysRegion != null) {
+                                        Long pid = sysRegion.getPid();
+                                        if (pid != null) {
+                                            if ("340882000000".equals(pid.toString())) {
+                                                czrk.setVillageTownsId(sysRegion.getAreaId());
+                                                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());
-                                    czrk.setVillageTowns(villagerGroup);
+                        String villagerGroup = vaccineInfoOperation.getVillagerGroup();
+                        if (StringUtils.isNotBlank(villagerGroup)) {
+                            List<SysRegion> sysRegions = sysRegionMapper.selectSysRegionByName(villagerGroup);
+                            if (sysRegions.size() > 0) {
+                                for (SysRegion sysRegion : sysRegions) {
+                                    if (sysRegion != null) {
+                                        if (czrk.getVillageTownsId().equals(sysRegion.getPid())) {
+                                            czrk.setVillageId(sysRegion.getAreaId());
+                                            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());
-                            czrkJzdz.setProvince(province);
+                        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());
+                                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());
-                            czrkJzdz.setCity(city);
+                        //现在居住地市
+                        String city = vaccineInfoOperation.getCity();
+                        if (StringUtils.isNotBlank(city)) {
+                            List<SysRegion> sysRegions = sysRegionMapper.selectSysRegionByName(city);
+                            if (sysRegions.size() > 0) {
+                                czrkJzdz.setCityId(sysRegions.get(0).getAreaId());
+                                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());
-                                    czrkJzdz.setRegion(region);
+                        //现在居住地区
+                        String region = vaccineInfoOperation.getRegion();
+                        if (StringUtils.isNotBlank(region)) {
+                            List<SysRegion> sysRegions = sysRegionMapper.selectSysRegionByName(region);
+                            if (sysRegions.size() > 0) {
+                                for (SysRegion sysRegion : sysRegions) {
+                                    if (sysRegion != null) {
+                                        if (czrkJzdz.getCityId().equals(sysRegion.getPid())) {
+                                            czrkJzdz.setRegionId(sysRegion.getAreaId());
+                                            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());
-                                    czrkJzdz.setTown(residenceTown);
+                        //居住地的镇
+                        String residenceTown = vaccineInfoOperation.getResidenceTown();
+                        if (StringUtils.isNotBlank(residenceTown)) {
+                            List<SysRegion> sysRegions = sysRegionMapper.selectSysRegionByName(residenceTown);
+                            if (sysRegions.size() > 0) {
+                                for (SysRegion sysRegion : sysRegions) {
+                                    if (sysRegion != null) {
+                                        if (czrkJzdz.getRegionId().equals(sysRegion.getPid())) {
+                                            czrkJzdz.setTownId(sysRegion.getAreaId());
+                                            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());
-                                    czrkJzdz.setVillage(residenceVillage);
+                        //居住地的村
+                        String residenceVillage = vaccineInfoOperation.getResidenceVillage();
+                        if (StringUtils.isNotBlank(residenceVillage)) {
+                            List<SysRegion> sysRegions = sysRegionMapper.selectSysRegionByName(residenceVillage);
+                            if (sysRegions.size() > 0) {
+                                for (SysRegion sysRegion : sysRegions) {
+                                    if (sysRegion != null) {
+                                        if (czrkJzdz.getTownId().equals(sysRegion.getPid())) {
+                                            czrkJzdz.setVillageId(sysRegion.getAreaId());
+                                            czrkJzdz.setVillage(residenceVillage);
+                                        }
+                                    }
                                 }
                             }
                         }
+                        czrkJzdz.setNowIn(vaccineInfoOperation.getNowIn());
+                        czrkJzdz.setCreateBy("admin");
+                        czrkJzdzMapper.insertCzrkJzdz(czrkJzdz);
                     }
-                    czrkJzdz.setNowIn(vaccineInfoOperation.getNowIn());
-                    czrkJzdz.setCreateBy("admin");
-                    czrkJzdzMapper.insertCzrkJzdz(czrkJzdz);
                 }
             }
-            System.out.println("处理完成"+startPage+"数据");
+            System.out.println("处理完成" + startPage + "数据");
         }
-        return  AjaxResult.success("全部完成");
+        return AjaxResult.success("全部完成");
     }
 }

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

@@ -10,6 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="gender"    column="gender"    />
         <result property="age"    column="age"    />
         <result property="birthday"    column="birthday"    />
+        <result property="deptId"    column="dept_id"    />
         <result property="idCard"    column="id_card"    />
         <result property="phoneNum"    column="phone_num"    />
         <result property="code"    column="code"    />
@@ -43,14 +44,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCzrkVo">
-        select id, user_name, gender, age, birthday, id_card, phone_num, code, house_type, rlr, rl_time, yhzgx
+        select id, user_name, gender, age, birthday,dept_id, id_card, phone_num, code, house_type, rlr, rl_time, yhzgx
              , work_unit, province_id, province, city_id, city, region_id, region, village_towns_id, village_towns
              , village_id, village, villager_group_id, villager_group, now_in, remark, status, create_by, create_time
              , update_by, update_time, is_del, delete_reason, dept_id, is_rl from czrk
     </sql>
 
     <select id="listByRlry"  resultMap="CzrkResult">
-        select id, user_name, phone_num, id_card, gender, province, city, region
+        select id, user_name, phone_num,dept_id, id_card, gender, province, city, region
         , house_type, update_by, code, rlr, update_time, delete_reason, now_in
         from czrk
         <where>
@@ -368,6 +369,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="gender != null">gender,</if>
             <if test="age != null">age,</if>
             <if test="birthday != null">birthday,</if>
+            <if test="deptId != null">dept_id,</if>
             <if test="idCard != null">id_card,</if>
             <if test="phoneNum != null">phone_num,</if>
             <if test="code != null">code,</if>
@@ -402,6 +404,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="gender != null">#{gender},</if>
             <if test="age != null">#{age},</if>
             <if test="birthday != null">#{birthday},</if>
+            <if test="deptId != null">#{deptId},</if>
             <if test="idCard != null">#{idCard},</if>
             <if test="phoneNum != null">#{phoneNum},</if>
             <if test="code != null">#{code},</if>