机构加盟搭建完平台在业务中增加员工信息、用户表中机构负责人数据增加employees_id的值

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

@@ -62,15 +62,17 @@ public class WorkOrderMQListener {
             sysBaseAPI.updateById(data);
 
 //            var userInfo = { userName: record.tel, realname: record.name, orgCode: record.id, orgId: record.pkId }
-            Map<String,String> map = new HashMap<>();
+            Map<String,Object> map = new HashMap<>();
             map.put("userName", workOrderMQDto.getAccountNo());
             map.put("realName", "管理员");
             map.put("orgCode", workOrderMQDto.getId());
             map.put("orgId", workOrderMQDto.getOrgId());
             map.put("password", workOrderMQDto.getPasswordText());
+            map.put("openId", workOrderMQDto.getOpenId());
+            map.put("tel", workOrderMQDto.getOrgTel());
+            map.put("orgInfo",workOrderMQDto.getOrgInfo());
             sysBaseAPI.initialization(map);
 
-
         }
     }
 

nursing-unit-common/src/main/java/com/nu/dto/WorkOrderMQDto.java

@@ -59,4 +59,8 @@ public class WorkOrderMQDto implements Serializable {
     private java.lang.String url;
     private java.lang.String mediaUrl;
     private java.lang.String contextPath;
+    private java.lang.String openId;
+    private java.lang.String orgTel;
+
+    private OrgApplyInfoMQDto orgInfo;
 }

nursing-unit-system/nu-system-api/nu-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java

@@ -647,5 +647,5 @@ public interface ISysBaseAPI extends CommonAPI {
 
     void updateById(SysDepartEntity sysDepartEntity);
 
-    void initialization(Map<String, String> map);
+    void initialization(Map<String, Object> map);
 }

nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java

@@ -459,5 +459,5 @@ public interface ISysUserService extends IService<SysUser> {
 	 */
 	void userLogOff(JSONObject jsonObject, String username);
 
-	void saveUserInitialization(String dataSourceCode, SysUser user, String selectedRoles, String selectedDeparts, String relTenantIds);
+	String saveUserInitialization(String dataSourceCode, SysUser user, String selectedRoles, String selectedDeparts, String relTenantIds);
 }

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

@@ -1,6 +1,7 @@
 package org.jeecg.modules.system.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.RandomUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -13,6 +14,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.base.Joiner;
 import com.google.common.collect.Maps;
+import com.nu.dto.EmployeesApplyMQDto;
+import com.nu.dto.OrgApplyInfoMQDto;
+import com.nu.utils.RabbitMQUtil;
 import org.apache.commons.compress.utils.Lists;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.api.ISysBaseAPI;
