提交：图片比对修改

(cherry picked from commit eea8f2bd63)

dk-modules/sample/src/main/java/org/dromara/sample/wayline/mapper/IAiCompareMapper.java

@@ -1,5 +1,6 @@
 package org.dromara.sample.wayline.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.dromara.sample.wayline.model.dto.AiCompareMediaFileDTO;
 import org.dromara.sample.wayline.model.entity.AiCompareEntity;
 
@@ -11,5 +12,5 @@ import java.util.List;
  */
 public interface IAiCompareMapper extends BaseMapper<AiCompareEntity> {
 
-    List<AiCompareMediaFileDTO>listMediaFile(String jobId);
+    List<AiCompareMediaFileDTO>listMediaFile(@Param("jobId") String jobId, @Param("compareId") Long compareId);
 }

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

@@ -138,7 +138,7 @@ public class AiCompareServiceImpl implements IAiCompareService {
                 }
             }
             String topic = TopicConst.IMAGE +TopicConst.COMPARE;
-            List<AiCompareMediaFileDTO> mediaFileDTOS = listMediaFile(aiCompareEntity.getJobId(),43200,false);
+            List<AiCompareMediaFileDTO> mediaFileDTOS = listMediaFile(aiCompareEntity.getJobId(),aiCompareEntity.getId(),43200,false);
             mqttGatewayPublish.publish(topic, new CommonTopicRequest().setData(mediaFileDTOS),1);
             insertList.add(aiCompareEntity);
         }
@@ -146,12 +146,12 @@ public class AiCompareServiceImpl implements IAiCompareService {
         List<Long> list =compareDTOList.stream().map(e->Convert.toLong(e.get("queueId"))).collect(Collectors.toList());
         return  aiCompareQueueService.updateStatus(list,AiCompareStatusConstants.QUEUW_TYPE_1);
     }
-    public List<AiCompareMediaFileDTO> listMediaFile(String jobId,Integer seconds ,boolean isIllegal){
+    public List<AiCompareMediaFileDTO> listMediaFile(String jobId,Long compareId,Integer seconds ,boolean isIllegal){
-        List<AiCompareMediaFileDTO> mediaFileDTOList = aiCompareMapper.listMediaFile(jobId);
+        List<AiCompareMediaFileDTO> mediaFileDTOList = aiCompareMapper.listMediaFile(jobId,compareId);
         if(!mediaFileDTOList.isEmpty()){
             mediaFileDTOList.stream().forEach(e->{
                 e.setFilePath(fileService.getObjectUrlOne(MinIOConstants.BUCKET_MEDIAFILE,e.getObjectKey(),seconds).toString());
-                e.setMateFilePath(fileService.getObjectUrlOne(MinIOConstants.BUCKET_MEDIAFILE,e.getObjectKey(),seconds).toString());
+                e.setMateFilePath(fileService.getObjectUrlOne(MinIOConstants.BUCKET_MEDIAFILE,e.getMateObjectKey(),seconds).toString());
                 if(isIllegal){
                     QueryWrapper<AiComparePlateEntity> queryWrapper = new QueryWrapper<AiComparePlateEntity>().eq("file_id", e.getFileId());
                     AiComparePlateEntity plateEntity = aiComparePlateMapper.selectOne(queryWrapper);
@@ -176,7 +176,7 @@ public class AiCompareServiceImpl implements IAiCompareService {
         int i = aiCompareMapper.updateById(aiCompareEntity);
         AiCompareEntity compareEntity = aiCompareMapper.selectById(id);
         String topic = TopicConst.IMAGE +TopicConst.COMPARE;
-        List<AiCompareMediaFileDTO> mediaFileDTOS = listMediaFile(compareEntity.getJobId(),43200,false);
+        List<AiCompareMediaFileDTO> mediaFileDTOS = listMediaFile(compareEntity.getJobId(),compareEntity.getId(),43200,false);
         mqttGatewayPublish.publish(topic, new CommonTopicRequest().setData(mediaFileDTOS),1);
         return i>0;
     }
@@ -189,7 +189,7 @@ public class AiCompareServiceImpl implements IAiCompareService {
     @Override
     public List<AiCompareMediaFileDTO> queryById(Long id) {
         AiCompareEntity aiCompareEntity = aiCompareMapper.selectById(id);
-        return  listMediaFile(aiCompareEntity.getJobId(),3600,true);
+        return  listMediaFile(aiCompareEntity.getJobId(),aiCompareEntity.getId(),3600,true);
     }
     @Override
     public Boolean pictureFrame(Map<String,Object>objectMap) {

dk-modules/sample/src/main/resources/mapper/AiCompareMapper.xml

@@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 mf.file_index = mfi.file_index  and mf.file_type='jpeg'  and mfi.file_type='jpeg'
                 JOIN ai_compare ai ON ai.template_id = mfi.job_id
         WHERE
-            mf.job_id = #{jobId}
+            mf.job_id = #{jobId}  and ai.id=#{compareId}
         ORDER BY
             mf.file_index;