机构加盟流程变更：机构加盟入驻审核-管理平台审核通过后，管理平台直接进入运维平台搭建环节，运维平台分为加盟确认、环境配置、反馈三个环节，其中环境配置环节需要填写各类信息，其余两个环节都是状态变更，运维平台反馈后，代表加盟及平台搭建完毕

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<OrgApplyInfoMapper, Org
     private IEmployeesAdvisioryInfoApi employeesAdvisioryInfoApi;
     @Autowired
     private ISysBaseAPI sysBaseAPI;
+    @Lazy
+    @Autowired
+    private IOrgApplyInfoService ownService;
 
 
     @Override
@@ -478,6 +482,12 @@ public class OrgApplyInfoServiceImpl extends ServiceImpl<OrgApplyInfoMapper, Org
         }
         //修改数据
         baseMapper.updateById(orgApplyInfo);
+
+        if("2".equals(orgApplyInfo.getStatus())){
+            OrgAllInfoApiEntity data = new OrgAllInfoApiEntity();
+            BeanUtils.copyProperties(orgApplyInfo,data);
+            ownService.submitContract(data);
+        }
     }
 
     @Override
@@ -495,7 +505,7 @@ public class OrgApplyInfoServiceImpl extends ServiceImpl<OrgApplyInfoMapper, Org
         //先保存数据 将构建状态置为“平台搭建”
         SysDepartEntity sysDepartEntity = new SysDepartEntity();
         sysDepartEntity.setId(orgApplyInfo.getPkId());
-        sysDepartEntity.setOrgStatus("4");
+        sysDepartEntity.setOrgStatus("3");
         sysDepartEntity.setWorkOrderStatus("1");
         sysDepartEntity.setContract(orgApplyInfo.getContract());//加盟合同
         sysDepartEntity.setContractNote(orgApplyInfo.getContractNote());//备注信息

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

@@ -62,7 +62,7 @@ public class WorkOrderMQListener {
             sysBaseAPI.updateById(data);
 
 //            var userInfo = { userName: record.tel, realname: record.name, orgCode: record.id, orgId: record.pkId }
-            Map<String,Object> map = new HashMap<>();
+            Map<String, Object> 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);
+    }
 }

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;

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<String, Object> map);
+
+    void joinConfirm(SysDepartEntity sysDepartEntity);
+
+    void handFk(SysDepartEntity sysDepartEntity);
+
 }

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;
     /**
      * 项目访问路径
      */

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;
     /**
      * 项目访问路径
      */

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);
+    }
+
 }