> params.put("rescuerDeviceId", String.valueOf(alarmMap.get("RESCUER_DEVICE_ID"))); //救援者的设备ID 71 101 
		}
72 102
73 103 
		//求救记录ID

+ 44 - 24
ebc-sea-platform/src/main/java/com/ai/ipu/server/util/DateUtil.java
Vedi File 

@ -37,58 +37,64 @@ public class DateUtil {
37 37 
	 * @param dateStr
38 38 
	 * @param amount
39 39 
	 * @return yyyy-MM-dd HH:mm:ss
40 
	 * @throws ParseException
40 41 
	 */
41 
	public static String dateAddYear(String dateStr, int amount) {
42 
	public static String dateAddYear(String dateStr, int amount) throws ParseException {
42 43 
		return dateAdd(dateStr, Calendar.YEAR, amount, NORM_DATETIME_PATTERN);
43 44 
	}
44
45
45 46 
	/**
46 47 
	 * 在原日期加月数
47 48 
	 * @param dateStr
48 49 
	 * @param amount
49 50 
	 * @return yyyy-MM-dd HH:mm:ss
51 
	 * @throws ParseException
50 52 
	 */
51 
	public static String dateAddMonth(String dateStr, int amount) {
53 
	public static String dateAddMonth(String dateStr, int amount) throws ParseException {
52 54 
		return dateAdd(dateStr, Calendar.MONTH, amount, NORM_DATETIME_PATTERN);
53 55 
	}
54
56
55 57 
	/**
56 58 
	 * 在原日期加天数
57 59 
	 * @param dateStr
58 60 
	 * @param amount
59 61 
	 * @return yyyy-MM-dd HH:mm:ss
62 
	 * @throws ParseException
60 63 
	 */
61 
	public static String dateAddDay(String dateStr, int amount) {
64 
	public static String dateAddDay(String dateStr, int amount) throws ParseException {
62 65 
		return dateAdd(dateStr, Calendar.DATE, amount, NORM_DATETIME_PATTERN);
63 66 
	}
64
67
65 68 
	/**
66 69 
	 * 在原日期加小时数
67 70 
	 * @param dateStr
68 71 
	 * @param amount
69 72 
	 * @return yyyy-MM-dd HH:mm:ss
73 
	 * @throws ParseException
70 74 
	 */
71 
	public static String dateAddHour(String dateStr, int amount) {
75 
	public static String dateAddHour(String dateStr, int amount) throws ParseException {
72 76 
		return dateAdd(dateStr, Calendar.HOUR, amount, NORM_DATETIME_PATTERN);
73 77 
	}
74
78
75 79 
	/**
76 80 
	 * 在原日期加分钟数
77 81 
	 * @param dateStr
78 82 
	 * @param amount
79 83 
	 * @return yyyy-MM-dd HH:mm:ss
84 
	 * @throws ParseException
80 85 
	 */
81 
	public static String dateAddMinute(String dateStr, int amount) {
86 
	public static String dateAddMinute(String dateStr, int amount) throws ParseException {
82 87 
		return dateAdd(dateStr, Calendar.MINUTE, amount, NORM_DATETIME_PATTERN);
83 88 
	}
84
89
85 90 
	/**
86 91 
	 * 在原日期加秒数
87 92 
	 * @param dateStr
88 93 
	 * @param amount
89 94 
	 * @return yyyy-MM-dd HH:mm:ss
95 
	 * @throws ParseException
90 96 
	 */
91 
	public static String dateAddSecond(String dateStr, int amount) {
97 
	public static String dateAddSecond(String dateStr, int amount) throws ParseException {
92 98 
		return dateAdd(dateStr, Calendar.SECOND, amount, NORM_DATETIME_PATTERN);
93 99 
	}
94 100 
@ -99,8 +105,9 @@ public class DateUtil {
99 105 
	 * @param amount 间隔长度
100 106 
	 * @param pattern 返回日期格式
101 107 
	 * @return
108 
	 * @throws ParseException
102 109 
	 */
103 
	public static String dateAdd(String dateStr, int field, int amount, String pattern) {
110 
	public static String dateAdd(String dateStr, int field, int amount, String pattern) throws ParseException {
104 111 
		Date date = convertDate(dateStr);
105 112 
		Date newDate = dateAdd(date, field, amount);
106 113 
		return formatDate(newDate, pattern);
 
@ -125,8 +132,9 @@ public class DateUtil {
125 132 
	 * @param field Calendar中的时间类型
126 133 
	 * @param amount 间隔长度
127 134 
	 * @return
135 
	 * @throws ParseException
128 136 
	 */
129 
	public static Date dateAdd(String dateStr, int field, int amount) {
137 
	public static Date dateAdd(String dateStr, int field, int amount) throws ParseException {
130 138 
		Date date = convertDate(dateStr);
131 139 
		return dateAdd(date, field, amount);
132 140 
	}
 
@ -149,9 +157,22 @@ public class DateUtil {
149 157 
	 * 比较日期大小
150 158 
	 * @param dateStr0
151 159 
	 * @param dateStr1
152 
	 * @return
160 
	 * @return dateStr0<dateStr1 ? -1 : (dateStr0==dateStr1 ? 0 : 1)
161 
	 * @throws ParseException
153 162 
	 */
154 
	public static int compareDate(String dateStr0, String dateStr1) {
163 
	public static int compareDate(String dateStr0, String dateStr1) throws ParseException {
164 
		if (dateStr0 == null || "".equals(dateStr0)) {
165 
			if (dateStr1 == null || "".equals(dateStr1)) {
166 
				return 0;
167 
			} else {
168 
				return -1;
169 
			}
170 
		}
171
172 
		if (dateStr1 == null || "".equals(dateStr1)) {
173 
			return 1;
174 
		}
175
155 176 
		Date date1 = convertDate(dateStr0);
156 177 
		Date date2 = convertDate(dateStr1);
157 178 
		int result = date1.compareTo(date2);
 
@ -162,8 +183,9 @@ public class DateUtil {
162 183 
	 * 格式化字符串时间
163 184 
	 * @param date
164 185 
	 * @return yyyy-MM-dd HH:mm:ss
186 
	 * @throws ParseException
165 187 
	 */
166 
	public static String formatStrDate(String dateStr) {
188 
	public static String formatStrDate(String dateStr) throws ParseException {
167 189 
		Date date = convertDate(dateStr);
168 190 
		return formatDate(date, DateUtil.NORM_DATETIME_PATTERN);
169 191 
	}
 
@ -196,11 +218,13 @@ public class DateUtil {
196 218 
	 * 字符串转时间
197 219 
	 * @param dateStr
198 220 
	 * @return
221 
	 * @throws ParseException
199 222 
	 */
200 
	public static Date convertDate(String dateStr) {
223 
	public static Date convertDate(String dateStr) throws ParseException {
201 224 
		if (dateStr == null || "".equals(dateStr)) {
202 225 
			return null;
203 226 
		}
227
204 228 
		String pattern = TimeUtil.getTimestampFormat(dateStr);
205 229 
		return convertDate(dateStr, pattern);
206 230 
	}
 
@ -210,8 +234,9 @@ public class DateUtil {
210 234 
	 * @param dateStr
211 235 
	 * @param pattern
212 236 
	 * @return
237 
	 * @throws ParseException
213 238 
	 */
214 
	public static Date convertDate(String dateStr, String pattern) {
239 
	public static Date convertDate(String dateStr, String pattern) throws ParseException {
215 240 
		if (dateStr == null || "".equals(dateStr)) {
216 241 
			return null;
217 242 
		}
 
@ -221,12 +246,7 @@ public class DateUtil {
221 246 
		}
222 247
223 248 
		SimpleDateFormat formatter = new SimpleDateFormat(pattern);
224 
		Date date = null;
225 
		try {
226 
			date = formatter.parse(dateStr);
227 
		} catch (ParseException e) {
228 
			e.printStackTrace();
229 
		}
249 
		Date date = formatter.parse(dateStr);
230 250 
		return date;
231 251 
	}
232 252

+ 6 - 6
ebc-sea-platform/src/main/java/com/ai/ipu/server/util/EbcConstant.java
Vedi File 

@ -72,21 +72,21 @@ public class EbcConstant {
72 72 
	// 人员定位状态：救援人员
73 73 
	public static final String location_status_rescuer = "6";
74 74
75 
	// 告警类型：SOS(手动)
76 
	public static final int alarm_type_jogsos_beidou = 2;
77
78 75 
	// 告警类型：SOS(自动)
79 76 
	public static final int alarm_type_autosos_beidou = 1;
77
78 
	// 告警类型：SOS(手动)
79 
	public static final int alarm_type_jogsos_beidou = 2;
80 80
81 81 
	// 告警类型：离线
82 82 
	public static final int alarm_type_offline_beidou = 4;
83 83
84 
	// 告警类型：SOS(手动)
85 
	public static final String alarm_type_jogsos_ZH = "手动告警";
86
87 84 
	// 告警类型：SOS(自动)
88 85 
	public static final String alarm_type_autosos_ZH = "落水告警";
89 86
87 
	// 告警类型：SOS(手动)
88 
	public static final String alarm_type_jogsos_ZH = "手动告警";
89
90 90 
	// 告警类型：离线
91 91 
	public static final String alarm_type_offline_ZH = "离线告警";
92 92

+ 16 - 15
ebc-sea-platform/src/main/java/com/ai/ipu/server/util/HttpServiceUtil.java
Vedi File 

@ -189,21 +189,20 @@ public class HttpServiceUtil {
189 189
190 190 
	public static String sendGet(String url, Charset encoding) {
191 191 
		HttpClient httpClient = HttpClients.createDefault();
192 
		String resp = "";
193 192 
		HttpGet httpGet = new HttpGet(url);
194 193 
		httpGet.addHeader(HTTP.CONTENT_TYPE, HTTP_CONTENT_TYPE_JSON);
195 194 
		CloseableHttpResponse response = null;
196 195 
		try {
197 196 
			response = (CloseableHttpResponse) httpClient.execute(httpGet);
198 
		} catch (IOException e) {
199 
			log.error("请求错误");
197 
		} catch (Exception e) {
198 
			log.error("sendGet Exception: " + e.getMessage());
199 
			return "{}";
200 200 
		}
201 201 
		return responseEx(httpClient, response, encoding);
202 202 
	}
203 203
204 204 
	public static String sendPost(String url, Map<String, Object> paramsMap, Charset encoding) {
205 205 
		HttpClient httpClient = HttpClients.createDefault();
206 
		String resp = "";
207 206 
		HttpPost httpPost = new HttpPost(url);
208 207 
		httpPost.addHeader(HTTP.CONTENT_TYPE, HTTP_CONTENT_TYPE_JSON);
209 208 
		if (paramsMap != null && paramsMap.size() > 0) {
 
@ -213,8 +212,9 @@ public class HttpServiceUtil {
213 212 
		CloseableHttpResponse response = null;
214 213 
		try {
215 214 
			response = (CloseableHttpResponse) httpClient.execute(httpPost);
216 
		} catch (IOException e) {
217 
			log.error("sendPost Exception: ", e.getMessage());
215 
		} catch (Exception e) {
216 
			log.error("sendPost Exception: " + e.getMessage());
217 
			return "{}";
218 218 
		}
219 219 
		return responseEx(httpClient, response, encoding);
220 220 
	}
 
@ -222,7 +222,6 @@ public class HttpServiceUtil {
222 222 
	public static String sendPost(String url, Map<String, Object> paramsMap, Charset encoding,
223 223 
			Map<String, String> headerMap) {
224 224 
		HttpClient httpClient = HttpClients.createDefault();
225 
		String resp = "";
226 225 
		HttpPost httpPost = new HttpPost(url);
227 226
228 227 
		Iterator<String> iter = headerMap.keySet().iterator();
 
@ -236,15 +235,16 @@ public class HttpServiceUtil {
236 235
237 236 
		httpPost.addHeader(HTTP.CONTENT_TYPE, HTTP_CONTENT_TYPE_JSON);
238 237 
		if (paramsMap != null && paramsMap.size() > 0) {
239 
			log.debug("调用北向接口：url= "+url+",参数= "+JSONObject.toJSONString(paramsMap));
238 
			log.debug("调用北向接口：url= " + url + ",参数= " + JSONObject.toJSONString(paramsMap));
240 239 
			StringEntity se = new StringEntity(JSONObject.toJSONString(paramsMap), encoding);
241 240 
			httpPost.setEntity(se);
242 241 
		}
243 242 
		CloseableHttpResponse response = null;
244 243 
		try {
245 244 
			response = (CloseableHttpResponse) httpClient.execute(httpPost);
246 
		} catch (IOException e) {
247 
			log.error("sendPost Exception: ", e.getMessage());
245 
		} catch (Exception e) {
246 
			log.error("sendPost Exception: " + e.getMessage());
247 
			return "{}";
248 248 
		}
249 249 
		return responseEx(httpClient, response, encoding);
250 250 
	}
 
@ -261,8 +261,9 @@ public class HttpServiceUtil {
261 261 
		CloseableHttpResponse response = null;
262 262 
		try {
263 263 
			response = (CloseableHttpResponse) httpClient.execute(httpPut);
264 
		} catch (IOException e) {
265 
			log.error("请求错误");
264 
		} catch (Exception e) {
265 
			log.error("sendPut Exception: " + e.getMessage());
266 
			return "{}";
266 267 
		}
267 268
268 269 
		return responseEx(httpClient, response, encoding);
 
@ -275,13 +276,13 @@ public class HttpServiceUtil {
275 276 
				resp = EntityUtils.toString(response.getEntity(), encoding);
276 277 
			}
277 278 
		} catch (Exception e) {
278 
			log.error(e.getMessage(), e);
279 
			log.error("responseEx Exception: " + e.getMessage());
279 280 
		} finally {
280 281 
			if (response != null) {
281 282 
				try {
282 283 
					response.close();
283 
				} catch (IOException e) {
284 
					log.error(e.getMessage(), e);
284 
				} catch (Exception e) {
285 
					log.error("responseEx Exception: " + e.getMessage());
285 286 
				}
286 287 
			}
287 288 
		}

+ 82 - 38
ebc-sea-platform/src/main/java/com/ai/ipu/server/util/NorthboundInterfaceUtil.java
Vedi File 

@ -25,16 +25,16 @@ public class NorthboundInterfaceUtil {
25 25
26 26 
	@Value("${aap.iot.userCode}")
27 27 
	private String userCode;
28
28
29 29 
	@Value("${aap.iot.passWord}")
30 30 
	private String passWord;
31
31
32 32 
	@Value("${url.iot.login}")
33 33 
	private String iotLoginUrl;
34
34
35 35 
	@Value("${url.iot.service}")
36 36 
	private String iotServiceUrl;
37
37
38 38 
	// 定义静态存储map空间存放sign与sessionId
39 39 
	private volatile static Map<String, String> cacheMap = new ConcurrentHashMap<String, String>();// 缓存map
40 40 
@ -71,18 +71,25 @@ public class NorthboundInterfaceUtil {
71 71 
		// 调用北向服务的接口
72 72 
		logger.debug("GET调用北向接口");
73 73
74 
		boolean loginFlag = true;
75
74 76 
		// 1.在缓存中获取sessionId与sign
75 77 
		Map<String, String> mapCache = getMapCache();
76 78 
		if (mapCache.isEmpty() || mapCache.get("sign") == null || mapCache.get("session_id") == null) {
77 79 
			// 2.如果没有调用登录接口从新获取
78 
			iotLogin();
80 
			loginFlag = iotLogin();
81 
		}
82
83 
		if (!loginFlag) {
84 
			logger.debug("调用北向接口登录失败");
85 
			return new HashMap<String, String>();
79 86 
		}
80 87
81 88 
		// 3.调用北向服务接口
82 89 
		// (1)设置字符集
83 90 
		Charset charset = Charset.forName("utf-8");
84 91 
		// (2)调用接口
85 
		String resultJson = HttpServiceUtil.sendGet(iotServiceUrl+url, charset);
92 
		String resultJson = HttpServiceUtil.sendGet(iotServiceUrl + url, charset);
86 93 
		// (3)将参数转为Map<String,String>【将返回值统一为String】
87 94 
		Map<String, String> resultMap = JSON.parseObject(resultJson, Map.class);
88 95 
@ -93,15 +100,31 @@ public class NorthboundInterfaceUtil {
93 100 
			// (1)清除缓存
94 101 
			clear();
95 102 
			// (2)重新登录
96 
			iotLogin();
97 
			// (3)再次调用接口
98 
			String fianlresultJson = HttpServiceUtil.sendGet(iotServiceUrl+url, charset);
99 
			// (4)获取返回值
100 
			resultMap = JSON.parseObject(fianlresultJson, Map.class);
103 
			loginFlag = iotLogin();
104
105 
			if (!loginFlag) {
106 
				logger.debug("再次调用北向接口登录失败");
107 
				return new HashMap<String, String>();
108 
			}
109
110 
			try {
111 
				// (3)再次调用接口
112 
				String fianlresultJson = HttpServiceUtil.sendGet(iotServiceUrl + url, charset);
113 
				// (4)获取返回值
114 
				resultMap = JSON.parseObject(fianlresultJson, Map.class);
115 
			} catch (Exception e) {
116 
				logger.error("再次调用北向接口失败: " + e.getMessage());
117 
				return new HashMap<String, String>();
118 
			}
119
120 
			if (resultMap == null) {
121 
				logger.error("再次调用北向接口返回值为空");
122 
				return new HashMap<String, String>();
123 
			}
101 124 
		}
102 125
103 126 
		// 5.判断是否调用成功
104 
		if ("0".equals(resultMap.get("resultCode"))) {
127 
		if (NorthboundInterfaceConstant.resultCode_succeed.equals(resultMap.get("resultCode"))) {
105 128 
			logger.info("调用北向接口成功");
106 129 
		} else {
107 130 
			logger.info("调用北向接口失败");
 
@ -122,11 +145,18 @@ public class NorthboundInterfaceUtil {
122 145 
		// 调用北向服务的接口
123 146 
		logger.debug("POSt调用北向接口");
124 147
148 
		boolean loginFlag = true;
149
125 150 
		// 1.在缓存中获取sessionId与sign
126 151 
		Map<String, String> mapCache = getMapCache();
127 152 
		if (mapCache.isEmpty() || mapCache.get("sign") == null || mapCache.get("session_id") == null) {
128 153 
			// 2.如果没有调用登录接口从新获取
129 
			iotLogin();
154 
			loginFlag = iotLogin();
155 
		}
156
157 
		if (!loginFlag) {
158 
			logger.debug("调用北向接口登录失败");
159 
			return new HashMap<String, String>();
130 160 
		}
131 161
132 162 
		// 3.调用北向服务接口
 
@ -136,34 +166,52 @@ public class NorthboundInterfaceUtil {
136 166 
		Map<String, String> resultMap = null;
137 167 
		try {
138 168 
			// (2)调用接口
139 
			String resultJson = HttpServiceUtil.sendPost(iotServiceUrl+url, paramsMap, charset, getMapCache());
169 
			String resultJson = HttpServiceUtil.sendPost(iotServiceUrl + url, paramsMap, charset, getMapCache());
140 170 
			// (3)将参数转为Map<String,String>【将返回值统一为String】
141 171 
			resultMap = JSON.parseObject(resultJson, Map.class);
142 172 
		} catch (Exception e) {
143 173 
			logger.error("调用北向接口失败: " + e.getMessage());
174 
			return new HashMap<String, String>();
144 175 
		}
145 176
146 177 
		if (resultMap == null) {
147 
			logger.info("调用北向接口失败");
178 
			logger.error("调用北向接口返回值为空");
148 179 
			return new HashMap<String, String>();
149 180 
		}
150 181
151 182 
		// 4.登录超时，需重新登录
152 183 
		if ("登录超时".equals(resultMap.get("resultMsg"))) {
153 
			logger.info("调用北向接口失败，需重新登录");
184 
			logger.info("调用北向接口登录超时，需重新登录");
154 185 
			// 4.调用不成功可能是登录过期
155 186 
			// (1)清除缓存
156 187 
			clear();
157 188 
			// (2)重新登录
158 
			iotLogin();
159 
			// (3)再次调用接口
160 
			String fianlresultJson = HttpServiceUtil.sendPost(iotServiceUrl+url, paramsMap, charset, getMapCache());
161 
			// (4)获取返回值
162 
			resultMap = JSON.parseObject(fianlresultJson, Map.class);
189 
			loginFlag = iotLogin();
190
191 
			if (!loginFlag) {
192 
				logger.debug("再次调用北向接口登录失败");
193 
				return new HashMap<String, String>();
194 
			}
195
196 
			try {
197 
				// (3)再次调用接口
198 
				String fianlresultJson = HttpServiceUtil.sendPost(iotServiceUrl + url, paramsMap, charset,
199 
						getMapCache());
200 
				// (4)获取返回值
201 
				resultMap = JSON.parseObject(fianlresultJson, Map.class);
202 
			} catch (Exception e) {
203 
				logger.error("再次调用北向接口失败: " + e.getMessage());
204 
				return new HashMap<String, String>();
205 
			}
206
207 
			if (resultMap == null) {
208 
				logger.error("再次调用北向接口返回值为空");
209 
				return new HashMap<String, String>();
210 
			}
163 211 
		}
164 212
165 213 
		// 5.判断是否调用成功
166 
		if ("0".equals(resultMap.get("resultCode"))) {
214 
		if (NorthboundInterfaceConstant.resultCode_succeed.equals(resultMap.get("resultCode"))) {
167 215 
			logger.info("调用北向接口成功");
168 216 
		} else {
169 217 
			logger.info("调用北向接口失败");
 
@ -177,7 +225,7 @@ public class NorthboundInterfaceUtil {
177 225 
	 *
178 226 
	 * @return
179 227 
	 */
180 
	private Map<String, String> iotLogin() {
228 
	private boolean iotLogin() {
181 229 
		logger.debug("登录北向接口");
182 230
183 231 
		// 调用登录接口获取sessionId与sign
 
@ -188,30 +236,26 @@ public class NorthboundInterfaceUtil {
188 236 
		// 设置字符集
189 237 
		Charset charset = Charset.forName("utf-8");
190 238
191 
		Map mapType = null;
239 
		Map loginResultMap = null;
192 240 
		try {
193 241 
			// 调用登录接口
194 242 
			String loginResult = HttpServiceUtil.sendPost(iotLoginUrl, loginParamMap, charset);
195 
			mapType = JSON.parseObject(loginResult, Map.class);
243 
			loginResultMap = JSON.parseObject(loginResult, Map.class);
196 244 
		} catch (Exception e) {
197 245 
			logger.error("登录北向接口失败: " + e.getMessage());
246 
			return false;
198 247 
		}
199 248
200 
		if (mapType != null) {
201 
			Map result = (Map) mapType.get("result");
202
203 
			if ("0".equals(String.valueOf(mapType.get("resultCode")))) {
204 
				logger.info("登录北向接口成功");
205 
				// 将数据存到缓存中
206 
				setMapCache(result);
207 
			} else {
208 
				logger.info("登录北向接口失败");
209 
			}
249 
		if (loginResultMap != null && NorthboundInterfaceConstant.resultCode_succeed
250 
				.equals(String.valueOf(loginResultMap.get("resultCode")))) {
251 
			logger.info("登录北向接口成功");
252 
			Map result = (Map) loginResultMap.get("result");
253 
			// 将数据存到缓存中
254 
			setMapCache(result);
255 
			return true;
210 256 
		} else {
211 257 
			logger.info("登录北向接口失败");
258 
			return false;
212 259 
		}
213
214 
		return cacheMap;
215 260 
	}
216
217 261 
}

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

@ -8,5 +8,8 @@ url.gis.token=http://192.168.74.189:9999/gisIntf/account/gettoken
8 8 
#\u6d77\u56fe\u4e2d\u5fc3\u5750\u6807
9 9 
seaMap.centre.longitude=123.396036
10 10 
seaMap.centre.latitude=31.560302
11
11 12 
#\u6d77\u56fe\u663e\u793a\u6bd4\u4f8b\u5c3a
13 
# 5-->300km,6-->200km,7-->100km,8-->50km,9-->20km,10-->10km,11-->5km
14 
# 12-->2km,13-->1km,14-->500m,15-->300m,16-->200m,17-->100m,18-->50m
12 15 
seaMap.scale=11

+ 5 - 2
ebc-sea-platform/src/main/resources/dev/application-iot.properties
Vedi File 

@ -3,6 +3,9 @@ aap.iot.userCode=IOT_ADMIN
3 3 
aap.iot.passWord=123456
4 4
5 5 
#iot\u7684\u5317\u5411\u63a5\u53e3\u6ce8\u518c\u5730\u5740
6 
url.iot.login=http://60.205.219.67:8300/sso/login
6 
#url.iot.login=http://60.205.219.67:8300/sso/login
7 
url.iot.login=http://47.105.130.83:8083/sso/login
8
7 9 
#iot\u7684\u5317\u5411\u63a5\u53e3\u7edf\u4e00\u5730\u5740
8 
url.iot.service=http://60.205.219.67:8300/dmp/terminalNorthApi/
10 
#url.iot.service=http://60.205.219.67:8300/dmp/terminalNorthApi/
11 
url.iot.service=http://47.105.130.83:8083/dmp/terminalNorthApi/

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

@ -8,5 +8,8 @@ url.gis.token=http://192.168.74.189:9999/gisIntf/account/gettoken
8 8 
#\u6d77\u56fe\u4e2d\u5fc3\u5750\u6807
9 9 
seaMap.centre.longitude=123.396036
10 10 
seaMap.centre.latitude=31.560302
11
11 12 
#\u6d77\u56fe\u663e\u793a\u6bd4\u4f8b\u5c3a
13 
# 5-->300km,6-->200km,7-->100km,8-->50km,9-->20km,10-->10km,11-->5km
14 
# 12-->2km,13-->1km,14-->500m,15-->300m,16-->200m,17-->100m,18-->50m
12 15 
seaMap.scale=11

+ 3 - 8
ebc-sea-platform/src/main/resources/sql/ipu/RescueDao.xml
Vedi File 

@ -17,14 +17,9 @@
17 17 
	        AND l.ALARM_TYPE <> #{offlineType}
18 18 
	        AND l.DATA_STATUS = #{alarmDataStatus}
19 19
20 
	        <if test="deviceIdsList != null">
21 
		        AND l.DEVICE_ID IN (
22
23 
	    		<foreach collection="deviceIdsList" item="item" separator=",">
24 
	        		#{item}
25 
	    		</foreach>
26
27 
	    		)
20 
	        <if test="deviceId != null">
21 
		        AND ( l.DEVICE_ID = #{deviceId}
22 
		        OR t.DEVICE_ID = #{deviceId} )
28 23 
    		</if>
29 24
30 25 
	        </where>

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

@ -8,5 +8,8 @@ url.gis.token=http://192.168.74.189:9999/gisIntf/account/gettoken
8 8 
#\u6d77\u56fe\u4e2d\u5fc3\u5750\u6807
9 9 
seaMap.centre.longitude=123.396036
10 10 
seaMap.centre.latitude=31.560302
11
11 12 
#\u6d77\u56fe\u663e\u793a\u6bd4\u4f8b\u5c3a
13 
# 5-->300km,6-->200km,7-->100km,8-->50km,9-->20km,10-->10km,11-->5km
14 
# 12-->2km,13-->1km,14-->500m,15-->300m,16-->200m,17-->100m,18-->50m
12 15 
seaMap.scale=11

android-share - Nuosi Git Service
Startseite Erkunden Hilfe
Anmelden
ipu
/
android-share
Beobachten 6
Favorit hinzufügen 0
Fork 0
Code Issues 1 Pull-Requests 1 Commits 1106 Releases 4 Wiki

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

Struktur: b715f4e3f6
Branches Tags
android-share
/
ipu-pathmenu
/
.project

.project 815B
Verlauf Originalformat 

    <?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
	<name>ipu-pathmenu</name>
	<comment></comment>
	<projects>
	</projects>
	<buildSpec>
		<buildCommand>
			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
			<arguments>
			</arguments>
		</buildCommand>
		<buildCommand>
			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
			<arguments>
			</arguments>
		</buildCommand>
		<buildCommand>
			<name>org.eclipse.jdt.core.javabuilder</name>
			<arguments>
			</arguments>
		</buildCommand>
		<buildCommand>
			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
			<arguments>
			</arguments>
		</buildCommand>
	</buildSpec>
	<natures>
		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
		<nature>org.eclipse.jdt.core.javanature</nature>
	</natures>
</projectDescription>