业务逻辑代码调整

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

@@ -8,7 +8,5 @@ import com.uas.credit.model.EnterpriseQuery;
  **/
 public interface EnCreditInfoService {
 
-    String getQueryCondition(EnterpriseQuery query);
-
     String queryAndSave(EnterpriseQuery query);
 }

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

@@ -8,8 +8,6 @@ import com.uas.credit.model.EnterpriseQuery;
  **/
 public interface EnRiskInfoService {
 
-    String getQueryCondition(EnterpriseQuery query);
-
     String queryAndSave(EnterpriseQuery query);
 
 }

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

@@ -8,8 +8,5 @@ import com.uas.credit.model.EnterpriseQuery;
  **/
 public interface EnexceptionService {
 
-
-    String getQueryCondition(EnterpriseQuery query);
-
     String queryAndSave(EnterpriseQuery query);
 }

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

@@ -8,8 +8,5 @@ import com.uas.credit.model.EnterpriseQuery;
  **/
 public interface EnterpriseDeptService {
 
-
-    String getQueryCondition(EnterpriseQuery query);
-
     String queryAndSave(EnterpriseQuery query);
 }

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

@@ -9,7 +9,5 @@ import com.uas.credit.model.PersonQuery;
 public interface PersonCorporationService {
 
 
-    String getQueryCondition(PersonQuery query);
-
     String queryAndSave(PersonQuery query);
 }

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

@@ -9,7 +9,5 @@ import com.uas.credit.model.PersonQuery;
  **/
 public interface PersonalService {
 
-    String getQueryCondition(PersonQuery query);
-
     String queryAndSave(PersonQuery query);
 }

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

@@ -2,12 +2,15 @@ package com.uas.credit.service.impl;
 
 import com.uas.credit.dao.CompanyDao;
 import com.uas.credit.model.Company;
+import com.uas.credit.service.CompanyService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 /**
  * created by shicr on 2018/6/7
  **/
