Merge remote-tracking branch 'origin/dev' into dev

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 createId;
+    private Long createBy;
     /**
      *用户昵称
      * */

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

@@ -83,7 +83,7 @@ public class AiCompareServiceImpl implements IAiCompareService {
         QueryWrapper<AiCompareEntity> wrapper = Wrappers.query();
         wrapper
             .eq(StringUtils.isNotEmpty(bo.getStatus()), "status",bo.getStatus())
-            .eq(ObjectUtil.isNotEmpty(bo.getCreateId()), "create_by",bo.getCreateId())
+            .eq(ObjectUtil.isNotEmpty(bo.getCreateBy()), "create_id",bo.getCreateBy())
             .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,
@@ -156,7 +156,10 @@ public class AiCompareServiceImpl implements IAiCompareService {
                 if(isIllegal){
                     QueryWrapper<AiComparePlateEntity> queryWrapper = new QueryWrapper<AiComparePlateEntity>().eq("file_id", e.getFileId());
                     AiComparePlateEntity plateEntity = aiComparePlateMapper.selectOne(queryWrapper);
-                    e.setPatternUrl(fileService.getObjectUrlOne(MinIOConstants.BUCKET_ALERT,plateEntity.getPatternName(),seconds).toString());
+                    if(plateEntity != null){
+                        e.setPatternUrl(fileService.getObjectUrlOne(MinIOConstants.BUCKET_ALERT,plateEntity.getPatternName(),seconds).toString());
+                    }
+
                 }
             });
         }

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

@@ -10,28 +10,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="listMediaFile" resultType="org.dromara.sample.wayline.model.dto.AiCompareMediaFileDTO">
         SELECT
-            ai.id as compareId,
             mf.file_index,
             mf.file_id,
             mf.file_name,
             mf.object_key,
             mf.job_id,
-            mfi.file_id as mateFileId,
-            mfi.file_name as mateFileName,
+            mfi.file_id AS mateFileId,
+            mfi.file_name AS mateFileName,
             mfi.object_key AS mateObjectKey,
             mfi.file_index AS mateFileIndex,
             mfi.create_time AS mateFileDate
         FROM
-            media_file AS mf
-        JOIN
-            media_file AS mfi
-            ON
-                mf.file_index = mfi.file_index  and mf.file_type='jpeg'  and mfi.file_type='jpeg'
+            media_file mf
+                JOIN media_file mfi ON mf.file_index = mfi.file_index
                 JOIN ai_compare ai ON ai.template_id = mfi.job_id
         WHERE
-            mf.job_id = #{jobId}  and ai.id=#{compareId}
+            mf.file_status = mfi.file_status
+          AND mf.file_id != mfi.file_id
+	AND mf.file_index = mfi.file_index
+	AND mf.file_type = 'jpeg'
+	AND mfi.file_type = 'jpeg'
+	AND mf.job_id = #{jobId}
+          AND ai.id = #{compareId}
         ORDER BY
-            mf.file_index;
-
+            mf.file_index,
+            mf.file_status;
     </select>
 </mapper>