diff --git a/src/main/java/com/budwk/app/sys/controller/SysHomeController.java b/src/main/java/com/budwk/app/sys/controller/SysHomeController.java index 54b1cba..a057ad6 100644 --- a/src/main/java/com/budwk/app/sys/controller/SysHomeController.java +++ b/src/main/java/com/budwk/app/sys/controller/SysHomeController.java @@ -149,8 +149,9 @@ public class SysHomeController { ); List menus = sysUserService.getMenus(SecurityUtil.getUserId()); List allMenuIds = menus.stream().map(Sys_menu::getId).toList(); - //List sysMenus = list.stream().filter(m -> allMenuIds.contains(m.getId())).sorted(Comparator.comparingInt(Sys_menu::getLocation)).toList(); - List sysMenus = list.stream().sorted(Comparator.comparingInt(Sys_menu::getLocation)).toList(); + // 推荐应用必须受当前用户角色菜单权限约束，避免展示无权访问的入口。 + List sysMenus = list.stream().filter(m -> allMenuIds.contains(m.getId())).sorted(Comparator.comparingInt(Sys_menu::getLocation)).toList(); + //List sysMenus = list.stream().sorted(Comparator.comparingInt(Sys_menu::getLocation)).toList(); return Result.success(sysMenus); } @@ -166,8 +167,9 @@ public class SysHomeController { ); List menus = sysUserService.getMenus(SecurityUtil.getUserId()); List allMenuIds = menus.stream().map(Sys_menu::getId).toList(); - //List sysMenus = list.stream().filter(m -> allMenuIds.contains(m.getId())).sorted(Comparator.comparingInt(Sys_menu::getLocation)).toList(); - List sysMenus = list.stream().sorted(Comparator.comparingInt(Sys_menu::getLocation)).toList(); + // 推荐服务必须受当前用户角色菜单权限约束，避免展示无权访问的入口。 + List sysMenus = list.stream().filter(m -> allMenuIds.contains(m.getId())).sorted(Comparator.comparingInt(Sys_menu::getLocation)).toList(); + //List sysMenus = list.stream().sorted(Comparator.comparingInt(Sys_menu::getLocation)).toList(); return Result.success(sysMenus); } diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/blessing/controller/BlessingController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/blessing/controller/BlessingController.java index 226ce67..02f31fb 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/blessing/controller/BlessingController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/blessing/controller/BlessingController.java @@ -1,54 +1,32 @@ package com.budwk.app.zhgh.staffbenefit.blessing.controller; - +import cn.dev33.satoken.annotation.SaCheckLogin; import cn.dev33.satoken.annotation.SaCheckPermission; -import com.alibaba.fastjson.JSON; +import cn.hutool.core.util.StrUtil; import com.budwk.app.base.param.PageForm; import com.budwk.app.base.result.Result; -import com.budwk.app.base.utils.DateUtil; -import com.budwk.app.sys.models.Sys_task; -import com.budwk.app.sys.services.SysTaskService; -import com.budwk.app.task.services.TaskPlatformService; -import com.budwk.app.zhgh.staffbenefit.blessing.models.Blessing; -import com.budwk.app.zhgh.staffbenefit.blessing.models.BlessingUser; -import com.budwk.app.zhgh.staffbenefit.blessing.service.BlessingService; +import com.budwk.app.zhgh.staffbenefit.blessing.models.BlessingBirthdayConfig; +import com.budwk.app.zhgh.staffbenefit.blessing.service.BirthdayBlessingService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.nutz.aop.interceptor.ioc.TransAop; -import org.nutz.dao.Cnd; -import org.nutz.dao.Sqls; -import org.nutz.dao.sql.Sql; -import org.nutz.ioc.aop.Aop; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; -import org.nutz.lang.Strings; -import org.nutz.lang.util.NutMap; import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; -import org.nutz.mvc.annotation.Param; -import org.nutz.trans.Trans; -import org.quartz.CronExpression; - -import java.text.ParseException; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; +import javax.servlet.http.HttpServletResponse; +/** + * 会员生日祝福管理：生日人员查询、手工发送和贺卡配置。 + */ @IocBean -@Ok("json") -@ApiOperation("职工祝福") +@Ok("json:full") +@Api(tags = "会员生日祝福") @At("/platform/blessing/applyList") public class BlessingController { @Inject - private BlessingService blessingService; - - @Inject - private TaskPlatformService taskPlatformService; - - @Inject - private SysTaskService sysTaskService; - + private BirthdayBlessingService birthdayBlessingService; @At("") @Ok("beetl:/platform/zhgh/staffbenefit/blessing/applyList.html") @@ -56,110 +34,62 @@ public class BlessingController { public void index() { } - - @At - @SaCheckPermission("blessing.applyList") - public Result pageData(PageForm pageForm, String blessingName) { - Cnd cnd = Cnd.NEW(); - Sql sql = Sqls.create(""" - SELECT - bl.*, - aus.groupName - FROM - `blessing` bl - LEFT JOIN activity_user_scope aus ON aus.groupId = bl.activityGroupId - $condition - """); - if (Strings.isNotBlank(blessingName)) { - cnd.where().andLike("bl.blessingName", blessingName); - } - cnd.groupBy("aus.groupId"); - sql.setCondition(cnd); - return Result.success(blessingService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql)); + @At("/h5") + @Ok("beetl:/platform/zhghh5/staffbenefit/blessing/index.html") + @SaCheckLogin + public void h5() { } + @At + @ApiOperation("分页查询会员生日人员") + @SaCheckPermission("blessing.applyList") + public Result pageData(PageForm pageForm, String searchKeyword, String unionId, String unitId, String userState, + String personType, String preparedBy, String employmentType, String birthdayStart, String birthdayEnd) { + return Result.success(birthdayBlessingService.pageUsers(pageForm, searchKeyword, unionId, unitId, userState, personType, preparedBy, employmentType, birthdayStart, birthdayEnd)); + } @At - @Aop(TransAop.READ_COMMITTED) + @Ok("void") + @ApiOperation("导出会员生日人员") @SaCheckPermission("blessing.applyList") - public Result doAdd(@Param("Blessing") Blessing blessing) { - blessing.setApplyDate(DateUtil.getDate()); - blessingService.insert(blessing); - if (blessing.getIsSend().equals("1")) { - blessingService.addTask(blessing); + public void exportXlsx(String searchKeyword, String unionId, String unitId, String userState, String personType, + String preparedBy, String employmentType, String birthdayStart, String birthdayEnd, HttpServletResponse response) { + birthdayBlessingService.exportUsers(searchKeyword, unionId, unitId, userState, personType, preparedBy, employmentType, birthdayStart, birthdayEnd, response); + } + + @At + @ApiOperation("按当前筛选条件发送生日祝福") + @SaCheckPermission("blessing.applyList") + public Result sendMsgByQueryUsers(String searchKeyword, String unionId, String unitId, String userState, + String personType, String preparedBy, String employmentType, String birthdayStart, String birthdayEnd, String title, String content) { + if (StrUtil.isBlank(title) || StrUtil.isBlank(content)) { + return Result.error("标题和发送内容不能为空"); } + int count = birthdayBlessingService.sendByQuery(searchKeyword, unionId, unitId, userState, personType, preparedBy, employmentType, birthdayStart, birthdayEnd, title.trim(), content.trim()); + return count == 0 ? Result.error("当前筛选条件下没有可发送的会员") : Result.success("已发送给" + count + "人"); + } + + @At + @ApiOperation("向单个会员发送生日祝福") + @SaCheckPermission("blessing.applyList") + public Result sendMsgByUser(String userId, String title, String content) { + if (StrUtil.isBlank(title) || StrUtil.isBlank(content)) { + return Result.error("标题和发送内容不能为空"); + } + int count = birthdayBlessingService.sendByUserId(userId, title.trim(), content.trim(), false); + return count == 0 ? Result.error("未获取到可发送的会员") : Result.success("发送成功"); + } + + @At + @SaCheckLogin + public Result getConfig() { + return Result.success(birthdayBlessingService.getConfig()); + } + + @At + @SaCheckPermission("blessing.applyList") + public Result saveOrModifyConfig(BlessingBirthdayConfig config) { + birthdayBlessingService.saveConfig(config); return Result.success(); } - - - @At - @Aop(TransAop.READ_COMMITTED) - @SaCheckPermission("blessing.applyList") - public Result doEdit(@Param("Blessing") Blessing blessing) { - if (Strings.isNotBlank(blessing.getBlessingCron()) && !blessing.getBlessingCron().equals("* * * * * ? *")) { - blessing.setApplyDate(DateUtil.getDate()); - blessingService.updateIgnoreNull(blessing); - if (blessing.getIsSend().equals("1")) { - blessingService.editTask(blessing); - } - } - return Result.success(); - } - - @At - @Aop(TransAop.READ_COMMITTED) - @SaCheckPermission("blessing.applyList") - public Result doDelete(String id) { - blessingService.delete(id); - Sys_task sysTask = sysTaskService.fetch(Cnd.where("name", "=", id)); - blessingService.dao().clear(BlessingUser.class, Cnd.where("blessingId", "=", id)); - if (sysTask != null) { - taskPlatformService.delete(sysTask.getId(), sysTask.getId()); - sysTaskService.delete(sysTask.getId()); - } - return Result.success(); - } - - @At - @Aop(TransAop.READ_COMMITTED) - @SaCheckPermission("blessing.applyList") - public Result findOne(String id) { - try { - Blessing blessing = blessingService.fetch(id); - NutMap nutMap = NutMap.WRAP(JSON.parseObject(JSON.toJSONString(blessing))); - List result = new ArrayList<>(); - try { - CronExpression cronExpression = new CronExpression(nutMap.getString("blessingCron")); - Date lastTime = new Date(); - for (int i = 0; i < 5; i++) { - lastTime = cronExpression.getNextValidTimeAfter(lastTime); - if (lastTime != null) { - result.add(DateUtil.formatDateTime(lastTime)); - } else { - String[] newStr = nutMap.getString("blessingCron").split(" "); - String second = (newStr[0].equals("?") || newStr[0].equals("*")) ? "00" : newStr[0]; - String minute = (newStr[1].equals("?") || newStr[1].equals("*")) ? "00" : newStr[1]; - String hour = (newStr[2].equals("?") || newStr[2].equals("*")) ? "00" : newStr[2]; - String day = (newStr[3].equals("?") || newStr[3].equals("*")) ? "00" : newStr[3]; - String month = (newStr[4].equals("?") || newStr[4].equals("*")) ? "00" : newStr[4]; - String s6 = (newStr[5].equals("?") || newStr[5].equals("*")) ? "00" : newStr[5]; - String year = (newStr[6].equals("?") || newStr[6].equals("*")) ? "00" : newStr[6]; - String Time = year + "/" + month + "/" + day + " " + hour + ":" + minute + ":" + second; - result.add(Time); - break; - } - } - } catch (ParseException e) { - e.printStackTrace(); - } - nutMap.setv("blessingDate", result); - return Result.success(nutMap); - } catch (Exception e) { - e.printStackTrace(); - return Result.error(); - } - - } - - } diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/blessing/controller/BlessingUserController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/blessing/controller/BlessingUserController.java index 2d08146..762d669 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/blessing/controller/BlessingUserController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/blessing/controller/BlessingUserController.java @@ -1,73 +1,38 @@ package com.budwk.app.zhgh.staffbenefit.blessing.controller; - import cn.dev33.satoken.annotation.SaCheckPermission; import com.budwk.app.base.param.PageForm; import com.budwk.app.base.result.Result; -import com.budwk.app.zhgh.staffbenefit.blessing.service.BlessingService; -import org.nutz.dao.Cnd; -import org.nutz.dao.Sqls; -import org.nutz.dao.sql.Sql; +import com.budwk.app.zhgh.staffbenefit.blessing.service.BirthdayBlessingService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; -import org.nutz.lang.Strings; import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; +/** + * 会员生日祝福发送日志。 + */ @IocBean @Ok("json:full") +@Api(tags = "会员生日祝福日志") @At("/platform/blessing/userList") public class BlessingUserController { + @Inject + private BirthdayBlessingService birthdayBlessingService; + @At("") @Ok("beetl:/platform/zhgh/staffbenefit/blessing/blessingUser.html") @SaCheckPermission("blessing.user") public void index() { } - @Inject - private BlessingService blessingService; - - @At + @ApiOperation("分页查询生日祝福发送日志") @SaCheckPermission("blessing.user") - public Result pageData(PageForm pageForm, String data, String unionId, String unitId, String personType, String userState, String sex, String blessingName) { - Cnd cnd = Cnd.NEW(); - Sql sql = Sqls.create(""" - SELECT - u.loginname, - u.username, - u.sex, - u.personType, - u.userState, - u.unionname, - u.unitname, - u.birthday, - blu.*, - bl.blessingName - FROM - blessing_user blu - LEFT JOIN blessing bl ON bl.id = blu.blessingId - LEFT JOIN `vw_user` u ON u.id = blu.userId - $condition - """); - if (Strings.isNotBlank(pageForm.getSearchKeyword()) && Strings.isNotBlank(pageForm.getSearchName())) { - cnd.where().andLike(pageForm.getSearchName(), pageForm.getSearchKeyword()); - } - if (Strings.isNotBlank(blessingName)) { - cnd.where().andLike("bl.blessingName", blessingName); - } - cnd.andEX("u.unionid", "=", unionId); - cnd.andEX("u.unitid", "=", unitId); - cnd.andEX("u.personType", "=", personType); - cnd.andEX("u.userState", "=", userState); - cnd.andEX("u.sex", "=", sex); - cnd.andEX("blu.applyDate", "=", data); - cnd.desc("blu.blessingId"); - cnd.desc("blu.applyDate"); - cnd.desc("u.unitid"); - sql.setCondition(cnd); - return Result.success(blessingService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql)); + public Result pageData(PageForm pageForm, String searchKeyword, String unionId, String unitId) { + return Result.success(birthdayBlessingService.pageLogs(pageForm, searchKeyword, unionId, unitId)); } - } diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/blessing/models/BlessingBirthdayConfig.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/blessing/models/BlessingBirthdayConfig.java new file mode 100644 index 0000000..485f4f1 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/blessing/models/BlessingBirthdayConfig.java @@ -0,0 +1,36 @@ +package com.budwk.app.zhgh.staffbenefit.blessing.models; + +import com.budwk.app.base.model.BaseModel; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.nutz.dao.entity.annotation.ColDefine; +import org.nutz.dao.entity.annotation.ColType; +import org.nutz.dao.entity.annotation.Column; +import org.nutz.dao.entity.annotation.Comment; +import org.nutz.dao.entity.annotation.Name; +import org.nutz.dao.entity.annotation.EL; +import org.nutz.dao.entity.annotation.Prev; +import org.nutz.dao.entity.annotation.Table; + +/** + * 生日贺卡配置。 + */ +@Data +@Table("blessing_birthday_config") +@EqualsAndHashCode(callSuper = true) +public class BlessingBirthdayConfig extends BaseModel { + + @Name + @Prev(els = {@EL("uuid()")}) + private String id; + + @Column + @Comment("背景图片地址") + @ColDefine(type = ColType.VARCHAR, width = 500) + private String picUrl; + + @Column + @Comment("生日贺卡图片地址") + @ColDefine(type = ColType.VARCHAR, width = 500) + private String birthdayUrl; +} diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/blessing/models/BlessingBirthdayMsgLog.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/blessing/models/BlessingBirthdayMsgLog.java new file mode 100644 index 0000000..ef456ba --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/blessing/models/BlessingBirthdayMsgLog.java @@ -0,0 +1,62 @@ +package com.budwk.app.zhgh.staffbenefit.blessing.models; + +import com.budwk.app.base.model.BaseModel; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.nutz.dao.entity.annotation.ColDefine; +import org.nutz.dao.entity.annotation.ColType; +import org.nutz.dao.entity.annotation.Column; +import org.nutz.dao.entity.annotation.Comment; +import org.nutz.dao.entity.annotation.Name; +import org.nutz.dao.entity.annotation.EL; +import org.nutz.dao.entity.annotation.Prev; +import org.nutz.dao.entity.annotation.Table; + +/** + * 生日祝福发送日志，每位接收人保存一条记录。 + */ +@Data +@Table("blessing_birthday_msg_log") +@EqualsAndHashCode(callSuper = true) +public class BlessingBirthdayMsgLog extends BaseModel { + + @Name + @Prev(els = {@EL("uuid()")}) + private String id; + + @Column + @ColDefine(type = ColType.VARCHAR, width = 50) + private String pushTime; + + @Column + @ColDefine(type = ColType.VARCHAR, width = 100) + private String msgTitle; + + @Column + @ColDefine(type = ColType.TEXT) + private String msgContent; + + @Column + @ColDefine(type = ColType.VARCHAR, width = 32) + private String receiveBy; + + @Column + @ColDefine(type = ColType.VARCHAR, width = 100) + private String receiveName; + + @Column + @ColDefine(type = ColType.VARCHAR, width = 32) + private String pushBy; + + @Column + @ColDefine(type = ColType.VARCHAR, width = 100) + private String pushByName; + + @Column + @ColDefine(type = ColType.VARCHAR, width = 20) + private String pushType; + + @Column + @ColDefine(type = ColType.VARCHAR, width = 500) + private String link; +} diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/blessing/service/BirthdayBlessingService.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/blessing/service/BirthdayBlessingService.java new file mode 100644 index 0000000..701a0bd --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/blessing/service/BirthdayBlessingService.java @@ -0,0 +1,32 @@ +package com.budwk.app.zhgh.staffbenefit.blessing.service; + +import com.budwk.app.base.page.Pagination; +import com.budwk.app.base.param.PageForm; +import com.budwk.app.zhgh.staffbenefit.blessing.models.BlessingBirthdayConfig; + +import javax.servlet.http.HttpServletResponse; + +/** + * 生日祝福人员查询、消息发送和日志保存服务。 + */ +public interface BirthdayBlessingService { + + Pagination pageUsers(PageForm pageForm, String searchKeyword, String unionId, String unitId, String userState, + String personType, String preparedBy, String employmentType, String birthdayStart, String birthdayEnd); + + void exportUsers(String searchKeyword, String unionId, String unitId, String userState, String personType, + String preparedBy, String employmentType, String birthdayStart, String birthdayEnd, HttpServletResponse response); + + int sendByUserId(String userId, String title, String content, boolean automatic); + + int sendByQuery(String searchKeyword, String unionId, String unitId, String userState, String personType, + String preparedBy, String employmentType, String birthdayStart, String birthdayEnd, String title, String content); + + void executeAutomaticSend(); + + BlessingBirthdayConfig getConfig(); + + void saveConfig(BlessingBirthdayConfig config); + + Pagination pageLogs(PageForm pageForm, String searchKeyword, String unionId, String unitId); +} diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/blessing/service/impl/BirthdayBlessingServiceImpl.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/blessing/service/impl/BirthdayBlessingServiceImpl.java new file mode 100644 index 0000000..bf7a84c --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/blessing/service/impl/BirthdayBlessingServiceImpl.java @@ -0,0 +1,224 @@ +package com.budwk.app.zhgh.staffbenefit.blessing.service.impl; + +import cn.afterturn.easypoi.excel.ExcelExportUtil; +import cn.afterturn.easypoi.excel.entity.ExportParams; +import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; +import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; +import com.budwk.app.base.page.Pagination; +import com.budwk.app.base.param.PageForm; +import com.budwk.app.base.service.impl.BaseServiceImpl; +import com.budwk.app.base.sms.SmsService; +import com.budwk.app.base.utils.CommonDownloadUtil; +import com.budwk.app.sys.models.Sys_user; +import com.budwk.app.web.commons.auth.utils.SecurityUtil; +import com.budwk.app.zhgh.dayofficework.message.strategy.impl.LocalMessageSendStrategy; +import com.budwk.app.zhgh.staffbenefit.blessing.models.BlessingBirthdayConfig; +import com.budwk.app.zhgh.staffbenefit.blessing.models.BlessingBirthdayMsgLog; +import com.budwk.app.zhgh.staffbenefit.blessing.service.BirthdayBlessingService; +import lombok.extern.slf4j.Slf4j; +import org.apache.poi.ss.usermodel.Workbook; +import org.nutz.dao.Cnd; +import org.nutz.dao.Dao; +import org.nutz.dao.Sqls; +import org.nutz.dao.sql.Sql; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.random.R; +import org.nutz.lang.util.NutMap; + +import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; + +/** + * 生日祝福业务实现：统一处理会员生日筛选、多渠道发送和发送审计日志。 + */ +@IocBean(args = {"refer:dao"}) +@Slf4j +public class BirthdayBlessingServiceImpl extends BaseServiceImpl implements BirthdayBlessingService { + + private static final String AUTO_TITLE = "智慧工会生日祝福"; + private static final String AUTO_CONTENT = "校工会祝您：生日快乐！幸福安康！"; + + @Inject + private LocalMessageSendStrategy localMessageSendStrategy; + @Inject + private SmsService smsService; + + public BirthdayBlessingServiceImpl(Dao dao) { + super(dao); + } + + @Override + public Pagination pageUsers(PageForm pageForm, String searchKeyword, String unionId, String unitId, String userState, + String personType, String preparedBy, String employmentType, String birthdayStart, String birthdayEnd) { + return listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), buildUserSql(searchKeyword, unionId, unitId, userState, personType, preparedBy, employmentType, birthdayStart, birthdayEnd, false)); + } + + @Override + public void exportUsers(String searchKeyword, String unionId, String unitId, String userState, String personType, + String preparedBy, String employmentType, String birthdayStart, String birthdayEnd, HttpServletResponse response) { + List users = listMap(buildUserSql(searchKeyword, unionId, unitId, userState, personType, preparedBy, employmentType, birthdayStart, birthdayEnd, false)); + List columns = new ArrayList<>(); + columns.add(new ExcelExportEntity("工号", "loginname", 20)); + columns.add(new ExcelExportEntity("姓名", "username", 20)); + columns.add(new ExcelExportEntity("性别", "sex", 10)); + columns.add(new ExcelExportEntity("联系方式", "mobile", 20)); + columns.add(new ExcelExportEntity("出生日期", "birthday", 20)); + columns.add(new ExcelExportEntity("生日倒计时（天）", "daysUntilBirthday", 20)); + columns.add(new ExcelExportEntity("在职状态", "userState", 20)); + columns.add(new ExcelExportEntity("人员类型", "personType", 20)); + columns.add(new ExcelExportEntity("人员性质", "preparedBy", 20)); + columns.add(new ExcelExportEntity("所属工会", "unionName", 20)); + columns.add(new ExcelExportEntity("所属单位", "unitName", 20)); + ExportParams exportParams = new ExportParams(); + exportParams.setType(ExcelType.XSSF); + try (Workbook workbook = ExcelExportUtil.exportExcel(exportParams, columns, users)) { + CommonDownloadUtil.download("会员生日人员.xlsx", workbook, response); + } catch (Exception e) { + log.error("导出会员生日人员失败", e); + throw new IllegalStateException("导出会员生日人员失败", e); + } + } + + @Override + public int sendByUserId(String userId, String title, String content, boolean automatic) { + if (StrUtil.isBlank(userId)) { + return 0; + } + List users = dao().query(Sys_user.class, Cnd.where(Sys_user::getId, "=", userId) + .and(Sys_user::getMember, "=", true).and("disabled", "=", false)); + return sendToUsers(users, title, content, automatic); + } + + @Override + public int sendByQuery(String searchKeyword, String unionId, String unitId, String userState, String personType, + String preparedBy, String employmentType, String birthdayStart, String birthdayEnd, String title, String content) { + List rows = listMap(buildUserSql(searchKeyword, unionId, unitId, userState, personType, preparedBy, employmentType, birthdayStart, birthdayEnd, false)); + List userIds = rows.stream().map(row -> row.getString("id")).collect(Collectors.toList()); + if (userIds.isEmpty()) { + return 0; + } + List users = dao().query(Sys_user.class, Cnd.where(Sys_user::getId, "in", userIds)); + return sendToUsers(users, title, content, false); + } + + @Override + public void executeAutomaticSend() { + List rows = listMap(buildUserSql(null, null, null, null, null, null, null, null, null, true)); + List userIds = rows.stream().map(row -> row.getString("id")).collect(Collectors.toList()); + if (userIds.isEmpty()) { + log.info("今日没有符合条件的会员生日人员"); + return; + } + List users = dao().query(Sys_user.class, Cnd.where(Sys_user::getId, "in", userIds)); + sendToUsers(users, AUTO_TITLE, AUTO_CONTENT, true); + } + + @Override + public BlessingBirthdayConfig getConfig() { + BlessingBirthdayConfig config = dao().fetch(BlessingBirthdayConfig.class, Cnd.NEW().desc("updatedAt")); + return config == null ? new BlessingBirthdayConfig() : config; + } + + @Override + public void saveConfig(BlessingBirthdayConfig config) { + if (StrUtil.isBlank(config.getId())) { + dao().insert(config); + } else { + dao().updateIgnoreNull(config); + } + } + + @Override + public Pagination pageLogs(PageForm pageForm, String searchKeyword, String unionId, String unitId) { + Sql sql = Sqls.create("SELECT log.*, u.loginname, u.username, u.unitName, u.unionName FROM blessing_birthday_msg_log log LEFT JOIN vw_user u ON u.id = log.receiveBy $condition"); + Cnd cnd = Cnd.NEW(); + if (StrUtil.isNotBlank(searchKeyword)) { + cnd.and(Cnd.exps("u.username", "like", "%" + searchKeyword + "%").or("u.loginname", "like", "%" + searchKeyword + "%")); + } + cnd.andEX("u.unionId", "=", unionId); + cnd.andEX("u.unitId", "=", unitId); + cnd.desc("log.pushTime"); + sql.setCondition(cnd); + return listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); + } + + private Sql buildUserSql(String searchKeyword, String unionId, String unitId, String userState, String personType, + String preparedBy, String employmentType, String birthdayStart, String birthdayEnd, boolean todayOnly) { + Sql sql = Sqls.create("SELECT u.id, u.loginname, u.username, u.sex, u.birthday, u.mobile, u.unitName, u.unionName, u.userState, u.personType, u.preparedBy, DATEDIFF(CASE WHEN DATE_FORMAT(u.birthday, '%m-%d') >= DATE_FORMAT(CURDATE(), '%m-%d') THEN STR_TO_DATE(CONCAT(YEAR(CURDATE()), '-', DATE_FORMAT(u.birthday, '%m-%d')), '%Y-%m-%d') ELSE STR_TO_DATE(CONCAT(YEAR(CURDATE()) + 1, '-', DATE_FORMAT(u.birthday, '%m-%d')), '%Y-%m-%d') END, CURDATE()) AS daysUntilBirthday FROM vw_user u $condition"); + Cnd cnd = Cnd.NEW(); + cnd.and("u.member", "=", 1).and("u.disabled", "=", 0).and("u.birthday", "is not", null); + if (StrUtil.isNotBlank(searchKeyword)) { + cnd.and(Cnd.exps("u.username", "like", "%" + searchKeyword + "%").or("u.loginname", "like", "%" + searchKeyword + "%")); + } + cnd.andEX("u.unionId", "=", unionId); + cnd.andEX("u.unitId", "=", unitId); + cnd.andEX("u.userState", "=", userState); + cnd.andEX("u.personType", "=", personType); + cnd.andEX("u.preparedBy", "=", preparedBy); + cnd.andEX("u.employmentType", "=", employmentType); + cnd.andEX("u.birthday", ">=", birthdayStart); + cnd.andEX("u.birthday", "<=", birthdayEnd); + if (todayOnly) { + cnd.and("MONTH(u.birthday)", "=", "MONTH(CURDATE())").and("DAY(u.birthday)", "=", "DAY(CURDATE())"); + } else { + cnd.asc("daysUntilBirthday"); + } + sql.setCondition(cnd); + return sql; + } + + private int sendToUsers(List users, String title, String content, boolean automatic) { + if (users == null || users.isEmpty()) { + return 0; + } + List userIds = users.stream().map(Sys_user::getId).collect(Collectors.toList()); + localMessageSendStrategy.send(title, content, 2, userIds, null); + if (Boolean.TRUE.equals(com.budwk.app.web.commons.base.Globals.MyConfig.getBoolean("AppSms"))) { + // 生日祝福仅发送文本内容，不附带 PC 或移动端贺卡链接。 + smsService.massSendByUsers(users, title, content, null, null); + // 仅在学校统一消息开启且发送成功后保留发送日志。 + saveLogs(users, title, content, null, automatic); + } + return users.size(); + } + + /** + * 记录每位接收人的发送结果，定时任务和人工操作使用不同推送类型。 + */ + private void saveLogs(List users, String title, String content, String link, boolean automatic) { + String operatorId = "system"; + String operatorName = "系统推送"; + if (!automatic) { + try { + operatorId = SecurityUtil.getUserId(); + operatorName = SecurityUtil.getUserUsername(); + } catch (Exception e) { + log.warn("未获取到手工生日祝福发送人，按系统推送记录", e); + } + } + final String pushBy = operatorId; + final String pushByName = operatorName; + List logs = users.stream().map(user -> { + BlessingBirthdayMsgLog logItem = new BlessingBirthdayMsgLog(); + // fastInsert 不会执行实体的 @Prev 主键生成，批量写入前显式生成日志主键。 + logItem.setId(R.UU32()); + logItem.setPushTime(DateUtil.now()); + logItem.setMsgTitle(title); + logItem.setMsgContent(content); + logItem.setReceiveBy(user.getId()); + logItem.setReceiveName(user.getUsername()); + logItem.setPushBy(pushBy); + logItem.setPushByName(pushByName); + logItem.setPushType(automatic ? "系统推送" : "手动推送"); + logItem.setLink(link); + return logItem; + }).collect(Collectors.toList()); + dao().fastInsert(logs); + } +} diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/blessing/task/BirthdayBlessingTask.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/blessing/task/BirthdayBlessingTask.java new file mode 100644 index 0000000..f1a848e --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/blessing/task/BirthdayBlessingTask.java @@ -0,0 +1,32 @@ +package com.budwk.app.zhgh.staffbenefit.blessing.task; + +import com.budwk.app.web.commons.base.Globals; +import com.budwk.app.zhgh.staffbenefit.blessing.service.BirthdayBlessingService; +import lombok.extern.slf4j.Slf4j; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.quartz.Job; +import org.quartz.JobExecutionContext; + +/** + * 每日生日祝福定时任务，仅发送给当天公历生日的会员。 + */ +@IocBean +@Slf4j +public class BirthdayBlessingTask implements Job { + + @Inject + private BirthdayBlessingService birthdayBlessingService; + + @Override + public void execute(JobExecutionContext context) { + // 系统参数关闭时不发送自动祝福，手工发送不受此开关限制。 + Boolean enabled = Globals.MyConfig.getBoolean("BirthdayBlessingEnabled"); + if (Boolean.FALSE.equals(enabled)) { + log.info("生日祝福开关未开启，跳过定时任务：{}", context.getJobDetail().getKey()); + return; + } + log.info("执行生日祝福定时任务：{}", context.getJobDetail().getKey()); + birthdayBlessingService.executeAutomaticSend(); + } +} diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/blessing/applyList.html b/src/main/resources/views/platform/zhgh/staffbenefit/blessing/applyList.html index 1223ffa..9ef8c7f 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/blessing/applyList.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/blessing/applyList.html @@ -1,398 +1,21 @@ - - - - - - - +
- - - - - - - - - - - - + + + + + + + + + + + 导出 Excel发送通知 + +
取消确定
 +
