From 7ba5730956fab5327b95110a8a70ff5ee025e35d Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期一, 24 十月 2022 16:03:08 +0800
Subject: [PATCH] 放开短信测试
---
flower_city/src/main/java/com/dg/core/controller/CommonController.java | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 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 041670a..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
@@ -1,11 +1,15 @@
package com.dg.core.controller;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
import com.dg.core.CorsConfig;
import com.dg.core.ResultData;
import com.dg.core.db.gen.AjaxResult;
import com.dg.core.file.FtpConstants;
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;
@@ -17,8 +21,11 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
+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;
@@ -34,6 +41,7 @@
@Autowired
private CorsConfig corsConfig;
+
// FTP 登录用户名
@@ -127,13 +135,28 @@
return ResultData.error("上传文件失败 "+e.getMessage());
}
-
// AjaxResult ajax = new AjaxResult();
// ajax.put("urls", StringUtils.join(urls, FILE_DELIMETER));
// ajax.put("fileNames", StringUtils.join(fileNames, FILE_DELIMETER));
// ajax.put("originalFilenames", StringUtils.join(originalFilenames, FILE_DELIMETER));
+ }
-
+ /**
+ * 判断当前时间是否是工作日,格式为“2022-10-16”,不传默认为今天
+ */
+ @ApiOperation("判断当前时间是否是工作日,格式为“20221016”,不传默认为今天")
+ @GetMapping("/isWeekday")
+ public ResultData isWeekday(@RequestParam(value = "dateTime",required = false) String dateTime)
+ {
+ if (dateTime==null){
+ Date date = new Date();
+ SimpleDateFormat fmt = new SimpleDateFormat("yyyyMMdd");
+ dateTime = fmt.format(date);
+ }
+ if (WorkUtils.isWorkendDay(dateTime))
+ return success("休息日或者周末");
+ else
+ return success("工作日");
}
--
Gitblit v1.7.1