diff --git a/pom.xml b/pom.xml index 02b13bf..969b7bc 100644 --- a/pom.xml +++ b/pom.xml @@ -24,27 +24,33 @@ knife4j-spring-boot-starter 2.0.9 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + com.baomidou mybatis-plus ${mybatis.plus.version} + + + + + + com.baomidou mybatis-plus-boot-starter @@ -66,11 +72,11 @@ 4.1.1 - - - - - + + + + + org.mybatis mybatis-spring @@ -142,11 +148,11 @@ spring-cloud-starter-alibaba-nacos-discovery 2021.1 - - - - - + + + + + ${project.name} diff --git a/pom.xml b/pom.xml index 02b13bf..969b7bc 100644 --- a/pom.xml +++ b/pom.xml @@ -24,27 +24,33 @@ knife4j-spring-boot-starter 2.0.9 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + com.baomidou mybatis-plus ${mybatis.plus.version} + + + + + + com.baomidou mybatis-plus-boot-starter @@ -66,11 +72,11 @@ 4.1.1 - - - - - + + + + + org.mybatis mybatis-spring @@ -142,11 +148,11 @@ spring-cloud-starter-alibaba-nacos-discovery 2021.1 - - - - - + + + + + ${project.name} diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java index cba273b..b8904aa 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java @@ -7,6 +7,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Value; @@ -32,7 +33,7 @@ * @create: 2022-06-14 20:44 **/ @RestController -@AllArgsConstructor +@RequiredArgsConstructor //@PreAuth(AuthConstant.PERMISSION_ALL) @RequestMapping("/monitorData") @Api(value = "讯飞数据接受接口", tags = "讯飞数据接受接口") @@ -85,7 +86,7 @@ DTO.forEach((i) -> { PtReceiveBaseModel model = RealTimeSerializer.xfObjectToRealMap(i); log.info("cover:{}", JSONObject.toJSONString(model)); -// rabbitTemplate.convertAndSend(JSONObject.toJSONString(model)); + rabbitTemplate.convertAndSend(JSONObject.toJSONString(model)); }); return R.status(true); } else { @@ -132,7 +133,6 @@ model = RealTimeSerializer.xfObjectToRealMap(DTO); } else if (xfDataEnum == XfDataEnum.ForcastData) { MonitorForcastData DTO = JSONObject.parseObject(data, MonitorForcastData.class); -// model = this.build(DTO); log.info("cover:{}", JSONObject.toJSONString(DTO)); String request = HttpUtil.post(hankouSaveUrl, JSONObject.toJSONString(DTO), 30000); log.info("发送汉口站数据:{}", request); diff --git a/pom.xml b/pom.xml index 02b13bf..969b7bc 100644 --- a/pom.xml +++ b/pom.xml @@ -24,27 +24,33 @@ knife4j-spring-boot-starter 2.0.9 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + com.baomidou mybatis-plus ${mybatis.plus.version} + + + + + + com.baomidou mybatis-plus-boot-starter @@ -66,11 +72,11 @@ 4.1.1 - - - - - + + + + + org.mybatis mybatis-spring @@ -142,11 +148,11 @@ spring-cloud-starter-alibaba-nacos-discovery 2021.1 - - - - - + + + + + ${project.name} diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java index cba273b..b8904aa 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java @@ -7,6 +7,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Value; @@ -32,7 +33,7 @@ * @create: 2022-06-14 20:44 **/ @RestController -@AllArgsConstructor +@RequiredArgsConstructor //@PreAuth(AuthConstant.PERMISSION_ALL) @RequestMapping("/monitorData") @Api(value = "讯飞数据接受接口", tags = "讯飞数据接受接口") @@ -85,7 +86,7 @@ DTO.forEach((i) -> { PtReceiveBaseModel model = RealTimeSerializer.xfObjectToRealMap(i); log.info("cover:{}", JSONObject.toJSONString(model)); -// rabbitTemplate.convertAndSend(JSONObject.toJSONString(model)); + rabbitTemplate.convertAndSend(JSONObject.toJSONString(model)); }); return R.status(true); } else { @@ -132,7 +133,6 @@ model = RealTimeSerializer.xfObjectToRealMap(DTO); } else if (xfDataEnum == XfDataEnum.ForcastData) { MonitorForcastData DTO = JSONObject.parseObject(data, MonitorForcastData.class); -// model = this.build(DTO); log.info("cover:{}", JSONObject.toJSONString(DTO)); String request = HttpUtil.post(hankouSaveUrl, JSONObject.toJSONString(DTO), 30000); log.info("发送汉口站数据:{}", request); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 6507551..1791ee4 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -10,12 +10,14 @@ database: 0 ssl: false rabbitmq: - virtual-host: pt_mq -# host: 139.155.49.237 - host: 192.168.16.220 +# virtual-host: pt_mq + host: 132.232.115.20 +# host: 192.168.16.220 port: 5672 - username: pt_mq - password: pt_mq +# username: pt_mq +# password: pt_mq + username: newfiber_user + password: newfiber@2020_rabbitmq publisher-confirm-type: correlated publisher-returns: true listener: @@ -26,7 +28,8 @@ template: routing-key: rtu_message_test exchange: amq.topic -# datasource: + + # datasource: # type: com.alibaba.druid.pool.DruidDataSource # driver-class-name: com.mysql.jdbc.Driver # url: jdbc:mysql://192.168.16.220:3306/new-water_dev?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Hongkong&rewriteBatchedStatements=true @@ -51,6 +54,8 @@ springnewfiber: dataadapter: info +business: + hankouSaveUrl: http://192.168.16.115:18000/forecastData/hankou_site ziguang: #渍水点 zs: @@ -88,7 +93,4 @@ # password: data-service11 username: data-service2 password: data-service212345678 - loginurl: http://58.49.51.33:8081/jkfc/user/login -#rabbitmq: -# exchange: amq.topic -# routingKey: rtu_message_test \ No newline at end of file + loginurl: http://58.49.51.33:8081/jkfc/user/login \ No newline at end of file diff --git a/pom.xml b/pom.xml index 02b13bf..969b7bc 100644 --- a/pom.xml +++ b/pom.xml @@ -24,27 +24,33 @@ knife4j-spring-boot-starter 2.0.9 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + com.baomidou mybatis-plus ${mybatis.plus.version} + + + + + + com.baomidou mybatis-plus-boot-starter @@ -66,11 +72,11 @@ 4.1.1 - - - - - + + + + + org.mybatis mybatis-spring @@ -142,11 +148,11 @@ spring-cloud-starter-alibaba-nacos-discovery 2021.1 - - - - - + + + + + ${project.name} diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java index cba273b..b8904aa 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java @@ -7,6 +7,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Value; @@ -32,7 +33,7 @@ * @create: 2022-06-14 20:44 **/ @RestController -@AllArgsConstructor +@RequiredArgsConstructor //@PreAuth(AuthConstant.PERMISSION_ALL) @RequestMapping("/monitorData") @Api(value = "讯飞数据接受接口", tags = "讯飞数据接受接口") @@ -85,7 +86,7 @@ DTO.forEach((i) -> { PtReceiveBaseModel model = RealTimeSerializer.xfObjectToRealMap(i); log.info("cover:{}", JSONObject.toJSONString(model)); -// rabbitTemplate.convertAndSend(JSONObject.toJSONString(model)); + rabbitTemplate.convertAndSend(JSONObject.toJSONString(model)); }); return R.status(true); } else { @@ -132,7 +133,6 @@ model = RealTimeSerializer.xfObjectToRealMap(DTO); } else if (xfDataEnum == XfDataEnum.ForcastData) { MonitorForcastData DTO = JSONObject.parseObject(data, MonitorForcastData.class); -// model = this.build(DTO); log.info("cover:{}", JSONObject.toJSONString(DTO)); String request = HttpUtil.post(hankouSaveUrl, JSONObject.toJSONString(DTO), 30000); log.info("发送汉口站数据:{}", request); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 6507551..1791ee4 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -10,12 +10,14 @@ database: 0 ssl: false rabbitmq: - virtual-host: pt_mq -# host: 139.155.49.237 - host: 192.168.16.220 +# virtual-host: pt_mq + host: 132.232.115.20 +# host: 192.168.16.220 port: 5672 - username: pt_mq - password: pt_mq +# username: pt_mq +# password: pt_mq + username: newfiber_user + password: newfiber@2020_rabbitmq publisher-confirm-type: correlated publisher-returns: true listener: @@ -26,7 +28,8 @@ template: routing-key: rtu_message_test exchange: amq.topic -# datasource: + + # datasource: # type: com.alibaba.druid.pool.DruidDataSource # driver-class-name: com.mysql.jdbc.Driver # url: jdbc:mysql://192.168.16.220:3306/new-water_dev?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Hongkong&rewriteBatchedStatements=true @@ -51,6 +54,8 @@ springnewfiber: dataadapter: info +business: + hankouSaveUrl: http://192.168.16.115:18000/forecastData/hankou_site ziguang: #渍水点 zs: @@ -88,7 +93,4 @@ # password: data-service11 username: data-service2 password: data-service212345678 - loginurl: http://58.49.51.33:8081/jkfc/user/login -#rabbitmq: -# exchange: amq.topic -# routingKey: rtu_message_test \ No newline at end of file + loginurl: http://58.49.51.33:8081/jkfc/user/login \ No newline at end of file diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml index 1b2020f..d28585e 100644 --- a/src/main/resources/application-pro.yml +++ b/src/main/resources/application-pro.yml @@ -1,5 +1,5 @@ server: - port: 8877 + port: 8876 spring: redis: @@ -11,11 +11,13 @@ ssl: false rabbitmq: virtual-host: pt_mq - # host: 139.155.49.237 +# host: 119.27.160.75 host: 172.16.3.111 port: 5672 username: pt password: uXP578kav8SDcjCgy +# username: newfiber_user +# password: newfiber@2020_rabbitmq publisher-confirm-type: correlated publisher-returns: true listener: @@ -46,6 +48,8 @@ springnewfiber: dataadapter: info +business: + hankouSaveUrl: http://172.16.3.109:8107/forecastData/hankou_site ziguang: #渍水点 zs: diff --git a/pom.xml b/pom.xml index 02b13bf..969b7bc 100644 --- a/pom.xml +++ b/pom.xml @@ -24,27 +24,33 @@ knife4j-spring-boot-starter 2.0.9 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + com.baomidou mybatis-plus ${mybatis.plus.version} + + + + + + com.baomidou mybatis-plus-boot-starter @@ -66,11 +72,11 @@ 4.1.1 - - - - - + + + + + org.mybatis mybatis-spring @@ -142,11 +148,11 @@ spring-cloud-starter-alibaba-nacos-discovery 2021.1 - - - - - + + + + + ${project.name} diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java index cba273b..b8904aa 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java @@ -7,6 +7,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Value; @@ -32,7 +33,7 @@ * @create: 2022-06-14 20:44 **/ @RestController -@AllArgsConstructor +@RequiredArgsConstructor //@PreAuth(AuthConstant.PERMISSION_ALL) @RequestMapping("/monitorData") @Api(value = "讯飞数据接受接口", tags = "讯飞数据接受接口") @@ -85,7 +86,7 @@ DTO.forEach((i) -> { PtReceiveBaseModel model = RealTimeSerializer.xfObjectToRealMap(i); log.info("cover:{}", JSONObject.toJSONString(model)); -// rabbitTemplate.convertAndSend(JSONObject.toJSONString(model)); + rabbitTemplate.convertAndSend(JSONObject.toJSONString(model)); }); return R.status(true); } else { @@ -132,7 +133,6 @@ model = RealTimeSerializer.xfObjectToRealMap(DTO); } else if (xfDataEnum == XfDataEnum.ForcastData) { MonitorForcastData DTO = JSONObject.parseObject(data, MonitorForcastData.class); -// model = this.build(DTO); log.info("cover:{}", JSONObject.toJSONString(DTO)); String request = HttpUtil.post(hankouSaveUrl, JSONObject.toJSONString(DTO), 30000); log.info("发送汉口站数据:{}", request); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 6507551..1791ee4 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -10,12 +10,14 @@ database: 0 ssl: false rabbitmq: - virtual-host: pt_mq -# host: 139.155.49.237 - host: 192.168.16.220 +# virtual-host: pt_mq + host: 132.232.115.20 +# host: 192.168.16.220 port: 5672 - username: pt_mq - password: pt_mq +# username: pt_mq +# password: pt_mq + username: newfiber_user + password: newfiber@2020_rabbitmq publisher-confirm-type: correlated publisher-returns: true listener: @@ -26,7 +28,8 @@ template: routing-key: rtu_message_test exchange: amq.topic -# datasource: + + # datasource: # type: com.alibaba.druid.pool.DruidDataSource # driver-class-name: com.mysql.jdbc.Driver # url: jdbc:mysql://192.168.16.220:3306/new-water_dev?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Hongkong&rewriteBatchedStatements=true @@ -51,6 +54,8 @@ springnewfiber: dataadapter: info +business: + hankouSaveUrl: http://192.168.16.115:18000/forecastData/hankou_site ziguang: #渍水点 zs: @@ -88,7 +93,4 @@ # password: data-service11 username: data-service2 password: data-service212345678 - loginurl: http://58.49.51.33:8081/jkfc/user/login -#rabbitmq: -# exchange: amq.topic -# routingKey: rtu_message_test \ No newline at end of file + loginurl: http://58.49.51.33:8081/jkfc/user/login \ No newline at end of file diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml index 1b2020f..d28585e 100644 --- a/src/main/resources/application-pro.yml +++ b/src/main/resources/application-pro.yml @@ -1,5 +1,5 @@ server: - port: 8877 + port: 8876 spring: redis: @@ -11,11 +11,13 @@ ssl: false rabbitmq: virtual-host: pt_mq - # host: 139.155.49.237 +# host: 119.27.160.75 host: 172.16.3.111 port: 5672 username: pt password: uXP578kav8SDcjCgy +# username: newfiber_user +# password: newfiber@2020_rabbitmq publisher-confirm-type: correlated publisher-returns: true listener: @@ -46,6 +48,8 @@ springnewfiber: dataadapter: info +business: + hankouSaveUrl: http://172.16.3.109:8107/forecastData/hankou_site ziguang: #渍水点 zs: diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index e169996..260cdca 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -32,4 +32,5 @@ mybatis-plus: global-config: db-config: - table-underline: false \ No newline at end of file + table-underline: false + mapper-locations: classpath:org/springnewfiber/dataadapter/**/mapper/*.xml