查询结果优化

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

@@ -1,7 +1,9 @@
 package com.uas.credit.controller;
 
 import com.uas.credit.model.EnterpriseQuery;
+import com.uas.credit.model.EnterpriseQueryResult;
 import com.uas.credit.model.PersonQuery;
+import com.uas.credit.model.PersonQueryResult;
 import com.uas.credit.model.abnormalinfo.AbnormalRoot;
 import com.uas.credit.model.corpcreditinfo.EncreditinfoRoot;
 import com.uas.credit.model.corpriskinfo.EnRiskInfoRoot;
@@ -11,7 +13,6 @@ 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;
-import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -46,9 +47,9 @@ public class ErpQueryController {
      * ERP对企业进行查询
      */
     @RequestMapping(value = "/queryEn", method = RequestMethod.POST)
-    public ModelMap queryEn(String data) {
+    public EnterpriseQueryResult queryEn(String data) {
         EnterpriseQuery erpQuery = FlexJsonUtils.fromJson(data, EnterpriseQuery.class);
-        ModelMap modelMap = new ModelMap();
+        EnterpriseQueryResult enQuery = new EnterpriseQueryResult();
         if (erpQuery != null) {
             // 查询企业债务信息
             EndeptinfoRoot endeptinfoRoot = enterpriseDeptService.queryAndSave(erpQuery);
@@ -58,29 +59,30 @@ public class ErpQueryController {
             EncreditinfoRoot encreditinfoRoot = creditInfoService.queryAndSave(erpQuery);
             // 查询企业风险信息
             EnRiskInfoRoot enRiskInfoRoot = enRiskInfoService.queryAndSave(erpQuery);
-            modelMap.put("endept", endeptinfoRoot);
-            modelMap.put("enexception", abnormalRoot);
-            modelMap.put("enrisk", encreditinfoRoot);
-            modelMap.put("encredit", enRiskInfoRoot);
+            enQuery.setEndept(endeptinfoRoot);
+            enQuery.setEnexception(abnormalRoot);
+            enQuery.setEnrisk(enRiskInfoRoot);
+            enQuery.setEncredit(encreditinfoRoot);
+
         }
-        return modelMap;
+        return enQuery;
     }
 
     /**
      * erp对个人进行查询
      */
     @RequestMapping(value = "/queryPe", method = RequestMethod.POST)
-    public ModelMap queryPerson(String data) {
+    public PersonQueryResult queryPerson(String data) {
         PersonQuery erpQuery = FlexJsonUtils.fromJson(data, PersonQuery.class);
-        ModelMap modelMap = new ModelMap();
+        PersonQueryResult result = new PersonQueryResult();
         if (erpQuery != null) {
             // 查询个人身份信息
             PoliceCheckRoot policeCheckRoot = personalService.queryAndSave(erpQuery);
             // 查询个人股东信息
             PersonCorporationRoot personCorporationRoot = personCorporationService.queryAndSave(erpQuery);
-            modelMap.put("pnidentity", policeCheckRoot);
-            modelMap.put("pnshareholder", personCorporationRoot);
+            result.setPnidentity(policeCheckRoot);
+            result.setPnshareholder(personCorporationRoot);
         }
-        return modelMap;
+        return result;
     }
 }

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

@@ -0,0 +1,65 @@
+package 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;
+
+/**
+ * @author liuam
+ * @since 2018/6/26 0026 下午 14:18
+ */
+public class EnterpriseQueryResult {
+
+    /**
+     * 企业债务信息
+     */
+    private EndeptinfoRoot endept;
+
+    /**
+     * 企业经营异常信息
+     */
+    private AbnormalRoot enexception;
+
+    /**
+     * 企业信用信息
+     */
+    private EncreditinfoRoot encredit;
+
+    /**
+     * 企业风险信息
+     */
+    private EnRiskInfoRoot enrisk;
+
+    public EndeptinfoRoot getEndept() {
+        return endept;
+    }
+
+    public void setEndept(EndeptinfoRoot endept) {
+        this.endept = endept;
+    }
+
+    public AbnormalRoot getEnexception() {
+        return enexception;
+    }
+
+    public void setEnexception(AbnormalRoot enexception) {
+        this.enexception = enexception;
+    }
+
+    public EncreditinfoRoot getEncredit() {
+        return encredit;
+    }
+
+    public void setEncredit(EncreditinfoRoot encredit) {
+        this.encredit = encredit;
+    }
+
+    public EnRiskInfoRoot getEnrisk() {
+        return enrisk;
+    }
+
+    public void setEnrisk(EnRiskInfoRoot enrisk) {
+        this.enrisk = enrisk;
+    }
+}

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

@@ -0,0 +1,37 @@
+package com.uas.credit.model;
+
+import com.uas.credit.model.personCorporation.PersonCorporationRoot;
+import com.uas.credit.model.personal.PoliceCheckRoot;
+
+/**
+ * @author liuam
+ * @since 2018/6/26 0026 下午 14:26
+ */
+public class PersonQueryResult {
+
+    /**
+     * 个人身份信息
+     */
+    private PoliceCheckRoot pnidentity;
+
+    /**
+     * 个人股东信息
+     */
+    private PersonCorporationRoot pnshareholder;
+
+    public PoliceCheckRoot getPnidentity() {
+        return pnidentity;
+    }
+
+    public void setPnidentity(PoliceCheckRoot pnidentity) {
+        this.pnidentity = pnidentity;
+    }
+
+    public PersonCorporationRoot getPnshareholder() {
+        return pnshareholder;
+    }
+
+    public void setPnshareholder(PersonCorporationRoot pnshareholder) {
+        this.pnshareholder = pnshareholder;
+    }
+}