task|附件查询&报错修正

+package com.fedex.connect.task.data.dto;
+
+import com.fedex.connect.common.model.biz.Attachment;
+import lombok.Data;
+
+import java.util.List;
+@Data
+public class PushZipEmailDto {
+    private String destIataCode;
+    private List<Attachment> attachments;
+}

@@ -2,6 +2,7 @@ package com.fedex.connect.task.repository.base;
 
 
 import com.fedex.connect.common.dao.sys.KafkaStorageHistoryMapper;
 import com.fedex.connect.common.dao.sys.KafkaStorageHistoryMapper;
 import com.fedex.connect.common.dao.sys.KafkaTemporaryStorageMapper;
 import com.fedex.connect.common.dao.sys.KafkaTemporaryStorageMapper;
+import com.fedex.connect.task.repository.dao.AttachmentExtMapper;
 import com.fedex.connect.task.repository.dao.EmailExtMapper;
 import com.fedex.connect.task.repository.dao.EmailExtMapper;
 import com.fedex.connect.task.repository.dao.KafkaTemporaryStorageMapperExt;
 import com.fedex.connect.task.repository.dao.KafkaTemporaryStorageMapperExt;
 import com.fedex.connect.task.repository.dao.RedisSlabMapperExt;
 import com.fedex.connect.task.repository.dao.RedisSlabMapperExt;
@@ -18,4 +19,6 @@ public class AbstractDaoRepository {
     protected RedisSlabMapperExt redisSlabMapperExt;
     protected RedisSlabMapperExt redisSlabMapperExt;
     @Autowired
     @Autowired
     protected EmailExtMapper emailExtMapper;
     protected EmailExtMapper emailExtMapper;
+    @Autowired
+    protected AttachmentExtMapper attachmentExtMapper;
 }
 }
\ No newline at end of file

+package com.fedex.connect.task.repository.dao;
+
+import com.fedex.connect.task.data.dto.PushZipEmailDto;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+@Mapper
+public interface AttachmentExtMapper {
+
+    @Select("SELECT c.DEST_IATA_CODE, a.* " +
+            "FROM T_BIZ_CONSIGNMENT c " +
+            "JOIN T_BIZ_ATTACHMENT a ON c.ID = a.BIZ_ID " +
+            "WHERE c.ID = #{conId}")
+    List<PushZipEmailDto> findAttachmentAndPortByCode(@Param("conId") Long conId);
+}

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fedex.connect.task.repository.dao.AttachmentExtMapper">
+
+</mapper>
\ No newline at end of file

@@ -3,8 +3,13 @@
 <mapper namespace="com.fedex.connect.task.repository.dao.EmailExtMapper">
 <mapper namespace="com.fedex.connect.task.repository.dao.EmailExtMapper">
     <select id="findConPushEmails" resultType="com.fedex.connect.common.model.biz.Email">
     <select id="findConPushEmails" resultType="com.fedex.connect.common.model.biz.Email">
         SELECT *
         SELECT *
+        FROM (
+        SELECT *
         FROM T_BIZ_EMAIL
         FROM T_BIZ_EMAIL
         WHERE TYPE_ID = #{typeId}
         WHERE TYPE_ID = #{typeId}
         AND STATUS_ID = #{statusId}
         AND STATUS_ID = #{statusId}
+        ORDER BY CREATED_DATE DESC
+        )
+        WHERE ROWNUM &lt; 500
     </select>
     </select>
 </mapper>
 </mapper>
\ No newline at end of file

@@ -14,6 +14,6 @@
   </sql>
   </sql>
 
 
   <select id="findValidRedisMsgList" resultMap="BaseResultMap">
   <select id="findValidRedisMsgList" resultMap="BaseResultMap">
-    SELECT <include refid="Base_Column_List" /> FROM T_REDIS_SLAB WHERE DIS_TIME &lt; #{curDate,jdbcType=TIMESTAMP}
+    SELECT <include refid="Base_Column_List" /> FROM T_SYS_REDIS_SLAB WHERE DIS_TIME &lt; #{curDate,jdbcType=TIMESTAMP}
   </select>
   </select>
 </mapper>
 </mapper>
\ No newline at end of file

+package com.fedex.connect.task.repository.repo.biz;
+
+import com.fedex.connect.task.data.dto.PushZipEmailDto;
+
+import java.util.List;
+
+public interface IAttachmentExtRepository {
+    List<PushZipEmailDto> findAttachmentAndPortByCode(Long conId);
+}

+package com.fedex.connect.task.repository.repo.biz.impl;
+
+import com.fedex.connect.task.data.dto.PushZipEmailDto;
+import com.fedex.connect.task.repository.base.AbstractDaoRepository;
+import com.fedex.connect.task.repository.repo.biz.IAttachmentExtRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public class AttachmentExtRepositoryImpl extends AbstractDaoRepository implements IAttachmentExtRepository {
+
+    @Override
+    public List<PushZipEmailDto> findAttachmentAndPortByCode(Long conId) {
+        return attachmentExtMapper.findAttachmentAndPortByCode(conId);
+    }
+}

@@ -8,7 +8,7 @@ import org.springframework.stereotype.Repository;
 import java.util.List;
 import java.util.List;
 
 
 @Repository
 @Repository
