From c1cb6b8a71581fa58f1109e05e685a4dbe6a857f Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Mon, 9 Mar 2026 14:57:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E6=9E=84=E5=8A=A0=E7=9B=9F=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E5=8F=98=E6=9B=B4=EF=BC=9A=E6=9C=BA=E6=9E=84=E5=8A=A0?= =?UTF-8?q?=E7=9B=9F=E5=85=A5=E9=A9=BB=E5=AE=A1=E6=A0=B8-=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=B9=B3=E5=8F=B0=E5=AE=A1=E6=A0=B8=E9=80=9A=E8=BF=87?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E7=AE=A1=E7=90=86=E5=B9=B3=E5=8F=B0=E7=9B=B4?= =?UTF-8?q?=E6=8E=A5=E8=BF=9B=E5=85=A5=E8=BF=90=E7=BB=B4=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E6=90=AD=E5=BB=BA=E7=8E=AF=E8=8A=82=EF=BC=8C=E8=BF=90=E7=BB=B4?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E5=88=86=E4=B8=BA=E5=8A=A0=E7=9B=9F=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=E3=80=81=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE=E3=80=81?= =?UTF-8?q?=E5=8F=8D=E9=A6=88=E4=B8=89=E4=B8=AA=E7=8E=AF=E8=8A=82=EF=BC=8C?= =?UTF-8?q?=E5=85=B6=E4=B8=AD=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE=E7=8E=AF?= =?UTF-8?q?=E8=8A=82=E9=9C=80=E8=A6=81=E5=A1=AB=E5=86=99=E5=90=84=E7=B1=BB?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=85=B6=E4=BD=99=E4=B8=A4=E4=B8=AA?= =?UTF-8?q?=E7=8E=AF=E8=8A=82=E9=83=BD=E6=98=AF=E7=8A=B6=E6=80=81=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=EF=BC=8C=E8=BF=90=E7=BB=B4=E5=B9=B3=E5=8F=B0=E5=8F=8D?= =?UTF-8?q?=E9=A6=88=E5=90=8E=EF=BC=8C=E4=BB=A3=E8=A1=A8=E5=8A=A0=E7=9B=9F?= =?UTF-8?q?=E5=8F=8A=E5=B9=B3=E5=8F=B0=E6=90=AD=E5=BB=BA=E5=AE=8C=E6=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OrgApplyInfoServiceImpl.java | 12 +++- .../listener/WorkOrderMQListener.java | 55 ++++++++++++++++++- .../main/java/com/nu/dto/WorkOrderMQDto.java | 1 + .../jeecg/common/system/api/ISysBaseAPI.java | 5 ++ .../common/system/entity/SysDepartEntity.java | 4 ++ .../modules/system/entity/SysDepart.java | 4 ++ .../system/service/impl/SysBaseApiImpl.java | 17 ++++++ 7 files changed, 95 insertions(+), 3 deletions(-) diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/service/impl/OrgApplyInfoServiceImpl.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/service/impl/OrgApplyInfoServiceImpl.java index 3060d8e..f68dc57 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/service/impl/OrgApplyInfoServiceImpl.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/service/impl/OrgApplyInfoServiceImpl.java @@ -34,6 +34,7 @@ import org.jeecg.common.system.vo.SysDepartModel; import org.jeecg.modules.base.service.BaseCommonService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; @@ -62,6 +63,9 @@ public class OrgApplyInfoServiceImpl extends ServiceImpl map = new HashMap<>(); + Map map = new HashMap<>(); map.put("userName", workOrderMQDto.getAccountNo()); map.put("realName", "管理员"); map.put("orgCode", workOrderMQDto.getId()); @@ -70,12 +70,63 @@ public class WorkOrderMQListener { map.put("password", workOrderMQDto.getPasswordText()); map.put("openId", workOrderMQDto.getOpenId()); map.put("tel", workOrderMQDto.getOrgTel()); - map.put("orgInfo",workOrderMQDto.getOrgInfo()); + map.put("orgInfo", workOrderMQDto.getOrgInfo()); sysBaseAPI.initialization(map); } } + /** + * 运维端-加盟确认 + * + * @param workOrderMQDto + */ + @RabbitListener( + bindings = @QueueBinding( + value = @Queue(name = "nu.workOrder.joinConfirm"), + exchange = @Exchange(name = "nu.workOrder", type = ExchangeTypes.DIRECT), + key = "nu.workOrder.joinConfirm" + ), + errorHandler = "workOrderMQErrorHandler" + ) + public void handleJoinConfirm(WorkOrderMQDto workOrderMQDto) { + SysDepartEntity sysDepartEntity = new SysDepartEntity(); + sysDepartEntity.setId(workOrderMQDto.getOrgId()); + sysBaseAPI.joinConfirm(sysDepartEntity); + } + /** + * 运维端-反馈 + * + * @param workOrderMQDto + */ + @RabbitListener( + bindings = @QueueBinding( + value = @Queue(name = "nu.workOrder.handFk"), + exchange = @Exchange(name = "nu.workOrder", type = ExchangeTypes.DIRECT), + key = "nu.workOrder.handFk" + ), + errorHandler = "workOrderMQErrorHandler" + ) + public void handFk(WorkOrderMQDto workOrderMQDto) { + //修改工单状态 + SysDepartEntity sysDepartEntity = new SysDepartEntity(); + sysDepartEntity.setId(workOrderMQDto.getOrgId()); + sysDepartEntity.setStatus("1");//机构设置为有效 + sysDepartEntity.setOrgStatus("5");//机构搭建状态 - 已完成 + sysDepartEntity.setReplyTime(workOrderMQDto.getReplyTime());//回复时间 - 反馈时间 + sysDepartEntity.setHandleBy(workOrderMQDto.getHandleBy());//反馈人 + sysDepartEntity.setWorkOrderStatus("2");//工单状态 - 已回执 + sysDepartEntity.setWorkOrderId(workOrderMQDto.getId());//工单ID + sysDepartEntity.setOrgCode(workOrderMQDto.getOrgCode());//机构编码 + sysDepartEntity.setNetUrl(workOrderMQDto.getNetUrl());//前台访问地址 + sysDepartEntity.setAccountNo(workOrderMQDto.getAccountNo());//账号 + sysDepartEntity.setPasswordText(workOrderMQDto.getPasswordText());//密码 + sysDepartEntity.setUrl(workOrderMQDto.getUrl());//域名 + sysDepartEntity.setFrontPath(workOrderMQDto.getFrontPath());//前台相对路径 + sysDepartEntity.setContextPath(workOrderMQDto.getContextPath());//后台相对路径 + sysDepartEntity.setMediaUrl(workOrderMQDto.getMediaUrl());//媒体资源路径 + sysBaseAPI.updateById(sysDepartEntity); + } } diff --git a/nursing-unit-common/src/main/java/com/nu/dto/WorkOrderMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/WorkOrderMQDto.java index 580d555..6760088 100644 --- a/nursing-unit-common/src/main/java/com/nu/dto/WorkOrderMQDto.java +++ b/nursing-unit-common/src/main/java/com/nu/dto/WorkOrderMQDto.java @@ -58,6 +58,7 @@ public class WorkOrderMQDto implements Serializable { private java.lang.String passwordText; private java.lang.String url; private java.lang.String mediaUrl; + private String frontPath; private java.lang.String contextPath; private java.lang.String openId; private java.lang.String orgTel; diff --git a/nursing-unit-system/nu-system-api/nu-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java b/nursing-unit-system/nu-system-api/nu-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java index e070bef..aacea6c 100644 --- a/nursing-unit-system/nu-system-api/nu-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java +++ b/nursing-unit-system/nu-system-api/nu-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java @@ -648,4 +648,9 @@ public interface ISysBaseAPI extends CommonAPI { void updateById(SysDepartEntity sysDepartEntity); void initialization(Map map); + + void joinConfirm(SysDepartEntity sysDepartEntity); + + void handFk(SysDepartEntity sysDepartEntity); + } diff --git a/nursing-unit-system/nu-system-api/nu-system-local-api/src/main/java/org/jeecg/common/system/entity/SysDepartEntity.java b/nursing-unit-system/nu-system-api/nu-system-local-api/src/main/java/org/jeecg/common/system/entity/SysDepartEntity.java index d22be55..c07ecd3 100644 --- a/nursing-unit-system/nu-system-api/nu-system-local-api/src/main/java/org/jeecg/common/system/entity/SysDepartEntity.java +++ b/nursing-unit-system/nu-system-api/nu-system-local-api/src/main/java/org/jeecg/common/system/entity/SysDepartEntity.java @@ -66,6 +66,10 @@ public class SysDepartEntity implements Serializable { * 协议+域名 */ private String url; + /** + * 前台路径 + */ + private String frontPath; /** * 项目访问路径 */ diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java index fa6d112..b471764 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java @@ -82,6 +82,10 @@ public class SysDepart implements Serializable { */ @Excel(name = "协议+域名", width = 30) private String url; + /** + * 前台路径 + */ + private String frontPath; /** * 项目访问路径 */ 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 bb792dc..f8dbbbb 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 @@ -2122,4 +2122,21 @@ public class SysBaseApiImpl implements ISysBaseAPI { log.error(e.getMessage(), e); } } + + @Override + public void joinConfirm(SysDepartEntity sysDepartEntity) { + SysDepart sysDepart = new SysDepart(); + sysDepart.setId(sysDepartEntity.getId()); + sysDepart.setOrgStatus("4"); + sysDepartService.updateById(sysDepart); + } + + @Override + public void handFk(SysDepartEntity sysDepartEntity) { + SysDepart sysDepart = new SysDepart(); + sysDepart.setId(sysDepartEntity.getId()); + sysDepart.setOrgStatus("5"); + sysDepartService.updateById(sysDepart); + } + }