Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

更新数据API前端报错问题 #1123

Open
wants to merge 3,553 commits into
base: branch-1.1.2
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
3553 commits
Select commit Hold shift + click to select a range
d28bd26
Merge remote-tracking branch 'origin/dev-1.1.12' into dev-1.1.12
zqburde Apr 3, 2023
1c404ad
Merge remote-tracking branch 'origin/dev-1.1.11' into dev-1.1.12
zqburde Apr 3, 2023
86a4b25
absolve error message
yuankang134 Apr 3, 2023
2fb5eda
Modify get clear cs task cron.
zqburde Apr 3, 2023
f937b32
absolve error message
yuankang134 Apr 3, 2023
f8acbfc
default max picture size
yynied Apr 4, 2023
73f2aae
添加dss-server
HmhWz Apr 6, 2023
511dc14
Merge branch 'dev-1.1.12' of https://github.com/WeDataSphere/DataSphe…
HmhWz Apr 6, 2023
5eabbda
Workspace administrator permission optimization
yuankang134 Apr 7, 2023
2556e70
Add monitor task of orchestrator convert job.
zqburde Apr 7, 2023
4824565
Merge remote-tracking branch 'origin/dev-1.1.12' into dev-1.1.12
zqburde Apr 7, 2023
318cb88
Merge remote-tracking branch 'origin/dev-1.1.11' into dev-1.1.12
zqburde Apr 7, 2023
e8bc2b3
revert sendemailcheck commit
Apr 7, 2023
0c40d26
修改链接 & fix bugs
demonray Apr 10, 2023
2e54543
fix
htyredc Apr 10, 2023
13851d3
Modify monitor task of orchestrator convert job.
zqburde Apr 10, 2023
e305f05
Extract common parts to check if the task is alive.
zqburde Apr 10, 2023
c46b90f
Add monitor job execute task.
zqburde Apr 11, 2023
4f6c142
add SendEmailCheck to SendEmailAppConnConfiguration
Apr 11, 2023
8f22008
Add monitor job copy task.
zqburde Apr 11, 2023
9bb0e9a
add checkdata to PictureEmailContentParser
Apr 11, 2023
cb26392
Add alter class.
zqburde Apr 11, 2023
4e77644
change checkdata to checkData
Apr 12, 2023
01dacf4
Modify CheckOrchestratorCopyTask.
zqburde Apr 13, 2023
a5fa8eb
Merge remote-tracking branch 'origin/dev-1.1.11' into dev-1.1.12
zqburde Apr 13, 2023
c13c24b
add sendemail to linkis-engineconn.properties log4j2.xml
Apr 13, 2023
8f95a33
Merge branch 'dev-1.1.11' of github.com:WeDataSphere/DataSphereStudio…
demonray Apr 13, 2023
b69375d
修改链接 & fix bugs
demonray Apr 10, 2023
5562771
param validate
yuankang134 Apr 13, 2023
ff9c553
fix bug.
HmhWz Apr 13, 2023
e92c28a
Merge branch 'dev-1.1.12' of https://github.com/WeDataSphere/DataSphe…
HmhWz Apr 13, 2023
9827eca
Add common alter interface and modify monitor task.
zqburde Apr 14, 2023
73156ae
Merge remote-tracking branch 'origin/dev-1.1.12' into dev-1.1.12
zqburde Apr 14, 2023
c528578
Delete unuseful class.
zqburde Apr 14, 2023
3e3141c
Delete unuseful class.
zqburde Apr 14, 2023
4540476
workspace privilege validate
yuankang134 Apr 14, 2023
ab6d106
Merge remote-tracking branch 'origin/dev-1.1.12' into dev-1.1.12
yuankang134 Apr 14, 2023
adabedc
Add altertype in alter.
zqburde Apr 14, 2023
8c33b4d
Merge remote-tracking branch 'origin/dev-1.1.12' into dev-1.1.12
zqburde Apr 14, 2023
ad78468
add privilege validation when add user to workspace
yuankang134 Apr 14, 2023
0200493
set updateUser and updateTime
yuankang134 Apr 14, 2023
9a780d5
Add alter in monitor task.
zqburde Apr 14, 2023
1f9528b
Merge remote-tracking branch 'origin/dev-1.1.12' into dev-1.1.12
zqburde Apr 14, 2023
f240c36
Add alter in monitor task.
zqburde Apr 14, 2023
d3add41
Add CustomAlterServiceImpl in AlterConfiguration.
zqburde Apr 14, 2023
86d9b5d
Delete unuseful code.
zqburde Apr 14, 2023
67531eb
Fix bug.
zqburde Apr 14, 2023
ce87bf3
modify DSSSenderServiceFactory.service.
HmhWz Apr 14, 2023
68f1e3d
Fix npe.
zqburde Apr 15, 2023
6253647
Merge remote-tracking branch 'origin/dev-1.1.12' into dev-1.1.12
zqburde Apr 15, 2023
04f4251
Fix sql bug.
zqburde Apr 16, 2023
88dab18
Fix sql bug.
zqburde Apr 16, 2023
300a1e8
User Permission Cleanup
wxyn Apr 17, 2023
fc8dd76
Merge branch 'dev-1.1.11-czb' into dev-1.1.12
Apr 17, 2023
1f8af25
Merge remote-tracking branch 'origin/dev-1.1.12' into dev-1.1.12
wxyn Apr 17, 2023
b6b7656
add check image size switch
yynied Apr 17, 2023
890781d
fix:User Permission Cleanup
wxyn Apr 17, 2023
33f1861
Merge branch 'dev-1.1.12' of https://github.com/WeDataSphere/DataSphe…
wxyn Apr 17, 2023
03d8c85
Adapt to all check tasks.
zqburde Apr 17, 2023
14cc4f0
Merge remote-tracking branch 'origin/dev-1.1.12' into dev-1.1.12
zqburde Apr 17, 2023
3b6601e
Merge remote-tracking branch 'origin/dev-1.1.11' into dev-1.1.12
zqburde Apr 17, 2023
c3cc032
check user operate validate
yuankang134 Apr 17, 2023
7bcfd7d
add getRequestFrameworkConvertOrchestration().
HmhWz Apr 17, 2023
802db77
Merge branch 'dev-1.1.12' of https://github.com/WeDataSphere/DataSphe…
HmhWz Apr 17, 2023
6ec6cd6
Modify Alter.
zqburde Apr 18, 2023
7636213
change role_id alias
wxyn Apr 18, 2023
89d9947
Update version 1.1.12 sql.
zqburde Apr 18, 2023
b9391cd
Merge remote-tracking branch 'origin/dev-1.1.12' into dev-1.1.12
zqburde Apr 18, 2023
3e46f1c
v1.1.12
demonray Apr 19, 2023
d6d2732
add getRequestFrameworkConvertOrchestrationStatus method that can be …
HmhWz Apr 19, 2023
8e55f16
Merge branch 'dev-1.1.12' of https://github.com/WeDataSphere/DataSphe…
HmhWz Apr 19, 2023
89b2a8d
Delete orchestrator convert cache.
zqburde Apr 20, 2023
5216981
Merge remote-tracking branch 'origin/dev-1.1.12' into dev-1.1.12
zqburde Apr 20, 2023
081b0c0
Modify orchestrator convert job id to UUID.
zqburde Apr 20, 2023
09c4500
Modify table dss_orchestrator_job_inf job_id to varchar.
zqburde Apr 20, 2023
453389f
change RequestMethod
wxyn Apr 20, 2023
9bd937f
add pageInfo
htyredc Apr 20, 2023
7d6a852
Fix convert orchestrator status bug.
zqburde Apr 20, 2023
f91b8cc
Merge remote-tracking branch 'origin/dev-1.1.12' into dev-1.1.12
zqburde Apr 20, 2023
b6d6d6f
Fix convert orchestrator status bug.
zqburde Apr 20, 2023
ab4c80f
change RequestMethod
wxyn Apr 20, 2023
1136fde
Merge branch 'dev-1.1.12' of https://github.com/WeDataSphere/DataSphe…
wxyn Apr 20, 2023
fc17817
Add new parameter CURRENT_DSS_SERVER_NAME.
zqburde Apr 20, 2023
2150a15
add pageInfo
htyredc Apr 20, 2023
cc786ff
Merge remote-tracking branch 'origin/dev-1.1.12' into dev-1.1.12
wxyn Apr 20, 2023
2e1a79b
add two fields to dss_workspace_user_role
yuankang134 Apr 20, 2023
0706bea
Modify Integer to Long.
zqburde Apr 20, 2023
c01c0ac
Merge remote-tracking branch 'origin/dev-1.1.12' into dev-1.1.12
zqburde Apr 20, 2023
6c64891
Remove dept list log
wxyn Apr 20, 2023
a3a9a73
Merge remote-tracking branch 'origin/dev-1.1.12' into dev-1.1.12
wxyn Apr 20, 2023
27f634f
Merge branch 'dev-1.1.12' of github.com:WeDataSphere/DataSphereStudio…
demonray Apr 21, 2023
9ad0679
engine kill history
demonray Apr 21, 2023
129a953
add workspace admin allowed update self normal privilege
yuankang134 Apr 21, 2023
ca36ee5
Add log.
zqburde Apr 21, 2023
305af41
Merge remote-tracking branch 'origin/dev-1.1.12' into dev-1.1.12
zqburde Apr 21, 2023
3791f24
add pageInfo
htyredc Apr 21, 2023
c0bf80b
Prompt for cleaning results for non real name users
wxyn Apr 21, 2023
5b2f25b
Add the loading mode of the legacy configuration
HmhWz Apr 21, 2023
62183f7
Merge branch 'dev-1.1.12' of https://github.com/WeDataSphere/DataSphe…
HmhWz Apr 21, 2023
8b79d11
Modify DSS-WORKFLOW-SERVER to DSS-SERVER.
zqburde Apr 22, 2023
04e7dc5
Merge branch 'dev-1.1.12' of github.com:WeDataSphere/DataSphereStudio…
demonray Apr 23, 2023
f18d850
Optimize code.
HmhWz Apr 23, 2023
dc4e548
Update getCron method.
zqburde Apr 23, 2023
ef8ef33
add ec kill period conf
htyredc Apr 24, 2023
aa3505b
fix user select
yuankang134 Apr 24, 2023
ce2b82f
rpc bug fix.
HmhWz Apr 25, 2023
079935e
Merge branch 'dev-1.1.12' of https://github.com/WeDataSphere/DataSphe…
HmhWz Apr 25, 2023
efe099e
update workspace role check
yuankang134 Apr 27, 2023
914842a
user auto join workspace add updatetime and updateuser
yuankang134 Apr 27, 2023
a24904b
add bean for user role check
yuankang134 Apr 27, 2023
1defa45
add a config to use appconn client mode.
HmhWz Apr 27, 2023
8153558
Merge branch 'dev-1.1.12' of https://github.com/WeDataSphere/DataSphe…
HmhWz Apr 27, 2023
cd58db6
Add precheck if project exists in schedulis when publish workflow.
HmhWz Apr 27, 2023
4eeb3ce
fix inject bean error
yuankang134 Apr 27, 2023
6199311
bug fix
HmhWz Apr 27, 2023
9929e4f
Merge branch 'dev-1.1.12' of https://github.com/WeDataSphere/DataSphe…
HmhWz Apr 27, 2023
1731570
Only dss-server-dev need load appconn in AppConnManagerRestfulApi.ini…
HmhWz Apr 27, 2023
415b5ac
Add orchestrator convert exception message.
zqburde Apr 27, 2023
26cf72d
Add error_msg in table dss_orchestrator_job_info.
zqburde Apr 27, 2023
c46fc74
fix: engine list search & fix bugs
demonray May 4, 2023
6b8fe8f
fix inject bean error
yuankang134 May 4, 2023
4f929de
fix: error message of copy porject
demonray May 4, 2023
bb23bf1
Merge branch 'dev-1.1.12' of github.com:WeDataSphere/DataSphereStudio…
demonray May 4, 2023
9b8172e
fix inject bean error
yuankang134 May 4, 2023
5bf48ff
Fix code smell.
zqburde May 4, 2023
e31beb2
Fix code smell.
zqburde May 4, 2023
86cc3cf
DSSConfiguration load config bug.
HmhWz May 5, 2023
79a01ab
Merge branch 'dev-1.1.12' of https://github.com/WeDataSphere/DataSphe…
HmhWz May 5, 2023
b9a0449
fix inject bean error
yuankang134 May 5, 2023
89a7e4b
Modify object to json in OrchestratorPluginServiceImpl.
zqburde May 5, 2023
e75cc89
Check if there are any running tasks for the service when starting it
zqburde May 6, 2023
b2cf0b7
Code Optimized.
HmhWz May 6, 2023
218db36
Merge branch 'dev-1.1.12' of https://github.com/WeDataSphere/DataSphe…
HmhWz May 6, 2023
31f9e3c
Optimize prompt.
HmhWz May 8, 2023
e9d1389
Verification of specific token access permissions
wxyn May 8, 2023
63ada80
Merge branch 'dev-1.1.12' of https://github.com/WeDataSphere/DataSphe…
wxyn May 8, 2023
4ec200c
fix bug.
HmhWz May 8, 2023
328b363
fix: Verification of specific token access permissions
wxyn May 9, 2023
5fcafa4
Modify salve node upload appconn.
zqburde May 9, 2023
2a668c2
Check if there are any running tasks for the service when start it.
zqburde May 10, 2023
b5270e9
modify hpms token config
wxyn May 10, 2023
a0b8f46
Check if there are any running tasks for the service when start it.
zqburde May 10, 2023
eeb9973
Merge remote-tracking branch 'origin/dev-1.1.12' into dev-1.1.12
zqburde May 10, 2023
f7edf78
fix bug.
zqburde May 10, 2023
ddf06cd
fix bug.
zqburde May 10, 2023
6645758
Delete unuseful code.
zqburde May 10, 2023
c4b6b8c
Fix bug.
zqburde May 10, 2023
aec6176
add EC_KILL_STRATEGY audit target type enum+
htyredc May 10, 2023
c84cf34
fix: 终止条件校验&告警信息展示优化&fix bug
demonray May 10, 2023
23e70f7
Fix bug.
zqburde May 11, 2023
3e9aca7
Fix save subflow bug.
zqburde May 11, 2023
41467ef
datachecker 支持 qualitis
htyredc May 13, 2023
4f3b8e2
fix
htyredc May 13, 2023
3db2b04
fix NPE
wxyn May 16, 2023
e31f3ae
datachecker 支持 qualitis v2
htyredc May 17, 2023
69617d6
datachecker 支持 qualitis v3
htyredc May 22, 2023
e72853b
Fix bug.
zqburde May 22, 2023
11b3141
Fix bug.
zqburde May 22, 2023
0c64130
add migrate-server dependency to dss-server.
HmhWz May 23, 2023
ad5de03
Merge branch 'dev-1.1.12' of https://github.com/WeDataSphere/DataSphe…
HmhWz May 23, 2023
2fcd605
datachecker 支持 qualitis v4
htyredc May 23, 2023
23aca18
datachecker 支持 qualitis v5
htyredc May 23, 2023
d90ae77
fix bug for the getSender() in migrate-server.
HmhWz May 23, 2023
c0bdc67
Merge branch 'dev-1.1.12' of https://github.com/WeDataSphere/DataSphe…
HmhWz May 23, 2023
d0585c4
fix bug for the getSender() in migrate-server.
HmhWz May 23, 2023
7a08440
datachecker 支持 qualitis v6
htyredc May 23, 2023
ee01a47
datachecker 支持 qualitis v7
htyredc May 23, 2023
248a411
datachecker 支持 qualitis v8
htyredc May 24, 2023
4595247
fix: reopen script file when unsave & refresh folder...
demonray May 24, 2023
729eeec
Merge branch 'dev-1.1.12' of github.com:WeDataSphere/DataSphereStudio…
demonray May 24, 2023
88c8298
add isReal field to judge privilege
yuankang134 May 24, 2023
049d16a
roll back isReal field
yuankang134 May 24, 2023
b5fb3f5
roll back isReal field
yuankang134 May 24, 2023
7a15324
datachecker 支持 qualitis v9
htyredc May 29, 2023
e5d627a
appconn 未加载完时,不要包NPE
htyredc May 30, 2023
ed785ad
modify the default value of hpms token
wxyn May 30, 2023
3a1c87f
Merge remote-tracking branch 'origin/dev-1.1.12' into dev-1.1.12
wxyn May 30, 2023
85419b0
delete unused code
htyredc May 31, 2023
962c301
datachecker 支持 qualitis v10
htyredc May 31, 2023
749edad
datachecker 支持 qualitis v10
htyredc Jun 1, 2023
f057ead
Merge remote-tracking branch 'origin/dev-1.1.12'
zqburde Jun 19, 2023
35bb43e
Modify version to 1.1.2.
zqburde Jun 20, 2023
c8a8e18
Adopt to Linkis 1.4.0.
zqburde Jun 20, 2023
26f2722
Adopt to Linkis 1.4.0.
zqburde Jun 21, 2023
a7dcd15
Delete unuseful server when package.
zqburde Jun 21, 2023
3d44331
babel-plugin-transform-remove-console
demonray Jun 26, 2023
b47ff72
Update scala version to 2.12.17
zqburde Jun 28, 2023
6c7abcb
Merge remote-tracking branch 'origin/master'
zqburde Jun 28, 2023
6a27487
Adopt scala 2.12.x
zqburde Jun 30, 2023
bba75d0
Add get notice feature.
zqburde Jul 4, 2023
acd8bbf
Resume feature about adapting to create workflow when have not schedu…
zqburde Jul 4, 2023
2c7eecf
Modify interface /dss/guide/query to /dss/guide/queryguide
zqburde Jul 4, 2023
a729485
Fix bug
zqburde Jul 4, 2023
a1be0be
添加demo
demonray Jul 5, 2023
d130557
Adapt to Linkis spring version.
zqburde Jul 5, 2023
d08c8d0
Update config.
zqburde Jul 5, 2023
6a9cd4b
Update sql.
zqburde Jul 5, 2023
161dd28
Fix bug.
zqburde Jul 5, 2023
b4f2d51
Delete unuseful config.
zqburde Jul 5, 2023
b6b4747
Modify config.
zqburde Jul 5, 2023
fd68934
feat: sparketl package
demonray Jul 6, 2023
ccf7a01
fix: 屏蔽开源环境不存在的功能
demonray Jul 6, 2023
02b17e0
remove the Notice to Workspace
Jul 7, 2023
44d7936
Fix bug.
zqburde Jul 7, 2023
b6412c4
Merge pull request #941 from yhdup/branch-1.1.0
zqburde Jul 24, 2023
05ef698
Merge pull request #1099 from WeBankFinTech/branch-1.1.0
zqburde Jul 25, 2023
addf94b
Merge pull request #7 from WeDataSphere/1.1.2-ryanlei
zqburde Jul 25, 2023
29b2f8e
Merge branch 'dev-1.1.2' into master
demonray Jul 25, 2023
d90081b
Merge pull request #1100 from WeDataSphere/master
zqburde Jul 25, 2023
a28c09c
Fix bug.
zqburde Jul 25, 2023
256fca1
开源测试发现的问题
demonray Jul 26, 2023
6052c75
Merge branch '1.1.2-ryanlei'
demonray Jul 26, 2023
092ce20
Revert "datachecker 支持 qualitis v10"
zqburde Jul 27, 2023
75dfec4
Revert "datachecker 支持 qualitis v10"
zqburde Jul 27, 2023
dcd4fd2
Revert "datachecker 支持 qualitis v9"
zqburde Jul 27, 2023
32a25ea
Revert "datachecker 支持 qualitis v8"
zqburde Jul 27, 2023
4b3418b
Revert "datachecker 支持 qualitis v7"
zqburde Jul 27, 2023
66d7cfe
Revert "datachecker 支持 qualitis v6"
zqburde Jul 27, 2023
08bd715
Revert "datachecker 支持 qualitis v5"
zqburde Jul 27, 2023
421368c
Revert "datachecker 支持 qualitis v4"
zqburde Jul 27, 2023
bac027a
Revert "datachecker 支持 qualitis v3"
zqburde Jul 27, 2023
6d117d8
Revert "datachecker 支持 qualitis v2"
zqburde Jul 27, 2023
e0003c7
Revert "datachecker 支持 qualitis"
zqburde Jul 27, 2023
bff9e40
Add sparketl appconn
zqburde Jul 27, 2023
ffbb9c8
Fix sql bug.
zqburde Jul 27, 2023
055d3ef
check update
demonray Jul 28, 2023
91695bd
Merge branch '1.1.2-ryanlei'
demonray Jul 28, 2023
4806cf9
version 1.1.2
demonray Jul 28, 2023
0d36196
Fix install question.
zqburde Jul 28, 2023
35ded6c
Fix build question.
zqburde Jul 30, 2023
988ffec
Fix install question.
zqburde Jul 30, 2023
8e3c48b
Add links check whitelist.
zqburde Aug 2, 2023
5244a51
fix version error
demonray Aug 2, 2023
df9c651
Optimize install script
zqburde Aug 3, 2023
dc07e70
Merge pull request #1027 from dachn/dolphinSchedulerAppConn-patch-del
zqburde Aug 3, 2023
65a4f6e
Update Linkis version to 1.4.0 and delete unuseful module dss-gateway…
zqburde Aug 7, 2023
7c38a68
Optimize script
zqburde Aug 8, 2023
c0ed746
Merge pull request #1101 from WeDataSphere/master
zqburde Aug 9, 2023
426069e
Merge pull request #1102 from WeBankFinTech/dev-1.1.2
zqburde Aug 9, 2023
c26b11b
support AppConn2Linkis node type.
wushengyeyouya Aug 11, 2023
e2ddaf1
support to execute bml2linkis node type.
wushengyeyouya Aug 11, 2023
35f4505
support to execute appconn2linkis node type.
wushengyeyouya Aug 11, 2023
92939fb
support to execute AppConn2Linkis and bml2linkis node type.
wushengyeyouya Aug 11, 2023
d9ebbc9
SparkEtl AppConn optimization, support to query jumpUrl.
wushengyeyouya Aug 11, 2023
38a8fb6
Merge remote-tracking branch 'origin/master'
wushengyeyouya Aug 11, 2023
17e5e4d
Update build.yml
demonray Aug 11, 2023
0b60a99
Delete unuseful code.
zqburde Aug 17, 2023
86944b3
Merge pull request #1105 from WeDataSphere/master
zqburde Aug 17, 2023
2cb3cbe
Merge pull request #1106 from WeBankFinTech/master
zqburde Aug 17, 2023
0289e6c
更新数据API前端报错问题
Jan 18, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Modify CheckOrchestratorCopyTask.
zqburde committed Apr 13, 2023

