提交添加用户组代码

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/listener/BaseEnterpriseMqTtlListener.java

@@ -56,6 +56,8 @@ public class BaseEnterpriseMqTtlListener extends EmqxListener {
     @Autowired
     DataDictionaryServiceImpl iDataDictionaryService;
 
+	@Value("${org.filter.group.seq}")
+	private Long groupSeq;
 
 	@Override
 	public void processMessage(String topic, MqttMessage message) throws Exception {
@@ -138,7 +140,9 @@ public class BaseEnterpriseMqTtlListener extends EmqxListener {
 				}
 				userModel.setAppCodes(new ArrayList<>(appCodesSet));
 				userModel.setOrgRoleSeqs(roleSeqMap);
-				Privilege.agencyUserClient.create(userModel);
+				FeignClientResult<AgencyUserModel> userResult  =Privilege.agencyUserClient.create(userModel);
+				String[] userIds = {userResult.getResult().getUserId()};
+				Privilege.groupUserClient.create(groupSeq,Arrays.asList(userIds) );
 			}
 		}
 	}

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/listener/CarcylUnitInspectMqTtlListener.java

 package com.yeejoin.amos.boot.module.tzs.biz.listener;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -46,6 +47,9 @@ public class CarcylUnitInspectMqTtlListener extends EmqxListener {
 	@Autowired
 	RedisUtil redisUtil;
 
+	@Value("${org.filter.group.seq}")
+	private Long groupSeq;
+	
 	@Override 
 	public void processMessage(String topic, MqttMessage message) throws Exception {
 		System.out.println(message);
@@ -99,7 +103,9 @@ public class CarcylUnitInspectMqTtlListener extends EmqxListener {
 			orgRoles.put(id, roleIds);
 			userModel.setAppCodes(appCodes);
 			userModel.setOrgRoleSeqs(orgRoles);
-			Privilege.agencyUserClient.create(userModel);
+			FeignClientResult<AgencyUserModel> userResult  =Privilege.agencyUserClient.create(userModel);
+			String[] userIds = {userResult.getResult().getUserId()};
+			Privilege.groupUserClient.create(groupSeq,Arrays.asList(userIds) );
 		}
 	}
 }

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/RegUnitInfoServiceImpl.java

 package com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
@@ -14,6 +15,7 @@ import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.client.RestTemplate;
@@ -88,6 +90,10 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
 	 * 单位类型，数据来源：cb_data_dictionary type = UNIT_TYPE
 	 */
 	private static String DICT_TYPE_UNIT_TYPE = "UNIT_TYPE_NEW";
+	
+
+	@Value("${org.filter.group.seq}")
+	private Long groupSeq;
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
@@ -420,6 +426,7 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
 			if (userResult == null || userResult.getResult() == null) {
 				throw new BadRequest("单位注册失败");
 			}
+			String[] userIds = {userResult.getResult().getUserId()};
 			regUnitInfo.setAdminUserId(userResult.getResult().getUserId());
 			regUnitInfo.setAmosCompanySeq(companyInfo.getSequenceNbr().toString());
 			// 3.3 org_user 创建组织机构
@@ -433,6 +440,7 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
 			org.setAmosOrgId(companyInfo.getSequenceNbr() + "");
 			org.setAmosOrgCode(companyInfo.getOrgCode());
 			iOrgUsrService.save(org);
+			Privilege.groupUserClient.create(groupSeq,Arrays.asList(userIds) );
 		} catch (Exception e) {
 			// 删除已经创建的 企业信息
 			if (companyInfo != null && companyInfo.getSequenceNbr() != null) {

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/resources/application-dev.properties

@@ -51,4 +51,6 @@ tzs.cti.url=http://172.16.10.90:8000
 rule.definition.load=false
 rule.definition.model-package=com.yeejoin.amos.boot.module.tzs.api.dto
 rule.definition.default-agency=tzs
-rule.definition.localIp=172.16.3.39
\ No newline at end of file
+rule.definition.localIp=172.16.3.39
+
+org.filter.group.seq=1564150103147573249
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/resources/application-dev2.properties

@@ -51,4 +51,6 @@ tzs.cti.url=http://113.134.211.174:8000
 rule.definition.load=false
 rule.definition.model-package=com.yeejoin.amos.boot.module.tzs.api.dto
 rule.definition.default-agency=tzs
-#rule.definition.localIp=172.16.3.34
\ No newline at end of file
+#rule.definition.localIp=172.16.3.34
+
+org.filter.group.seq=1564150103147573249
\ No newline at end of file