操作记录代码修改

src/main/java/com/diagbot/aop/LogAspect.java

@@ -8,7 +8,12 @@ import com.auth0.jwt.interfaces.DecodedJWT;
 import com.diagbot.dto.QcCasesDTO;
 import com.diagbot.dto.SysLoginLogDTO;
 import com.diagbot.dto.SysOperationLogDTO;
+import com.diagbot.dto.SysRoleMenuDTO;
+import com.diagbot.dto.SysUserQueryDTO;
+import com.diagbot.dto.SysUserRoleDTO;
 import com.diagbot.entity.SysHospitalSet;
+import com.diagbot.entity.SysRole;
+import com.diagbot.entity.SysUser;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.facade.LoginLogFacade;
@@ -21,6 +26,9 @@ import com.diagbot.util.ListUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.util.SysUserUtils;
 import com.diagbot.vo.QcCasesSaveListVO;
+import com.diagbot.vo.SysRoleMenuSaveVO;
+import com.diagbot.vo.SysUserBaseVO;
+import com.diagbot.vo.SysUserRoleVO;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import eu.bitwalker.useragentutils.UserAgent;
 import org.apache.commons.collections4.MapUtils;
@@ -301,7 +309,48 @@ public class LogAspect {
                     }
                     break;
                 case "/sys/user/disable":
-                    compareTwoClass("旧结果对象", "新的入参对象", outMap);
+                    Object[] args1 = joinPoint.getArgs();
+                    if (null != args1 && args1.length >= 0) {
+                        //通过id获取用户具体信息
+                        if (args1[0] instanceof SysUserBaseVO) {
+                            SysUserBaseVO sysUserBaseVO = (SysUserBaseVO) args1[0];
+                            SysUser sysUser = operationLogFacade.getSysUser(sysUserBaseVO.getUserId());
+                            compareTwoClass(sysUser, sysUserBaseVO.getUserId(), outMap);
+                        }
+                    }
+                    break;
+                case "/sys/user/enable":
+                    Object[] args2 = joinPoint.getArgs();
+                    if (null != args2 && args2.length >= 0) {
+                        //通过id获取用户具体信息
+                        if (args2[0] instanceof SysUserBaseVO) {
+                            SysUserBaseVO sysUserBaseVO = (SysUserBaseVO) args2[0];
+                            SysUser sysUser = operationLogFacade.getSysUser(sysUserBaseVO.getUserId());
+                            compareTwoClass(sysUser, sysUserBaseVO.getUserId(), outMap);
+                        }
+                    }
+                    break;
+                case "/sys/role/saveRoleMenu":
+                    Object[] args3 = joinPoint.getArgs();
+                    if (null != args3 && args3.length >= 0) {
+                        //通过id获取角色信息
+                        if (args3[0] instanceof SysRoleMenuSaveVO) {
+                            SysRoleMenuSaveVO sysRoleMenuSaveVO = (SysRoleMenuSaveVO) args3[0];
+                            SysRole sysRole = operationLogFacade.getRoleMenu(sysRoleMenuSaveVO.getRoleId());
+                            compareTwoClass(sysRole, sysRoleMenuSaveVO, outMap);
+                        }
+                    }
+                    break;
+                case "/sys/user/editUserRoles":
+                    Object[] args4 = joinPoint.getArgs();
+                    if (null != args4 && args4.length >= 0) {
+                        //通过id获取角色信息
+                        if (args4[0] instanceof SysUserRoleVO) {
+                            SysUserRoleVO sysUserRoleVO = (SysUserRoleVO) args4[0];
+                            SysUserRoleDTO sysUserRoleDTO = operationLogFacade.editUserRoles(sysUserRoleVO.getUserId());
+                            compareTwoClass(sysUserRoleDTO, sysUserRoleVO, outMap);
+                        }
+                    }
                     break;
 
                 default:

src/main/java/com/diagbot/facade/OperationLogFacade.java

@@ -1,14 +1,26 @@
 package com.diagbot.facade;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.QcCasesDTO;
 import com.diagbot.dto.SysOperationLogDTO;
+import com.diagbot.dto.SysRoleMenuDTO;
+import com.diagbot.dto.SysUserQueryDTO;
+import com.diagbot.dto.SysUserRoleDTO;
+import com.diagbot.entity.SysRole;
+import com.diagbot.entity.SysUser;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.SysOperationLogServiceImpl;
 import com.diagbot.util.SysUserUtils;
 import com.diagbot.vo.SysOperationLogVO;
+import com.diagbot.vo.SysRoleMenuQueryVO;
+import com.diagbot.vo.SysRoleMenuSaveVO;
+import com.diagbot.vo.SysUserBaseVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * @Description:操作日志处理类
  * @author: songxl
@@ -19,6 +31,12 @@ public class OperationLogFacade extends SysOperationLogServiceImpl {
     @Autowired
     QcCasesFacade qcCasesFacade;
 
+    @Autowired
+    SysUserFacade sysUserFacade;
+
+    @Autowired
+    SysRoleFacade sysRoleFacade;
+
     public IPage<SysOperationLogDTO> getOperationLog(SysOperationLogVO sysOperationLogVO) {
         return this.getBaseMapper().getOperationLog(sysOperationLogVO);
     }
@@ -26,4 +44,22 @@ public class OperationLogFacade extends SysOperationLogServiceImpl {
     public QcCasesDTO getQcCasesById(String id) {
         return qcCasesFacade.getQcCasesById(id, SysUserUtils.getCurrentHospitalID());
     }
+
+    public SysUser getSysUser(Long id) {
+        return sysUserFacade.getBaseMapper().selectOne(new QueryWrapper<SysUser>()
+                .eq("id",id)
+                .eq("is_deleted", IsDeleteEnum.N.getKey()));
+    }
+
+    public SysRole getRoleMenu(Long roleId) {
+        return sysRoleFacade.getBaseMapper().selectOne(new QueryWrapper<SysRole>()
+                .eq("id",roleId)
+                .eq("is_deleted", IsDeleteEnum.N.getKey()));
+    }
+
+    public SysUserRoleDTO editUserRoles(Long userId) {
+        SysUserBaseVO sysUserBaseVO = new SysUserBaseVO();
+        sysUserBaseVO.setUserId(userId);
+        return sysUserFacade.getUserRoles(sysUserBaseVO);
+    }
 }