pan>
	
167

163 168
    <!--
164 169
    <repositories>
165 170
        <repository>
@ -184,4 +189,99 @@
184 189
    </pluginRepositories>
185 190
    -->
186 191

192
    <build>
193

194
        <resources>
195
            <resource>
196
                <directory>src/main/resources</directory>
197
            </resource>
198
        </resources>
199

200
        <plugins>
201

202
            <!-- The configuration of maven-jar-plugin -->
203
            <plugin>
204
                <groupId>org.apache.maven.plugins</groupId>
205
                <artifactId>maven-jar-plugin</artifactId>
206
                <version>2.4</version>
207
                <!-- The configuration of the plugin -->
208
                <configuration>
209
                    <!-- Configuration of the archiver -->
210
                    <archive>
211
                        <!--生成的jar中,不要包含pom.xml和pom.properties这两个文件-->
212
                        <addMavenDescriptor>false</addMavenDescriptor>
213

214
                        <!-- Manifest specific configuration -->
215
                        <manifest>
216
                            <!--是否要把第三方jar放到manifest的classpath中-->
217
                            <addClasspath>true</addClasspath>
218
                            <!--生成的manifest中classpath的前缀,因为要把第三方jar放到lib目录下,所以classpath的前缀是lib/-->
219
                            <classpathPrefix>lib/</classpathPrefix>
220
                            <!--应用的main class-->
221
                            <mainClass>com.ai.bss.location.rescue.LocationRescueApp</mainClass>
222
                        </manifest>
223
                        <manifestEntries>
224
                            <Class-Path>./config/</Class-Path>
225
                        </manifestEntries>
226
                    </archive>
227
                    <!--过滤掉不希望包含在jar中的文件-->
228
                    <excludes>
229
                        <exclude>**/*.properties</exclude>
230
                        <exclude>**/*.xml</exclude>
231
                    </excludes>
232
                </configuration>
233
            </plugin>
234

235
            <plugin>
236
                <groupId>org.apache.maven.plugins</groupId>
237
                <artifactId>maven-dependency-plugin</artifactId>
238
                <version>2.10</version>
239
                <executions>
240
                    <execution>
241
                        <id>copy-dependencies</id>
242
                        <phase>package</phase>
243
                        <goals>
244
                            <goal>copy-dependencies</goal>
245
                        </goals>
246
                        <configuration>
247
                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
248
                        </configuration>
249
                    </execution>
250
                </executions>
251
            </plugin>
252

253
            <!-- The configuration of maven-assembly-plugin -->
254
            <plugin>
255
                <groupId>org.apache.maven.plugins</groupId>
256
                <artifactId>maven-assembly-plugin</artifactId>
257
                <version>2.4</version>
258
                <!-- The configuration of the plugin -->
259
                <configuration>
260
                    <!-- Specifies the configuration file of the assembly plugin -->
261
                    <descriptors>
262
                        <descriptor>src/main/assembly/package.xml</descriptor>
263
                    </descriptors>
264
                </configuration>
265
                <executions>
266
                    <execution>
267
                        <id>make-assembly</id>
268
                        <phase>package</phase>
269
                        <goals>
270
                            <goal>single</goal>
271
                        </goals>
272
                    </execution>
273
                </executions>
274
            </plugin>
275

276
            <plugin>
277
                <groupId>org.apache.maven.plugins</groupId>
278
                <artifactId>maven-surefire-plugin</artifactId>
279
                <configuration>
280
                    <skip>true</skip>
281
                </configuration>
282
            </plugin>
283
        </plugins>
284

285
    </build>
286

187 287
</project>

+ 59 - 0
ebc-sea-platform/src/main/assembly/package.xml

@ -0,0 +1,59 @@
1
<assembly>
2
    <id>bin</id>
3
    <!-- 最终打包成一个用于发布的zip文件 -->
4
    <formats>
5
        <format>zip</format>
6
    </formats>
7
8
    <!-- Adds dependencies to zip package under lib directory -->
9
    <dependencySets>
10
        <dependencySet>
11
            <!-- 不使用项目的artifact,第三方jar不要解压,打包进zip文件的lib目录 -->
12
            <useProjectArtifact>false</useProjectArtifact>
13
            <outputDirectory>lib</outputDirectory>
14
            <unpack>false</unpack>
15
            <scope>runtime</scope>
16
        </dependencySet>
17
    </dependencySets>
18
19
    <fileSets>
20
        <!-- 把项目相关的说明文件,打包进zip文件的根目录 -->
21
        <fileSet>
22
            <directory>${project.basedir}</directory>
23
            <outputDirectory>/</outputDirectory>
24
        <includes>
25
            <include>README*</include>
26
            <include>LICENSE*</include>
27
            <include>NOTICE*</include>
28
        </includes>
29
    </fileSet>
30
31
        <!-- 把项目的配置文件,打包进zip文件的config目录 -->
32
        <fileSet>
33
            <directory>src/main/resources</directory>
34
            <outputDirectory>/config</outputDirectory>
35
            <includes>
36
                <include>**/*.properties</include>
37
                <include>**/*.xml</include>
38
            </includes>
39
        </fileSet>
40
41
        <!-- 把项目的脚本文件目录( src/main/scripts )中的启动脚本文件,打包进zip文件的跟目录 -->
42
        <fileSet>
43
            <directory>${project.build.scriptSourceDirectory}</directory>
44
            <outputDirectory></outputDirectory>
45
            <includes>
46
                <include>startup.*</include>
47
            </includes>
48
        </fileSet>
49
50
        <!-- 把项目自己编译出来的jar文件,打包进zip文件的根目录 -->
51
        <fileSet>
52
            <directory>${project.build.directory}</directory>
53
            <outputDirectory></outputDirectory>
54
            <includes>
