From 9608ff0d06566535a00d9e07aa9dee7cc8f771b2 Mon Sep 17 00:00:00 2001 From: yq183 <645046984@qq.com> Date: Tue, 25 Mar 2025 17:02:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=EF=BC=9A=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E5=AF=B9=E6=AF=94=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resource/DKResourceApplication.java | 2 +- .../controller/AiCompareController.java | 14 +++++++++-- .../wayline/model/dto/AiCompareDTO.java | 4 ++++ .../wayline/model/entity/AiCompareEntity.java | 3 +++ .../wayline/service/IAiCompareService.java | 2 ++ .../service/impl/AiCompareServiceImpl.java | 23 +++++++++++++++---- pom.xml | 4 ++-- 7 files changed, 42 insertions(+), 10 deletions(-) diff --git a/dk-modules/resource/src/main/java/org/dromara/resource/DKResourceApplication.java b/dk-modules/resource/src/main/java/org/dromara/resource/DKResourceApplication.java index 5283659..dc1339b 100644 --- a/dk-modules/resource/src/main/java/org/dromara/resource/DKResourceApplication.java +++ b/dk-modules/resource/src/main/java/org/dromara/resource/DKResourceApplication.java @@ -13,7 +13,7 @@ import org.springframework.boot.context.metrics.buffering.BufferingApplicationSt */ @EnableDubbo @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}) -public class DKResourceApplication { +public class DKResourceApplication { public static void main(String[] args) { SpringApplication application = new SpringApplication(DKResourceApplication.class); application.setApplicationStartup(new BufferingApplicationStartup(2048)); diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/AiCompareController.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/AiCompareController.java index a5a702c..e845892 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/AiCompareController.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/AiCompareController.java @@ -36,7 +36,7 @@ import java.util.Map; @RequiredArgsConstructor @RequestMapping("/compare") @Validated -@Tag(name="算法比对模块") +@Tag(name="算法比对模块(驼峰传参)") public class AiCompareController extends BaseController { @@ -75,7 +75,6 @@ public class AiCompareController extends BaseController { /** * 对比编辑 - * * @param id 主键 */ @SaCheckPermission("sample:compare:query") @@ -118,4 +117,15 @@ public class AiCompareController extends BaseController { return toAjax(aiCompareService.update(bo)); } + + /** + * 画框 提交 + */ + @SaCheckPermission("sample:compare:add") + @Log(title = "算法比对", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping("/pictureFrame") + public R pictureFrame(@Validated(AddGroup.class) @RequestBody Map compare) { + return toAjax(aiCompareService.pictureFrame(compare)); + } } diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/AiCompareDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/AiCompareDTO.java index f827e58..358f608 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/AiCompareDTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/AiCompareDTO.java @@ -1,6 +1,7 @@ package org.dromara.sample.wayline.model.dto; +import cn.hutool.core.convert.Convert; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -42,6 +43,9 @@ public class AiCompareDTO implements Serializable { /**航线名称*/ private String waylineName; + /**航线id*/ + private String waylineId; + /** * 模板id 对应模板的jobId * */ diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/entity/AiCompareEntity.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/entity/AiCompareEntity.java index 22cbb84..563351a 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/entity/AiCompareEntity.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/entity/AiCompareEntity.java @@ -28,6 +28,9 @@ public class AiCompareEntity extends BaseEntity { /**航线名称*/ private String waylineName; + + /**航线名称*/ + private String waylineId; /** * 模板id * */ diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IAiCompareService.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IAiCompareService.java index 6fbfb90..db044dc 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IAiCompareService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IAiCompareService.java @@ -23,4 +23,6 @@ public interface IAiCompareService { AiCompareEntity getInfo(Long id); List queryById(Long id); + + Boolean pictureFrame(Map compare); } diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/AiCompareServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/AiCompareServiceImpl.java index 2ab193a..71e35ee 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/AiCompareServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/AiCompareServiceImpl.java @@ -73,10 +73,19 @@ public class AiCompareServiceImpl implements IAiCompareService { } List insertList =new ArrayList<>(); for (Map bo : compareDTOList) { - Long queueId = Convert.toLong(bo.get("queueId")); + Long queueId = bo.containsKey("queueId") ? Convert.toLong(bo.get("queueId")) : null; + String waylineId = bo.containsKey("waylineId") ? Convert.toStr(bo.get("waylineId")) : null; + if(StrUtil.isBlank(waylineId)){ + throw new RuntimeException("未获取到waylineId"); + } + if(ObjectUtil.isNull(queueId)){ + throw new RuntimeException("未获取到queueId"); + } + String templateId = bo.containsKey("templateId") ? Convert.toStr(bo.get("templateId")) : null; AiCompareQueueEntity serviceInfo = aiCompareQueueService.getInfo(queueId); AiCompareEntity aiCompareEntity = new AiCompareEntity(); LoginUser loginUser = LoginHelper.getLoginUser(); + aiCompareEntity.setWaylineId(waylineId); aiCompareEntity.setWaylineName(serviceInfo.getWaylineName()); aiCompareEntity.setJobId(serviceInfo.getJobId()); aiCompareEntity.setJobName(serviceInfo.getJobName()); @@ -87,7 +96,6 @@ public class AiCompareServiceImpl implements IAiCompareService { aiCompareEntity.setCreateDept(loginUser.getDeptId()); aiCompareEntity.setStatus(AiCompareStatusConstants.COMPARE_STATUS_1); aiCompareEntity.setCreateTime(new Date()); - String templateId = Convert.toStr(bo.get("templateId")); if(ObjectUtil.isNotEmpty(templateId)){ aiCompareEntity.setTemplateId(templateId); }else { @@ -109,16 +117,15 @@ public class AiCompareServiceImpl implements IAiCompareService { List resultList = aiCompareMapper.insertOrUpdate(insertList, 10); System.out.println(resultList); List list =compareDTOList.stream().map(e->Convert.toLong(e.get("queueId"))).collect(Collectors.toList()); - ; return aiCompareQueueService.updateStatus(list,AiCompareStatusConstants.QUEUW_TYPE_1); } @Override public Boolean update(Map compareDTO) { AiCompareEntity aiCompareEntity =new AiCompareEntity(); - Long id = Convert.toLong(compareDTO.get("id")); + Long id = compareDTO.containsKey("id") ? Convert.toLong(compareDTO.get("id")) : null; + String templateId = compareDTO.containsKey("templateId") ? Convert.toStr(compareDTO.get("templateId")) : null; aiCompareEntity.setId(id); - String templateId = Convert.toStr(compareDTO.get("templateId")); if(StrUtil.isNotEmpty(templateId)){ aiCompareEntity.setTemplateId(templateId); } @@ -137,4 +144,10 @@ public class AiCompareServiceImpl implements IAiCompareService { List mediaFileDTOList = aiCompareMapper.listMediaFile(aiCompareEntity); return mediaFileDTOList; } + + @Override + public Boolean pictureFrame(Map compare) { + + return true; + } } diff --git a/pom.xml b/pom.xml index 699db26..63a9d40 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ 2.2.2 UTF-8 UTF-8 - 21 + 17 3.2.11 2023.0.3 3.2.3 @@ -85,7 +85,7 @@ dev - wuyuan + dev 127.0.0.1:8848 DEFAULT_GROUP DEFAULT_GROUP