"> 
            <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 
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 
@SpringBootApplication
 23 
@SpringBootApplication
24 
public class LocationRescueApp {
 24 
public class LocationRescueApp {
25 
    public static void main(String[] args) throws Exception {
 25 
    public static void main(String[] args) throws Exception {
26 
        System.setProperty("websocket.port", "7100");
27
26 
    	//注册镜屏服务
 28 
    	//注册镜屏服务
27 
		ConnectServerManager.registerServer("websocket.port", new WebSocketStompServer("/stomp"));
 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 
	@ResponseBody
 76 
	@ResponseBody
77 
	@RequestMapping("/queryMapAreaTypeList")
 77 
	@RequestMapping("/queryMapAreaTypeList")
78 
	public CommonResponse<List<MapAreaBusinessType>> queryMapAreaTypeList() {
 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 
import java.util.List;
 5 
import java.util.List;
6 
import java.util.Map;
 6 
import java.util.Map;
7
7
8 
import com.ai.bss.location.rescue.service.interfaces.MapTagManageService;
8 
import org.slf4j.Logger;
 9 
import org.slf4j.Logger;
9 
import org.slf4j.LoggerFactory;
 10 
import org.slf4j.LoggerFactory;
10 
import org.springframework.beans.factory.annotation.Autowired;
 11 
import org.springframework.beans.factory.annotation.Autowired;
58 
    @Autowired
 59 
    @Autowired
59 
    private CharacteristicSpecService characteristicSpecService;
 60 
    private CharacteristicSpecService characteristicSpecService;
60
61
62 
    @Autowired
63 
    MapTagManageService mapTagManageService;
64
61 
    /**
 65 
    /**
62 
     * 初始化实时报警数据
 66 
     * 初始化实时报警数据
63 
     *
 67 
     *
128 
    public CommonResponse<Map<String, Object>> loadMapAreaTool(HashMap<String, Object> dataMap) throws Exception {
 132 
    public CommonResponse<Map<String, Object>> loadMapAreaTool(HashMap<String, Object> dataMap) throws Exception {
129 
        Map<String, Object> resultMap = new HashMap<String, Object>();
 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 
        List<ResourceToolType> toolTypeList = resourceToolQuery.loadAllResourceToolType(new CommonRequest(null))
 136 
        List<ResourceToolType> toolTypeList = resourceToolQuery.loadAllResourceToolType(new CommonRequest(null))
134 
                .getData();
 137 
                .getData();
135
138

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

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

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

55 
	}
 55 
	}
56
56
57 
	@Override
 57 
	@Override
58 
	public CommonResponse<List<MapAreaBusinessType>> queryMapAreaTypeList(CommonRequest<Void> params) {
58 
	public CommonResponse<List<MapAreaBusinessType>> queryMapAreaTypeList() {
59 
		CommonRequest params = new CommonRequest("5");
59 
		return mapAreaQuery.queryAllMapAreaBusinessType(params);
 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
31
32 
	/**
 32 
	/**
33 
	 * 获取所有围栏类型
 33 
	 * 获取所有围栏类型
34 
	 *
34 
	 * @return
 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 
spring.main.allow-bean-definition-overriding=true
 20 
spring.main.allow-bean-definition-overriding=true
21
21
22 
#kafka
 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 
kafka.producer.batch-size=16785
 29 
kafka.producer.batch-size=16785
30 
kafka.producer.retries=1
 30 
kafka.producer.retries=1
31 
kafka.producer.buffer-memory=33554432
 31 
kafka.producer.buffer-memory=33554432

拆分properties配置文件 · 3640ccd134 - Nuosi Git Service
Home Explore Help
Sign In
asiainfo
/
ebc
Watch 4
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Commits 144 Releases 0 Wiki
Browse Source

拆分properties配置文件

konghl 4 years ago
parent
9afed3d1cd
commit
3640ccd134
9 changed files with 66 additions and 57 deletions
Split View Show Diff Stats
  1. 12 0
      ebc-sea-platform/src/main/resources/dev/application-gis.properties
  2. 8 0
      ebc-sea-platform/src/main/resources/dev/application-iot.properties
  3. 2 19
      ebc-sea-platform/src/main/resources/dev/application.properties
  4. 12 0
      ebc-sea-platform/src/main/resources/pro/application-gis.properties
  5. 8 0
      ebc-sea-platform/src/main/resources/pro/application-iot.properties
  6. 2 19
      ebc-sea-platform/src/main/resources/pro/application.properties
  7. 12 0
      ebc-sea-platform/src/main/resources/test/application-gis.properties
  8. 8 0
      ebc-sea-platform/src/main/resources/test/application-iot.properties
  9. 2 19
      ebc-sea-platform/src/main/resources/test/application.properties

+ 12 - 0
ebc-sea-platform/src/main/resources/dev/application-gis.properties
View File 

@ -0,0 +1,12 @@
1 
#gis\u767b\u5f55\u8d26\u53f7\u548c\u5bc6\u7801
2 
aap.gis.userName=EBC_PPRS
3 
aap.gis.passwd=ITBS93wMYHosT
4
5 
#gis\u7684token\u5730\u5740
6 
url.gis.token=http://192.168.74.189:9999/gisIntf/account/gettoken
7
8 
#\u6d77\u56fe\u4e2d\u5fc3\u5750\u6807
9 
seaMap.centre.longitude=123.396036
10 
seaMap.centre.latitude=31.560302
11 
#\u6d77\u56fe\u663e\u793a\u6bd4\u4f8b\u5c3a
12 
seaMap.scale=11

+ 8 - 0
ebc-sea-platform/src/main/resources/dev/application-iot.properties
View File 

@ -0,0 +1,8 @@
1 
#\u5317\u5411\u767b\u5f55\u8d26\u53f7\u548c\u5bc6\u7801
2 
aap.iot.userCode=IOT_ADMIN
3 
aap.iot.passWord=123456
4
5 
#iot\u7684\u5317\u5411\u63a5\u53e3\u6ce8\u518c\u5730\u5740
6 
url.iot.login=http://60.205.219.67:8300/sso/login
7 
#iot\u7684\u5317\u5411\u63a5\u53e3\u7edf\u4e00\u5730\u5740
8 
url.iot.service=http://60.205.219.67:8300/dmp/terminalNorthApi/

+ 2 - 19
ebc-sea-platform/src/main/resources/dev/application.properties
View File 

@ -25,23 +25,6 @@ spring.devtools.restart.enabled=true
25 25 
spring.devtools.restart.additional-paths=src/main/java
26 26 
spring.devtools.restart.exclude=WEB-INF/**
27 27
28 
#\u5317\u5411\u767b\u5f55\u8d26\u53f7\u548c\u5bc6\u7801
29 
aap.iot.userCode=IOT_ADMIN
30 
aap.iot.passWord=123456
31 28
32 
#gis\u767b\u5f55\u8d26\u53f7\u548c\u5bc6\u7801
33 
aap.gis.userName=EBC_PPRS
34 
aap.gis.passwd=ITBS93wMYHosT
35
36 
#gis\u7684token\u5730\u5740
37 
url.gis.token=http://192.168.74.189:9999/gisIntf/account/gettoken
38 
#iot\u7684\u5317\u5411\u63a5\u53e3\u6ce8\u518c\u5730\u5740
39 
url.iot.login=http://60.205.219.67:8300/sso/login
40 
#iot\u7684\u5317\u5411\u63a5\u53e3\u7edf\u4e00\u5730\u5740
41 
url.iot.service=http://60.205.219.67:8300/dmp/terminalNorthApi/
42
43 
#\u6d77\u56fe\u4e2d\u5fc3\u5750\u6807
44 
seaMap.centre.longitude=123.396036
45 
seaMap.centre.latitude=31.560302
46 
#\u6d77\u56fe\u663e\u793a\u6bd4\u4f8b\u5c3a
47 
seaMap.scale=11
29 
#\u5f15\u7528\u5176\u4ed6\u914d\u7f6e\u6587\u4ef6
30 
spring.profiles.active=iot,gis

+ 12 - 0
ebc-sea-platform/src/main/resources/pro/application-gis.properties
View File 

@ -0,0 +1,12 @@
1 
#gis\u767b\u5f55\u8d26\u53f7\u548c\u5bc6\u7801
2 
aap.gis.userName=EBC_PPRS
3 
aap.gis.passwd=ITBS93wMYHosT
4
5 
#gis\u7684token\u5730\u5740
6 
url.gis.token=http://192.168.74.189:9999/gisIntf/account/gettoken
7
8 
#\u6d77\u56fe\u4e2d\u5fc3\u5750\u6807
9 
seaMap.centre.longitude=123.396036
10 
seaMap.centre.latitude=31.560302
11 
#\u6d77\u56fe\u663e\u793a\u6bd4\u4f8b\u5c3a
12 
seaMap.scale=11

+ 8 - 0
ebc-sea-platform/src/main/resources/pro/application-iot.properties
View File 

@ -0,0 +1,8 @@
1 
#\u5317\u5411\u767b\u5f55\u8d26\u53f7\u548c\u5bc6\u7801
2 
aap.iot.userCode=IOT_ADMIN
3 
aap.iot.passWord=123456
4
5 
#iot\u7684\u5317\u5411\u63a5\u53e3\u6ce8\u518c\u5730\u5740
6 
url.iot.login=http://60.205.219.67:80/sso/login
7 
#iot\u7684\u5317\u5411\u63a5\u53e3\u7edf\u4e00\u5730\u5740
8 
url.iot.service=http://60.205.219.67:80/dmp/terminalNorthApi/

+ 2 - 19
ebc-sea-platform/src/main/resources/pro/application.properties
View File 

@ -22,23 +22,6 @@ spring.devtools.restart.enabled=true
22 22 
spring.devtools.restart.additional-paths=src/main/java
23 23 
spring.devtools.restart.exclude=WEB-INF/**
24 24
25 
#\u5317\u5411\u767b\u5f55\u8d26\u53f7\u548c\u5bc6\u7801
26 
aap.iot.userCode=IOT_ADMIN
27 
aap.iot.passWord=123456
28 25
29 
#gis\u767b\u5f55\u8d26\u53f7\u548c\u5bc6\u7801
30 
aap.gis.userName=EBC_PPRS
31 
aap.gis.passwd=ITBS93wMYHosT
32
33 
#gis\u7684token\u5730\u5740
34 
url.gis.token=http://192.168.74.189:9999/gisIntf/account/gettoken
35 
#iot\u7684\u5317\u5411\u63a5\u53e3\u6ce8\u518c\u5730\u5740
36 
url.iot.login=http://60.205.219.67:80/sso/login
37 
#iot\u7684\u5317\u5411\u63a5\u53e3\u7edf\u4e00\u5730\u5740
38 
url.iot.service=http://60.205.219.67:80/dmp/terminalNorthApi/
39
40 
#\u6d77\u56fe\u4e2d\u5fc3\u5750\u6807
41 
seaMap.centre.longitude=123.396036
42 
seaMap.centre.latitude=31.560302
43 
#\u6d77\u56fe\u663e\u793a\u6bd4\u4f8b\u5c3a
44 
seaMap.scale=11
26 
#\u5f15\u7528\u5176\u4ed6\u914d\u7f6e\u6587\u4ef6
27 
spring.profiles.active=iot,gis

+ 12 - 0
ebc-sea-platform/src/main/resources/test/application-gis.properties
View File 

@ -0,0 +1,12 @@
1 
#gis\u767b\u5f55\u8d26\u53f7\u548c\u5bc6\u7801
2 
aap.gis.userName=EBC_PPRS
3 
aap.gis.passwd=ITBS93wMYHosT
4
5 
#gis\u7684token\u5730\u5740
6 
url.gis.token=http://192.168.74.189:9999/gisIntf/account/gettoken
7
8 
#\u6d77\u56fe\u4e2d\u5fc3\u5750\u6807
9 
seaMap.centre.longitude=123.396036
10 
seaMap.centre.latitude=31.560302
11 
#\u6d77\u56fe\u663e\u793a\u6bd4\u4f8b\u5c3a
12 
seaMap.scale=11

+ 8 - 0
ebc-sea-platform/src/main/resources/test/application-iot.properties
View File 

@ -0,0 +1,8 @@
1 
#\u5317\u5411\u767b\u5f55\u8d26\u53f7\u548c\u5bc6\u7801
2 
aap.iot.userCode=IOT_ADMIN
3 
aap.iot.passWord=123456
4
5 
#iot\u7684\u5317\u5411\u63a5\u53e3\u6ce8\u518c\u5730\u5740
6 
url.iot.login=http://60.205.219.67:8300/sso/login
7 
#iot\u7684\u5317\u5411\u63a5\u53e3\u7edf\u4e00\u5730\u5740
8 
url.iot.service=http://60.205.219.67:8300/dmp/terminalNorthApi/

+ 2 - 19
ebc-sea-platform/src/main/resources/test/application.properties
View File 

@ -22,23 +22,6 @@ spring.devtools.restart.enabled=true
22 22 
spring.devtools.restart.additional-paths=src/main/java
23 23 
spring.devtools.restart.exclude=WEB-INF/**
24 24
25 
#\u5317\u5411\u767b\u5f55\u8d26\u53f7\u548c\u5bc6\u7801
26 
aap.iot.userCode=IOT_ADMIN
27 
aap.iot.passWord=123456
28 25
29 
#gis\u767b\u5f55\u8d26\u53f7\u548c\u5bc6\u7801
30 
aap.gis.userName=EBC_PPRS
31 
aap.gis.passwd=ITBS93wMYHosT
32
33 
#gis\u7684token\u5730\u5740
34 
url.gis.token=http://192.168.74.189:9999/gisIntf/account/gettoken
35 
#iot\u7684\u5317\u5411\u63a5\u53e3\u6ce8\u518c\u5730\u5740
36 
url.iot.login=http://60.205.219.67:8300/sso/login
37 
#iot\u7684\u5317\u5411\u63a5\u53e3\u7edf\u4e00\u5730\u5740
38 
url.iot.service=http://60.205.219.67:8300/dmp/terminalNorthApi/
39
40 
#\u6d77\u56fe\u4e2d\u5fc3\u5750\u6807
41 
seaMap.centre.longitude=123.396036
42 
seaMap.centre.latitude=31.560302
43 
#\u6d77\u56fe\u663e\u793a\u6bd4\u4f8b\u5c3a
44 
seaMap.scale=11
26 
#\u5f15\u7528\u5176\u4ed6\u914d\u7f6e\u6587\u4ef6
27 
spring.profiles.active=iot,gis