From ec95e52c6f84c0a6cbdcbaecc2465b00ede6696d Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 24 Jun 2021 14:03:59 +0800
Subject: [PATCH] 数据校准工具类

---
 screen-api/src/main/java/com/moral/api/utils/OperationLogUtils.java |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/utils/OperationLogUtils.java b/screen-api/src/main/java/com/moral/api/utils/OperationLogUtils.java
index c217379..9f9468c 100644
--- a/screen-api/src/main/java/com/moral/api/utils/OperationLogUtils.java
+++ b/screen-api/src/main/java/com/moral/api/utils/OperationLogUtils.java
@@ -8,6 +8,7 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
 
 import com.moral.api.entity.UserLog;
 import com.moral.api.service.UserLogService;
@@ -18,20 +19,19 @@
 @Component
 public class OperationLogUtils {
 
-    private static UserLogService userLogService;
-
     @Autowired
-    public void setUserLogService(UserLogService userLogService) {
-        this.userLogService = userLogService;
-    }
+    private UserLogService userLogService;
 
-    public static void insertLog(HttpServletRequest request, String content) {
+    @Transactional
+    public void insertLog(HttpServletRequest request, String content, String type) {
         String token = request.getHeader("token");
         Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(token);
         UserLog userLog = new UserLog();
+        userLog.setType(type);
         userLog.setIp(WebUtils.getIpAddr(request));
         userLog.setOperateId((Integer) currentUserInfo.get("userId"));
-        userLog.setOrganizationId((Integer) currentUserInfo.get("organizationId"));
+        Map<String, Object> orgInfo = (Map<String, Object>) currentUserInfo.get("organization");
+        userLog.setOrganizationId((Integer) orgInfo.get("id"));
         userLog.setContent(content);
         userLogService.save(userLog);
     }

--
Gitblit v1.8.0