阶段提交：iotm ,iots

src/main/java/com/yunfeiyun/agmp/iots/service/checker/CmdResultCheckService.java

@@ -94,10 +94,6 @@ public class CmdResultCheckService {
      * @param cmdExecModel
      */
     public void onChecked(CmdExecModel cmdExecModel) {
-        if (true) {
-            TestConst.printError("！！！！！！！！！！【看这里：临时测试】checker 因为iots直接下发指令测试，没有塞缓存task，先强制关闭，联调到iotm iots，再打开");
-            return;
-        }
         if (cmdExecModel == null) {
             log.error("cmdExceModel is null");
             return;

src/main/resources/mapper/IotCmdexecMapper.xml

@@ -7,7 +7,7 @@
     <resultMap type="IotCmdexec" id="IotCmdexecResult">
         <result property="id" column="id"/>
         <result property="ceBid" column="ceBid"/>
-        <result property="cId" column="cId"/>
+        <result property="tid" column="tid"/>
         <result property="ctBid" column="ctBid"/>
         <result property="devBid" column="devBid"/>
         <result property="ceGroupbid" column="ceGroupbid"/>
@@ -29,14 +29,14 @@
     </resultMap>
 
     <sql id="selectIotCmdexecVo">
-        select id, ceBid, cId, ctBid, devBid, ceGroupbid, ceType, ceGroupparentbid, ceSeq, ceInstruct, ceStatus, ceSendrecount, ceValidrecount, ceDelayddate, ceFinally, ceDesc, ceStartddate, ceCompletedate, ceModifieddate, ceCreateddate, ceDelstatus from IotCmdexec
+        select id, ceBid, tid, ctBid, devBid, ceGroupbid, ceType, ceGroupparentbid, ceSeq, ceInstruct, ceStatus, ceSendrecount, ceValidrecount, ceDelayddate, ceFinally, ceDesc, ceStartddate, ceCompletedate, ceModifieddate, ceCreateddate, ceDelstatus from IotCmdexec
     </sql>
 
     <select id="selectIotCmdexecList" parameterType="IotCmdexec" resultMap="IotCmdexecResult">
         <include refid="selectIotCmdexecVo"/>
         <where>
             <if test="ceBid != null  and ceBid != ''">and ceBid = #{ceBid}</if>
-            <if test="cId != null  and cId != ''">and cId = #{cId}</if>
+            <if test="tid != null  and tid != ''">and tid = #{tid}</if>
             <if test="ctBid != null  and ctBid != ''">and ctBid = #{ctBid}</if>
             <if test="devBid != null  and devBid != ''">and devBid = #{devBid}</if>
             <if test="ceGroupbid != null  and ceGroupbid != ''">and ceGroupbid = #{ceGroupbid}</if>
@@ -85,7 +85,7 @@
         insert into IotCmdexec
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="ceBid != null">ceBid,</if>
-            <if test="cId != null">cId,</if>
+            <if test="tid != null">tid,</if>
             <if test="ctBid != null">ctBid,</if>
             <if test="devBid != null">devBid,</if>
             <if test="ceGroupbid != null">ceGroupbid,</if>
@@ -107,7 +107,7 @@
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="ceBid != null">#{ceBid},</if>
-            <if test="cId != null">#{cId},</if>
+            <if test="tid != null">#{tid},</if>
             <if test="ctBid != null">#{ctBid},</if>
             <if test="devBid != null">#{devBid},</if>
             <if test="ceGroupbid != null">#{ceGroupbid},</if>
@@ -156,7 +156,7 @@
         <foreach collection="list" separator="," index="index" item="item">
             (
             #{item.ceBid},
-            #{item.cId},
+            #{item.tid},
             #{item.ctBid},
             #{item.devBid},
             #{item.ceGroupbid},
@@ -184,7 +184,7 @@
         update IotCmdexec
         <trim prefix="SET" suffixOverrides=",">
             <if test="ceBid != null">ceBid = #{ceBid},</if>
-            <if test="cId != null">cId = #{cId},</if>
+            <if test="tid != null">tid = #{tid},</if>
             <if test="ctBid != null">ctBid = #{ctBid},</if>
             <if test="devBid != null">devBid = #{devBid},</if>
             <if test="ceGroupbid != null">ceGroupbid = #{ceGroupbid},</if>
@@ -211,7 +211,7 @@
         update IotCmdexec
         <trim prefix="SET" suffixOverrides=",">
             <if test="ceBid != null">ceBid = #{ceBid},</if>
-            <if test="cId != null">cId = #{cId},</if>
+            <if test="tid != null">tid = #{tid},</if>
             <if test="ctBid != null">ctBid = #{ctBid},</if>
             <if test="devBid != null">devBid = #{devBid},</if>
             <if test="ceGroupbid != null">ceGroupbid = #{ceGroupbid},</if>

src/main/resources/mapper/IotCmdtaskMapper.xml

@@ -6,7 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <resultMap type="IotCmdtask" id="IotCmdtaskResult">
         <result property="id"    column="id"    />
-        <result property="cId"    column="cId"    />
+        <result property="tid"    column="tid"    />
         <result property="ctBid"    column="ctBid"    />
         <result property="ctStatus"    column="ctStatus"    />
         <result property="ctDescribe"    column="ctDescribe"    />
@@ -34,13 +34,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectIotCmdtaskVo">
-        select id, cId, ctBid, ctStatus, ctDescribe, ctStartddate, ctCompletedate, ctRequestid, ctRequestSource, ctRequestParam, ctReceiptstatus, ctReceiptddate, ctReceiptaddr, ctCreator, ctModifier, ctModifieddate, ctCreateddate, ctDelstatus, ctCreatorname, ctBiztype, ctBiztitle, ctParam, ctCtime, ctDevcode, ctDevtype from IotCmdtask
+        select id, tid, ctBid, ctStatus, ctDescribe, ctStartddate, ctCompletedate, ctRequestid, ctRequestSource, ctRequestParam, ctReceiptstatus, ctReceiptddate, ctReceiptaddr, ctCreator, ctModifier, ctModifieddate, ctCreateddate, ctDelstatus, ctCreatorname, ctBiztype, ctBiztitle, ctParam, ctCtime, ctDevcode, ctDevtype from IotCmdtask
     </sql>
 
     <select id="selectIotCmdtaskList" parameterType="IotCmdtask" resultMap="IotCmdtaskResult">
         <include refid="selectIotCmdtaskVo"/>
         <where>
-            <if test="cId != null  and cId != ''"> and cId = #{cId}</if>
+            <if test="tid != null  and tid != ''"> and tid = #{tid}</if>
             <if test="ctBid != null  and ctBid != ''"> and ctBid = #{ctBid}</if>
             <if test="ctStatus != null  and ctStatus != ''"> and ctStatus = #{ctStatus}</if>
             <if test="ctDescribe != null  and ctDescribe != ''"> and ctDescribe = #{ctDescribe}</if>
@@ -79,7 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertIotCmdtask" parameterType="IotCmdtask" useGeneratedKeys="true" keyProperty="id">
         insert into IotCmdtask
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="cId != null">cId,</if>
+            <if test="tid != null">tid,</if>
             <if test="ctBid != null">ctBid,</if>
             <if test="ctStatus != null">ctStatus,</if>
             <if test="ctDescribe != null and ctDescribe != ''">ctDescribe,</if>
@@ -105,7 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="ctDevtype != null">ctDevtype,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="cId != null">#{cId},</if>
+            <if test="tid != null">#{tid},</if>
             <if test="ctBid != null">#{ctBid},</if>
             <if test="ctStatus != null">#{ctStatus},</if>
             <if test="ctDescribe != null and ctDescribe != ''">#{ctDescribe},</if>
@@ -135,7 +135,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateIotCmdtask" parameterType="IotCmdtask">
         update IotCmdtask
         <trim prefix="SET" suffixOverrides=",">
-            <if test="cId != null">cId = #{cId},</if>
+            <if test="tid != null">tid = #{tid},</if>
             <if test="ctBid != null">ctBid = #{ctBid},</if>
             <if test="ctStatus != null">ctStatus = #{ctStatus},</if>
             <if test="ctDescribe != null and ctDescribe != ''">ctDescribe = #{ctDescribe},</if>
@@ -165,7 +165,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateIotCmdtaskByCtBid">
         update IotCmdtask
         <trim prefix="SET" suffixOverrides=",">
-            <if test="cId != null">cId = #{cId},</if>
+            <if test="tid != null">tid = #{tid},</if>
             <if test="ctBid != null">ctBid = #{ctBid},</if>
             <if test="ctStatus != null">ctStatus = #{ctStatus},</if>
             <if test="ctDescribe != null and ctDescribe != ''">ctDescribe = #{ctDescribe},</if>