修改导入wbs

tall_sdk/src/main/java/com/ccsensptos/tallsdk/bean/vo/TallProjectVo.java

@@ -57,7 +57,7 @@ public class TallProjectVo {
         private Long startTime;
         @ApiModelProperty("结束时间")
         private Long endTime;
-        @ApiModelProperty("项目完成状态(0-未开始,1-进行中,2-暂停,3-已完成)")
+        @ApiModelProperty("项目完成状态(0-未开始,1-进行中,2-已完成，3-暂停)")
         private byte status;
         @ApiModelProperty("访问路径)")
         private String url;

util/src/main/java/com/ccsens/util/cron/CronConstant.java

@@ -27,9 +27,9 @@ public class CronConstant {
 //        System.out.println("每天9点，10点：" + new CronExpression().generateCron("每天9点，10点"));
 //        System.out.println("每隔3天：" + new CronExpression().generateCron("10号，每隔3天"));
 //        System.out.println("8-16号每小时：" + new CronExpression().generateCron("8-16号每小时"));
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        Date start = sdf.parse("2019-10-1 8:00:00");
-        Date end = sdf.parse("2021-10-1 8:00:00");
+//        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//        Date start = sdf.parse("2019-10-1 8:00:00");
+//        Date end = sdf.parse("2021-10-1 8:00:00");
         
 //        TaskCron year = getCronDay("每年");
 //        System.out.println("每年：" + year);
@@ -58,9 +58,9 @@ public class CronConstant {
 //        TaskCron workday = getCronDay("每周一-周五 18点");
 //        System.out.println("工作日：" + workday);
 //        System.out.println("工作日：" + getDate(workday,start, end));
-        TaskCron workday = getCronDay("每周一-周五 15点30分-15点45分");
-        System.out.println("工作日：" + workday);
-        System.out.println("工作日：" + getDate(workday,start, end));
+//        TaskCron workday = getCronDay("每周一-周五 15点30分-15点45分");
+////        System.out.println("工作日：" + workday);
+////        System.out.println("工作日：" + getDate(workday,start, end));
 //        System.out.println(generateDates("每天9点，10点", start, end));
     }
 

util/src/main/java/com/ccsens/util/cron/NatureToDate.java

@@ -41,7 +41,7 @@ public class NatureToDate {
 //        System.out.println("每月15号:" + generateDates("每月15号", start, end));
 //        System.out.println("每月:" + generateDates("每月", start, end));
 //        System.out.println("每月31号:" + generateDates("每月31号", start, end));
-//        System.out.println("每天:" + generateDates("每天", start, end));
+        System.out.println("每天:" + generateDates("每天", start, end));
 //        System.out.println("每年二月:" + generateDates("每年二月", start, end));
 //        System.out.println("每周一下午五点:" + generateDates("每周一下午五点", start, end));
 //        System.out.println("每月第一周:" + generateDates("每月第一周", start, end));
@@ -53,7 +53,7 @@ public class NatureToDate {
 //        System.out.println("第1天:" + generateDates("第1天", start, end));
 //        System.out.println("每40分钟:" + generateDates("每40分钟", start, end));
 //        System.out.println("每月15号下午5点:" + generateDates("每月15号下午5点", start, end));
-        System.out.println("每月最后一个工作日:" + generateDates("每年最后一个工作日", start, end));
+//        System.out.println("每月最后一个工作日:" + generateDates("每年最后一个工作日", start, end));
 
 //        log.info("周一到周五 8点-9点： " + generateDates("周一到周五 18点", start, end));
 //        log.info("每年3月5号前： " + generateDates("每年03月05号前", start, end));
@@ -236,11 +236,9 @@ public class NatureToDate {
 //        Object o = redisUtil.get(key);
 //        if(ObjectUtil.isNull(o)){
             //中国法定节假日期
-            holiday = "01-01,01-02,01-03,02-11,02-12,02-13,02-14,02-15,02-16,"
-                    + "02-17,04-03,04-04,04-05,05-01,05-02,05-03,05-04,05-05,06-12,06-13,"
-                    + "06-14,09-19,09-20,09-21,10-01,10-02,10-03,10-04,10-05,10-06,10-07";
+            holiday = "01-01,01-02,01-03,01-31,02-01,02-02,02-03,02-04,02-05,02-06,04-03,04-04,04-05,04-30,05-01,05-02,05-03,05-04,06-03,06-04,06-05,09-10,09-11,09-12,10-01,10-02,10-03,10-04,10-05,10-06,10-07";
             // 节假前后加班日期
-            overDay = "02-07,02-20,04-25,05-08,09-18,09-26,10-09";
+            overDay = "01-29,01-30,04-02,04-24,05-07,10-08,10-09";
 //        }else {
 //
 //        }