Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nnjcy-data-model
Overview
Overview
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
梁家彪
nnjcy-data-model
Commits
5a3e139e
Commit
5a3e139e
authored
Dec 26, 2023
by
梁家彪
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
完善
parent
b167f269
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
25 changed files
with
166 additions
and
93 deletions
+166
-93
data-collect-server/src/main/java/com/zq/datacollect/controller/DataCollectApiController.java
+3
-2
data-collect-server/src/main/java/com/zq/datacollect/controller/DataCollectDbController.java
+2
-2
data-collect-server/src/main/java/com/zq/datacollect/controller/DataCollectFileController.java
+3
-2
data-collect-server/src/main/java/com/zq/datacollect/controller/DataCollectLogController.java
+6
-0
data-collect-server/src/main/java/com/zq/datacollect/entity/DataCollectSetting.java
+4
-3
data-collect-server/src/main/java/com/zq/datacollect/entity/DataCollectSettingFile.java
+2
-1
data-collect-server/src/main/java/com/zq/datacollect/runner/DatabaseRunner.java
+1
-1
data-collect-server/src/main/java/com/zq/datacollect/service/DataCollectApiService.java
+2
-1
data-collect-server/src/main/java/com/zq/datacollect/service/DataCollectDbService.java
+1
-1
data-collect-server/src/main/java/com/zq/datacollect/service/DataCollectFileService.java
+2
-1
data-collect-server/src/main/java/com/zq/datacollect/service/DataCollectLogService.java
+2
-0
data-collect-server/src/main/java/com/zq/datacollect/service/impl/DataCollectApiServiceImpl.java
+7
-3
data-collect-server/src/main/java/com/zq/datacollect/service/impl/DataCollectDbServiceImpl.java
+4
-1
data-collect-server/src/main/java/com/zq/datacollect/service/impl/DataCollectFileServiceImpl.java
+6
-2
data-collect-server/src/main/java/com/zq/datacollect/service/impl/DataCollectLogServiceImpl.java
+21
-0
data-collect-server/src/main/java/com/zq/datacollect/service/impl/DataCollectServiceImpl.java
+10
-4
data-collect-server/src/main/java/com/zq/datacollect/util/SqlUtil.java
+2
-2
dataoperation-server/src/main/java/com/zq/dataoperation/holder/DatabaseHolder.java
+1
-1
dataoperation-server/src/main/java/com/zq/dataoperation/service/CommonQueryService.java
+17
-7
flow-component/src/main/java/com/zq/spiderflow/datacollision/executor/DataCollisionExecutor.java
+56
-49
flow-component/src/main/java/com/zq/spiderflow/excelremoveduplicate/executor/ExcelRemoveDuplicateExecutor.java
+0
-0
flow-component/src/main/java/com/zq/spiderflow/flowcall/executor/FlowCallExecutor.java
+0
-0
spider-flow-api/src/main/java/com/zq/spiderflow/model/SpiderNode.java
+4
-0
spider-flow-core/src/main/java/com/zq/spiderflow/core/Spider.java
+0
-0
spider-flow-web/src/main/java/com/zq/spiderflow/websocket/WebSocketEditorServer.java
+10
-10
No files found.
data-collect-server/src/main/java/com/zq/datacollect/controller/DataCollectApiController.java
View file @
5a3e139e
...
@@ -43,8 +43,8 @@ public class DataCollectApiController {
...
@@ -43,8 +43,8 @@ public class DataCollectApiController {
@ApiOperation
(
"执行接口汇聚"
)
@ApiOperation
(
"执行接口汇聚"
)
@PostMapping
(
value
=
"/execute"
)
@PostMapping
(
value
=
"/execute"
)
public
ResultVo
executeDb
(
@RequestParam
(
"dataCollectSettingId"
)
Integer
dataCollectSettingId
,
@RequestBody
DataCollectApiExecuteReq
dataCollectApiExecuteReq
)
{
public
ResultVo
executeDb
(
@RequestParam
(
"dataCollectSettingId"
)
Integer
dataCollectSettingId
,
@Request
Param
(
"collectType"
)
Integer
collectType
,
@Request
Body
DataCollectApiExecuteReq
dataCollectApiExecuteReq
)
{
dataCollectApiService
.
execute
(
dataCollectSettingId
,
dataCollectApiExecuteReq
);
dataCollectApiService
.
execute
(
dataCollectSettingId
,
collectType
,
dataCollectApiExecuteReq
);
return
ResultVo
.
success
(
"汇聚执行成功"
);
return
ResultVo
.
success
(
"汇聚执行成功"
);
}
}
}
}
\ No newline at end of file
data-collect-server/src/main/java/com/zq/datacollect/controller/DataCollectDbController.java
View file @
5a3e139e
...
@@ -41,8 +41,8 @@ public class DataCollectDbController {
...
@@ -41,8 +41,8 @@ public class DataCollectDbController {
@ApiOperation
(
"执行数据库汇聚"
)
@ApiOperation
(
"执行数据库汇聚"
)
@PostMapping
(
value
=
"/execute"
)
@PostMapping
(
value
=
"/execute"
)
public
ResultVo
executeDb
(
@RequestParam
(
"dataCollectSettingId"
)
Integer
dataCollectSettingId
)
{
public
ResultVo
executeDb
(
@RequestParam
(
"dataCollectSettingId"
)
Integer
dataCollectSettingId
,
@RequestParam
(
"collectType"
)
Integer
collectType
)
{
dataCollectDbService
.
execute
(
dataCollectSettingId
);
dataCollectDbService
.
execute
(
dataCollectSettingId
,
collectType
);
return
ResultVo
.
success
(
"汇聚执行成功"
);
return
ResultVo
.
success
(
"汇聚执行成功"
);
}
}
}
}
data-collect-server/src/main/java/com/zq/datacollect/controller/DataCollectFileController.java
View file @
5a3e139e
...
@@ -48,8 +48,8 @@ public class DataCollectFileController {
...
@@ -48,8 +48,8 @@ public class DataCollectFileController {
@ApiOperation
(
"执行文件汇聚"
)
@ApiOperation
(
"执行文件汇聚"
)
@PostMapping
(
value
=
"/execute"
)
@PostMapping
(
value
=
"/execute"
)
public
ResultVo
executeDb
(
@RequestParam
(
"dataCollectSettingId"
)
Integer
dataCollectSettingId
,
MultipartFile
file
)
{
public
ResultVo
executeDb
(
@RequestParam
(
"dataCollectSettingId"
)
Integer
dataCollectSettingId
,
@RequestParam
(
"collectType"
)
Integer
collectType
,
MultipartFile
file
)
{
dataCollectFileService
.
execute
(
dataCollectSettingId
,
file
);
dataCollectFileService
.
execute
(
dataCollectSettingId
,
collectType
,
file
);
return
ResultVo
.
success
(
"汇聚执行成功"
);
return
ResultVo
.
success
(
"汇聚执行成功"
);
}
}
}
}
\ No newline at end of file
data-collect-server/src/main/java/com/zq/datacollect/controller/DataCollectLogController.java
View file @
5a3e139e
...
@@ -33,6 +33,12 @@ public class DataCollectLogController {
...
@@ -33,6 +33,12 @@ public class DataCollectLogController {
return
ResultVo
.
success
(
dataCollectLogService
.
getList
(
req
));
return
ResultVo
.
success
(
dataCollectLogService
.
getList
(
req
));
}
}
@ApiOperation
(
"分页获取指定汇聚的日志"
)
@PostMapping
(
value
=
"/list/{id}"
)
public
ResultVo
getListById
(
@RequestBody
DataCollectLogReq
req
,
@PathVariable
Integer
id
)
{
return
ResultVo
.
success
(
dataCollectLogService
.
getList
(
req
,
id
));
}
@ApiOperation
(
"删除数据汇聚日志"
)
@ApiOperation
(
"删除数据汇聚日志"
)
@DeleteMapping
(
value
=
"/delete/{id}"
)
@DeleteMapping
(
value
=
"/delete/{id}"
)
public
ResultVo
delete
(
@PathVariable
Integer
id
)
{
public
ResultVo
delete
(
@PathVariable
Integer
id
)
{
...
...
data-collect-server/src/main/java/com/zq/datacollect/entity/DataCollectSetting.java
View file @
5a3e139e
...
@@ -91,14 +91,14 @@ public class DataCollectSetting {
...
@@ -91,14 +91,14 @@ public class DataCollectSetting {
private
Long
deptId
;
private
Long
deptId
;
/**
/**
* createTime
*
createTime
*/
*/
@TableField
(
fill
=
FieldFill
.
INSERT
)
@TableField
(
fill
=
FieldFill
.
INSERT
)
private
Date
createTime
;
private
Date
createTime
;
/**
/**
* updateTime
*
updateTime
*/
*/
@TableField
(
fill
=
FieldFill
.
INSERT_UPDATE
)
@TableField
(
fill
=
FieldFill
.
INSERT_UPDATE
)
private
Date
updateTime
;
private
Date
updateTime
;
}
}
\ No newline at end of file
data-collect-server/src/main/java/com/zq/datacollect/entity/DataCollectSettingFile.java
View file @
5a3e139e
...
@@ -53,5 +53,5 @@ public class DataCollectSettingFile {
...
@@ -53,5 +53,5 @@ public class DataCollectSettingFile {
* updateTime
* updateTime
*/
*/
@TableField
(
fill
=
FieldFill
.
INSERT_UPDATE
)
@TableField
(
fill
=
FieldFill
.
INSERT_UPDATE
)
private
Date
updateTime
;
;
private
Date
updateTime
;
}
}
\ No newline at end of file
data-collect-server/src/main/java/com/zq/datacollect/runner/DatabaseRunner.java
View file @
5a3e139e
...
@@ -38,7 +38,7 @@ public class DatabaseRunner implements ApplicationRunner {
...
@@ -38,7 +38,7 @@ public class DatabaseRunner implements ApplicationRunner {
switch
(
ds
.
getDbType
())
{
switch
(
ds
.
getDbType
())
{
case
1
:
case
1
:
className
=
"com.mysql.cj.jdbc.Driver"
;
className
=
"com.mysql.cj.jdbc.Driver"
;
url
=
"jdbc:mysql://"
+
ds
.
getDbIp
()
+
":"
+
ds
.
getDbPort
()
+
"/"
+
ds
.
getDbName
()
+
"?characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true"
;
url
=
"jdbc:mysql://"
+
ds
.
getDbIp
()
+
":"
+
ds
.
getDbPort
()
+
"/"
+
ds
.
getDbName
()
+
"?characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8&
rewriteBatchedStatements=true&
autoReconnect=true"
;
break
;
break
;
case
2
:
case
2
:
className
=
"oracle.jdbc.driver.OracleDriver"
;
className
=
"oracle.jdbc.driver.OracleDriver"
;
...
...
data-collect-server/src/main/java/com/zq/datacollect/service/DataCollectApiService.java
View file @
5a3e139e
...
@@ -12,5 +12,5 @@ public interface DataCollectApiService {
...
@@ -12,5 +12,5 @@ public interface DataCollectApiService {
void
update
(
DataCollectApiAddReq
dataCollectApiAddReq
);
void
update
(
DataCollectApiAddReq
dataCollectApiAddReq
);
void
execute
(
Integer
dataCollectSettingId
,
DataCollectApiExecuteReq
dataCollectApiExecuteReq
);
void
execute
(
Integer
dataCollectSettingId
,
Integer
collectType
,
DataCollectApiExecuteReq
dataCollectApiExecuteReq
);
}
}
\ No newline at end of file
data-collect-server/src/main/java/com/zq/datacollect/service/DataCollectDbService.java
View file @
5a3e139e
...
@@ -11,5 +11,5 @@ public interface DataCollectDbService {
...
@@ -11,5 +11,5 @@ public interface DataCollectDbService {
void
update
(
DataCollectDbAddReq
dataCollectDbAddReq
);
void
update
(
DataCollectDbAddReq
dataCollectDbAddReq
);
void
execute
(
Integer
dataCollectSettingId
);
void
execute
(
Integer
dataCollectSettingId
,
Integer
collectType
);
}
}
data-collect-server/src/main/java/com/zq/datacollect/service/DataCollectFileService.java
View file @
5a3e139e
...
@@ -17,5 +17,5 @@ public interface DataCollectFileService {
...
@@ -17,5 +17,5 @@ public interface DataCollectFileService {
Map
<
String
,
Object
>
analysisExcel
(
MultipartFile
multipartFile
);
Map
<
String
,
Object
>
analysisExcel
(
MultipartFile
multipartFile
);
void
execute
(
Integer
dataCollectSettingId
,
MultipartFile
file
);
void
execute
(
Integer
dataCollectSettingId
,
Integer
collectType
,
MultipartFile
file
);
}
}
\ No newline at end of file
data-collect-server/src/main/java/com/zq/datacollect/service/DataCollectLogService.java
View file @
5a3e139e
...
@@ -12,6 +12,8 @@ public interface DataCollectLogService {
...
@@ -12,6 +12,8 @@ public interface DataCollectLogService {
PageVo
getList
(
DataCollectLogReq
req
);
PageVo
getList
(
DataCollectLogReq
req
);
PageVo
getList
(
DataCollectLogReq
req
,
Integer
id
);
List
<
DataCollectFileLog
>
file
(
Integer
id
);
List
<
DataCollectFileLog
>
file
(
Integer
id
);
boolean
removeById
(
Integer
id
);
boolean
removeById
(
Integer
id
);
...
...
data-collect-server/src/main/java/com/zq/datacollect/service/impl/DataCollectApiServiceImpl.java
View file @
5a3e139e
...
@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
...
@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
import
cn.hutool.core.util.StrUtil
;
import
cn.hutool.core.util.StrUtil
;
import
cn.hutool.http.HttpRequest
;
import
cn.hutool.http.HttpRequest
;
import
cn.hutool.http.HttpUtil
;
import
cn.hutool.http.HttpUtil
;
import
cn.hutool.json.JSONUtil
;
import
com.alibaba.fastjson2.JSONObject
;
import
com.alibaba.fastjson2.JSONObject
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
...
@@ -86,7 +87,7 @@ public class DataCollectApiServiceImpl extends ServiceImpl<DataCollectSettingApi
...
@@ -86,7 +87,7 @@ public class DataCollectApiServiceImpl extends ServiceImpl<DataCollectSettingApi
@Override
@Override
@Transactional
@Transactional
public
void
execute
(
Integer
dataCollectSettingId
,
DataCollectApiExecuteReq
dataCollectApiExecuteReq
)
{
public
void
execute
(
Integer
dataCollectSettingId
,
Integer
collectType
,
DataCollectApiExecuteReq
dataCollectApiExecuteReq
)
{
long
start
=
System
.
currentTimeMillis
();
long
start
=
System
.
currentTimeMillis
();
DataCollectSettingApi
settingApi
=
lambdaQuery
().
eq
(
DataCollectSettingApi:
:
getDataCollectSettingId
,
dataCollectSettingId
).
one
();
DataCollectSettingApi
settingApi
=
lambdaQuery
().
eq
(
DataCollectSettingApi:
:
getDataCollectSettingId
,
dataCollectSettingId
).
one
();
List
<
DataCollectSettingApiPara
>
apiParas
;
List
<
DataCollectSettingApiPara
>
apiParas
;
...
@@ -106,12 +107,12 @@ public class DataCollectApiServiceImpl extends ServiceImpl<DataCollectSettingApi
...
@@ -106,12 +107,12 @@ public class DataCollectApiServiceImpl extends ServiceImpl<DataCollectSettingApi
throw
new
BusinessException
(
"不支持的请求类型"
);
throw
new
BusinessException
(
"不支持的请求类型"
);
}
}
if
(
StrUtil
.
isNotBlank
(
dataCollectApiExecuteReq
.
getHeaders
())){
if
(
StrUtil
.
isNotBlank
(
dataCollectApiExecuteReq
.
getHeaders
())
&&
JSONUtil
.
isJsonObj
(
dataCollectApiExecuteReq
.
getHeaders
())
){
for
(
Map
.
Entry
<
String
,
Object
>
entry
:
JSONObject
.
parseObject
(
dataCollectApiExecuteReq
.
getHeaders
()).
entrySet
())
{
for
(
Map
.
Entry
<
String
,
Object
>
entry
:
JSONObject
.
parseObject
(
dataCollectApiExecuteReq
.
getHeaders
()).
entrySet
())
{
request
.
header
(
entry
.
getKey
(),
entry
.
getValue
().
toString
());
request
.
header
(
entry
.
getKey
(),
entry
.
getValue
().
toString
());
}
}
}
}
else
if
(
StrUtil
.
isNotBlank
(
settingApi
.
getHeaders
())){
else
if
(
StrUtil
.
isNotBlank
(
settingApi
.
getHeaders
())
&&
JSONUtil
.
isJsonObj
(
settingApi
.
getHeaders
())
){
for
(
Map
.
Entry
<
String
,
Object
>
entry
:
JSONObject
.
parseObject
(
settingApi
.
getHeaders
()).
entrySet
())
{
for
(
Map
.
Entry
<
String
,
Object
>
entry
:
JSONObject
.
parseObject
(
settingApi
.
getHeaders
()).
entrySet
())
{
request
.
header
(
entry
.
getKey
(),
entry
.
getValue
().
toString
());
request
.
header
(
entry
.
getKey
(),
entry
.
getValue
().
toString
());
}
}
...
@@ -130,6 +131,9 @@ public class DataCollectApiServiceImpl extends ServiceImpl<DataCollectSettingApi
...
@@ -130,6 +131,9 @@ public class DataCollectApiServiceImpl extends ServiceImpl<DataCollectSettingApi
JdbcTemplate
toDbJdbcTemplate
=
DatabaseHolder
.
getJdbcTemplate
(
dataCollectSetting
.
getToDbId
());
JdbcTemplate
toDbJdbcTemplate
=
DatabaseHolder
.
getJdbcTemplate
(
dataCollectSetting
.
getToDbId
());
Set
<
String
>
set
=
list
.
get
(
0
).
keySet
();
Set
<
String
>
set
=
list
.
get
(
0
).
keySet
();
set
.
remove
(
"id"
);
set
.
remove
(
"id"
);
if
(
collectType
==
0
){
toDbJdbcTemplate
.
execute
(
"TRUNCATE TABLE "
+
dataCollectSetting
.
getToTable
()
+
";"
);
}
if
(
dataCollectSetting
.
getCreateTable
()==
1
&&
toDbJdbcTemplate
.
queryForList
(
"SHOW TABLES LIKE '"
+
dataCollectSetting
.
getToTable
()
+
"'"
).
size
()==
0
){
if
(
dataCollectSetting
.
getCreateTable
()==
1
&&
toDbJdbcTemplate
.
queryForList
(
"SHOW TABLES LIKE '"
+
dataCollectSetting
.
getToTable
()
+
"'"
).
size
()==
0
){
toDbJdbcTemplate
.
execute
(
SqlUtil
.
joinCreateTableSql
(
dataCollectSetting
.
getToTable
(),
set
));
toDbJdbcTemplate
.
execute
(
SqlUtil
.
joinCreateTableSql
(
dataCollectSetting
.
getToTable
(),
set
));
}
}
...
...
data-collect-server/src/main/java/com/zq/datacollect/service/impl/DataCollectDbServiceImpl.java
View file @
5a3e139e
...
@@ -60,7 +60,7 @@ public class DataCollectDbServiceImpl extends ServiceImpl<DataCollectSettingDbMa
...
@@ -60,7 +60,7 @@ public class DataCollectDbServiceImpl extends ServiceImpl<DataCollectSettingDbMa
@Override
@Override
@Transactional
@Transactional
public
void
execute
(
Integer
dataCollectSettingId
)
{
public
void
execute
(
Integer
dataCollectSettingId
,
Integer
collectType
)
{
long
start
=
System
.
currentTimeMillis
();
long
start
=
System
.
currentTimeMillis
();
DataCollectSetting
dataCollectSetting
=
dataCollectMapper
.
selectById
(
dataCollectSettingId
);
DataCollectSetting
dataCollectSetting
=
dataCollectMapper
.
selectById
(
dataCollectSettingId
);
DataCollectSettingDb
settingDb
=
getOne
(
new
LambdaQueryWrapper
<
DataCollectSettingDb
>().
eq
(
DataCollectSettingDb:
:
getDataCollectSettingId
,
dataCollectSettingId
));
DataCollectSettingDb
settingDb
=
getOne
(
new
LambdaQueryWrapper
<
DataCollectSettingDb
>().
eq
(
DataCollectSettingDb:
:
getDataCollectSettingId
,
dataCollectSettingId
));
...
@@ -69,6 +69,9 @@ public class DataCollectDbServiceImpl extends ServiceImpl<DataCollectSettingDbMa
...
@@ -69,6 +69,9 @@ public class DataCollectDbServiceImpl extends ServiceImpl<DataCollectSettingDbMa
List
<
Map
<
String
,
Object
>>
list
=
fromDbJdbcTemplate
.
queryForList
(
"SELECT * FROM "
+
settingDb
.
getFromTable
());
List
<
Map
<
String
,
Object
>>
list
=
fromDbJdbcTemplate
.
queryForList
(
"SELECT * FROM "
+
settingDb
.
getFromTable
());
Set
<
String
>
set
=
list
.
get
(
0
).
keySet
();
Set
<
String
>
set
=
list
.
get
(
0
).
keySet
();
set
.
remove
(
"id"
);
set
.
remove
(
"id"
);
if
(
collectType
==
0
){
toDbJdbcTemplate
.
execute
(
"TRUNCATE TABLE "
+
dataCollectSetting
.
getToTable
()
+
";"
);
}
if
(
dataCollectSetting
.
getCreateTable
()==
1
&&
toDbJdbcTemplate
.
queryForList
(
"SHOW TABLES LIKE '"
+
dataCollectSetting
.
getToTable
()
+
"'"
).
size
()==
0
){
if
(
dataCollectSetting
.
getCreateTable
()==
1
&&
toDbJdbcTemplate
.
queryForList
(
"SHOW TABLES LIKE '"
+
dataCollectSetting
.
getToTable
()
+
"'"
).
size
()==
0
){
toDbJdbcTemplate
.
execute
(
SqlUtil
.
joinCreateTableSql
(
dataCollectSetting
.
getToTable
(),
set
));
toDbJdbcTemplate
.
execute
(
SqlUtil
.
joinCreateTableSql
(
dataCollectSetting
.
getToTable
(),
set
));
}
}
...
...
data-collect-server/src/main/java/com/zq/datacollect/service/impl/DataCollectFileServiceImpl.java
View file @
5a3e139e
...
@@ -67,7 +67,8 @@ public class DataCollectFileServiceImpl extends ServiceImpl<DataCollectSettingFi
...
@@ -67,7 +67,8 @@ public class DataCollectFileServiceImpl extends ServiceImpl<DataCollectSettingFi
String
suffix
=
FileUtil
.
extName
(
file
.
getOriginalFilename
());
String
suffix
=
FileUtil
.
extName
(
file
.
getOriginalFilename
());
AssertUtils
.
isTrue
(
suffix
.
equals
(
"xls"
)
||
suffix
.
equals
(
"xlsx"
)
||
suffix
.
equals
(
"et"
),
"不支持的文件类型"
);
AssertUtils
.
isTrue
(
suffix
.
equals
(
"xls"
)
||
suffix
.
equals
(
"xlsx"
)
||
suffix
.
equals
(
"et"
),
"不支持的文件类型"
);
try
{
try
{
return
EasyExcelUtil
.
preview100
(
file
.
getInputStream
());
Map
<
String
,
Object
>
map
=
EasyExcelUtil
.
preview100
(
file
.
getInputStream
());
return
map
;
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
throw
new
BusinessException
(
"文件读取失败,请检查后重试"
);
throw
new
BusinessException
(
"文件读取失败,请检查后重试"
);
}
}
...
@@ -75,7 +76,7 @@ public class DataCollectFileServiceImpl extends ServiceImpl<DataCollectSettingFi
...
@@ -75,7 +76,7 @@ public class DataCollectFileServiceImpl extends ServiceImpl<DataCollectSettingFi
@Override
@Override
@Transactional
@Transactional
public
void
execute
(
Integer
dataCollectSettingId
,
MultipartFile
file
)
{
public
void
execute
(
Integer
dataCollectSettingId
,
Integer
collectType
,
MultipartFile
file
)
{
long
start
=
System
.
currentTimeMillis
();
long
start
=
System
.
currentTimeMillis
();
String
suffix
=
FileUtil
.
extName
(
file
.
getOriginalFilename
());
String
suffix
=
FileUtil
.
extName
(
file
.
getOriginalFilename
());
AssertUtils
.
isTrue
(
suffix
.
equals
(
"xls"
)
||
suffix
.
equals
(
"xlsx"
)
||
suffix
.
equals
(
"et"
),
"不支持的文件类型"
);
AssertUtils
.
isTrue
(
suffix
.
equals
(
"xls"
)
||
suffix
.
equals
(
"xlsx"
)
||
suffix
.
equals
(
"et"
),
"不支持的文件类型"
);
...
@@ -85,6 +86,9 @@ public class DataCollectFileServiceImpl extends ServiceImpl<DataCollectSettingFi
...
@@ -85,6 +86,9 @@ public class DataCollectFileServiceImpl extends ServiceImpl<DataCollectSettingFi
JdbcTemplate
toDbJdbcTemplate
=
DatabaseHolder
.
getJdbcTemplate
(
dataCollectSetting
.
getToDbId
());
JdbcTemplate
toDbJdbcTemplate
=
DatabaseHolder
.
getJdbcTemplate
(
dataCollectSetting
.
getToDbId
());
Set
<
String
>
set
=
list
.
get
(
0
).
keySet
();
Set
<
String
>
set
=
list
.
get
(
0
).
keySet
();
set
.
remove
(
"id"
);
set
.
remove
(
"id"
);
if
(
collectType
==
0
){
toDbJdbcTemplate
.
execute
(
"TRUNCATE TABLE "
+
dataCollectSetting
.
getToTable
()
+
";"
);
}
if
(
dataCollectSetting
.
getCreateTable
()==
1
&&
toDbJdbcTemplate
.
queryForList
(
"SHOW TABLES LIKE '"
+
dataCollectSetting
.
getToTable
()
+
"'"
).
size
()==
0
){
if
(
dataCollectSetting
.
getCreateTable
()==
1
&&
toDbJdbcTemplate
.
queryForList
(
"SHOW TABLES LIKE '"
+
dataCollectSetting
.
getToTable
()
+
"'"
).
size
()==
0
){
toDbJdbcTemplate
.
execute
(
SqlUtil
.
joinCreateTableSql
(
dataCollectSetting
.
getToTable
(),
set
));
toDbJdbcTemplate
.
execute
(
SqlUtil
.
joinCreateTableSql
(
dataCollectSetting
.
getToTable
(),
set
));
}
}
...
...
data-collect-server/src/main/java/com/zq/datacollect/service/impl/DataCollectLogServiceImpl.java
View file @
5a3e139e
...
@@ -52,6 +52,27 @@ public class DataCollectLogServiceImpl extends ServiceImpl<DataCollectTaskLogMap
...
@@ -52,6 +52,27 @@ public class DataCollectLogServiceImpl extends ServiceImpl<DataCollectTaskLogMap
}
}
@Override
@Override
public
PageVo
getList
(
DataCollectLogReq
req
,
Integer
id
)
{
LambdaQueryWrapper
<
DataCollectTaskLog
>
wrapper
=
new
LambdaQueryWrapper
<>();
wrapper
.
eq
(
DataCollectTaskLog:
:
getDataCollectSettingId
,
id
);
PageVo
pageVo
=
PagingUtils
.
paging
(
req
,
dataCollectTaskLogMapper
,
wrapper
,
DataCollectTaskLog
.
class
);
List
<
DataCollectTaskLogResp
>
taskLogRespList
=
new
ArrayList
<>(
pageVo
.
getRows
().
size
());
for
(
Object
row
:
pageVo
.
getRows
())
{
DataCollectTaskLog
dataCollectTaskLog
=
(
DataCollectTaskLog
)
row
;
DataCollectSetting
dataCollectSetting
=
dataCollectServiceImpl
.
getById
(
dataCollectTaskLog
.
getDataCollectSettingId
());
if
(
null
==
dataCollectSetting
){
continue
;
}
DataCollectTaskLogResp
resp
=
new
DataCollectTaskLogResp
();
resp
.
setTaskName
(
dataCollectSetting
.
getTaskName
());
BeanUtil
.
copyProperties
(
dataCollectTaskLog
,
resp
);
taskLogRespList
.
add
(
resp
);
}
pageVo
.
setRows
(
taskLogRespList
);
return
pageVo
;
}
@Override
public
List
<
DataCollectFileLog
>
file
(
Integer
id
){
public
List
<
DataCollectFileLog
>
file
(
Integer
id
){
return
dataCollectFileLogMapper
.
selectList
(
new
LambdaQueryWrapper
<
DataCollectFileLog
>().
eq
(
DataCollectFileLog:
:
getDataCollectSettingFileId
,
id
));
return
dataCollectFileLogMapper
.
selectList
(
new
LambdaQueryWrapper
<
DataCollectFileLog
>().
eq
(
DataCollectFileLog:
:
getDataCollectSettingFileId
,
id
));
}
}
...
...
data-collect-server/src/main/java/com/zq/datacollect/service/impl/DataCollectServiceImpl.java
View file @
5a3e139e
...
@@ -43,6 +43,9 @@ public class DataCollectServiceImpl extends ServiceImpl<DataCollectMapper, DataC
...
@@ -43,6 +43,9 @@ public class DataCollectServiceImpl extends ServiceImpl<DataCollectMapper, DataC
@Resource
@Resource
private
DataCollectSettingApiParaMapper
dataCollectSettingApiParaMapper
;
private
DataCollectSettingApiParaMapper
dataCollectSettingApiParaMapper
;
@Resource
private
DataCollectTaskLogMapper
dataCollectTaskLogMapper
;
@Override
@Override
public
PageVo
<
DataCollectSetting
>
list
(
DataCollectReq
req
)
{
public
PageVo
<
DataCollectSetting
>
list
(
DataCollectReq
req
)
{
return
PagingUtils
.
paging
(
req
,
dataCollectMapper
,
new
LambdaQueryWrapper
<
DataCollectSetting
>().
orderByDesc
(
DataCollectSetting:
:
getId
),
DataCollectSetting
.
class
);
return
PagingUtils
.
paging
(
req
,
dataCollectMapper
,
new
LambdaQueryWrapper
<
DataCollectSetting
>().
orderByDesc
(
DataCollectSetting:
:
getId
),
DataCollectSetting
.
class
);
...
@@ -64,26 +67,29 @@ public class DataCollectServiceImpl extends ServiceImpl<DataCollectMapper, DataC
...
@@ -64,26 +67,29 @@ public class DataCollectServiceImpl extends ServiceImpl<DataCollectMapper, DataC
@Override
@Override
@Transactional
@Transactional
public
void
delete
(
Integer
id
){
public
void
delete
(
Integer
id
)
{
DataCollectSetting
dataCollectSetting
=
getById
(
id
);
DataCollectSetting
dataCollectSetting
=
getById
(
id
);
UpdateWrapper
wrapper
=
new
UpdateWrapper
();
UpdateWrapper
wrapper
=
new
UpdateWrapper
();
wrapper
.
eq
(
"data_collect_setting_id"
,
dataCollectSetting
.
getId
());
wrapper
.
eq
(
"data_collect_setting_id"
,
dataCollectSetting
.
getId
());
getDao
(
dataCollectSetting
.
getDataType
()).
delete
(
wrapper
);
getDao
(
dataCollectSetting
.
getDataType
()).
delete
(
wrapper
);
if
(
dataCollectSetting
.
getDataType
()==
3
){
if
(
dataCollectSetting
.
getDataType
()
==
2
)
{
dataCollectSettingFileMapper
.
delete
(
wrapper
);
}
else
if
(
dataCollectSetting
.
getDataType
()
==
3
)
{
dataCollectSettingApiParaMapper
.
delete
(
wrapper
);
dataCollectSettingApiParaMapper
.
delete
(
wrapper
);
}
}
dataCollectTaskLogMapper
.
delete
(
wrapper
);
AssertUtils
.
isTrue
(
removeById
(
id
),
"删除失败"
);
AssertUtils
.
isTrue
(
removeById
(
id
),
"删除失败"
);
}
}
@Override
@Override
@Transactional
@Transactional
public
void
batchDelete
(
List
<
Integer
>
ids
){
public
void
batchDelete
(
List
<
Integer
>
ids
)
{
for
(
Integer
id
:
ids
)
{
for
(
Integer
id
:
ids
)
{
delete
(
id
);
delete
(
id
);
}
}
}
}
public
BaseMapper
getDao
(
int
dataType
){
public
BaseMapper
getDao
(
int
dataType
)
{
switch
(
dataType
)
{
switch
(
dataType
)
{
case
1
:
case
1
:
return
dataCollectSettingDbMapper
;
return
dataCollectSettingDbMapper
;
...
...
data-collect-server/src/main/java/com/zq/datacollect/util/SqlUtil.java
View file @
5a3e139e
...
@@ -7,7 +7,7 @@ public class SqlUtil {
...
@@ -7,7 +7,7 @@ public class SqlUtil {
public
static
String
jointInsertSql
(
String
tableName
,
Set
<
String
>
cloums
){
public
static
String
jointInsertSql
(
String
tableName
,
Set
<
String
>
cloums
){
StringBuilder
fileds
=
new
StringBuilder
();
StringBuilder
fileds
=
new
StringBuilder
();
for
(
String
cloum
:
cloums
)
{
for
(
String
cloum
:
cloums
)
{
fileds
.
append
(
cloum
.
replaceAll
(
"\\p{Punct}"
,
""
)).
append
(
","
);
fileds
.
append
(
cloum
.
replaceAll
(
"\\p{Punct}"
,
""
)
.
replaceAll
(
"("
,
""
).
replaceAll
(
")"
,
""
).
replaceAll
(
"\r"
,
""
).
replaceAll
(
"\n"
,
""
)
).
append
(
","
);
}
}
fileds
.
deleteCharAt
(
fileds
.
length
()-
1
);
fileds
.
deleteCharAt
(
fileds
.
length
()-
1
);
StringBuilder
sql
=
new
StringBuilder
(
"INSERT INTO "
).
append
(
tableName
).
append
(
"("
).
append
(
fileds
).
append
(
") VALUES ("
);
StringBuilder
sql
=
new
StringBuilder
(
"INSERT INTO "
).
append
(
tableName
).
append
(
"("
).
append
(
fileds
).
append
(
") VALUES ("
);
...
@@ -25,7 +25,7 @@ public class SqlUtil {
...
@@ -25,7 +25,7 @@ public class SqlUtil {
public
static
String
joinCreateTableSql
(
String
tableName
,
Set
<
String
>
cloums
){
public
static
String
joinCreateTableSql
(
String
tableName
,
Set
<
String
>
cloums
){
StringBuilder
sql
=
new
StringBuilder
(
"CREATE TABLE "
).
append
(
tableName
).
append
(
"("
);
StringBuilder
sql
=
new
StringBuilder
(
"CREATE TABLE "
).
append
(
tableName
).
append
(
"("
);
for
(
String
cloum
:
cloums
)
{
for
(
String
cloum
:
cloums
)
{
sql
.
append
(
cloum
.
replaceAll
(
"\\p{Punct}"
,
""
)
).
append
(
" VARCHAR(255)
,"
);
sql
.
append
(
cloum
.
replaceAll
(
"\\p{Punct}"
,
""
)
.
replaceAll
(
"("
,
""
).
replaceAll
(
")"
,
""
).
replaceAll
(
"\r"
,
""
).
replaceAll
(
"\n"
,
""
)).
append
(
" TEXT
,"
);
}
}
sql
.
deleteCharAt
(
sql
.
length
()-
1
).
append
(
")"
);
sql
.
deleteCharAt
(
sql
.
length
()-
1
).
append
(
")"
);
return
sql
.
toString
();
return
sql
.
toString
();
...
...
dataoperation-server/src/main/java/com/zq/dataoperation/holder/DatabaseHolder.java
View file @
5a3e139e
...
@@ -22,7 +22,7 @@ public class DatabaseHolder {
...
@@ -22,7 +22,7 @@ public class DatabaseHolder {
switch
(
dbType
)
{
switch
(
dbType
)
{
case
1
:
case
1
:
className
=
"com.mysql.cj.jdbc.Driver"
;
className
=
"com.mysql.cj.jdbc.Driver"
;
url
=
"jdbc:mysql://"
+
dbIp
+
":"
+
dbPort
+
"/"
+
dbName
+
"?characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true"
;
url
=
"jdbc:mysql://"
+
dbIp
+
":"
+
dbPort
+
"/"
+
dbName
+
"?characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8&
rewriteBatchedStatements=true&
autoReconnect=true"
;
break
;
break
;
case
2
:
case
2
:
className
=
"oracle.jdbc.driver.OracleDriver"
;
className
=
"oracle.jdbc.driver.OracleDriver"
;
...
...
dataoperation-server/src/main/java/com/zq/dataoperation/service/CommonQueryService.java
View file @
5a3e139e
...
@@ -6,6 +6,7 @@ import cn.hutool.json.JSONUtil;
...
@@ -6,6 +6,7 @@ import cn.hutool.json.JSONUtil;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.zq.common.context.ThreadContext
;
import
com.zq.common.context.ThreadContext
;
import
com.zq.common.exception.BusinessException
;
import
com.zq.common.utils.AssertUtils
;;
import
com.zq.common.utils.AssertUtils
;;
import
com.zq.common.vo.PageVo
;
import
com.zq.common.vo.PageVo
;
import
com.zq.common.vo.ResultVo
;
import
com.zq.common.vo.ResultVo
;
...
@@ -49,6 +50,7 @@ public class CommonQueryService extends ServiceImpl<CommonQuerySettingDao, Commo
...
@@ -49,6 +50,7 @@ public class CommonQueryService extends ServiceImpl<CommonQuerySettingDao, Commo
}
}
public
ResultVo
addDatasource
(
QueryDb
queryDb
)
{
public
ResultVo
addDatasource
(
QueryDb
queryDb
)
{
queryDb
.
setCreateTime
(
DateUtil
.
date
());
AssertUtils
.
isTrue
(
queryDbDao
.
insert
(
queryDb
)
==
1
,
"添加失败,请检查后重试"
);
AssertUtils
.
isTrue
(
queryDbDao
.
insert
(
queryDb
)
==
1
,
"添加失败,请检查后重试"
);
DatabaseHolder
.
add
(
queryDb
.
getDbType
(),
queryDb
.
getDbIp
(),
queryDb
.
getDbPort
(),
queryDb
.
getDbName
(),
queryDb
.
getUsername
(),
queryDb
.
getPassword
(),
queryDb
.
getId
());
DatabaseHolder
.
add
(
queryDb
.
getDbType
(),
queryDb
.
getDbIp
(),
queryDb
.
getDbPort
(),
queryDb
.
getDbName
(),
queryDb
.
getUsername
(),
queryDb
.
getPassword
(),
queryDb
.
getId
());
return
ResultVo
.
success
();
return
ResultVo
.
success
();
...
@@ -93,14 +95,22 @@ public class CommonQueryService extends ServiceImpl<CommonQuerySettingDao, Commo
...
@@ -93,14 +95,22 @@ public class CommonQueryService extends ServiceImpl<CommonQuerySettingDao, Commo
}
}
public
Object
checkConnect
(
QueryDb
queryDb
)
{
public
Object
checkConnect
(
QueryDb
queryDb
)
{
QueryDb
queryDb1
=
queryDbDao
.
selectById
(
queryDb
.
getId
());
String
url
=
null
;
String
jdbcUrl
=
queryDb1
.
getDbIp
();
switch
(
queryDb
.
getDbType
())
{
try
{
case
1
:
return
SqlUtils
.
testConnection
(
jdbcUrl
,
queryDb1
.
getUsername
(),
queryDb1
.
getPassword
());
url
=
"jdbc:mysql://"
+
queryDb
.
getDbIp
()
+
":"
+
queryDb
.
getDbPort
()
+
"/"
+
queryDb
.
getDbName
()
+
"?characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true"
;
}
catch
(
Exception
e
)
{
break
;
log
.
error
(
e
.
getMessage
());
case
2
:
return
false
;
url
=
"jdbc:oracle:thin:@//"
+
queryDb
.
getDbIp
()
+
":"
+
queryDb
.
getDbPort
()
+
"/"
+
queryDb
.
getDbName
();
break
;
case
3
:
url
=
"jdbc:sqlserver://"
+
queryDb
.
getDbIp
()
+
":"
+
queryDb
.
getDbPort
()
+
"/"
+
queryDb
.
getDbName
();
break
;
default
:
throw
new
BusinessException
(
"不支持的数据库"
);
}
}
AssertUtils
.
isTrue
(
SqlUtils
.
testConnection
(
url
,
queryDb
.
getUsername
(),
queryDb
.
getPassword
()),
"连接失败"
);
return
true
;
}
}
public
List
<
Map
<
String
,
Object
>>
runSelect
(
Map
<
String
,
Object
>
body
)
throws
Exception
{
public
List
<
Map
<
String
,
Object
>>
runSelect
(
Map
<
String
,
Object
>
body
)
throws
Exception
{
...
...
flow-component/src/main/java/com/zq/spiderflow/datacollision/executor/DataCollisionExecutor.java
View file @
5a3e139e
package
com
.
zq
.
spiderflow
.
datacollision
.
executor
;
package
com
.
zq
.
spiderflow
.
datacollision
.
executor
;
import
cn.hutool.core.collection.CollectionUtil
;
import
cn.hutool.core.map.MapUtil
;
import
cn.hutool.core.map.MapUtil
;
import
cn.hutool.core.util.StrUtil
;
import
cn.hutool.core.util.StrUtil
;
import
cn.hutool.json.JSONArray
;
import
cn.hutool.json.JSONObject
;
import
cn.hutool.json.JSONUtil
;
import
com.zq.common.exception.BusinessException
;
import
com.zq.common.exception.BusinessException
;
import
com.zq.spiderflow.context.SpiderContext
;
import
com.zq.spiderflow.context.SpiderContext
;
import
com.zq.spiderflow.executor.ShapeExecutor
;
import
com.zq.spiderflow.executor.ShapeExecutor
;
...
@@ -10,17 +14,13 @@ import com.zq.spiderflow.model.SpiderNode;
...
@@ -10,17 +14,13 @@ import com.zq.spiderflow.model.SpiderNode;
import
com.zq.spiderflow.model.SpiderOutput
;
import
com.zq.spiderflow.model.SpiderOutput
;
import
org.springframework.stereotype.Component
;
import
org.springframework.stereotype.Component
;
import
java.util.ArrayList
;
import
java.util.*
;
import
java.util.List
;
import
java.util.Map
;
@Component
@Component
public
class
DataCollisionExecutor
implements
ShapeExecutor
{
public
class
DataCollisionExecutor
implements
ShapeExecutor
{
public
static
final
String
TABLE1
=
"table1"
;
public
static
final
String
FIELD1
=
"field1"
;
public
static
final
String
COLLISION
=
"collision"
;
public
static
final
String
TABLE2
=
"table2"
;
public
static
final
String
FIELD2
=
"field2"
;
public
static
final
String
RESERVE
=
"reserve"
;
public
static
final
String
RESERVE
=
"reserve"
;
@Override
@Override
...
@@ -40,53 +40,60 @@ public class DataCollisionExecutor implements ShapeExecutor {
...
@@ -40,53 +40,60 @@ public class DataCollisionExecutor implements ShapeExecutor {
@Override
@Override
public
void
execute
(
SpiderNode
node
,
SpiderContext
context
,
Map
<
String
,
Object
>
variables
)
throws
Exception
{
public
void
execute
(
SpiderNode
node
,
SpiderContext
context
,
Map
<
String
,
Object
>
variables
)
throws
Exception
{
String
table1
=
null
;
JSONArray
collisionArray
=
JSONUtil
.
parseArray
(
node
.
getStringJsonValue
(
COLLISION
));
String
table2
=
null
;
LinkedHashSet
<
Map
<
String
,
Object
>>
results
=
new
LinkedHashSet
<>();
String
field1
=
null
;
String
field2
=
null
;
try
{
table1
=
node
.
getStringJsonValue
(
TABLE1
);
table2
=
node
.
getStringJsonValue
(
TABLE2
);
field1
=
node
.
getStringJsonValue
(
FIELD1
);
field2
=
node
.
getStringJsonValue
(
FIELD2
);
}
catch
(
Exception
e
){
throw
new
BusinessException
(
"不是字符串"
);
}
if
(
StrUtil
.
isBlank
(
table1
)){
for
(
Object
o
:
collisionArray
)
{
throw
new
BusinessException
(
"没有表1"
);
JSONObject
jsonObject
=
JSONUtil
.
parseObj
(
o
);
}
String
table1
=
jsonObject
.
getStr
(
"table1"
);
if
(
StrUtil
.
isBlank
(
table2
)){
String
field1
=
jsonObject
.
getStr
(
"field1"
);
throw
new
BusinessException
(
"没有表2"
);
String
condition
=
jsonObject
.
getStr
(
"condition"
);
}
String
table2
=
jsonObject
.
getStr
(
"table2"
);
if
(
StrUtil
.
isBlank
(
field1
)){
String
field2
=
jsonObject
.
getStr
(
"field2"
);
throw
new
BusinessException
(
"没有字段1"
);
String
logic
=
jsonObject
.
getStr
(
"logic"
,
"2"
);
}
if
(
StrUtil
.
isBlank
(
field2
)){
throw
new
BusinessException
(
"没有字段2"
);
}
List
<
Map
<
String
,
Object
>>
list1
=
(
List
<
Map
<
String
,
Object
>>)
variables
.
get
(
table1
);
List
<
Map
<
String
,
Object
>>
list1
=
(
List
<
Map
<
String
,
Object
>>)
variables
.
get
(
table1
);
List
<
Map
<
String
,
Object
>>
list2
=
(
List
<
Map
<
String
,
Object
>>)
variables
.
get
(
table2
);
List
<
Map
<
String
,
Object
>>
list2
=
(
List
<
Map
<
String
,
Object
>>)
variables
.
get
(
table2
);
Set
<
Map
<
String
,
Object
>>
temp
=
new
HashSet
<>();
if
(
list1
==
null
){
for
(
Map
<
String
,
Object
>
map1
:
list1
)
{
throw
new
BusinessException
(
"表1没有数据"
);
String
field1Str
=
map1
.
get
(
field1
).
toString
();
}
for
(
Map
<
String
,
Object
>
map2
:
list2
)
{
if
(
list2
==
null
){
String
field2Str
=
map2
.
get
(
field2
).
toString
();
throw
new
BusinessException
(
"表2没有数据"
);
switch
(
condition
)
{
}
case
"1"
:
if
(
field1Str
.
equals
(
field2Str
)){
List
<
Map
<
String
,
Object
>>
results
=
new
ArrayList
<>();
map1
.
putAll
(
map2
);
for
(
Map
<
String
,
Object
>
map1
:
list1
)
{
temp
.
add
(
map1
);
String
field1Str
=
map1
.
get
(
field1
).
toString
();
}
for
(
Map
<
String
,
Object
>
map2
:
list2
)
{
break
;
String
field2Str
=
map2
.
get
(
field2
).
toString
();
case
"2"
:
if
(
field1Str
.
equals
(
field2Str
)){
if
(!
field1Str
.
equals
(
field2Str
)){
map1
.
putAll
(
map2
);
map1
.
putAll
(
map2
);
results
.
add
(
map1
);
temp
.
add
(
map1
);
break
;
}
break
;
case
"3"
:
if
(
field1Str
.
contains
(
field2Str
)){
map1
.
putAll
(
map2
);
temp
.
add
(
map1
);
}
break
;
case
"4"
:
if
(!
field1Str
.
contains
(
field2Str
)){
map1
.
putAll
(
map2
);
temp
.
add
(
map1
);
}
break
;
}
}
}
}
}
if
(
logic
.
equals
(
"1"
)){
results
.
retainAll
(
temp
);
}
else
{
results
.
addAll
(
temp
);
}
}
}
variables
.
put
(
node
.
getNodeId
()
+
"_"
+
node
.
getNodeName
(),
results
);
variables
.
put
(
node
.
getNodeId
()
+
"_"
+
node
.
getNodeName
(),
results
);
...
...
flow-component/src/main/java/com/zq/spiderflow/excelremoveduplicate/executor/ExcelRemoveDuplicateExecutor.java
View file @
5a3e139e
This diff is collapsed.
Click to expand it.
flow-component/src/main/java/com/zq/spiderflow/flowcall/executor/FlowCallExecutor.java
View file @
5a3e139e
This diff is collapsed.
Click to expand it.
spider-flow-api/src/main/java/com/zq/spiderflow/model/SpiderNode.java
View file @
5a3e139e
...
@@ -86,6 +86,10 @@ public class SpiderNode {
...
@@ -86,6 +86,10 @@ public class SpiderNode {
return
value
;
return
value
;
}
}
public
Object
getObjectJsonValue
(
String
key
){
return
this
.
jsonProperty
.
get
(
key
);
}
public
String
getStringJsonValue
(
String
key
,
String
defaultValue
){
public
String
getStringJsonValue
(
String
key
,
String
defaultValue
){
String
value
=
getStringJsonValue
(
key
);
String
value
=
getStringJsonValue
(
key
);
return
StringUtils
.
isNotBlank
(
value
)
?
value
:
defaultValue
;
return
StringUtils
.
isNotBlank
(
value
)
?
value
:
defaultValue
;
...
...
spider-flow-core/src/main/java/com/zq/spiderflow/core/Spider.java
View file @
5a3e139e
This diff is collapsed.
Click to expand it.
spider-flow-web/src/main/java/com/zq/spiderflow/websocket/WebSocketEditorServer.java
View file @
5a3e139e
...
@@ -38,24 +38,24 @@ public class WebSocketEditorServer {
...
@@ -38,24 +38,24 @@ public class WebSocketEditorServer {
context
.
setDebug
(
isDebug
);
context
.
setDebug
(
isDebug
);
context
.
setRunning
(
true
);
context
.
setRunning
(
true
);
String
flowId
=
event
.
getString
(
"flowId"
);
String
flowId
=
event
.
getString
(
"flowId"
);
if
(
StrUtil
.
isBlank
(
flowId
))
{
if
(
StrUtil
.
isBlank
(
flowId
))
{
context
.
write
(
new
WebSocketEvent
<>(
"error"
,
"flowId不能为空!"
));
context
.
write
(
new
WebSocketEvent
<>(
"error"
,
"flowId不能为空!"
));
}
}
context
.
setFlowId
(
flowId
);
context
.
setFlowId
(
flowId
);
// new Thread(() -> {
// new Thread(() -> {
String
xml
=
event
.
getString
(
"message"
);
String
xml
=
event
.
getString
(
"message"
);
if
(
xml
!=
null
)
{
if
(
xml
!=
null
)
{
spider
.
runWithTest
(
SpiderFlowUtils
.
loadXMLFromString
(
xml
),
context
);
spider
.
runWithTest
(
SpiderFlowUtils
.
loadXMLFromString
(
xml
),
context
);
context
.
write
(
new
WebSocketEvent
<>(
"finish"
,
null
));
context
.
write
(
new
WebSocketEvent
<>(
"finish"
,
null
));
}
else
{
}
else
{
context
.
write
(
new
WebSocketEvent
<>(
"error"
,
"xml不正确!"
));
context
.
write
(
new
WebSocketEvent
<>(
"error"
,
"xml不正确!"
));
}
}
context
.
setRunning
(
false
);
context
.
setRunning
(
false
);
// }).start();
// }).start();
}
else
if
(
"stop"
.
equals
(
eventType
)
&&
context
!=
null
)
{
}
else
if
(
"stop"
.
equals
(
eventType
)
&&
context
!=
null
)
{
context
.
setRunning
(
false
);
context
.
setRunning
(
false
);
context
.
stop
();
context
.
stop
();
}
else
if
(
"resume"
.
equalsIgnoreCase
(
eventType
)
&&
context
!=
null
)
{
}
else
if
(
"resume"
.
equalsIgnoreCase
(
eventType
)
&&
context
!=
null
)
{
context
.
resume
();
context
.
resume
();
}
}
}
}
...
...
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