按照开发新的发送协议修改发送逻辑

sql/update20250415.sql

@@ -5,11 +5,15 @@ CREATE TABLE `uavps_task`  (
   `biz_type` varchar(7) COMMENT '业务类型（start：开始，change：队形转换，disappear：消失出现）',
   `multi_target` varchar(7) COMMENT '多目标类型',
   `nose_type` varchar(127) COMMENT '噪声类型',
-  `noise_variance` DECIMAL(10,6) COMMENT '噪声类型',
-  `noise_mean` DECIMAL(12,6) COMMENT '噪声类型',
+  `noise_variance` DECIMAL(10,6) COMMENT '噪声方差',
+  `noise_mean` DECIMAL(12,6) COMMENT '噪声均值',
   `platform_uav_str` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '固定翼平台无人机数据',
   `fixed_multi_target_formation_str` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '固定编队目标数据',
   `customized_multi_target_formation_str` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '自定义编队目标数据',
+  `status` varchar(7) COMMENT '状态',
+  `start_time` datetime(0) NULL DEFAULT NULL COMMENT '开始时间',
+  `end_time` datetime(0) NULL DEFAULT NULL COMMENT '结束时间',
+  `file_path` varchar(127) COMMENT '噪声数据文件路径',
   `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
   `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
   `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',

uavps-system/src/main/java/com/uavps/system/domain/UavpsTask.java

@@ -2,8 +2,10 @@ package com.uavps.system.domain;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -50,28 +52,41 @@ public class UavpsTask extends BaseEntity
     /** 噪声类型 */
     private String noseType;
 
-    /** 噪声类型 */
+    /** 噪声方差 */
     private BigDecimal noiseVariance;
 
-    /** 噪声类型 */
+    /** 噪声均值 */
     private BigDecimal noiseMean;
 
     /** 固定翼平台无人机数据 */
-    /** 固定编队目标数据 */
     @JsonIgnore
     private String platformUavStr;
 
-
-    /** 固定编队目标数据 */
     /** 固定编队目标数据 */
     @JsonIgnore
     private String fixedMultiTargetFormationStr;
 
     /** 自定义编队目标数据 */
-    /** 固定编队目标数据 */
     @JsonIgnore
     private String customizedMultiTargetFormationStr;
 
+    /** 状态 */
+    @Excel(name = "状态")
+    private String status;
+
+    /** 开始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date startTime;
+
+    /** 结束时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date endTime;
+
+    /** 噪声数据文件路径 */
+    private String filePath;
+
     /** 固定翼平台无人机数据 */
     private PlatformUavDTO platformUav;
 
@@ -173,6 +188,43 @@ public class UavpsTask extends BaseEntity
     {
         return customizedMultiTargetFormationStr;
     }
+    public void setStatus(String status) 
+    {
+        this.status = status;
+    }
+
+    public String getStatus() 
+    {
+        return status;
+    }
+    public void setStartTime(Date startTime)
+    {
+        this.startTime = startTime;
+    }
+
+    public Date getStartTime() 
+    {
+        return startTime;
+    }
+    public void setEndTime(Date endTime) 
+    {
+        this.endTime = endTime;
+    }
+
+    public Date getEndTime() 
+    {
+        return endTime;
+    }
+    public void setFilePath(String filePath) 
+    {
+        this.filePath = filePath;
+    }
+
+    public String getFilePath() 
+    {
+        return filePath;
+    }
+
 
     public PlatformUavDTO getPlatformUav() {
         if (platformUav == null && StringUtils.isNotEmpty(platformUavStr)) {
@@ -270,6 +322,10 @@ public class UavpsTask extends BaseEntity
                 ", platformUavStr='" + platformUavStr + '\'' +
                 ", fixedMultiTargetFormationStr='" + fixedMultiTargetFormationStr + '\'' +
                 ", customizedMultiTargetFormationStr='" + customizedMultiTargetFormationStr + '\'' +
+                ", status='" + status + '\'' +
+                ", startTime=" + startTime +
+                ", endTime=" + endTime +
+                ", filePath='" + filePath + '\'' +
                 ", platformUav=" + platformUav +
                 ", fixedMultiTargetFormation=" + fixedMultiTargetFormation +
                 ", customizedMultiTargetFormation=" + customizedMultiTargetFormation +

uavps-system/src/main/resources/mapper/system/UavpsTaskMapper.xml

@@ -15,6 +15,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="platformUavStr"    column="platform_uav_str"    />
         <result property="fixedMultiTargetFormationStr"    column="fixed_multi_target_formation_str"    />
         <result property="customizedMultiTargetFormationStr"    column="customized_multi_target_formation_str"    />
+        <result property="status"    column="status"    />
+        <result property="startTime"    column="start_time"    />
+        <result property="endTime"    column="end_time"    />
+        <result property="filePath"    column="file_path"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -22,13 +26,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectUavpsTaskVo">
-        select biz_id, biz_name, biz_type, multi_target, nose_type, noise_variance, noise_mean, platform_uav_str, fixed_multi_target_formation_str, customized_multi_target_formation_str, create_by, create_time, update_by, update_time from uavps_task
+        select biz_id, biz_name, biz_type, multi_target, nose_type, noise_variance, noise_mean, platform_uav_str, fixed_multi_target_formation_str, customized_multi_target_formation_str, status, start_time, end_time, file_path, create_by, create_time, update_by, update_time from uavps_task
     </sql>
 
     <select id="selectUavpsTaskList" parameterType="UavpsTask" resultMap="UavpsTaskResult">
         <include refid="selectUavpsTaskVo"/>
         <where>  
             <if test="bizName != null  and bizName != ''"> and biz_name like concat('%', #{bizName}, '%')</if>
+            <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="startTime != null "> and start_time = #{startTime}</if>
+            <if test="endTime != null "> and end_time = #{endTime}</if>
             <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
         </where>
     </select>
@@ -50,6 +57,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="platformUavStr != null">platform_uav_str,</if>
             <if test="fixedMultiTargetFormationStr != null">fixed_multi_target_formation_str,</if>
             <if test="customizedMultiTargetFormationStr != null">customized_multi_target_formation_str,</if>
+            <if test="status != null">status,</if>
+            <if test="startTime != null">start_time,</if>
+            <if test="endTime != null">end_time,</if>
+            <if test="filePath != null">file_path,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
@@ -65,6 +76,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="platformUavStr != null">#{platformUavStr},</if>
             <if test="fixedMultiTargetFormationStr != null">#{fixedMultiTargetFormationStr},</if>
             <if test="customizedMultiTargetFormationStr != null">#{customizedMultiTargetFormationStr},</if>
+            <if test="status != null">#{status},</if>
+            <if test="startTime != null">#{startTime},</if>
+            <if test="endTime != null">#{endTime},</if>
+            <if test="filePath != null">#{filePath},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -84,6 +99,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="platformUavStr != null">platform_uav_str = #{platformUavStr},</if>
             <if test="fixedMultiTargetFormationStr != null">fixed_multi_target_formation_str = #{fixedMultiTargetFormationStr},</if>
             <if test="customizedMultiTargetFormationStr != null">customized_multi_target_formation_str = #{customizedMultiTargetFormationStr},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="startTime != null">start_time = #{startTime},</if>
+            <if test="endTime != null">end_time = #{endTime},</if>
+            <if test="filePath != null">file_path = #{filePath},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>

uavps-web/src/views/system/task/index.vue

@@ -16,6 +16,40 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择状态"
+          clearable
+        >
+          <el-option
+            v-for="dict in dict.type.uavps_task_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="开始时间" prop="startTime">
+        <el-date-picker
+          clearable
+          v-model="queryParams.startTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择开始时间"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="结束时间" prop="endTime">
+        <el-date-picker
+          clearable
+          v-model="queryParams.endTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择结束时间"
+        >
+        </el-date-picker>
+      </el-form-item>
       <el-form-item label="创建时间">
         <el-date-picker
           v-model="daterangeCreateTime"
@@ -102,6 +136,34 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="业务ID" align="center" prop="bizId" />
       <el-table-column label="任务名称" align="center" prop="bizName" />
+      <el-table-column label="状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.uavps_task_status"
+            :value="scope.row.status"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="开始时间"
+        align="center"
+        prop="startTime"
+        width="180"
+      >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.startTime, "{y}-{m}-{d}") }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="结束时间"
+        align="center"
+        prop="endTime"
+        width="180"
+      >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.endTime, "{y}-{m}-{d}") }}</span>
+        </template>
+      </el-table-column>
       <el-table-column
         label="创建时间"
         align="center"
@@ -137,11 +199,11 @@
             >运行</el-button
           >
           <el-button
-            v-hasPermi="['system:task:edit']"
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:task:edit']"
             >修改</el-button
           >
           <el-button
@@ -170,8 +232,8 @@
         <el-form-item label="任务名称" prop="bizName">
           <el-input v-model="form.bizName" placeholder="请输入任务名称" />
         </el-form-item>
-        <el-form-item label="业务类型" prop="bizType">
-          <el-select v-model="form.bizType" placeholder="请选择业务类型">
+        <el-form-item label="多目标类型" prop="multiTarget">
+          <el-select v-model="form.multiTarget" placeholder="请选择多目标类型">
             <el-option
               v-for="dict in dict.type.uavps_target_formation_type"
               :key="dict.value"
@@ -180,48 +242,21 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="多目标类型" prop="multiTarget">
-          <el-select v-model="form.multiTarget" placeholder="请选择多目标类型">
+        <el-form-item label="噪声类型" prop="noseType">
+          <el-select v-model="form.noseType" placeholder="请选择噪声类型">
             <el-option
-              v-for="dict in dict.type.uavps_target_formation_type"
+              v-for="dict in dict.type.uavps_task_nose_type"
               :key="dict.value"
               :label="dict.label"
               :value="dict.value"
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="噪声类型" prop="noiseVariance">
-          <el-input v-model="form.noiseVariance" placeholder="请输入噪声类型" />
-        </el-form-item>
-        <el-form-item label="噪声类型" prop="noiseMean">
-          <el-input v-model="form.noiseMean" placeholder="请输入噪声类型" />
-        </el-form-item>
-        <el-form-item label="固定翼平台无人机数据" prop="platformUavStr">
-          <el-input
-            v-model="form.platformUavStr"
-            type="textarea"
-            placeholder="请输入内容"
-          />
-        </el-form-item>
-        <el-form-item
-          label="固定编队目标数据"
-          prop="fixedMultiTargetFormationStr"
-        >
-          <el-input
-            v-model="form.fixedMultiTargetFormationStr"
-            type="textarea"
-            placeholder="请输入内容"
-          />
+        <el-form-item label="噪声方差" prop="noiseVariance">
+          <el-input v-model="form.noiseVariance" placeholder="请输入噪声方差" />
         </el-form-item>
-        <el-form-item
-          label="自定义编队目标数据"
-          prop="customizedMultiTargetFormationStr"
-        >
-          <el-input
-            v-model="form.customizedMultiTargetFormationStr"
-            type="textarea"
-            placeholder="请输入内容"
-          />
+        <el-form-item label="噪声均值" prop="noiseMean">
+          <el-input v-model="form.noiseMean" placeholder="请输入噪声均值" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -252,7 +287,11 @@ import {
 
 export default {
   name: "Task",
-  dicts: ["uavps_target_formation_type"],
+  dicts: [
+    "uavps_task_status",
+    "uavps_target_formation_type",
+    "uavps_task_nose_type",
+  ],
   data() {
     return {
       // 遮罩层
@@ -273,14 +312,16 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
-      // 自定义编队目标数据时间范围
+      // 噪声数据文件路径时间范围
       daterangeCreateTime: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
         bizName: null,
-        multiTarget: null,
+        status: null,
+        startTime: null,
+        endTime: null,
         createTime: null,
       },
       // 表单参数
@@ -329,6 +370,10 @@ export default {
         platformUavStr: null,
         fixedMultiTargetFormationStr: null,
         customizedMultiTargetFormationStr: null,
+        status: null,
+        startTime: null,
+        endTime: null,
+        filePath: null,
         createBy: null,
         createTime: null,
         updateBy: null,