From 7f251679fa0994dde8fa34033f7b621cb4242fab Mon Sep 17 00:00:00 2001 From: zengqiao Date: Thu, 25 Aug 2022 19:50:50 +0800 Subject: [PATCH] =?UTF-8?q?Job=E6=A8=A1=E5=9D=97=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=A4=B1=E8=B4=A5=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/service/job/impl/JobServiceImpl.java | 5 ++- km-dist/init/sql/ddl-ks-km.sql | 2 +- km-dist/init/sql/dml-logi.sql | 7 +++- .../km/persistence/mysql/job/JobDAO.java | 1 + .../main/resources/mybatis/KmJobMapper.xml | 32 +++++++++++++++++++ 5 files changed, 44 insertions(+), 3 deletions(-) create mode 100644 km-persistence/src/main/resources/mybatis/KmJobMapper.xml diff --git a/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/job/impl/JobServiceImpl.java b/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/job/impl/JobServiceImpl.java index 6e17081b..573a3cf5 100644 --- a/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/job/impl/JobServiceImpl.java +++ b/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/job/impl/JobServiceImpl.java @@ -73,8 +73,11 @@ public class JobServiceImpl implements JobService { } Job job = ConvertUtil.obj2Obj(jobDTO, Job.class); + job.setJobName(job.getJobName() == null? job.getJobDesc(): job.getJobName()); job.setCreator(operator); job.setClusterId(clusterPhyId); + job.setJobDesc(job.getJobDesc()== null ? "" : job.getJobDesc()); + job.setJobName(job.getJobName()== null ? job.getJobDesc() : job.getJobName()); try { // 写入job表 @@ -448,7 +451,7 @@ public class JobServiceImpl implements JobService { private boolean insert(Job task) { try { JobPO jobPO = ConvertUtil.obj2Obj(task, JobPO.class); - if (jobDao.insert( jobPO ) > 0) { + if (jobDao.addAndSetId( jobPO ) > 0) { task.setId(jobPO.getId()); return true; } diff --git a/km-dist/init/sql/ddl-ks-km.sql b/km-dist/init/sql/ddl-ks-km.sql index e1b4bfa8..83341125 100644 --- a/km-dist/init/sql/ddl-ks-km.sql +++ b/km-dist/init/sql/ddl-ks-km.sql @@ -150,7 +150,7 @@ CREATE TABLE `ks_km_job` ( `job_desc` varchar(1024) NOT NULL DEFAULT '' COMMENT '任务描述', `cluster_id` int(11) NOT NULL COMMENT 'kafka集群id', `target` varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '任务执行对象', - `running_status` varchar(256) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '任务运行详细状态(json), Success：7 Fail：1 Doing：2', + `running_status` varchar(256) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '' COMMENT '任务运行详细状态(json), Success：7 Fail：1 Doing：2', `creator` varchar(45) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '创建者', `plan_time` timestamp NOT NULL DEFAULT '1971-1-1 00:00:00' COMMENT '计划执行时间', `start_time` timestamp NOT NULL DEFAULT '1971-1-1 00:00:00' COMMENT '实际执行时间', diff --git a/km-dist/init/sql/dml-logi.sql b/km-dist/init/sql/dml-logi.sql index d2054c36..37a554b8 100644 --- a/km-dist/init/sql/dml-logi.sql +++ b/km-dist/init/sql/dml-logi.sql @@ -61,4 +61,9 @@ INSERT INTO `logi_security_role_permission` (`id`, `role_id`, `permission_id`, ` INSERT INTO `logi_security_role_permission` (`id`, `role_id`, `permission_id`, `is_delete`, `app_name`) VALUES ('2103', '1677', '1595', '0', 'know-streaming'); -- 初始化 用户角色关系 -INSERT INTO `logi_security_user_role` (`id`, `user_id`, `role_id`, `is_delete`, `app_name`) VALUES ('1', '1', '1677', '0', 'know-streaming'); \ No newline at end of file +INSERT INTO `logi_security_user_role` (`id`, `user_id`, `role_id`, `is_delete`, `app_name`) VALUES ('1', '1', '1677', '0', 'know-streaming'); + +INSERT INTO `logi_security_config` +(`value_group`,`value_name`,`value`,`edit`,`status`,`memo`,`is_delete`,`app_name`,`operator`) +VALUES +('SECURITY.LOGIN','SECURITY.TRICK_USERS','[\n \"admin\"\n]',1,1,'允许跳过登录的用户',0,'know-streaming','admin'); \ No newline at end of file diff --git a/km-persistence/src/main/java/com/xiaojukeji/know/streaming/km/persistence/mysql/job/JobDAO.java b/km-persistence/src/main/java/com/xiaojukeji/know/streaming/km/persistence/mysql/job/JobDAO.java index 7465c569..78791d2c 100644 --- a/km-persistence/src/main/java/com/xiaojukeji/know/streaming/km/persistence/mysql/job/JobDAO.java +++ b/km-persistence/src/main/java/com/xiaojukeji/know/streaming/km/persistence/mysql/job/JobDAO.java @@ -9,4 +9,5 @@ import org.springframework.stereotype.Repository; @Repository public interface JobDAO extends BaseMapper { + int addAndSetId(JobPO jobPO); } diff --git a/km-persistence/src/main/resources/mybatis/KmJobMapper.xml b/km-persistence/src/main/resources/mybatis/KmJobMapper.xml new file mode 100644 index 00000000..e5afe65f --- /dev/null +++ b/km-persistence/src/main/resources/mybatis/KmJobMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO ks_km_job + (cluster_id, job_name, job_desc, job_type, job_data, job_status, target, creator, plan_time) + VALUES + (#{clusterId}, #{jobName}, #{jobDesc}, #{jobType}, #{jobData}, #{jobStatus}, #{target}, #{creator}, #{planTime}) + + \ No newline at end of file