From 915eeb7b80df38745d7bc83e4b208e9c4cf05231 Mon Sep 17 00:00:00 2001 From: yq183 <645046984@qq.com> Date: Tue, 22 Apr 2025 17:49:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=EF=BC=9A=E6=97=A0=E4=BA=BA?= =?UTF-8?q?=E6=9C=BA=E6=A8=A1=E5=9D=97bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dk-common/common-mybatis/src/main/resources/spy.properties | 3 ++- .../sample/manage/service/impl/DeviceQrtzServiceImpl.java | 1 + .../org/dromara/sample/wayline/model/dto/WaylineJobDTO.java | 1 + .../dromara/sample/wayline/model/entity/WaylineJobEntity.java | 3 +++ .../dromara/sample/wayline/model/param/CreateJobParam.java | 3 +++ .../wayline/service/impl/AiCompareQueueServiceImpl.java | 2 +- .../sample/wayline/service/impl/WaylineJobServiceImpl.java | 1 + dk-visual/nacos/src/main/resources/application.properties | 4 ++-- 8 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dk-common/common-mybatis/src/main/resources/spy.properties b/dk-common/common-mybatis/src/main/resources/spy.properties index f3ed7d8..39df1f5 100644 --- a/dk-common/common-mybatis/src/main/resources/spy.properties +++ b/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前缀 diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceQrtzServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceQrtzServiceImpl.java index 4d2c674..7b16934 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceQrtzServiceImpl.java +++ b/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()))); diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/WaylineJobDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/WaylineJobDTO.java index 48d1c48..9973b5a 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/WaylineJobDTO.java +++ b/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; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/entity/WaylineJobEntity.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/entity/WaylineJobEntity.java index 88458c9..315eb97 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/entity/WaylineJobEntity.java +++ b/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; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/param/CreateJobParam.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/param/CreateJobParam.java index adcfa01..55c7b29 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/param/CreateJobParam.java +++ b/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; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/AiCompareQueueServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/AiCompareQueueServiceImpl.java index 5994525..d887a4e 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/AiCompareQueueServiceImpl.java +++ b/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.lambdaQuery().eq(MediaFileEntity::getJobId, jobId).eq(MediaFileEntity::getFileType, "jpeg")); diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/WaylineJobServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/WaylineJobServiceImpl.java index cec52d3..23d1c98 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/WaylineJobServiceImpl.java +++ b/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()) diff --git a/dk-visual/nacos/src/main/resources/application.properties b/dk-visual/nacos/src/main/resources/application.properties index 44fe8a3..972740f 100644 --- a/dk-visual/nacos/src/main/resources/application.properties +++ b/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