From 48a62ed1badc7b68a81e253240672b15d4c3d74a Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期二, 18 十月 2022 18:31:01 +0800
Subject: [PATCH] 修改获取节假日依赖及代码
---
flower_city/src/main/java/com/dg/core/controller/CommonController.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/CommonController.java b/flower_city/src/main/java/com/dg/core/controller/CommonController.java
index 98d31e0..9c89361 100644
--- a/flower_city/src/main/java/com/dg/core/controller/CommonController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/CommonController.java
@@ -9,6 +9,7 @@
import com.dg.core.file.MimeTypeUtils;
import com.dg.core.file.SFTPUtil;
import com.dg.core.util.TestDate;
+import com.iceyyy.workday.WorkUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -22,7 +23,9 @@
import javax.annotation.Resource;
import java.io.InputStream;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.UUID;
@@ -141,21 +144,19 @@
/**
* 判断当前时间是否是工作日,格式为“2022-10-16”,不传默认为今天
*/
- @ApiOperation("判断当前时间是否是工作日,格式为“2022-10-16”,不传默认为今天")
+ @ApiOperation("判断当前时间是否是工作日,格式为“20221016”,不传默认为今天")
@GetMapping("/isWeekday")
public ResultData isWeekday(@RequestParam(value = "dateTime",required = false) String dateTime)
{
- TestDate td=new TestDate();
- DateTime dateTimeUser;
- if (dateTime==null)
- dateTimeUser=DateTime.now();
- else{
- dateTimeUser=DateUtil.parse(dateTime);
+ if (dateTime==null){
+ Date date = new Date();
+ SimpleDateFormat fmt = new SimpleDateFormat("yyyyMMdd");
+ dateTime = fmt.format(date);
}
- if (td.isWeekday(dateTimeUser))
- return success("工作日");
- else
+ if (WorkUtils.isWorkendDay(dateTime))
return success("休息日或者周末");
+ else
+ return success("工作日");
}
--
Gitblit v1.7.1