3.3.3 update

teachcloud-common/src/main/java/com/qmth/teachcloud/common/util/ConvertUtil.java

@@ -89,33 +89,37 @@ public class ConvertUtil {
      * @return 键值对
      */
     public static Map<String, Object> analyzeDateAndTime(Long startTime, Long endTime) {
-        String tmpDateStart;
-        String tmpDateEnd;
-        String tmpTimeStart;
-        String tmpTimeEnd;
-        String date;
-        String time;
-
         Map<String, Object> map = new HashMap<>();
+        if (startTime != null && startTime > 0 && endTime != null && endTime > 0) {
+            String tmpDateStart;
+            String tmpDateEnd;
+            String tmpTimeStart;
+            String tmpTimeEnd;
+            String date;
+            String time;
+
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTime(new Date(startTime));
+            tmpDateStart = (new SimpleDateFormat("yyyy-MM-dd")).format(calendar.getTime());
+            tmpTimeStart = (new SimpleDateFormat("HH:mm:ss")).format(calendar.getTime());
+
+            calendar.setTime(new Date(endTime));
+            tmpDateEnd = (new SimpleDateFormat("yyyy-MM-dd")).format(calendar.getTime());
+            tmpTimeEnd = (new SimpleDateFormat("HH:mm:ss")).format(calendar.getTime());
+
+            if (!tmpDateStart.equals(tmpDateEnd)) {
+                throw ExceptionResultEnum.ERROR.exception("开始时间和结束时间不在同一天");
+            }
 
-        Calendar calendar = Calendar.getInstance();
-        calendar.setTime(new Date(startTime));
-        tmpDateStart = (new SimpleDateFormat("yyyy-MM-dd")).format(calendar.getTime());
-        tmpTimeStart = (new SimpleDateFormat("HH:mm:ss")).format(calendar.getTime());
-
-        calendar.setTime(new Date(endTime));
-        tmpDateEnd = (new SimpleDateFormat("yyyy-MM-dd")).format(calendar.getTime());
-        tmpTimeEnd = (new SimpleDateFormat("HH:mm:ss")).format(calendar.getTime());
-
-        if (!tmpDateStart.equals(tmpDateEnd)) {
-            throw ExceptionResultEnum.ERROR.exception("开始时间和结束时间不在同一天");
+            date = tmpDateStart;
+            time = tmpTimeStart + " - " + tmpTimeEnd;
+            map.put("date", date);
+            map.put("time", time);
+        } else {
+            map.put("date", "-");
+            map.put("time", "-");
         }
 
-        date = tmpDateStart;
-        time = tmpTimeStart + " - " + tmpTimeEnd;
-        map.put("date", date);
-        map.put("time", time);
-
         return map;
     }
 
@@ -257,18 +261,18 @@ public class ConvertUtil {
         DataType dataType = getDataType(type);
 
         switch (dataType) {
-        case INT:
-            return parseInt(value);
-        case DOUBLE:
-            return parseDouble(value);
-        case LONG:
-            return parseLong(value);
-        case FLOAT:
-            return parseFloat(value);
-        case DATE:
-            return parseDate(value);
-        default:
-            return value;
+            case INT:
+                return parseInt(value);
+            case DOUBLE:
+                return parseDouble(value);
+            case LONG:
+                return parseLong(value);
+            case FLOAT:
+                return parseFloat(value);
+            case DATE:
+                return parseDate(value);
+            default:
+                return value;
         }
     }
 
@@ -280,21 +284,21 @@ public class ConvertUtil {
      */
     private static DataType getDataType(String type) {
         switch (type.toLowerCase()) {
-        case "int":
-        case "integer":
-            return DataType.INT;
-        case "double":
-            return DataType.DOUBLE;
-        case "long":
-            return DataType.LONG;
-        case "float":
-            return DataType.FLOAT;
-        case "date":
-            return DataType.DATE;
-        case "string":
-            return DataType.STRING;
-        default:
-            return DataType.valueOf(type); // 对于未知类型，尝试直接匹配枚举值
+            case "int":
+            case "integer":
+                return DataType.INT;
+            case "double":
+                return DataType.DOUBLE;
+            case "long":
+                return DataType.LONG;
+            case "float":
+                return DataType.FLOAT;
+            case "date":
+                return DataType.DATE;
+            case "string":
+                return DataType.STRING;
+            default:
+                return DataType.valueOf(type); // 对于未知类型，尝试直接匹配枚举值
         }
     }