From 9386e23fb4e05b264ce38b56d95ab426757ebac7 Mon Sep 17 00:00:00 2001
From: guoqibing <guoqibing@sino-assistance.com>
Date: Fri, 1 Aug 2025 16:59:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=B7=E4=B8=AD=E9=9C=80=E6=B1=82=E9=AA=8C?=
 =?UTF-8?q?=E6=94=B6=E5=8F=91=E9=80=81=E5=A4=9A=E4=BA=BA=E9=82=AE=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/sa/zentao/mapper/ZtProductMapper.java |  2 ++
 .../sa/zentao/service/IZtProductService.java  |  3 ++
 .../service/impl/ZtProductServiceImpl.java    |  5 +++
 .../service/impl/ZtReleaseServiceImpl.java    | 31 +++++++++++++++++--
 .../java/com/sa/zentao/utils/SendEmail.java   | 13 +++-----
 src/main/resources/application-dev.yml        |  6 +++-
 src/main/resources/application-local.yml      |  4 ++-
 src/main/resources/mapper/ZtProductMapper.xml |  7 +++++
 8 files changed, 58 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/sa/zentao/mapper/ZtProductMapper.java b/src/main/java/com/sa/zentao/mapper/ZtProductMapper.java
index f60cac7..29a018b 100644
--- a/src/main/java/com/sa/zentao/mapper/ZtProductMapper.java
+++ b/src/main/java/com/sa/zentao/mapper/ZtProductMapper.java
@@ -22,4 +22,6 @@ public interface ZtProductMapper extends BaseMapper<ZtProduct> {
 
     List<ZtProductDTO> productPageList(@Param("qo") ZtProjectQo qo);
 
+    List<ZtProduct> productListByProgramName(@Param("programName") String programName);
+
 }
diff --git a/src/main/java/com/sa/zentao/service/IZtProductService.java b/src/main/java/com/sa/zentao/service/IZtProductService.java
index 7c1d0b3..aad25c0 100644
--- a/src/main/java/com/sa/zentao/service/IZtProductService.java
+++ b/src/main/java/com/sa/zentao/service/IZtProductService.java
@@ -54,4 +54,7 @@ public interface IZtProductService extends IService<ZtProduct> {
     void productTeamUpdate(ZtProjectQo qo);
 
     List<String> productTeamByPid(ZtProjectQo qo);
+
+    List<ZtProduct> productListByProgramName(String programName);
+
 }
diff --git a/src/main/java/com/sa/zentao/service/impl/ZtProductServiceImpl.java b/src/main/java/com/sa/zentao/service/impl/ZtProductServiceImpl.java
index b3b5e11..def69ee 100644
--- a/src/main/java/com/sa/zentao/service/impl/ZtProductServiceImpl.java
+++ b/src/main/java/com/sa/zentao/service/impl/ZtProductServiceImpl.java
@@ -658,6 +658,11 @@ public class ZtProductServiceImpl extends ServiceImpl<ZtProductMapper, ZtProduct
         return productTeamList.stream().map(o -> o.getAccount()).collect(Collectors.toList());
     }
 
