Commit cb45638e authored by duoduo-sx's avatar duoduo-sx
Browse files

Merge branch 'sxx' of gitlab.ruzhoukj.com:wujipeng/ops into sxx

parents 0922c3c8 4c68b6eb
...@@ -44,4 +44,11 @@ public interface ProjectDao extends BaseMapper<ProjectEntity> { ...@@ -44,4 +44,11 @@ public interface ProjectDao extends BaseMapper<ProjectEntity> {
* @return 受影响行数 * @return 受影响行数
*/ */
int deleteProject(@Param("id") Integer id); int deleteProject(@Param("id") Integer id);
/**
* 查询近七天要到期的项目
*
* @return List<ProjectEntity>
*/
List<ProjectEntity> selectSevenDaysProject();
} }
...@@ -23,4 +23,11 @@ public interface UserDao extends BaseMapper<UserEntity> { ...@@ -23,4 +23,11 @@ public interface UserDao extends BaseMapper<UserEntity> {
UserEntity getUserByUsernameAndPassword(@Param("name") String name, @Param("password") String password); UserEntity getUserByUsernameAndPassword(@Param("name") String name, @Param("password") String password);
/**
* 根据项目leader查询用户
*
* @param projectLeader projectLeader
* @return UserEntity
*/
UserEntity getUserByLeader(@Param("projectLeader") String projectLeader);
} }
...@@ -21,4 +21,5 @@ public class UserEntity { ...@@ -21,4 +21,5 @@ public class UserEntity {
private String name; private String name;
private BigInteger createTime; private BigInteger createTime;
private String departments; private String departments;
private String email;
} }
...@@ -8,6 +8,7 @@ import java.util.List; ...@@ -8,6 +8,7 @@ import java.util.List;
public interface ProjectService { public interface ProjectService {
/** /**
* 分页查询项目列表 * 分页查询项目列表
*
* @param queryRequest 查询请求参数 * @param queryRequest 查询请求参数
* @return 项目列表 * @return 项目列表
*/ */
...@@ -15,6 +16,7 @@ public interface ProjectService { ...@@ -15,6 +16,7 @@ public interface ProjectService {
/** /**
* 根据项目ID查询项目详情 * 根据项目ID查询项目详情
*
* @param id 项目ID * @param id 项目ID
* @return 项目详情 * @return 项目详情
*/ */
...@@ -22,6 +24,7 @@ public interface ProjectService { ...@@ -22,6 +24,7 @@ public interface ProjectService {
/** /**
* 新增项目 * 新增项目
*
* @param project 项目信息 * @param project 项目信息
* @return 受影响行数 * @return 受影响行数
*/ */
...@@ -29,6 +32,7 @@ public interface ProjectService { ...@@ -29,6 +32,7 @@ public interface ProjectService {
/** /**
* 更新项目 * 更新项目
*
* @param project 项目信息 * @param project 项目信息
* @return 受影响行数 * @return 受影响行数
*/ */
...@@ -36,8 +40,16 @@ public interface ProjectService { ...@@ -36,8 +40,16 @@ public interface ProjectService {
/** /**
* 删除项目 * 删除项目
*
* @param id 项目ID * @param id 项目ID
* @return 受影响行数 * @return 受影响行数
*/ */
int deleteProject(Integer id); int deleteProject(Integer id);
/**
* 查询近七天要到期的项目
*
* @return List<ProjectEntity>
*/
List<ProjectEntity> selectSevenDaysProject();
} }
...@@ -8,4 +8,11 @@ public interface UserService { ...@@ -8,4 +8,11 @@ public interface UserService {
public List<UserEntity> getUserList(String name); public List<UserEntity> getUserList(String name);
/**
* 根据项目leader查询用户
*
* @param projectLeader projectLeader
* @return UserEntity
*/
UserEntity getUserByLeader(String projectLeader);
} }
...@@ -37,4 +37,9 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDao, ProjectEntity> i ...@@ -37,4 +37,9 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectDao, ProjectEntity> i
public int deleteProject(Integer id) { public int deleteProject(Integer id) {
return baseMapper.deleteProject(id); return baseMapper.deleteProject(id);
} }
@Override
public List<ProjectEntity> selectSevenDaysProject() {
return baseMapper.selectSevenDaysProject();
}
} }
...@@ -19,4 +19,9 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements ...@@ -19,4 +19,9 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
public List<UserEntity> getUserList(String name) { public List<UserEntity> getUserList(String name) {
return baseMapper.getUserList(name); return baseMapper.getUserList(name);
} }
@Override
public UserEntity getUserByLeader(String projectLeader) {
return baseMapper.getUserByLeader(projectLeader);
}
} }
package com.ruzhoukj.sms.task;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import com.ruzhoukj.sms.entity.ProjectEntity;
import com.ruzhoukj.sms.entity.UserEntity;
import com.ruzhoukj.sms.service.ProjectService;
import com.ruzhoukj.sms.service.UserService;
import com.ruzhoukj.sms.util.EmailUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.util.List;
/**
* @author wujipeng
* @version 1.0
* @create 2024-08-28 9:47
*/
@Component
@Slf4j
public class ProjectTask {
@Resource
private ProjectService projectService;
@Resource
private UserService userService;
//每天执行一次,七天内要到期的项目
@Scheduled(cron = "0 10 * * * ?")
public void projectRemind() {
List<ProjectEntity> sevenDaysProject = projectService.selectSevenDaysProject();
//有要到期的合同,需要邮箱提醒
if (CollUtil.isNotEmpty(sevenDaysProject) && !sevenDaysProject.isEmpty()) {
for (ProjectEntity projectEntity : sevenDaysProject) {
UserEntity user = userService.getUserByLeader(projectEntity.getProjectLeader());
if (BeanUtil.isNotEmpty(user)) {
EmailUtil.contractReminder(user.getName(), user.getEmail(), projectEntity);
} else {
log.info("项目负责人为空,项目信息:{}", projectEntity);
}
}
}
}
}
package com.ruzhoukj.sms.util; package com.ruzhoukj.sms.util;
import java.text.SimpleDateFormat;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.ZoneId; import java.time.ZoneId;
...@@ -35,6 +36,20 @@ public class DateUtils { ...@@ -35,6 +36,20 @@ public class DateUtils {
return new Date[]{startDate, endDate}; return new Date[]{startDate, endDate};
} }
/**
* 将Date类型的日期转换为"yyyy-MM-dd"格式的字符串.
*
* @param date 需要被转换的日期
* @return 转换后的字符串,如果输入的date为null则返回null
*/
public static String formatDate(Date date) {
if (date == null) {
return null;
}
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
return sdf.format(date);
}
public static void main(String[] args) { public static void main(String[] args) {
Date[] dates = getStartAndEndDateOfCurrentMonth(); Date[] dates = getStartAndEndDateOfCurrentMonth();
System.out.println("Start date of this month: " + dates[0]); System.out.println("Start date of this month: " + dates[0]);
......
package com.ruzhoukj.sms.util; package com.ruzhoukj.sms.util;
import com.ruzhoukj.sms.entity.ProjectEntity;
import com.ruzhoukj.sms.entity.SSLEntity; import com.ruzhoukj.sms.entity.SSLEntity;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
...@@ -118,6 +119,55 @@ public class EmailUtil { ...@@ -118,6 +119,55 @@ public class EmailUtil {
Transport.send(message); Transport.send(message);
log.info("Email sent successfully");
} catch (MessagingException e) {
throw new RuntimeException(e);
}
}
public static void contractReminder(String name, String email, ProjectEntity projectEntity) {
final String username = "2404263178@qq.com";
final String password = "eryzvsveckiudiee";
// QQ Mail SMTP server information
Properties props = new Properties();
props.put("mail.smtp.auth", "true");
props.put("mail.smtp.starttls.enable", "true");
props.put("mail.smtp.host", "smtp.qq.com");
props.put("mail.smtp.port", "587");
Session session = Session.getInstance(props,
new javax.mail.Authenticator() {
@Override
protected javax.mail.PasswordAuthentication getPasswordAuthentication() {
return new javax.mail.PasswordAuthentication(username, password);
}
});
try {
Message message = new MimeMessage(session);
message.setSubject("项目到期提醒");
message.setFrom(new InternetAddress(username));
// 添加多个收件人
String[] toAddresses = {email};
message.setRecipients(Message.RecipientType.TO,
InternetAddress.parse(String.join(", ", toAddresses)));
StringJoiner stringJoiner = new StringJoiner("\n");
stringJoiner.add(name + "您好,以下项目即将在七天内到期");
stringJoiner.add("项目名:" + projectEntity.getProjectName());
stringJoiner.add("项目开始时间:" + DateUtils.formatDate(projectEntity.getStartTime()));
stringJoiner.add("项目结束时间:" + DateUtils.formatDate(projectEntity.getEndTime()));
stringJoiner.add("备注:" + projectEntity.getDescribe());
stringJoiner.add("请及时处理");
message.setText(stringJoiner.toString());
Transport.send(message);
log.info("Email sent successfully"); log.info("Email sent successfully");
} catch (MessagingException e) { } catch (MessagingException e) {
......
...@@ -27,6 +27,17 @@ ...@@ -27,6 +27,17 @@
WHERE WHERE
id = #{id} id = #{id}
</select> </select>
<select id="selectSevenDaysProject" resultType="com.ruzhoukj.sms.entity.ProjectEntity">
SELECT id,
project_leader as projectLeader,
start_time as startTime,
end_time as endTime,
`describe`,
project_name as projectName
FROM project
WHERE end_time >= DATE_SUB(CURDATE(), INTERVAL 7 DAY)
and CURDATE() <![CDATA[ <= ]]> end_time
</select>
<insert id="insertProject"> <insert id="insertProject">
INSERT INTO project (project_leader, start_time, end_time, `describe`, project_name) INSERT INTO project (project_leader, start_time, end_time, `describe`, project_name)
......
...@@ -24,4 +24,13 @@ ...@@ -24,4 +24,13 @@
WHERE name = #{name} WHERE name = #{name}
AND password = #{password} AND password = #{password}
</select> </select>
<select id="getUserByLeader" resultType="com.ruzhoukj.sms.entity.UserEntity">
select
name,
email
from
user
where
id = #{projectLeader}
</select>
</mapper> </mapper>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment