diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/common/BaseQuery.java b/nladmin-system/nlsso-server/src/main/java/org/nl/common/BaseQuery.java
index 50d1a4c..8246ccd 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/common/BaseQuery.java
+++ b/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 {
+ public Map doP = MapOf.of("blurry",QueryType.LK);
private String blurry;
@@ -30,10 +31,6 @@ public class BaseQuery {
private String sort;
- private Integer page;
-
- private Integer size;
-
public QueryWrapper convertQ(){
QueryWrapper wrapper = new QueryWrapper<>();
JSONObject json = (JSONObject)JSONObject.toJSON(this);
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/CodeGenerator.java b/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/CodeGenerator.java
index 51901a4..eb1ace8 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/CodeGenerator.java
+++ b/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();
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/SysUserController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/SysUserController.java
new file mode 100644
index 0000000..43c3dfc
--- /dev/null
+++ b/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;
+
+/**
+ *
+ * 用户表 前端控制器
+ *
+ *
+ * @author generator
+ * @since 2022-12-15
+ */
+@RestController
+@RequestMapping("/sysUser")
+public class SysUserController {
+ public static void main(String[] args) {
+ UserQuery userQuery = new UserQuery();
+ QueryWrapper wrapper = userQuery.convertQ();
+ }
+}
+
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java
deleted file mode 100644
index 4c02a2e..0000000
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java
+++ /dev/null
@@ -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 userQueryWrapper = query.convertQ();
-
- System.out.println(userQueryWrapper);
- }
-
- @ApiOperation("查询用户")
- @GetMapping
-// @SaCheckPermission("user:list")
- public ResponseEntity
*
* @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;
diff --git a/nladmin-system/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.java b/nladmin-system/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.java
new file mode 100644
index 0000000..11831d7
--- /dev/null
+++ b/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;
+
+/**
+ *
+ * 用户表 Mapper 接口
+ *
+ *
+ * @author generator
+ * @since 2022-12-15
+ */
+public interface SysUserMapper extends BaseMapper {
+
+}
diff --git a/nladmin-system/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml b/nladmin-system/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml
new file mode 100644
index 0000000..ecf1b48
--- /dev/null
+++ b/nladmin-system/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/nladmin-system/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java b/nladmin-system/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java
new file mode 100644
index 0000000..ab3f2f4
--- /dev/null
+++ b/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;
+
+/**
+ *
+ * 用户表 服务实现类
+ *
+ *
+ * @author generator
+ * @since 2022-12-15
+ */
+@Service
+public class ISysUserServiceImpl extends ServiceImpl implements ISysUserService {
+
+}