|
@@ -122,6 +122,14 @@ public class TargetDemandService extends ServiceImpl<TargetDemandMapper, TargetD
|
|
sceneTargetPoint.getTargetId().equals(targetDemandDTO.getTargetId())).collect(Collectors.toList());
|
|
sceneTargetPoint.getTargetId().equals(targetDemandDTO.getTargetId())).collect(Collectors.toList());
|
|
if (!CollectionUtils.isEmpty(sceneTargetPointList)) {
|
|
if (!CollectionUtils.isEmpty(sceneTargetPointList)) {
|
|
for (SceneTargetPoint sceneTargetPoint : sceneTargetPointList) {
|
|
for (SceneTargetPoint sceneTargetPoint : sceneTargetPointList) {
|
|
|
|
+
|
|
|
|
+/* SceneBasisTarget sceneBasisTarget = sceneBasisTargetMapper.selectById(sceneTargetPoint.getTargetId());
|
|
|
|
+ TargetDemand targetDemand11 = new TargetDemand();
|
|
|
|
+ BeanUtils.copyProperties(targetDemandDTO, targetDemand11);
|
|
|
|
+ targetDemand11.setReqName(targetDemand11.getId()+sceneBasisTarget.getTargetName());
|
|
|
|
+ this.updateById(targetDemand11);*/
|
|
|
|
+
|
|
|
|
+
|
|
PointDTO pointDTO = new PointDTO();
|
|
PointDTO pointDTO = new PointDTO();
|
|
pointDTO.setLng(sceneTargetPoint.getLongitude().doubleValue());
|
|
pointDTO.setLng(sceneTargetPoint.getLongitude().doubleValue());
|
|
pointDTO.setLat(sceneTargetPoint.getLatitude().doubleValue());
|
|
pointDTO.setLat(sceneTargetPoint.getLatitude().doubleValue());
|
|
@@ -624,6 +632,10 @@ public class TargetDemandService extends ServiceImpl<TargetDemandMapper, TargetD
|
|
relation.setStationSelected(null);
|
|
relation.setStationSelected(null);
|
|
relation.setId(UUID.randomUUID().toString());
|
|
relation.setId(UUID.randomUUID().toString());
|
|
relation.setTargetId(sceneBasisTarget.getId());
|
|
relation.setTargetId(sceneBasisTarget.getId());
|
|
|
|
+
|
|
|
|
+ relation.setReqName(relation.getId()+sceneBasisTarget.getTargetName());
|
|
|
|
+ relation.setTargetId(sceneBasisTarget.getId());
|
|
|
|
+
|
|
relation.setPriority(999);
|
|
relation.setPriority(999);
|
|
if (relation.getObservationPurpose() == null) {
|
|
if (relation.getObservationPurpose() == null) {
|
|
relation.setObservationPurpose(1);
|
|
relation.setObservationPurpose(1);
|