55
                <include>*.jar</include>
56
            </includes>
57
        </fileSet>
58
    </fileSets>
59
</assembly>

+ 9 - 5
ebc-sea-platform/src/main/java/com/ai/bss/location/rescue/LocationRescueApp.java

@ -1,5 +1,6 @@
1 1
package com.ai.bss.location.rescue;
2 2
3
import com.ailk.org.apache.commons.lang3.ArrayUtils;
3 4
import org.springframework.boot.SpringApplication;
4 5
import org.springframework.boot.autoconfigure.SpringBootApplication;
5 6
import org.springframework.boot.autoconfigure.domain.EntityScan;
@ -23,11 +24,14 @@ import com.ai.ipu.server.stomp.WebSocketStompServer;
23 24
@SpringBootApplication
24 25
public class LocationRescueApp {
25 26
    public static void main(String[] args) throws Exception {
26
    	//注册镜屏服务
27
		ConnectServerManager.registerServer("websocket.port", new WebSocketStompServer("/stomp"));
28
		//镜屏服务启动
29
		ConnectServerStart.start(args, false);
30
    	
27
        System.setProperty("websocket.port", "7100");
28
        //注册镜屏服务
29
        //ConnectServerManager.registerServer("websocket.port", new WebSocketStompServer("/stomp"));
30
        ConnectServerManager.registerServer("websocket.port", new WebSocketStompServer("/stomp"));
31
        //镜屏服务启动
32
        ConnectServerStart.start(args, false);
33
34
31 35
        SpringApplication.run(LocationRescueApp.class, args);
32 36
    }
33 37
}

ebc-sea-platform/src/main/resources/pro/application-gis.properties → ebc-sea-platform/src/main/resources/application-gis.properties


ebc-sea-platform/src/main/resources/pro/application-iot.properties → ebc-sea-platform/src/main/resources/application-iot.properties


ebc-sea-platform/src/main/resources/pro/application.properties → ebc-sea-platform/src/main/resources/application.properties


ebc-sea-platform/src/main/resources/pro/ipu-cache.xml → ebc-sea-platform/src/main/resources/ipu-cache.xml


ebc-sea-platform/src/main/resources/pro/sso.properties → ebc-sea-platform/src/main/resources/sso.properties


+ 0 - 232
location-rescue-service/location-rescue-service.iml

@ -1,232 +0,0 @@
1
<?xml version="1.0" encoding="UTF-8"?>
2
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" version="4">
3
  <component name="FacetManager">
4
    <facet type="Spring" name="Spring">
5
      <configuration />
6
    </facet>
7
    <facet type="jpa" name="JPA">
8
      <configuration>
9
        <setting name="validation-enabled" value="true" />
10
        <setting name="provider-name" value="Hibernate" />
11
        <datasource-mapping>
12
          <factory-entry name="entityManagerFactory" />
13
        </datasource-mapping>
14
        <naming-strategy-map />
15
      </configuration>
16
    </facet>
17
  </component>
18
  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
19
    <output url="file://$MODULE_DIR$/target/classes" />
20
    <output-test url="file://$MODULE_DIR$/target/test-classes" />
21
    <content url="file://$MODULE_DIR$">
22
      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
23
      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
24
      <excludeFolder url="file://$MODULE_DIR$/target" />
25
    </content>
26
    <orderEntry type="inheritedJdk" />
27
    <orderEntry type="sourceFolder" forTests="false" />
28
    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.0.3" level="project" />
29
    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.0" level="project" />
30
    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.11" level="project" />
31
    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.8" level="project" />
32
    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
33
    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.8" level="project" />
34
    <orderEntry type="library" name="Maven: com.ai.bss:work-tool-service-api:2.1-SNAPSHOT" level="project" />
35
    <orderEntry type="library" name="Maven: com.ai.bss:work-tool-model:2.1-SNAPSHOT" level="project" />
36
    <orderEntry type="library" name="Maven: com.ai.abc:persistence-mysql8:2.1-SNAPSHOT" level="project" />
37
    <orderEntry type="library" name="Maven: com.ai.abc:persistence-api:2.1-SNAPSHOT" level="project" />
38
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.5.RELEASE" level="project" />
39
    <orderEntry type="library" name="Maven: org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.2.Final" level="project" />
40
    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-jpa:2.1.8.RELEASE" level="project" />
41
    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.1.8.RELEASE" level="project" />
42
    <orderEntry type="library" name="Maven: org.springframework:spring-orm:5.1.7.RELEASE" level="project" />
43
    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.1.7.RELEASE" level="project" />
44
    <orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.9.4" level="project" />
45
    <orderEntry type="library" name="Maven: org.hibernate:hibernate-core:5.3.10.Final" level="project" />
46
    <orderEntry type="library" name="Maven: javax.persistence:javax.persistence-api:2.2" level="project" />
47
    <orderEntry type="library" name="Maven: org.javassist:javassist:3.23.2-GA" level="project" />
48
    <orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
49
    <orderEntry type="library" name="Maven: org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final" level="project" />
50
    <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.5.Final" level="project" />
51
    <orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
52
    <orderEntry type="library" name="Maven: org.hibernate.common:hibernate-commons-annotations:5.0.4.Final" level="project" />
53
    <orderEntry type="library" name="Maven: org.hibernate:hibernate-envers:5.3.10.Final" level="project" />
54
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-cache:2.1.5.RELEASE" level="project" />
55
    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.1.7.RELEASE" level="project" />
56
    <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.6.9" level="project" />
57
    <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:8.0.16" level="project" />
58
    <orderEntry type="library" scope="RUNTIME" name="Maven: com.google.protobuf:protobuf-java:3.6.1" level="project" />
59
    <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.17" level="project" />
60
    <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.17" level="project" />
