diff --git a/.editorconfig b/.editorconfig index afff4db4b..c4ed6ac9a 100644 --- a/.editorconfig +++ b/.editorconfig @@ -13,10 +13,6 @@ trim_trailing_whitespace = true indent_style = tab indent_size = 4 -[*.{yml,json}] -indent_style = space -indent_size = 2 - # 对后缀名为 md 的文件生效 [*.md] trim_trailing_whitespace = false diff --git a/pigx-common/pigx-common-aspect/pom.xml b/pigx-common/pigx-common-aspect/pom.xml deleted file mode 100644 index 28e3f4d4a..000000000 --- a/pigx-common/pigx-common-aspect/pom.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - com.pig4cloud - pigx-common - 1.8.0 - - 4.0.0 - - pigx-common-aspect - 公共切面包 - jar - - - - javax.servlet - javax.servlet-api - provided - - - org.springframework - spring-webmvc - provided - - - - com.baomidou - mybatis-plus-extension - ${mybatis-plus.version} - provided - - - - org.slf4j - slf4j-api - provided - - - - - - diff --git a/pigx-common/pigx-common-aspect/src/main/java/com/pig4cloud/pigx/common/aspect/config/WebMvcConfig.java b/pigx-common/pigx-common-aspect/src/main/java/com/pig4cloud/pigx/common/aspect/config/WebMvcConfig.java deleted file mode 100644 index 27622359f..000000000 --- a/pigx-common/pigx-common-aspect/src/main/java/com/pig4cloud/pigx/common/aspect/config/WebMvcConfig.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - */ -package com.pig4cloud.pigx.common.aspect.config; - -import com.pig4cloud.pigx.common.aspect.resolver.PaginationArgumentResolver; -import org.springframework.context.annotation.Configuration; -import org.springframework.web.method.support.HandlerMethodArgumentResolver; -import org.springframework.web.servlet.config.annotation.DefaultServletHandlerConfigurer; -import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; - -import java.util.List; - -/** - * WebMvcConfig - * - * @author: lishangbu - * @date: 2018/10/18 - */ -@Configuration -public class WebMvcConfig implements WebMvcConfigurer { - @Override - public void addArgumentResolvers(List argumentResolvers) { - argumentResolvers.add(new PaginationArgumentResolver()); - } - - /** - * 如果继承了WebMvcConfigurationSupport，则在yml中配置的相关内容会失效。 需要重新指定静态资源 - * - * @param registry - */ - @Override - public void addResourceHandlers(ResourceHandlerRegistry registry) { - // 重写默认的相关配置 - registry.addResourceHandler("/**").addResourceLocations( - "classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/"); - // 放行swagger相关资源 - registry.addResourceHandler("doc.html").addResourceLocations("classpath:/META-INF/resources/"); - registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/"); - } - - /** - * 配置servlet处理 - */ - @Override - public void configureDefaultServletHandling( - DefaultServletHandlerConfigurer configurer) { - configurer.enable(); - } -} diff --git a/pigx-common/pigx-common-aspect/src/main/java/com/pig4cloud/pigx/common/aspect/resolver/PaginationArgumentResolver.java b/pigx-common/pigx-common-aspect/src/main/java/com/pig4cloud/pigx/common/aspect/resolver/PaginationArgumentResolver.java deleted file mode 100644 index ab5d925fc..000000000 --- a/pigx-common/pigx-common-aspect/src/main/java/com/pig4cloud/pigx/common/aspect/resolver/PaginationArgumentResolver.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - */ -package com.pig4cloud.pigx.common.aspect.resolver; - -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.extern.slf4j.Slf4j; -import org.springframework.context.annotation.Configuration; -import org.springframework.core.MethodParameter; -import org.springframework.web.bind.support.WebDataBinderFactory; -import org.springframework.web.context.request.NativeWebRequest; -import org.springframework.web.method.support.HandlerMethodArgumentResolver; -import org.springframework.web.method.support.ModelAndViewContainer; - -import javax.servlet.http.HttpServletRequest; -import java.util.Optional; - -/** - * PaginationArgumentResolver - * 分页参数解析器 - * - * @author: lishangbu - * @date: 2018/10/18 - */ -@Configuration -@Slf4j -public class PaginationArgumentResolver implements HandlerMethodArgumentResolver { - /** - * 当前页 - */ - private static final String CURRENT = "current"; - - /** - * 每页显示条数 - */ - private static final String SIZE = "size"; - - /** - * 入参筛选 - * - * @param parameter 参数集合 - * @return 格式化后的参数 - */ - @Override - public boolean supportsParameter(MethodParameter parameter) { - return parameter.getParameterType().equals(Page.class); - } - - /** - * @param parameter 入参集合 - * @param mavContainer model 和 view - * @param webRequest web相关 - * @param binderFactory 入参解析 - * @return 包装对象 - * @throws Exception - */ - @Override - public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception { - HttpServletRequest request = webRequest.getNativeRequest(HttpServletRequest.class); - try { - return new Page(Long.valueOf(Optional.ofNullable(request.getParameter(CURRENT)).orElse("1")), - Long.valueOf(Optional.ofNullable(request.getParameter(SIZE)).orElse("10"))); - } catch (NumberFormatException e) { - return new Page(); - } - } -} diff --git a/pigx-common/pigx-common-aspect/src/main/resources/META-INF/spring.factories b/pigx-common/pigx-common-aspect/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 7ac3ec745..000000000 --- a/pigx-common/pigx-common-aspect/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.pig4cloud.pigx.common.aspect.config.WebMvcConfig diff --git a/pigx-common/pom.xml b/pigx-common/pom.xml index 1ce16a87f..5beaa211c 100644 --- a/pigx-common/pom.xml +++ b/pigx-common/pom.xml @@ -33,7 +33,6 @@ pigx 公共聚合模块 - pigx-common-aspect pigx-common-cache pigx-common-core pigx-common-gateway diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/config/MybatisPlusConfigurer.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/config/MybatisPlusConfigurer.java index f90eed13e..a1ed9f111 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/config/MybatisPlusConfigurer.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/config/MybatisPlusConfigurer.java @@ -20,7 +20,9 @@ package com.pig4cloud.pigx.admin.config; import cn.hutool.core.util.ArrayUtil; +import com.baomidou.mybatisplus.core.injector.ISqlInjector; import com.baomidou.mybatisplus.core.parser.ISqlParser; +import com.baomidou.mybatisplus.extension.injector.LogicSqlInjector; import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; import com.baomidou.mybatisplus.extension.plugins.tenant.TenantHandler; import com.baomidou.mybatisplus.extension.plugins.tenant.TenantSqlParser; @@ -88,4 +90,14 @@ public class MybatisPlusConfigurer { public DataScopeInterceptor dataScopeInterceptor() { return new DataScopeInterceptor(); } + + /** + * 逻辑删除插件 + * + * @return LogicSqlInjector + */ + @Bean + public ISqlInjector sqlInjector() { + return new LogicSqlInjector(); + } } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DeptController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DeptController.java index d7244ee05..5f6c97fb7 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DeptController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DeptController.java @@ -19,7 +19,6 @@ package com.pig4cloud.pigx.admin.controller; -import com.pig4cloud.pigx.admin.api.dto.DeptTree; import com.pig4cloud.pigx.admin.api.entity.SysDept; import com.pig4cloud.pigx.admin.service.SysDeptService; import com.pig4cloud.pigx.common.core.util.R; @@ -31,7 +30,6 @@ import org.springframework.web.bind.annotation.*; import javax.validation.Valid; import java.time.LocalDateTime; -import java.util.List; /** *

