xieb
2023-05-12 6a6687cf0b71a7ca29d70b13606b6fd065e52393
xxljob修改支持达梦数据库
6 files modified
116 ■■■■ changed files
skjcmanager/skjcmanager-ops/skjcmanager-xxljob-admin/pom.xml 10 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-ops/skjcmanager-xxljob-admin/src/main/resources/mybatis-mapper/XxlJobGroupMapper.xml 18 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-ops/skjcmanager-xxljob-admin/src/main/resources/mybatis-mapper/XxlJobLogGlueMapper.xml 18 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-ops/skjcmanager-xxljob-admin/src/main/resources/mybatis-mapper/XxlJobLogMapper.xml 44 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-ops/skjcmanager-xxljob-admin/src/main/resources/mybatis-mapper/XxlJobLogReportMapper.xml 16 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-ops/skjcmanager-xxljob-admin/src/main/resources/mybatis-mapper/XxlJobRegistryMapper.xml 10 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-ops/skjcmanager-xxljob-admin/pom.xml
@@ -79,9 +79,15 @@
            <version>${mybatis-spring-boot-starter.version}</version>
        </dependency>
        <!-- mysql -->
<!--        <dependency>-->
<!--            <groupId>mysql</groupId>-->
<!--            <artifactId>mysql-connector-java</artifactId>-->
<!--        </dependency>-->
        <!--达梦数据库-->
        <dependency>
            <groupId>mysql</groupId>
            <artifactId>mysql-connector-java</artifactId>
            <groupId>com.dameng</groupId>
            <artifactId>Dm8JdbcDriver18</artifactId>
            <version>8.1.1.49</version>
        </dependency>
        <!-- xxl-job-core -->
        <dependency>
skjcmanager/skjcmanager-ops/skjcmanager-xxljob-admin/src/main/resources/mybatis-mapper/XxlJobGroupMapper.xml
@@ -16,7 +16,7 @@
        t.id,
        t.app_name,
        t.title,
        t.`order`,
        t."ORDER",
        t.address_type,
        t.address_list
    </sql>