- - - - + +new Vue({el:"#app",mixins:[initTableMixins],components:{"member-info":MEMBER_INFO},data:function(){return{unions:[],units:[],birthdayRange:[],sendVisible:false,viewVisible:false,sending:false,sendUserId:"",sendUserName:"",sendForm:{title:"",content:""},sendRules:{title:[{required:true,message:"请输入发送标题",trigger:"blur"}],content:[{required:true,message:"请输入发送内容",trigger:"blur"}]}}},methods:{changeUnion:function(){var self=this;this.$set(this.pageForm,"unitId",null);this.$set(this,"units",[]);if(this.pageForm.unionId){this.$businessTool.listUnit(this.pageForm.unionId).then(function(data){self.$set(self,"units",data)})}},changeBirthdayRange:function(){this.$set(this.pageForm,"birthdayStart",this.birthdayRange&&this.birthdayRange.length?this.birthdayRange[0]:null);this.$set(this.pageForm,"birthdayEnd",this.birthdayRange&&this.birthdayRange.length?this.birthdayRange[1]:null)},openView:function(id){var self=this;this.$set(this,"viewVisible",true);this.$nextTick(function(){self.$refs.memberInfoRef.onOpen(id)})},exportXlsx:function(){this.$downLoad("/platform/blessing/applyList/exportXlsx",this.pageForm)},openSend:function(row){this.$set(this,"sendUserId",row?row.id:"");this.$set(this,"sendUserName",row?row.username:"当前筛选范围内的会员");this.$set(this,"sendForm",{title:"智慧工会生日祝福",content:"校工会祝您：生日快乐！幸福安康！"});this.$set(this,"sendVisible",true)},sendMessage:function(){var self=this;this.$refs.sendFormRef.validate(function(valid){if(!valid){return}self.$set(self,"sending",true);var url=self.sendUserId?"/platform/blessing/applyList/sendMsgByUser":"/platform/blessing/applyList/sendMsgByQueryUsers";var data={title:self.sendForm.title,content:self.sendForm.content};if(self.sendUserId){self.$set(data,"userId",self.sendUserId)}else{Object.keys(self.pageForm).forEach(function(key){self.$set(data,key,self.pageForm[key])})}self.$axios.post(url,data).then(function(res){if(res.code===0){self.$message.success(res.msg);self.$set(self,"sendVisible",false)}else{self.$message.error(res.msg)}}).finally(function(){self.$set(self,"sending",false)})})}},created:function(){var self=this;this.$businessTool.listUnion().then(function(data){self.$set(self,"unions",data)});this.pageData()}}) + diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/blessing/blessingUser.html b/src/main/resources/views/platform/zhgh/staffbenefit/blessing/blessingUser.html index fa9051f..77d931b 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/blessing/blessingUser.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/blessing/blessingUser.html @@ -1,208 +1,3 @@ - - - - - - -
- - - -
- - - - - + +
+ diff --git a/src/main/resources/views/platform/zhghh5/staffbenefit/blessing/index.html b/src/main/resources/views/platform/zhghh5/staffbenefit/blessing/index.html new file mode 100644 index 0000000..b22c2ac --- /dev/null +++ b/src/main/resources/views/platform/zhghh5/staffbenefit/blessing/index.html @@ -0,0 +1,5 @@ + +

生日快乐

校工会祝您：生日快乐！幸福安康！

生日贺卡
+ + +