From 2b47c5b0e504a653fe40ae8b6749e14e228a89bd Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期四, 02 一月 2025 13:46:57 +0800
Subject: [PATCH] 调度模型下发
---
iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mcs/MmPredictItemDao.xml | 97 +++++++++++++++++++++++++++++++-----------------
1 files changed, 62 insertions(+), 35 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mcs/MmPredictItemDao.xml b/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mcs/MmPredictItemDao.xml
index f3ba08e..5b72ac8 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mcs/MmPredictItemDao.xml
+++ b/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mcs/MmPredictItemDao.xml
@@ -14,6 +14,7 @@
<result property="isFuse" column="ISFUSE"/>
<result property="predictPhase" column="PREDICTPHASE"/>
<result property="workChecked" column="WORKCHECKED"/>
+ <result property="lastTime" column="last_time"/>
</resultMap>
<resultMap id="MergeItemVO" type="com.iailab.module.model.mdk.vo.MergeItemVO">
@@ -38,15 +39,15 @@
TDMI.ITEMORDER,
TMPI.STATUS,
TDMI.CATEGORYID,
- TMIO.POINTID,
- TMIO.TAGNAME,
- TMIO.RESULTTABLEID,
- TMRT.TABLENAME
+ TMIS.last_time,
+ TMIS.status run_status,
+ TMIS.duration,
+ TDMM.modulename
FROM T_MM_PREDICT_ITEM TMPI
LEFT JOIN T_MM_ITEM_TYPE TMIT ON TMIT.ID = TMPI.ITEMTYPEID
LEFT JOIN T_DM_MODULE_ITEM TDMI ON TDMI.ITEMID = TMPI.ID
- LEFT JOIN T_MM_ITEM_OUTPUT TMIO ON TMIO.ITEMID = TMPI.ID
- LEFT JOIN T_MM_RESULT_TABLE TMRT ON TMRT.ID = TMIO.RESULTTABLEID
+ LEFT JOIN t_mm_item_status TMIS ON TMIS.item_id = TMPI.ID
+ LEFT JOIN T_DM_MODULE TDMM ON TDMM.id = TDMI.moduleid
<where>
<if test="params.itemno != null and params.itemno != ''">
AND TMPI.ITEMNO LIKE CONCAT('%', #{params.itemno},'%')
@@ -63,50 +64,73 @@
<if test="params.status != null and params.status != ''">
AND TMPI.STATUS = #{params.status}
</if>
+ <if test="params.modulename != null and params.modulename != ''">
+ AND TDMM.modulename LIKE CONCAT('%', #{params.modulename},'%')
+ </if>
</where>
ORDER BY TMPI.CREATE_TIME DESC
</select>
- <select id="queryList" resultType="com.iailab.module.model.mcs.pre.vo.MmPredictItemRespVO" parameterType="map">
+ <resultMap id="MmPredictItemRespVO" type="com.iailab.module.model.mcs.pre.vo.MmPredictItemRespVO">
+ <result property="id" column="ID"/>
+ <result property="itemno" column="ITEMNO"/>
+ <result property="itemname" column="ITEMNAME"/>
+ <result property="itemtypeid" column="ITEMTYPEID"/>
+ <result property="itemtypename" column="ITEMTYPENAME"/>
+ <result property="predictlength" column="predictlength"/>
+ <result property="granularity" column="GRANULARITY"/>
+ <result property="isfuse" column="ISFUSE"/>
+ <result property="workchecked" column="WORKCHECKED"/>
+ <result property="moduleid" column="MODULEID"/>
+ <result property="itemorder" column="ITEMORDER"/>
+ <result property="status" column="STATUS"/>
+ <result property="categoryid" column="CATEGORYID"/>
+ <collection property="outPuts" ofType="com.iailab.module.model.mcs.pre.vo.MmItemOutputRespVO">
+ <result property="id" column="out_put_id"/>
+ <result property="outputorder" column="out_put_order"/>
+ <result property="resultName" column="result_name"/>
+ </collection>
+ </resultMap>
+
+ <select id="queryList" resultMap="MmPredictItemRespVO" parameterType="map">
SELECT
TMPI.ID,
TMPI.ITEMNO,
TMPI.ITEMNAME,
TMPI.ITEMTYPEID,
TMIT.ITEMTYPENAME,
+ TMPI.predictlength,
TMPI.GRANULARITY,
TMPI.ISFUSE,
TMPI.WORKCHECKED,
TDMI.MODULEID,
TDMI.ITEMORDER,
- TDMI.STATUS,
+ TMPI.STATUS,
TDMI.CATEGORYID,
- TMIO.POINTID,
- TMIO.TAGNAME,
- TMIO.RESULTTABLEID,
- TMRT.TABLENAME
+ TMIO.id out_put_id,
+ TMIO.outputorder out_put_order,
+ TMIO.result_name
FROM T_MM_PREDICT_ITEM TMPI
LEFT JOIN T_MM_ITEM_TYPE TMIT ON TMIT.ID = TMPI.ITEMTYPEID
LEFT JOIN T_DM_MODULE_ITEM TDMI ON TDMI.ITEMID = TMPI.ID
- LEFT JOIN T_MM_ITEM_OUTPUT TMIO ON TMIO.ITEMID = TMPI.ID
- LEFT JOIN T_MM_RESULT_TABLE TMRT ON TMRT.ID = TMIO.RESULTTABLEID
+ LEFT JOIN t_mm_item_output TMIO ON TMIO.itemid = TMPI.ID
WHERE 1 = 1
- <if test="params.itemno != null and params.itemno != ''">
- AND TMPI.ITEMNO LIKE CONCAT('%', #{params.itemno},'%')
+ <if test="itemno != null and itemno != ''">
+ AND TMPI.ITEMNO LIKE CONCAT('%', #{itemno},'%')
</if>
- <if test="params.itemname != null and params.itemname != ''">
- AND TMPI.ITEMNAME LIKE CONCAT('%', #{params.itemname},'%')
+ <if test="itemname != null and itemname != ''">
+ AND TMPI.ITEMNAME LIKE CONCAT('%', #{itemname},'%')
</if>
- <if test="params.itemtypeid != null and params.itemtypeid != ''">
- AND TMPI.ITEMTYPEID = #{params.itemtypeid}
+ <if test="itemtypeid != null and itemtypeid != ''">
+ AND TMPI.ITEMTYPEID = #{itemtypeid}
</if>
- <if test="params.itemtypename != null and params.itemtypename != ''">
- AND TMIT.ITEMTYPENAME = #{params.itemtypename}
+ <if test="itemtypename != null and itemtypename != ''">
+ AND TMIT.ITEMTYPENAME = #{itemtypename}
</if>
- <if test="params.status != null and params.status != ''">
- AND TDMI.STATUS = #{params.status}
+ <if test="status != null and status != ''">
+ AND TMPI.STATUS = #{status}
</if>
- ORDER BY TMPI.CREATE_TIME DESC
+ ORDER BY TMPI.CREATE_TIME DESC,TMIO.outputorder
</select>
<select id="getByModuleId" parameterType="map" resultMap="ItemVO">
@@ -142,17 +166,20 @@
t1.status,
t1.isfuse,
t1.predictphase,
- t1.workchecked
+ t1.workchecked,
+ t3.last_time
FROM
- ${TABLESCHEMA}.t_mm_predict_item t1,
- ${TABLESCHEMA}.t_mm_item_type t2
- WHERE t1.itemtypeid=t2.id
- <if test="ITEMID != null and ITEMID != ''">
- AND t1.id=#{ITEMID}
- </if>
- <if test="ITEMNO != null and ITEMNO != ''">
- t1.itemno=#{ITEMNO}
- </if>
+ t_mm_predict_item t1
+ LEFT JOIN t_mm_item_type t2 on t2.id = t1.itemtypeid
+ LEFT JOIN t_mm_item_status t3 on t3.item_id = t1.id
+ <where>
+ <if test="ITEMID != null and ITEMID != ''">
+ AND t1.id=#{ITEMID}
+ </if>
+ <if test="ITEMNO != null and ITEMNO != ''">
+ t1.itemno=#{ITEMNO}
+ </if>
+ </where>
</select>
<select id="getMergeItemByItemId" parameterType="map" resultMap="MergeItemVO">
SELECT t1.id,
--
Gitblit v1.9.3