潘志宝
2024-12-25 89800665b27cf49b5e5bdb034df9d165c7382637
调度记录查看
已修改5个文件
20 ■■■■ 文件已修改
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/controller/admin/StScheduleRecordController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/controller/admin/StScheduleSchemeController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/dao/StScheduleRecordDao.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/vo/StScheduleRecordPageReqVO.java 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pom.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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));
    }
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));
    }
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())
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;
}
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>