@@ -150,6 +154,8 @@ public class SysBaseApiImpl implements ISysBaseAPI {
 
     @Autowired
     private DataSourceLoader dataSourceLoader;
+    @Autowired
+    private RabbitMQUtil rabbitMQUtil;
 
     @Override
     //@SensitiveDecode
@@ -1981,36 +1987,36 @@ public class SysBaseApiImpl implements ISysBaseAPI {
     }
 
     @Override
-    public List<SysDepartEntity> queryAllOrgInfo(SysDepartEntity queryParams){
+    public List<SysDepartEntity> queryAllOrgInfo(SysDepartEntity queryParams) {
         return sysDepartService.queryAllOrgInfo(queryParams);
     }
 
     @Override
     public void updateById(SysDepartEntity sysDepartEntity) {
         SysDepart sysDepart = new SysDepart();
-        BeanUtils.copyProperties(sysDepartEntity,sysDepart);
+        BeanUtils.copyProperties(sysDepartEntity, sysDepart);
         sysDepartService.updateById(sysDepart);
     }
 
     @Override
-    public void initialization(Map<String, String> map) {
+    public void initialization(Map<String, Object> map) {
-        Map<String,String> result = new HashMap<>();
+        Map<String, String> result = new HashMap<>();
         String selectedRoles = "1940240123742437378";
         String selectedDeparts = "";
         try {
             SysUser user = new SysUser();
 //            JSON.parseObject(jsonObject.toJSONString(), SysUser.class);
-            String orgId = map.get("orgId");
+            String orgId = (String) map.get("orgId");
-            if(StringUtils.isNotBlank(orgId)){
+            if (StringUtils.isNotBlank(orgId)) {
                 SysDepart depart = sysDepartService.getDepartById(orgId);
                 //生成六位随机数
                 String random = RandomUtil.randomNumbers(6);
-                String password = map.get("password");
+                String password = (String) map.get("password");
                 selectedDeparts = depart.getId();
                 user.setOrgCode(depart.getOrgCode());
-                user.setUsername(map.get("userName"));
+                user.setUsername((String) map.get("userName"));
-                user.setRealname(map.get("realName"));
+                user.setRealname((String) map.get("realName"));
-                user.setWorkNo(depart.getOrgCode()+random);
+                user.setWorkNo(depart.getOrgCode() + random);
                 user.setPassword(password);
                 user.setCreateTime(new Date());//设置创建时间
                 String salt = oConvertUtils.randomGen(8);
@@ -2024,17 +2030,36 @@ public class SysBaseApiImpl implements ISysBaseAPI {
                 dataSourceLoader.refreshDataSources();
                 // 保存用户走一个service 保证事务
                 //获取租户ids
-                String relTenantIds =  map.get("relTenantIds");
+                String relTenantIds = (String) map.get("relTenantIds");
                 String dataSourceCode = depart.getOrgCode();
-                sysUserService.saveUserInitialization(dataSourceCode,user, selectedRoles, selectedDeparts, relTenantIds);
+                String userId = sysUserService.saveUserInitialization(dataSourceCode, user, selectedRoles, selectedDeparts, relTenantIds);
 
                 //修改机构加盟申请信息
                 SysDepartEntity sysDepartEntity = new SysDepartEntity();
                 sysDepartEntity.setId(depart.getId());
                 sysDepartEntity.setOrgStatus("5");
                 updateById(sysDepartEntity);
-            }
 
+                //通知业务修改用户的employees_id
+                EmployeesApplyMQDto mqDto = new EmployeesApplyMQDto();
+                OrgApplyInfoMQDto orgInfo = (OrgApplyInfoMQDto) map.get("orgInfo");
+                mqDto.setId(userId);
+                //员工表数据身份证上的信息取机构申请时上传的身份证信息
+                {
+                    mqDto.setName(orgInfo.getName());//姓名
+                    mqDto.setSex(orgInfo.getSex());//性别
+                    mqDto.setNational(orgInfo.getNational());//民族
+                    mqDto.setIdCard(orgInfo.getIdCard());//身份证号
+                    mqDto.setDateOfBirth(orgInfo.getBirthDate());//出生日期
+                    mqDto.setHouseAddress(orgInfo.getIdCardAddress());//地址
+                    mqDto.setIdCardPositive(orgInfo.getCardZmPath());//身份证正面
+                    mqDto.setIdCardNegative(orgInfo.getCardFmPath());//身份证反面
+                }
+                mqDto.setTel((String) map.get("tel"));
+                mqDto.setOpenId((String) map.get("openId"));
+
+                rabbitMQUtil.sendToExchange("hldy.org", dataSourceCode + ".orgapply.upuseremployeesid", mqDto);
+            }
 
 
         } catch (Exception e) {

nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java

@@ -2022,7 +2022,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
 	@Override
 	@DS("#dataSourceCode")
-	public void saveUserInitialization(String dataSourceCode, SysUser user, String selectedRoles, String selectedDeparts, String relTenantIds) {
+	public String saveUserInitialization(String dataSourceCode, SysUser user, String selectedRoles, String selectedDeparts, String relTenantIds) {
 		System.out.println("保存用户初始化数据"+dataSourceCode);
 		//step.1 保存用户
 		this.save(user);
@@ -2048,6 +2048,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
 		//step.4 保存职位
 		this.saveUserPosition(user.getId(),user.getPost());
+
+		return user.getId();
 	}
 
 	/**