Browse Source

[深爱]科目基础资料对接测试

zxl 1 year ago
parent
commit
c7b90292b0

+ 6 - 3
src/main/java/com/uas/eis/controller/STKController.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.uas.eis.dto.stksto.QueryAccountantProjectDto;
 import com.uas.eis.dto.stksto.QueryCashFlowItemsDto;
 import com.uas.eis.dto.stksto.QueryTravellingMerchantDto;
+import com.uas.eis.dto.stksto.StkCommonDto;
 import com.uas.eis.sdk.dto.*;
 import com.uas.eis.sdk.entity.ApiResult;
 import com.uas.eis.service.RequestSTKService;
@@ -265,14 +266,14 @@ public class STKController {
         request.put("size",pageSize);
 
         //传入参数  此处案例仅放置了时间,可自行添加
-        //JSONObject param=new JSONObject();
+        JSONObject param=new JSONObject();
         //param.put("UPDATE_TIME_start","2024-05-09 14:24:06");
         //param.put("UPDATE_TIME_end","2024-05-09 15:01:28");
         //param.put("TASKNO","P2022032200000041");
         //param.put("TASKCODE","202409");
 
 
-        //request.put("param",param);
+        request.put("param",param);
 
         String content = request.toString();
 
@@ -383,10 +384,12 @@ public class STKController {
     //现金流测试
     @GetMapping("apiPostxjl2")
     public CashFlowItemsVo apiPostxjl2() throws Exception {
-        QueryCashFlowItemsDto dto = new QueryCashFlowItemsDto();
+        StkCommonDto dto = new StkCommonDto();
         int pageXjl = 1;
         dto.setPage(pageXjl);
         dto.setSize(500);
+        QueryCashFlowItemsDto dtoParam = new QueryCashFlowItemsDto();
+        dto.setParam(dtoParam);
         CashFlowItemsVo cashFlowItemsVo = new CashFlowItemsVo();
         cashFlowItemsVo = requestSTKService.getCashFlowItems(dto);
         return cashFlowItemsVo;

+ 4 - 4
src/main/java/com/uas/eis/service/Impl/RequestSTKServiceImpl.java

@@ -121,9 +121,9 @@ public class RequestSTKServiceImpl implements RequestSTKService {
     }
 
     @Override
-    public CashFlowItemsVo getCashFlowItems(QueryCashFlowItemsDto dto) {
-        StkCommonDto stkCommonDto = new StkCommonDto();
-        stkCommonDto.setParam(dto);
+    public CashFlowItemsVo getCashFlowItems(StkCommonDto dto) {
+        /*StkCommonDto stkCommonDto = new StkCommonDto();
+        stkCommonDto.setParam(dto);*/
 
         //头部请求参数
         Map<String,String> headerMap = null;
@@ -133,7 +133,7 @@ public class RequestSTKServiceImpl implements RequestSTKService {
             log.error("STK加密异常:{}",e.getMessage());
         }
 
-        HttpResultResponse resultResponse = HuToolUtils.post(QUERY_URL+CASH_FLOW_ITEMS_REQUEST_CODE,stkCommonDto,headerMap);
+        HttpResultResponse resultResponse = HuToolUtils.post(QUERY_URL+CASH_FLOW_ITEMS_REQUEST_CODE,dto,headerMap);
         log.info("深投控,现金流项目,返回结果数据{}",JSONObject.toJSONString(resultResponse));
         if(!resultResponse.getSuccess()){
             log.info("深投控,现金流项目数据异常:{}",resultResponse.getMessage());

+ 2 - 1
src/main/java/com/uas/eis/service/RequestSTKService.java

@@ -3,6 +3,7 @@ package com.uas.eis.service;
 import com.uas.eis.dto.stksto.QueryAccountantProjectDto;
 import com.uas.eis.dto.stksto.QueryCashFlowItemsDto;
 import com.uas.eis.dto.stksto.QueryTravellingMerchantDto;
+import com.uas.eis.dto.stksto.StkCommonDto;
 import com.uas.eis.sdk.dto.CustvendDTO;
 import com.uas.eis.sdk.dto.SaveOrChangeCustomerDetailDto;
 import com.uas.eis.vo.stkVo.*;
@@ -28,7 +29,7 @@ public interface RequestSTKService {
     /**
      * 查询现金流项目
      * */
-    CashFlowItemsVo getCashFlowItems(QueryCashFlowItemsDto dto);
+    CashFlowItemsVo getCashFlowItems(StkCommonDto dto);
 
     /**
      * 获取会计科目

+ 4 - 1
src/main/java/com/uas/eis/task/STKTask.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.uas.eis.dto.stksto.QueryAccountantProjectDto;
 import com.uas.eis.dto.stksto.QueryCashFlowItemsDto;
 import com.uas.eis.dto.stksto.QueryTravellingMerchantDto;
+import com.uas.eis.dto.stksto.StkCommonDto;
 import com.uas.eis.sdk.dto.CustvendDTO;
 import com.uas.eis.service.RequestSTKService;
 import com.uas.eis.service.STKService;
@@ -205,10 +206,12 @@ public class STKTask {
     //现金流项目
     //@Scheduled(cron = "0 58 09 * * ?")
     public void queryCashFlowItems(){
-        QueryCashFlowItemsDto dto = new QueryCashFlowItemsDto();
+        StkCommonDto dto = new StkCommonDto();
+        QueryCashFlowItemsDto dtoParam = new QueryCashFlowItemsDto();
         int pageXjl = 1;
         dto.setPage(pageXjl);
         dto.setSize(500);
+        dto.setParam(dtoParam);
         //是否跳出循环
         Boolean isBreak = true;
         //是否发生异常