diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorPointDataController.java b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorPointDataController.java index 10929fc..6f38dae 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorPointDataController.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorPointDataController.java @@ -4,6 +4,8 @@ import io.swagger.annotations.Api; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.amqp.rabbit.core.RabbitTemplate; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -14,6 +16,7 @@ import org.springnewfiber.dataadapter.xf.service.DataAccessRecordService; import javax.validation.Valid; +import java.util.Date; /** * @program: newfiber-data-adapter @@ -29,9 +32,19 @@ @Slf4j public class MonitorPointDataController { private final DataAccessRecordService dataAccessRecordService; + @Value("${plc.queue_name}") + private String plc_queue; + @Value("${plc.Exchange}") + private String Exchange; + @Value("${plc.routingKey}") + private String routingKey; + private final RabbitTemplate rabbitTemplate; + @PostMapping("/realData") public R xfInterfaceSingle(@Valid @RequestBody MonitorPointData monitorPointData) { dataAccessRecordService.save(EDataAccessType.IflytekPlcRealtime, EDataAccessType.IflytekPlcRealtime.name(), JSONObject.toJSONString(monitorPointData)); + monitorPointData.setUt(new Date()); + rabbitTemplate.convertAndSend(Exchange, routingKey, JSONObject.toJSONString(monitorPointData)); return R.status(true); } } \ No newline at end of file diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorPointDataController.java b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorPointDataController.java index 10929fc..6f38dae 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorPointDataController.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorPointDataController.java @@ -4,6 +4,8 @@ import io.swagger.annotations.Api; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.amqp.rabbit.core.RabbitTemplate; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -14,6 +16,7 @@ import org.springnewfiber.dataadapter.xf.service.DataAccessRecordService; import javax.validation.Valid; +import java.util.Date; /** * @program: newfiber-data-adapter @@ -29,9 +32,19 @@ @Slf4j public class MonitorPointDataController { private final DataAccessRecordService dataAccessRecordService; + @Value("${plc.queue_name}") + private String plc_queue; + @Value("${plc.Exchange}") + private String Exchange; + @Value("${plc.routingKey}") + private String routingKey; + private final RabbitTemplate rabbitTemplate; + @PostMapping("/realData") public R xfInterfaceSingle(@Valid @RequestBody MonitorPointData monitorPointData) { dataAccessRecordService.save(EDataAccessType.IflytekPlcRealtime, EDataAccessType.IflytekPlcRealtime.name(), JSONObject.toJSONString(monitorPointData)); + monitorPointData.setUt(new Date()); + rabbitTemplate.convertAndSend(Exchange, routingKey, JSONObject.toJSONString(monitorPointData)); return R.status(true); } } \ No newline at end of file diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/entity/monitor/MonitorPointData.java b/src/main/java/org/springnewfiber/dataadapter/xf/entity/monitor/MonitorPointData.java index 564723f..8c264a0 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/entity/monitor/MonitorPointData.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/entity/monitor/MonitorPointData.java @@ -1,5 +1,6 @@ package org.springnewfiber.dataadapter.xf.entity.monitor; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -19,7 +20,7 @@ @Data public class MonitorPointData implements Serializable { @ApiModelProperty(value = "上位机唯一标识") - @NotBlank +// @NotBlank private String st; @ApiModelProperty(value = "监测站点code") @NotBlank @@ -31,4 +32,6 @@ @NotNull @Size(min = 1) private List pointDataList; + @JsonIgnore + private Date ut; } diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorPointDataController.java b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorPointDataController.java index 10929fc..6f38dae 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorPointDataController.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorPointDataController.java @@ -4,6 +4,8 @@ import io.swagger.annotations.Api; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.amqp.rabbit.core.RabbitTemplate; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -14,6 +16,7 @@ import org.springnewfiber.dataadapter.xf.service.DataAccessRecordService; import javax.validation.Valid; +import java.util.Date; /** * @program: newfiber-data-adapter @@ -29,9 +32,19 @@ @Slf4j public class MonitorPointDataController { private final DataAccessRecordService dataAccessRecordService; + @Value("${plc.queue_name}") + private String plc_queue; + @Value("${plc.Exchange}") + private String Exchange; + @Value("${plc.routingKey}") + private String routingKey; + private final RabbitTemplate rabbitTemplate; + @PostMapping("/realData") public R xfInterfaceSingle(@Valid @RequestBody MonitorPointData monitorPointData) { dataAccessRecordService.save(EDataAccessType.IflytekPlcRealtime, EDataAccessType.IflytekPlcRealtime.name(), JSONObject.toJSONString(monitorPointData)); + monitorPointData.setUt(new Date()); + rabbitTemplate.convertAndSend(Exchange, routingKey, JSONObject.toJSONString(monitorPointData)); return R.status(true); } } \ No newline at end of file diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/entity/monitor/MonitorPointData.java b/src/main/java/org/springnewfiber/dataadapter/xf/entity/monitor/MonitorPointData.java index 564723f..8c264a0 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/entity/monitor/MonitorPointData.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/entity/monitor/MonitorPointData.java @@ -1,5 +1,6 @@ package org.springnewfiber.dataadapter.xf.entity.monitor; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -19,7 +20,7 @@ @Data public class MonitorPointData implements Serializable { @ApiModelProperty(value = "上位机唯一标识") - @NotBlank +// @NotBlank private String st; @ApiModelProperty(value = "监测站点code") @NotBlank @@ -31,4 +32,6 @@ @NotNull @Size(min = 1) private List pointDataList; + @JsonIgnore + private Date ut; } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index a9b688b..e85e87c 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -11,7 +11,7 @@ ssl: false rabbitmq: # virtual-host: pt_mq - host: 132.232.115.20 + host: 119.27.160.75 # host: 192.168.16.220 port: 5672 # username: pt_mq @@ -61,7 +61,10 @@ org: springnewfiber: dataadapter: info - +plc: + queue_name: jk_plc_queue + Exchange: amq.topic + routingKey: jk_plc_routingKey business: hankouSaveUrl: http://192.168.16.115:18000/forecastData/hankou_site ziguang: diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorPointDataController.java b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorPointDataController.java index 10929fc..6f38dae 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorPointDataController.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorPointDataController.java @@ -4,6 +4,8 @@ import io.swagger.annotations.Api; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.amqp.rabbit.core.RabbitTemplate; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -14,6 +16,7 @@ import org.springnewfiber.dataadapter.xf.service.DataAccessRecordService; import javax.validation.Valid; +import java.util.Date; /** * @program: newfiber-data-adapter @@ -29,9 +32,19 @@ @Slf4j public class MonitorPointDataController { private final DataAccessRecordService dataAccessRecordService; + @Value("${plc.queue_name}") + private String plc_queue; + @Value("${plc.Exchange}") + private String Exchange; + @Value("${plc.routingKey}") + private String routingKey; + private final RabbitTemplate rabbitTemplate; + @PostMapping("/realData") public R xfInterfaceSingle(@Valid @RequestBody MonitorPointData monitorPointData) { dataAccessRecordService.save(EDataAccessType.IflytekPlcRealtime, EDataAccessType.IflytekPlcRealtime.name(), JSONObject.toJSONString(monitorPointData)); + monitorPointData.setUt(new Date()); + rabbitTemplate.convertAndSend(Exchange, routingKey, JSONObject.toJSONString(monitorPointData)); return R.status(true); } } \ No newline at end of file diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/entity/monitor/MonitorPointData.java b/src/main/java/org/springnewfiber/dataadapter/xf/entity/monitor/MonitorPointData.java index 564723f..8c264a0 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/entity/monitor/MonitorPointData.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/entity/monitor/MonitorPointData.java @@ -1,5 +1,6 @@ package org.springnewfiber.dataadapter.xf.entity.monitor; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -19,7 +20,7 @@ @Data public class MonitorPointData implements Serializable { @ApiModelProperty(value = "上位机唯一标识") - @NotBlank +// @NotBlank private String st; @ApiModelProperty(value = "监测站点code") @NotBlank @@ -31,4 +32,6 @@ @NotNull @Size(min = 1) private List pointDataList; + @JsonIgnore + private Date ut; } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index a9b688b..e85e87c 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -11,7 +11,7 @@ ssl: false rabbitmq: # virtual-host: pt_mq - host: 132.232.115.20 + host: 119.27.160.75 # host: 192.168.16.220 port: 5672 # username: pt_mq @@ -61,7 +61,10 @@ org: springnewfiber: dataadapter: info - +plc: + queue_name: jk_plc_queue + Exchange: amq.topic + routingKey: jk_plc_routingKey business: hankouSaveUrl: http://192.168.16.115:18000/forecastData/hankou_site ziguang: diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml index d1c156f..1d07e26 100644 --- a/src/main/resources/application-pro.yml +++ b/src/main/resources/application-pro.yml @@ -64,7 +64,10 @@ org: springnewfiber: dataadapter: info - +plc: + queue_name: jk_plc_queue + Exchange: amq.topic + routingKey: jk_plc_routingKey business: hankouSaveUrl: http://172.16.3.109:8107/forecastData/hankou_site ziguang: