diff --git a/README.md b/README.md index 4263bb7..098c147 100644 --- a/README.md +++ b/README.md @@ -18,23 +18,29 @@ * 权限认证使用Jwt，支持多终端认证系统。 * 支持加载动态权限菜单，多方式轻松权限控制。 * 高效率开发，使用代码生成器可以一键生成前后端代码。 -* 提供了技术栈（[Vue3](https://v3.cn.vuejs.org) [Element Plus](https://element-plus.org/zh-CN) [Vite](https://cn.vitejs.dev)）版本[RuoYi-Vue3](https://github.com/yangzongzhuan/RuoYi-Vue3)，保持同步更新。 -* 提供了单应用版本[RuoYi-Vue-fast](https://github.com/yangzongzhuan/RuoYi-Vue-fast)，Oracle版本[RuoYi-Vue-Oracle](https://github.com/yangzongzhuan/RuoYi-Vue-Oracle)，保持同步更新。 -* 不分离版本，请移步[RuoYi](https://gitee.com/y_project/RuoYi)，微服务版本，请移步[RuoYi-Cloud](https://gitee.com/y_project/RuoYi-Cloud) +* +提供了技术栈（[Vue3](https://v3.cn.vuejs.org) [Element Plus](https://element-plus.org/zh-CN) [Vite](https://cn.vitejs.dev) +）版本[RuoYi-Vue3](https://github.com/yangzongzhuan/RuoYi-Vue3)，保持同步更新。 +* 提供了单应用版本[RuoYi-Vue-fast](https://github.com/yangzongzhuan/RuoYi-Vue-fast) + ，Oracle版本[RuoYi-Vue-Oracle](https://github.com/yangzongzhuan/RuoYi-Vue-Oracle)，保持同步更新。 +* 不分离版本，请移步[RuoYi](https://gitee.com/y_project/RuoYi) + ，微服务版本，请移步[RuoYi-Cloud](https://gitee.com/y_project/RuoYi-Cloud) * 阿里云折扣场：[点我进入](http://aly.ruoyi.vip)，腾讯云秒杀场：[点我进入](http://txy.ruoyi.vip)   -* 阿里云优惠券：[点我领取](https://www.aliyun.com/minisite/goods?userCode=brki8iof&share_source=copy_link)，腾讯云优惠券：[点我领取](https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console)   +* 阿里云优惠券：[点我领取](https://www.aliyun.com/minisite/goods?userCode=brki8iof&share_source=copy_link) + ，腾讯云优惠券：[点我领取](https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console) +    ## 内置功能 -1. 用户管理：用户是系统操作者，该功能主要完成系统用户配置。 -2. 部门管理：配置系统组织机构（公司、部门、小组），树结构展现支持数据权限。 -3. 岗位管理：配置系统用户所属担任职务。 -4. 菜单管理：配置系统菜单，操作权限，按钮权限标识等。 -5. 角色管理：角色菜单权限分配、设置角色按机构进行数据范围权限划分。 -6. 字典管理：对系统中经常使用的一些较为固定的数据进行维护。 -7. 参数管理：对系统动态配置常用参数。 -8. 通知公告：系统通知公告信息发布维护。 -9. 操作日志：系统正常操作日志记录和查询；系统异常信息日志记录和查询。 +1. 用户管理：用户是系统操作者，该功能主要完成系统用户配置。 +2. 部门管理：配置系统组织机构（公司、部门、小组），树结构展现支持数据权限。 +3. 岗位管理：配置系统用户所属担任职务。 +4. 菜单管理：配置系统菜单，操作权限，按钮权限标识等。 +5. 角色管理：角色菜单权限分配、设置角色按机构进行数据范围权限划分。 +6. 字典管理：对系统中经常使用的一些较为固定的数据进行维护。 +7. 参数管理：对系统动态配置常用参数。 +8. 通知公告：系统通知公告信息发布维护。 +9. 操作日志：系统正常操作日志记录和查询；系统异常信息日志记录和查询。 10. 登录日志：系统登录日志记录查询包含登录异常。 11. 在线用户：当前系统中活跃用户状态监控。 12. 定时任务：在线（添加、修改、删除)任务调度包含执行结果日志。 @@ -47,7 +53,7 @@ ## 在线体验 -- admin/admin123 +- admin/admin123 - 陆陆续续收到一些打赏，为了更好的体验已用于演示服务器升级。谢谢各位小伙伴。 演示地址：http://vue.ruoyi.vip @@ -90,7 +96,7 @@ - ## 若依前后端分离交流群 -QQ群： [![加入QQ群](https://img.shields.io/badge/已满-937441-blue.svg)](https://jq.qq.com/?_wv=1027&k=5bVB1og) [![加入QQ群](https://img.shields.io/badge/已满-887144332-blue.svg)](https://jq.qq.com/?_wv=1027&k=5eiA4DH) [![加入QQ群](https://img.shields.io/badge/已满-180251782-blue.svg)](https://jq.qq.com/?_wv=1027&k=5AxMKlC) [![加入QQ群](https://img.shields.io/badge/已满-104180207-blue.svg)](https://jq.qq.com/?_wv=1027&k=51G72yr) [![加入QQ群](https://img.shields.io/badge/已满-186866453-blue.svg)](https://jq.qq.com/?_wv=1027&k=VvjN2nvu) [![加入QQ群](https://img.shields.io/badge/已满-201396349-blue.svg)](https://jq.qq.com/?_wv=1027&k=5vYAqA05) [![加入QQ群](https://img.shields.io/badge/已满-101456076-blue.svg)](https://jq.qq.com/?_wv=1027&k=kOIINEb5) [![加入QQ群](https://img.shields.io/badge/已满-101539465-blue.svg)](https://jq.qq.com/?_wv=1027&k=UKtX5jhs) [![加入QQ群](https://img.shields.io/badge/已满-264312783-blue.svg)](https://jq.qq.com/?_wv=1027&k=EI9an8lJ) [![加入QQ群](https://img.shields.io/badge/已满-167385320-blue.svg)](https://jq.qq.com/?_wv=1027&k=SWCtLnMz) [![加入QQ群](https://img.shields.io/badge/已满-104748341-blue.svg)](https://jq.qq.com/?_wv=1027&k=96Dkdq0k) [![加入QQ群](https://img.shields.io/badge/已满-160110482-blue.svg)](https://jq.qq.com/?_wv=1027&k=0fsNiYZt) [![加入QQ群](https://img.shields.io/badge/已满-170801498-blue.svg)](https://jq.qq.com/?_wv=1027&k=7xw4xUG1) [![加入QQ群](https://img.shields.io/badge/已满-108482800-blue.svg)](https://jq.qq.com/?_wv=1027&k=eCx8eyoJ) [![加入QQ群](https://img.shields.io/badge/已满-101046199-blue.svg)](https://jq.qq.com/?_wv=1027&k=SpyH2875) [![加入QQ群](https://img.shields.io/badge/已满-136919097-blue.svg)](https://jq.qq.com/?_wv=1027&k=tKEt51dz) [![加入QQ群](https://img.shields.io/badge/143961921-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=0vBbSb0ztbBgVtn3kJS-Q4HUNYwip89G&authKey=8irq5PhutrZmWIvsUsklBxhj57l%2F1nOZqjzigkXZVoZE451GG4JHPOqW7AW6cf0T&noverify=0&group_code=143961921) 点击按钮入群。 \ No newline at end of file +QQ群： [![加入QQ群](https://img.shields.io/badge/已满-937441-blue.svg)](https://jq.qq.com/?_wv=1027&k=5bVB1og) [![加入QQ群](https://img.shields.io/badge/已满-887144332-blue.svg)](https://jq.qq.com/?_wv=1027&k=5eiA4DH) [![加入QQ群](https://img.shields.io/badge/已满-180251782-blue.svg)](https://jq.qq.com/?_wv=1027&k=5AxMKlC) [![加入QQ群](https://img.shields.io/badge/已满-104180207-blue.svg)](https://jq.qq.com/?_wv=1027&k=51G72yr) [![加入QQ群](https://img.shields.io/badge/已满-186866453-blue.svg)](https://jq.qq.com/?_wv=1027&k=VvjN2nvu) [![加入QQ群](https://img.shields.io/badge/已满-201396349-blue.svg)](https://jq.qq.com/?_wv=1027&k=5vYAqA05) [![加入QQ群](https://img.shields.io/badge/已满-101456076-blue.svg)](https://jq.qq.com/?_wv=1027&k=kOIINEb5) [![加入QQ群](https://img.shields.io/badge/已满-101539465-blue.svg)](https://jq.qq.com/?_wv=1027&k=UKtX5jhs) [![加入QQ群](https://img.shields.io/badge/已满-264312783-blue.svg)](https://jq.qq.com/?_wv=1027&k=EI9an8lJ) [![加入QQ群](https://img.shields.io/badge/已满-167385320-blue.svg)](https://jq.qq.com/?_wv=1027&k=SWCtLnMz) [![加入QQ群](https://img.shields.io/badge/已满-104748341-blue.svg)](https://jq.qq.com/?_wv=1027&k=96Dkdq0k) [![加入QQ群](https://img.shields.io/badge/已满-160110482-blue.svg)](https://jq.qq.com/?_wv=1027&k=0fsNiYZt) [![加入QQ群](https://img.shields.io/badge/已满-170801498-blue.svg)](https://jq.qq.com/?_wv=1027&k=7xw4xUG1) [![加入QQ群](https://img.shields.io/badge/已满-108482800-blue.svg)](https://jq.qq.com/?_wv=1027&k=eCx8eyoJ) [![加入QQ群](https://img.shields.io/badge/已满-101046199-blue.svg)](https://jq.qq.com/?_wv=1027&k=SpyH2875) [![加入QQ群](https://img.shields.io/badge/已满-136919097-blue.svg)](https://jq.qq.com/?_wv=1027&k=tKEt51dz) [![加入QQ群](https://img.shields.io/badge/143961921-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=0vBbSb0ztbBgVtn3kJS-Q4HUNYwip89G&authKey=8irq5PhutrZmWIvsUsklBxhj57l%2F1nOZqjzigkXZVoZE451GG4JHPOqW7AW6cf0T&noverify=0&group_code=143961921) +点击按钮入群。 diff --git a/pom.xml b/pom.xml index ba3a233..e876a7d 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ - 4.0.0 + 4.0.0 com.muyu ruoyi @@ -177,13 +177,18 @@ ${ruoyi.version} + + + com.muyu + ruoyi-custom + ${ruoyi.version} + ruoyi-application ruoyi-basic - ruoyi-custom pom diff --git a/ruoyi-application/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi-application/src/main/java/com/ruoyi/RuoYiApplication.java index bc47b1e..97f0003 100644 --- a/ruoyi-application/src/main/java/com/ruoyi/RuoYiApplication.java +++ b/ruoyi-application/src/main/java/com/ruoyi/RuoYiApplication.java @@ -11,8 +11,9 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; * @author ruoyi */ @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}) +@MapperScan("com.ruoyi.*.mapper") public class RuoYiApplication { - public static void main (String[] args) { + public static void main(String[] args) { SpringApplication.run(RuoYiApplication.class, args); System.out.println("(♥◠‿◠)ﾉﾞ 若依启动成功 ლ(´ڡ`ლ)ﾞ"); } diff --git a/ruoyi-application/src/main/java/com/ruoyi/RuoYiServletInitializer.java b/ruoyi-application/src/main/java/com/ruoyi/RuoYiServletInitializer.java index edede20..70cb1b3 100644 --- a/ruoyi-application/src/main/java/com/ruoyi/RuoYiServletInitializer.java +++ b/ruoyi-application/src/main/java/com/ruoyi/RuoYiServletInitializer.java @@ -10,7 +10,7 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer */ public class RuoYiServletInitializer extends SpringBootServletInitializer { @Override - protected SpringApplicationBuilder configure (SpringApplicationBuilder application) { + protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { return application.sources(RuoYiApplication.class); } } diff --git a/ruoyi-application/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java b/ruoyi-application/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java index 358eaa6..4034685 100644 --- a/ruoyi-application/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java +++ b/ruoyi-application/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java @@ -45,7 +45,7 @@ public class CaptchaController { * 生成验证码 */ @GetMapping("/captchaImage") - public Result getCode (HttpServletResponse response) throws IOException { + public Result getCode(HttpServletResponse response) throws IOException { Result ajax = Result.success(); boolean captchaEnabled = configService.selectCaptchaEnabled(); CaptchaModel.CaptchaModelBuilder builder diff --git a/ruoyi-application/src/main/java/com/ruoyi/web/controller/common/CommonController.java b/ruoyi-application/src/main/java/com/ruoyi/web/controller/common/CommonController.java index 0d8cfb6..8f4d5fe 100644 --- a/ruoyi-application/src/main/java/com/ruoyi/web/controller/common/CommonController.java +++ b/ruoyi-application/src/main/java/com/ruoyi/web/controller/common/CommonController.java @@ -43,7 +43,7 @@ public class CommonController { * @param delete 是否删除 */ @GetMapping("/download") - public void fileDownload (String fileName, Boolean delete, HttpServletResponse response, HttpServletRequest request) { + public void fileDownload(String fileName, Boolean delete, HttpServletResponse response, HttpServletRequest request) { try { if (!FileUtils.checkAllowDownload(fileName)) { throw new Exception(StringUtils.format("文件名称({})非法，不允许下载。 ", fileName)); @@ -66,7 +66,7 @@ public class CommonController { * 通用上传请求（单个） */ @PostMapping("/upload") - public Result uploadFile (MultipartFile file) throws Exception { + public Result uploadFile(MultipartFile file) throws Exception { try { // 上传文件路径 String filePath = RuoYiConfig.getUploadPath(); @@ -89,7 +89,7 @@ public class CommonController { * 通用上传请求（多个） */ @PostMapping("/uploads") - public Result> uploadFiles (List files) throws Exception { + public Result> uploadFiles(List files) throws Exception { try { // 上传文件路径 String filePath = RuoYiConfig.getUploadPath(); @@ -116,7 +116,7 @@ public class CommonController { * 本地资源通用下载 */ @GetMapping("/download/resource") - public void resourceDownload (String resource, HttpServletRequest request, HttpServletResponse response) + public void resourceDownload(String resource, HttpServletRequest request, HttpServletResponse response) throws Exception { try { if (!FileUtils.checkAllowDownload(resource)) { diff --git a/ruoyi-application/src/main/java/com/ruoyi/web/controller/custom/SysClassController.java b/ruoyi-application/src/main/java/com/ruoyi/web/controller/custom/SysClassController.java new file mode 100644 index 0000000..1cd17ca --- /dev/null +++ b/ruoyi-application/src/main/java/com/ruoyi/web/controller/custom/SysClassController.java @@ -0,0 +1,106 @@ +package com.ruoyi.web.controller.custom; + +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.Result; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.custom.domain.SysClass; +import com.ruoyi.custom.domain.req.SysClassEditReq; +import com.ruoyi.custom.domain.req.SysClassQueryReq; +import com.ruoyi.custom.domain.req.SysClassSaveReq; +import com.ruoyi.custom.service.SysClassService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 班级管理Controller + * + * @author ruoyi + * @date 2024-04-22 + */ +@Api(tags = "班级管理") +@RestController +@RequestMapping("/custom/class") +public class SysClassController extends BaseController { + @Autowired + private SysClassService sysClassService; + + /** + * 查询班级管理列表 + */ + @ApiOperation("获取班级管理列表") + @PreAuthorize("@ss.hasPermi('custom:class:list')") + @GetMapping("/list") + public Result> list(SysClassQueryReq sysClassQueryReq) { + startPage(); + List list = sysClassService.list(SysClass.queryBuild(sysClassQueryReq)); + return getDataTable(list); + } + + /** + * 导出班级管理列表 + */ + @ApiOperation("导出班级管理列表") + @PreAuthorize("@ss.hasPermi('custom:class:export')") + @Log(title = "班级管理", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, SysClass sysClass) { + List list = sysClassService.list(sysClass); + ExcelUtil util = new ExcelUtil(SysClass.class); + util.exportExcel(response, list, "班级管理数据"); + } + + /** + * 获取班级管理详细信息 + */ + @ApiOperation("获取班级管理详细信息") + @PreAuthorize("@ss.hasPermi('custom:class:query')") + @GetMapping(value = "/{classId}") + @ApiImplicitParam(name = "classId", value = "classId", required = true, dataType = "Long", paramType = "path", dataTypeClass = Long.class) + public Result getInfo(@PathVariable("classId") Long classId) { + return Result.success(sysClassService.getById(classId)); + } + + /** + * 新增班级管理 + */ + @PreAuthorize("@ss.hasPermi('custom:class:add')") + @Log(title = "班级管理", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("新增班级管理") + public Result add(@RequestBody SysClassSaveReq sysClassSaveReq) { + return toAjax(sysClassService.save(SysClass.saveBuild(sysClassSaveReq))); + } + + /** + * 修改班级管理 + */ + @PreAuthorize("@ss.hasPermi('custom:class:edit')") + @Log(title = "班级管理", businessType = BusinessType.UPDATE) + @PutMapping("/{classId}") + @ApiOperation("修改班级管理") + public Result edit(@PathVariable Long classId, @RequestBody SysClassEditReq sysClassEditReq) { + return toAjax(sysClassService.updateById(SysClass.editBuild(classId, sysClassEditReq))); + } + + /** + * 删除班级管理 + */ + @PreAuthorize("@ss.hasPermi('custom:class:remove')") + @Log(title = "班级管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{classIds}") + @ApiOperation("删除班级管理") + @ApiImplicitParam(name = "classId", value = "classId", required = true, dataType = "Long", paramType = "path", dataTypeClass = String.class, example = "1,2,3,4") + public Result remove(@PathVariable List classIds) { + return toAjax(sysClassService.removeBatchByIds(classIds)); + } +} diff --git a/ruoyi-application/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java b/ruoyi-application/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java index f48af5a..0146f80 100644 --- a/ruoyi-application/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java +++ b/ruoyi-application/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java @@ -36,7 +36,7 @@ public class CacheController { @PreAuthorize("@ss.hasPermi('monitor:cache:list')") @GetMapping() - public Result> getInfo () throws Exception { + public Result> getInfo() throws Exception { Properties info = (Properties) redisTemplate.execute((RedisCallback) connection -> connection.info()); Properties commandStats = (Properties) redisTemplate.execute((RedisCallback) connection -> connection.info("commandstats")); Object dbSize = redisTemplate.execute((RedisCallback) connection -> connection.dbSize()); @@ -59,20 +59,20 @@ public class CacheController { @PreAuthorize("@ss.hasPermi('monitor:cache:list')") @GetMapping("/getNames") - public Result> cache () { + public Result> cache() { return Result.success(caches); } @PreAuthorize("@ss.hasPermi('monitor:cache:list')") @GetMapping("/getKeys/{cacheName}") - public Result> getCacheKeys (@PathVariable String cacheName) { + public Result> getCacheKeys(@PathVariable String cacheName) { Set cacheKeys = redisTemplate.keys(cacheName + "*"); return Result.success(cacheKeys); } @PreAuthorize("@ss.hasPermi('monitor:cache:list')") @GetMapping("/getValue/{cacheName}/{cacheKey}") - public Result getCacheValue (@PathVariable String cacheName, @PathVariable String cacheKey) { + public Result getCacheValue(@PathVariable String cacheName, @PathVariable String cacheKey) { String cacheValue = redisTemplate.opsForValue().get(cacheKey); SysCache sysCache = new SysCache(cacheName, cacheKey, cacheValue); return Result.success(sysCache); @@ -80,7 +80,7 @@ public class CacheController { @PreAuthorize("@ss.hasPermi('monitor:cache:list')") @DeleteMapping("/clearCacheName/{cacheName}") - public Result clearCacheName (@PathVariable String cacheName) { + public Result clearCacheName(@PathVariable String cacheName) { Collection cacheKeys = redisTemplate.keys(cacheName + "*"); if (cacheKeys != null) { redisTemplate.delete(cacheKeys); @@ -90,14 +90,14 @@ public class CacheController { @PreAuthorize("@ss.hasPermi('monitor:cache:list')") @DeleteMapping("/clearCacheKey/{cacheKey}") - public Result clearCacheKey (@PathVariable String cacheKey) { + public Result clearCacheKey(@PathVariable String cacheKey) { redisTemplate.delete(cacheKey); return Result.success(); } @PreAuthorize("@ss.hasPermi('monitor:cache:list')") @DeleteMapping("/clearCacheAll") - public Result clearCacheAll () { + public Result clearCacheAll() { Collection cacheKeys = redisTemplate.keys("*"); if (cacheKeys != null) { redisTemplate.delete(cacheKeys); diff --git a/ruoyi-application/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java b/ruoyi-application/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java index a12bc61..f328b47 100644 --- a/ruoyi-application/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java +++ b/ruoyi-application/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController; public class ServerController { @PreAuthorize("@ss.hasPermi('monitor:server:list')") @GetMapping() - public Result getInfo () throws Exception { + public Result getInfo() throws Exception { Server server = new Server(); server.copyTo(); return Result.success(server); diff --git a/ruoyi-application/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java b/ruoyi-application/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java index 565da5d..c9155e7 100644 --- a/ruoyi-application/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java +++ b/ruoyi-application/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java @@ -32,7 +32,7 @@ public class SysLogininforController extends BaseController { @PreAuthorize("@ss.hasPermi('monitor:logininfor:list')") @GetMapping("/list") - public Result> list (SysLogininfor logininfor) { + public Result> list(SysLogininfor logininfor) { startPage(); List list = logininforService.selectLogininforList(logininfor); return getDataTable(list); @@ -41,7 +41,7 @@ public class SysLogininforController extends BaseController { @Log(title = "登录日志", businessType = BusinessType.EXPORT) @PreAuthorize("@ss.hasPermi('monitor:logininfor:export')") @PostMapping("/export") - public void export (HttpServletResponse response, SysLogininfor logininfor) { + public void export(HttpServletResponse response, SysLogininfor logininfor) { List list = logininforService.selectLogininforList(logininfor); ExcelUtil util = new ExcelUtil(SysLogininfor.class); util.exportExcel(response, list, "登录日志"); @@ -50,14 +50,14 @@ public class SysLogininforController extends BaseController { @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')") @Log(title = "登录日志", businessType = BusinessType.DELETE) @DeleteMapping("/{infoIds}") - public Result remove (@PathVariable Long[] infoIds) { + public Result remove(@PathVariable Long[] infoIds) { return toAjax(logininforService.deleteLogininforByIds(infoIds)); } @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')") @Log(title = "登录日志", businessType = BusinessType.CLEAN) @DeleteMapping("/clean") - public Result clean () { + public Result clean() { logininforService.cleanLogininfor(); return Result.success(); } @@ -65,7 +65,7 @@ public class SysLogininforController extends BaseController { @PreAuthorize("@ss.hasPermi('monitor:logininfor:unlock')") @Log(title = "账户解锁", businessType = BusinessType.OTHER) @GetMapping("/unlock/{userName}") - public Result unlock (@PathVariable("userName") String userName) { + public Result unlock(@PathVariable("userName") String userName) { passwordService.clearLoginRecordCache(userName); return Result.success(); } diff --git a/ruoyi-application/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java b/ruoyi-application/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java index f8c4fe4..f31b54c 100644 --- a/ruoyi-application/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java +++ b/ruoyi-application/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java @@ -28,7 +28,7 @@ public class SysOperlogController extends BaseController { @PreAuthorize("@ss.hasPermi('monitor:operlog:list')") @GetMapping("/list") - public Result> list (SysOperLog operLog) { + public Result> list(SysOperLog operLog) { startPage(); List list = operLogService.selectOperLogList(operLog); return getDataTable(list); @@ -37,7 +37,7 @@ public class SysOperlogController extends BaseController { @Log(title = "操作日志", businessType = BusinessType.EXPORT) @PreAuthorize("@ss.hasPermi('monitor:operlog:export')") @PostMapping("/export") - public void export (HttpServletResponse response, SysOperLog operLog) { + public void export(HttpServletResponse response, SysOperLog operLog) { List list = operLogService.selectOperLogList(operLog); ExcelUtil util = new ExcelUtil(SysOperLog.class); util.exportExcel(response, list, "操作日志"); @@ -46,14 +46,14 @@ public class SysOperlogController extends BaseController { @Log(title = "操作日志", businessType = BusinessType.DELETE) @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')") @DeleteMapping("/{operIds}") - public Result remove (@PathVariable Long[] operIds) { + public Result remove(@PathVariable Long[] operIds) { return toAjax(operLogService.deleteOperLogByIds(operIds)); } @Log(title = "操作日志", businessType = BusinessType.CLEAN) @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')") @DeleteMapping("/clean") - public Result clean () { + public Result clean() { operLogService.cleanOperLog(); return Result.success(); } diff --git a/ruoyi-application/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java b/ruoyi-application/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java index 307a237..dc54d6e 100644 --- a/ruoyi-application/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java +++ b/ruoyi-application/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java @@ -36,7 +36,7 @@ public class SysUserOnlineController extends BaseController { @PreAuthorize("@ss.hasPermi('monitor:online:list')") @GetMapping("/list") - public Result> list (String ipaddr, String userName) { + public Result> list(String ipaddr, String userName) { Collection keys = redisCache.keys(CacheConstants.LOGIN_TOKEN_KEY + "*"); List userOnlineList = new ArrayList(); for (String key : keys) { @@ -62,7 +62,7 @@ public class SysUserOnlineController extends BaseController { @PreAuthorize("@ss.hasPermi('monitor:online:forceLogout')") @Log(title = "在线用户", businessType = BusinessType.FORCE) @DeleteMapping("/{tokenId}") - public Result forceLogout (@PathVariable String tokenId) { + public Result forceLogout(@PathVariable String tokenId) { redisCache.deleteObject(CacheConstants.LOGIN_TOKEN_KEY + tokenId); return Result.success(); } diff --git a/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java b/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java index d3fd608..7737ad2 100644 --- a/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java +++ b/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java @@ -32,7 +32,7 @@ public class SysConfigController extends BaseController { */ @PreAuthorize("@ss.hasPermi('system:config:list')") @GetMapping("/list") - public Result> list (SysConfig config) { + public Result> list(SysConfig config) { startPage(); List list = configService.selectConfigList(config); return getDataTable(list); @@ -41,7 +41,7 @@ public class SysConfigController extends BaseController { @Log(title = "参数管理", businessType = BusinessType.EXPORT) @PreAuthorize("@ss.hasPermi('system:config:export')") @PostMapping("/export") - public void export (HttpServletResponse response, SysConfig config) { + public void export(HttpServletResponse response, SysConfig config) { List list = configService.selectConfigList(config); ExcelUtil util = new ExcelUtil(SysConfig.class); util.exportExcel(response, list, "参数数据"); @@ -52,7 +52,7 @@ public class SysConfigController extends BaseController { */ @PreAuthorize("@ss.hasPermi('system:config:query')") @GetMapping(value = "/{configId}") - public Result getInfo (@PathVariable Long configId) { + public Result getInfo(@PathVariable Long configId) { return Result.success(configService.selectConfigById(configId)); } @@ -60,7 +60,7 @@ public class SysConfigController extends BaseController { * 根据参数键名查询参数值 */ @GetMapping(value = "/configKey/{configKey}") - public Result getConfigKey (@PathVariable String configKey) { + public Result getConfigKey(@PathVariable String configKey) { return Result.success(configService.selectConfigByKey(configKey)); } @@ -70,7 +70,7 @@ public class SysConfigController extends BaseController { @PreAuthorize("@ss.hasPermi('system:config:add')") @Log(title = "参数管理", businessType = BusinessType.INSERT) @PostMapping - public Result add (@Validated @RequestBody SysConfig config) { + public Result add(@Validated @RequestBody SysConfig config) { if (!configService.checkConfigKeyUnique(config)) { return error("新增参数'" + config.getConfigName() + "'失败，参数键名已存在"); } @@ -84,7 +84,7 @@ public class SysConfigController extends BaseController { @PreAuthorize("@ss.hasPermi('system:config:edit')") @Log(title = "参数管理", businessType = BusinessType.UPDATE) @PutMapping - public Result edit (@Validated @RequestBody SysConfig config) { + public Result edit(@Validated @RequestBody SysConfig config) { if (!configService.checkConfigKeyUnique(config)) { return error("修改参数'" + config.getConfigName() + "'失败，参数键名已存在"); } @@ -98,7 +98,7 @@ public class SysConfigController extends BaseController { @PreAuthorize("@ss.hasPermi('system:config:remove')") @Log(title = "参数管理", businessType = BusinessType.DELETE) @DeleteMapping("/{configIds}") - public Result remove (@PathVariable Long[] configIds) { + public Result remove(@PathVariable Long[] configIds) { configService.deleteConfigByIds(configIds); return Result.success(); } @@ -109,7 +109,7 @@ public class SysConfigController extends BaseController { @PreAuthorize("@ss.hasPermi('system:config:remove')") @Log(title = "参数管理", businessType = BusinessType.CLEAN) @DeleteMapping("/refreshCache") - public Result refreshCache () { + public Result refreshCache() { configService.resetConfigCache(); return Result.success(); } diff --git a/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java b/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java index 344ac53..8e757ad 100644 --- a/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java +++ b/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java @@ -32,7 +32,7 @@ public class SysDeptController extends BaseController { */ @PreAuthorize("@ss.hasPermi('system:dept:list')") @GetMapping("/list") - public Result> list (SysDept dept) { + public Result> list(SysDept dept) { List depts = deptService.selectDeptList(dept); return Result.success(depts); } @@ -42,7 +42,7 @@ public class SysDeptController extends BaseController { */ @PreAuthorize("@ss.hasPermi('system:dept:list')") @GetMapping("/list/exclude/{deptId}") - public Result> excludeChild (@PathVariable(value = "deptId", required = false) Long deptId) { + public Result> excludeChild(@PathVariable(value = "deptId", required = false) Long deptId) { List depts = deptService.selectDeptList(new SysDept()); depts.removeIf(d -> d.getDeptId().intValue() == deptId || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + "")); return Result.success(depts); @@ -53,7 +53,7 @@ public class SysDeptController extends BaseController { */ @PreAuthorize("@ss.hasPermi('system:dept:query')") @GetMapping(value = "/{deptId}") - public Result getInfo (@PathVariable Long deptId) { + public Result getInfo(@PathVariable Long deptId) { deptService.checkDeptDataScope(deptId); return Result.success(deptService.selectDeptById(deptId)); } @@ -64,7 +64,7 @@ public class SysDeptController extends BaseController { @PreAuthorize("@ss.hasPermi('system:dept:add')") @Log(title = "部门管理", businessType = BusinessType.INSERT) @PostMapping - public Result add (@Validated @RequestBody SysDept dept) { + public Result add(@Validated @RequestBody SysDept dept) { if (!deptService.checkDeptNameUnique(dept)) { return error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在"); } @@ -78,7 +78,7 @@ public class SysDeptController extends BaseController { @PreAuthorize("@ss.hasPermi('system:dept:edit')") @Log(title = "部门管理", businessType = BusinessType.UPDATE) @PutMapping - public Result edit (@Validated @RequestBody SysDept dept) { + public Result edit(@Validated @RequestBody SysDept dept) { Long deptId = dept.getDeptId(); deptService.checkDeptDataScope(deptId); if (!deptService.checkDeptNameUnique(dept)) { @@ -98,7 +98,7 @@ public class SysDeptController extends BaseController { @PreAuthorize("@ss.hasPermi('system:dept:remove')") @Log(title = "部门管理", businessType = BusinessType.DELETE) @DeleteMapping("/{deptId}") - public Result remove (@PathVariable Long deptId) { + public Result remove(@PathVariable Long deptId) { if (deptService.hasChildByDeptId(deptId)) { return warn("存在下级部门,不允许删除"); } diff --git a/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java b/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java index 9a73f6a..be967e6 100644 --- a/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java +++ b/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java @@ -35,7 +35,7 @@ public class SysDictDataController extends BaseController { @PreAuthorize("@ss.hasPermi('system:dict:list')") @GetMapping("/list") - public Result> list (SysDictData dictData) { + public Result> list(SysDictData dictData) { startPage(); List list = dictDataService.selectDictDataList(dictData); return getDataTable(list); @@ -44,7 +44,7 @@ public class SysDictDataController extends BaseController { @Log(title = "字典数据", businessType = BusinessType.EXPORT) @PreAuthorize("@ss.hasPermi('system:dict:export')") @PostMapping("/export") - public void export (HttpServletResponse response, SysDictData dictData) { + public void export(HttpServletResponse response, SysDictData dictData) { List list = dictDataService.selectDictDataList(dictData); ExcelUtil util = new ExcelUtil(SysDictData.class); util.exportExcel(response, list, "字典数据"); @@ -55,7 +55,7 @@ public class SysDictDataController extends BaseController { */ @PreAuthorize("@ss.hasPermi('system:dict:query')") @GetMapping(value = "/{dictCode}") - public Result getInfo (@PathVariable Long dictCode) { + public Result getInfo(@PathVariable Long dictCode) { return Result.success(dictDataService.selectDictDataById(dictCode)); } @@ -63,7 +63,7 @@ public class SysDictDataController extends BaseController { * 根据字典类型查询字典数据信息 */ @GetMapping(value = "/type/{dictType}") - public Result> dictType (@PathVariable String dictType) { + public Result> dictType(@PathVariable String dictType) { List data = dictTypeService.selectDictDataByType(dictType); if (StringUtils.isNull(data)) { data = new ArrayList(); @@ -77,7 +77,7 @@ public class SysDictDataController extends BaseController { @PreAuthorize("@ss.hasPermi('system:dict:add')") @Log(title = "字典数据", businessType = BusinessType.INSERT) @PostMapping - public Result add (@Validated @RequestBody SysDictData dict) { + public Result add(@Validated @RequestBody SysDictData dict) { dict.setCreateBy(getUserId()); return toAjax(dictDataService.insertDictData(dict)); } @@ -88,7 +88,7 @@ public class SysDictDataController extends BaseController { @PreAuthorize("@ss.hasPermi('system:dict:edit')") @Log(title = "字典数据", businessType = BusinessType.UPDATE) @PutMapping - public Result edit (@Validated @RequestBody SysDictData dict) { + public Result edit(@Validated @RequestBody SysDictData dict) { dict.setUpdateBy(getUserId()); return toAjax(dictDataService.updateDictData(dict)); } @@ -99,7 +99,7 @@ public class SysDictDataController extends BaseController { @PreAuthorize("@ss.hasPermi('system:dict:remove')") @Log(title = "字典类型", businessType = BusinessType.DELETE) @DeleteMapping("/{dictCodes}") - public Result remove (@PathVariable Long[] dictCodes) { + public Result remove(@PathVariable Long[] dictCodes) { dictDataService.deleteDictDataByIds(dictCodes); return Result.success(); } diff --git a/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java b/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java index 0a9a2bb..7430fa0 100644 --- a/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java +++ b/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java @@ -29,7 +29,7 @@ public class SysDictTypeController extends BaseController { @PreAuthorize("@ss.hasPermi('system:dict:list')") @GetMapping("/list") - public Result> list (SysDictType dictType) { + public Result> list(SysDictType dictType) { startPage(); List list = dictTypeService.selectDictTypeList(dictType); return getDataTable(list); @@ -38,7 +38,7 @@ public class SysDictTypeController extends BaseController { @Log(title = "字典类型", businessType = BusinessType.EXPORT) @PreAuthorize("@ss.hasPermi('system:dict:export')") @PostMapping("/export") - public void export (HttpServletResponse response, SysDictType dictType) { + public void export(HttpServletResponse response, SysDictType dictType) { List list = dictTypeService.selectDictTypeList(dictType); ExcelUtil util = new ExcelUtil(SysDictType.class); util.exportExcel(response, list, "字典类型"); @@ -49,7 +49,7 @@ public class SysDictTypeController extends BaseController { */ @PreAuthorize("@ss.hasPermi('system:dict:query')") @GetMapping(value = "/{dictId}") - public Result getInfo (@PathVariable Long dictId) { + public Result getInfo(@PathVariable Long dictId) { return Result.success(dictTypeService.selectDictTypeById(dictId)); } @@ -59,7 +59,7 @@ public class SysDictTypeController extends BaseController { @PreAuthorize("@ss.hasPermi('system:dict:add')") @Log(title = "字典类型", businessType = BusinessType.INSERT) @PostMapping - public Result add (@Validated @RequestBody SysDictType dict) { + public Result add(@Validated @RequestBody SysDictType dict) { if (!dictTypeService.checkDictTypeUnique(dict)) { return error("新增字典'" + dict.getDictName() + "'失败，字典类型已存在"); } @@ -73,7 +73,7 @@ public class SysDictTypeController extends BaseController { @PreAuthorize("@ss.hasPermi('system:dict:edit')") @Log(title = "字典类型", businessType = BusinessType.UPDATE) @PutMapping - public Result edit (@Validated @RequestBody SysDictType dict) { + public Result edit(@Validated @RequestBody SysDictType dict) { if (!dictTypeService.checkDictTypeUnique(dict)) { return error("修改字典'" + dict.getDictName() + "'失败，字典类型已存在"); } @@ -87,7 +87,7 @@ public class SysDictTypeController extends BaseController { @PreAuthorize("@ss.hasPermi('system:dict:remove')") @Log(title = "字典类型", businessType = BusinessType.DELETE) @DeleteMapping("/{dictIds}") - public Result remove (@PathVariable Long[] dictIds) { + public Result remove(@PathVariable Long[] dictIds) { dictTypeService.deleteDictTypeByIds(dictIds); return Result.success(); } @@ -98,7 +98,7 @@ public class SysDictTypeController extends BaseController { @PreAuthorize("@ss.hasPermi('system:dict:remove')") @Log(title = "字典类型", businessType = BusinessType.CLEAN) @DeleteMapping("/refreshCache") - public Result refreshCache () { + public Result refreshCache() { dictTypeService.resetDictCache(); return Result.success(); } @@ -107,7 +107,7 @@ public class SysDictTypeController extends BaseController { * 获取字典选择框列表 */ @GetMapping("/optionselect") - public Result> optionselect () { + public Result> optionselect() { List dictTypes = dictTypeService.selectDictTypeAll(); return Result.success(dictTypes); } diff --git a/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java b/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java index bcc4c28..3273268 100644 --- a/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java +++ b/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java @@ -23,7 +23,7 @@ public class SysIndexController { * 访问首页，提示语 */ @RequestMapping("/") - public String index () { + public String index() { return StringUtils.format("欢迎使用{}后台管理框架，当前版本：v{}，请通过前端地址访问。", ruoyiConfig.getName(), ruoyiConfig.getVersion()); } } diff --git a/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java index b44ae74..d5423b3 100644 --- a/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java +++ b/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java @@ -39,11 +39,10 @@ public class SysLoginController { * 登录方法 * * @param loginBody 登录信息 - * * @return 结果 */ @PostMapping("/login") - public Result login (@RequestBody LoginBody loginBody) { + public Result login(@RequestBody LoginBody loginBody) { // 生成令牌 String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(), loginBody.getUuid()); @@ -56,7 +55,7 @@ public class SysLoginController { * @return 用户信息 */ @GetMapping("getInfo") - public Result getInfo () { + public Result getInfo() { SysUser user = SecurityUtils.getLoginUser().getUser(); // 角色集合 Set roles = permissionService.getRolePermission(user); @@ -77,7 +76,7 @@ public class SysLoginController { * @return 路由信息 */ @GetMapping("getRouters") - public Result> getRouters () { + public Result> getRouters() { Long userId = SecurityUtils.getUserId(); List menus = menuService.selectMenuTreeByUserId(userId); return Result.success(menuService.buildMenus(menus)); diff --git a/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java b/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java index 77fb003..1a0f7fa 100644 --- a/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java +++ b/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java @@ -33,7 +33,7 @@ public class SysMenuController extends BaseController { */ @PreAuthorize("@ss.hasPermi('system:menu:list')") @GetMapping("/list") - public Result> list (SysMenu menu) { + public Result> list(SysMenu menu) { List menus = menuService.selectMenuList(menu, getUserId()); return Result.success(menus); } @@ -43,7 +43,7 @@ public class SysMenuController extends BaseController { */ @PreAuthorize("@ss.hasPermi('system:menu:query')") @GetMapping(value = "/{menuId}") - public Result getInfo (@PathVariable Long menuId) { + public Result getInfo(@PathVariable Long menuId) { return Result.success(menuService.selectMenuById(menuId)); } @@ -51,7 +51,7 @@ public class SysMenuController extends BaseController { * 获取菜单下拉树列表 */ @GetMapping("/treeselect") - public Result> treeselect (SysMenu menu) { + public Result> treeselect(SysMenu menu) { List menus = menuService.selectMenuList(menu, getUserId()); return Result.success(menuService.buildMenuTreeSelect(menus)); } @@ -60,7 +60,7 @@ public class SysMenuController extends BaseController { * 加载对应角色菜单列表树 */ @GetMapping(value = "/roleMenuTreeselect/{roleId}") - public Result roleMenuTreeselect (@PathVariable("roleId") Long roleId) { + public Result roleMenuTreeselect(@PathVariable("roleId") Long roleId) { List menus = menuService.selectMenuList(getUserId()); return Result.success( RoleMenuTreeResp.builder() @@ -76,7 +76,7 @@ public class SysMenuController extends BaseController { @PreAuthorize("@ss.hasPermi('system:menu:add')") @Log(title = "菜单管理", businessType = BusinessType.INSERT) @PostMapping - public Result add (@Validated @RequestBody SysMenu menu) { + public Result add(@Validated @RequestBody SysMenu menu) { if (!menuService.checkMenuNameUnique(menu)) { return error("新增菜单'" + menu.getMenuName() + "'失败，菜单名称已存在"); } else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) { @@ -92,7 +92,7 @@ public class SysMenuController extends BaseController { @PreAuthorize("@ss.hasPermi('system:menu:edit')") @Log(title = "菜单管理", businessType = BusinessType.UPDATE) @PutMapping - public Result edit (@Validated @RequestBody SysMenu menu) { + public Result edit(@Validated @RequestBody SysMenu menu) { if (!menuService.checkMenuNameUnique(menu)) { return error("修改菜单'" + menu.getMenuName() + "'失败，菜单名称已存在"); } else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) { @@ -110,7 +110,7 @@ public class SysMenuController extends BaseController { @PreAuthorize("@ss.hasPermi('system:menu:remove')") @Log(title = "菜单管理", businessType = BusinessType.DELETE) @DeleteMapping("/{menuId}") - public Result remove (@PathVariable("menuId") Long menuId) { + public Result remove(@PathVariable("menuId") Long menuId) { if (menuService.hasChildByMenuId(menuId)) { return warn("存在子菜单,不允许删除"); } diff --git a/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java b/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java index 984bf79..4accd40 100644 --- a/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java +++ b/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java @@ -30,7 +30,7 @@ public class SysNoticeController extends BaseController { */ @PreAuthorize("@ss.hasPermi('system:notice:list')") @GetMapping("/list") - public Result> list (SysNotice notice) { + public Result> list(SysNotice notice) { startPage(); List list = noticeService.selectNoticeList(notice); return getDataTable(list); @@ -41,7 +41,7 @@ public class SysNoticeController extends BaseController { */ @PreAuthorize("@ss.hasPermi('system:notice:query')") @GetMapping(value = "/{noticeId}") - public Result getInfo (@PathVariable Long noticeId) { + public Result getInfo(@PathVariable Long noticeId) { return Result.success(noticeService.selectNoticeById(noticeId)); } @@ -51,7 +51,7 @@ public class SysNoticeController extends BaseController { @PreAuthorize("@ss.hasPermi('system:notice:add')") @Log(title = "通知公告", businessType = BusinessType.INSERT) @PostMapping - public Result add (@Validated @RequestBody SysNotice notice) { + public Result add(@Validated @RequestBody SysNotice notice) { notice.setCreateBy(getUserId()); return toAjax(noticeService.insertNotice(notice)); } @@ -62,7 +62,7 @@ public class SysNoticeController extends BaseController { @PreAuthorize("@ss.hasPermi('system:notice:edit')") @Log(title = "通知公告", businessType = BusinessType.UPDATE) @PutMapping - public Result edit (@Validated @RequestBody SysNotice notice) { + public Result edit(@Validated @RequestBody SysNotice notice) { notice.setUpdateBy(getUserId()); return toAjax(noticeService.updateNotice(notice)); } @@ -73,7 +73,7 @@ public class SysNoticeController extends BaseController { @PreAuthorize("@ss.hasPermi('system:notice:remove')") @Log(title = "通知公告", businessType = BusinessType.DELETE) @DeleteMapping("/{noticeIds}") - public Result remove (@PathVariable Long[] noticeIds) { + public Result remove(@PathVariable Long[] noticeIds) { return toAjax(noticeService.deleteNoticeByIds(noticeIds)); } } diff --git a/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/SysPostController.java b/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/SysPostController.java index 0dca89f..e47912e 100644 --- a/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/SysPostController.java +++ b/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/SysPostController.java @@ -32,7 +32,7 @@ public class SysPostController extends BaseController { */ @PreAuthorize("@ss.hasPermi('system:post:list')") @GetMapping("/list") - public Result> list (SysPost post) { + public Result> list(SysPost post) { startPage(); List list = postService.selectPostList(post); return getDataTable(list); @@ -41,7 +41,7 @@ public class SysPostController extends BaseController { @Log(title = "岗位管理", businessType = BusinessType.EXPORT) @PreAuthorize("@ss.hasPermi('system:post:export')") @PostMapping("/export") - public void export (HttpServletResponse response, SysPost post) { + public void export(HttpServletResponse response, SysPost post) { List list = postService.selectPostList(post); ExcelUtil util = new ExcelUtil(SysPost.class); util.exportExcel(response, list, "岗位数据"); @@ -52,7 +52,7 @@ public class SysPostController extends BaseController { */ @PreAuthorize("@ss.hasPermi('system:post:query')") @GetMapping(value = "/{postId}") - public Result getInfo (@PathVariable Long postId) { + public Result getInfo(@PathVariable Long postId) { return Result.success(postService.selectPostById(postId)); } @@ -62,7 +62,7 @@ public class SysPostController extends BaseController { @PreAuthorize("@ss.hasPermi('system:post:add')") @Log(title = "岗位管理", businessType = BusinessType.INSERT) @PostMapping - public Result add (@Validated @RequestBody SysPost post) { + public Result add(@Validated @RequestBody SysPost post) { if (!postService.checkPostNameUnique(post)) { return error("新增岗位'" + post.getPostName() + "'失败，岗位名称已存在"); } else if (!postService.checkPostCodeUnique(post)) { @@ -78,7 +78,7 @@ public class SysPostController extends BaseController { @PreAuthorize("@ss.hasPermi('system:post:edit')") @Log(title = "岗位管理", businessType = BusinessType.UPDATE) @PutMapping - public Result edit (@Validated @RequestBody SysPost post) { + public Result edit(@Validated @RequestBody SysPost post) { if (!postService.checkPostNameUnique(post)) { return error("修改岗位'" + post.getPostName() + "'失败，岗位名称已存在"); } else if (!postService.checkPostCodeUnique(post)) { @@ -94,7 +94,7 @@ public class SysPostController extends BaseController { @PreAuthorize("@ss.hasPermi('system:post:remove')") @Log(title = "岗位管理", businessType = BusinessType.DELETE) @DeleteMapping("/{postIds}") - public Result remove (@PathVariable Long[] postIds) { + public Result remove(@PathVariable Long[] postIds) { return toAjax(postService.deletePostByIds(postIds)); } @@ -102,7 +102,7 @@ public class SysPostController extends BaseController { * 获取岗位选择框列表 */ @GetMapping("/optionselect") - public Result> optionselect () { + public Result> optionselect() { List posts = postService.selectPostAll(); return Result.success(posts); } diff --git a/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java b/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java index 6c8590c..1d542ff 100644 --- a/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java +++ b/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java @@ -36,7 +36,7 @@ public class SysProfileController extends BaseController { * 个人信息 */ @GetMapping - public Result profile () { + public Result profile() { LoginUser loginUser = getLoginUser(); SysUser user = loginUser.getUser(); return Result.success( @@ -53,7 +53,7 @@ public class SysProfileController extends BaseController { */ @Log(title = "个人信息", businessType = BusinessType.UPDATE) @PutMapping - public Result updateProfile (@RequestBody SysUser user) { + public Result updateProfile(@RequestBody SysUser user) { LoginUser loginUser = getLoginUser(); SysUser currentUser = loginUser.getUser(); currentUser.setNickName(user.getNickName()); @@ -79,7 +79,7 @@ public class SysProfileController extends BaseController { */ @Log(title = "个人信息", businessType = BusinessType.UPDATE) @PutMapping("/updatePwd") - public Result updatePwd (String oldPassword, String newPassword) { + public Result updatePwd(String oldPassword, String newPassword) { LoginUser loginUser = getLoginUser(); String userName = loginUser.getUsername(); String password = loginUser.getPassword(); @@ -103,7 +103,7 @@ public class SysProfileController extends BaseController { */ @Log(title = "用户头像", businessType = BusinessType.UPDATE) @PostMapping("/avatar") - public Result avatar (@RequestParam("avatarfile") MultipartFile file) throws Exception { + public Result avatar(@RequestParam("avatarfile") MultipartFile file) throws Exception { if (!file.isEmpty()) { LoginUser loginUser = getLoginUser(); String avatar = FileUploadUtils.upload(RuoYiConfig.getAvatarPath(), file, MimeTypeUtils.IMAGE_EXTENSION); diff --git a/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java b/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java index bcbbc7c..9be3e48 100644 --- a/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java +++ b/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java @@ -25,7 +25,7 @@ public class SysRegisterController extends BaseController { private SysConfigServic configService; @PostMapping("/register") - public Result register (@RequestBody RegisterBody user) { + public Result register(@RequestBody RegisterBody user) { if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) { return error("当前系统没有开启注册功能！"); } diff --git a/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java b/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java index aa5c1cc..c75c67a 100644 --- a/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java +++ b/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java @@ -51,7 +51,7 @@ public class SysRoleController extends BaseController { @PreAuthorize("@ss.hasPermi('system:role:list')") @GetMapping("/list") - public Result> list (SysRole role) { + public Result> list(SysRole role) { startPage(); List list = roleService.selectRoleList(role); return getDataTable(list); @@ -60,7 +60,7 @@ public class SysRoleController extends BaseController { @Log(title = "角色管理", businessType = BusinessType.EXPORT) @PreAuthorize("@ss.hasPermi('system:role:export')") @PostMapping("/export") - public void export (HttpServletResponse response, SysRole role) { + public void export(HttpServletResponse response, SysRole role) { List list = roleService.selectRoleList(role); ExcelUtil util = new ExcelUtil(SysRole.class); util.exportExcel(response, list, "角色数据"); @@ -71,7 +71,7 @@ public class SysRoleController extends BaseController { */ @PreAuthorize("@ss.hasPermi('system:role:query')") @GetMapping(value = "/{roleId}") - public Result getInfo (@PathVariable Long roleId) { + public Result getInfo(@PathVariable Long roleId) { roleService.checkRoleDataScope(roleId); return Result.success(roleService.selectRoleById(roleId)); } @@ -82,7 +82,7 @@ public class SysRoleController extends BaseController { @PreAuthorize("@ss.hasPermi('system:role:add')") @Log(title = "角色管理", businessType = BusinessType.INSERT) @PostMapping - public Result add (@Validated @RequestBody SysRole role) { + public Result add(@Validated @RequestBody SysRole role) { if (!roleService.checkRoleNameUnique(role)) { return error("新增角色'" + role.getRoleName() + "'失败，角色名称已存在"); } else if (!roleService.checkRoleKeyUnique(role)) { @@ -99,7 +99,7 @@ public class SysRoleController extends BaseController { @PreAuthorize("@ss.hasPermi('system:role:edit')") @Log(title = "角色管理", businessType = BusinessType.UPDATE) @PutMapping - public Result edit (@Validated @RequestBody SysRole role) { + public Result edit(@Validated @RequestBody SysRole role) { roleService.checkRoleAllowed(role); roleService.checkRoleDataScope(role.getRoleId()); if (!roleService.checkRoleNameUnique(role)) { @@ -128,7 +128,7 @@ public class SysRoleController extends BaseController { @PreAuthorize("@ss.hasPermi('system:role:edit')") @Log(title = "角色管理", businessType = BusinessType.UPDATE) @PutMapping("/dataScope") - public Result dataScope (@RequestBody SysRole role) { + public Result dataScope(@RequestBody SysRole role) { roleService.checkRoleAllowed(role); roleService.checkRoleDataScope(role.getRoleId()); return toAjax(roleService.authDataScope(role)); @@ -140,7 +140,7 @@ public class SysRoleController extends BaseController { @PreAuthorize("@ss.hasPermi('system:role:edit')") @Log(title = "角色管理", businessType = BusinessType.UPDATE) @PutMapping("/changeStatus") - public Result changeStatus (@RequestBody SysRole role) { + public Result changeStatus(@RequestBody SysRole role) { roleService.checkRoleAllowed(role); roleService.checkRoleDataScope(role.getRoleId()); role.setUpdateBy(getUserId()); @@ -153,7 +153,7 @@ public class SysRoleController extends BaseController { @PreAuthorize("@ss.hasPermi('system:role:remove')") @Log(title = "角色管理", businessType = BusinessType.DELETE) @DeleteMapping("/{roleIds}") - public Result remove (@PathVariable Long[] roleIds) { + public Result remove(@PathVariable Long[] roleIds) { return toAjax(roleService.deleteRoleByIds(roleIds)); } @@ -162,7 +162,7 @@ public class SysRoleController extends BaseController { */ @PreAuthorize("@ss.hasPermi('system:role:query')") @GetMapping("/optionselect") - public Result> optionselect () { + public Result> optionselect() { return Result.success(roleService.selectRoleAll()); } @@ -171,7 +171,7 @@ public class SysRoleController extends BaseController { */ @PreAuthorize("@ss.hasPermi('system:role:list')") @GetMapping("/authUser/allocatedList") - public Result> allocatedList (SysUser user) { + public Result> allocatedList(SysUser user) { startPage(); List list = userService.selectAllocatedList(user); return getDataTable(list); @@ -182,7 +182,7 @@ public class SysRoleController extends BaseController { */ @PreAuthorize("@ss.hasPermi('system:role:list')") @GetMapping("/authUser/unallocatedList") - public Result> unallocatedList (SysUser user) { + public Result> unallocatedList(SysUser user) { startPage(); List list = userService.selectUnallocatedList(user); return getDataTable(list); @@ -194,7 +194,7 @@ public class SysRoleController extends BaseController { @PreAuthorize("@ss.hasPermi('system:role:edit')") @Log(title = "角色管理", businessType = BusinessType.GRANT) @PutMapping("/authUser/cancel") - public Result cancelAuthUser (@RequestBody SysUserRole userRole) { + public Result cancelAuthUser(@RequestBody SysUserRole userRole) { return toAjax(roleService.deleteAuthUser(userRole)); } @@ -204,7 +204,7 @@ public class SysRoleController extends BaseController { @PreAuthorize("@ss.hasPermi('system:role:edit')") @Log(title = "角色管理", businessType = BusinessType.GRANT) @PutMapping("/authUser/cancelAll") - public Result cancelAuthUserAll (Long roleId, Long[] userIds) { + public Result cancelAuthUserAll(Long roleId, Long[] userIds) { return toAjax(roleService.deleteAuthUsers(roleId, userIds)); } @@ -214,7 +214,7 @@ public class SysRoleController extends BaseController { @PreAuthorize("@ss.hasPermi('system:role:edit')") @Log(title = "角色管理", businessType = BusinessType.GRANT) @PutMapping("/authUser/selectAll") - public Result selectAuthUserAll (Long roleId, Long[] userIds) { + public Result selectAuthUserAll(Long roleId, Long[] userIds) { roleService.checkRoleDataScope(roleId); return toAjax(roleService.insertAuthUsers(roleId, userIds)); } @@ -224,7 +224,7 @@ public class SysRoleController extends BaseController { */ @PreAuthorize("@ss.hasPermi('system:role:query')") @GetMapping(value = "/deptTree/{roleId}") - public Result deptTree (@PathVariable("roleId") Long roleId) { + public Result deptTree(@PathVariable("roleId") Long roleId) { return Result.success( DeptTreeResp.builder() .checkedKeys(deptService.selectDeptListByRoleId(roleId)) diff --git a/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/SysUserController.java index 14182b9..44dfb85 100644 --- a/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/SysUserController.java +++ b/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/SysUserController.java @@ -55,7 +55,7 @@ public class SysUserController extends BaseController { */ @PreAuthorize("@ss.hasPermi('system:user:list')") @GetMapping("/list") - public Result> list (SysUser user) { + public Result> list(SysUser user) { startPage(); List list = userService.selectUserList(user); return getDataTable(list); @@ -64,7 +64,7 @@ public class SysUserController extends BaseController { @Log(title = "用户管理", businessType = BusinessType.EXPORT) @PreAuthorize("@ss.hasPermi('system:user:export')") @PostMapping("/export") - public void export (HttpServletResponse response, SysUser user) { + public void export(HttpServletResponse response, SysUser user) { List list = userService.selectUserList(user); ExcelUtil util = new ExcelUtil(SysUser.class); util.exportExcel(response, list, "用户数据"); @@ -73,7 +73,7 @@ public class SysUserController extends BaseController { @Log(title = "用户管理", businessType = BusinessType.IMPORT) @PreAuthorize("@ss.hasPermi('system:user:import')") @PostMapping("/importData") - public Result importData (MultipartFile file, boolean updateSupport) throws Exception { + public Result importData(MultipartFile file, boolean updateSupport) throws Exception { ExcelUtil util = new ExcelUtil(SysUser.class); List userList = util.importExcel(file.getInputStream()); Long userId = getUserId(); @@ -82,7 +82,7 @@ public class SysUserController extends BaseController { } @PostMapping("/importTemplate") - public void importTemplate (HttpServletResponse response) { + public void importTemplate(HttpServletResponse response) { ExcelUtil util = new ExcelUtil(SysUser.class); util.importTemplateExcel(response, "用户数据"); } @@ -92,7 +92,7 @@ public class SysUserController extends BaseController { */ @PreAuthorize("@ss.hasPermi('system:user:query')") @GetMapping(value = {"/", "/{userId}"}) - public Result getInfo (@PathVariable(value = "userId", required = false) Long userId) { + public Result getInfo(@PathVariable(value = "userId", required = false) Long userId) { userService.checkUserDataScope(userId); List roles = roleService.selectRoleAll(); UserDetailInfoRespBuilder builder = UserDetailInfoResp.builder() @@ -115,7 +115,7 @@ public class SysUserController extends BaseController { @PreAuthorize("@ss.hasPermi('system:user:add')") @Log(title = "用户管理", businessType = BusinessType.INSERT) @PostMapping - public Result add (@Validated @RequestBody SysUser user) { + public Result add(@Validated @RequestBody SysUser user) { if (!userService.checkUserNameUnique(user)) { return error("新增用户'" + user.getUserName() + "'失败，登录账号已存在"); } else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) { @@ -134,7 +134,7 @@ public class SysUserController extends BaseController { @PreAuthorize("@ss.hasPermi('system:user:edit')") @Log(title = "用户管理", businessType = BusinessType.UPDATE) @PutMapping - public Result edit (@Validated @RequestBody SysUser user) { + public Result edit(@Validated @RequestBody SysUser user) { userService.checkUserAllowed(user); userService.checkUserDataScope(user.getUserId()); if (!userService.checkUserNameUnique(user)) { @@ -154,7 +154,7 @@ public class SysUserController extends BaseController { @PreAuthorize("@ss.hasPermi('system:user:remove')") @Log(title = "用户管理", businessType = BusinessType.DELETE) @DeleteMapping("/{userIds}") - public Result remove (@PathVariable Long[] userIds) { + public Result remove(@PathVariable Long[] userIds) { if (ArrayUtils.contains(userIds, getUserId())) { return error("当前用户不能删除"); } @@ -167,7 +167,7 @@ public class SysUserController extends BaseController { @PreAuthorize("@ss.hasPermi('system:user:resetPwd')") @Log(title = "用户管理", businessType = BusinessType.UPDATE) @PutMapping("/resetPwd") - public Result resetPwd (@RequestBody SysUser user) { + public Result resetPwd(@RequestBody SysUser user) { userService.checkUserAllowed(user); userService.checkUserDataScope(user.getUserId()); user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); @@ -181,7 +181,7 @@ public class SysUserController extends BaseController { @PreAuthorize("@ss.hasPermi('system:user:edit')") @Log(title = "用户管理", businessType = BusinessType.UPDATE) @PutMapping("/changeStatus") - public Result changeStatus (@RequestBody SysUser user) { + public Result changeStatus(@RequestBody SysUser user) { userService.checkUserAllowed(user); userService.checkUserDataScope(user.getUserId()); user.setUpdateBy(getUserId()); @@ -193,7 +193,7 @@ public class SysUserController extends BaseController { */ @PreAuthorize("@ss.hasPermi('system:user:query')") @GetMapping("/authRole/{userId}") - public Result authRole (@PathVariable("userId") Long userId) { + public Result authRole(@PathVariable("userId") Long userId) { SysUser user = userService.selectUserById(userId); List roles = roleService.selectRolesByUserId(userId); return Result.success( @@ -210,7 +210,7 @@ public class SysUserController extends BaseController { @PreAuthorize("@ss.hasPermi('system:user:edit')") @Log(title = "用户管理", businessType = BusinessType.GRANT) @PutMapping("/authRole") - public Result insertAuthRole (Long userId, Long[] roleIds) { + public Result insertAuthRole(Long userId, Long[] roleIds) { userService.checkUserDataScope(userId); userService.insertUserAuth(userId, roleIds); return Result.success(); @@ -221,7 +221,7 @@ public class SysUserController extends BaseController { */ @PreAuthorize("@ss.hasPermi('system:user:list')") @GetMapping("/deptTree") - public Result> deptTree (SysDept dept) { + public Result> deptTree(SysDept dept) { return Result.success(deptService.selectDeptTreeList(dept)); } } diff --git a/ruoyi-application/src/main/java/com/ruoyi/web/controller/tool/TestController.java b/ruoyi-application/src/main/java/com/ruoyi/web/controller/tool/TestController.java index c967a9f..031cec0 100644 --- a/ruoyi-application/src/main/java/com/ruoyi/web/controller/tool/TestController.java +++ b/ruoyi-application/src/main/java/com/ruoyi/web/controller/tool/TestController.java @@ -29,7 +29,7 @@ public class TestController extends BaseController { @ApiOperation("获取用户列表") @GetMapping("/list") - public Result> userList () { + public Result> userList() { List userList = new ArrayList(users.values()); return Result.success(userList); } @@ -37,7 +37,7 @@ public class TestController extends BaseController { @ApiOperation("获取用户详细") @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path", dataTypeClass = Integer.class) @GetMapping("/{userId}") - public Result getUser (@PathVariable Integer userId) { + public Result getUser(@PathVariable Integer userId) { if (!users.isEmpty() && users.containsKey(userId)) { return Result.success(users.get(userId)); } else { @@ -53,7 +53,7 @@ public class TestController extends BaseController { @ApiImplicitParam(name = "mobile", value = "用户手机", dataType = "String", dataTypeClass = String.class) }) @PostMapping("/save") - public Result save (UserEntity user) { + public Result save(UserEntity user) { if (StringUtils.isNull(user) || StringUtils.isNull(user.getUserId())) { return Result.error("用户ID不能为空"); } @@ -63,7 +63,7 @@ public class TestController extends BaseController { @ApiOperation("更新用户") @PutMapping("/update") - public Result update (@RequestBody UserEntity user) { + public Result update(@RequestBody UserEntity user) { if (StringUtils.isNull(user) || StringUtils.isNull(user.getUserId())) { return Result.error("用户ID不能为空"); } @@ -78,7 +78,7 @@ public class TestController extends BaseController { @ApiOperation("删除用户信息") @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path", dataTypeClass = Integer.class) @DeleteMapping("/{userId}") - public Result delete (@PathVariable Integer userId) { + public Result delete(@PathVariable Integer userId) { if (!users.isEmpty() && users.containsKey(userId)) { users.remove(userId); return Result.success(); @@ -102,46 +102,46 @@ class UserEntity { @ApiModelProperty("用户手机") private String mobile; - public UserEntity () { + public UserEntity() { } - public UserEntity (Integer userId, String username, String password, String mobile) { + public UserEntity(Integer userId, String username, String password, String mobile) { this.userId = userId; this.username = username; this.password = password; this.mobile = mobile; } - public Integer getUserId () { + public Integer getUserId() { return userId; } - public void setUserId (Integer userId) { + public void setUserId(Integer userId) { this.userId = userId; } - public String getUsername () { + public String getUsername() { return username; } - public void setUsername (String username) { + public void setUsername(String username) { this.username = username; } - public String getPassword () { + public String getPassword() { return password; } - public void setPassword (String password) { + public void setPassword(String password) { this.password = password; } - public String getMobile () { + public String getMobile() { return mobile; } - public void setMobile (String mobile) { + public void setMobile(String mobile) { this.mobile = mobile; } } diff --git a/ruoyi-application/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java b/ruoyi-application/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java index 52c45cd..339adb2 100644 --- a/ruoyi-application/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java +++ b/ruoyi-application/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java @@ -47,7 +47,7 @@ public class SwaggerConfig { * 创建API */ @Bean - public Docket createRestApi () { + public Docket createRestApi() { return new Docket(DocumentationType.OAS_30) // 是否启用Swagger .enable(enabled) @@ -71,7 +71,7 @@ public class SwaggerConfig { /** * 安全模式，这里指定token通过Authorization头请求头传递 */ - private List securitySchemes () { + private List securitySchemes() { List apiKeyList = new ArrayList(); apiKeyList.add(new ApiKey("Authorization", "Authorization", In.HEADER.toValue())); return apiKeyList; @@ -80,7 +80,7 @@ public class SwaggerConfig { /** * 安全上下文 */ - private List securityContexts () { + private List securityContexts() { List securityContexts = new ArrayList<>(); securityContexts.add( SecurityContext.builder() @@ -93,7 +93,7 @@ public class SwaggerConfig { /** * 默认的安全上引用 */ - private List defaultAuth () { + private List defaultAuth() { AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything"); AuthorizationScope[] authorizationScopes = new AuthorizationScope[1]; authorizationScopes[0] = authorizationScope; @@ -105,7 +105,7 @@ public class SwaggerConfig { /** * 添加摘要信息 */ - private ApiInfo apiInfo () { + private ApiInfo apiInfo() { // 用ApiInfoBuilder进行定制 return new ApiInfoBuilder() // 设置标题 diff --git a/ruoyi-basic/pom.xml b/ruoyi-basic/pom.xml index 3660df6..b74e693 100644 --- a/ruoyi-basic/pom.xml +++ b/ruoyi-basic/pom.xml @@ -16,6 +16,7 @@ ruoyi-framework ruoyi-system ruoyi-common + ruoyi-custom diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java index dfaaeac..22392e5 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java @@ -14,15 +14,15 @@ public @interface DataScope { /** * 部门表的别名 */ - public String deptAlias () default ""; + public String deptAlias() default ""; /** * 用户表的别名 */ - public String userAlias () default ""; + public String userAlias() default ""; /** * 权限字符（用于多个角色匹配符合要求的权限）默认根据权限注解@ss获取，多个权限用逗号分隔开来 */ - public String permission () default ""; + public String permission() default ""; } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java index 0b105a8..f8649ee 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java @@ -19,5 +19,5 @@ public @interface DataSource { /** * 切换数据源名称 */ - public DataSourceType value () default DataSourceType.MASTER; + public DataSourceType value() default DataSourceType.MASTER; } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java index a06580f..d0da412 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java @@ -21,137 +21,137 @@ public @interface Excel { /** * 导出时在excel中排序 */ - public int sort () default Integer.MAX_VALUE; + public int sort() default Integer.MAX_VALUE; /** * 导出到Excel中的名字. */ - public String name () default ""; + public String name() default ""; /** * 日期格式, 如: yyyy-MM-dd */ - public String dateFormat () default ""; + public String dateFormat() default ""; /** * 如果是字典类型，请设置字典的type值 (如: sys_user_sex) */ - public String dictType () default ""; + public String dictType() default ""; /** * 读取内容转表达式 (如: 0=男,1=女,2=未知) */ - public String readConverterExp () default ""; + public String readConverterExp() default ""; /** * 分隔符，读取字符串组内容 */ - public String separator () default ","; + public String separator() default ","; /** * BigDecimal 精度 默认:-1(默认不开启BigDecimal格式化) */ - public int scale () default -1; + public int scale() default -1; /** * BigDecimal 舍入规则 默认:BigDecimal.ROUND_HALF_EVEN */ - public int roundingMode () default BigDecimal.ROUND_HALF_EVEN; + public int roundingMode() default BigDecimal.ROUND_HALF_EVEN; /** * 导出时在excel中每个列的高度 */ - public double height () default 14; + public double height() default 14; /** * 导出时在excel中每个列的宽度 */ - public double width () default 16; + public double width() default 16; /** * 文字后缀,如% 90 变成90% */ - public String suffix () default ""; + public String suffix() default ""; /** * 当值为空时,字段的默认值 */ - public String defaultValue () default ""; + public String defaultValue() default ""; /** * 提示信息 */ - public String prompt () default ""; + public String prompt() default ""; /** * 设置只能选择不能输入的列内容. */ - public String[] combo () default {}; + public String[] combo() default {}; /** * 是否需要纵向合并单元格,应对需求:含有list集合单元格) */ - public boolean needMerge () default false; + public boolean needMerge() default false; /** * 是否导出数据,应对需求:有时我们需要导出一份模板,这是标题需要但内容需要用户手工填写. */ - public boolean isExport () default true; + public boolean isExport() default true; /** * 另一个类中的属性名称,支持多级获取,以小数点隔开 */ - public String targetAttr () default ""; + public String targetAttr() default ""; /** * 是否自动统计数据,在最后追加一行统计数据总和 */ - public boolean isStatistics () default false; + public boolean isStatistics() default false; /** * 导出类型（0数字 1字符串 2图片） */ - public ColumnType cellType () default ColumnType.STRING; + public ColumnType cellType() default ColumnType.STRING; /** * 导出列头背景颜色 */ - public IndexedColors headerBackgroundColor () default IndexedColors.GREY_50_PERCENT; + public IndexedColors headerBackgroundColor() default IndexedColors.GREY_50_PERCENT; /** * 导出列头字体颜色 */ - public IndexedColors headerColor () default IndexedColors.WHITE; + public IndexedColors headerColor() default IndexedColors.WHITE; /** * 导出单元格背景颜色 */ - public IndexedColors backgroundColor () default IndexedColors.WHITE; + public IndexedColors backgroundColor() default IndexedColors.WHITE; /** * 导出单元格字体颜色 */ - public IndexedColors color () default IndexedColors.BLACK; + public IndexedColors color() default IndexedColors.BLACK; /** * 导出字段对齐方式 */ - public HorizontalAlignment align () default HorizontalAlignment.CENTER; + public HorizontalAlignment align() default HorizontalAlignment.CENTER; /** * 自定义数据处理器 */ - public Class handler () default ExcelHandlerAdapter.class; + public Class handler() default ExcelHandlerAdapter.class; /** * 自定义数据处理器参数 */ - public String[] args () default {}; + public String[] args() default {}; /** * 字段类型（0：导出导入；1：仅导出；2：仅导入） */ - Type type () default Type.ALL; + Type type() default Type.ALL; public enum Type { /** @@ -168,11 +168,11 @@ public @interface Excel { IMPORT(2); private final int value; - Type (int value) { + Type(int value) { this.value = value; } - public int value () { + public int value() { return this.value; } } @@ -199,17 +199,19 @@ public @interface Excel { /** * 类类型枚举构造器 + * * @param value 枚举类型值 */ - ColumnType (int value) { + ColumnType(int value) { this.value = value; } /** * 获取列枚举类型 + * * @return 枚举值 */ - public int value () { + public int value() { return this.value; } } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excels.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excels.java index 25dbff3..f5b80ec 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excels.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excels.java @@ -13,5 +13,5 @@ import java.lang.annotation.Target; @Target(ElementType.FIELD) @Retention(RetentionPolicy.RUNTIME) public @interface Excels { - public Excel[] value (); + public Excel[] value(); } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java index 33fbb40..e49c940 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java @@ -17,30 +17,30 @@ public @interface Log { /** * 模块 */ - public String title () default ""; + public String title() default ""; /** * 功能 */ - public BusinessType businessType () default BusinessType.OTHER; + public BusinessType businessType() default BusinessType.OTHER; /** * 操作人类别 */ - public OperatorType operatorType () default OperatorType.MANAGE; + public OperatorType operatorType() default OperatorType.MANAGE; /** * 是否保存请求的参数 */ - public boolean isSaveRequestData () default true; + public boolean isSaveRequestData() default true; /** * 是否保存响应的参数 */ - public boolean isSaveResponseData () default true; + public boolean isSaveResponseData() default true; /** * 排除指定的请求参数 */ - public String[] excludeParamNames () default {}; + public String[] excludeParamNames() default {}; } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RateLimiter.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RateLimiter.java index 70a45c3..959bbef 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RateLimiter.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RateLimiter.java @@ -17,20 +17,20 @@ public @interface RateLimiter { /** * 限流key */ - public String key () default CacheConstants.RATE_LIMIT_KEY; + public String key() default CacheConstants.RATE_LIMIT_KEY; /** * 限流时间,单位秒 */ - public int time () default 60; + public int time() default 60; /** * 限流次数 */ - public int count () default 100; + public int count() default 100; /** * 限流类型 */ - public LimitType limitType () default LimitType.DEFAULT; + public LimitType limitType() default LimitType.DEFAULT; } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java index 69dca56..4716bd0 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java @@ -15,10 +15,10 @@ public @interface RepeatSubmit { /** * 间隔时间(ms)，小于此时间视为重复提交 */ - public int interval () default 5000; + public int interval() default 5000; /** * 提示消息 */ - public String message () default "不允许重复提交，请稍候再试"; + public String message() default "不允许重复提交，请稍候再试"; } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java index ae50d19..4f01df9 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java @@ -40,87 +40,87 @@ public class RuoYiConfig { */ private boolean demoEnabled; - public static String getProfile () { + public static String getProfile() { return profile; } - public void setProfile (String profile) { + public void setProfile(String profile) { RuoYiConfig.profile = profile; } - public static boolean isAddressEnabled () { + public static boolean isAddressEnabled() { return addressEnabled; } - public void setAddressEnabled (boolean addressEnabled) { + public void setAddressEnabled(boolean addressEnabled) { RuoYiConfig.addressEnabled = addressEnabled; } - public static String getCaptchaType () { + public static String getCaptchaType() { return captchaType; } - public void setCaptchaType (String captchaType) { + public void setCaptchaType(String captchaType) { RuoYiConfig.captchaType = captchaType; } /** * 获取导入上传路径 */ - public static String getImportPath () { + public static String getImportPath() { return getProfile() + "/import"; } /** * 获取头像上传路径 */ - public static String getAvatarPath () { + public static String getAvatarPath() { return getProfile() + "/avatar"; } /** * 获取下载路径 */ - public static String getDownloadPath () { + public static String getDownloadPath() { return getProfile() + "/download/"; } /** * 获取上传路径 */ - public static String getUploadPath () { + public static String getUploadPath() { return getProfile() + "/upload"; } - public String getName () { + public String getName() { return name; } - public void setName (String name) { + public void setName(String name) { this.name = name; } - public String getVersion () { + public String getVersion() { return version; } - public void setVersion (String version) { + public void setVersion(String version) { this.version = version; } - public String getCopyrightYear () { + public String getCopyrightYear() { return copyrightYear; } - public void setCopyrightYear (String copyrightYear) { + public void setCopyrightYear(String copyrightYear) { this.copyrightYear = copyrightYear; } - public boolean isDemoEnabled () { + public boolean isDemoEnabled() { return demoEnabled; } - public void setDemoEnabled (boolean demoEnabled) { + public void setDemoEnabled(boolean demoEnabled) { this.demoEnabled = demoEnabled; } } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java index 990f326..0af14ad 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java @@ -45,11 +45,11 @@ public class ScheduleConstants { private String value; - private Status (String value) { + private Status(String value) { this.value = value; } - public String getValue () { + public String getValue() { return value; } } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java index 3c2b98f..33441a8 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java @@ -12,7 +12,6 @@ import com.ruoyi.common.utils.PageUtils; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.sql.SqlUtil; -import org.apache.poi.ss.formula.functions.T; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.bind.WebDataBinder; @@ -34,11 +33,11 @@ public class BaseController { * 将前台传递过来的日期格式的字符串，自动转化为Date类型 */ @InitBinder - public void initBinder (WebDataBinder binder) { + public void initBinder(WebDataBinder binder) { // Date 类型转换 binder.registerCustomEditor(Date.class, new PropertyEditorSupport() { @Override - public void setAsText (String text) { + public void setAsText(String text) { setValue(DateUtils.parseDate(text)); } }); @@ -47,14 +46,14 @@ public class BaseController { /** * 设置请求分页数据 */ - protected void startPage () { + protected void startPage() { PageUtils.startPage(); } /** * 设置请求排序数据 */ - protected void startOrderBy () { + protected void startOrderBy() { PageDomain pageDomain = TableSupport.buildPageRequest(); if (StringUtils.isNotEmpty(pageDomain.getOrderBy())) { String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy()); @@ -65,7 +64,7 @@ public class BaseController { /** * 清理分页的线程变量 */ - protected void clearPage () { + protected void clearPage() { PageUtils.clearPage(); } @@ -73,7 +72,7 @@ public class BaseController { * 响应请求分页数据 */ @SuppressWarnings({"rawtypes", "unchecked"}) - protected Result> getDataTable (List list) { + protected Result> getDataTable(List list) { return Result.success( TableDataInfo.builder() .total(new PageInfo(list).getTotal()) @@ -85,14 +84,14 @@ public class BaseController { /** * 返回成功 */ - public Result success () { + public Result success() { return Result.success(); } /** * 返回失败消息 */ - public Result error () { + public Result error() { return Result.error(); } @@ -100,14 +99,14 @@ public class BaseController { /** * 返回失败消息 */ - public Result error (String message) { + public Result error(String message) { return Result.error(message); } /** * 返回警告消息 */ - public Result warn (String message) { + public Result warn(String message) { return Result.warn(message); } @@ -115,10 +114,9 @@ public class BaseController { * 响应返回结果 * * @param rows 影响行数 - * * @return 操作结果 */ - protected Result toAjax (int rows) { + protected Result toAjax(int rows) { return rows > 0 ? Result.success() : Result.error(); } @@ -126,45 +124,44 @@ public class BaseController { * 响应返回结果 * * @param result 结果 - * * @return 操作结果 */ - protected Result toAjax (boolean result) { + protected Result toAjax(boolean result) { return result ? success() : error(); } /** * 页面跳转 */ - public String redirect (String url) { + public String redirect(String url) { return StringUtils.format("redirect:{}", url); } /** * 获取用户缓存信息 */ - public LoginUser getLoginUser () { + public LoginUser getLoginUser() { return SecurityUtils.getLoginUser(); } /** * 获取登录用户id */ - public Long getUserId () { + public Long getUserId() { return getLoginUser().getUserId(); } /** * 获取登录部门id */ - public Long getDeptId () { + public Long getDeptId() { return getLoginUser().getDeptId(); } /** * 获取登录用户名 */ - public String getUsername () { + public String getUsername() { return getLoginUser().getUsername(); } } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java index f24180a..b9d2ec9 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java @@ -40,31 +40,31 @@ public class BaseEntity implements Serializable { /** * 创建者 */ - @TableField(value = "create_by" , fill = FieldFill.INSERT) - @ApiModelProperty(hidden=true) + @TableField(value = "create_by", fill = FieldFill.INSERT) + @ApiModelProperty(hidden = true) private Long createBy; /** * 创建时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @TableField(value = "create_time" , fill = FieldFill.INSERT) - @ApiModelProperty(hidden=true) + @TableField(value = "create_time", fill = FieldFill.INSERT) + @ApiModelProperty(hidden = true) private Date createTime; /** * 更新者 */ - @TableField(value = "update_by" , fill = FieldFill.UPDATE) - @ApiModelProperty(hidden=true) + @TableField(value = "update_by", fill = FieldFill.UPDATE) + @ApiModelProperty(hidden = true) private Long updateBy; /** * 更新时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @TableField(value = "update_time" , fill = FieldFill.UPDATE) - @ApiModelProperty(hidden=true) + @TableField(value = "update_time", fill = FieldFill.UPDATE) + @ApiModelProperty(hidden = true) private Date updateTime; /** @@ -72,26 +72,27 @@ public class BaseEntity implements Serializable { */ @JsonInclude(JsonInclude.Include.NON_EMPTY) @TableField(exist = false) - @ApiModelProperty(hidden=true) + @ApiModelProperty(hidden = true) private Map params; - public Map getParams () { + public Map getParams() { if (params == null) { params = new HashMap<>(); } return params; } - public void setParams (Map params) { + public void setParams(Map params) { this.params = params; } /** * 开始时间 + * * @param key 属性名称 * @return 结果数据 */ - public Object getBeginParam(String key){ + public Object getBeginParam(String key) { return getParams().get( StringUtils.format(ReqDomain.BEGIN_REF, key) ); @@ -99,10 +100,11 @@ public class BaseEntity implements Serializable { /** * 开始时间 + * * @param key 属性名称 * @return 结果数据 */ - public Object getEndParam(String key){ + public Object getEndParam(String key) { return getParams().get( StringUtils.format(ReqDomain.END_REF, key) ); @@ -110,10 +112,11 @@ public class BaseEntity implements Serializable { /** * 获取区间数据 + * * @param key 属性名称 * @return 结果数据 */ - public Object[] getBetween(String key){ + public Object[] getBetween(String key) { return new Object[]{getBeginParam(key), getEndParam(key)}; } } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/Result.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/Result.java index a9b8981..7baeb49 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/Result.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/Result.java @@ -32,59 +32,59 @@ public class Result implements Serializable { private T data; - public static Result success () { + public static Result success() { return restResult(null, SUCCESS, "操作成功"); } - public static Result success (T data) { + public static Result success(T data) { return restResult(data, SUCCESS, "操作成功"); } - public static Result success (T data, String msg) { + public static Result success(T data, String msg) { return restResult(data, SUCCESS, msg); } - public static Result error () { + public static Result error() { return restResult(null, FAIL, "操作失败"); } - public static Result error (String msg) { + public static Result error(String msg) { return restResult(null, FAIL, msg); } - public static Result error (T data) { + public static Result error(T data) { return restResult(data, FAIL, "操作失败"); } - public static Result error (T data, String msg) { + public static Result error(T data, String msg) { return restResult(data, FAIL, msg); } - public static Result error (int code, String msg) { + public static Result error(int code, String msg) { return restResult(null, code, msg); } - public static Result warn () { + public static Result warn() { return restResult(null, WARN, "操作失败"); } - public static Result warn (String msg) { + public static Result warn(String msg) { return restResult(null, WARN, msg); } - public static Result warn (T data) { + public static Result warn(T data) { return restResult(data, WARN, "操作失败"); } - public static Result warn (T data, String msg) { + public static Result warn(T data, String msg) { return restResult(data, WARN, msg); } - public static Result warn (int code, String msg) { + public static Result warn(int code, String msg) { return restResult(null, code, msg); } - private static Result restResult (T data, int code, String msg) { + private static Result restResult(T data, int code, String msg) { Result apiResult = new Result<>(); apiResult.setCode(code); apiResult.setData(data); @@ -92,11 +92,11 @@ public class Result implements Serializable { return apiResult; } - public static Boolean isError (Result ret) { + public static Boolean isError(Result ret) { return !isSuccess(ret); } - public static Boolean isSuccess (Result ret) { + public static Boolean isSuccess(Result ret) { return Result.SUCCESS == ret.getCode(); } } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java index 46d8227..265c738 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java @@ -36,43 +36,43 @@ public class TreeEntity extends BaseEntity { */ private List children = new ArrayList<>(); - public String getParentName () { + public String getParentName() { return parentName; } - public void setParentName (String parentName) { + public void setParentName(String parentName) { this.parentName = parentName; } - public Long getParentId () { + public Long getParentId() { return parentId; } - public void setParentId (Long parentId) { + public void setParentId(Long parentId) { this.parentId = parentId; } - public Integer getOrderNum () { + public Integer getOrderNum() { return orderNum; } - public void setOrderNum (Integer orderNum) { + public void setOrderNum(Integer orderNum) { this.orderNum = orderNum; } - public String getAncestors () { + public String getAncestors() { return ancestors; } - public void setAncestors (String ancestors) { + public void setAncestors(String ancestors) { this.ancestors = ancestors; } - public List getChildren () { + public List getChildren() { return children; } - public void setChildren (List children) { + public void setChildren(List children) { this.children = children; } } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java index 11ec333..39cd358 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java @@ -32,43 +32,43 @@ public class TreeSelect implements Serializable { @JsonInclude(JsonInclude.Include.NON_EMPTY) private List children; - public TreeSelect () { + public TreeSelect() { } - public TreeSelect (SysDept dept) { + public TreeSelect(SysDept dept) { this.id = dept.getDeptId(); this.label = dept.getDeptName(); this.children = dept.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList()); } - public TreeSelect (SysMenu menu) { + public TreeSelect(SysMenu menu) { this.id = menu.getMenuId(); this.label = menu.getMenuName(); this.children = menu.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList()); } - public Long getId () { + public Long getId() { return id; } - public void setId (Long id) { + public void setId(Long id) { this.id = id; } - public String getLabel () { + public String getLabel() { return label; } - public void setLabel (String label) { + public void setLabel(String label) { this.label = label; } - public List getChildren () { + public List getChildren() { return children; } - public void setChildren (List children) { + public void setChildren(List children) { this.children = children; } } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java index 42f2156..98ea901 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java @@ -79,110 +79,110 @@ public class SysDept extends BaseEntity { */ private List children = new ArrayList(); - public Long getDeptId () { + public Long getDeptId() { return deptId; } - public void setDeptId (Long deptId) { + public void setDeptId(Long deptId) { this.deptId = deptId; } - public Long getParentId () { + public Long getParentId() { return parentId; } - public void setParentId (Long parentId) { + public void setParentId(Long parentId) { this.parentId = parentId; } - public String getAncestors () { + public String getAncestors() { return ancestors; } - public void setAncestors (String ancestors) { + public void setAncestors(String ancestors) { this.ancestors = ancestors; } @NotBlank(message = "部门名称不能为空") @Size(min = 0, max = 30, message = "部门名称长度不能超过30个字符") - public String getDeptName () { + public String getDeptName() { return deptName; } - public void setDeptName (String deptName) { + public void setDeptName(String deptName) { this.deptName = deptName; } @NotNull(message = "显示顺序不能为空") - public Integer getOrderNum () { + public Integer getOrderNum() { return orderNum; } - public void setOrderNum (Integer orderNum) { + public void setOrderNum(Integer orderNum) { this.orderNum = orderNum; } - public String getLeader () { + public String getLeader() { return leader; } - public void setLeader (String leader) { + public void setLeader(String leader) { this.leader = leader; } @Size(min = 0, max = 11, message = "联系电话长度不能超过11个字符") - public String getPhone () { + public String getPhone() { return phone; } - public void setPhone (String phone) { + public void setPhone(String phone) { this.phone = phone; } @Email(message = "邮箱格式不正确") @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符") - public String getEmail () { + public String getEmail() { return email; } - public void setEmail (String email) { + public void setEmail(String email) { this.email = email; } - public String getStatus () { + public String getStatus() { return status; } - public void setStatus (String status) { + public void setStatus(String status) { this.status = status; } - public String getDelFlag () { + public String getDelFlag() { return delFlag; } - public void setDelFlag (String delFlag) { + public void setDelFlag(String delFlag) { this.delFlag = delFlag; } - public String getParentName () { + public String getParentName() { return parentName; } - public void setParentName (String parentName) { + public void setParentName(String parentName) { this.parentName = parentName; } - public List getChildren () { + public List getChildren() { return children; } - public void setChildren (List children) { + public void setChildren(List children) { this.children = children; } @Override - public String toString () { + public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) .append("deptId", getDeptId()) .append("parentId", getParentId()) diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java index f83f4e4..77a8721 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java @@ -2,7 +2,6 @@ package com.ruoyi.common.core.domain.entity; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel.ColumnType; -import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.core.domain.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; @@ -87,29 +86,29 @@ public class SysDictData extends BaseEntity { @NotBlank(message = "字典标签不能为空") @Size(min = 0, max = 100, message = "字典标签长度不能超过100个字符") - public String getDictLabel () { + public String getDictLabel() { return dictLabel; } @NotBlank(message = "字典键值不能为空") @Size(min = 0, max = 100, message = "字典键值长度不能超过100个字符") - public String getDictValue () { + public String getDictValue() { return dictValue; } @NotBlank(message = "字典类型不能为空") @Size(min = 0, max = 100, message = "字典类型长度不能超过100个字符") - public String getDictType () { + public String getDictType() { return dictType; } @Size(min = 0, max = 100, message = "样式属性长度不能超过100个字符") - public String getCssClass () { + public String getCssClass() { return cssClass; } @Override - public String toString () { + public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) .append("dictCode", getDictCode()) .append("dictSort", getDictSort()) diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java index d6c408f..26c0bdb 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java @@ -60,19 +60,19 @@ public class SysDictType extends BaseEntity { @NotBlank(message = "字典名称不能为空") @Size(min = 0, max = 100, message = "字典类型名称长度不能超过100个字符") - public String getDictName () { + public String getDictName() { return dictName; } @NotBlank(message = "字典类型不能为空") @Size(min = 0, max = 100, message = "字典类型类型长度不能超过100个字符") @Pattern(regexp = "^[a-z][a-z0-9_]*$", message = "字典类型必须以字母开头，且只能为（小写字母，数字，下滑线）") - public String getDictType () { + public String getDictType() { return dictType; } @Override - public String toString () { + public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) .append("dictId", getDictId()) .append("dictName", getDictName()) diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java index c8b8348..5744758 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java @@ -116,38 +116,38 @@ public class SysMenu extends BaseEntity { @NotBlank(message = "菜单名称不能为空") @Size(min = 0, max = 50, message = "菜单名称长度不能超过50个字符") - public String getMenuName () { + public String getMenuName() { return menuName; } @NotNull(message = "显示顺序不能为空") - public Integer getOrderNum () { + public Integer getOrderNum() { return orderNum; } @Size(min = 0, max = 200, message = "路由地址不能超过200个字符") - public String getPath () { + public String getPath() { return path; } @Size(min = 0, max = 200, message = "组件路径不能超过255个字符") - public String getComponent () { + public String getComponent() { return component; } @NotBlank(message = "菜单类型不能为空") - public String getMenuType () { + public String getMenuType() { return menuType; } @Size(min = 0, max = 100, message = "权限标识长度不能超过100个字符") - public String getPerms () { + public String getPerms() { return perms; } @Override - public String toString () { + public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) .append("menuId", getMenuId()) .append("menuName", getMenuName()) diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java index 8c9ce58..6b9463e 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java @@ -6,7 +6,6 @@ import com.ruoyi.common.core.domain.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -105,48 +104,49 @@ public class SysRole extends BaseEntity { private String remark; - public SysRole () { + public SysRole() { } - public SysRole (Long roleId) { + public SysRole(Long roleId) { this.roleId = roleId; } - public static boolean isAdmin (Long roleId) { + public static boolean isAdmin(Long roleId) { return roleId != null && 1L == roleId; } - public boolean isAdmin () { + public boolean isAdmin() { return isAdmin(this.roleId); } @NotBlank(message = "角色名称不能为空") @Size(min = 0, max = 30, message = "角色名称长度不能超过30个字符") - public String getRoleName () { + public String getRoleName() { return roleName; } @NotBlank(message = "权限字符不能为空") @Size(min = 0, max = 100, message = "权限字符长度不能超过100个字符") - public String getRoleKey () { + public String getRoleKey() { return roleKey; } @NotNull(message = "显示顺序不能为空") - public Integer getRoleSort () { + public Integer getRoleSort() { return roleSort; } - public boolean isMenuCheckStrictly () { + public boolean isMenuCheckStrictly() { return menuCheckStrictly; } - public boolean isDeptCheckStrictly () { + public boolean isDeptCheckStrictly() { return deptCheckStrictly; } + @Override - public String toString () { + public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) .append("roleId", getRoleId()) .append("roleName", getRoleName()) diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java index 5e58fb8..adab386 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java @@ -9,7 +9,6 @@ import com.ruoyi.common.xss.Xss; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -141,47 +140,48 @@ public class SysUser extends BaseEntity { */ private String remark; - public SysUser () { + public SysUser() { } - public SysUser (Long userId) { + public SysUser(Long userId) { this.userId = userId; } - public static boolean isAdmin (Long userId) { + public static boolean isAdmin(Long userId) { return userId != null && 1L == userId; } - public boolean isAdmin () { + public boolean isAdmin() { return isAdmin(this.userId); } @Xss(message = "用户昵称不能包含脚本字符") @Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符") - public String getNickName () { + public String getNickName() { return nickName; } @Xss(message = "用户账号不能包含脚本字符") @NotBlank(message = "用户账号不能为空") @Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符") - public String getUserName () { + public String getUserName() { return userName; } @Email(message = "邮箱格式不正确") @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符") - public String getEmail () { + public String getEmail() { return email; } @Size(min = 0, max = 11, message = "手机号码长度不能超过11个字符") - public String getPhonenumber () { + public String getPhonenumber() { return phonenumber; } + @Override - public String toString () { + public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) .append("userId", getUserId()) .append("deptId", getDeptId()) diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java index de57094..9d9daea 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java @@ -26,35 +26,35 @@ public class LoginBody { */ private String uuid; - public String getUsername () { + public String getUsername() { return username; } - public void setUsername (String username) { + public void setUsername(String username) { this.username = username; } - public String getPassword () { + public String getPassword() { return password; } - public void setPassword (String password) { + public void setPassword(String password) { this.password = password; } - public String getCode () { + public String getCode() { return code; } - public void setCode (String code) { + public void setCode(String code) { this.code = code; } - public String getUuid () { + public String getUuid() { return uuid; } - public void setUuid (String uuid) { + public void setUuid(String uuid) { this.uuid = uuid; } } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java index 485482c..67b5a93 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java @@ -71,53 +71,53 @@ public class LoginUser implements UserDetails { */ private SysUser user; - public LoginUser () { + public LoginUser() { } - public LoginUser (SysUser user, Set permissions) { + public LoginUser(SysUser user, Set permissions) { this.user = user; this.permissions = permissions; } - public LoginUser (Long userId, Long deptId, SysUser user, Set permissions) { + public LoginUser(Long userId, Long deptId, SysUser user, Set permissions) { this.userId = userId; this.deptId = deptId; this.user = user; this.permissions = permissions; } - public Long getUserId () { + public Long getUserId() { return userId; } - public void setUserId (Long userId) { + public void setUserId(Long userId) { this.userId = userId; } - public Long getDeptId () { + public Long getDeptId() { return deptId; } - public void setDeptId (Long deptId) { + public void setDeptId(Long deptId) { this.deptId = deptId; } - public String getToken () { + public String getToken() { return token; } - public void setToken (String token) { + public void setToken(String token) { this.token = token; } @JSONField(serialize = false) @Override - public String getPassword () { + public String getPassword() { return user.getPassword(); } @Override - public String getUsername () { + public String getUsername() { return user.getUserName(); } @@ -126,7 +126,7 @@ public class LoginUser implements UserDetails { */ @JSONField(serialize = false) @Override - public boolean isAccountNonExpired () { + public boolean isAccountNonExpired() { return true; } @@ -137,7 +137,7 @@ public class LoginUser implements UserDetails { */ @JSONField(serialize = false) @Override - public boolean isAccountNonLocked () { + public boolean isAccountNonLocked() { return true; } @@ -148,7 +148,7 @@ public class LoginUser implements UserDetails { */ @JSONField(serialize = false) @Override - public boolean isCredentialsNonExpired () { + public boolean isCredentialsNonExpired() { return true; } @@ -159,76 +159,76 @@ public class LoginUser implements UserDetails { */ @JSONField(serialize = false) @Override - public boolean isEnabled () { + public boolean isEnabled() { return true; } - public Long getLoginTime () { + public Long getLoginTime() { return loginTime; } - public void setLoginTime (Long loginTime) { + public void setLoginTime(Long loginTime) { this.loginTime = loginTime; } - public String getIpaddr () { + public String getIpaddr() { return ipaddr; } - public void setIpaddr (String ipaddr) { + public void setIpaddr(String ipaddr) { this.ipaddr = ipaddr; } - public String getLoginLocation () { + public String getLoginLocation() { return loginLocation; } - public void setLoginLocation (String loginLocation) { + public void setLoginLocation(String loginLocation) { this.loginLocation = loginLocation; } - public String getBrowser () { + public String getBrowser() { return browser; } - public void setBrowser (String browser) { + public void setBrowser(String browser) { this.browser = browser; } - public String getOs () { + public String getOs() { return os; } - public void setOs (String os) { + public void setOs(String os) { this.os = os; } - public Long getExpireTime () { + public Long getExpireTime() { return expireTime; } - public void setExpireTime (Long expireTime) { + public void setExpireTime(Long expireTime) { this.expireTime = expireTime; } - public Set getPermissions () { + public Set getPermissions() { return permissions; } - public void setPermissions (Set permissions) { + public void setPermissions(Set permissions) { this.permissions = permissions; } - public SysUser getUser () { + public SysUser getUser() { return user; } - public void setUser (SysUser user) { + public void setUser(SysUser user) { this.user = user; } @Override - public Collection getAuthorities () { + public Collection getAuthorities() { return null; } } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java index d9ff9bb..8d78800 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java @@ -33,42 +33,42 @@ public class PageDomain { */ private Boolean reasonable = true; - public String getOrderBy () { + public String getOrderBy() { if (StringUtils.isEmpty(orderByColumn)) { return ""; } return StringUtils.toUnderScoreCase(orderByColumn) + " " + isAsc; } - public Integer getPageNum () { + public Integer getPageNum() { return pageNum; } - public void setPageNum (Integer pageNum) { + public void setPageNum(Integer pageNum) { this.pageNum = pageNum; } - public Integer getPageSize () { + public Integer getPageSize() { return pageSize; } - public void setPageSize (Integer pageSize) { + public void setPageSize(Integer pageSize) { this.pageSize = pageSize; } - public String getOrderByColumn () { + public String getOrderByColumn() { return orderByColumn; } - public void setOrderByColumn (String orderByColumn) { + public void setOrderByColumn(String orderByColumn) { this.orderByColumn = orderByColumn; } - public String getIsAsc () { + public String getIsAsc() { return isAsc; } - public void setIsAsc (String isAsc) { + public void setIsAsc(String isAsc) { if (StringUtils.isNotEmpty(isAsc)) { // 兼容前端排序类型 if ("ascending".equals(isAsc)) { @@ -80,14 +80,14 @@ public class PageDomain { } } - public Boolean getReasonable () { + public Boolean getReasonable() { if (StringUtils.isNull(reasonable)) { return Boolean.TRUE; } return reasonable; } - public void setReasonable (Boolean reasonable) { + public void setReasonable(Boolean reasonable) { this.reasonable = reasonable; } } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java index a72ed5b..d567aed 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java @@ -37,7 +37,7 @@ public class TableSupport { /** * 封装分页对象 */ - public static PageDomain getPageDomain () { + public static PageDomain getPageDomain() { PageDomain pageDomain = new PageDomain(); pageDomain.setPageNum(Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1)); pageDomain.setPageSize(Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10)); @@ -47,7 +47,7 @@ public class TableSupport { return pageDomain; } - public static PageDomain buildPageRequest () { + public static PageDomain buildPageRequest() { return getPageDomain(); } } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java index c5adda9..8d9b507 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java @@ -7,7 +7,10 @@ import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.ValueOperations; import org.springframework.stereotype.Component; -import java.util.*; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.concurrent.TimeUnit; /** @@ -27,7 +30,7 @@ public class RedisCache { * @param key 缓存的键值 * @param value 缓存的值 */ - public void setCacheObject (final String key, final T value) { + public void setCacheObject(final String key, final T value) { redisTemplate.opsForValue().set(key, value); } @@ -39,7 +42,7 @@ public class RedisCache { * @param timeout 时间 * @param timeUnit 时间颗粒度 */ - public void setCacheObject (final String key, final T value, final Integer timeout, final TimeUnit timeUnit) { + public void setCacheObject(final String key, final T value, final Integer timeout, final TimeUnit timeUnit) { redisTemplate.opsForValue().set(key, value, timeout, timeUnit); } @@ -48,10 +51,9 @@ public class RedisCache { * * @param key Redis键 * @param timeout 超时时间 - * * @return true=设置成功；false=设置失败 */ - public boolean expire (final String key, final long timeout) { + public boolean expire(final String key, final long timeout) { return expire(key, timeout, TimeUnit.SECONDS); } @@ -61,10 +63,9 @@ public class RedisCache { * @param key Redis键 * @param timeout 超时时间 * @param unit 时间单位 - * * @return true=设置成功；false=设置失败 */ - public boolean expire (final String key, final long timeout, final TimeUnit unit) { + public boolean expire(final String key, final long timeout, final TimeUnit unit) { return Boolean.TRUE.equals(redisTemplate.expire(key, timeout, unit)); } @@ -72,10 +73,9 @@ public class RedisCache { * 获取有效时间 * * @param key Redis键 - * * @return 有效时间 */ - public long getExpire (final String key) { + public long getExpire(final String key) { return redisTemplate.getExpire(key); } @@ -83,10 +83,9 @@ public class RedisCache { * 判断 key是否存在 * * @param key 键 - * * @return true 存在 false不存在 */ - public Boolean hasKey (String key) { + public Boolean hasKey(String key) { return redisTemplate.hasKey(key); } @@ -94,10 +93,9 @@ public class RedisCache { * 获得缓存的基本对象。 * * @param key 缓存键值 - * * @return 缓存键值对应的数据 */ - public T getCacheObject (final String key) { + public T getCacheObject(final String key) { ValueOperations operation = redisTemplate.opsForValue(); return operation.get(key); } @@ -107,7 +105,7 @@ public class RedisCache { * * @param key */ - public boolean deleteObject (final String key) { + public boolean deleteObject(final String key) { return redisTemplate.delete(key); } @@ -115,10 +113,9 @@ public class RedisCache { * 删除集合对象 * * @param collection 多个对象 - * * @return */ - public boolean deleteObject (final Collection collection) { + public boolean deleteObject(final Collection collection) { return redisTemplate.delete(collection) > 0; } @@ -127,10 +124,9 @@ public class RedisCache { * * @param key 缓存的键值 * @param dataList 待缓存的List数据 - * * @return 缓存的对象 */ - public long setCacheList (final String key, final List dataList) { + public long setCacheList(final String key, final List dataList) { Long count = redisTemplate.opsForList().rightPushAll(key, dataList); return count == null ? 0 : count; } @@ -139,10 +135,9 @@ public class RedisCache { * 获得缓存的list对象 * * @param key 缓存的键值 - * * @return 缓存键值对应的数据 */ - public List getCacheList (final String key) { + public List getCacheList(final String key) { return redisTemplate.opsForList().range(key, 0, -1); } @@ -151,10 +146,9 @@ public class RedisCache { * * @param key 缓存键值 * @param dataSet 缓存的数据 - * * @return 缓存数据的对象 */ - public BoundSetOperations setCacheSet (final String key, final Set dataSet) { + public BoundSetOperations setCacheSet(final String key, final Set dataSet) { BoundSetOperations setOperation = redisTemplate.boundSetOps(key); for (T t : dataSet) { setOperation.add(t); @@ -166,10 +160,9 @@ public class RedisCache { * 获得缓存的set * * @param key - * * @return */ - public Set getCacheSet (final String key) { + public Set getCacheSet(final String key) { return redisTemplate.opsForSet().members(key); } @@ -179,7 +172,7 @@ public class RedisCache { * @param key * @param dataMap */ - public void setCacheMap (final String key, final Map dataMap) { + public void setCacheMap(final String key, final Map dataMap) { if (dataMap != null) { redisTemplate.opsForHash().putAll(key, dataMap); } @@ -189,10 +182,9 @@ public class RedisCache { * 获得缓存的Map * * @param key - * * @return */ - public Map getCacheMap (final String key) { + public Map getCacheMap(final String key) { return redisTemplate.opsForHash().entries(key); } @@ -203,7 +195,7 @@ public class RedisCache { * @param hKey Hash键 * @param value 值 */ - public void setCacheMapValue (final String key, final String hKey, final T value) { + public void setCacheMapValue(final String key, final String hKey, final T value) { redisTemplate.opsForHash().put(key, hKey, value); } @@ -212,10 +204,9 @@ public class RedisCache { * * @param key Redis键 * @param hKey Hash键 - * * @return Hash中的对象 */ - public T getCacheMapValue (final String key, final String hKey) { + public T getCacheMapValue(final String key, final String hKey) { HashOperations opsForHash = redisTemplate.opsForHash(); return opsForHash.get(key, hKey); } @@ -225,10 +216,9 @@ public class RedisCache { * * @param key Redis键 * @param hKeys Hash键集合 - * * @return Hash对象集合 */ - public List getMultiCacheMapValue (final String key, final Collection hKeys) { + public List getMultiCacheMapValue(final String key, final Collection hKeys) { return redisTemplate.opsForHash().multiGet(key, hKeys); } @@ -237,10 +227,9 @@ public class RedisCache { * * @param key Redis键 * @param hKey Hash键 - * * @return 是否成功 */ - public boolean deleteCacheMapValue (final String key, final String hKey) { + public boolean deleteCacheMapValue(final String key, final String hKey) { return redisTemplate.opsForHash().delete(key, hKey) > 0; } @@ -248,10 +237,9 @@ public class RedisCache { * 获得缓存的基本对象列表 * * @param pattern 字符串前缀 - * * @return 对象列表 */ - public Collection keys (final String pattern) { + public Collection keys(final String pattern) { return redisTemplate.keys(pattern); } } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java index aa11d85..777005c 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java @@ -41,10 +41,9 @@ public class CharsetKit { * 转换为Charset对象 * * @param charset 字符集，为空则返回默认字符集 - * * @return Charset */ - public static Charset charset (String charset) { + public static Charset charset(String charset) { return StringUtils.isEmpty(charset) ? Charset.defaultCharset() : Charset.forName(charset); } @@ -54,10 +53,9 @@ public class CharsetKit { * @param source 字符串 * @param srcCharset 源字符集，默认ISO-8859-1 * @param destCharset 目标字符集，默认UTF-8 - * * @return 转换后的字符集 */ - public static String convert (String source, String srcCharset, String destCharset) { + public static String convert(String source, String srcCharset, String destCharset) { return convert(source, Charset.forName(srcCharset), Charset.forName(destCharset)); } @@ -67,10 +65,9 @@ public class CharsetKit { * @param source 字符串 * @param srcCharset 源字符集，默认ISO-8859-1 * @param destCharset 目标字符集，默认UTF-8 - * * @return 转换后的字符集 */ - public static String convert (String source, Charset srcCharset, Charset destCharset) { + public static String convert(String source, Charset srcCharset, Charset destCharset) { if (null == srcCharset) { srcCharset = StandardCharsets.ISO_8859_1; } @@ -88,7 +85,7 @@ public class CharsetKit { /** * @return 系统字符集编码 */ - public static String systemCharset () { + public static String systemCharset() { return Charset.defaultCharset().name(); } } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java index 8f9cbfe..d81f70b 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java @@ -23,10 +23,9 @@ public class Convert { * * @param value 被转换的值 * @param defaultValue 转换错误时的默认值 - * * @return 结果 */ - public static String toStr (Object value, String defaultValue) { + public static String toStr(Object value, String defaultValue) { if (null == value) { return defaultValue; } @@ -42,10 +41,9 @@ public class Convert { * 转换失败不会报错 * * @param value 被转换的值 - * * @return 结果 */ - public static String toStr (Object value) { + public static String toStr(Object value) { return toStr(value, null); } @@ -56,10 +54,9 @@ public class Convert { * * @param value 被转换的值 * @param defaultValue 转换错误时的默认值 - * * @return 结果 */ - public static Character toChar (Object value, Character defaultValue) { + public static Character toChar(Object value, Character defaultValue) { if (null == value) { return defaultValue; } @@ -77,10 +74,9 @@ public class Convert { * 转换失败不会报错 * * @param value 被转换的值 - * * @return 结果 */ - public static Character toChar (Object value) { + public static Character toChar(Object value) { return toChar(value, null); } @@ -91,10 +87,9 @@ public class Convert { * * @param value 被转换的值 * @param defaultValue 转换错误时的默认值 - * * @return 结果 */ - public static Byte toByte (Object value, Byte defaultValue) { + public static Byte toByte(Object value, Byte defaultValue) { if (value == null) { return defaultValue; } @@ -121,10 +116,9 @@ public class Convert { * 转换失败不会报错 * * @param value 被转换的值 - * * @return 结果 */ - public static Byte toByte (Object value) { + public static Byte toByte(Object value) { return toByte(value, null); } @@ -135,10 +129,9 @@ public class Convert { * * @param value 被转换的值 * @param defaultValue 转换错误时的默认值 - * * @return 结果 */ - public static Short toShort (Object value, Short defaultValue) { + public static Short toShort(Object value, Short defaultValue) { if (value == null) { return defaultValue; } @@ -165,10 +158,9 @@ public class Convert { * 转换失败不会报错 * * @param value 被转换的值 - * * @return 结果 */ - public static Short toShort (Object value) { + public static Short toShort(Object value) { return toShort(value, null); } @@ -179,10 +171,9 @@ public class Convert { * * @param value 被转换的值 * @param defaultValue 转换错误时的默认值 - * * @return 结果 */ - public static Number toNumber (Object value, Number defaultValue) { + public static Number toNumber(Object value, Number defaultValue) { if (value == null) { return defaultValue; } @@ -206,10 +197,9 @@ public class Convert { * 转换失败不会报错 * * @param value 被转换的值 - * * @return 结果 */ - public static Number toNumber (Object value) { + public static Number toNumber(Object value) { return toNumber(value, null); } @@ -220,10 +210,9 @@ public class Convert { * * @param value 被转换的值 * @param defaultValue 转换错误时的默认值 - * * @return 结果 */ - public static Integer toInt (Object value, Integer defaultValue) { + public static Integer toInt(Object value, Integer defaultValue) { if (value == null) { return defaultValue; } @@ -250,10 +239,9 @@ public class Convert { * 转换失败不会报错 * * @param value 被转换的值 - * * @return 结果 */ - public static Integer toInt (Object value) { + public static Integer toInt(Object value) { return toInt(value, null); } @@ -261,10 +249,9 @@ public class Convert { * 转换为Integer数组
* * @param str 被转换的值 - * * @return 结果 */ - public static Integer[] toIntArray (String str) { + public static Integer[] toIntArray(String str) { return toIntArray(",", str); } @@ -272,10 +259,9 @@ public class Convert { * 转换为Long数组
* * @param str 被转换的值 - * * @return 结果 */ - public static Long[] toLongArray (String str) { + public static Long[] toLongArray(String str) { return toLongArray(",", str); } @@ -284,16 +270,15 @@ public class Convert { * * @param split 分隔符 * @param split 被转换的值 - * * @return 结果 */ - public static Integer[] toIntArray (String split, String str) { + public static Integer[] toIntArray(String split, String str) { if (StringUtils.isEmpty(str)) { return new Integer[]{}; } String[] arr = str.split(split); final Integer[] ints = new Integer[arr.length]; - for (int i = 0 ; i < arr.length ; i++) { + for (int i = 0; i < arr.length; i++) { final Integer v = toInt(arr[i], 0); ints[i] = v; } @@ -305,16 +290,15 @@ public class Convert { * * @param split 分隔符 * @param str 被转换的值 - * * @return 结果 */ - public static Long[] toLongArray (String split, String str) { + public static Long[] toLongArray(String split, String str) { if (StringUtils.isEmpty(str)) { return new Long[]{}; } String[] arr = str.split(split); final Long[] longs = new Long[arr.length]; - for (int i = 0 ; i < arr.length ; i++) { + for (int i = 0; i < arr.length; i++) { final Long v = toLong(arr[i], null); longs[i] = v; } @@ -325,10 +309,9 @@ public class Convert { * 转换为String数组
* * @param str 被转换的值 - * * @return 结果 */ - public static String[] toStrArray (String str) { + public static String[] toStrArray(String str) { return toStrArray(",", str); } @@ -337,10 +320,9 @@ public class Convert { * * @param split 分隔符 * @param split 被转换的值 - * * @return 结果 */ - public static String[] toStrArray (String split, String str) { + public static String[] toStrArray(String split, String str) { return str.split(split); } @@ -351,10 +333,9 @@ public class Convert { * * @param value 被转换的值 * @param defaultValue 转换错误时的默认值 - * * @return 结果 */ - public static Long toLong (Object value, Long defaultValue) { + public static Long toLong(Object value, Long defaultValue) { if (value == null) { return defaultValue; } @@ -382,10 +363,9 @@ public class Convert { * 转换失败不会报错 * * @param value 被转换的值 - * * @return 结果 */ - public static Long toLong (Object value) { + public static Long toLong(Object value) { return toLong(value, null); } @@ -396,10 +376,9 @@ public class Convert { * * @param value 被转换的值 * @param defaultValue 转换错误时的默认值 - * * @return 结果 */ - public static Double toDouble (Object value, Double defaultValue) { + public static Double toDouble(Object value, Double defaultValue) { if (value == null) { return defaultValue; } @@ -427,10 +406,9 @@ public class Convert { * 转换失败不会报错 * * @param value 被转换的值 - * * @return 结果 */ - public static Double toDouble (Object value) { + public static Double toDouble(Object value) { return toDouble(value, null); } @@ -441,10 +419,9 @@ public class Convert { * * @param value 被转换的值 * @param defaultValue 转换错误时的默认值 - * * @return 结果 */ - public static Float toFloat (Object value, Float defaultValue) { + public static Float toFloat(Object value, Float defaultValue) { if (value == null) { return defaultValue; } @@ -471,10 +448,9 @@ public class Convert { * 转换失败不会报错 * * @param value 被转换的值 - * * @return 结果 */ - public static Float toFloat (Object value) { + public static Float toFloat(Object value) { return toFloat(value, null); } @@ -485,10 +461,9 @@ public class Convert { * * @param value 被转换的值 * @param defaultValue 转换错误时的默认值 - * * @return 结果 */ - public static Boolean toBool (Object value, Boolean defaultValue) { + public static Boolean toBool(Object value, Boolean defaultValue) { if (value == null) { return defaultValue; } @@ -521,10 +496,9 @@ public class Convert { * 转换失败不会报错 * * @param value 被转换的值 - * * @return 结果 */ - public static Boolean toBool (Object value) { + public static Boolean toBool(Object value) { return toBool(value, null); } @@ -535,10 +509,9 @@ public class Convert { * @param clazz Enum的Class * @param value 值 * @param defaultValue 默认值 - * * @return Enum */ - public static > E toEnum (Class clazz, Object value, E defaultValue) { + public static > E toEnum(Class clazz, Object value, E defaultValue) { if (value == null) { return defaultValue; } @@ -564,10 +537,9 @@ public class Convert { * * @param clazz Enum的Class * @param value 值 - * * @return Enum */ - public static > E toEnum (Class clazz, Object value) { + public static > E toEnum(Class clazz, Object value) { return toEnum(clazz, value, null); } @@ -578,10 +550,9 @@ public class Convert { * * @param value 被转换的值 * @param defaultValue 转换错误时的默认值 - * * @return 结果 */ - public static BigInteger toBigInteger (Object value, BigInteger defaultValue) { + public static BigInteger toBigInteger(Object value, BigInteger defaultValue) { if (value == null) { return defaultValue; } @@ -608,10 +579,9 @@ public class Convert { * 转换失败不会报错 * * @param value 被转换的值 - * * @return 结果 */ - public static BigInteger toBigInteger (Object value) { + public static BigInteger toBigInteger(Object value) { return toBigInteger(value, null); } @@ -622,10 +592,9 @@ public class Convert { * * @param value 被转换的值 * @param defaultValue 转换错误时的默认值 - * * @return 结果 */ - public static BigDecimal toBigDecimal (Object value, BigDecimal defaultValue) { + public static BigDecimal toBigDecimal(Object value, BigDecimal defaultValue) { if (value == null) { return defaultValue; } @@ -658,10 +627,9 @@ public class Convert { * 转换失败不会报错 * * @param value 被转换的值 - * * @return 结果 */ - public static BigDecimal toBigDecimal (Object value) { + public static BigDecimal toBigDecimal(Object value) { return toBigDecimal(value, null); } @@ -670,10 +638,9 @@ public class Convert { * 1、Byte数组和ByteBuffer会被转换为对应字符串的数组 2、对象数组会调用Arrays.toString方法 * * @param obj 对象 - * * @return 字符串 */ - public static String utf8Str (Object obj) { + public static String utf8Str(Object obj) { return str(obj, CharsetKit.CHARSET_UTF_8); } @@ -683,10 +650,9 @@ public class Convert { * * @param obj 对象 * @param charsetName 字符集 - * * @return 字符串 */ - public static String str (Object obj, String charsetName) { + public static String str(Object obj, String charsetName) { return str(obj, Charset.forName(charsetName)); } @@ -696,10 +662,9 @@ public class Convert { * * @param obj 对象 * @param charset 字符集 - * * @return 字符串 */ - public static String str (Object obj, Charset charset) { + public static String str(Object obj, Charset charset) { if (null == obj) { return null; } @@ -722,10 +687,9 @@ public class Convert { * * @param bytes byte数组 * @param charset 字符集 - * * @return 字符串 */ - public static String str (byte[] bytes, String charset) { + public static String str(byte[] bytes, String charset) { return str(bytes, StringUtils.isEmpty(charset) ? Charset.defaultCharset() : Charset.forName(charset)); } @@ -734,10 +698,9 @@ public class Convert { * * @param data 字符串 * @param charset 字符集，如果此字段为空，则解码的结果取决于平台 - * * @return 解码后的字符串 */ - public static String str (byte[] data, Charset charset) { + public static String str(byte[] data, Charset charset) { if (data == null) { return null; } @@ -753,10 +716,9 @@ public class Convert { * * @param data 数据 * @param charset 字符集，如果为空使用当前系统字符集 - * * @return 字符串 */ - public static String str (ByteBuffer data, String charset) { + public static String str(ByteBuffer data, String charset) { if (data == null) { return null; } @@ -769,10 +731,9 @@ public class Convert { * * @param data 数据 * @param charset 字符集，如果为空使用当前系统字符集 - * * @return 字符串 */ - public static String str (ByteBuffer data, Charset charset) { + public static String str(ByteBuffer data, Charset charset) { if (null == charset) { charset = Charset.defaultCharset(); } @@ -785,10 +746,9 @@ public class Convert { * 半角转全角 * * @param input String. - * * @return 全角字符串. */ - public static String toSBC (String input) { + public static String toSBC(String input) { return toSBC(input, null); } @@ -797,12 +757,11 @@ public class Convert { * * @param input String * @param notConvertSet 不替换的字符集合 - * * @return 全角字符串. */ - public static String toSBC (String input, Set notConvertSet) { + public static String toSBC(String input, Set notConvertSet) { char[] c = input.toCharArray(); - for (int i = 0 ; i < c.length ; i++) { + for (int i = 0; i < c.length; i++) { if (null != notConvertSet && notConvertSet.contains(c[i])) { // 跳过不替换的字符 continue; @@ -822,10 +781,9 @@ public class Convert { * 全角转半角 * * @param input String. - * * @return 半角字符串 */ - public static String toDBC (String input) { + public static String toDBC(String input) { return toDBC(input, null); } @@ -834,12 +792,11 @@ public class Convert { * * @param text 文本 * @param notConvertSet 不替换的字符集合 - * * @return 替换后的字符 */ - public static String toDBC (String text, Set notConvertSet) { + public static String toDBC(String text, Set notConvertSet) { char[] c = text.toCharArray(); - for (int i = 0 ; i < c.length ; i++) { + for (int i = 0; i < c.length; i++) { if (null != notConvertSet && notConvertSet.contains(c[i])) { // 跳过不替换的字符 continue; @@ -860,10 +817,9 @@ public class Convert { * 数字金额大写转换 先写个完整的然后将如零拾替换成零 * * @param n 数字 - * * @return 中文大写数字 */ - public static String digitUppercase (double n) { + public static String digitUppercase(double n) { String[] fraction = {"角", "分"}; String[] digit = {"零", "壹", "贰", "叁", "肆", "伍", "陆", "柒", "捌", "玖"}; String[][] unit = {{"元", "万", "亿"}, {"", "拾", "佰", "仟"}}; @@ -872,7 +828,7 @@ public class Convert { n = Math.abs(n); String s = ""; - for (int i = 0 ; i < fraction.length ; i++) { + for (int i = 0; i < fraction.length; i++) { s += (digit[(int) (Math.floor(n * 10 * Math.pow(10, i)) % 10)] + fraction[i]).replaceAll("(零.)+", ""); } if (s.length() < 1) { @@ -880,9 +836,9 @@ public class Convert { } int integerPart = (int) Math.floor(n); - for (int i = 0 ; i < unit[0].length && integerPart > 0 ; i++) { + for (int i = 0; i < unit[0].length && integerPart > 0; i++) { String p = ""; - for (int j = 0 ; j < unit[1].length && n > 0 ; j++) { + for (int j = 0; j < unit[1].length && n > 0; j++) { p = digit[integerPart % 10] + unit[1][j] + p; integerPart = integerPart / 10; } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/text/StrFormatter.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/text/StrFormatter.java index fb817c0..eec64f9 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/text/StrFormatter.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/text/StrFormatter.java @@ -24,10 +24,9 @@ public class StrFormatter { * * @param strPattern 字符串模板 * @param argArray 参数列表 - * * @return 结果 */ - public static String format (final String strPattern, final Object... argArray) { + public static String format(final String strPattern, final Object... argArray) { if (StringUtils.isEmpty(strPattern) || StringUtils.isEmpty(argArray)) { return strPattern; } @@ -38,7 +37,7 @@ public class StrFormatter { int handledPosition = 0; int delimIndex;// 占位符所在位置 - for (int argIndex = 0 ; argIndex < argArray.length ; argIndex++) { + for (int argIndex = 0; argIndex < argArray.length; argIndex++) { delimIndex = strPattern.indexOf(EMPTY_JSON, handledPosition); if (delimIndex == -1) { if (handledPosition == 0) { diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/enums/HttpMethod.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/enums/HttpMethod.java index d9a662d..bd1bfcc 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/enums/HttpMethod.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/enums/HttpMethod.java @@ -22,11 +22,11 @@ public enum HttpMethod { } @Nullable - public static HttpMethod resolve (@Nullable String method) { + public static HttpMethod resolve(@Nullable String method) { return (method != null ? mappings.get(method) : null); } - public boolean matches (String method) { + public boolean matches(String method) { return (this == resolve(method)); } } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/enums/UserStatus.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/enums/UserStatus.java index 47380db..673ddeb 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/enums/UserStatus.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/enums/UserStatus.java @@ -11,16 +11,16 @@ public enum UserStatus { private final String code; private final String info; - UserStatus (String code, String info) { + UserStatus(String code, String info) { this.code = code; this.info = info; } - public String getCode () { + public String getCode() { return code; } - public String getInfo () { + public String getInfo() { return info; } } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java index eb4af3d..9178131 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java @@ -8,6 +8,6 @@ package com.ruoyi.common.exception; public class DemoModeException extends RuntimeException { private static final long serialVersionUID = 1L; - public DemoModeException () { + public DemoModeException() { } } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/GlobalException.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/GlobalException.java index 74eb822..358de20 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/GlobalException.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/GlobalException.java @@ -23,28 +23,28 @@ public class GlobalException extends RuntimeException { /** * 空构造方法，避免反序列化问题 */ - public GlobalException () { + public GlobalException() { } - public GlobalException (String message) { + public GlobalException(String message) { this.message = message; } - public String getDetailMessage () { + public String getDetailMessage() { return detailMessage; } - public GlobalException setDetailMessage (String detailMessage) { + public GlobalException setDetailMessage(String detailMessage) { this.detailMessage = detailMessage; return this; } @Override - public String getMessage () { + public String getMessage() { return message; } - public GlobalException setMessage (String message) { + public GlobalException setMessage(String message) { this.message = message; return this; } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/ServiceException.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/ServiceException.java index 4649ab3..c6b18bc 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/ServiceException.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/ServiceException.java @@ -28,38 +28,38 @@ public final class ServiceException extends RuntimeException { /** * 空构造方法，避免反序列化问题 */ - public ServiceException () { + public ServiceException() { } - public ServiceException (String message) { + public ServiceException(String message) { this.message = message; } - public ServiceException (String message, Integer code) { + public ServiceException(String message, Integer code) { this.message = message; this.code = code; } - public String getDetailMessage () { + public String getDetailMessage() { return detailMessage; } - public ServiceException setDetailMessage (String detailMessage) { + public ServiceException setDetailMessage(String detailMessage) { this.detailMessage = detailMessage; return this; } @Override - public String getMessage () { + public String getMessage() { return message; } - public ServiceException setMessage (String message) { + public ServiceException setMessage(String message) { this.message = message; return this; } - public Integer getCode () { + public Integer getCode() { return code; } } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/UtilException.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/UtilException.java index 9348c4a..01cc878 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/UtilException.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/UtilException.java @@ -8,15 +8,15 @@ package com.ruoyi.common.exception; public class UtilException extends RuntimeException { private static final long serialVersionUID = 8247610319171014183L; - public UtilException (Throwable e) { + public UtilException(Throwable e) { super(e.getMessage(), e); } - public UtilException (String message) { + public UtilException(String message) { super(message); } - public UtilException (String message, Throwable throwable) { + public UtilException(String message, Throwable throwable) { super(message, throwable); } } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java index 630a1ab..c4ff125 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java @@ -31,31 +31,31 @@ public class BaseException extends RuntimeException { */ private String defaultMessage; - public BaseException (String module, String code, Object[] args, String defaultMessage) { + public BaseException(String module, String code, Object[] args, String defaultMessage) { this.module = module; this.code = code; this.args = args; this.defaultMessage = defaultMessage; } - public BaseException (String module, String code, Object[] args) { + public BaseException(String module, String code, Object[] args) { this(module, code, args, null); } - public BaseException (String module, String defaultMessage) { + public BaseException(String module, String defaultMessage) { this(module, null, null, defaultMessage); } - public BaseException (String code, Object[] args) { + public BaseException(String code, Object[] args) { this(null, code, args, null); } - public BaseException (String defaultMessage) { + public BaseException(String defaultMessage) { this(null, null, null, defaultMessage); } @Override - public String getMessage () { + public String getMessage() { String message = null; if (!StringUtils.isEmpty(code)) { message = MessageUtils.message(code, args); @@ -66,19 +66,19 @@ public class BaseException extends RuntimeException { return message; } - public String getModule () { + public String getModule() { return module; } - public String getCode () { + public String getCode() { return code; } - public Object[] getArgs () { + public Object[] getArgs() { return args; } - public String getDefaultMessage () { + public String getDefaultMessage() { return defaultMessage; } } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java index 656c421..794f4e1 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java @@ -10,7 +10,7 @@ import com.ruoyi.common.exception.base.BaseException; public class FileException extends BaseException { private static final long serialVersionUID = 1L; - public FileException (String code, Object[] args) { + public FileException(String code, Object[] args) { super("file", code, args, null); } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java index 33c3ede..64a5020 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java @@ -8,7 +8,7 @@ package com.ruoyi.common.exception.file; public class FileNameLengthLimitExceededException extends FileException { private static final long serialVersionUID = 1L; - public FileNameLengthLimitExceededException (int defaultFileNameLength) { + public FileNameLengthLimitExceededException(int defaultFileNameLength) { super("upload.filename.exceed.length", new Object[]{defaultFileNameLength}); } } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java index bbb1d76..93e9e1c 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java @@ -8,7 +8,7 @@ package com.ruoyi.common.exception.file; public class FileSizeLimitExceededException extends FileException { private static final long serialVersionUID = 1L; - public FileSizeLimitExceededException (long defaultMaxSize) { + public FileSizeLimitExceededException(long defaultMaxSize) { super("upload.exceed.maxSize", new Object[]{defaultMaxSize}); } } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileUploadException.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileUploadException.java index a73cac3..4153ce8 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileUploadException.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileUploadException.java @@ -14,21 +14,21 @@ public class FileUploadException extends Exception { private final Throwable cause; - public FileUploadException () { + public FileUploadException() { this(null, null); } - public FileUploadException (final String msg) { + public FileUploadException(final String msg) { this(msg, null); } - public FileUploadException (String msg, Throwable cause) { + public FileUploadException(String msg, Throwable cause) { super(msg); this.cause = cause; } @Override - public void printStackTrace (PrintStream stream) { + public void printStackTrace(PrintStream stream) { super.printStackTrace(stream); if (cause != null) { stream.println("Caused by:"); @@ -37,7 +37,7 @@ public class FileUploadException extends Exception { } @Override - public void printStackTrace (PrintWriter writer) { + public void printStackTrace(PrintWriter writer) { super.printStackTrace(writer); if (cause != null) { writer.println("Caused by:"); @@ -46,7 +46,7 @@ public class FileUploadException extends Exception { } @Override - public Throwable getCause () { + public Throwable getCause() { return cause; } } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java index dbefcb5..3c6769c 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java @@ -14,29 +14,29 @@ public class InvalidExtensionException extends FileUploadException { private String extension; private String filename; - public InvalidExtensionException (String[] allowedExtension, String extension, String filename) { + public InvalidExtensionException(String[] allowedExtension, String extension, String filename) { super("文件[" + filename + "]后缀[" + extension + "]不正确，请上传" + Arrays.toString(allowedExtension) + "格式"); this.allowedExtension = allowedExtension; this.extension = extension; this.filename = filename; } - public String[] getAllowedExtension () { + public String[] getAllowedExtension() { return allowedExtension; } - public String getExtension () { + public String getExtension() { return extension; } - public String getFilename () { + public String getFilename() { return filename; } public static class InvalidImageExtensionException extends InvalidExtensionException { private static final long serialVersionUID = 1L; - public InvalidImageExtensionException (String[] allowedExtension, String extension, String filename) { + public InvalidImageExtensionException(String[] allowedExtension, String extension, String filename) { super(allowedExtension, extension, filename); } } @@ -44,7 +44,7 @@ public class InvalidExtensionException extends FileUploadException { public static class InvalidFlashExtensionException extends InvalidExtensionException { private static final long serialVersionUID = 1L; - public InvalidFlashExtensionException (String[] allowedExtension, String extension, String filename) { + public InvalidFlashExtensionException(String[] allowedExtension, String extension, String filename) { super(allowedExtension, extension, filename); } } @@ -52,7 +52,7 @@ public class InvalidExtensionException extends FileUploadException { public static class InvalidMediaExtensionException extends InvalidExtensionException { private static final long serialVersionUID = 1L; - public InvalidMediaExtensionException (String[] allowedExtension, String extension, String filename) { + public InvalidMediaExtensionException(String[] allowedExtension, String extension, String filename) { super(allowedExtension, extension, filename); } } @@ -60,7 +60,7 @@ public class InvalidExtensionException extends FileUploadException { public static class InvalidVideoExtensionException extends InvalidExtensionException { private static final long serialVersionUID = 1L; - public InvalidVideoExtensionException (String[] allowedExtension, String extension, String filename) { + public InvalidVideoExtensionException(String[] allowedExtension, String extension, String filename) { super(allowedExtension, extension, filename); } } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/job/TaskException.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/job/TaskException.java index a4cc6c7..98b29e6 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/job/TaskException.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/job/TaskException.java @@ -10,16 +10,16 @@ public class TaskException extends Exception { private Code code; - public TaskException (String msg, Code code) { + public TaskException(String msg, Code code) { this(msg, code, null); } - public TaskException (String msg, Code code, Exception nestedEx) { + public TaskException(String msg, Code code, Exception nestedEx) { super(msg, nestedEx); this.code = code; } - public Code getCode () { + public Code getCode() { return code; } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/BlackListException.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/BlackListException.java index 76758f9..6bf6db0 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/BlackListException.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/BlackListException.java @@ -8,7 +8,7 @@ package com.ruoyi.common.exception.user; public class BlackListException extends UserException { private static final long serialVersionUID = 1L; - public BlackListException () { + public BlackListException() { super("login.blocked", null); } } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java index e79a1a0..9040485 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java @@ -8,7 +8,7 @@ package com.ruoyi.common.exception.user; public class CaptchaException extends UserException { private static final long serialVersionUID = 1L; - public CaptchaException () { + public CaptchaException() { super("user.jcaptcha.error", null); } } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java index ca45210..ae5f759 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java @@ -8,7 +8,7 @@ package com.ruoyi.common.exception.user; public class CaptchaExpireException extends UserException { private static final long serialVersionUID = 1L; - public CaptchaExpireException () { + public CaptchaExpireException() { super("user.jcaptcha.expire", null); } } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java index a9b1e16..94dbcdd 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java @@ -10,7 +10,7 @@ import com.ruoyi.common.exception.base.BaseException; public class UserException extends BaseException { private static final long serialVersionUID = 1L; - public UserException (String code, Object[] args) { + public UserException(String code, Object[] args) { super("user", code, args, null); } } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserNotExistsException.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserNotExistsException.java index 51c3df2..9f19b90 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserNotExistsException.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserNotExistsException.java @@ -8,7 +8,7 @@ package com.ruoyi.common.exception.user; public class UserNotExistsException extends UserException { private static final long serialVersionUID = 1L; - public UserNotExistsException () { + public UserNotExistsException() { super("user.not.exists", null); } } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java index b325f8f..0fab116 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java @@ -8,7 +8,7 @@ package com.ruoyi.common.exception.user; public class UserPasswordNotMatchException extends UserException { private static final long serialVersionUID = 1L; - public UserPasswordNotMatchException () { + public UserPasswordNotMatchException() { super("user.password.not.match", null); } } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordRetryLimitExceedException.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordRetryLimitExceedException.java index 61e62ac..6340773 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordRetryLimitExceedException.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordRetryLimitExceedException.java @@ -8,7 +8,7 @@ package com.ruoyi.common.exception.user; public class UserPasswordRetryLimitExceedException extends UserException { private static final long serialVersionUID = 1L; - public UserPasswordRetryLimitExceedException (int retryLimitCount, int lockTime) { + public UserPasswordRetryLimitExceedException(int retryLimitCount, int lockTime) { super("user.password.retry.limit.exceed", new Object[]{retryLimitCount, lockTime}); } } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/filter/PropertyPreExcludeFilter.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/filter/PropertyPreExcludeFilter.java index 21d7018..d0daa16 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/filter/PropertyPreExcludeFilter.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/filter/PropertyPreExcludeFilter.java @@ -8,11 +8,11 @@ import com.alibaba.fastjson2.filter.SimplePropertyPreFilter; * @author ruoyi */ public class PropertyPreExcludeFilter extends SimplePropertyPreFilter { - public PropertyPreExcludeFilter () { + public PropertyPreExcludeFilter() { } - public PropertyPreExcludeFilter addExcludes (String... filters) { - for (int i = 0 ; i < filters.length ; i++) { + public PropertyPreExcludeFilter addExcludes(String... filters) { + for (int i = 0; i < filters.length; i++) { this.getExcludes().add(filters[i]); } return this; diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java index e926381..0e4b265 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java @@ -14,12 +14,12 @@ import java.io.IOException; */ public class RepeatableFilter implements Filter { @Override - public void init (FilterConfig filterConfig) throws ServletException { + public void init(FilterConfig filterConfig) throws ServletException { } @Override - public void doFilter (ServletRequest request, ServletResponse response, FilterChain chain) + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { ServletRequest requestWrapper = null; if (request instanceof HttpServletRequest @@ -34,7 +34,7 @@ public class RepeatableFilter implements Filter { } @Override - public void destroy () { + public void destroy() { } } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java index e559b7d..62d8972 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java @@ -21,7 +21,7 @@ import java.io.InputStreamReader; public class RepeatedlyRequestWrapper extends HttpServletRequestWrapper { private final byte[] body; - public RepeatedlyRequestWrapper (HttpServletRequest request, ServletResponse response) throws IOException { + public RepeatedlyRequestWrapper(HttpServletRequest request, ServletResponse response) throws IOException { super(request); request.setCharacterEncoding(Constants.UTF8); response.setCharacterEncoding(Constants.UTF8); @@ -30,36 +30,36 @@ public class RepeatedlyRequestWrapper extends HttpServletRequestWrapper { } @Override - public BufferedReader getReader () throws IOException { + public BufferedReader getReader() throws IOException { return new BufferedReader(new InputStreamReader(getInputStream())); } @Override - public ServletInputStream getInputStream () throws IOException { + public ServletInputStream getInputStream() throws IOException { final ByteArrayInputStream bais = new ByteArrayInputStream(body); return new ServletInputStream() { @Override - public int read () throws IOException { + public int read() throws IOException { return bais.read(); } @Override - public int available () throws IOException { + public int available() throws IOException { return body.length; } @Override - public boolean isFinished () { + public boolean isFinished() { return false; } @Override - public boolean isReady () { + public boolean isReady() { return false; } @Override - public void setReadListener (ReadListener readListener) { + public void setReadListener(ReadListener readListener) { } }; diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java index 71a749e..6084aa9 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java @@ -22,18 +22,18 @@ public class XssFilter implements Filter { public List excludes = new ArrayList<>(); @Override - public void init (FilterConfig filterConfig) throws ServletException { + public void init(FilterConfig filterConfig) throws ServletException { String tempExcludes = filterConfig.getInitParameter("excludes"); if (StringUtils.isNotEmpty(tempExcludes)) { String[] url = tempExcludes.split(","); - for (int i = 0 ; url != null && i < url.length ; i++) { + for (int i = 0; url != null && i < url.length; i++) { excludes.add(url[i]); } } } @Override - public void doFilter (ServletRequest request, ServletResponse response, FilterChain chain) + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { HttpServletRequest req = (HttpServletRequest) request; HttpServletResponse resp = (HttpServletResponse) response; @@ -45,7 +45,7 @@ public class XssFilter implements Filter { chain.doFilter(xssRequest, response); } - private boolean handleExcludeURL (HttpServletRequest request, HttpServletResponse response) { + private boolean handleExcludeURL(HttpServletRequest request, HttpServletResponse response) { String url = request.getServletPath(); String method = request.getMethod(); // GET DELETE 不过滤 @@ -56,7 +56,7 @@ public class XssFilter implements Filter { } @Override - public void destroy () { + public void destroy() { } } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java index e0a2680..46b4f12 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java @@ -22,17 +22,17 @@ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper { /** * @param request */ - public XssHttpServletRequestWrapper (HttpServletRequest request) { + public XssHttpServletRequestWrapper(HttpServletRequest request) { super(request); } @Override - public String[] getParameterValues (String name) { + public String[] getParameterValues(String name) { String[] values = super.getParameterValues(name); if (values != null) { int length = values.length; String[] escapesValues = new String[length]; - for (int i = 0 ; i < length ; i++) { + for (int i = 0; i < length; i++) { // 防xss攻击和过滤前后空格 escapesValues[i] = EscapeUtil.clean(values[i]).trim(); } @@ -42,7 +42,7 @@ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper { } @Override - public ServletInputStream getInputStream () throws IOException { + public ServletInputStream getInputStream() throws IOException { // 非json类型，直接返回 if (!isJsonRequest()) { return super.getInputStream(); @@ -60,26 +60,26 @@ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper { final ByteArrayInputStream bis = new ByteArrayInputStream(jsonBytes); return new ServletInputStream() { @Override - public boolean isFinished () { + public boolean isFinished() { return true; } @Override - public boolean isReady () { + public boolean isReady() { return true; } @Override - public int available () throws IOException { + public int available() throws IOException { return jsonBytes.length; } @Override - public void setReadListener (ReadListener readListener) { + public void setReadListener(ReadListener readListener) { } @Override - public int read () throws IOException { + public int read() throws IOException { return bis.read(); } }; @@ -90,7 +90,7 @@ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper { * * @param request */ - public boolean isJsonRequest () { + public boolean isJsonRequest() { String header = super.getHeader(HttpHeaders.CONTENT_TYPE); return StringUtils.startsWithIgnoreCase(header, MediaType.APPLICATION_JSON_VALUE); } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java index c6cf336..19a231c 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java @@ -18,7 +18,7 @@ public class Arith { /** * 这个类不能实例化 */ - private Arith () { + private Arith() { } /** @@ -26,10 +26,9 @@ public class Arith { * * @param v1 被加数 * @param v2 加数 - * * @return 两个参数的和 */ - public static double add (double v1, double v2) { + public static double add(double v1, double v2) { BigDecimal b1 = new BigDecimal(Double.toString(v1)); BigDecimal b2 = new BigDecimal(Double.toString(v2)); return b1.add(b2).doubleValue(); @@ -40,10 +39,9 @@ public class Arith { * * @param v1 被减数 * @param v2 减数 - * * @return 两个参数的差 */ - public static double sub (double v1, double v2) { + public static double sub(double v1, double v2) { BigDecimal b1 = new BigDecimal(Double.toString(v1)); BigDecimal b2 = new BigDecimal(Double.toString(v2)); return b1.subtract(b2).doubleValue(); @@ -54,10 +52,9 @@ public class Arith { * * @param v1 被乘数 * @param v2 乘数 - * * @return 两个参数的积 */ - public static double mul (double v1, double v2) { + public static double mul(double v1, double v2) { BigDecimal b1 = new BigDecimal(Double.toString(v1)); BigDecimal b2 = new BigDecimal(Double.toString(v2)); return b1.multiply(b2).doubleValue(); @@ -69,10 +66,9 @@ public class Arith { * * @param v1 被除数 * @param v2 除数 - * * @return 两个参数的商 */ - public static double div (double v1, double v2) { + public static double div(double v1, double v2) { return div(v1, v2, DEF_DIV_SCALE); } @@ -83,10 +79,9 @@ public class Arith { * @param v1 被除数 * @param v2 除数 * @param scale 表示表示需要精确到小数点以后几位。 - * * @return 两个参数的商 */ - public static double div (double v1, double v2, int scale) { + public static double div(double v1, double v2, int scale) { if (scale < 0) { throw new IllegalArgumentException( "The scale must be a positive integer or zero"); @@ -104,10 +99,9 @@ public class Arith { * * @param v 需要四舍五入的数字 * @param scale 小数点后保留几位 - * * @return 四舍五入后的结果 */ - public static double round (double v, int scale) { + public static double round(double v, int scale) { if (scale < 0) { throw new IllegalArgumentException( "The scale must be a positive integer or zero"); diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java index 6a85e5c..adcd1d8 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java @@ -34,7 +34,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils { * * @return Date() 当前日期 */ - public static Date getNowDate () { + public static Date getNowDate() { return new Date(); } @@ -43,31 +43,31 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils { * * @return String */ - public static String getDate () { + public static String getDate() { return dateTimeNow(YYYY_MM_DD); } - public static final String getTime () { + public static final String getTime() { return dateTimeNow(YYYY_MM_DD_HH_MM_SS); } - public static final String dateTimeNow () { + public static final String dateTimeNow() { return dateTimeNow(YYYYMMDDHHMMSS); } - public static final String dateTimeNow (final String format) { + public static final String dateTimeNow(final String format) { return parseDateToStr(format, new Date()); } - public static final String dateTime (final Date date) { + public static final String dateTime(final Date date) { return parseDateToStr(YYYY_MM_DD, date); } - public static final String parseDateToStr (final String format, final Date date) { + public static final String parseDateToStr(final String format, final Date date) { return new SimpleDateFormat(format).format(date); } - public static final Date dateTime (final String format, final String ts) { + public static final Date dateTime(final String format, final String ts) { try { return new SimpleDateFormat(format).parse(ts); } catch (ParseException e) { @@ -78,7 +78,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils { /** * 日期路径 即年/月/日 如2018/08/08 */ - public static final String datePath () { + public static final String datePath() { Date now = new Date(); return DateFormatUtils.format(now, "yyyy/MM/dd"); } @@ -86,7 +86,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils { /** * 日期路径 即年/月/日 如20180808 */ - public static final String dateTime () { + public static final String dateTime() { Date now = new Date(); return DateFormatUtils.format(now, "yyyyMMdd"); } @@ -94,7 +94,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils { /** * 日期型字符串转化为日期 格式 */ - public static Date parseDate (Object str) { + public static Date parseDate(Object str) { if (str == null) { return null; } @@ -108,7 +108,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils { /** * 获取服务器启动时间 */ - public static Date getServerStartDate () { + public static Date getServerStartDate() { long time = ManagementFactory.getRuntimeMXBean().getStartTime(); return new Date(time); } @@ -116,7 +116,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils { /** * 计算相差天数 */ - public static int differentDaysByMillisecond (Date date1, Date date2) { + public static int differentDaysByMillisecond(Date date1, Date date2) { return Math.abs((int) ((date2.getTime() - date1.getTime()) / (1000 * 3600 * 24))); } @@ -125,10 +125,9 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils { * * @param endDate 最后时间 * @param startTime 开始时间 - * * @return 时间差（天/小时/分钟） */ - public static String timeDistance (Date endDate, Date startTime) { + public static String timeDistance(Date endDate, Date startTime) { long nd = 1000 * 24 * 60 * 60; long nh = 1000 * 60 * 60; long nm = 1000 * 60; @@ -149,7 +148,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils { /** * 增加 LocalDateTime ==> Date */ - public static Date toDate (LocalDateTime temporalAccessor) { + public static Date toDate(LocalDateTime temporalAccessor) { ZonedDateTime zdt = temporalAccessor.atZone(ZoneId.systemDefault()); return Date.from(zdt.toInstant()); } @@ -157,7 +156,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils { /** * 增加 LocalDate ==> Date */ - public static Date toDate (LocalDate temporalAccessor) { + public static Date toDate(LocalDate temporalAccessor) { LocalDateTime localDateTime = LocalDateTime.of(temporalAccessor, LocalTime.of(0, 0, 0)); ZonedDateTime zdt = localDateTime.atZone(ZoneId.systemDefault()); return Date.from(zdt.toInstant()); diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java index 3b6487b..2328b78 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java @@ -26,7 +26,7 @@ public class DictUtils { * @param key 参数键 * @param dictDatas 字典数据列表 */ - public static void setDictCache (String key, List dictDatas) { + public static void setDictCache(String key, List dictDatas) { SpringUtils.getBean(RedisCache.class).setCacheObject(getCacheKey(key), dictDatas); } @@ -34,10 +34,9 @@ public class DictUtils { * 获取字典缓存 * * @param key 参数键 - * * @return dictDatas 字典数据列表 */ - public static List getDictCache (String key) { + public static List getDictCache(String key) { JSONArray arrayCache = SpringUtils.getBean(RedisCache.class).getCacheObject(getCacheKey(key)); if (StringUtils.isNotNull(arrayCache)) { return arrayCache.toList(SysDictData.class); @@ -50,10 +49,9 @@ public class DictUtils { * * @param dictType 字典类型 * @param dictValue 字典值 - * * @return 字典标签 */ - public static String getDictLabel (String dictType, String dictValue) { + public static String getDictLabel(String dictType, String dictValue) { return getDictLabel(dictType, dictValue, SEPARATOR); } @@ -62,10 +60,9 @@ public class DictUtils { * * @param dictType 字典类型 * @param dictLabel 字典标签 - * * @return 字典值 */ - public static String getDictValue (String dictType, String dictLabel) { + public static String getDictValue(String dictType, String dictLabel) { return getDictValue(dictType, dictLabel, SEPARATOR); } @@ -75,10 +72,9 @@ public class DictUtils { * @param dictType 字典类型 * @param dictValue 字典值 * @param separator 分隔符 - * * @return 字典标签 */ - public static String getDictLabel (String dictType, String dictValue, String separator) { + public static String getDictLabel(String dictType, String dictValue, String separator) { StringBuilder propertyString = new StringBuilder(); List datas = getDictCache(dictType); @@ -109,10 +105,9 @@ public class DictUtils { * @param dictType 字典类型 * @param dictLabel 字典标签 * @param separator 分隔符 - * * @return 字典值 */ - public static String getDictValue (String dictType, String dictLabel, String separator) { + public static String getDictValue(String dictType, String dictLabel, String separator) { StringBuilder propertyString = new StringBuilder(); List datas = getDictCache(dictType); @@ -140,14 +135,14 @@ public class DictUtils { * * @param key 字典键 */ - public static void removeDictCache (String key) { + public static void removeDictCache(String key) { SpringUtils.getBean(RedisCache.class).deleteObject(getCacheKey(key)); } /** * 清空字典缓存 */ - public static void clearDictCache () { + public static void clearDictCache() { Collection keys = SpringUtils.getBean(RedisCache.class).keys(CacheConstants.SYS_DICT_KEY + "*"); SpringUtils.getBean(RedisCache.class).deleteObject(keys); } @@ -156,10 +151,9 @@ public class DictUtils { * 设置cache key * * @param configKey 参数键 - * * @return 缓存键key */ - public static String getCacheKey (String configKey) { + public static String getCacheKey(String configKey) { return CacheConstants.SYS_DICT_KEY + configKey; } } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java index 0d1e382..fd7a780 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java @@ -14,13 +14,13 @@ public class ExceptionUtil { /** * 获取exception的详细错误信息。 */ - public static String getExceptionMessage (Throwable e) { + public static String getExceptionMessage(Throwable e) { StringWriter sw = new StringWriter(); e.printStackTrace(new PrintWriter(sw, true)); return sw.toString(); } - public static String getRootErrorMessage (Exception e) { + public static String getRootErrorMessage(Exception e) { Throwable root = ExceptionUtils.getRootCause(e); root = (root == null ? e : root); if (root == null) { diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/LogUtils.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/LogUtils.java index 8a18776..a0d5c9f 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/LogUtils.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/LogUtils.java @@ -6,7 +6,7 @@ package com.ruoyi.common.utils; * @author ruoyi */ public class LogUtils { - public static String getBlock (Object msg) { + public static String getBlock(Object msg) { if (msg == null) { msg = ""; } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java index 3b7d028..039eb24 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java @@ -15,10 +15,9 @@ public class MessageUtils { * * @param code 消息键 * @param args 参数 - * * @return 获取国际化翻译值 */ - public static String message (String code, Object... args) { + public static String message(String code, Object... args) { MessageSource messageSource = SpringUtils.getBean(MessageSource.class); return messageSource.getMessage(code, args, LocaleContextHolder.getLocale()); } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/ObjUtils.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/ObjUtils.java index 7bb8ed1..35f0950 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/ObjUtils.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/ObjUtils.java @@ -17,49 +17,56 @@ public class ObjUtils { * Array: 如果长度为零，则认为为空。 * Collection: 如果元素为零，则认为为空。 * Map: 如果键值映射为零，则认为为空。 + * * @param o 对象 * @return 如果对象具有受支持的类型并且为空或null，则为true，否则为false */ - public static boolean notNull(Object o){ + public static boolean notNull(Object o) { return ObjectUtils.isNotEmpty(o); } /** * 判断long类型不为0 + * * @param val 值 * @return 返回值不为0 */ - public static boolean notNull(Long val){ - return ObjectUtils.isNotEmpty(val) && val != 0; + public static boolean notNull(Long val) { + return ObjectUtils.isNotEmpty(val) && val != 0; } /** * 判断Integer类型不为0 + * * @param val 值 * @return 返回值不为0 */ - public static boolean notNull(Integer val){ - return ObjectUtils.isNotEmpty(val) && val != 0; + public static boolean notNull(Integer val) { + return ObjectUtils.isNotEmpty(val) && val != 0; } + /** * 判断BigDecimal类型不为0 + * * @param val 值 * @return 返回值不为0 */ - public static boolean notNull(BigDecimal val){ - return ObjectUtils.isNotEmpty(val) && val.doubleValue() == 0.00; + public static boolean notNull(BigDecimal val) { + return ObjectUtils.isNotEmpty(val) && val.doubleValue() == 0.00; } + /** * 判断BigDecimal类型不为0 + * * @param val 值 * @return 返回值不为0 */ - public static boolean notChildNull(Object[] val){ + public static boolean notChildNull(Object[] val) { for (Object o : val) { - if (!notNull(o)){ + if (!notNull(o)) { return false; } } - return true; + return true; } } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java index c053e02..c51ea3c 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java @@ -14,7 +14,7 @@ public class PageUtils extends PageHelper { /** * 设置请求分页数据 */ - public static void startPage () { + public static void startPage() { PageDomain pageDomain = TableSupport.buildPageRequest(); Integer pageNum = pageDomain.getPageNum(); Integer pageSize = pageDomain.getPageSize(); @@ -26,7 +26,7 @@ public class PageUtils extends PageHelper { /** * 清理分页的线程变量 */ - public static void clearPage () { + public static void clearPage() { PageHelper.clearPage(); } } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java index b4d6866..8110fc2 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java @@ -16,7 +16,7 @@ public class SecurityUtils { /** * 用户ID **/ - public static Long getUserId () { + public static Long getUserId() { try { return getLoginUser().getUserId(); } catch (Exception e) { @@ -27,7 +27,7 @@ public class SecurityUtils { /** * 获取部门ID **/ - public static Long getDeptId () { + public static Long getDeptId() { try { return getLoginUser().getDeptId(); } catch (Exception e) { @@ -38,7 +38,7 @@ public class SecurityUtils { /** * 获取用户账户 **/ - public static String getUsername () { + public static String getUsername() { try { return getLoginUser().getUsername(); } catch (Exception e) { @@ -49,7 +49,7 @@ public class SecurityUtils { /** * 获取用户 **/ - public static LoginUser getLoginUser () { + public static LoginUser getLoginUser() { try { return (LoginUser) getAuthentication().getPrincipal(); } catch (Exception e) { @@ -60,7 +60,7 @@ public class SecurityUtils { /** * 获取Authentication */ - public static Authentication getAuthentication () { + public static Authentication getAuthentication() { return SecurityContextHolder.getContext().getAuthentication(); } @@ -68,10 +68,9 @@ public class SecurityUtils { * 生成BCryptPasswordEncoder密码 * * @param password 密码 - * * @return 加密字符串 */ - public static String encryptPassword (String password) { + public static String encryptPassword(String password) { BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder(); return passwordEncoder.encode(password); } @@ -81,10 +80,9 @@ public class SecurityUtils { * * @param rawPassword 真实密码 * @param encodedPassword 加密后字符 - * * @return 结果 */ - public static boolean matchesPassword (String rawPassword, String encodedPassword) { + public static boolean matchesPassword(String rawPassword, String encodedPassword) { BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder(); return passwordEncoder.matches(rawPassword, encodedPassword); } @@ -93,10 +91,9 @@ public class SecurityUtils { * 是否为管理员 * * @param userId 用户ID - * * @return 结果 */ - public static boolean isAdmin (Long userId) { + public static boolean isAdmin(Long userId) { return userId != null && 1L == userId; } } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java index c8b36ec..36a9651 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java @@ -27,42 +27,42 @@ public class ServletUtils { /** * 获取String参数 */ - public static String getParameter (String name) { + public static String getParameter(String name) { return getRequest().getParameter(name); } /** * 获取String参数 */ - public static String getParameter (String name, String defaultValue) { + public static String getParameter(String name, String defaultValue) { return Convert.toStr(getRequest().getParameter(name), defaultValue); } /** * 获取Integer参数 */ - public static Integer getParameterToInt (String name) { + public static Integer getParameterToInt(String name) { return Convert.toInt(getRequest().getParameter(name)); } /** * 获取Integer参数 */ - public static Integer getParameterToInt (String name, Integer defaultValue) { + public static Integer getParameterToInt(String name, Integer defaultValue) { return Convert.toInt(getRequest().getParameter(name), defaultValue); } /** * 获取Boolean参数 */ - public static Boolean getParameterToBool (String name) { + public static Boolean getParameterToBool(String name) { return Convert.toBool(getRequest().getParameter(name)); } /** * 获取Boolean参数 */ - public static Boolean getParameterToBool (String name, Boolean defaultValue) { + public static Boolean getParameterToBool(String name, Boolean defaultValue) { return Convert.toBool(getRequest().getParameter(name), defaultValue); } @@ -70,10 +70,9 @@ public class ServletUtils { * 获得所有请求参数 * * @param request 请求对象{@link ServletRequest} - * * @return Map */ - public static Map getParams (ServletRequest request) { + public static Map getParams(ServletRequest request) { final Map map = request.getParameterMap(); return Collections.unmodifiableMap(map); } @@ -82,10 +81,9 @@ public class ServletUtils { * 获得所有请求参数 * * @param request 请求对象{@link ServletRequest} - * * @return Map */ - public static Map getParamMap (ServletRequest request) { + public static Map getParamMap(ServletRequest request) { Map params = new HashMap<>(); for (Map.Entry entry : getParams(request).entrySet()) { params.put(entry.getKey(), StringUtils.join(entry.getValue(), ",")); @@ -96,25 +94,25 @@ public class ServletUtils { /** * 获取request */ - public static HttpServletRequest getRequest () { + public static HttpServletRequest getRequest() { return getRequestAttributes().getRequest(); } /** * 获取response */ - public static HttpServletResponse getResponse () { + public static HttpServletResponse getResponse() { return getRequestAttributes().getResponse(); } /** * 获取session */ - public static HttpSession getSession () { + public static HttpSession getSession() { return getRequest().getSession(); } - public static ServletRequestAttributes getRequestAttributes () { + public static ServletRequestAttributes getRequestAttributes() { RequestAttributes attributes = RequestContextHolder.getRequestAttributes(); return (ServletRequestAttributes) attributes; } @@ -125,7 +123,7 @@ public class ServletUtils { * @param response 渲染对象 * @param string 待渲染的字符串 */ - public static void renderString (HttpServletResponse response, String string) { + public static void renderString(HttpServletResponse response, String string) { try { response.setStatus(200); response.setContentType("application/json"); @@ -141,7 +139,7 @@ public class ServletUtils { * * @param request */ - public static boolean isAjaxRequest (HttpServletRequest request) { + public static boolean isAjaxRequest(HttpServletRequest request) { String accept = request.getHeader("accept"); if (accept != null && accept.contains("application/json")) { return true; @@ -165,10 +163,9 @@ public class ServletUtils { * 内容编码 * * @param str 内容 - * * @return 编码后的内容 */ - public static String urlEncode (String str) { + public static String urlEncode(String str) { try { return URLEncoder.encode(str, Constants.UTF8); } catch (UnsupportedEncodingException e) { @@ -180,10 +177,9 @@ public class ServletUtils { * 内容解码 * * @param str 内容 - * * @return 解码后的内容 */ - public static String urlDecode (String str) { + public static String urlDecode(String str) { try { return URLDecoder.decode(str, Constants.UTF8); } catch (UnsupportedEncodingException e) { diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java index 9794595..d363732 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java @@ -26,10 +26,9 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { * 获取参数不为空值 * * @param value defaultValue 要判断的value - * * @return value 返回值 */ - public static T nvl (T value, T defaultValue) { + public static T nvl(T value, T defaultValue) { return value != null ? value : defaultValue; } @@ -37,10 +36,9 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { * * 判断一个Collection是否为空， 包含List，Set，Queue * * @param coll 要判断的Collection - * * @return true：为空 false：非空 */ - public static boolean isEmpty (Collection coll) { + public static boolean isEmpty(Collection coll) { return isNull(coll) || coll.isEmpty(); } @@ -48,10 +46,9 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { * * 判断一个Collection是否非空，包含List，Set，Queue * * @param coll 要判断的Collection - * * @return true：非空 false：空 */ - public static boolean isNotEmpty (Collection coll) { + public static boolean isNotEmpty(Collection coll) { return !isEmpty(coll); } @@ -61,7 +58,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { * @param objects 要判断的对象数组 * * @return true：为空 false：非空 */ - public static boolean isEmpty (Object[] objects) { + public static boolean isEmpty(Object[] objects) { return isNull(objects) || (objects.length == 0); } @@ -69,10 +66,9 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { * * 判断一个对象数组是否非空 * * @param objects 要判断的对象数组 - * * @return true：非空 false：空 */ - public static boolean isNotEmpty (Object[] objects) { + public static boolean isNotEmpty(Object[] objects) { return !isEmpty(objects); } @@ -80,10 +76,9 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { * * 判断一个Map是否为空 * * @param map 要判断的Map - * * @return true：为空 false：非空 */ - public static boolean isEmpty (Map map) { + public static boolean isEmpty(Map map) { return isNull(map) || map.isEmpty(); } @@ -91,10 +86,9 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { * * 判断一个Map是否为空 * * @param map 要判断的Map - * * @return true：非空 false：空 */ - public static boolean isNotEmpty (Map map) { + public static boolean isNotEmpty(Map map) { return !isEmpty(map); } @@ -102,10 +96,9 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { * * 判断一个字符串是否为空串 * * @param str String - * * @return true：为空 false：非空 */ - public static boolean isEmpty (String str) { + public static boolean isEmpty(String str) { return isNull(str) || NULLSTR.equals(str.trim()); } @@ -113,10 +106,9 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { * * 判断一个字符串是否为非空串 * * @param str String - * * @return true：非空串 false：空串 */ - public static boolean isNotEmpty (String str) { + public static boolean isNotEmpty(String str) { return !isEmpty(str); } @@ -124,10 +116,9 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { * * 判断一个对象是否为空 * * @param object Object - * * @return true：为空 false：非空 */ - public static boolean isNull (Object object) { + public static boolean isNull(Object object) { return object == null; } @@ -135,10 +126,9 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { * * 判断一个对象是否非空 * * @param object Object - * * @return true：非空 false：空 */ - public static boolean isNotNull (Object object) { + public static boolean isNotNull(Object object) { return !isNull(object); } @@ -146,17 +136,16 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { * * 判断一个对象是否是数组类型（Java基本型别的数组） * * @param object 对象 - * * @return true：是数组 false：不是数组 */ - public static boolean isArray (Object object) { + public static boolean isArray(Object object) { return isNotNull(object) && object.getClass().isArray(); } /** * 去空格 */ - public static String trim (String str) { + public static String trim(String str) { return (str == null ? "" : str.trim()); } @@ -165,10 +154,9 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { * * @param str 字符串 * @param start 开始 - * * @return 结果 */ - public static String substring (final String str, int start) { + public static String substring(final String str, int start) { if (str == null) { return NULLSTR; } @@ -193,10 +181,9 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { * @param str 字符串 * @param start 开始 * @param end 结束 - * * @return 结果 */ - public static String substring (final String str, int start, int end) { + public static String substring(final String str, int start, int end) { if (str == null) { return NULLSTR; } @@ -237,10 +224,9 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { * * @param template 文本模板，被替换的部分用 {} 表示 * @param params 参数值 - * * @return 格式化后的文本 */ - public static String format (String template, Object... params) { + public static String format(String template, Object... params) { if (isEmpty(params) || isEmpty(template)) { return template; } @@ -251,10 +237,9 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { * 是否为http(s)://开头 * * @param link 链接 - * * @return 结果 */ - public static boolean ishttp (String link) { + public static boolean ishttp(String link) { return StringUtils.startsWithAny(link, Constants.HTTP, Constants.HTTPS); } @@ -263,10 +248,9 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { * * @param str 字符串 * @param sep 分隔符 - * * @return set集合 */ - public static final Set str2Set (String str, String sep) { + public static final Set str2Set(String str, String sep) { return new HashSet(str2List(str, sep, true, false)); } @@ -277,10 +261,9 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { * @param sep 分隔符 * @param filterBlank 过滤纯空白 * @param trim 去掉首尾空白 - * * @return list集合 */ - public static final List str2List (String str, String sep, boolean filterBlank, boolean trim) { + public static final List str2List(String str, String sep, boolean filterBlank, boolean trim) { List list = new ArrayList(); if (StringUtils.isEmpty(str)) { return list; @@ -309,10 +292,9 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { * * @param collection 给定的集合 * @param array 给定的数组 - * * @return boolean 结果 */ - public static boolean containsAny (Collection collection, String... array) { + public static boolean containsAny(Collection collection, String... array) { if (isEmpty(collection) || isEmpty(array)) { return false; } else { @@ -330,10 +312,9 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { * * @param cs 指定字符串 * @param searchCharSequences 需要检查的字符串数组 - * * @return 是否包含任意一个字符串 */ - public static boolean containsAnyIgnoreCase (CharSequence cs, CharSequence... searchCharSequences) { + public static boolean containsAnyIgnoreCase(CharSequence cs, CharSequence... searchCharSequences) { if (isEmpty(cs) || isEmpty(searchCharSequences)) { return false; } @@ -348,7 +329,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { /** * 驼峰转下划线命名 */ - public static String toUnderScoreCase (String str) { + public static String toUnderScoreCase(String str) { if (str == null) { return null; } @@ -359,7 +340,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { boolean curreCharIsUpperCase = true; // 下一字符是否大写 boolean nexteCharIsUpperCase = true; - for (int i = 0 ; i < str.length() ; i++) { + for (int i = 0; i < str.length(); i++) { char c = str.charAt(i); if (i > 0) { preCharIsUpperCase = Character.isUpperCase(str.charAt(i - 1)); @@ -389,10 +370,9 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { * * @param str 验证字符串 * @param strs 字符串组 - * * @return 包含返回true */ - public static boolean inStringIgnoreCase (String str, String... strs) { + public static boolean inStringIgnoreCase(String str, String... strs) { if (str != null && strs != null) { for (String s : strs) { if (str.equalsIgnoreCase(trim(s))) { @@ -407,10 +387,9 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { * 将下划线大写方式命名的字符串转换为驼峰式。如果转换前的下划线大写方式命名的字符串为空，则返回空字符串。 例如：HELLO_WORLD->HelloWorld * * @param name 转换前的下划线大写方式命名的字符串 - * * @return 转换后的驼峰式命名的字符串 */ - public static String convertToCamelCase (String name) { + public static String convertToCamelCase(String name) { StringBuilder result = new StringBuilder(); // 快速检查 if (name == null || name.isEmpty()) { @@ -438,7 +417,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { * 驼峰式命名法 * 例如：user_name->userName */ - public static String toCamelCase (String s) { + public static String toCamelCase(String s) { if (s == null) { return null; } @@ -448,7 +427,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { s = s.toLowerCase(); StringBuilder sb = new StringBuilder(s.length()); boolean upperCase = false; - for (int i = 0 ; i < s.length() ; i++) { + for (int i = 0; i < s.length(); i++) { char c = s.charAt(i); if (c == SEPARATOR) { @@ -468,10 +447,9 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { * * @param str 指定字符串 * @param strs 需要检查的字符串数组 - * * @return 是否匹配 */ - public static boolean matches (String str, List strs) { + public static boolean matches(String str, List strs) { if (isEmpty(str) || isEmpty(strs)) { return false; } @@ -491,16 +469,15 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { * * @param pattern 匹配规则 * @param url 需要匹配的url - * * @return */ - public static boolean isMatch (String pattern, String url) { + public static boolean isMatch(String pattern, String url) { AntPathMatcher matcher = new AntPathMatcher(); return matcher.match(pattern, url); } @SuppressWarnings("unchecked") - public static T cast (Object obj) { + public static T cast(Object obj) { return (T) obj; } @@ -509,10 +486,9 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { * * @param num 数字对象 * @param size 字符串指定长度 - * * @return 返回数字的字符串格式，该字符串为指定长度。 */ - public static final String padl (final Number num, final int size) { + public static final String padl(final Number num, final int size) { return padl(num.toString(), size, '0'); } @@ -522,15 +498,14 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { * @param s 原始字符串 * @param size 字符串指定长度 * @param c 用于补齐的字符 - * * @return 返回指定长度的字符串，由原字符串左补齐或截取得到。 */ - public static final String padl (final String s, final int size, final char c) { + public static final String padl(final String s, final int size, final char c) { final StringBuilder sb = new StringBuilder(size); if (s != null) { final int len = s.length(); if (s.length() <= size) { - for (int i = size - len ; i > 0 ; i--) { + for (int i = size - len; i > 0; i--) { sb.append(c); } sb.append(s); @@ -538,7 +513,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { return s.substring(len - size, len); } } else { - for (int i = size ; i > 0 ; i--) { + for (int i = size; i > 0; i--) { sb.append(c); } } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java index bdf2906..5be9582 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java @@ -16,7 +16,7 @@ public class Threads { /** * sleep等待,单位为毫秒 */ - public static void sleep (long milliseconds) { + public static void sleep(long milliseconds) { try { Thread.sleep(milliseconds); } catch (InterruptedException e) { @@ -31,7 +31,7 @@ public class Threads { * 如果仍然超時，則強制退出. * 另对在shutdown时线程本身被调用中断做了处理. */ - public static void shutdownAndAwaitTermination (ExecutorService pool) { + public static void shutdownAndAwaitTermination(ExecutorService pool) { if (pool != null && !pool.isShutdown()) { pool.shutdown(); try { @@ -51,7 +51,7 @@ public class Threads { /** * 打印线程异常信息 */ - public static void printException (Runnable r, Throwable t) { + public static void printException(Runnable r, Throwable t) { if (t == null && r instanceof Future) { try { Future future = (Future) r; diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/bean/BeanUtils.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/bean/BeanUtils.java index f59d433..43114b3 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/bean/BeanUtils.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/bean/BeanUtils.java @@ -33,7 +33,7 @@ public class BeanUtils extends org.springframework.beans.BeanUtils { * @param dest 目标对象 * @param src 源对象 */ - public static void copyBeanProp (Object dest, Object src) { + public static void copyBeanProp(Object dest, Object src) { try { copyProperties(src, dest); } catch (Exception e) { @@ -45,10 +45,9 @@ public class BeanUtils extends org.springframework.beans.BeanUtils { * 获取对象的setter方法。 * * @param obj 对象 - * * @return 对象的setter方法列表 */ - public static List getSetterMethods (Object obj) { + public static List getSetterMethods(Object obj) { // setter方法列表 List setterMethods = new ArrayList(); @@ -71,11 +70,10 @@ public class BeanUtils extends org.springframework.beans.BeanUtils { * 获取对象的getter方法。 * * @param obj 对象 - * * @return 对象的getter方法列表 */ - public static List getGetterMethods (Object obj) { + public static List getGetterMethods(Object obj) { // getter方法列表 List getterMethods = new ArrayList(); // 获取所有方法 @@ -97,11 +95,10 @@ public class BeanUtils extends org.springframework.beans.BeanUtils { * * @param m1 方法名1 * @param m2 方法名2 - * * @return 属性名一样返回true，否则返回false */ - public static boolean isMethodPropEquals (String m1, String m2) { + public static boolean isMethodPropEquals(String m1, String m2) { return m1.substring(BEAN_METHOD_PROP_INDEX).equals(m2.substring(BEAN_METHOD_PROP_INDEX)); } } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/bean/BeanValidators.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/bean/BeanValidators.java index b950148..a0483d7 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/bean/BeanValidators.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/bean/BeanValidators.java @@ -11,7 +11,7 @@ import java.util.Set; * @author ruoyi */ public class BeanValidators { - public static void validateWithException (Validator validator, Object object, Class... groups) + public static void validateWithException(Validator validator, Object object, Class... groups) throws ConstraintViolationException { Set> constraintViolations = validator.validate(object, groups); if (!constraintViolations.isEmpty()) { diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileTypeUtils.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileTypeUtils.java index 64e1406..806e836 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileTypeUtils.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileTypeUtils.java @@ -16,10 +16,9 @@ public class FileTypeUtils { * 例如: ruoyi.txt, 返回: txt * * @param file 文件名 - * * @return 后缀（不含".") */ - public static String getFileType (File file) { + public static String getFileType(File file) { if (null == file) { return StringUtils.EMPTY; } @@ -32,10 +31,9 @@ public class FileTypeUtils { * 例如: ruoyi.txt, 返回: txt * * @param fileName 文件名 - * * @return 后缀（不含".") */ - public static String getFileType (String fileName) { + public static String getFileType(String fileName) { int separatorIndex = fileName.lastIndexOf("."); if (separatorIndex < 0) { return ""; @@ -47,10 +45,9 @@ public class FileTypeUtils { * 获取文件类型 * * @param photoByte 文件字节码 - * * @return 后缀（不含".") */ - public static String getFileExtendName (byte[] photoByte) { + public static String getFileExtendName(byte[] photoByte) { String strFileExtendName = "JPG"; if ((photoByte[0] == 71) && (photoByte[1] == 73) && (photoByte[2] == 70) && (photoByte[3] == 56) && ((photoByte[4] == 55) || (photoByte[4] == 57)) && (photoByte[5] == 97)) { diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java index 34745e3..1b5d69e 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java @@ -37,11 +37,11 @@ public class FileUploadUtils { */ private static String defaultBaseDir = RuoYiConfig.getProfile(); - public static String getDefaultBaseDir () { + public static String getDefaultBaseDir() { return defaultBaseDir; } - public static void setDefaultBaseDir (String defaultBaseDir) { + public static void setDefaultBaseDir(String defaultBaseDir) { FileUploadUtils.defaultBaseDir = defaultBaseDir; } @@ -49,12 +49,10 @@ public class FileUploadUtils { * 以默认配置进行文件上传 * * @param file 上传的文件 - * * @return 文件名称 - * * @throws Exception */ - public static final String upload (MultipartFile file) throws IOException { + public static final String upload(MultipartFile file) throws IOException { try { return upload(getDefaultBaseDir(), file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION); } catch (Exception e) { @@ -67,12 +65,10 @@ public class FileUploadUtils { * * @param baseDir 相对应用的基目录 * @param file 上传的文件 - * * @return 文件名称 - * * @throws IOException */ - public static final String upload (String baseDir, MultipartFile file) throws IOException { + public static final String upload(String baseDir, MultipartFile file) throws IOException { try { return upload(baseDir, file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION); } catch (Exception e) { @@ -86,15 +82,13 @@ public class FileUploadUtils { * @param baseDir 相对应用的基目录 * @param file 上传的文件 * @param allowedExtension 上传文件类型 - * * @return 返回上传成功的文件名 - * * @throws FileSizeLimitExceededException 如果超出最大大小 * @throws FileNameLengthLimitExceededException 文件名太长 * @throws IOException 比如读写文件出错时 * @throws InvalidExtensionException 文件校验异常 */ - public static final String upload (String baseDir, MultipartFile file, String[] allowedExtension) + public static final String upload(String baseDir, MultipartFile file, String[] allowedExtension) throws FileSizeLimitExceededException, IOException, FileNameLengthLimitExceededException, InvalidExtensionException { int fileNamelength = Objects.requireNonNull(file.getOriginalFilename()).length(); @@ -114,12 +108,12 @@ public class FileUploadUtils { /** * 编码文件名 */ - public static final String extractFilename (MultipartFile file) { + public static final String extractFilename(MultipartFile file) { return StringUtils.format("{}/{}_{}.{}", DateUtils.datePath(), FilenameUtils.getBaseName(file.getOriginalFilename()), Seq.getId(Seq.uploadSeqType), getExtension(file)); } - public static final File getAbsoluteFile (String uploadDir, String fileName) throws IOException { + public static final File getAbsoluteFile(String uploadDir, String fileName) throws IOException { File desc = new File(uploadDir + File.separator + fileName); if (!desc.exists()) { @@ -130,7 +124,7 @@ public class FileUploadUtils { return desc; } - public static final String getPathFileName (String uploadDir, String fileName) throws IOException { + public static final String getPathFileName(String uploadDir, String fileName) throws IOException { int dirLastIndex = RuoYiConfig.getProfile().length() + 1; String currentDir = StringUtils.substring(uploadDir, dirLastIndex); return Constants.RESOURCE_PREFIX + "/" + currentDir + "/" + fileName; @@ -140,13 +134,11 @@ public class FileUploadUtils { * 文件大小校验 * * @param file 上传的文件 - * * @return - * * @throws FileSizeLimitExceededException 如果超出最大大小 * @throws InvalidExtensionException */ - public static final void assertAllowed (MultipartFile file, String[] allowedExtension) + public static final void assertAllowed(MultipartFile file, String[] allowedExtension) throws FileSizeLimitExceededException, InvalidExtensionException { long size = file.getSize(); if (size > DEFAULT_MAX_SIZE) { @@ -179,10 +171,9 @@ public class FileUploadUtils { * * @param extension * @param allowedExtension - * * @return */ - public static final boolean isAllowedExtension (String extension, String[] allowedExtension) { + public static final boolean isAllowedExtension(String extension, String[] allowedExtension) { for (String str : allowedExtension) { if (str.equalsIgnoreCase(extension)) { return true; @@ -195,10 +186,9 @@ public class FileUploadUtils { * 获取文件名的后缀 * * @param file 表单文件 - * * @return 后缀名 */ - public static final String getExtension (MultipartFile file) { + public static final String getExtension(MultipartFile file) { String extension = FilenameUtils.getExtension(file.getOriginalFilename()); if (StringUtils.isEmpty(extension)) { extension = MimeTypeUtils.getExtension(Objects.requireNonNull(file.getContentType())); diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java index 07c4c68..bea15b1 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java @@ -27,10 +27,9 @@ public class FileUtils { * * @param filePath 文件路径 * @param os 输出流 - * * @return */ - public static void writeBytes (String filePath, OutputStream os) throws IOException { + public static void writeBytes(String filePath, OutputStream os) throws IOException { FileInputStream fis = null; try { File file = new File(filePath); @@ -55,12 +54,10 @@ public class FileUtils { * 写数据到文件中 * * @param data 数据 - * * @return 目标文件 - * * @throws IOException IO异常 */ - public static String writeImportBytes (byte[] data) throws IOException { + public static String writeImportBytes(byte[] data) throws IOException { return writeBytes(data, RuoYiConfig.getImportPath()); } @@ -69,12 +66,10 @@ public class FileUtils { * * @param data 数据 * @param uploadDir 目标文件 - * * @return 目标文件 - * * @throws IOException IO异常 */ - public static String writeBytes (byte[] data, String uploadDir) throws IOException { + public static String writeBytes(byte[] data, String uploadDir) throws IOException { FileOutputStream fos = null; String pathName = ""; try { @@ -93,10 +88,9 @@ public class FileUtils { * 删除文件 * * @param filePath 文件 - * * @return */ - public static boolean deleteFile (String filePath) { + public static boolean deleteFile(String filePath) { boolean flag = false; File file = new File(filePath); // 路径为文件且不为空则进行删除 @@ -110,10 +104,9 @@ public class FileUtils { * 文件名称验证 * * @param filename 文件名称 - * * @return true 正常 false 非法 */ - public static boolean isValidFilename (String filename) { + public static boolean isValidFilename(String filename) { return filename.matches(FILENAME_PATTERN); } @@ -121,10 +114,9 @@ public class FileUtils { * 检查文件是否可下载 * * @param resource 需要下载的文件 - * * @return true 正常 false 非法 */ - public static boolean checkAllowDownload (String resource) { + public static boolean checkAllowDownload(String resource) { // 禁止目录上跳级别 if (StringUtils.contains(resource, "..")) { return false; @@ -144,10 +136,9 @@ public class FileUtils { * * @param request 请求对象 * @param fileName 文件名 - * * @return 编码后的文件名 */ - public static String setFileDownloadHeader (HttpServletRequest request, String fileName) throws UnsupportedEncodingException { + public static String setFileDownloadHeader(HttpServletRequest request, String fileName) throws UnsupportedEncodingException { final String agent = request.getHeader("USER-AGENT"); String filename = fileName; if (agent.contains("MSIE")) { @@ -173,7 +164,7 @@ public class FileUtils { * @param response 响应对象 * @param realFileName 真实文件名 */ - public static void setAttachmentResponseHeader (HttpServletResponse response, String realFileName) throws UnsupportedEncodingException { + public static void setAttachmentResponseHeader(HttpServletResponse response, String realFileName) throws UnsupportedEncodingException { String percentEncodedFileName = percentEncode(realFileName); StringBuilder contentDispositionValue = new StringBuilder(); @@ -193,10 +184,9 @@ public class FileUtils { * 百分号编码工具方法 * * @param s 需要百分号编码的字符串 - * * @return 百分号编码后的字符串 */ - public static String percentEncode (String s) throws UnsupportedEncodingException { + public static String percentEncode(String s) throws UnsupportedEncodingException { String encode = URLEncoder.encode(s, StandardCharsets.UTF_8.toString()); return encode.replaceAll("\\+", "%20"); } @@ -205,10 +195,9 @@ public class FileUtils { * 获取图像后缀 * * @param photoByte 图像数据 - * * @return 后缀名 */ - public static String getFileExtendName (byte[] photoByte) { + public static String getFileExtendName(byte[] photoByte) { String strFileExtendName = "jpg"; if ((photoByte[0] == 71) && (photoByte[1] == 73) && (photoByte[2] == 70) && (photoByte[3] == 56) && ((photoByte[4] == 55) || (photoByte[4] == 57)) && (photoByte[5] == 97)) { @@ -227,10 +216,9 @@ public class FileUtils { * 获取文件名称 /profile/upload/2022/04/16/ruoyi.png -- ruoyi.png * * @param fileName 路径名称 - * * @return 没有文件路径的名称 */ - public static String getName (String fileName) { + public static String getName(String fileName) { if (fileName == null) { return null; } @@ -244,10 +232,9 @@ public class FileUtils { * 获取不带后缀文件名称 /profile/upload/2022/04/16/ruoyi.png -- ruoyi * * @param fileName 路径名称 - * * @return 没有文件路径和后缀的名称 */ - public static String getNameNotSuffix (String fileName) { + public static String getNameNotSuffix(String fileName) { if (fileName == null) { return null; } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java index 33923fd..59ed39a 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java @@ -22,7 +22,7 @@ import java.util.Arrays; public class ImageUtils { private static final Logger log = LoggerFactory.getLogger(ImageUtils.class); - public static byte[] getImage (String imagePath) { + public static byte[] getImage(String imagePath) { InputStream is = getFile(imagePath); try { return IOUtils.toByteArray(is); @@ -34,7 +34,7 @@ public class ImageUtils { } } - public static InputStream getFile (String imagePath) { + public static InputStream getFile(String imagePath) { try { byte[] result = readFile(imagePath); result = Arrays.copyOf(result, result.length); @@ -49,10 +49,9 @@ public class ImageUtils { * 读取文件为字节数据 * * @param url 地址 - * * @return 字节数据 */ - public static byte[] readFile (String url) { + public static byte[] readFile(String url) { InputStream in = null; try { if (url.startsWith("http")) { diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java index 63c9ceb..335ef4b 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java @@ -37,7 +37,7 @@ public class MimeTypeUtils { // pdf "pdf"}; - public static String getExtension (String prefix) { + public static String getExtension(String prefix) { switch (prefix) { case IMAGE_PNG: return "png"; diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java index 073d206..d0dc36d 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java @@ -13,7 +13,7 @@ public class EscapeUtil { private static final char[][] TEXT = new char[64][]; static { - for (int i = 0 ; i < 64 ; i++) { + for (int i = 0; i < 64; i++) { TEXT[i] = new char[]{(char) i}; } @@ -29,10 +29,9 @@ public class EscapeUtil { * 转义文本中的HTML字符为安全的字符 * * @param text 被转义的文本 - * * @return 转义后的文本 */ - public static String escape (String text) { + public static String escape(String text) { return encode(text); } @@ -40,10 +39,9 @@ public class EscapeUtil { * 还原被转义的HTML特殊字符 * * @param content 包含转义符的HTML内容 - * * @return 转换后的字符串 */ - public static String unescape (String content) { + public static String unescape(String content) { return decode(content); } @@ -51,10 +49,9 @@ public class EscapeUtil { * 清除所有HTML标签，但是不删除标签内的内容 * * @param content 文本 - * * @return 清除标签后的文本 */ - public static String clean (String content) { + public static String clean(String content) { return new HTMLFilter().filter(content); } @@ -62,17 +59,16 @@ public class EscapeUtil { * Escape编码 * * @param text 被编码的文本 - * * @return 编码后的字符 */ - private static String encode (String text) { + private static String encode(String text) { if (StringUtils.isEmpty(text)) { return StringUtils.EMPTY; } final StringBuilder tmp = new StringBuilder(text.length() * 6); char c; - for (int i = 0 ; i < text.length() ; i++) { + for (int i = 0; i < text.length(); i++) { c = text.charAt(i); if (c < 256) { tmp.append("%"); @@ -96,10 +92,9 @@ public class EscapeUtil { * Escape解码 * * @param content 被转义的内容 - * * @return 解码后的字符串 */ - public static String decode (String content) { + public static String decode(String content) { if (StringUtils.isEmpty(content)) { return content; } @@ -132,7 +127,7 @@ public class EscapeUtil { return tmp.toString(); } - public static void main (String[] args) { + public static void main(String[] args) { String html = ""; String escape = EscapeUtil.escape(html); // String html = "ipt>alert(\"XSS\")ipt>"; diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java index 5fb44a9..eaeccfd 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java @@ -95,7 +95,7 @@ public final class HTMLFilter { /** * Default constructor. */ - public HTMLFilter () { + public HTMLFilter() { vAllowed = new HashMap<>(); final ArrayList a_atts = new ArrayList<>(); @@ -134,7 +134,7 @@ public final class HTMLFilter { * @param conf map containing configuration. keys match field names. */ @SuppressWarnings("unchecked") - public HTMLFilter (final Map conf) { + public HTMLFilter(final Map conf) { assert conf.containsKey("vAllowed") : "configuration requires vAllowed"; assert conf.containsKey("vSelfClosingTags") : "configuration requires vSelfClosingTags"; @@ -160,11 +160,11 @@ public final class HTMLFilter { // --------------------------------------------------------------- // my versions of some PHP library functions - public static String chr (final int decimal) { + public static String chr(final int decimal) { return String.valueOf((char) decimal); } - public static String htmlSpecialChars (final String s) { + public static String htmlSpecialChars(final String s) { String result = s; result = regexReplace(P_AMP, "&", result); result = regexReplace(P_QUOTE, """, result); @@ -173,14 +173,14 @@ public final class HTMLFilter { return result; } - private static String regexReplace (final Pattern regex_pattern, final String replacement, final String s) { + private static String regexReplace(final Pattern regex_pattern, final String replacement, final String s) { Matcher m = regex_pattern.matcher(s); return m.replaceAll(replacement); } // --------------------------------------------------------------- - private static boolean inArray (final String s, final String[] array) { + private static boolean inArray(final String s, final String[] array) { for (String item : array) { if (item != null && item.equals(s)) { return true; @@ -189,7 +189,7 @@ public final class HTMLFilter { return false; } - private void reset () { + private void reset() { vTagCounts.clear(); } @@ -197,10 +197,9 @@ public final class HTMLFilter { * given a user submitted input String, filter out any invalid or restricted html. * * @param input text (i.e. submitted by a user) than may contain html - * * @return "clean" version of input, with only valid, whitelisted html elements allowed */ - public String filter (final String input) { + public String filter(final String input) { reset(); String s = input; @@ -217,15 +216,15 @@ public final class HTMLFilter { return s; } - public boolean isAlwaysMakeTags () { + public boolean isAlwaysMakeTags() { return alwaysMakeTags; } - public boolean isStripComments () { + public boolean isStripComments() { return stripComment; } - private String escapeComments (final String s) { + private String escapeComments(final String s) { final Matcher m = P_COMMENTS.matcher(s); final StringBuffer buf = new StringBuffer(); if (m.find()) { @@ -237,7 +236,7 @@ public final class HTMLFilter { return buf.toString(); } - private String balanceHTML (String s) { + private String balanceHTML(String s) { if (alwaysMakeTags) { // // try and form html @@ -265,7 +264,7 @@ public final class HTMLFilter { return s; } - private String checkTags (String s) { + private String checkTags(String s) { Matcher m = P_TAGS.matcher(s); final StringBuffer buf = new StringBuffer(); @@ -280,7 +279,7 @@ public final class HTMLFilter { // (remember to reset before subsequent calls to filter method) final StringBuilder sBuilder = new StringBuilder(buf.toString()); for (String key : vTagCounts.keySet()) { - for (int ii = 0 ; ii < vTagCounts.get(key) ; ii++) { + for (int ii = 0; ii < vTagCounts.get(key); ii++) { sBuilder.append(""); } } @@ -289,7 +288,7 @@ public final class HTMLFilter { return s; } - private String processRemoveBlanks (final String s) { + private String processRemoveBlanks(final String s) { String result = s; for (String tag : vRemoveBlanks) { if (!P_REMOVE_PAIR_BLANKS.containsKey(tag)) { @@ -305,7 +304,7 @@ public final class HTMLFilter { return result; } - private String processTag (final String s) { + private String processTag(final String s) { // ending tags Matcher m = P_END_TAG.matcher(s); if (m.find()) { @@ -345,7 +344,7 @@ public final class HTMLFilter { } String paramName, paramValue; - for (int ii = 0 ; ii < paramNames.size() ; ii++) { + for (int ii = 0; ii < paramNames.size(); ii++) { paramName = paramNames.get(ii).toLowerCase(); paramValue = paramValues.get(ii); @@ -393,7 +392,7 @@ public final class HTMLFilter { return ""; } - private String processParamProtocol (String s) { + private String processParamProtocol(String s) { s = decodeEntities(s); final Matcher m = P_PROTOCOL.matcher(s); if (m.find()) { @@ -410,7 +409,7 @@ public final class HTMLFilter { return s; } - private String decodeEntities (String s) { + private String decodeEntities(String s) { StringBuffer buf = new StringBuffer(); Matcher m = P_ENTITY.matcher(s); @@ -446,7 +445,7 @@ public final class HTMLFilter { return s; } - private String validateEntities (final String s) { + private String validateEntities(final String s) { StringBuffer buf = new StringBuffer(); // validate entities throughout the string @@ -461,7 +460,7 @@ public final class HTMLFilter { return encodeQuotes(buf.toString()); } - private String encodeQuotes (final String s) { + private String encodeQuotes(final String s) { if (encodeQuotes) { StringBuffer buf = new StringBuffer(); Matcher m = P_VALID_QUOTES.matcher(s); @@ -479,20 +478,20 @@ public final class HTMLFilter { } } - private String checkEntity (final String preamble, final String term) { + private String checkEntity(final String preamble, final String term) { return ";".equals(term) && isValidEntity(preamble) ? '&' + preamble : "&" + preamble; } - private boolean isValidEntity (final String entity) { + private boolean isValidEntity(final String entity) { return inArray(entity, vAllowedEntities); } - private boolean allowed (final String name) { + private boolean allowed(final String name) { return (vAllowed.isEmpty() || vAllowed.containsKey(name)) && !inArray(name, vDisallowed); } - private boolean allowedAttribute (final String name, final String paramName) { + private boolean allowedAttribute(final String name, final String paramName) { return allowed(name) && (vAllowed.isEmpty() || vAllowed.get(name).contains(paramName)); } } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java index a823f5d..2252176 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java @@ -19,7 +19,7 @@ import java.nio.charset.StandardCharsets; public class HttpHelper { private static final Logger LOGGER = LoggerFactory.getLogger(HttpHelper.class); - public static String getBodyString (ServletRequest request) { + public static String getBodyString(ServletRequest request) { StringBuilder sb = new StringBuilder(); BufferedReader reader = null; try (InputStream inputStream = request.getInputStream()) { diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java index fb92fe1..7d0af13 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java @@ -26,10 +26,9 @@ public class HttpUtils { * 向指定 URL 发送GET方法的请求 * * @param url 发送请求的 URL - * * @return 所代表远程资源的响应结果 */ - public static String sendGet (String url) { + public static String sendGet(String url) { return sendGet(url, StringUtils.EMPTY); } @@ -38,10 +37,9 @@ public class HttpUtils { * * @param url 发送请求的 URL * @param param 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。 - * * @return 所代表远程资源的响应结果 */ - public static String sendGet (String url, String param) { + public static String sendGet(String url, String param) { return sendGet(url, param, Constants.UTF8); } @@ -51,10 +49,9 @@ public class HttpUtils { * @param url 发送请求的 URL * @param param 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。 * @param contentType 编码类型 - * * @return 所代表远程资源的响应结果 */ - public static String sendGet (String url, String param, String contentType) { + public static String sendGet(String url, String param, String contentType) { StringBuilder result = new StringBuilder(); BufferedReader in = null; try { @@ -97,10 +94,9 @@ public class HttpUtils { * * @param url 发送请求的 URL * @param param 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。 - * * @return 所代表远程资源的响应结果 */ - public static String sendPost (String url, String param) { + public static String sendPost(String url, String param) { PrintWriter out = null; BufferedReader in = null; StringBuilder result = new StringBuilder(); @@ -147,7 +143,7 @@ public class HttpUtils { return result.toString(); } - public static String sendSSLPost (String url, String param) { + public static String sendSSLPost(String url, String param) { StringBuilder result = new StringBuilder(); String urlNameString = url + "?" + param; try { @@ -192,22 +188,22 @@ public class HttpUtils { private static class TrustAnyTrustManager implements X509TrustManager { @Override - public void checkClientTrusted (X509Certificate[] chain, String authType) { + public void checkClientTrusted(X509Certificate[] chain, String authType) { } @Override - public void checkServerTrusted (X509Certificate[] chain, String authType) { + public void checkServerTrusted(X509Certificate[] chain, String authType) { } @Override - public X509Certificate[] getAcceptedIssuers () { + public X509Certificate[] getAcceptedIssuers() { return new X509Certificate[]{}; } } private static class TrustAnyHostnameVerifier implements HostnameVerifier { @Override - public boolean verify (String hostname, SSLSession session) { + public boolean verify(String hostname, SSLSession session) { return true; } } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java index 9166cfb..5d2fed1 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java @@ -21,7 +21,7 @@ public class AddressUtils { public static final String UNKNOWN = "XX XX"; private static final Logger log = LoggerFactory.getLogger(AddressUtils.class); - public static String getRealAddressByIP (String ip) { + public static String getRealAddressByIP(String ip) { // 内网不查询 if (IpUtils.internalIp(ip)) { return "内网IP"; diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java index ffe574d..03527c9 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java @@ -25,7 +25,7 @@ public class IpUtils { * * @return IP地址 */ - public static String getIpAddr () { + public static String getIpAddr() { return getIpAddr(ServletUtils.getRequest()); } @@ -33,10 +33,9 @@ public class IpUtils { * 获取客户端IP * * @param request 请求对象 - * * @return IP地址 */ - public static String getIpAddr (HttpServletRequest request) { + public static String getIpAddr(HttpServletRequest request) { if (request == null) { return "unknown"; } @@ -65,10 +64,9 @@ public class IpUtils { * 检查是否为内部IP地址 * * @param ip IP地址 - * * @return 结果 */ - public static boolean internalIp (String ip) { + public static boolean internalIp(String ip) { byte[] addr = textToNumericFormatV4(ip); return internalIp(addr) || "127.0.0.1".equals(ip); } @@ -77,10 +75,9 @@ public class IpUtils { * 检查是否为内部IP地址 * * @param addr byte地址 - * * @return 结果 */ - private static boolean internalIp (byte[] addr) { + private static boolean internalIp(byte[] addr) { if (StringUtils.isNull(addr) || addr.length < 2) { return true; } @@ -116,10 +113,9 @@ public class IpUtils { * 将IPv4地址转换成字节 * * @param text IPv4地址 - * * @return byte 字节 */ - public static byte[] textToNumericFormatV4 (String text) { + public static byte[] textToNumericFormatV4(String text) { if (text.length() == 0) { return null; } @@ -155,7 +151,7 @@ public class IpUtils { bytes[3] = (byte) (int) (l & 0xFF); break; case 3: - for (i = 0; i < 2 ; ++i) { + for (i = 0; i < 2; ++i) { l = Integer.parseInt(elements[i]); if ((l < 0L) || (l > 255L)) { return null; @@ -170,7 +166,7 @@ public class IpUtils { bytes[3] = (byte) (int) (l & 0xFF); break; case 4: - for (i = 0; i < 4 ; ++i) { + for (i = 0; i < 4; ++i) { l = Integer.parseInt(elements[i]); if ((l < 0L) || (l > 255L)) { return null; @@ -192,7 +188,7 @@ public class IpUtils { * * @return 本地IP地址 */ - public static String getHostIp () { + public static String getHostIp() { try { return InetAddress.getLocalHost().getHostAddress(); } catch (UnknownHostException e) { @@ -205,7 +201,7 @@ public class IpUtils { * * @return 本地主机名 */ - public static String getHostName () { + public static String getHostName() { try { return InetAddress.getLocalHost().getHostName(); } catch (UnknownHostException e) { @@ -217,10 +213,9 @@ public class IpUtils { * 从多级反向代理中获得第一个非unknown IP地址 * * @param ip 获得的IP地址 - * * @return 第一个非unknown IP地址 */ - public static String getMultistageReverseProxyIp (String ip) { + public static String getMultistageReverseProxyIp(String ip) { // 多级反向代理检测 if (ip != null && ip.indexOf(",") > 0) { final String[] ips = ip.trim().split(","); @@ -238,35 +233,34 @@ public class IpUtils { * 检测给定字符串是否为未知，多用于检测HTTP请求相关 * * @param checkString 被检测的字符串 - * * @return 是否未知 */ - public static boolean isUnknown (String checkString) { + public static boolean isUnknown(String checkString) { return StringUtils.isBlank(checkString) || "unknown".equalsIgnoreCase(checkString); } /** * 是否为IP */ - public static boolean isIP (String ip) { + public static boolean isIP(String ip) { return StringUtils.isNotBlank(ip) && ip.matches(REGX_IP); } /** * 是否为IP，或 *为间隔的通配符地址 */ - public static boolean isIpWildCard (String ip) { + public static boolean isIpWildCard(String ip) { return StringUtils.isNotBlank(ip) && ip.matches(REGX_IP_WILDCARD); } /** * 检测参数是否在ip通配符里 */ - public static boolean ipIsInWildCardNoCheck (String ipWildCard, String ip) { + public static boolean ipIsInWildCardNoCheck(String ipWildCard, String ip) { String[] s1 = ipWildCard.split("\\."); String[] s2 = ip.split("\\."); boolean isMatchedSeg = true; - for (int i = 0 ; i < s1.length && !s1[i].equals("*") ; i++) { + for (int i = 0; i < s1.length && !s1[i].equals("*"); i++) { if (!s1[i].equals(s2[i])) { isMatchedSeg = false; break; @@ -278,20 +272,20 @@ public class IpUtils { /** * 是否为特定格式如:“10.10.10.1-10.10.10.99”的ip段字符串 */ - public static boolean isIPSegment (String ipSeg) { + public static boolean isIPSegment(String ipSeg) { return StringUtils.isNotBlank(ipSeg) && ipSeg.matches(REGX_IP_SEG); } /** * 判断ip是否在指定网段中 */ - public static boolean ipIsInNetNoCheck (String iparea, String ip) { + public static boolean ipIsInNetNoCheck(String iparea, String ip) { int idx = iparea.indexOf('-'); String[] sips = iparea.substring(0, idx).split("\\."); String[] sipe = iparea.substring(idx + 1).split("\\."); String[] sipt = ip.split("\\."); long ips = 0L, ipe = 0L, ipt = 0L; - for (int i = 0 ; i < 4 ; ++i) { + for (int i = 0; i < 4; ++i) { ips = ips << 8 | Integer.parseInt(sips[i]); ipe = ipe << 8 | Integer.parseInt(sipe[i]); ipt = ipt << 8 | Integer.parseInt(sipt[i]); @@ -309,10 +303,9 @@ public class IpUtils { * * @param filter 过滤IP列表,支持后缀'*'通配,支持网段如:`10.10.10.1-10.10.10.99` * @param ip 校验IP地址 - * * @return boolean 结果 */ - public static boolean isMatchedIp (String filter, String ip) { + public static boolean isMatchedIp(String filter, String ip) { if (StringUtils.isEmpty(filter) || StringUtils.isEmpty(ip)) { return false; } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelHandlerAdapter.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelHandlerAdapter.java index 5a0bcd4..2d1fd3b 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelHandlerAdapter.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelHandlerAdapter.java @@ -16,8 +16,7 @@ public interface ExcelHandlerAdapter { * @param args excel注解args参数组 * @param cell 单元格对象 * @param wb 工作簿对象 - * * @return 处理后的值 */ - Object format (Object value, String[] args, Cell cell, Workbook wb); + Object format(Object value, String[] args, Cell cell, Workbook wb); } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java index 7ffdb17..504ddb7 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java @@ -31,7 +31,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import javax.servlet.http.HttpServletResponse; -import java.io.*; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.lang.reflect.ParameterizedType; @@ -134,14 +137,14 @@ public class ExcelUtil { */ private Map statistics = new HashMap(); - public ExcelUtil (Class clazz) { + public ExcelUtil(Class clazz) { this.clazz = clazz; } /** * 获取画布 */ - public static Drawing getDrawingPatriarch (Sheet sheet) { + public static Drawing getDrawingPatriarch(Sheet sheet) { if (sheet.getDrawingPatriarch() == null) { sheet.createDrawingPatriarch(); } @@ -154,10 +157,9 @@ public class ExcelUtil { * @param propertyValue 参数值 * @param converterExp 翻译注解 * @param separator 分隔符 - * * @return 解析后值 */ - public static String convertByExp (String propertyValue, String converterExp, String separator) { + public static String convertByExp(String propertyValue, String converterExp, String separator) { StringBuilder propertyString = new StringBuilder(); String[] convertSource = converterExp.split(","); for (String item : convertSource) { @@ -184,10 +186,9 @@ public class ExcelUtil { * @param propertyValue 参数值 * @param converterExp 翻译注解 * @param separator 分隔符 - * * @return 解析后值 */ - public static String reverseByExp (String propertyValue, String converterExp, String separator) { + public static String reverseByExp(String propertyValue, String converterExp, String separator) { StringBuilder propertyString = new StringBuilder(); String[] convertSource = converterExp.split(","); for (String item : convertSource) { @@ -214,10 +215,9 @@ public class ExcelUtil { * @param dictValue 字典值 * @param dictType 字典类型 * @param separator 分隔符 - * * @return 字典标签 */ - public static String convertDictByExp (String dictValue, String dictType, String separator) { + public static String convertDictByExp(String dictValue, String dictType, String separator) { return DictUtils.getDictLabel(dictType, dictValue, separator); } @@ -227,10 +227,9 @@ public class ExcelUtil { * @param dictLabel 字典标签 * @param dictType 字典类型 * @param separator 分隔符 - * * @return 字典值 */ - public static String reverseDictByExp (String dictLabel, String dictType, String separator) { + public static String reverseDictByExp(String dictLabel, String dictType, String separator) { return DictUtils.getDictValue(dictType, dictLabel, separator); } @@ -239,10 +238,9 @@ public class ExcelUtil { * * @param sheet 当前sheet对象 * @param workbook 工作簿对象 - * * @return Map key:图片单元格索引（1_1）String，value:图片流PictureData */ - public static Map getSheetPictures03 (HSSFSheet sheet, HSSFWorkbook workbook) { + public static Map getSheetPictures03(HSSFSheet sheet, HSSFWorkbook workbook) { Map sheetIndexPicMap = new HashMap(); List pictures = workbook.getAllPictures(); if (!pictures.isEmpty()) { @@ -267,10 +265,9 @@ public class ExcelUtil { * * @param sheet 当前sheet对象 * @param workbook 工作簿对象 - * * @return Map key:图片单元格索引（1_1）String，value:图片流PictureData */ - public static Map getSheetPictures07 (XSSFSheet sheet, XSSFWorkbook workbook) { + public static Map getSheetPictures07(XSSFSheet sheet, XSSFWorkbook workbook) { Map sheetIndexPicMap = new HashMap(); for (POIXMLDocumentPart dr : sheet.getRelations()) { if (dr instanceof XSSFDrawing) { @@ -294,14 +291,13 @@ public class ExcelUtil { * 隐藏Excel中列属性 * * @param fields 列属性名 示例[单个"name"/多个"id","name"] - * * @throws Exception */ - public void hideColumn (String... fields) { + public void hideColumn(String... fields) { this.excludeFields = fields; } - public void init (List list, String sheetName, String title, Type type) { + public void init(List list, String sheetName, String title, Type type) { if (list == null) { list = new ArrayList(); } @@ -318,7 +314,7 @@ public class ExcelUtil { /** * 创建excel第一行标题 */ - public void createTitle () { + public void createTitle() { if (StringUtils.isNotEmpty(title)) { subMergedFirstRowNum++; subMergedLastRowNum++; @@ -338,7 +334,7 @@ public class ExcelUtil { /** * 创建对象的子列表名称 */ - public void createSubHead () { + public void createSubHead() { if (isSubList()) { subMergedFirstRowNum++; subMergedLastRowNum++; @@ -364,10 +360,9 @@ public class ExcelUtil { * 对excel表单默认第一个索引名转换成list * * @param is 输入流 - * * @return 转换后集合 */ - public List importExcel (InputStream is) { + public List importExcel(InputStream is) { List list = null; try { list = importExcel(is, 0); @@ -385,10 +380,9 @@ public class ExcelUtil { * * @param is 输入流 * @param titleNum 标题占用行数 - * * @return 转换后集合 */ - public List importExcel (InputStream is, int titleNum) throws Exception { + public List importExcel(InputStream is, int titleNum) throws Exception { return importExcel(StringUtils.EMPTY, is, titleNum); } @@ -398,10 +392,9 @@ public class ExcelUtil { * @param sheetName 表格索引名 * @param titleNum 标题占用行数 * @param is 输入流 - * * @return 转换后集合 */ - public List importExcel (String sheetName, InputStream is, int titleNum) throws Exception { + public List importExcel(String sheetName, InputStream is, int titleNum) throws Exception { this.type = Type.IMPORT; this.wb = WorkbookFactory.create(is); List list = new ArrayList(); @@ -424,7 +417,7 @@ public class ExcelUtil { Map cellMap = new HashMap(); // 获取表头 Row heard = sheet.getRow(titleNum); - for (int i = 0 ; i < heard.getPhysicalNumberOfCells() ; i++) { + for (int i = 0; i < heard.getPhysicalNumberOfCells(); i++) { Cell cell = heard.getCell(i); if (StringUtils.isNotNull(cell)) { String value = this.getCellValue(heard, i).toString(); @@ -443,7 +436,7 @@ public class ExcelUtil { fieldsMap.put(column, objects); } } - for (int i = titleNum + 1 ; i <= rows ; i++) { + for (int i = titleNum + 1; i <= rows; i++) { // 从第2行开始取数据,默认第一行是表头. Row row = sheet.getRow(i); // 判断当前行是否是空行 @@ -526,10 +519,9 @@ public class ExcelUtil { * * @param list 导出数据集合 * @param sheetName 工作表的名称 - * * @return 结果 */ - public Result exportExcel (List list, String sheetName) { + public Result exportExcel(List list, String sheetName) { return exportExcel(list, sheetName, StringUtils.EMPTY); } @@ -539,10 +531,9 @@ public class ExcelUtil { * @param list 导出数据集合 * @param sheetName 工作表的名称 * @param title 标题 - * * @return 结果 */ - public Result exportExcel (List list, String sheetName, String title) { + public Result exportExcel(List list, String sheetName, String title) { this.init(list, sheetName, title, Type.EXPORT); return exportExcel(); } @@ -553,10 +544,9 @@ public class ExcelUtil { * @param response 返回数据 * @param list 导出数据集合 * @param sheetName 工作表的名称 - * * @return 结果 */ - public void exportExcel (HttpServletResponse response, List list, String sheetName) { + public void exportExcel(HttpServletResponse response, List list, String sheetName) { exportExcel(response, list, sheetName, StringUtils.EMPTY); } @@ -567,10 +557,9 @@ public class ExcelUtil { * @param list 导出数据集合 * @param sheetName 工作表的名称 * @param title 标题 - * * @return 结果 */ - public void exportExcel (HttpServletResponse response, List list, String sheetName, String title) { + public void exportExcel(HttpServletResponse response, List list, String sheetName, String title) { response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); response.setCharacterEncoding("utf-8"); this.init(list, sheetName, title, Type.EXPORT); @@ -581,10 +570,9 @@ public class ExcelUtil { * 对list数据源将其里面的数据导入到excel表单 * * @param sheetName 工作表的名称 - * * @return 结果 */ - public Result importTemplateExcel (String sheetName) { + public Result importTemplateExcel(String sheetName) { return importTemplateExcel(sheetName, StringUtils.EMPTY); } @@ -593,10 +581,9 @@ public class ExcelUtil { * * @param sheetName 工作表的名称 * @param title 标题 - * * @return 结果 */ - public Result importTemplateExcel (String sheetName, String title) { + public Result importTemplateExcel(String sheetName, String title) { this.init(null, sheetName, title, Type.IMPORT); return exportExcel(); } @@ -605,10 +592,9 @@ public class ExcelUtil { * 对list数据源将其里面的数据导入到excel表单 * * @param sheetName 工作表的名称 - * * @return 结果 */ - public void importTemplateExcel (HttpServletResponse response, String sheetName) { + public void importTemplateExcel(HttpServletResponse response, String sheetName) { importTemplateExcel(response, sheetName, StringUtils.EMPTY); } @@ -617,10 +603,9 @@ public class ExcelUtil { * * @param sheetName 工作表的名称 * @param title 标题 - * * @return 结果 */ - public void importTemplateExcel (HttpServletResponse response, String sheetName, String title) { + public void importTemplateExcel(HttpServletResponse response, String sheetName, String title) { response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); response.setCharacterEncoding("utf-8"); this.init(null, sheetName, title, Type.IMPORT); @@ -632,7 +617,7 @@ public class ExcelUtil { * * @return 结果 */ - public void exportExcel (HttpServletResponse response) { + public void exportExcel(HttpServletResponse response) { try { writeSheet(); wb.write(response.getOutputStream()); @@ -648,7 +633,7 @@ public class ExcelUtil { * * @return 结果 */ - public Result exportExcel () { + public Result exportExcel() { OutputStream out = null; try { writeSheet(); @@ -668,10 +653,10 @@ public class ExcelUtil { /** * 创建写入数据到Sheet */ - public void writeSheet () { + public void writeSheet() { // 取出一共有多少个sheet. int sheetNo = Math.max(1, (int) Math.ceil(list.size() * 1.0 / sheetSize)); - for (int index = 0 ; index < sheetNo ; index++) { + for (int index = 0; index < sheetNo; index++) { createSheet(sheetNo, index); // 产生一行 @@ -704,11 +689,11 @@ public class ExcelUtil { * @param row 单元格行 */ @SuppressWarnings("unchecked") - public void fillExcelData (int index, Row row) { + public void fillExcelData(int index, Row row) { int startNo = index * sheetSize; int endNo = Math.min(startNo + sheetSize, list.size()); int rowNo = (1 + rownum) - startNo; - for (int i = startNo ; i < endNo ; i++) { + for (int i = startNo; i < endNo; i++) { rowNo = isSubList() ? (i > 1 ? rowNo + 1 : rowNo + i) : i + 1 + rownum - startNo; row = sheet.createRow(rowNo); // 得到导出对象. @@ -758,10 +743,9 @@ public class ExcelUtil { * 创建表格样式 * * @param wb 工作薄对象 - * * @return 样式列表 */ - private Map createStyles (Workbook wb) { + private Map createStyles(Workbook wb) { // 写入各条记录,每条记录对应excel表中的一行 Map styles = new HashMap(); CellStyle style = wb.createCellStyle(); @@ -811,10 +795,9 @@ public class ExcelUtil { * 根据Excel注解创建表格头样式 * * @param wb 工作薄对象 - * * @return 自定义样式列表 */ - private Map annotationHeaderStyles (Workbook wb, Map styles) { + private Map annotationHeaderStyles(Workbook wb, Map styles) { Map headerStyles = new HashMap(); for (Object[] os : fields) { Excel excel = (Excel) os[1]; @@ -842,10 +825,9 @@ public class ExcelUtil { * 根据Excel注解创建表格列样式 * * @param wb 工作薄对象 - * * @return 自定义样式列表 */ - private Map annotationDataStyles (Workbook wb) { + private Map annotationDataStyles(Workbook wb) { Map styles = new HashMap(); for (Object[] os : fields) { Excel excel = (Excel) os[1]; @@ -878,7 +860,7 @@ public class ExcelUtil { /** * 创建单元格 */ - public Cell createHeadCell (Excel attr, Row row, int column) { + public Cell createHeadCell(Excel attr, Row row, int column) { // 创建列 Cell cell = row.createCell(column); // 写入列信息 @@ -902,7 +884,7 @@ public class ExcelUtil { * @param attr 注解相关 * @param cell 单元格信息 */ - public void setCellVo (Object value, Excel attr, Cell cell) { + public void setCellVo(Object value, Excel attr, Cell cell) { if (ColumnType.STRING == attr.cellType()) { String cellValue = Convert.toStr(value); // 对于任何以表达式触发字符 =-+@开头的单元格，直接使用tab字符作为前缀，防止CSV注入。 @@ -931,7 +913,7 @@ public class ExcelUtil { /** * 获取图片类型,设置图片插入类型 */ - public int getImageType (byte[] value) { + public int getImageType(byte[] value) { String type = FileTypeUtils.getFileExtendName(value); if ("JPG".equalsIgnoreCase(type)) { return Workbook.PICTURE_TYPE_JPEG; @@ -944,7 +926,7 @@ public class ExcelUtil { /** * 创建表格样式 */ - public void setDataValidation (Excel attr, Row row, int column) { + public void setDataValidation(Excel attr, Row row, int column) { if (attr.name().indexOf("注：") >= 0) { sheet.setColumnWidth(column, 6000); } else { @@ -965,7 +947,7 @@ public class ExcelUtil { /** * 添加单元格 */ - public Cell addCell (Excel attr, Row row, T vo, Field field, int column) { + public Cell addCell(Excel attr, Row row, T vo, Field field, int column) { Cell cell = null; try { // 设置行高 @@ -1023,8 +1005,8 @@ public class ExcelUtil { * @param firstCol 开始列 * @param endCol 结束列 */ - public void setPromptOrValidation (Sheet sheet, String[] textlist, String promptContent, int firstRow, int endRow, - int firstCol, int endCol) { + public void setPromptOrValidation(Sheet sheet, String[] textlist, String promptContent, int firstRow, int endRow, + int firstCol, int endCol) { DataValidationHelper helper = sheet.getDataValidationHelper(); DataValidationConstraint constraint = textlist.length > 0 ? helper.createExplicitListConstraint(textlist) : helper.createCustomConstraint("DD1"); CellRangeAddressList regions = new CellRangeAddressList(firstRow, endRow, firstCol, endCol); @@ -1055,10 +1037,10 @@ public class ExcelUtil { * @param firstCol 开始列 * @param endCol 结束列 */ - public void setXSSFValidationWithHidden (Sheet sheet, String[] textlist, String promptContent, int firstRow, int endRow, int firstCol, int endCol) { + public void setXSSFValidationWithHidden(Sheet sheet, String[] textlist, String promptContent, int firstRow, int endRow, int firstCol, int endCol) { String hideSheetName = "combo_" + firstCol + "_" + endCol; Sheet hideSheet = wb.createSheet(hideSheetName); // 用于存储 下拉菜单数据 - for (int i = 0 ; i < textlist.length ; i++) { + for (int i = 0; i < textlist.length; i++) { hideSheet.createRow(i).createCell(0).setCellValue(textlist[i]); } // 创建名称，可被其他单元格引用 @@ -1095,10 +1077,9 @@ public class ExcelUtil { * * @param value 数据值 * @param excel 数据注解 - * * @return */ - public String dataFormatHandlerAdapter (Object value, Excel excel, Cell cell) { + public String dataFormatHandlerAdapter(Object value, Excel excel, Cell cell) { try { Object instance = excel.handler().newInstance(); Method formatMethod = excel.handler().getMethod("format", new Class[]{Object.class, String[].class, Cell.class, Workbook.class}); @@ -1112,7 +1093,7 @@ public class ExcelUtil { /** * 合计统计信息 */ - private void addStatisticsData (Integer index, String text, Excel entity) { + private void addStatisticsData(Integer index, String text, Excel entity) { if (entity != null && entity.isStatistics()) { Double temp = 0D; if (!statistics.containsKey(index)) { @@ -1129,7 +1110,7 @@ public class ExcelUtil { /** * 创建统计行 */ - public void addStatisticsRow () { + public void addStatisticsRow() { if (statistics.size() > 0) { Row row = sheet.createRow(sheet.getLastRowNum() + 1); Set keys = statistics.keySet(); @@ -1149,7 +1130,7 @@ public class ExcelUtil { /** * 编码文件名 */ - public String encodingFilename (String filename) { + public String encodingFilename(String filename) { filename = UUID.randomUUID() + "_" + filename + ".xlsx"; return filename; } @@ -1159,7 +1140,7 @@ public class ExcelUtil { * * @param filename 文件名称 */ - public String getAbsoluteFile (String filename) { + public String getAbsoluteFile(String filename) { String downloadPath = RuoYiConfig.getDownloadPath() + filename; File desc = new File(downloadPath); if (!desc.getParentFile().exists()) { @@ -1174,12 +1155,10 @@ public class ExcelUtil { * @param vo 实体对象 * @param field 字段 * @param excel 注解 - * * @return 最终的属性值 - * * @throws Exception */ - private Object getTargetValue (T vo, Field field, Excel excel) throws Exception { + private Object getTargetValue(T vo, Field field, Excel excel) throws Exception { Object o = field.get(vo); if (StringUtils.isNotEmpty(excel.targetAttr())) { String target = excel.targetAttr(); @@ -1200,12 +1179,10 @@ public class ExcelUtil { * * @param o * @param name - * * @return value - * * @throws Exception */ - private Object getValue (Object o, String name) throws Exception { + private Object getValue(Object o, String name) throws Exception { if (StringUtils.isNotNull(o) && StringUtils.isNotEmpty(name)) { Class clazz = o.getClass(); Field field = clazz.getDeclaredField(name); @@ -1218,7 +1195,7 @@ public class ExcelUtil { /** * 得到所有定义字段 */ - private void createExcelField () { + private void createExcelField() { this.fields = getFields(); this.fields = this.fields.stream().sorted(Comparator.comparing(objects -> ((Excel) objects[1]).sort())).collect(Collectors.toList()); this.maxHeight = getRowHeight(); @@ -1227,7 +1204,7 @@ public class ExcelUtil { /** * 获取字段注解信息 */ - public List getFields () { + public List getFields() { List fields = new ArrayList(); List tempFields = new ArrayList<>(); tempFields.addAll(Arrays.asList(clazz.getSuperclass().getDeclaredFields())); @@ -1269,7 +1246,7 @@ public class ExcelUtil { /** * 根据注解获取最大行高 */ - public short getRowHeight () { + public short getRowHeight() { double maxHeight = 0; for (Object[] os : this.fields) { Excel excel = (Excel) os[1]; @@ -1281,7 +1258,7 @@ public class ExcelUtil { /** * 创建一个工作簿 */ - public void createWorkbook () { + public void createWorkbook() { this.wb = new SXSSFWorkbook(500); this.sheet = wb.createSheet(); wb.setSheetName(0, sheetName); @@ -1294,7 +1271,7 @@ public class ExcelUtil { * @param sheetNo sheet数量 * @param index 序号 */ - public void createSheet (int sheetNo, int index) { + public void createSheet(int sheetNo, int index) { // 设置工作表的名称. if (sheetNo > 1 && index > 0) { this.sheet = wb.createSheet(); @@ -1308,10 +1285,9 @@ public class ExcelUtil { * * @param row 获取的行 * @param column 获取单元格列号 - * * @return 单元格值 */ - public Object getCellValue (Row row, int column) { + public Object getCellValue(Row row, int column) { if (row == null) { return row; } @@ -1349,14 +1325,13 @@ public class ExcelUtil { * 判断是否是空行 * * @param row 判断的行 - * * @return */ - private boolean isRowEmpty (Row row) { + private boolean isRowEmpty(Row row) { if (row == null) { return true; } - for (int i = row.getFirstCellNum() ; i < row.getLastCellNum() ; i++) { + for (int i = row.getFirstCellNum(); i < row.getLastCellNum(); i++) { Cell cell = row.getCell(i); if (cell != null && cell.getCellType() != CellType.BLANK) { return false; @@ -1370,10 +1345,9 @@ public class ExcelUtil { * * @param dateFormat 日期格式 * @param val 被格式化的日期对象 - * * @return 格式化后的日期字符 */ - public String parseDateToStr (String dateFormat, Object val) { + public String parseDateToStr(String dateFormat, Object val) { if (val == null) { return ""; } @@ -1393,21 +1367,21 @@ public class ExcelUtil { /** * 是否有对象的子列表 */ - public boolean isSubList () { + public boolean isSubList() { return StringUtils.isNotNull(subFields) && subFields.size() > 0; } /** * 是否有对象的子列表，集合不为空 */ - public boolean isSubListValue (T vo) { + public boolean isSubListValue(T vo) { return StringUtils.isNotNull(subFields) && subFields.size() > 0 && StringUtils.isNotNull(getListCellValue(vo)) && getListCellValue(vo).size() > 0; } /** * 获取集合的值 */ - public Collection getListCellValue (Object obj) { + public Collection getListCellValue(Object obj) { Object value; try { value = subMethod.invoke(obj, new Object[]{}); @@ -1422,10 +1396,9 @@ public class ExcelUtil { * * @param name 名称 * @param pojoClass 类对象 - * * @return 子列表方法 */ - public Method getSubMethod (String name, Class pojoClass) { + public Method getSubMethod(String name, Class pojoClass) { StringBuffer getMethodName = new StringBuffer("get"); getMethodName.append(name.substring(0, 1).toUpperCase()); getMethodName.append(name.substring(1)); diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java index 665b818..03ea7c3 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java @@ -31,7 +31,7 @@ public class ReflectUtils { * 支持多级，如：对象名.对象名.方法 */ @SuppressWarnings("unchecked") - public static E invokeGetter (Object obj, String propertyName) { + public static E invokeGetter(Object obj, String propertyName) { Object object = obj; for (String name : StringUtils.split(propertyName, ".")) { String getterMethodName = GETTER_PREFIX + StringUtils.capitalize(name); @@ -44,10 +44,10 @@ public class ReflectUtils { * 调用Setter方法, 仅匹配方法名。 * 支持多级，如：对象名.对象名.方法 */ - public static void invokeSetter (Object obj, String propertyName, E value) { + public static void invokeSetter(Object obj, String propertyName, E value) { Object object = obj; String[] names = StringUtils.split(propertyName, "."); - for (int i = 0 ; i < names.length ; i++) { + for (int i = 0; i < names.length; i++) { if (i < names.length - 1) { String getterMethodName = GETTER_PREFIX + StringUtils.capitalize(names[i]); object = invokeMethod(object, getterMethodName, new Class[]{}, new Object[]{}); @@ -62,7 +62,7 @@ public class ReflectUtils { * 直接读取对象属性值, 无视private/protected修饰符, 不经过getter函数. */ @SuppressWarnings("unchecked") - public static E getFieldValue (final Object obj, final String fieldName) { + public static E getFieldValue(final Object obj, final String fieldName) { Field field = getAccessibleField(obj, fieldName); if (field == null) { logger.debug("在 [" + obj.getClass() + "] 中，没有找到 [" + fieldName + "] 字段 "); @@ -80,7 +80,7 @@ public class ReflectUtils { /** * 直接设置对象属性值, 无视private/protected修饰符, 不经过setter函数. */ - public static void setFieldValue (final Object obj, final String fieldName, final E value) { + public static void setFieldValue(final Object obj, final String fieldName, final E value) { Field field = getAccessibleField(obj, fieldName); if (field == null) { // throw new IllegalArgumentException("在 [" + obj.getClass() + "] 中，没有找到 [" + fieldName + "] 字段 "); @@ -100,8 +100,8 @@ public class ReflectUtils { * 同时匹配方法名+参数类型， */ @SuppressWarnings("unchecked") - public static E invokeMethod (final Object obj, final String methodName, final Class[] parameterTypes, - final Object[] args) { + public static E invokeMethod(final Object obj, final String methodName, final Class[] parameterTypes, + final Object[] args) { if (obj == null || methodName == null) { return null; } @@ -124,7 +124,7 @@ public class ReflectUtils { * 只匹配函数名，如果有多个同名函数调用第一个。 */ @SuppressWarnings("unchecked") - public static E invokeMethodByName (final Object obj, final String methodName, final Object[] args) { + public static E invokeMethodByName(final Object obj, final String methodName, final Object[] args) { Method method = getAccessibleMethodByName(obj, methodName, args.length); if (method == null) { // 如果为空不报错，直接返回空。 @@ -134,7 +134,7 @@ public class ReflectUtils { try { // 类型转换（将参数数据类型转换为目标方法参数类型） Class[] cs = method.getParameterTypes(); - for (int i = 0 ; i < cs.length ; i++) { + for (int i = 0; i < cs.length; i++) { if (args[i] != null && !args[i].getClass().equals(cs[i])) { if (cs[i] == String.class) { args[i] = Convert.toStr(args[i]); @@ -171,13 +171,13 @@ public class ReflectUtils { * 循环向上转型, 获取对象的DeclaredField, 并强制设置为可访问. * 如向上转型到Object仍无法找到, 返回null. */ - public static Field getAccessibleField (final Object obj, final String fieldName) { + public static Field getAccessibleField(final Object obj, final String fieldName) { // 为空不报错。直接返回 null if (obj == null) { return null; } Validate.notBlank(fieldName, "fieldName can't be blank"); - for (Class superClass = obj.getClass() ; superClass != Object.class ; superClass = superClass.getSuperclass()) { + for (Class superClass = obj.getClass(); superClass != Object.class; superClass = superClass.getSuperclass()) { try { Field field = superClass.getDeclaredField(fieldName); makeAccessible(field); @@ -195,14 +195,14 @@ public class ReflectUtils { * 匹配函数名+参数类型。 * 用于方法需要被多次调用的情况. 先使用本函数先取得Method,然后调用Method.invoke(Object obj, Object... args) */ - public static Method getAccessibleMethod (final Object obj, final String methodName, - final Class... parameterTypes) { + public static Method getAccessibleMethod(final Object obj, final String methodName, + final Class... parameterTypes) { // 为空不报错。直接返回 null if (obj == null) { return null; } Validate.notBlank(methodName, "methodName can't be blank"); - for (Class searchType = obj.getClass() ; searchType != Object.class ; searchType = searchType.getSuperclass()) { + for (Class searchType = obj.getClass(); searchType != Object.class; searchType = searchType.getSuperclass()) { try { Method method = searchType.getDeclaredMethod(methodName, parameterTypes); makeAccessible(method); @@ -220,13 +220,13 @@ public class ReflectUtils { * 只匹配函数名。 * 用于方法需要被多次调用的情况. 先使用本函数先取得Method,然后调用Method.invoke(Object obj, Object... args) */ - public static Method getAccessibleMethodByName (final Object obj, final String methodName, int argsNum) { + public static Method getAccessibleMethodByName(final Object obj, final String methodName, int argsNum) { // 为空不报错。直接返回 null if (obj == null) { return null; } Validate.notBlank(methodName, "methodName can't be blank"); - for (Class searchType = obj.getClass() ; searchType != Object.class ; searchType = searchType.getSuperclass()) { + for (Class searchType = obj.getClass(); searchType != Object.class; searchType = searchType.getSuperclass()) { Method[] methods = searchType.getDeclaredMethods(); for (Method method : methods) { if (method.getName().equals(methodName) && method.getParameterTypes().length == argsNum) { @@ -241,7 +241,7 @@ public class ReflectUtils { /** * 改变private/protected的方法为public，尽量不调用实际改动的语句，避免JDK的SecurityManager抱怨。 */ - public static void makeAccessible (Method method) { + public static void makeAccessible(Method method) { if ((!Modifier.isPublic(method.getModifiers()) || !Modifier.isPublic(method.getDeclaringClass().getModifiers())) && !method.isAccessible()) { method.setAccessible(true); @@ -251,7 +251,7 @@ public class ReflectUtils { /** * 改变private/protected的成员变量为public，尽量不调用实际改动的语句，避免JDK的SecurityManager抱怨。 */ - public static void makeAccessible (Field field) { + public static void makeAccessible(Field field) { if ((!Modifier.isPublic(field.getModifiers()) || !Modifier.isPublic(field.getDeclaringClass().getModifiers()) || Modifier.isFinal(field.getModifiers())) && !field.isAccessible()) { field.setAccessible(true); @@ -263,7 +263,7 @@ public class ReflectUtils { * 如无法找到, 返回Object.class. */ @SuppressWarnings("unchecked") - public static Class getClassGenricType (final Class clazz) { + public static Class getClassGenricType(final Class clazz) { return getClassGenricType(clazz, 0); } @@ -271,7 +271,7 @@ public class ReflectUtils { * 通过反射, 获得Class定义中声明的父类的泛型参数的类型. * 如无法找到, 返回Object.class. */ - public static Class getClassGenricType (final Class clazz, final int index) { + public static Class getClassGenricType(final Class clazz, final int index) { Type genType = clazz.getGenericSuperclass(); if (!(genType instanceof ParameterizedType)) { @@ -294,7 +294,7 @@ public class ReflectUtils { return (Class) params[index]; } - public static Class getUserClass (Object instance) { + public static Class getUserClass(Object instance) { if (instance == null) { throw new RuntimeException("Instance must not be null"); } @@ -312,7 +312,7 @@ public class ReflectUtils { /** * 将反射时的checked exception转换为unchecked exception. */ - public static RuntimeException convertReflectionExceptionToUnchecked (String msg, Exception e) { + public static RuntimeException convertReflectionExceptionToUnchecked(String msg, Exception e) { if (e instanceof IllegalAccessException || e instanceof IllegalArgumentException || e instanceof NoSuchMethodException) { return new IllegalArgumentException(msg, e); diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Base64.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Base64.java index 70fe94f..55659bc 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Base64.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Base64.java @@ -18,47 +18,47 @@ public final class Base64 { static final private char[] lookUpBase64Alphabet = new char[LOOKUPLENGTH]; static { - for (int i = 0 ; i < BASELENGTH ; ++i) { + for (int i = 0; i < BASELENGTH; ++i) { base64Alphabet[i] = -1; } - for (int i = 'Z' ; i >= 'A' ; i--) { + for (int i = 'Z'; i >= 'A'; i--) { base64Alphabet[i] = (byte) (i - 'A'); } - for (int i = 'z' ; i >= 'a' ; i--) { + for (int i = 'z'; i >= 'a'; i--) { base64Alphabet[i] = (byte) (i - 'a' + 26); } - for (int i = '9' ; i >= '0' ; i--) { + for (int i = '9'; i >= '0'; i--) { base64Alphabet[i] = (byte) (i - '0' + 52); } base64Alphabet['+'] = 62; base64Alphabet['/'] = 63; - for (int i = 0 ; i <= 25 ; i++) { + for (int i = 0; i <= 25; i++) { lookUpBase64Alphabet[i] = (char) ('A' + i); } - for (int i = 26, j = 0 ; i <= 51 ; i++, j++) { + for (int i = 26, j = 0; i <= 51; i++, j++) { lookUpBase64Alphabet[i] = (char) ('a' + j); } - for (int i = 52, j = 0 ; i <= 61 ; i++, j++) { + for (int i = 52, j = 0; i <= 61; i++, j++) { lookUpBase64Alphabet[i] = (char) ('0' + j); } lookUpBase64Alphabet[62] = (char) '+'; lookUpBase64Alphabet[63] = (char) '/'; } - private static boolean isWhiteSpace (char octect) { + private static boolean isWhiteSpace(char octect) { return (octect == 0x20 || octect == 0xd || octect == 0xa || octect == 0x9); } - private static boolean isPad (char octect) { + private static boolean isPad(char octect) { return (octect == PAD); } - private static boolean isData (char octect) { + private static boolean isData(char octect) { return (octect < BASELENGTH && base64Alphabet[octect] != -1); } @@ -66,10 +66,9 @@ public final class Base64 { * Encodes hex octects into Base64 * * @param binaryData Array containing binaryData - * * @return Encoded Base64 array */ - public static String encode (byte[] binaryData) { + public static String encode(byte[] binaryData) { if (binaryData == null) { return null; } @@ -91,7 +90,7 @@ public final class Base64 { int encodedIndex = 0; int dataIndex = 0; - for (int i = 0 ; i < numberTriplets ; i++) { + for (int i = 0; i < numberTriplets; i++) { b1 = binaryData[dataIndex++]; b2 = binaryData[dataIndex++]; b3 = binaryData[dataIndex++]; @@ -139,10 +138,9 @@ public final class Base64 { * Decodes Base64 data into octects * * @param encoded string containing Base64 data - * * @return Array containind decoded data. */ - public static byte[] decode (String encoded) { + public static byte[] decode(String encoded) { if (encoded == null) { return null; } @@ -170,7 +168,7 @@ public final class Base64 { int dataIndex = 0; decodedData = new byte[(numberQuadruple) * 3]; - for ( ; i < numberQuadruple - 1 ; i++) { + for (; i < numberQuadruple - 1; i++) { if (!isData((d1 = base64Data[dataIndex++])) || !isData((d2 = base64Data[dataIndex++])) || !isData((d3 = base64Data[dataIndex++])) || !isData((d4 = base64Data[dataIndex++]))) { @@ -235,10 +233,9 @@ public final class Base64 { * remove WhiteSpace from MIME containing encoded Base64 data. * * @param data the byte array of base64 data (with WS) - * * @return the new length */ - private static int removeWhiteSpace (char[] data) { + private static int removeWhiteSpace(char[] data) { if (data == null) { return 0; } @@ -246,7 +243,7 @@ public final class Base64 { // count characters that's not whitespace int newSize = 0; int len = data.length; - for (int i = 0 ; i < len ; i++) { + for (int i = 0; i < len; i++) { if (!isWhiteSpace(data[i])) { data[newSize++] = data[i]; } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java index 370bfa2..93bb070 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java @@ -14,7 +14,7 @@ import java.security.MessageDigest; public class Md5Utils { private static final Logger log = LoggerFactory.getLogger(Md5Utils.class); - private static byte[] md5 (String s) { + private static byte[] md5(String s) { MessageDigest algorithm; try { algorithm = MessageDigest.getInstance("MD5"); @@ -28,14 +28,14 @@ public class Md5Utils { return null; } - private static final String toHex (byte hash[]) { + private static final String toHex(byte hash[]) { if (hash == null) { return null; } StringBuffer buf = new StringBuffer(hash.length * 2); int i; - for (i = 0; i < hash.length ; i++) { + for (i = 0; i < hash.length; i++) { if ((hash[i] & 0xff) < 0x10) { buf.append("0"); } @@ -44,7 +44,7 @@ public class Md5Utils { return buf.toString(); } - public static String hash (String s) { + public static String hash(String s) { try { return new String(toHex(md5(s)).getBytes(StandardCharsets.UTF_8), StandardCharsets.UTF_8); } catch (Exception e) { diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java index d1c9aaf..023b977 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java @@ -28,13 +28,11 @@ public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationC * 获取对象 * * @param name - * * @return Object 一个以所给名字注册的bean的实例 - * * @throws org.springframework.beans.BeansException */ @SuppressWarnings("unchecked") - public static T getBean (String name) throws BeansException { + public static T getBean(String name) throws BeansException { return (T) beanFactory.getBean(name); } @@ -42,12 +40,10 @@ public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationC * 获取类型为requiredType的对象 * * @param clz - * * @return - * * @throws org.springframework.beans.BeansException */ - public static T getBean (Class clz) throws BeansException { + public static T getBean(Class clz) throws BeansException { T result = (T) beanFactory.getBean(clz); return result; } @@ -56,10 +52,9 @@ public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationC * 如果BeanFactory包含一个与所给名称匹配的bean定义，则返回true * * @param name - * * @return boolean */ - public static boolean containsBean (String name) { + public static boolean containsBean(String name) { return beanFactory.containsBean(name); } @@ -67,23 +62,19 @@ public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationC * 判断以给定名字注册的bean定义是一个singleton还是一个prototype。 如果与给定名字相应的bean定义没有被找到，将会抛出一个异常（NoSuchBeanDefinitionException） * * @param name - * * @return boolean - * * @throws org.springframework.beans.factory.NoSuchBeanDefinitionException */ - public static boolean isSingleton (String name) throws NoSuchBeanDefinitionException { + public static boolean isSingleton(String name) throws NoSuchBeanDefinitionException { return beanFactory.isSingleton(name); } /** * @param name - * * @return Class 注册对象的类型 - * * @throws org.springframework.beans.factory.NoSuchBeanDefinitionException */ - public static Class getType (String name) throws NoSuchBeanDefinitionException { + public static Class getType(String name) throws NoSuchBeanDefinitionException { return beanFactory.getType(name); } @@ -91,12 +82,10 @@ public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationC * 如果给定的bean名字在bean定义中有别名，则返回这些别名 * * @param name - * * @return - * * @throws org.springframework.beans.factory.NoSuchBeanDefinitionException */ - public static String[] getAliases (String name) throws NoSuchBeanDefinitionException { + public static String[] getAliases(String name) throws NoSuchBeanDefinitionException { return beanFactory.getAliases(name); } @@ -104,11 +93,10 @@ public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationC * 获取aop代理对象 * * @param invoker - * * @return */ @SuppressWarnings("unchecked") - public static T getAopProxy (T invoker) { + public static T getAopProxy(T invoker) { return (T) AopContext.currentProxy(); } @@ -117,7 +105,7 @@ public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationC * * @return 当前的环境配置 */ - public static String[] getActiveProfiles () { + public static String[] getActiveProfiles() { return applicationContext.getEnvironment().getActiveProfiles(); } @@ -126,7 +114,7 @@ public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationC * * @return 当前的环境配置 */ - public static String getActiveProfile () { + public static String getActiveProfile() { final String[] activeProfiles = getActiveProfiles(); return StringUtils.isNotEmpty(activeProfiles) ? activeProfiles[0] : null; } @@ -135,20 +123,19 @@ public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationC * 获取配置文件中的值 * * @param key 配置文件的key - * * @return 当前的配置文件的值 */ - public static String getRequiredProperty (String key) { + public static String getRequiredProperty(String key) { return applicationContext.getEnvironment().getRequiredProperty(key); } @Override - public void postProcessBeanFactory (ConfigurableListableBeanFactory beanFactory) throws BeansException { + public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException { SpringUtils.beanFactory = beanFactory; } @Override - public void setApplicationContext (ApplicationContext applicationContext) throws BeansException { + public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { SpringUtils.applicationContext = applicationContext; } } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java index a0bc367..90c665a 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java @@ -25,7 +25,7 @@ public class SqlUtil { /** * 检查字符，防止注入绕过 */ - public static String escapeOrderBySql (String value) { + public static String escapeOrderBySql(String value) { if (StringUtils.isNotEmpty(value) && !isValidOrderBySql(value)) { throw new UtilException("参数不符合规范，不能进行查询"); } @@ -38,14 +38,14 @@ public class SqlUtil { /** * 验证 order by 语法是否符合规范 */ - public static boolean isValidOrderBySql (String value) { + public static boolean isValidOrderBySql(String value) { return value.matches(SQL_PATTERN); } /** * SQL关键字检查 */ - public static void filterKeyword (String value) { + public static void filterKeyword(String value) { if (StringUtils.isEmpty(value)) { return; } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java index 9be9344..f5cd6ef 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java @@ -11,7 +11,7 @@ public class IdUtils { * * @return 随机UUID */ - public static String randomUUID () { + public static String randomUUID() { return UUID.randomUUID().toString(); } @@ -20,7 +20,7 @@ public class IdUtils { * * @return 简化的UUID，去掉了横线 */ - public static String simpleUUID () { + public static String simpleUUID() { return UUID.randomUUID().toString(true); } @@ -29,7 +29,7 @@ public class IdUtils { * * @return 随机UUID */ - public static String fastUUID () { + public static String fastUUID() { return UUID.fastUUID().toString(); } @@ -38,7 +38,7 @@ public class IdUtils { * * @return 简化的UUID，去掉了横线 */ - public static String fastSimpleUUID () { + public static String fastSimpleUUID() { return UUID.fastUUID().toString(true); } } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/Seq.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/Seq.java index f9f99ad..249df16 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/Seq.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/Seq.java @@ -26,7 +26,7 @@ public class Seq { * * @return 序列值 */ - public static String getId () { + public static String getId() { return getId(commSeqType); } @@ -35,7 +35,7 @@ public class Seq { * * @return 序列值 */ - public static String getId (String type) { + public static String getId(String type) { AtomicInteger atomicInt = commSeq; if (uploadSeqType.equals(type)) { atomicInt = uploadSeq; @@ -48,10 +48,9 @@ public class Seq { * * @param atomicInt 序列数 * @param length 数值长度 - * * @return 序列值 */ - public static String getId (AtomicInteger atomicInt, int length) { + public static String getId(AtomicInteger atomicInt, int length) { String result = DateUtils.dateTimeNow(); result += machineCode; result += getSeq(atomicInt, length); @@ -63,7 +62,7 @@ public class Seq { * * @return 序列值 */ - private synchronized static String getSeq (AtomicInteger atomicInt, int length) { + private synchronized static String getSeq(AtomicInteger atomicInt, int length) { // 先取值再+1 int value = atomicInt.getAndIncrement(); diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/UUID.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/UUID.java index 636211b..b62b030 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/UUID.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/UUID.java @@ -29,14 +29,14 @@ public final class UUID implements java.io.Serializable, Comparable { * * @param data 数据 */ - private UUID (byte[] data) { + private UUID(byte[] data) { long msb = 0; long lsb = 0; assert data.length == 16 : "data must be 16 bytes in length"; - for (int i = 0 ; i < 8 ; i++) { + for (int i = 0; i < 8; i++) { msb = (msb << 8) | (data[i] & 0xff); } - for (int i = 8 ; i < 16 ; i++) { + for (int i = 8; i < 16; i++) { lsb = (lsb << 8) | (data[i] & 0xff); } this.mostSigBits = msb; @@ -49,7 +49,7 @@ public final class UUID implements java.io.Serializable, Comparable { * @param mostSigBits 用于 {@code UUID} 的最高有效 64 位 * @param leastSigBits 用于 {@code UUID} 的最低有效 64 位 */ - public UUID (long mostSigBits, long leastSigBits) { + public UUID(long mostSigBits, long leastSigBits) { this.mostSigBits = mostSigBits; this.leastSigBits = leastSigBits; } @@ -59,7 +59,7 @@ public final class UUID implements java.io.Serializable, Comparable { * * @return 随机生成的 {@code UUID} */ - public static UUID fastUUID () { + public static UUID fastUUID() { return randomUUID(false); } @@ -68,7 +68,7 @@ public final class UUID implements java.io.Serializable, Comparable { * * @return 随机生成的 {@code UUID} */ - public static UUID randomUUID () { + public static UUID randomUUID() { return randomUUID(true); } @@ -76,10 +76,9 @@ public final class UUID implements java.io.Serializable, Comparable { * 获取类型 4（伪随机生成的）UUID 的静态工厂。 使用加密的强伪随机数生成器生成该 UUID。 * * @param isSecure 是否使用{@link SecureRandom}如果是可以获得更安全的随机码，否则可以得到更好的性能 - * * @return 随机生成的 {@code UUID} */ - public static UUID randomUUID (boolean isSecure) { + public static UUID randomUUID(boolean isSecure) { final Random ng = isSecure ? Holder.numberGenerator : getRandom(); byte[] randomBytes = new byte[16]; @@ -95,10 +94,9 @@ public final class UUID implements java.io.Serializable, Comparable { * 根据指定的字节数组获取类型 3（基于名称的）UUID 的静态工厂。 * * @param name 用于构造 UUID 的字节数组。 - * * @return 根据指定数组生成的 {@code UUID} */ - public static UUID nameUUIDFromBytes (byte[] name) { + public static UUID nameUUIDFromBytes(byte[] name) { MessageDigest md; try { md = MessageDigest.getInstance("MD5"); @@ -117,17 +115,15 @@ public final class UUID implements java.io.Serializable, Comparable { * 根据 {@link #toString()} 方法中描述的字符串标准表示形式创建{@code UUID}。 * * @param name 指定 {@code UUID} 字符串 - * * @return 具有指定值的 {@code UUID} - * * @throws IllegalArgumentException 如果 name 与 {@link #toString} 中描述的字符串表示形式不符抛出此异常 */ - public static UUID fromString (String name) { + public static UUID fromString(String name) { String[] components = name.split("-"); if (components.length != 5) { throw new IllegalArgumentException("Invalid UUID string: " + name); } - for (int i = 0 ; i < 5 ; i++) { + for (int i = 0; i < 5; i++) { components[i] = "0x" + components[i]; } @@ -149,10 +145,9 @@ public final class UUID implements java.io.Serializable, Comparable { * * @param val 值 * @param digits 位 - * * @return 值 */ - private static String digits (long val, int digits) { + private static String digits(long val, int digits) { long hi = 1L << (digits * 4); return Long.toHexString(hi | (val & (hi - 1))).substring(1); } @@ -162,7 +157,7 @@ public final class UUID implements java.io.Serializable, Comparable { * * @return {@link SecureRandom} */ - public static SecureRandom getSecureRandom () { + public static SecureRandom getSecureRandom() { try { return SecureRandom.getInstance("SHA1PRNG"); } catch (NoSuchAlgorithmException e) { @@ -176,7 +171,7 @@ public final class UUID implements java.io.Serializable, Comparable { * * @return {@link ThreadLocalRandom} */ - public static ThreadLocalRandom getRandom () { + public static ThreadLocalRandom getRandom() { return ThreadLocalRandom.current(); } @@ -185,7 +180,7 @@ public final class UUID implements java.io.Serializable, Comparable { * * @return 此 UUID 的 128 位值中的最低有效 64 位。 */ - public long getLeastSignificantBits () { + public long getLeastSignificantBits() { return leastSigBits; } @@ -194,7 +189,7 @@ public final class UUID implements java.io.Serializable, Comparable { * * @return 此 UUID 的 128 位值中最高有效 64 位。 */ - public long getMostSignificantBits () { + public long getMostSignificantBits() { return mostSigBits; } @@ -211,7 +206,7 @@ public final class UUID implements java.io.Serializable, Comparable { * * @return 此 {@code UUID} 的版本号 */ - public int version () { + public int version() { // Version is bits masked by 0x000000000000F000 in MS long return (int) ((mostSigBits >> 12) & 0x0f); } @@ -229,7 +224,7 @@ public final class UUID implements java.io.Serializable, Comparable { * * @return 此 {@code UUID} 相关联的变体号 */ - public int variant () { + public int variant() { // This field is composed of a varying number of bits. // 0 - - Reserved for NCS backward compatibility // 1 0 - The IETF aka Leach-Salz variant (used by this class) @@ -251,7 +246,7 @@ public final class UUID implements java.io.Serializable, Comparable { * * @throws UnsupportedOperationException 如果此 {@code UUID} 不是 version 为 1 的 UUID。 */ - public long timestamp () throws UnsupportedOperationException { + public long timestamp() throws UnsupportedOperationException { checkTimeBase(); return (mostSigBits & 0x0FFFL) << 48// | ((mostSigBits >> 16) & 0x0FFFFL) << 32// @@ -268,10 +263,9 @@ public final class UUID implements java.io.Serializable, Comparable { * UnsupportedOperationException。 * * @return 此 {@code UUID} 的时钟序列 - * * @throws UnsupportedOperationException 如果此 UUID 的 version 不为 1 */ - public int clockSequence () throws UnsupportedOperationException { + public int clockSequence() throws UnsupportedOperationException { checkTimeBase(); return (int) ((leastSigBits & 0x3FFF000000000000L) >>> 48); } @@ -286,10 +280,9 @@ public final class UUID implements java.io.Serializable, Comparable { * 如果此 UUID 不是基于时间的 UUID，则此方法抛出 UnsupportedOperationException。 * * @return 此 {@code UUID} 的节点值 - * * @throws UnsupportedOperationException 如果此 UUID 的 version 不为 1 */ - public long node () throws UnsupportedOperationException { + public long node() throws UnsupportedOperationException { checkTimeBase(); return leastSigBits & 0x0000FFFFFFFFFFFFL; } @@ -316,11 +309,10 @@ public final class UUID implements java.io.Serializable, Comparable { * * * @return 此{@code UUID} 的字符串表现形式 - * * @see #toString(boolean) */ @Override - public String toString () { + public String toString() { return toString(false); } @@ -346,10 +338,9 @@ public final class UUID implements java.io.Serializable, Comparable { * * * @param isSimple 是否简单模式，简单模式为不带'-'的UUID字符串 - * * @return 此{@code UUID} 的字符串表现形式 */ - public String toString (boolean isSimple) { + public String toString(boolean isSimple) { final StringBuilder builder = new StringBuilder(isSimple ? 32 : 36); // time_low builder.append(digits(mostSigBits >> 32, 8)); @@ -385,7 +376,7 @@ public final class UUID implements java.io.Serializable, Comparable { * @return UUID 的哈希码值。 */ @Override - public int hashCode () { + public int hashCode() { long hilo = mostSigBits ^ leastSigBits; return ((int) (hilo >> 32)) ^ (int) hilo; } @@ -399,11 +390,10 @@ public final class UUID implements java.io.Serializable, Comparable { * 当且仅当参数不为 {@code null}、而是一个 UUID 对象、具有与此 UUID 相同的 varriant、包含相同的值（每一位均相同）时，结果才为 {@code true}。 * * @param obj 要与之比较的对象 - * * @return 如果对象相同，则返回 {@code true}；否则返回 {@code false} */ @Override - public boolean equals (Object obj) { + public boolean equals(Object obj) { if ((null == obj) || (obj.getClass() != UUID.class)) { return false; } @@ -418,11 +408,10 @@ public final class UUID implements java.io.Serializable, Comparable { * 如果两个 UUID 不同，且第一个 UUID 的最高有效字段大于第二个 UUID 的对应字段，则第一个 UUID 大于第二个 UUID。 * * @param val 与此 UUID 比较的 UUID - * * @return 在此 UUID 小于、等于或大于 val 时，分别返回 -1、0 或 1。 */ @Override - public int compareTo (UUID val) { + public int compareTo(UUID val) { // The ordering is intentionally set up so that the UUIDs // can simply be numerically compared as two numbers return (this.mostSigBits < val.mostSigBits ? -1 : // @@ -435,7 +424,7 @@ public final class UUID implements java.io.Serializable, Comparable { /** * 检查是否为time-based版本UUID */ - private void checkTimeBase () { + private void checkTimeBase() { if (version() != 1) { throw new UnsupportedOperationException("Not a time-based UUID"); } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/xss/Xss.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/xss/Xss.java index 53de13b..46c7317 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/xss/Xss.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/xss/Xss.java @@ -16,11 +16,11 @@ import java.lang.annotation.Target; @Target(value = {ElementType.METHOD, ElementType.FIELD, ElementType.CONSTRUCTOR, ElementType.PARAMETER}) @Constraint(validatedBy = {XssValidator.class}) public @interface Xss { - String message () + String message() default "不允许任何脚本运行"; - Class[] groups () default {}; + Class[] groups() default {}; - Class[] payload () default {}; + Class[] payload() default {}; } diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/xss/XssValidator.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/xss/XssValidator.java index 0bef4fd..52f36c0 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/xss/XssValidator.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/xss/XssValidator.java @@ -15,14 +15,14 @@ import java.util.regex.Pattern; public class XssValidator implements ConstraintValidator { private static final String HTML_PATTERN = "<(\\S*?)[^>]*>.*?|<.*? />"; - public static boolean containsHtml (String value) { + public static boolean containsHtml(String value) { Pattern pattern = Pattern.compile(HTML_PATTERN); Matcher matcher = pattern.matcher(value); return matcher.matches(); } @Override - public boolean isValid (String value, ConstraintValidatorContext constraintValidatorContext) { + public boolean isValid(String value, ConstraintValidatorContext constraintValidatorContext) { if (StringUtils.isBlank(value)) { return true; } diff --git a/ruoyi-custom/pom.xml b/ruoyi-basic/ruoyi-custom/pom.xml similarity index 70% rename from ruoyi-custom/pom.xml rename to ruoyi-basic/ruoyi-custom/pom.xml index 7561b87..70c9f4a 100644 --- a/ruoyi-custom/pom.xml +++ b/ruoyi-basic/ruoyi-custom/pom.xml @@ -2,19 +2,29 @@ - 4.0.0 + ruoyi-basic com.muyu - ruoyi 3.8.6 + 4.0.0 ruoyi-custom + + custom自定义模块 + + 17 17 UTF-8 + + + com.muyu + ruoyi-common + + diff --git a/ruoyi-basic/ruoyi-custom/src/main/java/com/ruoyi/custom/domain/SysClass.java b/ruoyi-basic/ruoyi-custom/src/main/java/com/ruoyi/custom/domain/SysClass.java new file mode 100644 index 0000000..b6cdad9 --- /dev/null +++ b/ruoyi-basic/ruoyi-custom/src/main/java/com/ruoyi/custom/domain/SysClass.java @@ -0,0 +1,93 @@ +package com.ruoyi.custom.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import com.ruoyi.custom.domain.req.SysClassEditReq; +import com.ruoyi.custom.domain.req.SysClassQueryReq; +import com.ruoyi.custom.domain.req.SysClassSaveReq; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * 班级管理对象 sys_class + * + * @author ruoyi + * @date 2024-04-22 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@TableName("sys_class") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "SysClass", description = "班级管理") +public class SysClass extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 班级ID + */ + @TableId(value = "class_id", type = IdType.AUTO) + @ApiModelProperty(name = "班级ID", value = "班级ID") + private Long classId; + + /** + * 班级名称 + */ + @Excel(name = "班级名称") + @ApiModelProperty(name = "班级名称", value = "班级名称", required = true) + private String className; + + /** + * 状态（0正常 1停用） + */ + @Excel(name = "状态", readConverterExp = "0=正常,1=停用") + @ApiModelProperty(name = "状态（0正常 1停用）", value = "状态（0正常 1停用）", required = true) + private String status; + + /** + * 备注 + */ + private String remark; + + /** + * 查询构造器 + */ + public static SysClass queryBuild(SysClassQueryReq sysClassQueryReq) { + return SysClass.builder() + .className(sysClassQueryReq.getClassName()) + .status(sysClassQueryReq.getStatus()) + .build(); + } + + /** + * 添加构造器 + */ + public static SysClass saveBuild(SysClassSaveReq sysClassSaveReq) { + return SysClass.builder() + .className(sysClassSaveReq.getClassName()) + .status(sysClassSaveReq.getStatus()) + .build(); + } + + /** + * 修改构造器 + */ + public static SysClass editBuild(Long classId, SysClassEditReq sysClassEditReq) { + return SysClass.builder() + .classId(classId) + .className(sysClassEditReq.getClassName()) + .status(sysClassEditReq.getStatus()) + .build(); + } + +} diff --git a/ruoyi-basic/ruoyi-custom/src/main/java/com/ruoyi/custom/domain/req/SysClassEditReq.java b/ruoyi-basic/ruoyi-custom/src/main/java/com/ruoyi/custom/domain/req/SysClassEditReq.java new file mode 100644 index 0000000..6914781 --- /dev/null +++ b/ruoyi-basic/ruoyi-custom/src/main/java/com/ruoyi/custom/domain/req/SysClassEditReq.java @@ -0,0 +1,38 @@ +package com.ruoyi.custom.domain.req; + +import com.ruoyi.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * 班级管理对象 sys_class + * + * @author ruoyi + * @date 2024-04-22 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value = "SysClassEditReq", description = "班级管理") +public class SysClassEditReq extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 班级名称 + */ + @ApiModelProperty(name = "班级名称", value = "班级名称", required = true) + private String className; + + /** + * 状态（0正常 1停用） + */ + @ApiModelProperty(name = "状态（0正常 1停用）", value = "状态（0正常 1停用）", required = true) + private String status; + +} diff --git a/ruoyi-basic/ruoyi-custom/src/main/java/com/ruoyi/custom/domain/req/SysClassQueryReq.java b/ruoyi-basic/ruoyi-custom/src/main/java/com/ruoyi/custom/domain/req/SysClassQueryReq.java new file mode 100644 index 0000000..9a476f6 --- /dev/null +++ b/ruoyi-basic/ruoyi-custom/src/main/java/com/ruoyi/custom/domain/req/SysClassQueryReq.java @@ -0,0 +1,38 @@ +package com.ruoyi.custom.domain.req; + +import com.ruoyi.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * 班级管理对象 sys_class + * + * @author ruoyi + * @date 2024-04-22 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value = "SysClassQueryReq", description = "班级管理") +public class SysClassQueryReq extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 班级名称 + */ + @ApiModelProperty(name = "班级名称", value = "班级名称") + private String className; + + /** + * 状态（0正常 1停用） + */ + @ApiModelProperty(name = "状态（0正常 1停用）", value = "状态（0正常 1停用）") + private String status; + +} diff --git a/ruoyi-basic/ruoyi-custom/src/main/java/com/ruoyi/custom/domain/req/SysClassSaveReq.java b/ruoyi-basic/ruoyi-custom/src/main/java/com/ruoyi/custom/domain/req/SysClassSaveReq.java new file mode 100644 index 0000000..29232df --- /dev/null +++ b/ruoyi-basic/ruoyi-custom/src/main/java/com/ruoyi/custom/domain/req/SysClassSaveReq.java @@ -0,0 +1,47 @@ +package com.ruoyi.custom.domain.req; + +import com.ruoyi.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * 班级管理对象 sys_class + * + * @author ruoyi + * @date 2024-04-22 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value = "SysClassSaveReq", description = "班级管理") +public class SysClassSaveReq extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 班级ID + */ + + @ApiModelProperty(name = "班级ID", value = "班级ID") + private Long classId; + + /** + * 班级名称 + */ + + @ApiModelProperty(name = "班级名称", value = "班级名称", required = true) + private String className; + + /** + * 状态（0正常 1停用） + */ + + @ApiModelProperty(name = "状态（0正常 1停用）", value = "状态（0正常 1停用）", required = true) + private String status; + +} diff --git a/ruoyi-basic/ruoyi-custom/src/main/java/com/ruoyi/custom/mapper/SysClassMapper.java b/ruoyi-basic/ruoyi-custom/src/main/java/com/ruoyi/custom/mapper/SysClassMapper.java new file mode 100644 index 0000000..bc60194 --- /dev/null +++ b/ruoyi-basic/ruoyi-custom/src/main/java/com/ruoyi/custom/mapper/SysClassMapper.java @@ -0,0 +1,14 @@ +package com.ruoyi.custom.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.custom.domain.SysClass; + +/** + * 班级管理Mapper接口 + * + * @author ruoyi + * @date 2024-04-22 + */ +public interface SysClassMapper extends BaseMapper { + +} diff --git a/ruoyi-basic/ruoyi-custom/src/main/java/com/ruoyi/custom/service/SysClassService.java b/ruoyi-basic/ruoyi-custom/src/main/java/com/ruoyi/custom/service/SysClassService.java new file mode 100644 index 0000000..d2c7d6a --- /dev/null +++ b/ruoyi-basic/ruoyi-custom/src/main/java/com/ruoyi/custom/service/SysClassService.java @@ -0,0 +1,23 @@ +package com.ruoyi.custom.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.custom.domain.SysClass; + +import java.util.List; + +/** + * 班级管理Service接口 + * + * @author ruoyi + * @date 2024-04-22 + */ +public interface SysClassService extends IService { + /** + * 查询班级管理列表 + * + * @param sysClass 班级管理 + * @return 班级管理集合 + */ + public List list(SysClass sysClass); + +} diff --git a/ruoyi-basic/ruoyi-custom/src/main/java/com/ruoyi/custom/service/impl/SysClassServiceImpl.java b/ruoyi-basic/ruoyi-custom/src/main/java/com/ruoyi/custom/service/impl/SysClassServiceImpl.java new file mode 100644 index 0000000..6dcdcc5 --- /dev/null +++ b/ruoyi-basic/ruoyi-custom/src/main/java/com/ruoyi/custom/service/impl/SysClassServiceImpl.java @@ -0,0 +1,46 @@ +package com.ruoyi.custom.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.utils.ObjUtils; +import com.ruoyi.custom.domain.SysClass; +import com.ruoyi.custom.mapper.SysClassMapper; +import com.ruoyi.custom.service.SysClassService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 班级管理Service业务层处理 + * + * @author ruoyi + * @date 2024-04-22 + */ +@Slf4j +@Service +public class SysClassServiceImpl extends ServiceImpl implements SysClassService { + + /** + * 查询班级管理列表 + * + * @param sysClass 班级管理 + * @return 班级管理 + */ + @Override + public List list(SysClass sysClass) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + + + if (ObjUtils.notNull(sysClass.getClassName())) { + queryWrapper.like(SysClass::getClassName, sysClass.getClassName()); + } + + if (ObjUtils.notNull(sysClass.getStatus())) { + queryWrapper.eq(SysClass::getStatus, sysClass.getStatus()); + } + + + return list(queryWrapper); + } +} diff --git a/ruoyi-basic/ruoyi-custom/src/main/resources/mapper/custom/SysClassMapper.xml b/ruoyi-basic/ruoyi-custom/src/main/resources/mapper/custom/SysClassMapper.xml new file mode 100644 index 0000000..e11ffbd --- /dev/null +++ b/ruoyi-basic/ruoyi-custom/src/main/resources/mapper/custom/SysClassMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + select class_id, + class_name, + status, + create_by, + create_time, + update_by, + update_time, + remark + from sys_class + + diff --git a/ruoyi-basic/ruoyi-framework/pom.xml b/ruoyi-basic/ruoyi-framework/pom.xml index 5fc4372..199e4e5 100644 --- a/ruoyi-basic/ruoyi-framework/pom.xml +++ b/ruoyi-basic/ruoyi-framework/pom.xml @@ -59,6 +59,12 @@ ruoyi-system + + + com.muyu + ruoyi-custom + + diff --git a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java index 015b9f9..21856f4 100644 --- a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java +++ b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java @@ -64,7 +64,7 @@ public class DataScopeAspect { * @param userAlias 用户别名 * @param permission 权限字符 */ - public static void dataScopeFilter (JoinPoint joinPoint, SysUser user, String deptAlias, String userAlias, String permission) { + public static void dataScopeFilter(JoinPoint joinPoint, SysUser user, String deptAlias, String userAlias, String permission) { StringBuilder sqlString = new StringBuilder(); List conditions = new ArrayList(); @@ -117,12 +117,12 @@ public class DataScopeAspect { } @Before("@annotation(controllerDataScope)") - public void doBefore (JoinPoint point, DataScope controllerDataScope) throws Throwable { + public void doBefore(JoinPoint point, DataScope controllerDataScope) throws Throwable { clearDataScope(point); handleDataScope(point, controllerDataScope); } - protected void handleDataScope (final JoinPoint joinPoint, DataScope controllerDataScope) { + protected void handleDataScope(final JoinPoint joinPoint, DataScope controllerDataScope) { // 获取当前的用户 LoginUser loginUser = SecurityUtils.getLoginUser(); if (StringUtils.isNotNull(loginUser)) { @@ -139,7 +139,7 @@ public class DataScopeAspect { /** * 拼接权限sql前先清空params.dataScope参数防止注入 */ - private void clearDataScope (final JoinPoint joinPoint) { + private void clearDataScope(final JoinPoint joinPoint) { Object params = joinPoint.getArgs()[0]; if (StringUtils.isNotNull(params) && params instanceof BaseEntity) { BaseEntity baseEntity = (BaseEntity) params; diff --git a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java index 5789837..121c1e3 100644 --- a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java +++ b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java @@ -29,12 +29,12 @@ public class DataSourceAspect { @Pointcut("@annotation(com.ruoyi.common.annotation.DataSource)" + "|| @within(com.ruoyi.common.annotation.DataSource)") - public void dsPointCut () { + public void dsPointCut() { } @Around("dsPointCut()") - public Object around (ProceedingJoinPoint point) throws Throwable { + public Object around(ProceedingJoinPoint point) throws Throwable { DataSource dataSource = getDataSource(point); if (StringUtils.isNotNull(dataSource)) { @@ -52,7 +52,7 @@ public class DataSourceAspect { /** * 获取需要切换的数据源 */ - public DataSource getDataSource (ProceedingJoinPoint point) { + public DataSource getDataSource(ProceedingJoinPoint point) { MethodSignature signature = (MethodSignature) point.getSignature(); DataSource dataSource = AnnotationUtils.findAnnotation(signature.getMethod(), DataSource.class); if (Objects.nonNull(dataSource)) { diff --git a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java index 0f775dc..86be5ca 100644 --- a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java +++ b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java @@ -53,7 +53,7 @@ public class LogAspect { * 处理请求前执行 */ @Before(value = "@annotation(controllerLog)") - public void boBefore (JoinPoint joinPoint, Log controllerLog) { + public void boBefore(JoinPoint joinPoint, Log controllerLog) { TIME_THREADLOCAL.set(System.currentTimeMillis()); } @@ -63,7 +63,7 @@ public class LogAspect { * @param joinPoint 切点 */ @AfterReturning(pointcut = "@annotation(controllerLog)", returning = "jsonResult") - public void doAfterReturning (JoinPoint joinPoint, Log controllerLog, Object jsonResult) { + public void doAfterReturning(JoinPoint joinPoint, Log controllerLog, Object jsonResult) { handleLog(joinPoint, controllerLog, null, jsonResult); } @@ -74,11 +74,11 @@ public class LogAspect { * @param e 异常 */ @AfterThrowing(value = "@annotation(controllerLog)", throwing = "e") - public void doAfterThrowing (JoinPoint joinPoint, Log controllerLog, Exception e) { + public void doAfterThrowing(JoinPoint joinPoint, Log controllerLog, Exception e) { handleLog(joinPoint, controllerLog, e, null); } - protected void handleLog (final JoinPoint joinPoint, Log controllerLog, final Exception e, Object jsonResult) { + protected void handleLog(final JoinPoint joinPoint, Log controllerLog, final Exception e, Object jsonResult) { try { // 获取当前的用户 LoginUser loginUser = SecurityUtils.getLoginUser(); @@ -124,10 +124,9 @@ public class LogAspect { * * @param log 日志 * @param operLog 操作日志 - * * @throws Exception */ - public void getControllerMethodDescription (JoinPoint joinPoint, Log log, SysOperLog operLog, Object jsonResult) throws Exception { + public void getControllerMethodDescription(JoinPoint joinPoint, Log log, SysOperLog operLog, Object jsonResult) throws Exception { // 设置action动作 operLog.setBusinessType(log.businessType().ordinal()); // 设置标题 @@ -149,10 +148,9 @@ public class LogAspect { * 获取请求的参数，放到log中 * * @param operLog 操作日志 - * * @throws Exception 异常 */ - private void setRequestValue (JoinPoint joinPoint, SysOperLog operLog, String[] excludeParamNames) throws Exception { + private void setRequestValue(JoinPoint joinPoint, SysOperLog operLog, String[] excludeParamNames) throws Exception { Map paramsMap = ServletUtils.getParamMap(ServletUtils.getRequest()); String requestMethod = operLog.getRequestMethod(); if (StringUtils.isEmpty(paramsMap) @@ -167,7 +165,7 @@ public class LogAspect { /** * 参数拼装 */ - private String argsArrayToString (Object[] paramsArray, String[] excludeParamNames) { + private String argsArrayToString(Object[] paramsArray, String[] excludeParamNames) { String params = ""; if (paramsArray != null && paramsArray.length > 0) { for (Object o : paramsArray) { @@ -186,7 +184,7 @@ public class LogAspect { /** * 忽略敏感属性 */ - public PropertyPreExcludeFilter excludePropertyPreFilter (String[] excludeParamNames) { + public PropertyPreExcludeFilter excludePropertyPreFilter(String[] excludeParamNames) { return new PropertyPreExcludeFilter().addExcludes(ArrayUtils.addAll(EXCLUDE_PROPERTIES, excludeParamNames)); } @@ -194,11 +192,10 @@ public class LogAspect { * 判断是否需要过滤的对象。 * * @param o 对象信息。 - * * @return 如果是需要过滤的对象，则返回true；否则返回false。 */ @SuppressWarnings("rawtypes") - public boolean isFilterObject (final Object o) { + public boolean isFilterObject(final Object o) { Class clazz = o.getClass(); if (clazz.isArray()) { return clazz.getComponentType().isAssignableFrom(MultipartFile.class); diff --git a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java index fa76ae9..ccc16ca 100644 --- a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java +++ b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java @@ -35,17 +35,17 @@ public class RateLimiterAspect { private RedisScript limitScript; @Autowired - public void setRedisTemplate1 (RedisTemplate redisTemplate) { + public void setRedisTemplate1(RedisTemplate redisTemplate) { this.redisTemplate = redisTemplate; } @Autowired - public void setLimitScript (RedisScript limitScript) { + public void setLimitScript(RedisScript limitScript) { this.limitScript = limitScript; } @Before("@annotation(rateLimiter)") - public void doBefore (JoinPoint point, RateLimiter rateLimiter) throws Throwable { + public void doBefore(JoinPoint point, RateLimiter rateLimiter) throws Throwable { int time = rateLimiter.time(); int count = rateLimiter.count(); @@ -64,7 +64,7 @@ public class RateLimiterAspect { } } - public String getCombineKey (RateLimiter rateLimiter, JoinPoint point) { + public String getCombineKey(RateLimiter rateLimiter, JoinPoint point) { StringBuffer stringBuffer = new StringBuffer(rateLimiter.key()); if (rateLimiter.limitType() == LimitType.IP) { stringBuffer.append(IpUtils.getIpAddr()).append("-"); diff --git a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java index 83f72ce..55dac04 100644 --- a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java +++ b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java @@ -18,19 +18,19 @@ import java.util.TimeZone; @EnableAspectJAutoProxy(exposeProxy = true) // 指定要扫描的Mapper类的包的路径 @MapperScan( - { - "com.ruoyi.system.mapper", - "com.ruoyi.quartz.mapper", - "com.ruoyi.generator.mapper", - "com.ruoyi.book.mapper", - } - ) + { + "com.ruoyi.system.mapper", + "com.ruoyi.quartz.mapper", + "com.ruoyi.generator.mapper", + "com.ruoyi.book.mapper", + } +) public class ApplicationConfig { /** * 时区配置 */ @Bean - public Jackson2ObjectMapperBuilderCustomizer jacksonObjectMapperCustomization () { + public Jackson2ObjectMapperBuilderCustomizer jacksonObjectMapperCustomization() { return jacksonObjectMapperBuilder -> jacksonObjectMapperBuilder.timeZone(TimeZone.getDefault()); } } diff --git a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java index 5146aff..d321677 100644 --- a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java +++ b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java @@ -17,7 +17,7 @@ import static com.google.code.kaptcha.Constants.*; @Configuration public class CaptchaConfig { @Bean(name = "captchaProducer") - public DefaultKaptcha getKaptchaBean () { + public DefaultKaptcha getKaptchaBean() { DefaultKaptcha defaultKaptcha = new DefaultKaptcha(); Properties properties = new Properties(); // 是否有边框 默认为true 我们可以自己设置yes，no @@ -44,7 +44,7 @@ public class CaptchaConfig { } @Bean(name = "captchaProducerMath") - public DefaultKaptcha getKaptchaBeanMath () { + public DefaultKaptcha getKaptchaBeanMath() { DefaultKaptcha defaultKaptcha = new DefaultKaptcha(); Properties properties = new Properties(); // 是否有边框 默认为true 我们可以自己设置yes，no diff --git a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java index 546eb3f..876a789 100644 --- a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java +++ b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java @@ -30,7 +30,7 @@ import java.util.Map; public class DruidConfig { @Bean @ConfigurationProperties("spring.datasource.druid.master") - public DataSource masterDataSource (DruidProperties druidProperties) { + public DataSource masterDataSource(DruidProperties druidProperties) { DruidDataSource dataSource = DruidDataSourceBuilder.create().build(); return druidProperties.dataSource(dataSource); } @@ -38,14 +38,14 @@ public class DruidConfig { @Bean @ConfigurationProperties("spring.datasource.druid.slave") @ConditionalOnProperty(prefix = "spring.datasource.druid.slave", name = "enabled", havingValue = "true") - public DataSource slaveDataSource (DruidProperties druidProperties) { + public DataSource slaveDataSource(DruidProperties druidProperties) { DruidDataSource dataSource = DruidDataSourceBuilder.create().build(); return druidProperties.dataSource(dataSource); } @Bean(name = "dynamicDataSource") @Primary - public DynamicDataSource dataSource (DataSource masterDataSource) { + public DynamicDataSource dataSource(DataSource masterDataSource) { Map targetDataSources = new HashMap<>(); targetDataSources.put(DataSourceType.MASTER.name(), masterDataSource); setDataSource(targetDataSources, DataSourceType.SLAVE.name(), "slaveDataSource"); @@ -59,7 +59,7 @@ public class DruidConfig { * @param sourceName 数据源名称 * @param beanName bean名称 */ - public void setDataSource (Map targetDataSources, String sourceName, String beanName) { + public void setDataSource(Map targetDataSources, String sourceName, String beanName) { try { DataSource dataSource = SpringUtils.getBean(beanName); targetDataSources.put(sourceName, dataSource); @@ -73,7 +73,7 @@ public class DruidConfig { @SuppressWarnings({"rawtypes", "unchecked"}) @Bean @ConditionalOnProperty(name = "spring.datasource.druid.statViewServlet.enabled", havingValue = "true") - public FilterRegistrationBean removeDruidFilterRegistrationBean (DruidStatProperties properties) { + public FilterRegistrationBean removeDruidFilterRegistrationBean(DruidStatProperties properties) { // 获取web监控页面的参数 DruidStatProperties.StatViewServlet config = properties.getStatViewServlet(); // 提取common.js的配置路径 @@ -83,11 +83,11 @@ public class DruidConfig { // 创建filter进行过滤 Filter filter = new Filter() { @Override - public void init (javax.servlet.FilterConfig filterConfig) throws ServletException { + public void init(javax.servlet.FilterConfig filterConfig) throws ServletException { } @Override - public void doFilter (ServletRequest request, ServletResponse response, FilterChain chain) + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { chain.doFilter(request, response); // 重置缓冲区，响应头不会被重置 @@ -101,7 +101,7 @@ public class DruidConfig { } @Override - public void destroy () { + public void destroy() { } }; FilterRegistrationBean registrationBean = new FilterRegistrationBean(); diff --git a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java index cf1638d..7c260b2 100644 --- a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java +++ b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java @@ -22,13 +22,13 @@ public class FastJson2JsonRedisSerializer implements RedisSerializer { private Class clazz; - public FastJson2JsonRedisSerializer (Class clazz) { + public FastJson2JsonRedisSerializer(Class clazz) { super(); this.clazz = clazz; } @Override - public byte[] serialize (T t) throws SerializationException { + public byte[] serialize(T t) throws SerializationException { if (t == null) { return new byte[0]; } @@ -36,7 +36,7 @@ public class FastJson2JsonRedisSerializer implements RedisSerializer { } @Override - public T deserialize (byte[] bytes) throws SerializationException { + public T deserialize(byte[] bytes) throws SerializationException { if (bytes == null || bytes.length <= 0) { return null; } diff --git a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java index dbc6117..a67ede6 100644 --- a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java +++ b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java @@ -29,7 +29,7 @@ public class FilterConfig { @SuppressWarnings({"rawtypes", "unchecked"}) @Bean @ConditionalOnProperty(value = "xss.enabled", havingValue = "true") - public FilterRegistrationBean xssFilterRegistration () { + public FilterRegistrationBean xssFilterRegistration() { FilterRegistrationBean registration = new FilterRegistrationBean(); registration.setDispatcherTypes(DispatcherType.REQUEST); registration.setFilter(new XssFilter()); @@ -44,7 +44,7 @@ public class FilterConfig { @SuppressWarnings({"rawtypes", "unchecked"}) @Bean - public FilterRegistrationBean someFilterRegistration () { + public FilterRegistrationBean someFilterRegistration() { FilterRegistrationBean registration = new FilterRegistrationBean(); registration.setFilter(new RepeatableFilter()); registration.addUrlPatterns("/*"); diff --git a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java index 03af352..a1d4bf0 100644 --- a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java +++ b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java @@ -13,7 +13,7 @@ public class KaptchaTextCreator extends DefaultTextCreator { private static final String[] CNUMBERS = "0,1,2,3,4,5,6,7,8,9,10".split(","); @Override - public String getText () { + public String getText() { Integer result = 0; Random random = new Random(); int x = random.nextInt(10); diff --git a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java index 7158326..f563201 100644 --- a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java +++ b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java @@ -19,7 +19,7 @@ import org.springframework.data.redis.serializer.StringRedisSerializer; public class RedisConfig extends CachingConfigurerSupport { @Bean @SuppressWarnings(value = {"unchecked", "rawtypes"}) - public RedisTemplate redisTemplate (RedisConnectionFactory connectionFactory) { + public RedisTemplate redisTemplate(RedisConnectionFactory connectionFactory) { RedisTemplate template = new RedisTemplate<>(); template.setConnectionFactory(connectionFactory); @@ -38,7 +38,7 @@ public class RedisConfig extends CachingConfigurerSupport { } @Bean - public DefaultRedisScript limitScript () { + public DefaultRedisScript limitScript() { DefaultRedisScript redisScript = new DefaultRedisScript<>(); redisScript.setScriptText(limitScriptText()); redisScript.setResultType(Long.class); @@ -48,7 +48,7 @@ public class RedisConfig extends CachingConfigurerSupport { /** * 限流脚本 */ - private String limitScriptText () { + private String limitScriptText() { return "local key = KEYS[1]\n" + "local count = tonumber(ARGV[1])\n" + "local time = tonumber(ARGV[2])\n" + diff --git a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java index 41763e8..26a7d4d 100644 --- a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java +++ b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java @@ -27,7 +27,7 @@ public class ResourcesConfig implements WebMvcConfigurer { private RepeatSubmitInterceptor repeatSubmitInterceptor; @Override - public void addResourceHandlers (ResourceHandlerRegistry registry) { + public void addResourceHandlers(ResourceHandlerRegistry registry) { /** 本地文件上传路径 */ registry.addResourceHandler(Constants.RESOURCE_PREFIX + "/**") .addResourceLocations("file:" + RuoYiConfig.getProfile() + "/"); @@ -43,7 +43,7 @@ public class ResourcesConfig implements WebMvcConfigurer { * 自定义拦截规则 */ @Override - public void addInterceptors (InterceptorRegistry registry) { + public void addInterceptors(InterceptorRegistry registry) { registry.addInterceptor(repeatSubmitInterceptor).addPathPatterns("/**"); } @@ -51,7 +51,7 @@ public class ResourcesConfig implements WebMvcConfigurer { * 跨域配置 */ @Bean - public CorsFilter corsFilter () { + public CorsFilter corsFilter() { CorsConfiguration config = new CorsConfiguration(); config.setAllowCredentials(true); // 设置访问源地址 diff --git a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java index 6e5211d..7af9ae7 100644 --- a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java +++ b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java @@ -67,12 +67,11 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { * 解决 无法直接注入 AuthenticationManager * * @return - * * @throws Exception */ @Bean @Override - public AuthenticationManager authenticationManagerBean () throws Exception { + public AuthenticationManager authenticationManagerBean() throws Exception { return super.authenticationManagerBean(); } @@ -92,7 +91,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { * authenticated | 用户登录后可访问 */ @Override - protected void configure (HttpSecurity httpSecurity) throws Exception { + protected void configure(HttpSecurity httpSecurity) throws Exception { // 注解标记允许匿名访问的url ExpressionUrlAuthorizationConfigurer.ExpressionInterceptUrlRegistry registry = httpSecurity.authorizeRequests(); permitAllUrl.getUrls().forEach(url -> registry.antMatchers(url).permitAll()); @@ -130,7 +129,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { * 强散列哈希加密实现 */ @Bean - public BCryptPasswordEncoder bCryptPasswordEncoder () { + public BCryptPasswordEncoder bCryptPasswordEncoder() { return new BCryptPasswordEncoder(); } @@ -138,7 +137,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { * 身份认证接口 */ @Override - protected void configure (AuthenticationManagerBuilder auth) throws Exception { + protected void configure(AuthenticationManagerBuilder auth) throws Exception { auth.userDetailsService(userDetailsService).passwordEncoder(bCryptPasswordEncoder()); } } diff --git a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ServerConfig.java b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ServerConfig.java index 8aed9ce..3a8c8e3 100644 --- a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ServerConfig.java +++ b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ServerConfig.java @@ -12,7 +12,7 @@ import javax.servlet.http.HttpServletRequest; */ @Component public class ServerConfig { - public static String getDomain (HttpServletRequest request) { + public static String getDomain(HttpServletRequest request) { StringBuffer url = request.getRequestURL(); String contextPath = request.getServletContext().getContextPath(); return url.delete(url.length() - request.getRequestURI().length(), url.length()).append(contextPath).toString(); @@ -23,7 +23,7 @@ public class ServerConfig { * * @return 服务地址 */ - public String getUrl () { + public String getUrl() { HttpServletRequest request = ServletUtils.getRequest(); return getDomain(request); } diff --git a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java index 2be215f..1f59b4c 100644 --- a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java +++ b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java @@ -30,7 +30,7 @@ public class ThreadPoolConfig { private int keepAliveSeconds = 300; @Bean(name = "threadPoolTaskExecutor") - public ThreadPoolTaskExecutor threadPoolTaskExecutor () { + public ThreadPoolTaskExecutor threadPoolTaskExecutor() { ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor(); executor.setMaxPoolSize(maxPoolSize); executor.setCorePoolSize(corePoolSize); @@ -45,12 +45,12 @@ public class ThreadPoolConfig { * 执行周期性或定时任务 */ @Bean(name = "scheduledExecutorService") - protected ScheduledExecutorService scheduledExecutorService () { + protected ScheduledExecutorService scheduledExecutorService() { return new ScheduledThreadPoolExecutor(corePoolSize, new BasicThreadFactory.Builder().namingPattern("schedule-pool-%d").daemon(true).build(), new ThreadPoolExecutor.CallerRunsPolicy()) { @Override - protected void afterExecute (Runnable r, Throwable t) { + protected void afterExecute(Runnable r, Throwable t) { super.afterExecute(r, t); Threads.printException(r, t); } diff --git a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/mybatisplus/MyMetaObjectHandler.java b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/mybatisplus/MyMetaObjectHandler.java index 779e371..d398c61 100644 --- a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/mybatisplus/MyMetaObjectHandler.java +++ b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/mybatisplus/MyMetaObjectHandler.java @@ -2,7 +2,6 @@ package com.ruoyi.framework.config.mybatisplus; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import com.ruoyi.common.utils.SecurityUtils; -import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.reflection.MetaObject; import org.springframework.stereotype.Component; @@ -23,6 +22,6 @@ public class MyMetaObjectHandler implements MetaObjectHandler { @Override public void updateFill(MetaObject metaObject) { this.setFieldValByName("updateBy", SecurityUtils.getUserId(), metaObject); - this.setFieldValByName("updateTime", new Date(),metaObject); + this.setFieldValByName("updateTime", new Date(), metaObject); } } diff --git a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java index 9ab794a..1d7bdcf 100644 --- a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java +++ b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java @@ -50,7 +50,7 @@ public class DruidProperties { @Value("${spring.datasource.druid.testOnReturn}") private boolean testOnReturn; - public DruidDataSource dataSource (DruidDataSource datasource) { + public DruidDataSource dataSource(DruidDataSource datasource) { /** 配置初始化大小、最小、最大 */ datasource.setInitialSize(initialSize); datasource.setMaxActive(maxActive); diff --git a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/PermitAllUrlProperties.java b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/PermitAllUrlProperties.java index 0c556b6..69deb17 100644 --- a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/PermitAllUrlProperties.java +++ b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/PermitAllUrlProperties.java @@ -28,7 +28,7 @@ public class PermitAllUrlProperties implements InitializingBean, ApplicationCont private List urls = new ArrayList<>(); @Override - public void afterPropertiesSet () { + public void afterPropertiesSet() { RequestMappingHandlerMapping mapping = applicationContext.getBean(RequestMappingHandlerMapping.class); Map map = mapping.getHandlerMethods(); @@ -48,15 +48,15 @@ public class PermitAllUrlProperties implements InitializingBean, ApplicationCont } @Override - public void setApplicationContext (ApplicationContext context) throws BeansException { + public void setApplicationContext(ApplicationContext context) throws BeansException { this.applicationContext = context; } - public List getUrls () { + public List getUrls() { return urls; } - public void setUrls (List urls) { + public void setUrls(List urls) { this.urls = urls; } } diff --git a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java index 5973b8c..958fa12 100644 --- a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java +++ b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java @@ -11,14 +11,14 @@ import java.util.Map; * @author ruoyi */ public class DynamicDataSource extends AbstractRoutingDataSource { - public DynamicDataSource (DataSource defaultTargetDataSource, Map targetDataSources) { + public DynamicDataSource(DataSource defaultTargetDataSource, Map targetDataSources) { super.setDefaultTargetDataSource(defaultTargetDataSource); super.setTargetDataSources(targetDataSources); super.afterPropertiesSet(); } @Override - protected Object determineCurrentLookupKey () { + protected Object determineCurrentLookupKey() { return DynamicDataSourceContextHolder.getDataSourceType(); } } diff --git a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.java b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.java index 4a793d7..e0c7662 100644 --- a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.java +++ b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.java @@ -20,14 +20,14 @@ public class DynamicDataSourceContextHolder { /** * 获得数据源的变量 */ - public static String getDataSourceType () { + public static String getDataSourceType() { return CONTEXT_HOLDER.get(); } /** * 设置数据源的变量 */ - public static void setDataSourceType (String dsType) { + public static void setDataSourceType(String dsType) { log.info("切换到{}数据源", dsType); CONTEXT_HOLDER.set(dsType); } @@ -35,7 +35,7 @@ public class DynamicDataSourceContextHolder { /** * 清空数据源变量 */ - public static void clearDataSourceType () { + public static void clearDataSourceType() { CONTEXT_HOLDER.remove(); } } diff --git a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java index aeda4ac..202153d 100644 --- a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java +++ b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java @@ -20,7 +20,7 @@ import java.lang.reflect.Method; @Component public abstract class RepeatSubmitInterceptor implements HandlerInterceptor { @Override - public boolean preHandle (HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { + public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { if (handler instanceof HandlerMethod) { HandlerMethod handlerMethod = (HandlerMethod) handler; Method method = handlerMethod.getMethod(); @@ -42,10 +42,8 @@ public abstract class RepeatSubmitInterceptor implements HandlerInterceptor { * * @param request 请求信息 * @param annotation 防重复注解参数 - * * @return 结果 - * * @throws Exception */ - public abstract boolean isRepeatSubmit (HttpServletRequest request, RepeatSubmit annotation); + public abstract boolean isRepeatSubmit(HttpServletRequest request, RepeatSubmit annotation); } diff --git a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java index 363decc..6dd1c73 100644 --- a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java +++ b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java @@ -38,7 +38,7 @@ public class SameUrlDataInterceptor extends RepeatSubmitInterceptor { @SuppressWarnings("unchecked") @Override - public boolean isRepeatSubmit (HttpServletRequest request, RepeatSubmit annotation) { + public boolean isRepeatSubmit(HttpServletRequest request, RepeatSubmit annotation) { String nowParams = ""; if (request instanceof RepeatedlyRequestWrapper) { RepeatedlyRequestWrapper repeatedlyRequest = (RepeatedlyRequestWrapper) request; @@ -81,7 +81,7 @@ public class SameUrlDataInterceptor extends RepeatSubmitInterceptor { /** * 判断参数是否相同 */ - private boolean compareParams (Map nowMap, Map preMap) { + private boolean compareParams(Map nowMap, Map preMap) { String nowParams = (String) nowMap.get(REPEAT_PARAMS); String preParams = (String) preMap.get(REPEAT_PARAMS); return nowParams.equals(preParams); @@ -90,7 +90,7 @@ public class SameUrlDataInterceptor extends RepeatSubmitInterceptor { /** * 判断两次间隔时间 */ - private boolean compareTime (Map nowMap, Map preMap, int interval) { + private boolean compareTime(Map nowMap, Map preMap, int interval) { long time1 = (Long) nowMap.get(REPEAT_TIME); long time2 = (Long) preMap.get(REPEAT_TIME); if ((time1 - time2) < interval) { diff --git a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/AsyncManager.java b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/AsyncManager.java index cc0159c..5dfa423 100644 --- a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/AsyncManager.java +++ b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/AsyncManager.java @@ -26,10 +26,10 @@ public class AsyncManager { /** * 单例模式 */ - private AsyncManager () { + private AsyncManager() { } - public static AsyncManager me () { + public static AsyncManager me() { return me; } @@ -38,14 +38,14 @@ public class AsyncManager { * * @param task 任务 */ - public void execute (TimerTask task) { + public void execute(TimerTask task) { executor.schedule(task, OPERATE_DELAY_TIME, TimeUnit.MILLISECONDS); } /** * 停止任务线程池 */ - public void shutdown () { + public void shutdown() { Threads.shutdownAndAwaitTermination(executor); } } diff --git a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java index 43e508c..0d6a67b 100644 --- a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java +++ b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java @@ -16,14 +16,14 @@ public class ShutdownManager { private static final Logger logger = LoggerFactory.getLogger("sys-user"); @PreDestroy - public void destroy () { + public void destroy() { shutdownAsyncManager(); } /** * 停止异步执行任务 */ - private void shutdownAsyncManager () { + private void shutdownAsyncManager() { try { logger.info("====关闭后台任务任务线程池===="); AsyncManager.me().shutdown(); diff --git a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java index e3d0b97..ed1d2f4 100644 --- a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java +++ b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java @@ -32,16 +32,15 @@ public class AsyncFactory { * @param status 状态 * @param message 消息 * @param args 列表 - * * @return 任务task */ - public static TimerTask recordLogininfor (final String username, final String status, final String message, - final Object... args) { + public static TimerTask recordLogininfor(final String username, final String status, final String message, + final Object... args) { final UserAgent userAgent = UserAgent.parseUserAgentString(ServletUtils.getRequest().getHeader("User-Agent")); final String ip = IpUtils.getIpAddr(); return new TimerTask() { @Override - public void run () { + public void run() { String address = AddressUtils.getRealAddressByIP(ip); StringBuilder s = new StringBuilder(); s.append(LogUtils.getBlock(ip)); @@ -79,13 +78,12 @@ public class AsyncFactory { * 操作日志记录 * * @param operLog 操作日志信息 - * * @return 任务task */ - public static TimerTask recordOper (final SysOperLog operLog) { + public static TimerTask recordOper(final SysOperLog operLog) { return new TimerTask() { @Override - public void run () { + public void run() { // 远程查询操作地点 operLog.setOperLocation(AddressUtils.getRealAddressByIP(operLog.getOperIp())); SpringUtils.getBean(SysOperLogService.class).insertOperlog(operLog); diff --git a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/security/context/AuthenticationContextHolder.java b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/security/context/AuthenticationContextHolder.java index 4e7432f..688c3ee 100644 --- a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/security/context/AuthenticationContextHolder.java +++ b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/security/context/AuthenticationContextHolder.java @@ -10,15 +10,15 @@ import org.springframework.security.core.Authentication; public class AuthenticationContextHolder { private static final ThreadLocal contextHolder = new ThreadLocal<>(); - public static Authentication getContext () { + public static Authentication getContext() { return contextHolder.get(); } - public static void setContext (Authentication context) { + public static void setContext(Authentication context) { contextHolder.set(context); } - public static void clearContext () { + public static void clearContext() { contextHolder.remove(); } } diff --git a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/security/context/PermissionContextHolder.java b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/security/context/PermissionContextHolder.java index e96adb6..a034f24 100644 --- a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/security/context/PermissionContextHolder.java +++ b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/security/context/PermissionContextHolder.java @@ -12,12 +12,12 @@ import org.springframework.web.context.request.RequestContextHolder; public class PermissionContextHolder { private static final String PERMISSION_CONTEXT_ATTRIBUTES = "PERMISSION_CONTEXT"; - public static String getContext () { + public static String getContext() { return Convert.toStr(RequestContextHolder.currentRequestAttributes().getAttribute(PERMISSION_CONTEXT_ATTRIBUTES, RequestAttributes.SCOPE_REQUEST)); } - public static void setContext (String permission) { + public static void setContext(String permission) { RequestContextHolder.currentRequestAttributes().setAttribute(PERMISSION_CONTEXT_ATTRIBUTES, permission, RequestAttributes.SCOPE_REQUEST); } diff --git a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java index b8ec657..f261f25 100644 --- a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java +++ b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java @@ -28,7 +28,7 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter { private TokenService tokenService; @Override - protected void doFilterInternal (HttpServletRequest request, HttpServletResponse response, FilterChain chain) + protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain) throws ServletException, IOException { LoginUser loginUser = tokenService.getLoginUser(request); if (StringUtils.isNotNull(loginUser) && StringUtils.isNull(SecurityUtils.getAuthentication())) { diff --git a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java index 3f3f93c..0293f39 100644 --- a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java +++ b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java @@ -24,7 +24,7 @@ public class AuthenticationEntryPointImpl implements AuthenticationEntryPoint, S private static final long serialVersionUID = -8970718410437077606L; @Override - public void commence (HttpServletRequest request, HttpServletResponse response, AuthenticationException e) + public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException e) throws IOException { int code = HttpStatus.UNAUTHORIZED; String msg = StringUtils.format("请求访问：{}，认证失败，无法访问系统资源", request.getRequestURI()); diff --git a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java index ed2eed3..b90a381 100644 --- a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java +++ b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java @@ -35,7 +35,7 @@ public class LogoutSuccessHandlerImpl implements LogoutSuccessHandler { * @return */ @Override - public void onLogoutSuccess (HttpServletRequest request, HttpServletResponse response, Authentication authentication) + public void onLogoutSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws IOException, ServletException { LoginUser loginUser = tokenService.getLoginUser(request); if (StringUtils.isNotNull(loginUser)) { diff --git a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java index 33b2bdc..fc0e861 100644 --- a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java +++ b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java @@ -51,50 +51,50 @@ public class Server { */ private List sysFiles = new LinkedList(); - public Cpu getCpu () { + public Cpu getCpu() { return cpu; } - public void setCpu (Cpu cpu) { + public void setCpu(Cpu cpu) { this.cpu = cpu; } - public Mem getMem () { + public Mem getMem() { return mem; } - public void setMem (Mem mem) { + public void setMem(Mem mem) { this.mem = mem; } - public Jvm getJvm () { + public Jvm getJvm() { return jvm; } - public void setJvm (Jvm jvm) { + public void setJvm(Jvm jvm) { this.jvm = jvm; } - public Sys getSys () { + public Sys getSys() { return sys; } - public void setSys (Sys sys) { + public void setSys(Sys sys) { this.sys = sys; } - public List getSysFiles () { + public List getSysFiles() { return sysFiles; } - public void setSysFiles (List sysFiles) { + public void setSysFiles(List sysFiles) { this.sysFiles = sysFiles; } /** * 设置磁盘信息 */ - private void setSysFiles (OperatingSystem os) { + private void setSysFiles(OperatingSystem os) { FileSystem fileSystem = os.getFileSystem(); List fsArray = fileSystem.getFileStores(); for (OSFileStore fs : fsArray) { @@ -113,7 +113,7 @@ public class Server { } } - public void copyTo () throws Exception { + public void copyTo() throws Exception { SystemInfo si = new SystemInfo(); HardwareAbstractionLayer hal = si.getHardware(); @@ -131,7 +131,7 @@ public class Server { /** * 设置CPU信息 */ - private void setCpuInfo (CentralProcessor processor) { + private void setCpuInfo(CentralProcessor processor) { // CPU信息 long[] prevTicks = processor.getSystemCpuLoadTicks(); Util.sleep(OSHI_WAIT_SECOND); @@ -156,7 +156,7 @@ public class Server { /** * 设置内存信息 */ - private void setMemInfo (GlobalMemory memory) { + private void setMemInfo(GlobalMemory memory) { mem.setTotal(memory.getTotal()); mem.setUsed(memory.getTotal() - memory.getAvailable()); mem.setFree(memory.getAvailable()); @@ -165,7 +165,7 @@ public class Server { /** * 设置服务器信息 */ - private void setSysInfo () { + private void setSysInfo() { Properties props = System.getProperties(); sys.setComputerName(IpUtils.getHostName()); sys.setComputerIp(IpUtils.getHostIp()); @@ -177,7 +177,7 @@ public class Server { /** * 设置Java虚拟机 */ - private void setJvmInfo () throws UnknownHostException { + private void setJvmInfo() throws UnknownHostException { Properties props = System.getProperties(); jvm.setTotal(Runtime.getRuntime().totalMemory()); jvm.setMax(Runtime.getRuntime().maxMemory()); @@ -190,10 +190,9 @@ public class Server { * 字节转换 * * @param size 字节大小 - * * @return 转换后值 */ - public String convertFileSize (long size) { + public String convertFileSize(long size) { long kb = 1024; long mb = kb * 1024; long gb = mb * 1024; diff --git a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Cpu.java b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Cpu.java index d778c11..4878bbd 100644 --- a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Cpu.java +++ b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Cpu.java @@ -38,51 +38,51 @@ public class Cpu { */ private double free; - public int getCpuNum () { + public int getCpuNum() { return cpuNum; } - public void setCpuNum (int cpuNum) { + public void setCpuNum(int cpuNum) { this.cpuNum = cpuNum; } - public double getTotal () { + public double getTotal() { return Arith.round(Arith.mul(total, 100), 2); } - public void setTotal (double total) { + public void setTotal(double total) { this.total = total; } - public double getSys () { + public double getSys() { return Arith.round(Arith.mul(sys / total, 100), 2); } - public void setSys (double sys) { + public void setSys(double sys) { this.sys = sys; } - public double getUsed () { + public double getUsed() { return Arith.round(Arith.mul(used / total, 100), 2); } - public void setUsed (double used) { + public void setUsed(double used) { this.used = used; } - public double getWait () { + public double getWait() { return Arith.round(Arith.mul(wait / total, 100), 2); } - public void setWait (double wait) { + public void setWait(double wait) { this.wait = wait; } - public double getFree () { + public double getFree() { return Arith.round(Arith.mul(free / total, 100), 2); } - public void setFree (double free) { + public void setFree(double free) { this.free = free; } } diff --git a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java index b9a5d8e..bcd4d10 100644 --- a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java +++ b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java @@ -36,79 +36,79 @@ public class Jvm { */ private String home; - public double getTotal () { + public double getTotal() { return Arith.div(total, (1024 * 1024), 2); } - public void setTotal (double total) { + public void setTotal(double total) { this.total = total; } - public double getMax () { + public double getMax() { return Arith.div(max, (1024 * 1024), 2); } - public void setMax (double max) { + public void setMax(double max) { this.max = max; } - public double getFree () { + public double getFree() { return Arith.div(free, (1024 * 1024), 2); } - public void setFree (double free) { + public void setFree(double free) { this.free = free; } - public double getUsed () { + public double getUsed() { return Arith.div(total - free, (1024 * 1024), 2); } - public double getUsage () { + public double getUsage() { return Arith.mul(Arith.div(total - free, total, 4), 100); } /** * 获取JDK名称 */ - public String getName () { + public String getName() { return ManagementFactory.getRuntimeMXBean().getVmName(); } - public String getVersion () { + public String getVersion() { return version; } - public void setVersion (String version) { + public void setVersion(String version) { this.version = version; } - public String getHome () { + public String getHome() { return home; } - public void setHome (String home) { + public void setHome(String home) { this.home = home; } /** * JDK启动时间 */ - public String getStartTime () { + public String getStartTime() { return DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, DateUtils.getServerStartDate()); } /** * JDK运行时间 */ - public String getRunTime () { + public String getRunTime() { return DateUtils.timeDistance(DateUtils.getNowDate(), DateUtils.getServerStartDate()); } /** * 运行参数 */ - public String getInputArgs () { + public String getInputArgs() { return ManagementFactory.getRuntimeMXBean().getInputArguments().toString(); } } diff --git a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Mem.java b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Mem.java index f9a66ca..f065d81 100644 --- a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Mem.java +++ b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Mem.java @@ -23,31 +23,31 @@ public class Mem { */ private double free; - public double getTotal () { + public double getTotal() { return Arith.div(total, (1024 * 1024 * 1024), 2); } - public void setTotal (long total) { + public void setTotal(long total) { this.total = total; } - public double getUsed () { + public double getUsed() { return Arith.div(used, (1024 * 1024 * 1024), 2); } - public void setUsed (long used) { + public void setUsed(long used) { this.used = used; } - public double getFree () { + public double getFree() { return Arith.div(free, (1024 * 1024 * 1024), 2); } - public void setFree (long free) { + public void setFree(long free) { this.free = free; } - public double getUsage () { + public double getUsage() { return Arith.mul(Arith.div(used, total, 4), 100); } } diff --git a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Sys.java b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Sys.java index 5b66c23..7c3857e 100644 --- a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Sys.java +++ b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Sys.java @@ -31,43 +31,43 @@ public class Sys { */ private String osArch; - public String getComputerName () { + public String getComputerName() { return computerName; } - public void setComputerName (String computerName) { + public void setComputerName(String computerName) { this.computerName = computerName; } - public String getComputerIp () { + public String getComputerIp() { return computerIp; } - public void setComputerIp (String computerIp) { + public void setComputerIp(String computerIp) { this.computerIp = computerIp; } - public String getUserDir () { + public String getUserDir() { return userDir; } - public void setUserDir (String userDir) { + public void setUserDir(String userDir) { this.userDir = userDir; } - public String getOsName () { + public String getOsName() { return osName; } - public void setOsName (String osName) { + public void setOsName(String osName) { this.osName = osName; } - public String getOsArch () { + public String getOsArch() { return osArch; } - public void setOsArch (String osArch) { + public void setOsArch(String osArch) { this.osArch = osArch; } } diff --git a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/SysFile.java b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/SysFile.java index 95d0a1a..0c4710a 100644 --- a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/SysFile.java +++ b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/SysFile.java @@ -41,59 +41,59 @@ public class SysFile { */ private double usage; - public String getDirName () { + public String getDirName() { return dirName; } - public void setDirName (String dirName) { + public void setDirName(String dirName) { this.dirName = dirName; } - public String getSysTypeName () { + public String getSysTypeName() { return sysTypeName; } - public void setSysTypeName (String sysTypeName) { + public void setSysTypeName(String sysTypeName) { this.sysTypeName = sysTypeName; } - public String getTypeName () { + public String getTypeName() { return typeName; } - public void setTypeName (String typeName) { + public void setTypeName(String typeName) { this.typeName = typeName; } - public String getTotal () { + public String getTotal() { return total; } - public void setTotal (String total) { + public void setTotal(String total) { this.total = total; } - public String getFree () { + public String getFree() { return free; } - public void setFree (String free) { + public void setFree(String free) { this.free = free; } - public String getUsed () { + public String getUsed() { return used; } - public void setUsed (String used) { + public void setUsed(String used) { this.used = used; } - public double getUsage () { + public double getUsage() { return usage; } - public void setUsage (double usage) { + public void setUsage(double usage) { this.usage = usage; } } diff --git a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java index 7451236..a1e5262 100644 --- a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java +++ b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java @@ -32,7 +32,7 @@ public class GlobalExceptionHandler { * 权限校验异常 */ @ExceptionHandler(AccessDeniedException.class) - public Result handleAccessDeniedException (AccessDeniedException e, HttpServletRequest request) { + public Result handleAccessDeniedException(AccessDeniedException e, HttpServletRequest request) { String requestURI = request.getRequestURI(); log.error("请求地址'{}',权限校验失败'{}'", requestURI, e.getMessage()); return Result.error(HttpStatus.FORBIDDEN, "没有权限，请联系管理员授权"); @@ -42,8 +42,8 @@ public class GlobalExceptionHandler { * 请求方式不支持 */ @ExceptionHandler(HttpRequestMethodNotSupportedException.class) - public Result handleHttpRequestMethodNotSupported (HttpRequestMethodNotSupportedException e, - HttpServletRequest request) { + public Result handleHttpRequestMethodNotSupported(HttpRequestMethodNotSupportedException e, + HttpServletRequest request) { String requestURI = request.getRequestURI(); log.error("请求地址'{}',不支持'{}'请求", requestURI, e.getMethod()); return Result.error(e.getMessage()); @@ -53,7 +53,7 @@ public class GlobalExceptionHandler { * 业务异常 */ @ExceptionHandler(ServiceException.class) - public Result handleServiceException (ServiceException e, HttpServletRequest request) { + public Result handleServiceException(ServiceException e, HttpServletRequest request) { log.error(e.getMessage(), e); Integer code = e.getCode(); return StringUtils.isNotNull(code) ? Result.error(code.intValue(), e.getMessage()) : Result.error(e.getMessage()); @@ -63,7 +63,7 @@ public class GlobalExceptionHandler { * 请求路径中缺少必需的路径变量 */ @ExceptionHandler(MissingPathVariableException.class) - public Result handleMissingPathVariableException (MissingPathVariableException e, HttpServletRequest request) { + public Result handleMissingPathVariableException(MissingPathVariableException e, HttpServletRequest request) { String requestURI = request.getRequestURI(); log.error("请求路径中缺少必需的路径变量'{}',发生系统异常.", requestURI, e); return Result.error(String.format("请求路径中缺少必需的路径变量[%s]", e.getVariableName())); @@ -73,7 +73,7 @@ public class GlobalExceptionHandler { * 请求参数类型不匹配 */ @ExceptionHandler(MethodArgumentTypeMismatchException.class) - public Result handleMethodArgumentTypeMismatchException (MethodArgumentTypeMismatchException e, HttpServletRequest request) { + public Result handleMethodArgumentTypeMismatchException(MethodArgumentTypeMismatchException e, HttpServletRequest request) { String requestURI = request.getRequestURI(); log.error("请求参数类型不匹配'{}',发生系统异常.", requestURI, e); return Result.error(String.format("请求参数类型不匹配，参数[%s]要求类型为：'%s'，但输入值为：'%s'", e.getName(), e.getRequiredType().getName(), e.getValue())); @@ -83,7 +83,7 @@ public class GlobalExceptionHandler { * 拦截未知的运行时异常 */ @ExceptionHandler(RuntimeException.class) - public Result handleRuntimeException (RuntimeException e, HttpServletRequest request) { + public Result handleRuntimeException(RuntimeException e, HttpServletRequest request) { String requestURI = request.getRequestURI(); log.error("请求地址'{}',发生未知异常.", requestURI, e); return Result.error(e.getMessage()); @@ -93,7 +93,7 @@ public class GlobalExceptionHandler { * 系统异常 */ @ExceptionHandler(Exception.class) - public Result handleException (Exception e, HttpServletRequest request) { + public Result handleException(Exception e, HttpServletRequest request) { String requestURI = request.getRequestURI(); log.error("请求地址'{}',发生系统异常.", requestURI, e); return Result.error(e.getMessage()); @@ -103,7 +103,7 @@ public class GlobalExceptionHandler { * 自定义验证异常 */ @ExceptionHandler(BindException.class) - public Result handleBindException (BindException e) { + public Result handleBindException(BindException e) { log.error(e.getMessage(), e); String message = e.getAllErrors().get(0).getDefaultMessage(); return Result.error(message); @@ -113,7 +113,7 @@ public class GlobalExceptionHandler { * 自定义验证异常 */ @ExceptionHandler(MethodArgumentNotValidException.class) - public Result handleMethodArgumentNotValidException (MethodArgumentNotValidException e) { + public Result handleMethodArgumentNotValidException(MethodArgumentNotValidException e) { log.error(e.getMessage(), e); String message = Objects.requireNonNull(e.getBindingResult().getFieldError()) .getDefaultMessage(); @@ -124,7 +124,7 @@ public class GlobalExceptionHandler { * 演示模式异常 */ @ExceptionHandler(DemoModeException.class) - public Result handleDemoModeException (DemoModeException e) { + public Result handleDemoModeException(DemoModeException e) { return Result.error("演示模式，不允许操作"); } } diff --git a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java index efdefe0..6799bf2 100644 --- a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java +++ b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java @@ -35,10 +35,9 @@ public class PermissionService { * 验证用户是否具备某权限 * * @param permission 权限字符串 - * * @return 用户是否具备某权限 */ - public boolean hasPermi (String permission) { + public boolean hasPermi(String permission) { if (StringUtils.isEmpty(permission)) { return false; } @@ -54,10 +53,9 @@ public class PermissionService { * 验证用户是否不具备某权限，与 hasPermi逻辑相反 * * @param permission 权限字符串 - * * @return 用户是否不具备某权限 */ - public boolean lacksPermi (String permission) { + public boolean lacksPermi(String permission) { return hasPermi(permission) != true; } @@ -65,10 +63,9 @@ public class PermissionService { * 验证用户是否具有以下任意一个权限 * * @param permissions 以 PERMISSION_DELIMETER 为分隔符的权限列表 - * * @return 用户是否具有以下任意一个权限 */ - public boolean hasAnyPermi (String permissions) { + public boolean hasAnyPermi(String permissions) { if (StringUtils.isEmpty(permissions)) { return false; } @@ -90,10 +87,9 @@ public class PermissionService { * 判断用户是否拥有某个角色 * * @param role 角色字符串 - * * @return 用户是否具备某角色 */ - public boolean hasRole (String role) { + public boolean hasRole(String role) { if (StringUtils.isEmpty(role)) { return false; } @@ -114,10 +110,9 @@ public class PermissionService { * 验证用户是否不具备某角色，与 isRole逻辑相反。 * * @param role 角色名称 - * * @return 用户是否不具备某角色 */ - public boolean lacksRole (String role) { + public boolean lacksRole(String role) { return hasRole(role) != true; } @@ -125,10 +120,9 @@ public class PermissionService { * 验证用户是否具有以下任意一个角色 * * @param roles 以 ROLE_NAMES_DELIMETER 为分隔符的角色列表 - * * @return 用户是否具有以下任意一个角色 */ - public boolean hasAnyRoles (String roles) { + public boolean hasAnyRoles(String roles) { if (StringUtils.isEmpty(roles)) { return false; } @@ -149,10 +143,9 @@ public class PermissionService { * * @param permissions 权限列表 * @param permission 权限字符串 - * * @return 用户是否具备某权限 */ - private boolean hasPermissions (Set permissions, String permission) { + private boolean hasPermissions(Set permissions, String permission) { return permissions.contains(ALL_PERMISSION) || permissions.contains(StringUtils.trim(permission)); } } diff --git a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java index 2baba6c..97bd589 100644 --- a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java +++ b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java @@ -55,10 +55,9 @@ public class SysLoginService { * @param password 密码 * @param code 验证码 * @param uuid 唯一标识 - * * @return 结果 */ - public String login (String username, String password, String code, String uuid) { + public String login(String username, String password, String code, String uuid) { // 验证码校验 validateCaptcha(username, code, uuid); // 登录前置校验 @@ -94,10 +93,9 @@ public class SysLoginService { * @param username 用户名 * @param code 验证码 * @param uuid 唯一标识 - * * @return 结果 */ - public void validateCaptcha (String username, String code, String uuid) { + public void validateCaptcha(String username, String code, String uuid) { boolean captchaEnabled = configService.selectCaptchaEnabled(); if (captchaEnabled) { String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + StringUtils.nvl(uuid, ""); @@ -120,7 +118,7 @@ public class SysLoginService { * @param username 用户名 * @param password 用户密码 */ - public void loginPreCheck (String username, String password) { + public void loginPreCheck(String username, String password) { // 用户名或密码为空 错误 if (StringUtils.isEmpty(username) || StringUtils.isEmpty(password)) { AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("not.null"))); @@ -151,7 +149,7 @@ public class SysLoginService { * * @param userId 用户ID */ - public void recordLoginInfo (Long userId) { + public void recordLoginInfo(Long userId) { SysUser sysUser = new SysUser(); sysUser.setUserId(userId); sysUser.setLoginIp(IpUtils.getIpAddr()); diff --git a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPasswordService.java b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPasswordService.java index 5960a7c..3ac9a0a 100644 --- a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPasswordService.java +++ b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPasswordService.java @@ -38,14 +38,13 @@ public class SysPasswordService { * 登录账户密码错误次数缓存键名 * * @param username 用户名 - * * @return 缓存键key */ - private String getCacheKey (String username) { + private String getCacheKey(String username) { return CacheConstants.PWD_ERR_CNT_KEY + username; } - public void validate (SysUser user) { + public void validate(SysUser user) { Authentication usernamePasswordAuthenticationToken = AuthenticationContextHolder.getContext(); String username = usernamePasswordAuthenticationToken.getName(); String password = usernamePasswordAuthenticationToken.getCredentials().toString(); @@ -73,11 +72,11 @@ public class SysPasswordService { } } - public boolean matches (SysUser user, String rawPassword) { + public boolean matches(SysUser user, String rawPassword) { return SecurityUtils.matchesPassword(rawPassword, user.getPassword()); } - public void clearLoginRecordCache (String loginName) { + public void clearLoginRecordCache(String loginName) { if (redisCache.hasKey(getCacheKey(loginName))) { redisCache.deleteObject(getCacheKey(loginName)); } diff --git a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java index 1edaafe..15df9d3 100644 --- a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java +++ b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java @@ -29,10 +29,9 @@ public class SysPermissionService { * 获取角色数据权限 * * @param user 用户信息 - * * @return 角色权限信息 */ - public Set getRolePermission (SysUser user) { + public Set getRolePermission(SysUser user) { Set roles = new HashSet(); // 管理员拥有所有权限 if (user.isAdmin()) { @@ -47,10 +46,9 @@ public class SysPermissionService { * 获取菜单数据权限 * * @param user 用户信息 - * * @return 菜单权限信息 */ - public Set getMenuPermission (SysUser user) { + public Set getMenuPermission(SysUser user) { Set perms = new HashSet(); // 管理员拥有所有权限 if (user.isAdmin()) { diff --git a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java index fef6b1d..db1cac2 100644 --- a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java +++ b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java @@ -37,7 +37,7 @@ public class SysRegisterService { /** * 注册 */ - public String register (RegisterBody registerBody) { + public String register(RegisterBody registerBody) { String msg = "", username = registerBody.getUsername(), password = registerBody.getPassword(); SysUser sysUser = new SysUser(); sysUser.setUserName(username); @@ -79,10 +79,9 @@ public class SysRegisterService { * @param username 用户名 * @param code 验证码 * @param uuid 唯一标识 - * * @return 结果 */ - public void validateCaptcha (String username, String code, String uuid) { + public void validateCaptcha(String username, String code, String uuid) { String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + StringUtils.nvl(uuid, ""); String captcha = redisCache.getCacheObject(verifyKey); redisCache.deleteObject(verifyKey); diff --git a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java index 5452e87..3dfa158 100644 --- a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java +++ b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java @@ -52,7 +52,7 @@ public class TokenService { * * @return 用户信息 */ - public LoginUser getLoginUser (HttpServletRequest request) { + public LoginUser getLoginUser(HttpServletRequest request) { // 获取请求携带的令牌 String token = getToken(request); if (StringUtils.isNotEmpty(token)) { @@ -73,7 +73,7 @@ public class TokenService { /** * 设置用户身份信息 */ - public void setLoginUser (LoginUser loginUser) { + public void setLoginUser(LoginUser loginUser) { if (StringUtils.isNotNull(loginUser) && StringUtils.isNotEmpty(loginUser.getToken())) { refreshToken(loginUser); } @@ -82,7 +82,7 @@ public class TokenService { /** * 删除用户身份信息 */ - public void delLoginUser (String token) { + public void delLoginUser(String token) { if (StringUtils.isNotEmpty(token)) { String userKey = getTokenKey(token); redisCache.deleteObject(userKey); @@ -93,10 +93,9 @@ public class TokenService { * 创建令牌 * * @param loginUser 用户信息 - * * @return 令牌 */ - public String createToken (LoginUser loginUser) { + public String createToken(LoginUser loginUser) { String token = IdUtils.fastUUID(); loginUser.setToken(token); setUserAgent(loginUser); @@ -111,10 +110,9 @@ public class TokenService { * 验证令牌有效期，相差不足20分钟，自动刷新缓存 * * @param loginUser - * * @return 令牌 */ - public void verifyToken (LoginUser loginUser) { + public void verifyToken(LoginUser loginUser) { long expireTime = loginUser.getExpireTime(); long currentTime = System.currentTimeMillis(); if (expireTime - currentTime <= MILLIS_MINUTE_TEN) { @@ -127,7 +125,7 @@ public class TokenService { * * @param loginUser 登录信息 */ - public void refreshToken (LoginUser loginUser) { + public void refreshToken(LoginUser loginUser) { loginUser.setLoginTime(System.currentTimeMillis()); loginUser.setExpireTime(loginUser.getLoginTime() + expireTime * MILLIS_MINUTE); // 根据uuid将loginUser缓存 @@ -140,7 +138,7 @@ public class TokenService { * * @param loginUser 登录信息 */ - public void setUserAgent (LoginUser loginUser) { + public void setUserAgent(LoginUser loginUser) { UserAgent userAgent = UserAgent.parseUserAgentString(ServletUtils.getRequest().getHeader("User-Agent")); String ip = IpUtils.getIpAddr(); loginUser.setIpaddr(ip); @@ -153,10 +151,9 @@ public class TokenService { * 从数据声明生成令牌 * * @param claims 数据声明 - * * @return 令牌 */ - private String createToken (Map claims) { + private String createToken(Map claims) { String token = Jwts.builder() .setClaims(claims) .signWith(SignatureAlgorithm.HS512, secret).compact(); @@ -167,10 +164,9 @@ public class TokenService { * 从令牌中获取数据声明 * * @param token 令牌 - * * @return 数据声明 */ - private Claims parseToken (String token) { + private Claims parseToken(String token) { return Jwts.parser() .setSigningKey(secret) .parseClaimsJws(token) @@ -181,10 +177,9 @@ public class TokenService { * 从令牌中获取用户名 * * @param token 令牌 - * * @return 用户名 */ - public String getUsernameFromToken (String token) { + public String getUsernameFromToken(String token) { Claims claims = parseToken(token); return claims.getSubject(); } @@ -193,10 +188,9 @@ public class TokenService { * 获取请求token * * @param request - * * @return token */ - private String getToken (HttpServletRequest request) { + private String getToken(HttpServletRequest request) { String token = request.getHeader(header); if (StringUtils.isNotEmpty(token) && token.startsWith(Constants.TOKEN_PREFIX)) { token = token.replace(Constants.TOKEN_PREFIX, ""); @@ -204,7 +198,7 @@ public class TokenService { return token; } - private String getTokenKey (String uuid) { + private String getTokenKey(String uuid) { return CacheConstants.LOGIN_TOKEN_KEY + uuid; } } diff --git a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java index 2265820..6bc70ca 100644 --- a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java +++ b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java @@ -34,7 +34,7 @@ public class UserDetailsServiceImpl implements UserDetailsService { private SysPermissionService permissionService; @Override - public UserDetails loadUserByUsername (String username) throws UsernameNotFoundException { + public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { SysUser user = userService.selectUserByUserName(username); if (StringUtils.isNull(user)) { log.info("登录用户：{} 不存在.", username); @@ -52,7 +52,7 @@ public class UserDetailsServiceImpl implements UserDetailsService { return createLoginUser(user); } - public UserDetails createLoginUser (SysUser user) { + public UserDetails createLoginUser(SysUser user) { return new LoginUser(user.getUserId(), user.getDeptId(), user, permissionService.getMenuPermission(user)); } } diff --git a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java index 3442b59..7baa6cd 100644 --- a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java +++ b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java @@ -34,39 +34,39 @@ public class GenConfig { */ public static String tablePrefix; - public static String getAuthor () { + public static String getAuthor() { return author; } @Value("${author}") - public void setAuthor (String author) { + public void setAuthor(String author) { GenConfig.author = author; } - public static String getPackageName () { + public static String getPackageName() { return packageName; } @Value("${packageName}") - public void setPackageName (String packageName) { + public void setPackageName(String packageName) { GenConfig.packageName = packageName; } - public static boolean getAutoRemovePre () { + public static boolean getAutoRemovePre() { return autoRemovePre; } @Value("${autoRemovePre}") - public void setAutoRemovePre (boolean autoRemovePre) { + public void setAutoRemovePre(boolean autoRemovePre) { GenConfig.autoRemovePre = autoRemovePre; } - public static String getTablePrefix () { + public static String getTablePrefix() { return tablePrefix; } @Value("${tablePrefix}") - public void setTablePrefix (String tablePrefix) { + public void setTablePrefix(String tablePrefix) { GenConfig.tablePrefix = tablePrefix; } } diff --git a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java index a09fe44..7a1f85d 100644 --- a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java +++ b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java @@ -41,7 +41,7 @@ public class GenController extends BaseController { */ @PreAuthorize("@ss.hasPermi('tool:gen:list')") @GetMapping("/list") - public Result> genList (GenTable genTable) { + public Result> genList(GenTable genTable) { startPage(); List list = genTableService.selectGenTableList(genTable); return getDataTable(list); @@ -52,7 +52,7 @@ public class GenController extends BaseController { */ @PreAuthorize("@ss.hasPermi('tool:gen:query')") @GetMapping(value = "/{tableId}") - public Result> getInfo (@PathVariable Long tableId) { + public Result> getInfo(@PathVariable Long tableId) { GenTable table = genTableService.selectGenTableById(tableId); List tables = genTableService.selectGenTableAll(); List list = genTableColumnService.selectGenTableColumnListByTableId(tableId); @@ -68,7 +68,7 @@ public class GenController extends BaseController { */ @PreAuthorize("@ss.hasPermi('tool:gen:list')") @GetMapping("/db/list") - public Result> dataList (GenTable genTable) { + public Result> dataList(GenTable genTable) { startPage(); List list = genTableService.selectDbTableList(genTable); return getDataTable(list); @@ -79,7 +79,7 @@ public class GenController extends BaseController { */ @PreAuthorize("@ss.hasPermi('tool:gen:list')") @GetMapping(value = "/column/{tableId}") - public Result> columnList (@PathVariable("tableId") Long tableId) { + public Result> columnList(@PathVariable("tableId") Long tableId) { List list = genTableColumnService.selectGenTableColumnListByTableId(tableId); return Result.success(TableDataInfo.builder() .rows(list) @@ -93,7 +93,7 @@ public class GenController extends BaseController { @PreAuthorize("@ss.hasPermi('tool:gen:import')") @Log(title = "代码生成", businessType = BusinessType.IMPORT) @PostMapping("/importTable") - public Result importTableSave (String tables) { + public Result importTableSave(String tables) { String[] tableNames = Convert.toStrArray(tables); // 查询表信息 List tableList = genTableService.selectDbTableListByNames(tableNames); @@ -107,7 +107,7 @@ public class GenController extends BaseController { @PreAuthorize("@ss.hasPermi('tool:gen:edit')") @Log(title = "代码生成", businessType = BusinessType.UPDATE) @PutMapping - public Result editSave (@Validated @RequestBody GenTable genTable) { + public Result editSave(@Validated @RequestBody GenTable genTable) { genTableService.validateEdit(genTable); genTableService.updateGenTable(genTable); return Result.success(); @@ -119,7 +119,7 @@ public class GenController extends BaseController { @PreAuthorize("@ss.hasPermi('tool:gen:remove')") @Log(title = "代码生成", businessType = BusinessType.DELETE) @DeleteMapping("/{tableIds}") - public Result remove (@PathVariable Long[] tableIds) { + public Result remove(@PathVariable Long[] tableIds) { genTableService.deleteGenTableByIds(tableIds); return Result.success(); } @@ -129,7 +129,7 @@ public class GenController extends BaseController { */ @PreAuthorize("@ss.hasPermi('tool:gen:preview')") @GetMapping("/preview/{tableId}") - public Result> preview (@PathVariable("tableId") Long tableId) { + public Result> preview(@PathVariable("tableId") Long tableId) { Map dataMap = genTableService.previewCode(tableId); return Result.success(dataMap); } @@ -140,7 +140,7 @@ public class GenController extends BaseController { @PreAuthorize("@ss.hasPermi('tool:gen:code')") @Log(title = "代码生成", businessType = BusinessType.GENCODE) @GetMapping("/download/{tableName}") - public void download (HttpServletResponse response, @PathVariable("tableName") String tableName) throws IOException { + public void download(HttpServletResponse response, @PathVariable("tableName") String tableName) throws IOException { byte[] data = genTableService.downloadCode(tableName); genCode(response, data); } @@ -151,7 +151,7 @@ public class GenController extends BaseController { @PreAuthorize("@ss.hasPermi('tool:gen:code')") @Log(title = "代码生成", businessType = BusinessType.GENCODE) @GetMapping("/genCode/{tableName}") - public Result genCode (@PathVariable("tableName") String tableName) { + public Result genCode(@PathVariable("tableName") String tableName) { genTableService.generatorCode(tableName); return Result.success(); } @@ -162,7 +162,7 @@ public class GenController extends BaseController { @PreAuthorize("@ss.hasPermi('tool:gen:edit')") @Log(title = "代码生成", businessType = BusinessType.UPDATE) @GetMapping("/synchDb/{tableName}") - public Result syncDb (@PathVariable("tableName") String tableName) { + public Result syncDb(@PathVariable("tableName") String tableName) { genTableService.syncDb(tableName); return Result.success(); } @@ -173,7 +173,7 @@ public class GenController extends BaseController { @PreAuthorize("@ss.hasPermi('tool:gen:code')") @Log(title = "代码生成", businessType = BusinessType.GENCODE) @GetMapping("/batchGenCode") - public void batchGenCode (HttpServletResponse response, String tables) throws IOException { + public void batchGenCode(HttpServletResponse response, String tables) throws IOException { String[] tableNames = Convert.toStrArray(tables); byte[] data = genTableService.downloadCode(tableNames); genCode(response, data); @@ -182,7 +182,7 @@ public class GenController extends BaseController { /** * 生成zip文件 */ - private void genCode (HttpServletResponse response, byte[] data) throws IOException { + private void genCode(HttpServletResponse response, byte[] data) throws IOException { response.reset(); response.addHeader("Access-Control-Allow-Origin", "*"); response.addHeader("Access-Control-Expose-Headers", "Content-Disposition"); diff --git a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java index fec91b4..12c7f14 100644 --- a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java +++ b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java @@ -153,15 +153,15 @@ public class GenTable extends BaseEntity { private String remark; - public static boolean isTree (String tplCategory) { + public static boolean isTree(String tplCategory) { return tplCategory != null && StringUtils.equals(GenConstants.TPL_TREE, tplCategory); } - public static boolean isCrud (String tplCategory) { + public static boolean isCrud(String tplCategory) { return tplCategory != null && StringUtils.equals(GenConstants.TPL_CRUD, tplCategory); } - public static boolean isSuperColumn (String tplCategory, String javaField) { + public static boolean isSuperColumn(String tplCategory, String javaField) { if (isTree(tplCategory)) { return StringUtils.equalsAnyIgnoreCase(javaField, ArrayUtils.addAll(GenConstants.TREE_ENTITY, GenConstants.BASE_ENTITY)); @@ -169,15 +169,15 @@ public class GenTable extends BaseEntity { return StringUtils.equalsAnyIgnoreCase(javaField, GenConstants.BASE_ENTITY); } - public boolean isTree () { + public boolean isTree() { return isTree(this.tplCategory); } - public boolean isCrud () { + public boolean isCrud() { return isCrud(this.tplCategory); } - public boolean isSuperColumn (String javaField) { + public boolean isSuperColumn(String javaField) { return isSuperColumn(this.tplCategory, javaField); } } diff --git a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java index 62e11af..ed0c90b 100644 --- a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java +++ b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java @@ -104,7 +104,7 @@ public class GenTableColumn extends BaseEntity { */ private Integer sort; - public static boolean isSuperColumn (String javaField) { + public static boolean isSuperColumn(String javaField) { return StringUtils.equalsAnyIgnoreCase(javaField, // BaseEntity "createBy", "createTime", "updateBy", "updateTime", "remark", @@ -112,224 +112,224 @@ public class GenTableColumn extends BaseEntity { "parentName", "parentId", "orderNum", "ancestors"); } - public static boolean isUsableColumn (String javaField) { + public static boolean isUsableColumn(String javaField) { // isSuperColumn()中的名单用于避免生成多余Domain属性，若某些属性在生成页面时需要用到不能忽略，则放在此处白名单 return StringUtils.equalsAnyIgnoreCase(javaField, "parentId", "orderNum", "remark"); } - public Long getColumnId () { + public Long getColumnId() { return columnId; } - public void setColumnId (Long columnId) { + public void setColumnId(Long columnId) { this.columnId = columnId; } - public Long getTableId () { + public Long getTableId() { return tableId; } - public void setTableId (Long tableId) { + public void setTableId(Long tableId) { this.tableId = tableId; } - public String getColumnName () { + public String getColumnName() { return columnName; } - public void setColumnName (String columnName) { + public void setColumnName(String columnName) { this.columnName = columnName; } - public String getColumnComment () { + public String getColumnComment() { return columnComment; } - public void setColumnComment (String columnComment) { + public void setColumnComment(String columnComment) { this.columnComment = columnComment; } - public String getColumnType () { + public String getColumnType() { return columnType; } - public void setColumnType (String columnType) { + public void setColumnType(String columnType) { this.columnType = columnType; } - public String getJavaType () { + public String getJavaType() { return javaType; } - public void setJavaType (String javaType) { + public void setJavaType(String javaType) { this.javaType = javaType; } - public String getJavaField () { + public String getJavaField() { return javaField; } - public void setJavaField (String javaField) { + public void setJavaField(String javaField) { this.javaField = javaField; } - public String getCapJavaField () { + public String getCapJavaField() { return StringUtils.capitalize(javaField); } - public String getIsPk () { + public String getIsPk() { return isPk; } - public void setIsPk (String isPk) { + public void setIsPk(String isPk) { this.isPk = isPk; } - public boolean isPk () { + public boolean isPk() { return isPk(this.isPk); } - public boolean isPk (String isPk) { + public boolean isPk(String isPk) { return isPk != null && StringUtils.equals("1", isPk); } - public String getIsIncrement () { + public String getIsIncrement() { return isIncrement; } - public void setIsIncrement (String isIncrement) { + public void setIsIncrement(String isIncrement) { this.isIncrement = isIncrement; } - public boolean isIncrement () { + public boolean isIncrement() { return isIncrement(this.isIncrement); } - public boolean isIncrement (String isIncrement) { + public boolean isIncrement(String isIncrement) { return isIncrement != null && StringUtils.equals("1", isIncrement); } - public String getIsRequired () { + public String getIsRequired() { return isRequired; } - public void setIsRequired (String isRequired) { + public void setIsRequired(String isRequired) { this.isRequired = isRequired; } - public boolean isRequired () { + public boolean isRequired() { return isRequired(this.isRequired); } - public boolean isRequired (String isRequired) { + public boolean isRequired(String isRequired) { return isRequired != null && StringUtils.equals("1", isRequired); } - public String getIsInsert () { + public String getIsInsert() { return isInsert; } - public void setIsInsert (String isInsert) { + public void setIsInsert(String isInsert) { this.isInsert = isInsert; } - public boolean isInsert () { + public boolean isInsert() { return isInsert(this.isInsert); } - public boolean isInsert (String isInsert) { + public boolean isInsert(String isInsert) { return isInsert != null && StringUtils.equals("1", isInsert); } - public String getIsEdit () { + public String getIsEdit() { return isEdit; } - public void setIsEdit (String isEdit) { + public void setIsEdit(String isEdit) { this.isEdit = isEdit; } - public boolean isEdit () { + public boolean isEdit() { return isInsert(this.isEdit); } - public boolean isEdit (String isEdit) { + public boolean isEdit(String isEdit) { return isEdit != null && StringUtils.equals("1", isEdit); } - public String getIsList () { + public String getIsList() { return isList; } - public void setIsList (String isList) { + public void setIsList(String isList) { this.isList = isList; } - public boolean isList () { + public boolean isList() { return isList(this.isList); } - public boolean isList (String isList) { + public boolean isList(String isList) { return isList != null && StringUtils.equals("1", isList); } - public String getIsQuery () { + public String getIsQuery() { return isQuery; } - public void setIsQuery (String isQuery) { + public void setIsQuery(String isQuery) { this.isQuery = isQuery; } - public boolean isQuery () { + public boolean isQuery() { return isQuery(this.isQuery); } - public boolean isQuery (String isQuery) { + public boolean isQuery(String isQuery) { return isQuery != null && StringUtils.equals("1", isQuery); } - public String getQueryType () { + public String getQueryType() { return queryType; } - public void setQueryType (String queryType) { + public void setQueryType(String queryType) { this.queryType = queryType; } - public String getHtmlType () { + public String getHtmlType() { return htmlType; } - public void setHtmlType (String htmlType) { + public void setHtmlType(String htmlType) { this.htmlType = htmlType; } - public String getDictType () { + public String getDictType() { return dictType; } - public void setDictType (String dictType) { + public void setDictType(String dictType) { this.dictType = dictType; } - public Integer getSort () { + public Integer getSort() { return sort; } - public void setSort (Integer sort) { + public void setSort(Integer sort) { this.sort = sort; } - public boolean isSuperColumn () { + public boolean isSuperColumn() { return isSuperColumn(this.javaField); } - public boolean isUsableColumn () { + public boolean isUsableColumn() { return isUsableColumn(javaField); } - public String readConverterExp () { + public String readConverterExp() { String remarks = StringUtils.substringBetween(this.columnComment, "（", "）"); StringBuffer sb = new StringBuffer(); if (StringUtils.isNotEmpty(remarks)) { diff --git a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java index 2af56c2..2b9470f 100644 --- a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java +++ b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java @@ -14,53 +14,47 @@ public interface GenTableColumnMapper { * 根据表名称查询列信息 * * @param tableName 表名称 - * * @return 列信息 */ - public List selectDbTableColumnsByName (String tableName); + public List selectDbTableColumnsByName(String tableName); /** * 查询业务字段列表 * * @param tableId 业务字段编号 - * * @return 业务字段集合 */ - public List selectGenTableColumnListByTableId (Long tableId); + public List selectGenTableColumnListByTableId(Long tableId); /** * 新增业务字段 * * @param genTableColumn 业务字段信息 - * * @return 结果 */ - public int insertGenTableColumn (GenTableColumn genTableColumn); + public int insertGenTableColumn(GenTableColumn genTableColumn); /** * 修改业务字段 * * @param genTableColumn 业务字段信息 - * * @return 结果 */ - public int updateGenTableColumn (GenTableColumn genTableColumn); + public int updateGenTableColumn(GenTableColumn genTableColumn); /** * 删除业务字段 * * @param genTableColumns 列数据 - * * @return 结果 */ - public int deleteGenTableColumns (List genTableColumns); + public int deleteGenTableColumns(List genTableColumns); /** * 批量删除业务字段 * * @param ids 需要删除的数据ID - * * @return 结果 */ - public int deleteGenTableColumnByIds (Long[] ids); + public int deleteGenTableColumnByIds(Long[] ids); } diff --git a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java index a426b18..5b3e16b 100644 --- a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java +++ b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java @@ -14,78 +14,70 @@ public interface GenTableMapper { * 查询业务列表 * * @param genTable 业务信息 - * * @return 业务集合 */ - public List selectGenTableList (GenTable genTable); + public List selectGenTableList(GenTable genTable); /** * 查询据库列表 * * @param genTable 业务信息 - * * @return 数据库表集合 */ - public List selectDbTableList (GenTable genTable); + public List selectDbTableList(GenTable genTable); /** * 查询据库列表 * * @param tableNames 表名称组 - * * @return 数据库表集合 */ - public List selectDbTableListByNames (String[] tableNames); + public List selectDbTableListByNames(String[] tableNames); /** * 查询所有表信息 * * @return 表信息集合 */ - public List selectGenTableAll (); + public List selectGenTableAll(); /** * 查询表ID业务信息 * * @param id 业务ID - * * @return 业务信息 */ - public GenTable selectGenTableById (Long id); + public GenTable selectGenTableById(Long id); /** * 查询表名称业务信息 * * @param tableName 表名称 - * * @return 业务信息 */ - public GenTable selectGenTableByName (String tableName); + public GenTable selectGenTableByName(String tableName); /** * 新增业务 * * @param genTable 业务信息 - * * @return 结果 */ - public int insertGenTable (GenTable genTable); + public int insertGenTable(GenTable genTable); /** * 修改业务 * * @param genTable 业务信息 - * * @return 结果 */ - public int updateGenTable (GenTable genTable); + public int updateGenTable(GenTable genTable); /** * 批量删除业务 * * @param ids 需要删除的数据ID - * * @return 结果 */ - public int deleteGenTableByIds (Long[] ids); + public int deleteGenTableByIds(Long[] ids); } diff --git a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnService.java b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnService.java index 662e112..7d1e5bc 100644 --- a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnService.java +++ b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnService.java @@ -14,35 +14,31 @@ public interface GenTableColumnService { * 查询业务字段列表 * * @param tableId 业务字段编号 - * * @return 业务字段集合 */ - public List selectGenTableColumnListByTableId (Long tableId); + public List selectGenTableColumnListByTableId(Long tableId); /** * 新增业务字段 * * @param genTableColumn 业务字段信息 - * * @return 结果 */ - public int insertGenTableColumn (GenTableColumn genTableColumn); + public int insertGenTableColumn(GenTableColumn genTableColumn); /** * 修改业务字段 * * @param genTableColumn 业务字段信息 - * * @return 结果 */ - public int updateGenTableColumn (GenTableColumn genTableColumn); + public int updateGenTableColumn(GenTableColumn genTableColumn); /** * 删除业务字段信息 * * @param ids 需要删除的数据ID - * * @return 结果 */ - public int deleteGenTableColumnByIds (String ids); + public int deleteGenTableColumnByIds(String ids); } diff --git a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableService.java b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableService.java index d951d6c..fb2b3c3 100644 --- a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableService.java +++ b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableService.java @@ -15,117 +15,107 @@ public interface GenTableService { * 查询业务列表 * * @param genTable 业务信息 - * * @return 业务集合 */ - public List selectGenTableList (GenTable genTable); + public List selectGenTableList(GenTable genTable); /** * 查询据库列表 * * @param genTable 业务信息 - * * @return 数据库表集合 */ - public List selectDbTableList (GenTable genTable); + public List selectDbTableList(GenTable genTable); /** * 查询据库列表 * * @param tableNames 表名称组 - * * @return 数据库表集合 */ - public List selectDbTableListByNames (String[] tableNames); + public List selectDbTableListByNames(String[] tableNames); /** * 查询所有表信息 * * @return 表信息集合 */ - public List selectGenTableAll (); + public List selectGenTableAll(); /** * 查询业务信息 * * @param id 业务ID - * * @return 业务信息 */ - public GenTable selectGenTableById (Long id); + public GenTable selectGenTableById(Long id); /** * 修改业务 * * @param genTable 业务信息 - * * @return 结果 */ - public void updateGenTable (GenTable genTable); + public void updateGenTable(GenTable genTable); /** * 删除业务信息 * * @param tableIds 需要删除的表数据ID - * * @return 结果 */ - public void deleteGenTableByIds (Long[] tableIds); + public void deleteGenTableByIds(Long[] tableIds); /** * 导入表结构 * * @param tableList 导入表列表 */ - public void importGenTable (List tableList); + public void importGenTable(List tableList); /** * 预览代码 * * @param tableId 表编号 - * * @return 预览数据列表 */ - public Map previewCode (Long tableId); + public Map previewCode(Long tableId); /** * 生成代码（下载方式） * * @param tableName 表名称 - * * @return 数据 */ - public byte[] downloadCode (String tableName); + public byte[] downloadCode(String tableName); /** * 生成代码（自定义路径） * * @param tableName 表名称 - * * @return 数据 */ - public void generatorCode (String tableName); + public void generatorCode(String tableName); /** * 同步数据库 * * @param tableName 表名称 */ - public void syncDb (String tableName); + public void syncDb(String tableName); /** * 批量生成代码（下载方式） * * @param tableNames 表数组 - * * @return 数据 */ - public byte[] downloadCode (String[] tableNames); + public byte[] downloadCode(String[] tableNames); /** * 修改保存参数校验 * * @param genTable 业务信息 */ - public void validateEdit (GenTable genTable); + public void validateEdit(GenTable genTable); } diff --git a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/service/impl/GenTableColumnServiceImpl.java b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/service/impl/GenTableColumnServiceImpl.java index 6e4ebd5..d7cf3a3 100644 --- a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/service/impl/GenTableColumnServiceImpl.java +++ b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/service/impl/GenTableColumnServiceImpl.java @@ -23,11 +23,10 @@ public class GenTableColumnServiceImpl implements GenTableColumnService { * 查询业务字段列表 * * @param tableId 业务字段编号 - * * @return 业务字段集合 */ @Override - public List selectGenTableColumnListByTableId (Long tableId) { + public List selectGenTableColumnListByTableId(Long tableId) { return genTableColumnMapper.selectGenTableColumnListByTableId(tableId); } @@ -35,11 +34,10 @@ public class GenTableColumnServiceImpl implements GenTableColumnService { * 新增业务字段 * * @param genTableColumn 业务字段信息 - * * @return 结果 */ @Override - public int insertGenTableColumn (GenTableColumn genTableColumn) { + public int insertGenTableColumn(GenTableColumn genTableColumn) { return genTableColumnMapper.insertGenTableColumn(genTableColumn); } @@ -47,11 +45,10 @@ public class GenTableColumnServiceImpl implements GenTableColumnService { * 修改业务字段 * * @param genTableColumn 业务字段信息 - * * @return 结果 */ @Override - public int updateGenTableColumn (GenTableColumn genTableColumn) { + public int updateGenTableColumn(GenTableColumn genTableColumn) { return genTableColumnMapper.updateGenTableColumn(genTableColumn); } @@ -59,11 +56,10 @@ public class GenTableColumnServiceImpl implements GenTableColumnService { * 删除业务字段对象 * * @param ids 需要删除的数据ID - * * @return 结果 */ @Override - public int deleteGenTableColumnByIds (String ids) { + public int deleteGenTableColumnByIds(String ids) { return genTableColumnMapper.deleteGenTableColumnByIds(Convert.toLongArray(ids)); } } diff --git a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/service/impl/GenTableServiceImpl.java b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/service/impl/GenTableServiceImpl.java index 78833c3..30fa84d 100644 --- a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/service/impl/GenTableServiceImpl.java +++ b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/service/impl/GenTableServiceImpl.java @@ -59,10 +59,9 @@ public class GenTableServiceImpl implements GenTableService { * * @param table 业务表信息 * @param template 模板文件路径 - * * @return 生成地址 */ - public static String getGenPath (GenTable table, String template) { + public static String getGenPath(GenTable table, String template) { String genPath = table.getGenPath(); if (StringUtils.equals(genPath, "/")) { return System.getProperty("user.dir") + File.separator + "src" + File.separator + VelocityUtils.getFileName(template, table); @@ -74,11 +73,10 @@ public class GenTableServiceImpl implements GenTableService { * 查询业务信息 * * @param id 业务ID - * * @return 业务信息 */ @Override - public GenTable selectGenTableById (Long id) { + public GenTable selectGenTableById(Long id) { GenTable genTable = genTableMapper.selectGenTableById(id); setTableFromOptions(genTable); return genTable; @@ -88,11 +86,10 @@ public class GenTableServiceImpl implements GenTableService { * 查询业务列表 * * @param genTable 业务信息 - * * @return 业务集合 */ @Override - public List selectGenTableList (GenTable genTable) { + public List selectGenTableList(GenTable genTable) { return genTableMapper.selectGenTableList(genTable); } @@ -100,11 +97,10 @@ public class GenTableServiceImpl implements GenTableService { * 查询据库列表 * * @param genTable 业务信息 - * * @return 数据库表集合 */ @Override - public List selectDbTableList (GenTable genTable) { + public List selectDbTableList(GenTable genTable) { return genTableMapper.selectDbTableList(genTable); } @@ -112,11 +108,10 @@ public class GenTableServiceImpl implements GenTableService { * 查询据库列表 * * @param tableNames 表名称组 - * * @return 数据库表集合 */ @Override - public List selectDbTableListByNames (String[] tableNames) { + public List selectDbTableListByNames(String[] tableNames) { return genTableMapper.selectDbTableListByNames(tableNames); } @@ -126,7 +121,7 @@ public class GenTableServiceImpl implements GenTableService { * @return 表信息集合 */ @Override - public List selectGenTableAll () { + public List selectGenTableAll() { return genTableMapper.selectGenTableAll(); } @@ -134,12 +129,11 @@ public class GenTableServiceImpl implements GenTableService { * 修改业务 * * @param genTable 业务信息 - * * @return 结果 */ @Override @Transactional - public void updateGenTable (GenTable genTable) { + public void updateGenTable(GenTable genTable) { String options = JSON.toJSONString(genTable.getParams()); genTable.setOptions(options); int row = genTableMapper.updateGenTable(genTable); @@ -154,12 +148,11 @@ public class GenTableServiceImpl implements GenTableService { * 删除业务对象 * * @param tableIds 需要删除的数据ID - * * @return 结果 */ @Override @Transactional - public void deleteGenTableByIds (Long[] tableIds) { + public void deleteGenTableByIds(Long[] tableIds) { genTableMapper.deleteGenTableByIds(tableIds); genTableColumnMapper.deleteGenTableColumnByIds(tableIds); } @@ -171,7 +164,7 @@ public class GenTableServiceImpl implements GenTableService { */ @Override @Transactional - public void importGenTable (List tableList) { + public void importGenTable(List tableList) { Long userId = SecurityUtils.getUserId(); try { for (GenTable table : tableList) { @@ -196,11 +189,10 @@ public class GenTableServiceImpl implements GenTableService { * 预览代码 * * @param tableId 表编号 - * * @return 预览数据列表 */ @Override - public Map previewCode (Long tableId) { + public Map previewCode(Long tableId) { Map dataMap = new LinkedHashMap<>(); // 查询表信息 GenTable table = genTableMapper.selectGenTableById(tableId); @@ -226,11 +218,10 @@ public class GenTableServiceImpl implements GenTableService { * 生成代码（下载方式） * * @param tableName 表名称 - * * @return 数据 */ @Override - public byte[] downloadCode (String tableName) { + public byte[] downloadCode(String tableName) { ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); ZipOutputStream zip = new ZipOutputStream(outputStream); generatorCode(tableName, zip); @@ -244,7 +235,7 @@ public class GenTableServiceImpl implements GenTableService { * @param tableName 表名称 */ @Override - public void generatorCode (String tableName) { + public void generatorCode(String tableName) { // 查询表信息 GenTable table = genTableMapper.selectGenTableByName(tableName); // 设置主键列信息 @@ -279,7 +270,7 @@ public class GenTableServiceImpl implements GenTableService { */ @Override @Transactional - public void syncDb (String tableName) { + public void syncDb(String tableName) { GenTable table = genTableMapper.selectGenTableByName(tableName); List tableColumns = table.getColumns(); Map tableColumnMap = tableColumns.stream().collect(Collectors.toMap(GenTableColumn::getColumnName, Function.identity())); @@ -323,11 +314,10 @@ public class GenTableServiceImpl implements GenTableService { * 批量生成代码（下载方式） * * @param tableNames 表数组 - * * @return 数据 */ @Override - public byte[] downloadCode (String[] tableNames) { + public byte[] downloadCode(String[] tableNames) { ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); ZipOutputStream zip = new ZipOutputStream(outputStream); for (String tableName : tableNames) { @@ -340,7 +330,7 @@ public class GenTableServiceImpl implements GenTableService { /** * 查询表信息并生成代码 */ - private void generatorCode (String tableName, ZipOutputStream zip) { + private void generatorCode(String tableName, ZipOutputStream zip) { // 查询表信息 GenTable table = genTableMapper.selectGenTableByName(tableName); // 设置主键列信息 @@ -376,7 +366,7 @@ public class GenTableServiceImpl implements GenTableService { * @param genTable 业务信息 */ @Override - public void validateEdit (GenTable genTable) { + public void validateEdit(GenTable genTable) { if (GenConstants.TPL_TREE.equals(genTable.getTplCategory())) { String options = JSON.toJSONString(genTable.getParams()); JSONObject paramsObj = JSON.parseObject(options); @@ -395,7 +385,7 @@ public class GenTableServiceImpl implements GenTableService { * * @param table 业务表信息 */ - public void setPkColumn (GenTable table) { + public void setPkColumn(GenTable table) { for (GenTableColumn column : table.getColumns()) { if (column.isPk()) { table.setPkColumn(column); @@ -412,7 +402,7 @@ public class GenTableServiceImpl implements GenTableService { * * @param genTable 设置后的生成对象 */ - public void setTableFromOptions (GenTable genTable) { + public void setTableFromOptions(GenTable genTable) { JSONObject paramsObj = JSON.parseObject(genTable.getOptions()); if (StringUtils.isNotNull(paramsObj)) { String treeCode = paramsObj.getString(GenConstants.TREE_CODE); diff --git a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java index 251171e..270736c 100644 --- a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java +++ b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java @@ -18,7 +18,7 @@ public class GenUtils { /** * 初始化表信息 */ - public static void initTable (GenTable genTable, Long userId) { + public static void initTable(GenTable genTable, Long userId) { genTable.setClassName(convertClassName(genTable.getTableName())); genTable.setPackageName(GenConfig.getPackageName()); genTable.setModuleName(getModuleName(GenConfig.getPackageName())); @@ -31,7 +31,7 @@ public class GenUtils { /** * 初始化列属性字段 */ - public static void initColumnField (GenTableColumn column, GenTable table) { + public static void initColumnField(GenTableColumn column, GenTable table) { String dataType = getDbType(column.getColumnType()); String columnName = column.getColumnName(); column.setTableId(table.getTableId()); @@ -116,10 +116,9 @@ public class GenUtils { * * @param arr 数组 * @param targetValue 值 - * * @return 是否包含 */ - public static boolean arraysContains (String[] arr, String targetValue) { + public static boolean arraysContains(String[] arr, String targetValue) { return Arrays.asList(arr).contains(targetValue); } @@ -127,10 +126,9 @@ public class GenUtils { * 获取模块名 * * @param packageName 包名 - * * @return 模块名 */ - public static String getModuleName (String packageName) { + public static String getModuleName(String packageName) { int lastIndex = packageName.lastIndexOf("."); int nameLength = packageName.length(); return StringUtils.substring(packageName, lastIndex + 1, nameLength); @@ -140,10 +138,9 @@ public class GenUtils { * 获取业务名 * * @param tableName 表名 - * * @return 业务名 */ - public static String getBusinessName (String tableName) { + public static String getBusinessName(String tableName) { int lastIndex = tableName.lastIndexOf("_"); int nameLength = tableName.length(); return StringUtils.substring(tableName, lastIndex + 1, nameLength); @@ -153,10 +150,9 @@ public class GenUtils { * 表名转换成Java类名 * * @param tableName 表名称 - * * @return 类名 */ - public static String convertClassName (String tableName) { + public static String convertClassName(String tableName) { boolean autoRemovePre = GenConfig.getAutoRemovePre(); String tablePrefix = GenConfig.getTablePrefix(); if (autoRemovePre && StringUtils.isNotEmpty(tablePrefix)) { @@ -171,10 +167,9 @@ public class GenUtils { * * @param replacementm 替换值 * @param searchList 替换列表 - * * @return */ - public static String replaceFirst (String replacementm, String[] searchList) { + public static String replaceFirst(String replacementm, String[] searchList) { String text = replacementm; for (String searchString : searchList) { if (replacementm.startsWith(searchString)) { @@ -189,10 +184,9 @@ public class GenUtils { * 关键字替换 * * @param text 需要被替换的名字 - * * @return 替换后的名字 */ - public static String replaceText (String text) { + public static String replaceText(String text) { return RegExUtils.replaceAll(text, "(?:表|若依)", ""); } @@ -200,10 +194,9 @@ public class GenUtils { * 获取数据库类型字段 * * @param columnType 列类型 - * * @return 截取后的列类型 */ - public static String getDbType (String columnType) { + public static String getDbType(String columnType) { if (StringUtils.indexOf(columnType, "(") > 0) { return StringUtils.substringBefore(columnType, "("); } else { @@ -215,10 +208,9 @@ public class GenUtils { * 获取字段长度 * * @param columnType 列类型 - * * @return 截取后的列类型 */ - public static Integer getColumnLength (String columnType) { + public static Integer getColumnLength(String columnType) { if (StringUtils.indexOf(columnType, "(") > 0) { String length = StringUtils.substringBetween(columnType, "(", ")"); return Integer.valueOf(length); diff --git a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java index 3d6c35a..93d8b46 100644 --- a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java +++ b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java @@ -14,7 +14,7 @@ public class VelocityInitializer { /** * 初始化vm方法 */ - public static void initVelocity () { + public static void initVelocity() { Properties p = new Properties(); try { // 加载classpath目录下的vm文件 diff --git a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java index 97d9a5e..5e104c5 100644 --- a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java +++ b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java @@ -40,7 +40,7 @@ public class VelocityUtils { * * @return 模板列表 */ - public static VelocityContext prepareContext (GenTable genTable) { + public static VelocityContext prepareContext(GenTable genTable) { String moduleName = genTable.getModuleName(); String businessName = genTable.getBusinessName(); String packageName = genTable.getPackageName(); @@ -73,14 +73,14 @@ public class VelocityUtils { return velocityContext; } - public static void setMenuVelocityContext (VelocityContext context, GenTable genTable) { + public static void setMenuVelocityContext(VelocityContext context, GenTable genTable) { String options = genTable.getOptions(); JSONObject paramsObj = JSON.parseObject(options); String parentMenuId = getParentMenuId(paramsObj); context.put("parentMenuId", parentMenuId); } - public static void setTreeVelocityContext (VelocityContext context, GenTable genTable) { + public static void setTreeVelocityContext(VelocityContext context, GenTable genTable) { String options = genTable.getOptions(); JSONObject paramsObj = JSON.parseObject(options); String treeCode = getTreecode(paramsObj); @@ -105,7 +105,7 @@ public class VelocityUtils { * * @return 模板列表 */ - public static List getTemplateList (String tplCategory) { + public static List getTemplateList(String tplCategory) { List templates = new ArrayList(); templates.add("vm/java/domain.java.vm"); templates.add("vm/java/query.java.vm"); @@ -129,7 +129,7 @@ public class VelocityUtils { /** * 获取文件名 */ - public static String getFileName (String template, GenTable genTable) { + public static String getFileName(String template, GenTable genTable) { // 文件名称 String fileName = ""; // 包路径 @@ -183,10 +183,9 @@ public class VelocityUtils { * 获取包前缀 * * @param packageName 包名称 - * * @return 包前缀名称 */ - public static String getPackagePrefix (String packageName) { + public static String getPackagePrefix(String packageName) { int lastIndex = packageName.lastIndexOf("."); return StringUtils.substring(packageName, 0, lastIndex); } @@ -195,10 +194,9 @@ public class VelocityUtils { * 根据列类型获取导入包 * * @param genTable 业务表对象 - * * @return 返回需要导入的包列表 */ - public static HashSet getImportList (GenTable genTable) { + public static HashSet getImportList(GenTable genTable) { List columns = genTable.getColumns(); HashSet importList = new HashSet(); for (GenTableColumn column : columns) { @@ -216,10 +214,9 @@ public class VelocityUtils { * 根据列类型获取字典组 * * @param genTable 业务表对象 - * * @return 返回字典组 */ - public static String getDicts (GenTable genTable) { + public static String getDicts(GenTable genTable) { List columns = genTable.getColumns(); Set dicts = new HashSet(); addDicts(dicts, columns); @@ -232,7 +229,7 @@ public class VelocityUtils { * @param dicts 字典列表 * @param columns 列集合 */ - public static void addDicts (Set dicts, List columns) { + public static void addDicts(Set dicts, List columns) { for (GenTableColumn column : columns) { if (!column.isSuperColumn() && StringUtils.isNotEmpty(column.getDictType()) && StringUtils.equalsAny( column.getHtmlType(), @@ -247,10 +244,9 @@ public class VelocityUtils { * * @param moduleName 模块名称 * @param businessName 业务名称 - * * @return 返回权限前缀 */ - public static String getPermissionPrefix (String moduleName, String businessName) { + public static String getPermissionPrefix(String moduleName, String businessName) { return StringUtils.format("{}:{}", moduleName, businessName); } @@ -258,10 +254,9 @@ public class VelocityUtils { * 获取上级菜单ID字段 * * @param paramsObj 生成其他选项 - * * @return 上级菜单ID字段 */ - public static String getParentMenuId (JSONObject paramsObj) { + public static String getParentMenuId(JSONObject paramsObj) { if (StringUtils.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.PARENT_MENU_ID) && StringUtils.isNotEmpty(paramsObj.getString(GenConstants.PARENT_MENU_ID))) { return paramsObj.getString(GenConstants.PARENT_MENU_ID); @@ -273,10 +268,9 @@ public class VelocityUtils { * 获取树编码 * * @param paramsObj 生成其他选项 - * * @return 树编码 */ - public static String getTreecode (JSONObject paramsObj) { + public static String getTreecode(JSONObject paramsObj) { if (paramsObj.containsKey(GenConstants.TREE_CODE)) { return StringUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_CODE)); } @@ -287,10 +281,9 @@ public class VelocityUtils { * 获取树父编码 * * @param paramsObj 生成其他选项 - * * @return 树父编码 */ - public static String getTreeParentCode (JSONObject paramsObj) { + public static String getTreeParentCode(JSONObject paramsObj) { if (paramsObj.containsKey(GenConstants.TREE_PARENT_CODE)) { return StringUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_PARENT_CODE)); } @@ -301,10 +294,9 @@ public class VelocityUtils { * 获取树名称 * * @param paramsObj 生成其他选项 - * * @return 树名称 */ - public static String getTreeName (JSONObject paramsObj) { + public static String getTreeName(JSONObject paramsObj) { if (paramsObj.containsKey(GenConstants.TREE_NAME)) { return StringUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_NAME)); } @@ -315,10 +307,9 @@ public class VelocityUtils { * 获取需要在哪一列上面显示展开按钮 * * @param genTable 业务表对象 - * * @return 展开按钮列序号 */ - public static int getExpandColumn (GenTable genTable) { + public static int getExpandColumn(GenTable genTable) { String options = genTable.getOptions(); JSONObject paramsObj = JSON.parseObject(options); String treeName = paramsObj.getString(GenConstants.TREE_NAME); diff --git a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml index 35a8357..916544a 100644 --- a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml +++ b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml @@ -64,10 +64,10 @@ - + insert into gen_table_column ( table_id, column_name, diff --git a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml index d0aa89a..35a8a52 100644 --- a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml +++ b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml @@ -249,7 +249,8 @@ order by c.sort - + insert into gen_table ( table_name, table_comment, diff --git a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/vm/java/controller.java.vm b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/vm/java/controller.java.vm index 0b1bf6a..288576e 100644 --- a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/vm/java/controller.java.vm +++ b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/vm/java/controller.java.vm @@ -42,24 +42,24 @@ public class ${ClassName}Controller extends BaseController { @Autowired private ${ClassName}Service ${className}Service; - /** - * 查询${functionName}列表 - */ - @ApiOperation("获取${functionName}列表") - @PreAuthorize("@ss.hasPermi('${permissionPrefix}:list')") - @GetMapping("/list") -#if($table.crud) +/** + * 查询${functionName}列表 + */ +@ApiOperation("获取${functionName}列表") +@PreAuthorize("@ss.hasPermi('${permissionPrefix}:list')") +@GetMapping("/list") + #if($table.crud) public Result> list(${ClassName}QueryReq ${className}QueryReq) { startPage(); List<${ClassName}> list = ${className}Service.list(${ClassName}.queryBuild(${className}QueryReq)); return getDataTable(list); } -#elseif($table.tree) - public Result> list(${ClassName} ${className}) { - List<${ClassName}> list = ${className}Service.list(${className}); - return Result.success(list); - } -#end + #elseif($table.tree) + public Result> list(${ClassName} ${className}) { + List<${ClassName}> list = ${className}Service.list(${className}); + return Result.success(list); + } + #end /** * 导出${functionName}列表 @@ -70,7 +70,7 @@ public class ${ClassName}Controller extends BaseController { @PostMapping("/export") public void export(HttpServletResponse response, ${ClassName} ${className}) { List<${ClassName}> list = ${className}Service.list(${className}); - ExcelUtil<${ClassName}> util = new ExcelUtil<${ClassName}>(${ClassName}.class); + ExcelUtil<${ClassName}> util = new ExcelUtil<${ClassName}>(${ClassName}. class); util.exportExcel(response, list, "${functionName}数据"); } @@ -104,7 +104,8 @@ public class ${ClassName}Controller extends BaseController { @PutMapping("/{${pkColumn.javaField}}") @ApiOperation("修改${functionName}") public Result edit(@PathVariable ${pkColumn.javaType} ${pkColumn.javaField}, @RequestBody ${ClassName}EditReq ${className}EditReq) { - return toAjax(${className}Service.updateById(${ClassName}.editBuild(${pkColumn.javaField},${className}EditReq))); + return toAjax(${className}Service.updateById(${ClassName}.editBuild(${pkColumn.javaField}, ${className}EditReq))) + ; } /** @@ -112,7 +113,7 @@ public class ${ClassName}Controller extends BaseController { */ @PreAuthorize("@ss.hasPermi('${permissionPrefix}:remove')") @Log(title = "${functionName}", businessType = BusinessType.DELETE) - @DeleteMapping("/{${pkColumn.javaField}s}") + @DeleteMapping("/{${pkColumn.javaField}s}") @ApiOperation("删除${functionName}") @ApiImplicitParam(name = "${pkColumn.javaField}", value = "${pkColumn.javaField}", required = true, dataType = "${pkColumn.javaType}", paramType = "path", dataTypeClass = String.class, example = "1,2,3,4") public Result remove(@PathVariable List<${pkColumn.javaType}> ${pkColumn.javaField}s) { diff --git a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/vm/java/domain.java.vm b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/vm/java/domain.java.vm index 96a65a2..24713b0 100644 --- a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/vm/java/domain.java.vm +++ b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/vm/java/domain.java.vm @@ -29,9 +29,9 @@ import com.ruoyi.common.core.domain.TreeEntity; * @date ${datetime} */ #if($table.crud) -#set($Entity="BaseEntity") + #set($Entity="BaseEntity") #elseif($table.tree) -#set($Entity="TreeEntity") + #set($Entity="TreeEntity") #end @Data @SuperBuilder @@ -42,43 +42,43 @@ import com.ruoyi.common.core.domain.TreeEntity; @ApiModel(value = "${ClassName}", description = "${functionName}") public class ${ClassName} extends ${Entity} { - private static final long serialVersionUID = 1L; +private static final long serialVersionUID=1L; #foreach ($column in $columns) -#if(!$table.isSuperColumn($column.javaField)) + #if(!$table.isSuperColumn($column.javaField)) /** $column.columnComment */ -#if($column.list) -#set($parentheseIndex=$column.columnComment.indexOf("（")) -#if($parentheseIndex != -1) -#set($comment=$column.columnComment.substring(0, $parentheseIndex)) -#else -#set($comment=$column.columnComment) -#end -#if($parentheseIndex != -1) - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") -#elseif($column.javaType == 'Date') - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd") -#else - @Excel(name = "${comment}") -#end -#end -#if($column.javaField == $pkColumn.javaField) - @TableId(value = "${pkColumn.columnName}",type = IdType.AUTO) -#end -#set($comment='') -#if($column.isRequired == '1') - #set($comment=', required = true') -#end + #if($column.list) + #set($parentheseIndex=$column.columnComment.indexOf("（")) + #if($parentheseIndex != -1) + #set($comment=$column.columnComment.substring(0, $parentheseIndex)) + #else + #set($comment=$column.columnComment) + #end + #if($parentheseIndex != -1) + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + #elseif($column.javaType == 'Date') + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd") + #else + @Excel(name = "${comment}") + #end + #end + #if($column.javaField == $pkColumn.javaField) + @TableId(value = "${pkColumn.columnName}", type = IdType.AUTO) + #end + #set($comment='') + #if($column.isRequired == '1') + #set($comment=', required = true') + #end @ApiModelProperty(name = "${column.columnComment}", value = "${column.columnComment}"$comment) private $column.javaType $column.javaField; + #end #end -#end - /** - * 查询构造器 - */ - public static ${ClassName} queryBuild( ${ClassName}QueryReq ${className}QueryReq){ +/** +* 查询构造器 +*/ +public static ${ClassName} queryBuild( ${ClassName}QueryReq ${className}QueryReq){ return ${ClassName}.builder() #foreach ($column in $columns) #if($column.isQuery == '1') @@ -88,52 +88,52 @@ public class ${ClassName} extends ${Entity} { #else #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) #end - .${column.javaField}(${className}QueryReq.get${AttrName}()) + .${column.javaField}(${className}QueryReq.get${AttrName}()) #end #end #end - .build(); - } + .build(); + } - /** - * 添加构造器 - */ - public static ${ClassName} saveBuild(${ClassName}SaveReq ${className}SaveReq){ +/** +* 添加构造器 +*/ +public static ${ClassName} saveBuild(${ClassName}SaveReq ${className}SaveReq){ return ${ClassName}.builder() #foreach ($column in $columns) #if($column.isEdit == '1') - #if(!$table.isSuperColumn($column.javaField)) - #if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) - #set($AttrName=$column.javaField) - #else - #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) + #if(!$table.isSuperColumn($column.javaField)) + #if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) + #set($AttrName=$column.javaField) + #else + #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) + #end + .${column.javaField}(${className}SaveReq.get${AttrName}()) #end - .${column.javaField}(${className}SaveReq.get${AttrName}()) - #end #end #end - .build(); - } + .build(); + } - /** - * 修改构造器 - */ - public static ${ClassName} editBuild(${pkColumn.javaType} ${pkColumn.javaField}, ${ClassName}EditReq ${className}EditReq){ +/** +* 修改构造器 +*/ +public static ${ClassName} editBuild(${pkColumn.javaType} ${pkColumn.javaField}, ${ClassName}EditReq ${className}EditReq){ return ${ClassName}.builder() - .${pkColumn.javaField}(${pkColumn.javaField}) -#foreach ($column in $columns) - #if($column.isEdit == '1') - #if(!$table.isSuperColumn($column.javaField)) - #if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) - #set($AttrName=$column.javaField) - #else - #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) + .${pkColumn.javaField}(${pkColumn.javaField}) + #foreach ($column in $columns) + #if($column.isEdit == '1') + #if(!$table.isSuperColumn($column.javaField)) + #if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) + #set($AttrName=$column.javaField) + #else + #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) + #end + .${column.javaField}(${className}EditReq.get${AttrName}()) + #end #end - .${column.javaField}(${className}EditReq.get${AttrName}()) #end - #end -#end - .build(); - } + .build(); + } -} + } diff --git a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/vm/java/edit.java.vm b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/vm/java/edit.java.vm index 0218bf2..e013516 100644 --- a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/vm/java/edit.java.vm +++ b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/vm/java/edit.java.vm @@ -24,43 +24,43 @@ import com.ruoyi.common.core.domain.TreeEntity; * @author ${author} * @date ${datetime} */ -#if($table.crud) - #set($Entity="BaseEntity") -#elseif($table.tree) - #set($Entity="TreeEntity") -#end -@Data -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor -@ApiModel(value = "${ClassName}EditReq", description = "${functionName}") -public class ${ClassName}EditReq extends ${Entity} { + #if($table.crud) + #set($Entity="BaseEntity") + #elseif($table.tree) + #set($Entity="TreeEntity") + #end + @Data + @SuperBuilder + @NoArgsConstructor + @AllArgsConstructor + @ApiModel(value = "${ClassName}EditReq", description = "${functionName}") + public class ${ClassName}EditReq extends ${Entity} { private static final long serialVersionUID = 1L; -#foreach ($column in $columns) - #if(!$table.isSuperColumn($column.javaField)) - #if($column.isEdit == '1') - /** $column.columnComment */ - #if($column.list) - #set($parentheseIndex=$column.columnComment.indexOf("（")) - #if($parentheseIndex != -1) - #set($comment=$column.columnComment.substring(0, $parentheseIndex)) - #else - #set($comment=$column.columnComment) + #foreach ($column in $columns) + #if(!$table.isSuperColumn($column.javaField)) + #if($column.isEdit == '1') + /** $column.columnComment */ + #if($column.list) + #set($parentheseIndex=$column.columnComment.indexOf("（")) + #if($parentheseIndex != -1) + #set($comment=$column.columnComment.substring(0, $parentheseIndex)) + #else + #set($comment=$column.columnComment) + #end + #if($column.javaType == 'Date') + @JsonFormat(pattern = "yyyy-MM-dd") + #end #end - #if($column.javaType == 'Date') - @JsonFormat(pattern = "yyyy-MM-dd") + #set($isRequired='') + #if($column.isRequired == '1') + #set($isRequired=', required = true') #end - #end - #set($isRequired='') - #if($column.isRequired == '1') - #set($isRequired=', required = true') - #end - @ApiModelProperty(name = "${column.columnComment}", value = "${column.columnComment}"$isRequired) - private $column.javaType $column.javaField; + @ApiModelProperty(name = "${column.columnComment}", value = "${column.columnComment}"$isRequired) + private $column.javaType $column.javaField; + #end #end #end -#end } diff --git a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm index 2926740..4b12c80 100644 --- a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm +++ b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm @@ -1,6 +1,7 @@ package ${packageName}.mapper; import java.util.List; + import com.baomidou.mybatisplus.core.mapper.BaseMapper; import ${packageName}.domain.${ClassName}; diff --git a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/vm/java/query.java.vm b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/vm/java/query.java.vm index 65876b7..5b24d44 100644 --- a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/vm/java/query.java.vm +++ b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/vm/java/query.java.vm @@ -24,42 +24,42 @@ import com.ruoyi.common.core.domain.TreeEntity; * @author ${author} * @date ${datetime} */ -#if($table.crud) -#set($Entity="BaseEntity") -#elseif($table.tree) -#set($Entity="TreeEntity") -#end -@Data -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor -@ApiModel(value = "${ClassName}QueryReq", description = "${functionName}") -public class ${ClassName}QueryReq extends ${Entity} { + #if($table.crud) + #set($Entity="BaseEntity") + #elseif($table.tree) + #set($Entity="TreeEntity") + #end + @Data + @SuperBuilder + @NoArgsConstructor + @AllArgsConstructor + @ApiModel(value = "${ClassName}QueryReq", description = "${functionName}") + public class ${ClassName}QueryReq extends ${Entity} { private static final long serialVersionUID = 1L; -#foreach ($column in $columns) -#if(!$table.isSuperColumn($column.javaField)) -#if($column.isQuery == '1') - /** $column.columnComment */ -#if($column.list) - #set($parentheseIndex=$column.columnComment.indexOf("（")) - #if($parentheseIndex != -1) - #set($comment=$column.columnComment.substring(0, $parentheseIndex)) - #else - #set($comment=$column.columnComment) - #end - #if($column.javaType == 'Date') - @JsonFormat(pattern = "yyyy-MM-dd") - #end -#end -#if($column.javaField == $pkColumn.javaField) - @TableId(value = "${pkColumn.javaField}",type = IdType.AUTO) -#end - @ApiModelProperty(name = "${column.columnComment}", value = "${column.columnComment}") - private $column.javaType $column.javaField; + #foreach ($column in $columns) + #if(!$table.isSuperColumn($column.javaField)) + #if($column.isQuery == '1') + /** $column.columnComment */ + #if($column.list) + #set($parentheseIndex=$column.columnComment.indexOf("（")) + #if($parentheseIndex != -1) + #set($comment=$column.columnComment.substring(0, $parentheseIndex)) + #else + #set($comment=$column.columnComment) + #end + #if($column.javaType == 'Date') + @JsonFormat(pattern = "yyyy-MM-dd") + #end + #end + #if($column.javaField == $pkColumn.javaField) + @TableId(value = "${pkColumn.javaField}", type = IdType.AUTO) + #end + @ApiModelProperty(name = "${column.columnComment}", value = "${column.columnComment}") + private $column.javaType $column.javaField; -#end -#end -#end + #end + #end + #end } diff --git a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/vm/java/save.java.vm b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/vm/java/save.java.vm index 34952af..f4c8983 100644 --- a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/vm/java/save.java.vm +++ b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/vm/java/save.java.vm @@ -24,44 +24,44 @@ import com.ruoyi.common.core.domain.TreeEntity; * @author ${author} * @date ${datetime} */ -#if($table.crud) - #set($Entity="BaseEntity") -#elseif($table.tree) - #set($Entity="TreeEntity") -#end -@Data -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor -@ApiModel(value = "${ClassName}SaveReq", description = "${functionName}") -public class ${ClassName}SaveReq extends ${Entity} { + #if($table.crud) + #set($Entity="BaseEntity") + #elseif($table.tree) + #set($Entity="TreeEntity") + #end + @Data + @SuperBuilder + @NoArgsConstructor + @AllArgsConstructor + @ApiModel(value = "${ClassName}SaveReq", description = "${functionName}") + public class ${ClassName}SaveReq extends ${Entity} { private static final long serialVersionUID = 1L; -#foreach ($column in $columns) - #if(!$table.isSuperColumn($column.javaField)) - #if($column.isInsert == '1') - /** $column.columnComment */ - #if($column.list) - #set($parentheseIndex=$column.columnComment.indexOf("（")) - #if($parentheseIndex != -1) - #set($comment=$column.columnComment.substring(0, $parentheseIndex)) - #else - #set($comment=$column.columnComment) + #foreach ($column in $columns) + #if(!$table.isSuperColumn($column.javaField)) + #if($column.isInsert == '1') + /** $column.columnComment */ + #if($column.list) + #set($parentheseIndex=$column.columnComment.indexOf("（")) + #if($parentheseIndex != -1) + #set($comment=$column.columnComment.substring(0, $parentheseIndex)) + #else + #set($comment=$column.columnComment) + #end + #if($column.javaType == 'Date') + @JsonFormat(pattern = "yyyy-MM-dd") + #end #end - #if($column.javaType == 'Date') - @JsonFormat(pattern = "yyyy-MM-dd") + + #set($isRequired='') + #if($column.isRequired == '1') + #set($isRequired=', required = true') #end - #end + @ApiModelProperty(name = "${column.columnComment}", value = "${column.columnComment}"$isRequired) + private $column.javaType $column.javaField; - #set($isRequired='') - #if($column.isRequired == '1') - #set($isRequired=', required = true') #end - @ApiModelProperty(name = "${column.columnComment}", value = "${column.columnComment}"$isRequired) - private $column.javaType $column.javaField; - #end #end -#end } diff --git a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/vm/java/service.java.vm b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/vm/java/service.java.vm index 89bbdf4..dc88fec 100644 --- a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/vm/java/service.java.vm +++ b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/vm/java/service.java.vm @@ -1,6 +1,7 @@ package ${packageName}.service; import java.util.List; + import ${packageName}.domain.${ClassName}; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm index 28dbce6..41ead1c 100644 --- a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm +++ b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm @@ -20,7 +20,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; */ @Slf4j @Service -public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${ClassName}> implements ${ClassName}Service { +public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${ClassName}> implements ${ClassName}Service { /** * 查询${functionName}列表 @@ -31,47 +31,48 @@ public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${C @Override public List<${ClassName}> list(${ClassName} ${className}) { LambdaQueryWrapper<${ClassName}> queryWrapper = new LambdaQueryWrapper<>(); -#foreach($column in $columns) - #set($queryType=$column.queryType) - #set($javaField=$column.javaField) - #set($JavaField=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) + #foreach($column in $columns) + #set($queryType=$column.queryType) + #set($javaField=$column.javaField) + #set($JavaField=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) - #if($column.query) - #if($queryType == "EQ") - if (ObjUtils.notNull(${className}.get$JavaField())){ - queryWrapper.eq(${ClassName}::get$JavaField, ${className}.get$JavaField()); - } - #elseif($queryType == "NE") - if (ObjUtils.notNull(${className}.get$JavaField())){ - queryWrapper.ne(${ClassName}::get$JavaField, ${className}.get$JavaField()); - } - #elseif($queryType == "GT") - if (ObjUtils.notNull(${className}.get$JavaField())){ - queryWrapper.gt(${ClassName}::get$JavaField, ${className}.get$JavaField()); - } - #elseif($queryType == "GTE") - if (ObjUtils.notNull(${className}.get$JavaField())){ - queryWrapper.ge(${ClassName}::get$JavaField, ${className}.get$JavaField()); - } - #elseif($queryType == "LT") - if (ObjUtils.notNull(${className}.get$JavaField())){ - queryWrapper.lt()${ClassName}::get$JavaField, ${className}.get$JavaField()); - } - #elseif($queryType == "LTE") - if (ObjUtils.notNull(${className}.get$JavaField())){ - queryWrapper.le()${ClassName}::get$JavaField, ${className}.get$JavaField()); - } - #elseif($queryType == "LIKE") - if (ObjUtils.notNull(${className}.get$JavaField())){ - queryWrapper.like(${ClassName}::get$JavaField, ${className}.get$JavaField()); - } - #elseif($queryType == "BETWEEN") - if (ObjUtils.notChildNull(${className}.getBetween("$JavaField"))){ - queryWrapper.between(${ClassName}::get$JavaField, ${className}.getBeginParam("$JavaField"),${className}.getEndParam("$JavaField")); - } + #if($column.query) + #if($queryType == "EQ") + if (ObjUtils.notNull(${className}.get$JavaField())){ + queryWrapper.eq(${ClassName}::get$JavaField, ${className}.get$JavaField()); + } + #elseif($queryType == "NE") + if (ObjUtils.notNull(${className}.get$JavaField())){ + queryWrapper.ne(${ClassName}::get$JavaField, ${className}.get$JavaField()); + } + #elseif($queryType == "GT") + if (ObjUtils.notNull(${className}.get$JavaField())){ + queryWrapper.gt(${ClassName}::get$JavaField, ${className}.get$JavaField()); + } + #elseif($queryType == "GTE") + if (ObjUtils.notNull(${className}.get$JavaField())){ + queryWrapper.ge(${ClassName}::get$JavaField, ${className}.get$JavaField()); + } + #elseif($queryType == "LT") + if (ObjUtils.notNull(${className}.get$JavaField())){ + queryWrapper.lt()${ClassName}::get$JavaField, ${className}.get$JavaField()); + } + #elseif($queryType == "LTE") + if (ObjUtils.notNull(${className}.get$JavaField())){ + queryWrapper.le()${ClassName}::get$JavaField, ${className}.get$JavaField()); + } + #elseif($queryType == "LIKE") + if (ObjUtils.notNull(${className}.get$JavaField())){ + queryWrapper.like(${ClassName}::get$JavaField, ${className}.get$JavaField()); + } + #elseif($queryType == "BETWEEN") + if (ObjUtils.notChildNull(${className}.getBetween("$JavaField"))){ + queryWrapper.between(${ClassName}::get$JavaField, ${className}. + getBeginParam("$JavaField"),${className}.getEndParam("$JavaField")); + } + #end + #end #end - #end -#end return list(queryWrapper); } } diff --git a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/vm/js/api.js.vm b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/vm/js/api.js.vm index 9f6bae9..d45bc1c 100644 --- a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/vm/js/api.js.vm +++ b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/vm/js/api.js.vm @@ -2,43 +2,43 @@ import request from '@/utils/request' // 查询${functionName}列表 export function list${BusinessName}(query) { - return request({ - url: '/${moduleName}/${businessName}/list', - method: 'get', - params: query - }) + return request({ + url: '/${moduleName}/${businessName}/list', + method: 'get', + params: query + }) } // 查询${functionName}详细 export function get${BusinessName}(${pkColumn.javaField}) { - return request({ - url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField}, - method: 'get' - }) + return request({ + url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField}, + method: 'get' + }) } // 新增${functionName} export function add${BusinessName}(data) { - return request({ - url: '/${moduleName}/${businessName}', - method: 'post', - data: data - }) + return request({ + url: '/${moduleName}/${businessName}', + method: 'post', + data: data + }) } // 修改${functionName} export function update${BusinessName}(data) { - return request({ - url: '/${moduleName}/${businessName}/'+data.${pkColumn.javaField}, - method: 'put', - data: data - }) + return request({ + url: '/${moduleName}/${businessName}/' + data.${pkColumn.javaField}, + method: 'put', + data: data + }) } // 删除${functionName} export function del${BusinessName}(${pkColumn.javaField}) { - return request({ - url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField}, - method: 'delete' - }) + return request({ + url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField}, + method: 'delete' + }) } diff --git a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm index 4819c2a..6baa7f8 100644 --- a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm +++ b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm @@ -1,68 +1,68 @@ diff --git a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm index ac7b661..6b280e1 100644 --- a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm +++ b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm @@ -1,66 +1,66 @@ diff --git a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm index c54d62b..b25bb9b 100644 --- a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm +++ b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm @@ -1,65 +1,65 @@