|
@@ -97,9 +97,9 @@ public class TestController {
|
|
public AjaxResult setCzrk() {
|
|
public AjaxResult setCzrk() {
|
|
//587731
|
|
//587731
|
|
for (int i = 0; i < 59; i++) {
|
|
for (int i = 0; i < 59; i++) {
|
|
- int startPage = i*10000;
|
|
|
|
|
|
+ int startPage = i * 10000;
|
|
int endPage = 10000;
|
|
int endPage = 10000;
|
|
- List<VaccineInfoOperation> vaccineInfoOperations = mapper.selectVaccineInfoListByPage(startPage,endPage);
|
|
|
|
|
|
+ List<VaccineInfoOperation> vaccineInfoOperations = mapper.selectVaccineInfoListByPage(startPage, endPage);
|
|
if (vaccineInfoOperations.size() > 0) {
|
|
if (vaccineInfoOperations.size() > 0) {
|
|
for (VaccineInfoOperation vaccineInfoOperation : vaccineInfoOperations) {
|
|
for (VaccineInfoOperation vaccineInfoOperation : vaccineInfoOperations) {
|
|
if (vaccineInfoOperation != null) {
|
|
if (vaccineInfoOperation != null) {
|
|
@@ -288,34 +288,34 @@ public class TestController {
|
|
*/
|
|
*/
|
|
@PostMapping("/setCzrkTown")
|
|
@PostMapping("/setCzrkTown")
|
|
public AjaxResult setCzrkTown() {
|
|
public AjaxResult setCzrkTown() {
|
|
- for (int i = 0; i < 59; i++) {
|
|
|
|
- int startPage = i*10000;
|
|
|
|
|
|
+ for (int i = 0; i < 46; i++) {
|
|
|
|
+ int startPage = i * 10000;
|
|
int endPage = 10000;
|
|
int endPage = 10000;
|
|
List<Czrk> czrks = czrkMapper.selectCzrkListByPage(startPage, endPage);
|
|
List<Czrk> czrks = czrkMapper.selectCzrkListByPage(startPage, endPage);
|
|
- if (czrks.size() > 0){
|
|
|
|
|
|
+ if (czrks.size() > 0) {
|
|
for (Czrk czrk : czrks) {
|
|
for (Czrk czrk : czrks) {
|
|
- if (czrk != null){
|
|
|
|
|
|
+ if (czrk != null) {
|
|
String nowIn = czrk.getNowIn();
|
|
String nowIn = czrk.getNowIn();
|
|
Long deptId = czrk.getDeptId();
|
|
Long deptId = czrk.getDeptId();
|
|
//有居住地址
|
|
//有居住地址
|
|
- if (StringUtils.isNotBlank(nowIn)){
|
|
|
|
|
|
+ if (StringUtils.isNotBlank(nowIn)) {
|
|
//提取出村的名称
|
|
//提取出村的名称
|
|
String village = addressResolution(nowIn);
|
|
String village = addressResolution(nowIn);
|
|
- if (StringUtils.isNotBlank(village)){
|
|
|
|
|
|
+ if (StringUtils.isNotBlank(village)) {
|
|
//去china_area表中查询对应数据
|
|
//去china_area表中查询对应数据
|
|
List<SysRegion> sysRegions = sysRegionMapper.selectSysRegionByNameLike(village);
|
|
List<SysRegion> sysRegions = sysRegionMapper.selectSysRegionByNameLike(village);
|
|
- if (sysRegions.size() == 1){
|
|
|
|
|
|
+ if (sysRegions.size() == 1) {
|
|
SysRegion sysRegion = sysRegions.get(0);
|
|
SysRegion sysRegion = sysRegions.get(0);
|
|
- if (sysRegion != null){
|
|
|
|
|
|
+ if (sysRegion != null) {
|
|
czrk.setVillage(sysRegion.getName());
|
|
czrk.setVillage(sysRegion.getName());
|
|
czrk.setVillageId(sysRegion.getAreaId());
|
|
czrk.setVillageId(sysRegion.getAreaId());
|
|
}
|
|
}
|
|
- }else if (sysRegions.size() > 1){
|
|
|
|
|
|
+ } else if (sysRegions.size() > 1) {
|
|
for (SysRegion sysRegion : sysRegions) {
|
|
for (SysRegion sysRegion : sysRegions) {
|
|
- if (sysRegion != null){
|
|
|
|
|
|
+ if (sysRegion != null) {
|
|
Long pid = sysRegion.getPid();
|
|
Long pid = sysRegion.getPid();
|
|
Long villageTownsId = czrk.getVillageTownsId();
|
|
Long villageTownsId = czrk.getVillageTownsId();
|
|
- if (villageTownsId != null && villageTownsId.equals(pid)){
|
|
|
|
|
|
+ if (villageTownsId != null && villageTownsId.equals(pid)) {
|
|
//说明是这个镇下面的村
|
|
//说明是这个镇下面的村
|
|
czrk.setVillage(sysRegion.getName());
|
|
czrk.setVillage(sysRegion.getName());
|
|
czrk.setVillageId(sysRegion.getAreaId());
|
|
czrk.setVillageId(sysRegion.getAreaId());
|
|
@@ -324,38 +324,38 @@ public class TestController {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- }else {
|
|
|
|
|
|
+ } else {
|
|
//没有居住地址看看有没有deptId
|
|
//没有居住地址看看有没有deptId
|
|
- if (deptId != null){
|
|
|
|
|
|
+ if (deptId != null) {
|
|
//去sys_dept表中找到对应的数据
|
|
//去sys_dept表中找到对应的数据
|
|
SysDept sysDept = czrkMapper.selectDeptNameById(deptId);
|
|
SysDept sysDept = czrkMapper.selectDeptNameById(deptId);
|
|
- if (sysDept != null){
|
|
|
|
|
|
+ if (sysDept != null) {
|
|
String ancestors = sysDept.getAncestors();
|
|
String ancestors = sysDept.getAncestors();
|
|
String[] split = ancestors.split(",");
|
|
String[] split = ancestors.split(",");
|
|
- if (split.length == 3){
|
|
|
|
|
|
+ if (split.length == 3) {
|
|
//说明是组,则找上级村id
|
|
//说明是组,则找上级村id
|
|
Long parentId = sysDept.getParentId();
|
|
Long parentId = sysDept.getParentId();
|
|
- if (parentId != null){
|
|
|
|
|
|
+ if (parentId != null) {
|
|
//获取到村名称
|
|
//获取到村名称
|
|
SysDept sysDeptParent = czrkMapper.selectDeptNameById(parentId);
|
|
SysDept sysDeptParent = czrkMapper.selectDeptNameById(parentId);
|
|
- if (sysDeptParent != null){
|
|
|
|
|
|
+ if (sysDeptParent != null) {
|
|
//村名称
|
|
//村名称
|
|
String deptName = sysDeptParent.getDeptName();
|
|
String deptName = sysDeptParent.getDeptName();
|
|
- if (StringUtils.isNotBlank(deptName)){
|
|
|
|
|
|
+ if (StringUtils.isNotBlank(deptName)) {
|
|
//去china_area表中查询对应数据
|
|
//去china_area表中查询对应数据
|
|
List<SysRegion> sysRegions = sysRegionMapper.selectSysRegionByNameLike(deptName);
|
|
List<SysRegion> sysRegions = sysRegionMapper.selectSysRegionByNameLike(deptName);
|
|
- if (sysRegions.size() == 1){
|
|
|
|
|
|
+ if (sysRegions.size() == 1) {
|
|
SysRegion sysRegion = sysRegions.get(0);
|
|
SysRegion sysRegion = sysRegions.get(0);
|
|
- if (sysRegion != null){
|
|
|
|
|
|
+ if (sysRegion != null) {
|
|
czrk.setVillage(sysRegion.getName());
|
|
czrk.setVillage(sysRegion.getName());
|
|
czrk.setVillageId(sysRegion.getAreaId());
|
|
czrk.setVillageId(sysRegion.getAreaId());
|
|
}
|
|
}
|
|
- }else if (sysRegions.size() > 1){
|
|
|
|
|
|
+ } else if (sysRegions.size() > 1) {
|
|
for (SysRegion sysRegion : sysRegions) {
|
|
for (SysRegion sysRegion : sysRegions) {
|
|
- if (sysRegion != null){
|
|
|
|
|
|
+ if (sysRegion != null) {
|
|
Long pid = sysRegion.getPid();
|
|
Long pid = sysRegion.getPid();
|
|
Long villageTownsId = czrk.getVillageTownsId();
|
|
Long villageTownsId = czrk.getVillageTownsId();
|
|
- if (villageTownsId != null && villageTownsId.equals(pid)){
|
|
|
|
|
|
+ if (villageTownsId != null && villageTownsId.equals(pid)) {
|
|
//说明是这个镇下面的村
|
|
//说明是这个镇下面的村
|
|
czrk.setVillage(sysRegion.getName());
|
|
czrk.setVillage(sysRegion.getName());
|
|
czrk.setVillageId(sysRegion.getAreaId());
|
|
czrk.setVillageId(sysRegion.getAreaId());
|
|
@@ -367,33 +367,33 @@ public class TestController {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- if (split.length == 2){
|
|
|
|
|
|
+ if (split.length == 2) {
|
|
//说明是村
|
|
//说明是村
|
|
- String deptName = sysDept.getDeptName();
|
|
|
|
- //村名称
|
|
|
|
- if (StringUtils.isNotBlank(deptName)){
|
|
|
|
- //去china_area表中查询对应数据
|
|
|
|
- List<SysRegion> sysRegions = sysRegionMapper.selectSysRegionByNameLike(deptName);
|
|
|
|
- if (sysRegions.size() == 1){
|
|
|
|
- SysRegion sysRegion = sysRegions.get(0);
|
|
|
|
- if (sysRegion != null){
|
|
|
|
- czrk.setVillage(sysRegion.getName());
|
|
|
|
- czrk.setVillageId(sysRegion.getAreaId());
|
|
|
|
- }
|
|
|
|
- }else if (sysRegions.size() > 1){
|
|
|
|
- for (SysRegion sysRegion : sysRegions) {
|
|
|
|
- if (sysRegion != null){
|
|
|
|
- Long pid = sysRegion.getPid();
|
|
|
|
- Long villageTownsId = czrk.getVillageTownsId();
|
|
|
|
- if (villageTownsId != null && villageTownsId.equals(pid)){
|
|
|
|
- //说明是这个镇下面的村
|
|
|
|
- czrk.setVillage(sysRegion.getName());
|
|
|
|
- czrk.setVillageId(sysRegion.getAreaId());
|
|
|
|
- }
|
|
|
|
|
|
+ String deptName = sysDept.getDeptName();
|
|
|
|
+ //村名称
|
|
|
|
+ if (StringUtils.isNotBlank(deptName)) {
|
|
|
|
+ //去china_area表中查询对应数据
|
|
|
|
+ List<SysRegion> sysRegions = sysRegionMapper.selectSysRegionByNameLike(deptName);
|
|
|
|
+ if (sysRegions.size() == 1) {
|
|
|
|
+ SysRegion sysRegion = sysRegions.get(0);
|
|
|
|
+ if (sysRegion != null) {
|
|
|
|
+ czrk.setVillage(sysRegion.getName());
|
|
|
|
+ czrk.setVillageId(sysRegion.getAreaId());
|
|
|
|
+ }
|
|
|
|
+ } else if (sysRegions.size() > 1) {
|
|
|
|
+ for (SysRegion sysRegion : sysRegions) {
|
|
|
|
+ if (sysRegion != null) {
|
|
|
|
+ Long pid = sysRegion.getPid();
|
|
|
|
+ Long villageTownsId = czrk.getVillageTownsId();
|
|
|
|
+ if (villageTownsId != null && villageTownsId.equals(pid)) {
|
|
|
|
+ //说明是这个镇下面的村
|
|
|
|
+ czrk.setVillage(sysRegion.getName());
|
|
|
|
+ czrk.setVillageId(sysRegion.getAreaId());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ }
|
|
|
|
|
|
|
|
|
|
}
|
|
}
|
|
@@ -405,23 +405,28 @@ public class TestController {
|
|
String village = czrk.getVillage();
|
|
String village = czrk.getVillage();
|
|
Long villageId = czrk.getVillageId();
|
|
Long villageId = czrk.getVillageId();
|
|
String idCard = czrk.getIdCard();
|
|
String idCard = czrk.getIdCard();
|
|
- if (StringUtils.isNotBlank(village)){
|
|
|
|
|
|
+ if (StringUtils.isNotBlank(village)) {
|
|
Czrk czrkNew = new Czrk();
|
|
Czrk czrkNew = new Czrk();
|
|
czrkNew.setId(czrk.getId());
|
|
czrkNew.setId(czrk.getId());
|
|
czrkNew.setVillageId(villageId);
|
|
czrkNew.setVillageId(villageId);
|
|
czrkNew.setVillage(village);
|
|
czrkNew.setVillage(village);
|
|
czrkMapper.updateCzrk(czrkNew);
|
|
czrkMapper.updateCzrk(czrkNew);
|
|
- System.out.println("更新编号"+czrk.getId()+village);
|
|
|
|
|
|
+ System.out.println("更新编号" + czrk.getId() + village);
|
|
}
|
|
}
|
|
- if (StringUtils.isNotBlank(village) && StringUtils.isNotBlank(idCard)){
|
|
|
|
|
|
+ CzrkJzdz czrkJzdz = new CzrkJzdz();
|
|
|
|
+
|
|
|
|
+ if (StringUtils.isNotBlank(village) && StringUtils.isNotBlank(idCard)) {
|
|
//更新czrk_jzdz
|
|
//更新czrk_jzdz
|
|
- CzrkJzdz czrkJzdz = new CzrkJzdz();
|
|
|
|
czrkJzdz.setVillage(village);
|
|
czrkJzdz.setVillage(village);
|
|
czrkJzdz.setVillageId(villageId);
|
|
czrkJzdz.setVillageId(villageId);
|
|
|
|
+ } else {
|
|
|
|
+ System.out.println(czrk.getId() + "村名称或者身份证号码不存在,没有更新czrk_jzdz");
|
|
|
|
+ }
|
|
|
|
+ if (StringUtils.isNotBlank(idCard)) {
|
|
|
|
+ czrkJzdz.setTownId(czrk.getVillageTownsId());
|
|
|
|
+ czrkJzdz.setTown(czrk.getVillageTowns());
|
|
czrkJzdz.setIdCard(idCard);
|
|
czrkJzdz.setIdCard(idCard);
|
|
czrkJzdzMapper.updateByIdCard(czrkJzdz);
|
|
czrkJzdzMapper.updateByIdCard(czrkJzdz);
|
|
- }else {
|
|
|
|
- System.out.println(czrk.getId()+"村名称或者身份证号码不存在,没有更新czrk_jzdz");
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -433,26 +438,27 @@ public class TestController {
|
|
|
|
|
|
/**
|
|
/**
|
|
* 解析地址
|
|
* 解析地址
|
|
- * @author lin
|
|
|
|
|
|
+ *
|
|
* @param address
|
|
* @param address
|
|
* @return
|
|
* @return
|
|
|
|
+ * @author lin
|
|
*/
|
|
*/
|
|
- public static String addressResolution(String address){
|
|
|
|
- String regex="(?<town>[^区]+区|.+镇|.+乡)?(?<village>.[^村]+村|.+居委会|.+乡)";
|
|
|
|
- Matcher m= Pattern.compile(regex).matcher(address);
|
|
|
|
- String province=null,city=null,county=null,town=null,village=null;
|
|
|
|
- List<Map<String,String>> table=new ArrayList<Map<String,String>>();
|
|
|
|
- Map<String,String> row=null;
|
|
|
|
|
|
+ public static String addressResolution(String address) {
|
|
|
|
+ String regex = "(?<town>[^区]+区|.+镇|.+乡)?(?<village>.[^村]+村|.+居委会|.+乡)";
|
|
|
|
+ Matcher m = Pattern.compile(regex).matcher(address);
|
|
|
|
+ String province = null, city = null, county = null, town = null, village = null;
|
|
|
|
+ List<Map<String, String>> table = new ArrayList<Map<String, String>>();
|
|
|
|
+ Map<String, String> row = null;
|
|
String result = null;
|
|
String result = null;
|
|
- while(m.find()){
|
|
|
|
|
|
+ while (m.find()) {
|
|
/* row=new LinkedHashMap<String,String>();
|
|
/* row=new LinkedHashMap<String,String>();
|
|
town=m.group("town");
|
|
town=m.group("town");
|
|
row.put("town", town==null?"":town.trim());
|
|
row.put("town", town==null?"":town.trim());
|
|
village=m.group("village");
|
|
village=m.group("village");
|
|
row.put("village", village==null?"":village.trim());
|
|
row.put("village", village==null?"":village.trim());
|
|
table.add(row);*/
|
|
table.add(row);*/
|
|
- village=m.group("village");
|
|
|
|
- result = village == null ? "" : village.trim();
|
|
|
|
|
|
+ village = m.group("village");
|
|
|
|
+ result = village == null ? "" : village.trim();
|
|
}
|
|
}
|
|
return result;
|
|
return result;
|
|
}
|
|
}
|