Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dlink
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhaowei
dlink
Commits
eabb360b
Commit
eabb360b
authored
Mar 17, 2022
by
wenmo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
admin 代码美化
parent
a4a8eb83
Changes
78
Show whitespace changes
Inline
Side-by-side
Showing
78 changed files
with
455 additions
and
517 deletions
+455
-517
Dlink.java
dlink-admin/src/main/java/com/dlink/Dlink.java
+3
-2
Assert.java
dlink-admin/src/main/java/com/dlink/assertion/Assert.java
+0
-4
APIController.java
...min/src/main/java/com/dlink/controller/APIController.java
+17
-17
AdminController.java
...n/src/main/java/com/dlink/controller/AdminController.java
+4
-4
AlertGroupController.java
.../main/java/com/dlink/controller/AlertGroupController.java
+11
-11
AlertHistoryController.java
...ain/java/com/dlink/controller/AlertHistoryController.java
+10
-10
AlertInstanceController.java
...in/java/com/dlink/controller/AlertInstanceController.java
+11
-11
CatalogueController.java
...c/main/java/com/dlink/controller/CatalogueController.java
+42
-41
ClusterConfigurationController.java
.../com/dlink/controller/ClusterConfigurationController.java
+14
-14
ClusterController.java
...src/main/java/com/dlink/controller/ClusterController.java
+14
-14
DataBaseController.java
...rc/main/java/com/dlink/controller/DataBaseController.java
+22
-21
DocumentController.java
...rc/main/java/com/dlink/controller/DocumentController.java
+11
-11
HistoryController.java
...src/main/java/com/dlink/controller/HistoryController.java
+8
-8
JarController.java
...min/src/main/java/com/dlink/controller/JarController.java
+12
-12
JobInstanceController.java
...main/java/com/dlink/controller/JobInstanceController.java
+3
-3
SavepointsController.java
.../main/java/com/dlink/controller/SavepointsController.java
+11
-11
StatementController.java
...c/main/java/com/dlink/controller/StatementController.java
+10
-10
StudioController.java
.../src/main/java/com/dlink/controller/StudioController.java
+30
-30
SysConfigController.java
...c/main/java/com/dlink/controller/SysConfigController.java
+11
-11
TaskController.java
...in/src/main/java/com/dlink/controller/TaskController.java
+32
-32
UserController.java
...in/src/main/java/com/dlink/controller/UserController.java
+3
-3
SuperEntity.java
...k-admin/src/main/java/com/dlink/db/model/SuperEntity.java
+1
-1
ISuperService.java
...min/src/main/java/com/dlink/db/service/ISuperService.java
+1
-1
SuperServiceImpl.java
...main/java/com/dlink/db/service/impl/SuperServiceImpl.java
+7
-7
ProTableUtil.java
...k-admin/src/main/java/com/dlink/db/util/ProTableUtil.java
+22
-23
APIExecuteSqlDTO.java
...k-admin/src/main/java/com/dlink/dto/APIExecuteSqlDTO.java
+0
-4
APIExplainSqlDTO.java
...k-admin/src/main/java/com/dlink/dto/APIExplainSqlDTO.java
+0
-3
SessionDTO.java
dlink-admin/src/main/java/com/dlink/dto/SessionDTO.java
+0
-2
SqlDTO.java
dlink-admin/src/main/java/com/dlink/dto/SqlDTO.java
+2
-2
StudioCADTO.java
dlink-admin/src/main/java/com/dlink/dto/StudioCADTO.java
+2
-7
StudioDDLDTO.java
dlink-admin/src/main/java/com/dlink/dto/StudioDDLDTO.java
+1
-1
WebExceptionHandler.java
...rc/main/java/com/dlink/exception/WebExceptionHandler.java
+1
-1
SystemInit.java
dlink-admin/src/main/java/com/dlink/init/SystemInit.java
+4
-4
FlinkJobTask.java
dlink-admin/src/main/java/com/dlink/job/FlinkJobTask.java
+2
-2
CatalogueMapper.java
...admin/src/main/java/com/dlink/mapper/CatalogueMapper.java
+0
-1
StatementMapper.java
...admin/src/main/java/com/dlink/mapper/StatementMapper.java
+0
-2
TaskMapper.java
dlink-admin/src/main/java/com/dlink/mapper/TaskMapper.java
+1
-0
AlertHistory.java
dlink-admin/src/main/java/com/dlink/model/AlertHistory.java
+1
-5
Cluster.java
dlink-admin/src/main/java/com/dlink/model/Cluster.java
+2
-2
ClusterConfiguration.java
...n/src/main/java/com/dlink/model/ClusterConfiguration.java
+3
-3
CodeEnum.java
dlink-admin/src/main/java/com/dlink/model/CodeEnum.java
+2
-1
Jar.java
dlink-admin/src/main/java/com/dlink/model/Jar.java
+0
-2
JobInstance.java
dlink-admin/src/main/java/com/dlink/model/JobInstance.java
+1
-5
SysConfig.java
dlink-admin/src/main/java/com/dlink/model/SysConfig.java
+1
-6
User.java
dlink-admin/src/main/java/com/dlink/model/User.java
+1
-2
APIJobResult.java
dlink-admin/src/main/java/com/dlink/result/APIJobResult.java
+3
-3
CatalogueService.java
...min/src/main/java/com/dlink/service/CatalogueService.java
+0
-1
ClusterConfigurationService.java
...n/java/com/dlink/service/ClusterConfigurationService.java
+1
-1
ClusterService.java
...admin/src/main/java/com/dlink/service/ClusterService.java
+1
-1
DocumentService.java
...dmin/src/main/java/com/dlink/service/DocumentService.java
+1
-0
HistoryService.java
...admin/src/main/java/com/dlink/service/HistoryService.java
+2
-1
JobHistoryService.java
...in/src/main/java/com/dlink/service/JobHistoryService.java
+1
-1
JobInstanceService.java
...n/src/main/java/com/dlink/service/JobInstanceService.java
+0
-1
SavepointsService.java
...in/src/main/java/com/dlink/service/SavepointsService.java
+1
-2
StatementService.java
...min/src/main/java/com/dlink/service/StatementService.java
+1
-0
StudioService.java
...-admin/src/main/java/com/dlink/service/StudioService.java
+2
-4
SysConfigService.java
...min/src/main/java/com/dlink/service/SysConfigService.java
+1
-1
TaskService.java
dlink-admin/src/main/java/com/dlink/service/TaskService.java
+1
-2
UserService.java
dlink-admin/src/main/java/com/dlink/service/UserService.java
+2
-2
APIServiceImpl.java
.../src/main/java/com/dlink/service/impl/APIServiceImpl.java
+2
-6
AlertGroupServiceImpl.java
...in/java/com/dlink/service/impl/AlertGroupServiceImpl.java
+4
-4
AlertInstanceServiceImpl.java
...java/com/dlink/service/impl/AlertInstanceServiceImpl.java
+1
-1
CatalogueServiceImpl.java
...ain/java/com/dlink/service/impl/CatalogueServiceImpl.java
+8
-8
ClusterConfigurationServiceImpl.java
...m/dlink/service/impl/ClusterConfigurationServiceImpl.java
+11
-15
ClusterServiceImpl.java
.../main/java/com/dlink/service/impl/ClusterServiceImpl.java
+15
-15
DocumentServiceImpl.java
...main/java/com/dlink/service/impl/DocumentServiceImpl.java
+2
-2
HistoryServiceImpl.java
.../main/java/com/dlink/service/impl/HistoryServiceImpl.java
+1
-1
JarServiceImpl.java
.../src/main/java/com/dlink/service/impl/JarServiceImpl.java
+1
-1
JobHistoryServiceImpl.java
...in/java/com/dlink/service/impl/JobHistoryServiceImpl.java
+11
-11
JobInstanceServiceImpl.java
...n/java/com/dlink/service/impl/JobInstanceServiceImpl.java
+4
-20
SavepointsServiceImpl.java
...in/java/com/dlink/service/impl/SavepointsServiceImpl.java
+1
-1
StatementServiceImpl.java
...ain/java/com/dlink/service/impl/StatementServiceImpl.java
+2
-2
StudioServiceImpl.java
...c/main/java/com/dlink/service/impl/StudioServiceImpl.java
+6
-7
SysConfigServiceImpl.java
...ain/java/com/dlink/service/impl/SysConfigServiceImpl.java
+6
-7
TaskServiceImpl.java
...src/main/java/com/dlink/service/impl/TaskServiceImpl.java
+6
-6
UserServiceImpl.java
...src/main/java/com/dlink/service/impl/UserServiceImpl.java
+21
-21
openapi_savepoint.json
dlink-admin/src/main/resources/json/openapi_savepoint.json
+1
-1
AdminTest.java
dlink-admin/src/test/java/com/dlink/admin/AdminTest.java
+1
-1
No files found.
dlink-admin/src/main/java/com/dlink/Dlink.java
View file @
eabb360b
...
...
@@ -6,6 +6,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
/**
* Dlink 启动器
*
* @author wenmo
* @since 2021/5/28
*/
...
...
dlink-admin/src/main/java/com/dlink/assertion/Assert.java
View file @
eabb360b
...
...
@@ -14,10 +14,6 @@ import com.dlink.model.Task;
*/
public
interface
Assert
{
static
boolean
checkNotNull
(
Object
object
){
return
object
!=
null
;
}
static
void
check
(
Cluster
cluster
)
{
if
(
cluster
.
getId
()
==
null
)
{
throw
new
BusException
(
"Flink 集群【"
+
cluster
.
getId
()
+
"】不存在"
);
...
...
dlink-admin/src/main/java/com/dlink/controller/APIController.java
View file @
eabb360b
...
...
@@ -29,46 +29,46 @@ public class APIController {
@GetMapping
(
value
=
"/submitTask"
)
public
Result
submitTask
(
@RequestParam
Integer
id
)
{
return
Result
.
succeed
(
taskService
.
submitTask
(
id
),
"执行成功"
);
return
Result
.
succeed
(
taskService
.
submitTask
(
id
),
"执行成功"
);
}
@PostMapping
(
"/executeSql"
)
public
Result
executeSql
(
@RequestBody
APIExecuteSqlDTO
apiExecuteSqlDTO
)
{
return
Result
.
succeed
(
apiService
.
executeSql
(
apiExecuteSqlDTO
),
"执行成功"
);
return
Result
.
succeed
(
apiService
.
executeSql
(
apiExecuteSqlDTO
),
"执行成功"
);
}
@PostMapping
(
"/explainSql"
)
public
Result
explainSql
(
@RequestBody
APIExplainSqlDTO
apiExecuteSqlDTO
)
{
return
Result
.
succeed
(
apiService
.
explainSql
(
apiExecuteSqlDTO
),
"执行成功"
);
return
Result
.
succeed
(
apiService
.
explainSql
(
apiExecuteSqlDTO
),
"执行成功"
);
}
@PostMapping
(
"/getJobPlan"
)
public
Result
getJobPlan
(
@RequestBody
APIExplainSqlDTO
apiExecuteSqlDTO
)
{
return
Result
.
succeed
(
apiService
.
getJobPlan
(
apiExecuteSqlDTO
),
"执行成功"
);
return
Result
.
succeed
(
apiService
.
getJobPlan
(
apiExecuteSqlDTO
),
"执行成功"
);
}
@PostMapping
(
"/getStreamGraph"
)
public
Result
getStreamGraph
(
@RequestBody
APIExplainSqlDTO
apiExecuteSqlDTO
)
{
return
Result
.
succeed
(
apiService
.
getStreamGraph
(
apiExecuteSqlDTO
),
"执行成功"
);
return
Result
.
succeed
(
apiService
.
getStreamGraph
(
apiExecuteSqlDTO
),
"执行成功"
);
}
@GetMapping
(
"/getJobData"
)
public
Result
getJobData
(
@RequestParam
String
jobId
)
{
return
Result
.
succeed
(
studioService
.
getJobData
(
jobId
),
"获取成功"
);
return
Result
.
succeed
(
studioService
.
getJobData
(
jobId
),
"获取成功"
);
}
@PostMapping
(
"/cancel"
)
public
Result
cancel
(
@RequestBody
APICancelDTO
apiCancelDTO
)
{
return
Result
.
succeed
(
apiService
.
cancel
(
apiCancelDTO
),
"执行成功"
);
return
Result
.
succeed
(
apiService
.
cancel
(
apiCancelDTO
),
"执行成功"
);
}
@PostMapping
(
"/savepoint"
)
public
Result
savepoint
(
@RequestBody
APISavePointDTO
apiSavePointDTO
)
{
return
Result
.
succeed
(
apiService
.
savepoint
(
apiSavePointDTO
),
"执行成功"
);
return
Result
.
succeed
(
apiService
.
savepoint
(
apiSavePointDTO
),
"执行成功"
);
}
@PostMapping
(
"/executeJar"
)
public
Result
executeJar
(
@RequestBody
APIExecuteJarDTO
apiExecuteJarDTO
)
{
return
Result
.
succeed
(
apiService
.
executeJar
(
apiExecuteJarDTO
),
"执行成功"
);
return
Result
.
succeed
(
apiService
.
executeJar
(
apiExecuteJarDTO
),
"执行成功"
);
}
}
dlink-admin/src/main/java/com/dlink/controller/AdminController.java
View file @
eabb360b
...
...
@@ -31,10 +31,10 @@ public class AdminController {
*/
@PostMapping
(
"/login"
)
public
Result
login
(
@RequestBody
LoginUTO
loginUTO
)
{
if
(
Asserts
.
isNull
(
loginUTO
.
isAutoLogin
()))
{
if
(
Asserts
.
isNull
(
loginUTO
.
isAutoLogin
()))
{
loginUTO
.
setAutoLogin
(
false
);
}
return
userService
.
loginUser
(
loginUTO
.
getUsername
(),
loginUTO
.
getPassword
(),
loginUTO
.
isAutoLogin
());
return
userService
.
loginUser
(
loginUTO
.
getUsername
(),
loginUTO
.
getPassword
(),
loginUTO
.
isAutoLogin
());
}
/**
...
...
@@ -51,9 +51,9 @@ public class AdminController {
*/
@GetMapping
(
"/current"
)
public
Result
current
()
throws
Exception
{
try
{
try
{
return
Result
.
succeed
(
StpUtil
.
getSession
().
get
(
"user"
),
"获取成功"
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
return
Result
.
failed
(
"获取失败"
);
}
}
...
...
dlink-admin/src/main/java/com/dlink/controller/AlertGroupController.java
View file @
eabb360b
...
...
@@ -40,9 +40,9 @@ public class AlertGroupController {
*/
@PutMapping
public
Result
saveOrUpdate
(
@RequestBody
AlertGroup
alertGroup
)
throws
Exception
{
if
(
alertGroupService
.
saveOrUpdate
(
alertGroup
))
{
if
(
alertGroupService
.
saveOrUpdate
(
alertGroup
))
{
return
Result
.
succeed
(
"新增成功"
);
}
else
{
}
else
{
return
Result
.
failed
(
"新增失败"
);
}
}
...
...
@@ -60,20 +60,20 @@ public class AlertGroupController {
*/
@DeleteMapping
public
Result
deleteMul
(
@RequestBody
JsonNode
para
)
{
if
(
para
.
size
()
>
0
)
{
if
(
para
.
size
()
>
0
)
{
List
<
Integer
>
error
=
new
ArrayList
<>();
for
(
final
JsonNode
item
:
para
){
for
(
final
JsonNode
item
:
para
)
{
Integer
id
=
item
.
asInt
();
if
(!
alertGroupService
.
removeById
(
id
))
{
if
(!
alertGroupService
.
removeById
(
id
))
{
error
.
add
(
id
);
}
}
if
(
error
.
size
()==
0
)
{
if
(
error
.
size
()
==
0
)
{
return
Result
.
succeed
(
"删除成功"
);
}
else
{
return
Result
.
succeed
(
"删除部分成功,但"
+
error
.
toString
()+
"删除失败,共"
+
error
.
size
()+
"次失败。"
);
}
else
{
return
Result
.
succeed
(
"删除部分成功,但"
+
error
.
toString
()
+
"删除失败,共"
+
error
.
size
()
+
"次失败。"
);
}
}
else
{
}
else
{
return
Result
.
failed
(
"请选择要删除的记录"
);
}
}
...
...
@@ -84,7 +84,7 @@ public class AlertGroupController {
@PostMapping
(
"/getOneById"
)
public
Result
getOneById
(
@RequestBody
AlertGroup
alertGroup
)
throws
Exception
{
alertGroup
=
alertGroupService
.
getById
(
alertGroup
.
getId
());
return
Result
.
succeed
(
alertGroup
,
"获取成功"
);
return
Result
.
succeed
(
alertGroup
,
"获取成功"
);
}
/**
...
...
@@ -92,7 +92,7 @@ public class AlertGroupController {
*/
@GetMapping
(
"/listEnabledAll"
)
public
Result
listEnabledAll
()
{
return
Result
.
succeed
(
alertGroupService
.
listEnabledAll
(),
"获取成功"
);
return
Result
.
succeed
(
alertGroupService
.
listEnabledAll
(),
"获取成功"
);
}
/**
...
...
dlink-admin/src/main/java/com/dlink/controller/AlertHistoryController.java
View file @
eabb360b
...
...
@@ -35,9 +35,9 @@ public class AlertHistoryController {
*/
@PutMapping
public
Result
saveOrUpdate
(
@RequestBody
AlertHistory
alertHistory
)
throws
Exception
{
if
(
alertHistoryService
.
saveOrUpdate
(
alertHistory
))
{
if
(
alertHistoryService
.
saveOrUpdate
(
alertHistory
))
{
return
Result
.
succeed
(
"新增成功"
);
}
else
{
}
else
{
return
Result
.
failed
(
"新增失败"
);
}
}
...
...
@@ -55,20 +55,20 @@ public class AlertHistoryController {
*/
@DeleteMapping
public
Result
deleteMul
(
@RequestBody
JsonNode
para
)
{
if
(
para
.
size
()
>
0
)
{
if
(
para
.
size
()
>
0
)
{
List
<
Integer
>
error
=
new
ArrayList
<>();
for
(
final
JsonNode
item
:
para
){
for
(
final
JsonNode
item
:
para
)
{
Integer
id
=
item
.
asInt
();
if
(!
alertHistoryService
.
removeById
(
id
))
{
if
(!
alertHistoryService
.
removeById
(
id
))
{
error
.
add
(
id
);
}
}
if
(
error
.
size
()==
0
)
{
if
(
error
.
size
()
==
0
)
{
return
Result
.
succeed
(
"删除成功"
);
}
else
{
return
Result
.
succeed
(
"删除部分成功,但"
+
error
.
toString
()+
"删除失败,共"
+
error
.
size
()+
"次失败。"
);
}
else
{
return
Result
.
succeed
(
"删除部分成功,但"
+
error
.
toString
()
+
"删除失败,共"
+
error
.
size
()
+
"次失败。"
);
}
}
else
{
}
else
{
return
Result
.
failed
(
"请选择要删除的记录"
);
}
}
...
...
@@ -79,6 +79,6 @@ public class AlertHistoryController {
@PostMapping
(
"/getOneById"
)
public
Result
getOneById
(
@RequestBody
AlertHistory
alertHistory
)
throws
Exception
{
alertHistory
=
alertHistoryService
.
getById
(
alertHistory
.
getId
());
return
Result
.
succeed
(
alertHistory
,
"获取成功"
);
return
Result
.
succeed
(
alertHistory
,
"获取成功"
);
}
}
dlink-admin/src/main/java/com/dlink/controller/AlertInstanceController.java
View file @
eabb360b
...
...
@@ -37,10 +37,10 @@ public class AlertInstanceController {
*/
@PutMapping
public
Result
saveOrUpdate
(
@RequestBody
AlertInstance
alertInstance
)
throws
Exception
{
if
(
alertInstanceService
.
saveOrUpdate
(
alertInstance
))
{
if
(
alertInstanceService
.
saveOrUpdate
(
alertInstance
))
{
AlertPool
.
remove
(
alertInstance
.
getName
());
return
Result
.
succeed
(
"新增成功"
);
}
else
{
}
else
{
return
Result
.
failed
(
"新增失败"
);
}
}
...
...
@@ -58,20 +58,20 @@ public class AlertInstanceController {
*/
@DeleteMapping
public
Result
deleteMul
(
@RequestBody
JsonNode
para
)
{
if
(
para
.
size
()
>
0
)
{
if
(
para
.
size
()
>
0
)
{
List
<
Integer
>
error
=
new
ArrayList
<>();
for
(
final
JsonNode
item
:
para
){
for
(
final
JsonNode
item
:
para
)
{
Integer
id
=
item
.
asInt
();
if
(!
alertInstanceService
.
removeById
(
id
))
{
if
(!
alertInstanceService
.
removeById
(
id
))
{
error
.
add
(
id
);
}
}
if
(
error
.
size
()==
0
)
{
if
(
error
.
size
()
==
0
)
{
return
Result
.
succeed
(
"删除成功"
);
}
else
{
return
Result
.
succeed
(
"删除部分成功,但"
+
error
.
toString
()+
"删除失败,共"
+
error
.
size
()+
"次失败。"
);
}
else
{
return
Result
.
succeed
(
"删除部分成功,但"
+
error
.
toString
()
+
"删除失败,共"
+
error
.
size
()
+
"次失败。"
);
}
}
else
{
}
else
{
return
Result
.
failed
(
"请选择要删除的记录"
);
}
}
...
...
@@ -82,7 +82,7 @@ public class AlertInstanceController {
@PostMapping
(
"/getOneById"
)
public
Result
getOneById
(
@RequestBody
AlertInstance
alertInstance
)
throws
Exception
{
alertInstance
=
alertInstanceService
.
getById
(
alertInstance
.
getId
());
return
Result
.
succeed
(
alertInstance
,
"获取成功"
);
return
Result
.
succeed
(
alertInstance
,
"获取成功"
);
}
/**
...
...
@@ -90,6 +90,6 @@ public class AlertInstanceController {
*/
@GetMapping
(
"/listEnabledAll"
)
public
Result
listEnabledAll
()
{
return
Result
.
succeed
(
alertInstanceService
.
listEnabledAll
(),
"获取成功"
);
return
Result
.
succeed
(
alertInstanceService
.
listEnabledAll
(),
"获取成功"
);
}
}
dlink-admin/src/main/java/com/dlink/controller/CatalogueController.java
View file @
eabb360b
...
...
@@ -12,6 +12,7 @@ import lombok.extern.slf4j.Slf4j;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.multipart.MultipartFile
;
import
java.io.*
;
import
java.util.ArrayList
;
import
java.util.List
;
...
...
@@ -31,17 +32,17 @@ public class CatalogueController {
private
CatalogueService
catalogueService
;
@PostMapping
(
"/upload/{id}"
)
public
Result
<
String
>
upload
(
MultipartFile
file
,
@PathVariable
Integer
id
)
{
public
Result
<
String
>
upload
(
MultipartFile
file
,
@PathVariable
Integer
id
)
{
//获取上传的路径
String
filePath
=
System
.
getProperty
(
"user.dir"
);
//获取源文件的名称
String
fileName
=
file
.
getOriginalFilename
();
String
zipPath
=
filePath
+
File
.
separator
+
fileName
;
String
unzipFileName
=
fileName
.
substring
(
0
,
fileName
.
lastIndexOf
(
"."
));
String
unzipPath
=
filePath
+
File
.
separator
+
unzipFileName
;
String
zipPath
=
filePath
+
File
.
separator
+
fileName
;
String
unzipFileName
=
fileName
.
substring
(
0
,
fileName
.
lastIndexOf
(
"."
));
String
unzipPath
=
filePath
+
File
.
separator
+
unzipFileName
;
File
unzipFile
=
new
File
(
unzipPath
);
File
zipFile
=
new
File
(
zipPath
);
if
(
unzipFile
.
exists
())
{
if
(
unzipFile
.
exists
())
{
FileUtil
.
del
(
zipFile
);
return
Result
.
failed
(
"工程已存在"
);
}
...
...
@@ -49,55 +50,55 @@ public class CatalogueController {
//文件写入上传的路径
FileUtil
.
writeBytes
(
file
.
getBytes
(),
zipPath
);
Thread
.
sleep
(
1L
);
if
(!
unzipFile
.
exists
())
{
ZipUtil
.
unzip
(
zipPath
,
filePath
);
if
(!
unzipFile
.
exists
())
{
ZipUtil
.
unzip
(
zipPath
,
filePath
);
Catalogue
cata
=
getCatalogue
(
id
,
unzipFileName
);
traverseFile
(
unzipPath
,
cata
);
traverseFile
(
unzipPath
,
cata
);
}
}
catch
(
Exception
e
)
{
return
Result
.
failed
(
e
.
getMessage
());
}
finally
{
}
finally
{
FileUtil
.
del
(
zipFile
);
}
return
Result
.
succeed
(
"上传zip包并创建工程成功"
);
}
private
void
traverseFile
(
String
sourcePath
,
Catalogue
catalog
)
throws
Exception
{
private
void
traverseFile
(
String
sourcePath
,
Catalogue
catalog
)
throws
Exception
{
File
file
=
new
File
(
sourcePath
);
File
[]
fs
=
file
.
listFiles
();
if
(
fs
==
null
)
{
if
(
fs
==
null
)
{
throw
new
RuntimeException
(
"目录层级有误"
);
}
for
(
File
fl
:
fs
)
{
if
(
fl
.
isFile
())
{
if
(
fl
.
isFile
())
{
System
.
out
.
println
(
fl
.
getName
());
CatalogueTaskDTO
dto
=
getCatalogueTaskDTO
(
fl
.
getName
(),
catalogueService
.
findByParentIdAndName
(
catalog
.
getParentId
(),
catalog
.
getName
()).
getId
());
String
fileText
=
getFileText
(
fl
);
catalogueService
.
createCatalogAndFileTask
(
dto
,
fileText
);
}
else
{
catalogueService
.
createCatalogAndFileTask
(
dto
,
fileText
);
}
else
{
Catalogue
newCata
=
getCatalogue
(
catalogueService
.
findByParentIdAndName
(
catalog
.
getParentId
(),
catalog
.
getName
()).
getId
(),
fl
.
getName
());
traverseFile
(
fl
.
getPath
(),
newCata
);
traverseFile
(
fl
.
getPath
(),
newCata
);
}
}
}
private
String
getFileText
(
File
sourceFile
){
private
String
getFileText
(
File
sourceFile
)
{
StringBuilder
sb
=
new
StringBuilder
();
BufferedReader
br
=
null
;
try
{
if
(
sourceFile
.
isFile
()
&&
sourceFile
.
exists
())
{
try
{
if
(
sourceFile
.
isFile
()
&&
sourceFile
.
exists
())
{
InputStreamReader
isr
=
new
InputStreamReader
(
new
FileInputStream
(
sourceFile
));
br
=
new
BufferedReader
(
isr
);
String
lineText
=
null
;
while
((
lineText
=
br
.
readLine
())
!=
null
){
while
((
lineText
=
br
.
readLine
())
!=
null
)
{
sb
.
append
(
lineText
).
append
(
"\n"
);
}
}
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
}
finally
{
if
(
br
!=
null
)
{
}
finally
{
if
(
br
!=
null
)
{
try
{
br
.
close
();
}
catch
(
IOException
e
)
{
...
...
@@ -108,7 +109,7 @@ public class CatalogueController {
return
sb
.
toString
();
}
private
Catalogue
getCatalogue
(
Integer
parentId
,
String
name
){
private
Catalogue
getCatalogue
(
Integer
parentId
,
String
name
)
{
Catalogue
subcata
=
new
Catalogue
();
subcata
.
setTaskId
(
null
);
subcata
.
setName
(
name
);
...
...
@@ -119,9 +120,9 @@ public class CatalogueController {
return
subcata
;
}
private
CatalogueTaskDTO
getCatalogueTaskDTO
(
String
alias
,
Integer
parentId
){
private
CatalogueTaskDTO
getCatalogueTaskDTO
(
String
alias
,
Integer
parentId
)
{
CatalogueTaskDTO
catalogueTaskDTO
=
new
CatalogueTaskDTO
();
catalogueTaskDTO
.
setName
(
UUID
.
randomUUID
().
toString
().
substring
(
0
,
6
)+
alias
);
catalogueTaskDTO
.
setName
(
UUID
.
randomUUID
().
toString
().
substring
(
0
,
6
)
+
alias
);
catalogueTaskDTO
.
setAlias
(
alias
);
catalogueTaskDTO
.
setId
(
null
);
catalogueTaskDTO
.
setParentId
(
parentId
);
...
...
@@ -135,9 +136,9 @@ public class CatalogueController {
*/
@PutMapping
public
Result
saveOrUpdate
(
@RequestBody
Catalogue
catalogue
)
throws
Exception
{
if
(
catalogueService
.
saveOrUpdate
(
catalogue
))
{
if
(
catalogueService
.
saveOrUpdate
(
catalogue
))
{
return
Result
.
succeed
(
"创建成功"
);
}
else
{
}
else
{
return
Result
.
failed
(
"创建失败"
);
}
}
...
...
@@ -155,21 +156,21 @@ public class CatalogueController {
*/
@DeleteMapping
public
Result
deleteMul
(
@RequestBody
JsonNode
para
)
{
if
(
para
.
size
()
>
0
)
{
if
(
para
.
size
()
>
0
)
{
boolean
isAdmin
=
false
;
List
<
Integer
>
error
=
new
ArrayList
<>();
for
(
final
JsonNode
item
:
para
){
for
(
final
JsonNode
item
:
para
)
{
Integer
id
=
item
.
asInt
();
if
(!
catalogueService
.
removeCatalogueAndTaskById
(
id
))
{
if
(!
catalogueService
.
removeCatalogueAndTaskById
(
id
))
{
error
.
add
(
id
);
}
}
if
(
error
.
size
()==
0
&&
!
isAdmin
)
{
if
(
error
.
size
()
==
0
&&
!
isAdmin
)
{
return
Result
.
succeed
(
"删除成功"
);
}
else
{
return
Result
.
succeed
(
"删除部分成功,但"
+
error
.
toString
()+
"删除失败,共"
+
error
.
size
()+
"次失败。"
);
}
else
{
return
Result
.
succeed
(
"删除部分成功,但"
+
error
.
toString
()
+
"删除失败,共"
+
error
.
size
()
+
"次失败。"
);
}
}
else
{
}
else
{
return
Result
.
failed
(
"请选择要删除的记录"
);
}
}
...
...
@@ -180,7 +181,7 @@ public class CatalogueController {
@PostMapping
(
"/getOneById"
)
public
Result
getOneById
(
@RequestBody
Catalogue
catalogue
)
throws
Exception
{
catalogue
=
catalogueService
.
getById
(
catalogue
.
getId
());
return
Result
.
succeed
(
catalogue
,
"获取成功"
);
return
Result
.
succeed
(
catalogue
,
"获取成功"
);
}
/**
...
...
@@ -189,7 +190,7 @@ public class CatalogueController {
@PostMapping
(
"/getCatalogueTreeData"
)
public
Result
getCatalogueTreeData
()
throws
Exception
{
List
<
Catalogue
>
catalogues
=
catalogueService
.
getAllData
();
return
Result
.
succeed
(
catalogues
,
"获取成功"
);
return
Result
.
succeed
(
catalogues
,
"获取成功"
);
}
/**
...
...
@@ -198,9 +199,9 @@ public class CatalogueController {
@PutMapping
(
"/createTask"
)
public
Result
createTask
(
@RequestBody
CatalogueTaskDTO
catalogueTaskDTO
)
throws
Exception
{
Catalogue
catalogue
=
catalogueService
.
createCatalogueAndTask
(
catalogueTaskDTO
);
if
(
catalogue
.
getId
()!=
null
)
{
return
Result
.
succeed
(
catalogue
,
"创建成功"
);
}
else
{
if
(
catalogue
.
getId
()
!=
null
)
{
return
Result
.
succeed
(
catalogue
,
"创建成功"
);
}
else
{
return
Result
.
failed
(
"创建失败"
);
}
}
...
...
@@ -210,9 +211,9 @@ public class CatalogueController {
*/
@PutMapping
(
"/toRename"
)
public
Result
toRename
(
@RequestBody
Catalogue
catalogue
)
throws
Exception
{
if
(
catalogueService
.
toRename
(
catalogue
))
{
if
(
catalogueService
.
toRename
(
catalogue
))
{
return
Result
.
succeed
(
"重命名成功"
);
}
else
{
}
else
{
return
Result
.
failed
(
"重命名失败"
);
}
}
...
...
dlink-admin/src/main/java/com/dlink/controller/ClusterConfigurationController.java
View file @
eabb360b
...
...
@@ -39,9 +39,9 @@ public class ClusterConfigurationController {
public
Result
saveOrUpdate
(
@RequestBody
ClusterConfiguration
clusterConfiguration
)
{
TestResult
testResult
=
clusterConfigurationService
.
testGateway
(
clusterConfiguration
);
clusterConfiguration
.
setAvailable
(
testResult
.
isAvailable
());
if
(
clusterConfigurationService
.
saveOrUpdate
(
clusterConfiguration
))
{
if
(
clusterConfigurationService
.
saveOrUpdate
(
clusterConfiguration
))
{
return
Result
.
succeed
(
"新增成功"
);
}
else
{
}
else
{
return
Result
.
failed
(
"新增失败"
);
}
}
...
...
@@ -59,20 +59,20 @@ public class ClusterConfigurationController {
*/
@DeleteMapping
public
Result
deleteMul
(
@RequestBody
JsonNode
para
)
{
if
(
para
.
size
()
>
0
)
{
if
(
para
.
size
()
>
0
)
{
List
<
Integer
>
error
=
new
ArrayList
<>();
for
(
final
JsonNode
item
:
para
){
for
(
final
JsonNode
item
:
para
)
{
Integer
id
=
item
.
asInt
();
if
(!
clusterConfigurationService
.
removeById
(
id
))
{
if
(!
clusterConfigurationService
.
removeById
(
id
))
{
error
.
add
(
id
);
}
}
if
(
error
.
size
()==
0
)
{
if
(
error
.
size
()
==
0
)
{
return
Result
.
succeed
(
"删除成功"
);
}
else
{
return
Result
.
succeed
(
"删除部分成功,但"
+
error
.
toString
()+
"删除失败,共"
+
error
.
size
()+
"次失败。"
);
}
else
{
return
Result
.
succeed
(
"删除部分成功,但"
+
error
.
toString
()
+
"删除失败,共"
+
error
.
size
()
+
"次失败。"
);
}
}
else
{
}
else
{
return
Result
.
failed
(
"请选择要删除的记录"
);
}
}
...
...
@@ -83,7 +83,7 @@ public class ClusterConfigurationController {
@PostMapping
(
"/getOneById"
)
public
Result
getOneById
(
@RequestBody
ClusterConfiguration
clusterConfiguration
)
{
clusterConfiguration
=
clusterConfigurationService
.
getById
(
clusterConfiguration
.
getId
());
return
Result
.
succeed
(
clusterConfiguration
,
"获取成功"
);
return
Result
.
succeed
(
clusterConfiguration
,
"获取成功"
);
}
/**
...
...
@@ -91,8 +91,8 @@ public class ClusterConfigurationController {
*/
@GetMapping
(
"/listEnabledAll"
)
public
Result
listEnabledAll
()
{
List
<
ClusterConfiguration
>
clusters
=
clusterConfigurationService
.
listEnabledAll
();
return
Result
.
succeed
(
clusters
,
"获取成功"
);
List
<
ClusterConfiguration
>
clusters
=
clusterConfigurationService
.
listEnabledAll
();
return
Result
.
succeed
(
clusters
,
"获取成功"
);
}
/**
...
...
@@ -101,9 +101,9 @@ public class ClusterConfigurationController {
@PostMapping
(
"/testConnect"
)
public
Result
testConnect
(
@RequestBody
ClusterConfiguration
clusterConfiguration
)
{
TestResult
testResult
=
clusterConfigurationService
.
testGateway
(
clusterConfiguration
);
if
(
testResult
.
isAvailable
())
{
if
(
testResult
.
isAvailable
())
{
return
Result
.
succeed
(
"测试链接成功"
);
}
else
{
}
else
{
return
Result
.
failed
(
testResult
.
getError
());
}
}
...
...
dlink-admin/src/main/java/com/dlink/controller/ClusterController.java
View file @
eabb360b
...
...
@@ -36,7 +36,7 @@ public class ClusterController {
public
Result
saveOrUpdate
(
@RequestBody
Cluster
cluster
)
throws
Exception
{
cluster
.
setAutoRegisters
(
false
);
clusterService
.
registersCluster
(
cluster
);
return
Result
.
succeed
(
Asserts
.
isNotNull
(
cluster
.
getId
())
?
"修改成功"
:
"新增成功"
);
return
Result
.
succeed
(
Asserts
.
isNotNull
(
cluster
.
getId
())
?
"修改成功"
:
"新增成功"
);
}
/**
...
...
@@ -61,20 +61,20 @@ public class ClusterController {
*/
@DeleteMapping
public
Result
deleteMul
(
@RequestBody
JsonNode
para
)
{
if
(
para
.
size
()
>
0
)
{
if
(
para
.
size
()
>
0
)
{
List
<
Integer
>
error
=
new
ArrayList
<>();
for
(
final
JsonNode
item
:
para
){
for
(
final
JsonNode
item
:
para
)
{
Integer
id
=
item
.
asInt
();
if
(!
clusterService
.
removeById
(
id
))
{
if
(!
clusterService
.
removeById
(
id
))
{
error
.
add
(
id
);
}
}
if
(
error
.
size
()==
0
)
{
if
(
error
.
size
()
==
0
)
{
return
Result
.
succeed
(
"删除成功"
);
}
else
{
return
Result
.
succeed
(
"删除部分成功,但"
+
error
.
toString
()+
"删除失败,共"
+
error
.
size
()+
"次失败。"
);
}
else
{
return
Result
.
succeed
(
"删除部分成功,但"
+
error
.
toString
()
+
"删除失败,共"
+
error
.
size
()
+
"次失败。"
);
}
}
else
{
}
else
{
return
Result
.
failed
(
"请选择要删除的记录"
);
}
}
...
...
@@ -85,7 +85,7 @@ public class ClusterController {
@PostMapping
(
"/getOneById"
)
public
Result
getOneById
(
@RequestBody
Cluster
cluster
)
throws
Exception
{
cluster
=
clusterService
.
getById
(
cluster
.
getId
());
return
Result
.
succeed
(
cluster
,
"获取成功"
);
return
Result
.
succeed
(
cluster
,
"获取成功"
);
}
/**
...
...
@@ -93,8 +93,8 @@ public class ClusterController {
*/
@GetMapping
(
"/listEnabledAll"
)
public
Result
listEnabledAll
()
{
List
<
Cluster
>
clusters
=
clusterService
.
listEnabledAll
();
return
Result
.
succeed
(
clusters
,
"获取成功"
);
List
<
Cluster
>
clusters
=
clusterService
.
listEnabledAll
();
return
Result
.
succeed
(
clusters
,
"获取成功"
);
}
/**
...
...
@@ -102,8 +102,8 @@ public class ClusterController {
*/
@GetMapping
(
"/listSessionEnable"
)
public
Result
listSessionEnable
()
{
List
<
Cluster
>
clusters
=
clusterService
.
listSessionEnable
();
return
Result
.
succeed
(
clusters
,
"获取成功"
);
List
<
Cluster
>
clusters
=
clusterService
.
listSessionEnable
();
return
Result
.
succeed
(
clusters
,
"获取成功"
);
}
/**
...
...
@@ -124,7 +124,7 @@ public class ClusterController {
*/
@GetMapping
(
"/clear"
)
public
Result
clear
()
{
return
Result
.
succeed
(
clusterService
.
clearCluster
(),
"回收完成"
);
return
Result
.
succeed
(
clusterService
.
clearCluster
(),
"回收完成"
);
}
}
dlink-admin/src/main/java/com/dlink/controller/DataBaseController.java
View file @
eabb360b
...
...
@@ -36,10 +36,10 @@ public class DataBaseController {
*/
@PutMapping
public
Result
saveOrUpdate
(
@RequestBody
DataBase
database
)
{
if
(
databaseService
.
saveOrUpdateDataBase
(
database
))
{
if
(
databaseService
.
saveOrUpdateDataBase
(
database
))
{
DriverPool
.
remove
(
database
.
getName
());
return
Result
.
succeed
(
"更新成功"
);
}
else
{
}
else
{
return
Result
.
failed
(
"更新失败"
);
}
}
...
...
@@ -57,20 +57,20 @@ public class DataBaseController {
*/
@DeleteMapping
public
Result
deleteMul
(
@RequestBody
JsonNode
para
)
{
if
(
para
.
size
()
>
0
)
{
if
(
para
.
size
()
>
0
)
{
List
<
Integer
>
error
=
new
ArrayList
<>();
for
(
final
JsonNode
item
:
para
){
for
(
final
JsonNode
item
:
para
)
{
Integer
id
=
item
.
asInt
();
if
(!
databaseService
.
removeById
(
id
))
{
if
(!
databaseService
.
removeById
(
id
))
{
error
.
add
(
id
);
}
}
if
(
error
.
size
()==
0
)
{
if
(
error
.
size
()
==
0
)
{
return
Result
.
succeed
(
"删除成功"
);
}
else
{
return
Result
.
succeed
(
"删除部分成功,但"
+
error
.
toString
()+
"删除失败,共"
+
error
.
size
()+
"次失败。"
);
}
else
{
return
Result
.
succeed
(
"删除部分成功,但"
+
error
.
toString
()
+
"删除失败,共"
+
error
.
size
()
+
"次失败。"
);
}
}
else
{
}
else
{
return
Result
.
failed
(
"请选择要删除的记录"
);
}
}
...
...
@@ -81,7 +81,7 @@ public class DataBaseController {
@PostMapping
(
"/getOneById"
)
public
Result
getOneById
(
@RequestBody
DataBase
database
)
{
database
=
databaseService
.
getById
(
database
.
getId
());
return
Result
.
succeed
(
database
,
"获取成功"
);
return
Result
.
succeed
(
database
,
"获取成功"
);
}
/**
...
...
@@ -90,18 +90,19 @@ public class DataBaseController {
@GetMapping
(
"/listEnabledAll"
)
public
Result
listEnabledAll
()
{
List
<
DataBase
>
dataBases
=
databaseService
.
listEnabledAll
();
return
Result
.
succeed
(
dataBases
,
"获取成功"
);
return
Result
.
succeed
(
dataBases
,
"获取成功"
);
}
/**
* 连接测试
*/
@PostMapping
(
"/testConnect"
)
public
Result
testConnect
(
@RequestBody
DataBase
database
)
{
String
msg
=
databaseService
.
testConnect
(
database
);
boolean
isHealthy
=
Asserts
.
isEquals
(
CommonConstant
.
HEALTHY
,
msg
);
if
(
isHealthy
)
{
boolean
isHealthy
=
Asserts
.
isEquals
(
CommonConstant
.
HEALTHY
,
msg
);
if
(
isHealthy
)
{
return
Result
.
succeed
(
"数据源连接测试成功!"
);
}
else
{
}
else
{
return
Result
.
failed
(
msg
);
}
}
...
...
@@ -126,10 +127,10 @@ public class DataBaseController {
@GetMapping
(
"/checkHeartBeatById"
)
public
Result
checkHeartBeatById
(
@RequestParam
Integer
id
)
{
DataBase
dataBase
=
databaseService
.
getById
(
id
);
Asserts
.
checkNotNull
(
dataBase
,
"该数据源不存在!"
);
Asserts
.
checkNotNull
(
dataBase
,
"该数据源不存在!"
);
databaseService
.
checkHeartBeat
(
dataBase
);
databaseService
.
updateById
(
dataBase
);
return
Result
.
succeed
(
dataBase
,
"状态刷新完成"
);
return
Result
.
succeed
(
dataBase
,
"状态刷新完成"
);
}
/**
...
...
@@ -137,22 +138,22 @@ public class DataBaseController {
*/
@GetMapping
(
"/getSchemasAndTables"
)
public
Result
getSchemasAndTables
(
@RequestParam
Integer
id
)
{
return
Result
.
succeed
(
databaseService
.
getSchemasAndTables
(
id
),
"获取成功"
);
return
Result
.
succeed
(
databaseService
.
getSchemasAndTables
(
id
),
"获取成功"
);
}
/**
* 获取元数据的指定表的列
*/
@GetMapping
(
"/listColumns"
)
public
Result
listColumns
(
@RequestParam
Integer
id
,
@RequestParam
String
schemaName
,
@RequestParam
String
tableName
)
{
return
Result
.
succeed
(
databaseService
.
listColumns
(
id
,
schemaName
,
tableName
),
"获取成功"
);
public
Result
listColumns
(
@RequestParam
Integer
id
,
@RequestParam
String
schemaName
,
@RequestParam
String
tableName
)
{
return
Result
.
succeed
(
databaseService
.
listColumns
(
id
,
schemaName
,
tableName
),
"获取成功"
);
}
/**
* 获取 SqlGeneration
*/
@GetMapping
(
"/getSqlGeneration"
)
public
Result
getSqlGeneration
(
@RequestParam
Integer
id
,
@RequestParam
String
schemaName
,
@RequestParam
String
tableName
)
{
return
Result
.
succeed
(
databaseService
.
getSqlGeneration
(
id
,
schemaName
,
tableName
),
"获取成功"
);
public
Result
getSqlGeneration
(
@RequestParam
Integer
id
,
@RequestParam
String
schemaName
,
@RequestParam
String
tableName
)
{
return
Result
.
succeed
(
databaseService
.
getSqlGeneration
(
id
,
schemaName
,
tableName
),
"获取成功"
);
}
}
\ No newline at end of file
dlink-admin/src/main/java/com/dlink/controller/DocumentController.java
View file @
eabb360b
...
...
@@ -30,9 +30,9 @@ public class DocumentController {
*/
@PutMapping
public
Result
saveOrUpdate
(
@RequestBody
Document
document
)
throws
Exception
{
if
(
documentService
.
saveOrUpdate
(
document
))
{
if
(
documentService
.
saveOrUpdate
(
document
))
{
return
Result
.
succeed
(
"新增成功"
);
}
else
{
}
else
{
return
Result
.
failed
(
"新增失败"
);
}
}
...
...
@@ -50,20 +50,20 @@ public class DocumentController {
*/
@DeleteMapping
public
Result
deleteMul
(
@RequestBody
JsonNode
para
)
{
if
(
para
.
size
()
>
0
)
{
if
(
para
.
size
()
>
0
)
{
List
<
Integer
>
error
=
new
ArrayList
<>();
for
(
final
JsonNode
item
:
para
){
for
(
final
JsonNode
item
:
para
)
{
Integer
id
=
item
.
asInt
();
if
(!
documentService
.
removeById
(
id
))
{
if
(!
documentService
.
removeById
(
id
))
{
error
.
add
(
id
);
}
}
if
(
error
.
size
()==
0
)
{
if
(
error
.
size
()
==
0
)
{
return
Result
.
succeed
(
"删除成功"
);
}
else
{
return
Result
.
succeed
(
"删除部分成功,但"
+
error
.
toString
()+
"删除失败,共"
+
error
.
size
()+
"次失败。"
);
}
else
{
return
Result
.
succeed
(
"删除部分成功,但"
+
error
.
toString
()
+
"删除失败,共"
+
error
.
size
()
+
"次失败。"
);
}
}
else
{
}
else
{
return
Result
.
failed
(
"请选择要删除的记录"
);
}
}
...
...
@@ -74,7 +74,7 @@ public class DocumentController {
@PostMapping
(
"/getOneById"
)
public
Result
getOneById
(
@RequestBody
Document
document
)
throws
Exception
{
document
=
documentService
.
getById
(
document
.
getId
());
return
Result
.
succeed
(
document
,
"获取成功"
);
return
Result
.
succeed
(
document
,
"获取成功"
);
}
/**
...
...
@@ -82,6 +82,6 @@ public class DocumentController {
*/
@GetMapping
(
"/getFillAllByVersion"
)
public
Result
getFillAllByVersion
(
@RequestParam
String
version
)
{
return
Result
.
succeed
(
documentService
.
getFillAllByVersion
(
version
),
"获取成功"
);
return
Result
.
succeed
(
documentService
.
getFillAllByVersion
(
version
),
"获取成功"
);
}
}
dlink-admin/src/main/java/com/dlink/controller/HistoryController.java
View file @
eabb360b
...
...
@@ -38,20 +38,20 @@ public class HistoryController {
*/
@DeleteMapping
public
Result
deleteMul
(
@RequestBody
JsonNode
para
)
{
if
(
para
.
size
()
>
0
)
{
if
(
para
.
size
()
>
0
)
{
List
<
Integer
>
error
=
new
ArrayList
<>();
for
(
final
JsonNode
item
:
para
){
for
(
final
JsonNode
item
:
para
)
{
Integer
id
=
item
.
asInt
();
if
(!
historyService
.
removeHistoryById
(
id
))
{
if
(!
historyService
.
removeHistoryById
(
id
))
{
error
.
add
(
id
);
}
}
if
(
error
.
size
()==
0
)
{
if
(
error
.
size
()
==
0
)
{
return
Result
.
succeed
(
"删除成功"
);
}
else
{
return
Result
.
succeed
(
"删除部分成功,但"
+
error
.
toString
()+
"删除失败,共"
+
error
.
size
()+
"次失败。"
);
}
else
{
return
Result
.
succeed
(
"删除部分成功,但"
+
error
.
toString
()
+
"删除失败,共"
+
error
.
size
()
+
"次失败。"
);
}
}
else
{
}
else
{
return
Result
.
failed
(
"请选择要删除的记录"
);
}
}
...
...
@@ -62,7 +62,7 @@ public class HistoryController {
@PostMapping
(
"/getOneById"
)
public
Result
getOneById
(
@RequestBody
History
history
)
throws
Exception
{
history
=
historyService
.
getById
(
history
.
getId
());
return
Result
.
succeed
(
history
,
"获取成功"
);
return
Result
.
succeed
(
history
,
"获取成功"
);
}
}
dlink-admin/src/main/java/com/dlink/controller/JarController.java
View file @
eabb360b
...
...
@@ -36,9 +36,9 @@ public class JarController {
*/
@PutMapping
public
Result
saveOrUpdate
(
@RequestBody
Jar
jar
)
throws
Exception
{
if
(
jarService
.
saveOrUpdate
(
jar
))
{
if
(
jarService
.
saveOrUpdate
(
jar
))
{
return
Result
.
succeed
(
"新增成功"
);
}
else
{
}
else
{
return
Result
.
failed
(
"新增失败"
);
}
}
...
...
@@ -56,20 +56,20 @@ public class JarController {
*/
@DeleteMapping
public
Result
deleteMul
(
@RequestBody
JsonNode
para
)
{
if
(
para
.
size
()
>
0
)
{
if
(
para
.
size
()
>
0
)
{
List
<
Integer
>
error
=
new
ArrayList
<>();
for
(
final
JsonNode
item
:
para
){
for
(
final
JsonNode
item
:
para
)
{
Integer
id
=
item
.
asInt
();
if
(!
jarService
.
removeById
(
id
))
{
if
(!
jarService
.
removeById
(
id
))
{
error
.
add
(
id
);
}
}
if
(
error
.
size
()==
0
)
{
if
(
error
.
size
()
==
0
)
{
return
Result
.
succeed
(
"删除成功"
);
}
else
{
return
Result
.
succeed
(
"删除部分成功,但"
+
error
.
toString
()+
"删除失败,共"
+
error
.
size
()+
"次失败。"
);
}
else
{
return
Result
.
succeed
(
"删除部分成功,但"
+
error
.
toString
()
+
"删除失败,共"
+
error
.
size
()
+
"次失败。"
);
}
}
else
{
}
else
{
return
Result
.
failed
(
"请选择要删除的记录"
);
}
}
...
...
@@ -80,7 +80,7 @@ public class JarController {
@PostMapping
(
"/getOneById"
)
public
Result
getOneById
(
@RequestBody
Jar
jar
)
throws
Exception
{
jar
=
jarService
.
getById
(
jar
.
getId
());
return
Result
.
succeed
(
jar
,
"获取成功"
);
return
Result
.
succeed
(
jar
,
"获取成功"
);
}
/**
...
...
@@ -88,7 +88,7 @@ public class JarController {
*/
@GetMapping
(
"/listEnabledAll"
)
public
Result
listEnabledAll
()
{
List
<
Jar
>
jars
=
jarService
.
listEnabledAll
();
return
Result
.
succeed
(
jars
,
"获取成功"
);
List
<
Jar
>
jars
=
jarService
.
listEnabledAll
();
return
Result
.
succeed
(
jars
,
"获取成功"
);
}
}
dlink-admin/src/main/java/com/dlink/controller/JobInstanceController.java
View file @
eabb360b
...
...
@@ -75,9 +75,9 @@ public class JobInstanceController {
*/
@GetMapping
(
"/getStatusCount"
)
public
Result
getStatusCount
()
{
HashMap
<
String
,
Object
>
result
=
new
HashMap
<>();
result
.
put
(
"history"
,
jobInstanceService
.
getStatusCount
(
true
));
result
.
put
(
"instance"
,
jobInstanceService
.
getStatusCount
(
false
));
HashMap
<
String
,
Object
>
result
=
new
HashMap
<>();
result
.
put
(
"history"
,
jobInstanceService
.
getStatusCount
(
true
));
result
.
put
(
"instance"
,
jobInstanceService
.
getStatusCount
(
false
));
return
Result
.
succeed
(
result
,
"获取成功"
);
}
...
...
dlink-admin/src/main/java/com/dlink/controller/SavepointsController.java
View file @
eabb360b
...
...
@@ -30,9 +30,9 @@ public class SavepointsController {
*/
@PutMapping
public
Result
saveOrUpdate
(
@RequestBody
Savepoints
savepoints
)
throws
Exception
{
if
(
savepointsService
.
saveOrUpdate
(
savepoints
))
{
if
(
savepointsService
.
saveOrUpdate
(
savepoints
))
{
return
Result
.
succeed
(
"新增成功"
);
}
else
{
}
else
{
return
Result
.
failed
(
"新增失败"
);
}
}
...
...
@@ -50,20 +50,20 @@ public class SavepointsController {
*/
@DeleteMapping
public
Result
deleteMul
(
@RequestBody
JsonNode
para
)
{
if
(
para
.
size
()
>
0
)
{
if
(
para
.
size
()
>
0
)
{
List
<
Integer
>
error
=
new
ArrayList
<>();
for
(
final
JsonNode
item
:
para
){
for
(
final
JsonNode
item
:
para
)
{
Integer
id
=
item
.
asInt
();
if
(!
savepointsService
.
removeById
(
id
))
{
if
(!
savepointsService
.
removeById
(
id
))
{
error
.
add
(
id
);
}
}
if
(
error
.
size
()==
0
)
{
if
(
error
.
size
()
==
0
)
{
return
Result
.
succeed
(
"删除成功"
);
}
else
{
return
Result
.
succeed
(
"删除部分成功,但"
+
error
.
toString
()+
"删除失败,共"
+
error
.
size
()+
"次失败。"
);
}
else
{
return
Result
.
succeed
(
"删除部分成功,但"
+
error
.
toString
()
+
"删除失败,共"
+
error
.
size
()
+
"次失败。"
);
}
}
else
{
}
else
{
return
Result
.
failed
(
"请选择要删除的记录"
);
}
}
...
...
@@ -74,7 +74,7 @@ public class SavepointsController {
@PostMapping
(
"/getOneById"
)
public
Result
getOneById
(
@RequestBody
Savepoints
savepoints
)
throws
Exception
{
savepoints
=
savepointsService
.
getById
(
savepoints
.
getId
());
return
Result
.
succeed
(
savepoints
,
"获取成功"
);
return
Result
.
succeed
(
savepoints
,
"获取成功"
);
}
/**
...
...
@@ -82,6 +82,6 @@ public class SavepointsController {
*/
@GetMapping
(
"/listSavepointsByTaskId"
)
public
Result
listSavepointsByTaskId
(
@RequestParam
Integer
taskID
)
throws
Exception
{
return
Result
.
succeed
(
savepointsService
.
listSavepointsByTaskId
(
taskID
),
"获取成功"
);
return
Result
.
succeed
(
savepointsService
.
listSavepointsByTaskId
(
taskID
),
"获取成功"
);
}
}
dlink-admin/src/main/java/com/dlink/controller/StatementController.java
View file @
eabb360b
...
...
@@ -36,9 +36,9 @@ public class StatementController {
*/
@PutMapping
public
Result
saveOrUpdate
(
@RequestBody
Statement
statement
)
throws
Exception
{
if
(
statementService
.
saveOrUpdate
(
statement
))
{
if
(
statementService
.
saveOrUpdate
(
statement
))
{
return
Result
.
succeed
(
"新增成功"
);
}
else
{
}
else
{
return
Result
.
failed
(
"新增失败"
);
}
}
...
...
@@ -56,21 +56,21 @@ public class StatementController {
*/
@DeleteMapping
public
Result
deleteMul
(
@RequestBody
JsonNode
para
)
{
if
(
para
.
size
()
>
0
)
{
if
(
para
.
size
()
>
0
)
{
boolean
isAdmin
=
false
;
List
<
Integer
>
error
=
new
ArrayList
<>();
for
(
final
JsonNode
item
:
para
){
for
(
final
JsonNode
item
:
para
)
{
Integer
id
=
item
.
asInt
();
if
(!
statementService
.
removeById
(
id
))
{
if
(!
statementService
.
removeById
(
id
))
{
error
.
add
(
id
);
}
}
if
(
error
.
size
()==
0
&&
!
isAdmin
)
{
if
(
error
.
size
()
==
0
&&
!
isAdmin
)
{
return
Result
.
succeed
(
"删除成功"
);
}
else
{
return
Result
.
succeed
(
"删除部分成功,但"
+
error
.
toString
()+
"删除失败,共"
+
error
.
size
()+
"次失败。"
);
}
else
{
return
Result
.
succeed
(
"删除部分成功,但"
+
error
.
toString
()
+
"删除失败,共"
+
error
.
size
()
+
"次失败。"
);
}
}
else
{
}
else
{
return
Result
.
failed
(
"请选择要删除的记录"
);
}
}
...
...
@@ -81,7 +81,7 @@ public class StatementController {
@PostMapping
(
"/getOneById"
)
public
Result
getOneById
(
@RequestBody
Statement
statement
)
throws
Exception
{
statement
=
statementService
.
getById
(
statement
.
getId
());
return
Result
.
succeed
(
statement
,
"获取成功"
);
return
Result
.
succeed
(
statement
,
"获取成功"
);
}
}
dlink-admin/src/main/java/com/dlink/controller/StudioController.java
View file @
eabb360b
...
...
@@ -36,7 +36,7 @@ public class StudioController {
@PostMapping
(
"/executeSql"
)
public
Result
executeSql
(
@RequestBody
StudioExecuteDTO
studioExecuteDTO
)
{
JobResult
jobResult
=
studioService
.
executeSql
(
studioExecuteDTO
);
return
Result
.
succeed
(
jobResult
,
"执行成功"
);
return
Result
.
succeed
(
jobResult
,
"执行成功"
);
}
/**
...
...
@@ -44,7 +44,7 @@ public class StudioController {
*/
@PostMapping
(
"/explainSql"
)
public
Result
explainSql
(
@RequestBody
StudioExecuteDTO
studioExecuteDTO
)
{
return
Result
.
succeed
(
studioService
.
explainSql
(
studioExecuteDTO
),
"解释成功"
);
return
Result
.
succeed
(
studioService
.
explainSql
(
studioExecuteDTO
),
"解释成功"
);
}
/**
...
...
@@ -52,7 +52,7 @@ public class StudioController {
*/
@PostMapping
(
"/getStreamGraph"
)
public
Result
getStreamGraph
(
@RequestBody
StudioExecuteDTO
studioExecuteDTO
)
{
return
Result
.
succeed
(
studioService
.
getStreamGraph
(
studioExecuteDTO
),
"获取执行图成功"
);
return
Result
.
succeed
(
studioService
.
getStreamGraph
(
studioExecuteDTO
),
"获取执行图成功"
);
}
/**
...
...
@@ -60,7 +60,7 @@ public class StudioController {
*/
@PostMapping
(
"/getJobPlan"
)
public
Result
getJobPlan
(
@RequestBody
StudioExecuteDTO
studioExecuteDTO
)
{
return
Result
.
succeed
(
studioService
.
getJobPlan
(
studioExecuteDTO
),
"获取作业计划成功"
);
return
Result
.
succeed
(
studioService
.
getJobPlan
(
studioExecuteDTO
),
"获取作业计划成功"
);
}
/**
...
...
@@ -69,7 +69,7 @@ public class StudioController {
@PostMapping
(
"/executeDDL"
)
public
Result
executeDDL
(
@RequestBody
StudioDDLDTO
studioDDLDTO
)
{
IResult
result
=
studioService
.
executeDDL
(
studioDDLDTO
);
return
Result
.
succeed
(
result
,
"执行成功"
);
return
Result
.
succeed
(
result
,
"执行成功"
);
}
/**
...
...
@@ -77,7 +77,7 @@ public class StudioController {
*/
@GetMapping
(
"/getJobData"
)
public
Result
getJobData
(
@RequestParam
String
jobId
)
{
return
Result
.
succeed
(
studioService
.
getJobData
(
jobId
),
"获取成功"
);
return
Result
.
succeed
(
studioService
.
getJobData
(
jobId
),
"获取成功"
);
}
/**
...
...
@@ -93,7 +93,7 @@ public class StudioController {
*/
@PutMapping
(
"/createSession"
)
public
Result
createSession
(
@RequestBody
SessionDTO
sessionDTO
)
{
return
Result
.
succeed
(
studioService
.
createSession
(
sessionDTO
,
"admin"
),
"创建成功"
);
return
Result
.
succeed
(
studioService
.
createSession
(
sessionDTO
,
"admin"
),
"创建成功"
);
}
/**
...
...
@@ -101,20 +101,20 @@ public class StudioController {
*/
@DeleteMapping
(
"/clearSession"
)
public
Result
clearSession
(
@RequestBody
JsonNode
para
)
{
if
(
para
.
size
()
>
0
)
{
if
(
para
.
size
()
>
0
)
{
List
<
String
>
error
=
new
ArrayList
<>();
for
(
final
JsonNode
item
:
para
){
for
(
final
JsonNode
item
:
para
)
{
String
session
=
item
.
asText
();
if
(!
studioService
.
clearSession
(
session
))
{
if
(!
studioService
.
clearSession
(
session
))
{
error
.
add
(
session
);
}
}
if
(
error
.
size
()==
0
)
{
if
(
error
.
size
()
==
0
)
{
return
Result
.
succeed
(
"清除成功"
);
}
else
{
return
Result
.
succeed
(
"清除部分成功,但"
+
error
.
toString
()+
"清除失败,共"
+
error
.
size
()+
"次失败。"
);
}
else
{
return
Result
.
succeed
(
"清除部分成功,但"
+
error
.
toString
()
+
"清除失败,共"
+
error
.
size
()
+
"次失败。"
);
}
}
else
{
}
else
{
return
Result
.
failed
(
"请选择要清除的记录"
);
}
}
...
...
@@ -124,7 +124,7 @@ public class StudioController {
*/
@GetMapping
(
"/listSession"
)
public
Result
listSession
()
{
return
Result
.
succeed
(
studioService
.
listSession
(
"admin"
),
"获取成功"
);
return
Result
.
succeed
(
studioService
.
listSession
(
"admin"
),
"获取成功"
);
}
/**
...
...
@@ -133,23 +133,23 @@ public class StudioController {
@GetMapping
(
"/listJobs"
)
public
Result
listJobs
(
@RequestParam
Integer
clusterId
)
{
List
<
JsonNode
>
jobs
=
studioService
.
listJobs
(
clusterId
);
return
Result
.
succeed
(
jobs
.
toArray
(),
"获取成功"
);
return
Result
.
succeed
(
jobs
.
toArray
(),
"获取成功"
);
}
/**
* 停止任务
*/
@GetMapping
(
"/cancel"
)
public
Result
cancel
(
@RequestParam
Integer
clusterId
,
@RequestParam
String
jobId
)
{
return
Result
.
succeed
(
studioService
.
cancel
(
clusterId
,
jobId
),
"停止成功"
);
public
Result
cancel
(
@RequestParam
Integer
clusterId
,
@RequestParam
String
jobId
)
{
return
Result
.
succeed
(
studioService
.
cancel
(
clusterId
,
jobId
),
"停止成功"
);
}
/**
* savepoint
*/
@GetMapping
(
"/savepoint"
)
public
Result
savepoint
(
@RequestParam
Integer
clusterId
,
@RequestParam
String
jobId
,
@RequestParam
String
savePointType
,
@RequestParam
String
name
,
@RequestParam
Integer
taskId
)
{
return
Result
.
succeed
(
studioService
.
savepoint
(
taskId
,
clusterId
,
jobId
,
savePointType
,
name
),
"savepoint 成功"
);
public
Result
savepoint
(
@RequestParam
Integer
clusterId
,
@RequestParam
String
jobId
,
@RequestParam
String
savePointType
,
@RequestParam
String
name
,
@RequestParam
Integer
taskId
)
{
return
Result
.
succeed
(
studioService
.
savepoint
(
taskId
,
clusterId
,
jobId
,
savePointType
,
name
),
"savepoint 成功"
);
}
}
dlink-admin/src/main/java/com/dlink/controller/SysConfigController.java
View file @
eabb360b
...
...
@@ -30,9 +30,9 @@ public class SysConfigController {
*/
@PutMapping
public
Result
saveOrUpdate
(
@RequestBody
SysConfig
sysConfig
)
throws
Exception
{
if
(
sysConfigService
.
saveOrUpdate
(
sysConfig
))
{
if
(
sysConfigService
.
saveOrUpdate
(
sysConfig
))
{
return
Result
.
succeed
(
"新增成功"
);
}
else
{
}
else
{
return
Result
.
failed
(
"新增失败"
);
}
}
...
...
@@ -50,20 +50,20 @@ public class SysConfigController {
*/
@DeleteMapping
public
Result
deleteMul
(
@RequestBody
JsonNode
para
)
{
if
(
para
.
size
()
>
0
)
{
if
(
para
.
size
()
>
0
)
{
List
<
Integer
>
error
=
new
ArrayList
<>();
for
(
final
JsonNode
item
:
para
){
for
(
final
JsonNode
item
:
para
)
{
Integer
id
=
item
.
asInt
();
if
(!
sysConfigService
.
removeById
(
id
))
{
if
(!
sysConfigService
.
removeById
(
id
))
{
error
.
add
(
id
);
}
}
if
(
error
.
size
()==
0
)
{
if
(
error
.
size
()
==
0
)
{
return
Result
.
succeed
(
"删除成功"
);
}
else
{
return
Result
.
succeed
(
"删除部分成功,但"
+
error
.
toString
()+
"删除失败,共"
+
error
.
size
()+
"次失败。"
);
}
else
{
return
Result
.
succeed
(
"删除部分成功,但"
+
error
.
toString
()
+
"删除失败,共"
+
error
.
size
()
+
"次失败。"
);
}
}
else
{
}
else
{
return
Result
.
failed
(
"请选择要删除的记录"
);
}
}
...
...
@@ -74,7 +74,7 @@ public class SysConfigController {
@PostMapping
(
"/getOneById"
)
public
Result
getOneById
(
@RequestBody
SysConfig
sysConfig
)
throws
Exception
{
sysConfig
=
sysConfigService
.
getById
(
sysConfig
.
getId
());
return
Result
.
succeed
(
sysConfig
,
"获取成功"
);
return
Result
.
succeed
(
sysConfig
,
"获取成功"
);
}
/**
...
...
@@ -82,7 +82,7 @@ public class SysConfigController {
*/
@GetMapping
(
"/getAll"
)
public
Result
getAll
()
{
return
Result
.
succeed
(
sysConfigService
.
getAll
(),
"获取成功"
);
return
Result
.
succeed
(
sysConfigService
.
getAll
(),
"获取成功"
);
}
/**
...
...
dlink-admin/src/main/java/com/dlink/controller/TaskController.java
View file @
eabb360b
...
...
@@ -32,9 +32,9 @@ public class TaskController {
*/
@PutMapping
public
Result
saveOrUpdate
(
@RequestBody
Task
task
)
throws
Exception
{
if
(
taskService
.
saveOrUpdateTask
(
task
))
{
if
(
taskService
.
saveOrUpdateTask
(
task
))
{
return
Result
.
succeed
(
"操作成功"
);
}
else
{
}
else
{
return
Result
.
failed
(
"操作失败"
);
}
}
...
...
@@ -52,21 +52,21 @@ public class TaskController {
*/
@DeleteMapping
public
Result
deleteMul
(
@RequestBody
JsonNode
para
)
{
if
(
para
.
size
()
>
0
)
{
if
(
para
.
size
()
>
0
)
{
boolean
isAdmin
=
false
;
List
<
Integer
>
error
=
new
ArrayList
<>();
for
(
final
JsonNode
item
:
para
){
for
(
final
JsonNode
item
:
para
)
{
Integer
id
=
item
.
asInt
();
if
(!
taskService
.
removeById
(
id
))
{
if
(!
taskService
.
removeById
(
id
))
{
error
.
add
(
id
);
}
}
if
(
error
.
size
()==
0
&&
!
isAdmin
)
{
if
(
error
.
size
()
==
0
&&
!
isAdmin
)
{
return
Result
.
succeed
(
"删除成功"
);
}
else
{
return
Result
.
succeed
(
"删除部分成功,但"
+
error
.
toString
()+
"删除失败,共"
+
error
.
size
()+
"次失败。"
);
}
else
{
return
Result
.
succeed
(
"删除部分成功,但"
+
error
.
toString
()
+
"删除失败,共"
+
error
.
size
()
+
"次失败。"
);
}
}
else
{
}
else
{
return
Result
.
failed
(
"请选择要删除的记录"
);
}
}
...
...
@@ -76,23 +76,23 @@ public class TaskController {
*/
@PostMapping
(
value
=
"/submit"
)
public
Result
submit
(
@RequestBody
JsonNode
para
)
throws
Exception
{
if
(
para
.
size
()
>
0
)
{
if
(
para
.
size
()
>
0
)
{
List
<
JobResult
>
results
=
new
ArrayList
<>();
List
<
Integer
>
error
=
new
ArrayList
<>();
for
(
final
JsonNode
item
:
para
){
for
(
final
JsonNode
item
:
para
)
{
Integer
id
=
item
.
asInt
();
JobResult
result
=
taskService
.
submitTask
(
id
);
if
(!
result
.
isSuccess
())
{
if
(!
result
.
isSuccess
())
{
error
.
add
(
id
);
}
results
.
add
(
result
);
}
if
(
error
.
size
()==
0
)
{
return
Result
.
succeed
(
results
,
"执行成功"
);
}
else
{
return
Result
.
succeed
(
results
,
"执行部分成功,但"
+
error
.
toString
()+
"执行失败,共"
+
error
.
size
()+
"次失败。"
);
if
(
error
.
size
()
==
0
)
{
return
Result
.
succeed
(
results
,
"执行成功"
);
}
else
{
return
Result
.
succeed
(
results
,
"执行部分成功,但"
+
error
.
toString
()
+
"执行失败,共"
+
error
.
size
()
+
"次失败。"
);
}
}
else
{
}
else
{
return
Result
.
failed
(
"请选择要执行的记录"
);
}
}
...
...
@@ -103,7 +103,7 @@ public class TaskController {
@GetMapping
public
Result
getOneById
(
@RequestParam
Integer
id
)
{
Task
task
=
taskService
.
getTaskInfoById
(
id
);
return
Result
.
succeed
(
task
,
"获取成功"
);
return
Result
.
succeed
(
task
,
"获取成功"
);
}
/**
...
...
@@ -111,7 +111,7 @@ public class TaskController {
*/
@GetMapping
(
value
=
"/listFlinkSQLEnv"
)
public
Result
listFlinkSQLEnv
()
{
return
Result
.
succeed
(
taskService
.
listFlinkSQLEnv
(),
"获取成功"
);
return
Result
.
succeed
(
taskService
.
listFlinkSQLEnv
(),
"获取成功"
);
}
/**
...
...
@@ -119,7 +119,7 @@ public class TaskController {
*/
@GetMapping
(
value
=
"/exportSql"
)
public
Result
exportSql
(
@RequestParam
Integer
id
)
{
return
Result
.
succeed
(
taskService
.
exportSql
(
id
),
"获取成功"
);
return
Result
.
succeed
(
taskService
.
exportSql
(
id
),
"获取成功"
);
}
/**
...
...
@@ -135,7 +135,7 @@ public class TaskController {
*/
@GetMapping
(
value
=
"/developTask"
)
public
Result
developTask
(
@RequestParam
Integer
id
)
{
return
Result
.
succeed
(
taskService
.
developTask
(
id
),
"操作成功"
);
return
Result
.
succeed
(
taskService
.
developTask
(
id
),
"操作成功"
);
}
/**
...
...
@@ -150,8 +150,8 @@ public class TaskController {
* 下线任务
*/
@GetMapping
(
value
=
"/offLineTask"
)
public
Result
offLineTask
(
@RequestParam
Integer
id
,
@RequestParam
String
type
)
{
return
taskService
.
offLineTask
(
id
,
type
);
public
Result
offLineTask
(
@RequestParam
Integer
id
,
@RequestParam
String
type
)
{
return
taskService
.
offLineTask
(
id
,
type
);
}
/**
...
...
@@ -167,7 +167,7 @@ public class TaskController {
*/
@GetMapping
(
value
=
"/recoveryTask"
)
public
Result
recoveryTask
(
@RequestParam
Integer
id
)
{
return
Result
.
succeed
(
taskService
.
recoveryTask
(
id
),
"操作成功"
);
return
Result
.
succeed
(
taskService
.
recoveryTask
(
id
),
"操作成功"
);
}
/**
...
...
@@ -175,7 +175,7 @@ public class TaskController {
*/
@GetMapping
(
value
=
"/restartTask"
)
public
Result
restartTask
(
@RequestParam
Integer
id
)
{
return
Result
.
succeed
(
taskService
.
restartTask
(
id
),
"操作成功"
);
return
Result
.
succeed
(
taskService
.
restartTask
(
id
),
"操作成功"
);
}
}
dlink-admin/src/main/java/com/dlink/controller/UserController.java
View file @
eabb360b
...
...
@@ -61,7 +61,7 @@ public class UserController {
List
<
Integer
>
error
=
new
ArrayList
<>();
for
(
final
JsonNode
item
:
para
)
{
Integer
id
=
item
.
asInt
();
if
(
checkAdmin
(
id
))
{
if
(
checkAdmin
(
id
))
{
error
.
add
(
id
);
continue
;
}
...
...
@@ -89,7 +89,7 @@ public class UserController {
@PostMapping
(
"/getOneById"
)
public
Result
getOneById
(
@RequestBody
User
user
)
{
user
=
userService
.
getById
(
user
.
getId
());
return
Result
.
succeed
(
user
,
"获取成功"
);
return
Result
.
succeed
(
user
,
"获取成功"
);
}
/**
...
...
@@ -97,7 +97,7 @@ public class UserController {
*/
@PostMapping
(
"/modifyPassword"
)
public
Result
modifyPassword
(
@RequestBody
ModifyPasswordDTO
modifyPasswordDTO
)
{
return
userService
.
modifyPassword
(
modifyPasswordDTO
.
getUsername
(),
modifyPasswordDTO
.
getPassword
(),
return
userService
.
modifyPassword
(
modifyPasswordDTO
.
getUsername
(),
modifyPasswordDTO
.
getPassword
(),
modifyPasswordDTO
.
getNewPassword
());
}
}
dlink-admin/src/main/java/com/dlink/db/model/SuperEntity.java
View file @
eabb360b
...
...
@@ -26,7 +26,7 @@ import java.time.LocalDateTime;
*/
@Setter
@Getter
public
class
SuperEntity
<
T
extends
Model
<?>>
extends
Model
<
T
>
implements
Serializable
{
public
class
SuperEntity
<
T
extends
Model
<?>>
extends
Model
<
T
>
implements
Serializable
{
/**
* 主键ID
*/
...
...
dlink-admin/src/main/java/com/dlink/db/service/ISuperService.java
View file @
eabb360b
...
...
@@ -20,6 +20,6 @@ public interface ISuperService<T> extends IService<T> {
ProTableResult
<
T
>
selectForProTable
(
JsonNode
para
,
boolean
isDelete
);
ProTableResult
<
T
>
selectForProTable
(
JsonNode
para
,
Map
<
String
,
Object
>
paraMap
);
ProTableResult
<
T
>
selectForProTable
(
JsonNode
para
,
Map
<
String
,
Object
>
paraMap
);
}
dlink-admin/src/main/java/com/dlink/db/service/impl/SuperServiceImpl.java
View file @
eabb360b
...
...
@@ -37,11 +37,11 @@ public class SuperServiceImpl<M extends SuperMapper<T>, T> extends ServiceImpl<M
}
@Override
public
ProTableResult
<
T
>
selectForProTable
(
JsonNode
para
,
boolean
isDelete
)
{
public
ProTableResult
<
T
>
selectForProTable
(
JsonNode
para
,
boolean
isDelete
)
{
Integer
current
=
para
.
has
(
"current"
)
?
para
.
get
(
"current"
).
asInt
()
:
1
;
Integer
pageSize
=
para
.
has
(
"pageSize"
)
?
para
.
get
(
"pageSize"
).
asInt
()
:
10
;
QueryWrapper
<
T
>
queryWrapper
=
new
QueryWrapper
<>();
ProTableUtil
.
autoQueryDefalut
(
para
,
queryWrapper
,
isDelete
);
ProTableUtil
.
autoQueryDefalut
(
para
,
queryWrapper
,
isDelete
);
ObjectMapper
mapper
=
new
ObjectMapper
();
Map
<
String
,
Object
>
param
=
mapper
.
convertValue
(
para
,
Map
.
class
);
Page
<
T
>
page
=
new
Page
<>(
current
,
pageSize
);
...
...
@@ -50,16 +50,16 @@ public class SuperServiceImpl<M extends SuperMapper<T>, T> extends ServiceImpl<M
}
@Override
public
ProTableResult
<
T
>
selectForProTable
(
JsonNode
para
,
Map
<
String
,
Object
>
paraMap
)
{
public
ProTableResult
<
T
>
selectForProTable
(
JsonNode
para
,
Map
<
String
,
Object
>
paraMap
)
{
Integer
current
=
para
.
has
(
"current"
)
?
para
.
get
(
"current"
).
asInt
()
:
1
;
Integer
pageSize
=
para
.
has
(
"pageSize"
)
?
para
.
get
(
"pageSize"
).
asInt
()
:
10
;
QueryWrapper
<
T
>
queryWrapper
=
new
QueryWrapper
<>();
ProTableUtil
.
autoQueryDefalut
(
para
,
queryWrapper
);
ObjectMapper
mapper
=
new
ObjectMapper
();
Map
<
String
,
Object
>
param
=
mapper
.
convertValue
(
para
,
Map
.
class
);
if
(
Asserts
.
isNotNull
(
paraMap
))
{
if
(
Asserts
.
isNotNull
(
paraMap
))
{
for
(
Map
.
Entry
<
String
,
Object
>
entry
:
paraMap
.
entrySet
())
{
param
.
put
(
entry
.
getKey
(),
entry
.
getValue
());
param
.
put
(
entry
.
getKey
(),
entry
.
getValue
());
}
}
Page
<
T
>
page
=
new
Page
<>(
current
,
pageSize
);
...
...
dlink-admin/src/main/java/com/dlink/db/util/ProTableUtil.java
View file @
eabb360b
...
...
@@ -22,9 +22,9 @@ public class ProTableUtil {
* @Param [para, wrapper, camelToUnderscore, isDelete]
**/
public
static
void
autoQuery
(
JsonNode
para
,
QueryWrapper
<?>
wrapper
,
boolean
camelToUnderscore
,
boolean
isDelete
)
{
buildDelete
(
wrapper
,
camelToUnderscore
,
isDelete
);
buildDelete
(
wrapper
,
camelToUnderscore
,
isDelete
);
JsonNode
sortField
=
para
.
get
(
"sorter"
);
if
(
sortField
!=
null
)
{
if
(
sortField
!=
null
)
{
Iterator
<
Map
.
Entry
<
String
,
JsonNode
>>
fields
=
sortField
.
fields
();
while
(
fields
.
hasNext
())
{
Map
.
Entry
<
String
,
JsonNode
>
entry
=
fields
.
next
();
...
...
@@ -32,7 +32,7 @@ public class ProTableUtil {
}
}
JsonNode
filter
=
para
.
get
(
"filter"
);
if
(
filter
!=
null
)
{
if
(
filter
!=
null
)
{
Iterator
<
Map
.
Entry
<
String
,
JsonNode
>>
fields2
=
filter
.
fields
();
while
(
fields2
.
hasNext
())
{
Map
.
Entry
<
String
,
JsonNode
>
entry
=
fields2
.
next
();
...
...
@@ -41,7 +41,7 @@ public class ProTableUtil {
}
}
private
static
void
buildDelete
(
QueryWrapper
<?>
wrapper
,
boolean
camelToUnderscore
,
boolean
isDelete
)
{
private
static
void
buildDelete
(
QueryWrapper
<?>
wrapper
,
boolean
camelToUnderscore
,
boolean
isDelete
)
{
if
(
isDelete
)
{
if
(
camelToUnderscore
)
{
wrapper
.
eq
(
CaseFormat
.
LOWER_CAMEL
.
to
(
CaseFormat
.
LOWER_UNDERSCORE
,
"is_delete"
),
0
);
...
...
@@ -51,40 +51,40 @@ public class ProTableUtil {
}
}
private
static
void
buildSort
(
String
sortField
,
String
sortValue
,
QueryWrapper
<?>
wrapper
,
boolean
camelToUnderscore
)
{
private
static
void
buildSort
(
String
sortField
,
String
sortValue
,
QueryWrapper
<?>
wrapper
,
boolean
camelToUnderscore
)
{
if
(
sortField
!=
null
&&
sortValue
!=
null
)
{
if
(
camelToUnderscore
)
{
sortField
=
CaseFormat
.
LOWER_CAMEL
.
to
(
CaseFormat
.
LOWER_UNDERSCORE
,
sortField
);
}
if
(
sortValue
.
equals
(
"descend"
))
{
if
(!
sortField
.
contains
(
"."
))
{
if
(!
sortField
.
contains
(
"."
))
{
wrapper
.
orderByDesc
(
"a."
+
sortField
);
}
}
else
{
if
(!
sortField
.
contains
(
"."
))
{
if
(!
sortField
.
contains
(
"."
))
{
wrapper
.
orderByAsc
(
"a."
+
sortField
);
}
}
}
}
private
static
void
buildFilter
(
String
searchField
,
JsonNode
searchValue
,
QueryWrapper
<?>
wrapper
,
boolean
camelToUnderscore
)
{
private
static
void
buildFilter
(
String
searchField
,
JsonNode
searchValue
,
QueryWrapper
<?>
wrapper
,
boolean
camelToUnderscore
)
{
if
(
searchField
!=
null
&&
!
searchField
.
equals
(
""
)
&&
searchValue
!=
null
)
{
if
(
camelToUnderscore
)
{
searchField
=
CaseFormat
.
LOWER_CAMEL
.
to
(
CaseFormat
.
LOWER_UNDERSCORE
,
searchField
);
}
final
String
field
=
searchField
;
List
<
String
>
searchValues
=
new
ArrayList
<>();
String
type
=
"String"
;
if
(
searchValue
.
isArray
()){
for
(
final
JsonNode
objNode
:
searchValue
){
if
(
objNode
.
getNodeType
()==
JsonNodeType
.
NUMBER
)
{
type
=
"Number"
;
String
type
=
"String"
;
if
(
searchValue
.
isArray
())
{
for
(
final
JsonNode
objNode
:
searchValue
)
{
if
(
objNode
.
getNodeType
()
==
JsonNodeType
.
NUMBER
)
{
type
=
"Number"
;
}
searchValues
.
add
(
objNode
.
asText
());
}
}
if
(
searchValues
.
size
()>
0
)
{
if
(
searchValues
.
size
()
>
0
)
{
if
(
"Number"
.
equals
(
type
))
{
wrapper
.
and
(
qw
->
{
for
(
int
i
=
0
;
i
<
searchValues
.
size
();
i
++)
{
...
...
@@ -109,6 +109,7 @@ public class ProTableUtil {
}
}
}
/**
* @return void
* @Author wenmo
...
...
@@ -119,15 +120,13 @@ public class ProTableUtil {
public
static
void
autoSetFromPara
(
QueryWrapper
<?>
wrapper
,
JsonNode
para
,
String
[]
blackarr
,
String
[]
writearr
,
boolean
camelToUnderscore
)
{
List
<
String
>
blacklist
=
Arrays
.
asList
(
blackarr
);
List
<
String
>
writelist
=
Arrays
.
asList
(
writearr
);
if
(
para
.
isObject
())
{
if
(
para
.
isObject
())
{
Iterator
<
Map
.
Entry
<
String
,
JsonNode
>>
it
=
para
.
fields
();
while
(
it
.
hasNext
())
{
while
(
it
.
hasNext
())
{
Map
.
Entry
<
String
,
JsonNode
>
entry
=
it
.
next
();
String
mapKey
=
entry
.
getKey
();
if
(
blacklist
.
indexOf
(
mapKey
)
==
-
1
||
writelist
.
indexOf
(
mapKey
)
>
-
1
)
{
if
(
entry
.
getValue
().
getNodeType
()
==
JsonNodeType
.
NUMBER
)
{
if
(
entry
.
getValue
().
getNodeType
()
==
JsonNodeType
.
NUMBER
)
{
Double
mapValue
=
entry
.
getValue
().
asDouble
();
if
(
mapValue
!=
null
)
{
if
(
camelToUnderscore
)
{
...
...
@@ -136,9 +135,9 @@ public class ProTableUtil {
wrapper
.
eq
(
mapKey
,
mapValue
);
}
}
}
else
{
}
else
{
String
mapValue
=
entry
.
getValue
().
asText
();
if
(
mapValue
!=
null
&&
!
""
.
equals
(
mapValue
))
{
if
(
mapValue
!=
null
&&
!
""
.
equals
(
mapValue
))
{
if
(
camelToUnderscore
)
{
wrapper
.
eq
(
CaseFormat
.
LOWER_CAMEL
.
to
(
CaseFormat
.
LOWER_UNDERSCORE
,
mapKey
),
mapValue
);
}
else
{
...
...
@@ -175,7 +174,7 @@ public class ProTableUtil {
autoQuery
(
para
,
wrapper
,
true
,
false
);
}
public
static
void
autoQueryDefalut
(
JsonNode
para
,
QueryWrapper
<?>
wrapper
,
boolean
isDelete
)
{
public
static
void
autoQueryDefalut
(
JsonNode
para
,
QueryWrapper
<?>
wrapper
,
boolean
isDelete
)
{
autoQuery
(
para
,
wrapper
,
true
,
isDelete
);
}
...
...
dlink-admin/src/main/java/com/dlink/dto/APIExecuteSqlDTO.java
View file @
eabb360b
...
...
@@ -3,13 +3,9 @@ package com.dlink.dto;
import
com.dlink.assertion.Asserts
;
import
com.dlink.gateway.config.GatewayConfig
;
import
com.dlink.job.JobConfig
;
import
com.fasterxml.jackson.core.JsonProcessingException
;
import
com.fasterxml.jackson.databind.JsonNode
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
lombok.Getter
;
import
lombok.Setter
;
import
java.util.HashMap
;
import
java.util.Map
;
/**
...
...
dlink-admin/src/main/java/com/dlink/dto/APIExplainSqlDTO.java
View file @
eabb360b
package
com
.
dlink
.
dto
;
import
com.dlink.assertion.Asserts
;
import
com.dlink.gateway.GatewayType
;
import
com.dlink.gateway.config.GatewayConfig
;
import
com.dlink.job.JobConfig
;
import
lombok.Getter
;
import
lombok.Setter
;
...
...
dlink-admin/src/main/java/com/dlink/dto/SessionDTO.java
View file @
eabb360b
package
com
.
dlink
.
dto
;
import
com.dlink.session.SessionConfig
;
import
lombok.Getter
;
import
lombok.Setter
;
...
...
@@ -17,5 +16,4 @@ public class SessionDTO {
private
String
type
;
private
boolean
useRemote
;
private
Integer
clusterId
;
}
dlink-admin/src/main/java/com/dlink/dto/SqlDTO.java
View file @
eabb360b
...
...
@@ -22,7 +22,7 @@ public class SqlDTO {
this
.
maxRowNum
=
maxRowNum
;
}
public
static
SqlDTO
build
(
String
statement
,
Integer
databaseId
,
Integer
maxRowNum
){
return
new
SqlDTO
(
statement
,
databaseId
,
maxRowNum
);
public
static
SqlDTO
build
(
String
statement
,
Integer
databaseId
,
Integer
maxRowNum
)
{
return
new
SqlDTO
(
statement
,
databaseId
,
maxRowNum
);
}
}
dlink-admin/src/main/java/com/dlink/dto/StudioCADTO.java
View file @
eabb360b
...
...
@@ -11,12 +11,7 @@ import lombok.Setter;
**/
@Getter
@Setter
public
class
StudioCADTO
extends
AbstractStatementDTO
{
// private String statement;
/* 1:单表表级血缘
* 2:单表字段血缘
* 3.全局表级血缘
* 4.全局字段血缘
* */
public
class
StudioCADTO
extends
AbstractStatementDTO
{
// It's useless for the time being
private
Integer
type
;
}
dlink-admin/src/main/java/com/dlink/dto/StudioDDLDTO.java
View file @
eabb360b
...
...
@@ -23,7 +23,7 @@ public class StudioDDLDTO {
private
Integer
maxRowNum
=
10000
;
public
JobConfig
getJobConfig
()
{
return
new
JobConfig
(
type
,
useResult
,
useSession
,
session
,
useRemote
,
clusterId
,
maxRowNum
);
return
new
JobConfig
(
type
,
useResult
,
useSession
,
session
,
useRemote
,
clusterId
,
maxRowNum
);
}
}
dlink-admin/src/main/java/com/dlink/exception/WebExceptionHandler.java
View file @
eabb360b
...
...
@@ -40,7 +40,7 @@ public class WebExceptionHandler {
@ExceptionHandler
public
Result
unknownException
(
Exception
e
)
{
logger
.
error
(
"ERROR:"
,
e
);
logger
.
error
(
"ERROR:"
,
e
);
return
Result
.
failed
(
"系统出现错误, 请联系平台管理员!"
);
}
}
dlink-admin/src/main/java/com/dlink/init/SystemInit.java
View file @
eabb360b
...
...
@@ -38,11 +38,11 @@ public class SystemInit implements ApplicationRunner {
public
void
run
(
ApplicationArguments
args
)
throws
Exception
{
sysConfigService
.
initSysConfig
();
List
<
JobInstance
>
jobInstances
=
jobInstanceService
.
listJobInstanceActive
();
List
<
DaemonTaskConfig
>
configList
=
new
ArrayList
<>();
for
(
JobInstance
jobInstance:
jobInstances
)
{
configList
.
add
(
new
DaemonTaskConfig
(
FlinkJobTask
.
TYPE
,
jobInstance
.
getId
()));
List
<
DaemonTaskConfig
>
configList
=
new
ArrayList
<>();
for
(
JobInstance
jobInstance
:
jobInstances
)
{
configList
.
add
(
new
DaemonTaskConfig
(
FlinkJobTask
.
TYPE
,
jobInstance
.
getId
()));
}
log
.
info
(
"启动的任务数量:"
+
configList
.
size
());
log
.
info
(
"启动的任务数量:"
+
configList
.
size
());
DaemonFactory
.
start
(
configList
);
}
}
dlink-admin/src/main/java/com/dlink/job/FlinkJobTask.java
View file @
eabb360b
...
...
@@ -40,7 +40,7 @@ public class FlinkJobTask implements DaemonTask {
@Override
public
void
dealTask
()
{
long
gap
=
System
.
currentTimeMillis
()
-
this
.
preDealTime
;
if
(
gap
<
FlinkTaskConstant
.
TIME_SLEEP
)
{
if
(
gap
<
FlinkTaskConstant
.
TIME_SLEEP
)
{
try
{
Thread
.
sleep
(
FlinkTaskConstant
.
TIME_SLEEP
);
}
catch
(
InterruptedException
e
)
{
...
...
@@ -49,7 +49,7 @@ public class FlinkJobTask implements DaemonTask {
}
preDealTime
=
System
.
currentTimeMillis
();
JobInstance
jobInstance
=
taskService
.
refreshJobInstance
(
config
.
getId
());
if
(!
JobStatus
.
isDone
(
jobInstance
.
getStatus
()))
{
if
(!
JobStatus
.
isDone
(
jobInstance
.
getStatus
()))
{
DefaultThreadPool
.
getInstance
().
execute
(
this
);
}
}
...
...
dlink-admin/src/main/java/com/dlink/mapper/CatalogueMapper.java
View file @
eabb360b
...
...
@@ -3,7 +3,6 @@ package com.dlink.mapper;
import
com.dlink.db.mapper.SuperMapper
;
import
com.dlink.model.Catalogue
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Param
;
/**
* CatalogueMapper
...
...
dlink-admin/src/main/java/com/dlink/mapper/StatementMapper.java
View file @
eabb360b
package
com
.
dlink
.
mapper
;
import
com.baomidou.mybatisplus.core.toolkit.Constants
;
import
com.dlink.db.mapper.SuperMapper
;
import
com.dlink.model.Statement
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Param
;
/**
* StatementMapper
...
...
dlink-admin/src/main/java/com/dlink/mapper/TaskMapper.java
View file @
eabb360b
...
...
@@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Mapper;
/**
* 作业 Mapper 接口
*
* @author wenmo
* @since 2021-05-28
*/
...
...
dlink-admin/src/main/java/com/dlink/model/AlertHistory.java
View file @
eabb360b
package
com
.
dlink
.
model
;
import
com.baomidou.mybatisplus.annotation.FieldFill
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.baomidou.mybatisplus.annotation.*
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
...
...
dlink-admin/src/main/java/com/dlink/model/Cluster.java
View file @
eabb360b
...
...
@@ -41,7 +41,7 @@ public class Cluster extends SuperEntity {
private
Integer
taskId
;
public
static
Cluster
autoRegistersCluster
(
String
hosts
,
String
name
,
String
alias
,
String
type
,
Integer
clusterConfigurationId
,
Integer
taskId
)
{
public
static
Cluster
autoRegistersCluster
(
String
hosts
,
String
name
,
String
alias
,
String
type
,
Integer
clusterConfigurationId
,
Integer
taskId
)
{
Cluster
cluster
=
new
Cluster
();
cluster
.
setName
(
name
);
cluster
.
setAlias
(
alias
);
...
...
dlink-admin/src/main/java/com/dlink/model/ClusterConfiguration.java
View file @
eabb360b
...
...
@@ -38,13 +38,13 @@ public class ClusterConfiguration extends SuperEntity {
private
String
note
;
@TableField
(
exist
=
false
)
private
Map
<
String
,
Object
>
config
=
new
HashMap
<>();
private
Map
<
String
,
Object
>
config
=
new
HashMap
<>();
public
Map
<
String
,
Object
>
parseConfig
()
{
public
Map
<
String
,
Object
>
parseConfig
()
{
ObjectMapper
objectMapper
=
new
ObjectMapper
();
try
{
if
(
Asserts
.
isNotNullString
(
configJson
))
{
if
(
Asserts
.
isNotNullString
(
configJson
))
{
config
=
objectMapper
.
readValue
(
configJson
,
HashMap
.
class
);
}
}
catch
(
JsonProcessingException
e
)
{
...
...
dlink-admin/src/main/java/com/dlink/model/CodeEnum.java
View file @
eabb360b
...
...
@@ -12,7 +12,8 @@ public enum CodeEnum {
NOTLOGIN
(
401
);
private
Integer
code
;
CodeEnum
(
Integer
code
){
CodeEnum
(
Integer
code
)
{
this
.
code
=
code
;
}
...
...
dlink-admin/src/main/java/com/dlink/model/Jar.java
View file @
eabb360b
...
...
@@ -7,8 +7,6 @@ import com.dlink.db.model.SuperEntity;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
java.io.Serializable
;
/**
* Jar
*
...
...
dlink-admin/src/main/java/com/dlink/model/JobInstance.java
View file @
eabb360b
package
com
.
dlink
.
model
;
import
com.baomidou.mybatisplus.annotation.FieldFill
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.baomidou.mybatisplus.annotation.*
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
...
...
dlink-admin/src/main/java/com/dlink/model/SysConfig.java
View file @
eabb360b
package
com
.
dlink
.
model
;
import
com.baomidou.mybatisplus.annotation.FieldFill
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.baomidou.mybatisplus.annotation.*
;
import
com.dlink.db.annotation.Save
;
import
com.dlink.db.model.SuperEntity
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
...
...
dlink-admin/src/main/java/com/dlink/model/User.java
View file @
eabb360b
package
com
.
dlink
.
model
;
import
com.baomidou.mybatisplus.annotation.*
;
import
com.dlink.assertion.Asserts
;
import
com.dlink.db.annotation.Save
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
...
...
@@ -19,7 +18,7 @@ import java.time.LocalDateTime;
@Data
@EqualsAndHashCode
(
callSuper
=
false
)
@TableName
(
"dlink_user"
)
public
class
User
implements
Serializable
{
public
class
User
implements
Serializable
{
private
static
final
long
serialVersionUID
=
-
1077801296270024204L
;
...
...
dlink-admin/src/main/java/com/dlink/result/APIJobResult.java
View file @
eabb360b
...
...
@@ -34,8 +34,8 @@ public class APIJobResult {
this
.
endTime
=
endTime
;
}
public
static
APIJobResult
build
(
JobResult
jobResult
){
return
new
APIJobResult
(
jobResult
.
getJobManagerAddress
(),
jobResult
.
getStatus
(),
jobResult
.
isSuccess
(),
jobResult
.
getJobId
(),
jobResult
.
getError
(),
jobResult
.
getStartTime
(),
jobResult
.
getEndTime
());
public
static
APIJobResult
build
(
JobResult
jobResult
)
{
return
new
APIJobResult
(
jobResult
.
getJobManagerAddress
(),
jobResult
.
getStatus
(),
jobResult
.
isSuccess
(),
jobResult
.
getJobId
(),
jobResult
.
getError
(),
jobResult
.
getStartTime
(),
jobResult
.
getEndTime
());
}
}
dlink-admin/src/main/java/com/dlink/service/CatalogueService.java
View file @
eabb360b
...
...
@@ -3,7 +3,6 @@ package com.dlink.service;
import
com.dlink.db.service.ISuperService
;
import
com.dlink.dto.CatalogueTaskDTO
;
import
com.dlink.model.Catalogue
;
import
org.apache.ibatis.annotations.Param
;
import
java.util.List
;
...
...
dlink-admin/src/main/java/com/dlink/service/ClusterConfigurationService.java
View file @
eabb360b
...
...
@@ -19,7 +19,7 @@ public interface ClusterConfigurationService extends ISuperService<ClusterConfig
List
<
ClusterConfiguration
>
listEnabledAll
();
Map
<
String
,
Object
>
getGatewayConfig
(
Integer
id
);
Map
<
String
,
Object
>
getGatewayConfig
(
Integer
id
);
TestResult
testGateway
(
ClusterConfiguration
clusterConfiguration
);
}
dlink-admin/src/main/java/com/dlink/service/ClusterService.java
View file @
eabb360b
...
...
@@ -18,7 +18,7 @@ public interface ClusterService extends ISuperService<Cluster> {
String
getJobManagerAddress
(
Cluster
cluster
);
String
buildEnvironmentAddress
(
boolean
useRemote
,
Integer
id
);
String
buildEnvironmentAddress
(
boolean
useRemote
,
Integer
id
);
String
buildRemoteEnvironmentAddress
(
Integer
id
);
...
...
dlink-admin/src/main/java/com/dlink/service/DocumentService.java
View file @
eabb360b
...
...
@@ -12,5 +12,6 @@ import java.util.List;
* @since 2021/6/3 14:35
**/
public
interface
DocumentService
extends
ISuperService
<
Document
>
{
List
<
Document
>
getFillAllByVersion
(
String
version
);
}
dlink-admin/src/main/java/com/dlink/service/HistoryService.java
View file @
eabb360b
...
...
@@ -10,5 +10,6 @@ import com.dlink.model.History;
* @since 2021/6/26 23:07
*/
public
interface
HistoryService
extends
ISuperService
<
History
>
{
public
boolean
removeHistoryById
(
Integer
id
);
boolean
removeHistoryById
(
Integer
id
);
}
dlink-admin/src/main/java/com/dlink/service/JobHistoryService.java
View file @
eabb360b
...
...
@@ -15,5 +15,5 @@ public interface JobHistoryService extends ISuperService<JobHistory> {
JobHistory
getJobHistoryInfo
(
JobHistory
jobHistory
);
JobHistory
refreshJobHistory
(
Integer
id
,
String
jobManagerHost
,
String
jobId
);
JobHistory
refreshJobHistory
(
Integer
id
,
String
jobManagerHost
,
String
jobId
);
}
dlink-admin/src/main/java/com/dlink/service/JobInstanceService.java
View file @
eabb360b
package
com
.
dlink
.
service
;
import
com.dlink.db.service.ISuperService
;
import
com.dlink.explainer.ca.TableCANode
;
import
com.dlink.explainer.lineage.LineageResult
;
import
com.dlink.model.JobInfoDetail
;
import
com.dlink.model.JobInstance
;
...
...
dlink-admin/src/main/java/com/dlink/service/SavepointsService.java
View file @
eabb360b
...
...
@@ -2,10 +2,8 @@ package com.dlink.service;
import
com.dlink.db.service.ISuperService
;
import
com.dlink.model.Savepoints
;
import
com.fasterxml.jackson.databind.JsonNode
;
import
java.util.List
;
import
java.util.Map
;
/**
* Savepoints
...
...
@@ -14,6 +12,7 @@ import java.util.Map;
* @since 2021/11/21
**/
public
interface
SavepointsService
extends
ISuperService
<
Savepoints
>
{
List
<
Savepoints
>
listSavepointsByTaskId
(
Integer
taskId
);
Savepoints
getLatestSavepointByTaskId
(
Integer
taskId
);
...
...
dlink-admin/src/main/java/com/dlink/service/StatementService.java
View file @
eabb360b
...
...
@@ -10,5 +10,6 @@ import com.dlink.model.Statement;
* @since 2021/5/28 13:45
**/
public
interface
StatementService
extends
ISuperService
<
Statement
>
{
boolean
insert
(
Statement
statement
);
}
dlink-admin/src/main/java/com/dlink/service/StudioService.java
View file @
eabb360b
package
com
.
dlink
.
service
;
import
com.dlink.dto.*
;
import
com.dlink.explainer.ca.ColumnCANode
;
import
com.dlink.explainer.ca.TableCANode
;
import
com.dlink.explainer.lineage.LineageResult
;
import
com.dlink.job.JobResult
;
import
com.dlink.result.IResult
;
...
...
@@ -46,7 +44,7 @@ public interface StudioService {
List
<
JsonNode
>
listJobs
(
Integer
clusterId
);
boolean
cancel
(
Integer
clusterId
,
String
jobId
);
boolean
cancel
(
Integer
clusterId
,
String
jobId
);
boolean
savepoint
(
Integer
taskId
,
Integer
clusterId
,
String
jobId
,
String
savePointType
,
String
name
);
boolean
savepoint
(
Integer
taskId
,
Integer
clusterId
,
String
jobId
,
String
savePointType
,
String
name
);
}
dlink-admin/src/main/java/com/dlink/service/SysConfigService.java
View file @
eabb360b
...
...
@@ -14,7 +14,7 @@ import java.util.Map;
**/
public
interface
SysConfigService
extends
ISuperService
<
SysConfig
>
{
Map
<
String
,
Object
>
getAll
();
Map
<
String
,
Object
>
getAll
();
void
initSysConfig
();
...
...
dlink-admin/src/main/java/com/dlink/service/TaskService.java
View file @
eabb360b
...
...
@@ -3,7 +3,6 @@ package com.dlink.service;
import
com.dlink.common.result.Result
;
import
com.dlink.db.service.ISuperService
;
import
com.dlink.dto.StudioExecuteDTO
;
import
com.dlink.job.JobResult
;
import
com.dlink.model.JobInfoDetail
;
import
com.dlink.model.JobInstance
;
...
...
@@ -50,7 +49,7 @@ public interface TaskService extends ISuperService<Task> {
boolean
recoveryTask
(
Integer
id
);
boolean
savepointTask
(
Integer
taskId
,
String
savePointType
);
boolean
savepointTask
(
Integer
taskId
,
String
savePointType
);
JobInstance
refreshJobInstance
(
Integer
id
);
...
...
dlink-admin/src/main/java/com/dlink/service/UserService.java
View file @
eabb360b
...
...
@@ -16,11 +16,11 @@ public interface UserService extends ISuperService<User> {
boolean
modifyUser
(
User
user
);
Result
modifyPassword
(
String
username
,
String
password
,
String
newPassword
);
Result
modifyPassword
(
String
username
,
String
password
,
String
newPassword
);
boolean
removeUser
(
Integer
id
);
Result
loginUser
(
String
username
,
String
password
,
boolean
isRemember
);
Result
loginUser
(
String
username
,
String
password
,
boolean
isRemember
);
User
getUserByUsername
(
String
username
);
}
dlink-admin/src/main/java/com/dlink/service/impl/APIServiceImpl.java
View file @
eabb360b
package
com
.
dlink
.
service
.
impl
;
import
com.dlink.assertion.Asserts
;
import
com.dlink.dto.*
;
import
com.dlink.gateway.GatewayType
;
import
com.dlink.gateway.result.SavePointResult
;
import
com.dlink.job.JobConfig
;
import
com.dlink.job.JobManager
;
...
...
@@ -16,8 +14,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import
com.fasterxml.jackson.databind.node.ObjectNode
;
import
org.springframework.stereotype.Service
;
import
java.util.Map
;
/**
* APIServiceImpl
*
...
...
@@ -52,12 +48,12 @@ public class APIServiceImpl implements APIService {
JobManager
jobManager
=
JobManager
.
buildPlanMode
(
config
);
String
planJson
=
jobManager
.
getJobPlanJson
(
apiExplainSqlDTO
.
getStatement
());
ObjectMapper
mapper
=
new
ObjectMapper
();
ObjectNode
objectNode
=
mapper
.
createObjectNode
();
ObjectNode
objectNode
=
mapper
.
createObjectNode
();
try
{
objectNode
=
(
ObjectNode
)
mapper
.
readTree
(
planJson
);
}
catch
(
JsonProcessingException
e
)
{
e
.
printStackTrace
();
}
finally
{
}
finally
{
RunTimeUtil
.
recovery
(
jobManager
);
return
objectNode
;
}
...
...
dlink-admin/src/main/java/com/dlink/service/impl/AlertGroupServiceImpl.java
View file @
eabb360b
...
...
@@ -28,19 +28,19 @@ public class AlertGroupServiceImpl extends SuperServiceImpl<AlertGroupMapper, Al
@Override
public
List
<
AlertGroup
>
listEnabledAll
()
{
return
list
(
new
QueryWrapper
<
AlertGroup
>().
eq
(
"enabled"
,
1
));
return
list
(
new
QueryWrapper
<
AlertGroup
>().
eq
(
"enabled"
,
1
));
}
@Override
public
AlertGroup
getAlertGroupInfo
(
Integer
id
)
{
AlertGroup
alertGroup
=
getById
(
id
);
if
(
Asserts
.
isNull
(
alertGroup
)||
Asserts
.
isNullString
(
alertGroup
.
getAlertInstanceIds
()))
{
if
(
Asserts
.
isNull
(
alertGroup
)
||
Asserts
.
isNullString
(
alertGroup
.
getAlertInstanceIds
()))
{
return
alertGroup
;
}
String
[]
alertInstanceIds
=
alertGroup
.
getAlertInstanceIds
().
split
(
","
);
List
<
AlertInstance
>
alertInstanceList
=
new
ArrayList
<>();
for
(
String
alertInstanceId:
alertInstanceIds
)
{
if
(
Asserts
.
isNullString
(
alertInstanceId
)||
alertInstanceId
.
equals
(
"0"
))
{
for
(
String
alertInstanceId
:
alertInstanceIds
)
{
if
(
Asserts
.
isNullString
(
alertInstanceId
)
||
alertInstanceId
.
equals
(
"0"
))
{
continue
;
}
alertInstanceList
.
add
(
alertInstanceService
.
getById
(
Integer
.
valueOf
(
alertInstanceId
)));
...
...
dlink-admin/src/main/java/com/dlink/service/impl/AlertInstanceServiceImpl.java
View file @
eabb360b
...
...
@@ -19,6 +19,6 @@ import java.util.List;
public
class
AlertInstanceServiceImpl
extends
SuperServiceImpl
<
AlertInstanceMapper
,
AlertInstance
>
implements
AlertInstanceService
{
@Override
public
List
<
AlertInstance
>
listEnabledAll
()
{
return
list
(
new
QueryWrapper
<
AlertInstance
>().
eq
(
"enabled"
,
1
));
return
list
(
new
QueryWrapper
<
AlertInstance
>().
eq
(
"enabled"
,
1
));
}
}
dlink-admin/src/main/java/com/dlink/service/impl/CatalogueServiceImpl.java
View file @
eabb360b
...
...
@@ -39,10 +39,10 @@ public class CatalogueServiceImpl extends SuperServiceImpl<CatalogueMapper, Cata
@Override
public
Catalogue
findByParentIdAndName
(
Integer
parent_id
,
String
name
)
{
return
catalogueMapper
.
selectOne
(
Wrappers
.<
Catalogue
>
query
().
eq
(
"parent_id"
,
parent_id
).
eq
(
"name"
,
name
));
return
catalogueMapper
.
selectOne
(
Wrappers
.<
Catalogue
>
query
().
eq
(
"parent_id"
,
parent_id
).
eq
(
"name"
,
name
));
}
@Transactional
(
rollbackFor
=
Exception
.
class
)
@Transactional
(
rollbackFor
=
Exception
.
class
)
@Override
public
Catalogue
createCatalogueAndTask
(
CatalogueTaskDTO
catalogueTaskDTO
)
{
Task
task
=
new
Task
();
...
...
@@ -79,13 +79,13 @@ public class CatalogueServiceImpl extends SuperServiceImpl<CatalogueMapper, Cata
return
catalogue
;
}
@Transactional
(
rollbackFor
=
Exception
.
class
)
@Transactional
(
rollbackFor
=
Exception
.
class
)
@Override
public
boolean
toRename
(
Catalogue
catalogue
)
{
Catalogue
oldCatalogue
=
this
.
getById
(
catalogue
.
getId
());
if
(
oldCatalogue
==
null
)
{
if
(
oldCatalogue
==
null
)
{
return
false
;
}
else
{
}
else
{
Task
task
=
new
Task
();
task
.
setId
(
oldCatalogue
.
getTaskId
());
task
.
setName
(
catalogue
.
getName
());
...
...
@@ -99,10 +99,10 @@ public class CatalogueServiceImpl extends SuperServiceImpl<CatalogueMapper, Cata
@Override
public
boolean
removeCatalogueAndTaskById
(
Integer
id
)
{
Catalogue
catalogue
=
this
.
getById
(
id
);
if
(
catalogue
==
null
)
{
if
(
catalogue
==
null
)
{
return
false
;
}
else
{
if
(
catalogue
.
getTaskId
()!=
null
)
{
}
else
{
if
(
catalogue
.
getTaskId
()
!=
null
)
{
taskService
.
removeById
(
catalogue
.
getTaskId
());
statementService
.
removeById
(
catalogue
.
getTaskId
());
}
...
...
dlink-admin/src/main/java/com/dlink/service/impl/ClusterConfigurationServiceImpl.java
View file @
eabb360b
package
com
.
dlink
.
service
.
impl
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.dlink.assertion.Assert
;
import
com.dlink.assertion.Asserts
;
import
com.dlink.db.service.impl.SuperServiceImpl
;
import
com.dlink.gateway.GatewayType
;
import
com.dlink.gateway.config.AppConfig
;
import
com.dlink.gateway.config.ClusterConfig
;
import
com.dlink.gateway.config.FlinkConfig
;
import
com.dlink.gateway.config.GatewayConfig
;
...
...
@@ -13,8 +11,6 @@ import com.dlink.gateway.result.TestResult;
import
com.dlink.job.JobManager
;
import
com.dlink.mapper.ClusterConfigurationMapper
;
import
com.dlink.model.ClusterConfiguration
;
import
com.dlink.model.Jar
;
import
com.dlink.model.SystemConfiguration
;
import
com.dlink.service.ClusterConfigurationService
;
import
org.springframework.stereotype.Service
;
...
...
@@ -28,7 +24,7 @@ import java.util.Map;
* @since 2021/11/6 20:54
*/
@Service
public
class
ClusterConfigurationServiceImpl
extends
SuperServiceImpl
<
ClusterConfigurationMapper
,
ClusterConfiguration
>
implements
ClusterConfigurationService
{
public
class
ClusterConfigurationServiceImpl
extends
SuperServiceImpl
<
ClusterConfigurationMapper
,
ClusterConfiguration
>
implements
ClusterConfigurationService
{
@Override
public
ClusterConfiguration
getClusterConfigById
(
Integer
id
)
{
ClusterConfiguration
clusterConfiguration
=
baseMapper
.
selectById
(
id
);
...
...
@@ -38,7 +34,7 @@ public class ClusterConfigurationServiceImpl extends SuperServiceImpl<ClusterCon
@Override
public
List
<
ClusterConfiguration
>
listEnabledAll
()
{
return
this
.
list
(
new
QueryWrapper
<
ClusterConfiguration
>().
eq
(
"enabled"
,
1
));
return
this
.
list
(
new
QueryWrapper
<
ClusterConfiguration
>().
eq
(
"enabled"
,
1
));
}
@Override
...
...
@@ -52,30 +48,30 @@ public class ClusterConfigurationServiceImpl extends SuperServiceImpl<ClusterCon
clusterConfiguration
.
parseConfig
();
Map
<
String
,
Object
>
config
=
clusterConfiguration
.
getConfig
();
GatewayConfig
gatewayConfig
=
new
GatewayConfig
();
if
(
config
.
containsKey
(
"hadoopConfigPath"
))
{
if
(
config
.
containsKey
(
"hadoopConfigPath"
))
{
gatewayConfig
.
setClusterConfig
(
ClusterConfig
.
build
(
config
.
get
(
"flinkConfigPath"
).
toString
(),
config
.
get
(
"flinkLibPath"
).
toString
(),
config
.
get
(
"hadoopConfigPath"
).
toString
()));
}
else
{
}
else
{
gatewayConfig
.
setClusterConfig
(
ClusterConfig
.
build
(
config
.
get
(
"flinkConfigPath"
).
toString
(),
config
.
get
(
"flinkLibPath"
).
toString
(),
""
));
}
if
(
config
.
containsKey
(
"flinkConfig"
))
{
gatewayConfig
.
setFlinkConfig
(
FlinkConfig
.
build
((
Map
<
String
,
String
>)
config
.
get
(
"flinkConfig"
)));
if
(
config
.
containsKey
(
"flinkConfig"
))
{
gatewayConfig
.
setFlinkConfig
(
FlinkConfig
.
build
((
Map
<
String
,
String
>)
config
.
get
(
"flinkConfig"
)));
}
if
(
Asserts
.
isEqualsIgnoreCase
(
clusterConfiguration
.
getType
(),
"Yarn"
))
{
if
(
Asserts
.
isEqualsIgnoreCase
(
clusterConfiguration
.
getType
(),
"Yarn"
))
{
gatewayConfig
.
setType
(
GatewayType
.
YARN_PER_JOB
);
}
else
if
(
Asserts
.
isEqualsIgnoreCase
(
clusterConfiguration
.
getType
(),
"Kubernetes"
))
{
}
else
if
(
Asserts
.
isEqualsIgnoreCase
(
clusterConfiguration
.
getType
(),
"Kubernetes"
))
{
gatewayConfig
.
setType
(
GatewayType
.
KUBERNETES_APPLICATION
);
Map
kubernetesConfig
=
(
Map
)
config
.
get
(
"kubernetesConfig"
);
if
(
kubernetesConfig
.
containsKey
(
"kubernetes.namespace"
))
{
if
(
kubernetesConfig
.
containsKey
(
"kubernetes.namespace"
))
{
gatewayConfig
.
getFlinkConfig
().
getConfiguration
().
put
(
"kubernetes.namespace"
,
kubernetesConfig
.
get
(
"kubernetes.namespace"
).
toString
());
}
if
(
kubernetesConfig
.
containsKey
(
"kubernetes.cluster-id"
))
{
if
(
kubernetesConfig
.
containsKey
(
"kubernetes.cluster-id"
))
{
gatewayConfig
.
getFlinkConfig
().
getConfiguration
().
put
(
"kubernetes.cluster-id"
,
kubernetesConfig
.
get
(
"kubernetes.cluster-id"
).
toString
());
}
if
(
kubernetesConfig
.
containsKey
(
"kubernetes.container.image"
))
{
if
(
kubernetesConfig
.
containsKey
(
"kubernetes.container.image"
))
{
gatewayConfig
.
getFlinkConfig
().
getConfiguration
().
put
(
"kubernetes.container.image"
,
kubernetesConfig
.
get
(
"kubernetes.container.image"
).
toString
());
}
}
...
...
dlink-admin/src/main/java/com/dlink/service/impl/ClusterServiceImpl.java
View file @
eabb360b
...
...
@@ -27,7 +27,7 @@ public class ClusterServiceImpl extends SuperServiceImpl<ClusterMapper, Cluster>
@Override
public
FlinkClusterInfo
checkHeartBeat
(
String
hosts
,
String
host
)
{
return
FlinkCluster
.
testFlinkJobManagerIP
(
hosts
,
host
);
return
FlinkCluster
.
testFlinkJobManagerIP
(
hosts
,
host
);
}
@Override
...
...
@@ -35,11 +35,11 @@ public class ClusterServiceImpl extends SuperServiceImpl<ClusterMapper, Cluster>
Assert
.
check
(
cluster
);
FlinkClusterInfo
info
=
FlinkCluster
.
testFlinkJobManagerIP
(
cluster
.
getHosts
(),
cluster
.
getJobManagerHost
());
String
host
=
null
;
if
(
info
.
isEffective
())
{
if
(
info
.
isEffective
())
{
host
=
info
.
getJobManagerAddress
();
}
Assert
.
checkHost
(
host
);
if
(!
host
.
equals
(
cluster
.
getJobManagerHost
()))
{
if
(!
host
.
equals
(
cluster
.
getJobManagerHost
()))
{
cluster
.
setJobManagerHost
(
host
);
updateById
(
cluster
);
}
...
...
@@ -48,9 +48,9 @@ public class ClusterServiceImpl extends SuperServiceImpl<ClusterMapper, Cluster>
@Override
public
String
buildEnvironmentAddress
(
boolean
useRemote
,
Integer
id
)
{
if
(
useRemote
&&
id
!=
0
)
{
if
(
useRemote
&&
id
!=
0
)
{
return
buildRemoteEnvironmentAddress
(
id
);
}
else
{
}
else
{
return
buildLocalEnvironmentAddress
();
}
}
...
...
@@ -64,8 +64,8 @@ public class ClusterServiceImpl extends SuperServiceImpl<ClusterMapper, Cluster>
public
String
buildLocalEnvironmentAddress
()
{
try
{
InetAddress
inetAddress
=
InetAddress
.
getLocalHost
();
if
(
inetAddress
!=
null
)
{
return
inetAddress
.
getHostAddress
()
+
NetConstant
.
COLON
+
FlinkConstant
.
FLINK_REST_DEFAULT_PORT
;
if
(
inetAddress
!=
null
)
{
return
inetAddress
.
getHostAddress
()
+
NetConstant
.
COLON
+
FlinkConstant
.
FLINK_REST_DEFAULT_PORT
;
}
}
catch
(
UnknownHostException
e
)
{
e
.
printStackTrace
();
...
...
@@ -75,7 +75,7 @@ public class ClusterServiceImpl extends SuperServiceImpl<ClusterMapper, Cluster>
@Override
public
List
<
Cluster
>
listEnabledAll
()
{
return
this
.
list
(
new
QueryWrapper
<
Cluster
>().
eq
(
"enabled"
,
1
));
return
this
.
list
(
new
QueryWrapper
<
Cluster
>().
eq
(
"enabled"
,
1
));
}
@Override
...
...
@@ -85,7 +85,7 @@ public class ClusterServiceImpl extends SuperServiceImpl<ClusterMapper, Cluster>
@Override
public
List
<
Cluster
>
listAutoEnable
()
{
return
list
(
new
QueryWrapper
<
Cluster
>().
eq
(
"enabled"
,
1
).
eq
(
"auto_registers"
,
1
));
return
list
(
new
QueryWrapper
<
Cluster
>().
eq
(
"enabled"
,
1
).
eq
(
"auto_registers"
,
1
));
}
@Override
...
...
@@ -107,21 +107,21 @@ public class ClusterServiceImpl extends SuperServiceImpl<ClusterMapper, Cluster>
public
int
clearCluster
()
{
List
<
Cluster
>
clusters
=
listAutoEnable
();
int
count
=
0
;
for
(
Cluster
item
:
clusters
)
{
if
((!
checkHealth
(
item
))&&
removeById
(
item
))
{
count
++;
for
(
Cluster
item
:
clusters
)
{
if
((!
checkHealth
(
item
))
&&
removeById
(
item
))
{
count
++;
}
}
return
count
;
}
private
boolean
checkHealth
(
Cluster
cluster
){
private
boolean
checkHealth
(
Cluster
cluster
)
{
FlinkClusterInfo
info
=
checkHeartBeat
(
cluster
.
getHosts
(),
cluster
.
getJobManagerHost
());
if
(!
info
.
isEffective
())
{
if
(!
info
.
isEffective
())
{
cluster
.
setJobManagerHost
(
""
);
cluster
.
setStatus
(
0
);
return
false
;
}
else
{
}
else
{
cluster
.
setJobManagerHost
(
info
.
getJobManagerAddress
());
cluster
.
setStatus
(
1
);
cluster
.
setVersion
(
info
.
getVersion
());
...
...
dlink-admin/src/main/java/com/dlink/service/impl/DocumentServiceImpl.java
View file @
eabb360b
...
...
@@ -21,9 +21,9 @@ public class DocumentServiceImpl extends SuperServiceImpl<DocumentMapper, Docume
@Override
public
List
<
Document
>
getFillAllByVersion
(
String
version
)
{
if
(
Asserts
.
isNotNullString
(
version
))
{
if
(
Asserts
.
isNotNullString
(
version
))
{
return
baseMapper
.
selectList
(
new
QueryWrapper
<
Document
>().
eq
(
"version"
,
version
).
eq
(
"enabled"
,
1
));
}
else
{
}
else
{
return
baseMapper
.
selectList
(
new
QueryWrapper
<
Document
>().
eq
(
"enabled"
,
1
));
}
}
...
...
dlink-admin/src/main/java/com/dlink/service/impl/HistoryServiceImpl.java
View file @
eabb360b
...
...
@@ -18,7 +18,7 @@ public class HistoryServiceImpl extends SuperServiceImpl<HistoryMapper, History>
@Override
public
boolean
removeHistoryById
(
Integer
id
)
{
History
history
=
getById
(
id
);
if
(
history
!=
null
)
{
if
(
history
!=
null
)
{
ResultPool
.
remove
(
history
.
getJobId
());
}
return
removeById
(
id
);
...
...
dlink-admin/src/main/java/com/dlink/service/impl/JarServiceImpl.java
View file @
eabb360b
...
...
@@ -19,6 +19,6 @@ import java.util.List;
public
class
JarServiceImpl
extends
SuperServiceImpl
<
JarMapper
,
Jar
>
implements
JarService
{
@Override
public
List
<
Jar
>
listEnabledAll
()
{
return
list
(
new
QueryWrapper
<
Jar
>().
eq
(
"enabled"
,
1
));
return
list
(
new
QueryWrapper
<
Jar
>().
eq
(
"enabled"
,
1
));
}
}
dlink-admin/src/main/java/com/dlink/service/impl/JobHistoryServiceImpl.java
View file @
eabb360b
...
...
@@ -26,36 +26,36 @@ public class JobHistoryServiceImpl extends SuperServiceImpl<JobHistoryMapper, Jo
@Override
public
JobHistory
getJobHistoryInfo
(
JobHistory
jobHistory
)
{
if
(
Asserts
.
isNotNull
(
jobHistory
))
{
if
(
Asserts
.
isNotNullString
(
jobHistory
.
getJobJson
()))
{
if
(
Asserts
.
isNotNull
(
jobHistory
))
{
if
(
Asserts
.
isNotNullString
(
jobHistory
.
getJobJson
()))
{
jobHistory
.
setJob
(
JSONUtil
.
parseObject
(
jobHistory
.
getJobJson
()));
jobHistory
.
setJobJson
(
null
);
}
if
(
Asserts
.
isNotNullString
(
jobHistory
.
getExceptionsJson
()))
{
if
(
Asserts
.
isNotNullString
(
jobHistory
.
getExceptionsJson
()))
{
jobHistory
.
setExceptions
(
JSONUtil
.
parseObject
(
jobHistory
.
getExceptionsJson
()));
jobHistory
.
setExceptionsJson
(
null
);
}
if
(
Asserts
.
isNotNullString
(
jobHistory
.
getCheckpointsJson
()))
{
if
(
Asserts
.
isNotNullString
(
jobHistory
.
getCheckpointsJson
()))
{
jobHistory
.
setCheckpoints
(
JSONUtil
.
parseObject
(
jobHistory
.
getCheckpointsJson
()));
jobHistory
.
setCheckpointsJson
(
null
);
}
if
(
Asserts
.
isNotNullString
(
jobHistory
.
getCheckpointsConfigJson
()))
{
if
(
Asserts
.
isNotNullString
(
jobHistory
.
getCheckpointsConfigJson
()))
{
jobHistory
.
setCheckpointsConfig
(
JSONUtil
.
parseObject
(
jobHistory
.
getCheckpointsConfigJson
()));
jobHistory
.
setCheckpointsConfigJson
(
null
);
}
if
(
Asserts
.
isNotNullString
(
jobHistory
.
getConfigJson
()))
{
if
(
Asserts
.
isNotNullString
(
jobHistory
.
getConfigJson
()))
{
jobHistory
.
setConfig
(
JSONUtil
.
parseObject
(
jobHistory
.
getConfigJson
()));
jobHistory
.
setConfigJson
(
null
);
}
if
(
Asserts
.
isNotNullString
(
jobHistory
.
getJarJson
()))
{
if
(
Asserts
.
isNotNullString
(
jobHistory
.
getJarJson
()))
{
jobHistory
.
setJar
(
JSONUtil
.
parseObject
(
jobHistory
.
getJarJson
()));
jobHistory
.
setJarJson
(
null
);
}
if
(
Asserts
.
isNotNullString
(
jobHistory
.
getClusterJson
()))
{
if
(
Asserts
.
isNotNullString
(
jobHistory
.
getClusterJson
()))
{
jobHistory
.
setCluster
(
JSONUtil
.
parseObject
(
jobHistory
.
getClusterJson
()));
jobHistory
.
setClusterJson
(
null
);
}
if
(
Asserts
.
isNotNullString
(
jobHistory
.
getClusterConfigurationJson
()))
{
if
(
Asserts
.
isNotNullString
(
jobHistory
.
getClusterConfigurationJson
()))
{
jobHistory
.
setClusterConfiguration
(
JSONUtil
.
parseObject
(
jobHistory
.
getClusterConfigurationJson
()));
jobHistory
.
setClusterConfigurationJson
(
null
);
}
...
...
@@ -83,8 +83,8 @@ public class JobHistoryServiceImpl extends SuperServiceImpl<JobHistoryMapper, Jo
}
else
{
save
(
jobHistory
);
}
}
catch
(
Exception
e
)
{
}
finally
{
}
catch
(
Exception
e
)
{
}
finally
{
return
jobHistory
;
}
}
...
...
dlink-admin/src/main/java/com/dlink/service/impl/JobInstanceServiceImpl.java
View file @
eabb360b
package
com
.
dlink
.
service
.
impl
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.dlink.assertion.Asserts
;
import
com.dlink.constant.FlinkRestResultConstant
;
import
com.dlink.db.service.impl.SuperServiceImpl
;
import
com.dlink.explainer.ca.CABuilder
;
import
com.dlink.explainer.ca.TableCANode
;
import
com.dlink.explainer.lineage.LineageBuilder
;
import
com.dlink.explainer.lineage.LineageResult
;
import
com.dlink.mapper.JobInstanceMapper
;
import
com.dlink.model.Cluster
;
import
com.dlink.model.History
;
import
com.dlink.model.JobHistory
;
import
com.dlink.model.JobInfoDetail
;
import
com.dlink.model.JobInstance
;
import
com.dlink.model.JobInstanceCount
;
import
com.dlink.model.JobInstanceStatus
;
import
com.dlink.model.JobStatus
;
import
com.dlink.service.ClusterConfigurationService
;
import
com.dlink.service.ClusterService
;
import
com.dlink.service.HistoryService
;
import
com.dlink.service.JobHistoryService
;
import
com.dlink.service.JobInstanceService
;
import
com.dlink.service.TaskService
;
import
com.dlink.model.*
;
import
com.dlink.service.*
;
import
com.dlink.utils.JSONUtil
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
...
...
@@ -50,9 +34,9 @@ public class JobInstanceServiceImpl extends SuperServiceImpl<JobInstanceMapper,
@Override
public
JobInstanceStatus
getStatusCount
(
boolean
isHistory
)
{
List
<
JobInstanceCount
>
jobInstanceCounts
=
null
;
if
(
isHistory
)
{
if
(
isHistory
)
{
jobInstanceCounts
=
baseMapper
.
countHistoryStatus
();
}
else
{
}
else
{
jobInstanceCounts
=
baseMapper
.
countStatus
();
}
JobInstanceStatus
jobInstanceStatus
=
new
JobInstanceStatus
();
...
...
dlink-admin/src/main/java/com/dlink/service/impl/SavepointsServiceImpl.java
View file @
eabb360b
...
...
@@ -20,7 +20,7 @@ public class SavepointsServiceImpl extends SuperServiceImpl<SavepointsMapper, Sa
@Override
public
List
<
Savepoints
>
listSavepointsByTaskId
(
Integer
taskId
)
{
return
list
(
new
QueryWrapper
<
Savepoints
>().
eq
(
"task_id"
,
taskId
));
return
list
(
new
QueryWrapper
<
Savepoints
>().
eq
(
"task_id"
,
taskId
));
}
@Override
...
...
dlink-admin/src/main/java/com/dlink/service/impl/StatementServiceImpl.java
View file @
eabb360b
...
...
@@ -16,9 +16,9 @@ import org.springframework.stereotype.Service;
public
class
StatementServiceImpl
extends
SuperServiceImpl
<
StatementMapper
,
Statement
>
implements
StatementService
{
@Override
public
boolean
insert
(
Statement
statement
)
{
if
(
baseMapper
.
insert
(
statement
)>
0
)
{
if
(
baseMapper
.
insert
(
statement
)
>
0
)
{
return
true
;
}
else
{
}
else
{
return
false
;
}
}
...
...
dlink-admin/src/main/java/com/dlink/service/impl/StudioServiceImpl.java
View file @
eabb360b
package
com
.
dlink
.
service
.
impl
;
import
com.dlink.api.FlinkAPI
;
import
com.dlink.assertion.Assert
;
import
com.dlink.assertion.Asserts
;
import
com.dlink.config.Dialect
;
import
com.dlink.dto.*
;
import
com.dlink.explainer.ca.CABuilder
;
import
com.dlink.explainer.ca.ColumnCANode
;
import
com.dlink.explainer.ca.TableCANode
;
import
com.dlink.explainer.lineage.LineageBuilder
;
import
com.dlink.explainer.lineage.LineageResult
;
import
com.dlink.gateway.GatewayType
;
...
...
@@ -18,7 +14,10 @@ import com.dlink.job.JobManager;
import
com.dlink.job.JobResult
;
import
com.dlink.metadata.driver.Driver
;
import
com.dlink.metadata.result.JdbcSelectResult
;
import
com.dlink.model.*
;
import
com.dlink.model.Cluster
;
import
com.dlink.model.DataBase
;
import
com.dlink.model.Savepoints
;
import
com.dlink.model.Task
;
import
com.dlink.result.IResult
;
import
com.dlink.result.SelectResult
;
import
com.dlink.result.SqlExplainResult
;
...
...
@@ -301,7 +300,7 @@ public class StudioServiceImpl implements StudioService {
jobConfig
.
getGatewayConfig
().
getClusterConfig
().
setAppId
(
cluster
.
getName
());
jobConfig
.
setTaskId
(
cluster
.
getTaskId
());
useGateway
=
true
;
}
else
{
}
else
{
jobConfig
.
setTaskId
(
taskId
);
}
JobManager
jobManager
=
JobManager
.
build
(
jobConfig
);
...
...
@@ -309,7 +308,7 @@ public class StudioServiceImpl implements StudioService {
SavePointResult
savePointResult
=
jobManager
.
savepoint
(
jobId
,
savePointType
,
null
);
if
(
Asserts
.
isNotNull
(
savePointResult
))
{
for
(
JobInfo
item
:
savePointResult
.
getJobInfos
())
{
if
(
Asserts
.
isEqualsIgnoreCase
(
jobId
,
item
.
getJobId
())
&&
Asserts
.
isNotNull
(
jobConfig
.
getTaskId
()))
{
if
(
Asserts
.
isEqualsIgnoreCase
(
jobId
,
item
.
getJobId
())
&&
Asserts
.
isNotNull
(
jobConfig
.
getTaskId
()))
{
Savepoints
savepoints
=
new
Savepoints
();
savepoints
.
setName
(
name
);
savepoints
.
setType
(
savePointType
);
...
...
dlink-admin/src/main/java/com/dlink/service/impl/SysConfigServiceImpl.java
View file @
eabb360b
...
...
@@ -7,7 +7,6 @@ import com.dlink.mapper.SysConfigMapper;
import
com.dlink.model.SysConfig
;
import
com.dlink.model.SystemConfiguration
;
import
com.dlink.service.SysConfigService
;
import
com.fasterxml.jackson.core.JsonProcessingException
;
import
com.fasterxml.jackson.databind.JsonNode
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
org.springframework.stereotype.Service
;
...
...
@@ -30,10 +29,10 @@ public class SysConfigServiceImpl extends SuperServiceImpl<SysConfigMapper, SysC
@Override
public
Map
<
String
,
Object
>
getAll
()
{
Map
<
String
,
Object
>
map
=
new
HashMap
<>();
Map
<
String
,
Object
>
map
=
new
HashMap
<>();
List
<
SysConfig
>
sysConfigs
=
list
();
for
(
SysConfig
item
:
sysConfigs
)
{
map
.
put
(
item
.
getName
(),
item
.
getValue
());
for
(
SysConfig
item
:
sysConfigs
)
{
map
.
put
(
item
.
getName
(),
item
.
getValue
());
}
SystemConfiguration
.
getInstances
().
addConfiguration
(
map
);
return
map
;
...
...
@@ -46,7 +45,7 @@ public class SysConfigServiceImpl extends SuperServiceImpl<SysConfigMapper, SysC
@Override
public
void
updateSysConfigByJson
(
JsonNode
node
)
{
if
(
node
!=
null
&&
node
.
isObject
())
{
if
(
node
!=
null
&&
node
.
isObject
())
{
Iterator
<
Map
.
Entry
<
String
,
JsonNode
>>
it
=
node
.
fields
();
while
(
it
.
hasNext
())
{
Map
.
Entry
<
String
,
JsonNode
>
entry
=
it
.
next
();
...
...
@@ -55,10 +54,10 @@ public class SysConfigServiceImpl extends SuperServiceImpl<SysConfigMapper, SysC
SysConfig
config
=
getOne
(
new
QueryWrapper
<
SysConfig
>().
eq
(
"name"
,
name
));
SysConfig
newConfig
=
new
SysConfig
();
newConfig
.
setValue
(
value
);
if
(
Asserts
.
isNull
(
config
))
{
if
(
Asserts
.
isNull
(
config
))
{
newConfig
.
setName
(
name
);
save
(
newConfig
);
}
else
{
}
else
{
newConfig
.
setId
(
config
.
getId
());
updateById
(
newConfig
);
}
...
...
dlink-admin/src/main/java/com/dlink/service/impl/TaskServiceImpl.java
View file @
eabb360b
...
...
@@ -341,7 +341,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen
Task
task
=
getById
(
id
);
Assert
.
check
(
task
);
if
(
JobLifeCycle
.
RELEASE
.
equalsValue
(
task
.
getStep
()))
{
if
(
Asserts
.
isNotNull
(
task
.
getJobInstanceId
())&&
task
.
getJobInstanceId
()!=
0
)
{
if
(
Asserts
.
isNotNull
(
task
.
getJobInstanceId
())
&&
task
.
getJobInstanceId
()
!=
0
)
{
return
Result
.
failed
(
"当前发布状态下有作业正在运行,上线失败,请停止后上线"
);
}
JobResult
jobResult
=
submitTaskToOnline
(
id
);
...
...
@@ -349,7 +349,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen
task
.
setStep
(
JobLifeCycle
.
ONLINE
.
getValue
());
task
.
setJobInstanceId
(
jobResult
.
getJobInstanceId
());
if
(
updateById
(
task
))
{
return
Result
.
succeed
(
jobResult
,
"上线成功"
);
return
Result
.
succeed
(
jobResult
,
"上线成功"
);
}
else
{
return
Result
.
failed
(
"由于未知原因,上线失败"
);
}
...
...
@@ -368,7 +368,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen
type
=
SavePointType
.
CANCEL
.
getValue
();
}
if
(
savepointTask
(
id
,
type
))
{
if
(!
JobLifeCycle
.
ONLINE
.
equalsValue
(
task
.
getStep
()))
{
if
(!
JobLifeCycle
.
ONLINE
.
equalsValue
(
task
.
getStep
()))
{
return
Result
.
succeed
(
"停止成功"
);
}
task
.
setStep
(
JobLifeCycle
.
RELEASE
.
getValue
());
...
...
@@ -387,7 +387,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen
Task
task
=
getById
(
id
);
Assert
.
check
(
task
);
if
(
JobLifeCycle
.
ONLINE
!=
JobLifeCycle
.
get
(
task
.
getStep
()))
{
if
(
Asserts
.
isNotNull
(
task
.
getJobInstanceId
())&&
task
.
getJobInstanceId
()!=
0
)
{
if
(
Asserts
.
isNotNull
(
task
.
getJobInstanceId
())
&&
task
.
getJobInstanceId
()
!=
0
)
{
return
Result
.
failed
(
"当前有作业正在运行,注销失败,请停止后注销"
);
}
task
.
setStep
(
JobLifeCycle
.
CANCEL
.
getValue
());
...
...
@@ -417,7 +417,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen
Asserts
.
checkNotNull
(
cluster
,
"该集群不存在"
);
Asserts
.
checkNotNull
(
task
.
getJobInstanceId
(),
"无任务需要SavePoint"
);
JobInstance
jobInstance
=
jobInstanceService
.
getById
(
task
.
getJobInstanceId
());
if
(
Asserts
.
isNull
(
jobInstance
))
{
if
(
Asserts
.
isNull
(
jobInstance
))
{
return
true
;
}
String
jobId
=
jobInstance
.
getJid
();
...
...
@@ -434,7 +434,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen
jobConfig
.
setTaskId
(
task
.
getId
());
JobManager
jobManager
=
JobManager
.
build
(
jobConfig
);
jobManager
.
setUseGateway
(
useGateway
);
if
(
"canceljob"
.
equals
(
savePointType
))
{
if
(
"canceljob"
.
equals
(
savePointType
))
{
return
jobManager
.
cancel
(
jobId
);
}
SavePointResult
savePointResult
=
jobManager
.
savepoint
(
jobId
,
savePointType
,
null
);
...
...
dlink-admin/src/main/java/com/dlink/service/impl/UserServiceImpl.java
View file @
eabb360b
...
...
@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import
com.dlink.assertion.Asserts
;
import
com.dlink.common.result.Result
;
import
com.dlink.db.service.impl.SuperServiceImpl
;
import
com.dlink.exception.BusException
;
import
com.dlink.mapper.UserMapper
;
import
com.dlink.model.User
;
import
com.dlink.service.UserService
;
...
...
@@ -22,47 +21,48 @@ import org.springframework.stereotype.Service;
public
class
UserServiceImpl
extends
SuperServiceImpl
<
UserMapper
,
User
>
implements
UserService
{
private
static
final
String
DEFAULT_PASSWORD
=
"123456"
;
@Override
public
Result
registerUser
(
User
user
)
{
User
userByUsername
=
getUserByUsername
(
user
.
getUsername
());
if
(
Asserts
.
isNotNull
(
userByUsername
))
{
if
(
Asserts
.
isNotNull
(
userByUsername
))
{
return
Result
.
failed
(
"该账号已存在"
);
}
if
(
Asserts
.
isNullString
(
user
.
getPassword
()))
{
if
(
Asserts
.
isNullString
(
user
.
getPassword
()))
{
user
.
setPassword
(
DEFAULT_PASSWORD
);
}
user
.
setPassword
(
SaSecureUtil
.
md5
(
user
.
getPassword
()));
user
.
setEnabled
(
true
);
user
.
setDelete
(
false
);
if
(
save
(
user
))
{
if
(
save
(
user
))
{
return
Result
.
succeed
(
"注册成功"
);
}
else
{
}
else
{
return
Result
.
failed
(
"该账号已存在"
);
}
}
@Override
public
boolean
modifyUser
(
User
user
)
{
if
(
Asserts
.
isNull
(
user
.
getId
()))
{
if
(
Asserts
.
isNull
(
user
.
getId
()))
{
return
false
;
}
if
(
Asserts
.
isNotNull
(
user
.
getPassword
()))
{
if
(
Asserts
.
isNotNull
(
user
.
getPassword
()))
{
user
.
setPassword
(
SaSecureUtil
.
md5
(
user
.
getPassword
()));
}
return
updateById
(
user
);
}
@Override
public
Result
modifyPassword
(
String
username
,
String
password
,
String
newPassword
)
{
public
Result
modifyPassword
(
String
username
,
String
password
,
String
newPassword
)
{
User
user
=
getUserByUsername
(
username
);
if
(
Asserts
.
isNull
(
user
))
{
if
(
Asserts
.
isNull
(
user
))
{
return
Result
.
failed
(
"该账号不存在"
);
}
if
(!
Asserts
.
isEquals
(
SaSecureUtil
.
md5
(
password
),
user
.
getPassword
()))
{
if
(!
Asserts
.
isEquals
(
SaSecureUtil
.
md5
(
password
),
user
.
getPassword
()))
{
return
Result
.
failed
(
"原密码错误"
);
}
user
.
setPassword
(
SaSecureUtil
.
md5
(
newPassword
));
if
(
updateById
(
user
))
{
if
(
updateById
(
user
))
{
return
Result
.
succeed
(
"密码修改成功"
);
}
return
Result
.
failed
(
"密码修改失败"
);
...
...
@@ -77,35 +77,35 @@ public class UserServiceImpl extends SuperServiceImpl<UserMapper, User> implemen
}
@Override
public
Result
loginUser
(
String
username
,
String
password
,
boolean
isRemember
)
{
public
Result
loginUser
(
String
username
,
String
password
,
boolean
isRemember
)
{
User
user
=
getUserByUsername
(
username
);
if
(
Asserts
.
isNull
(
user
))
{
if
(
Asserts
.
isNull
(
user
))
{
return
Result
.
failed
(
"账号或密码错误"
);
}
String
userPassword
=
user
.
getPassword
();
if
(
Asserts
.
isNullString
(
password
))
{
if
(
Asserts
.
isNullString
(
password
))
{
return
Result
.
failed
(
"密码不能为空"
);
}
if
(
Asserts
.
isEquals
(
SaSecureUtil
.
md5
(
password
),
userPassword
))
{
if
(
user
.
isDelete
())
{
if
(
Asserts
.
isEquals
(
SaSecureUtil
.
md5
(
password
),
userPassword
))
{
if
(
user
.
isDelete
())
{
return
Result
.
failed
(
"账号不存在"
);
}
if
(!
user
.
isEnabled
())
{
if
(!
user
.
isEnabled
())
{
return
Result
.
failed
(
"账号已被禁用"
);
}
StpUtil
.
login
(
user
.
getId
(),
isRemember
);
StpUtil
.
getSession
().
set
(
"user"
,
user
);
return
Result
.
succeed
(
user
,
"登录成功"
);
}
else
{
}
else
{
return
Result
.
failed
(
"账号或密码错误"
);
}
}
@Override
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
user
=
getOne
(
new
QueryWrapper
<
User
>().
eq
(
"username"
,
username
).
eq
(
"is_delete"
,
0
));
if
(
Asserts
.
isNotNull
(
user
))
{
user
.
setAdmin
(
Asserts
.
isEqualsIgnoreCase
(
username
,
"admin"
));
}
return
user
;
}
...
...
dlink-admin/src/main/resources/json/openapi_savepoint.json
View file @
eabb360b
/*
http
:
//
127.0
.
0.1
:
8888
/openapi/
explainSql
*/
/*
http
:
//
127.0
.
0.1
:
8888
/openapi/
savepoint
*/
{
/*
required-start
*/
"jobId"
:
"195352b0a4518e16699983a13205f059"
,
...
...
dlink-admin/src/test/java/com/dlink/admin/AdminTest.java
View file @
eabb360b
...
...
@@ -12,7 +12,7 @@ import org.junit.Test;
public
class
AdminTest
{
@Test
public
void
adminTest
(){
public
void
adminTest
()
{
String
admin
=
SaSecureUtil
.
md5
(
"admin"
);
System
.
out
.
println
(
admin
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment