mirror of
https://github.com/hpd840321/starRiverProperty.git
synced 2026-06-09 16:30:29 +08:00
fix: relocate cwos-portal decompiled output to correct path; remove nested directory
Former-commit-id: dc30d42a8c55ed8b2382a41dc2434233fbed9930
This commit is contained in:
+1
@@ -1,6 +1,7 @@
|
||||
package cn.cloudwalk.elevator.config;
|
||||
|
||||
public class AcsConstants {
|
||||
|
||||
public static final String SUCCESS_CODE = "00000000";
|
||||
public static final String SERVICE_CODE = "elevator-app";
|
||||
public static final Long ONE_DAY_MILLISECONDS = Long.valueOf(86400000L);
|
||||
|
||||
+1
@@ -1,6 +1,7 @@
|
||||
package cn.cloudwalk.elevator.config;
|
||||
|
||||
public class AcsLockConstants {
|
||||
|
||||
public static final String LOCK_EXPORT_BUSINESSID_PREFIX = "AcsExport:";
|
||||
|
||||
public static final String LOCK_RECORD_STATISTICS_BUSINESSID_PREFIX = "AcsRecordStatistics:";
|
||||
|
||||
+1
@@ -1,6 +1,7 @@
|
||||
package cn.cloudwalk.elevator.config;
|
||||
|
||||
public class ErrorCode {
|
||||
|
||||
public static final String OTHER_ERROR = "00000001";
|
||||
|
||||
public static final String ID_IS_NULL = "53060410";
|
||||
|
||||
+1
@@ -1,6 +1,7 @@
|
||||
package cn.cloudwalk.elevator.config;
|
||||
|
||||
public class FeignRemoteConfig {
|
||||
|
||||
public static final String PLATFORM_USER_ID = "platformuserid";
|
||||
|
||||
public static final String LOGIN_ID = "loginid";
|
||||
|
||||
+1
@@ -4,6 +4,7 @@ import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
public class ImageStoreConstants {
|
||||
|
||||
public static final short IS_NOT_DEL = 0;
|
||||
public static final short IS_DEL = 1;
|
||||
public static final int ASSOCIATED_ACTION_INCLUDE = 0;
|
||||
|
||||
+55
-55
@@ -47,11 +47,11 @@ public class DateUtils {
|
||||
}
|
||||
|
||||
public static int defaultFormat(Date date) {
|
||||
return Integer.valueOf(formatDate(date, "yyyyMMdd")).intValue();
|
||||
return Integer.valueOf(DateUtils.formatDate(date, YYYYMMDD));
|
||||
}
|
||||
|
||||
public static Date defaultFormat(String str) {
|
||||
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
|
||||
SimpleDateFormat sdf = new SimpleDateFormat(YYYYMMDD);
|
||||
try {
|
||||
return sdf.parse(str);
|
||||
} catch (ParseException e) {
|
||||
@@ -73,16 +73,16 @@ public class DateUtils {
|
||||
public static int defaultFormat(long millis) {
|
||||
Calendar cal = Calendar.getInstance();
|
||||
cal.setTimeInMillis(millis);
|
||||
return defaultFormat(cal.getTime());
|
||||
return DateUtils.defaultFormat(cal.getTime());
|
||||
}
|
||||
|
||||
public static String parseTimestamp(Timestamp time) {
|
||||
return parseDate(time.getTimestamp());
|
||||
return DateUtils.parseDate(time.getTimestamp());
|
||||
}
|
||||
|
||||
public static String parseDate(Date date) {
|
||||
try {
|
||||
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
|
||||
SimpleDateFormat sdf = new SimpleDateFormat(YYYYMMDD);
|
||||
return sdf.format(date);
|
||||
} catch (Exception e) {
|
||||
logger.error("日期格式转换失败", e);
|
||||
@@ -129,19 +129,19 @@ public class DateUtils {
|
||||
}
|
||||
|
||||
public static Long dateToStamp(String s) {
|
||||
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
|
||||
SimpleDateFormat simpleDateFormat = new SimpleDateFormat(YYYYMMDD);
|
||||
try {
|
||||
Date date = simpleDateFormat.parse(s);
|
||||
long ts = date.getTime();
|
||||
return Long.valueOf(ts);
|
||||
return ts;
|
||||
} catch (Exception e) {
|
||||
logger.error("日期转为时间戳失败", e);
|
||||
return Long.valueOf(0L);
|
||||
return 0L;
|
||||
}
|
||||
}
|
||||
|
||||
public static String stampToDate(String s) {
|
||||
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||
SimpleDateFormat simpleDateFormat = new SimpleDateFormat(YYYY_MM_DD_HMS);
|
||||
long lt = (new Long(s)).longValue();
|
||||
Date date = new Date(lt);
|
||||
String res = simpleDateFormat.format(date);
|
||||
@@ -149,12 +149,11 @@ public class DateUtils {
|
||||
}
|
||||
|
||||
public static String getTwoDaysDesc(Integer startTime, Integer endTime) {
|
||||
String twoDayDesc;
|
||||
List<Integer> days = new ArrayList<>();
|
||||
List<Integer> days = new ArrayList<Integer>();
|
||||
if (null == startTime || null == endTime) {
|
||||
return "日";
|
||||
}
|
||||
DateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
|
||||
DateFormat dateFormat = new SimpleDateFormat(YYYYMMDD);
|
||||
try {
|
||||
Date start = dateFormat.parse(String.valueOf(startTime));
|
||||
Date end = dateFormat.parse(String.valueOf(endTime));
|
||||
@@ -164,13 +163,14 @@ public class DateUtils {
|
||||
tempEnd.setTime(end);
|
||||
tempEnd.add(5, 1);
|
||||
while (tempStart.before(tempEnd)) {
|
||||
days.add(Integer.valueOf(Integer.parseInt(dateFormat.format(tempStart.getTime()))));
|
||||
days.add(Integer.parseInt(dateFormat.format(tempStart.getTime())));
|
||||
tempStart.add(6, 1);
|
||||
}
|
||||
} catch (ParseException e) {
|
||||
logger.error("时间转换失败", e);
|
||||
}
|
||||
int dayOfWeek = 7;
|
||||
String twoDayDesc;
|
||||
if (days.size() > dayOfWeek) {
|
||||
twoDayDesc = "月";
|
||||
} else if (days.size() > 1) {
|
||||
@@ -187,21 +187,21 @@ public class DateUtils {
|
||||
calendar.set(12, 0);
|
||||
calendar.set(13, 0);
|
||||
calendar.set(14, 0);
|
||||
return Long.valueOf(calendar.getTimeInMillis());
|
||||
return calendar.getTimeInMillis();
|
||||
}
|
||||
|
||||
public static Long dateToStampTomorrow(String s) {
|
||||
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
|
||||
SimpleDateFormat simpleDateFormat = new SimpleDateFormat(YYYYMMDD);
|
||||
try {
|
||||
Date date = simpleDateFormat.parse(s);
|
||||
Calendar cal = Calendar.getInstance();
|
||||
cal.setTime(date);
|
||||
cal.add(5, 1);
|
||||
long ts = cal.getTimeInMillis();
|
||||
return Long.valueOf(ts);
|
||||
return ts;
|
||||
} catch (Exception e) {
|
||||
logger.error("日期转换失败", e);
|
||||
return Long.valueOf(0L);
|
||||
return 0L;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -226,7 +226,7 @@ public class DateUtils {
|
||||
calendar.set(12, 0);
|
||||
calendar.set(13, 0);
|
||||
calendar.set(14, 0);
|
||||
return Long.valueOf(calendar.getTimeInMillis());
|
||||
return calendar.getTimeInMillis();
|
||||
}
|
||||
|
||||
public static Long todayEnd(Date date) {
|
||||
@@ -236,7 +236,7 @@ public class DateUtils {
|
||||
calendar.set(12, 59);
|
||||
calendar.set(13, 59);
|
||||
calendar.set(14, 999);
|
||||
return Long.valueOf(calendar.getTimeInMillis());
|
||||
return calendar.getTimeInMillis();
|
||||
}
|
||||
|
||||
public static Long todayEnd() {
|
||||
@@ -245,7 +245,7 @@ public class DateUtils {
|
||||
calendar.set(12, 59);
|
||||
calendar.set(13, 59);
|
||||
calendar.set(14, 999);
|
||||
return Long.valueOf(calendar.getTimeInMillis());
|
||||
return calendar.getTimeInMillis();
|
||||
}
|
||||
|
||||
public static String formatTimeDuration(long duration, int format) {
|
||||
@@ -329,15 +329,17 @@ public class DateUtils {
|
||||
SimpleDateFormat simpleDateFormat = new SimpleDateFormat(format);
|
||||
try {
|
||||
Date date = simpleDateFormat.parse(s);
|
||||
return Long.valueOf(date.getTime());
|
||||
return date.getTime();
|
||||
} catch (Exception e) {
|
||||
logger.error("日期转换失败", e);
|
||||
return Long.valueOf(0L);
|
||||
return 0L;
|
||||
}
|
||||
}
|
||||
|
||||
public static boolean timeIsInRound(String now, String start, String end, String format) {
|
||||
Date nowTime, beginTime, endTime;
|
||||
Date nowTime;
|
||||
Date beginTime;
|
||||
Date endTime;
|
||||
SimpleDateFormat df = new SimpleDateFormat(format);
|
||||
try {
|
||||
nowTime = df.parse(now);
|
||||
@@ -364,66 +366,64 @@ public class DateUtils {
|
||||
}
|
||||
|
||||
public static List<StartTimeAndEndTime> getCycle(Integer timeType, int cycleNum) {
|
||||
LocalDateTime nowStartTime, nowEndTime;
|
||||
LocalDateTime nowStartTime;
|
||||
LocalDateTime nowEndTime;
|
||||
int i;
|
||||
LocalDateTime nowMonday, nowSunday;
|
||||
LocalDateTime nowMonday;
|
||||
LocalDateTime nowSunday;
|
||||
int j;
|
||||
LocalDateTime nowFirstDay, nowLastDay;
|
||||
LocalDateTime nowFirstDay;
|
||||
LocalDateTime nowLastDay;
|
||||
int k;
|
||||
if (timeType == null) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
List<StartTimeAndEndTime> timeList = new ArrayList<>(cycleNum);
|
||||
List<StartTimeAndEndTime> timeList = new ArrayList<StartTimeAndEndTime>(cycleNum);
|
||||
switch (timeType.intValue()) {
|
||||
case 0:
|
||||
nowStartTime = LocalDateTime.of(LocalDate.now(), LocalTime.MIN);
|
||||
nowEndTime = LocalDateTime.of(LocalDate.now(), LocalTime.MAX);
|
||||
timeList.add(
|
||||
new StartTimeAndEndTime(Long.valueOf(nowStartTime.toInstant(ZoneOffset.of("+8")).toEpochMilli()),
|
||||
Long.valueOf(nowEndTime.toInstant(ZoneOffset.of("+8")).toEpochMilli()),
|
||||
nowStartTime.getDayOfMonth() + "号"));
|
||||
timeList.add(new StartTimeAndEndTime(Long.valueOf(nowStartTime.toInstant(ZoneOffset.of("+8")).toEpochMilli()),
|
||||
Long.valueOf(nowEndTime.toInstant(ZoneOffset.of("+8")).toEpochMilli()),
|
||||
nowStartTime.getDayOfMonth() + "号"));
|
||||
for (i = 1; i < cycleNum; i++) {
|
||||
LocalDateTime firstDay = nowStartTime.minusDays(i);
|
||||
LocalDateTime lastDay = nowEndTime.minusDays(i);
|
||||
timeList.add(
|
||||
new StartTimeAndEndTime(Long.valueOf(firstDay.toInstant(ZoneOffset.of("+8")).toEpochMilli()),
|
||||
Long.valueOf(lastDay.toInstant(ZoneOffset.of("+8")).toEpochMilli()),
|
||||
firstDay.getDayOfMonth() + "号"));
|
||||
timeList.add(new StartTimeAndEndTime(Long.valueOf(firstDay.toInstant(ZoneOffset.of("+8")).toEpochMilli()),
|
||||
Long.valueOf(lastDay.toInstant(ZoneOffset.of("+8")).toEpochMilli()),
|
||||
firstDay.getDayOfMonth() + "号"));
|
||||
}
|
||||
break;
|
||||
case 1:
|
||||
nowMonday = LocalDateTime.of(LocalDate.now(), LocalTime.MIN).with(DayOfWeek.MONDAY);
|
||||
nowSunday = LocalDateTime.of(LocalDate.now(), LocalTime.MAX).with(DayOfWeek.SUNDAY);
|
||||
timeList
|
||||
.add(new StartTimeAndEndTime(Long.valueOf(nowMonday.toInstant(ZoneOffset.of("+8")).toEpochMilli()),
|
||||
Long.valueOf(nowSunday.toInstant(ZoneOffset.of("+8")).toEpochMilli()),
|
||||
nowMonday.get(WeekFields.ISO.weekOfWeekBasedYear()) + "周"));
|
||||
timeList.add(new StartTimeAndEndTime(Long.valueOf(nowMonday.toInstant(ZoneOffset.of("+8")).toEpochMilli()),
|
||||
Long.valueOf(nowSunday.toInstant(ZoneOffset.of("+8")).toEpochMilli()),
|
||||
nowMonday.get(WeekFields.ISO.weekOfWeekBasedYear()) + "周"));
|
||||
for (j = 1; j < cycleNum; j++) {
|
||||
LocalDateTime lastMonday = nowMonday.minusWeeks(j);
|
||||
LocalDateTime lastSunday = nowSunday.minusWeeks(j);
|
||||
timeList.add(
|
||||
new StartTimeAndEndTime(Long.valueOf(lastMonday.toInstant(ZoneOffset.of("+8")).toEpochMilli()),
|
||||
Long.valueOf(lastSunday.toInstant(ZoneOffset.of("+8")).toEpochMilli()),
|
||||
lastMonday.get(WeekFields.ISO.weekOfWeekBasedYear()) + "周"));
|
||||
timeList.add(new StartTimeAndEndTime(Long.valueOf(lastMonday.toInstant(ZoneOffset.of("+8")).toEpochMilli()),
|
||||
Long.valueOf(lastSunday.toInstant(ZoneOffset.of("+8")).toEpochMilli()),
|
||||
lastMonday.get(WeekFields.ISO.weekOfWeekBasedYear()) + "周"));
|
||||
}
|
||||
break;
|
||||
case 2:
|
||||
nowFirstDay =
|
||||
LocalDateTime.of(LocalDate.now(), LocalTime.MIN).with(TemporalAdjusters.firstDayOfMonth());
|
||||
nowLastDay = LocalDateTime.of(LocalDate.now(), LocalTime.MAX).with(TemporalAdjusters.lastDayOfMonth());
|
||||
timeList.add(
|
||||
new StartTimeAndEndTime(Long.valueOf(nowFirstDay.toInstant(ZoneOffset.of("+8")).toEpochMilli()),
|
||||
Long.valueOf(nowLastDay.toInstant(ZoneOffset.of("+8")).toEpochMilli()),
|
||||
nowFirstDay.get(ChronoField.MONTH_OF_YEAR) + "月"));
|
||||
nowLastDay =
|
||||
LocalDateTime.of(LocalDate.now(), LocalTime.MAX).with(TemporalAdjusters.lastDayOfMonth());
|
||||
timeList.add(new StartTimeAndEndTime(Long.valueOf(nowFirstDay.toInstant(ZoneOffset.of("+8")).toEpochMilli()),
|
||||
Long.valueOf(nowLastDay.toInstant(ZoneOffset.of("+8")).toEpochMilli()),
|
||||
nowFirstDay.get(ChronoField.MONTH_OF_YEAR) + "月"));
|
||||
for (k = 1; k < cycleNum; k++) {
|
||||
LocalDateTime firstDay = LocalDateTime.now().minusMonths(k)
|
||||
.with(TemporalAdjusters.firstDayOfMonth()).with(LocalTime.MIN);
|
||||
LocalDateTime firstDay =
|
||||
LocalDateTime.now().minusMonths(k).with(TemporalAdjusters.firstDayOfMonth()).with(LocalTime.MIN);
|
||||
LocalDateTime lastDay =
|
||||
LocalDateTime.now().minusMonths(k).with(TemporalAdjusters.lastDayOfMonth()).with(LocalTime.MAX);
|
||||
timeList.add(
|
||||
new StartTimeAndEndTime(Long.valueOf(firstDay.toInstant(ZoneOffset.of("+8")).toEpochMilli()),
|
||||
Long.valueOf(lastDay.toInstant(ZoneOffset.of("+8")).toEpochMilli()),
|
||||
firstDay.get(ChronoField.MONTH_OF_YEAR) + "月"));
|
||||
timeList.add(new StartTimeAndEndTime(Long.valueOf(firstDay.toInstant(ZoneOffset.of("+8")).toEpochMilli()),
|
||||
Long.valueOf(lastDay.toInstant(ZoneOffset.of("+8")).toEpochMilli()),
|
||||
firstDay.get(ChronoField.MONTH_OF_YEAR) + "月"));
|
||||
}
|
||||
break;
|
||||
}
|
||||
@@ -431,6 +431,6 @@ public class DateUtils {
|
||||
}
|
||||
|
||||
public static void main(String[] args) {
|
||||
System.out.println(">>>>>>>>>>>>>>" + dateToStampFormat("202002", "yyyyMM"));
|
||||
System.out.println(">>>>>>>>>>>>>>" + DateUtils.dateToStampFormat("202002", YYYYMM));
|
||||
}
|
||||
}
|
||||
|
||||
+5
-5
@@ -15,7 +15,7 @@ import org.slf4j.LoggerFactory;
|
||||
import org.springframework.util.Assert;
|
||||
|
||||
public class StringUtils {
|
||||
private static final Logger logger = LoggerFactory.getLogger(DateUtils.class);
|
||||
private static final Logger logger = LoggerFactory.getLogger(StringUtils.class);
|
||||
public static final String[] EMPTY_STRINGS = new String[0];
|
||||
public static final String EMPTY_STRING = "";
|
||||
private static final Pattern MAIL_PATTERN = Pattern.compile(".+@.+\\.[a-zA-Z]{2,}");
|
||||
@@ -1003,7 +1003,7 @@ public class StringUtils {
|
||||
}
|
||||
|
||||
public static String join(Object[] array) {
|
||||
return join(array, (String)null);
|
||||
return join(array, null);
|
||||
}
|
||||
|
||||
public static String join(Object[] array, char separator) {
|
||||
@@ -1853,7 +1853,7 @@ public class StringUtils {
|
||||
offset = str.length();
|
||||
}
|
||||
if (str.length() - offset < maxWidth - 3) {
|
||||
offset = str.length() - maxWidth - 3;
|
||||
offset = str.length() - (maxWidth - 3);
|
||||
}
|
||||
if (offset <= 4) {
|
||||
return str.substring(0, maxWidth - 3) + "...";
|
||||
@@ -1861,10 +1861,10 @@ public class StringUtils {
|
||||
if (maxWidth < 7) {
|
||||
maxWidth = 7;
|
||||
}
|
||||
if (offset + maxWidth - 3 < str.length()) {
|
||||
if (offset + (maxWidth - 3) < str.length()) {
|
||||
return "..." + abbreviate(str.substring(offset), maxWidth - 3);
|
||||
}
|
||||
return "..." + str.substring(str.length() - maxWidth - 3);
|
||||
return "..." + str.substring(str.length() - (maxWidth - 3));
|
||||
}
|
||||
|
||||
public static String difference(String str1, String str2) {
|
||||
|
||||
+1
@@ -7,6 +7,7 @@ import java.util.function.Function;
|
||||
import java.util.function.Predicate;
|
||||
|
||||
public class ToolUtil {
|
||||
|
||||
public static String generateUUID() {
|
||||
String uuid = UUID.randomUUID().toString();
|
||||
return uuid.replaceAll("-", "");
|
||||
|
||||
Reference in New Issue
Block a user