anderx лет назад: 2
Родитель
Сommit
1c80c4f3a1

+ 50 - 0
src/main/java/com/goafanti/common/bo/OutPoverty.java

@@ -22,6 +22,56 @@ public class OutPoverty {
     private String relationship;
     @Excel(name = "脱贫年度")
     private String povertyYear;
+    @Excel(name = "户类型")
+    private String householdType;
+    @Excel(name = "监测对象类别")
+    private String monitoringObjectType;
+    @Excel(name = "风险是否已消除")
+    private String riskStatus;
+    @Excel(name = "识别监测时间")
+    private String identifyMonitoringTime;
+    @Excel(name = "消除监测时间")
+    private String eliminateMonitoringTime;
+
+    public String getHouseholdType() {
+        return householdType;
+    }
+
+    public void setHouseholdType(String householdType) {
+        this.householdType = householdType;
+    }
+
+    public String getMonitoringObjectType() {
+        return monitoringObjectType;
+    }
+
+    public void setMonitoringObjectType(String monitoringObjectType) {
+        this.monitoringObjectType = monitoringObjectType;
+    }
+
+    public String getRiskStatus() {
+        return riskStatus;
+    }
+
+    public void setRiskStatus(String riskStatus) {
+        this.riskStatus = riskStatus;
+    }
+
+    public String getIdentifyMonitoringTime() {
+        return identifyMonitoringTime;
+    }
+
+    public void setIdentifyMonitoringTime(String identifyMonitoringTime) {
+        this.identifyMonitoringTime = identifyMonitoringTime;
+    }
+
+    public String getEliminateMonitoringTime() {
+        return eliminateMonitoringTime;
+    }
+
+    public void setEliminateMonitoringTime(String eliminateMonitoringTime) {
+        this.eliminateMonitoringTime = eliminateMonitoringTime;
+    }
 
     public String getId() {
         return id;

+ 40 - 15
src/main/java/com/goafanti/common/service/PovertyService.java

@@ -23,6 +23,8 @@ public class PovertyService {
 
 
     private static final String   gx_url="http://fpb.gxxw.cn/index.php?m=check&c=index&a=list_jdlk&name=";
+    private static final String   gx_jiance_url="http://fpb.gxxw.cn/index.php?m=check&c=index&a=list_fpjc&name=";
+
 
     @Cacheable(value = "selectPoverty#300", key = "'selectPoverty:key='+#id")
     public Map<String,Object> selectPoverty(MultipartFile file,String id) {
@@ -38,7 +40,7 @@ public class PovertyService {
         Integer totalcount =0;
         Integer effectiveCount =0;
         for (InputPoverty e : list) {
-            OutPoverty outPoverty = selectHttpPoverty(e);
+            OutPoverty outPoverty = selectAggravationHttpPoverty(e);
             if (outPoverty.getId()!=null){
                 effectiveCount++;
             }
@@ -52,13 +54,22 @@ public class PovertyService {
         map.put("id",id);
         return map;
     }
+    private OutPoverty selectAggravationHttpPoverty(InputPoverty in){
+        OutPoverty outPoverty = selectHttpPoverty(in, 0);
+        if (StringUtils.isBlank(outPoverty.getId()))outPoverty=selectHttpPoverty(in,1);
+        if (StringUtils.isBlank(outPoverty.getName()))outPoverty.setName(in.getName());
+        return outPoverty;
+    }
 
-    private OutPoverty selectHttpPoverty(InputPoverty in) {
+    private OutPoverty selectHttpPoverty(InputPoverty in,Integer type) {
         OutPoverty out=new OutPoverty();
         try {
+
             String name= StringUtils.deleteWhitespace(in.getName());
             String idcard=in.getIdCard();
-            StringBuffer url=new StringBuffer(gx_url);
+            StringBuffer url=new StringBuffer();
+            if (type==0)url=url.append(gx_url);
+            else url=url.append(gx_jiance_url);
             url=url.append(name).append("&idcard=").append(idcard);
             Document document = Jsoup
                     .connect(url.toString()).get();
@@ -67,19 +78,33 @@ public class PovertyService {
             if (tr.size()>1){
                 Element element = tr.get(1);
                 Elements td = element.select("td");
-                out.setId(td.get(0).text());
-                out.setCity(td.get(1).text());
-                out.setCounty(td.get(2).text());
-                out.setTownship(td.get(3).text());
-                out.setVillage(td.get(4).text());
-                out.setPeopleSum(td.get(5).text());
-                out.setName(td.get(6).text());
-                out.setRelationship(td.get(7).text());
-                out.setPovertyYear(td.get(8).text());
-            }else {
-                out.setName(name);
-            }
+                if (type==0){
+                    out.setId(td.get(0).text());
+                    out.setCity(td.get(1).text());
+                    out.setCounty(td.get(2).text());
+                    out.setTownship(td.get(3).text());
+                    out.setVillage(td.get(4).text());
+                    out.setPeopleSum(td.get(5).text());
+                    out.setName(td.get(6).text());
+                    out.setRelationship(td.get(7).text());
+                    out.setPovertyYear(td.get(8).text());
+                }else {
+                    out.setId(td.get(0).text());
+                    out.setCity(td.get(1).text());
+                    out.setCounty(td.get(2).text());
+                    out.setTownship(td.get(3).text());
+                    out.setVillage(td.get(4).text());
+                    out.setName(td.get(5).text());
+                    out.setRelationship(td.get(6).text());
+                    out.setPeopleSum(td.get(7).text());
+                    out.setHouseholdType(td.get(8).text());
+                    out.setMonitoringObjectType(td.get(9).text());
+                    out.setRiskStatus(td.get(10).text());
+                    out.setIdentifyMonitoringTime(td.get(11).text());
+                    out.setEliminateMonitoringTime(td.get(12).text());
+                }
 
+            }
         } catch (IOException e) {
             e.printStackTrace();
         }

+ 1 - 1
src/main/resources/props/config_local.properties

@@ -52,7 +52,7 @@ yxjl_max=100
 amb.maxLvl=6
 
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.2.83
+static.host=//static.jishutao.com/1.2.84
 rd.static.host=//static.jishutao.com/RD/1.0.00
 #avatar.host=//172.16.0.255:3000
 #static.host=//172.16.0.255:3000/1.2.62

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -52,7 +52,7 @@ amb.maxLvl=6
 
 portal.host=//static.jishutao.com/portal/2.0.6
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.2.83
+static.host=//static.jishutao.com/1.2.84
 rd.static.host=//static.jishutao.com/RD/1.0.01
 avatar.upload.host=//static.jishutao.com/upload