|
@@ -71,7 +71,8 @@ public class FeedingDataServiceImpl extends ServiceImpl<FeedingDataMapper, Feedi
|
|
Date timesmorning = DataUill.getTimesmorning();
|
|
Date timesmorning = DataUill.getTimesmorning();
|
|
QueryWrapper<FeedingData> queryWrapper2 = new QueryWrapper<>();
|
|
QueryWrapper<FeedingData> queryWrapper2 = new QueryWrapper<>();
|
|
queryWrapper2.eq("farm_id", farmId).ge("upload_time", timesmorning).groupBy("device_code");
|
|
queryWrapper2.eq("farm_id", farmId).ge("upload_time", timesmorning).groupBy("device_code");
|
|
- Integer integer2 = dataMapper.selectCount(queryWrapper2);//头数
|
|
|
|
|
|
+ List<FeedingData> feedingData = dataMapper.selectList(queryWrapper2);
|
|
|
|
+ Integer integer2 = feedingData.size();//头数
|
|
JSONObject jsonObject = new JSONObject();
|
|
JSONObject jsonObject = new JSONObject();
|
|
jsonObject.put("peihuai", integer1);
|
|
jsonObject.put("peihuai", integer1);
|
|
jsonObject.put("buru", integer);
|
|
jsonObject.put("buru", integer);
|