|
@ -85,6 +85,9 @@ public class DcEventServiceImpl extends ServiceImpl<DcEventMapper, DcEvent> impl |
|
|
@Autowired |
|
|
@Autowired |
|
|
private DcPublishManageMapper dcPublishManageMapper; |
|
|
private DcPublishManageMapper dcPublishManageMapper; |
|
|
|
|
|
|
|
|
|
|
|
@Autowired |
|
|
|
|
|
private DcStakeMarkMapper dcStakeMarkMapper; |
|
|
|
|
|
|
|
|
private final String HAPPEN = "发生"; |
|
|
private final String HAPPEN = "发生"; |
|
|
private final String EVENT = "事件"; |
|
|
private final String EVENT = "事件"; |
|
|
private final String SUBEVENT = "0"; |
|
|
private final String SUBEVENT = "0"; |
|
@ -584,6 +587,14 @@ public class DcEventServiceImpl extends ServiceImpl<DcEventMapper, DcEvent> impl |
|
|
//设置事件Id UUID无下划线格式32
|
|
|
//设置事件Id UUID无下划线格式32
|
|
|
String uuid = dcEvent.getId(); |
|
|
String uuid = dcEvent.getId(); |
|
|
int i7 = dcEventMapper.insertDcEvent(dcEvent); |
|
|
int i7 = dcEventMapper.insertDcEvent(dcEvent); |
|
|
|
|
|
if (StringUtils.isNotEmpty(dcEvent.getStakeMark()) && StringUtils.isNotEmpty(dcEvent.getDirection())){ |
|
|
|
|
|
DcStakeMark dcStakeMark = dcStakeMarkMapper.selectByDirection(dcEvent.getStakeMark(),dcEvent.getDirection()); |
|
|
|
|
|
if (dcStakeMark != null){ |
|
|
|
|
|
dcEvent.setLongitude(dcStakeMark.getLongitude()); |
|
|
|
|
|
dcEvent.setDimension(dcStakeMark.getLatitude()); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
if (i7 > 0) { |
|
|
if (i7 > 0) { |
|
|
//中间库
|
|
|
//中间库
|
|
|
MdEvent mdEvent = new MdEvent(dcEvent); |
|
|
MdEvent mdEvent = new MdEvent(dcEvent); |
|
@ -734,6 +745,13 @@ public class DcEventServiceImpl extends ServiceImpl<DcEventMapper, DcEvent> impl |
|
|
List<DcEventProcess> dcEventProcessList = new ArrayList<>(); |
|
|
List<DcEventProcess> dcEventProcessList = new ArrayList<>(); |
|
|
|
|
|
|
|
|
for (DcEvent dcEvent : dcEventList) { |
|
|
for (DcEvent dcEvent : dcEventList) { |
|
|
|
|
|
if (StringUtils.isNotEmpty(dcEvent.getStakeMark()) && StringUtils.isNotEmpty(dcEvent.getDirection())){ |
|
|
|
|
|
DcStakeMark dcStakeMark = dcStakeMarkMapper.selectByDirection(dcEvent.getStakeMark(),dcEvent.getDirection()); |
|
|
|
|
|
if (dcStakeMark != null){ |
|
|
|
|
|
dcEvent.setLongitude(dcStakeMark.getLongitude()); |
|
|
|
|
|
dcEvent.setDimension(dcStakeMark.getLatitude()); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
MdEvent mdEvent = new MdEvent(dcEvent); |
|
|
MdEvent mdEvent = new MdEvent(dcEvent); |
|
|
mdEventList.add(mdEvent); |
|
|
mdEventList.add(mdEvent); |
|
|
|
|
|
|
|
@ -883,6 +901,13 @@ public class DcEventServiceImpl extends ServiceImpl<DcEventMapper, DcEvent> impl |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//中间库
|
|
|
//中间库
|
|
|
|
|
|
if (StringUtils.isNotEmpty(dcEvent.getStakeMark()) && StringUtils.isNotEmpty(dcEvent.getDirection())){ |
|
|
|
|
|
DcStakeMark dcStakeMark = dcStakeMarkMapper.selectByDirection(dcEvent.getStakeMark(),dcEvent.getDirection()); |
|
|
|
|
|
if (dcStakeMark != null){ |
|
|
|
|
|
dcEvent.setLongitude(dcStakeMark.getLongitude()); |
|
|
|
|
|
dcEvent.setDimension(dcStakeMark.getLatitude()); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
MdEvent mdEvent = new MdEvent(dcEvent); |
|
|
MdEvent mdEvent = new MdEvent(dcEvent); |
|
|
middleDatabaseService.updateMiddleDatabaseEvent(mdEvent); |
|
|
middleDatabaseService.updateMiddleDatabaseEvent(mdEvent); |
|
|
|
|
|
|
|
@ -1200,6 +1225,13 @@ public class DcEventServiceImpl extends ServiceImpl<DcEventMapper, DcEvent> impl |
|
|
DcEvent dcEvent = dcEventMapper.selectDcEventMainById(id); |
|
|
DcEvent dcEvent = dcEventMapper.selectDcEventMainById(id); |
|
|
|
|
|
|
|
|
//中间库
|
|
|
//中间库
|
|
|
|
|
|
if (StringUtils.isNotEmpty(dcEvent.getStakeMark()) && StringUtils.isNotEmpty(dcEvent.getDirection())){ |
|
|
|
|
|
DcStakeMark dcStakeMark = dcStakeMarkMapper.selectByDirection(dcEvent.getStakeMark(),dcEvent.getDirection()); |
|
|
|
|
|
if (dcStakeMark != null){ |
|
|
|
|
|
dcEvent.setLongitude(dcStakeMark.getLongitude()); |
|
|
|
|
|
dcEvent.setDimension(dcStakeMark.getLatitude()); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
MdEvent mdEvent = new MdEvent(dcEvent); |
|
|
MdEvent mdEvent = new MdEvent(dcEvent); |
|
|
middleDatabaseService.insertMiddleDatabaseEvent(mdEvent); |
|
|
middleDatabaseService.insertMiddleDatabaseEvent(mdEvent); |
|
|
|
|
|
|
|
|