【fix】耳标加入到新表

huimv-eartag2-platform/huimv-eartag2-eartag/src/main/java/com/huimv/eartag2/eartag/service/impl/EartagServiceImpl.java

@@ -669,7 +669,9 @@ public class EartagServiceImpl implements IEartagService {
             dataEntity2.setAct1(Integer.parseInt(eartagJo.getString("act1")));
             dataEntity2.setSignal1(Integer.parseInt(eartagJo.getString("signal")));
             Date date = Convert.toDate(getAskTime(eartagJo.getString("askTime")));
-            dataEntity2.setAskTime(date);
+            Date date1 = new Date();
+            Timestamp timestamp = new Timestamp(date1.getTime());
+            dataEntity2.setAskTime(timestamp);
             dataEntity2.setOther(eartagJo.getString("other"));
             dataEntity2.setAddTime(nowTimestamp);
             dataEntity2.setCreateDate(todayDate);
@@ -690,7 +692,9 @@ public class EartagServiceImpl implements IEartagService {
             eartagData2.setAct1(Integer.parseInt(eartagJo.getString("act1")));
             eartagData2.setSignal1(Integer.parseInt(eartagJo.getString("signal")));
             Date date = Convert.toDate(getAskTime(eartagJo.getString("askTime")));
-            eartagData2.setAskTime(date);
+            Date date1 = new Date();
+            Timestamp timestamp = new Timestamp(date1.getTime());
+            eartagData2.setAskTime(timestamp);
             eartagData2.setOther(eartagJo.getString("other"));
             eartagData2.setCreateDate(todayDate);
             eartagData2.setFarmId(farmId);

huimv-eartag2-platform/huimv-eartag2-manage2/pom.xml

@@ -132,6 +132,11 @@
             <version>0.0.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.8.5</version>
+        </dependency>
         <!-- 基准测试 start -->
         <!--        <dependency>-->
         <!--            <groupId>org.openjdk.jmh</groupId>-->

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

@@ -3,6 +3,8 @@ package com.huimv.eartag2.manage2.pojo;
 import cn.hutool.core.date.DateTime;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
+
+import java.sql.Timestamp;
 import java.time.LocalDate;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
@@ -54,11 +56,11 @@ public class EartagData2 implements Serializable {
 
     private Integer signal1;
 
-    private Date askTime;
+    private Timestamp askTime;
 
     private String other;
 
-    private Date addTime;
+    private Timestamp addTime;
 
     private Date createDate;
 

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

@@ -3,6 +3,7 @@ package com.huimv.eartag2.manage2.service;
 import com.huimv.eartag2.manage2.pojo.EartagData2;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.text.ParseException;
 import java.util.List;
 
 /**
@@ -15,5 +16,5 @@ import java.util.List;
  */
 public interface IEartagData2Service extends IService<EartagData2> {
 
-    List<EartagData2> getEartagData(String earmark);
+    List<EartagData2> getEartagData(String earmark) throws ParseException;
 }

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

@@ -1,5 +1,6 @@
 package com.huimv.eartag2.manage2.service.impl;
 
+import cn.hutool.core.date.DateUnit;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.eartag2.manage2.pojo.EartagData2;
 import com.huimv.eartag2.manage2.mapper.EartagData2Mapper;
@@ -8,6 +9,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -25,10 +31,29 @@ public class EartagData2ServiceImpl extends ServiceImpl<EartagData2Mapper, Earta
     private EartagData2Mapper eartagData2Mapper;
 
     @Override
-    public List<EartagData2> getEartagData(String earmark) {
+    public List<EartagData2> getEartagData(String earmark) throws ParseException {
         QueryWrapper<EartagData2> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("earmark",earmark);
+        queryWrapper.eq("earmark", earmark);
         List<EartagData2> eartagData2s = eartagData2Mapper.selectList(queryWrapper);
-        return eartagData2s;
+
+        //查询出来五分钟之内的数据;
+
+        Calendar calendar = Calendar.getInstance();
+        //1-当前时间
+        Long currentTimestamps = System.currentTimeMillis();
+
+        //存五秒内的数据
+        ArrayList<EartagData2> eartagData2s1 = new ArrayList<>();
+        if (null != eartagData2s && eartagData2s.size() > 0) {
+            for (EartagData2 eartagData2 : eartagData2s) {
+                String addTime = eartagData2.getAddTime() + "";
+                calendar.setTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(addTime));
+                long timeInMillis = calendar.getTimeInMillis();
+                if (currentTimestamps - timeInMillis <= 5000) {
+                    eartagData2s1.add(eartagData2);
+                }
+            }
+        }
+        return eartagData2s1;
     }
 }