Merge branch 'master_dev' into 202304171

@@ -7,6 +7,8 @@ import org.quartz.SchedulerException;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
+import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
 import org.thingsboard.server.common.data.yunteng.dto.SysJobLogDTO;
 import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
@@ -15,15 +17,13 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.TkSysJobLogService;
 
+import java.sql.Timestamp;
 import java.util.HashMap;
 
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.ORDER_TYPE;
 
-/**
- * 调度日志操作处理
- *
- */
+/** 调度日志操作处理 */
 @RestController
 @RequestMapping("api/yt/monitor/job_log")
 @RequiredArgsConstructor
@@ -44,6 +44,8 @@ public class SysJobLogController extends BaseController {
       @RequestParam(value = "jobGroup", required = false) String jobGroup,
       @RequestParam(value = "status", required = false) Integer status,
       @RequestParam(value = "jobId", required = false) String jobId,
+      @RequestParam(value = "startTime", required = false) Long startTime,
+      @RequestParam(value = "endTime", required = false) Long endTime,
       @RequestParam(value = ORDER_FILED, required = false) String orderBy,
       @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType)
       throws ThingsboardException {
@@ -58,6 +60,15 @@ public class SysJobLogController extends BaseController {
     if (orderType != null) {
       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());
+    }
     return tkSysJobLogService.sysJobLogPageByJobId(queryMap);
   }
 
@@ -70,9 +81,10 @@ public class SysJobLogController extends BaseController {
 
   @GetMapping("/get/{jobId}/{id}")
   @ApiOperation(value = "获取详情")
-  public ResponseResult<SysJobLogDTO> getSysJobLog(@PathVariable("jobId") String jobId,@PathVariable("id") String id)
-          throws SchedulerException {
-    return ResponseResult.success(tkSysJobLogService.findSysJobLogById(jobId,id));
+  public ResponseResult<SysJobLogDTO> getSysJobLog(
+      @PathVariable("jobId") String jobId, @PathVariable("id") String id)
+      throws SchedulerException {
+    return ResponseResult.success(tkSysJobLogService.findSysJobLogById(jobId, id));
   }
 
   @PostMapping("/clean")

@@ -19,6 +19,8 @@ import org.thingsboard.server.dao.yunteng.entities.SysJobLogEntity;
 import org.thingsboard.server.dao.yunteng.mapper.SysJobLogMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.TkSysJobLogService;
+
+import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.util.Map;
 import java.util.Optional;
@@ -37,6 +39,8 @@ public class SysJobLogServiceImpl extends AbstractBaseService<SysJobLogMapper, S
     String jobId = queryMap.get("jobId") != null ? queryMap.get("jobId").toString() : null;
     Integer status =
         queryMap.get("status") != null ? Integer.valueOf(queryMap.get("status").toString()) : null;
+    LocalDateTime startTime = (LocalDateTime) queryMap.get("startTime");
+    LocalDateTime endTime = (LocalDateTime) queryMap.get("endTime");
     IPage<SysJobLogEntity> sysJobLogIPage =
         baseMapper.selectPage(
             getPage(queryMap, "start_time", false),
@@ -44,7 +48,12 @@ public class SysJobLogServiceImpl extends AbstractBaseService<SysJobLogMapper, S
                 .eq(StringUtils.isNotEmpty(jobId), SysJobLogEntity::getJobId, jobId)
                 .like(StringUtils.isNotEmpty(jobName), SysJobLogEntity::getJobName, jobName)
                 .eq(StringUtils.isNotEmpty(jobGroup), SysJobLogEntity::getJobGroup, jobGroup)
-                .eq(null != status, SysJobLogEntity::getStatus, status));
+                .eq(null != status, SysJobLogEntity::getStatus, status)
+                .and(
+                    null != startTime && null != endTime,
+                    qr ->
+                        qr.ge(SysJobLogEntity::getStartTime, startTime)
+                            .le(SysJobLogEntity::getStartTime, endTime)));
     return getPageData(sysJobLogIPage, SysJobLogDTO.class);
   }