Job模块创建任务失败修复

Author: zengqiao

km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/job/impl/JobServiceImpl.java

@@ -73,8 +73,11 @@ public Result<Void> addTask(Long clusterPhyId, JobDTO jobDTO, String operator) {
         }
 
         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 @@ private JobHandler getJobHandlerByType(int type){
     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;
             }

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 '实际执行时间',

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');
+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');

km-persistence/src/main/java/com/xiaojukeji/know/streaming/km/persistence/mysql/job/JobDAO.java

@@ -9,4 +9,5 @@
 
 @Repository
 public interface JobDAO extends BaseMapper<JobPO> {
+    int addAndSetId(JobPO jobPO);
 }

km-persistence/src/main/resources/mybatis/KmJobMapper.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xiaojukeji.know.streaming.km.persistence.mysql.job.JobDAO">
+    <resultMap id="KmJobMap"              type="com.xiaojukeji.know.streaming.km.common.bean.po.job.JobPO">
+    <id column="id"                       property="id" />
+    <result column="create_time"          property="createTime" />
+    <result column="update_time"          property="updateTime" />
+
+    <result column="cluster_id"           property="clusterId" />
+    <result column="job_name"             property="jobName" />
+    <result column="job_desc"             property="jobDesc" />
+    <result column="job_type"             property="jobType" />
+    <result column="job_data"             property="jobData" />
+    <result column="job_status"           property="jobStatus" />
+    <result column="running_status"       property="runningStatus" />
+    <result column="target"               property="target" />
+    <result column="creator"              property="creator" />
+    <result column="plan_time"            property="planTime" />
+    <result column="start_time"           property="startTime" />
+  </resultMap>
+
+  <insert id="addAndSetId"
+          parameterType="com.xiaojukeji.know.streaming.km.common.bean.po.job.JobPO"
+          useGeneratedKeys="true"
+          keyProperty="id">
+    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})
+  </insert>
+</mapper>