浏览代码

大屏用电饲料

Newspaper 2 年之前
父节点
当前提交
9d62fca9e6
共有 16 个文件被更改,包括 258 次插入21 次删除
  1. 11 0
      huimv-admin/src/main/java/com/huimv/guowei/admin/common/utils/DataUill.java
  2. 14 0
      huimv-admin/src/main/java/com/huimv/guowei/admin/controller/BaseDuckInfoController.java
  3. 10 0
      huimv-admin/src/main/java/com/huimv/guowei/admin/controller/EnergyElectricityController.java
  4. 11 5
      huimv-admin/src/main/java/com/huimv/guowei/admin/controller/EnvRegularCallFeedingController.java
  5. 2 1
      huimv-admin/src/main/java/com/huimv/guowei/admin/entity/DuckBodySizeInfo.java
  6. 3 2
      huimv-admin/src/main/java/com/huimv/guowei/admin/entity/DuckEggTextureInfo.java
  7. 3 2
      huimv-admin/src/main/java/com/huimv/guowei/admin/entity/DuckIncubateInfo.java
  8. 8 0
      huimv-admin/src/main/java/com/huimv/guowei/admin/mapper/EnergyElectricityMapper.java
  9. 9 0
      huimv-admin/src/main/java/com/huimv/guowei/admin/mapper/EnvRegularCallFeedingMapper.java
  10. 4 0
      huimv-admin/src/main/java/com/huimv/guowei/admin/service/IEnergyElectricityService.java
  11. 4 0
      huimv-admin/src/main/java/com/huimv/guowei/admin/service/IEnvRegularCallFeedingService.java
  12. 69 3
      huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/EnergyElectricityServiceImpl.java
  13. 67 8
      huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/EnvRegularCallFeedingServiceImpl.java
  14. 19 0
      huimv-admin/src/main/resources/com/huimv/guowei/admin/mapper/EnergyElectricityMapper.xml
  15. 2 0
      huimv-admin/src/main/resources/com/huimv/guowei/admin/mapper/EnergyWaterMapper.xml
  16. 22 0
      huimv-admin/src/main/resources/com/huimv/guowei/admin/mapper/EnvRegularCallFeedingMapper.xml

+ 11 - 0
huimv-admin/src/main/java/com/huimv/guowei/admin/common/utils/DataUill.java

@@ -82,6 +82,17 @@ public class DataUill {
         return cal.getTime();
     }
 
