增加接口实现类

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

@@ -18,8 +18,8 @@ import java.net.URLDecoder;
  * UAS查询入口
  * created by shicr on 2018/6/6
  **/
-@ResponseBody
 @RestController
+@RequestMapping(value = "erpquery")
 public class ErpQueryController {
 
     private static String ENTERPRISE_DEPT = "22118";

src/main/java/com/uas/credit/dao/EnAbnormalInfoDao.java

@@ -1,14 +0,0 @@
-package com.uas.credit.dao;
-
-import com.uas.credit.model.abnormalinfo.CorpManageAbnormalInfo;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-/**
- * 企业异常接口dao层
- * created by shicr on 2018/6/8
- **/
-@Repository
-public interface EnAbnormalInfoDao extends JpaRepository<CorpManageAbnormalInfo,Long>{
-
-}

src/main/java/com/uas/credit/dao/EnCreditDao.java

@@ -0,0 +1,14 @@
+package com.uas.credit.dao;
+
+import com.uas.credit.model.corpcreditinfo.EncreditReport;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 企业信用信息
+ * created by shicr on 2018/6/15
+ **/
+@Repository
+public interface EnCreditDao extends JpaRepository<EncreditReport,Long> {
+
+}

src/main/java/com/uas/credit/dao/EnRiskInfoDao.java

@@ -1,6 +1,6 @@
 package com.uas.credit.dao;
 
-import com.uas.credit.model.corpriskinfo.CorpRiskInfo;
+import com.uas.credit.model.corpriskinfo.EnRiskInfoReport;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
@@ -9,6 +9,6 @@ import org.springframework.stereotype.Repository;
  * created by shicr on 2018/6/12
  **/
 @Repository
-public interface EnRiskInfoDao extends JpaRepository<CorpRiskInfo,Long> {
+public interface EnRiskInfoDao extends JpaRepository<EnRiskInfoReport,Long> {
 
 }

src/main/java/com/uas/credit/dao/EnexceptionDao.java

@@ -0,0 +1,14 @@
+package com.uas.credit.dao;
+
+import com.uas.credit.model.abnormalinfo.AbnormalReport;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 企业异常保存类
+ * created by shicr on 2018/6/15
+ **/
+@Repository
+public interface EnexceptionDao extends JpaRepository<AbnormalReport,Long>{
+
+}

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

@@ -1,10 +0,0 @@
-package com.uas.credit.model;
-
-
-/**
- * created by shicr on 2018/6/8
- **/
-public class CreditBufferedLog  {
-
-
-}

src/main/java/com/uas/credit/model/corpriskInfo/CorpRiskInfo.java

@@ -27,24 +27,6 @@ public class CorpRiskInfo implements Serializable {
     @Column(name = "subReportType")
     private Integer subReportType;
 
-    /**
-     * 风险综述外键ID
-     */
-    @Column(name = "summaryId")
-    private Long summaryId;
-
-    /**
-     * 汇总信息外键ID
-     */
-    @Column(name = "statId")
-    private Long statId;
-
-    /**
-     * 风险详情外键ID
-     */
-    @Column(name = "detailsId")
-    private Long detailsId;
-
     /**
      * 关系拥有端
      */
@@ -76,30 +58,6 @@ public class CorpRiskInfo implements Serializable {
         this.subReportType = subReportType;
     }
 
-    public Long getSummaryId() {
-        return summaryId;
-    }
-
-    public void setSummaryId(Long summaryId) {
-        this.summaryId = summaryId;
-    }
-
-    public Long getStatId() {
-        return statId;
-    }
-
-    public void setStatId(Long statId) {
-        this.statId = statId;
-    }
-
-    public Long getDetailsId() {
-        return detailsId;
-    }
-
-    public void setDetailsId(Long detailsId) {
-        this.detailsId = detailsId;
-    }
-
     public CorpRiskInfoStat getStat() {
         return stat;
     }

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

@@ -9,7 +9,7 @@ import java.io.Serializable;
  **/
 @Entity
 @Table(name = "risk$report")
-public class CorpRiskInfoReport implements Serializable {
+public class EnRiskInfoReport implements Serializable {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)

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

@@ -1,7 +0,0 @@
-package com.uas.credit.service;
-
-/**
- * created by shicr on 2018/6/14
- **/
-public interface CorpCreditInfoService {
-}

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

@@ -1,16 +0,0 @@
-package com.uas.credit.service;
-
-
-import com.uas.credit.model.corpriskinfo.CorpRiskInfo;
-
-import java.util.List;
-
-/**
- * 企业风险信息接口层
- * created by shicr on 2018/6/12
- **/
-public interface CorpRiskInfoService {
-
-    List<CorpRiskInfo> save(List<CorpRiskInfo> corpRiskInfos);
-
-}

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

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

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

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

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

@@ -1,7 +0,0 @@
-package com.uas.credit.service.impl;
-
-/**
- * created by shicr on 2018/6/14
- **/
-public class CorpCreditInfoServiceImpl {
-}

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

@@ -1,33 +0,0 @@
-package com.uas.credit.service.impl;
-
-import com.uas.credit.dao.EnDebtInfoDao;
-import com.uas.credit.model.debtinfo.CorpDebtInfo;
-import com.uas.credit.service.CorpDebtInfoService;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 企业债务接口实现类
- * created by shicr on 2018/6/8
- **/
-public class CorpDebtInfoServiceImpl implements CorpDebtInfoService {
-
-    @Autowired
-    private EnDebtInfoDao corpDebtInfoDao;
-
-    /**
-     * 保存企业债务信息
-     * @param corpDebtInfos
-     * @return
-     */
-    public List<CorpDebtInfo> save(List<CorpDebtInfo> corpDebtInfos) {
-        List<CorpDebtInfo> list = new ArrayList<CorpDebtInfo>();
-        for(CorpDebtInfo corpDebtInfo : corpDebtInfos){
-            CorpDebtInfo corpDebtInfo1 = corpDebtInfoDao.save(corpDebtInfo);
-            list.add(corpDebtInfo1);
-        }
-        return list;
-    }
-}

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

@@ -1,32 +0,0 @@
-package com.uas.credit.service.impl;
-
-import com.uas.credit.dao.EnAbnormalInfoDao;
-import com.uas.credit.model.abnormalinfo.CorpManageAbnormalInfo;
-import com.uas.credit.service.CorpManageAbnormalInfoService;
-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/8
- **/
-@Service
-public class CorpManageAbnormalInfoServiceImpl implements CorpManageAbnormalInfoService {
-
-    @Autowired
-    private EnAbnormalInfoDao corpManageAbnormalInfoDao;
-
-    public List<CorpManageAbnormalInfo> save(List<CorpManageAbnormalInfo> corpManageAbnormalInfos) {
-
-        List<CorpManageAbnormalInfo> list = new ArrayList<CorpManageAbnormalInfo>();
-
-        for(CorpManageAbnormalInfo corpManageAbnormalInfo : corpManageAbnormalInfos){
-            CorpManageAbnormalInfo corpManageAbnormalInfo1 = corpManageAbnormalInfoDao.save(corpManageAbnormalInfo);
-            list.add(corpManageAbnormalInfo1);
-        }
-        return list;
-    }
-}

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

@@ -1,30 +0,0 @@
-package com.uas.credit.service.impl;
-
-import com.uas.credit.dao.EnRiskInfoDao;
-import com.uas.credit.model.corpriskinfo.CorpRiskInfo;
-import com.uas.credit.service.CorpRiskInfoService;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-/**
- * 企业风险接口实现层
- * created by shicr on 2018/6/12
- **/
-public class CorpRiskInfoServiceImpl implements CorpRiskInfoService {
-
-    @Autowired
-    private EnRiskInfoDao corpRiskInfoDao;
-
-    @Override
-    public List<CorpRiskInfo> save(List<CorpRiskInfo> corpRiskInfos) {
-        List<CorpRiskInfo> list = new ArrayList<CorpRiskInfo>();
-        for(CorpRiskInfo corpRiskInfo : list){
-            CorpRiskInfo corpRiskInfo1 = corpRiskInfoDao.save(corpRiskInfo);
-            list.add(corpRiskInfo1);
-        }
-        return list;
-    }
-}

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

@@ -0,0 +1,86 @@
+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.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.ErpQueryService;
+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/14
+ **/
+@Service
+public class EnCreditInfoServiceImpl implements EnCreditInfoService {
+
+
+    private static String queryType = "";
+
+    @Autowired
+    private EnCreditDao creditDao;
+
+    @Autowired
+    private ErpQueryService erpQueryService;
+
+    /**
+     * 查找企业信息
+     *
+     * @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>();
+
+        // 收费子报告
+        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", ""));
+
+        queryCondition.setItems(items);
+        conditions.add(queryCondition);
+        queryConditions.setConditions(conditions);
+        return JSON.toJSONString(queryConditions);
+    }
+
+    /**
+     * 查询并保存返回查询json串
+     *
+     * @param subreportIDs
+     * @param queryReasonID
+     * @return
+     */
+    public String queryAndSave(String subreportIDs, String queryReasonID) {
+        //拼装查询的json
+        String encredit = getQueryCondition(subreportIDs, queryReasonID);
+        //发起鹏元征信的请求
+        String encreditResult = erpQueryService.requestApi(PyConfig.HOST, PyConfig.PATH_UNZIP, encredit);
+        //保存返回的结果
+        EncreditReport encreditReport = JSON.parseObject(encreditResult, EncreditReport.class);
+        EncreditReport encreditReport1 = creditDao.save(encreditReport);
+        return encreditResult;
+    }
+}

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

@@ -0,0 +1,88 @@
+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.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.ErpQueryService;
+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/12
+ **/
+@Service
+public class EnRiskInfoServiceImpl implements EnRiskInfoService {
+
+    @Autowired
+    private EnRiskInfoDao corpRiskInfoDao;
+
+
+    private static String queryType = "";
+
+    @Autowired
+    private EnRiskInfoDao enRiskInfoDao;
+
+    @Autowired
+    private ErpQueryService erpQueryService;
+
+    /**
+     * 查找企业信息
+     *
+     * @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>();
+
+        // 收费子报告
+        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", ""));
+
+        queryCondition.setItems(items);
+        conditions.add(queryCondition);
+        queryConditions.setConditions(conditions);
+        return JSON.toJSONString(queryConditions);
+    }
+
+    /**
+     * 查询并保存返回查询json串
+     *
+     * @param subreportIDs
+     * @param queryReasonID
+     * @return
+     */
+    public String queryAndSave(String subreportIDs, String queryReasonID) {
+        //拼装查询的json
+        String enrisk = getQueryCondition(subreportIDs, queryReasonID);
+        //发起鹏元征信的请求
+        String enriskResult = erpQueryService.requestApi(PyConfig.HOST, PyConfig.PATH_UNZIP, enrisk);
+        //保存返回的结果
+        EnRiskInfoReport enRiskInfoReport = JSON.parseObject(enriskResult, EnRiskInfoReport.class);
+        EnRiskInfoReport enRiskInfoReport1 = enRiskInfoDao.save(enRiskInfoReport);
+        return enriskResult;
+    }
+}

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

@@ -1,21 +1,83 @@
 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.Item;
+import com.uas.credit.model.QueryCondition;
+import com.uas.credit.model.QueryConditions;
+import com.uas.credit.model.abnormalinfo.AbnormalReport;
 import com.uas.credit.service.EnexceptionService;
+import com.uas.credit.service.ErpQueryService;
+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 EnexceptionServiceImpl implements EnexceptionService {
 
+    private static String queryType = "";
+
+    @Autowired
+    private EnexceptionDao enexceptionDao;
+
+    @Autowired
+    private ErpQueryService erpQueryService;
 
-    @Override
+    /**
+     * 查找企业信息
+     *
+     * @return
+     */
     public String getQueryCondition(String subreportIDs, String queryReasonID) {
-        return null;
+        // 使用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>();
+
+        // 收费子报告
+        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", ""));
+
+        queryCondition.setItems(items);
+        conditions.add(queryCondition);
+        queryConditions.setConditions(conditions);
+        return JSON.toJSONString(queryConditions);
     }
 
-    @Override
+    /**
+     * 查询并保存返回查询json串
+     *
+     * @param subreportIDs
+     * @param queryReasonID
+     * @return
+     */
     public String queryAndSave(String subreportIDs, String queryReasonID) {
-        return null;
+        //拼装查询的json
+        String enexception = getQueryCondition(subreportIDs, queryReasonID);
+        //发起鹏元征信的请求
+        String enexceptionResult = erpQueryService.requestApi(PyConfig.HOST, PyConfig.PATH_UNZIP, enexception);
+        //保存返回的结果
+        AbnormalReport abnormalReport = JSON.parseObject(enexceptionResult, AbnormalReport.class);
+        AbnormalReport abnormalReport1 = enexceptionDao.save(abnormalReport);
+        return enexceptionResult;
     }
 }

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

@@ -1,58 +0,0 @@
-package com.uas.credit.service.impl;
-
-import com.alibaba.fastjson.JSON;
-import com.uas.credit.controller.PyConfig;
-import com.uas.credit.model.Item;
-import com.uas.credit.model.QueryCondition;
-import com.uas.credit.model.QueryConditions;
-import com.uas.credit.util.PyUtils;
-
-import java.io.FileInputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 企业经营异常接口
- * created by shicr on 2018/6/7
- **/
-public class EnterpriseAbnormalImpl {
-
-    /**
-     * 查找企业债务信息
-     *
-     * @return
-     */
-    private static String getQueryCondition() throws Exception {
-
-        if (PyConfig.IS_TEST) {
-            // 读取文件方式（测试使用,仅供参考）
-            return PyUtils.toString(new FileInputStream(PyConfig.QUERY_FILE), "UTF-8");
-        } else {
-            // 使用JavaBean/Map方式（正式使用,仅供参考）
-            QueryConditions queryConditions = new QueryConditions();
-            List<QueryCondition> conditions = new ArrayList<QueryCondition>();
-            QueryCondition queryCondition = new QueryCondition();
-            // 查询类型
-            queryCondition.setQueryType("25123");
-            List<Item> items = new ArrayList<Item>();
-
-            // 收费子报告
-            items.add(new Item("subreportIDs", "21301"));
-            // 查询原因
-            items.add(new Item("queryReasonID", "101"));
-            // 业务流水号
-            items.add(new Item("refID", ""));
-            //被查询企业名称
-            items.add(new Item("corpName",""));
-            //被查询企业工商注册号
-            items.add(new Item("registerNo",""));
-            //被查询企业社会信用代码
-            items.add(new Item("creditCode",""));
-
-            queryCondition.setItems(items);
-            conditions.add(queryCondition);
-            queryConditions.setConditions(conditions);
-            return JSON.toJSONString(queryConditions);
-        }
-    }
-}

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

@@ -16,7 +16,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * 查询企业信息
+ * 企业债务信息
  * created by shicr on 2018/6/7
  **/
 @Service

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

@@ -6,7 +6,7 @@ import com.uas.credit.dao.EnterpriseDao;
 import com.uas.credit.model.*;
 import com.uas.credit.service.CorpDebtInfoService;
 import com.uas.credit.service.CorpManageAbnormalInfoService;
-import com.uas.credit.service.CorpRiskInfoService;
+import com.uas.credit.service.EnRiskInfoService;
 import com.uas.credit.service.EnterpriseService;
 import com.uas.credit.util.HttpUtils;
 import org.apache.http.HttpResponse;
@@ -35,30 +35,10 @@ public class EnterpriseServiceImpl implements EnterpriseService {
     private CorpDebtInfoService corpDebtInfoService;
 
     @Autowired
-    private CorpRiskInfoService corpRiskInfoService;
+    private EnRiskInfoService corpRiskInfoService;
 
     @Autowired
     private CorpManageAbnormalInfoService corpManageAbnormalInfoService;
-/*
-    public void requestUnzipApi() throws Exception {
-        String result = requestApi(PyConfig.HOST, PyConfig.PATH_UNZIP);
-        System.out.println(result);
-    }
-
-    //    @Test
-    public void requestZipApi() throws Exception {
-        String result = requestApi(PyConfig.HOST, PyConfig.PATH_ZIP);
-        System.out.println(result);
-
-        // 对压缩文本做进一步处理
-        Map<String, Object> resultMap = JSON.parseObject(result);
-        String status = (String) resultMap.get("status");
-        if ("1".equals(status)) {
-            String returnValue = (String) resultMap.get("returnValue");
-            returnValue = PyUtils.decodeAndDecompress(returnValue, "UTF-8");
-            System.out.println("returnValue:" + returnValue);
-        }
-    }*/
 
     /**
      * 拼装企业查询json格式

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

@@ -1,10 +1,18 @@
 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.dao.PersonDao;
 import com.uas.credit.model.Item;
 import com.uas.credit.model.QueryCondition;
 import com.uas.credit.model.QueryConditions;
+import com.uas.credit.model.corpcreditinfo.EncreditReport;
+import com.uas.credit.model.personal.PoliceCheckReport;
+import com.uas.credit.service.ErpQueryService;
 import com.uas.credit.service.PersonalService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -13,10 +21,19 @@ import java.util.List;
  * 个人身份信息查询
  * created by shicr on 2018/6/8
  **/
+@Service
 public class PersonalServiceImpl implements PersonalService {
 
+
     private static String queryType = "";
 
+    @Autowired
+    private PersonDao personDao;
+
+    @Autowired
+    private ErpQueryService erpQueryService;
+
+
     @Override
     public String getQueryCondition(String subreportIDs, String queryReasonID) {
 
@@ -42,4 +59,23 @@ public class PersonalServiceImpl implements PersonalService {
 
         return JSON.toJSONString(queryConditions);
     }
+
+    /**
+     * 查询并保存返回查询json串
+     *
+     * @param subreportIDs
+     * @param queryReasonID
+     * @return
+     */
+    public String queryAndSave(String subreportIDs, String queryReasonID) {
+        //拼装查询的json
+        String person = getQueryCondition(subreportIDs, queryReasonID);
+        //发起鹏元征信的请求
+        String prsonResult = erpQueryService.requestApi(PyConfig.HOST, PyConfig.PATH_UNZIP, person);
+        //保存返回的结果
+
+        PoliceCheckReport policeCheckReport = JSON.parseObject(prsonResult, PoliceCheckReport.class);
+        PoliceCheckReport policeCheckReport1 = personDao.save(policeCheckReport);
+        return prsonResult;
+    }
 }