Merge remote-tracking branch 'origin/master'

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

@@ -103,7 +103,7 @@ public class EartagDataController {
     /*
     * 获取每日数据统计
     */
-    @Scheduled(cron = "1 1 * * * ?")
+    @Scheduled(cron = "0 0/10 * * * ?")
 //    @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

@@ -58,7 +58,7 @@ public class FarmStockController {
      /*
      * 定时更新regionStockDay表
      */
-     @Scheduled(cron = "1 10 * * * ?")
+     @Scheduled(cron = "0 0/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/CollectorRegisterServiceImpl.java

@@ -44,10 +44,6 @@ public class CollectorRegisterServiceImpl extends ServiceImpl<CollectorRegisterD
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
         QueryWrapper<CollectorRegisterEntity> wrapper = new QueryWrapper<>();
-        String farmCode = (String)params.get("farmCode");
-//        if (StringUtils.isBlank(farmCode)){
-//            throw new RRException("牧场未选择");
-//        }
         String registerStartTime = (String)params.get("registerStartTime");
         String registerEndTime = (String)params.get("registerEndTime");
         String deviceCode = (String)params.get("deviceCode");
@@ -94,29 +90,10 @@ public class CollectorRegisterServiceImpl extends ServiceImpl<CollectorRegisterD
         String sortord = (String)params.get("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/FarmStockServiceImpl.java

@@ -693,7 +693,7 @@ public class FarmStockServiceImpl extends ServiceImpl<FarmStockDao, FarmStockEnt
                                 map.put("type",2);
                                 List childreList = new ArrayList();
                                 QueryWrapper<FarmStockEntity> farmStockEntityQueryWrapper = new QueryWrapper<>();
-                                farmStockEntityQueryWrapper.eq("330110",regionStockDayEntity.getRegionCode());
+                                farmStockEntityQueryWrapper.eq("county_code",regionStockDayEntity.getRegionCode());
                                 farmStockEntityQueryWrapper.apply("id IN( SELECT MAX(id) FROM `farm_stock` GROUP BY farm_code)");
                                 List<FarmStockEntity> farmStockEntities = baseMapper.selectList(farmStockEntityQueryWrapper);
                                 for (FarmStockEntity farmStockEntity : farmStockEntities) {

smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/test/java/com/huimv/manager/HuimvSmartEartagDataManagerTests.java

@@ -1,3 +1,4 @@
+/*
 package com.huimv.manager;
 
 import cn.hutool.core.date.DateTime;
@@ -18,6 +19,7 @@ import org.springframework.boot.test.context.SpringBootTest;
 
 import java.util.List;
 
+*/
 /**
  * <p>
  *
@@ -25,7 +27,8 @@ import java.util.List;
  *
  * @author yinhao
  * @date 2021/7/24 14:20
- */
+ *//*
+
 @SpringBootTest
 public class HuimvSmartEartagDataManagerTests {
 
@@ -103,3 +106,4 @@ public class HuimvSmartEartagDataManagerTests {
         System.out.println(dayStockVoList);
     }
 }
+*/