【fix】加入新的耳标表中

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

@@ -1,5 +1,7 @@
 package com.huimv.eartag2.eartag.service.impl;
 
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.date.DateTime;
 import com.alibaba.fastjson.JSONObject;
 import com.huimv.eartag2.common.dao.entity.*;
 import com.huimv.eartag2.common.dao.repo.*;
@@ -8,6 +10,9 @@ import com.huimv.eartag2.common.utils.DateUtil;
 import com.huimv.eartag2.eartag.service.ICacheService;
 import com.huimv.eartag2.eartag.service.IDeviceService;
 import com.huimv.eartag2.eartag.service.IEartagService;
+import com.huimv.eartag2.manage2.mapper.EartagData2Mapper;
+import com.huimv.eartag2.manage2.pojo.EartagData2;
+import com.huimv.eartag2.manage2.service.IEartagData2Service;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -35,7 +40,10 @@ import java.util.Map;
 @Slf4j
 public class EartagServiceImpl implements IEartagService {
     @Resource
-    private EartagDataRepo2 eartagDataRepo2;
+    private IEartagData2Service eartagData2Service;
+
+    @Resource
+    private  EartagData2Mapper eartagData2Mapper;
     @Autowired
     private RedisTemplate redisTemplate;
     @Autowired
@@ -645,10 +653,10 @@ public class EartagServiceImpl implements IEartagService {
         DateUtil dateUtil = new DateUtil();
         //判断近五分钟内是否有耳标数据 先获取耳标号
         String earmark = eartagJo.getString("earmark");
-        EartagDataEntity2 eartagFlowByEarmark = eartagDataRepo2.getEartagFlowByEarmark(earmark);
-        if (null == eartagFlowByEarmark){
+        List<EartagData2> eartagFlowByEarmark = eartagData2Service.getEartagData(earmark);
+        if (null == eartagFlowByEarmark ||eartagFlowByEarmark.size() == 0 ){
             //插数据到数据库里
-            EartagDataEntity2 dataEntity2 = new EartagDataEntity2();
+            EartagData2 dataEntity2 = new EartagData2();
             dataEntity2.setCmdHeader(eartagJo.getString("cmdHeader"));
             dataEntity2.setDevice(eartagJo.getString("device"));
             dataEntity2.setEarmark(eartagJo.getString("earmark"));
@@ -660,31 +668,34 @@ public class EartagServiceImpl implements IEartagService {
             dataEntity2.setAct(Integer.parseInt(eartagJo.getString("act")));
             dataEntity2.setAct1(Integer.parseInt(eartagJo.getString("act1")));
             dataEntity2.setSignal1(Integer.parseInt(eartagJo.getString("signal")));
-            dataEntity2.setAskTime(getAskTime(eartagJo.getString("askTime")));
+            Date date = Convert.toDate(getAskTime(eartagJo.getString("askTime")));
+            dataEntity2.setAskTime(date);
             dataEntity2.setOther(eartagJo.getString("other"));
             dataEntity2.setAddTime(nowTimestamp);
             dataEntity2.setCreateDate(todayDate);
             dataEntity2.setFarmId(farmId);
             dataEntity2.setAskDate(new java.sql.Date(dateUtil.parseDate(getAskDate(eartagJo.getString("askTime"))).getTime()));
-            eartagDataRepo2.saveAndFlush(dataEntity2);
+            eartagData2Mapper.insert(dataEntity2);
         }else {
-            eartagFlowByEarmark.setCmdHeader(eartagJo.getString("cmdHeader"));
-            eartagFlowByEarmark.setDevice(eartagJo.getString("device"));
-            eartagFlowByEarmark.setEarmark(eartagJo.getString("earmark"));
-            eartagFlowByEarmark.setBat(Integer.parseInt(eartagJo.getString("bat")));
-            eartagFlowByEarmark.setEarTemp(Integer.parseInt(eartagJo.getString("earTemp")));
-            eartagFlowByEarmark.setEarTemp1(eartagJo.getFloat("earTemp1"));
-            eartagFlowByEarmark.setEnvTemp(Integer.parseInt(eartagJo.getString("envTemp")));
-            eartagFlowByEarmark.setEnvTemp1(eartagJo.getFloat("envTemp1"));
-            eartagFlowByEarmark.setAct(Integer.parseInt(eartagJo.getString("act")));
-            eartagFlowByEarmark.setAct1(Integer.parseInt(eartagJo.getString("act1")));
-            eartagFlowByEarmark.setSignal1(Integer.parseInt(eartagJo.getString("signal")));
-            eartagFlowByEarmark.setAskTime(getAskTime(eartagJo.getString("askTime")));
-            eartagFlowByEarmark.setOther(eartagJo.getString("other"));
-            eartagFlowByEarmark.setCreateDate(todayDate);
-            eartagFlowByEarmark.setFarmId(farmId);
-            eartagFlowByEarmark.setAskDate(new java.sql.Date(dateUtil.parseDate(getAskDate(eartagJo.getString("askTime"))).getTime()));
-            eartagDataRepo2.saveAndFlush(eartagFlowByEarmark);
+            EartagData2 eartagData2 = eartagFlowByEarmark.get(0);
+            eartagData2.setCmdHeader(eartagJo.getString("cmdHeader"));
+            eartagData2.setDevice(eartagJo.getString("device"));
+            eartagData2.setEarmark(eartagJo.getString("earmark"));
+            eartagData2.setBat(Integer.parseInt(eartagJo.getString("bat")));
+            eartagData2.setEarTemp(Integer.parseInt(eartagJo.getString("earTemp")));
+            eartagData2.setEarTemp1(eartagJo.getFloat("earTemp1"));
+            eartagData2.setEnvTemp(Integer.parseInt(eartagJo.getString("envTemp")));
+            eartagData2.setEnvTemp1(eartagJo.getFloat("envTemp1"));
+            eartagData2.setAct(Integer.parseInt(eartagJo.getString("act")));
+            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);
+            eartagData2.setOther(eartagJo.getString("other"));
+            eartagData2.setCreateDate(todayDate);
+            eartagData2.setFarmId(farmId);
+            eartagData2.setAskDate(new java.sql.Date(dateUtil.parseDate(getAskDate(eartagJo.getString("askTime"))).getTime()));
+            eartagData2Mapper.updateById(eartagData2);
         }
     }
 

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/mapper/EartagData2Mapper.java

@@ -12,5 +12,4 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @since 2022-07-29
  */
 public interface EartagData2Mapper extends BaseMapper<EartagData2> {
-
 }

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

@@ -1,11 +1,14 @@
 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.time.LocalDate;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -51,17 +54,17 @@ public class EartagData2 implements Serializable {
 
     private Integer signal1;
 
-    private LocalDateTime askTime;
+    private Date askTime;
 
     private String other;
 
-    private LocalDateTime addTime;
+    private Date addTime;
 
-    private LocalDate createDate;
+    private Date createDate;
 
     private String farmId;
 
-    private LocalDate askDate;
+    private Date askDate;
 
 
 }

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

@@ -3,6 +3,8 @@ package com.huimv.eartag2.manage2.service;
 import com.huimv.eartag2.manage2.pojo.EartagData2;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务类
@@ -13,4 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IEartagData2Service extends IService<EartagData2> {
 
+    List<EartagData2> getEartagData(String earmark);
 }

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

@@ -1,11 +1,15 @@
 package com.huimv.eartag2.manage2.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.eartag2.manage2.pojo.EartagData2;
 import com.huimv.eartag2.manage2.mapper.EartagData2Mapper;
 import com.huimv.eartag2.manage2.service.IEartagData2Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +21,14 @@ import org.springframework.stereotype.Service;
 @Service
 public class EartagData2ServiceImpl extends ServiceImpl<EartagData2Mapper, EartagData2> implements IEartagData2Service {
 
+    @Resource
+    private EartagData2Mapper eartagData2Mapper;
+
+    @Override
+    public List<EartagData2> getEartagData(String earmark) {
+        QueryWrapper<EartagData2> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("earmark",earmark);
+        List<EartagData2> eartagData2s = eartagData2Mapper.selectList(queryWrapper);
+        return eartagData2s;
+    }
 }