From 3706d2e1db45e64a1375b92300901de39e35e464 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 25 一月 2022 21:50:54 +0800
Subject: [PATCH] update 去除链式调用注解 不符合规范导致很多奇葩问题 例如: copy为空问题
---
ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/MinioOssStrategy.java | 2
ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java | 2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java | 1
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java | 2
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityQueueController.java | 8 ++
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java | 2
ruoyi-oss/src/main/java/com/ruoyi/oss/entity/UploadResult.java | 6 -
ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java | 2
ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java | 2
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java | 2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java | 2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java | 2
ruoyi-framework/src/main/java/com/ruoyi/framework/listener/UserActionListener.java | 21 +++---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java | 12 ++--
ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java | 2
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java | 2
ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserExportVo.java | 2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/dto/UserOnlineDTO.java | 6 -
ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/AliyunOssStrategy.java | 3
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java | 2
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java | 2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java | 2
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOss.java | 2
ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QcloudOssStrategy.java | 4 -
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOssConfig.java | 1
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java | 2
ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java | 2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java | 2
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityDemo.java | 2
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java | 3
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/dto/OperLogDTO.java | 4 -
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java | 2
ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java | 1
ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java | 1
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java | 2
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java | 3
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestBatchController.java | 16 ++++-
ruoyi-generator/src/main/resources/vm/java/domain.java.vm | 2
ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java | 2
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java | 2
ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QiniuOssStrategy.java | 4 -
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java | 2
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestSensitiveController.java | 14 ++--
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java | 2
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java | 4 +
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java | 2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java | 2
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java | 2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/PageQuery.java | 2
51 files changed, 56 insertions(+), 122 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java
index e60b4bb..e432107 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java
@@ -132,7 +132,9 @@
@PutMapping("/changePreviewListResource")
public AjaxResult<Void> changePreviewListResource(@RequestBody String body) {
Map<String, Boolean> map = JsonUtils.parseMap(body);
- SysConfig config = iSysConfigService.getOne(new SysConfig().setConfigKey(OssConstant.PEREVIEW_LIST_RESOURCE_KEY));
+ SysConfig sysConfig = new SysConfig();
+ sysConfig.setConfigKey(OssConstant.PEREVIEW_LIST_RESOURCE_KEY);
+ SysConfig config = iSysConfigService.getOne(sysConfig);
config.setConfigValue(map.get("previewListResource").toString());
return toAjax(iSysConfigService.updateConfig(config));
}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java b/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java
index bcfc677..8ce7a8c 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java
@@ -2,7 +2,6 @@
import lombok.Data;
import lombok.Getter;
-import lombok.experimental.Accessors;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
@@ -13,7 +12,6 @@
*/
@Data
-@Accessors(chain = true)
@Component
@ConfigurationProperties(prefix = "ruoyi")
public class RuoYiConfig {
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java
index 158da5f..333af88 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java
@@ -6,7 +6,6 @@
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
/**
* 鎿嶄綔娑堟伅鎻愰啋
@@ -16,7 +15,6 @@
@Data
@NoArgsConstructor
@AllArgsConstructor
-@Accessors(chain = true)
@ApiModel("璇锋眰鍝嶅簲瀵硅薄")
public class AjaxResult<T> {
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
index 9c7857a..d1ad296 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
@@ -4,7 +4,6 @@
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
@@ -18,7 +17,6 @@
*/
@Data
-@Accessors(chain = true)
public class BaseEntity implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/PageQuery.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/PageQuery.java
index 5ffd588..7a61237 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/PageQuery.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/PageQuery.java
@@ -7,7 +7,6 @@
import com.ruoyi.common.utils.sql.SqlUtil;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import lombok.experimental.Accessors;
import java.io.Serializable;
@@ -18,7 +17,6 @@
*/
@Data
-@Accessors(chain = true)
public class PageQuery implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java
index 819e6b7..5e7af73 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java
@@ -4,7 +4,6 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
import java.util.ArrayList;
import java.util.List;
@@ -17,7 +16,6 @@
@Data
@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
public class TreeEntity extends BaseEntity {
private static final long serialVersionUID = 1L;
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/dto/OperLogDTO.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/dto/OperLogDTO.java
index 773858f..26bf674 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/dto/OperLogDTO.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/dto/OperLogDTO.java
@@ -1,8 +1,6 @@
package com.ruoyi.common.core.domain.dto;
import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
@@ -14,8 +12,6 @@
*/
@Data
-@NoArgsConstructor
-@Accessors(chain = true)
public class OperLogDTO implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/dto/UserOnlineDTO.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/dto/UserOnlineDTO.java
index 5eb5280..e830274 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/dto/UserOnlineDTO.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/dto/UserOnlineDTO.java
@@ -1,8 +1,7 @@
package com.ruoyi.common.core.domain.dto;
+import lombok.Builder;
import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
import java.io.Serializable;
@@ -13,8 +12,7 @@
*/
@Data
-@NoArgsConstructor
-@Accessors(chain = true)
+@Builder
public class UserOnlineDTO implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
index da60bd0..46e9936 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
@@ -8,7 +8,6 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
import javax.validation.constraints.Email;
import javax.validation.constraints.NotBlank;
@@ -23,7 +22,6 @@
@Data
@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
@TableName("sys_dept")
@ApiModel("閮ㄩ棬涓氬姟瀵硅薄")
public class SysDept extends TreeEntity {
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java
index 241aecd..dc7f051 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java
@@ -12,7 +12,6 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
@@ -25,7 +24,6 @@
@Data
@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
@TableName("sys_dict_data")
@ExcelIgnoreUnannotated
@ApiModel("瀛楀吀鏁版嵁涓氬姟瀵硅薄")
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java
index 702ec09..082a5be 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java
@@ -24,7 +24,6 @@
@Data
@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
@TableName("sys_dict_type")
@ExcelIgnoreUnannotated
@ApiModel("瀛楀吀绫诲瀷涓氬姟瀵硅薄")
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
index 4429b3d..8eb97d0 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
@@ -8,7 +8,6 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
@@ -22,7 +21,6 @@
@Data
@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
@TableName("sys_menu")
@ApiModel("鑿滃崟鏉冮檺涓氬姟瀵硅薄")
public class SysMenu extends TreeEntity {
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
index 3153e41..aeffc40 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
@@ -13,7 +13,6 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
@@ -27,7 +26,6 @@
@Data
@NoArgsConstructor
@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
@TableName("sys_role")
@ExcelIgnoreUnannotated
public class SysRole extends BaseEntity {
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index bc3170d..b6f5d17 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -12,7 +12,6 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
import javax.validation.constraints.Email;
import javax.validation.constraints.NotBlank;
@@ -29,7 +28,6 @@
@Data
@NoArgsConstructor
@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
@TableName("sys_user")
@ApiModel("鐢ㄦ埛淇℃伅涓氬姟瀵硅薄")
public class SysUser extends BaseEntity {
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java
index 94ebebd..289727a 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java
@@ -4,7 +4,6 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import lombok.experimental.Accessors;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
@@ -16,7 +15,6 @@
*/
@Data
-@Accessors(chain = true)
@ApiModel("鐢ㄦ埛鐧诲綍瀵硅薄")
public class LoginBody {
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
index c93bd1c..4651b00 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
@@ -3,7 +3,6 @@
import com.ruoyi.common.helper.LoginHelper;
import lombok.Data;
import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Set;
@@ -16,7 +15,6 @@
@Data
@NoArgsConstructor
-@Accessors(chain = true)
public class LoginUser implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java
index b034dc1..bd9b84c 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java
@@ -4,7 +4,6 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
/**
* 鐢ㄦ埛娉ㄥ唽瀵硅薄
@@ -13,7 +12,6 @@
*/
@Data
@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
@ApiModel("鐢ㄦ埛娉ㄥ唽瀵硅薄")
public class RegisterBody extends LoginBody {
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java
index b2537c1..48353e3 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java
@@ -19,7 +19,6 @@
@Data
@NoArgsConstructor
-@Accessors(chain = true)
@ApiModel("鍒嗛〉鍝嶅簲瀵硅薄")
public class TableDataInfo<T> implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestBatchController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestBatchController.java
index 39cf3eb..78ffef9 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestBatchController.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestBatchController.java
@@ -44,7 +44,11 @@
public AjaxResult<Void> add() {
List<TestDemo> list = new ArrayList<>();
for (int i = 0; i < 1000; i++) {
- list.add(new TestDemo().setOrderNum(-1L).setTestKey("鎵归噺鏂板").setValue("娴嬭瘯鏂板"));
+ TestDemo testDemo = new TestDemo();
+ testDemo.setOrderNum(-1L);
+ testDemo.setTestKey("鎵归噺鏂板");
+ testDemo.setValue("娴嬭瘯鏂板");
+ list.add(testDemo);
}
return toAjax(testDemoMapper.insertBatch(list) ? 1 : 0);
}
@@ -60,12 +64,16 @@
public AjaxResult<Void> addOrUpdate() {
List<TestDemo> list = new ArrayList<>();
for (int i = 0; i < 1000; i++) {
- list.add(new TestDemo().setOrderNum(-1L).setTestKey("鎵归噺鏂板").setValue("娴嬭瘯鏂板"));
- }
+ TestDemo testDemo = new TestDemo();
+ testDemo.setOrderNum(-1L);
+ testDemo.setTestKey("鎵归噺鏂板");
+ testDemo.setValue("娴嬭瘯鏂板");
+ list.add(testDemo); }
testDemoMapper.insertBatch(list);
for (int i = 0; i < list.size(); i++) {
TestDemo testDemo = list.get(i);
- testDemo.setTestKey("鎵归噺鏂板鎴栦慨鏀�").setValue("鎵归噺鏂板鎴栦慨鏀�");
+ testDemo.setTestKey("鎵归噺鏂板鎴栦慨鏀�");
+ testDemo.setValue("鎵归噺鏂板鎴栦慨鏀�");
if (i % 2 == 0) {
testDemo.setId(null);
}
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestSensitiveController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestSensitiveController.java
index 72b16e6..4deb2c0 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestSensitiveController.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestSensitiveController.java
@@ -7,7 +7,6 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.Data;
-import lombok.experimental.Accessors;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -33,17 +32,16 @@
@ApiOperation("鏌ヨ娴嬭瘯鍗曡〃鍒楄〃")
@GetMapping("/test")
public AjaxResult<TestSensitive> test() {
- TestSensitive testSensitive = new TestSensitive()
- .setIdCard("210397198608215431")
- .setPhone("17640125371")
- .setAddress("鍖椾含甯傛湞闃冲尯鏌愭煇鍥涘悎闄�1203瀹�")
- .setEmail("17640125371@163.com")
- .setBankCard("6226456952351452853");
+ TestSensitive testSensitive = new TestSensitive();
+ testSensitive.setIdCard("210397198608215431");
+ testSensitive.setPhone("17640125371");
+ testSensitive.setAddress("鍖椾含甯傛湞闃冲尯鏌愭煇鍥涘悎闄�1203瀹�");
+ testSensitive.setEmail("17640125371@163.com");
+ testSensitive.setBankCard("6226456952351452853");
return AjaxResult.success(testSensitive);
}
@Data
- @Accessors(chain = true)
static class TestSensitive {
/**
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityDemo.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityDemo.java
index 0857690..80f1b11 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityDemo.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityDemo.java
@@ -2,7 +2,6 @@
import lombok.Data;
import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
/**
* 瀹炰綋绫� 娉ㄦ剰涓嶅厑璁镐娇鐢ㄥ唴閮ㄧ被 鍚﹀垯浼氭壘涓嶅埌绫�
@@ -11,7 +10,6 @@
* @version 3.6.0
*/
@Data
-@Accessors(chain = true)
@NoArgsConstructor
public class PriorityDemo {
private String name;
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityQueueController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityQueueController.java
index 832cbcf..b2a3247 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityQueueController.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityQueueController.java
@@ -46,7 +46,9 @@
}
for (int i = 0; i < 10; i++) {
int randomNum = RandomUtil.randomInt(10);
- PriorityDemo data = new PriorityDemo().setName("data-" + i).setOrderNum(randomNum);
+ PriorityDemo data = new PriorityDemo();
+ data.setName("data-" + i);
+ data.setOrderNum(randomNum);
if (QueueUtils.addPriorityQueueObject(queueName, data)) {
log.info("閫氶亾: {} , 鍙戦�佹暟鎹�: {}", queueName, data);
} else {
@@ -61,7 +63,9 @@
public AjaxResult<Void> remove(@ApiParam("闃熷垪鍚�") String queueName,
@ApiParam("瀵硅薄鍚�") String name,
@ApiParam("鎺掑簭鍙�") Integer orderNum) {
- PriorityDemo data = new PriorityDemo().setName(name).setOrderNum(orderNum);
+ PriorityDemo data = new PriorityDemo();
+ data.setName(name);
+ data.setOrderNum(orderNum);
if (QueueUtils.removePriorityQueueObject(queueName, data)) {
log.info("閫氶亾: {} , 鍒犻櫎鏁版嵁: {}", queueName, data);
} else {
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java
index f36ae2b..c079d12 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java
@@ -4,7 +4,6 @@
import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
/**
* 娴嬭瘯鍗曡〃瀵硅薄 test_demo
@@ -14,7 +13,6 @@
*/
@Data
@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
@TableName("test_demo")
public class TestDemo extends BaseEntity {
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java
index 7459362..1ca4a7a 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java
@@ -7,7 +7,6 @@
import com.ruoyi.common.core.domain.TreeEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
/**
* 娴嬭瘯鏍戣〃瀵硅薄 test_tree
@@ -17,7 +16,6 @@
*/
@Data
@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
@TableName("test_tree")
public class TestTree extends TreeEntity {
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/listener/UserActionListener.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/listener/UserActionListener.java
index 6995fb6..609c0ac 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/listener/UserActionListener.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/listener/UserActionListener.java
@@ -46,18 +46,19 @@
String ip = ServletUtils.getClientIP();
SysUser user = SpringUtils.getBean(UserService.class).selectUserById(LoginHelper.getUserId());
String tokenValue = StpUtil.getTokenValue();
- UserOnlineDTO userOnlineDTO = new UserOnlineDTO()
- .setIpaddr(ip)
- .setLoginLocation(AddressUtils.getRealAddressByIP(ip))
- .setBrowser(userAgent.getBrowser().getName())
- .setOs(userAgent.getOs().getName())
- .setLoginTime(System.currentTimeMillis())
- .setTokenId(tokenValue)
- .setUserName(user.getUserName());
+ UserOnlineDTO dto = UserOnlineDTO.builder()
+ .ipaddr(ip)
+ .loginLocation(AddressUtils.getRealAddressByIP(ip))
+ .browser(userAgent.getBrowser().getName())
+ .os(userAgent.getOs().getName())
+ .loginTime(System.currentTimeMillis())
+ .tokenId(tokenValue)
+ .userName(user.getUserName())
+ .build();
if (ObjectUtil.isNotNull(user.getDept())) {
- userOnlineDTO.setDeptName(user.getDept().getDeptName());
+ dto.setDeptName(user.getDept().getDeptName());
}
- RedisUtils.setCacheObject(Constants.ONLINE_TOKEN_KEY + tokenValue, userOnlineDTO, tokenConfig.getTimeout(), TimeUnit.SECONDS);
+ RedisUtils.setCacheObject(Constants.ONLINE_TOKEN_KEY + tokenValue, dto, tokenConfig.getTimeout(), TimeUnit.SECONDS);
log.info("user doLogin, useId:{}, token:{}", loginId, tokenValue);
} else if (userType == UserType.APP_USER) {
// app绔� 鑷鏍规嵁涓氬姟缂栧啓
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java
index 915cf7d..965c9f3 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java
@@ -8,7 +8,6 @@
import com.ruoyi.common.utils.StringUtils;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
import org.apache.commons.lang3.ArrayUtils;
import javax.validation.Valid;
@@ -23,7 +22,6 @@
@Data
@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
@TableName("gen_table")
public class GenTable extends BaseEntity {
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
index 1a978d4..763acd7 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
@@ -20,7 +20,6 @@
@Data
@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
@TableName("gen_table_column")
public class GenTableColumn extends BaseEntity {
diff --git a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
index dfd1465..2cf259c 100644
--- a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
import java.math.BigDecimal;
@@ -29,7 +28,6 @@
#set($Entity="TreeEntity")
#end
@Data
-@Accessors(chain = true)
@TableName("${tableName}")
public class ${ClassName} extends ${Entity} {
diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/entity/UploadResult.java b/ruoyi-oss/src/main/java/com/ruoyi/oss/entity/UploadResult.java
index 11f9a9b..379d283 100644
--- a/ruoyi-oss/src/main/java/com/ruoyi/oss/entity/UploadResult.java
+++ b/ruoyi-oss/src/main/java/com/ruoyi/oss/entity/UploadResult.java
@@ -1,8 +1,7 @@
package com.ruoyi.oss.entity;
+import lombok.Builder;
import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
/**
* 涓婁紶杩斿洖浣�
@@ -10,8 +9,7 @@
* @author Lion Li
*/
@Data
-@NoArgsConstructor
-@Accessors(chain = true)
+@Builder
public class UploadResult {
/**
diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/AliyunOssStrategy.java b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/AliyunOssStrategy.java
index 61b98cd..adfce09 100644
--- a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/AliyunOssStrategy.java
+++ b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/AliyunOssStrategy.java
@@ -77,8 +77,7 @@
} catch (Exception e) {
throw new OssException("涓婁紶鏂囦欢澶辫触锛岃妫�鏌ラ樋閲屼簯閰嶇疆淇℃伅:[" + e.getMessage() + "]");
}
- return new UploadResult().setUrl(getEndpointLink() + "/" + path).setFilename(path);
- }
+ return UploadResult.builder().url(getEndpointLink() + "/" + path).filename(path).build(); }
@Override
public void delete(String path) {
diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/MinioOssStrategy.java b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/MinioOssStrategy.java
index e2cd578..435606c 100644
--- a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/MinioOssStrategy.java
+++ b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/MinioOssStrategy.java
@@ -80,7 +80,7 @@
} catch (Exception e) {
throw new OssException("涓婁紶鏂囦欢澶辫触锛岃鏍稿Minio閰嶇疆淇℃伅:[" + e.getMessage() + "]");
}
- return new UploadResult().setUrl(getEndpointLink() + "/" + path).setFilename(path);
+ return UploadResult.builder().url(getEndpointLink() + "/" + path).filename(path).build();
}
@Override
diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QcloudOssStrategy.java b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QcloudOssStrategy.java
index bc11848..21a2f95 100644
--- a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QcloudOssStrategy.java
+++ b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QcloudOssStrategy.java
@@ -11,10 +11,8 @@
import com.ruoyi.oss.entity.UploadResult;
import com.ruoyi.oss.enumd.OssEnumd;
import com.ruoyi.oss.exception.OssException;
-import com.ruoyi.oss.factory.OssFactory;
import com.ruoyi.oss.properties.OssProperties;
import com.ruoyi.oss.service.abstractd.AbstractOssStrategy;
-import org.springframework.beans.factory.InitializingBean;
import org.springframework.stereotype.Component;
import java.io.ByteArrayInputStream;
@@ -87,7 +85,7 @@
} catch (Exception e) {
throw new OssException("涓婁紶鏂囦欢澶辫触锛岃妫�鏌ヨ吘璁簯閰嶇疆淇℃伅:[" + e.getMessage() + "]");
}
- return new UploadResult().setUrl(getEndpointLink() + "/" + path).setFilename(path);
+ return UploadResult.builder().url(getEndpointLink() + "/" + path).filename(path).build();
}
@Override
diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QiniuOssStrategy.java b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QiniuOssStrategy.java
index 417f703..a47bc68 100644
--- a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QiniuOssStrategy.java
+++ b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QiniuOssStrategy.java
@@ -10,10 +10,8 @@
import com.ruoyi.oss.entity.UploadResult;
import com.ruoyi.oss.enumd.OssEnumd;
import com.ruoyi.oss.exception.OssException;
-import com.ruoyi.oss.factory.OssFactory;
import com.ruoyi.oss.properties.OssProperties;
import com.ruoyi.oss.service.abstractd.AbstractOssStrategy;
-import org.springframework.beans.factory.InitializingBean;
import org.springframework.stereotype.Component;
import java.io.InputStream;
@@ -78,7 +76,7 @@
} catch (Exception e) {
throw new OssException("涓婁紶鏂囦欢澶辫触锛岃鏍稿涓冪墰閰嶇疆淇℃伅:[" + e.getMessage() + "]");
}
- return new UploadResult().setUrl(getEndpointLink() + "/" + path).setFilename(path);
+ return UploadResult.builder().url(getEndpointLink() + "/" + path).filename(path).build();
}
@Override
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java
index 19c7cd8..b1091b4 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java
@@ -11,7 +11,6 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
@@ -24,7 +23,6 @@
@Data
@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
@TableName("sys_config")
@ExcelIgnoreUnannotated
@ApiModel("鍙傛暟閰嶇疆涓氬姟瀵硅薄")
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java
index a157537..de095ec 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java
@@ -10,7 +10,6 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
@@ -24,7 +23,6 @@
*/
@Data
-@Accessors(chain = true)
@TableName("sys_logininfor")
@ExcelIgnoreUnannotated
@ApiModel("绯荤粺璁块棶璁板綍涓氬姟瀵硅薄")
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java
index aa855a3..2371bb7 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java
@@ -7,7 +7,6 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
@@ -20,7 +19,6 @@
*/
@Data
@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
@TableName("sys_notice")
public class SysNotice extends BaseEntity {
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java
index ff77cee..f6f3737 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java
@@ -10,7 +10,6 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
@@ -24,7 +23,6 @@
*/
@Data
-@Accessors(chain = true)
@TableName("sys_oper_log")
@ExcelIgnoreUnannotated
@ApiModel("鎿嶄綔鏃ュ織璁板綍涓氬姟瀵硅薄")
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOss.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOss.java
index d7d75e3..711dd83 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOss.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOss.java
@@ -6,7 +6,6 @@
import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
/**
* OSS瀵硅薄瀛樺偍瀵硅薄
@@ -15,7 +14,6 @@
*/
@Data
@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
@TableName("sys_oss")
public class SysOss extends BaseEntity {
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOssConfig.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOssConfig.java
index 775da2b..a8340df 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOssConfig.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOssConfig.java
@@ -14,7 +14,6 @@
*/
@Data
@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
@TableName("sys_oss_config")
public class SysOssConfig extends BaseEntity {
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java
index 6b99ceb..80bf275 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java
@@ -12,7 +12,6 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
@@ -25,7 +24,6 @@
@Data
@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
@TableName("sys_post")
@ExcelIgnoreUnannotated
@ApiModel("宀椾綅淇℃伅涓氬姟瀵硅薄")
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java
index 1a3e114..c3043c2 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java
@@ -6,7 +6,6 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import lombok.experimental.Accessors;
/**
* 瑙掕壊鍜岄儴闂ㄥ叧鑱� sys_role_dept
@@ -15,7 +14,6 @@
*/
@Data
-@Accessors(chain = true)
@TableName("sys_role_dept")
@ApiModel("瑙掕壊鍜岄儴闂ㄥ叧鑱�")
public class SysRoleDept {
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java
index 5d90d0f..f3e4dd7 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java
@@ -6,7 +6,6 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import lombok.experimental.Accessors;
/**
* 瑙掕壊鍜岃彍鍗曞叧鑱� sys_role_menu
@@ -15,7 +14,6 @@
*/
@Data
-@Accessors(chain = true)
@TableName("sys_role_menu")
@ApiModel("瑙掕壊鍜岃彍鍗曞叧鑱�")
public class SysRoleMenu {
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java
index f81508c..605d164 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java
@@ -3,7 +3,6 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import lombok.experimental.Accessors;
/**
* 褰撳墠鍦ㄧ嚎浼氳瘽
@@ -12,7 +11,6 @@
*/
@Data
-@Accessors(chain = true)
@ApiModel("褰撳墠鍦ㄧ嚎浼氳瘽涓氬姟瀵硅薄")
public class SysUserOnline {
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java
index ae48cba..243e3c8 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java
@@ -6,7 +6,6 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import lombok.experimental.Accessors;
/**
* 鐢ㄦ埛鍜屽矖浣嶅叧鑱� sys_user_post
@@ -15,7 +14,6 @@
*/
@Data
-@Accessors(chain = true)
@TableName("sys_user_post")
@ApiModel("鐢ㄦ埛鍜屽矖浣嶅叧鑱�")
public class SysUserPost {
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java
index 3db13df..5fa712a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java
@@ -6,7 +6,6 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import lombok.experimental.Accessors;
/**
* 鐢ㄦ埛鍜岃鑹插叧鑱� sys_user_role
@@ -15,7 +14,6 @@
*/
@Data
-@Accessors(chain = true)
@TableName("sys_user_role")
@ApiModel("鐢ㄦ埛鍜岃鑹插叧鑱�")
public class SysUserRole {
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java
index 6a3798a..d3e1a35 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java
@@ -4,7 +4,6 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import lombok.experimental.Accessors;
/**
* 璺敱鏄剧ず淇℃伅
@@ -13,7 +12,6 @@
*/
@Data
-@Accessors(chain = true)
@ApiModel("璺敱鏄剧ず淇℃伅")
public class MetaVo {
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java
index 05ba451..a451bb9 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java
@@ -4,7 +4,6 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import lombok.experimental.Accessors;
import java.util.List;
@@ -14,7 +13,6 @@
* @author Lion Li
*/
@Data
-@Accessors(chain = true)
@JsonInclude(JsonInclude.Include.NON_EMPTY)
@ApiModel("璺敱閰嶇疆淇℃伅")
public class RouterVo {
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserExportVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserExportVo.java
index c43c8a5..683cb83 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserExportVo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserExportVo.java
@@ -5,7 +5,6 @@
import com.ruoyi.common.convert.ExcelDictConvert;
import lombok.Data;
import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
@@ -18,7 +17,6 @@
@Data
@NoArgsConstructor
-@Accessors(chain = true)
public class SysUserExportVo implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java
index 2f12ef3..7c5018b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java
@@ -100,7 +100,8 @@
.between(params.get("beginTime") != null && params.get("endTime") != null,
SysLogininfor::getLoginTime, params.get("beginTime"), params.get("endTime"));
if (StringUtils.isBlank(pageQuery.getOrderByColumn())) {
- pageQuery.setOrderByColumn("info_id").setIsAsc("desc");
+ pageQuery.setOrderByColumn("info_id");
+ pageQuery.setIsAsc("desc");
}
Page<SysLogininfor> page = baseMapper.selectPage(pageQuery.build(), lqw);
return TableDataInfo.build(page);
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java
index d146819..8610d97 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java
@@ -65,7 +65,8 @@
.between(params.get("beginTime") != null && params.get("endTime") != null,
SysOperLog::getOperTime, params.get("beginTime"), params.get("endTime"));
if (StringUtils.isBlank(pageQuery.getOrderByColumn())) {
- pageQuery.setOrderByColumn("oper_id").setIsAsc("desc");
+ pageQuery.setOrderByColumn("oper_id");
+ pageQuery.setIsAsc("desc");
}
Page<SysOperLog> page = baseMapper.selectPage(pageQuery.build(), lqw);
return TableDataInfo.build(page);
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java
index 5a28086..19423f4 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java
@@ -73,12 +73,12 @@
throw new ServiceException(e.getMessage());
}
// 淇濆瓨鏂囦欢淇℃伅
- SysOss oss = new SysOss()
- .setUrl(uploadResult.getUrl())
- .setFileSuffix(suffix)
- .setFileName(uploadResult.getFilename())
- .setOriginalName(originalfileName)
- .setService(storage.getServiceType().getValue());
+ SysOss oss = new SysOss();
+ oss.setUrl(uploadResult.getUrl());
+ oss.setFileSuffix(suffix);
+ oss.setFileName(uploadResult.getFilename());
+ oss.setOriginalName(originalfileName);
+ oss.setService(storage.getServiceType().getValue());
baseMapper.insert(oss);
return oss;
}
--
Gitblit v1.9.3