生产阈值

huimv-admin/src/main/java/com/huimv/admin/entity/ProdWarningInfo.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -45,6 +47,7 @@ public class ProdWarningInfo implements Serializable {
      * 日期
      */
     @TableField("date")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
     private LocalDateTime date;
 
     @TableField("farm_id")

huimv-admin/src/main/java/com/huimv/admin/timer/ProdWarningTimer.java

@@ -31,6 +31,7 @@ public class ProdWarningTimer {
     @Autowired
     private IDisplayTypeService displayTypeService;
 
+//    @Scheduled(cron = "*/5 * * * * ?")
     @Scheduled(cron = "0 0 0 * * ?")
     private void action(){
         Integer type1 = 0;
@@ -129,7 +130,7 @@ public class ProdWarningTimer {
                 }
             }
             ProdProduction prodProduction = prodProductionMapper.selectOne(new QueryWrapper<ProdProduction>().lambda()
-                    .eq(ProdProduction::getFarmId, farmId));
+                    .eq(ProdProduction::getFarmId, farmId).orderByDesc(ProdProduction::getCreatTime).last("LIMIT 1"));
             if (ObjectUtil.isNotEmpty(prodProduction)){
                 ProdProductionThreshold prodProductionThreshold = prodProductionThresholdMapper.selectOne(new QueryWrapper<ProdProductionThreshold>().lambda().eq(ProdProductionThreshold::getFarmId,farmId));
                 if (ObjectUtil.isNotEmpty(prodProductionThreshold)){