feat: [操作日志] 路由日志

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/PublicController.java

@@ -74,6 +74,8 @@ public class PublicController extends BaseController {
     public IBacteriaService bacteriaService;
     @Autowired
     public ISysDeptService sysDeptService;
+    @Autowired
+    public ISystemLogService systemLogService;
 
 
     /**
@@ -300,4 +302,18 @@ public class PublicController extends BaseController {
         List<Yq> list = yqService.queryList(form);
         return success(list);
     }
+
+    /**
+     * 记录日志
+     * @param name
+     * @param nameEn
+     * @param jcmc
+     * @param jcmcEn
+     * @return
+     */
+    @GetMapping("/saveSimpleLog")
+    public AjaxResult saveSimpleLog(String name,String nameEn,String jcmc,String jcmcEn) {
+        systemLogService.saveSimpleInfo(name,nameEn,jcmc,jcmcEn);
+        return success();
+    }
 }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/SystemLog.java

@@ -18,6 +18,9 @@ public class SystemLog extends MpBaseEntity
     /** 操作对象的名称编号 */
     private String name;
 
+    /** 操作对象的名称编号-英文 */
+    private String nameEn;
+
     /** 操作类型 */
     private String jcmc;
 
@@ -47,6 +50,14 @@ public class SystemLog extends MpBaseEntity
         this.name = name;
     }
 
+    public String getNameEn() {
+        return nameEn;
+    }
+
+    public void setNameEn(String nameEn) {
+        this.nameEn = nameEn;
+    }
+
     public void setJcmc(String jcmc)
     {
         this.jcmc = jcmc;

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ISystemLogService.java

@@ -43,6 +43,7 @@ public interface ISystemLogService extends IService
     /**
      * 普通日志
      * @param name
+     * @param nameEn
      * @param jcmc
      * @param jcmcEn
      * @param jcnr
@@ -52,6 +53,15 @@ public interface ISystemLogService extends IService
      * @param qmrMcEn
      * @param remark
      */
-    void saveInfo(String name, String jcmc, String jcmcEn, String jcnr, String jcnrEn,Long qmrid, String qmrMc, String qmrMcEn, String remark);
+    void saveInfo(String name, String nameEn, String jcmc, String jcmcEn, String jcnr, String jcnrEn,Long qmrid, String qmrMc, String qmrMcEn, String remark);
+
+    /**
+     * 简单日志 进入页面，点按钮
+     * @param name 对象名称（试验管理）
+     * @param nameEn 对象名称（Study）
+     * @param jcmc 进入页面（详情）
+     * @param jcmcEn ViewPage (Detail)
+     */
+    void saveSimpleInfo(String name, String nameEn, String jcmc, String jcmcEn);
 
 }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SystemLogServiceImpl.java

@@ -95,9 +95,10 @@ public class SystemLogServiceImpl extends ServiceImpl
     }
 
     @Override
-    public void saveInfo(String name, String jcmc, String jcmcEn, String jcnr, String jcnrEn, Long qmrid, String qmrMc, String qmrMcEn, String remark) {
+    public void saveInfo(String name, String nameEn, String jcmc, String jcmcEn, String jcnr, String jcnrEn, Long qmrid, String qmrMc, String qmrMcEn, String remark) {
         SystemLog info = new SystemLog();
         info.setName(name);
+        info.setNameEn(StringUtils.isBlank(nameEn)?name:nameEn);
         info.setJcnr(jcnr);
         info.setJcnrEn(jcnrEn);
         info.setJcmc(jcmc);
@@ -108,4 +109,18 @@ public class SystemLogServiceImpl extends ServiceImpl
         info.setRemark(remark);
         save(info);
     }
+
+    @Override
+    public void saveSimpleInfo(String name, String nameEn, String jcmc, String jcmcEn) {
+        SystemLog info = new SystemLog();
+        info.setName(name);
+        info.setNameEn(StringUtils.isBlank(nameEn)?name:nameEn);
+        info.setJcmc(jcmc);
+        info.setJcmcEn(jcmcEn);
+
+        info.setQmrId(SecurityUtils.getUserId());
+        info.setQmrMc(SecurityUtils.getNickName());
+        info.setQmrMcEn(SecurityUtils.getUsername());
+        save(info);
+    }
 }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/impl/SysMenuServiceImpl.java

