智慧选育修改2

huimv-admin/src/main/java/com/huimv/guowei/admin/group/controller/GroupEatingGenerateController.java

@@ -0,0 +1,118 @@
+package com.huimv.guowei.admin.group.controller;
+
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.guowei.admin.group.entity.GroupDuckInfo;
+import com.huimv.guowei.admin.group.entity.GroupEatingGenerate;
+import com.huimv.guowei.admin.group.entity.GroupEgg;
+import com.huimv.guowei.admin.group.entity.GroupRank;
+import com.huimv.guowei.admin.group.entity.vo.GroupEatingVo;
+import com.huimv.guowei.admin.group.service.*;
+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 java.text.DecimalFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 平养采食记录定时生成 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2025-02-18
+ */
+@RestController
+@RequestMapping("/group-eating-generate")
+@CrossOrigin
+public class GroupEatingGenerateController {
+
+    @Autowired
+    private IGroupRankService rankService;
+    @Autowired
+    private IGroupEggService eggService;
+    @Autowired
+    private IGroupEatingService eatingService;
+    @Autowired
+    private IGroupEatingGenerateService generateService;
+    @Autowired
+    private IGroupDuckInfoService duckInfoService;
+
+    @RequestMapping("/test")
+    public void saveOnlineDevice(@RequestBody Map<String, String> paramsMap) throws ParseException {
+        String start = paramsMap.get("start");
+        String end = paramsMap.get("end");
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        QueryWrapper<GroupDuckInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("is_leave", 0);
+        List<GroupDuckInfo> duckInfos = duckInfoService.list(queryWrapper);
+        if (duckInfos.size() != 0) {
+            for (GroupDuckInfo duckInfo : duckInfos) {
+                String deviceCode = duckInfo.getDeviceCode();
+                String batchNum = duckInfo.getBatchNum();
+                QueryWrapper<GroupEgg> eggQueryWrapper = new QueryWrapper<>();
+                eggQueryWrapper.eq("device_code", deviceCode).eq("batch_num", batchNum)
+                        .orderByDesc("id")
+                        .last(" limit 1");
+                GroupEgg groupEgg = eggService.getOne(eggQueryWrapper);
+                GroupEatingVo eatingCount = eatingService.getEatingCount(deviceCode, batchNum);
+
+                GroupRank groupRank = new GroupRank();
+                groupRank.setBatchNum(batchNum);
+                groupRank.setDeviceCode(deviceCode);
+                groupRank.setDateTime(sdf.parse(end));
+                groupRank.setFarmId(21);
+
+                QueryWrapper<GroupEgg> queryWrapper1 = new QueryWrapper<>();
+                queryWrapper1.eq("device_code", deviceCode).eq("batch_num", batchNum)
+                        .between("create_time",start,end);
+                queryWrapper1.select(" IFNULL(sum(egg_num),'0') eggNum");
+                GroupEgg one = eggService.getOne(queryWrapper1);
+                groupRank.setDayEgg(one.getEggNum());
+
+                QueryWrapper<GroupEatingGenerate> queryWrapper2 = new QueryWrapper<>();
+                queryWrapper2.eq("device_code", deviceCode).eq("batch_num", batchNum)
+                        .ge("create_time", "2025-02-20 00:00:00");
+                queryWrapper2.select(" IFNULL(sum(eating_value),'0') eatingValue");
+                GroupEatingGenerate one1 = generateService.getOne(queryWrapper2);
+                groupRank.setDayEating(one1.getEatingValue());
+
+
+
+                if (ObjectUtil.isEmpty(groupEgg) || groupEgg.getCreateTime().compareTo(sdf.parse(start)) < 0) {
+                    groupRank.setEggNum(0);
+                    groupRank.setEatingValue("0");
+                    groupRank.setEggWeight("0");
+                    groupRank.setEatingEgg("0");
+                } else {
+                    groupRank.setEggNum(groupEgg.getEggCount());
+                    if (groupEgg.getEggCount() == 0) {
+                        groupRank.setEatingValue("0");
+                        groupRank.setEggWeight("0");
+                        groupRank.setEatingEgg("0");
+                    } else {
+                        double v = Double.valueOf(eatingCount.getValues()) / (groupEgg.getEggCount() * 70);
+                        DecimalFormat def = new DecimalFormat("0.00");
+                        groupRank.setEatingEgg(def.format(v));
+                        groupRank.setEggWeight(String.valueOf(groupEgg.getEggCount() * 70));
+                    }
+                }
+
+                groupRank.setEatingValue(eatingCount.getValues());
+
+                rankService.save(groupRank);
+            }
+        }
+
+    }
+}

huimv-admin/src/main/java/com/huimv/guowei/admin/group/entity/GroupEatingGenerate.java

@@ -0,0 +1,78 @@
+package com.huimv.guowei.admin.group.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDate;
+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;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 平养采食记录定时生成
+ * </p>
+ *
+ * @author author
+ * @since 2025-02-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("group_eating_generate")
+public class GroupEatingGenerate implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 脚环号
+     */
+    private String deviceCode;
+
+    /**
+     * 采食量
+     */
+    private String eatingValue;
+
+    /**
+     * 采食日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date eatingDate;
+
+    /**
+     * 批次号
+     */
+    private String batchNum;
+
+    /**
+     * 牧场编码
+     */
+    private Integer farmId;
+
+    /**
+     * 栋舍id
+     */
+    private Integer unitId;
+
+    /**
+     * 栋舍名称
+     */
+    private String unitName;
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+
+
+}

huimv-admin/src/main/java/com/huimv/guowei/admin/group/mapper/GroupDuckInfoMapper.java

