优化代码

src/main/java/com/uas/credit/controller/ErpQueryController.java

@@ -1,9 +1,11 @@
 package com.uas.credit.controller;
 
 import com.alibaba.fastjson.JSON;
+import com.fasterxml.jackson.databind.annotation.JsonAppend;
+import com.uas.credit.model.EnterpriseQuery;
 import com.uas.credit.model.ErpQuery;
-import com.uas.credit.service.EnterpriseService;
-import com.uas.credit.service.PersonalService;
+import com.uas.credit.model.PersonQuery;
+import com.uas.credit.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -19,63 +21,77 @@ import java.net.URLDecoder;
  * created by shicr on 2018/6/6
  **/
 @RestController
-@RequestMapping(value = "erpquery")
+@RequestMapping(value = "/erpquery")
 public class ErpQueryController {
 
-    private static String ENTERPRISE_DEPT = "22118";
-
-    private static String ENTERPRISE_RISK = "22527";
-
-    private static String ENTERPRISE_CREDIT = "95013";
-
-    private static String ENTERPRISE_EXCEPTION = "22117";
+    @Autowired
+    private EnCreditInfoService creditInfoService;
 
-    private static String PERSONAL_IDENTITY = "10602";
+    @Autowired
+    private EnexceptionService enexceptionService;
 
-    private static String PERSONAL_SHAREHOLDER = "96002";
+    @Autowired
+    private EnRiskInfoService enRiskInfoService;
 
     @Autowired
-    private EnterpriseService enterpriseService;
+    private EnterpriseDeptService enterpriseDeptService;
 
     @Autowired
     private PersonalService personalService;
 
+    @Autowired
+    private PersonCorporationService personCorporationService;
+
     /**
-     * ERP对企业或个人进行查询
+     * ERP对企业进行查询
      */
-    @RequestMapping(value = "/erp/query",method = RequestMethod.GET)
-    public ModelMap queryCredit(String json) {
+    @RequestMapping(value = "/queryEn",method = RequestMethod.GET)
+    public ModelMap queryEn(String json) {
         ModelMap modelMap = new ModelMap();
-        ErpQuery erpQuery = new ErpQuery();
+        EnterpriseQuery erpQuery = new EnterpriseQuery();
         try {
             String query = URLDecoder.decode(json, "utf-8");
-            erpQuery = JSON.parseObject(query, ErpQuery.class);
+            erpQuery = JSON.parseObject(query, EnterpriseQuery.class);
         } catch (UnsupportedEncodingException e) {
             e.printStackTrace();
         }
         if (erpQuery != null) {
-            //查询企业
-            if (erpQuery.getQueryType() == 0) {
                 //查询企业债务信息
-                String Endept = enterpriseService.requestApi(PyConfig.HOST,PyConfig.PATH_UNZIP,ENTERPRISE_DEPT, "101");
+                String Endept = enterpriseDeptService.queryAndSave(erpQuery);
                 //查询企业经营异常信息
-                String Enexception = enterpriseService.requestApi(PyConfig.HOST,PyConfig.PATH_UNZIP,ENTERPRISE_EXCEPTION, "");
+                String Enexception = enexceptionService.queryAndSave(erpQuery);
                 //查询企业信用信息
-                String Encredit = enterpriseService.requestApi(PyConfig.HOST,PyConfig.PATH_UNZIP,ENTERPRISE_CREDIT, "");
+                String Encredit = creditInfoService.queryAndSave(erpQuery);
                 //查询企业风险信息
-                String Enrisk = enterpriseService.requestApi(PyConfig.HOST,PyConfig.PATH_UNZIP,ENTERPRISE_RISK, "");
+                String Enrisk = enRiskInfoService.queryAndSave(erpQuery);
                 modelMap.put("Endept", Endept);
                 modelMap.put("Enexception", Enexception);
                 modelMap.put("Enrisk", Enrisk);
                 modelMap.put("Encredit", Encredit);
-            } else if(erpQuery.getQueryType() == 1) {
-                //查询个人身份信息
-                String Pnidentity = personalService.getQueryCondition(PERSONAL_IDENTITY,"");
-                //查询个人股东信息
-                String Pnshareholder = personalService.getQueryCondition(PERSONAL_SHAREHOLDER,"");
-                modelMap.put("Pnidentity",Pnidentity);
-                modelMap.put("Pnshareholder",Pnshareholder);
-            }
+        }
+        return modelMap;
+    }
+
+    /**
+     * erp对个人进行查询
+     */
+    @RequestMapping(value = "/queryPe",method = RequestMethod.GET)
+    public ModelMap queryPerson(String json) {
+        ModelMap modelMap = new ModelMap();
+        PersonQuery erpQuery = new PersonQuery();
+        try {
+            String query = URLDecoder.decode(json, "utf-8");
+            erpQuery = JSON.parseObject(query, PersonQuery.class);
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        if(erpQuery != null){
+            //查询个人身份信息
+            String Pnidentity = personalService.queryAndSave(erpQuery);
+            //查询个人股东信息
+            String Pnshareholder = personCorporationService.queryAndSave(erpQuery);
+            modelMap.put("Pnidentity",Pnidentity);
+            modelMap.put("Pnshareholder",Pnshareholder);
         }
         return modelMap;
     }

src/main/java/com/uas/credit/model/Enterprise.java

@@ -1,70 +0,0 @@
-package com.uas.credit.model;
-import javax.persistence.*;
-
-/**
- * 企业信息
- * created by shicr on 2018/6/6
- **/
-@Entity
-@Table(name = "enterprise")
-public class Enterprise {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id")
-    private Long id;
-
-    /**
-     * 企业名称
-     */
-    @Column(name = "enname")
-    private String enname;
-
-    /**
-     * 企业工商注册号
-     * @return
-     */
-    @Column(name = "registerNo")
-    private String registerNo;
-
-
-    /**
-     * 企业社会信用代码
-     * @return
-     */
-    @Column(name = "creditCode")
-    private String creditCode;
-
-
-    public String getRegisterNo() {
-        return registerNo;
-    }
-
-    public void setRegisterNo(String registerNo) {
-        this.registerNo = registerNo;
-    }
-
-    public String getCreditCode() {
-        return creditCode;
-    }
-
-    public void setCreditCode(String creditCode) {
-        this.creditCode = creditCode;
-    }
-
-    public String getEnname() {
-        return enname;
-    }
-
-    public void setEnname(String enname) {
-        this.enname = enname;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-}

src/main/java/com/uas/credit/model/EnterpriseQuery.java

@@ -0,0 +1,135 @@
+package com.uas.credit.model;
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 企业查询信息
+ * created by shicr on 2018/6/6
+ **/
+@Entity
+@Table(name = "enterprise$query")
+public class EnterpriseQuery implements Serializable {
+
+    /**
+     * 序列号
+     */
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private Long id;
+
+    /**
+     * 企业名称
+     */
+    @Column(name = "enname")
+    private String enname;
+
+    /**
+     * 企业工商注册号
+     * @return
+     */
+    @Column(name = "registerNo")
+    private String registerNo;
+
+
+    /**
+     * 企业社会信用代码/组织机构代码
+     * @return
+     */
+    @Column(name = "creditCode")
+    private String creditCode;
+
+
+    /**
+     * 查询的收费子报告类型ID
+     */
+    @Column(name = "subreportIDs")
+    private String subreportIDs;
+
+
+    /**
+     * 查询原因ID
+     */
+    @Column(name = "queryReasonID")
+    private Integer queryReasonID;
+
+    /**
+     * 引用ID
+     */
+    @Column(name = "refID")
+    private String refID;
+
+    /**
+     * 查询时间
+     * @return
+     */
+    @Column(name = "queryTime")
+    private Date queryTime;
+
+    public Date getQueryTime() {
+        return queryTime;
+    }
+
+    public void setQueryTime(Date queryTime) {
+        this.queryTime = queryTime;
+    }
+
+    public String getRegisterNo() {
+        return registerNo;
+    }
+
+    public void setRegisterNo(String registerNo) {
+        this.registerNo = registerNo;
+    }
+
+    public String getCreditCode() {
+        return creditCode;
+    }
+
+    public void setCreditCode(String creditCode) {
+        this.creditCode = creditCode;
+    }
+
+    public String getEnname() {
+        return enname;
+    }
+
+    public void setEnname(String enname) {
+        this.enname = enname;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getSubreportIDs() {
+        return subreportIDs;
+    }
+
+    public void setSubreportIDs(String subreportIDs) {
+        this.subreportIDs = subreportIDs;
+    }
+
+    public Integer getQueryReasonID() {
+        return queryReasonID;
+    }
+
+    public void setQueryReasonID(Integer queryReasonID) {
+        this.queryReasonID = queryReasonID;
+    }
+
+    public String getRefID() {
+        return refID;
+    }
+
+    public void setRefID(String refID) {
+        this.refID = refID;
+    }
+}

src/main/java/com/uas/credit/model/ErpQuery.java

@@ -1,6 +1,7 @@
 package com.uas.credit.model;
 
 import javax.persistence.*;
+import java.io.Serializable;
 
 /**
  * 查询操作记录
@@ -8,7 +9,12 @@ import javax.persistence.*;
  **/
 @Entity
 @Table(name = "erp$query")
-public class ErpQuery {
+public class ErpQuery implements Serializable {
+
+    /**
+     * 序列号
+     */
+    private static final long serialVersionUID = 1L;
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)

src/main/java/com/uas/credit/model/PersonQuery.java

@@ -0,0 +1,102 @@
+package com.uas.credit.model;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * 个人查询条件
+ * created by shicr on 2018/6/19
+ **/
+@Entity
+@Table(name = "person$query")
+public class PersonQuery implements Serializable {
+
+    /**
+     * 序列号
+     */
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private Long id;
+
+    /**
+     * 被查询者姓名
+     */
+    @Column(name = "name")
+    private String name;
+
+    /**
+     * 被查询者证件号码
+     */
+    @Column(name = "documentNo")
+    private String documentNo;
+
+    /**
+     * 查询的收费子报告类型ID
+     */
+    @Column(name = "subreportIDs")
+    private String subreportIDs;
+
+
+    /**
+     * 查询原因ID
+     */
+    @Column(name = "queryReasonID")
+    private Integer queryReasonID;
+
+    /**
+     * 引用ID
+     */
+    @Column(name = "refID")
+    private String refID;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDocumentNo() {
+        return documentNo;
+    }
+
+    public void setDocumentNo(String documentNo) {
+        this.documentNo = documentNo;
+    }
+
+    public String getSubreportIDs() {
+        return subreportIDs;
+    }
+
+    public void setSubreportIDs(String subreportIDs) {
+        this.subreportIDs = subreportIDs;
+    }
+
+    public Integer getQueryReasonID() {
+        return queryReasonID;
+    }
+
+    public void setQueryReasonID(Integer queryReasonID) {
+        this.queryReasonID = queryReasonID;
+    }
+
+    public String getRefID() {
+        return refID;
+    }
+
+    public void setRefID(String refID) {
+        this.refID = refID;
+    }
+}

src/main/java/com/uas/credit/model/abnormalinfo/AbnormalReport.java

@@ -2,6 +2,7 @@ package com.uas.credit.model.abnormalinfo;
 
 import javax.persistence.*;
 import java.io.Serializable;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -18,6 +19,18 @@ public class AbnormalReport implements Serializable {
     @Column(name = "id")
     private Long id;
 
+    /**
+     * 申请查询时间，格式YYYYMMDD HH24:mm:ss
+     */
+    @Column(name = "receiveTime")
+    private Date receiveTime;
+
+    /**
+     * 查询单位名称
+     */
+    @Column(name = "unitName")
+    private String unitName;
+
 
     @OneToMany(cascade = CascadeType.PERSIST)
     @JoinColumn(name = "report_id")
@@ -31,6 +44,14 @@ public class AbnormalReport implements Serializable {
         this.id = id;
     }
 
+    public Date getReceiveTime() {
+        return receiveTime;
+    }
+
+    public void setReceiveTime(Date receiveTime) {
+        this.receiveTime = receiveTime;
+    }
+
     public List<AbnormalInfo> getCisReport() {
         return cisReport;
     }
@@ -39,5 +60,11 @@ public class AbnormalReport implements Serializable {
         this.cisReport = cisReport;
     }
 
+    public String getUnitName() {
+        return unitName;
+    }
 
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
 }

src/main/java/com/uas/credit/model/corpcreditinfo/EncreditReport.java

@@ -2,6 +2,7 @@ package com.uas.credit.model.corpcreditinfo;
 
 import javax.persistence.*;
 import java.io.Serializable;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -23,6 +24,18 @@ public class EncreditReport implements Serializable {
     @Column(name = "id")
     private Long id;
 
+    /**
+     * 查询单位名称
+     */
+    @Column(name = "unitName")
+    private String unitName;
+
+    /**
+     * 申请查询时间，格式YYYYMMDD HH24:mm:ss
+     */
+    @Column(name = "receiveTime")
+    private Date receiveTime;
+
     @OneToMany(cascade = CascadeType.PERSIST)
     @JoinColumn(name = "e_id")
     private List<EncreditInfo> cisReport;
@@ -35,6 +48,14 @@ public class EncreditReport implements Serializable {
         this.id = id;
     }
 
+    public Date getReceiveTime() {
+        return receiveTime;
+    }
+
+    public void setReceiveTime(Date receiveTime) {
+        this.receiveTime = receiveTime;
+    }
+
     public List<EncreditInfo> getCisReport() {
         return cisReport;
     }
@@ -42,4 +63,12 @@ public class EncreditReport implements Serializable {
     public void setCisReport(List<EncreditInfo> cisReport) {
         this.cisReport = cisReport;
     }
+
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
 }

src/main/java/com/uas/credit/model/corpriskinfo/EnRiskInfoReport.java

@@ -2,6 +2,7 @@ package com.uas.credit.model.corpriskinfo;
 
 import javax.persistence.*;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 企业风险信息报告
@@ -16,10 +17,30 @@ public class EnRiskInfoReport implements Serializable {
     @Column(name = "id")
     private Long id;
 
+    /**
+     * 申请查询时间，格式YYYYMMDD HH24:mm:ss
+     */
+    @Column(name = "receiveTime")
+    private Date receiveTime;
+
+    /**
+     * 查询单位名称
+     */
+    @Column(name = "unitName")
+    private String unitName;
+
     @OneToOne(cascade = CascadeType.PERSIST)
     @JoinColumn(name = "risk_id")
     private CorpRiskInfo corpRiskInfo;
 
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
     public Long getId() {
         return id;
     }
@@ -28,6 +49,14 @@ public class EnRiskInfoReport implements Serializable {
         this.id = id;
     }
 
+    public Date getReceiveTime() {
+        return receiveTime;
+    }
+
+    public void setReceiveTime(Date receiveTime) {
+        this.receiveTime = receiveTime;
+    }
+
     public CorpRiskInfo getCorpRiskInfo() {
         return corpRiskInfo;
     }

src/main/java/com/uas/credit/model/debtinfo/EndeptinfoReport.java

@@ -26,6 +26,7 @@ public class EndeptinfoReport implements Serializable {
     /**
      * 查询单位名称
      */
+    @Column(name = "unitName")
     private String unitName;
 
     /**
@@ -46,6 +47,7 @@ public class EndeptinfoReport implements Serializable {
     /**
      * 申请查询时间，格式YYYYMMDD HH24:mm:ss
      */
+    @Column(name = "receiveTime")
     private Date receiveTime;
 
     @OneToMany(cascade = CascadeType.PERSIST)
@@ -115,4 +117,6 @@ public class EndeptinfoReport implements Serializable {
     public void setCisReport(List<Endeptinfo> cisReport) {
         this.cisReport = cisReport;
     }
+
+
 }

src/main/java/com/uas/credit/model/corporation/ArtificialNationalInfo.java → src/main/java/com/uas/credit/model/personCorporation/ArtificialNationalInfo.java

@@ -1,4 +1,4 @@
-package com.uas.credit.model.corporation;
+package com.uas.credit.model.personCorporation;
 
 
 import com.uas.credit.model.personal.ArtificialNationalInfoItem;

src/main/java/com/uas/credit/model/corporation/CorporationInfo.java → src/main/java/com/uas/credit/model/personCorporation/CorporationInfo.java

@@ -1,4 +1,4 @@
-package com.uas.credit.model.corporation;
+package com.uas.credit.model.personCorporation;
 
 import javax.persistence.*;
 import java.io.Serializable;
@@ -41,7 +41,7 @@ public class CorporationInfo implements Serializable {
     private ArtificialNationalInfo artificialNationalInfo;
 
     @ManyToOne(cascade = CascadeType.PERSIST)
-    private CorporationReport corporationReport;
+    private PersonCorporationReport corporationReport;
 
     public Long getId() {
         return id;
@@ -59,11 +59,11 @@ public class CorporationInfo implements Serializable {
         this.pTopMInfoId = pTopMInfoId;
     }
 
-    public CorporationReport getCorporationReport() {
+    public PersonCorporationReport getCorporationReport() {
         return corporationReport;
     }
 
-    public void setCorporationReport(CorporationReport corporationReport) {
+    public void setCorporationReport(PersonCorporationReport corporationReport) {
         this.corporationReport = corporationReport;
     }
 

src/main/java/com/uas/credit/model/corporation/NationalPersonShareholderReport.java → src/main/java/com/uas/credit/model/personCorporation/NationalPersonShareholderReport.java

@@ -1,4 +1,4 @@
-package com.uas.credit.model.corporation;
+package com.uas.credit.model.personCorporation;
 
 
 import com.uas.credit.model.personal.NationalPersonShareholderReportItem;

src/main/java/com/uas/credit/model/corporation/CorporationReport.java → src/main/java/com/uas/credit/model/personCorporation/PersonCorporationReport.java

@@ -1,7 +1,8 @@
-package com.uas.credit.model.corporation;
+package com.uas.credit.model.personCorporation;
 
 import javax.persistence.*;
 import java.io.Serializable;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -9,8 +10,8 @@ import java.util.List;
  * created by shicr on 2018/6/14
  **/
 @Entity
-@Table(name = "corporation$report")
-public class CorporationReport implements Serializable {
+@Table(name = "personCorporation$report")
+public class PersonCorporationReport implements Serializable {
 
     /**
      * 序列号
@@ -23,10 +24,24 @@ public class CorporationReport implements Serializable {
     @Column(name = "id")
     private Long id;
 
+    /**
+     * 申请查询时间，格式YYYYMMDD HH24:mm:ss
+     */
+    @Column(name = "receiveTime")
+    private Date receiveTime;
+
     @OneToMany(cascade = CascadeType.PERSIST)
     @JoinColumn(name = "report_id")
     List<CorporationInfo> cisReport;
 
+    public Date getReceiveTime() {
+        return receiveTime;
+    }
+
+    public void setReceiveTime(Date receiveTime) {
+        this.receiveTime = receiveTime;
+    }
+
     public Long getId() {
         return id;
     }

src/main/java/com/uas/credit/model/corporation/PersonTopManagerInfo.java → src/main/java/com/uas/credit/model/personCorporation/PersonTopManagerInfo.java

@@ -1,4 +1,4 @@
-package com.uas.credit.model.corporation;
+package com.uas.credit.model.personCorporation;
 
 import com.uas.credit.model.personal.PersonTopManagerInfoItem;
 

src/main/java/com/uas/credit/model/personal/ArtificialNationalInfoItem.java

@@ -1,6 +1,6 @@
 package com.uas.credit.model.personal;
 
-import com.uas.credit.model.corporation.ArtificialNationalInfo;
+import com.uas.credit.model.personCorporation.ArtificialNationalInfo;
 
 import javax.persistence.*;
 import java.io.Serializable;

src/main/java/com/uas/credit/model/personal/NationalPersonShareholderReportItem.java

@@ -1,6 +1,6 @@
 package com.uas.credit.model.personal;
 
-import com.uas.credit.model.corporation.NationalPersonShareholderReport;
+import com.uas.credit.model.personCorporation.NationalPersonShareholderReport;
 
 import javax.persistence.*;
 import java.io.Serializable;

src/main/java/com/uas/credit/model/personal/PersonTopManagerInfoItem.java

@@ -1,6 +1,6 @@
 package com.uas.credit.model.personal;
 
-import com.uas.credit.model.corporation.PersonTopManagerInfo;
+import com.uas.credit.model.personCorporation.PersonTopManagerInfo;
 
 import javax.persistence.*;
 import java.io.Serializable;

src/main/java/com/uas/credit/model/personal/PoliceCheckReport.java

@@ -2,6 +2,7 @@ package com.uas.credit.model.personal;
 
 
 import javax.persistence.*;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -23,12 +24,22 @@ public class PoliceCheckReport {
     @Column(name = "id")
     private Long id;
 
+    /**
+     * 申请查询时间，格式YYYYMMDD HH24:mm:ss
+     */
+    @Column(name = "receiveTime")
+    private Date receiveTime;
+
     @OneToMany(cascade = { CascadeType.ALL }, fetch = FetchType.EAGER)
     @JoinColumn(name = "pc_id")
     List<PoliceCheckInfo> cisReport;
 
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
+    public Date getReceiveTime() {
+        return receiveTime;
+    }
+
+    public void setReceiveTime(Date receiveTime) {
+        this.receiveTime = receiveTime;
     }
 
     public Long getId() {

src/main/java/com/uas/credit/service/EnCreditInfoService.java

@@ -1,12 +1,14 @@
 package com.uas.credit.service;
 
+import com.uas.credit.model.EnterpriseQuery;
+
 /**
  * 企业信用接口类
  * created by shicr on 2018/6/14
  **/
 public interface EnCreditInfoService {
 
-    String getQueryCondition(String subreportIDs,String queryReasonID);
+    String getQueryCondition(EnterpriseQuery query);
 
-    String queryAndSave(String subreportIDs,String queryReasonID);
+    String queryAndSave(EnterpriseQuery query);
 }

src/main/java/com/uas/credit/service/EnRiskInfoService.java

@@ -1,13 +1,15 @@
 package com.uas.credit.service;
 
+import com.uas.credit.model.EnterpriseQuery;
+
 /**
  * 企业风险信息接口层
  * created by shicr on 2018/6/12
  **/
 public interface EnRiskInfoService {
 
-    String getQueryCondition(String subreportIDs,String queryReasonID);
+    String getQueryCondition(EnterpriseQuery query);
 
-    String queryAndSave(String subreportIDs,String queryReasonID);
+    String queryAndSave(EnterpriseQuery query);
 
 }

src/main/java/com/uas/credit/service/EnexceptionService.java

@@ -1,12 +1,15 @@
 package com.uas.credit.service;
 
+import com.uas.credit.model.EnterpriseQuery;
+
 /**
  * 企业异常信息接口层
  * created by shicr on 2018/6/15
  **/
 public interface EnexceptionService {
 
-    String getQueryCondition(String subreportIDs,String queryReasonID);
 
-    String queryAndSave(String subreportIDs,String queryReasonID);
+    String getQueryCondition(EnterpriseQuery query);
+
+    String queryAndSave(EnterpriseQuery query);
 }

src/main/java/com/uas/credit/service/EnterpriseDeptService.java

@@ -1,5 +1,7 @@
 package com.uas.credit.service;
 
+import com.uas.credit.model.EnterpriseQuery;
+
 /**
  * 企业债务信息接口
  * created by shicr on 2018/6/7
@@ -7,7 +9,7 @@ package com.uas.credit.service;
 public interface EnterpriseDeptService {
 
 
-    String getQueryCondition(String subreportIDs,String queryReasonID);
+    String getQueryCondition(EnterpriseQuery query);
 
-    String queryAndSave(String subreportIDs,String queryReasonID);
+    String queryAndSave(EnterpriseQuery query);
 }

src/main/java/com/uas/credit/service/EnterpriseQueryService.java

@@ -0,0 +1,14 @@
+package com.uas.credit.service;
+
+import com.uas.credit.model.EnterpriseQuery;
+
+/**
+ * 企业查询接口
+ * created by shicr on 2018/6/19
+ **/
+public interface EnterpriseQueryService {
+
+    String getQueryCondition(EnterpriseQuery query);
+
+    String queryAndSave(EnterpriseQuery query);
+}

src/main/java/com/uas/credit/service/ErpQueryService.java

@@ -1,5 +1,4 @@
 package com.uas.credit.service;
-
 /**
  * 查询入口
  * created by shicr on 2018/6/14
@@ -8,5 +7,4 @@ public interface ErpQueryService {
 
     String requestApi(String host, String path,String query);
 
-
 }

src/main/java/com/uas/credit/service/PersonCorporationService.java

@@ -0,0 +1,15 @@
+package com.uas.credit.service;
+
+import com.uas.credit.model.PersonQuery;
+
+/**
+ * 个人股东信息
+ * created by shicr on 2018/6/15
+ **/
+public interface PersonCorporationService {
+
+
+    String getQueryCondition(PersonQuery query);
+
+    String queryAndSave(PersonQuery query);
+}

src/main/java/com/uas/credit/service/PersonalService.java

@@ -1,9 +1,15 @@
 package com.uas.credit.service;
 
+
+import com.uas.credit.model.PersonQuery;
+
 /**
+ * 个人身份查询接口
  * created by shicr on 2018/6/8
  **/
 public interface PersonalService {
 
-    String getQueryCondition(String subreportIDs,String queryReasonID);
+    String getQueryCondition(PersonQuery query);
+
+    String queryAndSave(PersonQuery query);
 }

src/main/java/com/uas/credit/service/impl/EnCreditInfoServiceImpl.java

@@ -3,13 +3,13 @@ package com.uas.credit.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.uas.credit.controller.PyConfig;
 import com.uas.credit.dao.EnCreditDao;
+import com.uas.credit.model.EnterpriseQuery;
 import com.uas.credit.model.Item;
 import com.uas.credit.model.QueryCondition;
 import com.uas.credit.model.QueryConditions;
-import com.uas.credit.model.corpcreditinfo.EncreditInfo;
 import com.uas.credit.model.corpcreditinfo.EncreditReport;
-import com.uas.credit.model.debtinfo.EndeptinfoReport;
 import com.uas.credit.service.EnCreditInfoService;
+import com.uas.credit.service.EnterpriseQueryService;
 import com.uas.credit.service.ErpQueryService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -25,7 +25,15 @@ import java.util.List;
 public class EnCreditInfoServiceImpl implements EnCreditInfoService {
 
 
-    private static String queryType = "";
+    //查询类型
+    private static String ENTERPRISE_CREDIT = "25123";
+
+    //查询原因ID
+    private static Integer QueryReasonID = 101;
+
+    //收费子报告类型
+    private static String SubreportIDs = "95013";
+
 
     @Autowired
     private EnCreditDao creditDao;
@@ -38,27 +46,27 @@ public class EnCreditInfoServiceImpl implements EnCreditInfoService {
      *
      * @return
      */
-    public String getQueryCondition(String subreportIDs, String queryReasonID) {
+    public String getQueryCondition(EnterpriseQuery query) {
         // 使用JavaBean/Map方式（正式使用,仅供参考）
         QueryConditions queryConditions = new QueryConditions();
         List<QueryCondition> conditions = new ArrayList<QueryCondition>();
         QueryCondition queryCondition = new QueryCondition();
         // 查询类型
-        queryCondition.setQueryType(queryType);
+        queryCondition.setQueryType(ENTERPRISE_CREDIT);
         List<Item> items = new ArrayList<Item>();
 
         // 收费子报告
-        items.add(new Item("subreportIDs", subreportIDs));
+        items.add(new Item("subreportIDs", SubreportIDs));
         // 查询原因
-        items.add(new Item("queryReasonID", queryReasonID));
+        items.add(new Item("queryReasonID", String.valueOf(QueryReasonID)));
         // 业务流水号
-        items.add(new Item("refID", ""));
+        items.add(new Item("refID", query.getRefID()));
         //被查询企业名称
-        items.add(new Item("corpName", ""));
+        items.add(new Item("corpName", query.getEnname()));
         //被查询企业工商注册号
-        items.add(new Item("registerNo", ""));
+        items.add(new Item("registerNo", query.getRegisterNo()));
         //被查询企业社会信用代码
-        items.add(new Item("creditCode", ""));
+        items.add(new Item("creditCode", query.getCreditCode()));
 
         queryCondition.setItems(items);
         conditions.add(queryCondition);
@@ -69,13 +77,13 @@ public class EnCreditInfoServiceImpl implements EnCreditInfoService {
     /**
      * 查询并保存返回查询json串
      *
-     * @param subreportIDs
-     * @param queryReasonID
+     * @param query 企业查询信息
      * @return
      */
-    public String queryAndSave(String subreportIDs, String queryReasonID) {
+    public String queryAndSave(EnterpriseQuery query) {
         //拼装查询的json
-        String encredit = getQueryCondition(subreportIDs, queryReasonID);
+        String encredit = getQueryCondition(query);
+
         //发起鹏元征信的请求
         String encreditResult = erpQueryService.requestApi(PyConfig.HOST, PyConfig.PATH_UNZIP, encredit);
         //保存返回的结果

src/main/java/com/uas/credit/service/impl/EnRiskInfoServiceImpl.java

@@ -3,11 +3,13 @@ package com.uas.credit.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.uas.credit.controller.PyConfig;
 import com.uas.credit.dao.EnRiskInfoDao;
+import com.uas.credit.model.EnterpriseQuery;
 import com.uas.credit.model.Item;
 import com.uas.credit.model.QueryCondition;
 import com.uas.credit.model.QueryConditions;
 import com.uas.credit.model.corpriskinfo.EnRiskInfoReport;
 import com.uas.credit.service.EnRiskInfoService;
+import com.uas.credit.service.EnterpriseQueryService;
 import com.uas.credit.service.ErpQueryService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -23,11 +25,17 @@ import java.util.List;
 @Service
 public class EnRiskInfoServiceImpl implements EnRiskInfoService {
 
-    @Autowired
-    private EnRiskInfoDao corpRiskInfoDao;
+    //查询类型
+    private static String ENTERPRISE_RISK = "25123";
+
+    //查询原因ID
+    private static Integer QueryReasonID = 101;
 
+    //收费子报告类型
+    private static String SubreportIDs = "22527";
 
-    private static String queryType = "";
+    @Autowired
+    private EnRiskInfoDao corpRiskInfoDao;
 
     @Autowired
     private EnRiskInfoDao enRiskInfoDao;
@@ -40,27 +48,27 @@ public class EnRiskInfoServiceImpl implements EnRiskInfoService {
      *
      * @return
      */
-    public String getQueryCondition(String subreportIDs, String queryReasonID) {
+    public String getQueryCondition(EnterpriseQuery query) {
         // 使用JavaBean/Map方式（正式使用,仅供参考）
         QueryConditions queryConditions = new QueryConditions();
         List<QueryCondition> conditions = new ArrayList<QueryCondition>();
         QueryCondition queryCondition = new QueryCondition();
         // 查询类型
-        queryCondition.setQueryType(queryType);
+        queryCondition.setQueryType(ENTERPRISE_RISK);
         List<Item> items = new ArrayList<Item>();
 
         // 收费子报告
-        items.add(new Item("subreportIDs", subreportIDs));
+        items.add(new Item("subreportIDs", SubreportIDs));
         // 查询原因
-        items.add(new Item("queryReasonID", queryReasonID));
+        items.add(new Item("queryReasonID", String.valueOf(QueryReasonID)));
         // 业务流水号
-        items.add(new Item("refID", ""));
+        items.add(new Item("refID", query.getRefID()));
         //被查询企业名称
-        items.add(new Item("corpName", ""));
+        items.add(new Item("corpName", query.getEnname()));
         //被查询企业工商注册号
-        items.add(new Item("registerNo", ""));
+        items.add(new Item("registerNo", query.getRegisterNo()));
         //被查询企业社会信用代码
-        items.add(new Item("creditCode", ""));
+        items.add(new Item("creditCode", query.getCreditCode()));
 
         queryCondition.setItems(items);
         conditions.add(queryCondition);
@@ -71,13 +79,12 @@ public class EnRiskInfoServiceImpl implements EnRiskInfoService {
     /**
      * 查询并保存返回查询json串
      *
-     * @param subreportIDs
-     * @param queryReasonID
+     * @param query
      * @return
      */
-    public String queryAndSave(String subreportIDs, String queryReasonID) {
+    public String queryAndSave(EnterpriseQuery query) {
         //拼装查询的json
-        String enrisk = getQueryCondition(subreportIDs, queryReasonID);
+        String enrisk = getQueryCondition(query);
         //发起鹏元征信的请求
         String enriskResult = erpQueryService.requestApi(PyConfig.HOST, PyConfig.PATH_UNZIP, enrisk);
         //保存返回的结果

src/main/java/com/uas/credit/service/impl/EnexceptionServiceImpl.java

@@ -3,11 +3,14 @@ package com.uas.credit.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.uas.credit.controller.PyConfig;
 import com.uas.credit.dao.EnexceptionDao;
+import com.uas.credit.model.EnterpriseQuery;
 import com.uas.credit.model.Item;
 import com.uas.credit.model.QueryCondition;
 import com.uas.credit.model.QueryConditions;
 import com.uas.credit.model.abnormalinfo.AbnormalReport;
+import com.uas.credit.model.corpcreditinfo.EncreditReport;
 import com.uas.credit.service.EnexceptionService;
+import com.uas.credit.service.EnterpriseQueryService;
 import com.uas.credit.service.ErpQueryService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -22,7 +25,14 @@ import java.util.List;
 @Service
 public class EnexceptionServiceImpl implements EnexceptionService {
 
-    private static String queryType = "";
+    //查询类型
+    private static String ENTERPRISE_EXCEPTION = "25123";
+
+    //查询原因ID
+    private static Integer QueryReasonID = 101;
+
+    //收费子报告类型
+    private static String SubreportIDs = "22117";
 
     @Autowired
     private EnexceptionDao enexceptionDao;
@@ -35,27 +45,27 @@ public class EnexceptionServiceImpl implements EnexceptionService {
      *
      * @return
      */
-    public String getQueryCondition(String subreportIDs, String queryReasonID) {
+    public String getQueryCondition(EnterpriseQuery query) {
         // 使用JavaBean/Map方式（正式使用,仅供参考）
         QueryConditions queryConditions = new QueryConditions();
         List<QueryCondition> conditions = new ArrayList<QueryCondition>();
         QueryCondition queryCondition = new QueryCondition();
         // 查询类型
-        queryCondition.setQueryType(queryType);
+        queryCondition.setQueryType(ENTERPRISE_EXCEPTION);
         List<Item> items = new ArrayList<Item>();
 
         // 收费子报告
-        items.add(new Item("subreportIDs", subreportIDs));
+        items.add(new Item("subreportIDs", SubreportIDs));
         // 查询原因
-        items.add(new Item("queryReasonID", queryReasonID));
+        items.add(new Item("queryReasonID", String.valueOf(QueryReasonID)));
         // 业务流水号
-        items.add(new Item("refID", ""));
+        items.add(new Item("refID", query.getRefID()));
         //被查询企业名称
-        items.add(new Item("corpName", ""));
+        items.add(new Item("corpName", query.getEnname()));
         //被查询企业工商注册号
-        items.add(new Item("registerNo", ""));
+        items.add(new Item("registerNo", query.getRegisterNo()));
         //被查询企业社会信用代码
-        items.add(new Item("creditCode", ""));
+        items.add(new Item("creditCode", query.getCreditCode()));
 
         queryCondition.setItems(items);
         conditions.add(queryCondition);
@@ -63,16 +73,17 @@ public class EnexceptionServiceImpl implements EnexceptionService {
         return JSON.toJSONString(queryConditions);
     }
 
+
     /**
      * 查询并保存返回查询json串
      *
-     * @param subreportIDs
-     * @param queryReasonID
+     * @param query 企业查询信息
      * @return
      */
-    public String queryAndSave(String subreportIDs, String queryReasonID) {
+    public String queryAndSave(EnterpriseQuery query) {
         //拼装查询的json
-        String enexception = getQueryCondition(subreportIDs, queryReasonID);
+        String enexception = getQueryCondition(query);
+
         //发起鹏元征信的请求
         String enexceptionResult = erpQueryService.requestApi(PyConfig.HOST, PyConfig.PATH_UNZIP, enexception);
         //保存返回的结果

src/main/java/com/uas/credit/service/impl/EnterpriseDeptServiceImpl.java

@@ -3,11 +3,14 @@ package com.uas.credit.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.uas.credit.controller.PyConfig;
 import com.uas.credit.dao.EnterpriseDeptDao;
+import com.uas.credit.model.EnterpriseQuery;
 import com.uas.credit.model.Item;
 import com.uas.credit.model.QueryCondition;
 import com.uas.credit.model.QueryConditions;
 import com.uas.credit.model.debtinfo.EndeptinfoReport;
+import com.uas.credit.service.EnRiskInfoService;
 import com.uas.credit.service.EnterpriseDeptService;
+import com.uas.credit.service.EnterpriseQueryService;
 import com.uas.credit.service.ErpQueryService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -28,50 +31,58 @@ public class EnterpriseDeptServiceImpl implements EnterpriseDeptService {
     @Autowired
     private ErpQueryService erpQueryService;
 
-    private static String queryType = "";
+    //查询类型
+    private static String ENTERPRISE_DEPT = "25123";
+
+    //查询原因ID
+    private static Integer QueryReasonID = 101;
+
+    //收费子报告类型
+    private static String SubreportIDs = "22118";
 
     /**
      * 查找企业信息
      *
      * @return
      */
-    public String getQueryCondition(String subreportIDs,String queryReasonID)  {
-            // 使用JavaBean/Map方式（正式使用,仅供参考）
-            QueryConditions queryConditions = new QueryConditions();
-            List<QueryCondition> conditions = new ArrayList<QueryCondition>();
-            QueryCondition queryCondition = new QueryCondition();
-            // 查询类型
-            queryCondition.setQueryType(queryType);
-            List<Item> items = new ArrayList<Item>();
+    public String getQueryCondition(EnterpriseQuery query) {
+        // 使用JavaBean/Map方式（正式使用,仅供参考）
+        QueryConditions queryConditions = new QueryConditions();
+        List<QueryCondition> conditions = new ArrayList<QueryCondition>();
+        QueryCondition queryCondition = new QueryCondition();
+        // 查询类型
+        queryCondition.setQueryType(ENTERPRISE_DEPT);
+        List<Item> items = new ArrayList<Item>();
 
-            // 收费子报告
-            items.add(new Item("subreportIDs", subreportIDs));
-            // 查询原因
-            items.add(new Item("queryReasonID", queryReasonID));
-            // 业务流水号
-            items.add(new Item("refID", ""));
-            //被查询企业名称
-            items.add(new Item("corpName",""));
-            //被查询企业工商注册号
-            items.add(new Item("registerNo",""));
-            //被查询企业社会信用代码
-            items.add(new Item("creditCode",""));
+        // 收费子报告
+        items.add(new Item("subreportIDs", SubreportIDs));
+        // 查询原因
+        items.add(new Item("queryReasonID", String.valueOf(QueryReasonID)));
+        // 业务流水号
+        items.add(new Item("refID", query.getRefID()));
+        //被查询企业名称
+        items.add(new Item("corpName", query.getEnname()));
+        //被查询企业工商注册号
+        items.add(new Item("registerNo", query.getRegisterNo()));
+        //被查询企业社会信用代码
+        items.add(new Item("creditCode", query.getCreditCode()));
 
-            queryCondition.setItems(items);
-            conditions.add(queryCondition);
-            queryConditions.setConditions(conditions);
-            return JSON.toJSONString(queryConditions);
+        queryCondition.setItems(items);
+        conditions.add(queryCondition);
+        queryConditions.setConditions(conditions);
+        return JSON.toJSONString(queryConditions);
     }
 
     /**
      * 查询并保存返回查询json串
-     * @param subreportIDs
-     * @param queryReasonID
+     *
+     * @param query
      * @return
      */
-    public String queryAndSave(String subreportIDs, String queryReasonID) {
-        String endept = getQueryCondition(subreportIDs,queryReasonID);
-        String endeptResult = endeptResult = erpQueryService.requestApi(PyConfig.HOST,PyConfig.PATH_UNZIP,endept);
+    public String queryAndSave(EnterpriseQuery query) {
+        String endept = getQueryCondition(query);
+
+        String endeptResult = erpQueryService.requestApi(PyConfig.HOST, PyConfig.PATH_UNZIP, endept);
         EndeptinfoReport endeptinfoReport = JSON.parseObject(endeptResult, EndeptinfoReport.class);
         enterpriseDeptDao.save(endeptinfoReport);
         return endeptResult;

src/main/java/com/uas/credit/service/impl/ErpQueryServiceImpl.java

@@ -1,10 +1,6 @@
 package com.uas.credit.service.impl;
 
-import com.alibaba.fastjson.JSON;
 import com.uas.credit.controller.PyConfig;
-import com.uas.credit.model.ErpQuery;
-import com.uas.credit.model.abnormalinfo.AbnormalReport;
-import com.uas.credit.model.debtinfo.EndeptinfoReport;
 import com.uas.credit.service.EnterpriseDeptService;
 import com.uas.credit.service.EnterpriseService;
 import com.uas.credit.service.ErpQueryService;
@@ -14,11 +10,8 @@ import org.apache.http.HttpResponse;
 import org.apache.http.util.EntityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.ui.ModelMap;
 
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -29,35 +22,6 @@ import java.util.Map;
 @Service
 public class ErpQueryServiceImpl implements ErpQueryService {
 
-    /**
-     * 企业债务产品ID号
-     */
-    private static String ENTERPRISE_DEPT = "22118";
-
-    /**
-     * 企业风险产品ID号
-     */
-    private static String ENTERPRISE_RISK = "22527";
-
-    /**
-     * 企业信用产品ID号
-     */
-    private static String ENTERPRISE_CREDIT = "95013";
-
-    /**
-     * 企业经营异常产品ID号
-     */
-    private static String ENTERPRISE_EXCEPTION = "22117";
-
-    /**
-     * 个人身份认证产品ID号
-     */
-    private static String PERSONAL_IDENTITY = "10602";
-
-    /**
-     * 个人法人股东产品ID号
-     */
-    private static String PERSONAL_SHAREHOLDER = "96002";
 
     @Autowired
     private EnterpriseService enterpriseService;
@@ -68,69 +32,6 @@ public class ErpQueryServiceImpl implements ErpQueryService {
     @Autowired
     private EnterpriseDeptService enterpriseDeptService;
 
-    /**
-     * 接收ERP发起的查询请求
-     * @param json
-     * @return
-     */
-    public ModelMap getQueryCondition(String json) {
-        ModelMap modelMap = new ModelMap();
-        ErpQuery queryLog = new ErpQuery();
-        try {
-            String query = URLDecoder.decode(json, "utf-8");
-            queryLog = JSON.parseObject(query, ErpQuery.class);
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-        if (queryLog != null) {
-            String endeptResult = "";
-            String enexceptionResult = "";
-            String enriskResult = "";
-            String encreditResult = "";
-
-            //查询企业
-            if (queryLog.getQueryType() == 0) {
-
-                //查询并保存企业债务信息
-                endeptResult = enterpriseDeptService.queryAndSave(ENTERPRISE_DEPT, "101");
-
-                //查询企业经营异常信息
-                String enexception = enterpriseService.getQueryCondition(ENTERPRISE_EXCEPTION, "");
-                try {
-                    enexceptionResult = requestApi(PyConfig.HOST,PyConfig.PATH_UNZIP,enexception);
-                    AbnormalReport abnormalReport = JSON.parseObject(enexception, AbnormalReport.class);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                //查询企业信用信息
-                String encredit = enterpriseService.getQueryCondition(ENTERPRISE_CREDIT, "");
-                try {
-                    encreditResult = requestApi(PyConfig.HOST,PyConfig.PATH_UNZIP,encredit);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                //查询企业风险信息
-                String enrisk = enterpriseService.getQueryCondition(ENTERPRISE_RISK, "");
-                try {
-                    enriskResult = requestApi(PyConfig.HOST,PyConfig.PATH_UNZIP,enrisk);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                modelMap.put("EndeptResult", endeptResult);
-                modelMap.put("EnexceptionResult", enexceptionResult);
-                modelMap.put("EnriskResult", enriskResult);
-                modelMap.put("EncreditResult", encreditResult);
-            } else if(queryLog.getQueryType() == 1) {
-                //查询个人身份信息
-                String Pnidentity = personalService.getQueryCondition(PERSONAL_IDENTITY,"");
-                //查询个人股东信息
-                String Pnshareholder = personalService.getQueryCondition(PERSONAL_SHAREHOLDER,"");
-                modelMap.put("Pnidentity",Pnidentity);
-                modelMap.put("Pnshareholder",Pnshareholder);
-            }
-        }
-        return modelMap;
-    }
 
     public String requestApi(String host, String path,String query) {
 

src/main/java/com/uas/credit/service/impl/PersonCorporationServiceImpl.java

@@ -0,0 +1,95 @@
+package com.uas.credit.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.uas.credit.controller.PyConfig;
+import com.uas.credit.dao.EnterpriseDao;
+import com.uas.credit.dao.PersonCorporationDao;
+import com.uas.credit.model.Item;
+import com.uas.credit.model.PersonQuery;
+import com.uas.credit.model.QueryCondition;
+import com.uas.credit.model.QueryConditions;
+import com.uas.credit.model.personCorporation.PersonCorporationReport;
+import com.uas.credit.service.ErpQueryService;
+import com.uas.credit.service.PersonCorporationService;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 个人股东信息
+ * created by shicr on 2018/6/15
+ **/
+@Service
+public class PersonCorporationServiceImpl implements PersonCorporationService {
+
+
+    //查询类型
+    private static String PERSONAL_SHAREHOLDER = "25136";
+
+    //查询原因ID
+    private static Integer QueryReasonID = 101;
+
+    //收费子报告类型
+    private static String SubreportIDs = "96002";
+
+
+    @Autowired
+    private PersonCorporationDao personCorporationDao;
+
+    @Autowired
+    private ErpQueryService erpQueryService;
+
+    /**
+     * 拼装企业查询json格式
+     *
+     * @param query
+     * @return
+     */
+    @Override
+    public String getQueryCondition(PersonQuery query) {
+
+        QueryConditions queryConditions = new QueryConditions();
+        List<QueryCondition> conditions = new ArrayList<QueryCondition>();
+        QueryCondition queryCondition = new QueryCondition();
+
+        queryCondition.setQueryType(PERSONAL_SHAREHOLDER);
+        List<Item> items = new ArrayList<Item>();
+        // 收费子报告
+        items.add(new Item("subreportIDs", SubreportIDs));
+        // 查询原因
+        items.add(new Item("queryReasonID", String.valueOf(QueryReasonID)));
+        // 业务流水号
+        items.add(new Item("refID", query.getRefID()));
+        //被查询姓名
+        items.add(new Item("name", query.getName()));
+        //被查询个人证件号
+        items.add(new Item("documentNo", query.getDocumentNo()));
+        queryCondition.setItems(items);
+        conditions.add(queryCondition);
+        queryConditions.setConditions(conditions);
+
+        return JSON.toJSONString(queryConditions);
+    }
+
+
+    /**
+     * 查询并保存返回查询json串
+     *
+     * @param query
+     * @return
+     */
+    public String queryAndSave(PersonQuery query) {
+        //拼装查询的json
+        String corporation = getQueryCondition(query);
+        //发起鹏元征信的请求
+        String corporationResult = erpQueryService.requestApi(PyConfig.HOST, PyConfig.PATH_UNZIP, corporation);
+        //保存返回的结果
+        PersonCorporationReport personCorporationReport = JSON.parseObject(corporationResult, PersonCorporationReport.class);
+        PersonCorporationReport personCorporationReport1 = personCorporationDao.save(personCorporationReport);
+        return corporationResult;
+
+    }
+}

src/main/java/com/uas/credit/service/impl/PersonalServiceImpl.java

@@ -5,6 +5,7 @@ import com.uas.credit.controller.PyConfig;
 import com.uas.credit.dao.EnCreditDao;
 import com.uas.credit.dao.PersonDao;
 import com.uas.credit.model.Item;
+import com.uas.credit.model.PersonQuery;
 import com.uas.credit.model.QueryCondition;
 import com.uas.credit.model.QueryConditions;
 import com.uas.credit.model.corpcreditinfo.EncreditReport;
@@ -25,7 +26,15 @@ import java.util.List;
 public class PersonalServiceImpl implements PersonalService {
 
 
-    private static String queryType = "";
+    //查询类型
+    private static String PERSONAL_IDENTITY = "25160";
+
+    //查询原因ID
+    private static Integer QueryReasonID = 101;
+
+    //收费子报告类型
+    private static String SubreportIDs = "10602";
+
 
     @Autowired
     private PersonDao personDao;
@@ -35,24 +44,24 @@ public class PersonalServiceImpl implements PersonalService {
 
 
     @Override
-    public String getQueryCondition(String subreportIDs, String queryReasonID) {
+    public String getQueryCondition(PersonQuery query) {
 
         QueryConditions queryConditions = new QueryConditions();
         List<QueryCondition> conditions = new ArrayList<QueryCondition>();
         QueryCondition queryCondition = new QueryCondition();
 
-        queryCondition.setQueryType(queryType);
+        queryCondition.setQueryType(PERSONAL_IDENTITY);
         List<Item> items = new ArrayList<Item>();
         // 收费子报告
-        items.add(new Item("subreportIDs", subreportIDs));
+        items.add(new Item("subreportIDs", SubreportIDs));
         // 查询原因
-        items.add(new Item("queryReasonID", queryReasonID));
+        items.add(new Item("queryReasonID", String.valueOf(QueryReasonID)));
         // 业务流水号
-        items.add(new Item("refID", ""));
+        items.add(new Item("refID", query.getRefID()));
         //被查询姓名
-        items.add(new Item("name",""));
+        items.add(new Item("name", query.getName()));
         //被查询个人证件号
-        items.add(new Item("documentNo",""));
+        items.add(new Item("documentNo", query.getDocumentNo()));
         queryCondition.setItems(items);
         conditions.add(queryCondition);
         queryConditions.setConditions(conditions);
@@ -63,17 +72,15 @@ public class PersonalServiceImpl implements PersonalService {
     /**
      * 查询并保存返回查询json串
      *
-     * @param subreportIDs
-     * @param queryReasonID
+     * @param query
      * @return
      */
-    public String queryAndSave(String subreportIDs, String queryReasonID) {
+    public String queryAndSave(PersonQuery query) {
         //拼装查询的json
-        String person = getQueryCondition(subreportIDs, queryReasonID);
+        String person = getQueryCondition(query);
         //发起鹏元征信的请求
         String prsonResult = erpQueryService.requestApi(PyConfig.HOST, PyConfig.PATH_UNZIP, person);
         //保存返回的结果
-
         PoliceCheckReport policeCheckReport = JSON.parseObject(prsonResult, PoliceCheckReport.class);
         PoliceCheckReport policeCheckReport1 = personDao.save(policeCheckReport);
         return prsonResult;