更新

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/config/FullCardConfig.java

@@ -0,0 +1,14 @@
+package com.zhongshu.iot.server.core.config;
+
+import com.zhongshu.card.client.config.FullCardClientConfiguration;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+/**
+ * @author TRX
+ * @date 2024/7/23
+ */
+@Configuration
+@Import(FullCardClientConfiguration.class)
+public class FullCardConfig {
+}

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/base/SuperService.java

@@ -1,11 +1,12 @@
 package com.zhongshu.iot.server.core.service.base;
 
 import com.github.microservice.auth.security.helper.AuthHelper;
+import com.github.microservice.net.ResultContent;
+import com.zhongshu.card.client.model.org.UserCountModel;
+import com.zhongshu.card.client.service.feign.UserFeignService;
 import com.zhongshu.iot.client.model.baseParam.SuperParam;
 import com.zhongshu.iot.client.model.baseParam.SuperSearchParam;
-import com.zhongshu.iot.server.core.dao.UserDao;
 import com.zhongshu.iot.server.core.domain.base.SuperEntity;
-import com.zhongshu.iot.server.core.domain.user.User;
 import com.zhongshu.iot.server.core.util.DateUtils;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
@@ -22,22 +23,27 @@ import java.util.List;
 @Slf4j
 public abstract class SuperService {
 
-    @Autowired
-    private UserDao userDao;
-
     @Autowired
     HttpServletRequest request;
 
     @Autowired
     private AuthHelper authHelper;
 
+    @Autowired
+    private UserFeignService userFeignService;
+
     /**
      * 得到当前用户对象
      *
      * @return
      */
-    public User getCrrentUser() {
+    public UserCountModel getCrrentUser() {
         try {
+            String userId = getCurrentUserId();
+            ResultContent<UserCountModel> content = userFeignService.getUserDetailByUserId(userId);
+            if (content.isSuccess()) {
+                return content.getContent();
+            }
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -69,10 +75,10 @@ public abstract class SuperService {
         if (param.getId() != null && param.getId().trim().equals("")) {
             param.setId(null);
         }
-        User user = getCrrentUser();
+        UserCountModel user = getCrrentUser();
         if (user != null && StringUtils.isEmpty(param.getCreateUserId())) {
-            param.setCreateUserId(user.getId());
-            param.setCreateUserName(user.getUserName());
+            param.setCreateUserId(user.getUserId());
+            param.setCreateUserName(user.getName());
             param.setCreatePhone(user.getPhone());
         }
     }
@@ -81,10 +87,10 @@ public abstract class SuperService {
         if (param.getId() != null && param.getId().trim().equals("")) {
             param.setId(null);
         }
-        User user = getCrrentUser();
+        UserCountModel user = getCrrentUser();
         if (user != null && StringUtils.isEmpty(param.getCreateUserId())) {
-            param.setCreateUserId(user.getId());
-            param.setCreateUserName(user.getUserName());
+            param.setCreateUserId(user.getUserId());
+            param.setCreateUserName(user.getName());
             param.setCreatePhone(user.getPhone());
         }
     }

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/user/OperationLogsService.java

@@ -1,5 +1,6 @@
 package com.zhongshu.iot.server.core.service.user;
 
+import com.zhongshu.card.client.model.org.UserCountModel;
 import com.zhongshu.iot.client.model.operLogs.OperationLogsModel;
 import com.zhongshu.iot.client.model.operLogs.OperationLogsSearchParam;
 import com.zhongshu.iot.client.type.OperationLogType;
@@ -47,10 +48,10 @@ public class OperationLogsService extends SuperService {
             level = LogsLevel.Low;
         }
         logs.setLevel(level);
-        User user = getCrrentUser();
+        UserCountModel user = getCrrentUser();
         if (ObjectUtils.isNotEmpty(user)) {
             logs.setUid(user.getId());
-            logs.setUserName(user.getUserName());
+            logs.setUserName(user.getName());
             logs.setLoginName(user.getLoginName());
         }
         logs.setTime(DateUtils.paresTime(System.currentTimeMillis(), DateUtils.FORMAT_LONG));
@@ -72,10 +73,10 @@ public class OperationLogsService extends SuperService {
             level = LogsLevel.Low;
         }
         logs.setLevel(level);
-        User user = getCrrentUser();
+        UserCountModel user = getCrrentUser();
         if (ObjectUtils.isNotEmpty(user)) {
             logs.setUid(user.getId());
-            logs.setUserName(user.getUserName());
+            logs.setUserName(user.getName());
             logs.setLoginName(user.getLoginName());
         }
         logs.setTime(DateUtils.paresTime(System.currentTimeMillis(), DateUtils.FORMAT_LONG));
@@ -102,10 +103,10 @@ public class OperationLogsService extends SuperService {
             level = LogsLevel.Low;
         }
         logs.setLevel(level);
-        User user = getCrrentUser();
+        UserCountModel user = getCrrentUser();
         if (ObjectUtils.isNotEmpty(user)) {
             logs.setUid(user.getId());
-            logs.setUserName(user.getUserName());
+            logs.setUserName(user.getName());
             logs.setLoginName(user.getLoginName());
         }
         logs.setTime(DateUtils.paresTime(System.currentTimeMillis(), DateUtils.FORMAT_LONG));