Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updated made in proven data manager to store field measurements #1704

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

updated made in proven data manager to store field measurements #1704

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 18 additions & 19 deletions ...pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/data/ProvenTimeSeriesDataManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,27 +206,26 @@ private void subscribeAndStoreDataFromTopic(String topic, String appOrServiceid,
@Override
public void onMessage(Serializable message) {
DataResponse event = (DataResponse)message;
for(String str : event.getDestination().split(".")){
System.out.println(str);
}
//String appOrServiceid = event.getDestination().split("[.]")[2];
try{
//TODO: Remove if block once changes made in proven cluster to get measurement name from datatype
if(appOrServiceid==null){
JsonParser parser = new JsonParser();
JsonElement data = parser.parse(event.getData().toString());
if (data.isJsonObject()) {
JsonObject dataObj = data.getAsJsonObject();
if(dataObj.get("datatype")!=null){
String datatype = dataObj.get("datatype").getAsString();
if(datatype!=null)
provenWriteProducer.sendBulkMessage(event.getData().toString(), datatype, instanceId, simulationId, new Date().getTime());
}

String measurementName = appOrServiceid;
String simulation_id = simulationId;

JsonParser parser = new JsonParser();
JsonElement data = parser.parse(event.getData().toString());
if (data.isJsonObject()) {
JsonObject dataObj = data.getAsJsonObject();
if(dataObj.get("datatype")!=null){
measurementName = dataObj.get("datatype").getAsString();
}
}
else{
provenWriteProducer.sendBulkMessage(event.getData().toString(), appOrServiceid, instanceId, simulationId, new Date().getTime());
}
if(event.getDestination().contains("goss.gridappsd.field.output") && dataObj.get("simulation_id")!=null){
simulation_id = dataObj.get("simulation_id").getAsString();
measurementName = simulation_id;
}
}

provenWriteProducer.sendBulkMessage(event.getData().toString(), measurementName, instanceId, simulation_id, new Date().getTime());

}catch(Exception e){

StringWriter sw = new StringWriter();
Expand Down