autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-21 03:25:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

Browse Source 
# Conflicts:
#	jsowell-admin/src/test/java/SpringBootTestController.java
#	jsowell-common/src/main/java/com/jsowell/common/util/DateUtils.java
This commit is contained in:
Lemon
2024-06-20 14:23:08 +08:00
parent 9aea88ab4a af96ae4a1c
commit e409427db3
21 changed files with 1061 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
jsowell-common/src/main/java/com/jsowell/common/util/DateUtils.java
View File

@@ -10,6 +10,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.lang.management.ManagementFactory;
import java.sql.Time;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
@@ -44,6 +45,8 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
public static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
public static String HH_MM = "HH:mm";
public static String RFC3339 = "yyyy-MM-dd'T'HH:mm:ssXXX";
private static String[] parsePatterns = {
@@ -673,10 +676,6 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
// public static String date2HexStr(Date date) {
// return Cp56Time2aUtil.date2HexStr(date);
// }
public static void main(String[] args) {
List<String> allDatesInTheDateRange = getAllDatesInTheDateRange("2024-05-01", "2024-05-31");
System.out.println(allDatesInTheDateRange);
}
/**
* 获取两个时间的间隔时间
*
@@ -1033,4 +1032,54 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
return maxDate;
}
public static LocalDateTime convertToLocalDateTime(String time, boolean isNextDay) {
LocalTime localTime = LocalTime.parse(time, DateTimeFormatter.ofPattern("HH:mm:ss"));
LocalDateTime now = LocalDateTime.now();
LocalDateTime dateTime = now.with(localTime);
if (isNextDay) {
dateTime = dateTime.plusDays(1);
}
return dateTime;
}
/**
* 转换预约时间
* @param startTime
* @param endTime
* @return
*/
public static LocalDateTime[] convertStartAndEndTime(String startTime, String endTime) {
LocalTime startLocalTime = LocalTime.parse(startTime, DateTimeFormatter.ofPattern("HH:mm:ss"));
LocalTime endLocalTime = LocalTime.parse(endTime, DateTimeFormatter.ofPattern("HH:mm:ss"));
LocalDateTime now = LocalDateTime.now();
LocalDateTime startDateTime = now.with(startLocalTime);
LocalDateTime endDateTime = now.with(endLocalTime);
// 如果结束时间比开始时间小或相同，则结束时间为第二天
if (endLocalTime.isBefore(startLocalTime) || endLocalTime.equals(startLocalTime)) {
endDateTime = endDateTime.plusDays(1);
}
return new LocalDateTime[]{startDateTime, endDateTime};
}
public static void main(String[] args) {
String startTime = "22:00:00";
String endTime1 = "05:30:00";
String endTime2 = "22:00:00";
LocalDateTime[] dateTime1 = convertStartAndEndTime(startTime, endTime1);
LocalDateTime[] dateTime2 = convertStartAndEndTime(startTime, endTime2);
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
System.out.println("Start DateTime: " + dateTime1[0].format(formatter));
System.out.println("End DateTime (Next Day): " + dateTime1[1].format(formatter));
System.out.println("Start DateTime: " + dateTime2[0].format(formatter));
System.out.println("End DateTime (Same Day): " + dateTime2[1].format(formatter));
}
}

12
jsowell-common/src/main/java/com/jsowell/common/util/file/FtpUtils.java
View File

@@ -10,6 +10,7 @@ import com.jsowell.common.util.ServletUtils;
import com.jsowell.common.util.StringUtils;
import com.jsowell.common.util.id.IdUtils;
import com.jsowell.common.util.ip.IpUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.net.ftp.FTPClient;
@@ -23,7 +24,7 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
@Slf4j
@Component
public class FtpUtils {
@@ -59,7 +60,14 @@ public class FtpUtils {
/** 3. 连接ftp服务器*/
String ip = IpUtils.getIpFormDomainName(ftpConfig.getIp());
ftp.connect(ip, ftpConfig.getPort());
ftp.login(ftpConfig.getUsername(), ftpConfig.getPassword());
boolean login = ftp.login(ftpConfig.getUsername(), ftpConfig.getPassword());
if (login) {
log.info("FTP登录成功");
} else {
log.info("FTP登录失败");
}
ftp.enterLocalPassiveMode(); // 设置为被动模式
log.info("ftp连接信息, ip:{}, port:{}, 连接信息:{}", ip, ftpConfig.getPort(), ftp.getStatus());
if (!FTPReply.isPositiveCompletion(ftp.getReplyCode())) {
// 不合法时断开连接
ftp.disconnect();