Browse Source

每日汇总

523096025 4 years ago
parent
commit
bb1febc61f

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

@@ -1,6 +1,7 @@
  package com.huimv.manager.controller;
 
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -86,4 +87,14 @@ public class DailyTabulateDataController {
         return R.ok();
     }
 
+    /**
+     * 存栏变化
+     */
+    @RequestMapping("/countAllChange")
+    public R countAll(@RequestParam Map<String, Object> params){
+        List list = dailyTabulateDataService.countAllChange(params);
+
+        return R.ok().put("page", list);
+    }
+
 }

+ 20 - 0
smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/java/com/huimv/manager/entity/vo/DailyVo.java

@@ -0,0 +1,20 @@
+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/2 0002 17:01
+ **/
+@Data
+public class DailyVo {
+    private String ydate;
+    private Integer stock1;
+    private Integer stock2;
+    private Integer stock3;
+    private Integer stockNew;
+    private Integer offlineNo;
+}

+ 7 - 0
smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/java/com/huimv/manager/mapper/DailyTabulateDataDao.java

@@ -6,6 +6,7 @@ import com.huimv.manager.entity.DailyTabulateDataEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huimv.manager.entity.vo.DayStockVo;
 import com.huimv.manager.entity.vo.SunAreaStockVo;
+import com.huimv.manager.entity.vo.DailyVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -28,4 +29,10 @@ public interface DailyTabulateDataDao extends BaseMapper<DailyTabulateDataEntity
     List<SunAreaStockVo> getCityPigStock(@Param(Constants.WRAPPER) QueryWrapper<SunAreaStockVo> sunAreaQuery,@Param("type") String type);
 
     List<DayStockVo> getMunicipalDayStock(@Param(Constants.WRAPPER) QueryWrapper<DayStockVo> query);
+
+    List<DailyVo> selectDay(@Param(Constants.WRAPPER) QueryWrapper<DailyTabulateDataEntity> wrapper);
+
+    List<DailyVo> selectMonth(@Param(Constants.WRAPPER) QueryWrapper<DailyTabulateDataEntity> wrapper);
+
+    List<DailyVo> selectYear(@Param(Constants.WRAPPER) QueryWrapper<DailyTabulateDataEntity> wrapper);
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.huimv.manager.utils.PageUtils;
 import com.huimv.manager.entity.DailyTabulateDataEntity;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -18,5 +19,7 @@ public interface DailyTabulateDataService extends IService<DailyTabulateDataEnti
     PageUtils queryPage(Map<String, Object> params);
 
     DailyTabulateDataEntity listByFarm(Map<String, Object> params);
+
+    List countAllChange(Map<String, Object> params);
 }
 

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

@@ -1,13 +1,17 @@
 package com.huimv.manager.service.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.huimv.manager.entity.vo.DailyVo;
 import com.huimv.manager.mapper.DailyTabulateDataDao;
 import com.huimv.manager.result.R;
 import com.huimv.manager.result.RRException;
+import net.bytebuddy.implementation.bytecode.Throw;
 import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -90,4 +94,47 @@ public class DailyTabulateDataServiceImpl extends ServiceImpl<DailyTabulateDataD
 
         return   baseMapper.selectOne(wrapper);
     }
+
+    @Override
+    public List countAllChange(Map<String, Object> params) {
+        List<DailyVo> list = new ArrayList<>();
+
+        String farmCode = (String)params.get("farmCode");
+        String startDate = (String)params.get("startDate");
+        String endDate = (String)params.get("endDate");
+        String type = (String)params.get("type");
+
+        if (farmCode == null){
+            throw new RRException("请选择牧场");
+        }
+
+        QueryWrapper<DailyTabulateDataEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq("farm_code",farmCode);
+        wrapper.ge(StringUtils.isNotBlank(startDate),"statistic_date",startDate);
+        wrapper.ge(StringUtils.isNotBlank(startDate),"statistic_date",endDate);
+        wrapper.groupBy("ydate");
+        wrapper.orderByDesc("statistic_date");
+
+        if ("1".equals(type)){
+            if (StringUtils.isBlank(startDate) || StringUtils.isBlank(endDate)){
+                wrapper.last("limit 7");
+            }
+            list = baseMapper.selectDay(wrapper);
+        }
+        if ("2".equals(type)){
+            if (StringUtils.isBlank(startDate) || StringUtils.isBlank(endDate)){
+                wrapper.last("limit 6");
+            }
+            list = baseMapper.selectMonth(wrapper);
+        }
+        if ("3".equals(type)){
+            if (StringUtils.isBlank(startDate) || StringUtils.isBlank(endDate)){
+                wrapper.last("limit 5");
+            }
+            list = baseMapper.selectYear(wrapper);
+        }
+
+        return list;
+    }
+
 }

+ 38 - 0
smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/resources/mapper/manager/DailyTabulateDataDao.xml

@@ -19,6 +19,44 @@
         <result property="stock3" column="stock3"/>
         <result property="stock4" column="stock4"/>
     </resultMap>
+    <select id="selectDay" resultType="com.huimv.manager.entity.vo.DailyVo">
+         SELECT
+             DATE_FORMAT( statistic_date,"%m-%d") ydate,
+             SUM(stock1) stock1,
+             SUM(stock2) stock2,
+             SUM(stock3) stock3 ,
+             SUM(stock_new) stockNew,
+             SUM(offline_no) offlineNo
+             FROM `daily_tabulate_data`
+         ${ew.customSqlSegment}
+
+    </select>
+    <select id="selectMonth" resultType="com.huimv.manager.entity.vo.DailyVo">
+       SELECT
+         DATE_FORMAT(statistic_date,"%Y-%m") ydate,
+         SUM(stock1) stock1,
+         SUM(stock2) stock2,
+         SUM(stock3) stock3 ,
+         SUM(stock_new) stockNew,
+         SUM(offline_no) offlineNo
+
+          FROM `daily_tabulate_data`
+
+        ${ew.customSqlSegment}
+    </select>
+    <select id="selectYear" resultType="com.huimv.manager.entity.vo.DailyVo">
+        SELECT
+         DATE_FORMAT(statistic_date,"%Y")  ydate,
+         SUM(stock1) stock1,
+         SUM(stock2) stock2,
+         SUM(stock3) stock3 ,
+         SUM(stock_new) stockNew,
+         SUM(offline_no) offlineNo
+
+          FROM `daily_tabulate_data`
+
+        ${ew.customSqlSegment}
+    </select>
 
     <select id="getDayStockByRegion" resultType="com.huimv.manager.entity.vo.DayStockVo">
         SELECT