解决监控设备状态报错；预警规则配置增加创建时间，查询按时间倒序

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<OsmoticWarnRule> 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);
     }

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;
+
+
 }

src/main/java/com/gunshi/project/xyt/service/OsmoticWarnRuleService.java

@@ -31,7 +31,7 @@ public class OsmoticWarnRuleService extends ServiceImpl<OsmoticWarnRuleMapper, O
         if(StringUtils.isNotEmpty(warnRulePageSo.getStationCode())){
             queryWrapper.like(OsmoticWarnRule::getStationCode,warnRulePageSo.getStationCode());
         }
-        queryWrapper.orderByDesc(OsmoticWarnRule::getStatus);
+        queryWrapper.orderByDesc(OsmoticWarnRule::getStatus).orderByDesc(OsmoticWarnRule::getCreateTime);
         return this.page(warnRulePageSo.getPageSo().toPage(),queryWrapper);
     }
 }

src/main/java/com/gunshi/project/xyt/service/StStbprpBService.java

@@ -105,8 +105,8 @@ public class StStbprpBService extends ServiceImpl<StStbprpBMapper, StStbprpB>
                 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;
     }
 }