61
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.1.5.RELEASE" level="project" />
62
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.1.5.RELEASE" level="project" />
63
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.8" level="project" />
64
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.8" level="project" />
65
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.8" level="project" />
66
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.1.5.RELEASE" level="project" />
67
    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.19" level="project" />
68
    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.19" level="project" />
69
    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.19" level="project" />
70
    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.16.Final" level="project" />
71
    <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
72
    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.1.7.RELEASE" level="project" />
73
    <orderEntry type="library" name="Maven: com.ai.bss:components-common:2.1-SNAPSHOT" level="project" />
74
    <orderEntry type="library" name="Maven: com.ai.abc:api-common:2.1-SNAPSHOT" level="project" />
75
    <orderEntry type="library" name="Maven: com.ai.abc:exception:2.1-SNAPSHOT" level="project" />
76
    <orderEntry type="library" name="Maven: com.ai.abc:utils:2.1-SNAPSHOT" level="project" />
77
    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
78
    <orderEntry type="library" name="Maven: org.json:json:20180130" level="project" />
79
    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.69" level="project" />
80
    <orderEntry type="library" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
81
    <orderEntry type="library" name="Maven: net.minidev:json-smart:2.3" level="project" />
82
    <orderEntry type="library" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
83
    <orderEntry type="library" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
84
    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
85
    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
86
    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.3.2" level="project" />
87
    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.9.2" level="project" />
88
    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.20" level="project" />
89
    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.20" level="project" />
90
    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.9.2" level="project" />
91
    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.9.2" level="project" />
92
    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.9.2" level="project" />
93
    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.9.2" level="project" />
94
    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.9.2" level="project" />
95
    <orderEntry type="library" name="Maven: com.google.guava:guava:27.1-jre" level="project" />
96
    <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
97
    <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
98
    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
99
    <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.5.2" level="project" />
100
    <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.2.0" level="project" />
101
    <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.1" level="project" />
102
    <orderEntry type="library" name="Maven: org.codehaus.mojo:animal-sniffer-annotations:1.17" level="project" />
103
    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.4.0" level="project" />
104
    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
105
    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
106
    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" level="project" />
107
    <orderEntry type="library" name="Maven: com.vividsolutions:jts-core:1.14.0" level="project" />
108
    <orderEntry type="library" name="Maven: com.ai.bss:work-tool-service:2.1-SNAPSHOT" level="project" />
109
    <orderEntry type="library" name="Maven: com.ai.bss:position-service-api:2.1-SNAPSHOT" level="project" />
110
    <orderEntry type="library" name="Maven: com.ai.bss:position-model:2.1-SNAPSHOT" level="project" />
111
    <orderEntry type="library" name="Maven: com.ai.bss:position-service:2.1-SNAPSHOT" level="project" />
112
    <orderEntry type="library" name="Maven: com.ai.bss:worker-service:2.1-SNAPSHOT" level="project" />
113
    <orderEntry type="library" name="Maven: com.ai.bss:worker-model:2.1-SNAPSHOT" level="project" />
114
    <orderEntry type="library" name="Maven: org.hibernate:hibernate-spatial:5.3.10.Final" level="project" />
115
    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.2.Final" level="project" />
116
    <orderEntry type="library" name="Maven: org.geolatte:geolatte-geom:1.3.0" level="project" />
117
    <orderEntry type="library" name="Maven: org.postgresql:postgresql:42.2.5" level="project" />
118
    <orderEntry type="library" name="Maven: org.dom4j:dom4j:2.1.1" level="project" />
119
    <orderEntry type="library" name="Maven: com.vividsolutions:jts:1.13" level="project" />
120
    <orderEntry type="library" name="Maven: com.ai.bss:worker-service-api:2.1-SNAPSHOT" level="project" />
121
    <orderEntry type="library" name="Maven: org.springframework.kafka:spring-kafka:2.2.6.RELEASE" level="project" />
122
    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.7.RELEASE" level="project" />
123
    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.7.RELEASE" level="project" />
124
    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.7.RELEASE" level="project" />
125
    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.7.RELEASE" level="project" />
126
    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.1.7.RELEASE" level="project" />
127
    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.1.7.RELEASE" level="project" />
128
    <orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.2.4.RELEASE" level="project" />
129
    <orderEntry type="library" name="Maven: org.apache.kafka:kafka-clients:2.0.1" level="project" />
130
    <orderEntry type="library" name="Maven: org.lz4:lz4-java:1.4.1" level="project" />
131
    <orderEntry type="library" name="Maven: org.xerial.snappy:snappy-java:1.1.7.1" level="project" />
132
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.5.RELEASE" level="project" />
133
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.5.RELEASE" level="project" />
134
    <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
135
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test:2.1.5.RELEASE" level="project" />
136
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.1.5.RELEASE" level="project" />
137
    <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
138
    <orderEntry type="library" name="Maven: org.assertj:assertj-core:3.11.1" level="project" />
139
    <orderEntry type="library" name="Maven: org.mockito:mockito-core:2.23.4" level="project" />
140
    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.9.12" level="project" />
141
    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.9.12" level="project" />
142
    <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.6" level="project" />
143
    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
144
    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
145
    <orderEntry type="library" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
146
    <orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
147
    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.7.RELEASE" level="project" />
148
    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.7.RELEASE" level="project" />
149
    <orderEntry type="library" name="Maven: org.springframework:spring-test:5.1.7.RELEASE" level="project" />
150
    <orderEntry type="library" name="Maven: org.xmlunit:xmlunit-core:2.6.2" level="project" />
151
    <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
152
    <orderEntry type="library" name="Maven: com.ai.bss:characteristic-spec-service:2.1-SNAPSHOT" level="project" />
