数据库改造代码提交

iot-data-receiver/src/main/java/com/zcxk/zoniot/data/receiver/dao/DeviceValveRecordMapper.java

@@ -0,0 +1,36 @@
+package com.zcxk.zoniot.data.receiver.dao;
+
+import com.zcxk.zoniot.data.receiver.model.DeviceValveRecord;
+import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p></p>
+ * @Author wilian.peng
+ * @Date 2020/7/7 14:57
+ * @Version 1.0
+ */
+@Mapper
+public interface DeviceValveRecordMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(DeviceValveRecord record);
+
+    int insertOrUpdate(DeviceValveRecord record);
+
+    int insertOrUpdateSelective(DeviceValveRecord record);
+
+    int insertSelective(DeviceValveRecord record);
+
+    DeviceValveRecord selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(DeviceValveRecord record);
+
+    int updateByPrimaryKey(DeviceValveRecord record);
+
+    int batchInsert(@Param("list") List<DeviceValveRecord> list);
+
+    int updateCommandStatus(@Param("commandId") String commandId, @Param("commandStatus") String commandStatus, @Param("message") String message);
+}

iot-data-receiver/src/main/java/com/zcxk/zoniot/data/receiver/model/DeviceValveRecord.java

@@ -0,0 +1,73 @@
+package com.zcxk.zoniot.data.receiver.model;
+
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * <p></p>
+ * @Author wilian.peng
+ * @Date 2020/7/7 14:57
+ * @Version 1.0
+ */
+@Data
+public class DeviceValveRecord {
+    /**
+    * id
+    */
+    private Integer id;
+
+    /**
+    * 设备id
+    */
+    private Long deviceId;
+
+    /**
+    * 下发阀门状态 0：关阀 1：开阀
+    */
+    private Integer sendValveStatus;
+
+    /**
+    * 下发状态 0：未发送 1：已发送
+    */
+    private Integer sendStatus;
+
+    /**
+    * 指令id
+    */
+    private String commandId;
+
+    /**
+    * 指令状态
+    */
+    private String commandStatus;
+
+    /**
+    * 备注
+    */
+    private String remark;
+
+    /**
+    * 状态
+    */
+    private Integer status;
+
+    /**
+    * 创建时间
+    */
+    private Date dateCreate;
+
+    /**
+    * 更新时间
+    */
+    private Date dateUpdate;
+
+    /**
+    * 创建人
+    */
+    private String createBy;
+
+    /**
+    * 更新人
+    */
+    private String updateBy;
+}

iot-data-receiver/src/main/resources/mapper/DeviceValveRecordMapper.xml

