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

@@ -73,7 +73,7 @@ public class TargetDemandRpcDTO {
     private String workMode;
 
     @ApiModelProperty("传感器代号")
-    private String sensorID;
+    private String sensorId;
 
     @ApiModelProperty("传感器模式")
     private String sensorMode;
@@ -92,4 +92,7 @@ public class TargetDemandRpcDTO {
 
     @ApiModelProperty("目标点集")
     private String points;
+
+    @ApiModelProperty("需求名称")
+    private String reqName;
 }

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

@@ -32,4 +32,7 @@ public class QueryTargetDemandDTO {
     @ApiModelProperty("目标唯一标识")
     private Set<String>  parentIds;
 
+    @ApiModelProperty("需求来源")
+    private String demandSources;
+
 }

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

@@ -42,4 +42,59 @@ public class TargetDemandDTO {
     private String parentId;
     @ApiModelProperty
     List<PointDTO> 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;
+    @ApiModelProperty("需求名称")
+    private String reqName;
+
 }

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

@@ -254,4 +254,7 @@ public class TargetDemand {
 
     @ApiModelProperty("目标点集")
     private String points;
+
+    @ApiModelProperty("需求名称")
+    private String reqName;
 }

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

@@ -98,6 +98,12 @@ public class TargetDemandService extends ServiceImpl<TargetDemandMapper, TargetD
         queryWrapper.in(!CollectionUtils.isEmpty(queryTargetDemandDTO.getParentIds()), "parent_id", queryTargetDemandDTO.getParentIds());
         queryWrapper.ge(Objects.nonNull(queryTargetDemandDTO.getStartTime()), "start_time", queryTargetDemandDTO.getStartTime());
         queryWrapper.le(Objects.nonNull(queryTargetDemandDTO.getEndTime()), "end_time", queryTargetDemandDTO.getEndTime());
+
+        if (!StringUtils.isEmpty(queryTargetDemandDTO.getDemandSources())){
+            List<String> demandSourceses = Arrays.asList(queryTargetDemandDTO.getDemandSources().split(","));
+            queryWrapper.in( "demand_sources", demandSourceses);
+        }
+
         List<TargetDemand> targetDemands = this.list(queryWrapper);
         List<TargetDemandDTO> targetDemandDTOS = BizUtils.copyEntityToDto(TargetDemandDTO.class, targetDemands);
         //  带上目标点位信息