소스 검색

feat:修改了日志中的user_id属性

xuxiaopang 2 년 전
부모
커밋
0e8bfd43f3

+ 2 - 1
web/src/main/java/cn/seecoder/web/service/impl/APITest/APITestServiceImpl.java

@@ -16,6 +16,7 @@ import cn.seecoder.web.model.vo.APITest.APITestBodyVO;
 import cn.seecoder.web.model.vo.APITest.APITestInfoVO;
 import cn.seecoder.web.model.vo.APITest.APITestResultVO;
 import cn.seecoder.web.service.APITest.APITestService;
+import cn.seecoder.web.service.user.UserService;
 import com.google.gson.Gson;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
@@ -283,7 +284,7 @@ public class APITestServiceImpl implements APITestService {
             JSONObject object = new JSONObject();
             object.put("apiTest_id",testId);
             object.put("project_id",projectId);
-            object.put("user_id",userMapper.selectIdByUserName(testInfo.getUsername()));
+            object.put("user_id", UserService.loginUser().getId());
             object.put("success",success[0]);
             object.put("failure",failure[0]);
 

+ 2 - 1
web/src/main/java/cn/seecoder/web/service/impl/InterfaceTest/InterfaceTestServiceImpl.java

@@ -14,6 +14,7 @@ import cn.seecoder.web.model.po.pipeline.PipelineRecordPO;
 import cn.seecoder.web.model.vo.InterfaceTest.InterfaceTestInfoVO;
 import cn.seecoder.web.model.vo.InterfaceTest.InterfaceTestResultVO;
 import cn.seecoder.web.service.InterfaceTest.InterfaceTestService;
+import cn.seecoder.web.service.user.UserService;
 import com.google.gson.Gson;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
@@ -168,7 +169,7 @@ public class InterfaceTestServiceImpl implements InterfaceTestService {
             JSONObject object = new JSONObject();
             object.put("apiTest_id",id);
             object.put("project_id",projectId);
-            object.put("user_id",userMapper.selectIdByUserName(username));
+            object.put("user_id", UserService.loginUser().getId());
             object.put("result",res[2]);
 //            object.put("failure",failure[0]);
 

+ 4 - 3
web/src/main/java/cn/seecoder/web/service/impl/bug_list/BugListServiceImpl.java

@@ -15,6 +15,7 @@ import cn.seecoder.web.model.vo.bug_list.BugListCreateVO;
 import cn.seecoder.web.model.vo.bug_list.BugListUpdateBasicVO;
 import cn.seecoder.web.model.vo.bug_list.BugListVO;
 import cn.seecoder.web.service.bug_list.BugListService;
+import cn.seecoder.web.service.user.UserService;
 import net.sf.json.JSONObject;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -91,7 +92,7 @@ public class BugListServiceImpl implements BugListService {
 //            object.put("bug_id",123);
             object.put("bug_id",bugId);
             object.put("project_id",po.getProjectId());
-            object.put("user_id",po.getProcessorId());
+            object.put("user_id", UserService.loginUser().getId());
             object.put("priority",po.getPriority());
             object.put("title",po.getTitle());
             object.put("description",po.getDescription());
@@ -154,7 +155,7 @@ public class BugListServiceImpl implements BugListService {
         try{
             BugListPO bugPo = bugListMapper.selectById(po.getId());
             JSONObject object = new JSONObject();
-            object.put("user_id",bugPo.getProcessorId());
+            object.put("user_id",UserService.loginUser().getId());
             object.put("bug_id",bugPo.getId());
             object.put("project_id",bugPo.getProjectId());
             object.put("priority",bugPo.getPriority());
@@ -187,7 +188,7 @@ public class BugListServiceImpl implements BugListService {
         try{
             BugListPO bugPo = bugListMapper.selectById(po.getId());
             JSONObject object = new JSONObject();
-            object.put("user_id",bugPo.getProcessorId());
+            object.put("user_id",UserService.loginUser().getId());
             object.put("bug_id",bugPo.getId());
             object.put("project_id",bugPo.getProjectId());
             object.put("priority",bugPo.getPriority());

+ 3 - 2
web/src/main/java/cn/seecoder/web/service/impl/commit/CommitLinkServiceImpl.java

@@ -16,6 +16,7 @@ import cn.seecoder.web.service.bug_list.BugListService;
 import cn.seecoder.web.service.commit.CommitLinkService;
 import cn.seecoder.web.service.commit.CommitService;
 import cn.seecoder.web.service.tree.TreeNodeService;
+import cn.seecoder.web.service.user.UserService;
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -62,7 +63,7 @@ public class CommitLinkServiceImpl implements CommitLinkService {
             //ANA 日志需要打出用户的commit信息
             JSONObject object = new JSONObject();
             try{
-                object.put("user_id",userMapper.selectIdByEmail(commit.getAuthor().getEmail()));
+                object.put("user_id",UserService.loginUser().getId());
                 object.put("commit_id",commit.getId());
                 object.put("project_id",projectId);
                 object.put("commit_time",commit.getTimestamp());
@@ -119,7 +120,7 @@ public class CommitLinkServiceImpl implements CommitLinkService {
         //ANA 日志需要打出用户commit的信息
         try{
             JSONObject object = new JSONObject();
-            object.put("user_id",userMapper.selectIdByUserName(po.getGitlabUsername()));
+            object.put("user_id", UserService.loginUser().getId());
             object.put("commit_id",po.getId());
             object.put("project_id",po.getProjectId());
             object.put("commit_name",po.getGitlabUsername());

+ 5 - 3
web/src/main/java/cn/seecoder/web/service/impl/tree/TreeNodeServiceImpl.java

@@ -14,6 +14,7 @@ import cn.seecoder.web.model.vo.tree.TreeNodeUpdateBasicVO;
 import cn.seecoder.web.model.vo.tree.TreeNodeVO;
 import cn.seecoder.web.service.tree.TreeNodeService;
 
+import cn.seecoder.web.service.user.UserService;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.http.HttpStatus;
 import org.springframework.beans.BeanUtils;
@@ -96,7 +97,7 @@ public class TreeNodeServiceImpl implements TreeNodeService {
             object.put("node_id",res);
             object.put("title",treeNodePO.getTitle());
             object.put("project_id",treeNodePO.getProjectId());
-            object.put("user_id",treeNodePO.getProcessorId());
+            object.put("user_id", UserService.loginUser().getId());
             object.put("type",treeNodePO.getType());
             object.put("priority",treeNodePO.getPriority());
             object.put("state",treeNodePO.getState());
@@ -128,7 +129,7 @@ public class TreeNodeServiceImpl implements TreeNodeService {
             object.put("node_id",node.getId());
             object.put("title",node.getTitle());
             object.put("project_id",node.getProjectId());
-            object.put("user_id",node.getProcessorId());
+            object.put("user_id",UserService.loginUser().getId());
             object.put("type",node.getType());
             object.put("priority",node.getPriority());
             object.put("state",node.getState());
@@ -166,6 +167,7 @@ public class TreeNodeServiceImpl implements TreeNodeService {
         //ANA 日志需要打出删除需求节点的信息
         try{
             JSONObject object = new JSONObject();
+            object.put("user_id",UserService.loginUser().getId());
             object.put("project_id",po.getProjectId());
             object.put("node_ids",nodes);
 
@@ -222,7 +224,7 @@ public class TreeNodeServiceImpl implements TreeNodeService {
             object.put("node_id",res);
             object.put("title",son.getTitle());
             object.put("project_id",son.getProjectId());
-            object.put("user_id",father.getProcessorId()); // 暂时先拿father的 可能根据业务修改
+            object.put("user_id",UserService.loginUser().getId()); // 暂时先拿father的 可能根据业务修改
             object.put("type",son.getType());
             object.put("priority",son.getPriority());
             object.put("state",son.getState());