指令信息

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/OrderInfo.java

@@ -37,6 +37,10 @@ public class OrderInfo extends BaseEntity {
     @Excel(name = "参数内容：JSON格式")
     private String content;
 
+    /** 指令状态，0：待执行，1：完成，99：执行异常 */
+    @Excel(name = "指令状态")
+    private Long status;
+
     /**
      * 数据是否删除（1：删除，0有效）
      */
@@ -74,6 +78,14 @@ public class OrderInfo extends BaseEntity {
         return content;
     }
 
+    public Long getStatus() {
+        return status;
+    }
+
+    public void setStatus(Long status) {
+        this.status = status;
+    }
+
     public void setIsDelete(Long isDelete) {
         this.isDelete = isDelete;
     }

PHM-admin/phm-manage/src/main/resources/mapper/manage/OrderInfoMapper.xml

@@ -1,14 +1,15 @@
 <?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">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.phm.manage.mapper.OrderInfoMapper">
-    
+
     <resultMap type="OrderInfo" id="OrderInfoResult">
         <result property="id"    column="id"    />
         <result property="orderName"    column="order_name"    />
         <result property="orderType"    column="order_type"    />
         <result property="content"    column="content"    />
+        <result property="status"    column="status"    />
         <result property="isDelete"    column="is_delete"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
@@ -17,45 +18,53 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectOrderInfoVo">
-        select id, order_name, order_type, content, is_delete, create_by, create_time, update_by, update_time from phm_order_info
+        select id, order_name, order_type, content, status, is_delete, create_by, create_time, update_by, update_time from phm_order_info
     </sql>
 
     <select id="selectOrderInfoList" parameterType="OrderInfo" resultMap="OrderInfoResult">
         <include refid="selectOrderInfoVo"/>
-        <where>  
+        <where>
             <if test="orderName != null  and orderName != ''"> and order_name like concat('%', #{orderName}, '%')</if>
             <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
             <if test="content != null  and content != ''"> and content = #{content}</if>
+            <if test="status != null "> and status = #{status}</if>
+            <if test="isDelete != null "> and is_delete = #{isDelete}</if>
+            <if test="createBy != null  and createBy != ''"> and create_by = #{createBy}</if>
+            <if test="createTime != null "> and create_time = #{createTime}</if>
+            <if test="updateBy != null  and updateBy != ''"> and update_by = #{updateBy}</if>
+            <if test="updateTime != null "> and update_time = #{updateTime}</if>
         </where>
     </select>
-    
+
     <select id="selectOrderInfoById" parameterType="Long" resultMap="OrderInfoResult">
         <include refid="selectOrderInfoVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertOrderInfo" parameterType="OrderInfo" useGeneratedKeys="true" keyProperty="id">
         insert into phm_order_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="orderName != null">order_name,</if>
             <if test="orderType != null">order_type,</if>
             <if test="content != null">content,</if>
+            <if test="status != null">status,</if>
             <if test="isDelete != null">is_delete,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="orderName != null">#{orderName},</if>
             <if test="orderType != null">#{orderType},</if>
             <if test="content != null">#{content},</if>
+            <if test="status != null">#{status},</if>
             <if test="isDelete != null">#{isDelete},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateOrderInfo" parameterType="OrderInfo">
@@ -64,6 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="orderName != null">order_name = #{orderName},</if>
             <if test="orderType != null">order_type = #{orderType},</if>
             <if test="content != null">content = #{content},</if>
+            <if test="status != null">status = #{status},</if>
             <if test="isDelete != null">is_delete = #{isDelete},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
@@ -78,7 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteOrderInfoByIds" parameterType="String">
-        delete from phm_order_info where id in 
+        delete from phm_order_info where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>