From 1ba3474431fca54cbe65705840ae8b4da5f7b1f4 Mon Sep 17 00:00:00 2001 From: xuyang <748613696@qq.com> Date: Wed, 19 Jul 2023 11:37:41 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A1=B9=E7=9B=AE=E7=BB=93?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../access/mapper/CsGatewayDeviceMapper.java | 2 - .../service/ICsGatewayDeviceService.java | 1 - .../service/impl/CsDeviceServiceImpl.java | 2 - .../impl/CsGatewayDeviceServiceImpl.java | 1 - .../src/main/resources/bootstrap.yml | 4 +- .../src/test/java/com/njcn/AppTest.java | 48 +++++++- .../{analysis-api => analysis-rt}/pom.xml | 22 ++-- iot-analysis/analysis-rt/rt-api/pom.xml | 22 ++++ iot-analysis/analysis-rt/rt-boot/pom.xml | 109 ++++++++++++++++++ .../java/com/njcn/rt/RtBootApplication.java} | 6 +- .../rt-boot}/src/main/resources/bootstrap.yml | 9 +- .../src/test/java/com/njcn/AppTest.java | 0 iot-analysis/analysis-stat/pom.xml | 28 +++++ iot-analysis/analysis-stat/stat-api/pom.xml | 22 ++++ iot-analysis/analysis-stat/stat-boot/pom.xml | 109 ++++++++++++++++++ .../com/njcn/stat/StatBootApplication.java | 25 ++++ .../src/main/resources/bootstrap.yml | 53 +++++++++ .../src/test/java/com/njcn/AppTest.java | 20 ++++ iot-analysis/analysis-zl-event/pom.xml | 28 +++++ .../analysis-zl-event/zl-event-api/pom.xml | 21 ++++ .../zl-event-boot}/pom.xml | 24 +--- .../njcn/zlevent/ZlEventBootApplication.java | 25 ++++ .../src/main/resources/bootstrap.yml | 53 +++++++++ .../src/test/java/com/njcn/AppTest.java | 20 ++++ iot-analysis/pom.xml | 5 +- 25 files changed, 610 insertions(+), 49 deletions(-) rename iot-analysis/{analysis-api => analysis-rt}/pom.xml (58%) create mode 100644 iot-analysis/analysis-rt/rt-api/pom.xml create mode 100644 iot-analysis/analysis-rt/rt-boot/pom.xml rename iot-analysis/{analysis-boot/src/main/java/com/njcn/analysis/AnalysisBootApplication.java => analysis-rt/rt-boot/src/main/java/com/njcn/rt/RtBootApplication.java} (80%) rename iot-analysis/{analysis-boot => analysis-rt/rt-boot}/src/main/resources/bootstrap.yml (86%) rename iot-analysis/{analysis-boot => analysis-rt/rt-boot}/src/test/java/com/njcn/AppTest.java (100%) create mode 100644 iot-analysis/analysis-stat/pom.xml create mode 100644 iot-analysis/analysis-stat/stat-api/pom.xml create mode 100644 iot-analysis/analysis-stat/stat-boot/pom.xml create mode 100644 iot-analysis/analysis-stat/stat-boot/src/main/java/com/njcn/stat/StatBootApplication.java create mode 100644 iot-analysis/analysis-stat/stat-boot/src/main/resources/bootstrap.yml create mode 100644 iot-analysis/analysis-stat/stat-boot/src/test/java/com/njcn/AppTest.java create mode 100644 iot-analysis/analysis-zl-event/pom.xml create mode 100644 iot-analysis/analysis-zl-event/zl-event-api/pom.xml rename iot-analysis/{analysis-boot => analysis-zl-event/zl-event-boot}/pom.xml (85%) create mode 100644 iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/ZlEventBootApplication.java create mode 100644 iot-analysis/analysis-zl-event/zl-event-boot/src/main/resources/bootstrap.yml create mode 100644 iot-analysis/analysis-zl-event/zl-event-boot/src/test/java/com/njcn/AppTest.java diff --git a/iot-access/access-boot/src/main/java/com/njcn/access/mapper/CsGatewayDeviceMapper.java b/iot-access/access-boot/src/main/java/com/njcn/access/mapper/CsGatewayDeviceMapper.java index b1bd9ad..e3d543d 100644 --- a/iot-access/access-boot/src/main/java/com/njcn/access/mapper/CsGatewayDeviceMapper.java +++ b/iot-access/access-boot/src/main/java/com/njcn/access/mapper/CsGatewayDeviceMapper.java @@ -2,8 +2,6 @@ package com.njcn.access.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.njcn.access.pojo.po.CsGatewayDevice; -import com.njcn.access.pojo.vo.CsGatewayVo; -import com.njcn.csdevice.pojo.po.CsEquipmentAlarmPO; import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO; import java.util.List; diff --git a/iot-access/access-boot/src/main/java/com/njcn/access/service/ICsGatewayDeviceService.java b/iot-access/access-boot/src/main/java/com/njcn/access/service/ICsGatewayDeviceService.java index 9ed85d4..59d3760 100644 --- a/iot-access/access-boot/src/main/java/com/njcn/access/service/ICsGatewayDeviceService.java +++ b/iot-access/access-boot/src/main/java/com/njcn/access/service/ICsGatewayDeviceService.java @@ -2,7 +2,6 @@ package com.njcn.access.service; import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.access.pojo.po.CsGatewayDevice; -import com.njcn.csdevice.pojo.po.CsEquipmentAlarmPO; import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO; import java.util.List; diff --git a/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java b/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java index 9391aae..ff726dc 100644 --- a/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java +++ b/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java @@ -9,7 +9,6 @@ import com.njcn.access.param.DevAccessParam; import com.njcn.access.pojo.dto.AccessDto; import com.njcn.access.pojo.dto.ReqAndResDto; import com.njcn.access.service.ICsDeviceService; -import com.njcn.access.service.ICsGatewayService; import com.njcn.access.utils.MqttUtil; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.exception.BusinessException; @@ -22,7 +21,6 @@ import com.njcn.csdevice.pojo.po.CsDeviceUserPO; import com.njcn.csdevice.pojo.po.CsLinePO; import com.njcn.csdevice.pojo.vo.CsEquipmentDeliveryVO; import com.njcn.redis.utils.RedisUtil; -import com.njcn.system.api.DicDataFeignClient; import com.njcn.system.api.DictTreeFeignClient; import com.njcn.system.enums.DicDataEnum; import com.njcn.system.pojo.po.SysDicTreePO; diff --git a/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsGatewayDeviceServiceImpl.java b/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsGatewayDeviceServiceImpl.java index 9d03d62..6dc0e3c 100644 --- a/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsGatewayDeviceServiceImpl.java +++ b/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsGatewayDeviceServiceImpl.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.access.mapper.CsGatewayDeviceMapper; import com.njcn.access.pojo.po.CsGatewayDevice; import com.njcn.access.service.ICsGatewayDeviceService; -import com.njcn.csdevice.pojo.po.CsEquipmentAlarmPO; import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO; import org.springframework.stereotype.Service; diff --git a/iot-access/access-boot/src/main/resources/bootstrap.yml b/iot-access/access-boot/src/main/resources/bootstrap.yml index eb8c195..a02e0fb 100644 --- a/iot-access/access-boot/src/main/resources/bootstrap.yml +++ b/iot-access/access-boot/src/main/resources/bootstrap.yml @@ -6,7 +6,7 @@ microservice: sentinel: url: @sentinel.url@ gateway: - url: @gateway.url@ + url: @gateway.url@ server: port: 10301 #feign接口开启服务熔断降级处理 @@ -52,4 +52,4 @@ mybatis-plus: mqtt: - client-id: access-boot${random.value} \ No newline at end of file + client-id: access-boot123456 \ No newline at end of file diff --git a/iot-access/access-boot/src/test/java/com/njcn/AppTest.java b/iot-access/access-boot/src/test/java/com/njcn/AppTest.java index a7e14d2..1783903 100644 --- a/iot-access/access-boot/src/test/java/com/njcn/AppTest.java +++ b/iot-access/access-boot/src/test/java/com/njcn/AppTest.java @@ -2,12 +2,31 @@ package com.njcn; import static org.junit.Assert.assertTrue; +import com.alibaba.nacos.shaded.com.google.common.reflect.TypeToken; +import com.alibaba.nacos.shaded.com.google.gson.Gson; +import com.graphbuilder.math.func.EFunction; +import com.njcn.access.pojo.dto.mqtt.MqttClientDto; +import io.lettuce.core.protocol.CompleteableCommand; +import okhttp3.Credentials; +import okhttp3.OkHttpClient; +import okhttp3.Request; +import okhttp3.Response; import org.junit.Test; +import java.io.BufferedReader; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.util.Objects; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; +import java.util.stream.Collectors; + /** * Unit test for simple App. */ -public class AppTest +public class AppTest { /** * Rigorous Test :-) @@ -17,4 +36,31 @@ public class AppTest { assertTrue( true ); } + + + public static void main(String[] args) { + try { + String username = "ac760c62395cecec"; + String password = "k0vGfe5xOE2Bl4DCF73uahcknvcwoKOEDPnOkMvuSBB"; + + OkHttpClient client = new OkHttpClient(); + + Request request = new Request.Builder() + .url("http://192.168.1.18:18083/api/v5/clients/access-boot123456") + .header("Content-Type", "application/json") + .header("Authorization", Credentials.basic(username, password)) + .build(); + + Response response = client.newCall(request).execute(); + response.body(); + String res = Objects.requireNonNull(response.body()).string(); + + Gson gson = new Gson(); + MqttClientDto mqttClientDto = gson.fromJson(res, new TypeToken(){}.getType()); + System.out.println("mqttClientDto==:" + mqttClientDto.isConnected()); + + } catch (IOException e) { + e.printStackTrace(); + } + } } diff --git a/iot-analysis/analysis-api/pom.xml b/iot-analysis/analysis-rt/pom.xml similarity index 58% rename from iot-analysis/analysis-api/pom.xml rename to iot-analysis/analysis-rt/pom.xml index 1028e89..51b8620 100644 --- a/iot-analysis/analysis-api/pom.xml +++ b/iot-analysis/analysis-rt/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> iot-analysis com.njcn @@ -9,22 +9,20 @@ 4.0.0 - analysis-api + analysis-rt + pom + 1.0.0 + + rt-api + rt-boot + - analysis-api + analysis-rt + 物解析-实时数据解析模块 UTF-8 8 8 - - - - junit - junit - 4.11 - test - - diff --git a/iot-analysis/analysis-rt/rt-api/pom.xml b/iot-analysis/analysis-rt/rt-api/pom.xml new file mode 100644 index 0000000..01eae08 --- /dev/null +++ b/iot-analysis/analysis-rt/rt-api/pom.xml @@ -0,0 +1,22 @@ + + + + + analysis-rt + com.njcn + 1.0.0 + + 4.0.0 + + rt-api + 1.0.0 + + rt-api + + + UTF-8 + 8 + 8 + + diff --git a/iot-analysis/analysis-rt/rt-boot/pom.xml b/iot-analysis/analysis-rt/rt-boot/pom.xml new file mode 100644 index 0000000..58a4576 --- /dev/null +++ b/iot-analysis/analysis-rt/rt-boot/pom.xml @@ -0,0 +1,109 @@ + + + + + analysis-rt + com.njcn + 1.0.0 + + 4.0.0 + + rt-boot + 1.0.0 + + rt-boot + + + UTF-8 + 8 + 8 + + + + + com.njcn + common-web + ${project.version} + + + com.njcn + common-swagger + ${project.version} + + + com.baomidou + dynamic-datasource-spring-boot-starter + + + com.njcn + common-db + ${project.version} + + + + + rtboot + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.0 + + -Xlint:unchecked + + + + org.springframework.boot + spring-boot-maven-plugin + + + package + + repackage + + + + + + + com.spotify + docker-maven-plugin + 1.0.0 + + + + build-image + ${docker.operate} + + build + + + + + + http://${docker.repostory} + + ${docker.repostory}/${docker.registry.name}/${project.artifactId} + + + latest + + + ${docker.url} + ${basedir}/ + + + + /ROOT + + ${project.build.directory} + + ${project.build.finalName}.jar + + + + + + + diff --git a/iot-analysis/analysis-boot/src/main/java/com/njcn/analysis/AnalysisBootApplication.java b/iot-analysis/analysis-rt/rt-boot/src/main/java/com/njcn/rt/RtBootApplication.java similarity index 80% rename from iot-analysis/analysis-boot/src/main/java/com/njcn/analysis/AnalysisBootApplication.java rename to iot-analysis/analysis-rt/rt-boot/src/main/java/com/njcn/rt/RtBootApplication.java index 9899e70..a26bf27 100644 --- a/iot-analysis/analysis-boot/src/main/java/com/njcn/analysis/AnalysisBootApplication.java +++ b/iot-analysis/analysis-rt/rt-boot/src/main/java/com/njcn/rt/RtBootApplication.java @@ -1,4 +1,4 @@ -package com.njcn.analysis; +package com.njcn.rt; import lombok.extern.slf4j.Slf4j; import org.mybatis.spring.annotation.MapperScan; @@ -16,10 +16,10 @@ import org.springframework.cloud.openfeign.EnableFeignClients; @MapperScan("com.njcn.**.mapper") @EnableFeignClients(basePackages = "com.njcn") @SpringBootApplication(scanBasePackages = "com.njcn") -public class AnalysisBootApplication { +public class RtBootApplication { public static void main(String[] args) { - SpringApplication.run(AnalysisBootApplication.class, args); + SpringApplication.run(RtBootApplication.class, args); } } diff --git a/iot-analysis/analysis-boot/src/main/resources/bootstrap.yml b/iot-analysis/analysis-rt/rt-boot/src/main/resources/bootstrap.yml similarity index 86% rename from iot-analysis/analysis-boot/src/main/resources/bootstrap.yml rename to iot-analysis/analysis-rt/rt-boot/src/main/resources/bootstrap.yml index 83706e3..0bdf91b 100644 --- a/iot-analysis/analysis-boot/src/main/resources/bootstrap.yml +++ b/iot-analysis/analysis-rt/rt-boot/src/main/resources/bootstrap.yml @@ -6,7 +6,7 @@ microservice: sentinel: url: @sentinel.url@ gateway: - url: + url: @gateway.url@ server: port: 10303 #feign接口开启服务熔断降级处理 @@ -31,12 +31,11 @@ spring: shared-configs: - data-id: share-config.yaml refresh: true - - data-Id: share-config-datasource-db.yaml + - data-Id: algorithm-config.yaml refresh: true main: allow-bean-definition-overriding: true - #项目日志的配置 logging: config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml @@ -47,8 +46,8 @@ logging: #mybatis配置信息 mybatis-plus: #别名扫描 - type-aliases-package: com.njcn.analysis.pojo + type-aliases-package: com.njcn.rt.pojo mqtt: - client-id: analysis-boot${random.value} \ No newline at end of file + client-id: analysis-rt-boot${random.value} \ No newline at end of file diff --git a/iot-analysis/analysis-boot/src/test/java/com/njcn/AppTest.java b/iot-analysis/analysis-rt/rt-boot/src/test/java/com/njcn/AppTest.java similarity index 100% rename from iot-analysis/analysis-boot/src/test/java/com/njcn/AppTest.java rename to iot-analysis/analysis-rt/rt-boot/src/test/java/com/njcn/AppTest.java diff --git a/iot-analysis/analysis-stat/pom.xml b/iot-analysis/analysis-stat/pom.xml new file mode 100644 index 0000000..beef157 --- /dev/null +++ b/iot-analysis/analysis-stat/pom.xml @@ -0,0 +1,28 @@ + + + + + iot-analysis + com.njcn + 1.0.0 + + 4.0.0 + + analysis-stat + pom + 1.0.0 + + stat-api + stat-boot + + + analysis-stat + 物解析-统计数据解析模块 + + + UTF-8 + 8 + 8 + + diff --git a/iot-analysis/analysis-stat/stat-api/pom.xml b/iot-analysis/analysis-stat/stat-api/pom.xml new file mode 100644 index 0000000..169420b --- /dev/null +++ b/iot-analysis/analysis-stat/stat-api/pom.xml @@ -0,0 +1,22 @@ + + + + + analysis-stat + com.njcn + 1.0.0 + + 4.0.0 + + stat-api + 1.0.0 + + stat-api + + + UTF-8 + 8 + 8 + + diff --git a/iot-analysis/analysis-stat/stat-boot/pom.xml b/iot-analysis/analysis-stat/stat-boot/pom.xml new file mode 100644 index 0000000..fa5f9b6 --- /dev/null +++ b/iot-analysis/analysis-stat/stat-boot/pom.xml @@ -0,0 +1,109 @@ + + + + + analysis-stat + com.njcn + 1.0.0 + + 4.0.0 + + stat-boot + 1.0.0 + + stat-boot + + + UTF-8 + 8 + 8 + + + + + com.njcn + common-web + ${project.version} + + + com.njcn + common-swagger + ${project.version} + + + com.baomidou + dynamic-datasource-spring-boot-starter + + + com.njcn + common-db + ${project.version} + + + + + statboot + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.0 + + -Xlint:unchecked + + + + org.springframework.boot + spring-boot-maven-plugin + + + package + + repackage + + + + + + + com.spotify + docker-maven-plugin + 1.0.0 + + + + build-image + ${docker.operate} + + build + + + + + + http://${docker.repostory} + + ${docker.repostory}/${docker.registry.name}/${project.artifactId} + + + latest + + + ${docker.url} + ${basedir}/ + + + + /ROOT + + ${project.build.directory} + + ${project.build.finalName}.jar + + + + + + + diff --git a/iot-analysis/analysis-stat/stat-boot/src/main/java/com/njcn/stat/StatBootApplication.java b/iot-analysis/analysis-stat/stat-boot/src/main/java/com/njcn/stat/StatBootApplication.java new file mode 100644 index 0000000..1ad6d48 --- /dev/null +++ b/iot-analysis/analysis-stat/stat-boot/src/main/java/com/njcn/stat/StatBootApplication.java @@ -0,0 +1,25 @@ +package com.njcn.stat; + +import lombok.extern.slf4j.Slf4j; +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.openfeign.EnableFeignClients; + + +/** + * @author hongawen + * @version 1.0.0 + * @date 2021年12月09日 20:59 + */ +@Slf4j +@MapperScan("com.njcn.**.mapper") +@EnableFeignClients(basePackages = "com.njcn") +@SpringBootApplication(scanBasePackages = "com.njcn") +public class StatBootApplication { + + public static void main(String[] args) { + SpringApplication.run(StatBootApplication.class, args); + } + +} diff --git a/iot-analysis/analysis-stat/stat-boot/src/main/resources/bootstrap.yml b/iot-analysis/analysis-stat/stat-boot/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..9503d37 --- /dev/null +++ b/iot-analysis/analysis-stat/stat-boot/src/main/resources/bootstrap.yml @@ -0,0 +1,53 @@ +#当前服务的基本信息 +microservice: + ename: '@artifactId@' + name: '@name@' + version: '@version@' + sentinel: + url: @sentinel.url@ + gateway: + url: @gateway.url@ +server: + port: 10304 +#feign接口开启服务熔断降级处理 +feign: + sentinel: + enabled: true + +spring: + application: + name: @artifactId@ + #nacos注册中心以及配置中心的指定 + cloud: + nacos: + discovery: + ip: @service.server.url@ + server-addr: @nacos.url@ + namespace: @nacos.namespace@ + config: + server-addr: @nacos.url@ + namespace: @nacos.namespace@ + file-extension: yaml + shared-configs: + - data-id: share-config.yaml + refresh: true + - data-Id: algorithm-config.yaml + refresh: true + main: + allow-bean-definition-overriding: true + +#项目日志的配置 +logging: + config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml + level: + root: info + + +#mybatis配置信息 +mybatis-plus: + #别名扫描 + type-aliases-package: com.njcn.stat.pojo + + +mqtt: + client-id: analysis-stat-boot${random.value} \ No newline at end of file diff --git a/iot-analysis/analysis-stat/stat-boot/src/test/java/com/njcn/AppTest.java b/iot-analysis/analysis-stat/stat-boot/src/test/java/com/njcn/AppTest.java new file mode 100644 index 0000000..a7e14d2 --- /dev/null +++ b/iot-analysis/analysis-stat/stat-boot/src/test/java/com/njcn/AppTest.java @@ -0,0 +1,20 @@ +package com.njcn; + +import static org.junit.Assert.assertTrue; + +import org.junit.Test; + +/** + * Unit test for simple App. + */ +public class AppTest +{ + /** + * Rigorous Test :-) + */ + @Test + public void shouldAnswerWithTrue() + { + assertTrue( true ); + } +} diff --git a/iot-analysis/analysis-zl-event/pom.xml b/iot-analysis/analysis-zl-event/pom.xml new file mode 100644 index 0000000..7a9aa4b --- /dev/null +++ b/iot-analysis/analysis-zl-event/pom.xml @@ -0,0 +1,28 @@ + + + + + iot-analysis + com.njcn + 1.0.0 + + 4.0.0 + + analysis-zl-event + pom + + analysis-zl-event + 物解析-各类事件解析模块 + + zl-event-api + zl-event-boot + + + + UTF-8 + 8 + 8 + + + diff --git a/iot-analysis/analysis-zl-event/zl-event-api/pom.xml b/iot-analysis/analysis-zl-event/zl-event-api/pom.xml new file mode 100644 index 0000000..6a69bce --- /dev/null +++ b/iot-analysis/analysis-zl-event/zl-event-api/pom.xml @@ -0,0 +1,21 @@ + + + + + analysis-zl-event + com.njcn + 1.0.0 + + 4.0.0 + + zl-event-api + + zl-event-api + + + UTF-8 + 8 + 8 + + diff --git a/iot-analysis/analysis-boot/pom.xml b/iot-analysis/analysis-zl-event/zl-event-boot/pom.xml similarity index 85% rename from iot-analysis/analysis-boot/pom.xml rename to iot-analysis/analysis-zl-event/zl-event-boot/pom.xml index 0995223..9533a0c 100644 --- a/iot-analysis/analysis-boot/pom.xml +++ b/iot-analysis/analysis-zl-event/zl-event-boot/pom.xml @@ -3,15 +3,15 @@ - iot-analysis + analysis-zl-event com.njcn 1.0.0 4.0.0 - analysis-boot + zl-event-boot - analysis-boot + zl-event-boot UTF-8 @@ -31,30 +31,18 @@ ${project.version} - com.njcn - common-core - ${project.version} + com.baomidou + dynamic-datasource-spring-boot-starter com.njcn common-db ${project.version} - - com.njcn - common-poi - ${project.version} - - - com.njcn - common-redis - 1.0.0 - compile - - analysisboot + zleventboot org.apache.maven.plugins diff --git a/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/ZlEventBootApplication.java b/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/ZlEventBootApplication.java new file mode 100644 index 0000000..c5e3ae3 --- /dev/null +++ b/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/ZlEventBootApplication.java @@ -0,0 +1,25 @@ +package com.njcn.zlevent; + +import lombok.extern.slf4j.Slf4j; +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.openfeign.EnableFeignClients; + + +/** + * @author hongawen + * @version 1.0.0 + * @date 2021年12月09日 20:59 + */ +@Slf4j +@MapperScan("com.njcn.**.mapper") +@EnableFeignClients(basePackages = "com.njcn") +@SpringBootApplication(scanBasePackages = "com.njcn") +public class ZlEventBootApplication { + + public static void main(String[] args) { + SpringApplication.run(ZlEventBootApplication.class, args); + } + +} diff --git a/iot-analysis/analysis-zl-event/zl-event-boot/src/main/resources/bootstrap.yml b/iot-analysis/analysis-zl-event/zl-event-boot/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..a903120 --- /dev/null +++ b/iot-analysis/analysis-zl-event/zl-event-boot/src/main/resources/bootstrap.yml @@ -0,0 +1,53 @@ +#当前服务的基本信息 +microservice: + ename: '@artifactId@' + name: '@name@' + version: '@version@' + sentinel: + url: @sentinel.url@ + gateway: + url: @gateway.url@ +server: + port: 10305 +#feign接口开启服务熔断降级处理 +feign: + sentinel: + enabled: true + +spring: + application: + name: @artifactId@ + #nacos注册中心以及配置中心的指定 + cloud: + nacos: + discovery: + ip: @service.server.url@ + server-addr: @nacos.url@ + namespace: @nacos.namespace@ + config: + server-addr: @nacos.url@ + namespace: @nacos.namespace@ + file-extension: yaml + shared-configs: + - data-id: share-config.yaml + refresh: true + - data-Id: algorithm-config.yaml + refresh: true + main: + allow-bean-definition-overriding: true + +#项目日志的配置 +logging: + config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml + level: + root: info + + +#mybatis配置信息 +mybatis-plus: + #别名扫描 + type-aliases-package: com.njcn.zlevent.pojo + + +mqtt: + client-id: analysis-zl-event-boot${random.value} \ No newline at end of file diff --git a/iot-analysis/analysis-zl-event/zl-event-boot/src/test/java/com/njcn/AppTest.java b/iot-analysis/analysis-zl-event/zl-event-boot/src/test/java/com/njcn/AppTest.java new file mode 100644 index 0000000..a7e14d2 --- /dev/null +++ b/iot-analysis/analysis-zl-event/zl-event-boot/src/test/java/com/njcn/AppTest.java @@ -0,0 +1,20 @@ +package com.njcn; + +import static org.junit.Assert.assertTrue; + +import org.junit.Test; + +/** + * Unit test for simple App. + */ +public class AppTest +{ + /** + * Rigorous Test :-) + */ + @Test + public void shouldAnswerWithTrue() + { + assertTrue( true ); + } +} diff --git a/iot-analysis/pom.xml b/iot-analysis/pom.xml index 93a321e..e4e1fa4 100644 --- a/iot-analysis/pom.xml +++ b/iot-analysis/pom.xml @@ -16,8 +16,9 @@ 物解析模块 - analysis-api - analysis-boot + analysis-stat + analysis-rt + analysis-zl-event