设备管理，汇总数据,牧场概况

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

@@ -29,6 +29,16 @@ public class DailyTabulateDataController {
     /**
      * 列表
      */
+    @RequestMapping("/listByFarm")
+    public R listByFarm(@RequestParam Map<String, Object> params){
+         DailyTabulateDataEntity dataEntity = dailyTabulateDataService.listByFarm(params);
+
+        return R.ok().put("page", dataEntity);
+    }
+
+    /**
+     * 列表
+     */
     @RequestMapping("/list")
     public R list(@RequestParam Map<String, Object> params){
         PageUtils page = dailyTabulateDataService.queryPage(params);
@@ -36,7 +46,6 @@ public class DailyTabulateDataController {
         return R.ok().put("page", page);
     }
 
-
     /**
      * 信息
      */

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

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

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

@@ -16,5 +16,7 @@ import java.util.Map;
 public interface DailyTabulateDataService extends IService<DailyTabulateDataEntity> {
 
     PageUtils queryPage(Map<String, Object> params);
+
+    DailyTabulateDataEntity listByFarm(Map<String, Object> params);
 }
 

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

@@ -62,8 +62,6 @@ public class CollectorRegisterServiceImpl extends ServiceImpl<CollectorRegisterD
         wrapper.orderByDesc(sortord);
         IPage<CollectorRegisterVo> page = baseMapper.page(new Query<>().getPage(params),wrapper);
 
-
-
         return new PageUtils(page);
     }
 

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

@@ -2,8 +2,12 @@ package com.huimv.manager.service.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.huimv.manager.mapper.DailyTabulateDataDao;
+import com.huimv.manager.result.R;
 import com.huimv.manager.result.RRException;
 import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.Map;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -68,4 +72,22 @@ public class DailyTabulateDataServiceImpl extends ServiceImpl<DailyTabulateDataD
         return new PageUtils(page);
     }
 
+    @Override
+    public DailyTabulateDataEntity listByFarm(Map<String, Object> params) {
+        String date = (String) params.get("date");
+        String farmCode = (String) params.get("farmCode");
+        if (StringUtils.isBlank(farmCode)){
+            throw new RRException("请选择牧场");
+        }
+        if (StringUtils.isBlank(date) ){
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+            date = simpleDateFormat.format(new Date());
+        }
+        QueryWrapper<DailyTabulateDataEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq("statistic_date",date);
+        wrapper.eq("farm_code",farmCode);
+
+
+        return   baseMapper.selectOne(wrapper);
+    }
 }

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

@@ -277,6 +277,7 @@ public class FarmStockServiceImpl extends ServiceImpl<FarmStockDao, FarmStockEnt
                                 map.put("name", regionEntity1.getRegionName());
                                 map.put("code", regionEntity1.getRegionCode());
                                 map.put("children", getChildren1(regionEntity1, farmStockEntities));
+                                map.put("type",2);
                                 list.add(map);
                             }
                         }
@@ -312,6 +313,7 @@ public class FarmStockServiceImpl extends ServiceImpl<FarmStockDao, FarmStockEnt
                 map.put("name", farmStockEntity.getFarmName());
                 map.put("code", regionCode.getRegionCode());
                 map.put("children",null);
+                map.put("tpye",4);
                 endList.add(map);
             }
         }