Merge remote-tracking branch 'origin/master'

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

@@ -4,7 +4,10 @@ import com.boman.common.core.web.controller.BaseController;
 import com.boman.domain.Fxry;
 import com.boman.domain.TableDataInfo;
 import com.boman.domain.dto.AjaxResult;
+import com.boman.web.core.domain.SysRegion;
+import com.boman.web.core.mapper.SysRegionMapper;
 import com.boman.web.core.service.fxry.FxryService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -22,6 +25,9 @@ public class FxryController extends BaseController {
     @Resource
     private FxryService service;
 
+    @Autowired
+    private SysRegionMapper sysRegionMapper;
+
     @GetMapping("/list")
     public TableDataInfo list(Fxry fxry) {
         List<Fxry> list = service.list(fxry);
@@ -48,5 +54,11 @@ public class FxryController extends BaseController {
         return service.delete(id);
     }
 
+    @PostMapping("/select")
+    public AjaxResult selectSysRegion(@RequestBody SysRegion sysRegion){
+        List<SysRegion> list = sysRegionMapper.selectSysRegion(sysRegion);
+        return AjaxResult.success(list);
+    }
+
 
 }

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

@@ -36,6 +36,7 @@ public class SysRegionController {
     @Autowired
     private SysRegionMapper sysRegionMapper;
 
+
     @PostMapping("/insert")
     public void insertSysRegion() throws IOException {
 
@@ -55,8 +56,8 @@ public class SysRegionController {
                 String href = a.attr("href");     // 11.html
                 String name = a.text();           // 浙江省
 
-                Long id = 20L;
-                if ("广西壮族自治区".equals(name)) {
+                Long id = 24L;
+                if ("贵州省".equals(name)) {
                     SysRegion region = new SysRegion();
                     region.setId(id);
                     region.setPid(0L);
@@ -84,11 +85,7 @@ public class SysRegionController {
 
 
 
-    @PostMapping("/select")
-    public AjaxResult selectSysRegion(@RequestBody SysRegion sysRegion){
-        List<SysRegion> list = sysRegionMapper.selectSysRegion(sysRegion);
-        return AjaxResult.success(list);
-    }
+
 
 
     // 爬取市
@@ -113,7 +110,7 @@ public class SysRegionController {
             String name = nametd.select("a").text();        // 衢州市
             System.out.println("开始爬取" + name);
 
-            if ("南宁市".equals(name) || "柳州市".equals(name)|| "桂林市".equals(name)|| "梧州市".equals(name)||"北海市".equals(name)) {
+            if ( "贵阳市".equals(name)|| "六盘水市".equals(name)|| "遵义市".equals(name)|| "安顺市".equals(name)|| "毕节市".equals(name)) {
                 SysRegion region = new SysRegion();
                 region.setId(Long.valueOf(code));
                 region.setPid(i);
@@ -234,17 +231,17 @@ public class SysRegionController {
 
             String code = codetd.text();        // 330212001005
             String name = nametd.text();        // 东兴社区居委会
-            System.out.println("开始爬取" + name);
+                System.out.println("开始爬取" + name);
 
-            SysRegion region = new SysRegion();
-            region.setId(Long.valueOf(code));
-            region.setPid(Long.valueOf(townCode));
-            region.setName(name);
-            region.setTreeLevel(4);
-            region.setLeaf(1);
-            sort++;
-            region.setSort(sort);
-            regions.add(region);
+                SysRegion region = new SysRegion();
+                region.setId(Long.valueOf(code));
+                region.setPid(Long.valueOf(townCode));
+                region.setName(name);
+                region.setTreeLevel(4);
+                region.setLeaf(1);
+                sort++;
+                region.setSort(sort);
+                regions.add(region);
         }
     }
 }