环控修改

src/main/java/com/huimv/admin/config/ApiPrefixAutoConfiguration.java

@@ -1,16 +1,16 @@
-package com.huimv.admin.config;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.servlet.config.annotation.PathMatchConfigurer;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-@Configuration
-public class ApiPrefixAutoConfiguration implements WebMvcConfigurer {
-
-    @Override
-    public void configurePathMatch(PathMatchConfigurer configurer) {
-        configurer.addPathPrefix("/newEnv",  c -> c.isAnnotationPresent(RestController.class));
-    }
-
-}
+//package com.huimv.admin.config;
+//
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.web.bind.annotation.RestController;
+//import org.springframework.web.servlet.config.annotation.PathMatchConfigurer;
+//import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+//
+//@Configuration
+//public class ApiPrefixAutoConfiguration implements WebMvcConfigurer {
+//
+// /*   @Override
+//    public void configurePathMatch(PathMatchConfigurer configurer) {
+//        configurer.addPathPrefix("/newEnv",  c -> c.isAnnotationPresent(RestController.class));
+//    }*/
+//
+//}

src/main/java/com/huimv/admin/entity/EnvWarning.java

@@ -6,6 +6,7 @@ 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;
@@ -38,6 +39,7 @@ public class EnvWarning implements Serializable {
 
     private String chipCode;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime updateTime;
 
     private Integer farmId;

src/main/java/com/huimv/admin/service/impl/BasePigpenServiceImpl.java

@@ -447,7 +447,8 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
             pageSize = "20";
         }
         QueryWrapper<EnvWarning> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("farm_id", farmId).eq("unit_id", unitId);
+        queryWrapper.eq("farm_id", farmId).eq("unit_id", unitId).eq("warning_type",8)
+                .orderByDesc("update_time");
         Page<EnvWarning> page = new Page(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         Page<EnvWarning> envWarningPage = envWarningMapper.selectPage(page, queryWrapper);
         return new Result(ResultCode.SUCCESS, envWarningPage);

src/main/java/com/huimv/admin/service/impl/EnvWarningServiceImpl.java

@@ -18,6 +18,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -77,7 +78,9 @@ public class EnvWarningServiceImpl extends ServiceImpl<EnvWarningMapper, EnvWarn
         if (ObjectUtil.isNull(gap)){
             gap = 0.0;
         }
-        BigDecimal bg = new BigDecimal(gap).setScale(2, RoundingMode.UP);
+//        BigDecimal bg = new BigDecimal(gap).setScale(2, RoundingMode.UP);
+        DecimalFormat def = new DecimalFormat("#.00");
+        String bg = def.format(gap);
         resultMap.put("gap",bg);
         return new Result(ResultCode.SUCCESS,resultMap);
     }