+    public static Date getLastMonthEndNight() {
+        Calendar cal = Calendar.getInstance();
+        cal.add(Calendar.MONTH, -1);
+        cal.set(Calendar.DATE, cal.getActualMaximum(Calendar.DATE));
+        cal.set(Calendar.HOUR_OF_DAY, 24);
+        cal.set(Calendar.MINUTE, 0);
+        cal.set(Calendar.SECOND, 0);
+        cal.set(Calendar.MILLISECOND, 0);
+        return cal.getTime();
+    }
+
     public static Date getTwoLastMonthStartMorning() {
         Calendar cal = Calendar.getInstance();
         cal.setTime(getTimesMonthmorning());

+ 14 - 0
huimv-admin/src/main/java/com/huimv/guowei/admin/controller/BaseDuckInfoController.java

@@ -1,6 +1,7 @@
 package com.huimv.guowei.admin.controller;
 
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.guowei.admin.common.utils.PdfUtil;
 import com.huimv.guowei.admin.common.utils.Result;
@@ -98,6 +99,19 @@ public class BaseDuckInfoController {
         return duckInfoService.listDuckById(httpServletRequest, paramsMap);
     }
 
+    @PostMapping("/getLocationById")
+    public Result getLocationById(@RequestBody Map<String, String> paramsMap){
+        String duckNum = paramsMap.get("duckNum");
+        BaseDuckInfo baseDuckInfo = duckInfoService.getOne(new QueryWrapper<BaseDuckInfo>().eq("duck_num", duckNum));
+        if (ObjectUtil.isEmpty(baseDuckInfo)){
+            return new Result(10001,"鸭只不存在",false);
+        }
+        Map resultMap = new HashMap();
+        resultMap.put("unitName",baseDuckInfo.getUnitName());
+        resultMap.put("unitId",baseDuckInfo.getUnitId());
+        return new Result(ResultCode.SUCCESS,resultMap);
+    }
+
     @GetMapping("/printDuck")
     public void printDuck(HttpServletResponse response, @RequestParam(name = "duckCode") String duckCode) throws Exception {
         Map<String, String> map = new HashMap<>();

+ 10 - 0
huimv-admin/src/main/java/com/huimv/guowei/admin/controller/EnergyElectricityController.java

@@ -32,4 +32,14 @@ public class EnergyElectricityController {
     public Result listElectricity(@RequestBody Map<String ,String> paramsMap){
         return energyElectricityService.listElectricity(paramsMap);
     }
+
+    @PostMapping("/getScrrenElectricity")
+    public Result getScrrenElectricity(@RequestBody Map<String ,String> paramsMap){
+        return energyElectricityService.getScrrenElectricity(paramsMap);
+    }
+
+    @PostMapping("/listScrrenElectricity")
+    public Result listScrrenElectricity(@RequestBody Map<String ,String> paramsMap){
+        return energyElectricityService.listScrrenElectricity(paramsMap);
+    }
 }

+ 11 - 5
huimv-admin/src/main/java/com/huimv/guowei/admin/controller/EnvRegularCallFeedingController.java

@@ -5,11 +5,7 @@ import com.huimv.guowei.admin.common.utils.Result;
 import com.huimv.guowei.admin.common.utils.ResultCode;
 import com.huimv.guowei.admin.service.IEnvRegularCallFeedingService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
@@ -50,4 +46,14 @@ public class EnvRegularCallFeedingController {
         return feedingService.listSeven(httpServletRequest, paramsMap);
     }
 
+    @PostMapping("/getScrrenFeed")
+    public Result getScrrenFeed(@RequestBody Map<String, String> paramsMap){
+        return feedingService.getScrrenFeed(paramsMap);
+    }
+
+    @PostMapping("/listScrrenFeed")
+    public Result listScrrenFeed(@RequestBody Map<String, String> paramsMap){
+        return feedingService.listScrrenFeed(paramsMap);
+    }
+
 }

+ 2 - 1
huimv-admin/src/main/java/com/huimv/guowei/admin/entity/DuckBodySizeInfo.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
@@ -50,7 +51,7 @@ public class DuckBodySizeInfo implements Serializable {
      * 测量日期
      */
     @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
-    private LocalDateTime measureDate;
+    private Date measureDate;
 
     /**
      * 翅号

+ 3 - 2
huimv-admin/src/main/java/com/huimv/guowei/admin/entity/DuckEggTextureInfo.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
@@ -50,13 +51,13 @@ public class DuckEggTextureInfo implements Serializable {
      * 产蛋日期
      */
     @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
-    private LocalDateTime layEggsTime;
+    private Date layEggsTime;
 
     /**
      * 测定日期
      */
     @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
-    private LocalDateTime determineTime;
+    private Date determineTime;
 
     /**
      * 鸭蛋种类 1受精蛋 2肉浮蛋

+ 3 - 2
huimv-admin/src/main/java/com/huimv/guowei/admin/entity/DuckIncubateInfo.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
@@ -50,7 +51,7 @@ public class DuckIncubateInfo implements Serializable {
      * 产蛋日期
      */
     @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
-    private LocalDateTime layEggsTime;
+    private Date layEggsTime;
 
     /**
      * 产蛋数量(枚)
@@ -61,7 +62,7 @@ public class DuckIncubateInfo implements Serializable {
      * 孵化日期
      */
     @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
-    private LocalDateTime incubateTime;
+    private Date incubateTime;
 
     /**
      * 孵化数量(枚)

+ 8 - 0
huimv-admin/src/main/java/com/huimv/guowei/admin/mapper/EnergyElectricityMapper.java

@@ -1,5 +1,7 @@
 package com.huimv.guowei.admin.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.huimv.guowei.admin.entity.EnergyElectricity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
@@ -28,4 +30,10 @@ public interface EnergyElectricityMapper extends BaseMapper<EnergyElectricity> {
     BigDecimal getDayElectricity(String farmId);
 
     BigDecimal getMonthElectricity(String farmId);
+
+    BigDecimal getElectricity(@Param(Constants.WRAPPER) QueryWrapper<EnergyElectricity> queryWrapper);
+
+    List<EnergyElectricity> listSixMonthElectricity(String farmId,String unitId);
+
+    List<EnergyElectricity> listSevenDayElectricity(String farmId,String unitId);
 }

+ 9 - 0
huimv-admin/src/main/java/com/huimv/guowei/admin/mapper/EnvRegularCallFeedingMapper.java

@@ -4,11 +4,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huimv.guowei.admin.entity.EnergyElectricity;
 import com.huimv.guowei.admin.entity.EnvRegularCallEgg;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huimv.guowei.admin.entity.EnvRegularCallFeeding;
 import org.apache.ibatis.annotations.Param;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -23,4 +25,11 @@ public interface EnvRegularCallFeedingMapper extends BaseMapper<EnvRegularCallFe
     List<EnvRegularCallFeeding> listDay(@Param(Constants.WRAPPER) QueryWrapper<EnvRegularCallFeeding> queryWrapper);
 
     IPage<EnvRegularCallFeeding> listPage(Page<EnvRegularCallFeeding> page, @Param(Constants.WRAPPER) QueryWrapper<EnvRegularCallFeeding> queryWrapper);
+
+    BigDecimal getFeed(@Param(Constants.WRAPPER) QueryWrapper<EnvRegularCallFeeding> queryWrapper);
+
+    List<EnvRegularCallFeeding> listSixMonthFeed(String farmId,String unitId);
+
+    List<EnvRegularCallFeeding> listSevenDayFeed(String farmId,String unitId);
+
 }

+ 4 - 0
huimv-admin/src/main/java/com/huimv/guowei/admin/service/IEnergyElectricityService.java

@@ -19,4 +19,8 @@ public interface IEnergyElectricityService extends IService<EnergyElectricity> {
     Result getElectricity(Map<String, String> paramsMap);
 
     Result listElectricity(Map<String, String> paramsMap);
+
+    Result getScrrenElectricity(Map<String, String> paramsMap);
+
+    Result listScrrenElectricity(Map<String, String> paramsMap);
 }

+ 4 - 0
huimv-admin/src/main/java/com/huimv/guowei/admin/service/IEnvRegularCallFeedingService.java

@@ -24,4 +24,8 @@ public interface IEnvRegularCallFeedingService extends IService<EnvRegularCallFe
     Result listSelect(HttpServletRequest httpServletRequest, Map<String,String> paramsMap);
 
     Result listSeven(HttpServletRequest httpServletRequest, Map<String,String> paramsMap);
+
+    Result getScrrenFeed(Map<String, String> paramsMap);
+
+    Result listScrrenFeed(Map<String, String> paramsMap);
 }

+ 69 - 3
huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/EnergyElectricityServiceImpl.java

@@ -1,5 +1,9 @@
 package com.huimv.guowei.admin.service.impl;
 
+import cn.hutool.core.date.DateUnit;
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.guowei.admin.common.utils.DataUill;
 import com.huimv.guowei.admin.common.utils.Result;
 import com.huimv.guowei.admin.common.utils.ResultCode;
 import com.huimv.guowei.admin.entity.EnergyElectricity;
@@ -10,10 +14,13 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import javax.xml.crypto.Data;
 import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.math.RoundingMode;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.*;
 
 /**
  * <p>
@@ -67,4 +74,63 @@ public class EnergyElectricityServiceImpl extends ServiceImpl<EnergyElectricityM
         }
         return new Result(ResultCode.SUCCESS,energyElectricityList);
     }
+
+    @Override
+    public Result getScrrenElectricity(Map<String, String> paramsMap) {
+        String unitId = paramsMap.get("unitId");
+        String farmId = paramsMap.get("farmId");
+        Date timesmorning = DataUill.getTimesmorning();
+        Date timesMonthmorning = DataUill.getTimesMonthmorning();
+
+        Map resultMap = new HashMap();
+        //今日
+        QueryWrapper<EnergyElectricity> queryWrapper1 = new QueryWrapper<>();
+        queryWrapper1.eq("unit_id",unitId).eq("farm_id",farmId).ge("create_date",timesmorning);
+        BigDecimal dayElectricity = energyElectricityMapper.getElectricity(queryWrapper1);
+        //昨日
+        LocalDate yesterday = LocalDate.now().minusDays(1);
+        LocalDateTime startOfDay = yesterday.atStartOfDay();
+        LocalDateTime endOfDay = yesterday.atTime(LocalTime.MAX);
+        QueryWrapper<EnergyElectricity> queryWrapper2 = new QueryWrapper<>();
+        queryWrapper2.eq("unit_id",unitId).eq("farm_id",farmId).between("create_date",startOfDay,endOfDay);
+        BigDecimal lastDayElectricity = energyElectricityMapper.getElectricity(queryWrapper2);
+        //日环比
+        BigDecimal dayGap = dayElectricity.subtract(lastDayElectricity).divide(lastDayElectricity).multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.UP);
+
+        //本月
+        QueryWrapper<EnergyElectricity> queryWrapper3 = new QueryWrapper<>();
+        queryWrapper3.eq("unit_id",unitId).eq("farm_id",farmId).ge("create_date",timesMonthmorning);
+        BigDecimal monthElectricity = energyElectricityMapper.getElectricity(queryWrapper3);
+        //上月
+        Date lastMonthStartMorning = DataUill.getLastMonthStartMorning();
+        Date lastMonthEndNight = DataUill.getLastMonthEndNight();
+        QueryWrapper<EnergyElectricity> queryWrapper4 = new QueryWrapper<>();
+        queryWrapper4.eq("unit_id",unitId).eq("farm_id",farmId).between("create_date",lastMonthStartMorning,lastMonthEndNight);
+        BigDecimal lastMonthElectricity = energyElectricityMapper.getElectricity(queryWrapper4);
+        //月环比
+        BigDecimal monthGap = monthElectricity.subtract(lastMonthElectricity).divide(lastMonthElectricity).multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.UP);
+
+        resultMap.put("dayElectricity",dayElectricity);
+        resultMap.put("dayElectricityGap",dayGap+"%");
+        resultMap.put("monthElectricity",monthElectricity);
+        resultMap.put("monthElectricityGap",monthGap+"%");
+        return new Result(ResultCode.SUCCESS,resultMap);
+    }
+
+    @Override
+    public Result listScrrenElectricity(Map<String, String> paramsMap) {
+        String unitId = paramsMap.get("unitId");
+        String farmId = paramsMap.get("farmId");
+        String type = paramsMap.get("type");
+        List<EnergyElectricity> energyElectricityList;
+        //六个月
+        if ("1".equals(type)){
+            energyElectricityList = energyElectricityMapper.listSixMonthElectricity(farmId, unitId);
+        }
+        //七天
+        else {
+            energyElectricityList = energyElectricityMapper.listSevenDayElectricity(farmId, unitId);
+        }
+        return new Result(ResultCode.SUCCESS,energyElectricityList);
+    }
 }

+ 67 - 8
huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/EnvRegularCallFeedingServiceImpl.java

@@ -6,10 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.guowei.admin.common.utils.DataUill;
 import com.huimv.guowei.admin.common.utils.Result;
 import com.huimv.guowei.admin.common.utils.ResultCode;
-import com.huimv.guowei.admin.entity.DuckHealthInfo;
-import com.huimv.guowei.admin.entity.EnvMoveCall;
-import com.huimv.guowei.admin.entity.EnvRegularCallEgg;
-import com.huimv.guowei.admin.entity.EnvRegularCallFeeding;
+import com.huimv.guowei.admin.entity.*;
 import com.huimv.guowei.admin.mapper.EnvRegularCallFeedingMapper;
 import com.huimv.guowei.admin.service.IEnvRegularCallFeedingService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -17,10 +14,12 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.*;
 
 /**
  * <p>
@@ -120,4 +119,64 @@ public class EnvRegularCallFeedingServiceImpl extends ServiceImpl<EnvRegularCall
         return new Result(ResultCode.SUCCESS, feedingMapper.selectList(queryWrapper));
     }
 
+    @Override
+    public Result getScrrenFeed(Map<String, String> paramsMap) {
+        String unitId = paramsMap.get("unitId");
+        String farmId = paramsMap.get("farmId");
+        Date timesmorning = DataUill.getTimesmorning();
+        Date timesMonthmorning = DataUill.getTimesMonthmorning();
+
+        Map resultMap = new HashMap();
+        //今日
+        QueryWrapper<EnvRegularCallFeeding> queryWrapper1 = new QueryWrapper<>();
+        queryWrapper1.eq("d.unit_id",unitId).eq("f.farm_id",farmId).ge("f.call_date",timesmorning);
+        BigDecimal dayFeed = feedingMapper.getFeed(queryWrapper1);
+        //昨日
+        LocalDate yesterday = LocalDate.now().minusDays(1);
+        LocalDateTime startOfDay = yesterday.atStartOfDay();
+        LocalDateTime endOfDay = yesterday.atTime(LocalTime.MAX);
+        QueryWrapper<EnvRegularCallFeeding> queryWrapper2 = new QueryWrapper<>();
+        queryWrapper2.eq("d.unit_id",unitId).eq("f.farm_id",farmId).between("f.call_date",startOfDay,endOfDay);
+        BigDecimal lastDayFeed = feedingMapper.getFeed(queryWrapper2);
+        //日环比
+        BigDecimal dayGap = dayFeed.subtract(lastDayFeed).divide(lastDayFeed).multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.UP);
+
+        //本月
+        QueryWrapper<EnvRegularCallFeeding> queryWrapper3 = new QueryWrapper<>();
+        queryWrapper3.eq("d.unit_id",unitId).eq("f.farm_id",farmId).ge("f.call_date",timesMonthmorning);
+        BigDecimal monthFeed = feedingMapper.getFeed(queryWrapper3);
+        //上月
+        Date lastMonthStartMorning = DataUill.getLastMonthStartMorning();
+        Date lastMonthEndNight = DataUill.getLastMonthEndNight();
+        QueryWrapper<EnvRegularCallFeeding> queryWrapper4 = new QueryWrapper<>();
+        queryWrapper4.eq("d.unit_id",unitId).eq("f.farm_id",farmId).between("f.call_date",lastMonthStartMorning,lastMonthEndNight);
+        BigDecimal lastMonthFeed = feedingMapper.getFeed(queryWrapper4);
+        //月环比
+        BigDecimal monthGap = monthFeed.subtract(lastMonthFeed).divide(lastMonthFeed).multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.UP);
+
+        resultMap.put("dayFeed",dayFeed);
+        resultMap.put("dayFeedGap",dayGap+"%");
+        resultMap.put("monthFeed",monthFeed);
+        resultMap.put("monthFeedGap",monthGap+"%");
+
+        return new Result(ResultCode.SUCCESS,resultMap);
+    }
+
+    @Override
+    public Result listScrrenFeed(Map<String, String> paramsMap) {
+        String unitId = paramsMap.get("unitId");
+        String farmId = paramsMap.get("farmId");
+        String type = paramsMap.get("type");
+        List<EnvRegularCallFeeding> envRegularCallFeedingList;
+        //六个月
+        if ("1".equals(type)){
+            envRegularCallFeedingList = feedingMapper.listSixMonthFeed(farmId, unitId);
+        }
+        //七天
+        else {
+            envRegularCallFeedingList = feedingMapper.listSevenDayFeed(farmId, unitId);
+        }
+        return new Result(ResultCode.SUCCESS,envRegularCallFeedingList);
+    }
+
 }

+ 19 - 0
huimv-admin/src/main/resources/com/huimv/guowei/admin/mapper/EnergyElectricityMapper.xml

@@ -54,4 +54,23 @@
         WHERE farm_id = #{farmId}
         AND create_date BETWEEN (SELECT DATE_ADD(CURDATE(),INTERVAL -DAY(CURDATE())+1 DAY)) AND NOW()
     </select>
+
+    <select id="getElectricity" resultType="java.math.BigDecimal">
+        SELECT ROUND(SUM(electricity_value),2) 'electricityValue' FROM `energy_electricity`
+        ${ew.customSqlSegment}
+    </select>
+
+    <select id="listSixMonthElectricity" resultType="com.huimv.guowei.admin.entity.EnergyElectricity">
+        SELECT ROUND(SUM(electricity_value),2) 'electricityValue', create_date FROM `energy_electricity`
+        WHERE farm_id = #{farmId} and unit_id = #{unitId}
+        AND create_date &gt;= DATE_SUB(NOW(), INTERVAL 6 MONTH)
+        GROUP BY DATE_FORMAT(create_date,"%Y-%m")
+    </select>
+
+    <select id="listSevenDayElectricity" resultType="com.huimv.guowei.admin.entity.EnergyElectricity">
+        SELECT ROUND(SUM(electricity_value),2) 'electricityValue', create_date FROM `energy_electricity`
+        WHERE farm_id = #{farmId} and unit_id = #{unitId}
+        AND create_date &gt;= DATE_SUB(CURDATE(), INTERVAL 6 DAY)
+        GROUP BY DATE_FORMAT(create_date,"%Y-%m-%d")
+    </select>
 </mapper>

+ 2 - 0
huimv-admin/src/main/resources/com/huimv/guowei/admin/mapper/EnergyWaterMapper.xml

@@ -100,5 +100,7 @@
     WHERE chip_code IN (1001, 1002, 1003, 1004) AND farm_id = #{farmId} AND create_date BETWEEN '${startDate}' AND '${endDate}'
     GROUP BY DATE_FORMAT(create_date,"%Y-%m-%d")
     </select>
+    
+    <select id="listWaterLineSixMonth"
 
 </mapper>

+ 22 - 0
huimv-admin/src/main/resources/com/huimv/guowei/admin/mapper/EnvRegularCallFeedingMapper.xml

@@ -27,4 +27,26 @@
         GROUP BY DATE_FORMAT(call_date,'%Y-%m-%d')
         ORDER BY call_date ASC
     </select>
+
+    <select id="getFeed" resultType="java.math.BigDecimal">
+        SELECT ROUND(SUM(f.duck_weight),2) 'duckWeight' FROM `env_regular_call_feeding` f
+        LEFT JOIN `base_duck_info` d ON f.duck_id = d.id
+        ${ew.customSqlSegment}
+    </select>
+
+    <select id="listSixMonthFeed" resultType="com.huimv.guowei.admin.entity.EnvRegularCallFeeding">
+        SELECT ROUND(SUM(f.duck_weight),2) 'duckWeight', f.call_date FROM `env_regular_call_feeding` f
+        LEFT JOIN `base_duck_info` d ON f.duck_id = d.id
+        WHERE f.farm_id = #{farmId} and d.unit_id = #{unitId}
+        AND f.call_date &gt;= DATE_SUB(NOW(), INTERVAL 6 MONTH)
+        GROUP BY DATE_FORMAT(f.call_date,"%Y-%m")
+    </select>
+
+    <select id="listSevenDayFeed" resultType="com.huimv.guowei.admin.entity.EnvRegularCallFeeding">
+        SELECT ROUND(SUM(f.duck_weight),2) 'duckWeight', f.call_date FROM `env_regular_call_feeding` f
+        LEFT JOIN `base_duck_info` d ON f.duck_id = d.id
+        WHERE f.farm_id = #{farmId} and d.unit_id = #{unitId}
+        AND f.call_date &gt;= DATE_SUB(CURDATE(), INTERVAL 6 DAY)
+        GROUP BY DATE_FORMAT(f.call_date,"%Y-%m-%d")
+    </select>
 </mapper>