Merge remote-tracking branch 'origin/master'

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,35 @@ 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);
+        QueryWrapper<CollectorRegisterEntity> collectorRegisterEntityQueryWrapper = new QueryWrapper<>();
+
+        String deviceCode = collectorRegister.getDeviceCode();
+        collectorRegisterEntityQueryWrapper.eq("device_code",deviceCode);
+        int count = collectorRegisterService.count(collectorRegisterEntityQueryWrapper);
+        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);
+        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,11 +90,21 @@ 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);
+    }
+
     /*
     * 获取每日数据统计
     */
-    @Scheduled(cron = "1 1 * * * ?")
-//    @RequestMapping("/test")
+//    @Scheduled(cron = "1 1 * * * ?")
+    @RequestMapping("/test")
     private void updateDailyData(){
         eartagDataService.updateDailyData();
     }

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

@@ -0,0 +1,90 @@
+ package com.huimv.manager.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+import com.huimv.manager.entity.StockOutEntity;
+import com.huimv.manager.result.R;
+import com.huimv.manager.service.StockOutService;
+import com.huimv.manager.utils.PageUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+
+ /**
+  *
+  *
+  * @author yinhao
+  * @version ${version}
+  * @date 2021-08-06 15:40:07
+  */
+@RestController
+@RequestMapping("management/stockout")
+@CrossOrigin
+public class StockOutController {
+    @Autowired
+    private StockOutService stockOutService;
+
+    /**
+     * 列表
+     */
+    @RequestMapping("/list")
+    public R list(@RequestParam Map<String, Object> params){
+        PageUtils page = stockOutService.queryPage(params);
+
+        return R.ok().put("page", page);
+    }
+
+
+    /**
+     * 信息
+     */
+    @RequestMapping("/info/{id}")
+    public R info(@PathVariable("id") Integer id){
+		StockOutEntity stockOut = stockOutService.getById(id);
+
+        return R.ok().put("stockOut", stockOut);
+    }
+
+    /**
+     * 保存
+     */
+    @RequestMapping("/save")
+    public R save(@RequestBody StockOutEntity stockOut){
+		stockOutService.save(stockOut);
+
+        return R.ok();
+    }
+
+    /**
+     * 修改
+     */
+    @RequestMapping("/update")
+    public R update(@RequestBody StockOutEntity stockOut){
+		stockOutService.updateById(stockOut);
+
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @RequestMapping("/delete")
+    public R delete(@RequestBody Integer[] ids){
+		stockOutService.removeByIds(Arrays.asList(ids));
+
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @RequestMapping("/findByCode")
+    public R findByCode(@RequestParam Map<String, Object> params){
+        List list = stockOutService.findByCode(params);
+
+        return R.ok().put("data",list);
+    }
+
+}

smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/java/com/huimv/manager/entity/StockOutEntity.java

@@ -0,0 +1,84 @@
+package com.huimv.manager.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-06 15:40:07
+ */
+@Data
+@TableName("stock_out")
+public class StockOutEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 
+	 */
+	@TableId
+	private Integer id;
+	/**
+	 * 行政区划代码/牧场代码
+	 */
+	private String regionCode;
+	/**
+	 * 行政区划名称/牧场名称（备用字段）
+	 */
+	private String regionName;
+	/**
+	 * 母猪总存栏
+	 */
+	private Integer sowTotalStock;
+	/**
+	 * 总存栏增幅类型
+	 */
+	private Integer totalStockWay;
+	/**
+	 * 总存栏增幅数量
+	 */
+	private Integer totalStockUpdate;
+	/**
+	 * 累计出栏量
+	 */
+	private Integer outTotal;
+	/**
+	 * 累计出栏量增幅类型
+	 */
+	private Integer outWay;
+	/**
+	 * 累计出栏量增幅数量
+	 */
+	private Integer outUpdate;
+	/**
+	 * 预计年出栏量
+	 */
+	private Integer expectOut;
+	/**
+	 * 预计年出栏量增幅类型
+	 */
+	private Integer expectOutWay;
+	/**
+	 * 预计年出栏量增幅数量
+	 */
+	private Integer expectOutUpdate;
+	/**
+	 * 母猪目标存栏量
+	 */
+	private Integer sowPlanStock;
+	/**
+	 * 目标年出栏量
+	 */
+	private Integer planOut;
+	/**
+	 * 年度
+	 */
+	private Integer year;
+
+}

smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/java/com/huimv/manager/entity/vo/StockOutVo.java

@@ -0,0 +1,25 @@
+package com.huimv.manager.entity.vo;
+
+import lombok.Data;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.manager.entity.vo
+ * @Description : TODO
+ * @Author : yuxuexuan
+ * @Create : 2021/8/6 0006 15:56
+ **/
+@Data
+public class StockOutVo {
+    //母猪总存栏
+    private Integer sowTotalStock;
+
+    //预计年出栏量
+    private Integer expectOut;
+
+    //母猪目标存栏量
+    private Integer sowPlanStock;
+
+    //目标年出栏量
+    private Integer planOut;
+}

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/mapper/StockOutDao.java

@@ -0,0 +1,20 @@
+package com.huimv.manager.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.manager.entity.StockOutEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-06 15:40:07
+ */
+@Mapper
+@Repository
+public interface StockOutDao extends BaseMapper<StockOutEntity> {
+
+    StockOutEntity counAll();
+}

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/StockOutService.java

@@ -0,0 +1,23 @@
+package com.huimv.manager.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.manager.entity.StockOutEntity;
+import com.huimv.manager.utils.PageUtils;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-06 15:40:07
+ */
+public interface StockOutService extends IService<StockOutEntity> {
+
+    PageUtils queryPage(Map<String, Object> params);
+
+    List findByCode(Map<String, Object> params);
+}
+

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

@@ -5,7 +5,10 @@ import com.huimv.manager.mapper.BaseFarmInfoDao;
 import com.huimv.manager.service.BaseFarmInfoService;
 import com.huimv.manager.utils.PageUtils;
 import com.huimv.manager.utils.Query;
+import org.apache.commons.lang.StringUtils;
 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;
@@ -22,6 +25,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service("baseFarmInfoService")
 public class BaseFarmInfoServiceImpl extends ServiceImpl<BaseFarmInfoDao, BaseFarmInfoEntity> implements BaseFarmInfoService {
 
+
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
         IPage<BaseFarmInfoEntity> page = this.page(
@@ -32,4 +36,15 @@ 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");
+        if ("330000".equals(countyCode)){
+            countyCode = null;
+        }
+        QueryWrapper<BaseFarmInfoEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(countyCode),"county",countyCode).or().eq(StringUtils.isNotBlank(countyCode),"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

@@ -30,6 +30,7 @@ import com.huimv.manager.service.EartagDataService;
 @Service("eartagDataService")
 public class EartagDataServiceImpl extends ServiceImpl<EartagDataDao, EartagDataEntity> implements EartagDataService {
 
+
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
 
@@ -97,6 +98,8 @@ public class EartagDataServiceImpl extends ServiceImpl<EartagDataDao, EartagData
     @Autowired
     private FarmStockDao farmStockDao;
 
+    @Autowired
+    private StockOutDao stockOutDao;
 
     @Override
     public void updateDailyData() {
@@ -275,6 +278,25 @@ public class EartagDataServiceImpl extends ServiceImpl<EartagDataDao, EartagData
                 farmStockDao.updateById(farmStockEntity);
             }
 
+            //stockOut更新
+            QueryWrapper<StockOutEntity> stockOutEntityQueryWrapper = new QueryWrapper<>();
+            stockOutEntityQueryWrapper.eq("year", DateUtil.year(now));
+            stockOutEntityQueryWrapper.eq("region_code", farmCode);
+            StockOutEntity stockOutEntity = stockOutDao.selectOne(stockOutEntityQueryWrapper);
+            if (stockOutEntity == null) {
+                stockOutEntity = new StockOutEntity();
+            }
+            stockOutEntity.setRegionCode(farmCode);
+            stockOutEntity.setRegionName(farmName);
+            stockOutEntity.setSowTotalStock(allSow);
+            stockOutEntity.setYear(DateUtil.year(now));
+
+            if (stockOutEntity.getId() == null) {
+                stockOutDao.insert(stockOutEntity);
+            } else {
+                stockOutDao.updateById(stockOutEntity);
+            }
+
 
         }
 
@@ -290,4 +312,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("countByDay");
+
+
+        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/java/com/huimv/manager/service/impl/StockOutServiceImpl.java

@@ -0,0 +1,56 @@
+package com.huimv.manager.service.impl;
+
+import com.huimv.manager.entity.StockOutEntity;
+import com.huimv.manager.mapper.StockOutDao;
+import com.huimv.manager.service.StockOutService;
+import com.huimv.manager.utils.PageUtils;
+import com.huimv.manager.utils.Query;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-06 15:40:07
+ */
+@Service("stockOutService")
+public class StockOutServiceImpl extends ServiceImpl<StockOutDao, StockOutEntity> implements StockOutService {
+
+    @Override
+    public PageUtils queryPage(Map<String, Object> params) {
+        IPage<StockOutEntity> page = this.page(
+                new Query<StockOutEntity>().getPage(params),
+                new QueryWrapper<StockOutEntity>()
+        );
+
+        return new PageUtils(page);
+    }
+
+    @Override
+    public List findByCode(Map<String, Object> params) {
+        String farmCode = (String)params.get("farmCode");
+        QueryWrapper<StockOutEntity> stockOutEntityQueryWrapper = new QueryWrapper<>();
+        if (StringUtils.isBlank(farmCode)) {
+            List list = new ArrayList();
+           StockOutEntity stockOutEntity = baseMapper.counAll();
+            list.add(stockOutEntity);
+           return list;
+        }
+
+        stockOutEntityQueryWrapper.eq(StringUtils.isNotBlank(farmCode),"region_code",farmCode);
+
+        List<StockOutEntity> stockOutEntities = baseMapper.selectList(stockOutEntityQueryWrapper);
+        return stockOutEntities;
+    }
+
+}

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>

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

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.huimv.manager.mapper.StockOutDao">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.huimv.manager.entity.StockOutEntity" id="stockOutMap">
+        <result property="id" column="id"/>
+        <result property="regionCode" column="region_code"/>
+        <result property="regionName" column="region_name"/>
+        <result property="sowTotalStock" column="sow_total_stock"/>
+        <result property="totalStockWay" column="total_stock_way"/>
+        <result property="totalStockUpdate" column="total_stock_update"/>
+        <result property="out" column="out"/>
+        <result property="outWay" column="out_way"/>
+        <result property="outUpdate" column="out_update"/>
+        <result property="expectOut" column="expect_out"/>
+        <result property="expectOutWay" column="expect_out_way"/>
+        <result property="expectOutUpdate" column="expect_out_update"/>
+        <result property="sowPlanStock" column="sow_plan_stock"/>
+        <result property="planOut" column="plan_out"/>
+        <result property="year" column="year"/>
+    </resultMap>
+    <select id="counAll" resultType="com.huimv.manager.entity.StockOutEntity">
+        select
+           SUM(sow_total_stock) sowTotalStock,
+           SUM(expect_out) expectOut,
+           SUM(sow_plan_stock) sowPlanStock,
+           SUM(plan_out) planOut
+           from `stock_out`
+
+    </select>
+
+
+</mapper>