增加查询缓存

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

@@ -1,12 +1,9 @@
 package com.uas.credit.controller;
 
-import com.uas.credit.model.*;
-import com.uas.credit.model.abnormalinfo.AbnormalRoot;
-import com.uas.credit.model.corpcreditinfo.EncreditinfoRoot;
-import com.uas.credit.model.corpriskinfo.EnRiskInfoRoot;
-import com.uas.credit.model.debtinfo.EndeptinfoRoot;
-import com.uas.credit.model.personCorporation.PersonCorporationRoot;
-import com.uas.credit.model.personal.PoliceCheckRoot;
+import com.uas.credit.model.EnterpriseJson;
+import com.uas.credit.model.EnterpriseQuery;
+import com.uas.credit.model.PersonJson;
+import com.uas.credit.model.PersonQuery;
 import com.uas.credit.service.*;
 import com.uas.credit.util.FlexJsonUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,6 +11,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Date;
+
 /**
  * UAS查询入口
  * created by shicr on 2018/6/6
@@ -50,50 +49,49 @@ public class ErpQueryController {
      * ERP对企业进行查询
      */
     @RequestMapping(value = "/queryEn", method = RequestMethod.POST)
-    public EnterpriseQueryResult queryEn(String data) {
+    public EnterpriseJson queryEn(String data) {
         EnterpriseQuery erpQuery = FlexJsonUtils.fromJson(data, EnterpriseQuery.class);
-        EnterpriseQueryResult enQuery = new EnterpriseQueryResult();
+
+        EnterpriseJson enterpriseJson = enterpriseJsonService.findByCreateTime(new Date());
+        if (enterpriseJson != null && enterpriseJson.getEndept() != null) {
+            return enterpriseJson;
+        }
         if (erpQuery != null) {
             // 查询企业债务信息
-            EndeptinfoRoot endeptinfoRoot = enterpriseDeptService.queryAndSave(erpQuery);
+            String endeptinfoRoot = enterpriseDeptService.queryEnterpriseDept(erpQuery);
             // 查询企业经营异常信息
-            AbnormalRoot abnormalRoot = enexceptionService.queryAndSave(erpQuery);
+            String abnormalRoot = enexceptionService.queryEnexception(erpQuery);
             // 查询企业信用信息
-            EncreditinfoRoot encreditinfoRoot = creditInfoService.queryAndSave(erpQuery);
+            String encreditinfoRoot = creditInfoService.queryEnCreditInfo(erpQuery);
             // 查询企业风险信息
-            EnRiskInfoRoot enRiskInfoRoot = enRiskInfoService.queryAndSave(erpQuery);
-            enQuery.setEndept(endeptinfoRoot);
-            enQuery.setEnexception(abnormalRoot);
-            enQuery.setEnrisk(enRiskInfoRoot);
-            enQuery.setEncredit(encreditinfoRoot);
-
-            // 将调用接口返回数据保存到数据库
-            String json = FlexJsonUtils.toJson(enQuery);
-            EnterpriseJson enterpriseJson = new EnterpriseJson(json);
+            String enRiskInfoRoot = enRiskInfoService.queryEnRiskInfo(erpQuery);
+            enterpriseJson = new EnterpriseJson(endeptinfoRoot, abnormalRoot, encreditinfoRoot, enRiskInfoRoot);
+
             enterpriseJsonService.save(enterpriseJson);
         }
-        return enQuery;
+        return enterpriseJson;
     }
 
     /**
      * erp对个人进行查询
      */
     @RequestMapping(value = "/queryPe", method = RequestMethod.POST)
-    public PersonQueryResult queryPerson(String data) {
+    public PersonJson queryPerson(String data) {
         PersonQuery erpQuery = FlexJsonUtils.fromJson(data, PersonQuery.class);
-        PersonQueryResult result = new PersonQueryResult();
+        PersonJson personJson = personJsonService.findByCreateTime(new Date());
+        if (personJson != null && personJson.getPnidentity() != null) {
+            return personJson;
+        }
         if (erpQuery != null) {
             // 查询个人身份信息
-            PoliceCheckRoot policeCheckRoot = personalService.queryAndSave(erpQuery);
+            String policeCheckRoot = personalService.queryPoliceCheck(erpQuery);
             // 查询个人股东信息
-            PersonCorporationRoot personCorporationRoot = personCorporationService.queryAndSave(erpQuery);
-            result.setPnidentity(policeCheckRoot);
-            result.setPnshareholder(personCorporationRoot);
+            String personCorporationRoot = personCorporationService.queryPersonCorporation(erpQuery);
+
 
-            String json = FlexJsonUtils.toJson(result);
-            PersonJson personJson = new PersonJson(json);
+            personJson = new PersonJson(policeCheckRoot, personCorporationRoot);
             personJsonService.save(personJson);
         }
-        return result;
+        return personJson;
     }
 }

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

@@ -4,10 +4,15 @@ import com.uas.credit.model.PersonJson;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
+import java.util.Date;
+
 /**
  * @author liuam
  * @since 2018/7/17 0017 下午 22:19
  */
 @Repository
 public interface PersonJsonDao extends JpaRepository<PersonJson, Long> {
+
+    PersonJson findByCreateTime(Date date);
+
 }

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

@@ -1,5 +1,7 @@
 package com.uas.credit.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
@@ -15,21 +17,38 @@ public class EnterpriseJson implements Serializable {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id")
+    @JsonIgnore
     private Long id;
 
     @Lob
-    @Column(name = "json", columnDefinition="TEXT")
-    private String json;
+    @Column(name = "endept", columnDefinition="TEXT")
+    private String endept;
+
+    @Lob
+    @Column(name = "enexception", columnDefinition="TEXT")
+    private String enexception;
+
+    @Lob
+    @Column(name = "encredit", columnDefinition="TEXT")
+    private String encredit;
+
+    @Lob
+    @Column(name = "enrisk", columnDefinition="TEXT")
+    private String enrisk;
 
     @Column(name = "createTime")
     @Temporal(TemporalType.DATE)
+    @JsonIgnore
     private Date createTime = new Date();
 
     public EnterpriseJson() {
     }
 
-    public EnterpriseJson(String json) {
-        this.json = json;
+    public EnterpriseJson(String endept, String enexception, String encredit, String enrisk) {
+        this.endept = endept;
+        this.enexception = enexception;
+        this.encredit = encredit;
+        this.enrisk = enrisk;
     }
 
     public Long getId() {
@@ -40,12 +59,36 @@ public class EnterpriseJson implements Serializable {
         this.id = id;
     }
 
-    public String getJson() {
-        return json;
+    public String getEndept() {
+        return endept;
+    }
+
+    public void setEndept(String endept) {
+        this.endept = endept;
+    }
+
+    public String getEnexception() {
+        return enexception;
+    }
+
+    public void setEnexception(String enexception) {
+        this.enexception = enexception;
+    }
+
+    public String getEncredit() {
+        return encredit;
+    }
+
+    public void setEncredit(String encredit) {
+        this.encredit = encredit;
+    }
+
+    public String getEnrisk() {
+        return enrisk;
     }
 
-    public void setJson(String json) {
-        this.json = json;
+    public void setEnrisk(String enrisk) {
+        this.enrisk = enrisk;
     }
 
     public Date getCreateTime() {

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

@@ -1,5 +1,7 @@
 package com.uas.credit.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import javax.persistence.*;
 import java.util.Date;
 
@@ -14,21 +16,28 @@ public class PersonJson {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id")
+    @JsonIgnore
     private Long id;
 
     @Lob
-    @Column(name = "json", columnDefinition="TEXT")
-    private String json;
+    @Column(name = "pnidentity", columnDefinition="TEXT")
+    private String pnidentity;
+
+    @Lob
+    @Column(name = "pnshareholder", columnDefinition="TEXT")
+    private String pnshareholder;
 
     @Column(name = "createTime")
     @Temporal(TemporalType.DATE)
+    @JsonIgnore
     private Date createTime = new Date();
 
     public PersonJson() {
     }
 
-    public PersonJson(String json) {
-        this.json = json;
+    public PersonJson(String pnidentity, String pnshareholder) {
+        this.pnidentity = pnidentity;
+        this.pnshareholder = pnshareholder;
     }
 
     public Long getId() {
@@ -39,12 +48,20 @@ public class PersonJson {
         this.id = id;
     }
 
-    public String getJson() {
-        return json;
+    public String getPnidentity() {
+        return pnidentity;
+    }
+
+    public void setPnidentity(String pnidentity) {
+        this.pnidentity = pnidentity;
+    }
+
+    public String getPnshareholder() {
+        return pnshareholder;
     }
 
-    public void setJson(String json) {
-        this.json = json;
+    public void setPnshareholder(String pnshareholder) {
+        this.pnshareholder = pnshareholder;
     }
 
     public Date getCreateTime() {

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

@@ -1,7 +1,6 @@
 package com.uas.credit.service;
 
 import com.uas.credit.model.EnterpriseQuery;
-import com.uas.credit.model.corpcreditinfo.EncreditinfoRoot;
 
 /**
  * 企业信用接口类
@@ -9,5 +8,5 @@ import com.uas.credit.model.corpcreditinfo.EncreditinfoRoot;
  **/
 public interface EnCreditInfoService {
 
-    EncreditinfoRoot queryAndSave(EnterpriseQuery query);
+    String queryEnCreditInfo(EnterpriseQuery query);
 }

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

@@ -1,7 +1,6 @@
 package com.uas.credit.service;
 
 import com.uas.credit.model.EnterpriseQuery;
-import com.uas.credit.model.corpriskinfo.EnRiskInfoRoot;
 
 /**
  * 企业风险信息接口层
@@ -9,6 +8,6 @@ import com.uas.credit.model.corpriskinfo.EnRiskInfoRoot;
  **/
 public interface EnRiskInfoService {
 
-    EnRiskInfoRoot queryAndSave(EnterpriseQuery query);
+    String queryEnRiskInfo(EnterpriseQuery query);
 
 }

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

@@ -1,7 +1,6 @@
 package com.uas.credit.service;
 
 import com.uas.credit.model.EnterpriseQuery;
-import com.uas.credit.model.abnormalinfo.AbnormalRoot;
 
 /**
  * 企业异常信息接口层
@@ -9,5 +8,5 @@ import com.uas.credit.model.abnormalinfo.AbnormalRoot;
  **/
 public interface EnexceptionService {
 
-    AbnormalRoot queryAndSave(EnterpriseQuery query);
+    String queryEnexception(EnterpriseQuery query);
 }

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

@@ -1,7 +1,6 @@
 package com.uas.credit.service;
 
 import com.uas.credit.model.EnterpriseQuery;
-import com.uas.credit.model.debtinfo.EndeptinfoRoot;
 
 /**
  * 企业债务信息接口
@@ -9,5 +8,5 @@ import com.uas.credit.model.debtinfo.EndeptinfoRoot;
  **/
 public interface EnterpriseDeptService {
 
-    EndeptinfoRoot queryAndSave(EnterpriseQuery query);
+    String queryEnterpriseDept(EnterpriseQuery query);
 }

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

@@ -2,6 +2,8 @@ package com.uas.credit.service;
 
 import com.uas.credit.model.EnterpriseJson;
 
+import java.util.Date;
+
 /**
  * @author liuam
  * @since 2018/7/17 0017 下午 22:14
@@ -10,4 +12,6 @@ public interface EnterpriseJsonService {
 
     void save(EnterpriseJson enterpriseJson);
 
+    EnterpriseJson findByCreateTime(Date date);
+
 }

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

@@ -1,7 +1,6 @@
 package com.uas.credit.service;
 
 import com.uas.credit.model.PersonQuery;
-import com.uas.credit.model.personCorporation.PersonCorporationRoot;
 
 /**
  * 个人股东信息
@@ -10,5 +9,5 @@ import com.uas.credit.model.personCorporation.PersonCorporationRoot;
 public interface PersonCorporationService {
 
 
-    PersonCorporationRoot queryAndSave(PersonQuery query);
+    String queryPersonCorporation(PersonQuery query);
 }

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

@@ -2,6 +2,8 @@ package com.uas.credit.service;
 
 import com.uas.credit.model.PersonJson;
 
+import java.util.Date;
+
 /**
  * @author liuam
  * @since 2018/7/17 0017 下午 22:15
@@ -10,4 +12,6 @@ public interface PersonJsonService {
 
     void save(PersonJson personJson);
 
+    PersonJson findByCreateTime(Date date);
+
 }

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

@@ -2,7 +2,6 @@ package com.uas.credit.service;
 
 
 import com.uas.credit.model.PersonQuery;
-import com.uas.credit.model.personal.PoliceCheckRoot;
 
 /**
  * 个人身份查询接口
@@ -10,5 +9,5 @@ import com.uas.credit.model.personal.PoliceCheckRoot;
  **/
 public interface PersonalService {
 
-    PoliceCheckRoot queryAndSave(PersonQuery query);
+    String queryPoliceCheck(PersonQuery query);
 }

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

@@ -1,10 +1,7 @@
 package com.uas.credit.service.impl;
 
-import com.alibaba.fastjson.JSON;
 import com.uas.credit.config.PyConfig;
-import com.uas.credit.dao.EnCreditDao;
 import com.uas.credit.model.EnterpriseQuery;
-import com.uas.credit.model.corpcreditinfo.EncreditinfoRoot;
 import com.uas.credit.service.EnCreditInfoService;
 import com.uas.credit.service.ErpQueryService;
 import com.uas.credit.util.QueryConditionUtil;
@@ -29,9 +26,6 @@ public class EnCreditInfoServiceImpl implements EnCreditInfoService {
     private static String SubreportIDs = "95013";
 
 
-    @Autowired
-    private EnCreditDao creditDao;
-
     @Autowired
     private ErpQueryService erpQueryService;
 
@@ -46,15 +40,12 @@ public class EnCreditInfoServiceImpl implements EnCreditInfoService {
      * @return
      */
     @Override
-    public EncreditinfoRoot queryAndSave(EnterpriseQuery query) {
+    public String queryEnCreditInfo(EnterpriseQuery query) {
         //拼装查询的json
         String encredit = QueryConditionUtil.getEnterpriseQuery(query, ENTERPRISE_CREDIT, SubreportIDs, QueryReasonID);
 
         //发起鹏元征信的请求
         String encreditResult = erpQueryService.requestApi(pyConfig.getHost(), pyConfig.getPathUnZip(), encredit);
-        //保存返回的结果
-        EncreditinfoRoot encreditinfoRoot = JSON.parseObject(encreditResult, EncreditinfoRoot.class);
-        creditDao.save(encreditinfoRoot);
-        return encreditinfoRoot;
+        return encreditResult;
     }
 }

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

@@ -1,10 +1,7 @@
 package com.uas.credit.service.impl;
 
-import com.alibaba.fastjson.JSON;
 import com.uas.credit.config.PyConfig;
-import com.uas.credit.dao.EnRiskInfoDao;
 import com.uas.credit.model.EnterpriseQuery;
-import com.uas.credit.model.corpriskinfo.EnRiskInfoRoot;
 import com.uas.credit.service.EnRiskInfoService;
 import com.uas.credit.service.ErpQueryService;
 import com.uas.credit.util.QueryConditionUtil;
@@ -28,8 +25,6 @@ public class EnRiskInfoServiceImpl implements EnRiskInfoService {
     //收费子报告类型
     private static String SubreportIDs = "22527";
 
-    @Autowired
-    private EnRiskInfoDao enRiskInfoDao;
 
     @Autowired
     private ErpQueryService erpQueryService;
@@ -45,14 +40,11 @@ public class EnRiskInfoServiceImpl implements EnRiskInfoService {
      * @return
      */
     @Override
-    public EnRiskInfoRoot queryAndSave(EnterpriseQuery query) {
+    public String queryEnRiskInfo(EnterpriseQuery query) {
         //拼装查询的json
         String enrisk = QueryConditionUtil.getEnterpriseQuery(query, ENTERPRISE_RISK, SubreportIDs, QueryReasonID);
         //发起鹏元征信的请求
         String enriskResult = erpQueryService.requestApi(pyConfig.getHost(), pyConfig.getPathUnZip(), enrisk);
-        //保存返回的结果
-        EnRiskInfoRoot enRiskInfoRoot = JSON.parseObject(enriskResult, EnRiskInfoRoot.class);
-        enRiskInfoDao.save(enRiskInfoRoot);
-        return enRiskInfoRoot;
+        return enriskResult;
     }
 }

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

@@ -1,10 +1,7 @@
 package com.uas.credit.service.impl;
 
-import com.alibaba.fastjson.JSON;
 import com.uas.credit.config.PyConfig;
-import com.uas.credit.dao.EnexceptionDao;
 import com.uas.credit.model.EnterpriseQuery;
-import com.uas.credit.model.abnormalinfo.AbnormalRoot;
 import com.uas.credit.service.EnexceptionService;
 import com.uas.credit.service.ErpQueryService;
 import com.uas.credit.util.QueryConditionUtil;
@@ -27,9 +24,6 @@ public class EnexceptionServiceImpl implements EnexceptionService {
     //收费子报告类型
     private static String SubreportIDs = "22117";
 
-    @Autowired
-    private EnexceptionDao enexceptionDao;
-
     @Autowired
     private ErpQueryService erpQueryService;
 
@@ -44,15 +38,12 @@ public class EnexceptionServiceImpl implements EnexceptionService {
      * @return
      */
     @Override
-    public AbnormalRoot queryAndSave(EnterpriseQuery query) {
+    public String queryEnexception(EnterpriseQuery query) {
         //拼装查询的json
         String enexception = QueryConditionUtil.getEnterpriseQuery(query, ENTERPRISE_EXCEPTION, SubreportIDs, QueryReasonID);
 
         //发起鹏元征信的请求
         String enexceptionResult = erpQueryService.requestApi(pyConfig.getHost(), pyConfig.getPathUnZip(), enexception);
-        //保存返回的结果
-        AbnormalRoot abnormalRoot = JSON.parseObject(enexceptionResult, AbnormalRoot.class);
-        enexceptionDao.save(abnormalRoot);
-        return abnormalRoot;
+        return enexceptionResult;
     }
 }

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

@@ -1,10 +1,7 @@
 package com.uas.credit.service.impl;
 
-import com.alibaba.fastjson.JSON;
 import com.uas.credit.config.PyConfig;
-import com.uas.credit.dao.EnDebtInfoDao;
 import com.uas.credit.model.EnterpriseQuery;
-import com.uas.credit.model.debtinfo.EndeptinfoRoot;
 import com.uas.credit.service.EnterpriseDeptService;
 import com.uas.credit.service.ErpQueryService;
 import com.uas.credit.util.QueryConditionUtil;
@@ -18,9 +15,6 @@ import org.springframework.stereotype.Service;
 @Service
 public class EnterpriseDeptServiceImpl implements EnterpriseDeptService {
 
-    @Autowired
-    private EnDebtInfoDao enterpriseDeptDao;
-
     @Autowired
     private ErpQueryService erpQueryService;
 
@@ -44,12 +38,10 @@ public class EnterpriseDeptServiceImpl implements EnterpriseDeptService {
      * @return
      */
     @Override
-    public EndeptinfoRoot queryAndSave(EnterpriseQuery query) {
+    public String queryEnterpriseDept(EnterpriseQuery query) {
         String endept = QueryConditionUtil.getEnterpriseQuery(query, ENTERPRISE_DEPT, SubreportIDs, QueryReasonID);
 
         String endeptResult = erpQueryService.requestApi(pyConfig.getHost(), pyConfig.getPathUnZip(), endept);
-        EndeptinfoRoot endeptinfoRoot = JSON.parseObject(endeptResult, EndeptinfoRoot.class);
-        enterpriseDeptDao.save(endeptinfoRoot);
-        return endeptinfoRoot;
+        return endeptResult;
     }
 }

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

@@ -6,6 +6,8 @@ import com.uas.credit.service.EnterpriseJsonService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
+
 /**
  * @author liuam
  * @since 2018/7/17 0017 下午 22:14
@@ -21,4 +23,9 @@ public class EnterpriseJsonServiceImpl implements EnterpriseJsonService {
     public void save(EnterpriseJson enterpriseJson) {
         enterpriseJsonDao.save(enterpriseJson);
     }
+
+    @Override
+    public EnterpriseJson findByCreateTime(Date date) {
+        return enterpriseJsonDao.findByCreateTime(date);
+    }
 }

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

@@ -1,10 +1,7 @@
 package com.uas.credit.service.impl;
 
-import com.alibaba.fastjson.JSON;
 import com.uas.credit.config.PyConfig;
-import com.uas.credit.dao.PersonCorporationDao;
 import com.uas.credit.model.PersonQuery;
-import com.uas.credit.model.personCorporation.PersonCorporationRoot;
 import com.uas.credit.service.ErpQueryService;
 import com.uas.credit.service.PersonCorporationService;
 import com.uas.credit.util.QueryConditionUtil;
@@ -29,9 +26,6 @@ public class PersonCorporationServiceImpl implements PersonCorporationService {
     private static String SubreportIDs = "96002";
 
 
-    @Autowired
-    private PersonCorporationDao personCorporationDao;
-
     @Autowired
     private ErpQueryService erpQueryService;
 
@@ -47,15 +41,12 @@ public class PersonCorporationServiceImpl implements PersonCorporationService {
      * @return
      */
     @Override
-    public PersonCorporationRoot queryAndSave(PersonQuery query) {
+    public String queryPersonCorporation(PersonQuery query) {
         //拼装查询的json
         String corporation = QueryConditionUtil.getPersonQuery(query, PERSONAL_SHAREHOLDER, SubreportIDs, QueryReasonID);
         //发起鹏元征信的请求
         String corporationResult = erpQueryService.requestApi(pyConfig.getHost(), pyConfig.getPathUnZip(), corporation);
-        //保存返回的结果
-        PersonCorporationRoot personCorporationRoot = JSON.parseObject(corporationResult, PersonCorporationRoot.class);
-        personCorporationDao.save(personCorporationRoot);
-        return personCorporationRoot;
+        return corporationResult;
 
     }
 }

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

@@ -6,6 +6,8 @@ import com.uas.credit.service.PersonJsonService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
+
 /**
  * @author liuam
  * @since 2018/7/17 0017 下午 22:16
@@ -20,4 +22,9 @@ public class PersonJsonServiceImpl implements PersonJsonService {
     public void save(PersonJson personJson) {
         personJsonDao.save(personJson);
     }
+
+    @Override
+    public PersonJson findByCreateTime(Date date) {
+        return personJsonDao.findByCreateTime(date);
+    }
 }

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

@@ -1,10 +1,7 @@
 package com.uas.credit.service.impl;
 
-import com.alibaba.fastjson.JSON;
 import com.uas.credit.config.PyConfig;
-import com.uas.credit.dao.PersonDao;
 import com.uas.credit.model.PersonQuery;
-import com.uas.credit.model.personal.PoliceCheckRoot;
 import com.uas.credit.service.ErpQueryService;
 import com.uas.credit.service.PersonalService;
 import com.uas.credit.util.QueryConditionUtil;
@@ -29,9 +26,6 @@ public class PersonalServiceImpl implements PersonalService {
     private static String SubreportIDs = "10602";
 
 
-    @Autowired
-    private PersonDao personDao;
-
     @Autowired
     private ErpQueryService erpQueryService;
 
@@ -46,14 +40,11 @@ public class PersonalServiceImpl implements PersonalService {
      * @return
      */
     @Override
-    public PoliceCheckRoot queryAndSave(PersonQuery query) {
+    public String queryPoliceCheck(PersonQuery query) {
         //拼装查询的json
         String person = QueryConditionUtil.getPersonQuery(query, PERSONAL_IDENTITY, SubreportIDs, QueryReasonID);
         //发起鹏元征信的请求
         String prsonResult = erpQueryService.requestApi(pyConfig.getHost(), pyConfig.getPathUnZip(), person);
-        //保存返回的结果
-        PoliceCheckRoot policeCheckRoot = JSON.parseObject(prsonResult, PoliceCheckRoot.class);
-        personDao.save(policeCheckRoot);
-        return policeCheckRoot;
+        return prsonResult;
     }
 }