From 0d697973f5bbc7c00a19d9d92beb4bea460e0006 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Wed, 11 Mar 2026 15:20:39 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/service/impl/SysBaseApiImpl.java | 78 +++++++++---------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java index f8dbbbb..a354148 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java @@ -2074,47 +2074,47 @@ public class SysBaseApiImpl implements ISysBaseAPI { rabbitMQUtil.sendToExchange("hldy.org", dataSourceCode + ".orgapply.upuseremployeesid", mqDto); //登录会去nu_biz_employees_advisory_info中查询数据 获取登录的机构 所以这里也要插入数据 - EmployeesAdvisoryInfoEntity employeesAdvisoryInfoEntity = new EmployeesAdvisoryInfoEntity(); - employeesAdvisoryInfoEntity.setId(userId); - employeesAdvisoryInfoEntity.setOpenId(orgInfo.getOpenId()); - employeesAdvisoryInfoEntity.setTel(orgInfo.getTel()); - employeesAdvisoryInfoEntity.setIzEntry("Y"); - employeesAdvisoryInfoEntity.setName(orgInfo.getName()); - employeesAdvisoryInfoEntity.setSex(orgInfo.getSex()); - employeesAdvisoryInfoEntity.setNational(orgInfo.getNational()); - employeesAdvisoryInfoEntity.setBirthDate(orgInfo.getBirthDate()); - employeesAdvisoryInfoEntity.setIdCardAddress(orgInfo.getIdCardAddress()); - employeesAdvisoryInfoEntity.setIdCard(orgInfo.getIdCard()); - employeesAdvisoryInfoEntity.setIssuingAuthority(orgInfo.getIssuingAuthority()); - employeesAdvisoryInfoEntity.setStartTime(orgInfo.getStartTime()); - employeesAdvisoryInfoEntity.setEndTime(orgInfo.getEndTime()); - employeesAdvisoryInfoEntity.setCardZmPath(orgInfo.getCardZmPath()); - employeesAdvisoryInfoEntity.setCardFmPath(orgInfo.getCardFmPath()); - employeesAdvisoryInfoEntity.setLastLoginOrg(dataSourceCode); - employeesAdvisoryInfoEntity.setIzInit("Y"); - employeesAdvisioryInfoApi.insert(employeesAdvisoryInfoEntity); +// EmployeesAdvisoryInfoEntity employeesAdvisoryInfoEntity = new EmployeesAdvisoryInfoEntity(); +// employeesAdvisoryInfoEntity.setId(userId); +// employeesAdvisoryInfoEntity.setOpenId(orgInfo.getOpenId()); +// employeesAdvisoryInfoEntity.setTel(orgInfo.getTel()); +// employeesAdvisoryInfoEntity.setIzEntry("Y"); +// employeesAdvisoryInfoEntity.setName(orgInfo.getName()); +// employeesAdvisoryInfoEntity.setSex(orgInfo.getSex()); +// employeesAdvisoryInfoEntity.setNational(orgInfo.getNational()); +// employeesAdvisoryInfoEntity.setBirthDate(orgInfo.getBirthDate()); +// employeesAdvisoryInfoEntity.setIdCardAddress(orgInfo.getIdCardAddress()); +// employeesAdvisoryInfoEntity.setIdCard(orgInfo.getIdCard()); +// employeesAdvisoryInfoEntity.setIssuingAuthority(orgInfo.getIssuingAuthority()); +// employeesAdvisoryInfoEntity.setStartTime(orgInfo.getStartTime()); +// employeesAdvisoryInfoEntity.setEndTime(orgInfo.getEndTime()); +// employeesAdvisoryInfoEntity.setCardZmPath(orgInfo.getCardZmPath()); +// employeesAdvisoryInfoEntity.setCardFmPath(orgInfo.getCardFmPath()); +// employeesAdvisoryInfoEntity.setLastLoginOrg(dataSourceCode); +// employeesAdvisoryInfoEntity.setIzInit("Y"); +// employeesAdvisioryInfoApi.insert(employeesAdvisoryInfoEntity); //登录还会去nu_biz_employees_org中查询数据 获取机构信息 所以这里也要插入数据 - EmployeesOrgApiEntity empOrgdata = new EmployeesOrgApiEntity(); - empOrgdata.setEmployeesId(userId); - empOrgdata.setOrgCode(dataSourceCode); - empOrgdata.setIzOnline("N"); - empOrgdata.setIzFreeze("N"); - empOrgdata.setStatus("2"); - empOrgdata.setOpenId(orgInfo.getOpenId()); - empOrgdata.setTel(orgInfo.getTel()); - empOrgdata.setName(orgInfo.getName()); - empOrgdata.setSex(orgInfo.getSex()); - empOrgdata.setNational(orgInfo.getNational()); - empOrgdata.setBirthDate(orgInfo.getBirthDate()); - empOrgdata.setIdCardAddress(orgInfo.getIdCardAddress()); - empOrgdata.setIdCard(orgInfo.getIdCard()); - empOrgdata.setIssuingAuthority(orgInfo.getIssuingAuthority()); - empOrgdata.setStartTime(orgInfo.getStartTime()); - empOrgdata.setEndTime(orgInfo.getEndTime()); - empOrgdata.setCardZmPath(orgInfo.getCardZmPath()); - empOrgdata.setCardFmPath(orgInfo.getCardFmPath()); - employeesOrgLocalApi.insert(empOrgdata); +// EmployeesOrgApiEntity empOrgdata = new EmployeesOrgApiEntity(); +// empOrgdata.setEmployeesId(userId); +// empOrgdata.setOrgCode(dataSourceCode); +// empOrgdata.setIzOnline("N"); +// empOrgdata.setIzFreeze("N"); +// empOrgdata.setStatus("2"); +// empOrgdata.setOpenId(orgInfo.getOpenId()); +// empOrgdata.setTel(orgInfo.getTel()); +// empOrgdata.setName(orgInfo.getName()); +// empOrgdata.setSex(orgInfo.getSex()); +// empOrgdata.setNational(orgInfo.getNational()); +// empOrgdata.setBirthDate(orgInfo.getBirthDate()); +// empOrgdata.setIdCardAddress(orgInfo.getIdCardAddress()); +// empOrgdata.setIdCard(orgInfo.getIdCard()); +// empOrgdata.setIssuingAuthority(orgInfo.getIssuingAuthority()); +// empOrgdata.setStartTime(orgInfo.getStartTime()); +// empOrgdata.setEndTime(orgInfo.getEndTime()); +// empOrgdata.setCardZmPath(orgInfo.getCardZmPath()); +// empOrgdata.setCardFmPath(orgInfo.getCardFmPath()); +// employeesOrgLocalApi.insert(empOrgdata); } From 0ed386d1ad2fd16eedf673e240e479b57d2795df Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Thu, 12 Mar 2026 10:38:52 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9C=BA=E6=9E=84?= =?UTF-8?q?=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jeecg/modules/system/service/impl/SysBaseApiImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java index a354148..a825278 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java @@ -2031,6 +2031,7 @@ public class SysBaseApiImpl implements ISysBaseAPI { user.setRealname((String) map.get("realName")); user.setWorkNo(depart.getOrgCode() + random); user.setPassword(password); + user.setOrgCode(depart.getOrgCode()); user.setCreateTime(new Date());//设置创建时间 String salt = oConvertUtils.randomGen(8); user.setSalt(salt); From d68f7c49f944de0192bc099729117e717c45852e Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Thu, 12 Mar 2026 14:45:34 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E7=9F=AD?= =?UTF-8?q?=E4=BF=A1=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nu/mq/workorder/listener/WorkOrderMQListener.java | 10 +++++----- .../org/jeecg/common/constant/enums/DySmsEnum.java | 2 +- .../src/main/resources/application-dev.yml | 6 ++++-- .../src/main/resources/application-uat.yml | 6 ++++-- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/workorder/listener/WorkOrderMQListener.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/workorder/listener/WorkOrderMQListener.java index 92fcaa8..f1513aa 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/workorder/listener/WorkOrderMQListener.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/workorder/listener/WorkOrderMQListener.java @@ -153,11 +153,11 @@ public class WorkOrderMQListener { try { JSONObject jsonObject = new JSONObject(); - jsonObject.put("code", "SMS_319245237"); - jsonObject.put("name", workOrderMQDto.getFrontPath()); - jsonObject.put("username", workOrderMQDto.getAccountNo()); - jsonObject.put("password", workOrderMQDto.getPasswordText()); - Map smsResult = DySmsHelper.sendSmsReturnMsg(workOrderMQDto.getAccountNo(), jsonObject, DySmsEnum.JIGOURUZHU_DAJIANWANCHENG); + jsonObject.put("code", "SMS_501816065"); +// jsonObject.put("name", workOrderMQDto.getFrontPath()); +// jsonObject.put("username", workOrderMQDto.getAccountNo()); +// jsonObject.put("password", workOrderMQDto.getPasswordText()); + Map smsResult = DySmsHelper.sendSmsReturnMsg(workOrderMQDto.getOrgTel(), jsonObject, DySmsEnum.JIGOURUZHU_DAJIANWANCHENG); if (!"success".equals(smsResult.get("code"))) { //运维级别错误，需要人工处理 try { diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/common/constant/enums/DySmsEnum.java b/nursing-unit-base-core/src/main/java/org/jeecg/common/constant/enums/DySmsEnum.java index 34c21dc..3011a4a 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/common/constant/enums/DySmsEnum.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/common/constant/enums/DySmsEnum.java @@ -19,7 +19,7 @@ public enum DySmsEnum { /** * 机构入驻-平台搭建完成 */ - JIGOURUZHU_DAJIANWANCHENG("SMS_501601033","护理单元-机构平台搭建完成","name,username,password"); + JIGOURUZHU_DAJIANWANCHENG("SMS_501816065","护理单元-机构平台搭建完成","code"); /** * 短信模板编码 diff --git a/nursing-unit-system/nu-system-start/src/main/resources/application-dev.yml b/nursing-unit-system/nu-system-start/src/main/resources/application-dev.yml index 427a0ad..fa61da3 100644 --- a/nursing-unit-system/nu-system-start/src/main/resources/application-dev.yml +++ b/nursing-unit-system/nu-system-start/src/main/resources/application-dev.yml @@ -261,8 +261,8 @@ jeecg: excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/bigscreen/category/**,/bigscreen/visual/**,/bigscreen/map/**,/jmreport/bigscreen2/** #阿里云oss存储和大鱼短信秘钥配置 oss: - accessKey: LTAI5tB9WHDf3BZsTcQ64Knc - secretKey: QWwOazCWWZxV7ovqgGGfSCpQcUevUZ + accessKey: LTAI5tRoJN41bMeAhc1fcXZW + secretKey: or2CdiXsemhMsQV0OgEX1U2pLZmhpK endpoint: oss-cn-beijing.aliyuncs.com bucketName: jeecgdev # 短信模板 @@ -277,6 +277,8 @@ jeecg: SMS_465391221: # 注册账号短信模板编码 SMS_175430166: SMS_319245237 + # 机构加盟审核通过通知 + SMS_501816065: SMS_501816065 # 在线预览文件服务器地址配置 file-view-domain: http://fileview.jeecg.com # minio文件上传 diff --git a/nursing-unit-system/nu-system-start/src/main/resources/application-uat.yml b/nursing-unit-system/nu-system-start/src/main/resources/application-uat.yml index f177b28..401abd2 100644 --- a/nursing-unit-system/nu-system-start/src/main/resources/application-uat.yml +++ b/nursing-unit-system/nu-system-start/src/main/resources/application-uat.yml @@ -260,8 +260,8 @@ jeecg: excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/bigscreen/category/**,/bigscreen/visual/**,/bigscreen/map/**,/jmreport/bigscreen2/** #阿里云oss存储和大鱼短信秘钥配置 oss: - accessKey: LTAI5t6NYUi1s3AyFmEAp6xe - secretKey: 5CH5Ut8vKw5HhgnHyN5GxEKGfysWAL + accessKey: LTAI5tRoJN41bMeAhc1fcXZW + secretKey: or2CdiXsemhMsQV0OgEX1U2pLZmhpK endpoint: oss-cn-beijing.aliyuncs.com bucketName: jeecgdev # 短信模板 @@ -276,6 +276,8 @@ jeecg: SMS_465391221: # 注册账号短信模板编码 SMS_175430166: SMS_319245237 + # 机构加盟审核通过通知 + SMS_501816065: SMS_501816065 # 在线预览文件服务器地址配置 file-view-domain: http://fileview.jeecg.com # minio文件上传 From 1985e9380009e83dfb30422afcd375369c47da4d Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Thu, 12 Mar 2026 15:55:27 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jeecg/modules/system/service/impl/SysBaseApiImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java index a825278..f0b4757 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java @@ -2060,7 +2060,7 @@ public class SysBaseApiImpl implements ISysBaseAPI { mqDto.setId(userId); //员工表数据身份证上的信息取机构申请时上传的身份证信息 { - mqDto.setName(orgInfo.getName());//姓名 + mqDto.setName(user.getUsername());//姓名 mqDto.setSex(orgInfo.getSex());//性别 mqDto.setNational(orgInfo.getNational());//民族 mqDto.setIdCard(orgInfo.getIdCard());//身份证号