153
    <orderEntry type="library" name="Maven: com.ai.bss:infrastructure:2.1-SNAPSHOT" level="project" />
154
    <orderEntry type="library" name="Maven: com.ai.abc:core:2.1-SNAPSHOT" level="project" />
155
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-jpa:2.1.5.RELEASE" level="project" />
156
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.1.5.RELEASE" level="project" />
157
    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.4" level="project" />
158
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.1.5.RELEASE" level="project" />
159
    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.2.0" level="project" />
160
    <orderEntry type="library" name="Maven: javax.transaction:javax.transaction-api:1.3" level="project" />
161
    <orderEntry type="library" name="Maven: org.springframework:spring-aspects:5.1.7.RELEASE" level="project" />
162
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.1.5.RELEASE" level="project" />
163
    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.1.8.RELEASE" level="project" />
164
    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.1.8.RELEASE" level="project" />
165
    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.1.7.RELEASE" level="project" />
166
    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.1.6.RELEASE" level="project" />
167
    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.36.Final" level="project" />
168
    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.2.9.RELEASE" level="project" />
169
    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.2" level="project" />
170
    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
171
    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.1.7.RELEASE" level="project" />
172
    <orderEntry type="library" name="Maven: org.apache.poi:poi:3.6" level="project" />
173
    <orderEntry type="library" scope="RUNTIME" name="Maven: commons-logging:commons-logging:1.1" level="project" />
174
    <orderEntry type="library" scope="RUNTIME" name="Maven: logkit:logkit:1.0.1" level="project" />
175
    <orderEntry type="library" scope="RUNTIME" name="Maven: avalon-framework:avalon-framework:4.1.3" level="project" />
176
    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.servlet:servlet-api:2.3" level="project" />
177
    <orderEntry type="library" name="Maven: com.ai.bss:charcateristic-spec-service-api:2.1-SNAPSHOT" level="project" />
178
    <orderEntry type="library" name="Maven: com.ai.bss:characteristic-spec-model:2.1-SNAPSHOT" level="project" />
179
    <orderEntry type="library" name="Maven: com.ai.bss:system-user-service:2.1-SNAPSHOT" level="project" />
180
    <orderEntry type="library" name="Maven: com.ai.bss:system-user-model:2.1-SNAPSHOT" level="project" />
181
    <orderEntry type="library" name="Maven: com.ai.bss:person-model:2.1-SNAPSHOT" level="project" />
182
    <orderEntry type="library" name="Maven: com.ai.bss:system-user-service-api:2.1-SNAPSHOT" level="project" />
183
    <orderEntry type="library" name="Maven: com.ai.bss:person-service:2.1-SNAPSHOT" level="project" />
184
    <orderEntry type="library" name="Maven: com.ai.bss:person-service-api:2.1-SNAPSHOT" level="project" />
185
    <orderEntry type="library" name="Maven: com.wframe:sso-util:1.2" level="project" />
186
    <orderEntry type="library" name="Maven: com.ai.ipu:ipu-cache:3.1-SNAPSHOT" level="project" />
187
    <orderEntry type="library" name="Maven: com.ai.ipu:ipu-basic:3.1-SNAPSHOT" level="project" />
188
    <orderEntry type="library" name="Maven: com.ai.ipu:ipu-common:3.1-SNAPSHOT" level="project" />
189
    <orderEntry type="library" name="Maven: com.ai.wade:wade-data:1.0" level="project" />
190
    <orderEntry type="library" name="Maven: com.mashape.unirest:unirest-java:1.3.8" level="project" />
191
    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.4" level="project" />
192
    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.11" level="project" />
193
    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
194
    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
195
    <orderEntry type="library" name="Maven: jaxen:jaxen:1.1.6" level="project" />
196
    <orderEntry type="library" name="Maven: xalan:xalan:2.7.2" level="project" />
197
    <orderEntry type="library" name="Maven: xalan:serializer:2.7.2" level="project" />
198
    <orderEntry type="library" name="Maven: xerces:xercesImpl:2.12.0" level="project" />
199
    <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.9.2" level="project" />
200
    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.23" level="project" />
201
    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.26" level="project" />
202
    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.11.2" level="project" />
203
    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-core:2.11.2" level="project" />
204
    <orderEntry type="library" name="Maven: com.ai.wade:wade-cache:1.0" level="project" />
205
    <orderEntry type="library" name="Maven: com.ai.wade:wade-apache:1.0" level="project" />
206
    <orderEntry type="library" name="Maven: redis.clients:jedis:2.9.3" level="project" />
207
    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.6.2" level="project" />
208
    <orderEntry type="library" name="Maven: com.ai.ipu.server:iot-stomp-server:3.1-SNAPSHOT" level="project" />
209
    <orderEntry type="library" name="Maven: com.ai.ipu.server:ipu-connect-server:3.1-SNAPSHOT" level="project" />
210
    <orderEntry type="library" name="Maven: log4j:log4j:1.2.8" level="project" />
211
    <orderEntry type="library" name="Maven: io.netty:netty-all:4.1.36.Final" level="project" />
212
    <orderEntry type="library" name="Maven: io.netty:netty-codec-mqtt:4.1.36.Final" level="project" />
213
    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.36.Final" level="project" />
214
    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.36.Final" level="project" />
215
    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.36.Final" level="project" />
216
    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.36.Final" level="project" />
217
    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.36.Final" level="project" />
218
    <orderEntry type="library" name="Maven: de.schlichtherle.truelicense:truelicense-core:1.33" level="project" />
219
    <orderEntry type="library" name="Maven: de.schlichtherle.truelicense:truelicense-xml:1.33" level="project" />
220
    <orderEntry type="library" name="Maven: de.schlichtherle.truelicense:truelicense-swing:1.33" level="project" />
221
    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2" level="project" />