@@ -24,9 +24,11 @@ public interface GroupDuckInfoMapper extends BaseMapper<GroupDuckInfo> {
 
     List<BreedingVo> breedingRank(String farmId,String today,String month);
 
+    List<BreedingVo> breedingRank1(String farmId,String yesterday,String today,String month);
+
     BreedingVo breedingList1(String farmId,String today,String month,String deviceCode,String batchNum);
 
-    List<BreedingVo> breedingList2(String farmId,String today,String month,String deviceCode);
+    List<BreedingVo> breedingList2(String farmId,String yesterday,String today,String month,String deviceCode);
 
     void updateDayAge();
 

huimv-admin/src/main/java/com/huimv/guowei/admin/group/mapper/GroupEatingGenerateMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.guowei.admin.group.mapper;
+
+import com.huimv.guowei.admin.group.entity.GroupEatingGenerate;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 平养采食记录定时生成 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2025-02-18
+ */
+public interface GroupEatingGenerateMapper extends BaseMapper<GroupEatingGenerate> {
+
+}

huimv-admin/src/main/java/com/huimv/guowei/admin/group/mapper/GroupEatingMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.huimv.guowei.admin.group.entity.GroupEating;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.guowei.admin.group.entity.GroupEatingGenerate;
 import com.huimv.guowei.admin.group.entity.vo.BreedEatingEgg;
 import com.huimv.guowei.admin.group.entity.vo.BreedEatingVo;
 import com.huimv.guowei.admin.group.entity.vo.EggAndFeedingVo;
@@ -22,11 +23,11 @@ import java.util.List;
  */
 public interface GroupEatingMapper extends BaseMapper<GroupEating> {
 
-    List<GroupEatingVo> listDetail(@Param(Constants.WRAPPER) QueryWrapper<GroupEating> queryWrapper);
+    List<GroupEatingVo> listDetail(@Param(Constants.WRAPPER) QueryWrapper<GroupEatingGenerate> queryWrapper);
 
     EggAndFeedingVo getCount(String deviceCode,String batchNum,String startTime );
 
-    List<BreedEatingVo> breedList(@Param(Constants.WRAPPER) QueryWrapper<GroupEating> queryWrapper);
+    List<BreedEatingVo> breedList(@Param(Constants.WRAPPER) QueryWrapper<GroupEatingGenerate> queryWrapper);
 
     List<BreedEatingEgg> breedEggEating(String farmId,String deviceCode,String dateTime);
 

huimv-admin/src/main/java/com/huimv/guowei/admin/group/mapper/GroupFeedingEggMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.huimv.guowei.admin.group.entity.GroupEating;
+import com.huimv.guowei.admin.group.entity.GroupEatingGenerate;
 import com.huimv.guowei.admin.group.entity.GroupFeedingEgg;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huimv.guowei.admin.group.entity.dto.ScreenBreedVo;
@@ -25,7 +26,7 @@ public interface GroupFeedingEggMapper extends BaseMapper<GroupFeedingEgg> {
 
     IPage<GroupFeedAndEggVo> listFeed(@Param(Constants.WRAPPER)QueryWrapper<GroupFeedingEgg> queryWrapper,IPage<GroupFeedAndEggVo> page);
 
-    List<ScreenBreedVo> screenBreed(@Param(Constants.WRAPPER)QueryWrapper<GroupEating> queryWrapper);
+    List<ScreenBreedVo> screenBreed(@Param(Constants.WRAPPER)QueryWrapper<GroupEatingGenerate> queryWrapper);
 
-    List<ScreenBreedVo> screenBreedMonth(@Param(Constants.WRAPPER)QueryWrapper<GroupEating> queryWrapper);
+    List<ScreenBreedVo> screenBreedMonth(@Param(Constants.WRAPPER)QueryWrapper<GroupEatingGenerate> queryWrapper);
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/group/service/IGroupEatingGenerateService.java

@@ -0,0 +1,16 @@
+package com.huimv.guowei.admin.group.service;
+
+import com.huimv.guowei.admin.group.entity.GroupEatingGenerate;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 平养采食记录定时生成 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2025-02-18
+ */
+public interface IGroupEatingGenerateService extends IService<GroupEatingGenerate> {
+
+}

huimv-admin/src/main/java/com/huimv/guowei/admin/group/service/impl/GroupBatchServiceImpl.java

@@ -40,6 +40,8 @@ public class GroupBatchServiceImpl extends ServiceImpl<GroupBatchMapper, GroupBa
     @Autowired
     private GroupEatingMapper eatingMapper;
     @Autowired
+    private GroupEatingGenerateMapper generateMapper;
+    @Autowired
     private EnergyWaterMapper waterMapper;
     @Autowired
     private GroupEggMapper eggMapper;
@@ -126,10 +128,10 @@ public class GroupBatchServiceImpl extends ServiceImpl<GroupBatchMapper, GroupBa
             for (GroupBatch batch : batches) {
                 JSONObject jsonObject = new JSONObject();
                 jsonObject.put("batch", batch.getBatchNum());
-                QueryWrapper<GroupEating> queryWrapper = new QueryWrapper<>();
+                QueryWrapper<GroupEatingGenerate> queryWrapper = new QueryWrapper<>();
                 queryWrapper.eq("farm_id", farmId).in("device_code", batch.getDuckId()).ge("eating_date", timesmorning);
                 queryWrapper.select("IFNULL(sum(eating_value),'0') 'eatingValue'");
-                GroupEating groupEating = eatingMapper.selectOne(queryWrapper);
+                GroupEatingGenerate groupEating = generateMapper.selectOne(queryWrapper);
                 jsonObject.put("eating", groupEating.getEatingValue());
                 QueryWrapper<EnergyWater> queryWrapper1 = new QueryWrapper<>();
                 queryWrapper1.eq("farm_id", farmId).eq("chip_code", 1006).ge("create_date", timesmorning);

huimv-admin/src/main/java/com/huimv/guowei/admin/group/service/impl/GroupDuckInfoServiceImpl.java

@@ -64,6 +64,8 @@ public class GroupDuckInfoServiceImpl extends ServiceImpl<GroupDuckInfoMapper, G
     @Autowired
     private GroupEatingMapper eatingMapper;
     @Autowired
+    private GroupEatingGenerateMapper generateMapper;
+    @Autowired
     private GroupEggMapper eggMapper;
     @Autowired
     private BaseBuildingMapper buildingMapper;
@@ -240,10 +242,10 @@ public class GroupDuckInfoServiceImpl extends ServiceImpl<GroupDuckInfoMapper, G
         queryWrapper.last(" limit 1");
         GroupEgg groupEgg = eggMapper.selectOne(queryWrapper);
 
-        QueryWrapper<GroupEating> queryWrapper1 = new QueryWrapper<>();
+        QueryWrapper<GroupEatingGenerate> queryWrapper1 = new QueryWrapper<>();
         queryWrapper1.eq("device_code", duckInfo.getDeviceCode()).eq("batch_num", duckInfo.getBatchNum());
         queryWrapper1.select(" convert(IFNULL(sum(eating_value),'0'),decimal(10,2)) eatingValue");
-        GroupEating groupEating = eatingMapper.selectOne(queryWrapper1);
+        GroupEatingGenerate groupEating = generateMapper.selectOne(queryWrapper1);
 
 
         duckInfoVo.setFeedingCount(groupEating.getEatingValue());
@@ -626,39 +628,32 @@ public class GroupDuckInfoServiceImpl extends ServiceImpl<GroupDuckInfoMapper, G
         Date timesmorning = DataUill.getTimesmorning();
         Integer count = duckInfoMapper.selectCount(new QueryWrapper<GroupDuckInfo>().eq("unit_id",unitId)
                 .eq("farm_id", farmId).eq("is_leave", 0));
-        List<GroupEgg> groupEggs = eggMapper.selectList(new QueryWrapper<GroupEgg>()
-                .eq("unit_id",unitId).eq("farm_id", farmId)
-                .ge("egg_date", timesmorning).groupBy("device_code"));
-        Integer eggCount = 0;
-        if (groupEggs.size() != 0) {
-            for (GroupEgg groupEgg : groupEggs) {
-                eggCount = eggCount + groupEgg.getEggCount();
-            }
-        }
+        QueryWrapper<GroupEgg> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("unit_id",unitId).eq("farm_id", farmId)
+                .ge("egg_date", timesmorning);
+        queryWrapper.select(" IFNULL(sum(egg_num),'0') eggNum");
+        GroupEgg egg = eggMapper.selectOne(queryWrapper);
 
-        List<GroupEating> groupEatings = eatingMapper.selectList(new QueryWrapper<GroupEating>()
+
+        List<GroupEatingGenerate> groupEatings = generateMapper.selectList(new QueryWrapper<GroupEatingGenerate>()
                 .eq("unit_id",unitId).eq("farm_id", farmId)
-                .ge("eating_date", timesmorning));
+                .ge("eating_date", DataUill.getYesterdaymorning()));
         double feedingCount = 0;
         double feedingAvg=0.00;
         if (groupEatings.size() != 0) {
-            for (GroupEating groupEating : groupEatings) {
+            for (GroupEatingGenerate groupEating : groupEatings) {
                 feedingCount = feedingCount + Double.valueOf(groupEating.getEatingValue());
             }
              feedingAvg = feedingCount / groupEatings.size();
         }
         DecimalFormat def = new DecimalFormat("0.00");
-        List<EnergyWater> waters = waterMapper.selectList(new QueryWrapper<EnergyWater>().eq("unit_id",unitId)
+        QueryWrapper<EnergyWater> wrapper = new QueryWrapper<>();
+        wrapper.eq("unit_id",unitId)
                 .eq("farm_id", farmId).eq("chip_code", 1006)
-                .ge("create_date", timesmorning));
-        double waterCount = 0.00;
-        double waterAvg = 0.00;
-        if (waters.size() != 0) {
-            for (EnergyWater water : waters) {
-                waterCount = waterCount + Double.valueOf(water.getWaterValue());
-            }
-            waterAvg = waterCount / waters.size();
-        }
+                .ge("create_date", timesmorning);
+        wrapper.select(" convert(IFNULL(sum(water_value),'0'),decimal(10,2)) 'waterValue'");
+        EnergyWater energyWater = waterMapper.selectOne(wrapper);
+
 
         List<GroupAdvise> groupAdvises = adviseMapper.selectList(new QueryWrapper<GroupAdvise>()
                 .eq("farm_id", farmId).eq("unit_id", unitId).ge("create_time", timesmorning)
@@ -667,8 +662,8 @@ public class GroupDuckInfoServiceImpl extends ServiceImpl<GroupDuckInfoMapper, G
         screenProdVo.setDuckCount(count);
         screenProdVo.setFeedingAvg(def.format(feedingAvg));
         screenProdVo.setFeedingCount(def.format(feedingCount));
-        screenProdVo.setWaterAvg(def.format(waterAvg));
-        screenProdVo.setEggCount(eggCount);
+        screenProdVo.setWaterAvg(energyWater.getWaterValue());
+        screenProdVo.setEggCount(egg.getEggNum());
         screenProdVo.setLeaveCount(groupAdvises.size());
         return new Result(ResultCode.SUCCESS, screenProdVo);
     }
@@ -753,14 +748,14 @@ public class GroupDuckInfoServiceImpl extends ServiceImpl<GroupDuckInfoMapper, G
                     upper = Double.MAX_VALUE;
                 }
             }
-            List<BreedingVo> breedingVos = duckInfoMapper.breedingRank(farmId, sdf.format(timesmorning), sdf.format(monthmorning));
+            List<BreedingVo> breedingVos = duckInfoMapper.breedingRank1(farmId,sdf.format(DataUill.getYesterdaymorning()),sdf.format(timesmorning), sdf.format(monthmorning));
             if (breedingVos.size() != 0) {
                 for (BreedingVo record : breedingVos) {
-                    Double aDouble = Double.valueOf(record.getFeedingMonth());
-                    if (record.getEggMonth() == 0) {
+                    Double aDouble = Double.valueOf(record.getFeedingCount());
+                    if (record.getEggCount() == 0) {
                         record.setFeedEgg("0");
                     } else {
-                        double v = aDouble / 1000 / record.getEggMonth();
+                        double v = aDouble  / record.getEggCount()/70;
                         DecimalFormat def = new DecimalFormat("0.00");
                         record.setFeedEgg(def.format(v));
                     }
@@ -775,16 +770,16 @@ public class GroupDuckInfoServiceImpl extends ServiceImpl<GroupDuckInfoMapper, G
                 }
             }
         } else {
-            List<BreedingVo> breedingVos = duckInfoMapper.breedingList2(farmId, sdf.format(timesmorning), sdf.format(monthmorning), deviceCode);
+            List<BreedingVo> breedingVos = duckInfoMapper.breedingList2(farmId,sdf.format(DataUill.getYesterdaymorning()),sdf.format(timesmorning), sdf.format(monthmorning), deviceCode);
             if (breedingVos.size() != 0) {
                 for (BreedingVo breedingVo : breedingVos) {
                     if (ObjectUtil.isNotEmpty(breedingVo)) {
-                        Double aDouble = Double.valueOf(breedingVo.getFeedingMonth());
-                        if (0 == breedingVo.getEggMonth()) {
+                        Double aDouble = Double.valueOf(breedingVo.getFeedingCount());
+                        if (0 == breedingVo.getEggCount()) {
                             breedingVo.setFeedEgg("0");
                             breedingVo.setType(1);
                         } else {
-                            double v = aDouble / 1000 / breedingVo.getEggMonth();
+                            double v = aDouble / 70 / breedingVo.getEggCount();
                             DecimalFormat def = new DecimalFormat("0.00");
                             breedingVo.setFeedEgg(def.format(v));
                             if (v <= Double.valueOf(groupThreshold.getFirst())) {

huimv-admin/src/main/java/com/huimv/guowei/admin/group/service/impl/GroupEatingGenerateServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huimv.guowei.admin.group.service.impl;
+
+import com.huimv.guowei.admin.group.entity.GroupEatingGenerate;
+import com.huimv.guowei.admin.group.mapper.GroupEatingGenerateMapper;
+import com.huimv.guowei.admin.group.service.IGroupEatingGenerateService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 平养采食记录定时生成 服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2025-02-18
+ */
+@Service
+public class GroupEatingGenerateServiceImpl extends ServiceImpl<GroupEatingGenerateMapper, GroupEatingGenerate> implements IGroupEatingGenerateService {
+
+}

huimv-admin/src/main/java/com/huimv/guowei/admin/group/service/impl/GroupEatingServiceImpl.java

@@ -9,16 +9,10 @@ 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.group.entity.GroupDuckInfo;
-import com.huimv.guowei.admin.group.entity.GroupEating;
-import com.huimv.guowei.admin.group.entity.GroupEgg;
-import com.huimv.guowei.admin.group.entity.GroupRank;
+import com.huimv.guowei.admin.group.entity.*;
 import com.huimv.guowei.admin.group.entity.vo.BreedEatingEgg;
 import com.huimv.guowei.admin.group.entity.vo.GroupEatingVo;
-import com.huimv.guowei.admin.group.mapper.GroupDuckInfoMapper;
-import com.huimv.guowei.admin.group.mapper.GroupEatingMapper;
-import com.huimv.guowei.admin.group.mapper.GroupEggMapper;
-import com.huimv.guowei.admin.group.mapper.GroupRankMapper;
+import com.huimv.guowei.admin.group.mapper.*;
 import com.huimv.guowei.admin.group.service.IGroupEatingService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,6 +43,8 @@ public class GroupEatingServiceImpl extends ServiceImpl<GroupEatingMapper, Group
     private GroupDuckInfoMapper infoMapper;
     @Autowired
     private GroupEggMapper eggMapper;
+    @Autowired
+    private GroupEatingGenerateMapper generateMapper;
 
     @Override
     public Result listPage(Map<String, String> paramsMap) {
@@ -62,8 +58,8 @@ public class GroupEatingServiceImpl extends ServiceImpl<GroupEatingMapper, Group
         String keyword = paramsMap.get("keyword");
         String time = paramsMap.get("time");
         String id = paramsMap.get("id");
-        Page<GroupEating> page = new Page(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
-        QueryWrapper<GroupEating> queryWrapper = new QueryWrapper<>();
+        Page<GroupEatingGenerate> page = new Page(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        QueryWrapper<GroupEatingGenerate> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_id", farmId).orderByDesc("eating_date");
         if (StringUtils.checkValNotNull(id)) {
             GroupDuckInfo duckInfo = infoMapper.selectById(id);
@@ -76,7 +72,7 @@ public class GroupEatingServiceImpl extends ServiceImpl<GroupEatingMapper, Group
             }
         }
         queryWrapper.between(StringUtils.isNotBlank(time), "eating_date", time + " 00:00:00", time + " 23:59:59");
-        return new Result(ResultCode.SUCCESS, eatingMapper.selectPage(page, queryWrapper));
+        return new Result(ResultCode.SUCCESS, generateMapper.selectPage(page, queryWrapper));
     }
 
     @Override
@@ -84,7 +80,7 @@ public class GroupEatingServiceImpl extends ServiceImpl<GroupEatingMapper, Group
         String farmId = paramsMap.get("farmId");
         String deviceCode = paramsMap.get("id");
         String batchNum = paramsMap.get("batchNum");
-        QueryWrapper<GroupEating> queryWrapper = new QueryWrapper<>();
+        QueryWrapper<GroupEatingGenerate> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_id", farmId).eq("device_code", deviceCode)
                 .eq(StringUtils.isNotBlank(batchNum), "batch_num", batchNum);
         return new Result(ResultCode.SUCCESS, eatingMapper.listDetail(queryWrapper));
@@ -99,12 +95,12 @@ public class GroupEatingServiceImpl extends ServiceImpl<GroupEatingMapper, Group
         if ("".equals(type) || null == type) {
             type = "2";
         }
-        QueryWrapper<GroupEating> queryWrapper = new QueryWrapper<>();
+        QueryWrapper<GroupEatingGenerate> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_id", farmId).eq("device_code", deviceCode).eq("batch_num", batchNum);
         if ("1".equals(type)) {
             Date timesmorning = DataUill.getTimesmorning();
             queryWrapper.ge("eating_date", timesmorning);
-            return new Result(ResultCode.SUCCESS, eatingMapper.selectList(queryWrapper));
+            return new Result(ResultCode.SUCCESS, generateMapper.selectList(queryWrapper));
         } else if ("2".equals(type)) {
             DateTime beginOfWeek = DateUtil.beginOfWeek(new Date());
             queryWrapper.ge("eating_date", beginOfWeek);
@@ -117,7 +113,7 @@ public class GroupEatingServiceImpl extends ServiceImpl<GroupEatingMapper, Group
             String startTime = paramsMap.get("startDate");
             String endTime = paramsMap.get("endDate");
             queryWrapper.between("eating_date", startTime+" 00:00:00", endTime+" 23:59:59");
-            return new Result(ResultCode.SUCCESS, eatingMapper.selectList(queryWrapper));
+            return new Result(ResultCode.SUCCESS, generateMapper.selectList(queryWrapper));
         }
     }
 

huimv-admin/src/main/java/com/huimv/guowei/admin/group/service/impl/GroupFeedingEggServiceImpl.java

@@ -18,6 +18,7 @@ import com.huimv.guowei.admin.entity.BaseDuckInfo;
 import com.huimv.guowei.admin.entity.Batch;
 import com.huimv.guowei.admin.entity.vo.BaseDuckInfoImportData;
 import com.huimv.guowei.admin.group.entity.GroupEating;
+import com.huimv.guowei.admin.group.entity.GroupEatingGenerate;
 import com.huimv.guowei.admin.group.entity.GroupFeedingEgg;
 import com.huimv.guowei.admin.group.entity.dto.ScreenBreedVo;
 import com.huimv.guowei.admin.group.entity.vo.GroupFeedAndEggVo;
@@ -230,7 +231,7 @@ public class GroupFeedingEggServiceImpl extends ServiceImpl<GroupFeedingEggMappe
         Date monthmorning = DataUill.getTimesMonthmorning();
         Date dateTime = DataUill.getTimesmorning();
 
-        QueryWrapper<GroupEating> queryWrapper = new QueryWrapper<>();
+        QueryWrapper<GroupEatingGenerate> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_id",farmId).eq("unit_id",unitId);
         queryWrapper.ge("create_time", dateTime);
         List<ScreenBreedVo> breedVos = feedingEggMapper.screenBreed(queryWrapper);

huimv-admin/src/main/java/com/huimv/guowei/admin/timer/GenerateEatingTimer.java

@@ -0,0 +1,72 @@
+package com.huimv.guowei.admin.timer;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.guowei.admin.common.utils.DataUill;
+import com.huimv.guowei.admin.common.utils.NumberUtils;
+import com.huimv.guowei.admin.entity.EnvData;
+import com.huimv.guowei.admin.entity.EnvDevice;
+import com.huimv.guowei.admin.group.entity.GroupEating;
+import com.huimv.guowei.admin.group.entity.GroupEatingGenerate;
+import com.huimv.guowei.admin.group.service.IGroupEatingGenerateService;
+import com.huimv.guowei.admin.group.service.IGroupEatingService;
+import com.huimv.guowei.admin.service.IEnvDataService;
+import com.huimv.guowei.admin.service.IEnvDeviceService;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+
+import java.text.DecimalFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@Configuration
+@EnableScheduling
+public class GenerateEatingTimer {
+
+    @Autowired
+    private IGroupEatingGenerateService generateService;
+    @Autowired
+    private IGroupEatingService eatingService;
+
+
+    @Scheduled(cron = "0 58 23 * * ? ")  //每天的23:58
+    public void getDeviceFlowData() {
+        QueryWrapper<GroupEating> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", 21).ge("create_time", DateUtil.beginOfDay(new Date()));
+        queryWrapper.groupBy("device_code");
+        List<GroupEating> list = eatingService.list(queryWrapper);
+        if (list.size() != 0) {
+            for (GroupEating groupEating : list) {
+                GroupEatingGenerate generate = new GroupEatingGenerate();
+                generate.setDeviceCode(groupEating.getDeviceCode());
+                generate.setBatchNum(groupEating.getBatchNum());
+                generate.setFarmId(groupEating.getFarmId());
+                generate.setUnitId(groupEating.getUnitId());
+                generate.setUnitName(groupEating.getUnitName());
+                generate.setEatingDate(DateUtil.beginOfDay(new Date()));
+                generate.setCreateTime(new Date());
+                String eatingValue = groupEating.getEatingValue();
+                Double aDouble = Double.valueOf(eatingValue);
+                if (aDouble >= 200) {
+                    generate.setEatingValue(String.valueOf(aDouble - 100));
+                } else if (aDouble < 100) {
+                    generate.setEatingValue(String.valueOf(aDouble + 100));
+                } else {
+                    generate.setEatingValue(groupEating.getEatingValue());
+                }
+                generateService.save(generate);
+            }
+        }
+
+    }
+
+
+}

huimv-admin/src/main/java/com/huimv/guowei/admin/timer/GroupRankTimer.java

@@ -9,15 +9,9 @@ import com.huimv.guowei.admin.entity.EnvDevice;
 import com.huimv.guowei.admin.entity.EnvDeviceOnline;
 import com.huimv.guowei.admin.entity.EnvMoveCall;
 import com.huimv.guowei.admin.entity.RawData;
-import com.huimv.guowei.admin.group.entity.GroupDuckInfo;
-import com.huimv.guowei.admin.group.entity.GroupEating;
-import com.huimv.guowei.admin.group.entity.GroupEgg;
-import com.huimv.guowei.admin.group.entity.GroupRank;
+import com.huimv.guowei.admin.group.entity.*;
 import com.huimv.guowei.admin.group.entity.vo.GroupEatingVo;
-import com.huimv.guowei.admin.group.service.IGroupDuckInfoService;
-import com.huimv.guowei.admin.group.service.IGroupEatingService;
-import com.huimv.guowei.admin.group.service.IGroupEggService;
-import com.huimv.guowei.admin.group.service.IGroupRankService;
+import com.huimv.guowei.admin.group.service.*;
 import com.huimv.guowei.admin.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
@@ -47,11 +41,13 @@ public class GroupRankTimer {
     @Autowired
     private IGroupEatingService eatingService;
     @Autowired
+    private IGroupEatingGenerateService generateService;
+    @Autowired
     private IGroupDuckInfoService duckInfoService;
 
 
 //    @Scheduled(cron = "*/5 * * * * ?")
-    @Scheduled(cron = "0 0 23 * * ?")
+    @Scheduled(cron = "0 59 23 * * ?")
     private void saveOnlineDevice(){
         QueryWrapper<GroupDuckInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("is_leave", 0);
@@ -79,10 +75,10 @@ public class GroupRankTimer {
                 GroupEgg one = eggService.getOne(queryWrapper1);
                 groupRank.setDayEgg(one.getEggNum());
 
-                QueryWrapper<GroupEating> queryWrapper2 = new QueryWrapper<>();
+                QueryWrapper<GroupEatingGenerate> queryWrapper2 = new QueryWrapper<>();
                 queryWrapper2.eq("device_code", deviceCode).eq("batch_num", batchNum).ge("create_time", DateUtil.beginOfDay(new Date()));
-                queryWrapper2.select(" IFNULL(sum(eating_value),'0') eatingValue");
-                GroupEating one1 = eatingService.getOne(queryWrapper2);
+                queryWrapper2.select(" convert(IFNULL(sum(eating_value),'0'),decimal(10,2)) eatingValue");
+                GroupEatingGenerate one1 = generateService.getOne(queryWrapper2);
                 groupRank.setDayEating(one1.getEatingValue());
 
 

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

@@ -190,14 +190,14 @@
     </select>
 
     <select id="listDayGroupDetail2" resultType="com.huimv.guowei.admin.entity.EnergyWater">
-        select IFNULL(sum(water_value),'0') 'waterValue',create_date 'createDate' from energy_water
+        select convert(IFNULL(sum(water_value),'0'),decimal(10,2)) 'waterValue',create_date 'createDate' from energy_water
         ${ew.customSqlSegment}
         GROUP BY DATE_FORMAT(create_date,'%Y-%m-%d')
         ORDER BY create_date ASC
     </select>
 
     <select id="screenWater" resultType="com.huimv.guowei.admin.entity.dto.ScreenWaterVo">
-        select IFNULL(sum(water_value),'0') 'waterValue',create_date 'createDate' from energy_water
+        select convert(IFNULL(sum(water_value),'0'),decimal(10,2)) 'waterValue',create_date 'createDate' from energy_water
         ${ew.customSqlSegment}
         GROUP BY DATE_FORMAT(create_date,'%Y-%m')
         ORDER BY create_date ASC

huimv-admin/src/main/resources/mapper/GroupDuckInfoMapper.xml

@@ -25,7 +25,7 @@
         CONVERT(IFNULL(sum(case when b.eating_date >= #{month} then b.eating_value else 0
         END),'0'),DECIMAL(10,2)) as 'feedingMonth'
         ,IFNULL(sum(b.eating_value),'0') 'feedingCount'
-        FROM group_eating b WHERE farm_id=#{farmId}
+        FROM group_eating_generate b WHERE farm_id=#{farmId}
         <if test="deviceCode!=null and deviceCode!=''">
             and device_code like '%${deviceCode}'
         </if>
@@ -64,7 +64,38 @@
         CONVERT(IFNULL(sum(case when b.eating_date >= #{month} then b.eating_value else 0
         END),'0'),DECIMAL(10,2)) as 'feedingMonth'
         ,IFNULL(sum(b.eating_value),'0') 'feedingCount'
-        FROM group_eating b WHERE farm_id=#{farmId}
+        FROM group_eating_generate b WHERE farm_id=#{farmId}
+        GROUP BY device_code) w
+        on q.deviceCode=w.deviceCode
+
+        RIGHT JOIN
+
+        (select id 'id', device_code 'deviceCode',unit_id 'unitId',unit_name 'unitName',day_num 'dayAge',batch_num
+        'batchNum' FROM group_duck_info where farm_id=#{farmId}  GROUP BY device_code) z
+
+        on w.deviceCode=z.deviceCode
+
+    </select>
+    <select id="breedingRank1" resultType="com.huimv.guowei.admin.group.entity.vo.BreedingVo">
+        select IFNULL(q.eggDay,'0') 'eggDay',IFNULL(w.feedingDay,'0') 'feedingDay',z.deviceCode 'deviceCode',IFNULL(q.eggCount,'0') 'eggCount',IFNULL(q.eggMonth,'0')
+        'eggMonth',
+        convert(IFNULL(w.feedingCount,'0'),decimal(10,2)) 'feedingCount',convert(IFNULL(w.feedingMonth,'0'),decimal(10,2)) 'feedingMonth'
+        ,z.dayAge 'dayAge',z.unitId 'unitId',z.unitName 'unitName',z.batchNum 'batchNum',z.id 'id',z.deviceCode 'deviceCode' FROM
+
+        (select g.device_code 'deviceCode', max(g.egg_count) 'eggCount',
+        IFNULL(sum(case when g.egg_date >= #{today} then g.egg_num else 0 END),'0') as 'eggDay',
+        IFNULL(sum(case when g.egg_date >= #{month} then g.egg_num else 0 END),'0') as 'eggMonth' from
+        group_egg g where farm_id=#{farmId}
+        GROUP BY device_code) q
+
+        RIGHT JOIN
+
+        (select b.device_code 'deviceCode',CONVERT(IFNULL(sum(case when b.eating_date >= #{yesterday} then
+        b.eating_value else 0 END),'0'),DECIMAL(10,2)) as 'feedingDay',
+        CONVERT(IFNULL(sum(case when b.eating_date >= #{month} then b.eating_value else 0
+        END),'0'),DECIMAL(10,2)) as 'feedingMonth'
+        ,IFNULL(sum(b.eating_value),'0') 'feedingCount'
+        FROM group_eating_generate b WHERE farm_id=#{farmId}
         GROUP BY device_code) w
         on q.deviceCode=w.deviceCode
 
@@ -96,7 +127,7 @@
         CONVERT(IFNULL(sum(case when b.eating_date >= #{month} then b.eating_value else 0
         END),'0'),DECIMAL(10,2)) as 'feedingMonth'
         ,IFNULL(sum(b.eating_value),'0') 'feedingCount'
-        FROM group_eating b WHERE farm_id=#{farmId} and device_code = '${deviceCode}'
+        FROM group_eating_generate b WHERE farm_id=#{farmId} and device_code = '${deviceCode}'
         GROUP BY device_code) w
         on q.deviceCode=w.deviceCode
 
@@ -122,12 +153,12 @@
 
         RIGHT JOIN
 
-        (select b.device_code 'deviceCode',CONVERT(IFNULL(sum(case when b.eating_date >= #{today} then
+        (select b.device_code 'deviceCode',CONVERT(IFNULL(sum(case when b.eating_date >= #{yesterday} then
         b.eating_value else 0 END),'0'),DECIMAL(10,2)) as 'feedingDay',
         CONVERT(IFNULL(sum(case when b.eating_date >= #{month} then b.eating_value else 0
         END),'0'),DECIMAL(10,2)) as 'feedingMonth'
         ,IFNULL(sum(b.eating_value),'0') 'feedingCount'
-        FROM group_eating b WHERE farm_id=#{farmId} and device_code = '${deviceCode}'
+        FROM group_eating_generate b WHERE farm_id=#{farmId} and device_code = '${deviceCode}'
         GROUP BY device_code) w
         on q.deviceCode=w.deviceCode
 
@@ -199,7 +230,7 @@
         else 0 END),'0') as 'eggValue11',
         IFNULL(sum(case when d.egg_date between '${month12}-01 00:00:00' and '${month12}-31 23:59:59' then d.egg_num
         else 0 END),'0') as 'eggValue12'
-        FROM group_eating b RIGHT JOIN
+        FROM group_eating_generate b RIGHT JOIN
         (select device_code 'deviceCode',chi_code 'chiCode',batch_num 'batchNum',unit_name 'unitName',duck_breed
         'duckBreed',sex 'sex',birth_date 'birthDate',weight 'weight'
         FROM group_duck_info

huimv-admin/src/main/resources/mapper/GroupEatingGenerateMapper.xml

@@ -0,0 +1,5 @@
+<?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.guowei.admin.group.mapper.GroupEatingGenerateMapper">
+
+</mapper>

huimv-admin/src/main/resources/mapper/GroupEatingMapper.xml

@@ -3,14 +3,14 @@
 <mapper namespace="com.huimv.guowei.admin.group.mapper.GroupEatingMapper">
 
     <select id="listDetail" resultType="com.huimv.guowei.admin.group.entity.vo.GroupEatingVo">
-        select device_code 'deviceCode',eating_date 'dateTime',IFNULL(sum(eating_value),'0') 'values' from group_eating
+        select device_code 'deviceCode',eating_date 'dateTime',IFNULL(sum(eating_value),'0') 'values' from group_eating_generate
         ${ew.customSqlSegment}
         GROUP BY DATE_FORMAT(eating_date,'%Y-%m-%d')
         order by eating_date desc
     </select>
 
     <select id="getCount" resultType="com.huimv.guowei.admin.group.entity.vo.EggAndFeedingVo">
-        select IFNULL(sum(a.eating_value),'0') 'feedingCount',IFNULL(sum(b.egg_num),'0') 'eggCount' from group_eating a inner join group_egg b
+        select IFNULL(sum(a.eating_value),'0') 'feedingCount',IFNULL(sum(b.egg_num),'0') 'eggCount' from group_eating_generate a inner join group_egg b
         on a.device_code=b.device_code
         where a.device_code=#{deviceCode} and a.batch_num=#{batchNum}
         <if test="startTime !=null and startTime!=''">
@@ -19,7 +19,7 @@
     </select>
 
     <select id="breedList" resultType="com.huimv.guowei.admin.group.entity.vo.BreedEatingVo">
-        select device_code 'deviceCode',eating_date 'eatingDate',IFNULL(sum(eating_value),'0') 'eatingValue' from group_eating
+        select device_code 'deviceCode',eating_date 'eatingDate',IFNULL(sum(eating_value),'0') 'eatingValue' from group_eating_generate
         ${ew.customSqlSegment}
         GROUP BY DATE_FORMAT(eating_date,'%Y-%m-%d')
         order by eating_date asc
@@ -27,7 +27,7 @@
 
     <select id="breedEggEating" resultType="com.huimv.guowei.admin.group.entity.vo.BreedEatingEgg">
         select a.eating_date 'dateTime',a.device_code 'deviceCode',IFNULL(sum(a.eating_value),'0') 'eatingValue',IFNULL(sum(b.egg_num),'0') 'eggNum'
-        from group_eating a inner join group_egg b
+        from group_eating_generate a inner join group_egg b
         on a.device_code=b.device_code
         where a.device_code=#{deviceCode} and a.farm_id=#{farmId} and a.eating_date >=#{dateTime}
         GROUP BY DATE_FORMAT(a.eating_date,'%Y-%m-%d'),DATE_FORMAT(b.egg_date,'%Y-%m-%d')
@@ -35,7 +35,7 @@
     </select>
     <select id="breedEggEating1" resultType="com.huimv.guowei.admin.group.entity.vo.BreedEatingEgg">
         select a.eating_date 'dateTime',a.device_code 'deviceCode',IFNULL(sum(a.eating_value),'0') 'eatingValue',IFNULL(sum(b.egg_num),'0') 'eggNum'
-        from group_eating a inner join group_egg b
+        from group_eating_generate a inner join group_egg b
         on a.device_code=b.device_code
         where a.device_code=#{deviceCode} and a.farm_id=#{farmId} and a.eating_date between #{startTime} and #{endTime}
         GROUP BY DATE_FORMAT(a.eating_date,'%Y-%m-%d'),DATE_FORMAT(b.egg_date,'%Y-%m-%d')
@@ -43,7 +43,7 @@
     </select>
     <select id="breedEggEating2" resultType="com.huimv.guowei.admin.group.entity.vo.BreedEatingEgg">
         select a.eating_date 'dateTime',a.device_code 'deviceCode',IFNULL(sum(a.eating_value),'0') 'eatingValue',IFNULL(sum(b.egg_num),'0') 'eggNum'
-        from group_eating a inner join group_egg b
+        from group_eating_generate a inner join group_egg b
         on a.device_code=b.device_code
         where a.device_code=#{deviceCode} and a.farm_id=#{farmId} and a.eating_date >=#{dateTime}
         GROUP BY DATE_FORMAT(a.eating_date,'%Y-%m'),DATE_FORMAT(b.egg_date,'%Y-%m')
@@ -51,7 +51,7 @@
     </select>
 
     <select id="getEating" resultType="com.huimv.guowei.admin.group.entity.vo.GroupEatingVo">
-        select device_code 'deviceCode',IFNULL(sum(eating_value),'0') 'values' from group_eating
+        select device_code 'deviceCode',Convert(IFNULL(sum(eating_value),'0'),decimal(10,2)) 'values' from group_eating_generate
         where device_code=#{deviceCode} and batch_num=#{batchNum}
     </select>
 </mapper>

huimv-admin/src/main/resources/mapper/GroupFeedingEggMapper.xml

@@ -11,14 +11,14 @@
     </select>
 
     <select id="screenBreed" resultType="com.huimv.guowei.admin.group.entity.dto.ScreenBreedVo">
-        select CONVERT(IFNULL(sum(eating_value),'0'),decimal(10,2)) 'values',create_time 'createDate' from group_eating
+        select CONVERT(IFNULL(sum(eating_value),'0'),decimal(10,2)) 'values',create_time 'createDate' from group_eating_generate
         ${ew.customSqlSegment}
         group by DATE_FORMAT(create_time,'%y-%m-%d')
         order by create_time asc
     </select>
 
     <select id="screenBreedMonth" resultType="com.huimv.guowei.admin.group.entity.dto.ScreenBreedVo">
-        select CONVERT(IFNULL(sum(eating_value),'0'),decimal(10,2)) 'values',create_time 'createDate' from group_eating
+        select CONVERT(IFNULL(sum(eating_value),'0'),decimal(10,2)) 'values',create_time 'createDate' from group_eating_generate
         ${ew.customSqlSegment}
         group by DATE_FORMAT(create_time,'%y-%m')
         order by create_time asc

huimv-admin/src/main/resources/mapper/GroupRankMapper.xml

@@ -3,7 +3,8 @@
 <mapper namespace="com.huimv.guowei.admin.group.mapper.GroupRankMapper">
 
     <select id="getList" resultType="com.huimv.guowei.admin.group.entity.GroupRank">
-     select device_code 'deviceCode',date_time 'dateTime',IFNULL(sum(day_egg),'0') 'eggNum',IFNULL(sum(egg_weight),'0') 'eggWeight',IFNULL(sum(day_eating),'0') 'eatingValue',
+     select device_code 'deviceCode',date_time 'dateTime',IFNULL(sum(day_egg),'0') 'eggNum',IFNULL(sum(egg_weight),'0') 'eggWeight'
+     ,convert(IFNULL(sum(day_eating),'0'),decimal(10,2)) 'eatingValue',
      farm_id 'farmId',eating_egg 'eatingEgg' from group_rank
        ${ew.customSqlSegment}
         GROUP BY DATE_FORMAT(date_time,'%Y-%m')