+    @Override
+    public List<ZtProduct> productListByProgramName(String programName) {
+        return this.baseMapper.productListByProgramName(programName);
+    }
+
     private Map<Integer, List<ZtProductDTO>> getChildrenMap(List<ZtProjectDTO> result) {
 
         List<ZtProduct> ztProjects = this.baseMapper.selectList(
diff --git a/src/main/java/com/sa/zentao/service/impl/ZtReleaseServiceImpl.java b/src/main/java/com/sa/zentao/service/impl/ZtReleaseServiceImpl.java
index 56f9ad7..1cfd7c7 100644
--- a/src/main/java/com/sa/zentao/service/impl/ZtReleaseServiceImpl.java
+++ b/src/main/java/com/sa/zentao/service/impl/ZtReleaseServiceImpl.java
@@ -2,6 +2,7 @@ package com.sa.zentao.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -22,6 +23,7 @@ import com.sa.zentao.utils.SendEmail;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -69,6 +71,9 @@ public class ZtReleaseServiceImpl extends ServiceImpl<ZtReleaseMapper, ZtRelease
     @Autowired
     private IZtExecutionprojectService executionprojectService;
 
+    @Value("${xfx.release}")
+    private String [] xfxRelease;
+
     @Override
     @Transactional
     public void addRelease(ZtReleaseDTO dto) {
@@ -436,11 +441,32 @@ public class ZtReleaseServiceImpl extends ServiceImpl<ZtReleaseMapper, ZtRelease
         b.append( "</tbody>");
         b.append( "</table>");
         if(!CollectionUtils.isEmpty(mailTo)){
+
             SendEmail.sendMessage("需求发布提醒：",mailTo.stream().collect(Collectors.toList()),
-                    null,
+                    getFxcfCopyToMail(ztStories),
                     b.toString());
         }
     }
+
+    /**
+     * 飞侠车服 抄送指定人
+     * @param
+     * @return
+     */
+    private List<String> getFxcfCopyToMail(List<ZtStory> ztStories) {
+        List<ZtProduct> ztProducts = this.productService.productListByProgramName("飞侠车服");
+        //飞侠车服产品
+        if(!CollectionUtils.isEmpty(ztProducts)&&xfxRelease!=null&&xfxRelease.length>0){
+            List<Integer> xfProductIds = ztProducts.stream().map(o -> o.getId()).collect(Collectors.toList());
+            for (ZtStory story : ztStories) {
+                if(xfProductIds.contains(story.getProduct())){
+                    return Arrays.asList(xfxRelease);
+                }
+            }
+        }
+        return null;
+    }
+
     //催促验收
     private void urgeYsMail(List<ZtStory> ztStories,ZtRelease release) {
         Map<String, ZtUser> userMap = this.userService.userMapByIds(null);
@@ -488,7 +514,7 @@ public class ZtReleaseServiceImpl extends ServiceImpl<ZtReleaseMapper, ZtRelease
         b.append( "</table>");
         if(!CollectionUtils.isEmpty(mailTo)){
             SendEmail.sendMessage("需求验收提醒：",mailTo.stream().collect(Collectors.toList()),
-                    null,
+                    getFxcfCopyToMail(ztStories),
                     b.toString());
         }
         for (ZtStory s:ztStories) {
@@ -1045,5 +1071,4 @@ public class ZtReleaseServiceImpl extends ServiceImpl<ZtReleaseMapper, ZtRelease
         return Arrays.asList();
     }
 
-
 }
diff --git a/src/main/java/com/sa/zentao/utils/SendEmail.java b/src/main/java/com/sa/zentao/utils/SendEmail.java
index 640ffc0..e74bb35 100644
--- a/src/main/java/com/sa/zentao/utils/SendEmail.java
+++ b/src/main/java/com/sa/zentao/utils/SendEmail.java
@@ -19,6 +19,7 @@ import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 import java.util.List;
 import java.util.Properties;
+import java.util.stream.Collectors;
 
 @Slf4j
 public class SendEmail {
@@ -129,14 +130,10 @@ public class SendEmail {
             // 设置发件人和收件人地址
             message.setFrom(new InternetAddress(username));
 
-            for (String str:mails) {
-                message.addRecipient(Message.RecipientType.TO, new InternetAddress(str));
-            }
+//            for (String str:mails) {
+            message.addRecipients(Message.RecipientType.TO, mails.stream().collect(Collectors.joining(",")));
             if(!CollectionUtils.isEmpty(copyTo)){
-                for (String str:copyTo ) {
-                    message.setRecipients(Message.RecipientType.CC, InternetAddress
-                            .parse(str));
-                }
+                message.setRecipients(Message.RecipientType.CC, copyTo.stream().collect(Collectors.joining(",")));
             }
 
             if(StringUtils.isEmpty(title)){
@@ -160,7 +157,7 @@ public class SendEmail {
             // 发送邮件
             Transport.send(message);
 
-            System.out.println("邮件发送成功！");
+            log.info("邮件发送成功！");
         } catch (UnsupportedEncodingException e) {
             log.error("{} {}",e, JSON.toJSONString(mails));
             throw new BusinessException("邮件发送失败 ");
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 184c651..bfeab03 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -54,4 +54,8 @@ vx:
   dkCorpsecret: 1MWQxoL8QtypfdnKJqdo3pGdZDAmdhqTF_MaWm3rVjs
   salaryCorpsecretApp: BsgdcmLV5L1jbO7uro9QqdgGQaGItVb_tvfaasAq_3w
   salaryCorpsecretAppUrl: https://qyapi.weixin.qq.com/cgi-bin/message/send
-  dkcorpsecret: 1MWQxoL8QtypfdnKJqdo3pGdZDAmdhqTF_MaWm3rVjs
\ No newline at end of file
+  dkcorpsecret: 1MWQxoL8QtypfdnKJqdo3pGdZDAmdhqTF_MaWm3rVjs
+
+# 小飞侠发版通知和催促邮件增加抄送人
+xfx:
+  release: gongwenyi@flying-man.cn,juntao.lin@sino-assistance.com,lizhicheng@sino-assistance.com,wangtingting@sino-assistance.com,liang.xie@sino-assistance.com,zhangyamei@sino-assistance.com
diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml
index f741170..6542dd3 100644
--- a/src/main/resources/application-local.yml
+++ b/src/main/resources/application-local.yml
@@ -63,7 +63,9 @@ vx:
   salaryCorpsecretAppUrl: https://qyapi.weixin.qq.com/cgi-bin/message/send
   dkcorpsecret: biYcz9e1gIJSsAaTgCZXbcO8Vh9YT11JtaFeZPaPmtU   #书籍
 
-
+# 小飞侠发版通知和催促邮件增加抄送人
+xfx:
+  release: sunqingfang@sino-assistance.com,4468058@qq.com
 
 #vx:
 #  agentld: 1000059
diff --git a/src/main/resources/mapper/ZtProductMapper.xml b/src/main/resources/mapper/ZtProductMapper.xml
index 5e7f5cd..a5d2d2e 100644
--- a/src/main/resources/mapper/ZtProductMapper.xml
+++ b/src/main/resources/mapper/ZtProductMapper.xml
@@ -71,4 +71,11 @@
         order by id desc
     </select>
 
+    <select id="productListByProgramName" resultType="com.sa.zentao.entity.ZtProduct">
+        select p.* from zt_product p WHERE program in (
+            SELECT id from zt_project pj WHERE pj.`name` = #{programName} and pj.deleted ='0'
+        ) and deleted = '0'
+
+    </select>
+
 </mapper>