|
@@ -22,6 +22,7 @@ import com.cnbm.influx.config.InfluxClient; |
|
|
import com.cnbm.influx.param.PageInfo; |
|
|
import com.cnbm.influx.param.PageInfo; |
|
|
import com.cnbm.influx.param.QueryDataParam; |
|
|
import com.cnbm.influx.param.QueryDataParam; |
|
|
import com.cnbm.influx.param.Range; |
|
|
import com.cnbm.influx.param.Range; |
|
|
|
|
|
|
|
|
import com.cnbm.influx.param.Tag; |
|
|
import com.cnbm.influx.param.Tag; |
|
|
import com.cnbm.influx.template.Event; |
|
|
import com.cnbm.influx.template.Event; |
|
|
import com.cnbm.processInspection.dto.InspectionSampleDTO; |
|
|
import com.cnbm.processInspection.dto.InspectionSampleDTO; |
|
@@ -29,7 +30,6 @@ import com.cnbm.processInspection.dto.InspectionSheetDTO; |
|
|
import com.cnbm.processInspection.entity.InspectionSheet; |
|
|
import com.cnbm.processInspection.entity.InspectionSheet; |
|
|
import com.cnbm.processInspection.mapper.InspectionSheetMapper; |
|
|
import com.cnbm.processInspection.mapper.InspectionSheetMapper; |
|
|
import com.cnbm.processInspection.service.IInspectionSheetService; |
|
|
import com.cnbm.processInspection.service.IInspectionSheetService; |
|
|
import com.google.gson.JsonObject; |
|
|
|
|
|
import com.influxdb.query.FluxRecord; |
|
|
import com.influxdb.query.FluxRecord; |
|
|
import com.influxdb.query.FluxTable; |
|
|
import com.influxdb.query.FluxTable; |
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
import org.apache.commons.lang3.StringUtils; |
|
@@ -209,9 +209,7 @@ public class InspectionSheetServiceImpl extends CrudServiceImpl<InspectionSheetM |
|
|
queryDataParam.setMeasurement(workingProcedureName); |
|
|
queryDataParam.setMeasurement(workingProcedureName); |
|
|
//queryDataParam.setInspectionSheetId(inspectionSheetId); |
|
|
//queryDataParam.setInspectionSheetId(inspectionSheetId); |
|
|
queryDataParam.setBucket("qgs-bucket"); |
|
|
queryDataParam.setBucket("qgs-bucket"); |
|
|
|
|
|
|
|
|
//queryDataParam.setTag(new Tag("inspectionSheetId", inspectionSheetId)); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
queryDataParam.setTags(Arrays.asList(new Tag("inspectionSheetId", inspectionSheetId))); |
|
|
List<String> dropNames = new ArrayList<>(); |
|
|
List<String> dropNames = new ArrayList<>(); |
|
|
dropNames.add("transationId"); |
|
|
dropNames.add("transationId"); |
|
|
queryDataParam.setDropedTagNames(dropNames); |
|
|
queryDataParam.setDropedTagNames(dropNames); |
|
@@ -240,6 +238,7 @@ public class InspectionSheetServiceImpl extends CrudServiceImpl<InspectionSheetM |
|
|
|
|
|
|
|
|
InspectionSampleDTO sampleDTO = new InspectionSampleDTO(); |
|
|
InspectionSampleDTO sampleDTO = new InspectionSampleDTO(); |
|
|
sampleDTO.setSampleNumber(sampleNumber); |
|
|
sampleDTO.setSampleNumber(sampleNumber); |
|
|
|
|
|
//sampleDTO.setSampleTime(LocalDateTime.ofInstant(events.get(0).getTime(), ZoneId.systemDefault())); |
|
|
sampleDTO.setSampleTime(events.get(0).getTime()); |
|
|
sampleDTO.setSampleTime(events.get(0).getTime()); |
|
|
sampleDTO.setBatchNum(dto.getBatchNumber()); |
|
|
sampleDTO.setBatchNum(dto.getBatchNumber()); |
|
|
sampleDTO.setInspectionSheetId(events.get(0).getInspectionSheetId()); |
|
|
sampleDTO.setInspectionSheetId(events.get(0).getInspectionSheetId()); |
|
@@ -266,9 +265,9 @@ public class InspectionSheetServiceImpl extends CrudServiceImpl<InspectionSheetM |
|
|
String sampleNumber = dto.getSampleNumber(); |
|
|
String sampleNumber = dto.getSampleNumber(); |
|
|
String jsonData = dto.getJsonData(); |
|
|
String jsonData = dto.getJsonData(); |
|
|
JSONObject json = JSON.parseObject(jsonData); |
|
|
JSONObject json = JSON.parseObject(jsonData); |
|
|
|
|
|
|
|
|
Instant time = dto.getSampleTime(); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// LocalDateTime sampleTime = dto.getSampleTime(); |
|
|
|
|
|
// Instant eventTime = sampleTime.toInstant(ZoneOffset.UTC); |
|
|
|
|
|
Instant eventTime = dto.getSampleTime(); |
|
|
List<Event> list = new ArrayList<>(); |
|
|
List<Event> list = new ArrayList<>(); |
|
|
for (Map.Entry entry : json.entrySet()) { |
|
|
for (Map.Entry entry : json.entrySet()) { |
|
|
String key = entry.getKey().toString(); |
|
|
String key = entry.getKey().toString(); |
|
@@ -278,7 +277,7 @@ public class InspectionSheetServiceImpl extends CrudServiceImpl<InspectionSheetM |
|
|
// v= Double.valueOf(entry.getValue().toString()); |
|
|
// v= Double.valueOf(entry.getValue().toString()); |
|
|
// }catch (Exception e){ |
|
|
// }catch (Exception e){ |
|
|
// } |
|
|
// } |
|
|
list.add(newEvent(time, inspectionSheetId, key, v, sampleNumber)); |
|
|
|
|
|
|
|
|
list.add(newEvent(eventTime, inspectionSheetId, key, v, sampleNumber)); |
|
|
} |
|
|
} |
|
|
InfluxClient.Client.batchInsert(list, workingProcedureName); |
|
|
InfluxClient.Client.batchInsert(list, workingProcedureName); |
|
|
} |
|
|
} |
|
|