222
    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.8" level="project" />
223
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.8" level="project" />
224
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
225
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.8" level="project" />
226
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.1.5.RELEASE" level="project" />
227
    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
228
    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
229
    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.11.2" level="project" />
230
    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.26" level="project" />
231
  </component>
232
</module>

+ 158 - 52
location-rescue-service/pom.xml

@ -3,15 +3,23 @@
3 3
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4 4
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5 5
    <modelVersion>4.0.0</modelVersion>
6
6 7
    <parent>
7 8
        <artifactId>components</artifactId>
8 9
        <groupId>com.ai.bss</groupId>
9 10
        <version>2.1.5-SNAPSHOT</version>
10 11
    </parent>
11 12
13
12 14
    <groupId>com.ai.bss</groupId>
13 15
    <artifactId>location-rescue-service</artifactId>
14
    <version>1.0-SNAPSHOT</version>
16
    <name>location-rescue-service</name>
17
18
    <!--	<properties>-->
19
    <!--		<start-class>com.ai.bss.location.rescue.LocationRescueApp</start-class>-->
20
    <!--		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>-->
21
    <!--        <jdk>1.8</jdk>-->
22
    <!--	</properties>-->
15 23
16 24
    <dependencies>
17 25
        <dependency>
@ -19,7 +27,7 @@
19 27
            <artifactId>pagehelper</artifactId>
20 28
            <version>5.0.3</version>
21 29
        </dependency>
22
        
30
23 31
        <dependency>
24 32
            <groupId>org.apache.httpcomponents</groupId>
25 33
            <artifactId>httpcore</artifactId>
@ -50,22 +58,22 @@
50 58
            <artifactId>worker-service</artifactId>
51 59
            <version>2.1.5-SNAPSHOT</version>
52 60
            <exclusions>
53
            	<exclusion>
54
            		<groupId>org.springframework.boot</groupId>
55
            		<artifactId>
56
            			spring-boot-starter-security
57
            		</artifactId>
58
            	</exclusion>
61
                <exclusion>
62
                    <groupId>org.springframework.boot</groupId>
63
                    <artifactId>
64
                        spring-boot-starter-security
65
                    </artifactId>
66
                </exclusion>
59 67
            </exclusions>
60 68
        </dependency>
61 69
62
		<dependency>
70
        <dependency>
63 71
            <groupId>com.ai.bss</groupId>
64 72
            <artifactId>characteristic-spec-service</artifactId>
65 73
            <version>2.1.5-SNAPSHOT</version>
66 74
        </dependency>
67 75
68
		<dependency>
76
        <dependency>
69 77
            <groupId>com.ai.bss</groupId>
70 78
            <artifactId>work-attendance-service-api</artifactId>
71 79
            <version>2.1.5-SNAPSHOT</version>
@ -85,61 +93,61 @@
85 93
            </exclusions>
86 94
        </dependency>
87 95
88
       <!-- uspa登录拦截效验-->
89
<!--   <dependency>
90
            <groupId>com.ai.bss</groupId>
91
            <artifactId>sso-util</artifactId>
92
            <version>1.0.0-RELEASE</version>
93
        </dependency>-->
96
        <!-- uspa登录拦截效验-->
97
        <!--   <dependency>
98
                    <groupId>com.ai.bss</groupId>
99
                    <artifactId>sso-util</artifactId>
100
                    <version>1.0.0-RELEASE</version>
101
                </dependency>-->
94 102
        <dependency>
95 103
            <groupId>com.wframe</groupId>
96 104
            <artifactId>sso-util</artifactId>
97 105
            <version>1.2</version>
98 106
        </dependency>
99
        
100
<!--	<dependency>
101
             <groupId>com.ai.ipu</groupId>
102
             <artifactId>ipu-data</artifactId>
103
             <version>3.1-SNAPSHOT</version>
104
             <scope>compile</scope>
105
         </dependency>
106
         <dependency>
107
             <groupId>com.ai.ipu</groupId>
108
             <artifactId>ipu-basic</artifactId>
109
             <version>3.1-SNAPSHOT</version>
110
             <scope>compile</scope>
111
         </dependency>
112
         <dependency>
113
             <groupId>com.ai.wade</groupId>
114
             <artifactId>wade-common</artifactId>
115
             <version>1.0</version>
116
             <scope>compile</scope>
117
         </dependency>
118
		<dependency>
119
            <groupId>com.ai.ipu</groupId>
120
            <artifactId>ipu-common</artifactId>
121
            <version>3.1-SNAPSHOT</version>
122
            <scope>compile</scope>
123
        </dependency>
124
        <dependency>
125
            <groupId>org.apache.poi</groupId>
126
            <artifactId>poi-ooxml</artifactId>
127
            <version>3.14</version>
128
            <scope>compile</scope>
129
        </dependency>-->
107
108
        <!--	<dependency>
109
                     <groupId>com.ai.ipu</groupId>
110
                     <artifactId>ipu-data</artifactId>
111
                     <version>3.1-SNAPSHOT</version>
112
                     <scope>compile</scope>
113
                 </dependency>
114
                 <dependency>
115
                     <groupId>com.ai.ipu</groupId>
116
                     <artifactId>ipu-basic</artifactId>
117
                     <version>3.1-SNAPSHOT</version>
118
                     <scope>compile</scope>
119
                 </dependency>
120
                 <dependency>
121
                     <groupId>com.ai.wade</groupId>
122
                     <artifactId>wade-common</artifactId>
123
                     <version>1.0</version>
124
                     <scope>compile</scope>
125
                 </dependency>
126
                <dependency>
127
                    <groupId>com.ai.ipu</groupId>
128
                    <artifactId>ipu-common</artifactId>
129
                    <version>3.1-SNAPSHOT</version>
