|
|
@@ -2,6 +2,7 @@ package com.huimv.eartag2.eartag.service.impl;
|
|
|
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.huimv.eartag2.common.dao.entity.*;
|
|
|
import com.huimv.eartag2.common.dao.repo.*;
|
|
|
import com.huimv.eartag2.common.service.IBaseConfigService;
|
|
|
@@ -650,30 +651,29 @@ public class EartagServiceImpl implements IEartagService {
|
|
|
}
|
|
|
String earmark = eartagJo.getString("earmark");
|
|
|
Long act = Long.parseLong(eartagJo.getString("act"));
|
|
|
+ Long act1 = Long.parseLong(eartagJo.getString("act1"));
|
|
|
System.out.println("本次运动量=" + act);
|
|
|
System.out.println("earmark=" + earmark);
|
|
|
System.out.println("farmId=" + farmId);
|
|
|
//
|
|
|
// Optional<EartagData2Entity> optionEartagData = eartagData2Repo.getLastByEarmark(earmark, farmId);
|
|
|
//TODO
|
|
|
- Optional<EartagData2Entity> optionEartagData = eartagData2Repo.getLastByEarmark(earmark, farmId);
|
|
|
- System.out.println("optionEartagData.isPresent=" + optionEartagData.isPresent());
|
|
|
- if (optionEartagData.isPresent()) {
|
|
|
+ EartagData eartagData = eartagData2Mapper.selectOne(new QueryWrapper<EartagData>().lambda()
|
|
|
+ .eq(EartagData::getFarmId, farmId)
|
|
|
+ .eq(EartagData::getEarmark, earmark)
|
|
|
+ .orderByDesc(EartagData::getAddTime)
|
|
|
+ .last("LIMIT 1"));
|
|
|
+ if (ObjectUtil.isNotEmpty(eartagData)) {
|
|
|
// 上一次耳标运动量
|
|
|
- EartagData2Entity eartagData2Entity = optionEartagData.get();
|
|
|
- int lastId = eartagData2Entity.getId();
|
|
|
- Long lastAct = eartagData2Entity.getAct();
|
|
|
+ int lastId = eartagData.getId();
|
|
|
+ Long lastAct = Long.valueOf(eartagData.getAct());
|
|
|
System.out.println("上次运动量=" + lastAct);
|
|
|
- Timestamp lastAddTime = eartagData2Entity.getAddTime();
|
|
|
+ Timestamp lastAddTime = new Timestamp(eartagData.getAddTime().getTime());
|
|
|
long timeDiff = nowTimestamp.getTime() - lastAddTime.getTime();
|
|
|
if (timeDiff / (1000 * 60 * 60) < eartagOfflineTime) {
|
|
|
- long act1 = 0;
|
|
|
boolean resetStatus = false;
|
|
|
if (act < lastAct) {
|
|
|
- act1 = act;
|
|
|
resetStatus = true;
|
|
|
- } else {
|
|
|
- act1 = act - lastAct;
|
|
|
}
|
|
|
System.out.println("本次运动量增量=" + act1);
|
|
|
//{保存耳标小时运动量}
|
|
|
@@ -754,7 +754,8 @@ public class EartagServiceImpl implements IEartagService {
|
|
|
private void saveEartagHourAct(String farmId, String earmark, long act1, int nowHour, java.sql.Date todayDate) {
|
|
|
Optional<EartagHourActEntity> optionalHourAct = eartagHourActEntityRepo.findByFarmIdAndEarmarkAndHourAndDate(farmId, earmark, nowHour, todayDate);
|
|
|
Optional<EartagHourActEntity> optionalHourAct2 = eartagHourActEntityRepo.findByEarmarkOrderById( earmark,todayDate);
|
|
|
-// long act = 0;
|
|
|
+ System.out.println(optionalHourAct);
|
|
|
+ System.out.println(optionalHourAct2);
|
|
|
if (!optionalHourAct.isPresent()) {
|
|
|
EartagHourActEntity newEartagHourActEntity = new EartagHourActEntity();
|
|
|
newEartagHourActEntity.setIsShow(0);
|
|
|
@@ -771,11 +772,13 @@ public class EartagServiceImpl implements IEartagService {
|
|
|
newEartagHourActEntity.setAddDate(todayDate);
|
|
|
newEartagHourActEntity.setHour(nowHour);
|
|
|
newEartagHourActEntity.setAct(act1);
|
|
|
+ System.out.println("newEartagHourActEntity---->"+ newEartagHourActEntity);
|
|
|
eartagHourActEntityRepo.save(newEartagHourActEntity);
|
|
|
// act = act1;
|
|
|
} else {
|
|
|
EartagHourActEntity eartagHourActEntity = optionalHourAct.get();
|
|
|
eartagHourActEntity.setAct(eartagHourActEntity.getAct() + act1);
|
|
|
+ System.out.println("eartagHourActEntity---->"+ eartagHourActEntity);
|
|
|
eartagHourActEntityRepo.save(eartagHourActEntity);
|
|
|
// act = eartagHourActEntity.getAct() + act1;
|
|
|
}
|
