diff --git a/ruoyi-modules/hwmom-tsdb/src/main/java/org/dromara/tsdb/controller/InfluxDbController.java b/ruoyi-modules/hwmom-tsdb/src/main/java/org/dromara/tsdb/controller/InfluxDbController.java index 9c74366b..7d5c7b9d 100644 --- a/ruoyi-modules/hwmom-tsdb/src/main/java/org/dromara/tsdb/controller/InfluxDbController.java +++ b/ruoyi-modules/hwmom-tsdb/src/main/java/org/dromara/tsdb/controller/InfluxDbController.java @@ -1,5 +1,6 @@ package org.dromara.tsdb.controller; +import org.dromara.tsdb.domain.bo.InfluxMeasurementBo; import org.dromara.tsdb.service.IInfluxDbService; import org.influxdb.dto.QueryResult; import org.springframework.beans.factory.annotation.Autowired; @@ -16,12 +17,8 @@ public class InfluxDbController { * 写入数据到InfluxDB */ @PostMapping("/write") - public String writeData(@RequestParam String measurement, - @RequestParam String tagKey, - @RequestParam String tagValue, - @RequestParam String fieldKey, - @RequestParam String fieldValue) { - influxDbService.writeData(measurement, tagKey, tagValue, fieldKey, fieldValue); + public String writeData(@RequestBody InfluxMeasurementBo influxMeasurementBo) { + influxDbService.writeData(influxMeasurementBo); return "Data written to InfluxDB successfully!"; } diff --git a/ruoyi-modules/hwmom-tsdb/src/main/java/org/dromara/tsdb/domain/bo/InfluxMeasurementBo.java b/ruoyi-modules/hwmom-tsdb/src/main/java/org/dromara/tsdb/domain/bo/InfluxMeasurementBo.java new file mode 100644 index 00000000..b248fa06 --- /dev/null +++ b/ruoyi-modules/hwmom-tsdb/src/main/java/org/dromara/tsdb/domain/bo/InfluxMeasurementBo.java @@ -0,0 +1,23 @@ +package org.dromara.tsdb.domain.bo; + +import lombok.Data; + +@Data +public class InfluxMeasurementBo { + + /** @param measurement 表名 + * @param tagKey 标签键 + * @param tagValue 标签值 + * @param fieldKey 字段键 + * @param fieldValue 字段值*/ + private String measurement; + + private String tagKey; + + private String tagValue; + + private String fieldKey; + + private String fieldValue; + +} diff --git a/ruoyi-modules/hwmom-tsdb/src/main/java/org/dromara/tsdb/service/IInfluxDbService.java b/ruoyi-modules/hwmom-tsdb/src/main/java/org/dromara/tsdb/service/IInfluxDbService.java index f4f065d8..ecd2b989 100644 --- a/ruoyi-modules/hwmom-tsdb/src/main/java/org/dromara/tsdb/service/IInfluxDbService.java +++ b/ruoyi-modules/hwmom-tsdb/src/main/java/org/dromara/tsdb/service/IInfluxDbService.java @@ -1,18 +1,14 @@ package org.dromara.tsdb.service; +import org.dromara.tsdb.domain.bo.InfluxMeasurementBo; import org.influxdb.dto.QueryResult; public interface IInfluxDbService { /** * 写入数据到InfluxDB - * - * @param measurement 表名 - * @param tagKey 标签键 - * @param tagValue 标签值 - * @param fieldKey 字段键 - * @param fieldValue 字段值 + * @param influxMeasurementBo */ - public void writeData(String measurement, String tagKey, String tagValue, String fieldKey, String fieldValue); + public void writeData(InfluxMeasurementBo influxMeasurementBo); /** * 查询数据 diff --git a/ruoyi-modules/hwmom-tsdb/src/main/java/org/dromara/tsdb/service/impl/InfluxDbServiceImpl.java b/ruoyi-modules/hwmom-tsdb/src/main/java/org/dromara/tsdb/service/impl/InfluxDbServiceImpl.java index 6a2dc170..de198af2 100644 --- a/ruoyi-modules/hwmom-tsdb/src/main/java/org/dromara/tsdb/service/impl/InfluxDbServiceImpl.java +++ b/ruoyi-modules/hwmom-tsdb/src/main/java/org/dromara/tsdb/service/impl/InfluxDbServiceImpl.java @@ -1,5 +1,6 @@ package org.dromara.tsdb.service.impl; +import org.dromara.tsdb.domain.bo.InfluxMeasurementBo; import org.dromara.tsdb.service.IInfluxDbService; import org.influxdb.InfluxDB; import org.influxdb.dto.Point; @@ -18,18 +19,13 @@ public class InfluxDbServiceImpl implements IInfluxDbService { /** * 写入数据到InfluxDB - * - * @param measurement 表名 - * @param tagKey 标签键 - * @param tagValue 标签值 - * @param fieldKey 字段键 - * @param fieldValue 字段值 + * @param influxMeasurementBo */ @Override - public void writeData(String measurement, String tagKey, String tagValue, String fieldKey, String fieldValue) { - Point point = Point.measurement(measurement) - .tag(tagKey, tagValue) - .addField(fieldKey, fieldValue) + public void writeData(InfluxMeasurementBo influxMeasurementBo) { + Point point = Point.measurement(influxMeasurementBo.getMeasurement()) + .tag(influxMeasurementBo.getTagKey(), influxMeasurementBo.getTagValue()) + .addField(influxMeasurementBo.getFieldKey(), influxMeasurementBo.getFieldValue()) .time(System.currentTimeMillis(), TimeUnit.MILLISECONDS) .build(); influxDB.write(point);