Verified

This commit was signed with the committer’s verified signature.
valpinkman Valentin D. Pinkman
commit 01dacf40d2dfa7759d708d9cdf571182805a719b
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
*/
@Component
@EnableScheduling
public class CheckOrchestratorCopyJobTask {
public class CheckOrchestratorCopyTask {

@Autowired
private OrchestratorCopyJobMapper orchestratorCopyJobMapper;
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@

import com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorCopyInfo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

@@ -20,7 +21,7 @@ public interface OrchestratorCopyJobMapper {

void updateErrorMsgById(DSSOrchestratorCopyInfo dssOrchestratorCopyInfo);

void batchUpdateCopyJob(List<DSSOrchestratorCopyInfo> dssOrchestratorCopyInfos);
void batchUpdateCopyJob(@Param("list") List<DSSOrchestratorCopyInfo> dssOrchestratorCopyInfos);

DSSOrchestratorCopyInfo getOrchestratorCopyInfoById(String id);

Original file line number Diff line number Diff line change
@@ -2,24 +2,21 @@

import com.webank.wedatasphere.dss.orchestrator.common.entity.OrchestratorPublishJob;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

@Mapper
public interface OrchestratorJobMapper {

OrchestratorPublishJob getPublishJobById(long id);
OrchestratorPublishJob getPublishJobByJobId(@Param("jobId") String jobId);

OrchestratorPublishJob getPublishJobByJobId(String jobId);

List<OrchestratorPublishJob> getPublishJobByJobStatuses(List<String> statuses);
List<OrchestratorPublishJob> getPublishJobByJobStatuses(@Param("statuses") List<String> statuses);

long insertPublishJob(OrchestratorPublishJob job);

void updatePublishJob(OrchestratorPublishJob job);

void deletePublishJob(OrchestratorPublishJob job);

void batchUpdatePublishJob(List<OrchestratorPublishJob> jobs);
void batchUpdatePublishJob(@Param("list") List<OrchestratorPublishJob> jobs);

}
Original file line number Diff line number Diff line change
@@ -24,10 +24,6 @@
id, job_id, conversion_job_json, create_time, update_time, instance_name, status
</sql>

<select id="getPublishJobById" resultMap="orchestrator_job_info_result_map">
SELECT * FROM `dss_orchestrator_job_info` WHERE id = #{id}
</select>

<select id="getPublishJobByJobId" resultMap="orchestrator_job_info_result_map">
SELECT * FROM `dss_orchestrator_job_info` WHERE job_id = #{jobId}
</select>
@@ -61,17 +57,10 @@

<update id="batchUpdatePublishJob" parameterType="java.util.List">
<foreach collection="list" item="item" separator=";">
UPDATE dss_orchestrator_job_info set status = #{item.status} WHERE id = #{item.id}
UPDATE dss_orchestrator_job_info set status = #{item.status} WHERE id = #{item.id}
</foreach>
</update>

<delete id="deletePublishJob">
DELETE
FROM
dss_orchestrator_job_info
WHERE id = #{id}
</delete>

<resultMap id="orchestrator_job_info_result_map" type="com.webank.wedatasphere.dss.orchestrator.common.entity.OrchestratorPublishJob">
<result column="id" property="id" jdbcType="BIGINT"/>
<result column="job_id" property="jobId" jdbcType="LONGVARCHAR"/>
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ public interface TaskMapper {

void updateTask(WorkflowQueryTask queryTask);

void batchUpdateTasks(List<WorkflowQueryTask> workflowQueryTasks);
void batchUpdateTasks(@Param("list") List<WorkflowQueryTask> workflowQueryTasks);

List<WorkflowQueryTask> search(@Param("taskID") Long taskID, @Param("umUser") String username, @Param("status") List<String> status,
@Param("startDate") Date startDate, @Param("endDate") Date endDate, @Param("executeApplicationName") String executeApplicationName,