提交：无人机模块bug修复

dk-common/common-mybatis/src/main/resources/spy.properties

@@ -3,7 +3,8 @@ modulelist=com.baomidou.mybatisplus.extension.p6spy.MybatisPlusLogFactory,com.p6
 # 自定义日志打印
 logMessageFormat=com.baomidou.mybatisplus.extension.p6spy.P6SpyLogger
 #日志输出到控制台
-appender=com.baomidou.mybatisplus.extension.p6spy.StdoutLogger
+#??sql????
+#appender=com.baomidou.mybatisplus.extension.p6spy.StdoutLogger
 # 使用日志系统记录 sql
 #appender=com.p6spy.engine.spy.appender.Slf4JLogger
 # 取消JDBC URL前缀

dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceQrtzServiceImpl.java

@@ -311,6 +311,7 @@ public class DeviceQrtzServiceImpl implements IDeviceQrtzService {
                         CreateJobParam createJobParam = new CreateJobParam();
                         try {
                             createJobParam.setName(deviceQrtzFileEntity.getWaylineName() + "" + currentDate.format(formatterS));
+                            createJobParam.setWaylineName(deviceQrtzFileEntity.getWaylineName());
                             createJobParam.setFileId(deviceQrtzFileEntity.getWaylineId());
                             createJobParam.setDockSn(device.getDeviceSn());
                             createJobParam.setWaylineType(WaylineTypeEnum.find(Integer.parseInt(waylineFileEntity.getTemplateTypes())));

dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/WaylineJobDTO.java

@@ -29,6 +29,7 @@ public class WaylineJobDTO {
     private String fileId;
 
     private String fileName;
+    private String waylineName;
 
     private String dockSn;
 

dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/entity/WaylineJobEntity.java

@@ -32,6 +32,9 @@ public class WaylineJobEntity implements Serializable {
     @TableField("name")
     private String name;
 
+    @TableField("wayline_name")
+    private String waylineName;
+
     @TableField("file_id")
     private String fileId;
 

dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/param/CreateJobParam.java

@@ -28,6 +28,9 @@ public class CreateJobParam {
     @Schema(description = "航线id")
     private String fileId;
 
+    @NotBlank
+    @Schema(description = "航线名称")
+    private String waylineName;
     @NotBlank
     @Schema(description = "机场sn")
     private String dockSn;

dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/AiCompareQueueServiceImpl.java

@@ -105,7 +105,7 @@ public class AiCompareQueueServiceImpl implements IAiCompareQueueService {
         if(waylineJob!=null){
             AiCompareQueueEntity aiCompareQueueEntity = new AiCompareQueueEntity();
             aiCompareQueueEntity.setWaylineId(waylineJob.getFileId());
-            aiCompareQueueEntity.setWaylineName(waylineJob.getName());
+            aiCompareQueueEntity.setWaylineName(waylineJob.getWaylineName());
             aiCompareQueueEntity.setJobId(jobId);
             aiCompareQueueEntity.setJobName(waylineJob.getName());
             Long selectCount = fileMapper.selectCount(Wrappers.<MediaFileEntity>lambdaQuery().eq(MediaFileEntity::getJobId, jobId).eq(MediaFileEntity::getFileType, "jpeg"));

dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/WaylineJobServiceImpl.java

@@ -90,6 +90,7 @@ public class WaylineJobServiceImpl implements IWaylineJobService {
                 .name(param.getName())
                 .dockSn(param.getDockSn())
                 .fileId(param.getFileId())
+                .waylineName(param.getWaylineName())
                 .username(username)
                 .workspaceId(workspaceId)
                 .jobId(StringUtils.hasText(param.getJobId())?param.getJobId():UUID.randomUUID().toString())

dk-visual/nacos/src/main/resources/application.properties

@@ -40,9 +40,9 @@ spring.sql.init.platform=mysql
 db.num=1
 
 ### Connect URL of DB:
-db.url.0=jdbc:mysql://114.235.183.147:3306/dk_config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
+db.url.0=jdbc:mysql://127.0.0.1:3306/dk_config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
 db.user.0=root
-db.password.0=dkcy@yf
+db.password.0=123456
 
 ### the maximum retry times for push
 nacos.config.push.maxRetryTime=50