查询结果优化

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

@@ -2,6 +2,12 @@ package com.uas.credit.controller;
 
 import com.uas.credit.model.EnterpriseQuery;
 import com.uas.credit.model.PersonQuery;
+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.service.*;
 import com.uas.credit.util.FlexJsonUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,17 +51,17 @@ public class ErpQueryController {
         ModelMap modelMap = new ModelMap();
         if (erpQuery != null) {
             // 查询企业债务信息
-            String endept = enterpriseDeptService.queryAndSave(erpQuery);
+            EndeptinfoRoot endeptinfoRoot = enterpriseDeptService.queryAndSave(erpQuery);
             // 查询企业经营异常信息
-            String enexception = enexceptionService.queryAndSave(erpQuery);
+            AbnormalRoot abnormalRoot = enexceptionService.queryAndSave(erpQuery);
             // 查询企业信用信息
-            String encredit = creditInfoService.queryAndSave(erpQuery);
+            EncreditinfoRoot encreditinfoRoot = creditInfoService.queryAndSave(erpQuery);
             // 查询企业风险信息
-            String enrisk = enRiskInfoService.queryAndSave(erpQuery);
-            modelMap.put("endept", endept);
-            modelMap.put("enexception", enexception);
-            modelMap.put("enrisk", enrisk);
-            modelMap.put("encredit", encredit);
+            EnRiskInfoRoot enRiskInfoRoot = enRiskInfoService.queryAndSave(erpQuery);
+            modelMap.put("endept", endeptinfoRoot);
+            modelMap.put("enexception", abnormalRoot);
+            modelMap.put("enrisk", encreditinfoRoot);
+            modelMap.put("encredit", enRiskInfoRoot);
         }
         return modelMap;
     }
@@ -69,11 +75,11 @@ public class ErpQueryController {
         ModelMap modelMap = new ModelMap();
         if (erpQuery != null) {
             // 查询个人身份信息
-            String pnidentity = personalService.queryAndSave(erpQuery);
+            PoliceCheckRoot policeCheckRoot = personalService.queryAndSave(erpQuery);
             // 查询个人股东信息
-            String pnshareholder = personCorporationService.queryAndSave(erpQuery);
-            modelMap.put("pnidentity", pnidentity);
-            modelMap.put("pnshareholder", pnshareholder);
+            PersonCorporationRoot personCorporationRoot = personCorporationService.queryAndSave(erpQuery);
+            modelMap.put("pnidentity", policeCheckRoot);
+            modelMap.put("pnshareholder", personCorporationRoot);
         }
         return modelMap;
     }

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -46,7 +46,7 @@ public class EnCreditInfoServiceImpl implements EnCreditInfoService {
      * @return
      */
     @Override
-    public String queryAndSave(EnterpriseQuery query) {
+    public EncreditinfoRoot queryAndSave(EnterpriseQuery query) {
         //拼装查询的json
         String encredit = QueryConditionUtil.getEnterpriseQuery(query, ENTERPRISE_CREDIT, SubreportIDs, QueryReasonID);
 
@@ -54,7 +54,7 @@ public class EnCreditInfoServiceImpl implements EnCreditInfoService {
         String encreditResult = erpQueryService.requestApi(pyConfig.getHost(), pyConfig.getPathUnZip(), encredit);
         //保存返回的结果
         EncreditinfoRoot encreditinfoRoot = JSON.parseObject(encreditResult, EncreditinfoRoot.class);
-        EncreditinfoRoot encreditReport1 = creditDao.save(encreditinfoRoot);
-        return encreditResult;
+        creditDao.save(encreditinfoRoot);
+        return encreditinfoRoot;
     }
 }

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

@@ -45,14 +45,14 @@ public class EnRiskInfoServiceImpl implements EnRiskInfoService {
      * @return
      */
     @Override
-    public String queryAndSave(EnterpriseQuery query) {
+    public EnRiskInfoRoot queryAndSave(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);
-        EnRiskInfoRoot enRiskInfoRoot1 = enRiskInfoDao.save(enRiskInfoRoot);
-        return enriskResult;
+        enRiskInfoDao.save(enRiskInfoRoot);
+        return enRiskInfoRoot;
     }
 }

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

@@ -44,7 +44,7 @@ public class EnexceptionServiceImpl implements EnexceptionService {
      * @return
      */
     @Override
-    public String queryAndSave(EnterpriseQuery query) {
+    public AbnormalRoot queryAndSave(EnterpriseQuery query) {
         //拼装查询的json
         String enexception = QueryConditionUtil.getEnterpriseQuery(query, ENTERPRISE_EXCEPTION, SubreportIDs, QueryReasonID);
 
@@ -52,7 +52,7 @@ public class EnexceptionServiceImpl implements EnexceptionService {
         String enexceptionResult = erpQueryService.requestApi(pyConfig.getHost(), pyConfig.getPathUnZip(), enexception);
         //保存返回的结果
         AbnormalRoot abnormalRoot = JSON.parseObject(enexceptionResult, AbnormalRoot.class);
-        AbnormalRoot abnormalReport1 = enexceptionDao.save(abnormalRoot);
-        return enexceptionResult;
+        enexceptionDao.save(abnormalRoot);
+        return abnormalRoot;
     }
 }

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

@@ -44,12 +44,12 @@ public class EnterpriseDeptServiceImpl implements EnterpriseDeptService {
      * @return
      */
     @Override
-    public String queryAndSave(EnterpriseQuery query) {
+    public EndeptinfoRoot queryAndSave(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);
-        EndeptinfoRoot endeptinfoRoot1 = enterpriseDeptDao.save(endeptinfoRoot);
-        return endeptResult;
+        enterpriseDeptDao.save(endeptinfoRoot);
+        return endeptinfoRoot;
     }
 }

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

@@ -47,15 +47,15 @@ public class PersonCorporationServiceImpl implements PersonCorporationService {
      * @return
      */
     @Override
-    public String queryAndSave(PersonQuery query) {
+    public PersonCorporationRoot queryAndSave(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);
-        PersonCorporationRoot personCorporationReport1 = personCorporationDao.save(personCorporationRoot);
-        return corporationResult;
+        personCorporationDao.save(personCorporationRoot);
+        return personCorporationRoot;
 
     }
 }

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

@@ -46,14 +46,14 @@ public class PersonalServiceImpl implements PersonalService {
      * @return
      */
     @Override
-    public String queryAndSave(PersonQuery query) {
+    public PoliceCheckRoot queryAndSave(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);
-        PoliceCheckRoot policeCheckRoot1 = personDao.save(policeCheckRoot);
-        return prsonResult;
+        personDao.save(policeCheckRoot);
+        return policeCheckRoot;
     }
 }

src/main/resources/application.yml

@@ -1,3 +1,4 @@
+
 spring:
     application:
         name: credit
@@ -14,4 +15,6 @@ spring:
       multipart:
         enabled: true
         max-file-size: 512MB
-        max-request-size: 512MB
+        max-request-size: 512MB
+server:
+  port: 8989