欧阳劲驰 недель назад: 2
Родитель
Сommit
b1d14386c7

+ 7 - 1
custom-gateway-zydma/src/main/java/com/shkpr/service/customgateway/zydma/components/InfoSynchronizer.java

@@ -56,8 +56,10 @@ public class InfoSynchronizer {
 
     /**
      * 同步用户信息
+     *
+     * @param userId 用户ID
      */
-    public void syncUserInfo() {
+    public void syncUserInfo(Long userId) {
         LogPrintMgr.getInstance().printLogMsg(LogLevelFlag.LOG_INFO, mBizType, mStrClassName
                 , "开始同步用户信息,开始滚动拉取数据");
         long begin = System.currentTimeMillis();
@@ -81,6 +83,10 @@ public class InfoSynchronizer {
                     );
                 });
 
+        //遍历用户
+        //todo 用户角色信息获取
+
+
         //转换用户对象
         List<PersonnelInfo> dates = users.stream()
                 .map(MiddlePlatformUser::toPersonnelInfo).collect(Collectors.toList());

+ 1 - 0
custom-gateway-zydma/src/main/java/com/shkpr/service/customgateway/zydma/components/IotCollector.java

@@ -150,6 +150,7 @@ public class IotCollector {
                     List<IotPlatformData.Data> dates = tagItems.stream()
                             .flatMap(it -> it.getDataModel().stream())
                             .collect(Collectors.toList());
+
                     //===================构建influxdb===================
                     results.addAll(dates.stream()
                             .map(it -> it.toPoint(device, tag))

+ 3 - 1
custom-gateway-zydma/src/main/java/com/shkpr/service/customgateway/zydma/constants/MiddlePlatformMetadata.java

@@ -43,8 +43,10 @@ public abstract class MiddlePlatformMetadata extends IntegrationMetadata {
      * 接口地址
      */
     public interface Uri {
-        //获取用户
+        //获取用户列表
         String GET_USERS = "/IntegrationAuth/GetUsers";
+        //获取用户角色信息
+        String ROLE_GROUP_LIST = "/IntegrationAuth/GetUsers";
     }
 
     /**

+ 2 - 2
custom-gateway-zydma/src/main/java/com/shkpr/service/customgateway/zydma/manager/InfoSyncManager.java

@@ -31,7 +31,7 @@ public class InfoSyncManager {
     @PostConstruct
     public void init() {
         //同步用户信息
-        taskScheduler.execute(infoSynchronizer::syncUserInfo);
+        taskScheduler.execute(() -> infoSynchronizer.syncUserInfo(null));
     }
 
     /**
@@ -40,6 +40,6 @@ public class InfoSyncManager {
     @Scheduled(cron = "0 */10 * * * *")
     public void minuteTask() {
         //同步用户信息
-        taskScheduler.execute(infoSynchronizer::syncUserInfo);
+        taskScheduler.execute(() -> infoSynchronizer.syncUserInfo(null));
     }
 }