修改用户组

amos-boot-data/amos-boot-data-openapi/src/main/resources/application-dev.properties

@@ -2,9 +2,10 @@ spring.application.name=AMOS-API-OPENAPI
 server.servlet.context-path=/openapi
 server.port=11004
 # jdbc_config
-spring.datasource.url=jdbc:mysql://172.16.6.60:3306/amos_openapi?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&serverTimezone=GMT%2B8
+spring.datasource.url=jdbc:mysql://172.16.10.90:53306/tzs_amos_openapi?allowMultiQueries=true&serverTimezone=GMT%2B8\
+  &characterEncoding=utf8
 spring.datasource.username=root
-spring.datasource.password=root_123
+spring.datasource.password=Yeejoin@2020
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.type=com.zaxxer.hikari.HikariDataSource
 spring.datasource.hikari.minimum-idle=5
@@ -17,10 +18,10 @@ spring.datasource.hikari.connection-timeout=30000
 spring.datasource.hikari.connection-test-query=SELECT 1
 
 # REDIS (RedisProperties)
-spring.redis.database=0
-spring.redis.host=172.16.11.30
+spring.redis.database=1
+spring.redis.host=172.16.10.90
 spring.redis.port=6379
-spring.redis.password=amos2019Redis
+spring.redis.password=yeejoin@2020
 spring.redis.lettuce.pool.max-active=200
 spring.redis.lettuce.pool.max-wait=-1
 spring.redis.lettuce.pool.max-idle=10
@@ -28,7 +29,7 @@ spring.redis.lettuce.pool.min-idle=0
 spring.redis.expire.time=300
 
 #注册中心地址
-eureka.client.service-url.defaultZone =http://172.16.11.30:10001/eureka/
+eureka.client.service-url.defaultZone =http://172.16.3.99:10001/eureka/
 eureka.instance.prefer-ip-address=true
 management.endpoint.health.show-details=always
 management.endpoints.web.exposure.include=*
@@ -40,10 +41,9 @@ eureka.instance.metadata-map.management.api-docs=http://localhost:${server.port}
 ##emqx
 emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
-emqx.broker=tcp://39.98.45.134:1883
+emqx.broker=tcp://172.16.10.90:1883
 emqx.user-name=super
-emqx.password=a123456
-emqx.max-inflight=1000
+emqx.password=123456
 
 ##biz custem properties
 biz.lxyd.lift.url=http://39.106.181.149:8088/elevatorapi
\ No newline at end of file

amos-boot-data/amos-boot-data-openapi/src/main/resources/application.properties

-spring.profiles.active=cyl
+spring.profiles.active=dev
 server.compression.enabled=true
 spring.jackson.dateFormat=yyyy-MM-dd HH:mm:ss
 

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

@@ -11,6 +11,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import org.apache.commons.lang3.StringUtils;
 import org.eclipse.paho.client.mqttv3.MqttMessage;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -52,9 +53,9 @@ public class BaseEnterpriseMqTtlListener extends EmqxListener {
 	String appkey;
 	@Autowired
 	RedisUtil redisUtil;
-	
-    @Autowired
-    DataDictionaryServiceImpl iDataDictionaryService;
+
+	@Autowired
+	DataDictionaryServiceImpl iDataDictionaryService;
 
 	@Value("${org.filter.group.seq}")
 	private Long groupSeq;
@@ -99,7 +100,7 @@ public class BaseEnterpriseMqTtlListener extends EmqxListener {
 				}
 			}
 			FeignClientResult<CompanyModel> createResult = Privilege.companyClient.create(companyModel);
-            Long companySqr = createResult.getResult().getSequenceNbr();
+			Long companySqr = createResult.getResult().getSequenceNbr();
 			String unitCode = object.getString("use_code");
 			if (unitCode == null || unitCode.length() < 6) {
 				log.error("公司统一信用代码长度不够6位");
@@ -109,7 +110,7 @@ public class BaseEnterpriseMqTtlListener extends EmqxListener {
 			FeignClientResult<AgencyUserModel> uResult = Privilege.agencyUserClient.queryByUserName(userName);
 			if (uResult.getResult() == null) {
 				FeignClientResult<List<RoleModel>> roleListResult = Privilege.roleClient.queryRoleList(null, null);
-			    List<RoleModel> allRoleList = roleListResult.getResult();
+				List<RoleModel> allRoleList = roleListResult.getResult();
 				AgencyUserModel userModel = new AgencyUserModel();
 				userModel.setUserName(userName);
 				userModel.setRealName(userName);
@@ -121,7 +122,7 @@ public class BaseEnterpriseMqTtlListener extends EmqxListener {
 				// Privilege.roleClient.queryRoleList("使用单位", "admin");
 				String[] unitTypeArray = unitTypes.split(",");
 				List<String> unitTypeList = Arrays.asList(unitTypeArray);
-				Set<String> roleNameSet =new HashSet<>();
+				Set<String> roleNameSet = new HashSet<>();
 				Set<String> appCodesSet = new HashSet<>();
 				List<RoleModel> userRoleList = new ArrayList<>();
 				List<Long> roleIds = new ArrayList<>();
@@ -140,9 +141,11 @@ public class BaseEnterpriseMqTtlListener extends EmqxListener {
 				}
 				userModel.setAppCodes(new ArrayList<>(appCodesSet));
 				userModel.setOrgRoleSeqs(roleSeqMap);
-				FeignClientResult<AgencyUserModel> userResult  =Privilege.agencyUserClient.create(userModel);
-				String[] userIds = {userResult.getResult().getUserId()};
-				Privilege.groupUserClient.create(groupSeq,Arrays.asList(userIds) );
+				FeignClientResult<AgencyUserModel> userResult = Privilege.agencyUserClient.create(userModel);
+				String[] userIds = { userResult.getResult().getUserId() };
+				if (groupSeq != null) {
+					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

@@ -105,7 +105,9 @@ public class CarcylUnitInspectMqTtlListener extends EmqxListener {
 			userModel.setOrgRoleSeqs(orgRoles);
 			FeignClientResult<AgencyUserModel> userResult  =Privilege.agencyUserClient.create(userModel);
 			String[] userIds = {userResult.getResult().getUserId()};
-			Privilege.groupUserClient.create(groupSeq,Arrays.asList(userIds) );
+			if (groupSeq != null) {
+				Privilege.groupUserClient.create(groupSeq, Arrays.asList(userIds));
+			}
 		}
 	}
 }