1改成0 需求名称

orbit-base-biz/base-biz-service/src/main/java/com/base/biz/service/TargetDemandService.java

@@ -578,11 +578,11 @@ public class TargetDemandService extends ServiceImpl<TargetDemandMapper, TargetD
             SceneTargetPoint.setId(UUID.randomUUID().toString());
             SceneTargetPoint.setCreatedDate(new Date());
 
-            SceneTargetPoint.setLatitude(BigDecimal.valueOf(pointDTO.getLng()));
+            SceneTargetPoint.setLatitude(BigDecimal.valueOf(pointDTO.getLat()));
 
             SceneTargetPoint.setSource(1);
 
-            SceneTargetPoint.setLongitude(BigDecimal.valueOf(pointDTO.getLat()));
+            SceneTargetPoint.setLongitude(BigDecimal.valueOf(pointDTO.getLng()));
 
             SceneTargetPoint.setTargetId(targetId);
             SceneTargetPoint.setSequence(pointDTO.getSequence());
@@ -659,7 +659,7 @@ public class TargetDemandService extends ServiceImpl<TargetDemandMapper, TargetD
             relation.setId(UUID.randomUUID().toString());
             relation.setTargetId(sceneBasisTarget.getId());
 
-            relation.setReqName(relation.getId()+sceneBasisTarget.getTargetName());
+            relation.setReqName(sceneBasisTarget.getTargetName());
             relation.setTargetId(sceneBasisTarget.getId());
 
             relation.setPriority(999);

orbit-base-plan/base-plan-service/src/main/java/com/base/plan/service/DemandService.java

@@ -11,6 +11,7 @@ import com.base.api.model.TargetDemandRpcDTO;
 import com.base.orbit.Exception.ServiceException;
 import com.base.orbit.domain.AjaxResult;
 import com.base.orbit.utils.DateUtils;
+import com.base.orbit.utils.IdGenerator;
 import com.base.plan.constant.PassTypeEnum;
 import com.base.plan.mapper.*;
 import com.base.plan.model.dto.SatelliteIdAndPayloadDTO;
@@ -76,7 +77,7 @@ public class DemandService {
     @Resource
     StepWindowDataPassRelationMapper stepWindowDataPassRelationMapper;
 
-    private static final String DEMAND_TYPE_FULL = "0";
+    private static final String DEMAND_TYPE_FULL = "1";
     
     private static final int IS_CONFIRMED = 2;
 
@@ -700,7 +701,7 @@ public class DemandService {
             List<StepWindowControlPassRelation> stepWindowControlPassRelationIsExist = stepWindowControlPassRelationMapper.selectList(stepWindowControlPassRelationQueryWrapper);
 
             if(stepWindowControlPassRelationIsExist.isEmpty()){
-                stepWindowControlPassRelation.setId(System.currentTimeMillis());
+                stepWindowControlPassRelation.setId(IdGenerator.getId());
                 stepWindowControlPassRelation.setCreateTime(DateUtils.getNowDate());
                 stepWindowControlPassRelationMapper.insert(stepWindowControlPassRelation);
             }else {
@@ -712,7 +713,7 @@ public class DemandService {
             List<StepWindowDataPassRelation> stepWindowDataPassRelationIsExist = stepWindowDataPassRelationMapper.selectList(stepWindowDataPassRelationQueryWrapper);
 
             if(stepWindowDataPassRelationIsExist.isEmpty()){
-                stepWindowDataPassRelation.setId(System.currentTimeMillis());
+                stepWindowDataPassRelation.setId(IdGenerator.getId());
                 stepWindowDataPassRelation.setCreateTime(DateUtils.getNowDate());
                 stepWindowDataPassRelationMapper.insert(stepWindowDataPassRelation);
             }else {
@@ -727,7 +728,7 @@ public class DemandService {
             List<StepWindowRelation> stepWindowRelationIsExist = stepWindowRelationMapper.selectList(stepWindowRelationQueryWrapper);
 
             if(stepWindowRelationIsExist.isEmpty()){
-                stepWindowRelation.setId(System.currentTimeMillis());
+                stepWindowRelation.setId(IdGenerator.getId());
                 stepWindowRelation.setCreateTime(DateUtils.getNowDate());
                 stepWindowRelationMapper.insert(stepWindowRelation);
             }else {