@@ -55,7 +53,7 @@ public class DeptController { * @return SysDept */ @GetMapping("/{id}") - public R get(@PathVariable Integer id) { + public R get(@PathVariable Integer id) { return new R<>(sysDeptService.getById(id)); } @@ -66,7 +64,7 @@ public class DeptController { * @return 树形菜单 */ @GetMapping(value = "/tree") - public R> getTree() { + public R getTree() { return new R<>(sysDeptService.selectTree()); } @@ -76,7 +74,7 @@ public class DeptController { * @return 树形菜单 */ @GetMapping(value = "/user-tree") - public R> userTree() { + public R userTree() { return new R<>(sysDeptService.selectUserTree()); } @@ -89,7 +87,7 @@ public class DeptController { @SysLog("添加部门") @PostMapping @PreAuthorize("@pms.hasPermission('sys_dept_add')") - public R add(@Valid @RequestBody SysDept sysDept) { + public R add(@Valid @RequestBody SysDept sysDept) { return new R<>(sysDeptService.insertDept(sysDept)); } @@ -102,7 +100,7 @@ public class DeptController { @SysLog("删除部门") @DeleteMapping("/{id}") @PreAuthorize("@pms.hasPermission('sys_dept_del')") - public R delete(@PathVariable Integer id) { + public R delete(@PathVariable Integer id) { return new R<>(sysDeptService.deleteDeptById(id)); } @@ -115,7 +113,7 @@ public class DeptController { @SysLog("编辑部门") @PutMapping @PreAuthorize("@pms.hasPermission('sys_dept_edit')") - public R edit(@Valid @RequestBody SysDept sysDept) { + public R edit(@Valid @RequestBody SysDept sysDept) { sysDept.setUpdateTime(LocalDateTime.now()); return new R<>(sysDeptService.updateDeptById(sysDept)); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DictController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DictController.java index b08c8a5e7..a38cc447e 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DictController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DictController.java @@ -20,8 +20,8 @@ package com.pig4cloud.pigx.admin.controller; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pig4cloud.pigx.admin.api.entity.SysDict; import com.pig4cloud.pigx.admin.service.SysDictService; @@ -35,7 +35,6 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; -import java.util.List; /** *

@@ -59,7 +58,7 @@ public class DictController { * @return 字典信息 */ @GetMapping("/{id}") - public R dict(@PathVariable Integer id) { + public R dict(@PathVariable Integer id) { return new R<>(sysDictService.getById(id)); } @@ -70,8 +69,8 @@ public class DictController { * @return 分页对象 */ @GetMapping("/page") - public R> getSysDictPage(Page page, SysDict sysDict) { - return new R<>(sysDictService.getSysDictPage(page,sysDict)); + public R getSysDictPage(Page page, SysDict sysDict) { + return new R<>(sysDictService.page(page, Wrappers.query(sysDict))); } /** @@ -82,10 +81,10 @@ public class DictController { */ @GetMapping("/type/{type}") @Cacheable(value = "dict_details", key = "#type") - public R> findDictByType(@PathVariable String type) { - SysDict condition = new SysDict(); - condition.setType(type); - return new R<>(sysDictService.list(new QueryWrapper<>(condition))); + public R findDictByType(@PathVariable String type) { + return new R<>(sysDictService.list(Wrappers + .query().lambda() + .eq(SysDict::getType, type))); } /** @@ -98,7 +97,7 @@ public class DictController { @PostMapping @CacheEvict(value = "dict_details", key = "#sysDict.type") @PreAuthorize("@pms.hasPermission('sys_dict_add')") - public R dict(@Valid @RequestBody SysDict sysDict) { + public R dict(@Valid @RequestBody SysDict sysDict) { return new R<>(sysDictService.save(sysDict)); } @@ -113,7 +112,7 @@ public class DictController { @DeleteMapping("/{id}/{type}") @CacheEvict(value = "dict_details", key = "#type") @PreAuthorize("@pms.hasPermission('sys_dict_del')") - public R deleteDict(@PathVariable Integer id, @PathVariable String type) { + public R deleteDict(@PathVariable Integer id, @PathVariable String type) { return new R<>(sysDictService.removeById(id)); } @@ -127,7 +126,7 @@ public class DictController { @SysLog("修改字典") @CacheEvict(value = "dict_details", key = "#sysDict.type") @PreAuthorize("@pms.hasPermission('sys_dict_edit')") - public R editDict(@Valid @RequestBody SysDict sysDict) { + public R editDict(@Valid @RequestBody SysDict sysDict) { return new R<>(sysDictService.updateById(sysDict)); } } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/LogController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/LogController.java index 627256de8..7f6ef932d 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/LogController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/LogController.java @@ -20,7 +20,7 @@ package com.pig4cloud.pigx.admin.controller; -import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pig4cloud.pigx.admin.api.entity.SysLog; import com.pig4cloud.pigx.admin.api.vo.PreLogVo; @@ -45,19 +45,20 @@ import java.util.List; @RestController @AllArgsConstructor @RequestMapping("/log") -@Api(value = "log",description = "日志管理模块") +@Api(value = "log", description = "日志管理模块") public class LogController { private final SysLogService sysLogService; /** * 简单分页查询 - * @param page 分页对象 + * + * @param page 分页对象 * @param sysLog 系统日志 * @return */ @GetMapping("/page") - public R> getSysLogPage(Page page, SysLog sysLog) { - return new R<>(sysLogService.getSysLogPage(page,sysLog)); + public R getSysLogPage(Page page, SysLog sysLog) { + return new R<>(sysLogService.page(page, Wrappers.query(sysLog))); } /** @@ -68,7 +69,7 @@ public class LogController { */ @DeleteMapping("/{id}") @PreAuthorize("@pms.hasPermission('sys_log_del')") - public R delete(@PathVariable Long id) { + public R delete(@PathVariable Long id) { return new R<>(sysLogService.removeById(id)); } @@ -79,7 +80,7 @@ public class LogController { * @return success/false */ @PostMapping - public R save(@Valid @RequestBody SysLog sysLog) { + public R save(@Valid @RequestBody SysLog sysLog) { return new R<>(sysLogService.save(sysLog)); } @@ -90,7 +91,7 @@ public class LogController { * @return success/false */ @PostMapping("/logs") - public R saveLogs(@RequestBody List preLogVoList) { + public R saveLogs(@RequestBody List preLogVoList) { return new R<>(sysLogService.insertLogs(preLogVoList)); } } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/MenuController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/MenuController.java index be462ce94..beb431340 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/MenuController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/MenuController.java @@ -19,7 +19,7 @@ package com.pig4cloud.pigx.admin.controller; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.pig4cloud.pigx.admin.api.dto.MenuTree; import com.pig4cloud.pigx.admin.api.entity.SysMenu; import com.pig4cloud.pigx.admin.api.vo.MenuVO; @@ -58,7 +58,7 @@ public class MenuController { * @return 当前用户的树形菜单 */ @GetMapping - public R> userMenu() { + public R userMenu() { // 获取符合条件的菜单 Set all = new HashSet<>(); SecurityUtils.getRoles() @@ -77,9 +77,8 @@ public class MenuController { * @return 树形菜单 */ @GetMapping(value = "/tree") - public R> getTree() { - return new R<>(TreeUtil.bulidTree(sysMenuService.list(new QueryWrapper() - .lambda().eq(SysMenu::getDelFlag,CommonConstant.STATUS_NORMAL)), -1)); + public R getTree() { + return new R<>(TreeUtil.bulidTree(sysMenuService.list(Wrappers.emptyWrapper()), -1)); } /** @@ -89,7 +88,7 @@ public class MenuController { * @return 属性集合 */ @GetMapping("/tree/{roleId}") - public List roleTree(@PathVariable Integer roleId) { + public List roleTree(@PathVariable Integer roleId) { return sysMenuService.findMenuByRoleId(roleId) .stream() .map(MenuVO::getMenuId) @@ -103,7 +102,7 @@ public class MenuController { * @return 菜单详细信息 */ @GetMapping("/{id}") - public R menu(@PathVariable Integer id) { + public R menu(@PathVariable Integer id) { return new R<>(sysMenuService.getById(id)); } @@ -116,7 +115,7 @@ public class MenuController { @SysLog("新增菜单") @PostMapping @PreAuthorize("@pms.hasPermission('sys_menu_add')") - public R menu(@Valid @RequestBody SysMenu sysMenu) { + public R menu(@Valid @RequestBody SysMenu sysMenu) { return new R<>(sysMenuService.save(sysMenu)); } @@ -129,7 +128,7 @@ public class MenuController { @SysLog("删除菜单") @DeleteMapping("/{id}") @PreAuthorize("@pms.hasPermission('sys_menu_del')") - public R menuDel(@PathVariable Integer id) { + public R menuDel(@PathVariable Integer id) { return new R<>(sysMenuService.deleteMenu(id)); } @@ -142,7 +141,7 @@ public class MenuController { @SysLog("更新菜单") @PutMapping @PreAuthorize("@pms.hasPermission('sys_menu_edit')") - public R menuUpdate(@Valid @RequestBody SysMenu sysMenu) { + public R menuUpdate(@Valid @RequestBody SysMenu sysMenu) { return new R<>(sysMenuService.updateMenuById(sysMenu)); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/MobileController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/MobileController.java index ce49349d4..39424327b 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/MobileController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/MobileController.java @@ -42,7 +42,7 @@ public class MobileController { @SysLog("发送验证码") @GetMapping("/{mobile}") - public R code(@PathVariable String mobile) { + public R code(@PathVariable String mobile) { return mobileService.sendSmsCode(mobile); } } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/OauthClientDetailsController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/OauthClientDetailsController.java index 9c7bc5a5f..f80e514db 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/OauthClientDetailsController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/OauthClientDetailsController.java @@ -19,7 +19,7 @@ package com.pig4cloud.pigx.admin.controller; -import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pig4cloud.pigx.admin.api.entity.SysOauthClientDetails; import com.pig4cloud.pigx.admin.service.SysOauthClientDetailsService; @@ -54,20 +54,21 @@ public class OauthClientDetailsController { * @return SysOauthClientDetails */ @GetMapping("/{id}") - public R get(@PathVariable Integer id) { + public R get(@PathVariable Integer id) { return new R<>(sysOauthClientDetailsService.getById(id)); } /** * 简单分页查询 - * @param page 分页对象 + * + * @param page 分页对象 * @param sysOauthClientDetails 系统终端 * @return */ @GetMapping("/page") - public R> getSysOauthClientDetailsPage(Page page, SysOauthClientDetails sysOauthClientDetails) { - return new R<>(sysOauthClientDetailsService.getSysOauthClientDetailsPage(page,sysOauthClientDetails)); + public R getSysOauthClientDetailsPage(Page page, SysOauthClientDetails sysOauthClientDetails) { + return new R<>(sysOauthClientDetailsService.page(page, Wrappers.query(sysOauthClientDetails))); } /** @@ -79,7 +80,7 @@ public class OauthClientDetailsController { @SysLog("添加终端") @PostMapping @PreAuthorize("@pms.hasPermission('sys_client_add')") - public R add(@Valid @RequestBody SysOauthClientDetails sysOauthClientDetails) { + public R add(@Valid @RequestBody SysOauthClientDetails sysOauthClientDetails) { return new R<>(sysOauthClientDetailsService.save(sysOauthClientDetails)); } @@ -92,7 +93,7 @@ public class OauthClientDetailsController { @SysLog("删除终端") @DeleteMapping("/{id}") @PreAuthorize("@pms.hasPermission('sys_client_del')") - public R delete(@PathVariable String id) { + public R delete(@PathVariable String id) { return new R<>(sysOauthClientDetailsService.deleteClientDetailsById(id)); } @@ -105,7 +106,7 @@ public class OauthClientDetailsController { @SysLog("编辑终端") @PutMapping @PreAuthorize("@pms.hasPermission('sys_client_edit')") - public R edit(@Valid @RequestBody SysOauthClientDetails sysOauthClientDetails) { + public R edit(@Valid @RequestBody SysOauthClientDetails sysOauthClientDetails) { return new R<>(sysOauthClientDetailsService.updateClientDetailsById(sysOauthClientDetails)); } } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/RoleController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/RoleController.java index bb828453e..b214d2e21 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/RoleController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/RoleController.java @@ -19,8 +19,7 @@ package com.pig4cloud.pigx.admin.controller; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pig4cloud.pigx.admin.api.entity.SysRole; import com.pig4cloud.pigx.admin.service.SysRoleMenuService; @@ -32,9 +31,6 @@ import lombok.AllArgsConstructor; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; -import java.util.List; -import java.util.Map; - /** * @author lengleng * @date 2017/11/5 @@ -54,7 +50,7 @@ public class RoleController { * @return 角色信息 */ @GetMapping("/{id}") - public R role(@PathVariable Integer id) { + public R role(@PathVariable Integer id) { return new R<>(sysRoleService.getById(id)); } @@ -67,7 +63,7 @@ public class RoleController { @SysLog("添加角色") @PostMapping @PreAuthorize("@pms.hasPermission('sys_role_add')") - public R role(@RequestBody SysRole sysRole) { + public R role(@RequestBody SysRole sysRole) { return new R<>(sysRoleService.save(sysRole)); } @@ -80,7 +76,7 @@ public class RoleController { @SysLog("修改角色") @PutMapping @PreAuthorize("@pms.hasPermission('sys_role_edit')") - public R roleUpdate(@RequestBody SysRole sysRole) { + public R roleUpdate(@RequestBody SysRole sysRole) { return new R<>(sysRoleService.updateById(sysRole)); } @@ -93,7 +89,7 @@ public class RoleController { @SysLog("删除角色") @DeleteMapping("/{id}") @PreAuthorize("@pms.hasPermission('sys_role_del')") - public R roleDel(@PathVariable Integer id) { + public R roleDel(@PathVariable Integer id) { return new R<>(sysRoleService.deleteRoleById(id)); } @@ -103,8 +99,8 @@ public class RoleController { * @return 角色列表 */ @GetMapping("/list") - public R> roleList() { - return new R<>(sysRoleService.list(new QueryWrapper<>())); + public R roleList() { + return new R<>(sysRoleService.list(Wrappers.emptyWrapper())); } /** @@ -114,8 +110,8 @@ public class RoleController { * @return 分页对象 */ @GetMapping("/page") - public R rolePage(Page page) { - return new R<>(sysRoleService.page(page, new QueryWrapper<>())); + public R rolePage(Page page) { + return new R<>(sysRoleService.page(page, Wrappers.emptyWrapper())); } /** @@ -128,7 +124,7 @@ public class RoleController { @SysLog("更新角色菜单") @PutMapping("/upd-menu") @PreAuthorize("@pms.hasPermission('sys_role_perm')") - public R roleMenuUpd(Integer roleId, @RequestParam(value = "menuIds", required = false) String menuIds) { + public R roleMenuUpd(Integer roleId, @RequestParam(value = "menuIds", required = false) String menuIds) { SysRole sysRole = sysRoleService.getById(roleId); return new R<>(sysRoleMenuService.insertRoleMenus(sysRole.getRoleCode(), roleId, menuIds)); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysRouteConfController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysRouteConfController.java index bdbb4f414..0380953d5 100755 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysRouteConfController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysRouteConfController.java @@ -47,7 +47,7 @@ public class SysRouteConfController { */ @GetMapping public R routes() { - return new R<>(sysRouteConfService.routes()); + return new R<>(sysRouteConfService.list()); } /** diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysSocialDetailsController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysSocialDetailsController.java index 8b5e36e6b..0ac463cce 100755 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysSocialDetailsController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysSocialDetailsController.java @@ -17,9 +17,8 @@ package com.pig4cloud.pigx.admin.controller; -import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.pig4cloud.pigx.admin.api.dto.UserInfo; import com.pig4cloud.pigx.admin.api.entity.SysSocialDetails; import com.pig4cloud.pigx.admin.service.SysSocialDetailsService; import com.pig4cloud.pigx.common.core.util.R; @@ -53,8 +52,8 @@ public class SysSocialDetailsController { * @return */ @GetMapping("/page") - public R> getSysSocialDetailsPage(Page page, SysSocialDetails sysSocialDetails) { - return new R<>(sysSocialDetailsService.getSysSocialDetailsPage(page, sysSocialDetails)); + public R getSysSocialDetailsPage(Page page, SysSocialDetails sysSocialDetails) { + return new R<>(sysSocialDetailsService.page(page, Wrappers.query(sysSocialDetails))); } @@ -65,7 +64,7 @@ public class SysSocialDetailsController { * @return R */ @GetMapping("/{id}") - public R info(@PathVariable("id") Integer id) { + public R info(@PathVariable("id") Integer id) { return new R<>(sysSocialDetailsService.getById(id)); } @@ -114,7 +113,7 @@ public class SysSocialDetailsController { * @return */ @GetMapping("/info/{inStr}") - public R social(@PathVariable String inStr) { + public R social(@PathVariable String inStr) { return new R<>(sysSocialDetailsService.findUserInfo(inStr)); } @@ -126,7 +125,7 @@ public class SysSocialDetailsController { * @return */ @PostMapping("/bind") - public R bind(String state, String code) { + public R bind(String state, String code) { return new R<>(sysSocialDetailsService.bindSocial(state, code)); } } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/TokenController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/TokenController.java index f4c2207b5..e7a6f0029 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/TokenController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/TokenController.java @@ -17,8 +17,6 @@ package com.pig4cloud.pigx.admin.controller; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pig4cloud.pigx.admin.api.feign.RemoteTokenService; import com.pig4cloud.pigx.common.core.constant.SecurityConstants; import com.pig4cloud.pigx.common.core.util.R; @@ -49,7 +47,7 @@ public class TokenController { * @return token集合 */ @GetMapping("/page") - public R token(@RequestParam Map params) { + public R token(@RequestParam Map params) { return remoteTokenService.selectPage(params, SecurityConstants.FROM_IN); } @@ -62,7 +60,7 @@ public class TokenController { @SysLog("删除用户token") @DeleteMapping("/{token}") @PreAuthorize("@pms.hasPermission('sys_token_del')") - public R delete(@PathVariable String token) { + public R delete(@PathVariable String token) { return remoteTokenService.deleteTokenById(token, SecurityConstants.FROM_IN); } } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/UserController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/UserController.java index ae8916881..534b7dca2 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/UserController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/UserController.java @@ -21,15 +21,11 @@ package com.pig4cloud.pigx.admin.controller; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pig4cloud.pigx.admin.api.dto.UserDTO; -import com.pig4cloud.pigx.admin.api.dto.UserInfo; import com.pig4cloud.pigx.admin.api.entity.SysUser; -import com.pig4cloud.pigx.admin.api.entity.SysUserRole; -import com.pig4cloud.pigx.admin.api.vo.UserVO; import com.pig4cloud.pigx.admin.service.SysUserService; -import com.pig4cloud.pigx.common.core.constant.CommonConstant; import com.pig4cloud.pigx.common.core.constant.SecurityConstants; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.log.annotation.SysLog; @@ -38,14 +34,10 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; -import org.springframework.beans.BeanUtils; import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; -import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; -import java.util.List; /** * @author lengleng @@ -56,7 +48,6 @@ import java.util.List; @RequestMapping("/user") @Api(value = "user", description = "用户管理模块") public class UserController { - private static final PasswordEncoder ENCODER = new BCryptPasswordEncoder(); private final SysUserService userService; /** @@ -68,8 +59,8 @@ public class UserController { * @return 用户名 */ @GetMapping(value = {"/info", "/info/{username}"}) - public R user(@PathVariable(required = false) String username, - @RequestHeader(required = false) String from) { + public R user(@PathVariable(required = false) String username, + @RequestHeader(required = false) String from) { // 查询用户不为空时判断是不是内部请求 if (StrUtil.isNotBlank(username) && !StrUtil.equals(SecurityConstants.FROM_IN, from)) { return new R<>(null, "error"); @@ -78,10 +69,8 @@ public class UserController { if (StrUtil.isBlank(username)) { username = SecurityUtils.getUser().getUsername(); } - - SysUser condition = new SysUser(); - condition.setUsername(username); - SysUser sysUser = userService.getOne(new QueryWrapper<>(condition)); + SysUser sysUser = userService.getOne(Wrappers.query() + .lambda().eq(SysUser::getUsername, username)); if (sysUser == null) { return new R<>(); } @@ -95,7 +84,7 @@ public class UserController { * @return 用户信息 */ @GetMapping("/{id}") - public R user(@PathVariable Integer id) { + public R user(@PathVariable Integer id) { return new R<>(userService.selectUserVoById(id)); } @@ -106,7 +95,7 @@ public class UserController { * @return */ @GetMapping("/details/{username}") - public R user(@PathVariable String username) { + public R user(@PathVariable String username) { SysUser condition = new SysUser(); condition.setUsername(username); return new R<>(userService.getOne(new QueryWrapper<>(condition))); @@ -123,7 +112,7 @@ public class UserController { @PreAuthorize("@pms.hasPermission('sys_user_del')") @ApiOperation(value = "删除用户", notes = "根据ID删除用户") @ApiImplicitParam(name = "id", value = "用户ID", required = true, dataType = "int", paramType = "path") - public R userDel(@PathVariable Integer id) { + public R userDel(@PathVariable Integer id) { SysUser sysUser = userService.getById(id); return new R<>(userService.deleteUserById(sysUser)); } @@ -137,19 +126,8 @@ public class UserController { @SysLog("添加用户") @PostMapping @PreAuthorize("@pms.hasPermission('sys_user_add')") - public R user(@RequestBody UserDTO userDto) { - SysUser sysUser = new SysUser(); - BeanUtils.copyProperties(userDto, sysUser); - sysUser.setDelFlag(CommonConstant.STATUS_NORMAL); - sysUser.setPassword(ENCODER.encode(userDto.getPassword())); - userService.save(sysUser); - userDto.getRole().forEach(roleId -> { - SysUserRole userRole = new SysUserRole(); - userRole.setUserId(sysUser.getUserId()); - userRole.setRoleId(roleId); - userRole.insert(); - }); - return new R<>(Boolean.TRUE); + public R user(@RequestBody UserDTO userDto) { + return new R<>(userService.saveUser(userDto)); } /** @@ -161,20 +139,20 @@ public class UserController { @SysLog("更新用户信息") @PutMapping @PreAuthorize("@pms.hasPermission('sys_user_edit')") - public R userUpdate(@Valid @RequestBody UserDTO userDto) { + public R userUpdate(@Valid @RequestBody UserDTO userDto) { return new R<>(userService.updateUser(userDto)); } /** * 分页查询用户 * - * @param page 参数集 - * @param username 用户名 + * @param page 参数集 + * @param userDTO 查询参数列表 * @return 用户集合 */ @GetMapping("/page") - public R userPage(Page> page, @RequestParam(required = false) String username,@RequestParam(required = false) String deptId) { - return new R<>(userService.getUsersWithRolePage(page,username,deptId)); + public R userPage(Page page, UserDTO userDTO) { + return new R<>(userService.getUsersWithRolePage(page, userDTO)); } /** @@ -185,7 +163,7 @@ public class UserController { */ @SysLog("修改个人信息") @PutMapping("/edit") - public R editInfo(@Valid @RequestBody UserDTO userDto) { + public R editInfo(@Valid @RequestBody UserDTO userDto) { return userService.updateUserInfo(userDto); } @@ -194,7 +172,7 @@ public class UserController { * @return */ @GetMapping("/ancestor/{username}") - public R> ancestorUsers(@PathVariable String username) { + public R ancestorUsers(@PathVariable String username) { return new R<>(userService.ancestorUsers(username)); } } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/SmsLoginHandler.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/SmsLoginHandler.java index cc5d82620..d8ce7c842 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/SmsLoginHandler.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/SmsLoginHandler.java @@ -17,7 +17,7 @@ package com.pig4cloud.pigx.admin.handler; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.pig4cloud.pigx.admin.api.dto.UserInfo; import com.pig4cloud.pigx.admin.api.entity.SysUser; import com.pig4cloud.pigx.admin.service.SysUserService; @@ -55,10 +55,9 @@ public class SmsLoginHandler extends AbstractLoginHandler { */ @Override public UserInfo info(String identify) { - SysUser condition = new SysUser(); - condition.setPhone(identify); SysUser sysUser = sysUserService - .getOne(new QueryWrapper<>(condition)); + .getOne(Wrappers.query() + .lambda().eq(SysUser::getPhone, identify)); if (sysUser == null) { log.info("手机号未注册:{}", identify); diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/WeChatLoginHandler.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/WeChatLoginHandler.java index 19eec46cd..4d88274db 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/WeChatLoginHandler.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/WeChatLoginHandler.java @@ -19,6 +19,7 @@ package com.pig4cloud.pigx.admin.handler; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.pig4cloud.pigx.admin.api.dto.UserInfo; import com.pig4cloud.pigx.admin.api.entity.SysSocialDetails; import com.pig4cloud.pigx.admin.api.entity.SysUser; @@ -74,10 +75,9 @@ public class WeChatLoginHandler extends AbstractLoginHandler { */ @Override public UserInfo info(String openId) { - SysUser condition = new SysUser(); - condition.setWxOpenid(openId); SysUser sysUser = sysUserService - .getOne(new QueryWrapper<>(condition)); + .getOne(Wrappers.query() + .lambda().eq(SysUser::getWxOpenid, openId)); if (sysUser == null) { log.info("微信未绑定:{}", openId); diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysDictMapper.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysDictMapper.java index b5ca1468b..684da122c 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysDictMapper.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysDictMapper.java @@ -20,10 +20,7 @@ package com.pig4cloud.pigx.admin.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pig4cloud.pigx.admin.api.entity.SysDict; -import org.apache.ibatis.annotations.Param; /** *

@@ -34,12 +31,5 @@ import org.apache.ibatis.annotations.Param; * @since 2017-11-19 */ public interface SysDictMapper extends BaseMapper { - /** - * 系统字典简单分页查询 - * @param sysDict 系统字典 - * @return - */ - IPage getSysDictPage(Page page, @Param("sysDict") SysDict sysDict); - } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysLogMapper.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysLogMapper.java index b8fbafee7..cdcc9235e 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysLogMapper.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysLogMapper.java @@ -20,10 +20,7 @@ package com.pig4cloud.pigx.admin.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pig4cloud.pigx.admin.api.entity.SysLog; -import org.apache.ibatis.annotations.Param; /** *

@@ -34,10 +31,4 @@ import org.apache.ibatis.annotations.Param; * @since 2017-11-20 */ public interface SysLogMapper extends BaseMapper { - /** - * 系统日志简单分页查询 - * @param sysLog 系统日志 - * @return - */ - IPage getSysLogPage(Page page, @Param("sysLog") SysLog sysLog); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysOauthClientDetailsMapper.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysOauthClientDetailsMapper.java index 99e2318bb..f0e058d95 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysOauthClientDetailsMapper.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysOauthClientDetailsMapper.java @@ -21,10 +21,7 @@ package com.pig4cloud.pigx.admin.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pig4cloud.pigx.admin.api.entity.SysOauthClientDetails; -import org.apache.ibatis.annotations.Param; /** *

@@ -35,12 +32,5 @@ import org.apache.ibatis.annotations.Param; * @since 2018-05-15 */ public interface SysOauthClientDetailsMapper extends BaseMapper { - /** - * 系统终端简单分页查询 - * @param sysOauthClientDetails 系统终端 - * @return - */ - IPage getSysOauthClientDetailsPage(Page page, @Param("sysOauthClientDetails") SysOauthClientDetails sysOauthClientDetails); - } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysSocialDetailsMapper.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysSocialDetailsMapper.java index f8a212fc5..5a4016350 100755 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysSocialDetailsMapper.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysSocialDetailsMapper.java @@ -18,11 +18,8 @@ package com.pig4cloud.pigx.admin.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pig4cloud.pigx.admin.api.entity.SysSocialDetails; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; /** * 系统社交登录账号表 @@ -32,10 +29,5 @@ import org.apache.ibatis.annotations.Param; */ @Mapper public interface SysSocialDetailsMapper extends BaseMapper { - /** - * 社交登录简单分页查询 - * @param sysSocialDetails 社交登录 - * @return - */ - IPage getSysSocialDetailsPage(Page page, @Param("sysSocialDetails") SysSocialDetails sysSocialDetails); + } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysUserMapper.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysUserMapper.java index 84490092e..589c89124 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysUserMapper.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysUserMapper.java @@ -22,6 +22,7 @@ package com.pig4cloud.pigx.admin.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.pig4cloud.pigx.admin.api.dto.UserDTO; import com.pig4cloud.pigx.admin.api.entity.SysUser; import com.pig4cloud.pigx.admin.api.vo.UserVO; import com.pig4cloud.pigx.common.core.datascope.DataScope; @@ -49,12 +50,12 @@ public interface SysUserMapper extends BaseMapper { /** * 分页查询用户信息（含角色） * - * @param page 分页 - * @param username 用户名 + * @param page 分页 + * @param userDTO 查询参数 * @param dataScope * @return list */ - IPage> getUserVosPage(Page page, @Param("username") String username,@Param("deptId")String deptId,DataScope dataScope); + IPage> getUserVosPage(Page page, @Param("query") UserDTO userDTO, DataScope dataScope); /** * 通过ID查询用户信息 diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysDictService.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysDictService.java index a74af2a48..777d32d04 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysDictService.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysDictService.java @@ -19,8 +19,6 @@ package com.pig4cloud.pigx.admin.service; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.pig4cloud.pigx.admin.api.entity.SysDict; @@ -33,12 +31,4 @@ import com.pig4cloud.pigx.admin.api.entity.SysDict; * @since 2017-11-19 */ public interface SysDictService extends IService { - - /** - * 系统字典简单分页查询 - * @param sysDict 系统字典 - * @return - */ - IPage getSysDictPage(Page page, SysDict sysDict); - } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysLogService.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysLogService.java index 4d427ac0c..97fcf19e1 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysLogService.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysLogService.java @@ -19,8 +19,6 @@ package com.pig4cloud.pigx.admin.service; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.pig4cloud.pigx.admin.api.entity.SysLog; import com.pig4cloud.pigx.admin.api.vo.PreLogVo; @@ -37,12 +35,6 @@ import java.util.List; */ public interface SysLogService extends IService { - /** - * 系统日志简单分页查询 - * @param sysLog 系统日志 - * @return - */ - IPage getSysLogPage(Page page, SysLog sysLog); /** * 批量插入前端错误日志 diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysOauthClientDetailsService.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysOauthClientDetailsService.java index 5e7343bfa..8ce90a1f3 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysOauthClientDetailsService.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysOauthClientDetailsService.java @@ -19,8 +19,6 @@ package com.pig4cloud.pigx.admin.service; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.pig4cloud.pigx.admin.api.entity.SysOauthClientDetails; @@ -33,14 +31,6 @@ import com.pig4cloud.pigx.admin.api.entity.SysOauthClientDetails; * @since 2018-05-15 */ public interface SysOauthClientDetailsService extends IService { - /** - * 系统终端简单分页查询 - * @param sysOauthClientDetails 系统终端 - * @return - */ - IPage getSysOauthClientDetailsPage(Page page, SysOauthClientDetails sysOauthClientDetails); - - /** * 通过ID删除客户端 * diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysSocialDetailsService.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysSocialDetailsService.java index 57cd5da17..90b21a2c6 100755 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysSocialDetailsService.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysSocialDetailsService.java @@ -17,8 +17,6 @@ package com.pig4cloud.pigx.admin.service; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.pig4cloud.pigx.admin.api.dto.UserInfo; import com.pig4cloud.pigx.admin.api.entity.SysSocialDetails; @@ -31,13 +29,6 @@ import com.pig4cloud.pigx.admin.api.entity.SysSocialDetails; */ public interface SysSocialDetailsService extends IService { - /** - * 社交登录简单分页查询 - * @param sysSocialDetails 社交登录 - * @return - */ - IPage getSysSocialDetailsPage(Page page, SysSocialDetails sysSocialDetails); - /** * 绑定社交账号 * diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysUserService.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysUserService.java index 149725cd2..1215a0044 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysUserService.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysUserService.java @@ -46,11 +46,11 @@ public interface SysUserService extends IService { /** * 分页查询用户信息（含有角色信息） * - * @param page 分页对象 - * @param username 用户名 + * @param page 分页对象 + * @param userDTO 参数列表 * @return */ - IPage> getUsersWithRolePage(Page> page, String username,String deptId); + IPage getUsersWithRolePage(Page page, UserDTO userDTO); /** * 删除用户 @@ -63,7 +63,7 @@ public interface SysUserService extends IService { /** * 更新当前用户基本信息 * - * @param userDto 用户信息 + * @param userDto 用户信息 * @return Boolean */ R updateUserInfo(UserDTO userDto); @@ -71,7 +71,7 @@ public interface SysUserService extends IService { /** * 更新指定用户信息 * - * @param userDto 用户信息 + * @param userDto 用户信息 * @return */ Boolean updateUser(UserDTO userDto); @@ -91,4 +91,12 @@ public interface SysUserService extends IService { * @return R */ List ancestorUsers(String username); + + /** + * 保存用户信息 + * + * @param userDto DTO 对象 + * @return success/fail + */ + Boolean saveUser(UserDTO userDto); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/MobileServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/MobileServiceImpl.java index 66782b2f2..1cca951ff 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/MobileServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/MobileServiceImpl.java @@ -19,7 +19,7 @@ package com.pig4cloud.pigx.admin.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.RandomUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.pig4cloud.pigx.admin.api.entity.SysUser; import com.pig4cloud.pigx.admin.mapper.SysUserMapper; import com.pig4cloud.pigx.admin.service.MobileService; @@ -58,9 +58,9 @@ public class MobileServiceImpl implements MobileService { */ @Override public R sendSmsCode(String mobile) { - SysUser condition = new SysUser(); - condition.setPhone(mobile); - List userList = userMapper.selectList(new QueryWrapper<>(condition)); + List userList = userMapper.selectList(Wrappers + .query().lambda() + .eq(SysUser::getPhone, mobile)); if (CollUtil.isEmpty(userList)) { log.info("手机号未注册:{}", mobile); diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptRelationServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptRelationServiceImpl.java index 378958266..5f386fba2 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptRelationServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptRelationServiceImpl.java @@ -20,7 +20,7 @@ package com.pig4cloud.pigx.admin.service.impl; import cn.hutool.core.collection.CollUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pig4cloud.pigx.admin.api.entity.SysDept; import com.pig4cloud.pigx.admin.api.entity.SysDeptRelation; @@ -58,7 +58,8 @@ public class SysDeptRelationServiceImpl extends ServiceImpl relationList = sysDeptRelationMapper - .selectList(new QueryWrapper<>(condition)) + .selectList(Wrappers.query().lambda() + .eq(SysDeptRelation::getDescendant, sysDept.getParentId())) .stream().map(relation -> { relation.setDescendant(sysDept.getDeptId()); return relation; diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptServiceImpl.java index 6879a3ec4..d9d57a98e 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptServiceImpl.java @@ -20,7 +20,7 @@ package com.pig4cloud.pigx.admin.service.impl; import cn.hutool.core.collection.CollUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pig4cloud.pigx.admin.api.dto.DeptTree; import com.pig4cloud.pigx.admin.api.entity.SysDept; @@ -29,7 +29,6 @@ import com.pig4cloud.pigx.admin.api.vo.TreeUtil; import com.pig4cloud.pigx.admin.mapper.SysDeptMapper; import com.pig4cloud.pigx.admin.service.SysDeptRelationService; import com.pig4cloud.pigx.admin.service.SysDeptService; -import com.pig4cloud.pigx.common.core.constant.CommonConstant; import com.pig4cloud.pigx.common.security.util.SecurityUtils; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; @@ -79,10 +78,9 @@ public class SysDeptServiceImpl extends ServiceImpl impl @Transactional(rollbackFor = Exception.class) public Boolean deleteDeptById(Integer id) { //级联删除部门 - SysDeptRelation condition = new SysDeptRelation(); - condition.setAncestor(id); List idList = sysDeptRelationService - .list(new QueryWrapper<>(condition)) + .list(Wrappers.query().lambda() + .eq(SysDeptRelation::getAncestor, id)) .stream() .map(SysDeptRelation::getDescendant) .collect(Collectors.toList()); @@ -122,10 +120,7 @@ public class SysDeptServiceImpl extends ServiceImpl impl */ @Override public List selectTree() { - return getDeptTree(this.list( - new QueryWrapper() - .lambda().eq(SysDept::getDelFlag, CommonConstant.STATUS_NORMAL) - )); + return getDeptTree(this.list(Wrappers.emptyWrapper())); } /** @@ -136,11 +131,9 @@ public class SysDeptServiceImpl extends ServiceImpl impl @Override public List selectUserTree() { Integer deptId = SecurityUtils.getUser().getDeptId(); - - SysDeptRelation condition = new SysDeptRelation(); - condition.setAncestor(deptId); List descendantIdList = sysDeptRelationService - .list(new QueryWrapper<>(condition)) + .list(Wrappers.query().lambda() + .eq(SysDeptRelation::getAncestor, deptId)) .stream().map(SysDeptRelation::getDescendant) .collect(Collectors.toList()); @@ -155,7 +148,6 @@ public class SysDeptServiceImpl extends ServiceImpl impl * @return */ private List getDeptTree(List depts) { - List treeList = depts.stream() .filter(dept -> !dept.getDeptId().equals(dept.getParentId())) .map(dept -> { diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDictServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDictServiceImpl.java index 4e07e08bd..0ec8b6fd6 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDictServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDictServiceImpl.java @@ -19,8 +19,6 @@ package com.pig4cloud.pigx.admin.service.impl; -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.pig4cloud.pigx.admin.api.entity.SysDict; import com.pig4cloud.pigx.admin.mapper.SysDictMapper; @@ -37,15 +35,5 @@ import org.springframework.stereotype.Service; */ @Service public class SysDictServiceImpl extends ServiceImpl implements SysDictService { - /** - * 系统字典简单分页查询 - * @param sysDict 系统字典 - * @return - */ - @Override - public IPage getSysDictPage(Page page, SysDict sysDict){ - return baseMapper.getSysDictPage(page,sysDict); - } - } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysLogServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysLogServiceImpl.java index 89660b985..3012f456a 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysLogServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysLogServiceImpl.java @@ -19,8 +19,6 @@ package com.pig4cloud.pigx.admin.service.impl; -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.pig4cloud.pigx.admin.api.entity.SysLog; import com.pig4cloud.pigx.admin.api.vo.PreLogVo; @@ -43,15 +41,6 @@ import java.util.stream.Collectors; */ @Service public class SysLogServiceImpl extends ServiceImpl implements SysLogService { - /** - * 系统日志简单分页查询 - * @param sysLog 系统日志 - * @return - */ - @Override - public IPage getSysLogPage(Page page, SysLog sysLog){ - return baseMapper.getSysLogPage(page,sysLog); - } /** * 批量插入前端错误日志 diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java index e2c0a83fe..54c21e973 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java @@ -19,8 +19,7 @@ package com.pig4cloud.pigx.admin.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pig4cloud.pigx.admin.api.entity.SysMenu; import com.pig4cloud.pigx.admin.api.entity.SysRoleMenu; @@ -61,19 +60,16 @@ public class SysMenuServiceImpl extends ServiceImpl impl @CacheEvict(value = "menu_details", allEntries = true) public Boolean deleteMenu(Integer id) { // 查询父节点为当前节点的节点 - SysMenu conditon = new SysMenu(); - conditon.setParentId(id); - List menuIdList = this.list(new QueryWrapper<>(conditon)) + List menuIdList = this.list(Wrappers.query() + .lambda().eq(SysMenu::getParentId, id)) .stream().map(SysMenu::getMenuId) .collect(Collectors.toList()); - menuIdList.add(id); //删除关联ROLE_MENU 数据 - menuIdList.forEach(menu -> { - SysRoleMenu conditon2 = new SysRoleMenu(); - conditon2.setMenuId(menu); - sysRoleMenuMapper.delete(new UpdateWrapper<>(conditon2)); - }); + menuIdList.add(id); + menuIdList.forEach(menu -> sysRoleMenuMapper + .delete(Wrappers.query() + .lambda().eq(SysRoleMenu::getMenuId, menu))); //删除当前菜单及其子菜单 return this.removeByIds(menuIdList); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysOauthClientDetailsServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysOauthClientDetailsServiceImpl.java index 29cf296f5..fc85b91df 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysOauthClientDetailsServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysOauthClientDetailsServiceImpl.java @@ -19,8 +19,6 @@ package com.pig4cloud.pigx.admin.service.impl; -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.pig4cloud.pigx.admin.api.entity.SysOauthClientDetails; import com.pig4cloud.pigx.admin.mapper.SysOauthClientDetailsMapper; @@ -40,17 +38,6 @@ import org.springframework.stereotype.Service; @Service public class SysOauthClientDetailsServiceImpl extends ServiceImpl implements SysOauthClientDetailsService { - - /** - * 系统终端简单分页查询 - * @param sysOauthClientDetails 系统终端 - * @return - */ - @Override - public IPage getSysOauthClientDetailsPage(Page page, SysOauthClientDetails sysOauthClientDetails){ - return baseMapper.getSysOauthClientDetailsPage(page,sysOauthClientDetails); - } - /** * 通过ID删除客户端 * diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleMenuServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleMenuServiceImpl.java index 62ebfe460..73818343f 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleMenuServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleMenuServiceImpl.java @@ -20,7 +20,7 @@ package com.pig4cloud.pigx.admin.service.impl; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pig4cloud.pigx.admin.api.entity.SysRoleMenu; import com.pig4cloud.pigx.admin.mapper.SysRoleMenuMapper; @@ -58,14 +58,12 @@ public class SysRoleMenuServiceImpl extends ServiceImpl(condition)); + this.remove(Wrappers.query().lambda() + .eq(SysRoleMenu::getRoleId, role)); if (StrUtil.isBlank(menuIds)) { return Boolean.TRUE; } - List roleMenuList = Arrays .stream(menuIds.split(",")) .map(menuId -> { diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleServiceImpl.java index 0279c5bbc..e631f9d01 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleServiceImpl.java @@ -19,7 +19,7 @@ package com.pig4cloud.pigx.admin.service.impl; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pig4cloud.pigx.admin.api.entity.SysRole; import com.pig4cloud.pigx.admin.api.entity.SysRoleMenu; @@ -53,7 +53,7 @@ public class SysRoleServiceImpl extends ServiceImpl impl * @return */ @Override - public List findRolesByUserId(Integer userId) { + public List findRolesByUserId(Integer userId) { return baseMapper.findRolesByUserId(userId); } @@ -67,10 +67,9 @@ public class SysRoleServiceImpl extends ServiceImpl impl @CacheEvict(value = "menu_details", allEntries = true) @Transactional(rollbackFor = Exception.class) public Boolean deleteRoleById(Integer id) { - SysRoleMenu condition = new SysRoleMenu(); - condition.setRoleId(id); - - sysRoleMenuMapper.delete(new UpdateWrapper<>(condition)); + sysRoleMenuMapper.delete(Wrappers + .update().lambda() + .eq(SysRoleMenu::getRoleId, id)); return this.removeById(id); } } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRouteConfServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRouteConfServiceImpl.java index 6b2d6b01c..f3c715ac7 100755 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRouteConfServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRouteConfServiceImpl.java @@ -19,8 +19,8 @@ package com.pig4cloud.pigx.admin.service.impl; import cn.hutool.json.JSONArray; import cn.hutool.json.JSONUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pig4cloud.pigx.admin.api.entity.SysRouteConf; import com.pig4cloud.pigx.admin.mapper.SysRouteConfMapper; @@ -69,9 +69,7 @@ public class SysRouteConfServiceImpl extends ServiceImpl routes() { - SysRouteConf condition = new SysRouteConf(); - condition.setDelFlag(CommonConstant.STATUS_NORMAL); - return baseMapper.selectList(new QueryWrapper<>(condition)); + return baseMapper.selectList(Wrappers.emptyWrapper()); } /** diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysSocialDetailsServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysSocialDetailsServiceImpl.java index 954b7b7ac..2a05f25d8 100755 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysSocialDetailsServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysSocialDetailsServiceImpl.java @@ -17,10 +17,6 @@ package com.pig4cloud.pigx.admin.service.impl; -import cn.hutool.json.JSONUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -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.pig4cloud.pigx.admin.api.dto.UserInfo; import com.pig4cloud.pigx.admin.api.entity.SysSocialDetails; @@ -29,8 +25,6 @@ import com.pig4cloud.pigx.admin.handler.LoginHandler; import com.pig4cloud.pigx.admin.mapper.SysSocialDetailsMapper; import com.pig4cloud.pigx.admin.mapper.SysUserMapper; import com.pig4cloud.pigx.admin.service.SysSocialDetailsService; -import com.pig4cloud.pigx.common.core.constant.SecurityConstants; -import com.pig4cloud.pigx.common.core.constant.enums.EnumLoginType; import com.pig4cloud.pigx.common.security.util.SecurityUtils; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -38,7 +32,6 @@ import org.springframework.cache.CacheManager; import org.springframework.stereotype.Service; import org.springframework.web.client.RestTemplate; -import java.util.HashMap; import java.util.Map; /** @@ -54,35 +47,21 @@ public class SysSocialDetailsServiceImpl extends ServiceImpl getSysSocialDetailsPage(Page page, SysSocialDetails sysSocialDetails) { - return baseMapper.getSysSocialDetailsPage(page, sysSocialDetails); - } - /** * 绑定社交账号 * - * @param appId appId - * @param code code + * @param type type + * @param code code * @return */ @Override - public Boolean bindSocial(String appId, String code) { - Map result = getOpenId(appId, code); - + public Boolean bindSocial(String type, String code) { + String identify = loginHandlerMap.get(type).identify(code); SysUser sysUser = sysUserMapper.selectById(SecurityUtils.getUser().getId()); - sysUser.setWxOpenid(result.get("openId")); - + sysUser.setWxOpenid(identify); sysUserMapper.updateById(sysUser); //更新緩存 - cacheManager.getCache("user_details").evict(result.get("openId")); + cacheManager.getCache("user_details").evict(sysUser.getUsername()); return Boolean.TRUE; } @@ -99,38 +78,4 @@ public class SysSocialDetailsServiceImpl extends ServiceImpl getOpenId(String appId, String code) { - SysSocialDetails condition = new SysSocialDetails(); - condition.setAppId(appId); - SysSocialDetails socialDetails = this.baseMapper.selectOne(new QueryWrapper<>(condition)); - - String openId = null; - //微信登录 - if (EnumLoginType.WECHAT.getType().equals(socialDetails.getType())) { - String url = String.format(SecurityConstants.WX_AUTHORIZATION_CODE_URL - , socialDetails.getAppId(), socialDetails.getAppSecret(), code); - String result = restTemplate.getForObject(url, String.class); - log.debug("微信响应报文:{}", result); - - Object obj = JSONUtil.parseObj(result).get("openid"); - if (obj == null) { - return null; - } - openId = obj.toString(); - } - - Map result = new HashMap<>(2); - result.put("type", socialDetails.getType()); - result.put("openId", openId); - return result; - } - } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java index f76470ad4..41730eca0 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java @@ -21,9 +21,8 @@ package com.pig4cloud.pigx.admin.service.impl; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pig4cloud.pigx.admin.api.dto.UserDTO; @@ -33,6 +32,7 @@ import com.pig4cloud.pigx.admin.api.vo.MenuVO; import com.pig4cloud.pigx.admin.api.vo.UserVO; import com.pig4cloud.pigx.admin.mapper.SysUserMapper; import com.pig4cloud.pigx.admin.service.*; +import com.pig4cloud.pigx.common.core.constant.CommonConstant; import com.pig4cloud.pigx.common.core.datascope.DataScope; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.security.util.SecurityUtils; @@ -45,6 +45,7 @@ import org.springframework.cache.annotation.Cacheable; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; import java.util.HashSet; @@ -67,6 +68,30 @@ public class SysUserServiceImpl extends ServiceImpl impl private final SysUserRoleService sysUserRoleService; private final SysDeptRelationService sysDeptRelationService; + /** + * 保存用户信息 + * + * @param userDto DTO 对象 + * @return success/fail + */ + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean saveUser(UserDTO userDto) { + SysUser sysUser = new SysUser(); + BeanUtils.copyProperties(userDto, sysUser); + sysUser.setDelFlag(CommonConstant.STATUS_NORMAL); + sysUser.setPassword(ENCODER.encode(userDto.getPassword())); + baseMapper.insert(sysUser); + List userRoleList = userDto.getRole() + .stream().map(roleId -> { + SysUserRole userRole = new SysUserRole(); + userRole.setUserId(sysUser.getUserId()); + userRole.setRoleId(roleId); + return userRole; + }).collect(Collectors.toList()); + return sysUserRoleService.saveBatch(userRoleList); + } + /** * 通过查用户的全部信息 * @@ -103,17 +128,22 @@ public class SysUserServiceImpl extends ServiceImpl impl return userInfo; } + /** + * 分页查询用户信息（含有角色信息） + * + * @param page 分页对象 + * @param userDTO 参数列表 + * @return + */ @Override - public IPage> getUsersWithRolePage(Page> page, String username,String deptId) { + public IPage getUsersWithRolePage(Page page, UserDTO userDTO) { DataScope dataScope = new DataScope(); dataScope.setScopeName("deptId"); dataScope.setIsOnly(true); dataScope.setDeptIds(getChildDepts()); - IPage> userVosPage = baseMapper.getUserVosPage(page, username,deptId, dataScope); - return userVosPage.setTotal(Long.valueOf(userVosPage.getRecords().size())); + return baseMapper.getUserVosPage(page, userDTO, dataScope); } - /** * 通过ID查询用户信息 * @@ -171,9 +201,8 @@ public class SysUserServiceImpl extends ServiceImpl impl } this.updateById(sysUser); - SysUserRole condition = new SysUserRole(); - condition.setUserId(userDto.getUserId()); - sysUserRoleService.remove(new UpdateWrapper<>(condition)); + sysUserRoleService.remove(Wrappers.update().lambda() + .eq(SysUserRole::getUserId, userDto.getUserId())); userDto.getRole().forEach(roleId -> { SysUserRole userRole = new SysUserRole(); userRole.setUserId(sysUser.getUserId()); @@ -191,20 +220,17 @@ public class SysUserServiceImpl extends ServiceImpl impl */ @Override public List ancestorUsers(String username) { - SysUser condition = new SysUser(); - condition.setUsername(username); - SysUser sysUser = this.getOne(new QueryWrapper<>(condition)); + SysUser sysUser = this.getOne(Wrappers.query().lambda() + .eq(SysUser::getUsername, username)); - Integer deptId = sysUser.getDeptId(); - SysDept sysDept = sysDeptService.getById(deptId); + SysDept sysDept = sysDeptService.getById(sysUser.getDeptId()); if (sysDept == null) { return null; } Integer parentId = sysDept.getParentId(); - SysUser condition2 = new SysUser(); - condition2.setDeptId(parentId); - return this.list(new QueryWrapper<>(condition2)); + return this.list(Wrappers.query().lambda() + .eq(SysUser::getDeptId, parentId)); } /** @@ -215,10 +241,9 @@ public class SysUserServiceImpl extends ServiceImpl impl private List getChildDepts() { Integer deptId = SecurityUtils.getUser().getDeptId(); //获取当前部门的子部门 - SysDeptRelation condition = new SysDeptRelation(); - condition.setAncestor(deptId); return sysDeptRelationService - .list(new QueryWrapper<>(condition)) + .list(Wrappers.query().lambda() + .eq(SysDeptRelation::getAncestor, deptId)) .stream() .map(SysDeptRelation::getDescendant) .collect(Collectors.toList()); diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysDictMapper.xml b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysDictMapper.xml index e4a37152a..362b17322 100644 --- a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysDictMapper.xml +++ b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysDictMapper.xml @@ -35,54 +35,4 @@ - - - - - diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysLogMapper.xml b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysLogMapper.xml index 9e8b8a9f7..a5e30a6f5 100644 --- a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysLogMapper.xml +++ b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysLogMapper.xml @@ -40,74 +40,4 @@ - - - - - diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysOauthClientDetailsMapper.xml b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysOauthClientDetailsMapper.xml index 11b17f1fc..04ce22d32 100644 --- a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysOauthClientDetailsMapper.xml +++ b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysOauthClientDetailsMapper.xml @@ -36,58 +36,4 @@ - - - - - diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysSocialDetailsMapper.xml b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysSocialDetailsMapper.xml index e0e021afb..698decb4e 100755 --- a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysSocialDetailsMapper.xml +++ b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysSocialDetailsMapper.xml @@ -34,50 +34,4 @@ - - - - - diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysUserMapper.xml b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysUserMapper.xml index f230ab92c..80999f068 100644 --- a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysUserMapper.xml +++ b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysUserMapper.xml @@ -65,74 +65,31 @@ - - SELECT - `user`.user_id, - `user`.username, - `user`.`password`, - `user`.salt, - `user`.phone, - `user`.avatar, - `user`.wx_openid, - `user`.qq_openid, - `user`.dept_id, - `user`.create_time AS ucreate_time, - `user`.update_time AS uupdate_time, - `user`.del_flag AS udel_flag, - `user`.lock_flag AS lock_flag, - `user`.dept_id AS deptId, - `user`.tenant_id AS tenantId, - r.role_id, - r.role_name, - r.role_code, - r.role_desc, - r.create_time AS rcreate_time, - r.update_time AS rupdate_time - FROM - sys_user AS `user` - LEFT JOIN sys_user_role AS ur ON ur.user_id = `user`.user_id - LEFT JOIN sys_role AS r ON r.role_id = ur.role_id - + + `user`.user_id, + `user`.username, + `user`.`password`, + `user`.salt, + `user`.phone, + `user`.avatar, + `user`.wx_openid, + `user`.qq_openid, + `user`.dept_id, + `user`.create_time AS ucreate_time, + `user`.update_time AS uupdate_time, + `user`.del_flag AS udel_flag, + `user`.lock_flag AS lock_flag, + `user`.dept_id AS deptId, + `user`.tenant_id AS tenantId, + r.role_id, + r.role_name, + r.role_code, + r.role_desc, + r.create_time AS rcreate_time, + r.update_time AS rupdate_time + - - - - - + SELECT + + FROM + sys_user AS `user` + LEFT JOIN sys_user_role AS ur ON ur.user_id = `user`.user_id + LEFT JOIN sys_role AS r ON r.role_id = ur.role_id + WHERE `user`.username = #{username} + + + + + diff --git a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/config/MybatisPlusConfigurer.java b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/config/MybatisPlusConfigurer.java index c8c5ca9d5..d35c07be4 100644 --- a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/config/MybatisPlusConfigurer.java +++ b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/config/MybatisPlusConfigurer.java @@ -17,7 +17,9 @@ package com.pig4cloud.pigx.act.config; +import com.baomidou.mybatisplus.core.injector.ISqlInjector; import com.baomidou.mybatisplus.core.parser.ISqlParser; +import com.baomidou.mybatisplus.extension.injector.LogicSqlInjector; import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; import com.baomidou.mybatisplus.extension.plugins.tenant.TenantHandler; import com.baomidou.mybatisplus.extension.plugins.tenant.TenantSqlParser; @@ -73,4 +75,14 @@ public class MybatisPlusConfigurer { paginationInterceptor.setSqlParserList(sqlParserList); return paginationInterceptor; } + + /** + * 逻辑删除插件 + * + * @return LogicSqlInjector + */ + @Bean + public ISqlInjector sqlInjector() { + return new LogicSqlInjector(); + } } diff --git a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/LeaveBillController.java b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/LeaveBillController.java index ee5985800..fdc2c0de9 100755 --- a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/LeaveBillController.java +++ b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/LeaveBillController.java @@ -17,7 +17,7 @@ package com.pig4cloud.pigx.act.controller; -import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pig4cloud.pigx.act.entity.LeaveBill; import com.pig4cloud.pigx.act.service.LeaveBillService; @@ -44,13 +44,14 @@ public class LeaveBillController { /** * 请假审批单简单分页查询 - * @param page 分页对象 + * + * @param page 分页对象 * @param leaveBill 请假审批单 * @return */ @GetMapping("/page") - public R> getLeaveBillPage(Page page, LeaveBill leaveBill) { - return new R<>(leaveBillService.getLeaveBillPage(page,leaveBill)); + public R getLeaveBillPage(Page page, LeaveBill leaveBill) { + return new R<>(leaveBillService.page(page, Wrappers.query(leaveBill))); } @@ -62,8 +63,7 @@ public class LeaveBillController { */ @GetMapping("/{leaveId}") public R info(@PathVariable("leaveId") Integer leaveId) { - LeaveBill leaveBill = leaveBillService.getById(leaveId); - return new R<>(leaveBill); + return new R<>(leaveBillService.getById(leaveId)); } /** @@ -87,8 +87,7 @@ public class LeaveBillController { */ @PutMapping public R update(@RequestBody LeaveBill leaveBill) { - leaveBillService.updateById(leaveBill); - return new R<>(Boolean.TRUE); + return new R<>(leaveBillService.updateById(leaveBill)); } /** diff --git a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/ModelController.java b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/ModelController.java index a53df09a3..22ecfa857 100644 --- a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/ModelController.java +++ b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/ModelController.java @@ -17,12 +17,10 @@ package com.pig4cloud.pigx.act.controller; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.pig4cloud.pigx.act.dto.ModelForm; import com.pig4cloud.pigx.act.service.ModelService; import com.pig4cloud.pigx.common.core.util.R; import lombok.AllArgsConstructor; -import org.activiti.engine.repository.Model; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,25 +43,24 @@ public class ModelController { } @PostMapping - public String createModel(@RequestParam String name, @RequestParam String key, - @RequestParam String desc, @RequestParam String category) { - Model model = modelService.create(name, key, desc, category); - return model.getId(); + public R createModel(@RequestParam String name, @RequestParam String key, + @RequestParam String desc, @RequestParam String category) { + return new R(modelService.create(name, key, desc, category)); } @GetMapping - public R> list(@RequestParam Map params) { - return new R<> (modelService.selectPage(params)); + public R list(@RequestParam Map params) { + return new R<>(modelService.selectPage(params)); } @DeleteMapping("/{id}") - public R delete(@PathVariable("id") String id) { + public R delete(@PathVariable("id") String id) { return new R<>(modelService.delete(id)); } @PostMapping("/deploy/{id}") - public R deploy(@PathVariable("id") String id) { + public R deploy(@PathVariable("id") String id) { return new R<>(modelService.deploy(id)); } } diff --git a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/ProcessController.java b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/ProcessController.java index db710feb9..ca241b225 100644 --- a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/ProcessController.java +++ b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/ProcessController.java @@ -18,8 +18,6 @@ package com.pig4cloud.pigx.act.controller; import cn.hutool.core.io.IoUtil; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.pig4cloud.pigx.act.dto.ProcessDefDTO; import com.pig4cloud.pigx.act.service.ProcessService; import com.pig4cloud.pigx.common.core.constant.enums.EnumResourceType; import com.pig4cloud.pigx.common.core.util.R; @@ -44,7 +42,7 @@ public class ProcessController { private final ProcessService processService; @GetMapping - public R> list(@RequestParam Map params) { + public R list(@RequestParam Map params) { return new R<>(processService.getProcessByPage(params)); } @@ -64,12 +62,12 @@ public class ProcessController { } @PutMapping("/status/{procDefId}/{status}") - public R updateState(@PathVariable String procDefId, @PathVariable String status) { + public R updateState(@PathVariable String procDefId, @PathVariable String status) { return new R<>(processService.updateStatus(status, procDefId)); } @DeleteMapping("/{deploymentId}") - public R deleteProcIns(@PathVariable String deploymentId) { + public R deleteProcIns(@PathVariable String deploymentId) { return new R<>(processService.deleteProcIns(deploymentId)); } } diff --git a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/TaskController.java b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/TaskController.java index c812175d3..60a5c47c2 100644 --- a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/TaskController.java +++ b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/TaskController.java @@ -18,7 +18,6 @@ package com.pig4cloud.pigx.act.controller; import cn.hutool.core.io.IoUtil; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.pig4cloud.pigx.act.dto.LeaveBillDto; import com.pig4cloud.pigx.act.service.ActTaskService; import com.pig4cloud.pigx.common.core.util.R; @@ -44,7 +43,7 @@ public class TaskController { private final ActTaskService actTaskService; @GetMapping("/todo") - public R todo(@RequestParam Map params) { + public R todo(@RequestParam Map params) { return new R<>(actTaskService.findTaskByName(params, SecurityUtils.getUsername())); } diff --git a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/dto/LeaveBillDto.java b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/dto/LeaveBillDto.java index 7f4f06852..1b98c8cab 100644 --- a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/dto/LeaveBillDto.java +++ b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/dto/LeaveBillDto.java @@ -19,6 +19,7 @@ package com.pig4cloud.pigx.act.dto; import com.pig4cloud.pigx.act.entity.LeaveBill; import lombok.Data; +import lombok.EqualsAndHashCode; import java.util.Date; import java.util.List; @@ -29,6 +30,7 @@ import java.util.List; * LeaveBillDto */ @Data +@EqualsAndHashCode(callSuper = true) public class LeaveBillDto extends LeaveBill { /** * 任务ID diff --git a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/entity/LeaveBill.java b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/entity/LeaveBill.java index 0a7cce52d..bc5e5060f 100755 --- a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/entity/LeaveBill.java +++ b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/entity/LeaveBill.java @@ -35,8 +35,8 @@ import java.time.LocalDateTime; * @date 2018-09-27 15:20:44 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("oa_leave_bill") +@EqualsAndHashCode(callSuper = true) public class LeaveBill extends Model { private static final long serialVersionUID = 1L; diff --git a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/mapper/LeaveBillMapper.java b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/mapper/LeaveBillMapper.java index 67fc07cf6..a44951773 100755 --- a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/mapper/LeaveBillMapper.java +++ b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/mapper/LeaveBillMapper.java @@ -1,11 +1,8 @@ package com.pig4cloud.pigx.act.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pig4cloud.pigx.act.entity.LeaveBill; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; /** * 请假流程 @@ -15,11 +12,5 @@ import org.apache.ibatis.annotations.Param; */ @Mapper public interface LeaveBillMapper extends BaseMapper { - /** - * 请假审批单简单分页查询 - * @param leaveBill 请假审批单 - * @return - */ - IPage getLeaveBillPage(Page page, @Param("leaveBill") LeaveBill leaveBill); } diff --git a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/LeaveBillService.java b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/LeaveBillService.java index db8c2dc90..2132da649 100755 --- a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/LeaveBillService.java +++ b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/LeaveBillService.java @@ -1,7 +1,5 @@ package com.pig4cloud.pigx.act.service; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.pig4cloud.pigx.act.entity.LeaveBill; @@ -12,12 +10,6 @@ import com.pig4cloud.pigx.act.entity.LeaveBill; * @date 2018-09-27 15:20:44 */ public interface LeaveBillService extends IService { - /** - * 请假审批单简单分页查询 - * - * @param leaveBill 请假审批单 - * @return - */ - IPage getLeaveBillPage(Page page, LeaveBill leaveBill); + } diff --git a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/LeaveBillServiceImpl.java b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/LeaveBillServiceImpl.java index 0708b0781..d9ed4e32a 100755 --- a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/LeaveBillServiceImpl.java +++ b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/LeaveBillServiceImpl.java @@ -32,15 +32,4 @@ import org.springframework.stereotype.Service; @Service("leaveBillService") public class LeaveBillServiceImpl extends ServiceImpl implements LeaveBillService { - /** - * 请假审批单简单分页查询 - * - * @param leaveBill 请假审批单 - * @return - */ - @Override - public IPage getLeaveBillPage(Page page, LeaveBill leaveBill) { - return baseMapper.getLeaveBillPage(page, leaveBill); - } - } diff --git a/pigx-visual/pigx-activiti/src/main/resources/mapper/LeaveBillMapper.xml b/pigx-visual/pigx-activiti/src/main/resources/mapper/LeaveBillMapper.xml index d069608b9..af4af260c 100755 --- a/pigx-visual/pigx-activiti/src/main/resources/mapper/LeaveBillMapper.xml +++ b/pigx-visual/pigx-activiti/src/main/resources/mapper/LeaveBillMapper.xml @@ -4,56 +4,14 @@ - - - - - - - - - - - - - - - + + + + + + + + + + diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/config/MybatisPlusConfigurer.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/config/MybatisPlusConfigurer.java index 244cff272..23b314c3b 100644 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/config/MybatisPlusConfigurer.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/config/MybatisPlusConfigurer.java @@ -17,6 +17,8 @@ package com.pig4cloud.pigx.codegen.config; +import com.baomidou.mybatisplus.core.injector.ISqlInjector; +import com.baomidou.mybatisplus.extension.injector.LogicSqlInjector; import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; import org.mybatis.spring.annotation.MapperScan; import org.springframework.context.annotation.Bean; @@ -38,4 +40,14 @@ public class MybatisPlusConfigurer { public PaginationInterceptor paginationInterceptor() { return new PaginationInterceptor(); } + + /** + * 逻辑删除插件 + * + * @return LogicSqlInjector + */ + @Bean + public ISqlInjector sqlInjector() { + return new LogicSqlInjector(); + } } diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/SysGeneratorController.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/SysGeneratorController.java index c500dcfc3..b5717cb7d 100755 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/SysGeneratorController.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/SysGeneratorController.java @@ -18,12 +18,12 @@ package com.pig4cloud.pigx.codegen.controller; import cn.hutool.core.io.IoUtil; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pig4cloud.pigx.codegen.entity.GenConfig; import com.pig4cloud.pigx.codegen.service.SysGeneratorService; import com.pig4cloud.pigx.common.core.util.R; import lombok.AllArgsConstructor; +import org.springframework.http.HttpHeaders; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -48,8 +48,8 @@ public class SysGeneratorController { * @return 数据库表 */ @GetMapping("/page") - public R list(Page page, String tableName) { - return new R<>(sysGeneratorService.queryPage(page,tableName)); + public R list(Page page, String tableName) { + return new R<>(sysGeneratorService.queryPage(page, tableName)); } /** @@ -60,8 +60,8 @@ public class SysGeneratorController { byte[] data = sysGeneratorService.generatorCode(genConfig); response.reset(); - response.setHeader("Content-Disposition", String.format("attachment; filename=%s.zip", genConfig.getTableName())); - response.addHeader("Content-Length", "" + data.length); + response.setHeader(HttpHeaders.CONTENT_DISPOSITION, String.format("attachment; filename=%s.zip", genConfig.getTableName())); + response.addHeader(HttpHeaders.CONTENT_LENGTH, String.valueOf(data.length)); response.setContentType("application/octet-stream; charset=UTF-8"); IoUtil.write(response.getOutputStream(), Boolean.TRUE, data); diff --git a/pigx-visual/pigx-codegen/src/main/resources/template/Controller.java.vm b/pigx-visual/pigx-codegen/src/main/resources/template/Controller.java.vm index b4f9c9898..322f372bf 100755 --- a/pigx-visual/pigx-codegen/src/main/resources/template/Controller.java.vm +++ b/pigx-visual/pigx-codegen/src/main/resources/template/Controller.java.vm @@ -49,8 +49,8 @@ public class ${className}Controller { * @return */ @GetMapping("/page") - public R> get${className}Page(Page<${className}> page, ${className} ${classname}) { - return new R<>(${classname}Service.get${className}Page(page,${classname})); + public R get${className}Page(Page page, ${className} ${classname}) { + return new R<>(${classname}Service.page(page,Wrappers.query(${classname}))); } @@ -60,7 +60,7 @@ public class ${className}Controller { * @return R */ @GetMapping("/{${pk.lowerAttrName}}") - public R<${className}> getById(@PathVariable("${pk.lowerAttrName}") ${pk.attrType} ${pk.lowerAttrName}){ + public R getById(@PathVariable("${pk.lowerAttrName}") ${pk.attrType} ${pk.lowerAttrName}){ return new R<>(${classname}Service.getById(${pk.lowerAttrName})); } diff --git a/pigx-visual/pigx-codegen/src/main/resources/template/Mapper.java.vm b/pigx-visual/pigx-codegen/src/main/resources/template/Mapper.java.vm index d1f584b6f..5ef3ca60e 100755 --- a/pigx-visual/pigx-codegen/src/main/resources/template/Mapper.java.vm +++ b/pigx-visual/pigx-codegen/src/main/resources/template/Mapper.java.vm @@ -29,12 +29,5 @@ import org.apache.ibatis.annotations.Param; * @date ${datetime} */ public interface ${className}Mapper extends BaseMapper<${className}> { - /** - * ${comments}简单分页查询 - * @param ${classname} ${comments} - * @return - */ - IPage<${className}> get${className}Page(Page page, @Param("${classname}") ${className} ${classname}); - } diff --git a/pigx-visual/pigx-codegen/src/main/resources/template/Mapper.xml.vm b/pigx-visual/pigx-codegen/src/main/resources/template/Mapper.xml.vm index 634139d33..864e3d9ea 100755 --- a/pigx-visual/pigx-codegen/src/main/resources/template/Mapper.xml.vm +++ b/pigx-visual/pigx-codegen/src/main/resources/template/Mapper.xml.vm @@ -32,27 +32,4 @@ #end #end - - - - - - diff --git a/pigx-visual/pigx-codegen/src/main/resources/template/Service.java.vm b/pigx-visual/pigx-codegen/src/main/resources/template/Service.java.vm index 9ea358cd3..d1ca0db44 100755 --- a/pigx-visual/pigx-codegen/src/main/resources/template/Service.java.vm +++ b/pigx-visual/pigx-codegen/src/main/resources/template/Service.java.vm @@ -29,12 +29,4 @@ import ${package}.${moduleName}.entity.${className}; */ public interface ${className}Service extends IService<${className}> { - /** - * ${comments}简单分页查询 - * @param ${classname} ${comments} - * @return - */ - IPage<${className}> get${className}Page(Page<${className}> page, ${className} ${classname}); - - } diff --git a/pigx-visual/pigx-codegen/src/main/resources/template/ServiceImpl.java.vm b/pigx-visual/pigx-codegen/src/main/resources/template/ServiceImpl.java.vm index 019215800..e0f7181fe 100755 --- a/pigx-visual/pigx-codegen/src/main/resources/template/ServiceImpl.java.vm +++ b/pigx-visual/pigx-codegen/src/main/resources/template/ServiceImpl.java.vm @@ -32,14 +32,4 @@ import org.springframework.stereotype.Service; @Service("${classname}Service") public class ${className}ServiceImpl extends ServiceImpl<${className}Mapper, ${className}> implements ${className}Service { - /** - * ${comments}简单分页查询 - * @param ${classname} ${comments} - * @return - */ - @Override - public IPage<${className}> get${className}Page(Page<${className}> page, ${className} ${classname}){ - return baseMapper.get${className}Page(page,${classname}); - } - } diff --git a/pigx-visual/pigx-codegen/src/main/resources/template/index.vue.vm b/pigx-visual/pigx-codegen/src/main/resources/template/index.vue.vm index 851ad7e35..3cd82da7c 100755 --- a/pigx-visual/pigx-codegen/src/main/resources/template/index.vue.vm +++ b/pigx-visual/pigx-codegen/src/main/resources/template/index.vue.vm @@ -1,3 +1,20 @@ + +