Kaynağa Gözat

feat: 增加commit和BugList的日志打印,并修改Optype

181250114 4 yıl önce
ebeveyn
işleme
7a0c4c3e4f

+ 0 - 26
common/src/main/java/cn/seecoder/common/util/LogTrackingUtil.java

@@ -36,30 +36,4 @@ public class LogTrackingUtil {
     }
 }
 
-enum OpType {
 
-    MODIFY_BUGLIST(100, "修改缺陷信息"),
-    COMMIT(101, "用户进行commit"),
-    INTERFACE_TEST(102, "用户创建并执行接口测试"),
-    CREATE_PIPELINE(103, "用户创建流水线"),
-    DELETE_PIPELINE(104, "用户删除流水线"),
-    DEPLOY_PIPELINE(105, "用户部署流水线"),
-    MODYFY_REQUIREMENT_TREENODE(106, "用户插入/更新需求树节点"),
-    DELETE_REQUIREMENT_TREENODE(107, "用户删除需求树节点");
-
-    int num;
-    String name;
-
-    OpType(int num, String name) {
-        this.num = num;
-        this.name = name;
-    }
-
-    public int getNum() {
-        return this.num;
-    }
-
-    public String getName() {
-        return this.name;
-    }
-}

+ 29 - 0
common/src/main/java/cn/seecoder/common/util/OpType.java

@@ -0,0 +1,29 @@
+package cn.seecoder.common.util;
+
+public enum OpType {
+
+    MODIFY_BUGLIST(100, "修改缺陷信息"),
+    COMMIT(101, "用户进行commit"),
+    INTERFACE_TEST(102, "用户创建并执行接口测试"),
+    CREATE_PIPELINE(103, "用户创建流水线"),
+    DELETE_PIPELINE(104, "用户删除流水线"),
+    DEPLOY_PIPELINE(105, "用户部署流水线"),
+    MODYFY_REQUIREMENT_TREENODE(106, "用户插入/更新需求树节点"),
+    DELETE_REQUIREMENT_TREENODE(107, "用户删除需求树节点");
+
+    int num;
+    String name;
+
+    OpType(int num, String name) {
+        this.num = num;
+        this.name = name;
+    }
+
+    public int getNum() {
+        return this.num;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+}

+ 5 - 1
pom.xml

@@ -23,7 +23,11 @@
     </properties>
 
     <dependencies>
-
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.47</version>
+        </dependency>
     </dependencies>
 
     <dependencyManagement>

+ 3 - 0
web/src/main/java/cn/seecoder/web/dao/user/UserMapper.java

@@ -37,4 +37,7 @@ public interface UserMapper {
 
     @Select("select id from user where phone = #{phone}")
     Integer selectIdByPhone(String phone);
+
+    @Select("select id from user where email = #{email}")
+    Integer selectIdByEmail(String email);
 }

+ 32 - 0
web/src/main/java/cn/seecoder/web/service/impl/bug_list/BugListServiceImpl.java

@@ -1,5 +1,7 @@
 package cn.seecoder.web.service.impl.bug_list;
 
+import cn.seecoder.common.util.LogTrackingUtil;
+import cn.seecoder.common.util.OpType;
 import cn.seecoder.web.core.commit.model.CommitState;
 import cn.seecoder.web.dao.bug_list.BugListMapper;
 import cn.seecoder.web.dao.project.CommitMapper;
@@ -13,6 +15,8 @@ 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 net.sf.json.JSON;
+import net.sf.json.JSONObject;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -113,6 +117,20 @@ public class BugListServiceImpl implements BugListService {
         }
         bugListMapper.update(po);
         //ANA 日志需要打出修改的基础信息
+        try{
+            JSONObject object = new JSONObject();
+            object.put("bug_id:",po.getId());
+            object.put("project_id:",po.getProjectId());
+            object.put("priority:",po.getPriority());
+            object.put("title:",po.getTitle());
+            object.put("description:",po.getDescription());
+            object.put("timeToTake:",po.getTimeToTake());
+            object.put("bug_state:",po.getState());
+
+            String data = com.alibaba.fastjson.JSONObject.toJSONString(object);
+            LogTrackingUtil.log(data, OpType.MODIFY_BUGLIST);
+
+        }catch (Exception e){}
     }
 
     @Override
@@ -130,5 +148,19 @@ public class BugListServiceImpl implements BugListService {
         }
         bugListMapper.update(po);
         //ANA 日志需要打出修改的状态信息
+        try{
+            JSONObject object = new JSONObject();
+            object.put("bug_id:",po.getId());
+            object.put("project_id:",po.getProjectId());
+            object.put("priority:",po.getPriority());
+            object.put("title:",po.getTitle());
+            object.put("description:",po.getDescription());
+            object.put("timeToTake:",po.getTimeToTake());
+            object.put("bug_state:",po.getState());
+
+            String data = com.alibaba.fastjson.JSONObject.toJSONString(object);
+            LogTrackingUtil.log(data, OpType.MODIFY_BUGLIST);
+
+        }catch (Exception e){}
     }
 }

+ 18 - 0
web/src/main/java/cn/seecoder/web/service/impl/project/CommitServiceImpl.java

@@ -1,7 +1,11 @@
 package cn.seecoder.web.service.impl.project;
 
+import cn.seecoder.common.util.LogTrackingUtil;
+import cn.seecoder.common.util.OpType;
+import cn.seecoder.web.dao.user.UserMapper;
 import cn.seecoder.web.model.enums.CommitRelatedEnum;
 import cn.seecoder.web.model.vo.project.CommitVO;
+import com.alibaba.fastjson.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import cn.seecoder.web.dao.project.CommitMapper;
@@ -21,15 +25,29 @@ public class CommitServiceImpl implements CommitService {
 
     private final CommitMapper commitMapper;
 
+
     @Autowired
     public CommitServiceImpl(CommitMapper commitMapper) {
         this.commitMapper = commitMapper;
     }
 
+    @Autowired
+    private UserMapper userMapper;
+
     @Override
     public void save(CommitPO po) {
         commitMapper.insert(po);
         //ANA 日志需要打出用户的commit信息
+        try{
+            JSONObject object = new JSONObject();
+            object.put("commit_id:",po.getId());
+            object.put("user_id:",userMapper.selectIdByEmail(po.getEmail()));
+            object.put("project_id:",po.getProjectId());
+            object.put("commit_date:",po.getTimestamp());
+
+            String data = JSONObject.toJSONString(object);
+            LogTrackingUtil.log(data, OpType.COMMIT);
+        }catch (Exception e){}
     }
 
     @Override