三方调度相关接口开发0724

src/main/resources/mybatis/wisdom/AgvTaskResultMapper.xml

@@ -35,14 +35,21 @@
         </where>
     </select>
 
-    <select id="selectCountByRequestIdAndStatus" resultType="int">
-        SELECT COUNT(1)
-        FROM agv_task_result
+    <select id="selectByRequestId" resultMap="AgvTaskResultResultMap">
+        SELECT * FROM agv_task_result WHERE request_id = #{requestId} AND is_delete = '0'
+    </select>
+
+    <select id="countByRequestIdAndStatus" resultType="int">
+        SELECT COUNT(*) FROM agv_task_result
         WHERE request_id = #{requestId}
           AND status = #{status}
           AND is_delete = '0'
     </select>
 
+    <select id="selectByTaskNo" resultType="com.zg.project.wisdom.domain.AgvTaskResult">
+        SELECT * FROM agv_task_result WHERE task_no = #{taskNo} AND is_delete = '0'
+    </select>
+
     <insert id="insertAgvTaskResult" parameterType="AgvTaskResult" useGeneratedKeys="true" keyProperty="id">
         INSERT INTO agv_task_result
         <trim prefix="(" suffix=")" suffixOverrides=",">

src/main/resources/mybatis/wisdom/AgyWcsMapper.xml

@@ -0,0 +1,20 @@
+<?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.zg.project.wisdom.mapper.AgyWcsMapper">
+
+    <resultMap id="AgyWcsResultMap" type="com.zg.project.wisdom.domain.AgyWcs">
+        <id     property="id"        column="id"/>
+        <result property="requestId" column="requestId"/>
+        <result property="taskId"    column="TaskID"/>
+    </resultMap>
+
+    <!-- 插入 AGV-WCS 映射关系 -->
+    <insert id="insertAgyWcs" parameterType="com.zg.project.wisdom.domain.AgyWcs">
+        INSERT INTO agy_wcs (requestId, TaskID)
+        VALUES (#{requestId}, #{taskId})
+    </insert>
+
+</mapper>

src/main/resources/mybatis/wisdom/AuditSignatureMapper.xml

@@ -91,16 +91,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           AND is_delete = '0'
     </select>
 
-    <select id="selectPhotoUrlByBillNo"
-            resultMap="AuditSignatureResult"
-            parameterType="java.lang.String">
+    <select id="selectPhotoUrlByRkId" resultMap="AuditSignatureResult" parameterType="java.lang.Long">
         SELECT sign_url, audit_result
         FROM audit_signature
         WHERE is_delete = '0'
-          AND bill_no = #{billNo}
-          AND image_type = '1'
+        AND rk_id = #{rkId}
+        AND image_type = '1'
+        AND audit_result = '1'
+        AND is_current = '1'
         ORDER BY create_time DESC
-            LIMIT 1
+        LIMIT 1
     </select>
 
     <!-- 查询主记录列表（审批记录） signer_role=1 image_type=0 -->

src/main/resources/mybatis/wisdom/DdTaskMapper.xml

@@ -50,6 +50,11 @@
         SELECT * FROM dd_task WHERE id = #{id} AND is_delete = '0'
     </select>
 
+    <!-- 根据任务编号查询 -->
+    <select id="selectByTaskNo" resultMap="DdTaskResult" parameterType="String">
+        SELECT * FROM dd_task WHERE task_no = #{taskNo} AND is_delete = '0' LIMIT 1
+    </select>
+
     <insert id="insertDdTask" parameterType="DdTask">
         INSERT INTO dd_task (
             task_no, task_dtl, task_type, task_status, mid_status, mid, num, mid_type, source_name,
@@ -86,6 +91,14 @@
         WHERE id = #{id}
     </update>
 
+    <update id="updateTaskStatusByTaskNo">
+        UPDATE dd_task
+        SET task_status = #{status},
+            update_time = NOW()
+        WHERE task_no = #{taskNo}
+          AND is_delete = '0'
+    </update>
+
     <delete id="deleteDdTaskByIds">
         DELETE FROM dd_task WHERE id IN
         <foreach collection="array" item="id" open="(" separator="," close=")">

src/main/resources/mybatis/wisdom/GysJhMapper.xml

@@ -57,6 +57,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         AND status = '0'
     </select>
 
+    <select id="existsByUniqueKeys" resultType="boolean">
+        SELECT COUNT(1)
+        FROM gys_jh
+        WHERE sap_no = #{sapNo}
+          AND xm_no = #{xmNo}
+          AND wl_no = #{wlNo}
+          AND is_delete = '0'
+    </select>
+
     <insert id="insertGysJh" parameterType="GysJh" useGeneratedKeys="true" keyProperty="id">
         insert into gys_jh
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -152,6 +161,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{sapNo}
         </foreach>
     </update>
+
+    <update id="batchUpdateStatusByIds">
+        UPDATE gys_jh
+        SET status = '1'
+        WHERE id IN
+        <foreach collection="idSet" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
     <delete id="deleteGysJhById" parameterType="Long">
         delete from gys_jh where id = #{id}
     </delete>

src/main/resources/mybatis/wisdom/RkInfoMapper.xml

@@ -157,6 +157,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             update_time = NOW()
         WHERE bill_no_ck = #{billNoCk}
     </update>
+
     <delete id="deleteByBillNo">
         DELETE FROM rk_info
         WHERE bill_no = #{billNo}

src/main/resources/mybatis/wisdom/WcsTaskResultMapper.xml

@@ -0,0 +1,70 @@
+<?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.zg.project.wisdom.mapper.WcsTaskResultMapper">
+
+    <resultMap id="WcsTaskResultResultMap" type="com.zg.project.wisdom.domain.WcsTaskResult">
+        <result property="id"           column="id"/>
+        <result property="taskId"    column="task_id"/>
+        <result property="taskStatus"       column="task_status"/>
+        <result property="msg"          column="msg"/>
+        <result property="jobId"        column="job_id"/>
+        <result property="owner"        column="owner"/>
+        <result property="type"         column="type"/>
+        <result property="priority"     column="priority"/>
+        <result property="sourceName"   column="source_name"/>
+        <result property="targetName"   column="target_name"/>
+        <result property="createTime"   column="create_time"/>
+        <result property="updateTime"   column="update_time"/>
+        <result property="isDelete"     column="is_delete"/>
+        <result property="createBy"     column="create_by"/>
+        <result property="updateBy"     column="update_by"/>
+    </resultMap>
+
+    <insert id="insertWcsTaskResult" parameterType="com.zg.project.wisdom.domain.WcsTaskResult" useGeneratedKeys="true" keyProperty="id">
+        INSERT INTO wcs_task_result
+        (
+            task_id,
+            task_status,
+            msg,
+            job_id,
+            owner,
+            type,
+            priority,
+            source_name,
+            target_name,
+            create_time,
+            update_time,
+            is_delete,
+            create_by,
+            update_by
+        )
+        VALUES
+            (
+                #{taskId},
+                #{TaskStatus},
+                #{msg},
+                #{jobId},
+                #{owner},
+                #{type},
+                #{priority},
+                #{sourceName},
+                #{targetName},
+                #{createTime},
+                #{updateTime},
+                #{isDelete},
+                #{createBy},
+                #{updateBy}
+            )
+    </insert>
+
+    <select id="countByTaskId" resultType="java.lang.Integer" parameterType="java.lang.String">
+        SELECT COUNT(*)
+        FROM wcs_status
+        WHERE TaskID = #{taskId}
+          AND TaskStatus = '1'
+    </select>
+
+</mapper>