فهرست منبع

完成预警管理(增删改查)

zhuoning 2 سال پیش
والد
کامیت
890466025f

+ 3 - 0
huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/entity/WarningInfo.java

@@ -5,6 +5,8 @@ import java.util.Date;
 import com.baomidou.mybatisplus.annotation.Version;
 import com.baomidou.mybatisplus.annotation.Version;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode;
 
 
@@ -29,6 +31,7 @@ public class WarningInfo implements Serializable {
 
 
     private String content;
     private String content;
 
 
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date addDate;
     private Date addDate;
 
 
     private String addPeople;
     private String addPeople;

+ 3 - 2
huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/service/impl/WarningInfoServiceImpl.java

@@ -97,11 +97,12 @@ public class WarningInfoServiceImpl extends ServiceImpl<WarningInfoMapper, Warni
         if (StringUtils.isBlank(paramsMap.get("pageSize") + "")) {
         if (StringUtils.isBlank(paramsMap.get("pageSize") + "")) {
             pageSize = paramsMap.get("pageSize") + "";
             pageSize = paramsMap.get("pageSize") + "";
         }
         }
-                //
+        //
         String farmCode = paramsMap.get("farmCode");
         String farmCode = paramsMap.get("farmCode");
         QueryWrapper<WarningInfo> queryWrapper = new QueryWrapper<>();
         QueryWrapper<WarningInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_code",farmCode);
         queryWrapper.eq("farm_code",farmCode);
-        queryWrapper.orderByDesc("add_date");
+        queryWrapper.orderByDesc("add_date").orderByDesc("id");
+        queryWrapper.last("LIMIT 1");
         Page<WarningInfo> page = new Page<>(Integer.parseInt(pageNo), Integer.parseInt(pageSize));
         Page<WarningInfo> page = new Page<>(Integer.parseInt(pageNo), Integer.parseInt(pageSize));
         return new Result(ResultCode.SUCCESS, warningInfoMapper.selectPage(page, queryWrapper));
         return new Result(ResultCode.SUCCESS, warningInfoMapper.selectPage(page, queryWrapper));
     }
     }

+ 2 - 2
huimv-env-platform/huimv-env-produce/src/main/resources/application.properties

@@ -1,5 +1,5 @@
-#spring.profiles.active=dev
-spring.profiles.active=prod
+spring.profiles.active=dev
+#spring.profiles.active=prod
 
 
 # mysql:/cache:
 # mysql:/cache:
 device.online.access_mode=mysql
 device.online.access_mode=mysql