Merge remote-tracking branch 'origin/master'

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.*;
 
@@ -107,14 +107,19 @@ public class CollectorRegisterController {
         if (count >0){
             return R.error("编号为"+deviceCode+"的设备已存在");
         }
-        String countyCode = collectorRegister.getCountyCode();
-        QueryWrapper<BaseRegionEntity> baseRegionEntityQueryWrapper = new QueryWrapper<>();
-        baseRegionEntityQueryWrapper.eq("region_code",countyCode);
-        BaseRegionEntity baseRegionEntity = baseRegionDao.selectOne(baseRegionEntityQueryWrapper);
+//        String countyCode = "";
+//        for (String countyCodes : collectorRegister.getCountyCode().split(",")) {
+//            QueryWrapper<BaseRegionEntity> baseRegionEntityQueryWrapper = new QueryWrapper<>();
+//            baseRegionEntityQueryWrapper.eq("region_code",countyCodes);
+//            BaseRegionEntity baseRegionEntity = baseRegionDao.selectOne(baseRegionEntityQueryWrapper);
+//            countyCode += baseRegionEntity.getRegionName();
+//        }
+
+
         QueryWrapper<BaseFarmInfoEntity> wrapper = new QueryWrapper<>();
         wrapper.eq("farm_code",collectorRegister.getFarmCode());
         BaseFarmInfoEntity baseFarmInfoEntity = baseFarmInfoDao.selectOne(wrapper);
-        collectorRegister.setCountyName(baseRegionEntity.getRegionName());
+//        collectorRegister.setCountyName(countyCode);
         collectorRegister.setFarmName(baseFarmInfoEntity.getFarmName());
         collectorRegisterService.save(collectorRegister);
 
@@ -172,7 +177,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

@@ -2,7 +2,9 @@ package com.huimv.manager.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.huimv.manager.entity.BaseRegionEntity;
 import com.huimv.manager.entity.vo.CollectorRegisterVo;
+import com.huimv.manager.mapper.BaseRegionDao;
 import com.huimv.manager.mapper.CollectorRegisterDao;
 import com.huimv.manager.result.R;
 import com.huimv.manager.result.RRException;
@@ -36,6 +38,8 @@ import com.huimv.manager.service.CollectorRegisterService;
 public class CollectorRegisterServiceImpl extends ServiceImpl<CollectorRegisterDao, CollectorRegisterEntity> implements CollectorRegisterService {
 
 
+    @Autowired
+    private BaseRegionDao baseRegionDao;
 
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
@@ -54,10 +58,15 @@ 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);
+        if(StringUtils.isNotBlank(countyName)){
+            wrapper.like("register.county_name",countyName).or().like("register.county_code",countyName);
+        }
+        if (StringUtils.isNotBlank(farmName)){
+            wrapper.like("register.farm_name",farmName).or().like("register.farm_code",farmName);
+        }
+
 
-        wrapper.eq(StringUtils.isNotBlank(farmCode),"register.farm_code",farmCode);
+//        wrapper.eq(StringUtils.isNotBlank(farmCode),"register.farm_code",farmCode);
         if (StringUtils.isNotBlank(acqStatus)){
             wrapper.eq("acq_status",Integer.parseInt(acqStatus));
         }
@@ -79,17 +88,35 @@ public class CollectorRegisterServiceImpl extends ServiceImpl<CollectorRegisterD
             wrapper.ge("register.register_time",registerStartTime);
         }
 
-//        wrapper.ge(StringUtils.isNotBlank(registerEndTime),"register.register_time",registerStartTime);
 
         wrapper.apply("register.del_status  = 1");
 
         String sortord = (String)params.get("sortord");
-        wrapper.orderByDesc(sortord);
+        wrapper.orderByDesc(StringUtils.isNotBlank(sortord),sortord);
         IPage<CollectorRegisterVo> page = baseMapper.page(new Query<>().getPage(params),wrapper);
-
+   /* //todo
+        for (CollectorRegisterVo record : page.getRecords()) {
+            String countyCode = record.getCountyCode();
+            getAllCountyCode(countyCode);
+        }
+*/
         return new PageUtils(page);
     }
 
+  /*  private String getAllCountyCode(String countyCode) {
+        QueryWrapper<BaseRegionEntity> baseRegionEntityQueryWrapper = new QueryWrapper<>();
+        baseRegionEntityQueryWrapper.eq("region_code",countyCode);
+        BaseRegionEntity baseRegionEntity = baseRegionDao.selectOne(baseRegionEntityQueryWrapper);
+        if (baseRegionEntity.getParentCode() != null){
+            baseRegionEntityQueryWrapper.clear();
+
+            countyCode = countyCode + getAllCountyCode(countyCode);
+
+        }
+        return countyCode;
+
+    }*/
+
     @Override
     public Map countState(Map<String, Object> params) {
 

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 {

smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/resources/mapper/manager/CollectorRegisterDao.xml

@@ -50,6 +50,7 @@
         from collector_register register
         join base_pigpen pigpen on pigpen.id = register.pigpen_id
         join base_pigpen unit on unit.id = register.unit_id
+
       ${ew.customSqlSegment}
     </select>