根据行政编码查牧场

smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/java/com/huimv/manager/controller/EartagDataController.java

@@ -103,8 +103,8 @@ public class EartagDataController {
     /*
     * 获取每日数据统计
     */
-//    @Scheduled(cron = "1 1 * * * ?")
-    @RequestMapping("/test")
+    @Scheduled(cron = "1 1 * * * ?")
+//    @RequestMapping("/test")
     private void updateDailyData(){
         eartagDataService.updateDailyData();
     }

smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/java/com/huimv/manager/controller/FarmStockController.java

@@ -59,6 +59,7 @@ public class FarmStockController {
      * 定时更新regionStockDay表
      */
      @Scheduled(cron = "1 10 * * * ?")
+//     @RequestMapping("/test")
     public void updateRegionStockDay(){
          farmStockService.updateRegionStockDay();
 

smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/java/com/huimv/manager/service/impl/EartagDataServiceImpl.java

@@ -141,14 +141,49 @@ public class EartagDataServiceImpl extends ServiceImpl<EartagDataDao, EartagData
             }
             Set<String> set = ObjectUtil.cloneByStream(nowSet);
 
+            Integer allSow =0;
+
+            List<EartagDataEntity> sowEartagDataEntities =new ArrayList<>();
             //当日母猪总存栏
-            int allSow = nowSet.size();
+            for (EartagDataEntity eartagDataEntity : eartagDataEntities) {
+                Integer stage = eartagDataEntity.getStage();
+                if (stage == 1 || stage == 2 || stage == 5 || stage ==6){
+                    allSow++;
+                    sowEartagDataEntities.add(eartagDataEntity);
+                }
+            }
+            List<EartagDataEntity> sowYesterdayEartagDataEntities =new ArrayList<>();
+            //昨日母猪总存栏
+            for (EartagDataEntity yesterEartagDataEntity : yesterdayEartagDataEntities) {
+                Integer stage = yesterEartagDataEntity.getStage();
+                if (stage == 1 || stage == 2 || stage == 5 || stage ==6){
+                    allSow++;
+                    sowYesterdayEartagDataEntities.add(yesterEartagDataEntity);
+                }
+            }
+
+            //过滤
+            Set<String> sowNowSet = new HashSet();
+            for (EartagDataEntity eartagDataEntity : sowEartagDataEntities) {
+                sowNowSet.add(eartagDataEntity.getEartagNo());
+            }
+
+            Set<String> sowYesterdaySet = new HashSet();
+            for (EartagDataEntity eartagDataEntity : sowYesterdayEartagDataEntities) {
+                sowYesterdaySet.add(eartagDataEntity.getEartagNo());
+            }
 
+
+
+
+          /*  //当日母猪总存栏
+            int allSow = nowSet.size();
+*/
             //得到新增
-            nowSet.removeAll(yesterdaySet);
+            sowNowSet.removeAll(sowYesterdaySet);
             int newSow = nowSet.size();
             //得到离线
-            yesterdaySet.removeAll(set);
+            sowYesterdaySet.removeAll(sowNowSet);
             int offSow = yesterdaySet.size();
 
             //添加离线表