代码优化

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/LoginDto.java

@@ -0,0 +1,82 @@
+package com.qmth.distributed.print.business.bean.dto;
+
+import java.util.List;
+
+/**
+ * @Date: 2021/4/2.
+ */
+public class LoginDto {
+
+    private String id;
+    private String schoolId;
+    private String loginName;
+    private String realName;
+    private String orgId;
+    private Boolean enable;
+    private List<String> roles;
+    private Long pwdUpdateTime;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(String schoolId) {
+        this.schoolId = schoolId;
+    }
+
+    public String getLoginName() {
+        return loginName;
+    }
+
+    public void setLoginName(String loginName) {
+        this.loginName = loginName;
+    }
+
+    public String getRealName() {
+        return realName;
+    }
+
+    public void setRealName(String realName) {
+        this.realName = realName;
+    }
+
+    public String getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(String orgId) {
+        this.orgId = orgId;
+    }
+
+    public Boolean getEnable() {
+        return enable;
+    }
+
+    public void setEnable(Boolean enable) {
+        this.enable = enable;
+    }
+
+    public List<String> getRoles() {
+        return roles;
+    }
+
+    public void setRoles(List<String> roles) {
+        this.roles = roles;
+    }
+
+    public Long getPwdUpdateTime() {
+        return pwdUpdateTime;
+    }
+
+    public void setPwdUpdateTime(Long pwdUpdateTime) {
+        this.pwdUpdateTime = pwdUpdateTime;
+    }
+}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/SchoolDto.java

@@ -0,0 +1,35 @@
+package com.qmth.distributed.print.business.bean.dto;
+
+/**
+ * @Date: 2021/4/2.
+ */
+public class SchoolDto {
+
+    private String id;
+    private String name;
+    private Boolean enable;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Boolean getEnable() {
+        return enable;
+    }
+
+    public void setEnable(Boolean enable) {
+        this.enable = enable;
+    }
+}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/BasicSchoolMapper.java

@@ -1,8 +1,11 @@
 package com.qmth.distributed.print.business.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qmth.distributed.print.business.bean.dto.SchoolDto;
 import com.qmth.distributed.print.business.entity.BasicSchool;
 
