From 1d7d00682aff2ba0e93149bb23ad7582dd5e63bc Mon Sep 17 00:00:00 2001 From: yq183 <645046984@qq.com> Date: Fri, 28 Mar 2025 20:32:42 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4=EF=BC=9A=E6=AF=94?= =?UTF-8?q?=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sample/manage/service/impl/DeviceQrtzServiceImpl.java | 3 ++- .../dromara/sample/wayline/controller/AiCompareController.java | 2 ++ .../sample/wayline/service/impl/AiCompareServiceImpl.java | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) 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 4a8dee0..146e5e0 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 @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.dubbo.config.annotation.DubboReference; import org.dromara.business.api.RemoteBusinessTaskService; import org.dromara.common.core.constant.BusinessConstants; import org.dromara.common.core.constant.DeviceQrtzConstants; @@ -65,7 +66,7 @@ public class DeviceQrtzServiceImpl implements IDeviceQrtzService { private IWaylineFileMapper waylineFileMapper; @Autowired private IFlightTaskService flightTaskService; - @Autowired + @DubboReference private RemoteBusinessTaskService remoteBusinessTaskService; @Override public TableDataInfo listManageDeviceQrtz(Page page, DeviceQrtzDTO deviceQrtzDTO) { 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 2d12af7..10a93fa 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 @@ -140,4 +140,6 @@ public class AiCompareController extends BaseController { public R pictureFrame(@RequestBody Map map) { return toAjax(aiCompareService.expose(map)); } + + } 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 8761a46..cbde958 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 @@ -192,6 +192,9 @@ public class AiCompareServiceImpl implements IAiCompareService { @Override public Boolean expose(Map map) { + if(!map.isEmpty()){ + + } return true; } From 9d2795f41002c8ee8924d60a9890271589d31fb0 Mon Sep 17 00:00:00 2001 From: yq183 <645046984@qq.com> Date: Fri, 28 Mar 2025 22:30:39 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AiCompareController.java | 6 ++--- .../wayline/model/dto/AiCompareDTO.java | 11 +------- .../model/dto/AiCompareMediaFileDTO.java | 1 + .../wayline/model/dto/AiComparePlateDTO.java | 4 +++ .../wayline/model/entity/AiCompareEntity.java | 27 +++++++++++++++---- .../wayline/service/IAiCompareService.java | 2 +- .../service/impl/AiCompareServiceImpl.java | 23 ++++++++++++---- .../main/resources/mapper/AiCompareMapper.xml | 1 + 8 files changed, 50 insertions(+), 25 deletions(-) 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 10a93fa..f711d0d 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 @@ -134,11 +134,9 @@ public class AiCompareController extends BaseController { /** * 算法预警生成 */ - @Log(title = "算法预警生成", businessType = BusinessType.INSERT) - @RepeatSubmit() @PostMapping("/expose") - public R pictureFrame(@RequestBody Map map) { - return toAjax(aiCompareService.expose(map)); + public R expose(@RequestBody List> mapList) { + return toAjax(aiCompareService.expose(mapList)); } 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 4232c42..a45a158 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 @@ -95,7 +95,7 @@ public class AiCompareDTO implements Serializable { * 创建者 */ - private Long createBy; + private Long createId; /** *用户昵称 * */ @@ -105,16 +105,7 @@ public class AiCompareDTO implements Serializable { */ private Date createTime; - /** - * 更新者 - */ - - private Long updateBy; - /** - * 更新时间 - */ - private Date updateTime; /** * 请求参数 diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/AiCompareMediaFileDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/AiCompareMediaFileDTO.java index a515216..ca4ee70 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/AiCompareMediaFileDTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/AiCompareMediaFileDTO.java @@ -27,6 +27,7 @@ public class AiCompareMediaFileDTO { /**上云文件id*/ private String fileId; + private Long compareId; @Schema(description = "文件名") private String fileName; diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/AiComparePlateDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/AiComparePlateDTO.java index 2a00f8f..7ff06c1 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/AiComparePlateDTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/AiComparePlateDTO.java @@ -17,6 +17,10 @@ import org.dromara.sample.wayline.model.entity.AiComparePlateEntity; public class AiComparePlateDTO{ private Long id; + /** + * 比对id + * */ + private Long compareId; /** * 任务id * */ 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 563351a..d848863 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 @@ -1,11 +1,10 @@ package org.dromara.sample.wayline.model.entity; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import lombok.*; import org.dromara.common.mybatis.core.domain.BaseEntity; +import java.util.Date; /** @@ -13,9 +12,8 @@ import org.dromara.common.mybatis.core.domain.BaseEntity; * @data 2025/3/21 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("ai_compare") -public class AiCompareEntity extends BaseEntity { +public class AiCompareEntity { @TableId(type = IdType.AUTO) private Long id; @@ -64,6 +62,25 @@ public class AiCompareEntity extends BaseEntity { * 任务id * */ private String jobId; + /** + * 创建部门 + */ + + private Long createDept; + + /** + * 创建者 + */ + + private Long createId; + + /** + * 创建时间 + */ + + private Date createTime; + + } 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 cc87f8e..b33c4be 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 @@ -26,5 +26,5 @@ public interface IAiCompareService { List queryById(Long id); Boolean pictureFrame(FrameDTO frameDTO); - Boolean expose(Map map); + Boolean expose(List> mapList); } 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 cbde958..23069c3 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 @@ -30,6 +30,7 @@ import org.dromara.sample.wayline.mapper.IAiComparePlateMapper; import org.dromara.sample.wayline.mapper.IWaylineJobMapper; import org.dromara.sample.wayline.model.dto.AiCompareDTO; import org.dromara.sample.wayline.model.dto.AiCompareMediaFileDTO; +import org.dromara.sample.wayline.model.dto.AiComparePlateDTO; import org.dromara.sample.wayline.model.dto.FrameDTO; import org.dromara.sample.wayline.model.entity.AiCompareEntity; import org.dromara.sample.wayline.model.entity.AiComparePlateEntity; @@ -71,7 +72,7 @@ public class AiCompareServiceImpl implements IAiCompareService { QueryWrapper wrapper = Wrappers.query(); wrapper .eq(StringUtils.isNotEmpty(bo.getStatus()), "status",bo.getStatus()) - .eq(ObjectUtil.isNotEmpty(bo.getCreateBy()), "create_by",bo.getCreateBy()) + .eq(ObjectUtil.isNotEmpty(bo.getCreateId()), "create_by",bo.getCreateId()) .like(StringUtils.isNotBlank(bo.getDeptName()), "lower(dept_name)", StringUtils.lowerCase(bo.getDeptName())) .like(StringUtils.isNotBlank(bo.getJobName()), "lower(job_name)", StringUtils.lowerCase(bo.getJobName())) .between(params.get("beginTime") != null && params.get("endTime") != null, @@ -103,7 +104,7 @@ public class AiCompareServiceImpl implements IAiCompareService { aiCompareEntity.setJobId(serviceInfo.getJobId()); aiCompareEntity.setJobName(serviceInfo.getJobName()); aiCompareEntity.setTotalNum(serviceInfo.getPictureNumber()); - aiCompareEntity.setCreateBy(loginUser.getUserId()); + aiCompareEntity.setCreateId(loginUser.getUserId()); aiCompareEntity.setNickName(loginUser.getNickname()); aiCompareEntity.setDeptName(loginUser.getDeptName()); aiCompareEntity.setCreateDept(loginUser.getDeptId()); @@ -191,9 +192,21 @@ public class AiCompareServiceImpl implements IAiCompareService { } @Override - public Boolean expose(Map map) { - if(!map.isEmpty()){ - + public Boolean expose(List> mapList) { + if(!mapList.isEmpty()){ + List plateDTOS = Convert.toList(AiComparePlateDTO.class, mapList); + plateDTOS.parallelStream().forEach(e-> { + AiComparePlateEntity plateEntity = new AiComparePlateEntity(); + plateEntity.setFileId(e.getFileId()); + plateEntity.setPatternName(e.getPatternName()); + aiComparePlateMapper.delete(new QueryWrapper().eq("file_id", e.getFileId())); + aiComparePlateMapper.insert(plateEntity); + }); + Long compareId = plateDTOS.get(0).getCompareId(); + AiCompareEntity compareEntity = aiCompareMapper.selectById(compareId); + compareEntity.setStatus(AiCompareStatusConstants.COMPARE_STATUS_2); + compareEntity.setIllegalNum(plateDTOS.size()); + aiCompareMapper.updateById(compareEntity); } return true; } diff --git a/dk-modules/sample/src/main/resources/mapper/AiCompareMapper.xml b/dk-modules/sample/src/main/resources/mapper/AiCompareMapper.xml index 3bb9880..47f725b 100644 --- a/dk-modules/sample/src/main/resources/mapper/AiCompareMapper.xml +++ b/dk-modules/sample/src/main/resources/mapper/AiCompareMapper.xml @@ -10,6 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"