用户组操作日志

bi-server/src/main/java/com/usoftchina/bi/server/controller/user/UserController.java

@@ -4,6 +4,7 @@ import com.usoftchina.bi.auth.annotation.Auth;
 import com.usoftchina.bi.core.base.RepEntity;
 import com.usoftchina.bi.server.model.po.User;
 import com.usoftchina.bi.server.model.pojo.annotation.CheckToken;
+import com.usoftchina.bi.server.model.pojo.annotation.Log;
 import com.usoftchina.bi.server.model.vo.configVo.LoginInfo;
 import com.usoftchina.bi.server.model.vo.configVo.UserGroupInfo;
 import com.usoftchina.bi.server.model.vo.configVo.UserGroupSetInfo;
@@ -65,8 +66,10 @@ public class UserController {
      */
     @ApiOperation(value = "创建用户组", notes = "创建用户组", response = RepEntity.class)
     @Auth(user = "admin")
+    @Log(module = "用户组", name = "#body.userGroupName", token = "#token")
+    @CheckToken
     @PostMapping("/createUserGroup")
-    public RepEntity createUserGroup(@RequestBody UserGroupInfo body){
+    public RepEntity saveUserGroup(@RequestHeader String token, @RequestBody UserGroupInfo body){
         return userService.createUserGroup(body);
     }
 
@@ -75,8 +78,10 @@ public class UserController {
      */
     @ApiOperation(value = "更新用户组", notes = "更新用户组", response = RepEntity.class)
     @Auth(user = "admin")
+    @Log(module = "用户组", name = "#body.userGroupName", token = "#token")
+    @CheckToken
     @PostMapping("/updateUserGroup")
-    public RepEntity updateUserGroup(@RequestBody UserGroupInfo body){
+    public RepEntity updateUserGroup(@RequestHeader String token, @RequestBody UserGroupInfo body){
         return userService.updateUserGroup(body);
     }
 

bi-server/src/main/java/com/usoftchina/bi/server/dao/user/UserMapper.java

@@ -174,11 +174,18 @@ public interface UserMapper {
     void updateUserGroup(UserGroup userGroup);
 
     /*
-    查询用户组
+    查询用户组列表
      */
     @Select("select bg_id as id, bg_name as userGroupName, bg_note as userGroupNote, create_date as createDate, " +
             "updata_date as updateDate from bi_user_groups ")
-    List<UserGroup> getUserGroup();
+    List<UserGroup> getUserGroupList();
+
+    /*
+   查询用户组
+    */
+    @Select("select bg_id as id, bg_name as userGroupName, bg_note as userGroupNote, create_date as createDate, " +
+            "updata_date as updateDate from bi_user_groups where bg_id = #{id}")
+    UserGroup getUserGroup(int id);
 
     /*
     删除用户组

bi-server/src/main/java/com/usoftchina/bi/server/service/user/UserService.java

@@ -1,5 +1,6 @@
 package com.usoftchina.bi.server.service.user;
 
+import com.usoftchina.bi.core.base.BaseContextHolder;
 import com.usoftchina.bi.core.base.RepCode;
 import com.usoftchina.bi.core.base.RepEntity;
 import com.usoftchina.bi.core.exception.MyException;
@@ -14,6 +15,7 @@ import com.usoftchina.bi.server.model.po.UserGroup;
 import com.usoftchina.bi.server.model.vo.configVo.LoginInfo;
 import com.usoftchina.bi.server.model.vo.configVo.UserGroupInfo;
 import com.usoftchina.bi.server.model.vo.configVo.UserGroupSetInfo;
+import com.usoftchina.bi.server.service.common.MessageLogService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -26,11 +28,11 @@ import java.util.List;
 @Service
 public class UserService {
     @Autowired
-    JwtTokenAspect jwtTokenUtil;
+    private JwtTokenAspect jwtTokenUtil;
     @Autowired
-    UserMapper userMapper;
+    private UserMapper userMapper;
     @Autowired
-    ObjectMapper objectMapper;
+    private MessageLogService messageLogService;
 
     /**
      * 登录接口,涉及UAS用户同步：
@@ -193,7 +195,7 @@ public class UserService {
     查询用户组
      */
     public RepEntity getUserGroup(){
-        List<UserGroup> userGroup= userMapper.getUserGroup();
+        List<UserGroup> userGroup= userMapper.getUserGroupList();
         return new RepEntity(RepCode.success, userGroup);
     }
 
@@ -201,7 +203,9 @@ public class UserService {
     删除用户组
      */
     public RepEntity delUserGroup(Long id){
+        UserGroup userGroup = userMapper.getUserGroup(id.intValue());
         userMapper.delUserGroup(id);
+        messageLogService.delete("用户组", userGroup.getUserGroupName(), BaseContextHolder.getUserName(), "删除用户组");
         return new RepEntity(RepCode.success);
     }