优化调整

ruoyi-admin/src/main/resources/application.yml

@@ -41,7 +41,7 @@ logging:
 user:
   password:
     # 密码最大错误次数
-    maxRetryCount: 5
+    maxRetryCount: 10
     # 密码锁定时间（默认10分钟）
     lockTime: 10
 
@@ -107,6 +107,18 @@ mybatis:
   # 加载全局的配置文件
   configLocation: classpath:mybatis/mybatis-config.xml
 
+#MybatisPlus
+#mybatis-plus:
+#  # Mapper XML 扫描路径（若你用了 XML）
+#  mapper-locations: classpath*:mapper/**/*Mapper.xml
+#  # 实体类别名包（让 XML 中能用 User 而非全限定名）
+#  type-aliases-package: com.ruoyi.**.domain
+#  configuration:
+#    map-underscore-to-camel-case: true
+#    cache-enabled: false
+#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+#  interceptor: com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor
+
 # PageHelper分页插件
 pagehelper:
   helperDialect: sqlserver
@@ -128,3 +140,4 @@ xss:
   excludes: /system/notice
   # 匹配链接
   urlPatterns: /system/*,/monitor/*,/tool/*
+

ruoyi-admin/src/main/resources/mapper/job/JobCallBackMapper.xml

@@ -8,7 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id"    column="id"    />
         <result property="type"    column="type"    />
         <result property="taskNo"    column="task_no"    />
-        <result property="mydojobId"    column="mydojob_id"    />
+        <result property="mydoJobId"    column="mydoJob_Id"    />
         <result property="status"    column="status"    />
         <result property="createTime"    column="create_time"    />
         <result property="reqCode"    column="req_code"    />
@@ -17,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectJobCallBackVo">
-        select id, type, task_no, mydojob_id, status, create_time,req_code,task_type_code,task_code from job_call_back
+        select id, type, task_no, mydoJob_Id, status, create_time,req_code,task_type_code,task_code from job_call_back
     </sql>
 
     <select id="selectJobCallBackList" parameterType="JobCallBack" resultMap="JobCallBackResult">
@@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="type != null  and type != ''"> and type = #{type}</if>
             <if test="taskNo != null "> and task_no = #{taskNo}</if>
-            <if test="mydojobId != null and mydojobId != ''"> and mydojob_id = #{mydojobId}</if>
+            <if test="mydoJobId != null and mydoJobId != ''"> and mydoJob_Id = #{mydoJobId}</if>
             <if test="status != null and status != ''"> and status = #{status}</if>
             <if test="reqCode != null and reqCode != ''"> and req_code = #{reqCode}</if>
             <if test="taskTypeCode != null and taskTypeCode != ''"> and task_type_code = #{taskTypeCode}</if>
@@ -47,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="type != null">type,</if>
             <if test="taskNo != null">task_no,</if>
-            <if test="mydojobId != null">mydojob_id,</if>
+            <if test="mydoJobId != null">mydoJob_Id,</if>
             <if test="status != null">status,</if>
             <if test="createTime != null">create_time,</if>
             <if test="reqCode != null">req_code,</if>
@@ -57,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="type != null">#{type},</if>
             <if test="taskNo != null">#{taskNo},</if>
-            <if test="mydojobId != null">#{mydojobId},</if>
+            <if test="mydoJobId != null">#{mydoJobId},</if>
             <if test="status != null">#{status},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="reqCode != null">#{reqCode},</if>
@@ -71,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="type != null">type = #{type},</if>
             <if test="taskNo != null">task_no = #{taskNo},</if>
-            <if test="mydojobId != null">mydojob_id = #{mydojobId},</if>
+            <if test="mydoJobId != null">mydoJob_Id = #{mydoJobId},</if>
             <if test="status != null">status = #{status},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="reqCode != null">req_code = #{reqCode},</if>
@@ -93,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <select id="getTopJobCallBack" resultMap="JobCallBackResult">
-        select top(1) id, type, task_no, mydojob_id, status, create_time,req_code,task_type_code,task_code from job_call_back
+        select top(1) id, type, task_no, mydoJob_Id, status, create_time,req_code,task_type_code,task_code from job_call_back
         where status = '0' and spare1 in ('0','1','2')
           order by create_time asc
     </select>

ruoyi-admin/src/main/resources/mapper/queue/DdjDeviceExecutionQueueFinishMapper.xml

@@ -61,6 +61,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where uuid = #{uuid}
     </select>
 
+    <select id="selectDdjDeviceExecutionQueueFinishByTaskNo" parameterType="String" resultMap="DdjDeviceExecutionQueueFinishResult">
+        <include refid="selectDdjDeviceExecutionQueueFinishVo"/>
+        where rwh = #{taskNo}
+    </select>
+
     <insert id="insertDdjDeviceExecutionQueueFinish" parameterType="DdjDeviceExecutionQueueFinish">
         insert into ddj_device_execution_queue_finish
         <trim prefix="(" suffix=")" suffixOverrides=",">

ruoyi-admin/src/main/resources/mapper/queue/DdjDeviceExecutionQueueMapper.xml

@@ -61,6 +61,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectDdjDeviceExecutionQueueVo"/>
         where uuid = #{uuid}
     </select>
+
+    <select id="selectDdjDeviceExecutionQueueByTaskNo" parameterType="String" resultMap="DdjDeviceExecutionQueueResult">
+        <include refid="selectDdjDeviceExecutionQueueVo"/>
+        where rwh = #{taskNo}
+    </select>
+
     <select id="selectDdjDeviceExecutionQueueListByRwlx"
             resultMap="DdjDeviceExecutionQueueResult">
         <include refid="selectDdjDeviceExecutionQueueVo"/>