根据行政编码查牧场

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

@@ -1,13 +1,12 @@
  package com.huimv.manager.controller;
 
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.huimv.manager.entity.*;
+import com.huimv.manager.entity.vo.CollectorRegisterVo;
 import com.huimv.manager.mapper.BaseFarmInfoDao;
 import com.huimv.manager.mapper.BasePigpenDao;
 import com.huimv.manager.mapper.BasePigpenMapper;
@@ -16,6 +15,7 @@ import com.huimv.manager.result.RRException;
 import com.huimv.manager.service.BasePigpenService;
 import com.huimv.manager.service.BaseRegionService;
 import com.huimv.manager.service.EartagDataService;
+import com.huimv.manager.utils.Query;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -172,7 +172,4 @@ public class CollectorRegisterController {
     public R selectEveryStatusCollectors() {
         return collectorRegisterService.selectPcEveryStatusCollectors();
     }
-
-
-
 }

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

@@ -54,8 +54,8 @@ public class CollectorRegisterServiceImpl extends ServiceImpl<CollectorRegisterD
         String networkStatus = (String)params.get("networkStatus");
 
         wrapper.like(StringUtils.isNotBlank(deviceCode),"register.device_code",deviceCode);
-        wrapper.like(StringUtils.isNotBlank(countyName),"county_name",countyName);
-        wrapper.like(StringUtils.isNotBlank(farmName),"farm_name",farmName);
+        wrapper.like(StringUtils.isNotBlank(countyName),"county_name",countyName).or().like("county_code",countyName);
+        wrapper.like(StringUtils.isNotBlank(farmName),"farm_name",farmName).or().like("farm_code",farmName);
 
         wrapper.eq(StringUtils.isNotBlank(farmCode),"register.farm_code",farmCode);
         if (StringUtils.isNotBlank(acqStatus)){

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

@@ -146,7 +146,6 @@ public class EartagDataServiceImpl extends ServiceImpl<EartagDataDao, EartagData
                 }
             }
 
-
             List<String> sowYesterdayEartagDataEntities =new ArrayList<>();
             //昨日母猪总存栏
             for (EartagDataEntity yesterEartagDataEntity : yesterdayEartagDataEntities) {
@@ -156,6 +155,10 @@ public class EartagDataServiceImpl extends ServiceImpl<EartagDataDao, EartagData
                     sowYesterdayEartagDataEntities.add(yesterEartagDataEntity.getEartagNo());
                 }
             }
+            //母猪数量
+            Integer sowTotal = sowEartagDataEntities.size();
+            Integer yesterdaySowTotal = yesterdayEartagDataEntities.size();
+
             //拷贝
             List sowEartagDataEntities1 = ObjectUtil.cloneByStream(sowEartagDataEntities);
 
@@ -306,6 +309,21 @@ public class EartagDataServiceImpl extends ServiceImpl<EartagDataDao, EartagData
             stockOutEntity.setSowTotalStock(allSow);
             stockOutEntity.setYear(DateUtil.year(now));
 
+
+            if (sowTotal > yesterdaySowTotal){
+                stockOutEntity.setTotalStockUpdate(sowTotal - yesterdaySowTotal);
+                stockOutEntity.setTotalStockWay(1);
+            }
+            if (yesterdaySowTotal.equals(sowTotal)){
+                stockOutEntity.setTotalStockUpdate(0);
+                stockOutEntity.setTotalStockWay(0);
+            }
+            if (sowTotal < yesterdaySowTotal){
+                stockOutEntity.setTotalStockUpdate(yesterdaySowTotal - sowTotal);
+                stockOutEntity.setTotalStockWay(2);
+            }
+
+
             if (stockOutEntity.getId() == null) {
                 stockOutDao.insert(stockOutEntity);
             } else {