1.用户组管理

src/main/java/com/SpringbootStartApplication.java

@@ -1,8 +1,9 @@
 package com;
 
+import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
-
+@SpringBootApplication
 public class SpringbootStartApplication extends SpringBootServletInitializer {
 
     @Override

src/main/java/com/controller/ChartsConfigController.java

@@ -23,33 +23,36 @@ public class ChartsConfigController {
    /*
    添加
     */
-//   @CheckToken
+   @CheckToken
     @RequestMapping("/inputCharts")
-    public RepEntity inputCharts(@RequestBody ChartConfigInfo body){
+    public RepEntity inputCharts(@RequestHeader String token,@RequestBody ChartConfigInfo body){
         return chartsConfigService.setChartsConfig(body);
     }
 
     /*
    更新
     */
+    @CheckToken
     @RequestMapping("/updateCharts")
-    public RepEntity updateCharts(@RequestBody ChartConfigInfo body){
+    public RepEntity updateCharts(@RequestHeader String token,@RequestBody ChartConfigInfo body){
         return chartsConfigService.updateChartsConfig(body);
     }
 
     /*
     更新图表的分组
      */
+    @CheckToken
     @RequestMapping("/updateChartConfigGroup")
-    public RepEntity updateConfigGroup(@RequestBody GroupUpdateId body){
+    public RepEntity updateConfigGroup(@RequestHeader String token, @RequestBody GroupUpdateId body){
         return chartsConfigService.updateConfigGroup(body);
     }
 
     /*
     删除
      */
+    @CheckToken
     @RequestMapping("/delChartsConfig")
-    public RepEntity delChartsConfig(@RequestBody List<Integer> body){
+    public RepEntity delChartsConfig(@RequestHeader String token,@RequestBody List<Integer> body){
         return chartsConfigService.delChartsConfig(body);
     }
 
@@ -74,6 +77,7 @@ public class ChartsConfigController {
     /*
     添加图表分组
      */
+    @CheckToken
     @RequestMapping("/setChartsGroup")
     public RepEntity setChartsGroup(@RequestBody GroupInfo body){
         return chartsConfigService.setDataConnectorGroup(body);
@@ -82,32 +86,36 @@ public class ChartsConfigController {
     /*
     更新图表分组
      */
+    @CheckToken
     @RequestMapping("/updataChartsGroup")
-    public RepEntity updataChartsGroup(@RequestBody GroupInfo body){
+    public RepEntity updataChartsGroup(@RequestHeader String token,@RequestBody GroupInfo body){
         return chartsConfigService.updataDataConnectorGroup(body);
     }
 
     /*
     批量更新图表
      */
+    @CheckToken
     @RequestMapping("/updataListGroup")
-    public RepEntity updataListGroup(@RequestBody List<GroupInfo> body){
+    public RepEntity updataListGroup(@RequestHeader String token,@RequestBody List<GroupInfo> body){
         return chartsConfigService.updataListGroup(body);
     }
 
     /*
     删除图表分组
      */
+    @CheckToken
     @RequestMapping("/delChartsGroup")
-    public RepEntity delChartsGroup(@RequestBody List<Integer> body){
+    public RepEntity delChartsGroup(@RequestHeader String token,@RequestBody List<Integer> body){
         return chartsConfigService.delDataConnectorGroup(body);
     }
 
     /*
     查询图表分组
      */
+    @CheckToken
     @RequestMapping("/getChartsGroup")
-    public RepEntity getChartsGroup(){
+    public RepEntity getChartsGroup(@RequestHeader String token){
         return chartsConfigService.getConnectorGroup();
     }
 

src/main/java/com/controller/DashboardsController.java

@@ -5,6 +5,7 @@ import com.model.vo.configVo.DashboardsInfo;
 import com.server.DashboardsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -18,40 +19,45 @@ public class DashboardsController {
     /*
     保存看板
      */
+    @CheckToken
     @RequestMapping("/inputDashboards")
-    public RepEntity inputDashboards(@RequestBody DashboardsInfo body){
+    public RepEntity inputDashboards(@RequestHeader String token, @RequestBody DashboardsInfo body){
         return dashboardsService.setDashboards(body);
     }
 
     /*
     更新看板
      */
+    @CheckToken
     @RequestMapping("/updateDashboards")
-    public RepEntity updateDashboards(@RequestBody DashboardsInfo body){
+    public RepEntity updateDashboards(@RequestHeader String token,@RequestBody DashboardsInfo body){
         return dashboardsService.updateDashboards(body);
     }
 
     /*
     删除看板
      */
+    @CheckToken
     @RequestMapping("/delDashboards")
-    public RepEntity delDashboards(@RequestBody List<Integer> body){
+    public RepEntity delDashboards(@RequestHeader String token,@RequestBody List<Integer> body){
         return dashboardsService.delDashboards(body);
     }
 
     /*
     查看列表
      */
+    @CheckToken
     @RequestMapping("/getListDashboards")
-    public RepEntity getListDashboards(){
+    public RepEntity getListDashboards(@RequestHeader String token){
         return dashboardsService.getListDashboards();
     }
 
     /*
     查看单个看板
      */
+    @CheckToken
     @RequestMapping("/getDashboards")
-    public RepEntity getDashboards(@RequestBody int body){
+    public RepEntity getDashboards(@RequestHeader String token,@RequestBody int body){
         return dashboardsService.getDashboards(body);
     }
 }

src/main/java/com/controller/DataBasesController.java

@@ -8,6 +8,7 @@ import com.server.DataBasesService;
 import com.server.ImplementSqlService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -23,48 +24,54 @@ public class DataBasesController {
    数据库
    保存数据库配置
    */
+    @CheckToken
     @RequestMapping("/inputDatabases")
-    public RepEntity inputDatabases(@RequestBody DatabasesInfo body){
+    public RepEntity inputDatabases(@RequestHeader String token, @RequestBody DatabasesInfo body){
         return dataBasesService.inputDatabases(body);
     }
 
     /*
     查看数据库配置列表
      */
+    @CheckToken
     @RequestMapping("/getDatabases")
-    public RepEntity getDatabases(@RequestBody Pages body){
+    public RepEntity getDatabases(@RequestHeader String token,@RequestBody Pages body){
         return dataBasesService.getListDatabases(body);
     }
 
     /*
     删除数据库配置
      */
+    @CheckToken
     @RequestMapping("/delDatabases")
-    public RepEntity delDatabases(@RequestBody List<Integer> body){
+    public RepEntity delDatabases(@RequestHeader String token,@RequestBody List<Integer> body){
         return dataBasesService.delDatabases(body);
     }
 
     /*
     更新数据库配置
      */
+    @CheckToken
     @RequestMapping("/updatabases")
-    public RepEntity updatabases(@RequestBody DatabasesInfo databasesInfo){
+    public RepEntity updatabases(@RequestHeader String token,@RequestBody DatabasesInfo databasesInfo){
         return dataBasesService.updatabases(databasesInfo);
     }
 
     /*
     查看列
      */
+    @CheckToken
     @RequestMapping("/getColumnData")
-    public RepEntity getColumnData(@RequestBody int body){
+    public RepEntity getColumnData(@RequestHeader String token,@RequestBody int body){
         return dataBasesService.getColumnData(body);
     }
 
     /*
     测试数据库连接
      */
+    @CheckToken
     @RequestMapping("/testConnect")
-    public RepEntity testConnect(@RequestBody Databases body){
+    public RepEntity testConnect(@RequestHeader String token,@RequestBody Databases body){
         return implementSqlService.connectTest(body);
     }
 }

src/main/java/com/controller/DataConnectorController.java

@@ -10,6 +10,7 @@ import com.server.ImplementSqlService;
 import com.util.BasesSource.TargetDataSource;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -26,8 +27,9 @@ public class DataConnectorController {
     /*
     保存数据源配置
      */
+    @CheckToken
     @RequestMapping("/inputDataConnector")
-    public RepEntity inputDataConnector(@RequestBody DataConnectorInfo body) {
+    public RepEntity inputDataConnector(@RequestHeader String token, @RequestBody DataConnectorInfo body) {
         System.out.println("-----------");
         System.out.println(body);
         return dataConnectorService.setDataConnector(body);
@@ -36,32 +38,36 @@ public class DataConnectorController {
     /*
     查看数据源列表
      */
+    @CheckToken
     @RequestMapping("/getListDataConnector")
-    public RepEntity getListDataConnector(){
+    public RepEntity getListDataConnector(@RequestHeader String token){
         return dataConnectorService.getListConnector();
     }
 
     /*
     查看单个数据源配置
      */
+    @CheckToken
     @RequestMapping("/getDataConnector")
-    public RepEntity getDataConnector(@RequestBody int body){
+    public RepEntity getDataConnector(@RequestHeader String token,@RequestBody int body){
         return dataConnectorService.getConnector(body);
     }
 
     /*
     更新数据源配置
      */
+    @CheckToken
     @RequestMapping("/updateData")
-    public RepEntity updateData(@RequestBody DataConnectorInfo body){
+    public RepEntity updateData(@RequestHeader String token,@RequestBody DataConnectorInfo body){
         return dataConnectorService.updateData(body);
     }
 
     /*
     更新数据源配置的分组
      */
+    @CheckToken
     @RequestMapping("/updateConnectConfigGroup")
-    public RepEntity updateConConfigGroup(@RequestBody GroupUpdateId body){
+    public RepEntity updateConConfigGroup(@RequestHeader String token,@RequestBody GroupUpdateId body){
         return dataConnectorService.updateConfigGroup(body);
     }
 
@@ -69,57 +75,69 @@ public class DataConnectorController {
     /*
     删除配置
      */
+    @CheckToken
     @RequestMapping("/delDataConnector")
-    public RepEntity delDataConnector(@RequestBody List<Integer> body){
+    public RepEntity delDataConnector(@RequestHeader String token,@RequestBody List<Integer> body){
         return dataConnectorService.delDataConnector(body);
     }
 
     /*
     执行数据源配置
     */
+    @CheckToken
     @RequestMapping("/implementSql")
     @TargetDataSource
-    public RepEntity implementSql(@RequestBody ToSql body){
+    public RepEntity implementSql(@RequestHeader String token,@RequestBody ToSql body){
         return implementSqlService.implementSql(body);
     }
 
     /*
     添加数据源分组
      */
+    @CheckToken
     @RequestMapping("/setConnectorGroup")
-    public RepEntity setConnectorGroup(@RequestBody GroupInfo body){
+    public RepEntity setConnectorGroup(@RequestHeader String token,@RequestBody GroupInfo body){
         return dataConnectorService.setDataConnectorGroup(body);
     }
 
     /*
     更新数据源分组
      */
+    @CheckToken
     @RequestMapping("/updataDataConnectorGroup")
-    public RepEntity updataDataConnectorGroup(@RequestBody GroupInfo body){
+    public RepEntity updataDataConnectorGroup(@RequestHeader String token,@RequestBody GroupInfo body){
         return dataConnectorService.updataDataConnectorGroup(body);
     }
 
     /*
     批量更新数据源分组
      */
+    @CheckToken
     @RequestMapping("/updataConnectorGroup")
-    public RepEntity updataConnectorGroup(@RequestBody List<GroupInfo> body){
+    public RepEntity updataConnectorGroup(@RequestHeader String token,@RequestBody List<GroupInfo> body){
         return dataConnectorService.updataConnectorGroups(body);
     }
 
     /*
     删除数据源分组
      */
+    @CheckToken
     @RequestMapping("/delDataConnectorGroup")
-    public RepEntity delDataConnectorGroup(@RequestBody List<Integer> body){
+    public RepEntity delDataConnectorGroup(@RequestHeader String token,@RequestBody List<Integer> body){
         return dataConnectorService.delDataConnectorGroup(body);
     }
 
     /*
     查询数据源分组
      */
+    @CheckToken
     @RequestMapping("/getConnectorGroup")
-    public RepEntity getConnectorGroup(){
+    public RepEntity getConnectorGroup(@RequestHeader String token){
         return dataConnectorService.getConnectorGroup();
     }
+
+    /*
+    添加数据源策略
+     */
+//    @RequestMapping("/")
 }

src/main/java/com/controller/ShowChartsController.java

@@ -5,6 +5,7 @@ import com.model.vo.configVo.*;
 import com.server.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -30,56 +31,63 @@ public class ShowChartsController {
     /*
     展示柱状图
      */
+    @CheckToken
     @RequestMapping("/showHistogram")
-    public RepEntity showHistogram(@RequestBody HistogramConfigInfo body){
+    public RepEntity showHistogram(@RequestHeader String token,@RequestBody HistogramConfigInfo body){
         return showHistogramService.showHistogram(body);
     }
 
     /*
     展示饼图
      */
+    @CheckToken
     @RequestMapping("/showPie")
-    public RepEntity showPie(@RequestBody PieConfigInfo body){
+    public RepEntity showPie(@RequestHeader String token,@RequestBody PieConfigInfo body){
         return showPieService.showPie(body);
     }
 
     /*
     展示Line
      */
+    @CheckToken
     @RequestMapping("/showLine")
-    public RepEntity showLine(@RequestBody LineConfigInfo body){
+    public RepEntity showLine(@RequestHeader String token,@RequestBody LineConfigInfo body){
         return showLineService.showLine(body);
     }
 
     /*
     showScatter
      */
+    @CheckToken
     @RequestMapping("/showScatter")
-    public RepEntity showScatter(@RequestBody ScatterConfigInfo body){
+    public RepEntity showScatter(@RequestHeader String token,@RequestBody ScatterConfigInfo body){
         return showScatterService.showScatter(body);
     }
 
     /*
     show个体统计表
      */
+    @CheckToken
     @RequestMapping("/showIndividual")
-    public RepEntity showIndividual(@RequestBody IndividualConfigInfo body){
+    public RepEntity showIndividual(@RequestHeader String token,@RequestBody IndividualConfigInfo body){
         return showIndividualService.showIndividual(body);
     }
 
     /*
     show总体统计表
      */
+    @CheckToken
     @RequestMapping("/showPopulation")
-    public RepEntity showPopulation(@RequestBody PopulationInfo body) throws SQLException {
+    public RepEntity showPopulation(@RequestHeader String token,@RequestBody PopulationInfo body) throws SQLException {
         return showPopulationService.showPopulation(body);
     }
 
     /*
     展示单列数据
      */
+    @CheckToken
     @RequestMapping("/showScreenData")
-    public RepEntity showScreenData(@RequestBody ColumnScreenInfo body){
+    public RepEntity showScreenData(@RequestHeader String token,@RequestBody ColumnScreenInfo body){
         return columnScreenService.getScreenData(body);
     }
 }

src/main/java/com/controller/UserController.java

@@ -2,12 +2,16 @@ package com.controller;
 
 import com.model.pojo.RepEntity;
 import com.model.vo.configVo.LoginInfo;
+import com.model.vo.configVo.UserGroupInfo;
+import com.model.vo.configVo.UserGroupSetInfo;
 import com.server.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 @RestController
 public class UserController {
     @Autowired
@@ -20,4 +24,68 @@ public class UserController {
     public RepEntity login(@RequestBody LoginInfo body){
         return userService.login(body);
     }
+
+    /*
+    查询用户列表
+     */
+    @RequestMapping("/getUserList")
+    public RepEntity getUserList(){
+        return userService.getUserList();
+    }
+
+    /*
+    创建用户组
+     */
+    @RequestMapping("/createUserGroup")
+    public RepEntity createUserGroup(@RequestBody UserGroupInfo body){
+        return userService.createUserGroup(body);
+    }
+
+    /*
+    更新用户组
+     */
+    @RequestMapping("/updateUserGroup")
+    public RepEntity updateUserGroup(@RequestBody UserGroupInfo body){
+        return userService.updateUserGroup(body);
+    }
+
+    /*
+    查询用户组列表
+     */
+    @RequestMapping("/getUserGroupList")
+    public RepEntity getUserGroupList(){
+        return userService.getUserGroup();
+    }
+
+    /*
+    删除用户组
+     */
+    @RequestMapping("/delUserGroup")
+    public RepEntity delUserGroup(@RequestBody List<Integer> body){
+        return userService.delUserGroup(body);
+    }
+
+    /*
+    用户组添加用户
+     */
+    @RequestMapping("/setUserInto")
+    public RepEntity setUserInto(@RequestBody UserGroupSetInfo body){
+        return userService.setUserInto(body);
+    }
+
+    /*
+    查询用户组下的用户
+     */
+    @RequestMapping("/getUserInGroup")
+    public RepEntity getUserInGroup(@RequestBody int body){
+        return userService.getUserInGroup(body);
+    }
+
+    /*
+    删除用户组下的用户
+     */
+    @RequestMapping("/delUserInGroup")
+    public RepEntity delUserInGroup(@RequestBody UserGroupSetInfo body){
+        return userService.delUserInGroup(body);
+    }
 }

src/main/java/com/dao/UserMapper.java

@@ -1,21 +1,98 @@
 package com.dao;
 
 import com.model.po.User;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.Update;
+import com.model.po.UserGroup;
+import com.model.vo.configVo.UserGroupSetInfo;
+import org.apache.ibatis.annotations.*;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Mapper
 @Repository
 public interface UserMapper {
 
+    /*
+    获取用户信息
+     */
     @Select("select BU_ID as id, BU_NAME as name, BU_DEPARTMENT as department, BU_POST as post, BU_ROLE as role," +
             " user_name as userName, pass_word as passWord " +
             "from bi_users where user_name = #{userName}")
     User getLogin(String userName);
 
+    /*
+    获取用户列表
+     */
+    @Select("select BU_ID as id, BU_NAME as name, BU_DEPARTMENT as department, BU_POST as post, BU_ROLE as role," +
+            "user_name as userName, pass_word as passWord, create_date as createDate " +
+            "from bi_users")
+    List<User> getUserList();
+
+    /*
+    更新token
+     */
     @Update("update bi_users set user_token = #{token} where bu_id = #{id}")
     void updateToken(@Param("token") String token, @Param("id") int id);
+
+    /*
+    创建用户组
+     */
+    @Insert("insert into bi_user_groups(bg_id, bg_name, bg_note, create_date) values(#{id}, #{userGroupName}, #{userGroupNote}, " +
+            "to_date(to_char(sysdate,'yyyy-mm-dd hh24:mi:ss'),'YYYY-MM-DD hh24:mi:ss'))")
+    @SelectKey(before=true,keyProperty="id",resultType=Integer.class,statement="SELECT bi_user_groups_squence.nextval from dual",keyColumn = "bg_id")
+    void insUserGroup(UserGroup userGroup);
+
+    /*
+    更新用户组
+     */
+    @Update("<script>" +
+            "UPDATE bi_user_groups set "  +
+            "bg_name = #{userGroupName}" +
+            "<if test=\"userGroupNote != null\"> , bg_note = #{userGroupNote} </if>" +
+            ",UPDATA_DATE = to_date(to_char(sysdate,'yyyy-mm-dd hh24:mi:ss'),'YYYY-MM-DD hh24:mi:ss') " +
+            "where bg_id = #{id}" +
+            "</script>")
+    void updateUserGroup(UserGroup userGroup);
+
+    /*
+    查询用户组
+     */
+    @Select("select bg_id as id, bg_name as userGroupName, bg_note as userGroupNote, create_date as createDate, " +
+            "update_date as updateDate from bi_user_groups ")
+    List<UserGroup> getUserGroup();
+
+    /*
+    删除用户组
+     */
+    @Delete("<script>" +
+            "delete from bi_user_groups where bg_id in " +
+            "("+
+            "<foreach collection=\"list\" index=\"index\" item=\"item\"  separator=\",\">" +
+            "#{item, jdbcType = NUMERIC}"+
+            "</foreach>" +
+            ")"+
+            "</script>")
+    void delUserGroup(List<Integer> idList);
+
+    /*
+    添加用户到用户组
+     */
+    @Insert("insert into bi_user_rel_groups(br_id, br_user_id, br_user_group) values(#{id}, #{userId}, #{userGroupId})")
+    @SelectKey(before=true,keyProperty="id",resultType=Integer.class,statement="SELECT bi_user_rel_groups_squence.nextval from dual",keyColumn = "br_id")
+    void setUserInto(UserGroupSetInfo userGroupSetInfo);
+
+    /*
+    查询用户组下的用户信息
+     */
+    @Select("select bu_id as id, bu_name as name, bu_department as department, bu_post as post, bu_role as role " +
+            " from bi_users,bi_user_groups,bi_user_rel_groups where bi_users.bu_id=bi_user_rel_groups.br_user_id and " +
+            " bi_user_rel_groups.br_user_group=bi_user_groups.bg_id and bi_user_groups.bg_id = #{id}")
+    List<User> getGroupUserList(int id);
+
+    /*
+    删除用户组下的用户
+     */
+    @Delete("delete from bi_user_rel_groups where br_user_id = #{userId} and br_user_group = #{userGroupId} ")
+    void delUserInGroup(UserGroupSetInfo userGroupSetInfo);
+
 }

src/main/java/com/model/po/TokenData.java

@@ -3,6 +3,7 @@ package com.model.po;
 public class TokenData {
     private String token;
     private String times;
+    private User user;
 
     public String getToken() {
         return token;
@@ -19,4 +20,12 @@ public class TokenData {
     public void setTimes(String times) {
         this.times = times;
     }
+
+    public User getUser() {
+        return user;
+    }
+
+    public void setUser(User user) {
+        this.user = user;
+    }
 }

src/main/java/com/model/po/UserGroup.java

@@ -0,0 +1,51 @@
+package com.model.po;
+
+import java.util.Date;
+
+public class UserGroup {
+    private int id;
+    private String userGroupName;
+    private String userGroupNote;
+    private Date createDate;
+    private Date updateDate;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getUserGroupName() {
+        return userGroupName;
+    }
+
+    public void setUserGroupName(String userGroupName) {
+        this.userGroupName = userGroupName;
+    }
+
+    public String getUserGroupNote() {
+        return userGroupNote;
+    }
+
+    public void setUserGroupNote(String userGroupNote) {
+        this.userGroupNote = userGroupNote;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+}

src/main/java/com/model/vo/configVo/UserGroupInfo.java

@@ -0,0 +1,31 @@
+package com.model.vo.configVo;
+
+public class UserGroupInfo {
+    private int id;
+    private String userGroupName;
+    private String userGroupNote;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getUserGroupName() {
+        return userGroupName;
+    }
+
+    public void setUserGroupName(String userGroupName) {
+        this.userGroupName = userGroupName;
+    }
+
+    public String getUserGroupNote() {
+        return userGroupNote;
+    }
+
+    public void setUserGroupNote(String userGroupNote) {
+        this.userGroupNote = userGroupNote;
+    }
+}

src/main/java/com/model/vo/configVo/UserGroupSetInfo.java

@@ -0,0 +1,31 @@
+package com.model.vo.configVo;
+
+public class UserGroupSetInfo {
+    private int id;
+    private int userId;
+    private int userGroupId;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public int getUserId() {
+        return userId;
+    }
+
+    public void setUserId(int userId) {
+        this.userId = userId;
+    }
+
+    public int getUserGroupId() {
+        return userGroupId;
+    }
+
+    public void setUserGroupId(int userGroupId) {
+        this.userGroupId = userGroupId;
+    }
+}

src/main/java/com/server/UserService.java

@@ -3,13 +3,19 @@ package com.server;
 import com.dao.UserMapper;
 import com.model.po.TokenData;
 import com.model.po.User;
+import com.model.po.UserGroup;
 import com.model.pojo.RepCode;
 import com.model.pojo.RepEntity;
 import com.model.vo.configVo.LoginInfo;
+import com.model.vo.configVo.UserGroupInfo;
+import com.model.vo.configVo.UserGroupSetInfo;
 import com.util.JwtTokenUtil;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 public class UserService {
     @Autowired
@@ -31,7 +37,77 @@ public class UserService {
         }
 
         TokenData tokenData = jwtTokenUtil.createToke(user);
+        tokenData.setUser(user);
         userMapper.updateToken(tokenData.getToken(),user.getId());
         return new RepEntity(RepCode.success, tokenData);
     }
+
+    /*
+    查询用户列表
+     */
+    public RepEntity getUserList(){
+        List<User> userList = userMapper.getUserList();
+        return new RepEntity(RepCode.success, userList);
+    }
+
+
+    /*
+    创建用户组
+     */
+    public RepEntity createUserGroup(UserGroupInfo userGroupInfo){
+        UserGroup userGroup = new UserGroup();
+        BeanUtils.copyProperties(userGroupInfo,userGroup);
+        userMapper.insUserGroup(userGroup);
+        return new RepEntity(RepCode.success, userGroup.getId());
+    }
+
+    /*
+    更新用户组
+     */
+    public  RepEntity updateUserGroup(UserGroupInfo userGroupInfo){
+        UserGroup userGroup = new UserGroup();
+        BeanUtils.copyProperties(userGroupInfo,userGroup);
+        userMapper.updateUserGroup(userGroup);
+        return new RepEntity(RepCode.success);
+    }
+
+    /*
+    查询用户组
+     */
+    public RepEntity getUserGroup(){
+        List<UserGroup> userGroup= userMapper.getUserGroup();
+        return new RepEntity(RepCode.success, userGroup);
+    }
+
+    /*
+    删除用户组
+     */
+    public RepEntity delUserGroup(List<Integer> idList){
+        userMapper.delUserGroup(idList);
+        return new RepEntity(RepCode.success);
+    }
+
+    /*
+    添加用户到用户组
+     */
+    public RepEntity setUserInto(UserGroupSetInfo userGroupSetInfo){
+        userMapper.setUserInto(userGroupSetInfo);
+        return new RepEntity(RepCode.success);
+    }
+
+    /*
+    查询用户组下的用户信息
+     */
+    public RepEntity getUserInGroup(int id){
+        List<User> user = userMapper.getGroupUserList(id);
+        return new RepEntity(RepCode.success, user);
+    }
+
+    /*
+    删除用户组下的用户
+     */
+    public RepEntity delUserInGroup(UserGroupSetInfo userGroupSetInfo){
+        userMapper.delUserInGroup(userGroupSetInfo);
+        return new RepEntity(RepCode.success);
+    }
 }