Browse Source

site

master
han\hanst 4 days ago
parent
commit
ad0f47c35b
  1. 2
      src/main/java/com/xujie/sys/modules/pms/mapper/EamProjectMapper.java
  2. 16
      src/main/java/com/xujie/sys/modules/pms/service/Impl/EamProjectServiceImpl.java
  3. 8
      src/main/resources/mapper/pms/EamProjectMapper.xml

2
src/main/java/com/xujie/sys/modules/pms/mapper/EamProjectMapper.java

@ -126,6 +126,8 @@ public interface EamProjectMapper {
List<ProofDocumentData> getAutoSendMailAddress(String site); List<ProofDocumentData> getAutoSendMailAddress(String site);
List<String> getAllSiteList();
IPage<SysOssEntity> searchSopFileList(Page<SysOssEntity> sysOssEntityPage,@Param("query") SysOssEntity inData); IPage<SysOssEntity> searchSopFileList(Page<SysOssEntity> sysOssEntityPage,@Param("query") SysOssEntity inData);
List<ProofingInformationData> getEmailsByUsernames(@Param("usernames")List<String> userNames, @Param("site") String site); List<ProofingInformationData> getEmailsByUsernames(@Param("usernames")List<String> userNames, @Param("site") String site);

16
src/main/java/com/xujie/sys/modules/pms/service/Impl/EamProjectServiceImpl.java

@ -981,14 +981,20 @@ public class EamProjectServiceImpl implements EamProjectService {
**/ **/
@Override @Override
public void sendEmail() throws MessagingException, UnsupportedEncodingException { public void sendEmail() throws MessagingException, UnsupportedEncodingException {
List<String> siteList = new ArrayList<>();
siteList.add("2");
siteList.add("3");
// 通过 site 表动态获取启用站点避免硬编码站点遗漏
List<String> siteList = EamProjectMapper.getAllSiteList();
if (siteList == null || siteList.isEmpty()) {
logger.warn("定时发送邮件任务未获取到可用站点,任务结束。");
return;
}
// 从存储过程获取所有待发送邮件数据 // 从存储过程获取所有待发送邮件数据
List<ProofDocumentData> allUserSendEmailList = new ArrayList<>(); List<ProofDocumentData> allUserSendEmailList = new ArrayList<>();
for (int i = 0; i < siteList.size(); i++) {
allUserSendEmailList.addAll(EamProjectMapper.getAutoSendMailAddress(siteList.get(i)));
for (String site : siteList) {
if (StringUtils.isBlank(site)) {
continue;
}
allUserSendEmailList.addAll(EamProjectMapper.getAutoSendMailAddress(site));
} }
List<ProofDocumentData> oneUserSendEmailList = new ArrayList<>(); List<ProofDocumentData> oneUserSendEmailList = new ArrayList<>();
String previousUsername = null; String previousUsername = null;

8
src/main/resources/mapper/pms/EamProjectMapper.xml

@ -743,4 +743,12 @@
END) END)
WHERE id = #{projectPartId} WHERE id = #{projectPartId}
</update> </update>
<select id="getAllSiteList" resultType="java.lang.String">
SELECT
a.siteid
FROM site a
WHERE a.active = 'Y'
ORDER BY a.siteid
</select>
</mapper> </mapper>
Loading…
Cancel
Save