ld"> 37
38
	private void sendJingpingData(JMap params, Map<String, Object> bindInfoMap) {
39
		params.put("shipName", bindInfoMap.get("NAME"));
40
		params.put("shipCode", bindInfoMap.get("CODE"));
41
42
		JingPingSendDateUtil.sendData(JingPingSendDateUtil.topic_ship, params);
43
	}
44
45
}

+ 68 - 47
ebc-sea-platform/src/main/java/com/ai/ipu/server/util/EbcConstant.java

@ -9,9 +9,12 @@ public class EbcConstant {
9 9
	// 下拉列表最大查询条数
10 10
	public static final int comboBox_maxNum = 20;
11 11
12
	//经纬度的精度
13
	public static final int coord_scale=7;
14
	
12
	// 每页默认查询条数
13
	public static final int default_page_size = 20;
14
15
	// 经纬度的精度
16
	public static final int coord_scale = 7;
17
15 18
	// 终端的产品id
16 19
	public static final String beidouDevice_product_id = "57700004344";
17 20
@ -45,52 +48,70 @@ public class EbcConstant {
45 48
	// 围栏标记类型:定点
46 49
	public static final String area_type_temporariness = "4";
47 50
48
	//人员定位状态:正常
49
	public static final String location_status_normal="0";
50
	
51
	//人员定位状态:离线
52
	public static final String location_status_offline="1";
53
	
54
	//人员定位状态:定点(超时)违规
55
	public static final String location_status_overtime="2";
56
	
57
	//人员定位状态:电子围栏(禁区)违规
58
	public static final String location_status_exclusion ="3";
59
	
60
	//人员定位状态:SOS(自动)
61
	public static final String location_status_autosos="4";
62
	
63
	//人员定位状态:SOS(手动)
64
	public static final String location_status_jogsos="5";
65
	
66
	//人员定位状态:救援人员
67
	public static final String location_status_rescuers="6";
68
	
69
	//告警类型:SOS(手动)
70
	public static final int alarm_type_jogsos_beidou=2;
71
	
72
	//告警类型:SOS(自动)
73
	public static final int alarm_type_autosos_beidou=1;
74
	
75
	//告警类型:离线
76
	public static final int alarm_type_offline_beidou=4;
77
	
78
	//告警类型:SOS(手动)
79
	public static final String alarm_type_jogsos_ZH="手动告警";
80
	
81
	//告警类型:SOS(自动)
82
	public static final String alarm_type_autosos_ZH="落水告警";
51
	// 人员定位状态:正常
52
	public static final String location_status_normal = "0";
83 53
84
	//告警类型:离线
85
	public static final String alarm_type_offline_ZH="离线告警";
86
	
87
	//考勤查询日
88
	public static final String  AREA_IN_OUT_RECORD_DAY="day";
54
	// 人员定位状态:离线
55
	public static final String location_status_offline = "1";
56
57
	// 人员定位状态:定点(超时)违规
58
	public static final String location_status_overtime = "2";
59
60
	// 人员定位状态:电子围栏(禁区)违规
61
	public static final String location_status_exclusion = "3";
89 62
90
	//考勤查询周
91
	public static final String AREA_IN_OUT_RECORD_WEEK="week";
63
	// 人员定位状态:SOS(自动)
64
	public static final String location_status_autosos = "4";
92 65
93
	//考勤查询月
94
	public static final String AREA_IN_OUT_RECORD_MONTH="month";
66
	// 人员定位状态:SOS(手动)
67
	public static final String location_status_jogsos = "5";
95 68
69
	// 人员定位状态:救援人员
70
	public static final String location_status_rescuers = "6";
71
72
	// 告警类型:SOS(手动)
73
	public static final int alarm_type_jogsos_beidou = 2;
74
75
	// 告警类型:SOS(自动)
76
	public static final int alarm_type_autosos_beidou = 1;
77
78
	// 告警类型:离线
79
	public static final int alarm_type_offline_beidou = 4;
80
81
	// 告警类型:SOS(手动)
82
	public static final String alarm_type_jogsos_ZH = "手动告警";
83
84
	// 告警类型:SOS(自动)
85
	public static final String alarm_type_autosos_ZH = "落水告警";
86
87
	// 告警类型:离线
88
	public static final String alarm_type_offline_ZH = "离线告警";
89
90
	// 数据状态:有效(未关闭)
91
	public static final String data_status_valid = "1";
92
93
	// 数据状态:无效(关闭)
94
	public static final String data_status_close = "0";
95
96
	// 考勤查询:日
97
	public static final String AREA_IN_OUT_RECORD_DAY = "day";
98
99
	// 考勤查询:周
100
	public static final String AREA_IN_OUT_RECORD_WEEK = "week";
101
102
	// 考勤查询:月
103
	public static final String AREA_IN_OUT_RECORD_MONTH = "month";
104
105
	// 轨迹的时间段:10分钟
106
	public static final String locus_time_interval_tenMinute = "1";
107
	
108
	// 轨迹的时间段:1小时
109
	public static final String locus_time_interval_oneHour = "2";
110
	
111
	// 轨迹的时间段:1天
112
	public static final String locus_time_interval_oneDay = "3";
113
	
114
	// 轨迹的时间段:自定义
115
	public static final String locus_time_interval_custom = "4";
116
	
96 117
}

+ 10 - 1
ebc-sea-platform/src/main/java/com/ai/ipu/server/util/JingPingSendDateUtil.java

@ -1,9 +1,14 @@
1 1
package com.ai.ipu.server.util;
2 2
3
import com.ai.ipu.basic.log.ILogger;
4
import com.ai.ipu.basic.log.IpuLoggerFactory;
5
import com.ai.ipu.data.JMap;
3 6
import com.ai.ipu.server.connect.ps.EventChannelTool;
4 7
import com.ai.ipu.server.connect.ps.EventChannelTool.PublisherEvent;
5 8
import com.ai.ipu.server.connect.ps.ISubscriber;
6 9
import com.ai.ipu.server.connect.ps.impl.Publisher;
10
import com.ai.ipu.server.service.iotData.ManageIotNoInAreaData;
11
import com.alibaba.fastjson.JSON;
7 12
8 13
/**
9 14
 * 镜屏推送消息
@ -11,6 +16,7 @@ import com.ai.ipu.server.connect.ps.impl.Publisher;
11 16
 * 2020-10-21
12 17
 */
13 18
public class JingPingSendDateUtil {
19
	private static final ILogger logger = IpuLoggerFactory.createLogger(ManageIotNoInAreaData.class);
14 20
15 21
	// 人员定位topic
16 22
	public static final String topic_personnel = "personnel";
@ -18,7 +24,10 @@ public class JingPingSendDateUtil {
18 24
	// 船舶定位topic
19 25
	public static final String topic_ship = "ship";
20 26
21
	public static void sendData(String topic, String msg) {
27
	public static void sendData(String topic, JMap params) {
28
		String msg = JSON.toJSONString(params);
29
		logger.debug("推送镜屏数据: topic="+topic+" , data=" + msg);
30
		
22 31
		if (!EventChannelTool.isExistSubscriber(topic)) {
23 32
			// 如果没有订阅 先不管
24 33
			return;

+ 3 - 0
ebc-sea-platform/src/main/java/com/ai/ipu/server/util/NorthboundInterfaceConstant.java

@ -24,6 +24,9 @@ public class NorthboundInterfaceConstant {
24 24
	// 查询多个设备解析后的事件
25 25
	public static final String queryMoreDeviceNewIncident="findTerminalEventDataParseInResourceIdsLastData";
26 26
27
	//按时间段查询单个设备的事件
28
	public static final String queryOneDeviceIncident="findTerminalEventDataParseES";
29
	
27 30
	// 调用成功标识
28 31
	public static final String resultCode_succeed = "0";
29 32

+ 7 - 1
ebc-sea-platform/src/main/resources/dev/application.properties

@ -38,4 +38,10 @@ url.gis.token=http://192.168.74.189:9999/gisIntf/account/gettoken
38 38
#iot\u7684\u5317\u5411\u63a5\u53e3\u6ce8\u518c\u5730\u5740
39 39
url.iot.login=http://60.205.219.67:8300/sso/login
40 40
#iot\u7684\u5317\u5411\u63a5\u53e3\u7edf\u4e00\u5730\u5740
41
url.iot.service=http://60.205.219.67:8300/dmp/terminalNorthApi/
41
url.iot.service=http://60.205.219.67:8081/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

+ 7 - 1
ebc-sea-platform/src/main/resources/pro/application.properties

@ -35,4 +35,10 @@ url.gis.token=http://192.168.74.189:9999/gisIntf/account/gettoken
35 35
#iot\u7684\u5317\u5411\u63a5\u53e3\u6ce8\u518c\u5730\u5740
36 36
url.iot.login=http://60.205.219.67:80/sso/login
37 37
#iot\u7684\u5317\u5411\u63a5\u53e3\u7edf\u4e00\u5730\u5740
38
url.iot.service=http://60.205.219.67:80/dmp/terminalNorthApi/
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

+ 15 - 0
ebc-sea-platform/src/main/resources/sql/ipu/EquipmentManageDao.xml

@ -27,6 +27,21 @@
27 27
		</select>
28 28
		]]>
29 29
	</sql>
30
	
31
	<sql name="queryAllEquipmentInfo">
32
		<![CDATA[
33
		<select id="queryAllEquipmentInfo" resultType="java.util.Map" >
34
			SELECT FACILITY_ID,FACILITY_TYPE,FACILITY_CODE,FACILITY_NAME,LONGITUDE,LATITUDE
35
			FROM LR_FACILITY
36
			<where>
37
				<if test="facilityType!=null and facilityType != ''">
38
               		 FACILITY_TYPE IN (${facilityType})
39
            	</if>
40
		
41
			</where>
42
		</select>
43
		]]>
44
	</sql>
30 45
31 46
	<sql name="updateEquipmentInfo">
32 47
		<![CDATA[

+ 37 - 0
ebc-sea-platform/src/main/resources/sql/ipu/RescueDao.xml

@ -10,6 +10,7 @@
10 10
	        <where>
11 11
	        l.RESCUERS_DATE IS NULL
12 12
	        AND l.ALARM_TYPE <> #{offlineType}
13
	        AND l.DATA_STATUS = #{alarmDataStatus}
13 14
	        AND l.DEVICE_ID IN (
14 15
			
15 16
    		<foreach collection="deviceIdsList" item="item" separator=",">
@ -21,5 +22,41 @@
21 22
		</select>
22 23
		]]>
23 24
	</sql>
25
	
26
	<sql name="addRescueLog">
27
		<![CDATA[
28
		<insert id="addRescueLog" resultType="java.util.Map" useGeneratedKeys="true" keyProperty="LOG_ID">
29
			INSERT INTO LR_RESCUE_LOG(	
30
			CALLER_ID,DEVICE_ID,PARTY_TYPE,PARTY_CODE,PARTY_NAME,ALARM_TYPE,
31
			LONGITUDE,LATITUDE,CALLER_LOCATION,CALLER_DATE,LAST_LOCATION_DATE,REMARKS,
32
			DATA_STATUS,CREATE_DATE,CREATE_OP_ID,CREATE_ORG_ID,DONE_DATE,OP_ID,ORG_ID
33
			
34
		   )VALUES (
35
		   
36
			#{callerId},
37
			#{deviceId},
38
			#{partyType},
39
			#{partyCode},
40
			#{partyName},
41
			#{alarmType},
42
			
43
			#{longitude},
44
			#{latitude},
45
			#{callerLocation},
46
			#{callerDate},
47
			#{lastLocationDate},
48
			#{remarks},
49
			
50
			#{dataStatus},
51
			#{createDate},
52
			#{createOpId},
53
			#{createOrgId},
54
			#{doneDate},
55
			#{opId},
56
			#{orgId}
57
			)
58
		</insert>
59
		]]>
60
	</sql>
24 61
25 62
</sqls>

+ 7 - 1
ebc-sea-platform/src/main/resources/test/application.properties

@ -35,4 +35,10 @@ url.gis.token=http://192.168.74.189:9999/gisIntf/account/gettoken
35 35
#iot\u7684\u5317\u5411\u63a5\u53e3\u6ce8\u518c\u5730\u5740
36 36
url.iot.login=http://60.205.219.67:8300/sso/login
37 37
#iot\u7684\u5317\u5411\u63a5\u53e3\u7edf\u4e00\u5730\u5740
38
url.iot.service=http://60.205.219.67:8300/dmp/terminalNorthApi/
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

android-share - Nuosi Git Service

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

wangyj18 374e322b45 测试ignore 9 years ago
display-client 374e322b45 测试ignore 9 years ago
display-server c66fd0697b Merge branch 'master' of 9 years ago
ipu-client 61ff9d2503 Merge branch 'master' of 9 years ago
ipu-server 61ff9d2503 Merge branch 'master' of 9 years ago
multiple-client 61ff9d2503 Merge branch 'master' of 9 years ago
multiple-server 61ff9d2503 Merge branch 'master' of 9 years ago
push-server 61ff9d2503 Merge branch 'master' of 9 years ago
wade-mobile-common c5fa8975fa Merge branch 'master' of 9 years ago
wade-mobile-func c5fa8975fa Merge branch 'master' of 9 years ago
wade-mobile-lib 61ff9d2503 Merge branch 'master' of 9 years ago
wade-mobile-library 61ff9d2503 Merge branch 'master' of 9 years ago
wade-mobile-ui 61ff9d2503 Merge branch 'master' of 9 years ago
.classpath 61ff9d2503 Merge branch 'master' of 9 years ago
README.md 61ff9d2503 Merge branch 'master' of 9 years ago

README.md

android-share

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