母猪总存栏等

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

@@ -1,6 +1,7 @@
  package com.huimv.manager.controller;
 
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 
 import com.huimv.manager.entity.BaseFarmInfoEntity;
@@ -36,6 +37,16 @@ public class BaseFarmInfoController {
     }
 
 
+     /**
+      * 列表
+      */
+     @RequestMapping("/findByCityCode")
+     public R findByCityCode(@RequestParam Map<String, Object> params){
+         List list = baseFarmInfoService.findByCityCode(params);
+
+         return R.ok().put("page", list );
+     }
+
     /**
      * 信息
      */

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

@@ -7,17 +7,18 @@ import java.util.Map;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.huimv.manager.entity.BasePigpenEntity;
-import com.huimv.manager.entity.EartagDataEntity;
+import com.huimv.manager.entity.*;
+import com.huimv.manager.mapper.BaseFarmInfoDao;
 import com.huimv.manager.mapper.BasePigpenDao;
 import com.huimv.manager.mapper.BasePigpenMapper;
+import com.huimv.manager.mapper.BaseRegionDao;
 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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import com.huimv.manager.entity.CollectorRegisterEntity;
 import com.huimv.manager.service.CollectorRegisterService;
 import com.huimv.manager.result.R;
 import com.huimv.manager.utils.PageUtils;
@@ -87,12 +88,27 @@ public class CollectorRegisterController {
         return R.ok().put("collectorRegister", map);
     }
 
+    @Autowired
+    private BaseRegionDao baseRegionDao;
+
+    @Autowired
+    private BaseFarmInfoDao baseFarmInfoDao;
+
     /**
      * 保存
      */
     @RequestMapping("/save")
     public R save(@RequestBody CollectorRegisterEntity collectorRegister){
-		collectorRegisterService.save(collectorRegister);
+        String countyCode = collectorRegister.getCountyCode();
+        QueryWrapper<BaseRegionEntity> baseRegionEntityQueryWrapper = new QueryWrapper<>();
+        baseRegionEntityQueryWrapper.eq("region_code",countyCode);
+        BaseRegionEntity baseRegionEntity = baseRegionDao.selectOne(baseRegionEntityQueryWrapper);
+        QueryWrapper<BaseFarmInfoEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq("farm_code",collectorRegister.getFarmCode());
+        BaseFarmInfoEntity baseFarmInfoEntity = baseFarmInfoDao.selectOne(wrapper);
+        collectorRegister.setCountyName(baseRegionEntity.getRegionName());
+        collectorRegister.setFarmName(baseFarmInfoEntity.getFarmName());
+        collectorRegisterService.save(collectorRegister);
 
         return R.ok();
     }

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

@@ -90,6 +90,16 @@ public class EartagDataController {
         return R.ok().put("data",list);
     }
 
+    /**
+     * 查询每小时的上传量
+     */
+    @RequestMapping("/countByDay")
+    public R countByDay(@RequestParam Map<String, Object> params){
+        Map list =  eartagDataService.countByDay(params);
+
+        return R.ok().put("data",list);
+    }
+
     /*
     * 获取每日数据统计
     */

smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/java/com/huimv/manager/mapper/EartagDataDao.java

@@ -23,4 +23,5 @@ public interface EartagDataDao extends BaseMapper<EartagDataEntity> {
 
     List<EartagDataCountVo> countByTime(@Param(Constants.WRAPPER) QueryWrapper<EartagDataEntity> wrapper);
 
+    List<EartagDataCountVo> countByDay(@Param(Constants.WRAPPER)QueryWrapper<EartagDataEntity> wrapper);
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.huimv.manager.entity.BaseFarmInfoEntity;
 import com.huimv.manager.utils.PageUtils;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -16,5 +17,7 @@ import java.util.Map;
 public interface BaseFarmInfoService extends IService<BaseFarmInfoEntity> {
 
     PageUtils queryPage(Map<String, Object> params);
+
+    List findByCityCode(Map<String, Object> params);
 }
 

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

@@ -22,5 +22,7 @@ public interface EartagDataService extends IService<EartagDataEntity> {
 
 
     void updateDailyData();
+
+    Map countByDay(Map<String, Object> params);
 }
 

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

@@ -6,6 +6,8 @@ import com.huimv.manager.service.BaseFarmInfoService;
 import com.huimv.manager.utils.PageUtils;
 import com.huimv.manager.utils.Query;
 import org.springframework.stereotype.Service;
+
+import java.util.List;
 import java.util.Map;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -32,4 +34,12 @@ public class BaseFarmInfoServiceImpl extends ServiceImpl<BaseFarmInfoDao, BaseFa
         return new PageUtils(page);
     }
 
