From 89800665b27cf49b5e5bdb034df9d165c7382637 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期三, 25 十二月 2024 18:04:21 +0800
Subject: [PATCH] 调度记录查看
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/controller/admin/StScheduleSchemeController.java | 2 +-
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/vo/StScheduleRecordPageReqVO.java | 11 +++++++++--
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/dao/StScheduleRecordDao.java | 1 +
pom.xml | 4 ++--
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/controller/admin/StScheduleRecordController.java | 2 +-
5 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/controller/admin/StScheduleRecordController.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/controller/admin/StScheduleRecordController.java
index 8995232..f2c334a 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/controller/admin/StScheduleRecordController.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/controller/admin/StScheduleRecordController.java
@@ -46,7 +46,7 @@
@GetMapping("/page")
@Operation(summary = "获得调度记录分页")
@PreAuthorize("@ss.hasPermission('sche:record:query')")
- public CommonResult<PageResult<StScheduleRecordRespVO>> getTenantPage(@Valid StScheduleRecordPageReqVO pageVO) {
+ public CommonResult<PageResult<StScheduleRecordRespVO>> getPage(@Valid StScheduleRecordPageReqVO pageVO) {
PageResult<StScheduleRecordEntity> pageResult = stScheduleRecordService.page(pageVO);
return success(BeanUtils.toBean(pageResult, StScheduleRecordRespVO.class));
}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/controller/admin/StScheduleSchemeController.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/controller/admin/StScheduleSchemeController.java
index 12da0e3..139dd39 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/controller/admin/StScheduleSchemeController.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/controller/admin/StScheduleSchemeController.java
@@ -76,7 +76,7 @@
@GetMapping("/page")
@Operation(summary = "获得调度方案分页")
@PreAuthorize("@ss.hasPermission('sche:scheme:query')")
- public CommonResult<PageResult<StScheduleSchemeRespVO>> getTenantPage(@Valid StScheduleSchemePageReqVO pageVO) {
+ public CommonResult<PageResult<StScheduleSchemeRespVO>> getPage(@Valid StScheduleSchemePageReqVO pageVO) {
PageResult<StScheduleSchemeEntity> pageResult = stScheduleSchemeService.page(pageVO);
return success(BeanUtils.toBean(pageResult, StScheduleSchemeRespVO.class));
}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/dao/StScheduleRecordDao.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/dao/StScheduleRecordDao.java
index f064cfa..2c0cd2f 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/dao/StScheduleRecordDao.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/dao/StScheduleRecordDao.java
@@ -19,6 +19,7 @@
default PageResult<StScheduleRecordEntity> selectPage(StScheduleRecordPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<StScheduleRecordEntity>()
+ .eqIfPresent(StScheduleRecordEntity::getSchemeId, reqVO.getSchemeId())
.likeIfPresent(StScheduleRecordEntity::getModelName, reqVO.getModelName())
.geIfPresent(StScheduleRecordEntity::getScheduleTime, reqVO.getStartTime())
.leIfPresent(StScheduleRecordEntity::getScheduleTime, reqVO.getEndTime())
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/vo/StScheduleRecordPageReqVO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/vo/StScheduleRecordPageReqVO.java
index ac2adf8..9e61c1d 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/vo/StScheduleRecordPageReqVO.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/vo/StScheduleRecordPageReqVO.java
@@ -1,12 +1,17 @@
package com.iailab.module.model.mcs.sche.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.iailab.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
import java.util.Date;
+
+import static com.iailab.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
/**
* @author PanZhibao
@@ -26,8 +31,10 @@
private String modelName;
@Schema(description = "开始时间")
- private Date startTime;
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+ private LocalDateTime startTime;
@Schema(description = "结束时间")
- private Date endTime;
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+ private LocalDateTime endTime;
}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 5914503..9e21489 100644
--- a/pom.xml
+++ b/pom.xml
@@ -122,7 +122,7 @@
<nacos.metadata.version>1.0.0</nacos.metadata.version>
<log.path>D:\DLUT\iailab-plat</log.path>
<logstash.address>127.0.0.1:4560</logstash.address>
- <deploy.server>172.16.216.132</deploy.server>
+ <deploy.server>127.0.0.1</deploy.server>
</properties>
<activation>
<!-- 默认环境 -->
@@ -156,7 +156,7 @@
<nacos.username>nacos</nacos.username>
<nacos.password>nacos</nacos.password>
<nacos.metadata.version>1.0.0</nacos.metadata.version>
- <log.path>D:\iailab</log.path>
+ <log.path>D:\iailab\logs</log.path>
<logstash.address>127.0.0.1:4560</logstash.address>
<deploy.server>10.88.4.131</deploy.server>
</properties>
--
Gitblit v1.9.3