+import java.util.List;
+
 /**
  * <p>
  * 学校表 Mapper 接口
@@ -13,4 +16,5 @@ import com.qmth.distributed.print.business.entity.BasicSchool;
  */
 public interface BasicSchoolMapper extends BaseMapper<BasicSchool> {
 
+    List<SchoolDto> listSchool();
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/SysUserRoleMapper.java

@@ -1,8 +1,11 @@
 package com.qmth.distributed.print.business.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qmth.distributed.print.business.entity.SysRole;
 import com.qmth.distributed.print.business.entity.SysUserRole;
 
+import java.util.List;
+
 /**
  * <p>
  * 用户和角色关联表 Mapper 接口
@@ -13,4 +16,5 @@ import com.qmth.distributed.print.business.entity.SysUserRole;
  */
 public interface SysUserRoleMapper extends BaseMapper<SysUserRole> {
 
+    List<SysRole> listRoleByUserId(Long userId);
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/BasicSchoolService.java

@@ -1,8 +1,11 @@
 package com.qmth.distributed.print.business.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.qmth.distributed.print.business.bean.dto.SchoolDto;
 import com.qmth.distributed.print.business.entity.BasicSchool;
 
+import java.util.List;
+
 /**
  * <p>
  * 学校表 服务类
@@ -13,4 +16,5 @@ import com.qmth.distributed.print.business.entity.BasicSchool;
  */
 public interface BasicSchoolService extends IService<BasicSchool> {
 
+    List<SchoolDto> listSchool();
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/SysPrivilegeService.java

@@ -22,5 +22,5 @@ public interface SysPrivilegeService extends IService<SysPrivilege> {
 
     boolean remove(Long id);
 
-    List<Long> getRolePrivileges(Long roleId);
+    List<String> getRolePrivileges(Long roleId);
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/SysUserRoleService.java

@@ -1,6 +1,7 @@
 package com.qmth.distributed.print.business.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.qmth.distributed.print.business.entity.SysRole;
 import com.qmth.distributed.print.business.entity.SysUserRole;
 
 import java.util.List;
@@ -16,4 +17,6 @@ import java.util.List;
 public interface SysUserRoleService extends IService<SysUserRole> {
 
     List<SysUserRole> listByRoleId(Long id);
+
+    List<SysRole> listRoleByUserId(Long id);
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/SysUserService.java

@@ -2,6 +2,7 @@ package com.qmth.distributed.print.business.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.qmth.distributed.print.business.bean.dto.LoginDto;
 import com.qmth.distributed.print.business.bean.dto.UserDto;
 import com.qmth.distributed.print.business.bean.query.UserParam;
 import com.qmth.distributed.print.business.entity.SysUser;
@@ -28,4 +29,5 @@ public interface SysUserService extends IService<SysUser> {
 
     boolean bindRoles(SysUser sysUser);
 
+    LoginDto getUserRoles(SysUser sysUser);
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/BasicSchoolServiceImpl.java

@@ -1,11 +1,14 @@
 package com.qmth.distributed.print.business.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qmth.distributed.print.business.bean.dto.SchoolDto;
 import com.qmth.distributed.print.business.entity.BasicSchool;
 import com.qmth.distributed.print.business.mapper.BasicSchoolMapper;
 import com.qmth.distributed.print.business.service.BasicSchoolService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 学校表 服务实现类
@@ -17,4 +20,8 @@ import org.springframework.stereotype.Service;
 @Service
 public class BasicSchoolServiceImpl extends ServiceImpl<BasicSchoolMapper, BasicSchool> implements BasicSchoolService {
 
+    @Override
+    public List<SchoolDto> listSchool() {
+        return this.baseMapper.listSchool();
+    }
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/SysPrivilegeServiceImpl.java

@@ -101,13 +101,13 @@ public class SysPrivilegeServiceImpl extends ServiceImpl<SysPrivilegeMapper, Sys
     }
 
     @Override
-    public List<Long> getRolePrivileges(Long roleId) {
+    public List<String> getRolePrivileges(Long roleId) {
         QueryWrapper<SysRolePrivilege> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(SysRolePrivilege::getRoleId, roleId);
         List<SysRolePrivilege> sysRolePrivileges = sysRolePrivilegeService.list(queryWrapper);
-        List<Long> list = null;
+        List<String> list = null;
         if (sysRolePrivileges != null && sysRolePrivileges.size() > 0) {
-            list = sysRolePrivileges.stream().map(m -> m.getPrivilegeId()).collect(Collectors.toList());
+            list = sysRolePrivileges.stream().map(m -> String.valueOf(m.getPrivilegeId())).collect(Collectors.toList());
         }
         return list;
     }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/SysUserRoleServiceImpl.java

@@ -2,6 +2,7 @@ package com.qmth.distributed.print.business.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qmth.distributed.print.business.entity.SysRole;
 import com.qmth.distributed.print.business.entity.SysUserRole;
 import com.qmth.distributed.print.business.mapper.SysUserRoleMapper;
 import com.qmth.distributed.print.business.service.SysUserRoleService;
@@ -26,4 +27,9 @@ public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleMapper, SysUs
         queryWrapper.lambda().eq(SysUserRole::getRoleId, id);
         return this.list(queryWrapper);
     }
+
+    @Override
+    public List<SysRole> listRoleByUserId(Long userId) {
+        return this.baseMapper.listRoleByUserId(userId);
+    }
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/SysUserServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qmth.distributed.print.business.bean.dto.LoginDto;
 import com.qmth.distributed.print.business.bean.dto.UserDto;
 import com.qmth.distributed.print.business.entity.BasicCourse;
 import com.qmth.distributed.print.business.entity.SysRole;
@@ -21,8 +22,10 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -195,4 +198,25 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         return sysUserRoleService.saveBatch(list);
     }
 
+    @Override
+    public LoginDto getUserRoles(SysUser sysUser) {
+        LoginDto loginDto = new LoginDto();
+        loginDto.setId(String.valueOf(sysUser.getId()));
+        loginDto.setSchoolId(String.valueOf(sysUser.getSchoolId()));
+        loginDto.setLoginName(sysUser.getLoginName());
+        loginDto.setRealName(sysUser.getRealName());
+        loginDto.setOrgId(String.valueOf(sysUser.getOrgId()));
+        loginDto.setEnable(sysUser.getEnable());
+        loginDto.setPwdUpdateTime(sysUser.getPwdUpdateTime());
+
+        if("sysadmin".equals(sysUser.getLoginName())){
+            loginDto.setRoles(Arrays.asList("ADMIN"));
+        } else {
+            List<SysRole> list = sysUserRoleService.listRoleByUserId(sysUser.getId());
+            List<String> roles = list.stream().map(m -> m.getType().name()).collect(Collectors.toList());
+            loginDto.setRoles(roles);
+        }
+        return loginDto;
+    }
+
 }

distributed-print-business/src/main/resources/mapper/BasicSchoolMapper.xml

@@ -20,5 +20,8 @@
         id,
         code, name, enable, access_key, access_secret, remark, create_time, update_time
     </sql>
+    <select id="listSchool" resultType="com.qmth.distributed.print.business.bean.dto.SchoolDto">
+        select id, name, enable from basic_school where enable = true
+    </select>
 
 </mapper>

distributed-print-business/src/main/resources/mapper/SysPrivilegeMapper.xml

@@ -5,23 +5,19 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.qmth.distributed.print.business.entity.SysPrivilege">
     <result column="id" property="id" />
-        <result column="school_id" property="schoolId" />
         <result column="name" property="name" />
         <result column="url" property="url" />
         <result column="type" property="type" />
         <result column="parent_id" property="parentId" />
-        <result column="sort_number" property="sortNumber" />
+        <result column="sequence" property="sequence" />
         <result column="remark" property="remark" />
-        <result column="create_id" property="createId" />
         <result column="create_time" property="createTime" />
-        <result column="update_id" property="updateId" />
-        <result column="update_time" property="updateTime" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id,
-        school_id, name, url, type, parent_id, sort_number, remark, create_id, create_time, update_id, update_time
+        school_id, name, url, type, parent_id, sequence, remark, create_id, create_time, update_id, update_time
     </sql>
 
 </mapper>

distributed-print-business/src/main/resources/mapper/SysUserRoleMapper.xml

@@ -11,8 +11,17 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id,
-        user_id, role_id
+        select id, user_id, role_id from sys_user_role
     </sql>
+    <select id="listRoleByUserId" resultMap="com.qmth.distributed.print.business.mapper.SysRoleMapper.BaseResultMap">
+        SELECT
+            *
+        FROM
+            sys_user_role a
+                LEFT JOIN
+            sys_role b ON a.role_id = b.id
+        WHERE
+            a.user_id = #{userId}
+    </select>
 
 </mapper>

distributed-print/src/main/java/com/qmth/distributed/print/api/BasicSchoolController.java

@@ -1,10 +1,23 @@
 package com.qmth.distributed.print.api;
 
 
+import com.qmth.boot.api.annotation.Aac;
+import com.qmth.boot.api.annotation.BOOL;
+import com.qmth.boot.api.constant.ApiConstant;
+import com.qmth.distributed.print.business.bean.dto.SchoolDto;
+import com.qmth.distributed.print.business.service.BasicSchoolService;
+import com.qmth.distributed.print.common.util.Result;
+import com.qmth.distributed.print.common.util.ResultUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
-
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
 /**
  * <p>
  * 学校表 前端控制器
@@ -13,9 +26,20 @@ import org.springframework.web.bind.annotation.RestController;
  * @author xf
  * @since 2021-03-23
  */
+@Api(tags = "学校Controller")
 @RestController
-@RequestMapping("/basicSchool")
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.common}/school")
+@Aac(auth = BOOL.FALSE)
 public class BasicSchoolController {
 
+    @Autowired
+    private BasicSchoolService basicSchoolService;
+
+    @ApiOperation(value = "查询")
+    @RequestMapping(value = "/list", method = RequestMethod.POST)
+    public Result list(HttpServletRequest request) {
+        List<SchoolDto> list = basicSchoolService.listSchool();
+        return ResultUtil.ok(list);
+    }
 }
 

distributed-print/src/main/java/com/qmth/distributed/print/api/SysController.java

@@ -94,7 +94,7 @@ public class SysController {
             throw ExceptionResultEnum.ERROR.exception("用户已禁用");
         }
         JSONObject jsonObject = new JSONObject();
-        jsonObject.put("user", sysUser);
+        jsonObject.put("user", sysUserService.getUserRoles(sysUser));
         jsonObject.put("token", UUID.fastUUID().toString());
         return ResultUtil.ok(jsonObject);
     }

distributed-print/src/main/java/com/qmth/distributed/print/api/SysPrivilegeController.java

@@ -87,7 +87,7 @@ public class SysPrivilegeController {
     @ApiOperation(value = "角色已绑定权限列表")
     @RequestMapping(value = "/get_role_privileges", method = RequestMethod.POST)
     public Result getRolePrivileges(@RequestParam(value = "roleId", required = true) Long roleId) {
-        List<Long> list = sysPrivilegeService.getRolePrivileges(roleId);
+        List<String> list = sysPrivilegeService.getRolePrivileges(roleId);
         return ResultUtil.ok(list);
     }
 }