+    @Override
+    public List findByCityCode(Map<String, Object> params) {
+
+        String countyCode = (String)params.get("countyCode");
+        QueryWrapper<BaseFarmInfoEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq("county",countyCode).or().eq("city",countyCode);
+       return baseMapper.selectList(wrapper);
+    }
 }

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

@@ -69,7 +69,11 @@ public class CollectorRegisterServiceImpl extends ServiceImpl<CollectorRegisterD
         if (StringUtils.isNotBlank(networkStatus)){
             wrapper.eq("network_status",Integer.parseInt(networkStatus));
         }
-        wrapper.le(StringUtils.isNotBlank(registerEndTime),"rregister.egister_time",registerEndTime);
+        if(StringUtils.isNotBlank(registerEndTime)){
+            registerEndTime = registerStartTime+" 23:59:59";
+            wrapper.le("register.register_time",registerEndTime);
+        }
+
         wrapper.ge(StringUtils.isNotBlank(registerEndTime),"register.register_time",registerStartTime);
 
         wrapper.apply("register.del_status  = 1");

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

@@ -202,7 +202,7 @@ public class DailyTabulateDataServiceImpl extends ServiceImpl<DailyTabulateDataD
         Integer yestdayTotalSowStock = yestDayDailySowVo.getStockTotal();
 
         Map map = new HashMap();
-        map.put("sowStock",sowTotalStock);
+        map.put("sowStock",dailySowVo.getSowStock());
         if (yestdayTotalSowStock.equals(sowTotalStock)){
             map.put("sowTotalStockValue",0);
             map.put("sowTotalStockType",null);

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

@@ -290,4 +290,36 @@ public class EartagDataServiceImpl extends ServiceImpl<EartagDataDao, EartagData
                                         a.multiply(new BigDecimal(100)).divide(b, 2, BigDecimal.ROUND_HALF_UP) + "%";
         return percent;
     }
+
+    @Override
+    public Map countByDay(Map<String, Object> params) {
+
+        String startTime = (String) params.get("startTime");
+        String endTime = (String) params.get("endTime");
+        String deviceCode = (String) params.get("deviceCode");
+
+
+        QueryWrapper<EartagDataEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(deviceCode),"device_code", deviceCode);
+        wrapper.ge(StringUtils.isNotBlank(startTime), "time", startTime);
+        wrapper.le(StringUtils.isNotBlank(endTime), "time", endTime);
+        wrapper.groupBy("count_time");
+        List<EartagDataCountVo> eartagDataCountVos = baseMapper.countByDay(wrapper);
+
+        List timeList = new ArrayList();
+        List envTempList = new ArrayList();
+        List count = new ArrayList();
+        for (EartagDataCountVo eartagDataCountVo : eartagDataCountVos) {
+            timeList.add(eartagDataCountVo.getCountTime());
+            envTempList.add(eartagDataCountVo.getEnvTemp());
+            count.add(eartagDataCountVo.getUploadCount());
+        }
+        Map map = new HashMap();
+        map.put("time",timeList);
+        map.put("envTemp",envTempList);
+        map.put("count",count);
+
+
+        return map;
+    }
 }

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

@@ -33,6 +33,13 @@
 	        ${ew.customSqlSegment}
     </select>
 
+    <select id="countByDay" resultType="com.huimv.manager.entity.vo.EartagDataCountVo">
+         SELECT
+          DATE_FORMAT(`time`,"%y-%m-%d") count_time,COUNT(*) upload_count, CAST(AVG(env_temp) AS DECIMAL(10,2)) envTemp
+	        FROM `eartag_data`
+	        ${ew.customSqlSegment}
+    </select>
+
 
 
 </mapper>