NC定时任务测试及结构调整

mjava-lanyun/src/main/java/com/malk/lanyun/controller/TimerController.java

@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDate;
 import java.util.List;
 import java.util.Map;
 
@@ -28,6 +29,8 @@ public class TimerController {
     @Autowired
     private NCService ncService;
 
+    LocalDate lastMonth = LocalDate.now().minusMonths(1);
+
     /**
      * 月度定额更新
      */
@@ -40,6 +43,9 @@ public class TimerController {
 
     @RequestMapping("test")
     McR test() {
+        int year = lastMonth.getYear();
+        String month = String.format("%02d",lastMonth.getMonthValue()) ;
+        System.out.println(month);
         return McR.success();
     }
 

mjava-lanyun/src/main/java/com/malk/lanyun/delegate/DDDelegate.java

@@ -57,6 +57,10 @@ public class DDDelegate implements DDEvent {
         if  (isTerminate){
             log.info("开始执行撤销回调");
             timerService.terminateDataById(processInstanceId);
+        } else if (isAgree) {
+            if (processCode.equals("PROC-15DD2D3E-1432-42A9-83B8-3B443AEA110F")){
+
+            }
         }
         log.info("审批实例回调执行业务逻辑, {}", approveResult);
     }

mjava-lanyun/src/main/java/com/malk/lanyun/service/impl/NCServiceImpl.java

@@ -53,7 +53,7 @@ public class NCServiceImpl implements NCService {
     @Value("${dingtalk.agentId}")
     private Long agentId;
     // 获取当前日期
-    LocalDate lastMonth = LocalDate.now().minusMonths(1);
+    LocalDate lastMonth = LocalDate.now(ZoneId.of("Asia/Shanghai")).minusMonths(1);
     //本月
 //    LocalDate lastMonth = LocalDate.now();
     DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
@@ -635,15 +635,15 @@ public class NCServiceImpl implements NCService {
     public void getSupplierPay() {
         // 获取当前年
         int year = lastMonth.getYear();
-        for (int i = 1; i <= lastMonth.getMonthValue(); i++) {
-            String month = String.format("%02d",i) ;
-            deleteMonthDate("FORM-09CDC75CDC6048379567EC87ED6CE7B6T8PP","textField_m0g4itw4", String.valueOf(year),month);
-            try {
-                Thread.sleep(5000);
-            } catch (InterruptedException e) {
-                throw new RuntimeException(e);
-            }
-        }
+        deleteMonthDate("FORM-09CDC75CDC6048379567EC87ED6CE7B6T8PP","textField_m0g4itw4", String.valueOf(year),null);
+//        for (int i = 1; i <= lastMonth.getMonthValue(); i++) {
+//            String month = String.format("%02d",i) ;
+//            try {
+//                Thread.sleep(5000);
+//            } catch (InterruptedException e) {
+//                throw new RuntimeException(e);
+//            }
+//        }
 
         LocalDate firstDayOfYear = LocalDate.of(year, 1, 1);
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");

mjava/src/main/java/com/malk/server/dingtalk/DDR.java

@@ -25,6 +25,8 @@ public class DDR<T> extends VenR {
 
     private T result;
 
+    private T send_result;
+
     /**
      * token
      */

mjava/src/main/java/com/malk/server/dingtalk/DDR_New.java

@@ -62,6 +62,8 @@ public class DDR_New<T> extends VenR {
 
     private String taskId;
 
+    private String formUuid;
+
     private Map formData;
 
     /**

pom.xml

@@ -34,7 +34,7 @@
         <fastjson.version>1.2.83</fastjson.version>
         <commons-lang3.version>3.10</commons-lang3.version>
         <guava.version>30.1.1-jre</guava.version>
-        <hutool-all.version>5.6.0</hutool-all.version>
+        <hutool-all.version>5.8.16</hutool-all.version>
         <spring-boot-starter-data-jpa.version>2.1.3.RELEASE</spring-boot-starter-data-jpa.version>
         <querydsl-apt.version>4.2.1</querydsl-apt.version>
         <querydsl-jpa.version>4.2.1</querydsl-jpa.version>