|
@@ -1065,17 +1065,21 @@ public class EartagServiceImpl implements IEartagService {
|
|
|
// 不存在,则创建耳标在线记录,并更新到缓存数据中;
|
|
|
String envTemp = eartagJo.getString("envTemp1");
|
|
|
String earTemp = eartagJo.getString("earTemp1");
|
|
|
+ String act = eartagJo.getString("act");
|
|
|
+ Integer bat = eartagJo.getInteger("bat");
|
|
|
EartagEartagOnlineEntity eartagOnlineEntity = eartagOnlineRepo.getOneByEarmarkAndFarmId(earmark, todayDateText, farmId);
|
|
|
if (eartagOnlineEntity == null) {
|
|
|
int total = 1;
|
|
|
//{新建耳标在线记录}
|
|
|
- newEartagOnline(earmark, total, nowTimestamp, earTemp, envTemp, todayDate, farmId);
|
|
|
+ newEartagOnline(earmark, total, nowTimestamp, earTemp, envTemp, todayDate, farmId,act,bat);
|
|
|
} else {
|
|
|
int total = eartagOnlineEntity.getTotal();
|
|
|
eartagOnlineEntity.setTotal(++total);
|
|
|
eartagOnlineEntity.setLastTime(nowTimestamp);
|
|
|
eartagOnlineEntity.setEnvTemp(envTemp);
|
|
|
eartagOnlineEntity.setEartagTemp(earTemp);
|
|
|
+ eartagOnlineEntity.setAct(act);
|
|
|
+ eartagOnlineEntity.setBat(bat);
|
|
|
eartagOnlineRepo.saveAndFlush(eartagOnlineEntity);
|
|
|
//更新耳标在线统计
|
|
|
cacheService.putEartagOnlineCount(earmark, eartagOnlineEntity);
|
|
@@ -1083,7 +1087,7 @@ public class EartagServiceImpl implements IEartagService {
|
|
|
}
|
|
|
|
|
|
//新建耳标在线记录
|
|
|
- private void newEartagOnline(String earmark, int total, Timestamp nowTimestamp, String earTemp, String envTemp, java.sql.Date todayDate, String farmId) {
|
|
|
+ private void newEartagOnline(String earmark, int total, Timestamp nowTimestamp, String earTemp, String envTemp, java.sql.Date todayDate, String farmId, String act, Integer bat) {
|
|
|
EartagEartagOnlineEntity newEartagOnlineEntity = new EartagEartagOnlineEntity();
|
|
|
newEartagOnlineEntity.setEarmark(earmark);
|
|
|
newEartagOnlineEntity.setTotal(total);
|
|
@@ -1093,6 +1097,8 @@ public class EartagServiceImpl implements IEartagService {
|
|
|
newEartagOnlineEntity.setEartagTemp(earTemp);
|
|
|
newEartagOnlineEntity.setAddDate(todayDate);
|
|
|
newEartagOnlineEntity.setFarmId(farmId);
|
|
|
+ newEartagOnlineEntity.setAct(act);
|
|
|
+ newEartagOnlineEntity.setBat(bat);
|
|
|
eartagOnlineRepo.saveAndFlush(newEartagOnlineEntity);
|
|
|
//更新耳标在线统计
|
|
|
cacheService.putEartagOnlineCount(earmark, newEartagOnlineEntity);
|