From 827bbc2b17fdcf2638a9646af0e99821aa63caa1 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期日, 21 六月 2020 10:06:26 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
---
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java | 5 ++
ruoyi/src/main/java/com/ruoyi/project/system/domain/SysRole.java | 1
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java | 1
ruoyi-ui/src/views/monitor/job/log.vue | 4 -
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictDataServiceImpl.java | 1
ruoyi/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java | 2
ruoyi/src/main/java/com/ruoyi/common/core/lang/UUID.java | 3 +
ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java | 5 --
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysPostServiceImpl.java | 2 +
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserOnlineServiceImpl.java | 1
ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/IGenTableColumnService.java | 2
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictTypeServiceImpl.java | 5 ++
ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.java | 8 +++-
ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableColumnServiceImpl.java | 2
ruoyi/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java | 18 ++++++---
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java | 3 +
ruoyi/src/main/java/com/ruoyi/project/monitor/service/impl/SysOperLogServiceImpl.java | 1
ruoyi/src/main/java/com/ruoyi/common/constant/HttpStatus.java | 2
ruoyi/src/main/java/com/ruoyi/common/utils/VerifyCodeUtils.java | 6 ++-
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.java | 3 +
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java | 6 +++
ruoyi/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java | 2 +
22 files changed, 58 insertions(+), 25 deletions(-)
diff --git a/ruoyi-ui/src/views/monitor/job/log.vue b/ruoyi-ui/src/views/monitor/job/log.vue
index 4ead634..254f486 100644
--- a/ruoyi-ui/src/views/monitor/job/log.vue
+++ b/ruoyi-ui/src/views/monitor/job/log.vue
@@ -196,9 +196,7 @@
jobName: undefined,
jobGroup: undefined,
status: undefined
- },
- // 琛ㄥ崟鍙傛暟
- form: {}
+ }
};
},
created() {
diff --git a/ruoyi/src/main/java/com/ruoyi/common/constant/HttpStatus.java b/ruoyi/src/main/java/com/ruoyi/common/constant/HttpStatus.java
index e029d17..d60afee 100644
--- a/ruoyi/src/main/java/com/ruoyi/common/constant/HttpStatus.java
+++ b/ruoyi/src/main/java/com/ruoyi/common/constant/HttpStatus.java
@@ -5,7 +5,7 @@
*
* @author ruoyi
*/
-public interface HttpStatus
+public class HttpStatus
{
/**
* 鎿嶄綔鎴愬姛
diff --git a/ruoyi/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java b/ruoyi/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java
index 005e176..62ad815 100644
--- a/ruoyi/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java
+++ b/ruoyi/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java
@@ -5,7 +5,7 @@
*
* @author ruoyi
*/
-public interface ScheduleConstants
+public class ScheduleConstants
{
public static final String TASK_CLASS_NAME = "TASK_CLASS_NAME";
diff --git a/ruoyi/src/main/java/com/ruoyi/common/core/lang/UUID.java b/ruoyi/src/main/java/com/ruoyi/common/core/lang/UUID.java
index 3adf3df..38311e9 100644
--- a/ruoyi/src/main/java/com/ruoyi/common/core/lang/UUID.java
+++ b/ruoyi/src/main/java/com/ruoyi/common/core/lang/UUID.java
@@ -376,6 +376,7 @@
*
* @return UUID 鐨勫搱甯岀爜鍊笺��
*/
+ @Override
public int hashCode()
{
long hilo = mostSigBits ^ leastSigBits;
@@ -391,6 +392,7 @@
*
* @return 濡傛灉瀵硅薄鐩稿悓锛屽垯杩斿洖 {@code true}锛涘惁鍒欒繑鍥� {@code false}
*/
+ @Override
public boolean equals(Object obj)
{
if ((null == obj) || (obj.getClass() != UUID.class))
@@ -414,6 +416,7 @@
* @return 鍦ㄦ UUID 灏忎簬銆佺瓑浜庢垨澶т簬 val 鏃讹紝鍒嗗埆杩斿洖 -1銆�0 鎴� 1銆�
*
*/
+ @Override
public int compareTo(UUID val)
{
// The ordering is intentionally set up so that the UUIDs
diff --git a/ruoyi/src/main/java/com/ruoyi/common/utils/VerifyCodeUtils.java b/ruoyi/src/main/java/com/ruoyi/common/utils/VerifyCodeUtils.java
index 912bc04..5fdf3a9 100644
--- a/ruoyi/src/main/java/com/ruoyi/common/utils/VerifyCodeUtils.java
+++ b/ruoyi/src/main/java/com/ruoyi/common/utils/VerifyCodeUtils.java
@@ -139,10 +139,12 @@
private static Color getRandColor(int fc, int bc)
{
- if (fc > 255)
+ if (fc > 255) {
fc = 255;
- if (bc > 255)
+ }
+ if (bc > 255) {
bc = 255;
+ }
int r = fc + random.nextInt(bc - fc);
int g = fc + random.nextInt(bc - fc);
int b = fc + random.nextInt(bc - fc);
diff --git a/ruoyi/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java b/ruoyi/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java
index f2589d3..1b3f42b 100644
--- a/ruoyi/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java
+++ b/ruoyi/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java
@@ -110,8 +110,9 @@
{
case 1:
l = Long.parseLong(elements[0]);
- if ((l < 0L) || (l > 4294967295L))
+ if ((l < 0L) || (l > 4294967295L)) {
return null;
+ }
bytes[0] = (byte) (int) (l >> 24 & 0xFF);
bytes[1] = (byte) (int) ((l & 0xFFFFFF) >> 16 & 0xFF);
bytes[2] = (byte) (int) ((l & 0xFFFF) >> 8 & 0xFF);
@@ -119,12 +120,14 @@
break;
case 2:
l = Integer.parseInt(elements[0]);
- if ((l < 0L) || (l > 255L))
+ if ((l < 0L) || (l > 255L)) {
return null;
+ }
bytes[0] = (byte) (int) (l & 0xFF);
l = Integer.parseInt(elements[1]);
- if ((l < 0L) || (l > 16777215L))
+ if ((l < 0L) || (l > 16777215L)) {
return null;
+ }
bytes[1] = (byte) (int) (l >> 16 & 0xFF);
bytes[2] = (byte) (int) ((l & 0xFFFF) >> 8 & 0xFF);
bytes[3] = (byte) (int) (l & 0xFF);
@@ -133,13 +136,15 @@
for (i = 0; i < 2; ++i)
{
l = Integer.parseInt(elements[i]);
- if ((l < 0L) || (l > 255L))
+ if ((l < 0L) || (l > 255L)) {
return null;
+ }
bytes[i] = (byte) (int) (l & 0xFF);
}
l = Integer.parseInt(elements[2]);
- if ((l < 0L) || (l > 65535L))
+ if ((l < 0L) || (l > 65535L)) {
return null;
+ }
bytes[2] = (byte) (int) (l >> 8 & 0xFF);
bytes[3] = (byte) (int) (l & 0xFF);
break;
@@ -147,8 +152,9 @@
for (i = 0; i < 4; ++i)
{
l = Integer.parseInt(elements[i]);
- if ((l < 0L) || (l > 255L))
+ if ((l < 0L) || (l > 255L)) {
return null;
+ }
bytes[i] = (byte) (int) (l & 0xFF);
}
break;
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java b/ruoyi/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java
index 2f27ed1..59812ea 100644
--- a/ruoyi/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java
+++ b/ruoyi/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java
@@ -36,6 +36,7 @@
this.clazz = clazz;
}
+ @Override
public byte[] serialize(T t) throws SerializationException
{
if (t == null)
@@ -45,6 +46,7 @@
return JSON.toJSONString(t, SerializerFeature.WriteClassName).getBytes(DEFAULT_CHARSET);
}
+ @Override
public T deserialize(byte[] bytes) throws SerializationException
{
if (bytes == null || bytes.length <= 0)
diff --git a/ruoyi/src/main/java/com/ruoyi/project/monitor/service/impl/SysOperLogServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/monitor/service/impl/SysOperLogServiceImpl.java
index 2f11469..bed9d8d 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/monitor/service/impl/SysOperLogServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/monitor/service/impl/SysOperLogServiceImpl.java
@@ -47,6 +47,7 @@
* @param operIds 闇�瑕佸垹闄ょ殑鎿嶄綔鏃ュ織ID
* @return 缁撴灉
*/
+ @Override
public int deleteOperLogByIds(Long[] operIds)
{
return operLogMapper.deleteOperLogByIds(operIds);
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
index 35d374d..fae64fe 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
@@ -42,10 +42,7 @@
/**
* 鐧诲綍鏂规硶
*
- * @param username 鐢ㄦ埛鍚�
- * @param password 瀵嗙爜
- * @param captcha 楠岃瘉鐮�
- * @param uuid 鍞竴鏍囪瘑
+ * @param loginBody 鐧婚檰淇℃伅
* @return 缁撴灉
*/
@PostMapping("/login")
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysRole.java b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysRole.java
index d9acb73..41bbf1c 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysRole.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysRole.java
@@ -178,6 +178,7 @@
this.deptIds = deptIds;
}
+ @Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("roleId", getRoleId())
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.java
index fcb26d4..c047990 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.java
@@ -147,6 +147,7 @@
/**
* 娓呯┖缂撳瓨鏁版嵁
*/
+ @Override
public void clearCache()
{
Collection<String> keys = redisCache.keys(Constants.SYS_CONFIG_KEY + "*");
@@ -173,7 +174,7 @@
/**
* 璁剧疆cache key
- *
+ *
* @param configKey 鍙傛暟閿�
* @return 缂撳瓨閿甼ey
*/
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictDataServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictDataServiceImpl.java
index 0f531b7..364f295 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictDataServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictDataServiceImpl.java
@@ -62,6 +62,7 @@
* @param dictCodes 闇�瑕佸垹闄ょ殑瀛楀吀鏁版嵁ID
* @return 缁撴灉
*/
+ @Override
public int deleteDictDataByIds(Long[] dictCodes)
{
int row = dictDataMapper.deleteDictDataByIds(dictCodes);
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictTypeServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictTypeServiceImpl.java
index 41ce43f..b2eeb5b 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictTypeServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictTypeServiceImpl.java
@@ -68,7 +68,7 @@
/**
* 鏍规嵁瀛楀吀绫诲瀷鏌ヨ瀛楀吀鏁版嵁
- *
+ *
* @param dictType 瀛楀吀绫诲瀷
* @return 瀛楀吀鏁版嵁闆嗗悎淇℃伅
*/
@@ -107,6 +107,7 @@
* @param dictType 瀛楀吀绫诲瀷
* @return 瀛楀吀绫诲瀷
*/
+ @Override
public SysDictType selectDictTypeByType(String dictType)
{
return dictTypeMapper.selectDictTypeByType(dictType);
@@ -118,6 +119,7 @@
* @param dictIds 闇�瑕佸垹闄ょ殑瀛楀吀ID
* @return 缁撴灉
*/
+ @Override
public int deleteDictTypeByIds(Long[] dictIds)
{
for (Long dictId : dictIds)
@@ -139,6 +141,7 @@
/**
* 娓呯┖缂撳瓨鏁版嵁
*/
+ @Override
public void clearCache()
{
DictUtils.clearDictCache();
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java
index f248229..82d01e5 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java
@@ -121,6 +121,7 @@
* @param roleId 瑙掕壊ID
* @return 閫変腑鑿滃崟鍒楄〃
*/
+ @Override
public List<Integer> selectMenuListByRoleId(Long roleId)
{
return menuMapper.selectMenuListByRoleId(roleId);
@@ -301,7 +302,7 @@
/**
* 鑾峰彇璺敱鍚嶇О
- *
+ *
* @param menu 鑿滃崟淇℃伅
* @return 璺敱鍚嶇О
*/
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java
index f607b4f..2e9bf00 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java
@@ -84,6 +84,7 @@
* @param noticeIds 闇�瑕佸垹闄ょ殑鍏憡ID
* @return 缁撴灉
*/
+ @Override
public int deleteNoticeByIds(Long[] noticeIds)
{
return noticeMapper.deleteNoticeByIds(noticeIds);
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysPostServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysPostServiceImpl.java
index b31e8cb..0cdfc1e 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysPostServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysPostServiceImpl.java
@@ -66,6 +66,7 @@
* @param userId 鐢ㄦ埛ID
* @return 閫変腑宀椾綅ID鍒楄〃
*/
+ @Override
public List<Integer> selectPostListByUserId(Long userId)
{
return postMapper.selectPostListByUserId(userId);
@@ -138,6 +139,7 @@
* @return 缁撴灉
* @throws Exception 寮傚父
*/
+ @Override
public int deletePostByIds(Long[] postIds)
{
for (Long postId : postIds)
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java
index 6501949..44246bd 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java
@@ -81,6 +81,7 @@
*
* @return 瑙掕壊鍒楄〃
*/
+ @Override
public List<SysRole> selectRoleAll()
{
return SpringUtils.getAopProxy(this).selectRoleList(new SysRole());
@@ -92,6 +93,7 @@
* @param userId 鐢ㄦ埛ID
* @return 閫変腑瑙掕壊ID鍒楄〃
*/
+ @Override
public List<Integer> selectRoleListByUserId(Long userId)
{
return roleMapper.selectRoleListByUserId(userId);
@@ -103,6 +105,7 @@
* @param roleId 瑙掕壊ID
* @return 瑙掕壊瀵硅薄淇℃伅
*/
+ @Override
public SysRole selectRoleById(Long roleId)
{
return roleMapper.selectRoleById(roleId);
@@ -149,6 +152,7 @@
*
* @param role 瑙掕壊淇℃伅
*/
+ @Override
public void checkRoleAllowed(SysRole role)
{
if (StringUtils.isNotNull(role.getRoleId()) && role.isAdmin())
@@ -207,6 +211,7 @@
* @param role 瑙掕壊淇℃伅
* @return 缁撴灉
*/
+ @Override
public int updateRoleStatus(SysRole role)
{
return roleMapper.updateRole(role);
@@ -296,6 +301,7 @@
* @param roleIds 闇�瑕佸垹闄ょ殑瑙掕壊ID
* @return 缁撴灉
*/
+ @Override
public int deleteRoleByIds(Long[] roleIds)
{
for (Long roleId : roleIds)
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserOnlineServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserOnlineServiceImpl.java
index 261e7f1..498eacf 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserOnlineServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserOnlineServiceImpl.java
@@ -72,6 +72,7 @@
* @param user 鐢ㄦ埛淇℃伅
* @return 鍦ㄧ嚎鐢ㄦ埛
*/
+ @Override
public SysUserOnline loginUserToUserOnline(LoginUser user)
{
if (StringUtils.isNull(user) && StringUtils.isNull(user.getUser()))
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java
index 396ea3a..39e5d63 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java
@@ -192,6 +192,7 @@
*
* @param user 鐢ㄦ埛淇℃伅
*/
+ @Override
public void checkUserAllowed(SysUser user)
{
if (StringUtils.isNotNull(user.getUserId()) && user.isAdmin())
@@ -268,10 +269,11 @@
/**
* 淇敼鐢ㄦ埛澶村儚
*
- * @param userId 鐢ㄦ埛ID
+ * @param userName 鐢ㄦ埛鍚�
* @param avatar 澶村儚鍦板潃
* @return 缁撴灉
*/
+ @Override
public boolean updateUserAvatar(String userName, String avatar)
{
return userMapper.updateUserAvatar(userName, avatar) > 0;
@@ -376,6 +378,7 @@
* @param userIds 闇�瑕佸垹闄ょ殑鐢ㄦ埛ID
* @return 缁撴灉
*/
+ @Override
public int deleteUserByIds(Long[] userIds)
{
for (Long userId : userIds)
diff --git a/ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableColumnServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableColumnServiceImpl.java
index ee85a47..446a0df 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableColumnServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableColumnServiceImpl.java
@@ -21,7 +21,7 @@
/**
* 鏌ヨ涓氬姟瀛楁鍒楄〃
*
- * @param genTableColumn 涓氬姟瀛楁缂栧彿
+ * @param tableId 涓氬姟瀛楁缂栧彿
* @return 涓氬姟瀛楁闆嗗悎
*/
@Override
diff --git a/ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.java
index 85a3613..54178c1 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.java
@@ -80,6 +80,7 @@
* @param genTable 涓氬姟淇℃伅
* @return 鏁版嵁搴撹〃闆嗗悎
*/
+ @Override
public List<GenTable> selectDbTableList(GenTable genTable)
{
return genTableMapper.selectDbTableList(genTable);
@@ -91,6 +92,7 @@
* @param tableNames 琛ㄥ悕绉扮粍
* @return 鏁版嵁搴撹〃闆嗗悎
*/
+ @Override
public List<GenTable> selectDbTableListByNames(String[] tableNames)
{
return genTableMapper.selectDbTableListByNames(tableNames);
@@ -121,7 +123,7 @@
/**
* 鍒犻櫎涓氬姟瀵硅薄
*
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
+ * @param tableIds 闇�瑕佸垹闄ょ殑鏁版嵁ID
* @return 缁撴灉
*/
@Override
@@ -173,6 +175,7 @@
* @param tableId 琛ㄧ紪鍙�
* @return 棰勮鏁版嵁鍒楄〃
*/
+ @Override
public Map<String, String> previewCode(Long tableId)
{
Map<String, String> dataMap = new LinkedHashMap<>();
@@ -277,6 +280,7 @@
*
* @param genTable 涓氬姟淇℃伅
*/
+ @Override
public void validateEdit(GenTable genTable)
{
if (GenConstants.TPL_TREE.equals(genTable.getTplCategory()))
@@ -301,7 +305,7 @@
/**
* 璁剧疆涓婚敭鍒椾俊鎭�
*
- * @param genTable 涓氬姟琛ㄤ俊鎭�
+ * @param table 涓氬姟琛ㄤ俊鎭�
* @param columns 涓氬姟瀛楁鍒楄〃
*/
public void setPkColumn(GenTable table, List<GenTableColumn> columns)
diff --git a/ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/IGenTableColumnService.java b/ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/IGenTableColumnService.java
index c8c5c6f..d87b023 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/IGenTableColumnService.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/IGenTableColumnService.java
@@ -13,7 +13,7 @@
/**
* 鏌ヨ涓氬姟瀛楁鍒楄〃
*
- * @param genTableColumn 涓氬姟瀛楁缂栧彿
+ * @param tableId 涓氬姟瀛楁缂栧彿
* @return 涓氬姟瀛楁闆嗗悎
*/
public List<GenTableColumn> selectGenTableColumnListByTableId(Long tableId);
--
Gitblit v1.9.3