@@ -24,28 +24,28 @@
    <select id="findAll" resultMap="XxlJobGroup">
        SELECT <include refid="Base_Column_List" />
        FROM xxl_job_group AS t
        ORDER BY t.order ASC
        ORDER BY t."ORDER" ASC
    </select>
    <select id="findByAddressType" parameterType="java.lang.Integer" resultMap="XxlJobGroup">
        SELECT <include refid="Base_Column_List" />
        FROM xxl_job_group AS t
        WHERE t.address_type = #{addressType}
        ORDER BY t.order ASC
        ORDER BY t."ORDER" ASC
    </select>
    <insert id="save" parameterType="cn.gistack.job.admin.core.model.XxlJobGroup" useGeneratedKeys="true" keyProperty="id" >
        INSERT INTO xxl_job_group ( `app_name`, `title`, `order`, `address_type`, `address_list`)
        INSERT INTO xxl_job_group ( app_name, title, "ORDER", address_type, address_list)
        values ( #{appName}, #{title}, #{order}, #{addressType}, #{addressList});
    </insert>
    <update id="update" parameterType="cn.gistack.job.admin.core.model.XxlJobGroup" >
        UPDATE xxl_job_group
        SET `app_name` = #{appName},
            `title` = #{title},
            `order` = #{order},
            `address_type` = #{addressType},
            `address_list` = #{addressList}
        SET app_name = #{appName},
            title = #{title},
            "ORDER" = #{order},
            address_type = #{addressType},
            address_list = #{addressList}
        WHERE id = #{id}
    </update>
skjcmanager/skjcmanager-ops/skjcmanager-xxljob-admin/src/main/resources/mybatis-mapper/XxlJobLogGlueMapper.xml
@@ -25,12 +25,12 @@
    <insert id="save" parameterType="cn.gistack.job.admin.core.model.XxlJobLogGlue" useGeneratedKeys="true" keyProperty="id" >
        INSERT INTO xxl_job_logglue (
            `job_id`,
            `glue_type`,
            `glue_source`,
            `glue_remark`,
            `add_time`,
            `update_time`
            job_id,
            glue_type,
            glue_source,
            glue_remark,
            add_time,
            update_time
        ) VALUES (
            #{jobId},
            #{glueType},
@@ -56,16 +56,16 @@
        WHERE id NOT in(
            SELECT id FROM(
                SELECT id FROM xxl_job_logglue
                WHERE `job_id` = #{jobId}
                WHERE job_id = #{jobId}
                ORDER BY update_time desc
                LIMIT 0, #{limit}
            ) t1
        ) AND `job_id` = #{jobId}
        ) AND job_id = #{jobId}
    </delete>
    <delete id="deleteByJobId" parameterType="java.lang.Integer" >
        DELETE FROM xxl_job_logglue
        WHERE `job_id` = #{jobId}
        WHERE job_id = #{jobId}
    </delete>
</mapper>
skjcmanager/skjcmanager-ops/skjcmanager-xxljob-admin/src/main/resources/mybatis-mapper/XxlJobLogMapper.xml
@@ -119,11 +119,11 @@
    <insert id="save" parameterType="cn.gistack.job.admin.core.model.XxlJobLog" useGeneratedKeys="true" keyProperty="id" >
        INSERT INTO xxl_job_log (
            `job_group`,
            `job_id`,
            `trigger_time`,
            `trigger_code`,
            `handle_code`
            job_group,
            job_id,
            trigger_time,
            trigger_code,
            handle_code
        ) VALUES (
            #{jobGroup},
            #{jobId},
@@ -139,24 +139,24 @@
    <update id="updateTriggerInfo" >
        UPDATE xxl_job_log
        SET
            `trigger_time`= #{triggerTime},
            `trigger_code`= #{triggerCode},
            `trigger_msg`= #{triggerMsg},
            `executor_address`= #{executorAddress},
            `executor_handler`=#{executorHandler},
            `executor_param`= #{executorParam},
            `executor_sharding_param`= #{executorShardingParam},
            `executor_fail_retry_count`= #{executorFailRetryCount}
        WHERE `id`= #{id}
            trigger_time= #{triggerTime},
            trigger_code= #{triggerCode},
            trigger_msg= #{triggerMsg},
            executor_address= #{executorAddress},
            executor_handler=#{executorHandler},
            executor_param= #{executorParam},
            executor_sharding_param= #{executorShardingParam},
            executor_fail_retry_count= #{executorFailRetryCount}
        WHERE id= #{id}
    </update>
    <update id="updateHandleInfo">
        UPDATE xxl_job_log
        SET
            `handle_time`= #{handleTime},
            `handle_code`= #{handleCode},
            `handle_msg`= #{handleMsg}
        WHERE `id`= #{id}
            handle_time= #{handleTime},
            handle_code= #{handleCode},
            handle_msg= #{handleMsg}
        WHERE id= #{id}
    </update>
    <delete id="delete" >
@@ -228,13 +228,13 @@
    </delete>
    <select id="findFailJobLogIds" resultType="long" >
        SELECT id FROM `xxl_job_log`
        SELECT id FROM xxl_job_log
        WHERE !(
            (trigger_code in (0, 200) and handle_code = 0)
            OR
            (handle_code = 200)
        )
        AND `alarm_status` = 0
        AND alarm_status = 0
        ORDER BY id ASC
        LIMIT #{pagesize}
    </select>
@@ -242,8 +242,8 @@
    <update id="updateAlarmStatus" >
        UPDATE xxl_job_log
        SET
            `alarm_status` = #{newAlarmStatus}
        WHERE `id`= #{logId} AND `alarm_status` = #{oldAlarmStatus}
            alarm_status = #{newAlarmStatus}
        WHERE id= #{logId} AND alarm_status = #{oldAlarmStatus}
    </update>
</mapper>
skjcmanager/skjcmanager-ops/skjcmanager-xxljob-admin/src/main/resources/mybatis-mapper/XxlJobLogReportMapper.xml
@@ -21,10 +21,10 @@
    <insert id="save" parameterType="cn.gistack.job.admin.core.model.XxlJobLogReport" useGeneratedKeys="true" keyProperty="id" >
        INSERT INTO xxl_job_log_report (
            `trigger_day`,
            `running_count`,
            `suc_count`,
            `fail_count`
            trigger_day,
            running_count,
            suc_count,
            fail_count
        ) VALUES (
            #{triggerDay},
            #{runningCount},
@@ -38,10 +38,10 @@
    <update id="update" >
        UPDATE xxl_job_log_report
        SET `running_count` = #{runningCount},
            `suc_count` = #{sucCount},
            `fail_count` = #{failCount}
        WHERE `trigger_day` = #{triggerDay}
        SET running_count = #{runningCount},
            suc_count = #{sucCount},
            fail_count = #{failCount}
        WHERE trigger_day = #{triggerDay}
    </update>
    <select id="queryLogReport" resultMap="XxlJobLogReport">
skjcmanager/skjcmanager-ops/skjcmanager-xxljob-admin/src/main/resources/mybatis-mapper/XxlJobRegistryMapper.xml
@@ -41,14 +41,14 @@
    <update id="registryUpdate" >
        UPDATE xxl_job_registry
        SET `update_time` = #{updateTime}
        WHERE `registry_group` = #{registryGroup}
          AND `registry_key` = #{registryKey}
          AND `registry_value` = #{registryValue}
        SET update_time = #{updateTime}
        WHERE registry_group = #{registryGroup}
          AND registry_key = #{registryKey}
          AND registry_value = #{registryValue}
    </update>
    <insert id="registrySave" >
        INSERT INTO xxl_job_registry( `registry_group` , `registry_key` , `registry_value`, `update_time`)
        INSERT INTO xxl_job_registry( registry_group , registry_key , registry_value, update_time)
        VALUES( #{registryGroup}  , #{registryKey} , #{registryValue}, #{updateTime})
    </insert>