更新系统管理模块

gis_admin/src/main/java/com/gis/admin/controller/LoginController.java

@@ -112,6 +112,7 @@ public class LoginController {
 
         SysRoleEntity roleEntity = getRole(userId);
         if (entity.getIsAdmin() == 1) {
+            roleEntity = new SysRoleEntity();
             // 设置角色权限
             tokenMap.put("roleKey", Arrays.asList("sys_admin"));
             roleEntity.setPerm("1,2,3");

gis_admin/src/main/java/com/gis/admin/controller/SysUserController.java

@@ -1,6 +1,7 @@
 package com.gis.admin.controller;
 
 
+import com.gis.admin.entity.dto.UserPageDateDto;
 import com.gis.common.base.aop.WebControllerLog;
 import com.gis.common.base.entity.dto.PageDateDto;
 import com.gis.common.util.Result;
@@ -33,7 +34,7 @@ public class SysUserController {
     @RequiresRoles(value = {"sys_admin"}, logical = Logical.OR)
     @ApiOperation("用户列表")
     @PostMapping("list")
-    public Result<SysUserEntity> list(@RequestBody PageDateDto param) {
+    public Result<SysUserEntity> list(@RequestBody UserPageDateDto param) {
         return userService.search(param);
     }
 

gis_admin/src/main/java/com/gis/admin/entity/dto/UserDto.java

@@ -24,8 +24,8 @@ public class UserDto {
     @ApiModelProperty(value = "管理员账号", required = true)
     private String userName;
 
-    @ApiModelProperty(value = "昵称")
-    private String nickName;
+//    @ApiModelProperty(value = "昵称")
+//    private String nickName;
 
 //    @ApiModelProperty(value = "部门")
 //    private String dept;
@@ -39,11 +39,11 @@ public class UserDto {
 //    @ApiModelProperty(value = "备注")
 //    private String remark;
 
-//    @ApiModelProperty(value = "单位")
-//    private String unit;
+    @ApiModelProperty(value = "单位")
+    private String unit;
 
-//    @ApiModelProperty(value = "地址")
-//    private String address;
+    @ApiModelProperty(value = "地址")
+    private String address;
 
 //    @NotNull(message = "启用状态不能为空")
 //    @ApiModelProperty(value = "状态 1:启用  0：停用 ")
@@ -64,6 +64,7 @@ public class UserDto {
 //    @NotNull(message = "角色不能为空")
 //    @ApiModelProperty(value = "角色，sys_admin:系统管理员，sys_high：高级管理员， sys_normal：普通管理员, sys_visitor：游客" ,required = true)
 //    private String role;
+
 //    @NotNull(message = "角色不能为空")
 //    @ApiModelProperty(value = "角色id",notes = "目前一个用户只有一个角色", required = true)
 //    private Long roleId;

gis_common/src/main/java/com/gis/common/base/entity/dto/UserPageDateDto.java

@@ -1,5 +1,6 @@
-package com.gis.common.base.entity.dto;
+package com.gis.admin.entity.dto;
 
+import com.gis.common.base.entity.dto.PageDateDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

gis_admin/src/main/java/com/gis/admin/entity/po/SysUserEntity.java

@@ -48,11 +48,27 @@ public class SysUserEntity extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "缩略图url")
     private String thumb;
 
+
+    @ApiModelProperty(value = "单位")
+    private String unit;
+
+    @ApiModelProperty(value = "地址")
+    private String address;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "角色权限")
     private String perm;
 
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "角色" ,required = true)
+    private String roleName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "角色id",notes = "目前一个用户只有一个角色", required = true)
+    private Long roleId;
+
+
 
 
 

gis_admin/src/main/java/com/gis/admin/mapper/SysUserMapper.java

@@ -2,11 +2,9 @@ package com.gis.admin.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gis.admin.mapper.provider.SysRoleProvider;
-import com.gis.admin.mapper.provider.SysUserProvider;
-import com.gis.common.base.entity.dto.UserPageDateDto;
-//import com.gis.common.base.mapper.IBaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gis.admin.entity.po.SysUserEntity;
+import com.gis.common.base.mapper.provider.BaseProvider;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.SelectProvider;
@@ -33,9 +31,12 @@ public interface SysUserMapper extends BaseMapper<SysUserEntity> {
             "left join sys_role c on c.id=b.role_id where a.is_delete = 0 ")
     List<SysUserEntity> findListMapper();
 
-    @SelectProvider(type = SysUserProvider.class, method = "search")
-    List<SysUserEntity> search(UserPageDateDto param);
+//    @SelectProvider(type = SysUserProvider.class, method = "search")
+//    List<SysUserEntity> search(UserPageDateDto param);
 
-    @Select("select a.*, c.perm as perm from sys_user a left join sys_user_role b on b.user_id=a.id left join sys_role c on c.id=b.role_id where a.is_delete=0 and a.id=#{id}")
+    @Select("select a.*, c.perm as perm,c.id as role_id, c.role_name as roleName from sys_user a left join sys_user_role b on b.user_id=a.id left join sys_role c on c.id=b.role_id where a.is_delete=0 and a.id=#{id}")
     SysUserEntity mpDetail(Long id);
+
+    @SelectProvider(type = BaseProvider.class, method = "runSql")
+    IPage<SysUserEntity> search(String sqlStr, IPage<SysUserEntity> page);
 }

gis_admin/src/main/java/com/gis/admin/mapper/provider/SysUserProvider.java

@@ -1,54 +1,53 @@
-package com.gis.admin.mapper.provider;
-
-import com.gis.common.base.entity.dto.UserPageDateDto;
-import lombok.extern.log4j.Log4j2;
-import org.apache.commons.lang3.StringUtils;
-
-
-/**
- * Created by owen on 2020/6/13 0013 10:56
- */
-@Log4j2
-public class SysUserProvider {
-
-
-
-
-    public String search(UserPageDateDto param) {
-        StringBuffer sql = new StringBuffer(
-                "select a.*, b.role_id as roleId, c.role_name as roleName, c.role_key as roleKey from sys_user a " +
-                        "left join sys_user_role b on b.user_id = a.id " +
-                        "left join sys_role c on c.id=b.role_id where a.is_delete = 0 ");
-
-
-        if (StringUtils.isNotBlank(param.getStartTime()) && StringUtils.isNotBlank(param.getEndTime())) {
-
-            sql.append(" and a.create_time >= ").append("'").append(param.getStartTime()).append("'");
-            sql.append(" and a.create_time <= ").append("'").append(param.getEndTime()).append("'");
-        }
-
-        String searchKey = param.getSearchKey();
-        if (!StringUtils.isAllBlank(searchKey)) {
-            searchKey = StringUtils.trim(searchKey);
-            sql.append(" and (");
-            sql.append( "a.real_name like '%").append(searchKey).append("%'");
-//            sql.append( " or a.unit like '%").append(searchKey).append("%'");
-            sql.append(")");
-        }
-
-        Long roleId = param.getRoleId();
-        if (roleId != null) {
-            sql.append(" and c.id=").append(roleId);
-        }
-
-
-        sql.append(" order by a.create_time desc");
-        log.info("sql: {}", sql.toString());
-        return sql.toString();
-    }
-
-
-}
-
-
-
+//package com.gis.admin.mapper.provider;
+//
+//import lombok.extern.log4j.Log4j2;
+//import org.apache.commons.lang3.StringUtils;
+//
+//
+///**
+// * Created by owen on 2020/6/13 0013 10:56
+// */
+//@Log4j2
+//public class SysUserProvider {
+//
+//
+//
+//
+//    public String search(UserPageDateDto param) {
+//        StringBuffer sql = new StringBuffer(
+//                "select a.*, b.role_id as roleId, c.role_name as roleName, c.role_key as roleKey from sys_user a " +
+//                        "left join sys_user_role b on b.user_id = a.id " +
+//                        "left join sys_role c on c.id=b.role_id where a.is_delete = 0 ");
+//
+//
+//        if (StringUtils.isNotBlank(param.getStartTime()) && StringUtils.isNotBlank(param.getEndTime())) {
+//
+//            sql.append(" and a.create_time >= ").append("'").append(param.getStartTime()).append("'");
+//            sql.append(" and a.create_time <= ").append("'").append(param.getEndTime()).append("'");
+//        }
+//
+//        String searchKey = param.getSearchKey();
+//        if (!StringUtils.isAllBlank(searchKey)) {
+//            searchKey = StringUtils.trim(searchKey);
+//            sql.append(" and (");
+//            sql.append( "a.real_name like '%").append(searchKey).append("%'");
+////            sql.append( " or a.unit like '%").append(searchKey).append("%'");
+//            sql.append(")");
+//        }
+//
+//        Long roleId = param.getRoleId();
+//        if (roleId != null) {
+//            sql.append(" and c.id=").append(roleId);
+//        }
+//
+//
+//        sql.append(" order by a.create_time desc");
+//        log.info("sql: {}", sql.toString());
+//        return sql.toString();
+//    }
+//
+//
+//}
+//
+//
+//

gis_admin/src/main/java/com/gis/admin/service/SysUserService.java

@@ -2,12 +2,9 @@ package com.gis.admin.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.gis.admin.entity.dto.ResetPasswordDto;
+import com.gis.admin.entity.dto.*;
 import com.gis.common.base.entity.dto.PageDateDto;
 import com.gis.common.util.Result;
-import com.gis.admin.entity.dto.PasswordDto;
-import com.gis.admin.entity.dto.UserDto;
-import com.gis.admin.entity.dto.RegisterDto;
 import com.gis.admin.entity.po.SysUserEntity;
 
 
@@ -23,7 +20,7 @@ public interface SysUserService extends IService<SysUserEntity> {
 
     Result removes(String ids);
 
-    Result<SysUserEntity> search(PageDateDto param);
+    Result<SysUserEntity> search(UserPageDateDto param);
 
     Result updatePwd(PasswordDto param);
 

gis_admin/src/main/java/com/gis/admin/service/impl/SysUserServiceImpl.java

@@ -1,26 +1,14 @@
 package com.gis.admin.service.impl;
 
 import cn.hutool.core.util.RandomUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gis.admin.entity.dto.ResetPasswordDto;
-import com.gis.admin.entity.po.SysRoleEntity;
-import com.gis.common.base.entity.dto.PageDateDto;
-import com.gis.common.base.entity.dto.UserPageDateDto;
-import com.gis.common.base.entity.po.LogEntity;
+import com.gis.admin.entity.dto.*;
 import com.gis.common.base.exception.BaseRuntimeException;
-//import com.gis.common.base.service.LogService;
-//import com.gis.common.base.service.impl.MyBaseServiceImpl;
 import com.gis.common.util.*;
-import com.gis.admin.entity.dto.PasswordDto;
-import com.gis.admin.entity.dto.UserDto;
-import com.gis.admin.entity.dto.RegisterDto;
 import com.gis.admin.entity.po.SysUserEntity;
 import com.gis.admin.mapper.SysUserMapper;
-import com.gis.admin.service.SysRoleService;
 import com.gis.admin.service.SysUserService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -32,7 +20,6 @@ import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Set;
 
 
 /**
@@ -103,28 +90,68 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUserEntity
         return Result.success();
     }
 
+//    @Override
+//    public Result<SysUserEntity> search(PageDateDto param) {
+//        BaseUtil.startPage(param);
+//
+//        IPage<SysUserEntity> page = new Page<>(param.getPageNum() , param.getPageSize());
+//        LambdaQueryWrapper<SysUserEntity> wrapper = new LambdaQueryWrapper<>();
+//
+//
+//        String startTime = param.getStartTime();
+//        String endTime = param.getEndTime();
+//        if (StringUtils.isNotBlank(startTime) || StringUtils.isNotBlank(endTime)){
+//            wrapper.between(SysUserEntity::getCreateTime, startTime, endTime);
+//        }
+//
+//        String searchKey = param.getSearchKey();
+//        if (StringUtils.isNotBlank(searchKey)){
+//            wrapper.like(SysUserEntity::getUserName, searchKey);
+//        }
+//
+//        wrapper.orderByDesc(SysUserEntity::getCreateTime);
+//
+//        IPage<SysUserEntity> result = this.page(page, wrapper);
+//
+//        return Result.success(result);
+//    }
+
     @Override
-    public Result<SysUserEntity> search(PageDateDto param) {
+    public Result<SysUserEntity> search(UserPageDateDto param) {
         BaseUtil.startPage(param);
 
-        IPage<SysUserEntity> page = new Page<>(param.getPageNum() , param.getPageSize());
-        LambdaQueryWrapper<SysUserEntity> wrapper = new LambdaQueryWrapper<>();
-
+        StringBuffer sql = new StringBuffer();
+        sql.append("select a.*, c.role_name as roleName, c.id as roleId from sys_user a");
+        sql.append(" left join sys_user_role b on b.user_id=a.id");
+        sql.append(" left join sys_role c on c.id=b.role_id");
+        sql.append(" where a.is_delete=0 ");
 
         String startTime = param.getStartTime();
         String endTime = param.getEndTime();
         if (StringUtils.isNotBlank(startTime) || StringUtils.isNotBlank(endTime)){
-            wrapper.between(SysUserEntity::getCreateTime, startTime, endTime);
+            sql.append(" and a.create_time >= ").append("'").append(startTime).append("'");
+            sql.append(" and a.create_time <= ").append("'").append(endTime).append("'");
         }
 
         String searchKey = param.getSearchKey();
-        if (StringUtils.isNotBlank(searchKey)){
-            wrapper.like(SysUserEntity::getUserName, searchKey);
+        if (!StringUtils.isAllBlank(searchKey)) {
+            searchKey = StringUtils.trim(searchKey);
+            sql.append(" and (");
+            sql.append( "a.real_name like '%").append(searchKey).append("%'");
+//            sql.append( " or a.unit like '%").append(searchKey).append("%'");
+            sql.append(")");
         }
 
-        wrapper.orderByDesc(SysUserEntity::getCreateTime);
+        Long roleId = param.getRoleId();
+        if (roleId != null) {
+            sql.append(" and c.id=").append(roleId);
+        }
 
-        IPage<SysUserEntity> result = this.page(page, wrapper);
+        sql.append(" order by a.create_time desc");
+//        log.info("sql: {}", sql.toString());
+
+        IPage<SysUserEntity> page = new Page<>(param.getPageNum() , param.getPageSize());
+        IPage<SysUserEntity> result = entityMapper.search(sql.toString(), page);
 
         return Result.success(result);
     }
@@ -132,6 +159,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUserEntity
 
 
 
+
     @Override
     public Result updatePwd(PasswordDto param) {
         // 密码加密了，需要解密

gis_common/src/main/java/com/gis/common/base/mapper/provider/BaseProvider.java

@@ -9,9 +9,9 @@ import lombok.extern.slf4j.Slf4j;
 @Slf4j
 public class BaseProvider {
 
-    public String runSql(String sql){
-        log.info("sql: {}", sql);
-        return sql;
+    public String runSql(String sqlStr){
+        log.info("sqlStr: {}", sqlStr);
+        return sqlStr;
     }