修改代码生成

nladmin-system/nlsso-server/src/main/java/org/nl/common/BaseQuery.java

@@ -19,6 +19,7 @@ import java.util.function.Function;
 @Data
 public class BaseQuery<T> {
 
+   public Map<String, QueryType> doP = MapOf.of("blurry",QueryType.LK);
 
     private String blurry;
 
@@ -30,10 +31,6 @@ public class BaseQuery<T> {
 
     private String sort;
 
-    private Integer page;
-
-    private Integer size;
-
     public QueryWrapper<T> convertQ(){
         QueryWrapper<T> wrapper = new QueryWrapper<>();
         JSONObject json = (JSONObject)JSONObject.toJSON(this);

nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/CodeGenerator.java

@@ -51,7 +51,7 @@ public class CodeGenerator {
 //        gc.setSwagger2(true);
         gc.setEntityName("%s");
         gc.setServiceName("I%sService");
-        gc.setServiceImplName("I%sServiceImpl");
+        gc.setServiceImplName("%sServiceImpl");
         mpg.setGlobalConfig(gc);
         // 数据源配置
         DataSourceConfig dsc = new DataSourceConfig();

nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/SysUserController.java

@@ -0,0 +1,26 @@
+package org.nl.system.controller.user;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.apache.catalina.User;
+import org.nl.system.service.user.dto.UserQuery;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 用户表 前端控制器
+ * </p>
+ *
+ * @author generator
+ * @since 2022-12-15
+ */
+@RestController
+@RequestMapping("/sysUser")
+public class SysUserController {
+    public static void main(String[] args) {
+        UserQuery userQuery = new UserQuery();
+        QueryWrapper<User> wrapper = userQuery.convertQ();
+    }
+}
+

nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java

@@ -1,196 +0,0 @@
-/*
- *  Copyright 2019-2020 Zheng Jie
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.nl.system.controller.user;
-
-import cn.dev33.satoken.secure.SaSecureUtil;
-import cn.dev33.satoken.stp.StpUtil;
-import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.nl.modules.common.config.RsaProperties;
-import org.nl.modules.common.exception.BadRequestException;
-import org.nl.modules.common.utils.RedisUtils;
-import org.nl.modules.common.utils.RsaUtils;
-import org.nl.modules.common.utils.SecurityUtils;
-import org.nl.modules.logging.annotation.Log;
-import org.nl.modules.system.service.dto.UserQueryCriteria;
-import org.nl.system.service.user.UserService;
-import org.nl.system.service.user.dao.User;
-import org.nl.system.service.user.dto.UserQuery;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Pageable;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.HashMap;
-import java.util.Set;
-import java.util.function.BiPredicate;
-
-/**
- * @author Zheng Jie
- * @date 2018-11-23
- */
-@Api(tags = "系统：用户管理")
-@RestController
-@RequestMapping("/api/users")
-@RequiredArgsConstructor
-public class UserController {
-
-    @Autowired
-    UserService userService;
-
-    public static void main(String[] args) {
-        UserQuery query = new UserQuery();
-        query.setDeptId(123L);
-        query.setBlurry("zzddfd");
-        QueryWrapper<User> userQueryWrapper = query.convertQ();
-
-        System.out.println(userQueryWrapper);
-    }
-
-    @ApiOperation("查询用户")
-    @GetMapping
-//    @SaCheckPermission("user:list")
-    public ResponseEntity<Object> query(UserQuery query){
-        QueryWrapper<User> query1 = new QueryWrapper<User>();
-        UpdateWrapper<User> wrapper = new UpdateWrapper<>();
-
-//        query1.allEq(new BiPredicate<String, Object>() {
-//            @Override
-//            public boolean test(String s, Object o) {
-//                return false;
-//            }
-//        },
-//        Page page = userService.page(new Page<>(query.getPage(),query.getSize()),)
-        return new ResponseEntity<>(null,HttpStatus.OK);
-    }
-
-    @Log("新增用户")
-    @ApiOperation("新增用户")
-    @PostMapping
-//    @SaCheckPermission("user:add")
-    public ResponseEntity<Object> create(@Validated @RequestBody User resources){
-        checkLevel(resources);
-        // 默认密码 123456
-        if (ObjectUtil.isEmpty(resources.getPassword())) {
-            resources.setPassword(SaSecureUtil.md5BySalt("123456", "salt"));
-        } else {
-            resources.setPassword(SaSecureUtil.md5BySalt(resources.getPassword(), "salt"));
-        }
-        userService.save(resources);
-        return new ResponseEntity<>(HttpStatus.CREATED);
-    }
-
-    @Log("修改用户")
-    @ApiOperation("修改用户")
-    @PutMapping
-//    @SaCheckPermission("user:edit")
-    public ResponseEntity<Object> update( @RequestBody User resources) throws Exception {
-        checkLevel(resources);
-        userService.saveOrUpdate(resources);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @Log("修改用户：个人中心")
-    @ApiOperation("修改用户：个人中心")
-//    @PutMapping(value = "center")
-    public ResponseEntity<Object> center(@RequestBody User resources){
-        if(!resources.getUserId().equals(StpUtil.getLoginIdAsLong())){
-            throw new BadRequestException("不能修改他人资料");
-        }
-        userService.saveOrUpdate(resources);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @Log("删除用户")
-    @ApiOperation("删除用户")
-    @DeleteMapping
-//    @SaCheckPermission("user:del")
-    public ResponseEntity<Object> delete(@RequestBody Set<Long> ids) {
-        for (Long id : ids) {
-           /* Integer currentLevel =  Collections.min(roleService.findByUsersId(StpUtil.getLoginIdAsLong()).stream().map(Role::getLevel).collect(Collectors.toList()));
-            Integer optLevel =  Collections.min(roleService.findByUsersId(id).stream().map(Role::getLevel).collect(Collectors.toList()));
-            if (currentLevel > optLevel) {
-                throw new BadRequestException("角色权限不足，不能删除：" + userService.findById(id).getUsername());
-            }*/
-            // 删除缓存信息
-//            User userDto = userService.findById(id);
-//            redisUtils.del("data::user:" + userDto.getUser_id());
-//            redisUtils.del("menu::user:" + userDto.getUser_id());
-//            redisUtils.del("role::auth:" + userDto.getUser_id());
-//            redisUtils.del("user::username:" + userDto.getUsername());
-        }
-        userService.removeByIds(ids);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-
-   /* @ApiOperation("修改密码")
-    @PostMapping(value = "/updatePass")
-    public ResponseEntity<Object> updatePass(@RequestBody UserPassVo passVo) throws Exception {
-        // 解密，得到字符密码
-        String oldPass = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey,passVo.getOldPass());
-        String newPass = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey,passVo.getNewPass());
-        User user = userService.findByName(SecurityUtils.getCurrentUsername());
-        if (!SaSecureUtil.md5BySalt(user.getPassword(), "salt").equals(SaSecureUtil.md5BySalt(oldPass, "salt"))) {
-            throw new BadRequestException("修改失败，旧密码错误");
-        }
-        if (!SaSecureUtil.md5BySalt(user.getPassword(), "salt").equals(SaSecureUtil.md5BySalt(newPass, "salt"))) {
-            throw new BadRequestException("新密码不能与旧密码相同");
-        }
-        userService.updatePass(user.getUsername(),SaSecureUtil.md5BySalt(newPass, "salt"));
-        return new ResponseEntity<>(HttpStatus.OK);
-    }*/
-
-    @ApiOperation("修改头像")
-    @PostMapping(value = "/updateAvatar")
-    public ResponseEntity<Object> updateAvatar(@RequestParam MultipartFile avatar){
-        return new ResponseEntity<>(userService.updateAvatar(avatar), HttpStatus.OK);
-    }
-
-    @Log("修改邮箱")
-    @ApiOperation("修改邮箱")
-    @PostMapping(value = "/updateEmail/{code}")
-    public ResponseEntity<Object> updateEmail(@PathVariable String code,@RequestBody User user) throws Exception {
-        String password = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey,user.getPassword());
-        User userInfo = userService.getOne(new QueryWrapper<User>().eq("username",SecurityUtils.getCurrentUsername()));
-        if(!SaSecureUtil.md5BySalt(userInfo.getPassword(), "salt").equals(SaSecureUtil.md5BySalt(password, "salt"))){
-            throw new BadRequestException("密码错误");
-        }
-        userService.update(new UpdateWrapper<User>().set(userInfo.getUsername(),user.getEmail()));
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-
-    /**
-     * 如果当前用户的角色级别低于创建用户的角色级别，则抛出权限不足的错误
-     * @param resources /
-     */
-    private void checkLevel(User resources) {
-//        Integer currentLevel =  Collections.min(roleService.findByUsersId(StpUtil.getLoginIdAsLong()).stream().map(RoleSmallDto::getLevel).collect(Collectors.toList()));
-//        Integer optLevel = roleService.findByRoles(resources.getRoles());
-//        if (currentLevel > optLevel) {
-//            throw new BadRequestException("角色权限不足");
-//        }
-    }
-}

nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/ISysUserService.java

@@ -0,0 +1,16 @@
+package org.nl.system.service.user;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.nl.system.service.user.dao.SysUser;
+
+/**
+ * <p>
+ * 用户表 服务类
+ * </p>
+ *
+ * @author generator
+ * @since 2022-12-15
+ */
+public interface ISysUserService extends IService<SysUser> {
+
+}

nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/UserService.java

@@ -1,21 +0,0 @@
-package org.nl.system.service.user;
-
-import org.nl.system.service.user.dao.User;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.Map;
-
-/**
- * <p>
- * 用户表 服务类
- * </p>
- *
- * @author generator
- * @since 2022-12-14
- */
-public interface UserService extends IService<User> {
-
-    Map<String, String> updateAvatar(MultipartFile multipartFile);
-
-}

nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/SysUser.java

@@ -0,0 +1,133 @@
+package org.nl.system.service.user.dao;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 用户表
+ * </p>
+ *
+ * @author generator
+ * @since 2022-12-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("sys_user")
+public class SysUser implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户标识
+     */
+    @TableId(value = "user_id", type = IdType.AUTO)
+    private Long userId;
+
+    /**
+     * 登录账号
+     */
+    private String username;
+
+    /**
+     * 姓名
+     */
+    private String personName;
+
+    /**
+     * 性别
+     */
+    private String gender;
+
+    /**
+     * 电话
+     */
+    private String phone;
+
+    /**
+     * 电子邮箱
+     */
+    private String email;
+
+    /**
+     * 头像地址
+     */
+    private String avatarName;
+
+    /**
+     * 头像真实路径
+     */
+    private String avatarPath;
+
+    /**
+     * 密码
+     */
+    private String password;
+
+    /**
+     * 是否为admin账号
+     */
+    private String isAdmin;
+
+    /**
+     * 是否启用
+     */
+    private String isUsed;
+
+    /**
+     * 密码重置者
+     */
+    private String pwdResetUserId;
+
+    /**
+     * 密码重置时间
+     */
+    private String pwdResetTime;
+
+    /**
+     * 创建人标识
+     */
+    private Long createId;
+
+    /**
+     * 创建人
+     */
+    private String createName;
+
+    /**
+     * 创建时间
+     */
+    private String createTime;
+
+    /**
+     * 修改人标识
+     */
+    private Long updateOptid;
+
+    /**
+     * 修改人
+     */
+    private String updateOptname;
+
+    /**
+     * 修改时间
+     */
+    private String updateTime;
+
+    /**
+     * 外部人员标识
+     */
+    private String extpersonId;
+
+    /**
+     * 外部用户标识
+     */
+    private String extuserId;
+
+
+}

nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.java

@@ -1,7 +1,7 @@
 package org.nl.system.service.user.dao.mapper;
 
-import org.nl.system.service.user.dao.User;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.nl.system.service.user.dao.SysUser;
 
 /**
  * <p>
@@ -9,8 +9,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author generator
- * @since 2022-12-14
+ * @since 2022-12-15
  */
-public interface UserMapper extends BaseMapper<User> {
+public interface SysUserMapper extends BaseMapper<SysUser> {
 
 }

nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.system.service.user.dao.mapper.UserMapper">
+<mapper namespace="org.nl.system.service.user.dao.mapper.SysUserMapper">
 
 </mapper>

nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dto/UserQuery.java

@@ -1,21 +1,13 @@
 package org.nl.system.service.user.dto;
 
-import lombok.Data;
-import org.apache.poi.ss.formula.functions.T;
+import org.apache.catalina.User;
 import org.nl.common.BaseQuery;
-import org.nl.system.service.user.dao.User;
-
-import java.util.HashSet;
-import java.util.Set;
 
 /*
  * @author ZZQ
- * @Date 2022/12/14 6:35 下午
+ * @Date 2022/12/15 9:53 上午
  */
-@Data
 public class UserQuery extends BaseQuery<User> {
 
-    private Set<Long> deptIds;
 
-    private Long deptId;
 }

nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java

@@ -0,0 +1,20 @@
+package org.nl.system.service.user.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.nl.system.service.user.ISysUserService;
+import org.nl.system.service.user.dao.SysUser;
+import org.nl.system.service.user.dao.mapper.SysUserMapper;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 用户表 服务实现类
+ * </p>
+ *
+ * @author generator
+ * @since 2022-12-15
+ */
+@Service
+public class ISysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements ISysUserService {
+
+}

nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/impl/UserServiceImpl.java

@@ -1,50 +0,0 @@
-package org.nl.system.service.user.impl;
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import org.nl.modules.common.config.FileProperties;
-import org.nl.modules.common.utils.FileUtil;
-import org.nl.modules.common.utils.SecurityUtils;
-import org.nl.system.service.user.dao.User;
-import org.nl.system.service.user.dao.mapper.UserMapper;
-import org.nl.system.service.user.UserService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-
-/**
- * <p>
- * 用户表 服务实现类
- * </p>
- *
- * @author generator
- * @since 2022-12-14
- */
-@Service
-public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements UserService {
-
-    @Autowired
-    private  FileProperties properties;
-
-    @Override
-    public Map<String, String> updateAvatar(MultipartFile multipartFile) {
-        User user = this.getOne(new QueryWrapper<User>().eq("username", SecurityUtils.getCurrentUsername()));
-        String oldPath = user.getAvatarPath();
-        File file = FileUtil.upload(multipartFile, properties.getPath().getAvatar());
-        user.setAvatarPath(Objects.requireNonNull(file).getPath());
-        user.setAvatarName(file.getName());
-        this.saveOrUpdate(user);
-        if (StrUtil.isNotEmpty(oldPath)) {
-            FileUtil.del(oldPath);
-        }
-        return new HashMap<String, String>(1) {{
-            put("avatar", file.getName());
-        }};
-    }
-}

nladmin-system/src/main/java/org/nl/system/controller/user/SysUserController.java

@@ -0,0 +1,21 @@
+package org.nl.system.controller.user;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 用户表 前端控制器
+ * </p>
+ *
+ * @author generator
+ * @since 2022-12-15
+ */
+@RestController
+@RequestMapping("/sysUser")
+public class SysUserController {
+
+}
+

nladmin-system/src/main/java/org/nl/system/service/user/ISysUserService.java

@@ -0,0 +1,16 @@
+package org.nl.system.service.user;
+
+import org.nl.system.service.user.dao.SysUser;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 用户表 服务类
+ * </p>
+ *
+ * @author generator
+ * @since 2022-12-15
+ */
+public interface ISysUserService extends IService<SysUser> {
+
+}

nladmin-system/src/main/java/org/nl/system/service/user/dao/SysUser.java

@@ -13,12 +13,12 @@ import lombok.EqualsAndHashCode;
  * </p>
  *
  * @author generator
- * @since 2022-12-14
+ * @since 2022-12-15
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
 @TableName("sys_user")
-public class User implements Serializable {
+public class SysUser implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

nladmin-system/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.java

@@ -0,0 +1,16 @@
+package org.nl.system.service.user.dao.mapper;
+
+import org.nl.system.service.user.dao.SysUser;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 用户表 Mapper 接口
+ * </p>
+ *
+ * @author generator
+ * @since 2022-12-15
+ */
+public interface SysUserMapper extends BaseMapper<SysUser> {
+
+}

nladmin-system/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.nl.system.service.user.dao.mapper.SysUserMapper">
+
+</mapper>

nladmin-system/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java

@@ -0,0 +1,20 @@
+package org.nl.system.service.user.impl;
+
+import org.nl.system.service.user.dao.SysUser;
+import org.nl.system.service.user.dao.mapper.SysUserMapper;
+import org.nl.system.service.user.ISysUserService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 用户表 服务实现类
+ * </p>
+ *
+ * @author generator
+ * @since 2022-12-15
+ */
+@Service
+public class ISysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements ISysUserService {
+
+}