src/main/java/com/whyc/mapper/MailUserMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/pojo/MailUser.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/MailUserService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/MaterialApprovingService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/MaterialService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/mapper/MailUserMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/whyc/mapper/MailUserMapper.java
@@ -2,5 +2,9 @@ import com.whyc.pojo.MailUser; import java.util.List; public interface MailUserMapper extends CustomMapper<MailUser>{ List<MailUser> getMailUserList(int type); } src/main/java/com/whyc/pojo/MailUser.java
@@ -1,5 +1,6 @@ package com.whyc.pojo; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; @TableName("tb_mail_user") @@ -10,6 +11,9 @@ //邮件名单:1-软件发布,2-sop,3-产品首次解锁后 private Integer type; @TableField(exist = false) private String mail; public Integer getId() { return id; @@ -34,4 +38,12 @@ public void setType(Integer type) { this.type = type; } public String getMail() { return mail; } public void setMail(String mail) { this.mail = mail; } } src/main/java/com/whyc/service/MailUserService.java
@@ -22,4 +22,9 @@ List<MailUser> mailUsers = mapper.selectList(query); return new Response().set(1,mailUsers); } /** 获取type对应的用户邮箱列表*/ public List<MailUser> getMailUserList(int type) { return mapper.getMailUserList(type); } } src/main/java/com/whyc/service/MaterialApprovingService.java
@@ -3,9 +3,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.whyc.dto.MailDTO; import com.whyc.dto.Response; import com.whyc.mapper.MaterialApprovingMapper; import com.whyc.pojo.DocUser; import com.whyc.pojo.MailUser; import com.whyc.pojo.MaterialApproving; import com.whyc.util.ActionUtil; import com.whyc.util.CommonUtil; @@ -13,6 +15,7 @@ import com.whyc.util.Zip4jUtil; import org.apache.poi.openxml4j.exceptions.InvalidFormatException; import org.apache.poi.ss.usermodel.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; @@ -24,12 +27,19 @@ import java.util.Date; import java.util.LinkedList; import java.util.List; import java.util.stream.Collectors; @Service public class MaterialApprovingService { @Resource private MaterialApprovingMapper mapper; @Autowired private MailService mailService; @Autowired private MailUserService mailUserService; /** * @@ -152,6 +162,24 @@ if(irregularList.size()>0){ return response.setII(1,false,irregularList,"名称或型号命名不规范"); }*/ /*0120开头的物料上传后,系统自动发邮件对应人员:吴浚、陈卓、熊家杰、钱镜元、於奇 0108、0109开头的物料上传后,系统自动发邮件对应人员:喻艳、袁成、熊志平、叶胜蓝 */ List<String> materialCodeList = list.stream().map(MaterialApproving::getSubCode).collect(Collectors.toList()); MailDTO mailDTO = new MailDTO(); mailDTO.setTitle("【物料上传提醒】"); if(materialCodeList.stream().anyMatch(b->b.startsWith("0120"))){ List<MailUser> mailUserList = mailUserService.getMailUserList(5); mailDTO.setMailList(mailUserList.stream().map(MailUser::getMail).collect(Collectors.toList())); mailDTO.setContent(user.getName()+"在文档管理平台上传了0120开头的物料,请知晓"); mailService.sendMail(mailDTO); }else if (materialCodeList.stream().anyMatch(b->b.startsWith("0108")||b.startsWith("0109"))){ List<MailUser> mailUserList = mailUserService.getMailUserList(6); mailDTO.setMailList(mailUserList.stream().map(MailUser::getMail).collect(Collectors.toList())); mailDTO.setContent(user.getName()+"在文档管理平台上传了0108或0109开头的物料,请知晓"); mailService.sendMail(mailDTO); } String nextTitle = originalFilename.substring(0,originalFilename.lastIndexOf(".")); return response.setIII(1,true,list,nextTitle,filePath); } src/main/java/com/whyc/service/MaterialService.java
@@ -5,6 +5,7 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.whyc.dto.FileDirPath; import com.whyc.dto.MailDTO; import com.whyc.dto.MaterialCheckDTO; import com.whyc.dto.Response; import com.whyc.mapper.MaterialMapper; @@ -38,6 +39,12 @@ @Autowired private AttachLockService attachLockService; @Autowired private MailService mailService; @Autowired private MailUserService mailUserService; //查询所有的散装件信息加设置了替换关系的子件信息 /*public Response getAllMaterial(String category,String subCode,String subName,String subModel,int pageCurr,int pageSize) { @@ -490,7 +497,22 @@ //上传的文件夹转移到正式路径 org.aspectj.util.FileUtil.copyDir(unPackageFile,dirFile); FileUtil.deleteFile(unPackageFile);*/ /*0120开头的物料上传后,系统自动发邮件对应人员:吴浚、陈卓、熊家杰、钱镜元、於奇 0108、0109开头的物料上传后,系统自动发邮件对应人员:喻艳、袁成、熊志平、叶胜蓝 */ MailDTO mailDTO = new MailDTO(); DocUser user = ActionUtil.getUser(); mailDTO.setTitle("【附件更新提醒】"); if(material.getSubCode().startsWith("0120")){ List<MailUser> mailUserList = mailUserService.getMailUserList(5); mailDTO.setMailList(mailUserList.stream().map(MailUser::getMail).collect(Collectors.toList())); mailDTO.setContent(user.getName()+"在文档管理平台上传了0120开头的物料的附件,请知晓"); mailService.sendMail(mailDTO); }else if (material.getSubCode().startsWith("0108")||material.getSubCode().startsWith("0109")){ List<MailUser> mailUserList = mailUserService.getMailUserList(6); mailDTO.setMailList(mailUserList.stream().map(MailUser::getMail).collect(Collectors.toList())); mailDTO.setContent(user.getName()+"在文档管理平台上传了0108或0109开头的物料的附件,请知晓"); mailService.sendMail(mailDTO); } return new Response().set(1,true,"上传完成"); } @@ -576,6 +598,22 @@ mapper.updateById(temp); mhService.insert(mh); /*0120开头的物料上传后,系统自动发邮件对应人员:吴浚、陈卓、熊家杰、钱镜元、於奇 0108、0109开头的物料上传后,系统自动发邮件对应人员:喻艳、袁成、熊志平、叶胜蓝 */ MailDTO mailDTO = new MailDTO(); DocUser user = ActionUtil.getUser(); mailDTO.setTitle("【图纸图片更新提醒】"); if(material.getSubCode().startsWith("0120")){ List<MailUser> mailUserList = mailUserService.getMailUserList(5); mailDTO.setMailList(mailUserList.stream().map(MailUser::getMail).collect(Collectors.toList())); mailDTO.setContent(user.getName()+"在文档管理平台上传了0120开头的物料的图纸或图片,请知晓"); mailService.sendMail(mailDTO); }else if (material.getSubCode().startsWith("0108")||material.getSubCode().startsWith("0109")){ List<MailUser> mailUserList = mailUserService.getMailUserList(6); mailDTO.setMailList(mailUserList.stream().map(MailUser::getMail).collect(Collectors.toList())); mailDTO.setContent(user.getName()+"在文档管理平台上传了0108或0109开头的物料的图纸或图片,请知晓"); mailService.sendMail(mailDTO); } return new Response().set(1, true, "上传完成"); } public Response dwgCompare(int materialId, int materialId2) throws IOException { src/main/resources/mapper/MailUserMapper.xml
New file @@ -0,0 +1,10 @@ <?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.whyc.mapper.MailUserMapper" > <select id="getMailUserList" resultType="com.whyc.pojo.MailUser"> select tb_mail_user.*,tb_doc_user.mail from tb_mail_user,tb_doc_user where tb_mail_user.user=tb_doc_user.name and tb_mail_user.type=#{type} </select> </mapper>