From 2e543adab5b169c968b5fcfe15496e71b262ff6c Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Wed, 14 Dec 2022 15:43:50 +0800 Subject: [PATCH] =?UTF-8?q?add:=E4=BE=9D=E8=B5=96mybatisplus?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nladmin-system/nlsso-server/pom.xml | 15 ++ .../src/main/java/org/nl/AppRun.java | 2 + .../org/nl/config/mybatis/CodeGenerator.java | 112 +++++++++++++++ .../nl/config/mybatis/MybatisPlusConfig.java | 31 ++++ .../org/nl/config/saconfig/SaInitCOnfig.java | 1 + .../org/nl/controller/SysUserController.java | 41 ++++++ .../modules/common/utils/dto/CurrentUser.java | 3 +- .../rest/AuthorizationController.java | 4 +- .../org/nl/service/user/ISysUserService.java | 16 +++ .../org/nl/service/user/dto/SysUserDO.java | 133 ++++++++++++++++++ .../service/user/impl/SysUserServiceImpl.java | 20 +++ .../nl/service/user/mapper/SysUserMapper.java | 18 +++ .../src/main/resources/config/application.yml | 10 ++ .../main/resources/mapper/SysUserMapper.xml | 6 + .../java/org/nl/rest/SysUserController.java | 64 --------- .../java/org/nl/service/SysUserService.java | 64 --------- .../java/org/nl/service/dto/SysUserDto.java | 65 --------- .../nl/service/impl/SysUserServiceImpl.java | 128 ----------------- 18 files changed, 409 insertions(+), 324 deletions(-) create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/CodeGenerator.java create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/MybatisPlusConfig.java create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/controller/SysUserController.java create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/service/user/ISysUserService.java create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/service/user/dto/SysUserDO.java create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/service/user/impl/SysUserServiceImpl.java create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/service/user/mapper/SysUserMapper.java create mode 100644 nladmin-system/nlsso-server/src/main/resources/mapper/SysUserMapper.xml delete mode 100644 nladmin-system/user/src/main/java/org/nl/rest/SysUserController.java delete mode 100644 nladmin-system/user/src/main/java/org/nl/service/SysUserService.java delete mode 100644 nladmin-system/user/src/main/java/org/nl/service/dto/SysUserDto.java delete mode 100644 nladmin-system/user/src/main/java/org/nl/service/impl/SysUserServiceImpl.java diff --git a/nladmin-system/nlsso-server/pom.xml b/nladmin-system/nlsso-server/pom.xml index c39fc8a..02e19fa 100644 --- a/nladmin-system/nlsso-server/pom.xml +++ b/nladmin-system/nlsso-server/pom.xml @@ -71,6 +71,21 @@ 0.9.10 + + com.baomidou + mybatis-plus-boot-starter + 3.4.0 + + + org.apache.velocity + velocity-engine-core + 2.3 + + + com.baomidou + mybatis-plus-generator + 3.4.0 + diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java b/nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java index 4add80b..4adbe25 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java @@ -4,6 +4,7 @@ import cn.dev33.satoken.annotation.SaIgnore; import com.alicp.jetcache.anno.config.EnableCreateCacheAnnotation; import com.alicp.jetcache.anno.config.EnableMethodCache; import io.swagger.annotations.Api; +import org.mybatis.spring.annotation.MapperScan; import org.nl.modules.wql.util.SpringContextHolder; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -35,6 +36,7 @@ import org.springframework.web.bind.annotation.RestController; @EnableTransactionManagement @EnableMethodCache(basePackages = "org.nl") @EnableCreateCacheAnnotation +@MapperScan("org.nl.service.*.mapper") public class AppRun { public static void main(String[] args) { 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 new file mode 100644 index 0000000..60d3311 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/CodeGenerator.java @@ -0,0 +1,112 @@ +package org.nl.config.mybatis; + +import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException; +import com.baomidou.mybatisplus.generator.AutoGenerator; +import com.baomidou.mybatisplus.generator.InjectionConfig; +import com.baomidou.mybatisplus.generator.config.*; +import com.baomidou.mybatisplus.generator.config.po.TableInfo; +import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy; +import org.springframework.util.StringUtils; + +import java.util.ArrayList; +import java.util.List; +import java.util.Scanner; + +public class CodeGenerator { + + /** + *

+ * 读取控制台内容 + *

+ */ + public static String scanner(String tip) { + Scanner scanner = new Scanner(System.in); + StringBuilder help = new StringBuilder(); + help.append("请输入" + tip + "："); + System.out.println(help.toString()); + if (scanner.hasNext()) { + String ipt = scanner.next(); + if (!StringUtils.isEmpty(ipt)) { + return ipt; + } + } + throw new MybatisPlusException("请输入正确的" + tip + "！"); + } + + + public static void main(String[] args) { + String moduleName = scanner("请输入模块名称"); + // Mybatis代码生成器 + AutoGenerator mpg = new AutoGenerator(); + + // 全局配置 + GlobalConfig gc = new GlobalConfig(); + // 默认不覆盖 + gc.setFileOverride(false); + String projectPath = System.getProperty("user.dir"); + gc.setOutputDir(projectPath + "/src/main/java/"); + gc.setAuthor("generator"); + gc.setOpen(false); +// gc.setSwagger2(true); + gc.setEntityName("%sDO"); + gc.setServiceName("I%sService"); + gc.setServiceImplName("%sServiceImpl"); + mpg.setGlobalConfig(gc); + // 数据源配置 + DataSourceConfig dsc = new DataSourceConfig(); + dsc.setUrl("jdbc:mysql://192.168.81.252:3306/nl-sso-server?setUnicode=true&characterEncoding=utf8"); + dsc.setDriverName("com.mysql.cj.jdbc.Driver"); + dsc.setUsername("root"); + dsc.setPassword("Root.123456"); + mpg.setDataSource(dsc); + // 包配置 + PackageConfig pc = new PackageConfig(); +// pc.setModuleName(""); + pc.setParent("org.nl.generator"); + pc.setController("controller." + moduleName); + pc.setMapper("dao.mapper." + moduleName); + pc.setService("service." + moduleName); + pc.setServiceImpl("service." + moduleName + ".impl"); + pc.setEntity("dao.entity." + moduleName); +// pc.setXml("dao.mapper.xml"); + mpg.setPackageInfo(pc); +// // 自定义配置 + InjectionConfig cfg = new InjectionConfig() { + @Override + public void initMap() { + } + }; + List focList = new ArrayList<>(); + // 调整 xml 生成目录演示 + focList.add(new FileOutConfig("/templates/mapper.xml.vm") { + @Override + public String outputFile(TableInfo tableInfo) { + return projectPath + "/src/main/resources/mapper/" + moduleName + "/" + tableInfo.getEntityName() + "Mapper.xml"; + } + }); + cfg.setFileOutConfigList(focList); + mpg.setCfg(cfg); + // 关闭默认 xml 生成，调整生成 至 根目录 + TemplateConfig tc = new TemplateConfig(); + tc.setXml(null); + mpg.setTemplate(tc); + // 策略配置 + StrategyConfig strategy = new StrategyConfig(); + strategy.setNaming(NamingStrategy.underline_to_camel); + strategy.setColumnNaming(NamingStrategy.underline_to_camel); +// strategy.setSuperEntityClass("你自己的父类实体,没有就不用设置!"); + strategy.setEntityLombokModel(true); + strategy.setRestControllerStyle(true); + // 公共父类 +// strategy.setSuperControllerClass("你自己的父类控制器,没有就不用设置!"); + // 写于父类中的公共字段 +// strategy.setSuperEntityColumns("id"); + strategy.setInclude(scanner("表名，多个英文逗号分割").split(",")); + strategy.setControllerMappingHyphenStyle(true); + strategy.setTablePrefix("dc_"); + mpg.setStrategy(strategy); +// mpg.setTemplateEngine(new FreemarkerTemplateEngine()); + mpg.execute(); + } + +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/MybatisPlusConfig.java b/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/MybatisPlusConfig.java new file mode 100644 index 0000000..6b57662 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/MybatisPlusConfig.java @@ -0,0 +1,31 @@ +package org.nl.config.mybatis; + +import com.baomidou.mybatisplus.annotation.DbType; +import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +@EnableTransactionManagement +@Configuration +public class MybatisPlusConfig { + + /** + * 新的分页插件,一缓和二缓遵循mybatis的规则,需要设置 MybatisConfiguration#useDeprecatedExecutor = false 避免缓存出现问题(该属性会在旧插件移除后一同移除) + 添加自增插件 + */ + @Bean + public MybatisPlusInterceptor mybatisPlusInterceptor() { + + MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); + // 分页插件 + interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); + //乐观锁插件 + interceptor.addInnerInterceptor(new OptimisticLockerInnerInterceptor()); + + return interceptor; + } + +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/config/saconfig/SaInitCOnfig.java b/nladmin-system/nlsso-server/src/main/java/org/nl/config/saconfig/SaInitCOnfig.java index 67d803d..6a967a9 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/config/saconfig/SaInitCOnfig.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/config/saconfig/SaInitCOnfig.java @@ -3,6 +3,7 @@ package org.nl.config.saconfig; import cn.dev33.satoken.config.SaSsoConfig; import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpResponse; +import org.apache.http.client.HttpClient; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.ModelAndView; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/controller/SysUserController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/controller/SysUserController.java new file mode 100644 index 0000000..7a00885 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/controller/SysUserController.java @@ -0,0 +1,41 @@ +package org.nl.controller; + + +import com.alibaba.fastjson.JSON; +import org.nl.service.user.ISysUserService; +import org.nl.service.user.dto.SysUserDO; +import org.nl.service.user.mapper.SysUserMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +/** + *

+ * 用户表 前端控制器 + *

+ * + * @author generator + * @since 2022-12-14 + */ +@RestController +@RequestMapping("/sys-user-do") +public class SysUserController { + + @Autowired + ISysUserService iSysUserService; + + @Autowired + SysUserMapper sysUserMapper; + + @RequestMapping("/1") + public String getDemo(){ + List list = iSysUserService.list(); + return JSON.toJSONString(list) ; + } + +} + diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/common/utils/dto/CurrentUser.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/common/utils/dto/CurrentUser.java index 178cb44..e599129 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/common/utils/dto/CurrentUser.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/common/utils/dto/CurrentUser.java @@ -3,6 +3,7 @@ package org.nl.modules.common.utils.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; +import org.nl.modules.system.domain.User; import org.nl.modules.system.service.dto.UserDto; import java.io.Serializable; @@ -25,7 +26,7 @@ public class CurrentUser implements Serializable { private String preson_name; //用户详细信息 - private UserDto user; + private User user; private List permissions = new ArrayList<>(); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/security/rest/AuthorizationController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/security/rest/AuthorizationController.java index 3bfc202..b2d57f5 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/security/rest/AuthorizationController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/security/rest/AuthorizationController.java @@ -113,8 +113,8 @@ public class AuthorizationController { CurrentUser user = new CurrentUser(); user.setId(userInfo.getLong("user_id")); user.setUsername(userInfo.getString("username")); - user.setPermissions(Lists.newArrayList(userInfo.getString("person_name"))); - user.setUser(this.getById(userInfo.getLong("user_id"))); + user.setPreson_name((userInfo.getString("person_name"))); + user.setUser(userService.findById(userInfo.getLong("user_id"))); user.setPermissions(permissionList); // SaLoginModel 配置登录相关参数 diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/service/user/ISysUserService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/service/user/ISysUserService.java new file mode 100644 index 0000000..a9eba4a --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/service/user/ISysUserService.java @@ -0,0 +1,16 @@ +package org.nl.service.user; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.service.user.dto.SysUserDO; + +/** + *

+ * 用户表 服务类 + *

+ * + * @author generator + * @since 2022-12-14 + */ +public interface ISysUserService extends IService { + +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/service/user/dto/SysUserDO.java b/nladmin-system/nlsso-server/src/main/java/org/nl/service/user/dto/SysUserDO.java new file mode 100644 index 0000000..fc3ec11 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/service/user/dto/SysUserDO.java @@ -0,0 +1,133 @@ +package org.nl.service.user.dto; + +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; + +/** + *

+ * 用户表 + *

+ * + * @author generator + * @since 2022-12-14 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("sys_user") +public class SysUserDO 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; + + +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/service/user/impl/SysUserServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/service/user/impl/SysUserServiceImpl.java new file mode 100644 index 0000000..7b2ab28 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/service/user/impl/SysUserServiceImpl.java @@ -0,0 +1,20 @@ +package org.nl.service.user.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.nl.service.user.ISysUserService; +import org.nl.service.user.dto.SysUserDO; +import org.nl.service.user.mapper.SysUserMapper; +import org.springframework.stereotype.Service; + +/** + *

+ * 用户表 服务实现类 + *

+ * + * @author generator + * @since 2022-12-14 + */ +@Service +public class SysUserServiceImpl extends ServiceImpl implements ISysUserService { + +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/service/user/mapper/SysUserMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/service/user/mapper/SysUserMapper.java new file mode 100644 index 0000000..d875f34 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/service/user/mapper/SysUserMapper.java @@ -0,0 +1,18 @@ +package org.nl.service.user.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import org.nl.service.user.dto.SysUserDO; + +/** + *

+ * 用户表 Mapper 接口 + *

+ * + * @author generator + * @since 2022-12-14 + */ + +public interface SysUserMapper extends BaseMapper { + +} diff --git a/nladmin-system/nlsso-server/src/main/resources/config/application.yml b/nladmin-system/nlsso-server/src/main/resources/config/application.yml index 7e3fbea..3f0c2e4 100644 --- a/nladmin-system/nlsso-server/src/main/resources/config/application.yml +++ b/nladmin-system/nlsso-server/src/main/resources/config/application.yml @@ -54,6 +54,7 @@ security: - /auth/login - /auth/code - /auth/logout + - /sys-user-do/** # swagger - /swagger-ui.html - /swagger-resources/** @@ -78,3 +79,12 @@ security: - /api/localStorage/pictures # 参数 - /api/param/getValueByCode +mybatis-plus: + configuration: + map-underscore-to-camel-case: true + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + mapper-locations: + - classpath:mapper/*.xml + global-config: + db-config: + id-type: INPUT diff --git a/nladmin-system/nlsso-server/src/main/resources/mapper/SysUserMapper.xml b/nladmin-system/nlsso-server/src/main/resources/mapper/SysUserMapper.xml new file mode 100644 index 0000000..f361576 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/resources/mapper/SysUserMapper.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/nladmin-system/user/src/main/java/org/nl/rest/SysUserController.java b/nladmin-system/user/src/main/java/org/nl/rest/SysUserController.java deleted file mode 100644 index f1ac2fb..0000000 --- a/nladmin-system/user/src/main/java/org/nl/rest/SysUserController.java +++ /dev/null @@ -1,64 +0,0 @@ - -package org.nl.rest; - - -import org.springframework.data.domain.Pageable; -import lombok.RequiredArgsConstructor; -import org.nl.modules.logging.annotation.Log; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import cn.dev33.satoken.annotation.SaCheckPermission; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.*; -import java.util.Map; -import lombok.extern.slf4j.Slf4j; - -/** -* @author zzq -* @date 2022-11-28 -**/ -@RestController -@RequiredArgsConstructor -@Api(tags = "userService管理") -@RequestMapping("/api/sysUser") -@Slf4j -public class SysUserController { - - private final SysUserService sysUserService; - - @GetMapping - @Log("查询userService") - @ApiOperation("查询userService") - //@SaCheckPermission("@el.check('sysUser:list')") - public ResponseEntity query(@RequestParam Map whereJson, Pageable page){ - return new ResponseEntity<>(sysUserService.queryAll(whereJson,page),HttpStatus.OK); - } - - @PostMapping - @Log("新增userService") - @ApiOperation("新增userService") - //@SaCheckPermission("@el.check('sysUser:add')") - public ResponseEntity create(@Validated @RequestBody SysUserDto dto){ - sysUserService.create(dto); - return new ResponseEntity<>(HttpStatus.CREATED); - } - - @PutMapping - @Log("修改userService") - @ApiOperation("修改userService") - //@SaCheckPermission("@el.check('sysUser:edit')") - public ResponseEntity update(@Validated @RequestBody SysUserDto dto){ - sysUserService.update(dto); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - - @Log("删除userService") - @ApiOperation("删除userService") - //@SaCheckPermission("@el.check('sysUser:del')") - @DeleteMapping - public ResponseEntity delete(@RequestBody Long[] ids) { - sysUserService.deleteAll(ids); - return new ResponseEntity<>(HttpStatus.OK); - } -} diff --git a/nladmin-system/user/src/main/java/org/nl/service/SysUserService.java b/nladmin-system/user/src/main/java/org/nl/service/SysUserService.java deleted file mode 100644 index f86dc6e..0000000 --- a/nladmin-system/user/src/main/java/org/nl/service/SysUserService.java +++ /dev/null @@ -1,64 +0,0 @@ - -package org.nl.service; - -import org.springframework.data.domain.Pageable; -import java.util.Map; -import java.util.List; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; - -/** -* @description 服务接口 -* @author zzq -* @date 2022-11-28 -**/ -public interface SysUserService { - -/** -* 查询数据分页 -* @param whereJson 条件 -* @param page 分页参数 -* @return Map -*/ -Map queryAll(Map whereJson, Pageable page); - -/** -* 查询所有数据不分页 -* @param whereJson 条件参数 -* @return List - */ - List queryAll(Map whereJson); - - /** - * 根据ID查询 - * @param user_id ID - * @return SysUser - */ - SysUserDto findById(Long user_id); - - /** - * 根据编码查询 - * @param code code - * @return SysUser - */ - SysUserDto findByCode(String code); - - - /** - * 创建 - * @param dto / - */ - void create(SysUserDto dto); - - /** - * 编辑 - * @param dto / - */ - void update(SysUserDto dto); - - /** - * 多选删除 - * @param ids / - */ - void deleteAll(Long[] ids); - } diff --git a/nladmin-system/user/src/main/java/org/nl/service/dto/SysUserDto.java b/nladmin-system/user/src/main/java/org/nl/service/dto/SysUserDto.java deleted file mode 100644 index 16eb8e3..0000000 --- a/nladmin-system/user/src/main/java/org/nl/service/dto/SysUserDto.java +++ /dev/null @@ -1,65 +0,0 @@ -package org.nl.service.dto; - -import lombok.Data; - import java.util.Date; -import java.io.Serializable; - -/** -* @description / -* @author zzq -* @date 2022-11-28 -**/ -@Data -public class SysUserDto implements Serializable { - - /** ID */ - private Long user_id; - - /** 部门名称 */ - private Long dept_id; - - /** 用户名 */ - private String username; - - /** 昵称 */ - private String nick_name; - - /** 性别 */ - private String gender; - - /** 手机号码 */ - private String phone; - - /** 邮箱 */ - private String email; - - /** 头像地址 */ - private String avatar_name; - - /** 头像真实路径 */ - private String avatar_path; - - /** 密码 */ - private String password; - - /** 是否为admin账号 */ - private Boolean is_admin; - - /** 状态：1启用、0禁用 */ - private Long enabled; - - /** 创建者 */ - private String create_by; - - /** 更新者 */ - private String update_by; - - /** 修改密码的时间 */ - private Date pwd_reset_time; - - /** 创建日期 */ - private Date create_time; - - /** 更新时间 */ - private Date update_time; -} diff --git a/nladmin-system/user/src/main/java/org/nl/service/impl/SysUserServiceImpl.java b/nladmin-system/user/src/main/java/org/nl/service/impl/SysUserServiceImpl.java deleted file mode 100644 index 892f9a7..0000000 --- a/nladmin-system/user/src/main/java/org/nl/service/impl/SysUserServiceImpl.java +++ /dev/null @@ -1,128 +0,0 @@ - -package org.nl.service.impl; - - -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import org.springframework.data.domain.Pageable; -import java.util.List; -import java.util.Map; - -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import org.nl.modules.common.utils.SecurityUtils; -import org.nl.modules.wql.core.bean.ResultBean; -import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.modules.wql.util.WqlUtil; -import lombok.extern.slf4j.Slf4j; -import cn.hutool.core.util.ObjectUtil; - -/** -* @description 服务实现 -* @author zzq -* @date 2022-11-28 -**/ -@Service -@RequiredArgsConstructor -@Slf4j -public class SysUserServiceImpl implements SysUserService { - -@Override -public Map queryAll(Map whereJson, Pageable page){ -WQLObject wo = WQLObject.getWQLObject("sys_user"); -ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "1=1", "update_time desc"); -final JSONObject json = rb.pageResult(); -return json; -} - -@Override -public List queryAll(Map whereJson){ - WQLObject wo = WQLObject.getWQLObject("sys_user"); - JSONArray arr = wo.query().getResultJSONArray(0); - if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(SysUserDto.class); - return null; - } - - @Override - public SysUserDto findById(Long user_id) { - WQLObject wo = WQLObject.getWQLObject("sys_user"); - JSONObject json = wo.query("user_id = '" + user_id + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)){ - return json.toJavaObject( SysUserDto.class); - } - return null; - } - - @Override - public SysUserDto findByCode(String code) { - WQLObject wo = WQLObject.getWQLObject("sys_user"); - JSONObject json = wo.query("code ='" + code + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)){ - return json.toJavaObject( SysUserDto.class); - } - return null; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void create(SysUserDto dto) { - Long currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - - dto.setUser_id(IdUtil.getSnowflake(1, 1).nextId()); - dto.setCreate_id(currentUserId); - dto.setCreate_name(nickName); - dto.setUpdate_optid(currentUserId); - dto.setUpdate_optname(nickName); - dto.setUpdate_time(now); - dto.setCreate_time(now); - - WQLObject wo = WQLObject.getWQLObject("sys_user"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.insert(json); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(SysUserDto dto) { - SysUserDto entity = this.findById(dto.getUser_id()); - if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); - - Long currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - - String now = DateUtil.now(); - dto.setUpdate_time(now); - dto.setUpdate_optid(currentUserId); - dto.setUpdate_optname(nickName); - - WQLObject wo = WQLObject.getWQLObject("sys_user"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.update(json); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void deleteAll(Long[] ids) { - Long currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - - WQLObject wo = WQLObject.getWQLObject("sys_user"); - for (Long user_id: ids) { - JSONObject param = new JSONObject(); - param.put("user_id", String.valueOf(user_id)); - param.put("is_delete", "1"); - param.put("update_optid", currentUserId); - param.put("update_optname", nickName); - param.put("update_time", now); - wo.update(param); - } - } - - }