-public class EmailRepositoryExtImpl extends AbstractDaoRepository implements IEmailExtRepository {
+public class EmailExtRepositoryImpl extends AbstractDaoRepository implements IEmailExtRepository {
     public List<Email> findConPushEmails(Long typeId,Long statusId){
     public List<Email> findConPushEmails(Long typeId,Long statusId){
         return emailExtMapper.findConPushEmails(typeId,statusId);
         return emailExtMapper.findConPushEmails(typeId,statusId);
     }
     }

 package com.fedex.connect.task.repository.repo.sys;
 package com.fedex.connect.task.repository.repo.sys;
 
 
 import com.fedex.connect.common.model.sys.RedisSlab;
 import com.fedex.connect.common.model.sys.RedisSlab;
-import org.springframework.stereotype.Repository;
 
 
 import java.util.Date;
 import java.util.Date;
 import java.util.List;
 import java.util.List;
 
 
-@Repository
+
 public interface IRedisSlabExtRepository {
 public interface IRedisSlabExtRepository {
     List<RedisSlab> findValidRedisMsgList(Date curDate);
     List<RedisSlab> findValidRedisMsgList(Date curDate);
 }
 }
\ No newline at end of file

@@ -3,6 +3,7 @@ package com.fedex.connect.task.repository.repo.sys.impl;
 import com.fedex.connect.common.model.sys.RedisSlab;
 import com.fedex.connect.common.model.sys.RedisSlab;
 import com.fedex.connect.task.repository.base.AbstractDaoRepository;
 import com.fedex.connect.task.repository.base.AbstractDaoRepository;
 import com.fedex.connect.task.repository.repo.sys.IRedisSlabExtRepository;
 import com.fedex.connect.task.repository.repo.sys.IRedisSlabExtRepository;
+import org.springframework.stereotype.Repository;
 
 
 import java.util.Date;
 import java.util.Date;
 import java.util.List;
 import java.util.List;
@@ -12,6 +13,7 @@ import java.util.List;
   * @Description redis平替操作类
   * @Description redis平替操作类
   * @Date 2024/11/6
   * @Date 2024/11/6
   */
   */
+@Repository
 public class RedisSlabExtRepositoryImpl extends AbstractDaoRepository implements IRedisSlabExtRepository {
 public class RedisSlabExtRepositoryImpl extends AbstractDaoRepository implements IRedisSlabExtRepository {
 
 
     /**
     /**

 package com.fedex.connect.task.service.base;
 package com.fedex.connect.task.service.base;
 
 
 import com.fedex.connect.common.dependencies.repository.repo.sys.IRedisSlabRepository;
 import com.fedex.connect.common.dependencies.repository.repo.sys.IRedisSlabRepository;
+import com.fedex.connect.task.repository.repo.biz.IAttachmentExtRepository;
 import com.fedex.connect.task.repository.repo.biz.IEmailExtRepository;
 import com.fedex.connect.task.repository.repo.biz.IEmailExtRepository;
 import com.fedex.connect.task.repository.repo.sys.IKafkaStorageHistoryRepository;
 import com.fedex.connect.task.repository.repo.sys.IKafkaStorageHistoryRepository;
 import com.fedex.connect.task.repository.repo.sys.IKafkaTemporaryStorageRepository;
 import com.fedex.connect.task.repository.repo.sys.IKafkaTemporaryStorageRepository;
@@ -23,4 +24,6 @@ public class BaseService {
     protected IRedisSlabExtRepository redisRepository;
     protected IRedisSlabExtRepository redisRepository;
     @Autowired
     @Autowired
     protected IEmailExtRepository iEmailExtRepository;
     protected IEmailExtRepository iEmailExtRepository;
+    @Autowired
+    protected IAttachmentExtRepository attachmentExtRepository;
 }
 }
\ No newline at end of file

@@ -4,6 +4,7 @@ import com.fedex.connect.common.dependencies.cache.CacheSystem;
 import com.fedex.connect.common.dependencies.enums.biz.EmailStatusEnum;
 import com.fedex.connect.common.dependencies.enums.biz.EmailStatusEnum;
 import com.fedex.connect.common.dependencies.enums.biz.EmailTypeEnum;
 import com.fedex.connect.common.dependencies.enums.biz.EmailTypeEnum;
 import com.fedex.connect.common.model.biz.Email;
 import com.fedex.connect.common.model.biz.Email;
+import com.fedex.connect.task.data.dto.PushZipEmailDto;
 import com.fedex.connect.task.service.base.BaseService;
 import com.fedex.connect.task.service.base.BaseService;
 import com.fedex.connect.task.service.biz.IPushConsignmentFileService;
 import com.fedex.connect.task.service.biz.IPushConsignmentFileService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,7 +37,10 @@ public class PushConsignmentFileServiceImpl extends BaseService implements IPush
         //打zip包
         //打zip包
         if (!CollectionUtils.isEmpty(conPushEmails)){
         if (!CollectionUtils.isEmpty(conPushEmails)){
             for (Email conPushEmail : conPushEmails) {
             for (Email conPushEmail : conPushEmails) {
-
+                /**
+                 * 获取每个运单的附件
+                 */
+                List<PushZipEmailDto> attachmentAndPortByCode = attachmentExtRepository.findAttachmentAndPortByCode(conPushEmail.getBizId());
             }
             }
         }
         }
         //发送邮件
         //发送邮件