Merge remote-tracking branch 'origin/master'

orbit-base-biz/base-biz-api/src/main/java/com/base/api/model/TargetDemandRpcDTO.java

@@ -40,4 +40,56 @@ public class TargetDemandRpcDTO {
     private String parentId;
     @ApiModelProperty
     List<PointRpcDTO> pointDTOList;
+
+    @ApiModelProperty("需求来源")
+    private String demandSources;
+
+    @ApiModelProperty("提出部门")
+    private String proposeDepartment;
+
+    @ApiModelProperty("需求来源描述")
+    private String demandDescribe;
+
+    @ApiModelProperty("是否精确 0-是 1-否")
+    private String isaccurate;
+
+    @ApiModelProperty("是否电磁静默 0-是 1-否")
+    private String isEmcon;
+
+    @ApiModelProperty("目标观测时长要求")
+    private String targetPreprocess;
+
+
+    @ApiModelProperty("最小观测间隔时间（小时）")
+    private String reqInterval;
+
+    @ApiModelProperty("卫星要求，英文逗号隔开")
+    private String satellite;
+
+    @ApiModelProperty("接收站名")
+    private String receivingStation;
+
+    @ApiModelProperty("工作模式")
+    private String workMode;
+
+    @ApiModelProperty("传感器代号")
+    private String sensorID;
+
+    @ApiModelProperty("传感器模式")
+    private String sensorMode;
+
+    @ApiModelProperty("俯仰角")
+    private String pitchAngle;
+
+    @ApiModelProperty("分辨率 单位米")
+    private Double groundResolution;
+
+    @ApiModelProperty("目标运动先验信息")
+    private String priorInfo;
+
+    @ApiModelProperty("产品目的地")
+    private String productDest;
+
+    @ApiModelProperty("目标点集")
+    private String points;
 }

orbit-base-biz/base-biz-service/src/main/java/com/base/biz/model/entity/TargetDemand.java

@@ -203,4 +203,55 @@ public class TargetDemand {
     @ApiModelProperty("需求状态，0：未提交，1：已提交")
     private Integer status;
 
+    @ApiModelProperty("需求来源")
+    private String demandSources;
+
+    @ApiModelProperty("提出部门")
+    private String proposeDepartment;
+
+    @ApiModelProperty("需求来源描述")
+    private String demandDescribe;
+
+    @ApiModelProperty("是否精确 0-是 1-否")
+    private String isaccurate;
+
+    @ApiModelProperty("是否电磁静默 0-是 1-否")
+    private String isEmcon;
+
+    @ApiModelProperty("目标观测时长要求")
+    private String targetPreprocess;
+
+
+    @ApiModelProperty("最小观测间隔时间（小时）")
+    private String reqInterval;
+
+    @ApiModelProperty("卫星要求，英文逗号隔开")
+    private String satellite;
+
+    @ApiModelProperty("接收站名")
+    private String receivingStation;
+
+    @ApiModelProperty("工作模式")
+    private String workMode;
+
+    @ApiModelProperty("传感器代号")
+    private String sensorID;
+
+    @ApiModelProperty("传感器模式")
+    private String sensorMode;
+
+    @ApiModelProperty("俯仰角")
+    private String pitchAngle;
+
+    @ApiModelProperty("分辨率 单位米")
+    private Double groundResolution;
+
+    @ApiModelProperty("目标运动先验信息")
+    private String priorInfo;
+
+    @ApiModelProperty("产品目的地")
+    private String productDest;
+
+    @ApiModelProperty("目标点集")
+    private String points;
 }

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

@@ -907,15 +907,15 @@ public class StripService extends ServiceImpl<StripMapper, StripInfo> {
                     List<BizReq> bizReqs = new ArrayList<>();
                     List<EphTrack> ephdatas = new ArrayList<>();
                     BizReq bizReq = new BizReq();
-                    StripCalcResult stripCalcResult = new StripCalcResult();
-                    String stripCalcResultId = UUID.randomUUID().toString().replace("-", "") + primaryKeyGenerator.getAndIncrement();
+/*                    StripCalcResult stripCalcResult = new StripCalcResult();
+                    String stripCalcResultId = String.valueOf(IdGenerator.getId())+ primaryKeyGenerator.getAndIncrement();
                     stripCalcResult.setStripCalcResultId(stripCalcResultId);
                     stripCalcResult.setTargetCode(targetRelationDTO.getTargetCode());
                     stripCalcResult.setTargetName(targetRelationDTO.getTargetName());
                     stripCalcResult.setStartTime(targetRelationDTO.getStartTime());
                     stripCalcResult.setEndTime(targetRelationDTO.getEndTime());
                     stripCalcResult.setParentId(targetRelationDTO.getParentId());
-                    stripCalcResult.setSatelliteCode(payloadRpcDTO.getSatelliteCode());
+                    stripCalcResult.setSatelliteCode(payloadRpcDTO.getSatelliteCode());*/
                     try {
                         /**
                          * 1.构建观测区域
@@ -977,21 +977,21 @@ public class StripService extends ServiceImpl<StripMapper, StripInfo> {
                             try {
                                 saveStrips(stripDTOList, payloadRpcDTO, targetRelationDTO.getParentId(), targetRelationDTO.getPointDTOList().get(0));
                             }catch (Exception e){
-                                stripCalcResult.setIsSucceeded(STRIP_CALC_RESULT_FAILED);
+                                /*stripCalcResult.setIsSucceeded(STRIP_CALC_RESULT_FAILED);*/
                                 log.info("条带保存失败!");
                             }
                             //  条带提供测控、数传列表
                             insetAlgSchemeWindow(targetRelationDTO, payloadRpcDTO, algSchemeStepWindows);
                         }
-                        stripCalcResult.setIsSucceeded(STRIP_CALC_RESULT_SUCCEED);
+                        /*stripCalcResult.setIsSucceeded(STRIP_CALC_RESULT_SUCCEED);*/
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
-                    stripCalcResults.add(stripCalcResult);
+                    /*stripCalcResults.add(stripCalcResult);*/
                 }
             }
         }
-        stripCalcResultService.saveBatch(stripCalcResults);
+       /* stripCalcResultService.saveBatch(stripCalcResults);*/
     }
 
     /**