yangjun
/
hldy_java_monomer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、调整微信通知 

2、解决加盟机构信息不显示机构地址问题
This commit is contained in:
1378012178@qq.com 2025-10-14 11:16:06 +08:00
parent 70c720b889
commit 257db6a837
9 changed files with 252 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/wxnotice/IWxNoticeApi.java
View File

@ -1,18 +1,29 @@
package com.nu.modules.wxnotice; package com.nu.modules.wxnotice;
import com.nu.entity.NuWxNoticeEntity;
import com.nu.entity.WxNoticeEntity; import com.nu.entity.WxNoticeEntity;
import java.util.List; import java.util.List;
public interface IWxNoticeApi { public interface IWxNoticeApi {
void addNotice(WxNoticeEntity dto); void addNotice(NuWxNoticeEntity dto);
List<WxNoticeEntity> query(int pageNo, int pageSize, String openId, String clientType); List<NuWxNoticeEntity> query(int pageNo, int pageSize, String openId, String clientType);
int unreadCount(String openId, String clientType); int unreadCount(String openId, String clientType);
void upRead(WxNoticeEntity dto); void upRead(NuWxNoticeEntity dto);
void sendWechartMinMessage(WxNoticeEntity wxNoticeEntity); /**
* 用户邀约通知模板
*
*/
void sendWechartMessage_YAOYUE(WxNoticeEntity wxNotice, NuWxNoticeEntity nuWxNotice);
/**
* 审核通知模板
*
*/
void sendWechartMessage_SHENHE(WxNoticeEntity wxNotice, NuWxNoticeEntity nuWxNotice);
} }

4
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgAllInfo.java
View File

