From 98c62a9f5d38d106749609389577b52ddac5ae8a Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期六, 12 二月 2022 12:47:11 +0800
Subject: [PATCH] 优化代码
---
src/main/java/com/ruoyi/framework/security/service/SysRegisterService.java | 2
src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java | 3
src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java | 4
src/main/java/com/ruoyi/project/system/service/ISysDictDataService.java | 1
src/main/java/com/ruoyi/common/utils/http/HttpUtils.java | 10 +-
src/main/java/com/ruoyi/project/system/service/ISysPostService.java | 1
src/main/java/com/ruoyi/common/utils/ServletUtils.java | 14 +---
src/main/java/com/ruoyi/project/monitor/service/ISysLogininforService.java | 2
src/main/java/com/ruoyi/project/system/service/impl/SysDictTypeServiceImpl.java | 1
src/main/java/com/ruoyi/common/utils/DictUtils.java | 7 +-
src/main/java/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.java | 1
src/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java | 8 +-
src/main/java/com/ruoyi/project/system/service/ISysDictTypeService.java | 1
src/main/java/com/ruoyi/project/system/service/impl/SysDictDataServiceImpl.java | 1
src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java | 4
src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java | 21 +++---
src/main/java/com/ruoyi/common/utils/file/ImageUtils.java | 2
src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java | 32 +++++-----
src/main/java/com/ruoyi/common/utils/ExceptionUtil.java | 3
src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java | 2
src/main/java/com/ruoyi/project/system/service/impl/SysPostServiceImpl.java | 1
src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java | 3
src/main/java/com/ruoyi/framework/security/LoginBody.java | 2
src/main/java/com/ruoyi/project/monitor/service/impl/SysLogininforServiceImpl.java | 2
src/main/java/com/ruoyi/project/system/service/impl/SysDeptServiceImpl.java | 3
src/main/java/com/ruoyi/common/utils/http/HttpHelper.java | 4
src/main/java/com/ruoyi/project/system/service/ISysConfigService.java | 1
27 files changed, 58 insertions(+), 78 deletions(-)
diff --git a/src/main/java/com/ruoyi/common/utils/DictUtils.java b/src/main/java/com/ruoyi/common/utils/DictUtils.java
index 5241520..be6a73c 100644
--- a/src/main/java/com/ruoyi/common/utils/DictUtils.java
+++ b/src/main/java/com/ruoyi/common/utils/DictUtils.java
@@ -41,8 +41,7 @@
Object cacheObj = SpringUtils.getBean(RedisCache.class).getCacheObject(getCacheKey(key));
if (StringUtils.isNotNull(cacheObj))
{
- List<SysDictData> dictDatas = StringUtils.cast(cacheObj);
- return dictDatas;
+ return StringUtils.cast(cacheObj);
}
return null;
}
@@ -92,7 +91,7 @@
{
if (value.equals(dict.getDictValue()))
{
- propertyString.append(dict.getDictLabel() + separator);
+ propertyString.append(dict.getDictLabel()).append(separator);
break;
}
}
@@ -132,7 +131,7 @@
{
if (label.equals(dict.getDictLabel()))
{
- propertyString.append(dict.getDictValue() + separator);
+ propertyString.append(dict.getDictValue()).append(separator);
break;
}
}
diff --git a/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java b/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java
index f35aa04..50b10fe 100644
--- a/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java
+++ b/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java
@@ -18,8 +18,7 @@
{
StringWriter sw = new StringWriter();
e.printStackTrace(new PrintWriter(sw, true));
- String str = sw.toString();
- return str;
+ return sw.toString();
}
public static String getRootErrorMessage(Exception e)
diff --git a/src/main/java/com/ruoyi/common/utils/ServletUtils.java b/src/main/java/com/ruoyi/common/utils/ServletUtils.java
index a10c8ed..d67b246 100644
--- a/src/main/java/com/ruoyi/common/utils/ServletUtils.java
+++ b/src/main/java/com/ruoyi/common/utils/ServletUtils.java
@@ -99,9 +99,8 @@
*
* @param response 娓叉煋瀵硅薄
* @param string 寰呮覆鏌撶殑瀛楃涓�
- * @return null
*/
- public static String renderString(HttpServletResponse response, String string)
+ public static void renderString(HttpServletResponse response, String string)
{
try
{
@@ -114,7 +113,6 @@
{
e.printStackTrace();
}
- return null;
}
/**
@@ -125,13 +123,13 @@
public static boolean isAjaxRequest(HttpServletRequest request)
{
String accept = request.getHeader("accept");
- if (accept != null && accept.indexOf("application/json") != -1)
+ if (accept != null && accept.contains("application/json"))
{
return true;
}
String xRequestedWith = request.getHeader("X-Requested-With");
- if (xRequestedWith != null && xRequestedWith.indexOf("XMLHttpRequest") != -1)
+ if (xRequestedWith != null && xRequestedWith.contains("XMLHttpRequest"))
{
return true;
}
@@ -143,10 +141,6 @@
}
String ajax = request.getParameter("__ajax");
- if (StringUtils.inStringIgnoreCase(ajax, "json", "xml"))
- {
- return true;
- }
- return false;
+ return StringUtils.inStringIgnoreCase(ajax, "json", "xml");
}
}
diff --git a/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java b/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
index afed94d..09990a7 100644
--- a/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
+++ b/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
@@ -2,6 +2,7 @@
import java.io.File;
import java.io.IOException;
+import java.util.Objects;
import org.apache.commons.io.FilenameUtils;
import org.springframework.web.multipart.MultipartFile;
import com.ruoyi.common.constant.Constants;
@@ -15,7 +16,7 @@
/**
* 鏂囦欢涓婁紶宸ュ叿绫�
- *
+ *
* @author ruoyi
*/
public class FileUploadUtils
@@ -89,7 +90,7 @@
*
* @param baseDir 鐩稿搴旂敤鐨勫熀鐩綍
* @param file 涓婁紶鐨勬枃浠�
- * @param extension 涓婁紶鏂囦欢绫诲瀷
+ * @param allowedExtension 涓婁紶鏂囦欢绫诲瀷
* @return 杩斿洖涓婁紶鎴愬姛鐨勬枃浠跺悕
* @throws FileSizeLimitExceededException 濡傛灉瓒呭嚭鏈�澶уぇ灏�
* @throws FileNameLengthLimitExceededException 鏂囦欢鍚嶅お闀�
@@ -100,7 +101,7 @@
throws FileSizeLimitExceededException, IOException, FileNameLengthLimitExceededException,
InvalidExtensionException
{
- int fileNamelength = file.getOriginalFilename().length();
+ int fileNamelength = Objects.requireNonNull(file.getOriginalFilename()).length();
if (fileNamelength > FileUploadUtils.DEFAULT_FILE_NAME_LENGTH)
{
throw new FileNameLengthLimitExceededException(FileUploadUtils.DEFAULT_FILE_NAME_LENGTH);
@@ -112,8 +113,7 @@
File desc = getAbsoluteFile(baseDir, fileName);
file.transferTo(desc);
- String pathFileName = getPathFileName(baseDir, fileName);
- return pathFileName;
+ return getPathFileName(baseDir, fileName);
}
/**
@@ -145,8 +145,7 @@
{
int dirLastIndex = RuoYiConfig.getProfile().length() + 1;
String currentDir = StringUtils.substring(uploadDir, dirLastIndex);
- String pathFileName = Constants.RESOURCE_PREFIX + "/" + currentDir + "/" + fileName;
- return pathFileName;
+ return Constants.RESOURCE_PREFIX + "/" + currentDir + "/" + fileName;
}
/**
@@ -161,7 +160,7 @@
throws FileSizeLimitExceededException, InvalidExtensionException
{
long size = file.getSize();
- if (DEFAULT_MAX_SIZE != -1 && size > DEFAULT_MAX_SIZE)
+ if (size > DEFAULT_MAX_SIZE)
{
throw new FileSizeLimitExceededException(DEFAULT_MAX_SIZE / 1024 / 1024);
}
@@ -219,7 +218,7 @@
/**
* 鑾峰彇鏂囦欢鍚嶇殑鍚庣紑
- *
+ *
* @param file 琛ㄥ崟鏂囦欢
* @return 鍚庣紑鍚�
*/
@@ -228,8 +227,8 @@
String extension = FilenameUtils.getExtension(file.getOriginalFilename());
if (StringUtils.isEmpty(extension))
{
- extension = MimeTypeUtils.getExtension(file.getContentType());
+ extension = MimeTypeUtils.getExtension(Objects.requireNonNull(file.getContentType()));
}
return extension;
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java b/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java
index e0b6afe..bb184b2 100644
--- a/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java
+++ b/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java
@@ -59,7 +59,7 @@
/**
* 璇诲彇鏂囦欢涓哄瓧鑺傛暟鎹�
*
- * @param key 鍦板潃
+ * @param url 鍦板潃
* @return 瀛楄妭鏁版嵁
*/
public static byte[] readFile(String url)
diff --git a/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java b/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java
index e34fa5a..8baad38 100644
--- a/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java
+++ b/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java
@@ -4,7 +4,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import javax.servlet.ServletRequest;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.slf4j.Logger;
@@ -25,7 +25,7 @@
BufferedReader reader = null;
try (InputStream inputStream = request.getInputStream())
{
- reader = new BufferedReader(new InputStreamReader(inputStream, Charset.forName("UTF-8")));
+ reader = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8));
String line = "";
while ((line = reader.readLine()) != null)
{
diff --git a/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java b/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
index f57baf0..f82bef6 100644
--- a/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
+++ b/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
@@ -9,6 +9,7 @@
import java.net.SocketTimeoutException;
import java.net.URL;
import java.net.URLConnection;
+import java.nio.charset.StandardCharsets;
import java.security.cert.X509Certificate;
import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.HttpsURLConnection;
@@ -130,9 +131,8 @@
StringBuilder result = new StringBuilder();
try
{
- String urlNameString = url;
- log.info("sendPost - {}", urlNameString);
- URL realUrl = new URL(urlNameString);
+ log.info("sendPost - {}", url);
+ URL realUrl = new URL(url);
URLConnection conn = realUrl.openConnection();
conn.setRequestProperty("accept", "*/*");
conn.setRequestProperty("connection", "Keep-Alive");
@@ -144,7 +144,7 @@
out = new PrintWriter(conn.getOutputStream());
out.print(param);
out.flush();
- in = new BufferedReader(new InputStreamReader(conn.getInputStream(), "utf-8"));
+ in = new BufferedReader(new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8));
String line;
while ((line = in.readLine()) != null)
{
@@ -218,7 +218,7 @@
{
if (ret != null && !"".equals(ret.trim()))
{
- result.append(new String(ret.getBytes("ISO-8859-1"), "utf-8"));
+ result.append(new String(ret.getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8));
}
}
log.info("recv - {}", result);
diff --git a/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java b/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java
index c36431f..5d10606 100644
--- a/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java
+++ b/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java
@@ -25,7 +25,6 @@
public static String getRealAddressByIP(String ip)
{
- String address = UNKNOWN;
// 鍐呯綉涓嶆煡璇�
if (IpUtils.internalIp(ip))
{
@@ -51,6 +50,6 @@
log.error("鑾峰彇鍦扮悊浣嶇疆寮傚父 {}", ip);
}
}
- return address;
+ return UNKNOWN;
}
}
diff --git a/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
index a350ef2..f2e4140 100644
--- a/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
+++ b/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
@@ -1121,7 +1121,7 @@
if (StringUtils.isNotEmpty(excel.targetAttr()))
{
String target = excel.targetAttr();
- if (target.indexOf(".") > -1)
+ if (target.contains("."))
{
String[] targets = target.split("[.]");
for (String name : targets)
@@ -1216,7 +1216,7 @@
for (Object[] os : this.fields)
{
Excel excel = (Excel) os[1];
- maxHeight = maxHeight > excel.height() ? maxHeight : excel.height();
+ maxHeight = Math.max(maxHeight, excel.height());
}
return (short) (maxHeight * 20);
}
diff --git a/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java b/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java
index df1e23f..8fb0fc5 100644
--- a/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java
+++ b/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java
@@ -1,5 +1,6 @@
package com.ruoyi.common.utils.sign;
+import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -55,7 +56,7 @@
{
try
{
- return new String(toHex(md5(s)).getBytes("UTF-8"), "UTF-8");
+ return new String(toHex(md5(s)).getBytes(StandardCharsets.UTF_8), StandardCharsets.UTF_8);
}
catch (Exception e)
{
diff --git a/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java b/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java
index 71a7ae1..5243849 100644
--- a/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java
+++ b/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java
@@ -50,9 +50,9 @@
return;
}
String[] sqlKeywords = StringUtils.split(SQL_REGEX, "\\|");
- for (int i = 0; i < sqlKeywords.length; i++)
+ for (String sqlKeyword : sqlKeywords)
{
- if (StringUtils.indexOfIgnoreCase(value, sqlKeywords[i]) > -1)
+ if (StringUtils.indexOfIgnoreCase(value, sqlKeyword) > -1)
{
throw new UtilException("鍙傛暟瀛樺湪SQL娉ㄥ叆椋庨櫓");
}
diff --git a/src/main/java/com/ruoyi/framework/security/LoginBody.java b/src/main/java/com/ruoyi/framework/security/LoginBody.java
index 5986053..e241edf 100644
--- a/src/main/java/com/ruoyi/framework/security/LoginBody.java
+++ b/src/main/java/com/ruoyi/framework/security/LoginBody.java
@@ -25,7 +25,7 @@
/**
* 鍞竴鏍囪瘑
*/
- private String uuid = "";
+ private String uuid;
public String getUsername()
{
diff --git a/src/main/java/com/ruoyi/framework/security/service/SysRegisterService.java b/src/main/java/com/ruoyi/framework/security/service/SysRegisterService.java
index 524b8c2..94234f3 100644
--- a/src/main/java/com/ruoyi/framework/security/service/SysRegisterService.java
+++ b/src/main/java/com/ruoyi/framework/security/service/SysRegisterService.java
@@ -100,7 +100,7 @@
*/
public void validateCaptcha(String username, String code, String uuid)
{
- String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
+ String verifyKey = Constants.CAPTCHA_CODE_KEY + StringUtils.nvl(uuid, "");
String captcha = redisCache.getCacheObject(verifyKey);
redisCache.deleteObject(verifyKey);
if (captcha == null)
diff --git a/src/main/java/com/ruoyi/project/monitor/service/ISysLogininforService.java b/src/main/java/com/ruoyi/project/monitor/service/ISysLogininforService.java
index f46dddf..d51c9ca 100644
--- a/src/main/java/com/ruoyi/project/monitor/service/ISysLogininforService.java
+++ b/src/main/java/com/ruoyi/project/monitor/service/ISysLogininforService.java
@@ -29,7 +29,7 @@
* 鎵归噺鍒犻櫎绯荤粺鐧诲綍鏃ュ織
*
* @param infoIds 闇�瑕佸垹闄ょ殑鐧诲綍鏃ュ織ID
- * @return
+ * @return 缁撴灉
*/
public int deleteLogininforByIds(Long[] infoIds);
diff --git a/src/main/java/com/ruoyi/project/monitor/service/impl/SysLogininforServiceImpl.java b/src/main/java/com/ruoyi/project/monitor/service/impl/SysLogininforServiceImpl.java
index 5195bb3..4a50410 100644
--- a/src/main/java/com/ruoyi/project/monitor/service/impl/SysLogininforServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/monitor/service/impl/SysLogininforServiceImpl.java
@@ -46,7 +46,7 @@
* 鎵归噺鍒犻櫎绯荤粺鐧诲綍鏃ュ織
*
* @param infoIds 闇�瑕佸垹闄ょ殑鐧诲綍鏃ュ織ID
- * @return
+ * @return 缁撴灉
*/
@Override
public int deleteLogininforByIds(Long[] infoIds)
diff --git a/src/main/java/com/ruoyi/project/system/service/ISysConfigService.java b/src/main/java/com/ruoyi/project/system/service/ISysConfigService.java
index 33f4b84..ff102ce 100644
--- a/src/main/java/com/ruoyi/project/system/service/ISysConfigService.java
+++ b/src/main/java/com/ruoyi/project/system/service/ISysConfigService.java
@@ -61,7 +61,6 @@
* 鎵归噺鍒犻櫎鍙傛暟淇℃伅
*
* @param configIds 闇�瑕佸垹闄ょ殑鍙傛暟ID
- * @return 缁撴灉
*/
public void deleteConfigByIds(Long[] configIds);
diff --git a/src/main/java/com/ruoyi/project/system/service/ISysDictDataService.java b/src/main/java/com/ruoyi/project/system/service/ISysDictDataService.java
index 94aaf29..c588145 100644
--- a/src/main/java/com/ruoyi/project/system/service/ISysDictDataService.java
+++ b/src/main/java/com/ruoyi/project/system/service/ISysDictDataService.java
@@ -39,7 +39,6 @@
* 鎵归噺鍒犻櫎瀛楀吀鏁版嵁淇℃伅
*
* @param dictCodes 闇�瑕佸垹闄ょ殑瀛楀吀鏁版嵁ID
- * @return 缁撴灉
*/
public void deleteDictDataByIds(Long[] dictCodes);
diff --git a/src/main/java/com/ruoyi/project/system/service/ISysDictTypeService.java b/src/main/java/com/ruoyi/project/system/service/ISysDictTypeService.java
index 6483c55..80347a3 100644
--- a/src/main/java/com/ruoyi/project/system/service/ISysDictTypeService.java
+++ b/src/main/java/com/ruoyi/project/system/service/ISysDictTypeService.java
@@ -54,7 +54,6 @@
* 鎵归噺鍒犻櫎瀛楀吀淇℃伅
*
* @param dictIds 闇�瑕佸垹闄ょ殑瀛楀吀ID
- * @return 缁撴灉
*/
public void deleteDictTypeByIds(Long[] dictIds);
diff --git a/src/main/java/com/ruoyi/project/system/service/ISysPostService.java b/src/main/java/com/ruoyi/project/system/service/ISysPostService.java
index ec04c2d..7cec378 100644
--- a/src/main/java/com/ruoyi/project/system/service/ISysPostService.java
+++ b/src/main/java/com/ruoyi/project/system/service/ISysPostService.java
@@ -78,7 +78,6 @@
*
* @param postIds 闇�瑕佸垹闄ょ殑宀椾綅ID
* @return 缁撴灉
- * @throws Exception 寮傚父
*/
public int deletePostByIds(Long[] postIds);
diff --git a/src/main/java/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.java b/src/main/java/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.java
index dc80161..1f07ef7 100644
--- a/src/main/java/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.java
@@ -143,7 +143,6 @@
* 鎵归噺鍒犻櫎鍙傛暟淇℃伅
*
* @param configIds 闇�瑕佸垹闄ょ殑鍙傛暟ID
- * @return 缁撴灉
*/
@Override
public void deleteConfigByIds(Long[] configIds)
diff --git a/src/main/java/com/ruoyi/project/system/service/impl/SysDeptServiceImpl.java b/src/main/java/com/ruoyi/project/system/service/impl/SysDeptServiceImpl.java
index 25899a3..2b32d45 100644
--- a/src/main/java/com/ruoyi/project/system/service/impl/SysDeptServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/system/service/impl/SysDeptServiceImpl.java
@@ -63,9 +63,8 @@
{
tempList.add(dept.getDeptId());
}
- for (Iterator<SysDept> iterator = depts.iterator(); iterator.hasNext();)
+ for (SysDept dept : depts)
{
- SysDept dept = (SysDept) iterator.next();
// 濡傛灉鏄《绾ц妭鐐�, 閬嶅巻璇ョ埗鑺傜偣鐨勬墍鏈夊瓙鑺傜偣
if (!tempList.contains(dept.getParentId()))
{
diff --git a/src/main/java/com/ruoyi/project/system/service/impl/SysDictDataServiceImpl.java b/src/main/java/com/ruoyi/project/system/service/impl/SysDictDataServiceImpl.java
index 3620a2a..8a33773 100644
--- a/src/main/java/com/ruoyi/project/system/service/impl/SysDictDataServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/system/service/impl/SysDictDataServiceImpl.java
@@ -60,7 +60,6 @@
* 鎵归噺鍒犻櫎瀛楀吀鏁版嵁淇℃伅
*
* @param dictCodes 闇�瑕佸垹闄ょ殑瀛楀吀鏁版嵁ID
- * @return 缁撴灉
*/
@Override
public void deleteDictDataByIds(Long[] dictCodes)
diff --git a/src/main/java/com/ruoyi/project/system/service/impl/SysDictTypeServiceImpl.java b/src/main/java/com/ruoyi/project/system/service/impl/SysDictTypeServiceImpl.java
index f8e169f..7629f26 100644
--- a/src/main/java/com/ruoyi/project/system/service/impl/SysDictTypeServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/system/service/impl/SysDictTypeServiceImpl.java
@@ -115,7 +115,6 @@
* 鎵归噺鍒犻櫎瀛楀吀绫诲瀷淇℃伅
*
* @param dictIds 闇�瑕佸垹闄ょ殑瀛楀吀ID
- * @return 缁撴灉
*/
@Override
public void deleteDictTypeByIds(Long[] dictIds)
diff --git a/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java b/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java
index c6ed303..1681590 100644
--- a/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java
@@ -498,7 +498,7 @@
*/
private boolean hasChild(List<SysMenu> list, SysMenu t)
{
- return getChildList(list, t).size() > 0 ? true : false;
+ return getChildList(list, t).size() > 0;
}
/**
diff --git a/src/main/java/com/ruoyi/project/system/service/impl/SysPostServiceImpl.java b/src/main/java/com/ruoyi/project/system/service/impl/SysPostServiceImpl.java
index f7d1b33..2e59721 100644
--- a/src/main/java/com/ruoyi/project/system/service/impl/SysPostServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/system/service/impl/SysPostServiceImpl.java
@@ -137,7 +137,6 @@
*
* @param postIds 闇�瑕佸垹闄ょ殑宀椾綅ID
* @return 缁撴灉
- * @throws Exception 寮傚父
*/
@Override
public int deletePostByIds(Long[] postIds)
diff --git a/src/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java b/src/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java
index 274dba4..ed92f85 100644
--- a/src/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java
+++ b/src/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java
@@ -151,8 +151,7 @@
{
int lastIndex = packageName.lastIndexOf(".");
int nameLength = packageName.length();
- String moduleName = StringUtils.substring(packageName, lastIndex + 1, nameLength);
- return moduleName;
+ return StringUtils.substring(packageName, lastIndex + 1, nameLength);
}
/**
@@ -165,8 +164,7 @@
{
int lastIndex = tableName.lastIndexOf("_");
int nameLength = tableName.length();
- String businessName = StringUtils.substring(tableName, lastIndex + 1, nameLength);
- return businessName;
+ return StringUtils.substring(tableName, lastIndex + 1, nameLength);
}
/**
@@ -255,4 +253,4 @@
return 0;
}
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java b/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java
index 6195690..751e53b 100644
--- a/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java
+++ b/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java
@@ -30,7 +30,7 @@
/**
* 璁剧疆妯℃澘鍙橀噺淇℃伅
- *
+ *
* @return 妯℃澘鍒楄〃
*/
public static VelocityContext prepareContext(GenTable genTable)
@@ -119,9 +119,10 @@
context.put("subclassName", StringUtils.uncapitalize(subClassName));
context.put("subImportList", getImportList(genTable.getSubTable()));
}
+
/**
* 鑾峰彇妯℃澘淇℃伅
- *
+ *
* @return 妯℃澘鍒楄〃
*/
public static List<String> getTemplateList(String tplCategory)
@@ -220,15 +221,14 @@
/**
* 鑾峰彇鍖呭墠缂�
- *
+ *
* @param packageName 鍖呭悕绉�
* @return 鍖呭墠缂�鍚嶇О
*/
public static String getPackagePrefix(String packageName)
{
int lastIndex = packageName.lastIndexOf(".");
- String basePackage = StringUtils.substring(packageName, 0, lastIndex);
- return basePackage;
+ return StringUtils.substring(packageName, 0, lastIndex);
}
/**
@@ -285,7 +285,7 @@
/**
* 鑾峰彇鏉冮檺鍓嶇紑
- *
+ *
* @param moduleName 妯″潡鍚嶇О
* @param businessName 涓氬姟鍚嶇О
* @return 杩斿洖鏉冮檺鍓嶇紑
@@ -297,8 +297,8 @@
/**
* 鑾峰彇涓婄骇鑿滃崟ID瀛楁
- *
- * @param options 鐢熸垚鍏朵粬閫夐」
+ *
+ * @param paramsObj 鐢熸垚鍏朵粬閫夐」
* @return 涓婄骇鑿滃崟ID瀛楁
*/
public static String getParentMenuId(JSONObject paramsObj)
@@ -313,8 +313,8 @@
/**
* 鑾峰彇鏍戠紪鐮�
- *
- * @param options 鐢熸垚鍏朵粬閫夐」
+ *
+ * @param paramsObj 鐢熸垚鍏朵粬閫夐」
* @return 鏍戠紪鐮�
*/
public static String getTreecode(JSONObject paramsObj)
@@ -328,8 +328,8 @@
/**
* 鑾峰彇鏍戠埗缂栫爜
- *
- * @param options 鐢熸垚鍏朵粬閫夐」
+ *
+ * @param paramsObj 鐢熸垚鍏朵粬閫夐」
* @return 鏍戠埗缂栫爜
*/
public static String getTreeParentCode(JSONObject paramsObj)
@@ -343,8 +343,8 @@
/**
* 鑾峰彇鏍戝悕绉�
- *
- * @param options 鐢熸垚鍏朵粬閫夐」
+ *
+ * @param paramsObj 鐢熸垚鍏朵粬閫夐」
* @return 鏍戝悕绉�
*/
public static String getTreeName(JSONObject paramsObj)
@@ -358,7 +358,7 @@
/**
* 鑾峰彇闇�瑕佸湪鍝竴鍒椾笂闈㈡樉绀哄睍寮�鎸夐挳
- *
+ *
* @param genTable 涓氬姟琛ㄥ璞�
* @return 灞曞紑鎸夐挳鍒楀簭鍙�
*/
@@ -382,4 +382,4 @@
}
return num;
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3