Commit 731bda76 authored by wenmo's avatar wenmo

[Fix-402 [admin] MybatisPlus PO boolean default false

parent b91d42b7
......@@ -39,7 +39,7 @@ public class ClusterConfigurationController {
@PutMapping
public Result saveOrUpdate(@RequestBody ClusterConfiguration clusterConfiguration) {
TestResult testResult = clusterConfigurationService.testGateway(clusterConfiguration);
clusterConfiguration.setAvailable(testResult.isAvailable());
clusterConfiguration.setIsAvailable(testResult.isAvailable());
if (clusterConfigurationService.saveOrUpdate(clusterConfiguration)) {
return Result.succeed(Asserts.isNotNull(clusterConfiguration.getId()) ? "修改成功" : "新增成功");
} else {
......
......@@ -35,7 +35,7 @@ public class Cluster extends SuperEntity {
private String note;
private boolean autoRegisters;
private Boolean autoRegisters;
private Integer clusterConfigurationId;
......
......@@ -33,7 +33,7 @@ public class ClusterConfiguration extends SuperEntity {
private String configJson;
private boolean isAvailable;
private Boolean isAvailable;
private String note;
......
......@@ -44,7 +44,7 @@ public class DataBase extends SuperEntity {
private String dbVersion;
private boolean status;
private Boolean status;
private LocalDateTime healthTime;
......
......@@ -44,11 +44,11 @@ public class Task extends SuperEntity {
private Integer parallelism;
private boolean fragment;
private Boolean fragment;
private boolean statementSet;
private Boolean statementSet;
private boolean batchModel;
private Boolean batchModel;
private Integer clusterId;
......
......@@ -38,9 +38,9 @@ public class User implements Serializable {
private String mobile;
private boolean enabled;
private Boolean enabled;
private boolean isDelete;
private Boolean isDelete;
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
......@@ -49,5 +49,5 @@ public class User implements Serializable {
private LocalDateTime updateTime;
@TableField(exist = false)
private boolean isAdmin;
private Boolean isAdmin;
}
......@@ -487,7 +487,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen
private JobConfig buildJobConfig(Task task) {
boolean isJarTask = Dialect.FLINKJAR.equalsVal(task.getDialect());
if (!isJarTask && task.isFragment()) {
if (!isJarTask && task.getFragment()) {
String flinkWithSql = dataBaseService.getEnabledFlinkWithSql();
if (Asserts.isNotNullString(flinkWithSql)) {
task.setStatement(flinkWithSql + "\r\n" + task.getStatement());
......
......@@ -33,7 +33,7 @@ public class UserServiceImpl extends SuperServiceImpl<UserMapper, User> implemen
}
user.setPassword(SaSecureUtil.md5(user.getPassword()));
user.setEnabled(true);
user.setDelete(false);
user.setIsDelete(false);
if (save(user)) {
return Result.succeed("注册成功");
} else {
......@@ -69,7 +69,7 @@ public class UserServiceImpl extends SuperServiceImpl<UserMapper, User> implemen
public boolean removeUser(Integer id) {
User user = new User();
user.setId(id);
user.setDelete(true);
user.setIsDelete(true);
return updateById(user);
}
......@@ -84,10 +84,10 @@ public class UserServiceImpl extends SuperServiceImpl<UserMapper, User> implemen
return Result.failed("密码不能为空");
}
if (Asserts.isEquals(SaSecureUtil.md5(password), userPassword)) {
if (user.isDelete()) {
if (user.getIsDelete()) {
return Result.failed("账号不存在");
}
if (!user.isEnabled()) {
if (!user.getEnabled()) {
return Result.failed("账号已被禁用");
}
StpUtil.login(user.getId(), isRemember);
......@@ -102,7 +102,7 @@ public class UserServiceImpl extends SuperServiceImpl<UserMapper, User> implemen
public User getUserByUsername(String username) {
User user = getOne(new QueryWrapper<User>().eq("username", username).eq("is_delete", 0));
if (Asserts.isNotNull(user)) {
user.setAdmin(Asserts.isEqualsIgnoreCase(username, "admin"));
user.setIsAdmin(Asserts.isEqualsIgnoreCase(username, "admin"));
}
return user;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment