ruoyi
/
ruoyi-vue-server
14
1
Fork 0
Code Issues 7 Pull Requests Packages Projects Releases Wiki Activity

优化代码 

增加主键
nacos
DongZeLiang 2023-10-09 20:57:53 +08:00
parent d36d5672a6
commit 7fb34049a3
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
View File

@ -65,7 +65,7 @@ public class RedisCache {
* @return true=设置成功；false=设置失败 * @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 redisTemplate.expire(key, timeout, unit); return Boolean.TRUE.equals(redisTemplate.expire(key, timeout, unit));
} }
/** /**
@ -156,9 +156,8 @@ public class RedisCache {
*/ */
public <T> BoundSetOperations<String, T> setCacheSet (final String key, final Set<T> dataSet) { public <T> BoundSetOperations<String, T> setCacheSet (final String key, final Set<T> dataSet) {
BoundSetOperations<String, T> setOperation = redisTemplate.boundSetOps(key); BoundSetOperations<String, T> setOperation = redisTemplate.boundSetOps(key);
Iterator<T> it = dataSet.iterator(); for (T t : dataSet) {
while (it.hasNext()) { setOperation.add(t);
setOperation.add(it.next());
} }
return setOperation; return setOperation;
} }

8
ruoyi-generator/src/main/resources/vm/java/domain.java.vm
View File

@ -3,6 +3,7 @@ package ${packageName}.domain;
#foreach ($import in $importList) #foreach ($import in $importList)
import ${import}; import ${import};
#end #end
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@ -56,16 +57,15 @@ public class ${ClassName} extends ${Entity} {
#else #else
@Excel(name = "${comment}") @Excel(name = "${comment}")
#end #end
#end
#if($column.javaField == $pkColumn.javaField)
@TableId(value = "${pkColumn.javaField}",type = IdType.AUTO)
#end #end
private $column.javaType $column.javaField; private $column.javaType $column.javaField;
#end #end
#end #end
#if($table.sub)
/** $table.subTable.functionName信息 */
private List<${subClassName}> ${subclassName}List;
#end
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

2
ruoyi-system/src/main/java/com/ruoyi/book/domain/BookInfo.java
View File

@ -31,7 +31,7 @@ public class BookInfo extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 主键 */ /** 主键 */
@TableId(type = IdType.AUTO) @TableId(value = "id",type = IdType.AUTO)
private Long id; private Long id;
/** 名称 */ /** 名称 */