@@ -0,0 +1,368 @@
+<?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.zcxk.zoniot.data.receiver.dao.DeviceValveRecordMapper">
+  <resultMap id="BaseResultMap" type="com.zcxk.zoniot.data.receiver.model.DeviceValveRecord">
+    <!--@mbg.generated-->
+    <!--@Table sc_device_valve_record-->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="device_id" jdbcType="BIGINT" property="deviceId" />
+    <result column="send_valve_status" jdbcType="INTEGER" property="sendValveStatus" />
+    <result column="send_status" jdbcType="INTEGER" property="sendStatus" />
+    <result column="command_id" jdbcType="VARCHAR" property="commandId" />
+    <result column="command_status" jdbcType="VARCHAR" property="commandStatus" />
+    <result column="remark" jdbcType="VARCHAR" property="remark" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="date_create" jdbcType="TIMESTAMP" property="dateCreate" />
+    <result column="date_update" jdbcType="TIMESTAMP" property="dateUpdate" />
+    <result column="create_by" jdbcType="VARCHAR" property="createBy" />
+    <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, device_id, send_valve_status, send_status, command_id, command_status, remark, 
+    `status`, date_create, date_update, create_by, update_by
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    <!--@mbg.generated-->
+    select 
+    <include refid="Base_Column_List" />
+    from sc_device_valve_record
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    <!--@mbg.generated-->
+    delete from sc_device_valve_record
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.zcxk.zoniot.data.receiver.model.DeviceValveRecord" useGeneratedKeys="true">
+    <!--@mbg.generated-->
+    insert into sc_device_valve_record (device_id, send_valve_status, send_status, 
+      command_id, command_status, remark, 
+      `status`, date_create, date_update, 
+      create_by, update_by)
+    values (#{deviceId,jdbcType=BIGINT}, #{sendValveStatus,jdbcType=INTEGER}, #{sendStatus,jdbcType=INTEGER}, 
+      #{commandId,jdbcType=VARCHAR}, #{commandStatus,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, 
+      #{status,jdbcType=INTEGER}, #{dateCreate,jdbcType=TIMESTAMP}, #{dateUpdate,jdbcType=TIMESTAMP}, 
+      #{createBy,jdbcType=VARCHAR}, #{updateBy,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.zcxk.zoniot.data.receiver.model.DeviceValveRecord" useGeneratedKeys="true">
+    <!--@mbg.generated-->
+    insert into sc_device_valve_record
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="deviceId != null">
+        device_id,
+      </if>
+      <if test="sendValveStatus != null">
+        send_valve_status,
+      </if>
+      <if test="sendStatus != null">
+        send_status,
+      </if>
+      <if test="commandId != null">
+        command_id,
+      </if>
+      <if test="commandStatus != null">
+        command_status,
+      </if>
+      <if test="remark != null">
+        remark,
+      </if>
+      <if test="status != null">
+        `status`,
+      </if>
+      <if test="dateCreate != null">
+        date_create,
+      </if>
+      <if test="dateUpdate != null">
+        date_update,
+      </if>
+      <if test="createBy != null">
+        create_by,
+      </if>
+      <if test="updateBy != null">
+        update_by,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="deviceId != null">
+        #{deviceId,jdbcType=BIGINT},
+      </if>
+      <if test="sendValveStatus != null">
+        #{sendValveStatus,jdbcType=INTEGER},
+      </if>
+      <if test="sendStatus != null">
+        #{sendStatus,jdbcType=INTEGER},
+      </if>
+      <if test="commandId != null">
+        #{commandId,jdbcType=VARCHAR},
+      </if>
+      <if test="commandStatus != null">
+        #{commandStatus,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null">
+        #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=INTEGER},
+      </if>
+      <if test="dateCreate != null">
+        #{dateCreate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="dateUpdate != null">
+        #{dateUpdate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createBy != null">
+        #{createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="updateBy != null">
+        #{updateBy,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.zcxk.zoniot.data.receiver.model.DeviceValveRecord">
+    <!--@mbg.generated-->
+    update sc_device_valve_record
+    <set>
+      <if test="deviceId != null">
+        device_id = #{deviceId,jdbcType=BIGINT},
+      </if>
+      <if test="sendValveStatus != null">
+        send_valve_status = #{sendValveStatus,jdbcType=INTEGER},
+      </if>
+      <if test="sendStatus != null">
+        send_status = #{sendStatus,jdbcType=INTEGER},
+      </if>
+      <if test="commandId != null">
+        command_id = #{commandId,jdbcType=VARCHAR},
+      </if>
+      <if test="commandStatus != null">
+        command_status = #{commandStatus,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null">
+        remark = #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        `status` = #{status,jdbcType=INTEGER},
+      </if>
+      <if test="dateCreate != null">
+        date_create = #{dateCreate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="dateUpdate != null">
+        date_update = #{dateUpdate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createBy != null">
+        create_by = #{createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="updateBy != null">
+        update_by = #{updateBy,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.zcxk.zoniot.data.receiver.model.DeviceValveRecord">
+    <!--@mbg.generated-->
+    update sc_device_valve_record
+    set device_id = #{deviceId,jdbcType=BIGINT},
+      send_valve_status = #{sendValveStatus,jdbcType=INTEGER},
+      send_status = #{sendStatus,jdbcType=INTEGER},
+      command_id = #{commandId,jdbcType=VARCHAR},
+      command_status = #{commandStatus,jdbcType=VARCHAR},
+      remark = #{remark,jdbcType=VARCHAR},
+      `status` = #{status,jdbcType=INTEGER},
+      date_create = #{dateCreate,jdbcType=TIMESTAMP},
+      date_update = #{dateUpdate,jdbcType=TIMESTAMP},
+      create_by = #{createBy,jdbcType=VARCHAR},
+      update_by = #{updateBy,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <insert id="batchInsert" keyColumn="id" keyProperty="id" parameterType="map" useGeneratedKeys="true">
+    <!--@mbg.generated-->
+    insert into sc_device_valve_record
+    (device_id, send_valve_status, send_status, command_id, command_status, remark, `status`, 
+      date_create, date_update, create_by, update_by)
+    values
+    <foreach collection="list" item="item" separator=",">
+      (#{item.deviceId,jdbcType=BIGINT}, #{item.sendValveStatus,jdbcType=INTEGER}, #{item.sendStatus,jdbcType=INTEGER}, 
+        #{item.commandId,jdbcType=VARCHAR}, #{item.commandStatus,jdbcType=VARCHAR}, #{item.remark,jdbcType=VARCHAR}, 
+        #{item.status,jdbcType=INTEGER}, #{item.dateCreate,jdbcType=TIMESTAMP}, #{item.dateUpdate,jdbcType=TIMESTAMP}, 
+        #{item.createBy,jdbcType=VARCHAR}, #{item.updateBy,jdbcType=VARCHAR})
+    </foreach>
+  </insert>
+  <insert id="insertOrUpdate" keyColumn="id" keyProperty="id" parameterType="com.zcxk.zoniot.data.receiver.model.DeviceValveRecord" useGeneratedKeys="true">
+    <!--@mbg.generated-->
+    insert into sc_device_valve_record
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      device_id,
+      send_valve_status,
+      send_status,
+      command_id,
+      command_status,
+      remark,
+      `status`,
+      date_create,
+      date_update,
+      create_by,
+      update_by,
+    </trim>
+    values
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      #{deviceId,jdbcType=BIGINT},
+      #{sendValveStatus,jdbcType=INTEGER},
+      #{sendStatus,jdbcType=INTEGER},
+      #{commandId,jdbcType=VARCHAR},
+      #{commandStatus,jdbcType=VARCHAR},
+      #{remark,jdbcType=VARCHAR},
+      #{status,jdbcType=INTEGER},
+      #{dateCreate,jdbcType=TIMESTAMP},
+      #{dateUpdate,jdbcType=TIMESTAMP},
+      #{createBy,jdbcType=VARCHAR},
+      #{updateBy,jdbcType=VARCHAR},
+    </trim>
+    on duplicate key update 
+    <trim suffixOverrides=",">
+      <if test="id != null">
+        id = #{id,jdbcType=INTEGER},
+      </if>
+      device_id = #{deviceId,jdbcType=BIGINT},
+      send_valve_status = #{sendValveStatus,jdbcType=INTEGER},
+      send_status = #{sendStatus,jdbcType=INTEGER},
+      command_id = #{commandId,jdbcType=VARCHAR},
+      command_status = #{commandStatus,jdbcType=VARCHAR},
+      remark = #{remark,jdbcType=VARCHAR},
+      `status` = #{status,jdbcType=INTEGER},
+      date_create = #{dateCreate,jdbcType=TIMESTAMP},
+      date_update = #{dateUpdate,jdbcType=TIMESTAMP},
+      create_by = #{createBy,jdbcType=VARCHAR},
+      update_by = #{updateBy,jdbcType=VARCHAR},
+    </trim>
+  </insert>
+  <insert id="insertOrUpdateSelective" keyColumn="id" keyProperty="id" parameterType="com.zcxk.zoniot.data.receiver.model.DeviceValveRecord" useGeneratedKeys="true">
+    <!--@mbg.generated-->
+    insert into sc_device_valve_record
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="deviceId != null">
+        device_id,
+      </if>
+      <if test="sendValveStatus != null">
+        send_valve_status,
+      </if>
+      <if test="sendStatus != null">
+        send_status,
+      </if>
+      <if test="commandId != null">
+        command_id,
+      </if>
+      <if test="commandStatus != null">
+        command_status,
+      </if>
+      <if test="remark != null">
+        remark,
+      </if>
+      <if test="status != null">
+        `status`,
+      </if>
+      <if test="dateCreate != null">
+        date_create,
+      </if>
+      <if test="dateUpdate != null">
+        date_update,
+      </if>
+      <if test="createBy != null">
+        create_by,
+      </if>
+      <if test="updateBy != null">
+        update_by,
+      </if>
+    </trim>
+    values
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="deviceId != null">
+        #{deviceId,jdbcType=BIGINT},
+      </if>
+      <if test="sendValveStatus != null">
+        #{sendValveStatus,jdbcType=INTEGER},
+      </if>
+      <if test="sendStatus != null">
+        #{sendStatus,jdbcType=INTEGER},
+      </if>
+      <if test="commandId != null">
+        #{commandId,jdbcType=VARCHAR},
+      </if>
+      <if test="commandStatus != null">
+        #{commandStatus,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null">
+        #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=INTEGER},
+      </if>
+      <if test="dateCreate != null">
+        #{dateCreate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="dateUpdate != null">
+        #{dateUpdate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createBy != null">
+        #{createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="updateBy != null">
+        #{updateBy,jdbcType=VARCHAR},
+      </if>
+    </trim>
+    on duplicate key update 
+    <trim suffixOverrides=",">
+      <if test="id != null">
+        id = #{id,jdbcType=INTEGER},
+      </if>
+      <if test="deviceId != null">
+        device_id = #{deviceId,jdbcType=BIGINT},
+      </if>
+      <if test="sendValveStatus != null">
+        send_valve_status = #{sendValveStatus,jdbcType=INTEGER},
+      </if>
+      <if test="sendStatus != null">
+        send_status = #{sendStatus,jdbcType=INTEGER},
+      </if>
+      <if test="commandId != null">
+        command_id = #{commandId,jdbcType=VARCHAR},
+      </if>
+      <if test="commandStatus != null">
+        command_status = #{commandStatus,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null">
+        remark = #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        `status` = #{status,jdbcType=INTEGER},
+      </if>
+      <if test="dateCreate != null">
+        date_create = #{dateCreate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="dateUpdate != null">
+        date_update = #{dateUpdate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createBy != null">
+        create_by = #{createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="updateBy != null">
+        update_by = #{updateBy,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateCommandStatus">
+    update sc_device_valve_record set command_status = #{commandStatus},remark=#{message},date_update=NOW() where status = 1 and command_id = #{commandId}
+  </update>
+</mapper>