Skip to content

Commit 45d5269

Browse files
HariharanAnantharamanHariharanAnantharaman
committed
Changed to have remote Influx endpoint
1 parent 56f2c89 commit 45d5269

File tree

10 files changed

+38
-13
lines changed

10 files changed

+38
-13
lines changed

‎DataSimulator/src/com/techolution/mauritius/data/simulator/service/BatteryDataSimiulator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ private void sendBattery(Telemetry telemetry,Date date){
111111
CloseableHttpClient httpClient = HttpClientBuilder.create().build();
112112

113113
try {
114-
HttpPost request = new HttpPost("http://localhost:8083/insert/telemetry/data/"+telemetry.getMeter_id());
114+
HttpPost request = new HttpPost("http://localhost:8085/insert/telemetry/data/"+telemetry.getMeter_id());
115115
StringEntity params = new StringEntity(json.toString());
116116
request.addHeader("content-type", "application/json");
117117
request.setEntity(params);

‎DataSimulator/src/com/techolution/mauritius/data/simulator/service/FlowDataSimiulator.java‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@
2626

2727
public class FlowDataSimiulator implements IStubData {
2828

29+
30+
private static String INFLUX_CONNECTION_STRING="http://52.170.92.62:8086";
31+
private static String INFLUX_USERNAME="root";
32+
private static String INFLUX_PWD="root";
2933
Logger log=Logger.getLogger(FlowDataSimiulator.class.getName());
3034
@Override
3135
public void startProcess(int meterId, String startTime, String endTime, long sleepTime, int incrementtime) {
@@ -72,7 +76,8 @@ public void startProcess(int meterId, String startTime, String endTime, long sle
7276
log.fine("Query is:"+query);
7377

7478

75-
InfluxDB influxDB = InfluxDBFactory.connect("http://localhost:32768", "root", "root");
79+
//InfluxDB influxDB = InfluxDBFactory.connect("http://localhost:32768", "root", "root");
80+
InfluxDB influxDB = InfluxDBFactory.connect(INFLUX_CONNECTION_STRING, INFLUX_USERNAME, INFLUX_PWD);
7681
String dbName = "mauritius_smartwater";
7782
QueryResult queryResult = influxDB.query(new Query(query, dbName));
7883

@@ -133,7 +138,7 @@ private void sendRequest(Telemetry telemetry,Date date){
133138
CloseableHttpClient httpClient = HttpClientBuilder.create().build();
134139

135140
try {
136-
HttpPost request = new HttpPost("http://localhost:8083/insert/telemetry/data/"+telemetry.getMeter_id());
141+
HttpPost request = new HttpPost("http://localhost:8085/insert/telemetry/data/"+telemetry.getMeter_id());
137142
StringEntity params = new StringEntity(json.toString());
138143
request.addHeader("content-type", "application/json");
139144
request.setEntity(params);

‎DataSimulator/src/com/techolution/mauritus/data/simulator/PopulateData.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import java.text.ParseException;
44

5+
import com.techolution.mauritius.data.simulator.service.BatteryDataSimiulator;
56
import com.techolution.mauritius.data.simulator.service.FlowDataSimiulator;
67
import com.techolution.mauritius.data.simulator.service.IStubData;
78

@@ -28,6 +29,9 @@ public static void main(String[] args) {
2829
data.startProcess(meter, starttime, endtime, sleepval, incrementval);
2930

3031

32+
}else if("battery".equalsIgnoreCase(kpi)){
33+
data=new BatteryDataSimiulator();
34+
data.startProcess(meter, starttime, endtime, sleepval, incrementval);
3135
}
3236
}
3337

‎DataSimulator/target/classes/META-INF/maven/DataSimulator/DataSimulator/pom.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#Generated by Maven Integration for Eclipse
2-
#Tue Mar 20 17:02:52 IST 2018
2+
#Wed Mar 21 15:16:02 IST 2018
33
version=0.0.1-SNAPSHOT
44
groupId=DataSimulator
55
m2e.projectName=DataSimulator

‎DataSimulator/target/classes/com/techolution/mauritius/data/simulator/service/BatteryDataSimiulator.class‎

0 Bytes
Binary file not shown.

‎DataSimulator/target/classes/com/techolution/mauritius/data/simulator/service/FlowDataSimiulator.class‎

199 Bytes
Binary file not shown.

‎DataSimulator/target/classes/com/techolution/mauritus/data/simulator/PopulateData.class‎

144 Bytes
Binary file not shown.

‎connectionstatistics/src/main/java/com/techolution/mauritius/smartwater/connection/service/ConnectionStatisticsService.java‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ public class ConnectionStatisticsService {
3434

3535
private Log log = LogFactory.getLog(ConnectionStatisticsService.class);
3636

37+
private static String INFLUX_CONNECTION_STRING="http://52.170.92.62:8086";
38+
private static String INFLUX_USERNAME="root";
39+
private static String INFLUX_PWD="root";
40+
3741
public List<Data> getData(RequestData data) throws ParseException{
3842

3943

@@ -80,7 +84,8 @@ else if(data.getSample_Distance().equalsIgnoreCase("Hour")){
8084
log.debug("Query is:"+query);
8185

8286

83-
InfluxDB influxDB = InfluxDBFactory.connect("http://localhost:32768", "root", "root");
87+
//InfluxDB influxDB = InfluxDBFactory.connect("http://localhost:32770", "root", "root");
88+
InfluxDB influxDB = InfluxDBFactory.connect(INFLUX_CONNECTION_STRING, INFLUX_USERNAME, INFLUX_PWD);
8489
String dbName = "mauritius_smartwater";
8590
QueryResult queryResult = influxDB.query(new Query(query, dbName));
8691
String locationName= "TEST";
@@ -135,12 +140,13 @@ public void insertData(Telemetry telemetry){
135140
}else{
136141
log.info("Time to set is:"+telemetry.getDate().getTime());
137142
}
138-
InfluxDB influxDB = InfluxDBFactory.connect("http://localhost:8086", "root", "root");
143+
//InfluxDB influxDB = InfluxDBFactory.connect("http://localhost:32770", "root", "root");
144+
InfluxDB influxDB =InfluxDBFactory.connect(INFLUX_CONNECTION_STRING, INFLUX_USERNAME, INFLUX_PWD);
139145
String dbName = "mauritius_smartwater";
140146
influxDB.setDatabase(dbName);
141147
influxDB.enableBatch(BatchOptions.DEFAULTS);
142148
String rpName = "aRetentionPolicy";
143-
//influxDB.createRetentionPolicy(rpName, dbName, "365d", "30m", 2, true);
149+
influxDB.createRetentionPolicy(rpName, dbName, "365d", "30m", 2, true);
144150

145151

146152
BatchPoints batchPoints = BatchPoints

‎consolidateddetails/src/main/java/com/techolution/mauritius/smartwater/service/ConsolidatedDataService.java‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@
2727
public class ConsolidatedDataService {
2828
private Log log = LogFactory.getLog(ConsolidatedDataService.class);
2929

30-
private static final String INFLUX_ENDPOINT="http://localhost:32768/query?db=mauritius_smartwater&q=";
30+
private static String INFLUX_CONNECTION_STRING="http://52.170.92.62:8086";
31+
private static String INFLUX_USERNAME="root";
32+
private static String INFLUX_PWD="root";
3133

3234
@Autowired
3335
private ConnectionDetailsRepository connectionDetailsRepository;
@@ -70,7 +72,8 @@ public TotalConsolidatedConsumption getConsumptionForThisMonth() throws ClientPr
7072

7173

7274

73-
InfluxDB influxDB = InfluxDBFactory.connect("http://localhost:32768", "root", "root");
75+
//InfluxDB influxDB = InfluxDBFactory.connect("http://localhost:32768", "root", "root");
76+
InfluxDB influxDB = InfluxDBFactory.connect(INFLUX_CONNECTION_STRING, INFLUX_USERNAME, INFLUX_PWD);
7477
String dbName = "mauritius_smartwater";
7578
QueryResult queryResult = influxDB.query(new Query(query, dbName));
7679
Double consumption = getConsumption(queryResult);
@@ -106,7 +109,8 @@ public TotalConsolidatedConsumption getConsumptionForToday() throws ClientProtoc
106109

107110

108111

109-
InfluxDB influxDB = InfluxDBFactory.connect("http://localhost:32768", "root", "root");
112+
//InfluxDB influxDB = InfluxDBFactory.connect("http://localhost:32768", "root", "root");
113+
InfluxDB influxDB = InfluxDBFactory.connect(INFLUX_CONNECTION_STRING, INFLUX_USERNAME, INFLUX_PWD);
110114
String dbName = "mauritius_smartwater";
111115
QueryResult queryResult = influxDB.query(new Query(query, dbName));
112116
Double consumption = getConsumption(queryResult);
@@ -142,7 +146,8 @@ public TotalConsolidatedDeviceStatus getDeviceStatusForThisMonth() throws Client
142146

143147

144148

145-
InfluxDB influxDB = InfluxDBFactory.connect("http://localhost:32768", "root", "root");
149+
//InfluxDB influxDB = InfluxDBFactory.connect("http://localhost:32768", "root", "root");
150+
InfluxDB influxDB = InfluxDBFactory.connect(INFLUX_CONNECTION_STRING, INFLUX_USERNAME, INFLUX_PWD);
146151
String dbName = "mauritius_smartwater";
147152
QueryResult queryResult = influxDB.query(new Query(query, dbName));
148153
List<Result> results=queryResult.getResults();
@@ -219,7 +224,8 @@ public TotalConsolidatedDeviceStatus getDeviceStatusForToday() throws ClientProt
219224

220225

221226

222-
InfluxDB influxDB = InfluxDBFactory.connect("http://localhost:32768", "root", "root");
227+
//InfluxDB influxDB = InfluxDBFactory.connect("http://localhost:32768", "root", "root");
228+
InfluxDB influxDB = InfluxDBFactory.connect(INFLUX_CONNECTION_STRING, INFLUX_USERNAME, INFLUX_PWD);
223229
String dbName = "mauritius_smartwater";
224230
QueryResult queryResult = influxDB.query(new Query(query, dbName));
225231
List<Result> results=queryResult.getResults();

‎mapdataservice/src/main/java/com/techolution/mauritius/smartwater/map/service/MapDataService.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@
2626

2727
@Component
2828
public class MapDataService {
29+
private static String INFLUX_CONNECTION_STRING="http://52.170.92.62:8086";
30+
private static String INFLUX_USERNAME="root";
31+
private static String INFLUX_PWD="root";
2932

3033
private Log log = LogFactory.getLog(MapDataService.class);
3134

@@ -67,7 +70,8 @@ public List<MeterConsumption> getDataForAllConnections(RequestData data){
6770
//int deviceId=123;
6871

6972

70-
InfluxDB influxDB = InfluxDBFactory.connect("http://localhost:32768", "root", "root");
73+
//InfluxDB influxDB = InfluxDBFactory.connect("http://localhost:32768", "root", "root");
74+
InfluxDB influxDB = InfluxDBFactory.connect(INFLUX_CONNECTION_STRING, INFLUX_USERNAME, INFLUX_PWD);
7175
String dbName = "mauritius_smartwater";
7276

7377
SimpleDateFormat myFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");

0 commit comments

Comments
 (0)