Browse Source

add 是否智能算法,1是,0不是

allen 1 tháng trước cách đây
mục cha
commit
9158afd2f9

+ 47 - 38
sql/update20250415.sql

@@ -1,45 +1,54 @@
-DROP TABLE IF EXISTS `uavps_task`;
-CREATE TABLE `uavps_task`  (
-  `biz_id` bigint(0) NOT NULL AUTO_INCREMENT COMMENT '业务ID',
-  `biz_name` varchar(127) COMMENT '任务名称',
-  `biz_type` varchar(7) COMMENT '业务类型(start:开始,change:队形转换,disappear:消失出现)',
-  `multi_target` varchar(7) COMMENT '多目标类型',
-  `noise_type` varchar(127) 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 '更新人',
-  `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
-  PRIMARY KEY (`biz_id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '任务数据表' ROW_FORMAT = Dynamic;
+/*
+ Navicat Premium Data Transfer
 
--- 菜单 SQL
-insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('任务数据', '3', '1', 'task', 'system/task/index', 1, 0, 'C', '0', '0', 'system:task:list', '#', 'admin', sysdate(), '', null, '任务数据菜单');
+ Source Server         : huoshan
+ Source Server Type    : MySQL
+ Source Server Version : 50744
+ Source Host           : 101.126.133.7:9006
+ Source Schema         : uav_ps
 
--- 按钮父菜单ID
-SELECT @parentId := LAST_INSERT_ID();
+ Target Server Type    : MySQL
+ Target Server Version : 50744
+ File Encoding         : 65001
 
--- 按钮 SQL
-insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('任务数据查询', @parentId, '1',  '#', '', 1, 0, 'F', '0', '0', 'system:task:query',        '#', 'admin', sysdate(), '', null, '');
+ Date: 18/05/2025 22:06:46
+*/
 
-insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('任务数据新增', @parentId, '2',  '#', '', 1, 0, 'F', '0', '0', 'system:task:add',          '#', 'admin', sysdate(), '', null, '');
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
 
-insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('任务数据修改', @parentId, '3',  '#', '', 1, 0, 'F', '0', '0', 'system:task:edit',         '#', 'admin', sysdate(), '', null, '');
+-- ----------------------------
+-- Table structure for uavps_task
+-- ----------------------------
+DROP TABLE IF EXISTS `uavps_task`;
+CREATE TABLE `uavps_task`  (
+  `biz_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '业务ID',
+  `biz_name` varchar(127) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '任务名称',
+  `biz_type` varchar(7) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '业务类型(start:开始,change:队形转换,disappear:消失出现)',
+  `multi_target` varchar(7) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '多目标类型',
+  `smart_algorithm` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '是否智能算法,1是,0不是',
+  `noise_type` varchar(127) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '噪声类型',
+  `noise_variance` decimal(10, 6) NULL DEFAULT NULL COMMENT '噪声方差',
+  `noise_mean` decimal(12, 6) NULL DEFAULT NULL COMMENT '噪声均值',
+  `platform_uav_str` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '固定翼平台无人机数据',
+  `fixed_multi_target_formation_str` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '固定编队目标数据',
+  `customized_multi_target_formation_str` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '自定义编队目标数据',
+  `status` varchar(7) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '状态',
+  `start_time` datetime NULL DEFAULT NULL COMMENT '开始时间',
+  `end_time` datetime NULL DEFAULT NULL COMMENT '结束时间',
+  `file_path` varchar(127) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '噪声数据文件路径',
+  `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
+  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
+  `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+  PRIMARY KEY (`biz_id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '任务数据表' ROW_FORMAT = DYNAMIC;
 
-insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('任务数据删除', @parentId, '4',  '#', '', 1, 0, 'F', '0', '0', 'system:task:remove',       '#', 'admin', sysdate(), '', null, '');
+-- ----------------------------
+-- Records of uavps_task
+-- ----------------------------
+INSERT INTO `uavps_task` VALUES (1, '任务1', 'start', '1', NULL, '高斯', 0.000005, 0.000005, '{\"longitude\":104.5,\"latitude\":29.5,\"altitude\":0,\"eastSpeed\":100,\"northSpeed\":100,\"skySpeed\":100}', '{\"targetTotal\":13,\"longitude\":104.59,\"latitude\":29.56,\"altitude\":500,\"eastSpeed\":100,\"northSpeed\":0,\"skySpeed\":0,\"flightPathType\":\"直线\",\"formationShape\":\"V\",\"followAircraftDistance\":100}', NULL, '2', '2025-05-18 20:47:09', '2025-05-18 20:48:41', 'D:/UavPs/uploadPath/task/1/20250518204709A003.txt', 'admin', '2025-04-18 20:11:35', 'admin', '2025-05-18 20:48:41');
+INSERT INTO `uavps_task` VALUES (2, '任务2', 'start', '2', NULL, '高斯', 0.000005, 0.000005, '{\"longitude\":104.5000000,\"latitude\":29.5000000,\"altitude\":0,\"eastSpeed\":100,\"northSpeed\":100,\"skySpeed\":100}', '', '[{\"number\":1,\"longitude\":104.5900000,\"latitude\":29.5600000,\"altitude\":500.000000,\"eastSpeed\":100.00,\"northSpeed\":100.00,\"skySpeed\":0.0,\"flightPathType\":\"直线\",\"positionNoise\":18.2},{\"number\":2,\"longitude\":104.5910000,\"latitude\":29.5600000,\"altitude\":500.000000,\"eastSpeed\":100.00,\"northSpeed\":100.00,\"skySpeed\":0.0,\"flightPathType\":\"直线\",\"positionNoise\":18.20},{\"number\":3,\"longitude\":104.5890000,\"latitude\":29.5600000,\"altitude\":500.000000,\"eastSpeed\":1000.00,\"northSpeed\":1000.00,\"skySpeed\":0.0,\"flightPathType\":\"直线\",\"positionNoise\":18.20}]', '2', '2025-05-07 10:35:22', '2025-05-07 10:35:24', 'D:/UavPs/uploadPath/task/2/20250507103521A012.txt', 'admin', '2025-04-18 20:11:46', 'admin', '2025-05-07 10:35:24');
+INSERT INTO `uavps_task` VALUES (4, '111', 'start', '2', NULL, '1', 0.000005, 0.000005, '{\"longitude\":104.5,\"latitude\":29.5,\"altitude\":0,\"eastSpeed\":100,\"northSpeed\":100,\"skySpeed\":100}', '{\"targetTotal\":null,\"longitude\":null,\"latitude\":null,\"altitude\":null,\"eastSpeed\":null,\"northSpeed\":null,\"skySpeed\":null,\"flightPathType\":null,\"formationShape\":null,\"followAircraftDistance\":null}', '[{\"number\":1,\"longitude\":104.58984120472907,\"latitude\":29.551869791,\"altitude\":0,\"eastSpeed\":100,\"northSpeed\":100,\"skySpeed\":100,\"flightPathType\":\"直线\",\"positionNoise\":18.2},{\"number\":2,\"longitude\":104.59307779623857,\"latitude\":29.535556728603602,\"altitude\":100,\"eastSpeed\":100,\"northSpeed\":100,\"skySpeed\":100,\"flightPathType\":\"直线\",\"positionNoise\":18.2},{\"number\":3,\"longitude\":104.6454348972215,\"latitude\":29.533851772981983,\"altitude\":3,\"eastSpeed\":3,\"northSpeed\":3,\"skySpeed\":3,\"flightPathType\":\"直线\",\"positionNoise\":3}]', '2', '2025-05-08 09:03:56', '2025-05-08 09:03:59', 'D:/UavPs/uploadPath/task/4/20250508090356A001.txt', NULL, '2025-04-22 00:15:01', NULL, '2025-05-08 16:14:11');
 
-insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('任务数据导出', @parentId, '5',  '#', '', 1, 0, 'F', '0', '0', 'system:task:export',       '#', 'admin', sysdate(), '', null, '');
+SET FOREIGN_KEY_CHECKS = 1;

+ 14 - 1
uavps-system/src/main/java/com/uavps/system/domain/UavpsTask.java

@@ -58,6 +58,9 @@ public class UavpsTask extends BaseEntity
     /** 多目标类型 */
     private String multiTarget;
 
+    /** 是否智能算法,1是,0不是 */
+    private String smartAlgorithm;
+
     /** 噪声类型 */
     private String noiseType;
 
@@ -107,7 +110,7 @@ public class UavpsTask extends BaseEntity
 
     private List<Integer> numbers = new ArrayList<>();
 
-    public void setBizId(Long bizId) 
+    public void setBizId(Long bizId)
     {
         this.bizId = bizId;
     }
@@ -143,6 +146,15 @@ public class UavpsTask extends BaseEntity
     {
         return multiTarget;
     }
+    public void setSmartAlgorithm(String smartAlgorithm)
+    {
+        this.smartAlgorithm = smartAlgorithm;
+    }
+
+    public String getSmartAlgorithm()
+    {
+        return smartAlgorithm;
+    }
     public void setNoiseType(String noiseType)
     {
         this.noiseType = noiseType;
@@ -333,6 +345,7 @@ public class UavpsTask extends BaseEntity
                 ", bizName='" + bizName + '\'' +
                 ", bizType='" + bizType + '\'' +
                 ", multiTarget='" + multiTarget + '\'' +
+                ", smartAlgorithm='" + smartAlgorithm + '\'' +
                 ", noiseType='" + noiseType + '\'' +
                 ", noiseVariance=" + noiseVariance +
                 ", noiseMean=" + noiseMean +

+ 5 - 1
uavps-system/src/main/resources/mapper/system/UavpsTaskMapper.xml

@@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="bizName"    column="biz_name"    />
         <result property="bizType"    column="biz_type"    />
         <result property="multiTarget"    column="multi_target"    />
+        <result property="smartAlgorithm"    column="smart_algorithm"    />
         <result property="noiseType"    column="noise_type"    />
         <result property="noiseVariance"    column="noise_variance"    />
         <result property="noiseMean"    column="noise_mean"    />
@@ -26,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectUavpsTaskVo">
-        select biz_id, biz_name, biz_type, multi_target, noise_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
+        select biz_id, biz_name, biz_type, multi_target, smart_algorithm, noise_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">
@@ -51,6 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bizName != null">biz_name,</if>
             <if test="bizType != null">biz_type,</if>
             <if test="multiTarget != null">multi_target,</if>
+            <if test="smartAlgorithm != null">smart_algorithm,</if>
             <if test="noiseType != null">noise_type,</if>
             <if test="noiseVariance != null">noise_variance,</if>
             <if test="noiseMean != null">noise_mean,</if>
@@ -70,6 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bizName != null">#{bizName},</if>
             <if test="bizType != null">#{bizType},</if>
             <if test="multiTarget != null">#{multiTarget},</if>
+            <if test="smartAlgorithm != null">#{smartAlgorithm},</if>
             <if test="noiseType != null">#{noiseType},</if>
             <if test="noiseVariance != null">#{noiseVariance},</if>
             <if test="noiseMean != null">#{noiseMean},</if>
@@ -93,6 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bizName != null">biz_name = #{bizName},</if>
             <if test="bizType != null">biz_type = #{bizType},</if>
             <if test="multiTarget != null">multi_target = #{multiTarget},</if>
+            <if test="smartAlgorithm != null">smart_algorithm = #{smartAlgorithm},</if>
             <if test="noiseType != null">noise_type = #{noiseType},</if>
             <if test="noiseVariance != null">noise_variance = #{noiseVariance},</if>
             <if test="noiseMean != null">noise_mean = #{noiseMean},</if>