From 5f6d9f350bed3b91f4afc63d53cb179d5df6951a Mon Sep 17 00:00:00 2001 From: wany <13995595726@qq.com> Date: Fri, 19 Jul 2024 11:10:11 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=9B=91=E6=8E=A7=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E7=8A=B6=E6=80=81=E6=8A=A5=E9=94=99=EF=BC=9B=E9=A2=84?= =?UTF-8?q?=E8=AD=A6=E8=A7=84=E5=88=99=E9=85=8D=E7=BD=AE=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=EF=BC=8C=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8C=89=E6=97=B6=E9=97=B4=E5=80=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xyt/controller/OsmoticWarnRuleController.java | 2 ++ .../gunshi/project/xyt/model/OsmoticWarnRule.java | 12 ++++++++++++ .../project/xyt/service/OsmoticWarnRuleService.java | 2 +- .../gunshi/project/xyt/service/StStbprpBService.java | 4 ++-- 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/gunshi/project/xyt/controller/OsmoticWarnRuleController.java b/src/main/java/com/gunshi/project/xyt/controller/OsmoticWarnRuleController.java index 5b6c164..77ca9bd 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/OsmoticWarnRuleController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/OsmoticWarnRuleController.java @@ -17,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import java.util.Date; import java.util.List; /** * 描述: 预警规则配置表 @@ -37,6 +38,7 @@ public class OsmoticWarnRuleController { public R insert(@Validated(Insert.class) @RequestBody OsmoticWarnRule dto) { checkParam(dto); dto.setId(IdWorker.getId()); + dto.setCreateTime(new Date()); boolean result = service.save(dto); return R.ok(result ? dto : null); } diff --git a/src/main/java/com/gunshi/project/xyt/model/OsmoticWarnRule.java b/src/main/java/com/gunshi/project/xyt/model/OsmoticWarnRule.java index 6dcfa65..c68e74f 100644 --- a/src/main/java/com/gunshi/project/xyt/model/OsmoticWarnRule.java +++ b/src/main/java/com/gunshi/project/xyt/model/OsmoticWarnRule.java @@ -5,8 +5,10 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import com.gunshi.core.dateformat.DateFormatString; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; @@ -14,6 +16,7 @@ import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; +import java.util.Date; /** * 描述: 预警规则配置表 @@ -119,4 +122,13 @@ public class OsmoticWarnRule implements Serializable { @Schema(description="是否启用（0否 1是）") private BigDecimal status; + /** + * 创建时间 + */ + @TableField(value="create_time") + @Schema(description="创建时间") + @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") + private Date createTime; + + } \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/service/OsmoticWarnRuleService.java b/src/main/java/com/gunshi/project/xyt/service/OsmoticWarnRuleService.java index 13d157e..7249828 100644 --- a/src/main/java/com/gunshi/project/xyt/service/OsmoticWarnRuleService.java +++ b/src/main/java/com/gunshi/project/xyt/service/OsmoticWarnRuleService.java @@ -31,7 +31,7 @@ public class OsmoticWarnRuleService extends ServiceImpl onLineList.add(vo); } } - res.setOnline(onLineList.stream().sorted(Comparator.comparing(StStatusVo::getTm).reversed()).collect(Collectors.toList())); - res.setOffLine(offLineList.stream().sorted(Comparator.comparing(StStatusVo::getTm).reversed()).collect(Collectors.toList())); + res.setOnline(onLineList.stream().sorted(Comparator.comparing(StStatusVo::getTm,Comparator.nullsFirst(String::compareTo)).reversed()).collect(Collectors.toList())); + res.setOffLine(offLineList.stream().sorted(Comparator.comparing(StStatusVo::getTm,Comparator.nullsFirst(String::compareTo)).reversed()).collect(Collectors.toList())); return res; } }