From d79d2f12c82cac10ba28117a9ee49bc5fdc2842d Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期三, 13 十一月 2024 16:05:28 +0800 Subject: [PATCH] 1、完善通信中间件远程升级任务模块; 2、web端实现升级任务发布执行功能; 3、web端实现升级任务执行监视功能; 4、web端添加模拟升级过程逻辑。 --- pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeProcessingResultMapper.xml | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeProcessingResultMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeProcessingResultMapper.xml index 96a1a32..4315729 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeProcessingResultMapper.xml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeProcessingResultMapper.xml @@ -194,4 +194,45 @@ deleted = #{deleted,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT} </update> + + <!--鏍规嵁宸ュ崟ID鑾峰彇鏈垹闄ょ殑宸ュ崟瀵硅薄--> + <select id="getByWorkOrderId" resultType="com.dy.pipIrrGlobal.pojoOp.OpeProcessingResult"> + SELECT * FROM ope_processing_result WHERE deleted = 0 AND work_order_id = #{workOrderId} LIMIT 1 + </select> + + <!--鑾峰彇鎸囧畾宸℃鍛樼殑鎸囧畾鏈垹闄や笖鏈鎵圭殑澶勭悊缁撴灉涓婃姤锛屽垹闄ゅ鐞嗙粨鏋滃墠鍒ゆ柇浣跨敤浣跨敤--> + <select id="getProResult" resultType="com.dy.pipIrrGlobal.pojoOp.OpeProcessingResult"> + SELECT * FROM ope_processing_result + WHERE deleted = 0 AND state = 1 AND id = #{proResultId} AND inspector_id = #{inspectorId} LIMIT 1 + </select> + + <!--閫昏緫鍒犻櫎涓�涓湭鍒犻櫎鐨勫鐞嗙粨鏋滆褰�--> + <update id="deleteProResult"> + UPDATE ope_processing_result SET deleted = UNIX_TIMESTAMP() WHERE deleted = 0 AND id = #{proResultId} + </update> + + <!--鏍规嵁涓婚敭鑾峰彇澶勭悊缁撴灉瑙嗗浘瀵硅薄--> + <select id="getProResultById" resultType="com.dy.pipIrrGlobal.voOp.VoProcessingResult"> + SELECT + res.id AS proResultId, + res.work_order_id AS workOrderId, + us.name AS inspector, + res.content, + res.images, + res.audios, + res.videos, + res.lng, + res.lat, + res.complete_time AS completeTime, + res.report_time AS reportTime, + res.state, + CASE + WHEN res.state = 1 THEN '宸蹭笂鎶�' + WHEN res.state = 2 THEN '宸查�氳繃' + WHEN res.state = 3 THEN '宸查┏鍥�' + END AS stateName + FROM ope_processing_result res + INNER JOIN ba_user us ON us.id = res.inspector_id + WHERE res.deleted = 0 AND res.id = #{proResultId} + </select> </mapper> \ No newline at end of file -- Gitblit v1.8.0