@ -1,6 +1,7 @@
package com.nu.modules.orgapplyinfo.entity; package com.nu.modules.orgapplyinfo.entity;
import lombok.Data; import lombok.Data;
import org.jeecg.common.aspect.annotation.Dict;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
@ -162,10 +163,13 @@ public class OrgAllInfo implements Serializable {
/**机构建筑面积*/ /**机构建筑面积*/
private Double orgBuildingArea; private Double orgBuildingArea;
/**机构省份 sys_category.id*/ /**机构省份 sys_category.id*/
@Dict(dictTable = "sys_category",dicCode = "id",dicText = "name")
private String orgProvince; private String orgProvince;
/**机构城市 sys_category.id*/ /**机构城市 sys_category.id*/
@Dict(dictTable = "sys_category",dicCode = "id",dicText = "name")
private String orgCity; private String orgCity;
/**机构区域 sys_category.id*/ /**机构区域 sys_category.id*/
@Dict(dictTable = "sys_category",dicCode = "id",dicText = "name")
private String orgDistrict; private String orgDistrict;
/**合同附件*/ /**合同附件*/
private String contract; private String contract;

73
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/wxnotice/service/impl/WxNoticeServiceImpl.java
View File

@ -4,9 +4,9 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.json.JSONObject; import cn.hutool.json.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nu.entity.NuWxNoticeEntity;
import com.nu.entity.WxNoticeEntity; import com.nu.entity.WxNoticeEntity;
import com.nu.modules.weixin.utils.TemplateMessageSender; import com.nu.modules.weixin.utils.TemplateMessageSender;
import com.nu.modules.weixin.utils.WechatMiniProgramUtils; import com.nu.modules.weixin.utils.WechatMiniProgramUtils;
@ -15,7 +15,6 @@ import com.nu.modules.wxnotice.entity.WxNotice;
import com.nu.modules.wxnotice.mapper.WxNoticeMapper; import com.nu.modules.wxnotice.mapper.WxNoticeMapper;
import com.nu.modules.wxnotice.service.IWxNoticeService; import com.nu.modules.wxnotice.service.IWxNoticeService;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.api.ISysBaseAPI; import org.jeecg.common.system.api.ISysBaseAPI;
import org.jeecg.common.util.DateUtils; import org.jeecg.common.util.DateUtils;
@ -42,15 +41,16 @@ public class WxNoticeServiceImpl extends ServiceImpl<WxNoticeMapper, WxNotice> i
@Autowired @Autowired
private ISysBaseAPI sysBaseAPI; private ISysBaseAPI sysBaseAPI;
@Override @Override
public void addNotice(WxNoticeEntity dto) { public void addNotice(NuWxNoticeEntity dto) {
WxNotice wxNotice = new WxNotice(); WxNotice wxNotice = new WxNotice();
BeanUtils.copyProperties(dto, wxNotice); BeanUtils.copyProperties(dto, wxNotice);
baseMapper.insert(wxNotice); baseMapper.insert(wxNotice);
} }
@Override @Override
public List<WxNoticeEntity> query(int pageNo, int pageSize, String openId, String clientType) { public List<NuWxNoticeEntity> query(int pageNo, int pageSize, String openId, String clientType) {
if (StringUtils.isBlank(openId)) { if (StringUtils.isBlank(openId)) {
return List.of(); return List.of();
} }
@ -61,7 +61,7 @@ public class WxNoticeServiceImpl extends ServiceImpl<WxNoticeMapper, WxNotice> i
qw.orderByDesc("iz_read");//未读在前 qw.orderByDesc("iz_read");//未读在前
qw.orderByDesc("create_time");//按照时间倒序 qw.orderByDesc("create_time");//按照时间倒序
List<WxNotice> wxNotices = baseMapper.selectList(page, qw); List<WxNotice> wxNotices = baseMapper.selectList(page, qw);
List<WxNoticeEntity> result = BeanUtil.copyToList(wxNotices, WxNoticeEntity.class); List<NuWxNoticeEntity> result = BeanUtil.copyToList(wxNotices, NuWxNoticeEntity.class);
return result; return result;
} }
@ -77,7 +77,7 @@ public class WxNoticeServiceImpl extends ServiceImpl<WxNoticeMapper, WxNotice> i
} }
@Override @Override
public void upRead(WxNoticeEntity dto) { public void upRead(NuWxNoticeEntity dto) {
UpdateWrapper<WxNotice> uw = new UpdateWrapper<>(); UpdateWrapper<WxNotice> uw = new UpdateWrapper<>();
uw.in("id", dto.getId().split(",")); uw.in("id", dto.getId().split(","));
WxNotice wxNotice = new WxNotice(); WxNotice wxNotice = new WxNotice();
@ -85,40 +85,79 @@ public class WxNoticeServiceImpl extends ServiceImpl<WxNoticeMapper, WxNotice> i
baseMapper.update(wxNotice, uw); baseMapper.update(wxNotice, uw);
} }
/**
* 用户邀约通知
*/
@Override @Override
public void sendWechartMinMessage(WxNoticeEntity wxNoticeEntity) { public void sendWechartMessage_YAOYUE(WxNoticeEntity wxNotice, NuWxNoticeEntity wxNoticeEntity) {
try { try {
// 1. 获取access token // 1. 获取access token
String accessToken = WechatMiniProgramUtils.getAccessToken(); String accessToken = WechatMiniProgramUtils.getAccessToken();
// 2. 准备模板消息数据 // 2. 准备模板消息数据
// String templateId = "CJ6NDNV4mTTyOdYhbksyA_YjDORVemJRmzEVAUZMBis";
String templateId = "yvvhlRft1CAdtU-dWlCW8U63VnTwRU8w3gR0BUdqcWw"; String templateId = "yvvhlRft1CAdtU-dWlCW8U63VnTwRU8w3gR0BUdqcWw";
String page = "pages/yuangongindex/index"; // 点击消息跳转的页面 String page = wxNotice.getPageRoute(); // 点击消息跳转的页面
com.alibaba.fastjson.JSONObject orgInfo = sysBaseAPI.getOrgInfo(wxNoticeEntity.getOrgCode());
String companyName = orgInfo.getString("departName");
String openId = wxNoticeEntity.getOpenId(); String openId = wxNoticeEntity.getOpenId();
Map<String, Object> data = new HashMap<>(); Map<String, Object> data = new HashMap<>();
String tips = "请及时参加邀约哦"; data.put("thing1", wxNotice.getThing1()); // 对应模板中的字段
data.put("thing1", companyName); // 对应模板中的字段 data.put("thing4", wxNotice.getThing4());
data.put("thing4", tips);
data.put("date3", DateUtils.now()); data.put("date3", DateUtils.now());
// 3. 发送模板消息 // 3. 发送模板消息
String resInfo = TemplateMessageSender.sendTemplateMessage(accessToken, openId, templateId, page, data); String resInfo = TemplateMessageSender.sendTemplateMessage(accessToken, openId, templateId, page, data);
if (com.alibaba.cloud.commons.lang.StringUtils.equals(resInfo, "error")) { if (com.alibaba.cloud.commons.lang.StringUtils.equals(resInfo, "error")) {
baseCommonService.addLog("机构邀请员工入驻，发送通知失败-发送消息异常112 " + resInfo, CommonConstant.LOG_TYPE_2, 1); baseCommonService.addLog(wxNotice.getLogMainInfo() + "，发送通知失败-发送消息异常112 " + resInfo, CommonConstant.LOG_TYPE_2, 1);
} }
JSONObject jsonObject = new JSONObject(resInfo); JSONObject jsonObject = new JSONObject(resInfo);
boolean success = jsonObject.getInt("errcode") == 0; boolean success = jsonObject.getInt("errcode") == 0;
if (success) { if (success) {
System.out.println("模板消息发送成功"); System.out.println("模板消息发送成功");
baseCommonService.addLog("机构邀请员工入驻，发送通知成功 ", CommonConstant.LOG_TYPE_2, 1); baseCommonService.addLog(wxNotice.getLogMainInfo() + "，发送通知成功 ", CommonConstant.LOG_TYPE_2, 1);
} else { } else {
baseCommonService.addLog("机构邀请员工入驻，发送通知失败-发送消息异常121 " + resInfo, CommonConstant.LOG_TYPE_2, 1); baseCommonService.addLog(wxNotice.getLogMainInfo() + "，发送通知失败-发送消息异常121 " + resInfo, CommonConstant.LOG_TYPE_2, 1);
System.out.println("模板消息发送失败");
}
} catch (Exception e) {
e.printStackTrace();
}
}
/**
* 审核通知模板
*/
@Override
public void sendWechartMessage_SHENHE(WxNoticeEntity wxNotice, NuWxNoticeEntity wxNoticeEntity) {
try {
// 1. 获取access token
String accessToken = WechatMiniProgramUtils.getAccessToken();
// 2. 准备模板消息数据
String templateId = "cWVzXm1C-iitx1gNFn1nZdijq9R_3fCv8vLbiqs9zww";
String page = wxNotice.getPageRoute(); // 点击消息跳转的页面
String openId = wxNoticeEntity.getOpenId();
Map<String, Object> data = new HashMap<>();
data.put("thing2", wxNotice.getThing2()); // 对应模板中的字段
data.put("phrase1", wxNotice.getPhrase1());
data.put("date3", DateUtils.now());
// 3. 发送模板消息
String resInfo = TemplateMessageSender.sendTemplateMessage(accessToken, openId, templateId, page, data);
if (com.alibaba.cloud.commons.lang.StringUtils.equals(resInfo, "error")) {
baseCommonService.addLog(wxNotice.getLogMainInfo() + "，发送通知失败-发送消息异常112 " + resInfo, CommonConstant.LOG_TYPE_2, 1);
}
JSONObject jsonObject = new JSONObject(resInfo);
boolean success = jsonObject.getInt("errcode") == 0;
if (success) {
System.out.println("模板消息发送成功");
baseCommonService.addLog(wxNotice.getLogMainInfo() + "，发送通知成功 ", CommonConstant.LOG_TYPE_2, 1);
} else {
baseCommonService.addLog(wxNotice.getLogMainInfo() + "，发送通知失败-发送消息异常121 " + resInfo, CommonConstant.LOG_TYPE_2, 1);
System.out.println("模板消息发送失败"); System.out.println("模板消息发送失败");
} }
} catch (Exception e) { } catch (Exception e) {

94
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/employees/listener/EmployeesMQListener.java
View File

@ -8,6 +8,7 @@ import com.google.common.collect.Maps;
import com.nu.dto.EmployeesApplyMQDto; import com.nu.dto.EmployeesApplyMQDto;
import com.nu.dto.EmployeesStatusMQDto; import com.nu.dto.EmployeesStatusMQDto;
import com.nu.dto.SysUserMQDto; import com.nu.dto.SysUserMQDto;
import com.nu.entity.NuWxNoticeEntity;
import com.nu.entity.WxNoticeEntity; import com.nu.entity.WxNoticeEntity;
import com.nu.enums.WxClientType; import com.nu.enums.WxClientType;
import com.nu.modules.employees.entity.EmployeesOrg; import com.nu.modules.employees.entity.EmployeesOrg;
@ -78,39 +79,39 @@ public class EmployeesMQListener {
//审批通过，判断是否需要通知业务系统初始化登录账户。需要初始化则直接通知；不需要初始化则需要从已存在的业务系统中获取账号信息，并将账号信息通知给此审批的业务系统 //审批通过，判断是否需要通知业务系统初始化登录账户。需要初始化则直接通知；不需要初始化则需要从已存在的业务系统中获取账号信息，并将账号信息通知给此审批的业务系统
if ("2".equals(dto.getAuditStatus())) { if ("2".equals(dto.getAuditStatus())) {
NuEmployeesAdvisoryInfo employeesAd = employeesAdvisoryInfoService.getById(dto.getEmployeeId()); NuEmployeesAdvisoryInfo employeesAd = employeesAdvisoryInfoService.getById(dto.getEmployeeId());
if(employeesAd.getIzInit().equals("1")){ if (employeesAd.getIzInit().equals("1")) {
//需要初始化，直接通知审批业务系统进行初始化 //需要初始化，直接通知审批业务系统进行初始化
SysUserMQDto sysUserMQDto = new SysUserMQDto(); SysUserMQDto sysUserMQDto = new SysUserMQDto();
sysUserMQDto.setEmployeeId(dto.getEmployeeId()); sysUserMQDto.setEmployeeId(dto.getEmployeeId());
sysUserMQDto.setIzInit("1"); sysUserMQDto.setIzInit("1");
sysUserMQDto.setIzInitPassword("0");//不需要更新其他业务平台密码 sysUserMQDto.setIzInitPassword("0");//不需要更新其他业务平台密码
rabbitMQUtil.sendToExchange("hldy.employees", dto.getOrgCode() + ".employees.initsysuser", sysUserMQDto); rabbitMQUtil.sendToExchange("hldy.employees", dto.getOrgCode() + ".employees.initsysuser", sysUserMQDto);
}else{ } else {
long diffInMillis = Math.abs((new Date()).getTime() - employeesAd.getLastLoginTime().getTime()); long diffInMillis = Math.abs((new Date()).getTime() - employeesAd.getLastLoginTime().getTime());
// 30天的毫秒数（近似值） // 30天的毫秒数（近似值）
long oneMonthInMillis = 30L * 24 * 60 * 60 * 1000; long oneMonthInMillis = 30L * 24 * 60 * 60 * 1000;
if(diffInMillis > oneMonthInMillis){ if (diffInMillis > oneMonthInMillis) {
//最近登录时间大于30天，也需要初始化 //最近登录时间大于30天，也需要初始化
SysUserMQDto sysUserMQDto = new SysUserMQDto(); SysUserMQDto sysUserMQDto = new SysUserMQDto();
sysUserMQDto.setEmployeeId(dto.getEmployeeId()); sysUserMQDto.setEmployeeId(dto.getEmployeeId());
sysUserMQDto.setIzInit("1"); sysUserMQDto.setIzInit("1");
sysUserMQDto.setIzInitPassword("1");//需要更新其他业务平台密码 sysUserMQDto.setIzInitPassword("1");//需要更新其他业务平台密码
rabbitMQUtil.sendToExchange("hldy.employees", dto.getOrgCode() + ".employees.initsysuser", sysUserMQDto); rabbitMQUtil.sendToExchange("hldy.employees", dto.getOrgCode() + ".employees.initsysuser", sysUserMQDto);
}else{ } else {
UpdateWrapper<EmployeesOrg> uwOrg = new UpdateWrapper<>(); UpdateWrapper<EmployeesOrg> uwOrg = new UpdateWrapper<>();
uwOrg.eq("employees_id", dto.getEmployeeId()); uwOrg.eq("employees_id", dto.getEmployeeId());
uwOrg.eq("iz_freeze", "0");//未冻结 uwOrg.eq("iz_freeze", "0");//未冻结
uwOrg.eq("iz_history", "1");//非历史 uwOrg.eq("iz_history", "1");//非历史
uwOrg.and(c -> c.eq("apply_type","2").or().eq("status","2"));//审批通过 uwOrg.and(c -> c.eq("apply_type", "2").or().eq("status", "2"));//审批通过
uwOrg.eq("org_code", employeesAd.getLastLoginOrg());//机构 uwOrg.eq("org_code", employeesAd.getLastLoginOrg());//机构
EmployeesOrg empOrg = employeesOrgService.getOne(uwOrg); EmployeesOrg empOrg = employeesOrgService.getOne(uwOrg);
if(empOrg!=null){ if (empOrg != null) {
//不需要初始化，发送MQ从原业务系统获取账号信息，MQ收到账号信息后再通知给审批业务系统 //不需要初始化，发送MQ从原业务系统获取账号信息，MQ收到账号信息后再通知给审批业务系统
SysUserMQDto sysUserMQDto = new SysUserMQDto(); SysUserMQDto sysUserMQDto = new SysUserMQDto();
sysUserMQDto.setEmployeeId(dto.getEmployeeId()); sysUserMQDto.setEmployeeId(dto.getEmployeeId());
sysUserMQDto.setTargetOrgCode(dto.getOrgCode()); sysUserMQDto.setTargetOrgCode(dto.getOrgCode());
rabbitMQUtil.sendToExchange("hldy.employees", employeesAd.getLastLoginOrg() + ".employees.sysuser.info", sysUserMQDto); rabbitMQUtil.sendToExchange("hldy.employees", employeesAd.getLastLoginOrg() + ".employees.sysuser.info", sysUserMQDto);
}else{ } else {
//原账号冻结，也需要初始化 //原账号冻结，也需要初始化
SysUserMQDto sysUserMQDto = new SysUserMQDto(); SysUserMQDto sysUserMQDto = new SysUserMQDto();
sysUserMQDto.setEmployeeId(dto.getEmployeeId()); sysUserMQDto.setEmployeeId(dto.getEmployeeId());
@ -153,10 +154,10 @@ public class EmployeesMQListener {
uw.eq("employees_id", dto.getEmployeeId()); uw.eq("employees_id", dto.getEmployeeId());
uw.eq("iz_freeze", "0");//未冻结 uw.eq("iz_freeze", "0");//未冻结
uw.eq("iz_history", "1");//非历史 uw.eq("iz_history", "1");//非历史
uw.and(c -> c.eq("apply_type","2").or().eq("status","2"));//审批通过 uw.and(c -> c.eq("apply_type", "2").or().eq("status", "2"));//审批通过
List<EmployeesOrg> list = employeesOrgService.list(uw); List<EmployeesOrg> list = employeesOrgService.list(uw);
if(list.size()>0){ if (list.size() > 0) {
for(int i=0;i<list.size();i++){ for (int i = 0; i < list.size(); i++) {
EmployeesOrg entity = list.get(i); EmployeesOrg entity = list.get(i);
rabbitMQUtil.sendToExchange("hldy.employees", entity.getOrgCode() + ".employees.sysuser.pwd.sync", dto); rabbitMQUtil.sendToExchange("hldy.employees", entity.getOrgCode() + ".employees.sysuser.pwd.sync", dto);
} }
@ -188,39 +189,39 @@ public class EmployeesMQListener {
key = "hldy.employeesorg.howtoinitsysuser"), errorHandler = "employeesMQErrorHandler") key = "hldy.employeesorg.howtoinitsysuser"), errorHandler = "employeesMQErrorHandler")
public void handleHowToInitSysuser(SysUserMQDto dto) { public void handleHowToInitSysuser(SysUserMQDto dto) {
NuEmployeesAdvisoryInfo employeesAd = employeesAdvisoryInfoService.getById(dto.getEmployeeId()); NuEmployeesAdvisoryInfo employeesAd = employeesAdvisoryInfoService.getById(dto.getEmployeeId());
if(employeesAd.getIzInit().equals("1")){ if (employeesAd.getIzInit().equals("1")) {
//需要初始化，直接通知审批业务系统进行初始化 //需要初始化，直接通知审批业务系统进行初始化
SysUserMQDto sysUserMQDto = new SysUserMQDto(); SysUserMQDto sysUserMQDto = new SysUserMQDto();
sysUserMQDto.setEmployeeId(dto.getEmployeeId()); sysUserMQDto.setEmployeeId(dto.getEmployeeId());
sysUserMQDto.setIzInit("1"); sysUserMQDto.setIzInit("1");
sysUserMQDto.setIzInitPassword("0");//不需要更新其他业务平台密码 sysUserMQDto.setIzInitPassword("0");//不需要更新其他业务平台密码
rabbitMQUtil.sendToExchange("hldy.employees", dto.getOrgCode() + ".employees.initsysuser", sysUserMQDto); rabbitMQUtil.sendToExchange("hldy.employees", dto.getOrgCode() + ".employees.initsysuser", sysUserMQDto);
}else{ } else {
long diffInMillis = Math.abs((new Date()).getTime() - employeesAd.getLastLoginTime().getTime()); long diffInMillis = Math.abs((new Date()).getTime() - employeesAd.getLastLoginTime().getTime());
// 30天的毫秒数（近似值） // 30天的毫秒数（近似值）
long oneMonthInMillis = 30L * 24 * 60 * 60 * 1000; long oneMonthInMillis = 30L * 24 * 60 * 60 * 1000;
if(diffInMillis > oneMonthInMillis){ if (diffInMillis > oneMonthInMillis) {
//最近登录时间大于30天，也需要初始化 //最近登录时间大于30天，也需要初始化
SysUserMQDto sysUserMQDto = new SysUserMQDto(); SysUserMQDto sysUserMQDto = new SysUserMQDto();
sysUserMQDto.setEmployeeId(dto.getEmployeeId()); sysUserMQDto.setEmployeeId(dto.getEmployeeId());
sysUserMQDto.setIzInit("1"); sysUserMQDto.setIzInit("1");
sysUserMQDto.setIzInitPassword("1");//需要更新其他业务平台密码 sysUserMQDto.setIzInitPassword("1");//需要更新其他业务平台密码
rabbitMQUtil.sendToExchange("hldy.employees", dto.getOrgCode() + ".employees.initsysuser", sysUserMQDto); rabbitMQUtil.sendToExchange("hldy.employees", dto.getOrgCode() + ".employees.initsysuser", sysUserMQDto);
}else{ } else {
UpdateWrapper<EmployeesOrg> uwOrg = new UpdateWrapper<>(); UpdateWrapper<EmployeesOrg> uwOrg = new UpdateWrapper<>();
uwOrg.eq("employees_id", dto.getEmployeeId()); uwOrg.eq("employees_id", dto.getEmployeeId());
uwOrg.eq("iz_freeze", "0");//未冻结 uwOrg.eq("iz_freeze", "0");//未冻结
uwOrg.eq("iz_history", "1");//非历史 uwOrg.eq("iz_history", "1");//非历史
uwOrg.and(c -> c.eq("apply_type","2").or().eq("status","2"));//审批通过 uwOrg.and(c -> c.eq("apply_type", "2").or().eq("status", "2"));//审批通过
uwOrg.eq("org_code", employeesAd.getLastLoginOrg());//机构 uwOrg.eq("org_code", employeesAd.getLastLoginOrg());//机构
EmployeesOrg empOrg = employeesOrgService.getOne(uwOrg); EmployeesOrg empOrg = employeesOrgService.getOne(uwOrg);
if(empOrg!=null){ if (empOrg != null) {
//不需要初始化，发送MQ从原业务系统获取账号信息，MQ收到账号信息后再通知给审批业务系统 //不需要初始化，发送MQ从原业务系统获取账号信息，MQ收到账号信息后再通知给审批业务系统
SysUserMQDto sysUserMQDto = new SysUserMQDto(); SysUserMQDto sysUserMQDto = new SysUserMQDto();
sysUserMQDto.setEmployeeId(dto.getEmployeeId()); sysUserMQDto.setEmployeeId(dto.getEmployeeId());
sysUserMQDto.setTargetOrgCode(dto.getOrgCode()); sysUserMQDto.setTargetOrgCode(dto.getOrgCode());
rabbitMQUtil.sendToExchange("hldy.employees", employeesAd.getLastLoginOrg() + ".employees.sysuser.info", sysUserMQDto); rabbitMQUtil.sendToExchange("hldy.employees", employeesAd.getLastLoginOrg() + ".employees.sysuser.info", sysUserMQDto);
}else{ } else {
//原账号冻结，也需要初始化 //原账号冻结，也需要初始化
SysUserMQDto sysUserMQDto = new SysUserMQDto(); SysUserMQDto sysUserMQDto = new SysUserMQDto();
sysUserMQDto.setEmployeeId(dto.getEmployeeId()); sysUserMQDto.setEmployeeId(dto.getEmployeeId());
@ -319,20 +320,25 @@ public class EmployeesMQListener {
//增加机构邀请员工的消息通知 //增加机构邀请员工的消息通知
JSONObject orgInfo = sysBaseAPI.getOrgInfo(dto.getOrgCode()); JSONObject orgInfo = sysBaseAPI.getOrgInfo(dto.getOrgCode());
String departName = orgInfo.getString("departName"); String departName = orgInfo.getString("departName");
WxNoticeEntity wxNoticeEntity = new WxNoticeEntity(); NuWxNoticeEntity nuWxNotice = new NuWxNoticeEntity();
wxNoticeEntity.setOpenId(dto.getOpenId()); nuWxNotice.setOpenId(dto.getOpenId());
wxNoticeEntity.setIzRead("1"); nuWxNotice.setIzRead("1");
wxNoticeEntity.setOrgCode(dto.getOrgCode()); nuWxNotice.setOrgCode(dto.getOrgCode());
wxNoticeEntity.setTitle("邀请加入"); nuWxNotice.setTitle("邀请加入");
wxNoticeEntity.setContent("您好，" + departName + "邀请您加入。"); nuWxNotice.setContent("您好，【" + departName + " 机构】诚挚向您发出入驻邀请，诚盼您的加入。请您前往【入驻机构】页面，完成【接受】或【拒绝】操作，感谢您的关注！");
wxNoticeEntity.setType("emp_org_invited_emp_list"); nuWxNotice.setType("emp_org_invited_emp_list");
Map<String, Object> extend = Maps.newHashMap(); Map<String, Object> extend = Maps.newHashMap();
extend.put("dataId", employeesOrg.getId()); extend.put("dataId", employeesOrg.getId());
wxNoticeEntity.setExtend(JSONObject.toJSONString(extend)); nuWxNotice.setExtend(JSONObject.toJSONString(extend));
wxNoticeEntity.setClientType(WxClientType.EMPLOYEE.getCode()); nuWxNotice.setClientType(WxClientType.EMPLOYEE.getCode());
wxNoticeApi.addNotice(wxNoticeEntity); wxNoticeApi.addNotice(nuWxNotice);
wxNoticeApi.sendWechartMinMessage(wxNoticeEntity); WxNoticeEntity wxNotice = new WxNoticeEntity();
wxNotice.setPageRoute("pages/yuangongindex/index");//跳转员工首页
wxNotice.setThing1(departName);
wxNotice.setThing4("请及时参加邀约哦");
wxNotice.setLogMainInfo("机构邀请员工");
wxNoticeApi.sendWechartMessage_YAOYUE(wxNotice, nuWxNotice);
} }
@ -420,24 +426,32 @@ public class EmployeesMQListener {
} }
//增加机构邀请员工的消息通知 //增加机构邀请员工的消息通知
WxNoticeEntity wxNoticeEntity = new WxNoticeEntity(); NuWxNoticeEntity nuWxNotice = new NuWxNoticeEntity();
wxNoticeEntity.setOpenId(dto.getOpenId()); nuWxNotice.setOpenId(dto.getOpenId());
wxNoticeEntity.setIzRead("1"); nuWxNotice.setIzRead("1");
wxNoticeEntity.setOrgCode(dto.getOrgCode()); nuWxNotice.setOrgCode(dto.getOrgCode());
wxNoticeEntity.setTitle("员工信息变更审批"); nuWxNotice.setTitle("员工信息变更审批");
String modifyResultStr = "";
if ("2".equals(dto.getModifyStatus())) { if ("2".equals(dto.getModifyStatus())) {
wxNoticeEntity.setContent("您好，您提交的员工信息变更申请已通过"); nuWxNotice.setContent("您好，您提交的员工信息变更申请已通过");
modifyResultStr = "审核通过";
} }
if ("3".equals(dto.getModifyStatus())) { if ("3".equals(dto.getModifyStatus())) {
wxNoticeEntity.setContent("您好，您提交的员工信息变更申请未通过"); nuWxNotice.setContent("您好，您提交的员工信息变更申请未通过");
modifyResultStr = "审核未通过";
} }
wxNoticeEntity.setType("emp_info_update_list"); nuWxNotice.setType("emp_info_update_list");
Map<String, Object> extend = Maps.newHashMap(); Map<String, Object> extend = Maps.newHashMap();
extend.put("orgCode", dto.getOrgCode()); extend.put("orgCode", dto.getOrgCode());
extend.put("dataId", dto.getId()); extend.put("dataId", dto.getId());
wxNoticeEntity.setExtend(JSONObject.toJSONString(extend)); nuWxNotice.setExtend(JSONObject.toJSONString(extend));
wxNoticeEntity.setClientType(WxClientType.EMPLOYEE.getCode()); nuWxNotice.setClientType(WxClientType.EMPLOYEE.getCode());
wxNoticeApi.addNotice(wxNoticeEntity); wxNoticeApi.addNotice(nuWxNotice);
wxNoticeApi.sendWechartMinMessage(wxNoticeEntity); WxNoticeEntity wxNotice = new WxNoticeEntity();
wxNotice.setPageRoute("pages/yuangongindex/index");
wxNotice.setThing1("员工信息变更审核");
wxNotice.setThing4(modifyResultStr);
wxNotice.setLogMainInfo("员工信息变更审核");
wxNoticeApi.sendWechartMessage_SHENHE(wxNotice, nuWxNotice);
} }
} }

6
nursing-unit-api/src/main/java/com/nu/modules/wechat/notice/WxNoticeApi.java
View File

@ -1,6 +1,6 @@
package com.nu.modules.wechat.notice; package com.nu.modules.wechat.notice;
import com.nu.entity.WxNoticeEntity; import com.nu.entity.NuWxNoticeEntity;
import com.nu.modules.wxnotice.IWxNoticeApi; import com.nu.modules.wxnotice.IWxNoticeApi;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -39,7 +39,7 @@ public class WxNoticeApi {
@RequestParam(value = "openId") String openId, @RequestParam(value = "openId") String openId,
@RequestParam(value = "clientType") String clientType) { @RequestParam(value = "clientType") String clientType) {
List<WxNoticeEntity> query = wxNoticeApi.query(pageNo, pageSize, openId, clientType); List<NuWxNoticeEntity> query = wxNoticeApi.query(pageNo, pageSize, openId, clientType);
return Result.ok(query); return Result.ok(query);
} }
@ -50,7 +50,7 @@ public class WxNoticeApi {
* @return * @return
*/ */
@PostMapping("/upRead") @PostMapping("/upRead")
public Result<?> upRead(@RequestBody WxNoticeEntity dto) { public Result<?> upRead(@RequestBody NuWxNoticeEntity dto) {
wxNoticeApi.upRead(dto); wxNoticeApi.upRead(dto);
return Result.ok(); return Result.ok();
} }

38
nursing-unit-common/src/main/java/com/nu/entity/NuWxNoticeEntity.java Normal file
View File

@ -0,0 +1,38 @@
package com.nu.entity;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* @Description: 小程序消息通知
* @Author: jeecg-boot
* @Date: 2025-09-11
* @Version: V1.0
*/
@Data
public class NuWxNoticeEntity implements Serializable {
private static final long serialVersionUID = 1L;
/**id*/
private String id;
/**open_id微信openid*/
private String openId;
/**机构编码*/
private String orgCode;
/**通知类型 对应数据字典notice_type 在管理端能看到*/
private String type;
/**标题*/
private String title;
/**日期*/
private Date createTime;
/**内容*/
private String content;
/**是否已读 0已读 1未读*/
private String izRead;
/**扩展json字符串*/
private String extend;
/**1机构端 2员工端 3家属端*/
private String clientType;
}

37
nursing-unit-common/src/main/java/com/nu/entity/WxNoticeEntity.java
View File

@ -6,33 +6,26 @@ import java.io.Serializable;
import java.util.Date; import java.util.Date;
/** /**
* @Description: 小程序消息通知 * @Description: 微信官方通知参数信息
* @Author: jeecg-boot * @Author: jeecg-boot
* @Date: 2025-09-11 * @Date: 2025-09-11
* @Version: V1.0 * @Version: V1.0
*/ */
@Data @Data
public class WxNoticeEntity implements Serializable { public class WxNoticeEntity implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/**id*/ //跳转路由
private String id; private String pageRoute;
/**open_id微信openid*/
private String openId; //用户邀约通知两个
/**机构编码*/ private String thing1;
private String orgCode; private String thing4;
/**通知类型 对应数据字典notice_type 在管理端能看到*/
private String type; //审核通知模板两个
/**标题*/ private String thing2;
private String title; private String phrase1;
/**日期*/
private Date createTime; //日志备注主体信息
/**内容*/ private String logMainInfo;
private String content;
/**是否已读 0已读 1未读*/
private String izRead;
/**扩展json字符串*/
private String extend;
/**1机构端 2员工端 3家属端*/
private String clientType;
} }

109
nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/mq/eldertag/listener/ElderTaggMQListener.java
View File

@ -9,6 +9,7 @@ import com.nu.dto.ElderInfoMQDto;
import com.nu.dto.ElderTagAsyncMQDto; import com.nu.dto.ElderTagAsyncMQDto;
import com.nu.dto.ElderTagTypeMQDto; import com.nu.dto.ElderTagTypeMQDto;
import com.nu.dto.StatusMQDto; import com.nu.dto.StatusMQDto;
import com.nu.entity.NuWxNoticeEntity;
import com.nu.entity.WxNoticeEntity; import com.nu.entity.WxNoticeEntity;
import com.nu.enums.MQStatus; import com.nu.enums.MQStatus;
import com.nu.enums.WxClientType; import com.nu.enums.WxClientType;
@ -115,37 +116,47 @@ public class ElderTaggMQListener {
elderInfoService.updateById(elderInfo); elderInfoService.updateById(elderInfo);
if ("jhr".equals(dto.getModifyType())) { if ("jhr".equals(dto.getModifyType())) {
//增加消息通知 //增加消息通知
WxNoticeEntity wxNoticeEntity = new WxNoticeEntity(); NuWxNoticeEntity nuWxNotice = new NuWxNoticeEntity();
wxNoticeEntity.setOpenId(dto.getGuardianOpenId()); nuWxNotice.setOpenId(dto.getGuardianOpenId());
wxNoticeEntity.setIzRead("1"); nuWxNotice.setIzRead("1");
wxNoticeEntity.setOrgCode(dto.getOrgCode()); nuWxNotice.setOrgCode(dto.getOrgCode());
wxNoticeEntity.setTitle("监护人信息变更审批"); nuWxNotice.setTitle("监护人信息变更审批");
wxNoticeEntity.setContent("您好，您提交的" + dto.getName() + "老人的家属信息变更申请已通过"); nuWxNotice.setContent("您好，您提交的" + dto.getName() + "老人的家属信息变更申请已通过");
wxNoticeEntity.setType("elder_jhr_info_update_list"); nuWxNotice.setType("elder_jhr_info_update_list");
Map<String, Object> extend = Maps.newHashMap(); Map<String, Object> extend = Maps.newHashMap();
extend.put("orgCode", dto.getOrgCode()); extend.put("orgCode", dto.getOrgCode());
extend.put("dataId", dto.getId()); extend.put("dataId", dto.getId());
wxNoticeEntity.setExtend(JSONObject.toJSONString(extend)); nuWxNotice.setExtend(JSONObject.toJSONString(extend));
wxNoticeEntity.setClientType(WxClientType.ELDER.getCode()); nuWxNotice.setClientType(WxClientType.ELDER.getCode());
wxNoticeApi.addNotice(wxNoticeEntity); wxNoticeApi.addNotice(nuWxNotice);
wxNoticeApi.sendWechartMinMessage(wxNoticeEntity); WxNoticeEntity wxNotice = new WxNoticeEntity();
wxNotice.setPageRoute("pages/oldmanindex/index");
wxNotice.setThing1("监护人信息变更审核");
wxNotice.setThing4("审核通过");
wxNotice.setLogMainInfo("监护人信息变更审核");
wxNoticeApi.sendWechartMessage_SHENHE(wxNotice, nuWxNotice);
} }
if ("zz".equals(dto.getModifyType())) { if ("zz".equals(dto.getModifyType())) {
//增加消息通知 //增加消息通知
WxNoticeEntity wxNoticeEntity = new WxNoticeEntity(); NuWxNoticeEntity nuWxNotice = new NuWxNoticeEntity();
wxNoticeEntity.setOpenId(dto.getGuardianOpenId()); nuWxNotice.setOpenId(dto.getGuardianOpenId());
wxNoticeEntity.setIzRead("1"); nuWxNotice.setIzRead("1");
wxNoticeEntity.setOrgCode(dto.getOrgCode()); nuWxNotice.setOrgCode(dto.getOrgCode());
wxNoticeEntity.setTitle("长者信息变更审批"); nuWxNotice.setTitle("长者信息变更审批");
wxNoticeEntity.setContent("您好，您提交的" + dto.getName() + "老人信息变更申请已通过"); nuWxNotice.setContent("您好，您提交的" + dto.getName() + "长者信息变更申请已通过");
wxNoticeEntity.setType("elder_info_update_list"); nuWxNotice.setType("elder_info_update_list");
Map<String, Object> extend = Maps.newHashMap(); Map<String, Object> extend = Maps.newHashMap();
extend.put("orgCode", dto.getOrgCode()); extend.put("orgCode", dto.getOrgCode());
extend.put("dataId", dto.getId()); extend.put("dataId", dto.getId());
wxNoticeEntity.setExtend(JSONObject.toJSONString(extend)); nuWxNotice.setExtend(JSONObject.toJSONString(extend));
wxNoticeEntity.setClientType(WxClientType.ELDER.getCode()); nuWxNotice.setClientType(WxClientType.ELDER.getCode());
wxNoticeApi.addNotice(wxNoticeEntity); wxNoticeApi.addNotice(nuWxNotice);
wxNoticeApi.sendWechartMinMessage(wxNoticeEntity); WxNoticeEntity wxNotice = new WxNoticeEntity();
wxNotice.setPageRoute("pages/oldmanindex/index");
wxNotice.setThing1("长者信息变更审核");
wxNotice.setThing4("审核通过");
wxNotice.setLogMainInfo("长者信息变更审核");
wxNoticeApi.sendWechartMessage_SHENHE(wxNotice, nuWxNotice);
} }
} }
@ -157,20 +168,25 @@ public class ElderTaggMQListener {
elderInfo.setGuardianModifyContent(dto.getGuardianModifyContent());//监护人审批不通过原因 elderInfo.setGuardianModifyContent(dto.getGuardianModifyContent());//监护人审批不通过原因
elderInfoService.updateById(elderInfo); elderInfoService.updateById(elderInfo);
//增加消息通知 //增加消息通知
WxNoticeEntity wxNoticeEntity = new WxNoticeEntity(); NuWxNoticeEntity nuWxNotice = new NuWxNoticeEntity();
wxNoticeEntity.setOpenId(dto.getGuardianOpenId()); nuWxNotice.setOpenId(dto.getGuardianOpenId());
wxNoticeEntity.setIzRead("1"); nuWxNotice.setIzRead("1");
wxNoticeEntity.setOrgCode(dto.getOrgCode()); nuWxNotice.setOrgCode(dto.getOrgCode());
wxNoticeEntity.setTitle("监护人信息变更审批"); nuWxNotice.setTitle("监护人信息变更审批");
wxNoticeEntity.setContent("您好，您提交的" + dto.getName() + "老人的家属信息变更申请未通过"); nuWxNotice.setContent("您好，您提交的" + dto.getName() + "老人的家属信息变更申请未通过");
wxNoticeEntity.setType("elder_jhr_info_update_list"); nuWxNotice.setType("elder_jhr_info_update_list");
Map<String, Object> extend = Maps.newHashMap(); Map<String, Object> extend = Maps.newHashMap();
extend.put("orgCode", dto.getOrgCode()); extend.put("orgCode", dto.getOrgCode());
extend.put("dataId", dto.getId()); extend.put("dataId", dto.getId());
wxNoticeEntity.setExtend(JSONObject.toJSONString(extend)); nuWxNotice.setExtend(JSONObject.toJSONString(extend));
wxNoticeEntity.setClientType(WxClientType.ELDER.getCode()); nuWxNotice.setClientType(WxClientType.ELDER.getCode());
wxNoticeApi.addNotice(wxNoticeEntity); wxNoticeApi.addNotice(nuWxNotice);
wxNoticeApi.sendWechartMinMessage(wxNoticeEntity); WxNoticeEntity wxNotice = new WxNoticeEntity();
wxNotice.setPageRoute("pages/oldmanindex/index");
wxNotice.setThing1("监护人信息变更审核");
wxNotice.setThing4("审核未通过");
wxNotice.setLogMainInfo("监护人信息变更审核");
wxNoticeApi.sendWechartMessage_SHENHE(wxNotice, nuWxNotice);
} }
if ("zz".equals(dto.getModifyType())) { if ("zz".equals(dto.getModifyType())) {
ElderInfo elderInfo = new ElderInfo(); ElderInfo elderInfo = new ElderInfo();
@ -179,20 +195,25 @@ public class ElderTaggMQListener {
elderInfo.setElderModifyContent(dto.getElderModifyContent());//长者审批不通过原因 elderInfo.setElderModifyContent(dto.getElderModifyContent());//长者审批不通过原因
elderInfoService.updateById(elderInfo); elderInfoService.updateById(elderInfo);
//增加消息通知 //增加消息通知
WxNoticeEntity wxNoticeEntity = new WxNoticeEntity(); NuWxNoticeEntity nuWxNotice = new NuWxNoticeEntity();
wxNoticeEntity.setOpenId(dto.getGuardianOpenId()); nuWxNotice.setOpenId(dto.getGuardianOpenId());
wxNoticeEntity.setIzRead("1"); nuWxNotice.setIzRead("1");
wxNoticeEntity.setOrgCode(dto.getOrgCode()); nuWxNotice.setOrgCode(dto.getOrgCode());
wxNoticeEntity.setTitle("长者信息变更审批"); nuWxNotice.setTitle("长者信息变更审批");
wxNoticeEntity.setContent("您好，您提交的" + dto.getName() + "老人信息变更申请未通过"); nuWxNotice.setContent("您好，您提交的" + dto.getName() + "长者信息变更申请未通过");
wxNoticeEntity.setType("elder_info_update_list"); nuWxNotice.setType("elder_info_update_list");
Map<String, Object> extend = Maps.newHashMap(); Map<String, Object> extend = Maps.newHashMap();
extend.put("orgCode", dto.getOrgCode()); extend.put("orgCode", dto.getOrgCode());
extend.put("dataId", dto.getId()); extend.put("dataId", dto.getId());
wxNoticeEntity.setExtend(JSONObject.toJSONString(extend)); nuWxNotice.setExtend(JSONObject.toJSONString(extend));
wxNoticeEntity.setClientType(WxClientType.ELDER.getCode()); nuWxNotice.setClientType(WxClientType.ELDER.getCode());
wxNoticeApi.addNotice(wxNoticeEntity); wxNoticeApi.addNotice(nuWxNotice);
wxNoticeApi.sendWechartMinMessage(wxNoticeEntity); WxNoticeEntity wxNotice = new WxNoticeEntity();
wxNotice.setPageRoute("pages/oldmanindex/index");
wxNotice.setThing1("长者信息变更审核");
wxNotice.setThing4("审核未通过");
wxNotice.setLogMainInfo("长者信息变更审核");
wxNoticeApi.sendWechartMessage_SHENHE(wxNotice, nuWxNotice);
} }
} }
} }

4
nursing-unit-system/nu-system-start/src/main/resources/application-dev.yml
View File

@ -371,8 +371,8 @@ justauth:
aliyun: aliyun:
ocr: ocr:
# 滕 # 滕
accessKeyId: LTAI5tBREjXcTV54bhZu2eXx accessKeyId: LTAI5tJxmaqyXSG1T8Q6PSE9
accessKeySecret: ETmm0DE6kI6FM5B5wpUwxfNapv4Fr8 accessKeySecret: baBJyQOvph6dVugiSnx3tsiEuJeMy3
# 君 # 君
# accessKeyId: LTAI5tJxmaqyXSG1T8Q6PSE9 # accessKeyId: LTAI5tJxmaqyXSG1T8Q6PSE9
# accessKeySecret: baBJyQOvph6dVugiSnx3tsiEuJeMy3 # accessKeySecret: baBJyQOvph6dVugiSnx3tsiEuJeMy3