【feat】新增获取耳标温度，运动量曲线接口

huimv-eartag2-platform/gateway/src/main/resources/application-dev.yml

@@ -14,6 +14,12 @@ spring:
             - Path=/admin/**
           filters:
             - StripPrefix=1
+        - id: manage2
+          uri: http://127.0.0.1:8099
+          predicates:
+            - Path=/manage2/**
+          filters:
+            - StripPrefix=1
 
 logging:
   level:

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/controller/EartagDataController.java

@@ -1,10 +1,18 @@
 package com.huimv.eartag2.manage2.controller;
 
 
+import com.huimv.eartag2.common.utils.Result;
+import com.huimv.eartag2.manage2.pojo.EartagData;
+import com.huimv.eartag2.manage2.service.EartagDataService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Map;
+
 /**
  * <p>
  *  前端控制器
@@ -14,8 +22,15 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2022-07-18
  */
 @RestController
-@RequestMapping("/eartag-data")
+@RequestMapping("/eartagData")
 public class EartagDataController {
+    @Autowired
+    private EartagDataService eartagDataService;
+
+    @PostMapping("getEnvByTime")
+    public Result getEnvByTime(@RequestBody Map<String,String> map){
+       return eartagDataService.getEnvByTime(map);
+    }
 
 }
 

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/pojo/EartagData.java

@@ -5,6 +5,8 @@ import java.util.Date;
 import com.baomidou.mybatisplus.annotation.Version;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -47,16 +49,17 @@ public class EartagData implements Serializable {
 
     private Integer signal1;
 
-    private String askTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date askTime;
 
     private String other;
-
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date addTime;
-
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date createDate;
 
     private String farmId;
-
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date askDate;
 
 

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/service/EartagDataService.java

@@ -1,8 +1,11 @@
 package com.huimv.eartag2.manage2.service;
 
+import com.huimv.eartag2.common.utils.Result;
 import com.huimv.eartag2.manage2.pojo.EartagData;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.Map;
+
 /**
  * <p>
  *  服务类
@@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface EartagDataService extends IService<EartagData> {
 
+    Result getEnvByTime(Map<String, String> map);
 }

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/service/impl/EartagDataServiceImpl.java

@@ -1,11 +1,20 @@
 package com.huimv.eartag2.manage2.service.impl;
 
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.huimv.eartag2.common.utils.Result;
+import com.huimv.eartag2.common.utils.ResultCode;
 import com.huimv.eartag2.manage2.pojo.EartagData;
 import com.huimv.eartag2.manage2.mapper.EartagDataMapper;
 import com.huimv.eartag2.manage2.service.EartagDataService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +26,26 @@ import org.springframework.stereotype.Service;
 @Service
 public class EartagDataServiceImpl extends ServiceImpl<EartagDataMapper, EartagData> implements EartagDataService {
 
+    @Override
+    public Result getEnvByTime(Map<String, String> map) {
+        String earmark = map.get("earmark");
+        String startDate = map.get("startDate");
+        String endDate = map.get("endDate");
+        Date now = new Date();
+
+        if (StringUtils.isBlank(earmark)){
+            return new Result(10001,"请选择耳标",false);
+        }
+        QueryWrapper<EartagData> wrapper = new QueryWrapper<>();
+        wrapper.eq("earmark",earmark);
+        if (StringUtils.isBlank(startDate)){
+            wrapper.ge("ask_time", DateUtil.beginOfDay(now));
+        }else {
+            wrapper.between("ask_time",startDate,endDate);
+        }
+        wrapper.orderByDesc("ask_time");
+        List<EartagData> list = this.list(wrapper);
+
+        return new Result(ResultCode.SUCCESS,list);
+    }
 }

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/resources/application-dev2.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8096
+  port: 8099
 spring:
   application:
     name: huimv-eartag2-manage