130
                    <scope>compile</scope>
131
                </dependency>
132
                <dependency>
133
                    <groupId>org.apache.poi</groupId>
134
                    <artifactId>poi-ooxml</artifactId>
135
                    <version>3.14</version>
136
                    <scope>compile</scope>
137
                </dependency>-->
130 138
131 139
        <!-- 缓存 -->
132 140
        <dependency>
133
		   <groupId>com.ai.ipu</groupId>
134
		   <artifactId>ipu-cache</artifactId>
135
		   <version>3.1-SNAPSHOT</version>
136
		   <exclusions>
141
            <groupId>com.ai.ipu</groupId>
142
            <artifactId>ipu-cache</artifactId>
143
            <version>3.1-SNAPSHOT</version>
144
            <exclusions>
137 145
                <exclusion>
138 146
                    <groupId>org.apache.logging.log4j</groupId>
139 147
                    <artifactId>log4j-slf4j-impl</artifactId>
140 148
                </exclusion>
141 149
            </exclusions>
142
		</dependency>
150
        </dependency>
143 151
144 152
        <!--  IPU 镜屏 -->
145 153
        <dependency>
@ -155,6 +163,8 @@
155 163
        </dependency>
156 164
    </dependencies>
157 165
166
167
158 168
    <!--
159 169
    <repositories>
160 170
        <repository>
@ -179,4 +189,100 @@
179 189
    </pluginRepositories>
180 190
    -->
181 191
192
    <build>
193
194
        <resources>
195
            <resource>
196
                <directory>src/main/resources</directory>
197
            </resource>
198
        </resources>
199
200
        <plugins>
201
202
            <!-- The configuration of maven-jar-plugin -->
203
            <plugin>
204
                <groupId>org.apache.maven.plugins</groupId>
205
                <artifactId>maven-jar-plugin</artifactId>
206
                <version>2.4</version>
207
                <!-- The configuration of the plugin -->
208
                <configuration>
209
                    <!-- Configuration of the archiver -->
210
                    <archive>
211
                        <!--生成的jar中,不要包含pom.xml和pom.properties这两个文件-->
212
                        <addMavenDescriptor>false</addMavenDescriptor>
213
214
                        <!-- Manifest specific configuration -->
215
                        <manifest>
216
                            <!--是否要把第三方jar放到manifest的classpath中-->
217
                            <addClasspath>true</addClasspath>
218
                            <!--生成的manifest中classpath的前缀,因为要把第三方jar放到lib目录下,所以classpath的前缀是lib/-->
219
                            <classpathPrefix>lib/</classpathPrefix>
220
                            <!--应用的main class-->
221
                            <mainClass>com.ai.bss.location.rescue.LocationRescueApp</mainClass>
222
                        </manifest>
223
                        <manifestEntries>
224
                            <Class-Path>./config/</Class-Path>
225
                        </manifestEntries>
226
                    </archive>
227
                    <!--过滤掉不希望包含在jar中的文件-->
228
                    <excludes>
229
                        <exclude>**/*.properties</exclude>
230
                        <exclude>**/*.xml</exclude>
231
                    </excludes>
232
                </configuration>
233
            </plugin>
234
235
            <plugin>
236
                <groupId>org.apache.maven.plugins</groupId>
237
                <artifactId>maven-dependency-plugin</artifactId>
238
                <version>2.10</version>
239
                <executions>
240
                    <execution>
241
                        <id>copy-dependencies</id>
242
                        <phase>package</phase>
243
                        <goals>
244
                            <goal>copy-dependencies</goal>
245
                        </goals>
246
                        <configuration>
247
                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
248
                        </configuration>
249
                    </execution>
250
                </executions>
251
            </plugin>
252
253
            <!-- The configuration of maven-assembly-plugin -->
254
            <plugin>
255
                <groupId>org.apache.maven.plugins</groupId>
256
                <artifactId>maven-assembly-plugin</artifactId>
257
                <version>2.4</version>
258
                <!-- The configuration of the plugin -->
259
                <configuration>
260
                    <!-- Specifies the configuration file of the assembly plugin -->
261
                    <descriptors>
262
                        <descriptor>src/main/assembly/package.xml</descriptor>
263
                    </descriptors>
264
                </configuration>
265
                <executions>
266
                    <execution>
267
                        <id>make-assembly</id>
268
                        <phase>package</phase>
269
                        <goals>
270
                            <goal>single</goal>
271
                        </goals>
272
                    </execution>
273
                </executions>
274
            </plugin>
275
276
            <plugin>
277
                <groupId>org.apache.maven.plugins</groupId>
278
                <artifactId>maven-surefire-plugin</artifactId>
279
                <configuration>
280
                    <skip>true</skip>
281
                </configuration>
282
            </plugin>
283
        </plugins>
284
285
        <finalName>${project.artifactId}</finalName>
286
    </build>
287
182 288
</project>

+ 59 - 0
location-rescue-service/src/main/assembly/package.xml

@ -0,0 +1,59 @@
1
<assembly>
2
    <id>bin</id>
3
    <!-- 最终打包成一个用于发布的zip文件 -->
4
    <formats>
5
        <format>zip</format>
6
    </formats>
7
8
    <!-- Adds dependencies to zip package under lib directory -->
9
    <dependencySets>
10
        <dependencySet>
11
            <!-- 不使用项目的artifact,第三方jar不要解压,打包进zip文件的lib目录 -->
12
            <useProjectArtifact>false</useProjectArtifact>
13
            <outputDirectory>lib</outputDirectory>
14
            <unpack>false</unpack>
15
            <scope>runtime</scope>
16
        </dependencySet>
17
    </dependencySets>
18
19
    <fileSets>
20
        <!-- 把项目相关的说明文件,打包进zip文件的根目录 -->