@@ -309,7 +309,7 @@ public class SysMenuServiceImpl implements ISysMenuService
     public int insertMenu(SysMenu menu)
     {
         int row = menuMapper.insertMenu(menu);
-        systemLogService.saveInfo(menu.getMenuName(),"新增菜单","Create Menu",null,null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),SecurityUtils.getUsername(),null);
+        systemLogService.saveInfo(menu.getMenuName(),null,"新增菜单","Create Menu",null,null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),SecurityUtils.getUsername(),null);
         return row;
     }
 
@@ -343,7 +343,7 @@ public class SysMenuServiceImpl implements ISysMenuService
     {
         SysMenu menu = selectMenuById(menuId);
         int row = menuMapper.deleteMenuById(menuId);
-        systemLogService.saveInfo(menu.getMenuName(),"删除菜单","Remove Menu",null,null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),SecurityUtils.getUsername(),null);
+        systemLogService.saveInfo(menu.getMenuName(),null,"删除菜单","Remove Menu",null,null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),SecurityUtils.getUsername(),null);
         return row;
     }
 

hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/impl/SysRoleServiceImpl.java

@@ -246,7 +246,7 @@ public class SysRoleServiceImpl implements ISysRoleService
         // 新增角色信息
         roleMapper.insertRole(role);
         int row = insertRoleMenu(role);
-        systemLogService.saveInfo(role.getRoleName(),"新增角色","Create Role",null,null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),SecurityUtils.getUsername(),null);
+        systemLogService.saveInfo(role.getRoleName(),null,"新增角色","Create Role",null,null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),SecurityUtils.getUsername(),null);
         return row;
     }
 
@@ -288,7 +288,7 @@ public class SysRoleServiceImpl implements ISysRoleService
     {
         SysRole info = selectRoleById(role.getRoleId());
         int row = roleMapper.updateRole(role);
-        systemLogService.saveInfo(info.getRoleName(),"0".equals(role.getStatus())?"启用角色":"禁用角色","0".equals(role.getStatus())?"Enable Role":"Disable Role",null,null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),SecurityUtils.getUsername(),null);
+        systemLogService.saveInfo(info.getRoleName(),null,"0".equals(role.getStatus())?"启用角色":"禁用角色","0".equals(role.getStatus())?"Enable Role":"Disable Role",null,null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),SecurityUtils.getUsername(),null);
         return row;
     }
 
@@ -377,7 +377,7 @@ public class SysRoleServiceImpl implements ISysRoleService
 
         int row = roleMapper.deleteRoleById(roleId);
 
-        systemLogService.saveInfo(sysRole.getRoleName(),"删除角色","Remove Role",null,null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),SecurityUtils.getUsername(),null);
+        systemLogService.saveInfo(sysRole.getRoleName(),null,"删除角色","Remove Role",null,null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),SecurityUtils.getUsername(),null);
         return row;
     }
 

hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/impl/SysUserServiceImpl.java

@@ -277,7 +277,7 @@ public class SysUserServiceImpl implements ISysUserService
         // 新增用户与角色管理
         insertUserRole(user);
 
-        systemLogService.saveInfo(user.getUserName(),"新增用户","Create User",null,null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),SecurityUtils.getUsername(),null);
+        systemLogService.saveInfo(user.getUserName(),null,"新增用户","Create User",null,null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),SecurityUtils.getUsername(),null);
         return rows;
     }
 
@@ -352,7 +352,7 @@ public class SysUserServiceImpl implements ISysUserService
         SysUser info = selectUserById(user.getUserId());
 
         int row = userMapper.updateUserStatus(user.getUserId(), user.getStatus());
-        systemLogService.saveInfo(info.getUserName(),"0".equals(user.getStatus())?"启用用户":"禁用用户","0".equals(user.getStatus())?"Enable User":"Disable User",null,null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),SecurityUtils.getUsername(),null);
+        systemLogService.saveInfo(info.getUserName(),null,"0".equals(user.getStatus())?"启用用户":"禁用用户","0".equals(user.getStatus())?"Enable User":"Disable User",null,null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),SecurityUtils.getUsername(),null);
         return row;
     }
 
@@ -490,7 +490,7 @@ public class SysUserServiceImpl implements ISysUserService
         // 删除用户与岗位表
         userPostMapper.deleteUserPostByUserId(userId);
         int row = userMapper.deleteUserById(userId);
-        systemLogService.saveInfo(sysUser.getUserName(),"删除用户","Remove User",null,null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),SecurityUtils.getUsername(),null);
+        systemLogService.saveInfo(sysUser.getUserName(),null,"删除用户","Remove User",null,null,SecurityUtils.getUserId(),SecurityUtils.getNickName(),SecurityUtils.getUsername(),null);
         return row;
     }