|
@@ -38,16 +38,15 @@ public class ProcudeFeed {
|
|
|
|
|
|
|
|
|
|
|
|
|
//生成采食记录
|
|
//生成采食记录
|
|
|
- @Scheduled(cron = "12 0 * * * ?")
|
|
|
|
|
-// @Scheduled(cron = "12 * * * * ?")
|
|
|
|
|
|
|
+// @Scheduled(cron = "12 0 * * * ?")
|
|
|
|
|
+ @Scheduled(cron = "12 * * * * ?")
|
|
|
private void saveFeed() {
|
|
private void saveFeed() {
|
|
|
-
|
|
|
|
|
QueryWrapper<EnvDevice> queryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<EnvDevice> queryWrapper = new QueryWrapper<>();
|
|
|
queryWrapper.eq("farm_id", 21).eq("device_type", 3);
|
|
queryWrapper.eq("farm_id", 21).eq("device_type", 3);
|
|
|
List<EnvDevice> devices = deviceMapper.selectList(queryWrapper);
|
|
List<EnvDevice> devices = deviceMapper.selectList(queryWrapper);
|
|
|
// DateTime startdateTime = DateUtil.beginOfDay(new Date());
|
|
// DateTime startdateTime = DateUtil.beginOfDay(new Date());
|
|
|
// DateTime endDate = DateUtil.endOfDay(new Date());
|
|
// DateTime endDate = DateUtil.endOfDay(new Date());
|
|
|
- Date date = new Date();
|
|
|
|
|
|
|
+ Date date = DateUtil.beginOfDay(new Date());
|
|
|
// DateTime startdateTime = DateUtil.offsetMinute(DateUtil.beginOfDay(DateUtil.offsetDay(new Date(),-4)),1);
|
|
// DateTime startdateTime = DateUtil.offsetMinute(DateUtil.beginOfDay(DateUtil.offsetDay(new Date(),-4)),1);
|
|
|
// DateTime endDate = DateUtil.endOfDay(DateUtil.offsetDay(new Date(),-4));
|
|
// DateTime endDate = DateUtil.endOfDay(DateUtil.offsetDay(new Date(),-4));
|
|
|
for (EnvDevice device : devices) {
|
|
for (EnvDevice device : devices) {
|
|
@@ -64,7 +63,8 @@ public class ProcudeFeed {
|
|
|
}
|
|
}
|
|
|
//拿到原始数据
|
|
//拿到原始数据
|
|
|
List<RawData> rawData = rawDataMapper.selectList(new QueryWrapper<RawData>().eq("device_code", deviceCode).ge("create_time", date));
|
|
List<RawData> rawData = rawDataMapper.selectList(new QueryWrapper<RawData>().eq("device_code", deviceCode).ge("create_time", date));
|
|
|
- Double weight = 0.0;
|
|
|
|
|
|
|
+// System.out.println(rawData.toString() +"sssssssss");
|
|
|
|
|
+ double weight = 0.0;
|
|
|
if (ObjectUtil.isNotEmpty(rawData)){
|
|
if (ObjectUtil.isNotEmpty(rawData)){
|
|
|
//拿到重量
|
|
//拿到重量
|
|
|
weight = getWeight(rawData);
|
|
weight = getWeight(rawData);
|
|
@@ -119,7 +119,7 @@ public class ProcudeFeed {
|
|
|
//获取重量算法
|
|
//获取重量算法
|
|
|
|
|
|
|
|
Pipe pipe = new Pipe(list);
|
|
Pipe pipe = new Pipe(list);
|
|
|
- int sum = pipe.calcWeightLoss(5000);
|
|
|
|
|
|
|
+ int sum = pipe.calcWeightLoss(2000);
|
|
|
|
|
|
|
|
return sum /10.0;
|
|
return sum /10.0;
|
|
|
|
|
|