202410281632 #comment 描述替换

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

@@ -18,7 +18,7 @@ public class TargetDemandRpcDTO {
     private String targetCode;
     @ApiModelProperty("目标名称")
     private String targetName;
-    @ApiModelProperty("观测目的:1,应急侦察")
+    @ApiModelProperty("观测目的:1,应急观测")
     private Integer observationPurpose;
     @ApiModelProperty("状态，0：未提交；1：已提交")
     private Integer status;
@@ -32,7 +32,7 @@ public class TargetDemandRpcDTO {
     private Integer priority;
     @ApiModelProperty("频次")
     private Integer rate;
-    @ApiModelProperty("侦察手段")
+    @ApiModelProperty("观测手段")
     private String InvestigativeMeans;
     @ApiModelProperty("卫星ID")
     private String satelliteSelected;

orbit-base-biz/base-biz-service/src/main/java/com/base/biz/model/dto/request/QueryTargetRelationUpdateDTO.java

@@ -13,7 +13,7 @@ public class QueryTargetRelationUpdateDTO {
     @ApiModelProperty("id")
     private String id;
 
-    @ApiModelProperty("观测目的:1,应急侦察")
+    @ApiModelProperty("观测目的:1,应急观测")
     private Integer observationPurpose;
 
     @ApiModelProperty("开始时间")
@@ -28,7 +28,7 @@ public class QueryTargetRelationUpdateDTO {
     @ApiModelProperty("频次")
     private Integer rate;
 
-    @ApiModelProperty("侦察手段")
+    @ApiModelProperty("观测手段")
     private String investigativeMeans;
 
     @ApiModelProperty("是一个json数组字符串，[{\"satelliteId\":\"QM0103\",\"type\":\"MSS\"}]")

orbit-base-biz/base-biz-service/src/main/java/com/base/biz/model/dto/response/QueryBatchUpdateRelationDTO.java

@@ -12,7 +12,7 @@ public class QueryBatchUpdateRelationDTO {
     @ApiModelProperty("筛选卫星")
     private String satelliteSelected;
 
-    @ApiModelProperty("1：批量修改时间；2：批量修改侦察手段")
+    @ApiModelProperty("1：批量修改时间；2：批量修改观测手段")
     private Integer type;
 
     @ApiModelProperty("同一批次标识")

orbit-base-biz/base-biz-service/src/main/java/com/base/biz/model/dto/response/TargetDemandDTO.java

@@ -18,7 +18,7 @@ public class TargetDemandDTO {
     private String targetId;
     @ApiModelProperty("目标名称")
     private String targetName;
-    @ApiModelProperty("观测目的:1,应急侦察")
+    @ApiModelProperty("观测目的:1,应急观测")
     private Integer observationPurpose;
     @ApiModelProperty("状态，0：未提交；1：已提交")
     private Integer status;
@@ -34,7 +34,7 @@ public class TargetDemandDTO {
     private Integer priority;
     @ApiModelProperty("频次")
     private Integer rate;
-    @ApiModelProperty("侦察手段")
+    @ApiModelProperty("观测手段")
     private String InvestigativeMeans;
     @ApiModelProperty("卫星ID")
     private String satelliteSelected;

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

@@ -185,7 +185,7 @@ public class TargetDemand {
     @ApiModelProperty("同一次添加唯一标识")
     private String parentId;
 
-    @ApiModelProperty("观测目的,1:应急侦察")
+    @ApiModelProperty("观测目的,1:应急观测")
     private Integer observationPurpose;
 
     @ApiModelProperty("开始时间")
@@ -197,7 +197,7 @@ public class TargetDemand {
     @ApiModelProperty("频次")
     private Integer rate;
 
-    @ApiModelProperty("侦察手段")
+    @ApiModelProperty("观测手段")
     private String investigativeMeans;
 
     @ApiModelProperty("需求状态，0：未提交，1：已提交")

orbit-base-biz/base-biz-service/src/main/java/com/base/biz/model/enums/ReconnaissancePurposeEnums.java

@@ -3,11 +3,11 @@ package com.base.biz.model.enums;
 
 public enum ReconnaissancePurposeEnums {
 
-    RAPID_RESPONSE_RECONNAISSANCE(1,"快响应急侦察","CCD,SAR,IRS"),
-    LAND_CAMOUFLAGE_IDENTIFICATION(2,"陆地伪装识别","CCD,MSS,HSI"),
-    EARLY_ANOMALY_DETECTION(3,"早期异常检测","CCD,SAR"),
-    MARITIME_SEARCH_DISCOVERY(4,"海上搜索发现","ELECTRON,SAR,CCD,QWERT20-1"),
-    CONTINUOUS_TRACKING_AT_SEA(5,"海上持续跟踪","QWERT20-1,ELECTRON"),
+    RAPID_RESPONSE_RECONNAISSANCE(1,"应急观测","CCD,SAR,IRS"),
+    LAND_CAMOUFLAGE_IDENTIFICATION(2,"实时观测","CCD,MSS,HSI"),
+    EARLY_ANOMALY_DETECTION(3,"持续跟踪","CCD,SAR"),
+    MARITIME_SEARCH_DISCOVERY(4,"普查详情","ELECTRON,SAR,CCD,QWERT20-1"),
+    CONTINUOUS_TRACKING_AT_SEA(5,"历史统计","QWERT20-1,ELECTRON"),
     MARINE_IDENTIFICATION_CONFIRMATION(6,"海上识别确认","CCD,SAR");
 
     ReconnaissancePurposeEnums(Integer key, String describe, String payload){

orbit-base-biz/base-biz-service/src/main/resources/bootstrap-st.yml

@@ -8,10 +8,10 @@ spring:
         nacos:
             discovery:
                 server-addr: 127.0.0.1:8848
-                namespace: 25016bac-3175-4d7f-af2f-62dce1cac017
+                namespace: ada2667d-50f5-4b56-9243-713e0971aaaa
             config:
                 server-addr: 127.0.0.1:8848
-                namespace: 25016bac-3175-4d7f-af2f-62dce1cac017
+                namespace: ada2667d-50f5-4b56-9243-713e0971aaaa
                 file-extension: properties
                 extension-configs[0]:
                     data-id: orbit-base-biz.properties

orbit-base-biz/base-biz-service/src/main/resources/bootstrap.yml

@@ -1,4 +1,4 @@
 spring:
     profiles:
         # 取不同环境下配置项
-        active: test
+        active: st

orbit-base-framework/framework-core/src/main/java/com/base/core/model/enity/StripDTO.java

@@ -14,7 +14,7 @@ public class StripDTO {
     private String id;
     @ApiModelProperty("需求id")
     private String reqId;
-    @ApiModelProperty("侦察窗口id,方便后面设置条带的窗口关联id")
+    @ApiModelProperty("观测窗口id,方便后面设置条带的窗口关联id")
     private String windowId;
     @ApiModelProperty("目标名称")
     private String targetName;

orbit-base-framework/framework-core/src/main/java/com/base/core/model/enity/XjBizRequire.java

@@ -57,7 +57,7 @@ import java.util.List;
 /**
  * The persistent class for the BIZ_REQUIRE database table.
  * 
- * 侦察任务填入信息表   BIZ_REQUIRE 改成  ALG_OBS_STEP   20190507
+ * 观测任务填入信息表   BIZ_REQUIRE 改成  ALG_OBS_STEP   20190507
  */
 
 /*@Entity

orbit-base-framework/framework-core/src/main/java/com/base/core/service/AccessWindowsService.java

@@ -460,7 +460,7 @@ abstract public class AccessWindowsService {
                 //如果有相交，进行合并，TBD:或其他合并条件
                 target = working_accessDatas.get(i);
                 if (isAccessDataIntersect(current, target)) {
-                    //可以检查如果需要合并，合并后的时长是否超出了最大连续侦察时长。防止无限合并
+                    //可以检查如果需要合并，合并后的时长是否超出了最大连续观测时长。防止无限合并
                     long windowSize = combineTwoAccessData(current, target).getEndTime().getTime() - combineTwoAccessData(current, target).getBeginTime().getTime();
                     windowSize /= 1000;//to seconds
 

orbit-base-framework/framework-core/src/main/java/com/base/core/service/ElectronAccessService.java

@@ -19,7 +19,7 @@ import java.util.List;
 public class ElectronAccessService extends AccessWindowsService {
 
     /**
-     * 计算电子侦察卫星卫星访问信息，参数：目标数据结构Target、成像约束条件elimit
+     * 计算电子观测卫星卫星访问信息，参数：目标数据结构Target、成像约束条件elimit
      */
     // public List<AccessData> ElectronAccess_point(List<EphData> subPointList,
     // double lat_targ, double lon_targ) {

orbit-base-gateway/base-gateway-service/src/main/resources/bootstrap-st.yml

@@ -8,8 +8,8 @@ spring:
         nacos:
             discovery:
                 server-addr: 127.0.0.1:8848
-                namespace: 25016bac-3175-4d7f-af2f-62dce1cac017
+                namespace: ada2667d-50f5-4b56-9243-713e0971aaaa
             config:
                 server-addr: 127.0.0.1:8848
-                namespace: 25016bac-3175-4d7f-af2f-62dce1cac017
+                namespace: ada2667d-50f5-4b56-9243-713e0971aaaa
                 file-extension: yml

orbit-base-gateway/base-gateway-service/src/main/resources/bootstrap.yml

@@ -1,4 +1,4 @@
 spring:
   profiles:
     # 取不同环境下配置项
-    active: test
+    active: st

orbit-base-plan/base-plan-service/src/main/java/com/base/plan/mapper/StepWindowRelationMapper.java

@@ -44,4 +44,11 @@ public interface StepWindowRelationMapper extends BaseMapper<StepWindowRelation>
     void initConfirmStatusByList(@Param("parentIds") List<String> parentIds);
 
     void batchUpdateConfirmStatus(@Param("windowIds") List<String> windowIds);
+
+    /**
+     * 根据窗口id更新方案id
+     * @param algSchemeStepId 方案id
+     * @param windowId 窗口id
+     */
+    void updateStepIdByWindowId(@Param("algSchemeStepId") String algSchemeStepId, @Param("windowId") String windowId);
 }

orbit-base-plan/base-plan-service/src/main/java/com/base/plan/model/dto/QueryUpdateWindowDTO.java

@@ -11,7 +11,7 @@ public class QueryUpdateWindowDTO {
     @ApiModelProperty("需求id")
     private String stepId;
 
-    @ApiModelProperty("侦察窗口和数传窗口对应集合")
+    @ApiModelProperty("观测窗口和数传窗口对应集合")
     private List<WindowAndDataWindowRelationDTO> windowRelationDTOList;
 
 }

orbit-base-plan/base-plan-service/src/main/java/com/base/plan/model/dto/SatelliteMutexDTO.java

@@ -23,12 +23,12 @@ public class SatelliteMutexDTO {
     @ApiModelProperty("圈号")
     private String circle;
 
-    @ApiModelProperty("侦察开始时间")
+    @ApiModelProperty("观测开始时间")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     public Date startTime;
 
-    @ApiModelProperty("侦察结束时间")
+    @ApiModelProperty("观测结束时间")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     public Date endTime;

orbit-base-plan/base-plan-service/src/main/java/com/base/plan/model/dto/WindowAndDataWindowRelationDTO.java

@@ -6,7 +6,7 @@ import lombok.Data;
 @Data
 public class WindowAndDataWindowRelationDTO {
 
-    @ApiModelProperty("侦察窗口id")
+    @ApiModelProperty("观测窗口id")
     private String windowId;
 
     @ApiModelProperty("数传窗口id")

orbit-base-plan/base-plan-service/src/main/java/com/base/plan/model/dto/request/QueryKjckDTO.java

@@ -28,10 +28,10 @@ public class QueryKjckDTO {
     @ApiModelProperty("卫星名称")
     private String satelliteName;
 
-    @ApiModelProperty("侦察开始时间")
+    @ApiModelProperty("观测开始时间")
     private Date startTime;
 
-    @ApiModelProperty("侦察结束时间")
+    @ApiModelProperty("观测结束时间")
     private Date endTime;
 
     @ApiModelProperty("每个窗口时间间隔（毫秒）")

orbit-base-plan/base-plan-service/src/main/java/com/base/plan/model/entity/StepWindowRelation.java

@@ -21,7 +21,7 @@ public class StepWindowRelation {
     @ApiModelProperty("id")
     private Long id;
 
-    @ApiModelProperty("侦察窗口id")
+    @ApiModelProperty("观测窗口id")
     private String windowId;
 
     @ApiModelProperty("需求id")

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

@@ -635,8 +635,9 @@ public class DemandService {
             stepWindowRelation.setStepId(algSchemeStepId);
             stepWindowRelation.setWindowId(algSchemeStepWindow.getId());
             stepWindowRelation.setIsConfirm(IS_CONFIRMED);
-            //更新alg_scheme_step_window表中scheme_step_id字段
+            //更新alg_scheme_step_window表中scheme_step_id字段及step_window_relation表中step_id字段
             algSchemeStepWindowMapper.updateStepIdByParentId(algSchemeStepId,parentId);
+            stepWindowRelationMapper.updateStepIdByWindowId(algSchemeStepId,algSchemeStepWindow.getId());
             algSchemeStepWindow.setSchemeStepId(algSchemeStepId);
             algSchemeSteps.add(algSchemeStep);
             stepWindowRelations.add(stepWindowRelation);

orbit-base-plan/base-plan-service/src/main/resources/bootstrap-st.yml

@@ -8,10 +8,10 @@ spring:
     nacos:
       discovery:
         server-addr: 127.0.0.1:8848
-        namespace: 25016bac-3175-4d7f-af2f-62dce1cac017
+        namespace: ada2667d-50f5-4b56-9243-713e0971aaaa
       config:
         server-addr: 127.0.0.1:8848
-        namespace: 25016bac-3175-4d7f-af2f-62dce1cac017
+        namespace: ada2667d-50f5-4b56-9243-713e0971aaaa
         file-extension: properties
         extension-configs[0]:
           data-id: orbit-base-plan.properties

orbit-base-plan/base-plan-service/src/main/resources/bootstrap.yml

@@ -1,4 +1,4 @@
 spring:
     profiles:
         # 取不同环境下配置项
-        active: test
+        active: st

orbit-base-plan/base-plan-service/src/main/resources/mapper/StepWindowRelationMapper.xml

@@ -58,6 +58,13 @@
             </foreach>
         </where>
     </update>
+    <update id="updateStepIdByWindowId">
+        update step_window_relation swr
+        set swr.step_id = #{algSchemeStepId}
+        <where>
+            swr.window_id = #{windowId}
+        </where>
+    </update>
 
     <select id="selectIsUsedStepWindowDTOList" resultType="com.base.plan.model.dto.StepWindowDTO">
         SELECT

orbit-base-track/base-track-service/src/main/java/com/base/track/model/entity/SatellitePara.java

@@ -27,7 +27,7 @@ public class SatellitePara {
     private float OVER_LAP = 0;
     // huzhj 20180111
     /**
-     * 侦察幅宽
+     * 观测幅宽
      */
     private float RECONNAISSANCE_WIDTH = 0;
     /**

orbit-base-track/base-track-service/src/main/resources/bootstrap-st.yml

@@ -8,10 +8,10 @@ spring:
         nacos:
             discovery:
                 server-addr: 127.0.0.1:8848
-                namespace: 25016bac-3175-4d7f-af2f-62dce1cac017
+                namespace: ada2667d-50f5-4b56-9243-713e0971aaaa
             config:
                 server-addr: 127.0.0.1:8848
-                namespace: 25016bac-3175-4d7f-af2f-62dce1cac017
+                namespace: ada2667d-50f5-4b56-9243-713e0971aaaa
                 file-extension: properties
                 extension-configs[0]:
                     data-id: orbit-base-track.properties

orbit-base-track/base-track-service/src/main/resources/bootstrap.yml

@@ -1,4 +1,4 @@
 spring:
     profiles:
         # 取不同环境下配置项
-        active: test
+        active: st

orbit-base-user/base-user-service/src/main/resources/bootstrap-st.yml

@@ -1,12 +1,12 @@
 spring:
-    application:
-        name: orbit-base-user
-    cloud:
-        nacos:
-            discovery:
-                server-addr:  192.168.1.77:8848
-                namespace: 7fd1eec8-a9c6-4496-9d2e-c27ce0e4d4a7
-            config:
-                server-addr: 192.168.1.77:8848
-                namespace: 7fd1eec8-a9c6-4496-9d2e-c27ce0e4d4a7
-                file-extension: yml
+  application:
+    name: orbit-base-user
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 127.0.0.1:8848
+        namespace: ada2667d-50f5-4b56-9243-713e0971aaaa
+      config:
+        server-addr: 127.0.0.1:8848
+        namespace: ada2667d-50f5-4b56-9243-713e0971aaaa
+        file-extension: yml

orbit-base-user/base-user-service/src/main/resources/bootstrap.yml

@@ -1,4 +1,4 @@
 spring:
     profiles:
         # 取不同环境下配置项
-        active: test
+        active: st