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

Merge branch 'master' of http://47.115.223.229:8888/yangjun/hldy_java_monomer

This commit is contained in:
1378012178@qq.com 2026-03-12 16:18:20 +08:00
parent 3011ff8ae9 1985e93800
commit e3ade3b438
5 changed files with 55 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/workorder/listener/WorkOrderMQListener.java
View File

@ -153,11 +153,11 @@ public class WorkOrderMQListener {
try { try {
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
jsonObject.put("code", "SMS_319245237"); jsonObject.put("code", "SMS_501816065");
jsonObject.put("name", workOrderMQDto.getFrontPath()); // jsonObject.put("name", workOrderMQDto.getFrontPath());
jsonObject.put("username", workOrderMQDto.getAccountNo()); // jsonObject.put("username", workOrderMQDto.getAccountNo());
jsonObject.put("password", workOrderMQDto.getPasswordText()); // jsonObject.put("password", workOrderMQDto.getPasswordText());
Map<String, Object> smsResult = DySmsHelper.sendSmsReturnMsg(workOrderMQDto.getAccountNo(), jsonObject, DySmsEnum.JIGOURUZHU_DAJIANWANCHENG); Map<String, Object> smsResult = DySmsHelper.sendSmsReturnMsg(workOrderMQDto.getOrgTel(), jsonObject, DySmsEnum.JIGOURUZHU_DAJIANWANCHENG);
if (!"success".equals(smsResult.get("code"))) { if (!"success".equals(smsResult.get("code"))) {
//运维级别错误，需要人工处理 //运维级别错误，需要人工处理
try { try {

2
nursing-unit-base-core/src/main/java/org/jeecg/common/constant/enums/DySmsEnum.java
View File

@ -19,7 +19,7 @@ public enum DySmsEnum {
/** /**
* 机构入驻-平台搭建完成 * 机构入驻-平台搭建完成
*/ */
JIGOURUZHU_DAJIANWANCHENG("SMS_501601033","护理单元-机构平台搭建完成","name,username,password"); JIGOURUZHU_DAJIANWANCHENG("SMS_501816065","护理单元-机构平台搭建完成","code");
/** /**
* 短信模板编码 * 短信模板编码

81
nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java
View File

@ -2031,6 +2031,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
user.setRealname((String) map.get("realName")); user.setRealname((String) map.get("realName"));
user.setWorkNo(depart.getOrgCode() + random); user.setWorkNo(depart.getOrgCode() + random);
user.setPassword(password); user.setPassword(password);
user.setOrgCode(depart.getOrgCode());
user.setCreateTime(new Date());//设置创建时间 user.setCreateTime(new Date());//设置创建时间
String salt = oConvertUtils.randomGen(8); String salt = oConvertUtils.randomGen(8);
user.setSalt(salt); user.setSalt(salt);
@ -2059,7 +2060,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
mqDto.setId(userId); mqDto.setId(userId);
//员工表数据身份证上的信息取机构申请时上传的身份证信息 //员工表数据身份证上的信息取机构申请时上传的身份证信息
{ {
mqDto.setName(orgInfo.getName());//姓名 mqDto.setName(user.getUsername());//姓名
mqDto.setSex(orgInfo.getSex());//性别 mqDto.setSex(orgInfo.getSex());//性别
mqDto.setNational(orgInfo.getNational());//民族 mqDto.setNational(orgInfo.getNational());//民族
mqDto.setIdCard(orgInfo.getIdCard());//身份证号 mqDto.setIdCard(orgInfo.getIdCard());//身份证号
@ -2074,47 +2075,47 @@ public class SysBaseApiImpl implements ISysBaseAPI {
rabbitMQUtil.sendToExchange("hldy.org", dataSourceCode + ".orgapply.upuseremployeesid", mqDto); rabbitMQUtil.sendToExchange("hldy.org", dataSourceCode + ".orgapply.upuseremployeesid", mqDto);
//登录会去nu_biz_employees_advisory_info中查询数据 获取登录的机构 所以这里也要插入数据 //登录会去nu_biz_employees_advisory_info中查询数据 获取登录的机构 所以这里也要插入数据
EmployeesAdvisoryInfoEntity employeesAdvisoryInfoEntity = new EmployeesAdvisoryInfoEntity(); // EmployeesAdvisoryInfoEntity employeesAdvisoryInfoEntity = new EmployeesAdvisoryInfoEntity();
employeesAdvisoryInfoEntity.setId(userId); // employeesAdvisoryInfoEntity.setId(userId);
employeesAdvisoryInfoEntity.setOpenId(orgInfo.getOpenId()); // employeesAdvisoryInfoEntity.setOpenId(orgInfo.getOpenId());
employeesAdvisoryInfoEntity.setTel(orgInfo.getTel()); // employeesAdvisoryInfoEntity.setTel(orgInfo.getTel());
employeesAdvisoryInfoEntity.setIzEntry("Y"); // employeesAdvisoryInfoEntity.setIzEntry("Y");
employeesAdvisoryInfoEntity.setName(orgInfo.getName()); // employeesAdvisoryInfoEntity.setName(orgInfo.getName());
employeesAdvisoryInfoEntity.setSex(orgInfo.getSex()); // employeesAdvisoryInfoEntity.setSex(orgInfo.getSex());
employeesAdvisoryInfoEntity.setNational(orgInfo.getNational()); // employeesAdvisoryInfoEntity.setNational(orgInfo.getNational());
employeesAdvisoryInfoEntity.setBirthDate(orgInfo.getBirthDate()); // employeesAdvisoryInfoEntity.setBirthDate(orgInfo.getBirthDate());
employeesAdvisoryInfoEntity.setIdCardAddress(orgInfo.getIdCardAddress()); // employeesAdvisoryInfoEntity.setIdCardAddress(orgInfo.getIdCardAddress());
employeesAdvisoryInfoEntity.setIdCard(orgInfo.getIdCard()); // employeesAdvisoryInfoEntity.setIdCard(orgInfo.getIdCard());
employeesAdvisoryInfoEntity.setIssuingAuthority(orgInfo.getIssuingAuthority()); // employeesAdvisoryInfoEntity.setIssuingAuthority(orgInfo.getIssuingAuthority());
employeesAdvisoryInfoEntity.setStartTime(orgInfo.getStartTime()); // employeesAdvisoryInfoEntity.setStartTime(orgInfo.getStartTime());
employeesAdvisoryInfoEntity.setEndTime(orgInfo.getEndTime()); // employeesAdvisoryInfoEntity.setEndTime(orgInfo.getEndTime());
employeesAdvisoryInfoEntity.setCardZmPath(orgInfo.getCardZmPath()); // employeesAdvisoryInfoEntity.setCardZmPath(orgInfo.getCardZmPath());
employeesAdvisoryInfoEntity.setCardFmPath(orgInfo.getCardFmPath()); // employeesAdvisoryInfoEntity.setCardFmPath(orgInfo.getCardFmPath());
employeesAdvisoryInfoEntity.setLastLoginOrg(dataSourceCode); // employeesAdvisoryInfoEntity.setLastLoginOrg(dataSourceCode);
employeesAdvisoryInfoEntity.setIzInit("Y"); // employeesAdvisoryInfoEntity.setIzInit("Y");
employeesAdvisioryInfoApi.insert(employeesAdvisoryInfoEntity); // employeesAdvisioryInfoApi.insert(employeesAdvisoryInfoEntity);
//登录还会去nu_biz_employees_org中查询数据 获取机构信息 所以这里也要插入数据 //登录还会去nu_biz_employees_org中查询数据 获取机构信息 所以这里也要插入数据
EmployeesOrgApiEntity empOrgdata = new EmployeesOrgApiEntity(); // EmployeesOrgApiEntity empOrgdata = new EmployeesOrgApiEntity();
empOrgdata.setEmployeesId(userId); // empOrgdata.setEmployeesId(userId);
empOrgdata.setOrgCode(dataSourceCode); // empOrgdata.setOrgCode(dataSourceCode);
empOrgdata.setIzOnline("N"); // empOrgdata.setIzOnline("N");
empOrgdata.setIzFreeze("N"); // empOrgdata.setIzFreeze("N");
empOrgdata.setStatus("2"); // empOrgdata.setStatus("2");
empOrgdata.setOpenId(orgInfo.getOpenId()); // empOrgdata.setOpenId(orgInfo.getOpenId());
empOrgdata.setTel(orgInfo.getTel()); // empOrgdata.setTel(orgInfo.getTel());
empOrgdata.setName(orgInfo.getName()); // empOrgdata.setName(orgInfo.getName());
empOrgdata.setSex(orgInfo.getSex()); // empOrgdata.setSex(orgInfo.getSex());
empOrgdata.setNational(orgInfo.getNational()); // empOrgdata.setNational(orgInfo.getNational());
empOrgdata.setBirthDate(orgInfo.getBirthDate()); // empOrgdata.setBirthDate(orgInfo.getBirthDate());
empOrgdata.setIdCardAddress(orgInfo.getIdCardAddress()); // empOrgdata.setIdCardAddress(orgInfo.getIdCardAddress());
empOrgdata.setIdCard(orgInfo.getIdCard()); // empOrgdata.setIdCard(orgInfo.getIdCard());
empOrgdata.setIssuingAuthority(orgInfo.getIssuingAuthority()); // empOrgdata.setIssuingAuthority(orgInfo.getIssuingAuthority());
empOrgdata.setStartTime(orgInfo.getStartTime()); // empOrgdata.setStartTime(orgInfo.getStartTime());
empOrgdata.setEndTime(orgInfo.getEndTime()); // empOrgdata.setEndTime(orgInfo.getEndTime());
empOrgdata.setCardZmPath(orgInfo.getCardZmPath()); // empOrgdata.setCardZmPath(orgInfo.getCardZmPath());
empOrgdata.setCardFmPath(orgInfo.getCardFmPath()); // empOrgdata.setCardFmPath(orgInfo.getCardFmPath());
employeesOrgLocalApi.insert(empOrgdata); // employeesOrgLocalApi.insert(empOrgdata);
} }

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

@ -261,8 +261,8 @@ jeecg:
excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/bigscreen/category/**,/bigscreen/visual/**,/bigscreen/map/**,/jmreport/bigscreen2/** excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/bigscreen/category/**,/bigscreen/visual/**,/bigscreen/map/**,/jmreport/bigscreen2/**
#阿里云oss存储和大鱼短信秘钥配置 #阿里云oss存储和大鱼短信秘钥配置
oss: oss:
accessKey: LTAI5tB9WHDf3BZsTcQ64Knc accessKey: LTAI5tRoJN41bMeAhc1fcXZW
secretKey: QWwOazCWWZxV7ovqgGGfSCpQcUevUZ secretKey: or2CdiXsemhMsQV0OgEX1U2pLZmhpK
endpoint: oss-cn-beijing.aliyuncs.com endpoint: oss-cn-beijing.aliyuncs.com
bucketName: jeecgdev bucketName: jeecgdev
# 短信模板 # 短信模板
@ -277,6 +277,8 @@ jeecg:
SMS_465391221: SMS_465391221:
# 注册账号短信模板编码 # 注册账号短信模板编码
SMS_175430166: SMS_319245237 SMS_175430166: SMS_319245237
# 机构加盟审核通过通知
SMS_501816065: SMS_501816065
# 在线预览文件服务器地址配置 # 在线预览文件服务器地址配置
file-view-domain: http://fileview.jeecg.com file-view-domain: http://fileview.jeecg.com
# minio文件上传 # minio文件上传

6
nursing-unit-system/nu-system-start/src/main/resources/application-uat.yml
View File

@ -260,8 +260,8 @@ jeecg:
excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/bigscreen/category/**,/bigscreen/visual/**,/bigscreen/map/**,/jmreport/bigscreen2/** excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/bigscreen/category/**,/bigscreen/visual/**,/bigscreen/map/**,/jmreport/bigscreen2/**
#阿里云oss存储和大鱼短信秘钥配置 #阿里云oss存储和大鱼短信秘钥配置
oss: oss:
accessKey: LTAI5t6NYUi1s3AyFmEAp6xe accessKey: LTAI5tRoJN41bMeAhc1fcXZW
secretKey: 5CH5Ut8vKw5HhgnHyN5GxEKGfysWAL secretKey: or2CdiXsemhMsQV0OgEX1U2pLZmhpK
endpoint: oss-cn-beijing.aliyuncs.com endpoint: oss-cn-beijing.aliyuncs.com
bucketName: jeecgdev bucketName: jeecgdev
# 短信模板 # 短信模板
@ -276,6 +276,8 @@ jeecg:
SMS_465391221: SMS_465391221:
# 注册账号短信模板编码 # 注册账号短信模板编码
SMS_175430166: SMS_319245237 SMS_175430166: SMS_319245237
# 机构加盟审核通过通知
SMS_501816065: SMS_501816065
# 在线预览文件服务器地址配置 # 在线预览文件服务器地址配置
file-view-domain: http://fileview.jeecg.com file-view-domain: http://fileview.jeecg.com
# minio文件上传 # minio文件上传