21
        <fileSet>
22
            <directory>${project.basedir}</directory>
23
            <outputDirectory>/</outputDirectory>
24
        <includes>
25
            <include>README*</include>
26
            <include>LICENSE*</include>
27
            <include>NOTICE*</include>
28
        </includes>
29
    </fileSet>
30
31
        <!-- 把项目的配置文件,打包进zip文件的config目录 -->
32
        <fileSet>
33
            <directory>src/main/resources</directory>
34
            <outputDirectory>/config</outputDirectory>
35
            <includes>
36
                <include>**/*.properties</include>
37
                <include>**/*.xml</include>
38
            </includes>
39
        </fileSet>
40
41
        <!-- 把项目的脚本文件目录( src/main/scripts )中的启动脚本文件,打包进zip文件的跟目录 -->
42
        <fileSet>
43
            <directory>${project.build.scriptSourceDirectory}</directory>
44
            <outputDirectory></outputDirectory>
45
            <includes>
46
                <include>startup.*</include>
47
            </includes>
48
        </fileSet>
49
50
        <!-- 把项目自己编译出来的jar文件,打包进zip文件的根目录 -->
51
        <fileSet>
52
            <directory>${project.build.directory}</directory>
53
            <outputDirectory></outputDirectory>
54
            <includes>
55
                <include>*.jar</include>
56
            </includes>
57
        </fileSet>
58
    </fileSets>
59
</assembly>

+ 0 - 39
location-rescue-service/src/main/java/com/ai/bss/location/rescue/EbcSeaPlatformStart.java

@ -1,39 +0,0 @@
1
package com.ai.bss.location.rescue;
2
3
4
import org.slf4j.Logger;
5
import org.slf4j.LoggerFactory;
6
7
8
/**
9
 * @author huangbo@asiainfo.com
10
 * @team IPU
11
 * @date 2019年11月21日下午3:11:12
12
 * @desc SpringBoot应用启动类
13
 */
14
15
public class EbcSeaPlatformStart {
16
	
17
	private final static String EXCEPTION_MESSAGES_CONFIG = "exception_messages";
18
	private static final Logger logger = LoggerFactory.getLogger(EbcSeaPlatformStart.class);
19
20
	public static void main(String[] args) {
21
/*		*//*注册异常信息编码配置*//*
22
	    //热部署会多次加载,因此需要捕获并忽略异常
23
		try{
24
			IpuBaseException.registerCode(EXCEPTION_MESSAGES_CONFIG);
25
			//注册镜屏服务
26
			ConnectServerManager.registerServer("websocket.port", new WebSocketStompServer("/stomp"));
27
			//镜屏服务启动
28
			ConnectServerStart.start(args, false);
29
		}catch(Exception e) {
30
			logger.error("启动失败:" + e.getMessage());
31
			try {
32
				ReflectUtil.invokeStaticMethod(System.class, "exit", new Object[] { 0 });
33
			} catch (Exception e1) {}
34
		}
35
		*//*启动*//*
36
	    IpuRestApplication.start(args);*/
37
	}
38
	
39
}

+ 2 - 0
location-rescue-service/src/main/java/com/ai/bss/location/rescue/LocationRescueApp.java

