更新一个牧场内一个耳标不同采集器重复添加问题。

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

@@ -187,10 +187,10 @@ public class EartagServiceImpl implements IEartagService {
      * @Date        : 2022/8/5
      * @Time        : 14:16
      */
-    public Map countTimesByInTime(String earmark, Timestamp nowTimestamp) {
+    public Map countTimesByInTime(String earmark, Timestamp nowTimestamp, String farmId) {
         Map countMap = new HashMap();
         //
-        Optional<EartagData2Entity> optionEartagData = eartagData2Repo.getLastByEarmark(earmark);
+        Optional<EartagData2Entity> optionEartagData = eartagData2Repo.getLastByEarmark(earmark,farmId);
         if (!optionEartagData.isPresent()) {
             log.info("该耳标号无数据["+earmark+"].");
             countMap.put("countTimes",true);
@@ -935,7 +935,7 @@ public class EartagServiceImpl implements IEartagService {
         String earmark = eartagJo.getString("earmark");
 //        System.out.println("earmark ====================================="+earmark);
         // {}
-        Map countMap = countTimesByInTime(earmark, nowTimestamp);
+        Map countMap = countTimesByInTime(earmark, nowTimestamp,farmId);
         Boolean countTimes = Boolean.parseBoolean(countMap.get("countTimes").toString());
         //true:设定过滤时间内无耳标数据上传入库；false:有数据入库；
         if(countTimes){