Newspaper 2 éve
szülő
commit
edcbd2e20d

+ 3 - 1
src/main/java/com/huimv/admin/config/InterceptorConfig.java

@@ -21,6 +21,8 @@ public class InterceptorConfig implements WebMvcConfigurer {
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(jwtInterceptor()).
-                excludePathPatterns("/*/my/*");
+                excludePathPatterns("/*/my/*").
+                excludePathPatterns(("/env-electricity/testList")).
+                excludePathPatterns("/env-water/testList");
     }
 }

+ 10 - 0
src/main/java/com/huimv/admin/controller/EnvElectricityController.java

@@ -1,11 +1,16 @@
 package com.huimv.admin.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.common.utils.ResultCode;
+import com.huimv.admin.entity.EnvElectricity;
+import com.huimv.admin.entity.EnvWater;
 import com.huimv.admin.service.IEnvElectricityService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -28,4 +33,9 @@ public class EnvElectricityController {
     public Result listElectricity(@RequestBody Map<String, String> paramsMap){
         return envElectricityService.listElectricity(paramsMap);
     }
+    @PostMapping("/testList")
+    public Result testList(){
+        List<EnvElectricity> envElectricities = envElectricityService.list(new QueryWrapper<EnvElectricity>().eq("farm_Id", 27).orderByDesc("update_time").last("limit 10"));
+        return new Result(ResultCode.SUCCESS,envElectricities);
+    }
 }

+ 9 - 0
src/main/java/com/huimv/admin/controller/EnvWaterController.java

@@ -1,11 +1,15 @@
 package com.huimv.admin.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.common.utils.ResultCode;
+import com.huimv.admin.entity.EnvWater;
 import com.huimv.admin.service.IEnvWaterService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -28,4 +32,9 @@ public class EnvWaterController {
     public Result listWater(@RequestBody Map<String, String> paramsMap){
         return envWaterService.listWater(paramsMap);
     }
+    @PostMapping("/testList")
+    public Result testList(){
+        List<EnvWater> envWaters = envWaterService.list(new QueryWrapper<EnvWater>().eq("farm_Id", 27).orderByDesc("update_time").last("limit 10"));
+        return new Result(ResultCode.SUCCESS,envWaters);
+    }
 }

+ 3 - 0
src/main/java/com/huimv/admin/entity/EnvElectricity.java

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import java.math.BigDecimal;
 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 EnvElectricity implements Serializable {
 
     private LocalDateTime askTime;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime updateTime;
 
     private Integer farmId;

+ 1 - 1
src/main/java/com/huimv/admin/entity/EnvWater.java

@@ -50,7 +50,7 @@ public class EnvWater implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime askTime;
 
-
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime updateTime;
 
     private Integer farmId;