@ -23,6 +23,8 @@ import com.ai.ipu.server.stomp.WebSocketStompServer;
23 23
@SpringBootApplication
24 24
public class LocationRescueApp {
25 25
    public static void main(String[] args) throws Exception {
26
        System.setProperty("websocket.port", "7100");
27
26 28
    	//注册镜屏服务
27 29
		ConnectServerManager.registerServer("websocket.port", new WebSocketStompServer("/stomp"));
28 30
		//镜屏服务启动

+ 1 - 2
location-rescue-service/src/main/java/com/ai/bss/location/rescue/controller/MapTagManageController.java

@ -76,8 +76,7 @@ public class MapTagManageController {
76 76
	@ResponseBody
77 77
	@RequestMapping("/queryMapAreaTypeList")
78 78
	public CommonResponse<List<MapAreaBusinessType>> queryMapAreaTypeList() {
79
		CommonRequest<Void> params = new CommonRequest(null);
80
		return mapTagManageService.queryMapAreaTypeList(params);
79
		return mapTagManageService.queryMapAreaTypeList();
81 80
	}
82 81
83 82
	/**

+ 5 - 2
location-rescue-service/src/main/java/com/ai/bss/location/rescue/service/impl/AlarmManagementServiceImpl.java

@ -5,6 +5,7 @@ import java.util.HashMap;
5 5
import java.util.List;
6 6
import java.util.Map;
7 7
8
import com.ai.bss.location.rescue.service.interfaces.MapTagManageService;
8 9
import org.slf4j.Logger;
9 10
import org.slf4j.LoggerFactory;
10 11
import org.springframework.beans.factory.annotation.Autowired;
@ -58,6 +59,9 @@ public class AlarmManagementServiceImpl implements AlarmManagementService {
58 59
    @Autowired
59 60
    private CharacteristicSpecService characteristicSpecService;
60 61
62
    @Autowired
63
    MapTagManageService mapTagManageService;
64
61 65
    /**
62 66
     * 初始化实时报警数据
63 67
     *
@ -128,8 +132,7 @@ public class AlarmManagementServiceImpl implements AlarmManagementService {
128 132
    public CommonResponse<Map<String, Object>> loadMapAreaTool(HashMap<String, Object> dataMap) throws Exception {
129 133
        Map<String, Object> resultMap = new HashMap<String, Object>();
130 134
131
        List<MapAreaBusinessType> mapAreaTypeList = mapAreaQuery.queryAllMapAreaBusinessType(new CommonRequest(null))
132
                .getData();
135
        List<MapAreaBusinessType> mapAreaTypeList = mapTagManageService.queryMapAreaTypeList().getData();
133 136
        List<ResourceToolType> toolTypeList = resourceToolQuery.loadAllResourceToolType(new CommonRequest(null))
134 137
                .getData();
135 138

+ 5 - 2
location-rescue-service/src/main/java/com/ai/bss/location/rescue/service/impl/LocationManagementServiceImpl.java

@ -18,6 +18,7 @@ import com.ai.bss.components.common.util.ComponentReflectionUtils;
18 18
import com.ai.bss.location.rescue.model.EbcEntityPosition;
19 19
import com.ai.bss.location.rescue.model.EbcMapArea;
20 20
import com.ai.bss.location.rescue.service.interfaces.LocationManagementService;
21
import com.ai.bss.location.rescue.service.interfaces.MapTagManageService;
21 22
import com.ai.bss.position.model.EntityPosition;
22 23
import com.ai.bss.position.model.MapArea;
23 24
import com.ai.bss.position.model.MapAreaBusinessType;
@ -43,6 +44,9 @@ public class LocationManagementServiceImpl implements LocationManagementService
43 44
	@Autowired
44 45
	private ResourceToolQuery resourceToolQuery;
45 46
47
	@Autowired
48
	MapTagManageService mapTagManageService;
49
	
46 50
	/**
47 51
	 * 初始化人员定位详细数据
48 52
	 *
@ -170,8 +174,7 @@ public class LocationManagementServiceImpl implements LocationManagementService
170 174
		if (CollectionUtils.isEmpty(mapAreaList))
171 175
			return ebcMapAreaList;
172 176
173
		List<MapAreaBusinessType> mapAreaTypeList = mapAreaQuery.queryAllMapAreaBusinessType(new CommonRequest(null))
174
				.getData();
177
		List<MapAreaBusinessType> mapAreaTypeList = mapTagManageService.queryMapAreaTypeList().getData();
175 178
		List<ResourceToolType> toolTypeList = resourceToolQuery.loadAllResourceToolType(new CommonRequest(null))
176 179
				.getData();
177 180

+ 2 - 1
location-rescue-service/src/main/java/com/ai/bss/location/rescue/service/impl/MapTagManageServiceImpl.java

@ -55,7 +55,8 @@ public class MapTagManageServiceImpl implements MapTagManageService {
55 55
	}
56 56
57 57
	@Override
58
	public CommonResponse<List<MapAreaBusinessType>> queryMapAreaTypeList(CommonRequest<Void> params) {
58
	public CommonResponse<List<MapAreaBusinessType>> queryMapAreaTypeList() {
59
		CommonRequest params = new CommonRequest("5");
59 60
		return mapAreaQuery.queryAllMapAreaBusinessType(params);
60 61
	}
61 62

+ 2 - 1
location-rescue-service/src/main/java/com/ai/bss/location/rescue/service/interfaces/MapTagManageService.java

@ -31,9 +31,10 @@ public interface MapTagManageService {
31 31
32 32
	/**
33 33
	 * 获取所有围栏类型
34
	 * 
34 35
	 * @return
35 36
	 */
36
	CommonResponse<List<MapAreaBusinessType>> queryMapAreaTypeList(CommonRequest<Void> params);
37
	CommonResponse<List<MapAreaBusinessType>> queryMapAreaTypeList();
37 38
38 39
	/**
39 40
	 * 新增围栏信息

+ 6 - 6
location-rescue-service/src/main/resources/application.properties

@ -20,12 +20,12 @@ spring.jpa.properties.hibernate.generate_statistics=false
20 20
spring.main.allow-bean-definition-overriding=true
21 21
22 22
#kafka
23
kafka.bootstrap-servers=47.105.160.21:9090
24
#kafka.bootstrap-servers=10.19.90.34:2182
25
#kafka.topic.deviceLocation=Topic_IoT_DeviceLocation
26
#kafka.topic.alarm=Topic_IoT_IndividualAlarm
27
kafka.topic.deviceLocation=DeviceLocationA
28
kafka.topic.alarm=IndividualAlarmA
23
#kafka.bootstrap-servers=47.105.160.21:9090
24
kafka.bootstrap-servers=10.19.90.34:9090
25
kafka.topic.deviceLocation=Topic_IoT_DeviceLocation
26
kafka.topic.alarm=Topic_IoT_IndividualAlarm
27
#kafka.topic.deviceLocation=DeviceLocationA
28
#kafka.topic.alarm=IndividualAlarmA
29 29
kafka.producer.batch-size=16785
30 30
kafka.producer.retries=1
31 31
kafka.producer.buffer-memory=33554432

修改配置文件,用于上传服务器 · 8ff2333bdb - Nuosi Git Service
Browse Source

修改配置文件,用于上传服务器

konghl 4 years ago
parent
commit
8ff2333bdb
1 changed files with 7 additions and 2 deletions
  1. 7 2
      ebc-sea-platform/pom.xml

+ 7 - 2
ebc-sea-platform/pom.xml

@ -3,15 +3,20 @@
3 3
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4 4
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5 5
    <modelVersion>4.0.0</modelVersion>
6
    
6 7
    <parent>
7 8
        <artifactId>components</artifactId>
8 9
        <groupId>com.ai.bss</groupId>
9 10
        <version>2.1.5-SNAPSHOT</version>
10 11
    </parent>
11 12

12
    <groupId>com.ai.bss</groupId>
13 13
    <artifactId>ebc-sea-platform</artifactId>
14
    <version>2.0-SNAPSHOT</version>
14
	<packaging>jar</packaging>
15

16
	<properties>
17
		<start-class>com.ai.bss.location.rescue.LocationRescueApp</start-class>
18
		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
19
	</properties>
15 20

16 21
    <dependencies>
17 22
        <dependency>