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

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

@@ -247,7 +247,7 @@ public class STKController {
 
         //分页内容 自行调整
         String page = "1";
-        String pageSize = "100";
+        String pageSize = "500";
 
         //支持  时间字段_start  时间字段_end  的传值  例:UPDATE_TIME
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
@@ -318,7 +318,7 @@ public class STKController {
 
         //分页内容 自行调整
         String page = "1";
-        String pageSize = "100";
+        String pageSize = "500";
 
         //支持  时间字段_start  时间字段_end  的传值  例:UPDATE_TIME
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");

src/main/java/com/uas/eis/dto/stksto/QueryAccountantProjectDto.java

@@ -8,7 +8,7 @@ import java.util.Date;
  * 查询会计科目
  * */
 @Data
-public class QueryAccountantProjectDto {
+public class QueryAccountantProjectDto extends STKPageDto {
 
     /**
      *源_数据 ID
@@ -78,4 +78,16 @@ public class QueryAccountantProjectDto {
      * */
     private Date UPDATE_TIME;
 
+    /**
+     *开始时间
+     * yyyy-MM-dd HH:mm:ss
+     * */
+    private String UPDATE_TIME_start;
+
+    /**
+     *结束时间
+     * yyyy-MM-dd HH:mm:ss
+     * */
+    private String UPDATE_TIME_end;
+
 }

src/main/java/com/uas/eis/dto/stksto/QueryCashFlowItemsDto.java

@@ -8,7 +8,7 @@ import java.util.Date;
  * 查询现金流量项目
  * */
 @Data
-public class QueryCashFlowItemsDto{
+public class QueryCashFlowItemsDto extends STKPageDto{
 
     /**
      *主键 ID
@@ -57,4 +57,16 @@ public class QueryCashFlowItemsDto{
      * */
     private String UPDATE_TIME;
 
+    /**
+     *开始时间
+     * yyyy-MM-dd HH:mm:ss
+     * */
+    private String UPDATE_TIME_start;
+
+    /**
+     *结束时间
+     * yyyy-MM-dd HH:mm:ss
+     * */
+    private String UPDATE_TIME_end;
+
 }

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

@@ -293,6 +293,7 @@ public class STKServiceImpl implements STKService {
             sqls.add("delete from STK_CASHFLOWDJ");
         }
         for (int i = 0; i < cashFlowItemsDataVo.size(); i++) {
+            sqls.add("delete from STK_CASHFLOWDJ where id = " + cashFlowItemsDataVo.get(i).getID());
             sqls.add("insert into STK_CASHFLOWDJ(ID,NUMBER2,CODE,NAME,LONGNUMBER,LEVEL2,FULLNAME,ISLEAF,CTRLSTRATEGY,SOURCEDATA,BITINDEX,SRCINDEX," +
                     "TYPE,DIRECTION,ISDEALACTIVITY,ISEXCHANGERATE,ISPREFIT,NOTICE,CHECKITEMHELP,ISASSIST,ISSCHEDULEITEM,MODIFIER_NUMBER," +
                     "MODIFIER_NAME,CREATEORG_NUMBER,ORG_NUMBER,ORG_NAME,USEORG_NUMBER,USEORG_NAME,STATUS,ENABLE," +
@@ -327,6 +328,7 @@ public class STKServiceImpl implements STKService {
             sqls.add("delete from STK_CATEGORYDJ");
         }
         for (int i = 0; i < accountantProjectDataVo.size(); i++) {
+            sqls.add("delete from STK_CATEGORYDJ where id = " + accountantProjectDataVo.get(i).getID());
             sqls.add("insert into STK_CATEGORYDJ(S_ID,S_NUMBER,CODE,NAME,PARENTID,S_PARENTNUM,PARENTCODE,PARENTNAME,LONGNUMBER,LONGNAME,LEVEL2,ISLEAF,ACCOUNTTABLENUMBER,ACCOUNTTABLENAME,ACCOUNTTYPENUMBER,ACCOUNTTYPENAME," +
                     "PLTYPE,DC,ACCRUALDIRECTION,ISCASH,ISBANK,ISCASHEQUIVALENT,ACNOTICE,ISCHANGECURRENCY,BW,ISQTY,ISASSIST,NOCURRENCYRADIO,DESCURRENCYRADIO,ALLCURRENCYRADIO,ACCTCURRENCY,HELPCODE,ISALLOWCA,ORGCONTROLLEVEL,ISMANUAL,ACCHECK,ISJOURNAL," +
                     "STARTDATE," +

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 {
 
     /**
@@ -201,24 +201,92 @@ public class STKTask {
 
 
     //现金流项目
-    //@Scheduled(cron = "0 01 20 * * ?")
+    @Scheduled(cron = "0 58 09 * * ?")
     public void queryCashFlowItems(){
         QueryCashFlowItemsDto dto = new QueryCashFlowItemsDto();
-        CashFlowItemsVo cashFlowItemsVo = new CashFlowItemsVo();
-        cashFlowItemsVo = requestSTKService.getCashFlowItems(dto);
-        //获取到现金流项目，数据入库
-        stkService.getCashFlowItems(cashFlowItemsVo, true);
+        int pageXjl = 1;
+        dto.setPage(pageXjl);
+        dto.setSize(500);
+        //是否跳出循环
+        Boolean isBreak = true;
+        //是否发生异常
+        Boolean exception = false;
+        //异常跳过次数
+        Integer num = 0;
+        while(isBreak) {
+            if (num >= 5) {
+                break;
+            }
+            log.info("while循环获取现金流，查询参数：{}", JSONObject.toJSONString(dto));
+            CashFlowItemsVo cashFlowItemsVo = new CashFlowItemsVo();
+            try {
+                cashFlowItemsVo = requestSTKService.getCashFlowItems(dto);
+                if (cashFlowItemsVo.getCode() != 200) {
+                    num = num + 1;
+                    continue;
+                }
+                //获取到现金流项目，数据入库
+                stkService.getCashFlowItems(cashFlowItemsVo, true);
+            }catch (Exception e){
+                log.info("获取现金流异常：{}",e.getMessage());
+                exception = true;
+                num = num +1;
+            }
+            //判断没发生异常，且是最后一页条件判断==》没有下页编码，或者当前页数等于返回页数
+            if (!exception && null != cashFlowItemsVo && null != cashFlowItemsVo.getData() && dto.getPage() >= pageXjl){
+                isBreak = false;
+            }
+
+            if(!exception){
+                pageXjl = pageXjl+1;
+                dto.setPage(pageXjl);
+            }
+        }
     }
 
 
     //获取会计科目
-    //@Scheduled(cron = "0 03 20 * * ?")
-    public void queryAccountantProject(){
+    @Scheduled(cron = "0 05 10 * * ?")
+    public void queryAccountantProject() {
         QueryAccountantProjectDto dto = new QueryAccountantProjectDto();
-        AccountantProjectVo accountantProjectVo = new AccountantProjectVo();
-        accountantProjectVo = requestSTKService.getAccountantProject(dto);
-        //获取到现金流项目，数据入库
-        stkService.getAccountantProject(accountantProjectVo, true);
+        int pageKm = 1;
+        dto.setPage(pageKm);
+        dto.setSize(500);
+        //是否跳出循环
+        Boolean isBreak = true;
+        //是否发生异常
+        Boolean exception = false;
+        //异常跳过次数
+        Integer num = 0;
+        while (isBreak) {
+            if (num >= 5) {
+                break;
+            }
+            log.info("while循环会计科目，查询参数：{}", JSONObject.toJSONString(dto));
+            AccountantProjectVo accountantProjectVo = new AccountantProjectVo();
+            try {
+                accountantProjectVo = requestSTKService.getAccountantProject(dto);
+                if (accountantProjectVo.getCode() != 200) {
+                    num = num + 1;
+                    continue;
+                }
+                //获取到现金流项目，数据入库
+                stkService.getAccountantProject(accountantProjectVo, true);
+            } catch (Exception e) {
+                log.info("获取现金流异常：{}", e.getMessage());
+                exception = true;
+                num = num + 1;
+            }
+            //判断没发生异常，且是最后一页条件判断==》没有下页编码，或者当前页数等于返回页数
+            if (!exception && null != accountantProjectVo && null != accountantProjectVo.getData() && dto.getPage() >= pageKm) {
+                isBreak = false;
+            }
+
+            if (!exception) {
+                pageKm = pageKm + 1;
+                dto.setPage(pageKm);
+            }
+        }
     }
 
 

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

@@ -14,7 +14,7 @@ public class StkResponseBaseVo {
     /**
      * 请求接口返回状态码
      * */
-    private String code;
+    private Integer code;
 
     /**
      * 接口返回信息