Browse Source

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

zxl 1 year ago
parent
commit
6566513ac0

+ 36 - 0
src/main/java/com/uas/eis/controller/STKController.java

@@ -2,6 +2,8 @@ package com.uas.eis.controller;
 
 import cn.hutool.http.HttpRequest;
 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.sdk.dto.*;
 import com.uas.eis.sdk.entity.ApiResult;
@@ -9,6 +11,8 @@ import com.uas.eis.service.RequestSTKService;
 import com.uas.eis.service.STKService;
 import com.uas.eis.utils.MD5Util;
 import com.uas.eis.utils.STKSignUtil;
+import com.uas.eis.vo.stkVo.AccountantProjectVo;
+import com.uas.eis.vo.stkVo.CashFlowItemsVo;
 import com.uas.eis.vo.stkVo.TravellingMerchantVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -301,6 +305,7 @@ public class STKController {
         return (body);  //返回结果
     }
 
+
     //科目测试
     @GetMapping("apiPostkm")
     public String apiPostkm() throws Exception {
@@ -373,4 +378,35 @@ public class STKController {
     }
 
 
+
+
+    //现金流测试
+    @GetMapping("apiPostxjl2")
+    public CashFlowItemsVo apiPostxjl2() throws Exception {
+        QueryCashFlowItemsDto dto = new QueryCashFlowItemsDto();
+        int pageXjl = 1;
+        dto.setPage(pageXjl);
+        dto.setSize(500);
+        CashFlowItemsVo cashFlowItemsVo = new CashFlowItemsVo();
+        cashFlowItemsVo = requestSTKService.getCashFlowItems(dto);
+        return cashFlowItemsVo;
+    }
+
+
+
+
+    //会计科目测试
+    @GetMapping("apiPostkm2")
+    public AccountantProjectVo apiPostkm2() throws Exception {
+        QueryAccountantProjectDto dto = new QueryAccountantProjectDto();
+        int pageKm = 1;
+        dto.setPage(pageKm);
+        dto.setSize(500);
+        AccountantProjectVo accountantProjectVo = new AccountantProjectVo();
+        accountantProjectVo = requestSTKService.getAccountantProject(dto);
+        return accountantProjectVo;
+    }
+
+
+
 }

+ 7 - 3
src/main/java/com/uas/eis/task/STKTask.java

@@ -22,7 +22,7 @@ import java.util.List;
 import java.util.Set;
 
 @Slf4j
-@Component
+//@Component
 public class STKTask {
 
     /**
@@ -127,6 +127,7 @@ public class STKTask {
                 }
                 //获取到客商数据,数据入库
                 stkService.getCustvend(travellingMerchantVo, false);
+                exception = false;
             }catch (Exception e){
                 log.info("获取客商信息数据异常:{}",e.getMessage());
                 exception = true;
@@ -182,6 +183,7 @@ public class STKTask {
                 }
                 //获取到客商数据,数据入库
                 stkService.getCustvendDay(travellingMerchantVo, false);
+                exception = false;
             }catch (Exception e){
                 log.info("获取客商信息数据异常:{}",e.getMessage());
                 exception = true;
@@ -201,7 +203,7 @@ public class STKTask {
 
 
     //现金流项目
-    @Scheduled(cron = "0 58 09 * * ?")
+    //@Scheduled(cron = "0 58 09 * * ?")
     public void queryCashFlowItems(){
         QueryCashFlowItemsDto dto = new QueryCashFlowItemsDto();
         int pageXjl = 1;
@@ -227,6 +229,7 @@ public class STKTask {
                 }
                 //获取到现金流项目,数据入库
                 stkService.getCashFlowItems(cashFlowItemsVo, true);
+                exception = false;
             }catch (Exception e){
                 log.info("获取现金流异常:{}",e.getMessage());
                 exception = true;
@@ -246,7 +249,7 @@ public class STKTask {
 
 
     //获取会计科目
-    @Scheduled(cron = "0 05 10 * * ?")
+    //@Scheduled(cron = "0 05 10 * * ?")
     public void queryAccountantProject() {
         QueryAccountantProjectDto dto = new QueryAccountantProjectDto();
         int pageKm = 1;
@@ -272,6 +275,7 @@ public class STKTask {
                 }
                 //获取到现金流项目,数据入库
                 stkService.getAccountantProject(accountantProjectVo, true);
+                exception = false;
             } catch (Exception e) {
                 log.info("获取现金流异常:{}", e.getMessage());
                 exception = true;