-public class CompanyServiceImpl {
+@Service
+public class CompanyServiceImpl implements CompanyService {
 
     @Autowired
     private CompanyDao companyDao;
@@ -18,6 +21,7 @@ public class CompanyServiceImpl {
      * @param enuu
      * @return
      */
+    @Override
     public Company findByEnuu(Long enuu) {
         return companyDao.findOne(enuu);
     }

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

@@ -4,18 +4,13 @@ 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.Item;
-import com.uas.credit.model.QueryCondition;
-import com.uas.credit.model.QueryConditions;
 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;
 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
@@ -43,38 +38,6 @@ public class EnCreditInfoServiceImpl implements EnCreditInfoService {
     @Autowired
     private PyConfig pyConfig;
 
-    /**
-     * 查找企业信息
-     *
-     * @return
-     */
-    public String getQueryCondition(EnterpriseQuery query) {
-        // 使用JavaBean/Map方式（正式使用,仅供参考）
-        QueryConditions queryConditions = new QueryConditions();
-        List<QueryCondition> conditions = new ArrayList<QueryCondition>();
-        QueryCondition queryCondition = new QueryCondition();
-        // 查询类型
-        queryCondition.setQueryType(ENTERPRISE_CREDIT);
-        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("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);
-    }
 
     /**
      * 查询并保存返回查询json串
@@ -82,9 +45,10 @@ public class EnCreditInfoServiceImpl implements EnCreditInfoService {
      * @param query 企业查询信息
      * @return
      */
+    @Override
     public String queryAndSave(EnterpriseQuery query) {
         //拼装查询的json
-        String encredit = getQueryCondition(query);
+        String encredit = QueryConditionUtil.getEnterpriseQuery(query, ENTERPRISE_CREDIT, SubreportIDs, QueryReasonID);
 
         //发起鹏元征信的请求
         String encreditResult = erpQueryService.requestApi(pyConfig.getHost(), pyConfig.getPathUnZip(), encredit);

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

@@ -4,18 +4,13 @@ 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.Item;
-import com.uas.credit.model.QueryCondition;
-import com.uas.credit.model.QueryConditions;
 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;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.List;
-
 
 /**
  * 企业风险接口实现层
@@ -42,38 +37,6 @@ public class EnRiskInfoServiceImpl implements EnRiskInfoService {
     @Autowired
     private PyConfig pyConfig;
 
-    /**
-     * 查找企业信息
-     *
-     * @return
-     */
-    public String getQueryCondition(EnterpriseQuery query) {
-        // 使用JavaBean/Map方式（正式使用,仅供参考）
-        QueryConditions queryConditions = new QueryConditions();
-        List<QueryCondition> conditions = new ArrayList<QueryCondition>();
-        QueryCondition queryCondition = new QueryCondition();
-        // 查询类型
-        queryCondition.setQueryType(ENTERPRISE_RISK);
-        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("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);
-    }
 
     /**
      * 查询并保存返回查询json串
@@ -81,9 +44,10 @@ public class EnRiskInfoServiceImpl implements EnRiskInfoService {
      * @param query
      * @return
      */
+    @Override
     public String queryAndSave(EnterpriseQuery query) {
         //拼装查询的json
-        String enrisk = getQueryCondition(query);
+        String enrisk = QueryConditionUtil.getEnterpriseQuery(query, ENTERPRISE_RISK, SubreportIDs, QueryReasonID);
         //发起鹏元征信的请求
         String enriskResult = erpQueryService.requestApi(pyConfig.getHost(), pyConfig.getPathUnZip(), enrisk);
         //保存返回的结果

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

@@ -4,18 +4,13 @@ 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.Item;
-import com.uas.credit.model.QueryCondition;
-import com.uas.credit.model.QueryConditions;
 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;
 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
@@ -41,39 +36,6 @@ public class EnexceptionServiceImpl implements EnexceptionService {
     @Autowired
     private PyConfig pyConfig;
 
-    /**
-     * 查找企业信息
-     *
-     * @return
-     */
-    public String getQueryCondition(EnterpriseQuery query) {
-        // 使用JavaBean/Map方式（正式使用,仅供参考）
-        QueryConditions queryConditions = new QueryConditions();
-        List<QueryCondition> conditions = new ArrayList<QueryCondition>();
-        QueryCondition queryCondition = new QueryCondition();
-        // 查询类型
-        queryCondition.setQueryType(ENTERPRISE_EXCEPTION);
-        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("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);
-    }
-
 
     /**
      * 查询并保存返回查询json串
@@ -81,9 +43,10 @@ public class EnexceptionServiceImpl implements EnexceptionService {
      * @param query 企业查询信息
      * @return
      */
+    @Override
     public String queryAndSave(EnterpriseQuery query) {
         //拼装查询的json
-        String enexception = getQueryCondition(query);
+        String enexception = QueryConditionUtil.getEnterpriseQuery(query, ENTERPRISE_EXCEPTION, SubreportIDs, QueryReasonID);
 
         //发起鹏元征信的请求
         String enexceptionResult = erpQueryService.requestApi(pyConfig.getHost(), pyConfig.getPathUnZip(), enexception);

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

@@ -4,18 +4,13 @@ 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.Item;
-import com.uas.credit.model.QueryCondition;
-import com.uas.credit.model.QueryConditions;
 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;
 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/7
@@ -41,38 +36,6 @@ public class EnterpriseDeptServiceImpl implements EnterpriseDeptService {
     //收费子报告类型
     private static String SubreportIDs = "22118";
 
-    /**
-     * 查找企业信息
-     *
-     * @return
-     */
-    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", 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);
-    }
 
     /**
      * 查询并保存返回查询json串
@@ -80,8 +43,9 @@ public class EnterpriseDeptServiceImpl implements EnterpriseDeptService {
      * @param query
      * @return
      */
+    @Override
     public String queryAndSave(EnterpriseQuery query) {
-        String endept = getQueryCondition(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);

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

@@ -3,20 +3,14 @@ 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.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.PersonCorporationRoot;
 import com.uas.credit.service.ErpQueryService;
 import com.uas.credit.service.PersonCorporationService;
-
+import com.uas.credit.util.QueryConditionUtil;
 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
@@ -44,37 +38,6 @@ public class PersonCorporationServiceImpl implements PersonCorporationService {
     @Autowired
     private PyConfig pyConfig;
 
-    /**
-     * 拼装企业查询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);
-    }
 
 
     /**
@@ -83,9 +46,10 @@ public class PersonCorporationServiceImpl implements PersonCorporationService {
      * @param query
      * @return
      */
+    @Override
     public String queryAndSave(PersonQuery query) {
         //拼装查询的json
-        String corporation = getQueryCondition(query);
+        String corporation = QueryConditionUtil.getPersonQuery(query, PERSONAL_SHAREHOLDER, SubreportIDs, QueryReasonID);
         //发起鹏元征信的请求
         String corporationResult = erpQueryService.requestApi(pyConfig.getHost(), pyConfig.getPathUnZip(), corporation);
         //保存返回的结果

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

@@ -3,19 +3,14 @@ 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.Item;
 import com.uas.credit.model.PersonQuery;
-import com.uas.credit.model.QueryCondition;
-import com.uas.credit.model.QueryConditions;
 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;
 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
@@ -44,41 +39,16 @@ public class PersonalServiceImpl implements PersonalService {
     private PyConfig pyConfig;
 
 
-    @Override
-    public String getQueryCondition(PersonQuery query) {
-
-        QueryConditions queryConditions = new QueryConditions();
-        List<QueryCondition> conditions = new ArrayList<QueryCondition>();
-        QueryCondition queryCondition = new QueryCondition();
-
-        queryCondition.setQueryType(PERSONAL_IDENTITY);
-        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
      */
+    @Override
     public String queryAndSave(PersonQuery query) {
         //拼装查询的json
-        String person = getQueryCondition(query);
+        String person = QueryConditionUtil.getPersonQuery(query, PERSONAL_IDENTITY, SubreportIDs, QueryReasonID);
         //发起鹏元征信的请求
         String prsonResult = erpQueryService.requestApi(pyConfig.getHost(), pyConfig.getPathUnZip(), person);
         //保存返回的结果

src/main/java/com/uas/credit/util/QueryConditionUtil.java

@@ -0,0 +1,75 @@
+package com.uas.credit.util;
+
+import com.alibaba.fastjson.JSON;
+import com.uas.credit.model.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author liuam
+ * @since 2018/6/25 0025 下午 16:19
+ */
+public class QueryConditionUtil {
+    /**
+     * 查找企业信息
+     *
+     * @return
+     */
+    public static String getEnterpriseQuery(EnterpriseQuery query, String queryType, String SubreportIDs, Integer 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", 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);
+    }
+
+    /**
+     * 查找个人信息
+     *
+     * @return
+     */
+    public static String getPersonQuery(PersonQuery query, String queryType, String SubreportIDs, Integer QueryReasonID) {
+        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", 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);
+    }
+}