Browse Source

BA 状态设备增加历史数据记录

去除BA状态设备给third的转发功能
zhczh_c
zhczyx@163.com 1 month ago
parent
commit
3047301afb
  1. 13
      src/main/java/com/techsor/datacenter/sender/dao/BaStatusDao.java
  2. 17
      src/main/java/com/techsor/datacenter/sender/entitiy/bastatus/BaStatusHistoryEntity.java
  3. 16
      src/main/java/com/techsor/datacenter/sender/service/impl/DataProcessServiceImpl.java

13
src/main/java/com/techsor/datacenter/sender/dao/BaStatusDao.java

@ -1,6 +1,7 @@
package com.techsor.datacenter.sender.dao; package com.techsor.datacenter.sender.dao;
import com.techsor.datacenter.sender.entitiy.bastatus.BaStatusEntity; import com.techsor.datacenter.sender.entitiy.bastatus.BaStatusEntity;
import com.techsor.datacenter.sender.entitiy.bastatus.BaStatusHistoryEntity;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@ -68,5 +69,17 @@ public class BaStatusDao {
return (rows>0); return (rows>0);
} }
public Boolean insertHistory(BaStatusHistoryEntity entity) {
String sql = "INSERT INTO `ba_status_history` " +
"(`device_info_id`, `is_running`, `update_ts`) " +
"VALUES (?, ?, ?)";
int rows = jdbcTemplate.update(sql,
entity.getDeviceInfoId(),
entity.getIsRunning(),
entity.getUpdateTs());
return rows > 0;
}
} }

17
src/main/java/com/techsor/datacenter/sender/entitiy/bastatus/BaStatusHistoryEntity.java

@ -0,0 +1,17 @@
package com.techsor.datacenter.sender.entitiy.bastatus;
import lombok.Data;
import java.io.Serializable;
@Data
public class BaStatusHistoryEntity implements Serializable {
private int id;
private int deviceInfoId;
private int isRunning;
private String updateTs;
}

16
src/main/java/com/techsor/datacenter/sender/service/impl/DataProcessServiceImpl.java

@ -29,6 +29,7 @@ import com.techsor.datacenter.sender.dto.DeviceAlertInfo;
import com.techsor.datacenter.sender.dto.DeviceInfoVO; import com.techsor.datacenter.sender.dto.DeviceInfoVO;
import com.techsor.datacenter.sender.entitiy.*; import com.techsor.datacenter.sender.entitiy.*;
import com.techsor.datacenter.sender.entitiy.bastatus.BaStatusEntity; import com.techsor.datacenter.sender.entitiy.bastatus.BaStatusEntity;
import com.techsor.datacenter.sender.entitiy.bastatus.BaStatusHistoryEntity;
import com.techsor.datacenter.sender.entitiy.bastatus.BaStatusThirdReqEntity; import com.techsor.datacenter.sender.entitiy.bastatus.BaStatusThirdReqEntity;
import com.techsor.datacenter.sender.entitiy.company.CompanyEntity; import com.techsor.datacenter.sender.entitiy.company.CompanyEntity;
import com.techsor.datacenter.sender.entitiy.delta.DeltaNumEntity; import com.techsor.datacenter.sender.entitiy.delta.DeltaNumEntity;
@ -1465,6 +1466,17 @@ public class DataProcessServiceImpl implements IDataProcessService {
log.warn("No deviceId exist for ba_status:"+deviceId); log.warn("No deviceId exist for ba_status:"+deviceId);
return; return;
} }
//Insert history data to ba_status_history
Long update_ts = System.currentTimeMillis();
try{
BaStatusHistoryEntity baStatusHistoryEntity = new BaStatusHistoryEntity();
baStatusHistoryEntity.setDeviceInfoId(deviceInfo.getId());
baStatusHistoryEntity.setIsRunning(value);
baStatusHistoryEntity.setUpdateTs(update_ts.toString());
baStatusDao.insertHistory(baStatusHistoryEntity);
}catch (Exception e){
log.error("Insert ba_status_history Error:",e.getMessage(),e.fillInStackTrace());
}
//Update Or insert to mysql [ba_status_statistics] //Update Or insert to mysql [ba_status_statistics]
if (historyData==null){ if (historyData==null){
//insert //insert
@ -1488,7 +1500,7 @@ public class DataProcessServiceImpl implements IDataProcessService {
return; return;
} }
baStatusDao.insert(newData); baStatusDao.insert(newData);
sendBAStatus2Third(companyId,deviceId,newData); // sendBAStatus2Third(companyId,deviceId,newData);
}else{ }else{
//update //update
BaStatusEntity updateData = new BaStatusEntity(); BaStatusEntity updateData = new BaStatusEntity();
@ -1535,7 +1547,7 @@ public class DataProcessServiceImpl implements IDataProcessService {
return; return;
} }
baStatusDao.update(updateData); baStatusDao.update(updateData);
sendBAStatus2Third(companyId,deviceId,updateData); // sendBAStatus2Third(companyId,deviceId,updateData);
} }
} }

Loading…
Cancel
Save