[深爱]获取客商数据调整

src/main/java/com/uas/eis/controller/STKController.java

@@ -9,6 +9,7 @@ import com.uas.eis.sdk.entity.ApiResult;
 import com.uas.eis.service.RequestSTKService;
 import com.uas.eis.service.STKService;
 import com.uas.eis.utils.MD5Util;
+import com.uas.eis.vo.stkVo.TravellingMerchantVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -136,7 +137,7 @@ public class STKController {
 
 
     @GetMapping("/queryListTest")
-    public List<CustvendDTO> queryListTest(){
+    public TravellingMerchantVo queryListTest(){
         QueryTravellingMerchantDto dto = new QueryTravellingMerchantDto();
         dto.setCode(GET_TRAVELLING_MERCHANT);
         return requestSTKService.selectTravellingMerchantList(dto,"http://192.168.1.104:8186/eis_cw/queryTestList");

src/main/java/com/uas/eis/service/Impl/RequestSTKServiceImpl.java

@@ -6,19 +6,17 @@ import com.uas.eis.dao.SqlRowList;
 import com.uas.eis.dto.stksto.QueryTravellingMerchantDto;
 import com.uas.eis.sdk.dto.CustvendDTO;
 import com.uas.eis.service.RequestSTKService;
-import com.uas.eis.utils.HttpUtil;
 import com.uas.eis.utils.HuToolUtils;
 import com.uas.eis.utils.STKSignUtil;
 import com.uas.eis.vo.stkVo.HttpResultResponse;
+import com.uas.eis.vo.stkVo.TravellingMerchantVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
-import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.stereotype.Service;
 
-import javax.xml.ws.ServiceMode;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -48,7 +46,7 @@ public class RequestSTKServiceImpl implements RequestSTKService {
      * 获取客商相关数据
      * */
     @Override
-    public List<CustvendDTO> selectTravellingMerchantList(QueryTravellingMerchantDto dto,String url){
+    public TravellingMerchantVo selectTravellingMerchantList(QueryTravellingMerchantDto dto, String url){
         if(null == dto.getPage() || null == dto.getSize()){
             dto.setPage(1);
             dto.setSize(10);
@@ -76,11 +74,11 @@ public class RequestSTKServiceImpl implements RequestSTKService {
         System.out.println("STK,获取客商信息返回结果："+resultResponse.getBody());
 
         if(StringUtils.isBlank(resultResponse.getBody())){
-            return new ArrayList<>();
+            return null;
         }
 
         //System.out.println("返回结果："+listArray.size());
-        return JSONObject.parseArray(resultResponse.getBody(),CustvendDTO.class);  //返回结果
+        return JSONObject.parseObject(resultResponse.getBody(),TravellingMerchantVo.class);  //返回结果
     }
 
     @Override

src/main/java/com/uas/eis/service/Impl/STKServiceImpl.java

@@ -15,6 +15,7 @@ import com.uas.eis.utils.CollectionUtil;
 import com.uas.eis.utils.FlexJsonUtil;
 import com.uas.eis.utils.PSHttpUtils;
 import com.uas.eis.utils.StringUtil;
+import com.uas.eis.vo.stkVo.TravellingMerchantVo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -156,7 +157,8 @@ public class STKServiceImpl implements STKService {
 
 
     @Override
-    public void getCustvend(List<CustvendDTO> custvendDTOS) {
+    public void getCustvend(TravellingMerchantVo travellingMerchantVo ) {
+        List<CustvendDTO> custvendDTOS = travellingMerchantVo.getData();
         List<String> sqls = new ArrayList<>();
         for (int i = 0; i < custvendDTOS.size(); i++) {
             sqls.add("delete from STK_CUSTVEND2;");

src/main/java/com/uas/eis/service/RequestSTKService.java

@@ -2,6 +2,7 @@ package com.uas.eis.service;
 
 import com.uas.eis.dto.stksto.QueryTravellingMerchantDto;
 import com.uas.eis.sdk.dto.CustvendDTO;
+import com.uas.eis.vo.stkVo.TravellingMerchantVo;
 
 import java.util.List;
 
@@ -14,7 +15,7 @@ public interface RequestSTKService {
     /**
      * 获取客商相关信息
      * */
-    List<CustvendDTO> selectTravellingMerchantList(QueryTravellingMerchantDto dto, String url);
+    TravellingMerchantVo selectTravellingMerchantList(QueryTravellingMerchantDto dto, String url);
 
     /**
      * 获取深投控测试获取，测试

src/main/java/com/uas/eis/service/STKService.java

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.uas.eis.sdk.dto.AssistBalanceDTO;
 import com.uas.eis.sdk.dto.CustvendDTO;
 import com.uas.eis.sdk.entity.ApiResult;
+import com.uas.eis.vo.stkVo.TravellingMerchantVo;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
@@ -47,5 +48,5 @@ public interface STKService {
     /**
      * 获取客商信息
      * */
-    void getCustvend(List<CustvendDTO> custvendDTOS);
+    void getCustvend(TravellingMerchantVo travellingMerchantVo );
 }

src/main/java/com/uas/eis/task/STKTask.java

@@ -5,6 +5,7 @@ import com.uas.eis.dto.stksto.QueryTravellingMerchantDto;
 import com.uas.eis.sdk.dto.CustvendDTO;
 import com.uas.eis.service.RequestSTKService;
 import com.uas.eis.service.STKService;
+import com.uas.eis.vo.stkVo.TravellingMerchantVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -16,7 +17,7 @@ import java.util.List;
 import java.util.Set;
 
 @Slf4j
-//@Component
+@Component
 public class STKTask {
 
     /**
@@ -43,7 +44,7 @@ public class STKTask {
     @Autowired
     private STKService stkService;
 
-    //@Scheduled(cron = "0 0/2 * * * ?")
+    @Scheduled(cron = "0 0/2 * * * ?")
     public void getSellerOrders(){
         log.info("开始获取深投控客商状态信息=========start=============");
         Date date = new Date();
@@ -51,9 +52,10 @@ public class STKTask {
         QueryTravellingMerchantDto dto = new QueryTravellingMerchantDto();
         dto.setCode(GET_TRAVELLING_MERCHANT);
 
-        List<CustvendDTO> custvendDTOS =  requestSTKService.selectTravellingMerchantList(dto,COMPLEXITY_QUERY_URL);
-        stkService.getCustvend(custvendDTOS);
-        log.info("定时任务获取深投控客商信息数据结果：{}", JSONObject.toJSONString(custvendDTOS));
+        TravellingMerchantVo travellingMerchantVo =  requestSTKService.selectTravellingMerchantList(dto,COMPLEXITY_QUERY_URL);
+        log.info("定时任务获取深投控客商信息数据结果1：{}", JSONObject.toJSONString(travellingMerchantVo));
+        stkService.getCustvend(travellingMerchantVo);
+        log.info("定时任务获取深投控客商信息数据结果2：{}", JSONObject.toJSONString(travellingMerchantVo));
 
         log.info("开始获取深投控客商状态信息,结束:"+((System.currentTimeMillis()-date.getTime())/1000));
     }

src/main/java/com/uas/eis/vo/stkVo/TravellingMerchantVo.java

@@ -0,0 +1,19 @@
+package com.uas.eis.vo.stkVo;
+
+import com.uas.eis.sdk.dto.CustvendDTO;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class TravellingMerchantVo {
+
+    private Integer total;
+
+    private Integer pages;
+
+    private Integer code;
+
+    private List<CustvendDTO> data;
+
+}

src/main/resources/application-dev.yml

@@ -38,9 +38,9 @@ STK:
     #获取客商状态反馈信息接口编码
     get_travelling_merchant_status: nMy1haj6
     #自动化查询接口
-    query_url: https://10.67.2.187/api/oapigw/api/oapisvc/automicApi/
+    query_url: https://192.168.2.179/api/oapigw/api/oapisvc/automicApi/
     #自动化新增或变更类接口地址
-    save_or_update_url: http://10.67.2.187/api/oapigw/api/oapisvc/automicUpsertApi/
+    save_or_update_url: http://192.168.2.179/api/oapigw/api/oapisvc/automicUpsertApi/
     #复杂查询接口地址
-    complexity_query_url: https://10.67.2.187/api/oapigw/api/oapisvc/api/v2/search
+    complexity_query_url: https://192.168.2.179/api/oapigw/api/oapisvc/api/v2/search
 

src/main/resources/application-prod.yml

@@ -38,8 +38,8 @@ STK:
     #获取客商状态反馈信息接口编码
     get_travelling_merchant_status: WT3uRr4V
     #自动化查询接口
-    query_url: https://10.67.2.187/api/oapigw/api/oapisvc/automicApi/
+    query_url: https://192.168.2.179/api/oapigw/api/oapisvc/automicApi/
     #自动化新增或变更类接口地址
-    save_or_update_url: http://10.67.2.187/api/oapigw/api/oapisvc/automicUpsertApi/
+    save_or_update_url: http://192.168.2.179/api/oapigw/api/oapisvc/automicUpsertApi/
     #复杂查询接口地址
-    complexity_query_url: https://10.67.2.187/api/oapigw/api/oapisvc/api/v2/search
+    complexity_query_url: https://192.168.2.179/api/oapigw/api/oapisvc/api/v2/search