fix 查询区域信息

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

@@ -89,186 +89,189 @@ public class TestController {
      *
      * @return
      */
-    //@PostMapping("/setCzrk")
+    @PostMapping("/setCzrk")
     public AjaxResult setCzrk() {
         //587731
-        int id = 593891;
-        List<VaccineInfoOperation> vaccineInfoOperations = mapper.selectVaccineInfoListById(id);
-        if (vaccineInfoOperations.size() > 0) {
-            for (VaccineInfoOperation vaccineInfoOperation : vaccineInfoOperations) {
-                if (vaccineInfoOperation != null) {
-                    Czrk czrk = new Czrk();
-                    String userName = vaccineInfoOperation.getUserName();
-                    if (!userName.contains("测试") && userName.length() < 5) {
-                        czrk.setUserName(userName);
-                        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);
+        for (int i = 0; i < 59; i++) {
+            int startPage = i*10000;
+            int endPage = 10000;
+            List<VaccineInfoOperation> vaccineInfoOperations = mapper.selectVaccineInfoListByPage(startPage,endPage);
+            if (vaccineInfoOperations.size() > 0) {
+                for (VaccineInfoOperation vaccineInfoOperation : vaccineInfoOperations) {
+                    if (vaccineInfoOperation != null) {
+                        Czrk czrk = new Czrk();
+                        String userName = vaccineInfoOperation.getUserName();
+                        if (!userName.contains("测试") && userName.length() < 6) {
+                            czrk.setUserName(userName);
+                            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() > 1) {
-                                for (SysRegion sysRegion : sysRegions) {
-                                    if (sysRegion != null) {
-                                        Long villageTownsId = czrk.getVillageTownsId();
-                                        if (villageTownsId != null && villageTownsId.equals(sysRegion.getPid())) {
-                                            czrk.setVillageId(sysRegion.getAreaId());
-                                            czrk.setVillageTowns(villagerGroup);
+                            String villagerGroup = vaccineInfoOperation.getVillagerGroup();
+                            if (StringUtils.isNotBlank(villagerGroup)) {
+                                List<SysRegion> sysRegions = sysRegionMapper.selectSysRegionByName(villagerGroup);
+                                if (sysRegions.size() > 1) {
+                                    for (SysRegion sysRegion : sysRegions) {
+                                        if (sysRegion != null) {
+                                            Long villageTownsId = czrk.getVillageTownsId();
+                                            if (villageTownsId != null && villageTownsId.equals(sysRegion.getPid())) {
+                                                czrk.setVillageId(sysRegion.getAreaId());
+                                                czrk.setVillageTowns(villagerGroup);
+                                            }
                                         }
                                     }
-                                }
-                            } else if (sysRegions.size() == 1) {
-                                SysRegion sysRegion = sysRegions.get(0);
-                                if (sysRegion != null) {
-                                    czrk.setVillageId(sysRegion.getAreaId());
-                                    czrk.setVillageTowns(villagerGroup);
+                                } else if (sysRegions.size() == 1) {
+                                    SysRegion sysRegion = sysRegions.get(0);
+                                    if (sysRegion != null) {
+                                        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);
+                            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) {
-                                SysRegion sysRegion = sysRegions.get(0);
-                                if (sysRegion != null) {
-                                    czrkJzdz.setProvinceId(sysRegion.getAreaId());
-                                    czrkJzdz.setProvince(province);
-                                }
+                            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) {
+                                    SysRegion sysRegion = sysRegions.get(0);
+                                    if (sysRegion != null) {
+                                        czrkJzdz.setProvinceId(sysRegion.getAreaId());
+                                        czrkJzdz.setProvince(province);
+                                    }
 
+                                }
                             }
-                        }
-                        //现在居住地市
-                        String city = vaccineInfoOperation.getCity();
-                        if (StringUtils.isNotBlank(city)) {
-                            List<SysRegion> sysRegions = sysRegionMapper.selectSysRegionByName(city);
-                            if (sysRegions.size() > 0) {
-                                SysRegion sysRegion = sysRegions.get(0);
-                                if (sysRegion != null) {
-                                    czrkJzdz.setCityId(sysRegion.getAreaId());
-                                    czrkJzdz.setCity(city);
+                            //现在居住地市
+                            String city = vaccineInfoOperation.getCity();
+                            if (StringUtils.isNotBlank(city)) {
+                                List<SysRegion> sysRegions = sysRegionMapper.selectSysRegionByName(city);
+                                if (sysRegions.size() > 0) {
+                                    SysRegion sysRegion = sysRegions.get(0);
+                                    if (sysRegion != null) {
+                                        czrkJzdz.setCityId(sysRegion.getAreaId());
+                                        czrkJzdz.setCity(city);
+                                    }
                                 }
                             }
-                        }
 
-                        //现在居住地区
-                        String region = vaccineInfoOperation.getRegion();
-                        if (StringUtils.isNotBlank(region)) {
-                            List<SysRegion> sysRegions = sysRegionMapper.selectSysRegionByName(region);
-                            //如果有多个区,名字相同的,切没有市的信息,则不赋值
-                            if (sysRegions.size() > 1) {
-                                for (SysRegion sysRegion : sysRegions) {
-                                    if (sysRegion != null) {
-                                        Long cityId = czrkJzdz.getCityId();
-                                        if (cityId != null) {
-                                            if (cityId.equals(sysRegion.getPid())) {
-                                                czrkJzdz.setRegionId(sysRegion.getAreaId());
-                                                czrkJzdz.setRegion(region);
+                            //现在居住地区
+                            String region = vaccineInfoOperation.getRegion();
+                            if (StringUtils.isNotBlank(region)) {
+                                List<SysRegion> sysRegions = sysRegionMapper.selectSysRegionByName(region);
+                                //如果有多个区,名字相同的,切没有市的信息,则不赋值
+                                if (sysRegions.size() > 1) {
+                                    for (SysRegion sysRegion : sysRegions) {
+                                        if (sysRegion != null) {
+                                            Long cityId = czrkJzdz.getCityId();
+                                            if (cityId != null) {
+                                                if (cityId.equals(sysRegion.getPid())) {
+                                                    czrkJzdz.setRegionId(sysRegion.getAreaId());
+                                                    czrkJzdz.setRegion(region);
+                                                }
                                             }
                                         }
                                     }
-                                }
-                            } else if (sysRegions.size() == 1) {
-                                SysRegion sysRegion = sysRegions.get(0);
-                                if (sysRegion != null) {
-                                    czrkJzdz.setRegionId(sysRegion.getAreaId());
-                                    czrkJzdz.setRegion(region);
+                                } else if (sysRegions.size() == 1) {
+                                    SysRegion sysRegion = sysRegions.get(0);
+                                    if (sysRegion != null) {
+                                        czrkJzdz.setRegionId(sysRegion.getAreaId());
+                                        czrkJzdz.setRegion(region);
+                                    }
                                 }
                             }
-                        }
 
-                        //居住地的镇
-                        String residenceTown = vaccineInfoOperation.getResidenceTown();
-                        if (StringUtils.isNotBlank(residenceTown)) {
-                            List<SysRegion> sysRegions = sysRegionMapper.selectSysRegionByName(residenceTown);
-                            if (sysRegions.size() > 1) {
-                                for (SysRegion sysRegion : sysRegions) {
-                                    if (sysRegion != null) {
-                                        Long regionId = czrkJzdz.getRegionId();
-                                        if (regionId != null && regionId.equals(sysRegion.getPid())) {
-                                            czrkJzdz.setTownId(sysRegion.getAreaId());
-                                            czrkJzdz.setTown(residenceTown);
+                            //居住地的镇
+                            String residenceTown = vaccineInfoOperation.getResidenceTown();
+                            if (StringUtils.isNotBlank(residenceTown)) {
+                                List<SysRegion> sysRegions = sysRegionMapper.selectSysRegionByName(residenceTown);
+                                if (sysRegions.size() > 1) {
+                                    for (SysRegion sysRegion : sysRegions) {
+                                        if (sysRegion != null) {
+                                            Long regionId = czrkJzdz.getRegionId();
+                                            if (regionId != null && regionId.equals(sysRegion.getPid())) {
+                                                czrkJzdz.setTownId(sysRegion.getAreaId());
+                                                czrkJzdz.setTown(residenceTown);
+                                            }
                                         }
                                     }
-                                }
-                            } else if (sysRegions.size() == 1) {
-                                SysRegion sysRegion = sysRegions.get(0);
-                                if (sysRegion != null) {
-                                    czrkJzdz.setTownId(sysRegion.getAreaId());
-                                    czrkJzdz.setTown(residenceTown);
+                                } else if (sysRegions.size() == 1) {
+                                    SysRegion sysRegion = sysRegions.get(0);
+                                    if (sysRegion != null) {
+                                        czrkJzdz.setTownId(sysRegion.getAreaId());
+                                        czrkJzdz.setTown(residenceTown);
+                                    }
                                 }
                             }
-                        }
 
-                        //居住地的村
-                        String residenceVillage = vaccineInfoOperation.getResidenceVillage();
-                        if (StringUtils.isNotBlank(residenceVillage)) {
-                            List<SysRegion> sysRegions = sysRegionMapper.selectSysRegionByName(residenceVillage);
-                            if (sysRegions.size() > 1) {
-                                for (SysRegion sysRegion : sysRegions) {
-                                    if (sysRegion != null) {
-                                        Long townId = czrkJzdz.getTownId();
-                                        if (townId != null && townId.equals(sysRegion.getPid())) {
-                                            czrkJzdz.setVillageId(sysRegion.getAreaId());
-                                            czrkJzdz.setVillage(residenceVillage);
+                            //居住地的村
+                            String residenceVillage = vaccineInfoOperation.getResidenceVillage();
+                            if (StringUtils.isNotBlank(residenceVillage)) {
+                                List<SysRegion> sysRegions = sysRegionMapper.selectSysRegionByName(residenceVillage);
+                                if (sysRegions.size() > 1) {
+                                    for (SysRegion sysRegion : sysRegions) {
+                                        if (sysRegion != null) {
+                                            Long townId = czrkJzdz.getTownId();
+                                            if (townId != null && townId.equals(sysRegion.getPid())) {
+                                                czrkJzdz.setVillageId(sysRegion.getAreaId());
+                                                czrkJzdz.setVillage(residenceVillage);
+                                            }
                                         }
                                     }
-                                }
-                            } else if (sysRegions.size() == 1) {
-                                SysRegion sysRegion = sysRegions.get(0);
-                                if (sysRegion != null) {
-                                    czrkJzdz.setVillageId(sysRegions.get(0).getAreaId());
-                                    czrkJzdz.setVillage(residenceVillage);
+                                } else if (sysRegions.size() == 1) {
+                                    SysRegion sysRegion = sysRegions.get(0);
+                                    if (sysRegion != null) {
+                                        czrkJzdz.setVillageId(sysRegions.get(0).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("全部完成");
     }

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

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