|
@@ -44,8 +44,12 @@ import org.apache.commons.collections4.MapUtils;
|
|
|
import org.slf4j.Logger;
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
|
|
+import org.springframework.http.HttpEntity;
|
|
|
|
|
+import org.springframework.http.HttpHeaders;
|
|
|
|
|
+import org.springframework.http.MediaType;
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
+import org.springframework.web.client.RestTemplate;
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
@@ -84,8 +88,8 @@ public class AlarmEventServiceImpl implements AlarmEventService {
|
|
|
@Value("${sooka.dahuaservice.detail}")
|
|
@Value("${sooka.dahuaservice.detail}")
|
|
|
private String detailUrl;
|
|
private String detailUrl;
|
|
|
|
|
|
|
|
- /*@Value("${sooka.supermap.datasetUrl}")
|
|
|
|
|
- private String datasetUrl;*/
|
|
|
|
|
|
|
+ @Value("${sooka.supermap.datasetUrl}")
|
|
|
|
|
+ private String datasetUrl;
|
|
|
|
|
|
|
|
static final String ERROR_MSG_CHANNEL = "无法匹配相关设备!通道编号为:{}";
|
|
static final String ERROR_MSG_CHANNEL = "无法匹配相关设备!通道编号为:{}";
|
|
|
|
|
|
|
@@ -210,9 +214,9 @@ public class AlarmEventServiceImpl implements AlarmEventService {
|
|
|
centereventTEventcatalogue.setEventStatus("上报");
|
|
centereventTEventcatalogue.setEventStatus("上报");
|
|
|
centereventTEventcatalogue.setEventStatusValue(FOREST_EVENT_STATUS_1);//forest_event_status_1
|
|
centereventTEventcatalogue.setEventStatusValue(FOREST_EVENT_STATUS_1);//forest_event_status_1
|
|
|
// 自动研判误报,218工程车、222区域入侵、237违章建筑
|
|
// 自动研判误报,218工程车、222区域入侵、237违章建筑
|
|
|
- /*if ("218".equals(centereventTEventcatalogue.getEventTypeXl()) || "222".equals(centereventTEventcatalogue.getEventTypeXl()) || "237".equals(centereventTEventcatalogue.getEventTypeXl())) {
|
|
|
|
|
|
|
+ if ("218".equals(centereventTEventcatalogue.getEventTypeXl()) || "222".equals(centereventTEventcatalogue.getEventTypeXl()) || "237".equals(centereventTEventcatalogue.getEventTypeXl())) {
|
|
|
test(centereventTEventcatalogue);
|
|
test(centereventTEventcatalogue);
|
|
|
- }*/
|
|
|
|
|
|
|
+ }
|
|
|
centereventTEventcatalogue.setCreateBy(centerdataTCamera.getId());
|
|
centereventTEventcatalogue.setCreateBy(centerdataTCamera.getId());
|
|
|
centereventTEventcatalogue.setCreateName(centerdataTCamera.getCameraName());
|
|
centereventTEventcatalogue.setCreateName(centerdataTCamera.getCameraName());
|
|
|
centereventTEventcatalogue.setCreateTime(null == createTime ? DateUtils.getNowDate() : createTime);
|
|
centereventTEventcatalogue.setCreateTime(null == createTime ? DateUtils.getNowDate() : createTime);
|
|
@@ -221,14 +225,11 @@ public class AlarmEventServiceImpl implements AlarmEventService {
|
|
|
return centereventTEventcatalogue;
|
|
return centereventTEventcatalogue;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- /*private void test(CentereventTEventcatalogue centereventTEventcatalogue) {
|
|
|
|
|
|
|
+ private void test(CentereventTEventcatalogue centereventTEventcatalogue) {
|
|
|
try {
|
|
try {
|
|
|
HttpHeaders headers = new HttpHeaders();
|
|
HttpHeaders headers = new HttpHeaders();
|
|
|
headers.setContentType(MediaType.APPLICATION_JSON);
|
|
headers.setContentType(MediaType.APPLICATION_JSON);
|
|
|
for (String url : datasetUrl.split(";")) {
|
|
for (String url : datasetUrl.split(";")) {
|
|
|
- //http://116.142.80.12:8090/iserver/services/data-chengchunzhen/rest/data/featureResults.json?returnContent=true&datasetNames=["chengchuanzhen:城川镇_1"];
|
|
|
|
|
- // http://116.142.80.12:8090/iserver/services/data-yunzhaijidi/rest/data/featureResults.json?returnContent=true&datasetNames=["宅基地设施用地_1:宅基地设施用地"];
|
|
|
|
|
- // http://116.142.80.12:8090/iserver/services/data-aozhen/rest/data/featureResults.json?returnContent=true&datasetNames=["aozhen红线:敖镇耕地红线_1","aozhen红线:敖镇人工草地","aozhen红线:敖镇土地确权"]
|
|
|
|
|
JSONObject requestBody = JSONObject.parseObject("{" +
|
|
JSONObject requestBody = JSONObject.parseObject("{" +
|
|
|
"\"getFeatureMode\": \"SPATIAL\"," +
|
|
"\"getFeatureMode\": \"SPATIAL\"," +
|
|
|
"\"datasetNames\": " + url.split("&datasetNames=")[1] + "," +
|
|
"\"datasetNames\": " + url.split("&datasetNames=")[1] + "," +
|
|
@@ -257,7 +258,7 @@ public class AlarmEventServiceImpl implements AlarmEventService {
|
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
|
logger.error(e.getMessage());
|
|
logger.error(e.getMessage());
|
|
|
}
|
|
}
|
|
|
- }*/
|
|
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
// 事件部门
|
|
// 事件部门
|
|
|
private void insertEventDept(CentereventTEventcatalogue centereventTEventcatalogue, List<CenterdataTAidevicedept> listDept) {
|
|
private void insertEventDept(CentereventTEventcatalogue centereventTEventcatalogue, List<CenterdataTAidevicedept> listDept) {
|