perf: 抽离controller的startTime、endTime验证到BaseController

@@ -110,6 +110,7 @@ import org.thingsboard.server.service.telemetry.TelemetrySubscriptionService;
 
 
 import javax.mail.MessagingException;
 import javax.mail.MessagingException;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
+import java.sql.Timestamp;
 import java.util.*;
 import java.util.*;
 
 
 import static org.thingsboard.server.controller.ControllerConstants.DEFAULT_PAGE_SIZE;
 import static org.thingsboard.server.controller.ControllerConstants.DEFAULT_PAGE_SIZE;
@@ -978,4 +979,16 @@ public abstract class BaseController {
             dto.setPublicId(publicCustomerId);
             dto.setPublicId(publicCustomerId);
         }
         }
     }
     }
+
+    protected void checkTimeAndPut(Map<String, Object> queryMap,Long startTime,Long endTime)
+    {
+        if (null != endTime && null != startTime) {
+            if (startTime > endTime) {
+                throw new TkDataValidationException(
+                        ErrorMessage.START_TIME_NOT_MORE_THAN_END_TIME.getMessage());
+            }
+            queryMap.put("startTime", new Timestamp(startTime).toLocalDateTime());
+            queryMap.put("endTime", new Timestamp(endTime).toLocalDateTime());
+        }
+    }
 }
 }

@@ -61,14 +61,7 @@ public class SysJobLogController extends BaseController {
       queryMap.put(ORDER_TYPE, orderType.name());
       queryMap.put(ORDER_TYPE, orderType.name());
     }
     }
 
 
-    if (null != startTime && null != endTime) {
-      if (startTime > endTime) {
-        throw new TkDataValidationException(
-            ErrorMessage.START_TIME_NOT_MORE_THAN_END_TIME.getMessage());
-      }
-      queryMap.put("startTime", new Timestamp(startTime).toLocalDateTime());
-      queryMap.put("endTime", new Timestamp(endTime).toLocalDateTime());
-    }
+    checkTimeAndPut(queryMap,startTime,endTime);
     return tkSysJobLogService.sysJobLogPageByJobId(queryMap);
     return tkSysJobLogService.sysJobLogPageByJobId(queryMap);
   }
   }
 
 

@@ -136,14 +136,7 @@ public class TkDeviceScriptController extends BaseController {
         if (!StringUtils.isEmpty(name)) {
         if (!StringUtils.isEmpty(name)) {
             queryMap.put("name", name);
             queryMap.put("name", name);
         }
         }
-        if (null != startTime && null != endTime) {
-            if (startTime > endTime) {
-                throw new TkDataValidationException(
-                        ErrorMessage.START_TIME_NOT_MORE_THAN_END_TIME.getMessage());
-            }
-            queryMap.put("startTime", new Timestamp(startTime).toLocalDateTime());
-            queryMap.put("endTime", new Timestamp(endTime).toLocalDateTime());
-        }
+        checkTimeAndPut(queryMap,startTime,endTime);
 
 
         return scriptService.page(queryMap, getCurrentUser().isTenantAdmin());
         return scriptService.page(queryMap, getCurrentUser().isTenantAdmin());
     }
     }

@@ -54,14 +54,7 @@ public class TkDeviceStateLogController extends BaseController {
     queryMap.put("organizationName", organizationName);
     queryMap.put("organizationName", organizationName);
     queryMap.put("deviceProfileName", deviceProfileName);
     queryMap.put("deviceProfileName", deviceProfileName);
     queryMap.put("status", status);
     queryMap.put("status", status);
-    if (null != startTime && null != endTime) {
-      if (startTime > endTime) {
-        throw new TkDataValidationException(
-            ErrorMessage.START_TIME_NOT_MORE_THAN_END_TIME.getMessage());
-      }
-      queryMap.put("startTime", new Timestamp(startTime).toLocalDateTime());
-      queryMap.put("endTime", new Timestamp(endTime).toLocalDateTime());
-    }
+    checkTimeAndPut(queryMap,startTime,endTime);
     queryMap.put(PAGE_SIZE, pageSize);
     queryMap.put(PAGE_SIZE, pageSize);
     queryMap.put(PAGE, page);
     queryMap.put(PAGE, page);
     queryMap.put(ORDER_FILED, orderBy);
     queryMap.put(ORDER_FILED, orderBy);

@@ -64,14 +64,7 @@ public class TkReportFormConfigController extends BaseController {
       queryMap.put(ORDER_TYPE, orderType.name());
       queryMap.put(ORDER_TYPE, orderType.name());
     }
     }
     queryMap.put("userId",getCurrentUser().getCurrentUserId());
     queryMap.put("userId",getCurrentUser().getCurrentUserId());
-    if (null != startTime && null != endTime) {
-      if (startTime > endTime) {
-        throw new TkDataValidationException(
-            ErrorMessage.START_TIME_NOT_MORE_THAN_END_TIME.getMessage());
-      }
-      queryMap.put("startTime", new Timestamp(startTime).toLocalDateTime());
-      queryMap.put("endTime", new Timestamp(endTime).toLocalDateTime());
-    }
+    checkTimeAndPut(queryMap,startTime,endTime);
     return reportFormConfigService.page(queryMap, getCurrentUser().isTenantAdmin());
     return reportFormConfigService.page(queryMap, getCurrentUser().isTenantAdmin());
   }
   }
 
 

@@ -57,15 +57,7 @@ public class TkReportGenerateRecordController extends BaseController {
       throws ThingsboardException {
       throws ThingsboardException {
 
 
     HashMap<String, Object> queryMap = new HashMap<>();
     HashMap<String, Object> queryMap = new HashMap<>();
-    if (null != startTime && null != endTime) {
-      if (startTime > endTime) {
-        throw new TkDataValidationException(
-            ErrorMessage.START_TIME_NOT_MORE_THAN_END_TIME.getMessage());
-      }
-
-      queryMap.put("startTime", new Timestamp(startTime).toLocalDateTime());
-      queryMap.put("endTime", new Timestamp(endTime).toLocalDateTime());
-    }
+    checkTimeAndPut(queryMap,startTime,endTime);
     queryMap.put(PAGE_SIZE, pageSize);
     queryMap.put(PAGE_SIZE, pageSize);
     queryMap.put(PAGE, page);
     queryMap.put(PAGE, page);
     queryMap.put(ORDER_FILED, orderBy);
     queryMap.put(ORDER_FILED, orderBy);