1"> 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
View File 

@ -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
View File 

@ -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
View File 

@ -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
View File 

@ -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
View File 

@ -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
View File 

@ -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
View File 

@ -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
View File 

@ -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

android-share - Nuosi Git Service
ホーム エスクプローラ ヘルプ
サインイン
ipu
/
android-share
Watch 6
Star 0
Fork 0
コード 課題 1 プルリクエスト 1 コミット 1610 リリース 4 Wiki

ipu的trunk版的android工程和服务端工程。

ブランチ: master
ブランチ タグ
android-share
/
push-server
/
lib
/
commons-logging-1.1.1.jar

commons-logging-1.1.1.jar 59KB
パーマリンク 履歴 生データ

生データを見る