diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml
new file mode 100644
index 0000000..bd2c2cc
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml
@@ -0,0 +1,22 @@
+<?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.casic.missiles.mapper.AlarmConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmConfig">
+        <id column="id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="name" property="name" />
+        <result column="alarm_content" property="alarmContent" />
+        <result column="period_high" property="periodHigh" />
+        <result column="period_low" property="periodLow" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, product_id, alarm_content, period_high, period_low, TypeName, CreatorId, creater_user_id, create_time
+    </sql>
+
+</mapper>

diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml
new file mode 100644
index 0000000..bd2c2cc
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml
@@ -0,0 +1,22 @@
+<?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.casic.missiles.mapper.AlarmConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmConfig">
+        <id column="id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="name" property="name" />
+        <result column="alarm_content" property="alarmContent" />
+        <result column="period_high" property="periodHigh" />
+        <result column="period_low" property="periodLow" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, product_id, alarm_content, period_high, period_low, TypeName, CreatorId, creater_user_id, create_time
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml
new file mode 100644
index 0000000..4aee44a
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml
@@ -0,0 +1,23 @@
+<?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.casic.missiles.mapper.AlarmDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmData">
+        <id column="id" property="id" />
+        <result column="alarm_type" property="alarmType" />
+        <result column="alarm_content" property="alarmContent" />
+        <result column="devcode" property="devcode" />
+        <result column="alarm_time" property="alarmTime" />
+        <result column="alarm_value" property="alarmValue" />
+        <result column="status" property="status" />
+        <result column="create_name" property="createName" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, alarm_type, alarm_content, devcode, alarm_time, alarm_value, status, CreatorName, create_time
+    </sql>
+
+</mapper>

diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml
new file mode 100644
index 0000000..bd2c2cc
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml
@@ -0,0 +1,22 @@
+<?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.casic.missiles.mapper.AlarmConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmConfig">
+        <id column="id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="name" property="name" />
+        <result column="alarm_content" property="alarmContent" />
+        <result column="period_high" property="periodHigh" />
+        <result column="period_low" property="periodLow" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, product_id, alarm_content, period_high, period_low, TypeName, CreatorId, creater_user_id, create_time
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml
new file mode 100644
index 0000000..4aee44a
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml
@@ -0,0 +1,23 @@
+<?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.casic.missiles.mapper.AlarmDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmData">
+        <id column="id" property="id" />
+        <result column="alarm_type" property="alarmType" />
+        <result column="alarm_content" property="alarmContent" />
+        <result column="devcode" property="devcode" />
+        <result column="alarm_time" property="alarmTime" />
+        <result column="alarm_value" property="alarmValue" />
+        <result column="status" property="status" />
+        <result column="create_name" property="createName" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, alarm_type, alarm_content, devcode, alarm_time, alarm_value, status, CreatorName, create_time
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml b/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml
new file mode 100644
index 0000000..b4965d6
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml
@@ -0,0 +1,70 @@
+<?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.casic.missiles.mapper.BusConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.BusConfig">
+        <id column="id" property="id"/>
+        <result column="devcode" property="devcode"/>
+        <result column="config_json" property="configJson"/>
+        <result column="status" property="status"/>
+        <result column="send_time" property="sendTime"/>
+        <result column="create_time" property="createTime"/>
+        <result column="create_user_id" property="createUserId"/>
+    </resultMap>
+
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, Pid, devcode, config_json, status, update_time, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.model.BusConfig">
+        select bc.id,bc.devcode,config_type AS "configType", config_json AS "configJson",bc.status,
+        send_time as "sendTime",bc.create_time AS "createTime",bc.create_user_id AS "createUserId",
+        bc.create_user_name AS "createUserName",dg.deptid
+        FROM (
+            SELECT *
+            FROM bus_config
+            WHERE 1=1
+            <if test="request.configType != null and request.configType != '' ">
+                AND config_type =#{request.configType}
+            </if>
+            <if test="request.devcode != '' and request.devcode != null">
+                AND devcode =#{request.devcode}
+            </if>
+            <if test="request.status != '' and request.status != null">
+                AND status =#{request.status}
+            </if>
+            <if test="request.beginTime!='' and request.beginTime!=null">
+                AND send_time <![CDATA[  >=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.beginTime}"/>
+                </include>
+            </if>
+            <if test="request.endTime!='' and request.endTime!=null">
+                AND send_time <![CDATA[  <=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.endTime}"/>
+                </include>
+            </if>
+        )bc
+        JOIN device d ON d.devcode=bc.devcode
+        JOIN device_group dg ON dg.id= d.group_id
+
+    </select>
+
+
+</mapper>

diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml
new file mode 100644
index 0000000..bd2c2cc
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml
@@ -0,0 +1,22 @@
+<?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.casic.missiles.mapper.AlarmConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmConfig">
+        <id column="id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="name" property="name" />
+        <result column="alarm_content" property="alarmContent" />
+        <result column="period_high" property="periodHigh" />
+        <result column="period_low" property="periodLow" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, product_id, alarm_content, period_high, period_low, TypeName, CreatorId, creater_user_id, create_time
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml
new file mode 100644
index 0000000..4aee44a
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml
@@ -0,0 +1,23 @@
+<?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.casic.missiles.mapper.AlarmDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmData">
+        <id column="id" property="id" />
+        <result column="alarm_type" property="alarmType" />
+        <result column="alarm_content" property="alarmContent" />
+        <result column="devcode" property="devcode" />
+        <result column="alarm_time" property="alarmTime" />
+        <result column="alarm_value" property="alarmValue" />
+        <result column="status" property="status" />
+        <result column="create_name" property="createName" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, alarm_type, alarm_content, devcode, alarm_time, alarm_value, status, CreatorName, create_time
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml b/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml
new file mode 100644
index 0000000..b4965d6
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml
@@ -0,0 +1,70 @@
+<?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.casic.missiles.mapper.BusConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.BusConfig">
+        <id column="id" property="id"/>
+        <result column="devcode" property="devcode"/>
+        <result column="config_json" property="configJson"/>
+        <result column="status" property="status"/>
+        <result column="send_time" property="sendTime"/>
+        <result column="create_time" property="createTime"/>
+        <result column="create_user_id" property="createUserId"/>
+    </resultMap>
+
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, Pid, devcode, config_json, status, update_time, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.model.BusConfig">
+        select bc.id,bc.devcode,config_type AS "configType", config_json AS "configJson",bc.status,
+        send_time as "sendTime",bc.create_time AS "createTime",bc.create_user_id AS "createUserId",
+        bc.create_user_name AS "createUserName",dg.deptid
+        FROM (
+            SELECT *
+            FROM bus_config
+            WHERE 1=1
+            <if test="request.configType != null and request.configType != '' ">
+                AND config_type =#{request.configType}
+            </if>
+            <if test="request.devcode != '' and request.devcode != null">
+                AND devcode =#{request.devcode}
+            </if>
+            <if test="request.status != '' and request.status != null">
+                AND status =#{request.status}
+            </if>
+            <if test="request.beginTime!='' and request.beginTime!=null">
+                AND send_time <![CDATA[  >=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.beginTime}"/>
+                </include>
+            </if>
+            <if test="request.endTime!='' and request.endTime!=null">
+                AND send_time <![CDATA[  <=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.endTime}"/>
+                </include>
+            </if>
+        )bc
+        JOIN device d ON d.devcode=bc.devcode
+        JOIN device_group dg ON dg.id= d.group_id
+
+    </select>
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml
new file mode 100644
index 0000000..083b289
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml
@@ -0,0 +1,106 @@
+<?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.casic.missiles.mapper.DeviceDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceData">
+        <id column="id" property="id"/>
+        <result column="devcode" property="devcode"/>
+        <result column="device_type" property="deviceType"/>
+        <result column="cell" property="cell"/>
+        <result column="data_json" property="dataJson"/>
+        <result column="decrypt_before_data" property="decryptBeforeData"/>
+        <result column="decrypt_after_data" property="decryptAfterData"/>
+        <result column="uptime" property="uptime"/>
+        <result column="logtime" property="logtime"/>
+    </resultMap>
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, devcode, device_type, cell, data_json, decrypt_before_data, decrypt_after_data, uptime, logtime
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.data.DeviceDataListVO">
+          SELECT  	dd.id,
+                    dd.devcode,
+                    dd.device_type AS "deviceType",
+                    deptid,
+                    dd.cell,
+                    dd.data_json AS "dataJson",
+                    decrypt_before_data AS "decryptBeforeData",
+                    decrypt_after_data AS "decryptAfterData",
+                    uptime,
+                    logtime,
+                    d.STATUS,
+                    d.group_id AS "groupId",
+                    dg.group_name AS "groupName"
+        FROM (
+               SELECT *
+               FROM device_data
+               WHERE  1=1
+                <if test="request.devcode!='' and request.devcode != null">
+                    AND devcode like CONCAT('%',#{request.devcode},'%')
+                </if>
+                <if test="request.deviceType!='' and request.deviceType != null">
+                    AND device_type =#{request.deviceType}
+                </if>
+                <if test="request.beginTime!='' and request.beginTime!=null">
+                    AND logtime <![CDATA[  >=  ]]>
+                    <include refid="char_toDate">
+                        <property name="paramStr" value="#{request.beginTime}"/>
+                    </include>
+                </if>
+                <if test="request.endTime!='' and request.endTime!=null">
+                    AND logtime <![CDATA[  <=  ]]>
+                    <include refid="char_toDate">
+                        <property name="paramStr" value="#{request.endTime}"/>
+                    </include>
+                </if>
+                <if test="request.ids != null">
+                    and id in
+                    <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                        #{id}
+                    </foreach>
+                </if>
+
+          )dd
+          JOIN (
+                SELECT id, group_id,status,devcode
+                FROM device
+                WHERE valid=1
+                <if test="request.devcode!='' and request.devcode != null">
+                    AND devcode like CONCAT('%',#{request.devcode},'%')
+                </if>
+                <if test="request.deviceType!='' and request.deviceType != null">
+                    AND device_type =#{request.deviceType}
+                </if>
+                <if test="request.groupId!='' and request.groupId != null">
+                    AND greoup_id=#{request.groupId}
+                </if>
+          )d ON d.devcode=dd.devcode
+          JOIN (
+                SELECT   deptid,id,group_name
+                FROM device_group
+                WHERE valid=1
+                <if test="request.groupId!='' and request.groupId != null">
+                    AND id=#{request.groupId}
+                </if>
+          ) dg ON dg.id=d.group_id
+          order by logtime desc
+
+    </select>
+
+
+</mapper>

diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml
new file mode 100644
index 0000000..bd2c2cc
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml
@@ -0,0 +1,22 @@
+<?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.casic.missiles.mapper.AlarmConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmConfig">
+        <id column="id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="name" property="name" />
+        <result column="alarm_content" property="alarmContent" />
+        <result column="period_high" property="periodHigh" />
+        <result column="period_low" property="periodLow" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, product_id, alarm_content, period_high, period_low, TypeName, CreatorId, creater_user_id, create_time
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml
new file mode 100644
index 0000000..4aee44a
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml
@@ -0,0 +1,23 @@
+<?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.casic.missiles.mapper.AlarmDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmData">
+        <id column="id" property="id" />
+        <result column="alarm_type" property="alarmType" />
+        <result column="alarm_content" property="alarmContent" />
+        <result column="devcode" property="devcode" />
+        <result column="alarm_time" property="alarmTime" />
+        <result column="alarm_value" property="alarmValue" />
+        <result column="status" property="status" />
+        <result column="create_name" property="createName" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, alarm_type, alarm_content, devcode, alarm_time, alarm_value, status, CreatorName, create_time
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml b/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml
new file mode 100644
index 0000000..b4965d6
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml
@@ -0,0 +1,70 @@
+<?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.casic.missiles.mapper.BusConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.BusConfig">
+        <id column="id" property="id"/>
+        <result column="devcode" property="devcode"/>
+        <result column="config_json" property="configJson"/>
+        <result column="status" property="status"/>
+        <result column="send_time" property="sendTime"/>
+        <result column="create_time" property="createTime"/>
+        <result column="create_user_id" property="createUserId"/>
+    </resultMap>
+
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, Pid, devcode, config_json, status, update_time, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.model.BusConfig">
+        select bc.id,bc.devcode,config_type AS "configType", config_json AS "configJson",bc.status,
+        send_time as "sendTime",bc.create_time AS "createTime",bc.create_user_id AS "createUserId",
+        bc.create_user_name AS "createUserName",dg.deptid
+        FROM (
+            SELECT *
+            FROM bus_config
+            WHERE 1=1
+            <if test="request.configType != null and request.configType != '' ">
+                AND config_type =#{request.configType}
+            </if>
+            <if test="request.devcode != '' and request.devcode != null">
+                AND devcode =#{request.devcode}
+            </if>
+            <if test="request.status != '' and request.status != null">
+                AND status =#{request.status}
+            </if>
+            <if test="request.beginTime!='' and request.beginTime!=null">
+                AND send_time <![CDATA[  >=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.beginTime}"/>
+                </include>
+            </if>
+            <if test="request.endTime!='' and request.endTime!=null">
+                AND send_time <![CDATA[  <=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.endTime}"/>
+                </include>
+            </if>
+        )bc
+        JOIN device d ON d.devcode=bc.devcode
+        JOIN device_group dg ON dg.id= d.group_id
+
+    </select>
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml
new file mode 100644
index 0000000..083b289
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml
@@ -0,0 +1,106 @@
+<?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.casic.missiles.mapper.DeviceDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceData">
+        <id column="id" property="id"/>
+        <result column="devcode" property="devcode"/>
+        <result column="device_type" property="deviceType"/>
+        <result column="cell" property="cell"/>
+        <result column="data_json" property="dataJson"/>
+        <result column="decrypt_before_data" property="decryptBeforeData"/>
+        <result column="decrypt_after_data" property="decryptAfterData"/>
+        <result column="uptime" property="uptime"/>
+        <result column="logtime" property="logtime"/>
+    </resultMap>
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, devcode, device_type, cell, data_json, decrypt_before_data, decrypt_after_data, uptime, logtime
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.data.DeviceDataListVO">
+          SELECT  	dd.id,
+                    dd.devcode,
+                    dd.device_type AS "deviceType",
+                    deptid,
+                    dd.cell,
+                    dd.data_json AS "dataJson",
+                    decrypt_before_data AS "decryptBeforeData",
+                    decrypt_after_data AS "decryptAfterData",
+                    uptime,
+                    logtime,
+                    d.STATUS,
+                    d.group_id AS "groupId",
+                    dg.group_name AS "groupName"
+        FROM (
+               SELECT *
+               FROM device_data
+               WHERE  1=1
+                <if test="request.devcode!='' and request.devcode != null">
+                    AND devcode like CONCAT('%',#{request.devcode},'%')
+                </if>
+                <if test="request.deviceType!='' and request.deviceType != null">
+                    AND device_type =#{request.deviceType}
+                </if>
+                <if test="request.beginTime!='' and request.beginTime!=null">
+                    AND logtime <![CDATA[  >=  ]]>
+                    <include refid="char_toDate">
+                        <property name="paramStr" value="#{request.beginTime}"/>
+                    </include>
+                </if>
+                <if test="request.endTime!='' and request.endTime!=null">
+                    AND logtime <![CDATA[  <=  ]]>
+                    <include refid="char_toDate">
+                        <property name="paramStr" value="#{request.endTime}"/>
+                    </include>
+                </if>
+                <if test="request.ids != null">
+                    and id in
+                    <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                        #{id}
+                    </foreach>
+                </if>
+
+          )dd
+          JOIN (
+                SELECT id, group_id,status,devcode
+                FROM device
+                WHERE valid=1
+                <if test="request.devcode!='' and request.devcode != null">
+                    AND devcode like CONCAT('%',#{request.devcode},'%')
+                </if>
+                <if test="request.deviceType!='' and request.deviceType != null">
+                    AND device_type =#{request.deviceType}
+                </if>
+                <if test="request.groupId!='' and request.groupId != null">
+                    AND greoup_id=#{request.groupId}
+                </if>
+          )d ON d.devcode=dd.devcode
+          JOIN (
+                SELECT   deptid,id,group_name
+                FROM device_group
+                WHERE valid=1
+                <if test="request.groupId!='' and request.groupId != null">
+                    AND id=#{request.groupId}
+                </if>
+          ) dg ON dg.id=d.group_id
+          order by logtime desc
+
+    </select>
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml
new file mode 100644
index 0000000..2e07287
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml
@@ -0,0 +1,148 @@
+<?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.casic.missiles.mapper.DeviceGroupMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceGroup">
+        <id column="id" property="id" />
+        <result column="group_name" property="groupName" />
+        <result column="group_no" property="groupNo" />
+        <result column="descn" property="descn" />
+        <result column="deptid" property="deptid" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="owner" property="owner" />
+        <result column="valid" property="valid" />
+    </resultMap>
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, owner, subcribe_ids, descn, dept, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
+        SELECT
+            dg.id,
+            group_no AS "groupNo",
+            deptid,
+             deviceCount,
+            subscribeCount,
+            descn,
+            create_time AS "createTime",
+            group_name AS "groupName",
+            create_user_id AS "createUserId",
+            create_user_name AS "createUserName"
+        FROM
+          (
+             SELECT *
+             FROM device_group
+             WHERE valid = 1
+            <if test="request.groupNo != null and request.groupNo != '' ">
+                AND group_no =#{request.groupNo}
+            </if>
+            <if test="request.groupName != '' and request.groupName != null">
+                AND group_name =#{request.groupName}
+            </if>
+            <if test="request.ids != null">
+                and id in
+                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+            <if test="request.beginTime!='' and request.beginTime!=null">
+                AND create_time <![CDATA[  >=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.beginTime}"/>
+                </include>
+            </if>
+            <if test="request.endTime!='' and request.endTime!=null">
+                AND create_time <![CDATA[  <=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.endTime}"/>
+                </include>
+            </if>
+          ) dg
+            LEFT JOIN (
+                   SELECT count(id)  AS "deviceCount",group_id as groupId
+                   FROM device d
+                   WHERE VALID = 1
+                   GROUP BY group_id
+        ) d ON d.groupId = dg.id
+            LEFT JOIN (
+                 SELECT count(id)  AS "subscribeCount",group_id AS groupId
+                 FROM subscribe_store GROUP BY group_id
+           ) s ON s.groupId = dg.id
+         order by create_time desc
+    </select>
+
+    <select id="list" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
+        SELECT
+        dg.id,
+        group_no AS "groupNo",
+        deptid,
+        count( d.id ) AS "deviceCount",
+        count( s.id ) AS "subscribeCount",
+        descn,
+        create_time AS "createTime",
+        group_name AS "groupName"
+        FROM
+        (
+        SELECT *
+        FROM device_group
+        WHERE valid = 1
+        <if test="request.groupNo != null and request.groupNo != '' ">
+            AND group_no =#{request.groupNo}
+        </if>
+        <if test="request.groupName != '' and request.groupName != null">
+            AND group_name =#{request.groupName}
+        </if>
+        <if test="request.ids != null">
+            and id in
+            <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+        <if test="request.beginTime!='' and request.beginTime!=null">
+            AND create_time <![CDATA[  >=  ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{request.beginTime}"/>
+            </include>
+        </if>
+        <if test="request.endTime!='' and request.endTime!=null">
+            AND create_time <![CDATA[  <=  ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{request.endTime}"/>
+            </include>
+        </if>
+        ) dg
+        LEFT JOIN (
+            SELECT id, group_id AS "groupId"
+            FROM device d
+            WHERE VALID = 1
+        ) d ON d.groupId = dg.id
+        LEFT JOIN (
+            SELECT id, group_id AS "groupId"
+            FROM subscribe_store
+        ) s ON s.groupId = dg.id
+        GROUP BY dg.id
+        order by create_time desc
+    </select>
+
+    <select id="selectMaxNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(group_no, 12)), 0)
+        from device_group
+    </select>
+
+</mapper>

diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml
new file mode 100644
index 0000000..bd2c2cc
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml
@@ -0,0 +1,22 @@
+<?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.casic.missiles.mapper.AlarmConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmConfig">
+        <id column="id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="name" property="name" />
+        <result column="alarm_content" property="alarmContent" />
+        <result column="period_high" property="periodHigh" />
+        <result column="period_low" property="periodLow" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, product_id, alarm_content, period_high, period_low, TypeName, CreatorId, creater_user_id, create_time
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml
new file mode 100644
index 0000000..4aee44a
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml
@@ -0,0 +1,23 @@
+<?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.casic.missiles.mapper.AlarmDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmData">
+        <id column="id" property="id" />
+        <result column="alarm_type" property="alarmType" />
+        <result column="alarm_content" property="alarmContent" />
+        <result column="devcode" property="devcode" />
+        <result column="alarm_time" property="alarmTime" />
+        <result column="alarm_value" property="alarmValue" />
+        <result column="status" property="status" />
+        <result column="create_name" property="createName" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, alarm_type, alarm_content, devcode, alarm_time, alarm_value, status, CreatorName, create_time
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml b/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml
new file mode 100644
index 0000000..b4965d6
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml
@@ -0,0 +1,70 @@
+<?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.casic.missiles.mapper.BusConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.BusConfig">
+        <id column="id" property="id"/>
+        <result column="devcode" property="devcode"/>
+        <result column="config_json" property="configJson"/>
+        <result column="status" property="status"/>
+        <result column="send_time" property="sendTime"/>
+        <result column="create_time" property="createTime"/>
+        <result column="create_user_id" property="createUserId"/>
+    </resultMap>
+
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, Pid, devcode, config_json, status, update_time, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.model.BusConfig">
+        select bc.id,bc.devcode,config_type AS "configType", config_json AS "configJson",bc.status,
+        send_time as "sendTime",bc.create_time AS "createTime",bc.create_user_id AS "createUserId",
+        bc.create_user_name AS "createUserName",dg.deptid
+        FROM (
+            SELECT *
+            FROM bus_config
+            WHERE 1=1
+            <if test="request.configType != null and request.configType != '' ">
+                AND config_type =#{request.configType}
+            </if>
+            <if test="request.devcode != '' and request.devcode != null">
+                AND devcode =#{request.devcode}
+            </if>
+            <if test="request.status != '' and request.status != null">
+                AND status =#{request.status}
+            </if>
+            <if test="request.beginTime!='' and request.beginTime!=null">
+                AND send_time <![CDATA[  >=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.beginTime}"/>
+                </include>
+            </if>
+            <if test="request.endTime!='' and request.endTime!=null">
+                AND send_time <![CDATA[  <=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.endTime}"/>
+                </include>
+            </if>
+        )bc
+        JOIN device d ON d.devcode=bc.devcode
+        JOIN device_group dg ON dg.id= d.group_id
+
+    </select>
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml
new file mode 100644
index 0000000..083b289
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml
@@ -0,0 +1,106 @@
+<?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.casic.missiles.mapper.DeviceDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceData">
+        <id column="id" property="id"/>
+        <result column="devcode" property="devcode"/>
+        <result column="device_type" property="deviceType"/>
+        <result column="cell" property="cell"/>
+        <result column="data_json" property="dataJson"/>
+        <result column="decrypt_before_data" property="decryptBeforeData"/>
+        <result column="decrypt_after_data" property="decryptAfterData"/>
+        <result column="uptime" property="uptime"/>
+        <result column="logtime" property="logtime"/>
+    </resultMap>
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, devcode, device_type, cell, data_json, decrypt_before_data, decrypt_after_data, uptime, logtime
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.data.DeviceDataListVO">
+          SELECT  	dd.id,
+                    dd.devcode,
+                    dd.device_type AS "deviceType",
+                    deptid,
+                    dd.cell,
+                    dd.data_json AS "dataJson",
+                    decrypt_before_data AS "decryptBeforeData",
+                    decrypt_after_data AS "decryptAfterData",
+                    uptime,
+                    logtime,
+                    d.STATUS,
+                    d.group_id AS "groupId",
+                    dg.group_name AS "groupName"
+        FROM (
+               SELECT *
+               FROM device_data
+               WHERE  1=1
+                <if test="request.devcode!='' and request.devcode != null">
+                    AND devcode like CONCAT('%',#{request.devcode},'%')
+                </if>
+                <if test="request.deviceType!='' and request.deviceType != null">
+                    AND device_type =#{request.deviceType}
+                </if>
+                <if test="request.beginTime!='' and request.beginTime!=null">
+                    AND logtime <![CDATA[  >=  ]]>
+                    <include refid="char_toDate">
+                        <property name="paramStr" value="#{request.beginTime}"/>
+                    </include>
+                </if>
+                <if test="request.endTime!='' and request.endTime!=null">
+                    AND logtime <![CDATA[  <=  ]]>
+                    <include refid="char_toDate">
+                        <property name="paramStr" value="#{request.endTime}"/>
+                    </include>
+                </if>
+                <if test="request.ids != null">
+                    and id in
+                    <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                        #{id}
+                    </foreach>
+                </if>
+
+          )dd
+          JOIN (
+                SELECT id, group_id,status,devcode
+                FROM device
+                WHERE valid=1
+                <if test="request.devcode!='' and request.devcode != null">
+                    AND devcode like CONCAT('%',#{request.devcode},'%')
+                </if>
+                <if test="request.deviceType!='' and request.deviceType != null">
+                    AND device_type =#{request.deviceType}
+                </if>
+                <if test="request.groupId!='' and request.groupId != null">
+                    AND greoup_id=#{request.groupId}
+                </if>
+          )d ON d.devcode=dd.devcode
+          JOIN (
+                SELECT   deptid,id,group_name
+                FROM device_group
+                WHERE valid=1
+                <if test="request.groupId!='' and request.groupId != null">
+                    AND id=#{request.groupId}
+                </if>
+          ) dg ON dg.id=d.group_id
+          order by logtime desc
+
+    </select>
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml
new file mode 100644
index 0000000..2e07287
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml
@@ -0,0 +1,148 @@
+<?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.casic.missiles.mapper.DeviceGroupMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceGroup">
+        <id column="id" property="id" />
+        <result column="group_name" property="groupName" />
+        <result column="group_no" property="groupNo" />
+        <result column="descn" property="descn" />
+        <result column="deptid" property="deptid" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="owner" property="owner" />
+        <result column="valid" property="valid" />
+    </resultMap>
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, owner, subcribe_ids, descn, dept, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
+        SELECT
+            dg.id,
+            group_no AS "groupNo",
+            deptid,
+             deviceCount,
+            subscribeCount,
+            descn,
+            create_time AS "createTime",
+            group_name AS "groupName",
+            create_user_id AS "createUserId",
+            create_user_name AS "createUserName"
+        FROM
+          (
+             SELECT *
+             FROM device_group
+             WHERE valid = 1
+            <if test="request.groupNo != null and request.groupNo != '' ">
+                AND group_no =#{request.groupNo}
+            </if>
+            <if test="request.groupName != '' and request.groupName != null">
+                AND group_name =#{request.groupName}
+            </if>
+            <if test="request.ids != null">
+                and id in
+                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+            <if test="request.beginTime!='' and request.beginTime!=null">
+                AND create_time <![CDATA[  >=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.beginTime}"/>
+                </include>
+            </if>
+            <if test="request.endTime!='' and request.endTime!=null">
+                AND create_time <![CDATA[  <=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.endTime}"/>
+                </include>
+            </if>
+          ) dg
+            LEFT JOIN (
+                   SELECT count(id)  AS "deviceCount",group_id as groupId
+                   FROM device d
+                   WHERE VALID = 1
+                   GROUP BY group_id
+        ) d ON d.groupId = dg.id
+            LEFT JOIN (
+                 SELECT count(id)  AS "subscribeCount",group_id AS groupId
+                 FROM subscribe_store GROUP BY group_id
+           ) s ON s.groupId = dg.id
+         order by create_time desc
+    </select>
+
+    <select id="list" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
+        SELECT
+        dg.id,
+        group_no AS "groupNo",
+        deptid,
+        count( d.id ) AS "deviceCount",
+        count( s.id ) AS "subscribeCount",
+        descn,
+        create_time AS "createTime",
+        group_name AS "groupName"
+        FROM
+        (
+        SELECT *
+        FROM device_group
+        WHERE valid = 1
+        <if test="request.groupNo != null and request.groupNo != '' ">
+            AND group_no =#{request.groupNo}
+        </if>
+        <if test="request.groupName != '' and request.groupName != null">
+            AND group_name =#{request.groupName}
+        </if>
+        <if test="request.ids != null">
+            and id in
+            <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+        <if test="request.beginTime!='' and request.beginTime!=null">
+            AND create_time <![CDATA[  >=  ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{request.beginTime}"/>
+            </include>
+        </if>
+        <if test="request.endTime!='' and request.endTime!=null">
+            AND create_time <![CDATA[  <=  ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{request.endTime}"/>
+            </include>
+        </if>
+        ) dg
+        LEFT JOIN (
+            SELECT id, group_id AS "groupId"
+            FROM device d
+            WHERE VALID = 1
+        ) d ON d.groupId = dg.id
+        LEFT JOIN (
+            SELECT id, group_id AS "groupId"
+            FROM subscribe_store
+        ) s ON s.groupId = dg.id
+        GROUP BY dg.id
+        order by create_time desc
+    </select>
+
+    <select id="selectMaxNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(group_no, 12)), 0)
+        from device_group
+    </select>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
new file mode 100644
index 0000000..2c99706
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
@@ -0,0 +1,88 @@
+<?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.casic.missiles.mapper.DeviceMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.Device">
+        <id column="id" property="id" />
+        <result column="group_id" property="groupId" />
+        <result column="product_id" property="productId" />
+        <result column="devcode" property="devcode" />
+        <result column="device_type" property="deviceType" />
+        <result column="unit" property="unit" />
+        <result column="model" property="model" />
+        <result column="name" property="name" />
+        <result column="status" property="status" />
+        <result column="imei" property="imei" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="valid" property="valid" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, devcode, device_type, unit, name, product_id, status, imei, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.device.DeviceListVO">
+        SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime,
+        data_value AS "dataValue",model,imei,d.cell,name AS "deviceName",status,d.id,create_user_id AS "createUserId",
+        create_user_name AS "createUserName"
+        FROM (
+            SELECT *
+            FROM device
+            WHERE VALID=1
+            <if test="request.groupId!='' and request.groupId != null">
+                AND group_id =#{request.groupId}
+            </if>
+            <if test="request.devcode!='' and request.devcode != null">
+                AND devcode like CONCAT('%',#{request.devcode},'%')
+            </if>
+            <if test="request.imei!='' and request.imei != null">
+                AND imei like CONCAT('%',#{request.imei},'%')
+            </if>
+            <if test="request.deviceType!='' and request.deviceType != null">
+                AND device_type =#{request.deviceType}
+            </if>
+            <if test="request.status!='' and request.status != null">
+                AND status =#{request.status}
+            </if>
+            <if test="request.productId!='' and request.productId != null">
+                AND product_id =#{request.productId}
+            </if>
+            <if test="request.beginCell!='' and request.beginCell!=null">
+                AND cell <![CDATA[  >=  ]]> #{request.beginCell}
+
+            </if>
+            <if test="request.endCell!='' and request.endCell!=null">
+                AND cell <![CDATA[  <=  ]]> #{request.endCell}
+            </if>
+            <if test="request.ids != null">
+                and id in
+                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+            order by create_time desc
+        )d JOIN (
+            SELECT deptid,id
+            FROM device_group
+            WHERE VALID =1
+            <if test="request.groupId!='' and request.groupId != null">
+                AND id =#{request.groupId}
+            </if>
+        )dg ON dg.id=d.group_id
+        LEFT JOIN(
+            SELECT ddd.logtime AS logtime,data_value,ddd.devcode,cell
+            FROM device_data ddd
+            JOIN
+            (
+                SELECT Max(logtime) AS logtime,devcode
+                FROM  device_data
+                GROUP BY devcode
+            )dd  ON dd.logtime=ddd.logtime AND dd.devcode=ddd.devcode
+        )dd ON dd.devcode=d.devcode
+        order by create_time desc
+    </select>
+
+</mapper>

diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml
new file mode 100644
index 0000000..bd2c2cc
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml
@@ -0,0 +1,22 @@
+<?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.casic.missiles.mapper.AlarmConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmConfig">
+        <id column="id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="name" property="name" />
+        <result column="alarm_content" property="alarmContent" />
+        <result column="period_high" property="periodHigh" />
+        <result column="period_low" property="periodLow" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, product_id, alarm_content, period_high, period_low, TypeName, CreatorId, creater_user_id, create_time
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml
new file mode 100644
index 0000000..4aee44a
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml
@@ -0,0 +1,23 @@
+<?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.casic.missiles.mapper.AlarmDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmData">
+        <id column="id" property="id" />
+        <result column="alarm_type" property="alarmType" />
+        <result column="alarm_content" property="alarmContent" />
+        <result column="devcode" property="devcode" />
+        <result column="alarm_time" property="alarmTime" />
+        <result column="alarm_value" property="alarmValue" />
+        <result column="status" property="status" />
+        <result column="create_name" property="createName" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, alarm_type, alarm_content, devcode, alarm_time, alarm_value, status, CreatorName, create_time
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml b/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml
new file mode 100644
index 0000000..b4965d6
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml
@@ -0,0 +1,70 @@
+<?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.casic.missiles.mapper.BusConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.BusConfig">
+        <id column="id" property="id"/>
+        <result column="devcode" property="devcode"/>
+        <result column="config_json" property="configJson"/>
+        <result column="status" property="status"/>
+        <result column="send_time" property="sendTime"/>
+        <result column="create_time" property="createTime"/>
+        <result column="create_user_id" property="createUserId"/>
+    </resultMap>
+
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, Pid, devcode, config_json, status, update_time, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.model.BusConfig">
+        select bc.id,bc.devcode,config_type AS "configType", config_json AS "configJson",bc.status,
+        send_time as "sendTime",bc.create_time AS "createTime",bc.create_user_id AS "createUserId",
+        bc.create_user_name AS "createUserName",dg.deptid
+        FROM (
+            SELECT *
+            FROM bus_config
+            WHERE 1=1
+            <if test="request.configType != null and request.configType != '' ">
+                AND config_type =#{request.configType}
+            </if>
+            <if test="request.devcode != '' and request.devcode != null">
+                AND devcode =#{request.devcode}
+            </if>
+            <if test="request.status != '' and request.status != null">
+                AND status =#{request.status}
+            </if>
+            <if test="request.beginTime!='' and request.beginTime!=null">
+                AND send_time <![CDATA[  >=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.beginTime}"/>
+                </include>
+            </if>
+            <if test="request.endTime!='' and request.endTime!=null">
+                AND send_time <![CDATA[  <=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.endTime}"/>
+                </include>
+            </if>
+        )bc
+        JOIN device d ON d.devcode=bc.devcode
+        JOIN device_group dg ON dg.id= d.group_id
+
+    </select>
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml
new file mode 100644
index 0000000..083b289
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml
@@ -0,0 +1,106 @@
+<?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.casic.missiles.mapper.DeviceDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceData">
+        <id column="id" property="id"/>
+        <result column="devcode" property="devcode"/>
+        <result column="device_type" property="deviceType"/>
+        <result column="cell" property="cell"/>
+        <result column="data_json" property="dataJson"/>
+        <result column="decrypt_before_data" property="decryptBeforeData"/>
+        <result column="decrypt_after_data" property="decryptAfterData"/>
+        <result column="uptime" property="uptime"/>
+        <result column="logtime" property="logtime"/>
+    </resultMap>
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, devcode, device_type, cell, data_json, decrypt_before_data, decrypt_after_data, uptime, logtime
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.data.DeviceDataListVO">
+          SELECT  	dd.id,
+                    dd.devcode,
+                    dd.device_type AS "deviceType",
+                    deptid,
+                    dd.cell,
+                    dd.data_json AS "dataJson",
+                    decrypt_before_data AS "decryptBeforeData",
+                    decrypt_after_data AS "decryptAfterData",
+                    uptime,
+                    logtime,
+                    d.STATUS,
+                    d.group_id AS "groupId",
+                    dg.group_name AS "groupName"
+        FROM (
+               SELECT *
+               FROM device_data
+               WHERE  1=1
+                <if test="request.devcode!='' and request.devcode != null">
+                    AND devcode like CONCAT('%',#{request.devcode},'%')
+                </if>
+                <if test="request.deviceType!='' and request.deviceType != null">
+                    AND device_type =#{request.deviceType}
+                </if>
+                <if test="request.beginTime!='' and request.beginTime!=null">
+                    AND logtime <![CDATA[  >=  ]]>
+                    <include refid="char_toDate">
+                        <property name="paramStr" value="#{request.beginTime}"/>
+                    </include>
+                </if>
+                <if test="request.endTime!='' and request.endTime!=null">
+                    AND logtime <![CDATA[  <=  ]]>
+                    <include refid="char_toDate">
+                        <property name="paramStr" value="#{request.endTime}"/>
+                    </include>
+                </if>
+                <if test="request.ids != null">
+                    and id in
+                    <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                        #{id}
+                    </foreach>
+                </if>
+
+          )dd
+          JOIN (
+                SELECT id, group_id,status,devcode
+                FROM device
+                WHERE valid=1
+                <if test="request.devcode!='' and request.devcode != null">
+                    AND devcode like CONCAT('%',#{request.devcode},'%')
+                </if>
+                <if test="request.deviceType!='' and request.deviceType != null">
+                    AND device_type =#{request.deviceType}
+                </if>
+                <if test="request.groupId!='' and request.groupId != null">
+                    AND greoup_id=#{request.groupId}
+                </if>
+          )d ON d.devcode=dd.devcode
+          JOIN (
+                SELECT   deptid,id,group_name
+                FROM device_group
+                WHERE valid=1
+                <if test="request.groupId!='' and request.groupId != null">
+                    AND id=#{request.groupId}
+                </if>
+          ) dg ON dg.id=d.group_id
+          order by logtime desc
+
+    </select>
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml
new file mode 100644
index 0000000..2e07287
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml
@@ -0,0 +1,148 @@
+<?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.casic.missiles.mapper.DeviceGroupMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceGroup">
+        <id column="id" property="id" />
+        <result column="group_name" property="groupName" />
+        <result column="group_no" property="groupNo" />
+        <result column="descn" property="descn" />
+        <result column="deptid" property="deptid" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="owner" property="owner" />
+        <result column="valid" property="valid" />
+    </resultMap>
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, owner, subcribe_ids, descn, dept, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
+        SELECT
+            dg.id,
+            group_no AS "groupNo",
+            deptid,
+             deviceCount,
+            subscribeCount,
+            descn,
+            create_time AS "createTime",
+            group_name AS "groupName",
+            create_user_id AS "createUserId",
+            create_user_name AS "createUserName"
+        FROM
+          (
+             SELECT *
+             FROM device_group
+             WHERE valid = 1
+            <if test="request.groupNo != null and request.groupNo != '' ">
+                AND group_no =#{request.groupNo}
+            </if>
+            <if test="request.groupName != '' and request.groupName != null">
+                AND group_name =#{request.groupName}
+            </if>
+            <if test="request.ids != null">
+                and id in
+                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+            <if test="request.beginTime!='' and request.beginTime!=null">
+                AND create_time <![CDATA[  >=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.beginTime}"/>
+                </include>
+            </if>
+            <if test="request.endTime!='' and request.endTime!=null">
+                AND create_time <![CDATA[  <=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.endTime}"/>
+                </include>
+            </if>
+          ) dg
+            LEFT JOIN (
+                   SELECT count(id)  AS "deviceCount",group_id as groupId
+                   FROM device d
+                   WHERE VALID = 1
+                   GROUP BY group_id
+        ) d ON d.groupId = dg.id
+            LEFT JOIN (
+                 SELECT count(id)  AS "subscribeCount",group_id AS groupId
+                 FROM subscribe_store GROUP BY group_id
+           ) s ON s.groupId = dg.id
+         order by create_time desc
+    </select>
+
+    <select id="list" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
+        SELECT
+        dg.id,
+        group_no AS "groupNo",
+        deptid,
+        count( d.id ) AS "deviceCount",
+        count( s.id ) AS "subscribeCount",
+        descn,
+        create_time AS "createTime",
+        group_name AS "groupName"
+        FROM
+        (
+        SELECT *
+        FROM device_group
+        WHERE valid = 1
+        <if test="request.groupNo != null and request.groupNo != '' ">
+            AND group_no =#{request.groupNo}
+        </if>
+        <if test="request.groupName != '' and request.groupName != null">
+            AND group_name =#{request.groupName}
+        </if>
+        <if test="request.ids != null">
+            and id in
+            <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+        <if test="request.beginTime!='' and request.beginTime!=null">
+            AND create_time <![CDATA[  >=  ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{request.beginTime}"/>
+            </include>
+        </if>
+        <if test="request.endTime!='' and request.endTime!=null">
+            AND create_time <![CDATA[  <=  ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{request.endTime}"/>
+            </include>
+        </if>
+        ) dg
+        LEFT JOIN (
+            SELECT id, group_id AS "groupId"
+            FROM device d
+            WHERE VALID = 1
+        ) d ON d.groupId = dg.id
+        LEFT JOIN (
+            SELECT id, group_id AS "groupId"
+            FROM subscribe_store
+        ) s ON s.groupId = dg.id
+        GROUP BY dg.id
+        order by create_time desc
+    </select>
+
+    <select id="selectMaxNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(group_no, 12)), 0)
+        from device_group
+    </select>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
new file mode 100644
index 0000000..2c99706
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
@@ -0,0 +1,88 @@
+<?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.casic.missiles.mapper.DeviceMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.Device">
+        <id column="id" property="id" />
+        <result column="group_id" property="groupId" />
+        <result column="product_id" property="productId" />
+        <result column="devcode" property="devcode" />
+        <result column="device_type" property="deviceType" />
+        <result column="unit" property="unit" />
+        <result column="model" property="model" />
+        <result column="name" property="name" />
+        <result column="status" property="status" />
+        <result column="imei" property="imei" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="valid" property="valid" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, devcode, device_type, unit, name, product_id, status, imei, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.device.DeviceListVO">
+        SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime,
+        data_value AS "dataValue",model,imei,d.cell,name AS "deviceName",status,d.id,create_user_id AS "createUserId",
+        create_user_name AS "createUserName"
+        FROM (
+            SELECT *
+            FROM device
+            WHERE VALID=1
+            <if test="request.groupId!='' and request.groupId != null">
+                AND group_id =#{request.groupId}
+            </if>
+            <if test="request.devcode!='' and request.devcode != null">
+                AND devcode like CONCAT('%',#{request.devcode},'%')
+            </if>
+            <if test="request.imei!='' and request.imei != null">
+                AND imei like CONCAT('%',#{request.imei},'%')
+            </if>
+            <if test="request.deviceType!='' and request.deviceType != null">
+                AND device_type =#{request.deviceType}
+            </if>
+            <if test="request.status!='' and request.status != null">
+                AND status =#{request.status}
+            </if>
+            <if test="request.productId!='' and request.productId != null">
+                AND product_id =#{request.productId}
+            </if>
+            <if test="request.beginCell!='' and request.beginCell!=null">
+                AND cell <![CDATA[  >=  ]]> #{request.beginCell}
+
+            </if>
+            <if test="request.endCell!='' and request.endCell!=null">
+                AND cell <![CDATA[  <=  ]]> #{request.endCell}
+            </if>
+            <if test="request.ids != null">
+                and id in
+                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+            order by create_time desc
+        )d JOIN (
+            SELECT deptid,id
+            FROM device_group
+            WHERE VALID =1
+            <if test="request.groupId!='' and request.groupId != null">
+                AND id =#{request.groupId}
+            </if>
+        )dg ON dg.id=d.group_id
+        LEFT JOIN(
+            SELECT ddd.logtime AS logtime,data_value,ddd.devcode,cell
+            FROM device_data ddd
+            JOIN
+            (
+                SELECT Max(logtime) AS logtime,devcode
+                FROM  device_data
+                GROUP BY devcode
+            )dd  ON dd.logtime=ddd.logtime AND dd.devcode=ddd.devcode
+        )dd ON dd.devcode=d.devcode
+        order by create_time desc
+    </select>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml
new file mode 100644
index 0000000..a5bf5e7
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml
@@ -0,0 +1,20 @@
+<?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.casic.missiles.mapper.DeviceUpgradeTaskMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceUpgradeTask">
+        <id column="id" property="id" />
+        <result column="version_id" property="versionId" />
+        <result column="device_id" property="deviceId" />
+        <result column="status" property="status" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, version_id, device_id, status, create_time, create_user_id
+    </sql>
+
+</mapper>

diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml
new file mode 100644
index 0000000..bd2c2cc
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml
@@ -0,0 +1,22 @@
+<?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.casic.missiles.mapper.AlarmConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmConfig">
+        <id column="id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="name" property="name" />
+        <result column="alarm_content" property="alarmContent" />
+        <result column="period_high" property="periodHigh" />
+        <result column="period_low" property="periodLow" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, product_id, alarm_content, period_high, period_low, TypeName, CreatorId, creater_user_id, create_time
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml
new file mode 100644
index 0000000..4aee44a
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml
@@ -0,0 +1,23 @@
+<?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.casic.missiles.mapper.AlarmDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmData">
+        <id column="id" property="id" />
+        <result column="alarm_type" property="alarmType" />
+        <result column="alarm_content" property="alarmContent" />
+        <result column="devcode" property="devcode" />
+        <result column="alarm_time" property="alarmTime" />
+        <result column="alarm_value" property="alarmValue" />
+        <result column="status" property="status" />
+        <result column="create_name" property="createName" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, alarm_type, alarm_content, devcode, alarm_time, alarm_value, status, CreatorName, create_time
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml b/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml
new file mode 100644
index 0000000..b4965d6
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml
@@ -0,0 +1,70 @@
+<?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.casic.missiles.mapper.BusConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.BusConfig">
+        <id column="id" property="id"/>
+        <result column="devcode" property="devcode"/>
+        <result column="config_json" property="configJson"/>
+        <result column="status" property="status"/>
+        <result column="send_time" property="sendTime"/>
+        <result column="create_time" property="createTime"/>
+        <result column="create_user_id" property="createUserId"/>
+    </resultMap>
+
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, Pid, devcode, config_json, status, update_time, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.model.BusConfig">
+        select bc.id,bc.devcode,config_type AS "configType", config_json AS "configJson",bc.status,
+        send_time as "sendTime",bc.create_time AS "createTime",bc.create_user_id AS "createUserId",
+        bc.create_user_name AS "createUserName",dg.deptid
+        FROM (
+            SELECT *
+            FROM bus_config
+            WHERE 1=1
+            <if test="request.configType != null and request.configType != '' ">
+                AND config_type =#{request.configType}
+            </if>
+            <if test="request.devcode != '' and request.devcode != null">
+                AND devcode =#{request.devcode}
+            </if>
+            <if test="request.status != '' and request.status != null">
+                AND status =#{request.status}
+            </if>
+            <if test="request.beginTime!='' and request.beginTime!=null">
+                AND send_time <![CDATA[  >=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.beginTime}"/>
+                </include>
+            </if>
+            <if test="request.endTime!='' and request.endTime!=null">
+                AND send_time <![CDATA[  <=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.endTime}"/>
+                </include>
+            </if>
+        )bc
+        JOIN device d ON d.devcode=bc.devcode
+        JOIN device_group dg ON dg.id= d.group_id
+
+    </select>
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml
new file mode 100644
index 0000000..083b289
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml
@@ -0,0 +1,106 @@
+<?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.casic.missiles.mapper.DeviceDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceData">
+        <id column="id" property="id"/>
+        <result column="devcode" property="devcode"/>
+        <result column="device_type" property="deviceType"/>
+        <result column="cell" property="cell"/>
+        <result column="data_json" property="dataJson"/>
+        <result column="decrypt_before_data" property="decryptBeforeData"/>
+        <result column="decrypt_after_data" property="decryptAfterData"/>
+        <result column="uptime" property="uptime"/>
+        <result column="logtime" property="logtime"/>
+    </resultMap>
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, devcode, device_type, cell, data_json, decrypt_before_data, decrypt_after_data, uptime, logtime
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.data.DeviceDataListVO">
+          SELECT  	dd.id,
+                    dd.devcode,
+                    dd.device_type AS "deviceType",
+                    deptid,
+                    dd.cell,
+                    dd.data_json AS "dataJson",
+                    decrypt_before_data AS "decryptBeforeData",
+                    decrypt_after_data AS "decryptAfterData",
+                    uptime,
+                    logtime,
+                    d.STATUS,
+                    d.group_id AS "groupId",
+                    dg.group_name AS "groupName"
+        FROM (
+               SELECT *
+               FROM device_data
+               WHERE  1=1
+                <if test="request.devcode!='' and request.devcode != null">
+                    AND devcode like CONCAT('%',#{request.devcode},'%')
+                </if>
+                <if test="request.deviceType!='' and request.deviceType != null">
+                    AND device_type =#{request.deviceType}
+                </if>
+                <if test="request.beginTime!='' and request.beginTime!=null">
+                    AND logtime <![CDATA[  >=  ]]>
+                    <include refid="char_toDate">
+                        <property name="paramStr" value="#{request.beginTime}"/>
+                    </include>
+                </if>
+                <if test="request.endTime!='' and request.endTime!=null">
+                    AND logtime <![CDATA[  <=  ]]>
+                    <include refid="char_toDate">
+                        <property name="paramStr" value="#{request.endTime}"/>
+                    </include>
+                </if>
+                <if test="request.ids != null">
+                    and id in
+                    <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                        #{id}
+                    </foreach>
+                </if>
+
+          )dd
+          JOIN (
+                SELECT id, group_id,status,devcode
+                FROM device
+                WHERE valid=1
+                <if test="request.devcode!='' and request.devcode != null">
+                    AND devcode like CONCAT('%',#{request.devcode},'%')
+                </if>
+                <if test="request.deviceType!='' and request.deviceType != null">
+                    AND device_type =#{request.deviceType}
+                </if>
+                <if test="request.groupId!='' and request.groupId != null">
+                    AND greoup_id=#{request.groupId}
+                </if>
+          )d ON d.devcode=dd.devcode
+          JOIN (
+                SELECT   deptid,id,group_name
+                FROM device_group
+                WHERE valid=1
+                <if test="request.groupId!='' and request.groupId != null">
+                    AND id=#{request.groupId}
+                </if>
+          ) dg ON dg.id=d.group_id
+          order by logtime desc
+
+    </select>
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml
new file mode 100644
index 0000000..2e07287
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml
@@ -0,0 +1,148 @@
+<?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.casic.missiles.mapper.DeviceGroupMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceGroup">
+        <id column="id" property="id" />
+        <result column="group_name" property="groupName" />
+        <result column="group_no" property="groupNo" />
+        <result column="descn" property="descn" />
+        <result column="deptid" property="deptid" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="owner" property="owner" />
+        <result column="valid" property="valid" />
+    </resultMap>
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, owner, subcribe_ids, descn, dept, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
+        SELECT
+            dg.id,
+            group_no AS "groupNo",
+            deptid,
+             deviceCount,
+            subscribeCount,
+            descn,
+            create_time AS "createTime",
+            group_name AS "groupName",
+            create_user_id AS "createUserId",
+            create_user_name AS "createUserName"
+        FROM
+          (
+             SELECT *
+             FROM device_group
+             WHERE valid = 1
+            <if test="request.groupNo != null and request.groupNo != '' ">
+                AND group_no =#{request.groupNo}
+            </if>
+            <if test="request.groupName != '' and request.groupName != null">
+                AND group_name =#{request.groupName}
+            </if>
+            <if test="request.ids != null">
+                and id in
+                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+            <if test="request.beginTime!='' and request.beginTime!=null">
+                AND create_time <![CDATA[  >=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.beginTime}"/>
+                </include>
+            </if>
+            <if test="request.endTime!='' and request.endTime!=null">
+                AND create_time <![CDATA[  <=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.endTime}"/>
+                </include>
+            </if>
+          ) dg
+            LEFT JOIN (
+                   SELECT count(id)  AS "deviceCount",group_id as groupId
+                   FROM device d
+                   WHERE VALID = 1
+                   GROUP BY group_id
+        ) d ON d.groupId = dg.id
+            LEFT JOIN (
+                 SELECT count(id)  AS "subscribeCount",group_id AS groupId
+                 FROM subscribe_store GROUP BY group_id
+           ) s ON s.groupId = dg.id
+         order by create_time desc
+    </select>
+
+    <select id="list" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
+        SELECT
+        dg.id,
+        group_no AS "groupNo",
+        deptid,
+        count( d.id ) AS "deviceCount",
+        count( s.id ) AS "subscribeCount",
+        descn,
+        create_time AS "createTime",
+        group_name AS "groupName"
+        FROM
+        (
+        SELECT *
+        FROM device_group
+        WHERE valid = 1
+        <if test="request.groupNo != null and request.groupNo != '' ">
+            AND group_no =#{request.groupNo}
+        </if>
+        <if test="request.groupName != '' and request.groupName != null">
+            AND group_name =#{request.groupName}
+        </if>
+        <if test="request.ids != null">
+            and id in
+            <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+        <if test="request.beginTime!='' and request.beginTime!=null">
+            AND create_time <![CDATA[  >=  ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{request.beginTime}"/>
+            </include>
+        </if>
+        <if test="request.endTime!='' and request.endTime!=null">
+            AND create_time <![CDATA[  <=  ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{request.endTime}"/>
+            </include>
+        </if>
+        ) dg
+        LEFT JOIN (
+            SELECT id, group_id AS "groupId"
+            FROM device d
+            WHERE VALID = 1
+        ) d ON d.groupId = dg.id
+        LEFT JOIN (
+            SELECT id, group_id AS "groupId"
+            FROM subscribe_store
+        ) s ON s.groupId = dg.id
+        GROUP BY dg.id
+        order by create_time desc
+    </select>
+
+    <select id="selectMaxNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(group_no, 12)), 0)
+        from device_group
+    </select>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
new file mode 100644
index 0000000..2c99706
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
@@ -0,0 +1,88 @@
+<?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.casic.missiles.mapper.DeviceMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.Device">
+        <id column="id" property="id" />
+        <result column="group_id" property="groupId" />
+        <result column="product_id" property="productId" />
+        <result column="devcode" property="devcode" />
+        <result column="device_type" property="deviceType" />
+        <result column="unit" property="unit" />
+        <result column="model" property="model" />
+        <result column="name" property="name" />
+        <result column="status" property="status" />
+        <result column="imei" property="imei" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="valid" property="valid" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, devcode, device_type, unit, name, product_id, status, imei, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.device.DeviceListVO">
+        SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime,
+        data_value AS "dataValue",model,imei,d.cell,name AS "deviceName",status,d.id,create_user_id AS "createUserId",
+        create_user_name AS "createUserName"
+        FROM (
+            SELECT *
+            FROM device
+            WHERE VALID=1
+            <if test="request.groupId!='' and request.groupId != null">
+                AND group_id =#{request.groupId}
+            </if>
+            <if test="request.devcode!='' and request.devcode != null">
+                AND devcode like CONCAT('%',#{request.devcode},'%')
+            </if>
+            <if test="request.imei!='' and request.imei != null">
+                AND imei like CONCAT('%',#{request.imei},'%')
+            </if>
+            <if test="request.deviceType!='' and request.deviceType != null">
+                AND device_type =#{request.deviceType}
+            </if>
+            <if test="request.status!='' and request.status != null">
+                AND status =#{request.status}
+            </if>
+            <if test="request.productId!='' and request.productId != null">
+                AND product_id =#{request.productId}
+            </if>
+            <if test="request.beginCell!='' and request.beginCell!=null">
+                AND cell <![CDATA[  >=  ]]> #{request.beginCell}
+
+            </if>
+            <if test="request.endCell!='' and request.endCell!=null">
+                AND cell <![CDATA[  <=  ]]> #{request.endCell}
+            </if>
+            <if test="request.ids != null">
+                and id in
+                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+            order by create_time desc
+        )d JOIN (
+            SELECT deptid,id
+            FROM device_group
+            WHERE VALID =1
+            <if test="request.groupId!='' and request.groupId != null">
+                AND id =#{request.groupId}
+            </if>
+        )dg ON dg.id=d.group_id
+        LEFT JOIN(
+            SELECT ddd.logtime AS logtime,data_value,ddd.devcode,cell
+            FROM device_data ddd
+            JOIN
+            (
+                SELECT Max(logtime) AS logtime,devcode
+                FROM  device_data
+                GROUP BY devcode
+            )dd  ON dd.logtime=ddd.logtime AND dd.devcode=ddd.devcode
+        )dd ON dd.devcode=d.devcode
+        order by create_time desc
+    </select>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml
new file mode 100644
index 0000000..a5bf5e7
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml
@@ -0,0 +1,20 @@
+<?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.casic.missiles.mapper.DeviceUpgradeTaskMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceUpgradeTask">
+        <id column="id" property="id" />
+        <result column="version_id" property="versionId" />
+        <result column="device_id" property="deviceId" />
+        <result column="status" property="status" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, version_id, device_id, status, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml
new file mode 100644
index 0000000..e39ec1f
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml
@@ -0,0 +1,23 @@
+<?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.casic.missiles.mapper.DeviceVersionMapper">
+
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceVersion">
+        <id column="Id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="version_file" property="versionFile" />
+        <result column="version" property="version" />
+        <result column="owner" property="owner" />
+        <result column="dscn" property="dscn" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        Id, product_id, version_file, version, owner, dscn, create_time, create_user_id
+    </sql>
+
+</mapper>

diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml
new file mode 100644
index 0000000..bd2c2cc
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml
@@ -0,0 +1,22 @@
+<?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.casic.missiles.mapper.AlarmConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmConfig">
+        <id column="id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="name" property="name" />
+        <result column="alarm_content" property="alarmContent" />
+        <result column="period_high" property="periodHigh" />
+        <result column="period_low" property="periodLow" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, product_id, alarm_content, period_high, period_low, TypeName, CreatorId, creater_user_id, create_time
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml
new file mode 100644
index 0000000..4aee44a
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml
@@ -0,0 +1,23 @@
+<?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.casic.missiles.mapper.AlarmDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmData">
+        <id column="id" property="id" />
+        <result column="alarm_type" property="alarmType" />
+        <result column="alarm_content" property="alarmContent" />
+        <result column="devcode" property="devcode" />
+        <result column="alarm_time" property="alarmTime" />
+        <result column="alarm_value" property="alarmValue" />
+        <result column="status" property="status" />
+        <result column="create_name" property="createName" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, alarm_type, alarm_content, devcode, alarm_time, alarm_value, status, CreatorName, create_time
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml b/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml
new file mode 100644
index 0000000..b4965d6
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml
@@ -0,0 +1,70 @@
+<?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.casic.missiles.mapper.BusConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.BusConfig">
+        <id column="id" property="id"/>
+        <result column="devcode" property="devcode"/>
+        <result column="config_json" property="configJson"/>
+        <result column="status" property="status"/>
+        <result column="send_time" property="sendTime"/>
+        <result column="create_time" property="createTime"/>
+        <result column="create_user_id" property="createUserId"/>
+    </resultMap>
+
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, Pid, devcode, config_json, status, update_time, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.model.BusConfig">
+        select bc.id,bc.devcode,config_type AS "configType", config_json AS "configJson",bc.status,
+        send_time as "sendTime",bc.create_time AS "createTime",bc.create_user_id AS "createUserId",
+        bc.create_user_name AS "createUserName",dg.deptid
+        FROM (
+            SELECT *
+            FROM bus_config
+            WHERE 1=1
+            <if test="request.configType != null and request.configType != '' ">
+                AND config_type =#{request.configType}
+            </if>
+            <if test="request.devcode != '' and request.devcode != null">
+                AND devcode =#{request.devcode}
+            </if>
+            <if test="request.status != '' and request.status != null">
+                AND status =#{request.status}
+            </if>
+            <if test="request.beginTime!='' and request.beginTime!=null">
+                AND send_time <![CDATA[  >=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.beginTime}"/>
+                </include>
+            </if>
+            <if test="request.endTime!='' and request.endTime!=null">
+                AND send_time <![CDATA[  <=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.endTime}"/>
+                </include>
+            </if>
+        )bc
+        JOIN device d ON d.devcode=bc.devcode
+        JOIN device_group dg ON dg.id= d.group_id
+
+    </select>
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml
new file mode 100644
index 0000000..083b289
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml
@@ -0,0 +1,106 @@
+<?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.casic.missiles.mapper.DeviceDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceData">
+        <id column="id" property="id"/>
+        <result column="devcode" property="devcode"/>
+        <result column="device_type" property="deviceType"/>
+        <result column="cell" property="cell"/>
+        <result column="data_json" property="dataJson"/>
+        <result column="decrypt_before_data" property="decryptBeforeData"/>
+        <result column="decrypt_after_data" property="decryptAfterData"/>
+        <result column="uptime" property="uptime"/>
+        <result column="logtime" property="logtime"/>
+    </resultMap>
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, devcode, device_type, cell, data_json, decrypt_before_data, decrypt_after_data, uptime, logtime
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.data.DeviceDataListVO">
+          SELECT  	dd.id,
+                    dd.devcode,
+                    dd.device_type AS "deviceType",
+                    deptid,
+                    dd.cell,
+                    dd.data_json AS "dataJson",
+                    decrypt_before_data AS "decryptBeforeData",
+                    decrypt_after_data AS "decryptAfterData",
+                    uptime,
+                    logtime,
+                    d.STATUS,
+                    d.group_id AS "groupId",
+                    dg.group_name AS "groupName"
+        FROM (
+               SELECT *
+               FROM device_data
+               WHERE  1=1
+                <if test="request.devcode!='' and request.devcode != null">
+                    AND devcode like CONCAT('%',#{request.devcode},'%')
+                </if>
+                <if test="request.deviceType!='' and request.deviceType != null">
+                    AND device_type =#{request.deviceType}
+                </if>
+                <if test="request.beginTime!='' and request.beginTime!=null">
+                    AND logtime <![CDATA[  >=  ]]>
+                    <include refid="char_toDate">
+                        <property name="paramStr" value="#{request.beginTime}"/>
+                    </include>
+                </if>
+                <if test="request.endTime!='' and request.endTime!=null">
+                    AND logtime <![CDATA[  <=  ]]>
+                    <include refid="char_toDate">
+                        <property name="paramStr" value="#{request.endTime}"/>
+                    </include>
+                </if>
+                <if test="request.ids != null">
+                    and id in
+                    <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                        #{id}
+                    </foreach>
+                </if>
+
+          )dd
+          JOIN (
+                SELECT id, group_id,status,devcode
+                FROM device
+                WHERE valid=1
+                <if test="request.devcode!='' and request.devcode != null">
+                    AND devcode like CONCAT('%',#{request.devcode},'%')
+                </if>
+                <if test="request.deviceType!='' and request.deviceType != null">
+                    AND device_type =#{request.deviceType}
+                </if>
+                <if test="request.groupId!='' and request.groupId != null">
+                    AND greoup_id=#{request.groupId}
+                </if>
+          )d ON d.devcode=dd.devcode
+          JOIN (
+                SELECT   deptid,id,group_name
+                FROM device_group
+                WHERE valid=1
+                <if test="request.groupId!='' and request.groupId != null">
+                    AND id=#{request.groupId}
+                </if>
+          ) dg ON dg.id=d.group_id
+          order by logtime desc
+
+    </select>
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml
new file mode 100644
index 0000000..2e07287
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml
@@ -0,0 +1,148 @@
+<?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.casic.missiles.mapper.DeviceGroupMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceGroup">
+        <id column="id" property="id" />
+        <result column="group_name" property="groupName" />
+        <result column="group_no" property="groupNo" />
+        <result column="descn" property="descn" />
+        <result column="deptid" property="deptid" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="owner" property="owner" />
+        <result column="valid" property="valid" />
+    </resultMap>
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, owner, subcribe_ids, descn, dept, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
+        SELECT
+            dg.id,
+            group_no AS "groupNo",
+            deptid,
+             deviceCount,
+            subscribeCount,
+            descn,
+            create_time AS "createTime",
+            group_name AS "groupName",
+            create_user_id AS "createUserId",
+            create_user_name AS "createUserName"
+        FROM
+          (
+             SELECT *
+             FROM device_group
+             WHERE valid = 1
+            <if test="request.groupNo != null and request.groupNo != '' ">
+                AND group_no =#{request.groupNo}
+            </if>
+            <if test="request.groupName != '' and request.groupName != null">
+                AND group_name =#{request.groupName}
+            </if>
+            <if test="request.ids != null">
+                and id in
+                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+            <if test="request.beginTime!='' and request.beginTime!=null">
+                AND create_time <![CDATA[  >=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.beginTime}"/>
+                </include>
+            </if>
+            <if test="request.endTime!='' and request.endTime!=null">
+                AND create_time <![CDATA[  <=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.endTime}"/>
+                </include>
+            </if>
+          ) dg
+            LEFT JOIN (
+                   SELECT count(id)  AS "deviceCount",group_id as groupId
+                   FROM device d
+                   WHERE VALID = 1
+                   GROUP BY group_id
+        ) d ON d.groupId = dg.id
+            LEFT JOIN (
+                 SELECT count(id)  AS "subscribeCount",group_id AS groupId
+                 FROM subscribe_store GROUP BY group_id
+           ) s ON s.groupId = dg.id
+         order by create_time desc
+    </select>
+
+    <select id="list" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
+        SELECT
+        dg.id,
+        group_no AS "groupNo",
+        deptid,
+        count( d.id ) AS "deviceCount",
+        count( s.id ) AS "subscribeCount",
+        descn,
+        create_time AS "createTime",
+        group_name AS "groupName"
+        FROM
+        (
+        SELECT *
+        FROM device_group
+        WHERE valid = 1
+        <if test="request.groupNo != null and request.groupNo != '' ">
+            AND group_no =#{request.groupNo}
+        </if>
+        <if test="request.groupName != '' and request.groupName != null">
+            AND group_name =#{request.groupName}
+        </if>
+        <if test="request.ids != null">
+            and id in
+            <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+        <if test="request.beginTime!='' and request.beginTime!=null">
+            AND create_time <![CDATA[  >=  ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{request.beginTime}"/>
+            </include>
+        </if>
+        <if test="request.endTime!='' and request.endTime!=null">
+            AND create_time <![CDATA[  <=  ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{request.endTime}"/>
+            </include>
+        </if>
+        ) dg
+        LEFT JOIN (
+            SELECT id, group_id AS "groupId"
+            FROM device d
+            WHERE VALID = 1
+        ) d ON d.groupId = dg.id
+        LEFT JOIN (
+            SELECT id, group_id AS "groupId"
+            FROM subscribe_store
+        ) s ON s.groupId = dg.id
+        GROUP BY dg.id
+        order by create_time desc
+    </select>
+
+    <select id="selectMaxNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(group_no, 12)), 0)
+        from device_group
+    </select>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
new file mode 100644
index 0000000..2c99706
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
@@ -0,0 +1,88 @@
+<?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.casic.missiles.mapper.DeviceMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.Device">
+        <id column="id" property="id" />
+        <result column="group_id" property="groupId" />
+        <result column="product_id" property="productId" />
+        <result column="devcode" property="devcode" />
+        <result column="device_type" property="deviceType" />
+        <result column="unit" property="unit" />
+        <result column="model" property="model" />
+        <result column="name" property="name" />
+        <result column="status" property="status" />
+        <result column="imei" property="imei" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="valid" property="valid" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, devcode, device_type, unit, name, product_id, status, imei, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.device.DeviceListVO">
+        SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime,
+        data_value AS "dataValue",model,imei,d.cell,name AS "deviceName",status,d.id,create_user_id AS "createUserId",
+        create_user_name AS "createUserName"
+        FROM (
+            SELECT *
+            FROM device
+            WHERE VALID=1
+            <if test="request.groupId!='' and request.groupId != null">
+                AND group_id =#{request.groupId}
+            </if>
+            <if test="request.devcode!='' and request.devcode != null">
+                AND devcode like CONCAT('%',#{request.devcode},'%')
+            </if>
+            <if test="request.imei!='' and request.imei != null">
+                AND imei like CONCAT('%',#{request.imei},'%')
+            </if>
+            <if test="request.deviceType!='' and request.deviceType != null">
+                AND device_type =#{request.deviceType}
+            </if>
+            <if test="request.status!='' and request.status != null">
+                AND status =#{request.status}
+            </if>
+            <if test="request.productId!='' and request.productId != null">
+                AND product_id =#{request.productId}
+            </if>
+            <if test="request.beginCell!='' and request.beginCell!=null">
+                AND cell <![CDATA[  >=  ]]> #{request.beginCell}
+
+            </if>
+            <if test="request.endCell!='' and request.endCell!=null">
+                AND cell <![CDATA[  <=  ]]> #{request.endCell}
+            </if>
+            <if test="request.ids != null">
+                and id in
+                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+            order by create_time desc
+        )d JOIN (
+            SELECT deptid,id
+            FROM device_group
+            WHERE VALID =1
+            <if test="request.groupId!='' and request.groupId != null">
+                AND id =#{request.groupId}
+            </if>
+        )dg ON dg.id=d.group_id
+        LEFT JOIN(
+            SELECT ddd.logtime AS logtime,data_value,ddd.devcode,cell
+            FROM device_data ddd
+            JOIN
+            (
+                SELECT Max(logtime) AS logtime,devcode
+                FROM  device_data
+                GROUP BY devcode
+            )dd  ON dd.logtime=ddd.logtime AND dd.devcode=ddd.devcode
+        )dd ON dd.devcode=d.devcode
+        order by create_time desc
+    </select>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml
new file mode 100644
index 0000000..a5bf5e7
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml
@@ -0,0 +1,20 @@
+<?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.casic.missiles.mapper.DeviceUpgradeTaskMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceUpgradeTask">
+        <id column="id" property="id" />
+        <result column="version_id" property="versionId" />
+        <result column="device_id" property="deviceId" />
+        <result column="status" property="status" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, version_id, device_id, status, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml
new file mode 100644
index 0000000..e39ec1f
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml
@@ -0,0 +1,23 @@
+<?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.casic.missiles.mapper.DeviceVersionMapper">
+
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceVersion">
+        <id column="Id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="version_file" property="versionFile" />
+        <result column="version" property="version" />
+        <result column="owner" property="owner" />
+        <result column="dscn" property="dscn" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        Id, product_id, version_file, version, owner, dscn, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductConfigItemMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductConfigItemMapper.xml
new file mode 100644
index 0000000..e2448be
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/ProductConfigItemMapper.xml
@@ -0,0 +1,22 @@
+<?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.casic.missiles.mapper.ProductConfigItemMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductConfigItem">
+        <id column="id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="param_name" property="paramName" />
+        <result column="param_code" property="paramCode" />
+        <result column="param_type" property="paramType" />
+        <result column="regular_expression" property="regularExpression" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, product_id, param_name, param_code, param_type, regular_expression, create_time, create_user_id
+    </sql>
+
+</mapper>

diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml
new file mode 100644
index 0000000..bd2c2cc
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml
@@ -0,0 +1,22 @@
+<?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.casic.missiles.mapper.AlarmConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmConfig">
+        <id column="id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="name" property="name" />
+        <result column="alarm_content" property="alarmContent" />
+        <result column="period_high" property="periodHigh" />
+        <result column="period_low" property="periodLow" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, product_id, alarm_content, period_high, period_low, TypeName, CreatorId, creater_user_id, create_time
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml
new file mode 100644
index 0000000..4aee44a
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml
@@ -0,0 +1,23 @@
+<?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.casic.missiles.mapper.AlarmDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmData">
+        <id column="id" property="id" />
+        <result column="alarm_type" property="alarmType" />
+        <result column="alarm_content" property="alarmContent" />
+        <result column="devcode" property="devcode" />
+        <result column="alarm_time" property="alarmTime" />
+        <result column="alarm_value" property="alarmValue" />
+        <result column="status" property="status" />
+        <result column="create_name" property="createName" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, alarm_type, alarm_content, devcode, alarm_time, alarm_value, status, CreatorName, create_time
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml b/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml
new file mode 100644
index 0000000..b4965d6
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml
@@ -0,0 +1,70 @@
+<?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.casic.missiles.mapper.BusConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.BusConfig">
+        <id column="id" property="id"/>
+        <result column="devcode" property="devcode"/>
+        <result column="config_json" property="configJson"/>
+        <result column="status" property="status"/>
+        <result column="send_time" property="sendTime"/>
+        <result column="create_time" property="createTime"/>
+        <result column="create_user_id" property="createUserId"/>
+    </resultMap>
+
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, Pid, devcode, config_json, status, update_time, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.model.BusConfig">
+        select bc.id,bc.devcode,config_type AS "configType", config_json AS "configJson",bc.status,
+        send_time as "sendTime",bc.create_time AS "createTime",bc.create_user_id AS "createUserId",
+        bc.create_user_name AS "createUserName",dg.deptid
+        FROM (
+            SELECT *
+            FROM bus_config
+            WHERE 1=1
+            <if test="request.configType != null and request.configType != '' ">
+                AND config_type =#{request.configType}
+            </if>
+            <if test="request.devcode != '' and request.devcode != null">
+                AND devcode =#{request.devcode}
+            </if>
+            <if test="request.status != '' and request.status != null">
+                AND status =#{request.status}
+            </if>
+            <if test="request.beginTime!='' and request.beginTime!=null">
+                AND send_time <![CDATA[  >=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.beginTime}"/>
+                </include>
+            </if>
+            <if test="request.endTime!='' and request.endTime!=null">
+                AND send_time <![CDATA[  <=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.endTime}"/>
+                </include>
+            </if>
+        )bc
+        JOIN device d ON d.devcode=bc.devcode
+        JOIN device_group dg ON dg.id= d.group_id
+
+    </select>
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml
new file mode 100644
index 0000000..083b289
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml
@@ -0,0 +1,106 @@
+<?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.casic.missiles.mapper.DeviceDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceData">
+        <id column="id" property="id"/>
+        <result column="devcode" property="devcode"/>
+        <result column="device_type" property="deviceType"/>
+        <result column="cell" property="cell"/>
+        <result column="data_json" property="dataJson"/>
+        <result column="decrypt_before_data" property="decryptBeforeData"/>
+        <result column="decrypt_after_data" property="decryptAfterData"/>
+        <result column="uptime" property="uptime"/>
+        <result column="logtime" property="logtime"/>
+    </resultMap>
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, devcode, device_type, cell, data_json, decrypt_before_data, decrypt_after_data, uptime, logtime
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.data.DeviceDataListVO">
+          SELECT  	dd.id,
+                    dd.devcode,
+                    dd.device_type AS "deviceType",
+                    deptid,
+                    dd.cell,
+                    dd.data_json AS "dataJson",
+                    decrypt_before_data AS "decryptBeforeData",
+                    decrypt_after_data AS "decryptAfterData",
+                    uptime,
+                    logtime,
+                    d.STATUS,
+                    d.group_id AS "groupId",
+                    dg.group_name AS "groupName"
+        FROM (
+               SELECT *
+               FROM device_data
+               WHERE  1=1
+                <if test="request.devcode!='' and request.devcode != null">
+                    AND devcode like CONCAT('%',#{request.devcode},'%')
+                </if>
+                <if test="request.deviceType!='' and request.deviceType != null">
+                    AND device_type =#{request.deviceType}
+                </if>
+                <if test="request.beginTime!='' and request.beginTime!=null">
+                    AND logtime <![CDATA[  >=  ]]>
+                    <include refid="char_toDate">
+                        <property name="paramStr" value="#{request.beginTime}"/>
+                    </include>
+                </if>
+                <if test="request.endTime!='' and request.endTime!=null">
+                    AND logtime <![CDATA[  <=  ]]>
+                    <include refid="char_toDate">
+                        <property name="paramStr" value="#{request.endTime}"/>
+                    </include>
+                </if>
+                <if test="request.ids != null">
+                    and id in
+                    <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                        #{id}
+                    </foreach>
+                </if>
+
+          )dd
+          JOIN (
+                SELECT id, group_id,status,devcode
+                FROM device
+                WHERE valid=1
+                <if test="request.devcode!='' and request.devcode != null">
+                    AND devcode like CONCAT('%',#{request.devcode},'%')
+                </if>
+                <if test="request.deviceType!='' and request.deviceType != null">
+                    AND device_type =#{request.deviceType}
+                </if>
+                <if test="request.groupId!='' and request.groupId != null">
+                    AND greoup_id=#{request.groupId}
+                </if>
+          )d ON d.devcode=dd.devcode
+          JOIN (
+                SELECT   deptid,id,group_name
+                FROM device_group
+                WHERE valid=1
+                <if test="request.groupId!='' and request.groupId != null">
+                    AND id=#{request.groupId}
+                </if>
+          ) dg ON dg.id=d.group_id
+          order by logtime desc
+
+    </select>
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml
new file mode 100644
index 0000000..2e07287
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml
@@ -0,0 +1,148 @@
+<?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.casic.missiles.mapper.DeviceGroupMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceGroup">
+        <id column="id" property="id" />
+        <result column="group_name" property="groupName" />
+        <result column="group_no" property="groupNo" />
+        <result column="descn" property="descn" />
+        <result column="deptid" property="deptid" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="owner" property="owner" />
+        <result column="valid" property="valid" />
+    </resultMap>
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, owner, subcribe_ids, descn, dept, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
+        SELECT
+            dg.id,
+            group_no AS "groupNo",
+            deptid,
+             deviceCount,
+            subscribeCount,
+            descn,
+            create_time AS "createTime",
+            group_name AS "groupName",
+            create_user_id AS "createUserId",
+            create_user_name AS "createUserName"
+        FROM
+          (
+             SELECT *
+             FROM device_group
+             WHERE valid = 1
+            <if test="request.groupNo != null and request.groupNo != '' ">
+                AND group_no =#{request.groupNo}
+            </if>
+            <if test="request.groupName != '' and request.groupName != null">
+                AND group_name =#{request.groupName}
+            </if>
+            <if test="request.ids != null">
+                and id in
+                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+            <if test="request.beginTime!='' and request.beginTime!=null">
+                AND create_time <![CDATA[  >=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.beginTime}"/>
+                </include>
+            </if>
+            <if test="request.endTime!='' and request.endTime!=null">
+                AND create_time <![CDATA[  <=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.endTime}"/>
+                </include>
+            </if>
+          ) dg
+            LEFT JOIN (
+                   SELECT count(id)  AS "deviceCount",group_id as groupId
+                   FROM device d
+                   WHERE VALID = 1
+                   GROUP BY group_id
+        ) d ON d.groupId = dg.id
+            LEFT JOIN (
+                 SELECT count(id)  AS "subscribeCount",group_id AS groupId
+                 FROM subscribe_store GROUP BY group_id
+           ) s ON s.groupId = dg.id
+         order by create_time desc
+    </select>
+
+    <select id="list" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
+        SELECT
+        dg.id,
+        group_no AS "groupNo",
+        deptid,
+        count( d.id ) AS "deviceCount",
+        count( s.id ) AS "subscribeCount",
+        descn,
+        create_time AS "createTime",
+        group_name AS "groupName"
+        FROM
+        (
+        SELECT *
+        FROM device_group
+        WHERE valid = 1
+        <if test="request.groupNo != null and request.groupNo != '' ">
+            AND group_no =#{request.groupNo}
+        </if>
+        <if test="request.groupName != '' and request.groupName != null">
+            AND group_name =#{request.groupName}
+        </if>
+        <if test="request.ids != null">
+            and id in
+            <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+        <if test="request.beginTime!='' and request.beginTime!=null">
+            AND create_time <![CDATA[  >=  ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{request.beginTime}"/>
+            </include>
+        </if>
+        <if test="request.endTime!='' and request.endTime!=null">
+            AND create_time <![CDATA[  <=  ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{request.endTime}"/>
+            </include>
+        </if>
+        ) dg
+        LEFT JOIN (
+            SELECT id, group_id AS "groupId"
+            FROM device d
+            WHERE VALID = 1
+        ) d ON d.groupId = dg.id
+        LEFT JOIN (
+            SELECT id, group_id AS "groupId"
+            FROM subscribe_store
+        ) s ON s.groupId = dg.id
+        GROUP BY dg.id
+        order by create_time desc
+    </select>
+
+    <select id="selectMaxNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(group_no, 12)), 0)
+        from device_group
+    </select>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
new file mode 100644
index 0000000..2c99706
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
@@ -0,0 +1,88 @@
+<?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.casic.missiles.mapper.DeviceMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.Device">
+        <id column="id" property="id" />
+        <result column="group_id" property="groupId" />
+        <result column="product_id" property="productId" />
+        <result column="devcode" property="devcode" />
+        <result column="device_type" property="deviceType" />
+        <result column="unit" property="unit" />
+        <result column="model" property="model" />
+        <result column="name" property="name" />
+        <result column="status" property="status" />
+        <result column="imei" property="imei" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="valid" property="valid" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, devcode, device_type, unit, name, product_id, status, imei, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.device.DeviceListVO">
+        SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime,
+        data_value AS "dataValue",model,imei,d.cell,name AS "deviceName",status,d.id,create_user_id AS "createUserId",
+        create_user_name AS "createUserName"
+        FROM (
+            SELECT *
+            FROM device
+            WHERE VALID=1
+            <if test="request.groupId!='' and request.groupId != null">
+                AND group_id =#{request.groupId}
+            </if>
+            <if test="request.devcode!='' and request.devcode != null">
+                AND devcode like CONCAT('%',#{request.devcode},'%')
+            </if>
+            <if test="request.imei!='' and request.imei != null">
+                AND imei like CONCAT('%',#{request.imei},'%')
+            </if>
+            <if test="request.deviceType!='' and request.deviceType != null">
+                AND device_type =#{request.deviceType}
+            </if>
+            <if test="request.status!='' and request.status != null">
+                AND status =#{request.status}
+            </if>
+            <if test="request.productId!='' and request.productId != null">
+                AND product_id =#{request.productId}
+            </if>
+            <if test="request.beginCell!='' and request.beginCell!=null">
+                AND cell <![CDATA[  >=  ]]> #{request.beginCell}
+
+            </if>
+            <if test="request.endCell!='' and request.endCell!=null">
+                AND cell <![CDATA[  <=  ]]> #{request.endCell}
+            </if>
+            <if test="request.ids != null">
+                and id in
+                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+            order by create_time desc
+        )d JOIN (
+            SELECT deptid,id
+            FROM device_group
+            WHERE VALID =1
+            <if test="request.groupId!='' and request.groupId != null">
+                AND id =#{request.groupId}
+            </if>
+        )dg ON dg.id=d.group_id
+        LEFT JOIN(
+            SELECT ddd.logtime AS logtime,data_value,ddd.devcode,cell
+            FROM device_data ddd
+            JOIN
+            (
+                SELECT Max(logtime) AS logtime,devcode
+                FROM  device_data
+                GROUP BY devcode
+            )dd  ON dd.logtime=ddd.logtime AND dd.devcode=ddd.devcode
+        )dd ON dd.devcode=d.devcode
+        order by create_time desc
+    </select>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml
new file mode 100644
index 0000000..a5bf5e7
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml
@@ -0,0 +1,20 @@
+<?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.casic.missiles.mapper.DeviceUpgradeTaskMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceUpgradeTask">
+        <id column="id" property="id" />
+        <result column="version_id" property="versionId" />
+        <result column="device_id" property="deviceId" />
+        <result column="status" property="status" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, version_id, device_id, status, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml
new file mode 100644
index 0000000..e39ec1f
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml
@@ -0,0 +1,23 @@
+<?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.casic.missiles.mapper.DeviceVersionMapper">
+
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceVersion">
+        <id column="Id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="version_file" property="versionFile" />
+        <result column="version" property="version" />
+        <result column="owner" property="owner" />
+        <result column="dscn" property="dscn" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        Id, product_id, version_file, version, owner, dscn, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductConfigItemMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductConfigItemMapper.xml
new file mode 100644
index 0000000..e2448be
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/ProductConfigItemMapper.xml
@@ -0,0 +1,22 @@
+<?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.casic.missiles.mapper.ProductConfigItemMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductConfigItem">
+        <id column="id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="param_name" property="paramName" />
+        <result column="param_code" property="paramCode" />
+        <result column="param_type" property="paramType" />
+        <result column="regular_expression" property="regularExpression" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, product_id, param_name, param_code, param_type, regular_expression, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductDataItemMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductDataItemMapper.xml
new file mode 100644
index 0000000..61a55ec
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/ProductDataItemMapper.xml
@@ -0,0 +1,21 @@
+<?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.casic.missiles.mapper.ProductDataItemMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductDataItem">
+        <id column="id" property="id" />
+        <result column="data_item_name" property="dataItemName" />
+        <result column="product_id" property="productId" />
+        <result column="data_item_type" property="dataItemType" />
+        <result column="data_item_field" property="dataItemField" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, data_item_name, product_id, data_item_type, data_item_field, create_time, create_user_id
+    </sql>
+
+</mapper>

diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml
new file mode 100644
index 0000000..bd2c2cc
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml
@@ -0,0 +1,22 @@
+<?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.casic.missiles.mapper.AlarmConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmConfig">
+        <id column="id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="name" property="name" />
+        <result column="alarm_content" property="alarmContent" />
+        <result column="period_high" property="periodHigh" />
+        <result column="period_low" property="periodLow" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, product_id, alarm_content, period_high, period_low, TypeName, CreatorId, creater_user_id, create_time
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml
new file mode 100644
index 0000000..4aee44a
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml
@@ -0,0 +1,23 @@
+<?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.casic.missiles.mapper.AlarmDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmData">
+        <id column="id" property="id" />
+        <result column="alarm_type" property="alarmType" />
+        <result column="alarm_content" property="alarmContent" />
+        <result column="devcode" property="devcode" />
+        <result column="alarm_time" property="alarmTime" />
+        <result column="alarm_value" property="alarmValue" />
+        <result column="status" property="status" />
+        <result column="create_name" property="createName" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, alarm_type, alarm_content, devcode, alarm_time, alarm_value, status, CreatorName, create_time
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml b/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml
new file mode 100644
index 0000000..b4965d6
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml
@@ -0,0 +1,70 @@
+<?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.casic.missiles.mapper.BusConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.BusConfig">
+        <id column="id" property="id"/>
+        <result column="devcode" property="devcode"/>
+        <result column="config_json" property="configJson"/>
+        <result column="status" property="status"/>
+        <result column="send_time" property="sendTime"/>
+        <result column="create_time" property="createTime"/>
+        <result column="create_user_id" property="createUserId"/>
+    </resultMap>
+
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, Pid, devcode, config_json, status, update_time, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.model.BusConfig">
+        select bc.id,bc.devcode,config_type AS "configType", config_json AS "configJson",bc.status,
+        send_time as "sendTime",bc.create_time AS "createTime",bc.create_user_id AS "createUserId",
+        bc.create_user_name AS "createUserName",dg.deptid
+        FROM (
+            SELECT *
+            FROM bus_config
+            WHERE 1=1
+            <if test="request.configType != null and request.configType != '' ">
+                AND config_type =#{request.configType}
+            </if>
+            <if test="request.devcode != '' and request.devcode != null">
+                AND devcode =#{request.devcode}
+            </if>
+            <if test="request.status != '' and request.status != null">
+                AND status =#{request.status}
+            </if>
+            <if test="request.beginTime!='' and request.beginTime!=null">
+                AND send_time <![CDATA[  >=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.beginTime}"/>
+                </include>
+            </if>
+            <if test="request.endTime!='' and request.endTime!=null">
+                AND send_time <![CDATA[  <=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.endTime}"/>
+                </include>
+            </if>
+        )bc
+        JOIN device d ON d.devcode=bc.devcode
+        JOIN device_group dg ON dg.id= d.group_id
+
+    </select>
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml
new file mode 100644
index 0000000..083b289
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml
@@ -0,0 +1,106 @@
+<?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.casic.missiles.mapper.DeviceDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceData">
+        <id column="id" property="id"/>
+        <result column="devcode" property="devcode"/>
+        <result column="device_type" property="deviceType"/>
+        <result column="cell" property="cell"/>
+        <result column="data_json" property="dataJson"/>
+        <result column="decrypt_before_data" property="decryptBeforeData"/>
+        <result column="decrypt_after_data" property="decryptAfterData"/>
+        <result column="uptime" property="uptime"/>
+        <result column="logtime" property="logtime"/>
+    </resultMap>
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, devcode, device_type, cell, data_json, decrypt_before_data, decrypt_after_data, uptime, logtime
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.data.DeviceDataListVO">
+          SELECT  	dd.id,
+                    dd.devcode,
+                    dd.device_type AS "deviceType",
+                    deptid,
+                    dd.cell,
+                    dd.data_json AS "dataJson",
+                    decrypt_before_data AS "decryptBeforeData",
+                    decrypt_after_data AS "decryptAfterData",
+                    uptime,
+                    logtime,
+                    d.STATUS,
+                    d.group_id AS "groupId",
+                    dg.group_name AS "groupName"
+        FROM (
+               SELECT *
+               FROM device_data
+               WHERE  1=1
+                <if test="request.devcode!='' and request.devcode != null">
+                    AND devcode like CONCAT('%',#{request.devcode},'%')
+                </if>
+                <if test="request.deviceType!='' and request.deviceType != null">
+                    AND device_type =#{request.deviceType}
+                </if>
+                <if test="request.beginTime!='' and request.beginTime!=null">
+                    AND logtime <![CDATA[  >=  ]]>
+                    <include refid="char_toDate">
+                        <property name="paramStr" value="#{request.beginTime}"/>
+                    </include>
+                </if>
+                <if test="request.endTime!='' and request.endTime!=null">
+                    AND logtime <![CDATA[  <=  ]]>
+                    <include refid="char_toDate">
+                        <property name="paramStr" value="#{request.endTime}"/>
+                    </include>
+                </if>
+                <if test="request.ids != null">
+                    and id in
+                    <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                        #{id}
+                    </foreach>
+                </if>
+
+          )dd
+          JOIN (
+                SELECT id, group_id,status,devcode
+                FROM device
+                WHERE valid=1
+                <if test="request.devcode!='' and request.devcode != null">
+                    AND devcode like CONCAT('%',#{request.devcode},'%')
+                </if>
+                <if test="request.deviceType!='' and request.deviceType != null">
+                    AND device_type =#{request.deviceType}
+                </if>
+                <if test="request.groupId!='' and request.groupId != null">
+                    AND greoup_id=#{request.groupId}
+                </if>
+          )d ON d.devcode=dd.devcode
+          JOIN (
+                SELECT   deptid,id,group_name
+                FROM device_group
+                WHERE valid=1
+                <if test="request.groupId!='' and request.groupId != null">
+                    AND id=#{request.groupId}
+                </if>
+          ) dg ON dg.id=d.group_id
+          order by logtime desc
+
+    </select>
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml
new file mode 100644
index 0000000..2e07287
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml
@@ -0,0 +1,148 @@
+<?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.casic.missiles.mapper.DeviceGroupMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceGroup">
+        <id column="id" property="id" />
+        <result column="group_name" property="groupName" />
+        <result column="group_no" property="groupNo" />
+        <result column="descn" property="descn" />
+        <result column="deptid" property="deptid" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="owner" property="owner" />
+        <result column="valid" property="valid" />
+    </resultMap>
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, owner, subcribe_ids, descn, dept, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
+        SELECT
+            dg.id,
+            group_no AS "groupNo",
+            deptid,
+             deviceCount,
+            subscribeCount,
+            descn,
+            create_time AS "createTime",
+            group_name AS "groupName",
+            create_user_id AS "createUserId",
+            create_user_name AS "createUserName"
+        FROM
+          (
+             SELECT *
+             FROM device_group
+             WHERE valid = 1
+            <if test="request.groupNo != null and request.groupNo != '' ">
+                AND group_no =#{request.groupNo}
+            </if>
+            <if test="request.groupName != '' and request.groupName != null">
+                AND group_name =#{request.groupName}
+            </if>
+            <if test="request.ids != null">
+                and id in
+                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+            <if test="request.beginTime!='' and request.beginTime!=null">
+                AND create_time <![CDATA[  >=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.beginTime}"/>
+                </include>
+            </if>
+            <if test="request.endTime!='' and request.endTime!=null">
+                AND create_time <![CDATA[  <=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.endTime}"/>
+                </include>
+            </if>
+          ) dg
+            LEFT JOIN (
+                   SELECT count(id)  AS "deviceCount",group_id as groupId
+                   FROM device d
+                   WHERE VALID = 1
+                   GROUP BY group_id
+        ) d ON d.groupId = dg.id
+            LEFT JOIN (
+                 SELECT count(id)  AS "subscribeCount",group_id AS groupId
+                 FROM subscribe_store GROUP BY group_id
+           ) s ON s.groupId = dg.id
+         order by create_time desc
+    </select>
+
+    <select id="list" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
+        SELECT
+        dg.id,
+        group_no AS "groupNo",
+        deptid,
+        count( d.id ) AS "deviceCount",
+        count( s.id ) AS "subscribeCount",
+        descn,
+        create_time AS "createTime",
+        group_name AS "groupName"
+        FROM
+        (
+        SELECT *
+        FROM device_group
+        WHERE valid = 1
+        <if test="request.groupNo != null and request.groupNo != '' ">
+            AND group_no =#{request.groupNo}
+        </if>
+        <if test="request.groupName != '' and request.groupName != null">
+            AND group_name =#{request.groupName}
+        </if>
+        <if test="request.ids != null">
+            and id in
+            <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+        <if test="request.beginTime!='' and request.beginTime!=null">
+            AND create_time <![CDATA[  >=  ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{request.beginTime}"/>
+            </include>
+        </if>
+        <if test="request.endTime!='' and request.endTime!=null">
+            AND create_time <![CDATA[  <=  ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{request.endTime}"/>
+            </include>
+        </if>
+        ) dg
+        LEFT JOIN (
+            SELECT id, group_id AS "groupId"
+            FROM device d
+            WHERE VALID = 1
+        ) d ON d.groupId = dg.id
+        LEFT JOIN (
+            SELECT id, group_id AS "groupId"
+            FROM subscribe_store
+        ) s ON s.groupId = dg.id
+        GROUP BY dg.id
+        order by create_time desc
+    </select>
+
+    <select id="selectMaxNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(group_no, 12)), 0)
+        from device_group
+    </select>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
new file mode 100644
index 0000000..2c99706
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
@@ -0,0 +1,88 @@
+<?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.casic.missiles.mapper.DeviceMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.Device">
+        <id column="id" property="id" />
+        <result column="group_id" property="groupId" />
+        <result column="product_id" property="productId" />
+        <result column="devcode" property="devcode" />
+        <result column="device_type" property="deviceType" />
+        <result column="unit" property="unit" />
+        <result column="model" property="model" />
+        <result column="name" property="name" />
+        <result column="status" property="status" />
+        <result column="imei" property="imei" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="valid" property="valid" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, devcode, device_type, unit, name, product_id, status, imei, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.device.DeviceListVO">
+        SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime,
+        data_value AS "dataValue",model,imei,d.cell,name AS "deviceName",status,d.id,create_user_id AS "createUserId",
+        create_user_name AS "createUserName"
+        FROM (
+            SELECT *
+            FROM device
+            WHERE VALID=1
+            <if test="request.groupId!='' and request.groupId != null">
+                AND group_id =#{request.groupId}
+            </if>
+            <if test="request.devcode!='' and request.devcode != null">
+                AND devcode like CONCAT('%',#{request.devcode},'%')
+            </if>
+            <if test="request.imei!='' and request.imei != null">
+                AND imei like CONCAT('%',#{request.imei},'%')
+            </if>
+            <if test="request.deviceType!='' and request.deviceType != null">
+                AND device_type =#{request.deviceType}
+            </if>
+            <if test="request.status!='' and request.status != null">
+                AND status =#{request.status}
+            </if>
+            <if test="request.productId!='' and request.productId != null">
+                AND product_id =#{request.productId}
+            </if>
+            <if test="request.beginCell!='' and request.beginCell!=null">
+                AND cell <![CDATA[  >=  ]]> #{request.beginCell}
+
+            </if>
+            <if test="request.endCell!='' and request.endCell!=null">
+                AND cell <![CDATA[  <=  ]]> #{request.endCell}
+            </if>
+            <if test="request.ids != null">
+                and id in
+                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+            order by create_time desc
+        )d JOIN (
+            SELECT deptid,id
+            FROM device_group
+            WHERE VALID =1
+            <if test="request.groupId!='' and request.groupId != null">
+                AND id =#{request.groupId}
+            </if>
+        )dg ON dg.id=d.group_id
+        LEFT JOIN(
+            SELECT ddd.logtime AS logtime,data_value,ddd.devcode,cell
+            FROM device_data ddd
+            JOIN
+            (
+                SELECT Max(logtime) AS logtime,devcode
+                FROM  device_data
+                GROUP BY devcode
+            )dd  ON dd.logtime=ddd.logtime AND dd.devcode=ddd.devcode
+        )dd ON dd.devcode=d.devcode
+        order by create_time desc
+    </select>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml
new file mode 100644
index 0000000..a5bf5e7
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml
@@ -0,0 +1,20 @@
+<?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.casic.missiles.mapper.DeviceUpgradeTaskMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceUpgradeTask">
+        <id column="id" property="id" />
+        <result column="version_id" property="versionId" />
+        <result column="device_id" property="deviceId" />
+        <result column="status" property="status" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, version_id, device_id, status, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml
new file mode 100644
index 0000000..e39ec1f
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml
@@ -0,0 +1,23 @@
+<?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.casic.missiles.mapper.DeviceVersionMapper">
+
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceVersion">
+        <id column="Id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="version_file" property="versionFile" />
+        <result column="version" property="version" />
+        <result column="owner" property="owner" />
+        <result column="dscn" property="dscn" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        Id, product_id, version_file, version, owner, dscn, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductConfigItemMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductConfigItemMapper.xml
new file mode 100644
index 0000000..e2448be
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/ProductConfigItemMapper.xml
@@ -0,0 +1,22 @@
+<?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.casic.missiles.mapper.ProductConfigItemMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductConfigItem">
+        <id column="id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="param_name" property="paramName" />
+        <result column="param_code" property="paramCode" />
+        <result column="param_type" property="paramType" />
+        <result column="regular_expression" property="regularExpression" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, product_id, param_name, param_code, param_type, regular_expression, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductDataItemMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductDataItemMapper.xml
new file mode 100644
index 0000000..61a55ec
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/ProductDataItemMapper.xml
@@ -0,0 +1,21 @@
+<?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.casic.missiles.mapper.ProductDataItemMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductDataItem">
+        <id column="id" property="id" />
+        <result column="data_item_name" property="dataItemName" />
+        <result column="product_id" property="productId" />
+        <result column="data_item_type" property="dataItemType" />
+        <result column="data_item_field" property="dataItemField" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, data_item_name, product_id, data_item_type, data_item_field, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
new file mode 100644
index 0000000..26f3cb3
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
@@ -0,0 +1,30 @@
+<?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.casic.missiles.mapper.ProductInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductInfo">
+        <id column="Id" property="id" />
+        <result column="name" property="name" />
+        <result column="access_type" property="accessType" />
+        <result column="encipher_type" property="encipherType" />
+        <result column="descn" property="descn" />
+        <result column="product_type" property="productType" />
+        <result column="owners" property="owners" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_name" property="createUserName" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        Id, name, access_type, encipher_type, protocol_type, model, descn, product_type, owners, CreatorName, create_time, create_user_id
+    </sql>
+
+    <select id="selectMaxNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(product_no, 12)), 0)
+        from product_info
+    </select>
+
+
+
+</mapper>

diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml
new file mode 100644
index 0000000..bd2c2cc
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml
@@ -0,0 +1,22 @@
+<?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.casic.missiles.mapper.AlarmConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmConfig">
+        <id column="id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="name" property="name" />
+        <result column="alarm_content" property="alarmContent" />
+        <result column="period_high" property="periodHigh" />
+        <result column="period_low" property="periodLow" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, product_id, alarm_content, period_high, period_low, TypeName, CreatorId, creater_user_id, create_time
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml
new file mode 100644
index 0000000..4aee44a
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml
@@ -0,0 +1,23 @@
+<?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.casic.missiles.mapper.AlarmDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmData">
+        <id column="id" property="id" />
+        <result column="alarm_type" property="alarmType" />
+        <result column="alarm_content" property="alarmContent" />
+        <result column="devcode" property="devcode" />
+        <result column="alarm_time" property="alarmTime" />
+        <result column="alarm_value" property="alarmValue" />
+        <result column="status" property="status" />
+        <result column="create_name" property="createName" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, alarm_type, alarm_content, devcode, alarm_time, alarm_value, status, CreatorName, create_time
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml b/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml
new file mode 100644
index 0000000..b4965d6
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml
@@ -0,0 +1,70 @@
+<?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.casic.missiles.mapper.BusConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.BusConfig">
+        <id column="id" property="id"/>
+        <result column="devcode" property="devcode"/>
+        <result column="config_json" property="configJson"/>
+        <result column="status" property="status"/>
+        <result column="send_time" property="sendTime"/>
+        <result column="create_time" property="createTime"/>
+        <result column="create_user_id" property="createUserId"/>
+    </resultMap>
+
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, Pid, devcode, config_json, status, update_time, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.model.BusConfig">
+        select bc.id,bc.devcode,config_type AS "configType", config_json AS "configJson",bc.status,
+        send_time as "sendTime",bc.create_time AS "createTime",bc.create_user_id AS "createUserId",
+        bc.create_user_name AS "createUserName",dg.deptid
+        FROM (
+            SELECT *
+            FROM bus_config
+            WHERE 1=1
+            <if test="request.configType != null and request.configType != '' ">
+                AND config_type =#{request.configType}
+            </if>
+            <if test="request.devcode != '' and request.devcode != null">
+                AND devcode =#{request.devcode}
+            </if>
+            <if test="request.status != '' and request.status != null">
+                AND status =#{request.status}
+            </if>
+            <if test="request.beginTime!='' and request.beginTime!=null">
+                AND send_time <![CDATA[  >=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.beginTime}"/>
+                </include>
+            </if>
+            <if test="request.endTime!='' and request.endTime!=null">
+                AND send_time <![CDATA[  <=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.endTime}"/>
+                </include>
+            </if>
+        )bc
+        JOIN device d ON d.devcode=bc.devcode
+        JOIN device_group dg ON dg.id= d.group_id
+
+    </select>
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml
new file mode 100644
index 0000000..083b289
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml
@@ -0,0 +1,106 @@
+<?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.casic.missiles.mapper.DeviceDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceData">
+        <id column="id" property="id"/>
+        <result column="devcode" property="devcode"/>
+        <result column="device_type" property="deviceType"/>
+        <result column="cell" property="cell"/>
+        <result column="data_json" property="dataJson"/>
+        <result column="decrypt_before_data" property="decryptBeforeData"/>
+        <result column="decrypt_after_data" property="decryptAfterData"/>
+        <result column="uptime" property="uptime"/>
+        <result column="logtime" property="logtime"/>
+    </resultMap>
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, devcode, device_type, cell, data_json, decrypt_before_data, decrypt_after_data, uptime, logtime
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.data.DeviceDataListVO">
+          SELECT  	dd.id,
+                    dd.devcode,
+                    dd.device_type AS "deviceType",
+                    deptid,
+                    dd.cell,
+                    dd.data_json AS "dataJson",
+                    decrypt_before_data AS "decryptBeforeData",
+                    decrypt_after_data AS "decryptAfterData",
+                    uptime,
+                    logtime,
+                    d.STATUS,
+                    d.group_id AS "groupId",
+                    dg.group_name AS "groupName"
+        FROM (
+               SELECT *
+               FROM device_data
+               WHERE  1=1
+                <if test="request.devcode!='' and request.devcode != null">
+                    AND devcode like CONCAT('%',#{request.devcode},'%')
+                </if>
+                <if test="request.deviceType!='' and request.deviceType != null">
+                    AND device_type =#{request.deviceType}
+                </if>
+                <if test="request.beginTime!='' and request.beginTime!=null">
+                    AND logtime <![CDATA[  >=  ]]>
+                    <include refid="char_toDate">
+                        <property name="paramStr" value="#{request.beginTime}"/>
+                    </include>
+                </if>
+                <if test="request.endTime!='' and request.endTime!=null">
+                    AND logtime <![CDATA[  <=  ]]>
+                    <include refid="char_toDate">
+                        <property name="paramStr" value="#{request.endTime}"/>
+                    </include>
+                </if>
+                <if test="request.ids != null">
+                    and id in
+                    <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                        #{id}
+                    </foreach>
+                </if>
+
+          )dd
+          JOIN (
+                SELECT id, group_id,status,devcode
+                FROM device
+                WHERE valid=1
+                <if test="request.devcode!='' and request.devcode != null">
+                    AND devcode like CONCAT('%',#{request.devcode},'%')
+                </if>
+                <if test="request.deviceType!='' and request.deviceType != null">
+                    AND device_type =#{request.deviceType}
+                </if>
+                <if test="request.groupId!='' and request.groupId != null">
+                    AND greoup_id=#{request.groupId}
+                </if>
+          )d ON d.devcode=dd.devcode
+          JOIN (
+                SELECT   deptid,id,group_name
+                FROM device_group
+                WHERE valid=1
+                <if test="request.groupId!='' and request.groupId != null">
+                    AND id=#{request.groupId}
+                </if>
+          ) dg ON dg.id=d.group_id
+          order by logtime desc
+
+    </select>
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml
new file mode 100644
index 0000000..2e07287
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml
@@ -0,0 +1,148 @@
+<?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.casic.missiles.mapper.DeviceGroupMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceGroup">
+        <id column="id" property="id" />
+        <result column="group_name" property="groupName" />
+        <result column="group_no" property="groupNo" />
+        <result column="descn" property="descn" />
+        <result column="deptid" property="deptid" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="owner" property="owner" />
+        <result column="valid" property="valid" />
+    </resultMap>
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, owner, subcribe_ids, descn, dept, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
+        SELECT
+            dg.id,
+            group_no AS "groupNo",
+            deptid,
+             deviceCount,
+            subscribeCount,
+            descn,
+            create_time AS "createTime",
+            group_name AS "groupName",
+            create_user_id AS "createUserId",
+            create_user_name AS "createUserName"
+        FROM
+          (
+             SELECT *
+             FROM device_group
+             WHERE valid = 1
+            <if test="request.groupNo != null and request.groupNo != '' ">
+                AND group_no =#{request.groupNo}
+            </if>
+            <if test="request.groupName != '' and request.groupName != null">
+                AND group_name =#{request.groupName}
+            </if>
+            <if test="request.ids != null">
+                and id in
+                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+            <if test="request.beginTime!='' and request.beginTime!=null">
+                AND create_time <![CDATA[  >=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.beginTime}"/>
+                </include>
+            </if>
+            <if test="request.endTime!='' and request.endTime!=null">
+                AND create_time <![CDATA[  <=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.endTime}"/>
+                </include>
+            </if>
+          ) dg
+            LEFT JOIN (
+                   SELECT count(id)  AS "deviceCount",group_id as groupId
+                   FROM device d
+                   WHERE VALID = 1
+                   GROUP BY group_id
+        ) d ON d.groupId = dg.id
+            LEFT JOIN (
+                 SELECT count(id)  AS "subscribeCount",group_id AS groupId
+                 FROM subscribe_store GROUP BY group_id
+           ) s ON s.groupId = dg.id
+         order by create_time desc
+    </select>
+
+    <select id="list" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
+        SELECT
+        dg.id,
+        group_no AS "groupNo",
+        deptid,
+        count( d.id ) AS "deviceCount",
+        count( s.id ) AS "subscribeCount",
+        descn,
+        create_time AS "createTime",
+        group_name AS "groupName"
+        FROM
+        (
+        SELECT *
+        FROM device_group
+        WHERE valid = 1
+        <if test="request.groupNo != null and request.groupNo != '' ">
+            AND group_no =#{request.groupNo}
+        </if>
+        <if test="request.groupName != '' and request.groupName != null">
+            AND group_name =#{request.groupName}
+        </if>
+        <if test="request.ids != null">
+            and id in
+            <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+        <if test="request.beginTime!='' and request.beginTime!=null">
+            AND create_time <![CDATA[  >=  ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{request.beginTime}"/>
+            </include>
+        </if>
+        <if test="request.endTime!='' and request.endTime!=null">
+            AND create_time <![CDATA[  <=  ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{request.endTime}"/>
+            </include>
+        </if>
+        ) dg
+        LEFT JOIN (
+            SELECT id, group_id AS "groupId"
+            FROM device d
+            WHERE VALID = 1
+        ) d ON d.groupId = dg.id
+        LEFT JOIN (
+            SELECT id, group_id AS "groupId"
+            FROM subscribe_store
+        ) s ON s.groupId = dg.id
+        GROUP BY dg.id
+        order by create_time desc
+    </select>
+
+    <select id="selectMaxNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(group_no, 12)), 0)
+        from device_group
+    </select>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
new file mode 100644
index 0000000..2c99706
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
@@ -0,0 +1,88 @@
+<?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.casic.missiles.mapper.DeviceMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.Device">
+        <id column="id" property="id" />
+        <result column="group_id" property="groupId" />
+        <result column="product_id" property="productId" />
+        <result column="devcode" property="devcode" />
+        <result column="device_type" property="deviceType" />
+        <result column="unit" property="unit" />
+        <result column="model" property="model" />
+        <result column="name" property="name" />
+        <result column="status" property="status" />
+        <result column="imei" property="imei" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="valid" property="valid" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, devcode, device_type, unit, name, product_id, status, imei, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.device.DeviceListVO">
+        SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime,
+        data_value AS "dataValue",model,imei,d.cell,name AS "deviceName",status,d.id,create_user_id AS "createUserId",
+        create_user_name AS "createUserName"
+        FROM (
+            SELECT *
+            FROM device
+            WHERE VALID=1
+            <if test="request.groupId!='' and request.groupId != null">
+                AND group_id =#{request.groupId}
+            </if>
+            <if test="request.devcode!='' and request.devcode != null">
+                AND devcode like CONCAT('%',#{request.devcode},'%')
+            </if>
+            <if test="request.imei!='' and request.imei != null">
+                AND imei like CONCAT('%',#{request.imei},'%')
+            </if>
+            <if test="request.deviceType!='' and request.deviceType != null">
+                AND device_type =#{request.deviceType}
+            </if>
+            <if test="request.status!='' and request.status != null">
+                AND status =#{request.status}
+            </if>
+            <if test="request.productId!='' and request.productId != null">
+                AND product_id =#{request.productId}
+            </if>
+            <if test="request.beginCell!='' and request.beginCell!=null">
+                AND cell <![CDATA[  >=  ]]> #{request.beginCell}
+
+            </if>
+            <if test="request.endCell!='' and request.endCell!=null">
+                AND cell <![CDATA[  <=  ]]> #{request.endCell}
+            </if>
+            <if test="request.ids != null">
+                and id in
+                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+            order by create_time desc
+        )d JOIN (
+            SELECT deptid,id
+            FROM device_group
+            WHERE VALID =1
+            <if test="request.groupId!='' and request.groupId != null">
+                AND id =#{request.groupId}
+            </if>
+        )dg ON dg.id=d.group_id
+        LEFT JOIN(
+            SELECT ddd.logtime AS logtime,data_value,ddd.devcode,cell
+            FROM device_data ddd
+            JOIN
+            (
+                SELECT Max(logtime) AS logtime,devcode
+                FROM  device_data
+                GROUP BY devcode
+            )dd  ON dd.logtime=ddd.logtime AND dd.devcode=ddd.devcode
+        )dd ON dd.devcode=d.devcode
+        order by create_time desc
+    </select>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml
new file mode 100644
index 0000000..a5bf5e7
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml
@@ -0,0 +1,20 @@
+<?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.casic.missiles.mapper.DeviceUpgradeTaskMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceUpgradeTask">
+        <id column="id" property="id" />
+        <result column="version_id" property="versionId" />
+        <result column="device_id" property="deviceId" />
+        <result column="status" property="status" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, version_id, device_id, status, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml
new file mode 100644
index 0000000..e39ec1f
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml
@@ -0,0 +1,23 @@
+<?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.casic.missiles.mapper.DeviceVersionMapper">
+
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceVersion">
+        <id column="Id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="version_file" property="versionFile" />
+        <result column="version" property="version" />
+        <result column="owner" property="owner" />
+        <result column="dscn" property="dscn" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        Id, product_id, version_file, version, owner, dscn, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductConfigItemMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductConfigItemMapper.xml
new file mode 100644
index 0000000..e2448be
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/ProductConfigItemMapper.xml
@@ -0,0 +1,22 @@
+<?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.casic.missiles.mapper.ProductConfigItemMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductConfigItem">
+        <id column="id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="param_name" property="paramName" />
+        <result column="param_code" property="paramCode" />
+        <result column="param_type" property="paramType" />
+        <result column="regular_expression" property="regularExpression" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, product_id, param_name, param_code, param_type, regular_expression, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductDataItemMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductDataItemMapper.xml
new file mode 100644
index 0000000..61a55ec
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/ProductDataItemMapper.xml
@@ -0,0 +1,21 @@
+<?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.casic.missiles.mapper.ProductDataItemMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductDataItem">
+        <id column="id" property="id" />
+        <result column="data_item_name" property="dataItemName" />
+        <result column="product_id" property="productId" />
+        <result column="data_item_type" property="dataItemType" />
+        <result column="data_item_field" property="dataItemField" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, data_item_name, product_id, data_item_type, data_item_field, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
new file mode 100644
index 0000000..26f3cb3
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
@@ -0,0 +1,30 @@
+<?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.casic.missiles.mapper.ProductInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductInfo">
+        <id column="Id" property="id" />
+        <result column="name" property="name" />
+        <result column="access_type" property="accessType" />
+        <result column="encipher_type" property="encipherType" />
+        <result column="descn" property="descn" />
+        <result column="product_type" property="productType" />
+        <result column="owners" property="owners" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_name" property="createUserName" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        Id, name, access_type, encipher_type, protocol_type, model, descn, product_type, owners, CreatorName, create_time, create_user_id
+    </sql>
+
+    <select id="selectMaxNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(product_no, 12)), 0)
+        from product_info
+    </select>
+
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/SubscribeStoreMapper.xml b/casic-iot-dao/src/main/resources/mapper/SubscribeStoreMapper.xml
new file mode 100644
index 0000000..415a670
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/SubscribeStoreMapper.xml
@@ -0,0 +1,61 @@
+<?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.casic.missiles.mapper.SubscribeStoreMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.SubscribeStore">
+        <id column="id" property="id"/>
+        <result column="subscribe_no" property="subscribeNo"/>
+        <result column="group_id" property="groupId"/>
+        <result column="message_type" property="messageType"/>
+        <result column="subscribe_type" property="subscribeType"/>
+        <result column="enable" property="enable"/>
+        <result column="subscribe_status" property="subscribeStatus"/>
+        <result column="subscribe_content_json" property="subscribeContentJson"/>
+        <result column="descn" property="descn"/>
+        <result column="create_time" property="createTime"/>
+        <result column="create_user_name" property="createUserName"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, message_type, subscribe_type, enable, subscribe_status, subscribe_content_json, descn, create_time, create_user_name
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.subscribe.SubscribeListVO">
+        SELECT message_type AS "messageType",create_time AS "createTime",subscribe_no AS
+            "subscribeNo",subscribe_content_json AS "subscribeContentJson",
+            subscribe_status AS "subscribeStatus",create_user_name AS "createUserName",
+           create_user_id AS "createUserId"
+        FROM (
+        SELECT *
+        FROM subscribe_store
+        WHERE 1=1
+        <if test="request.groupId!='' and request.groupId != null">
+            AND group_id =#{request.groupId}
+        </if>
+        <if test="request.messageType!='' and request.messageType != null">
+            AND message_type =#{request.messageType}
+        </if>
+        <if test="request.subscribeNo!='' and request.subscribeNo != null">
+            AND subscribe_no like CONCAT('%',#{request.subscribeNo},'%')
+        </if>
+        <if test="request.subscribeType!='' and request.subscribeType != null">
+            AND subscribe_type =#{request.subscribeType}
+        </if>
+        <if test="request.status!='' and request.status != null">
+            AND subscribe_status =#{request.status}
+        </if>
+        order by create_time desc
+        )d JOIN (
+        SELECT deptid,id
+        FROM device_group
+        WHERE VALID=1
+        <if test="request.groupId!='' and request.groupId != null">
+            AND id =#{request.groupId}
+        </if>
+        )dg ON dg.id=d.group_id
+        order by create_time desc
+    </select>
+
+</mapper>

diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml
new file mode 100644
index 0000000..bd2c2cc
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml
@@ -0,0 +1,22 @@
+<?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.casic.missiles.mapper.AlarmConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmConfig">
+        <id column="id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="name" property="name" />
+        <result column="alarm_content" property="alarmContent" />
+        <result column="period_high" property="periodHigh" />
+        <result column="period_low" property="periodLow" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, product_id, alarm_content, period_high, period_low, TypeName, CreatorId, creater_user_id, create_time
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml
new file mode 100644
index 0000000..4aee44a
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml
@@ -0,0 +1,23 @@
+<?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.casic.missiles.mapper.AlarmDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmData">
+        <id column="id" property="id" />
+        <result column="alarm_type" property="alarmType" />
+        <result column="alarm_content" property="alarmContent" />
+        <result column="devcode" property="devcode" />
+        <result column="alarm_time" property="alarmTime" />
+        <result column="alarm_value" property="alarmValue" />
+        <result column="status" property="status" />
+        <result column="create_name" property="createName" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, alarm_type, alarm_content, devcode, alarm_time, alarm_value, status, CreatorName, create_time
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml b/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml
new file mode 100644
index 0000000..b4965d6
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml
@@ -0,0 +1,70 @@
+<?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.casic.missiles.mapper.BusConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.BusConfig">
+        <id column="id" property="id"/>
+        <result column="devcode" property="devcode"/>
+        <result column="config_json" property="configJson"/>
+        <result column="status" property="status"/>
+        <result column="send_time" property="sendTime"/>
+        <result column="create_time" property="createTime"/>
+        <result column="create_user_id" property="createUserId"/>
+    </resultMap>
+
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, Pid, devcode, config_json, status, update_time, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.model.BusConfig">
+        select bc.id,bc.devcode,config_type AS "configType", config_json AS "configJson",bc.status,
+        send_time as "sendTime",bc.create_time AS "createTime",bc.create_user_id AS "createUserId",
+        bc.create_user_name AS "createUserName",dg.deptid
+        FROM (
+            SELECT *
+            FROM bus_config
+            WHERE 1=1
+            <if test="request.configType != null and request.configType != '' ">
+                AND config_type =#{request.configType}
+            </if>
+            <if test="request.devcode != '' and request.devcode != null">
+                AND devcode =#{request.devcode}
+            </if>
+            <if test="request.status != '' and request.status != null">
+                AND status =#{request.status}
+            </if>
+            <if test="request.beginTime!='' and request.beginTime!=null">
+                AND send_time <![CDATA[  >=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.beginTime}"/>
+                </include>
+            </if>
+            <if test="request.endTime!='' and request.endTime!=null">
+                AND send_time <![CDATA[  <=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.endTime}"/>
+                </include>
+            </if>
+        )bc
+        JOIN device d ON d.devcode=bc.devcode
+        JOIN device_group dg ON dg.id= d.group_id
+
+    </select>
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml
new file mode 100644
index 0000000..083b289
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml
@@ -0,0 +1,106 @@
+<?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.casic.missiles.mapper.DeviceDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceData">
+        <id column="id" property="id"/>
+        <result column="devcode" property="devcode"/>
+        <result column="device_type" property="deviceType"/>
+        <result column="cell" property="cell"/>
+        <result column="data_json" property="dataJson"/>
+        <result column="decrypt_before_data" property="decryptBeforeData"/>
+        <result column="decrypt_after_data" property="decryptAfterData"/>
+        <result column="uptime" property="uptime"/>
+        <result column="logtime" property="logtime"/>
+    </resultMap>
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, devcode, device_type, cell, data_json, decrypt_before_data, decrypt_after_data, uptime, logtime
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.data.DeviceDataListVO">
+          SELECT  	dd.id,
+                    dd.devcode,
+                    dd.device_type AS "deviceType",
+                    deptid,
+                    dd.cell,
+                    dd.data_json AS "dataJson",
+                    decrypt_before_data AS "decryptBeforeData",
+                    decrypt_after_data AS "decryptAfterData",
+                    uptime,
+                    logtime,
+                    d.STATUS,
+                    d.group_id AS "groupId",
+                    dg.group_name AS "groupName"
+        FROM (
+               SELECT *
+               FROM device_data
+               WHERE  1=1
+                <if test="request.devcode!='' and request.devcode != null">
+                    AND devcode like CONCAT('%',#{request.devcode},'%')
+                </if>
+                <if test="request.deviceType!='' and request.deviceType != null">
+                    AND device_type =#{request.deviceType}
+                </if>
+                <if test="request.beginTime!='' and request.beginTime!=null">
+                    AND logtime <![CDATA[  >=  ]]>
+                    <include refid="char_toDate">
+                        <property name="paramStr" value="#{request.beginTime}"/>
+                    </include>
+                </if>
+                <if test="request.endTime!='' and request.endTime!=null">
+                    AND logtime <![CDATA[  <=  ]]>
+                    <include refid="char_toDate">
+                        <property name="paramStr" value="#{request.endTime}"/>
+                    </include>
+                </if>
+                <if test="request.ids != null">
+                    and id in
+                    <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                        #{id}
+                    </foreach>
+                </if>
+
+          )dd
+          JOIN (
+                SELECT id, group_id,status,devcode
+                FROM device
+                WHERE valid=1
+                <if test="request.devcode!='' and request.devcode != null">
+                    AND devcode like CONCAT('%',#{request.devcode},'%')
+                </if>
+                <if test="request.deviceType!='' and request.deviceType != null">
+                    AND device_type =#{request.deviceType}
+                </if>
+                <if test="request.groupId!='' and request.groupId != null">
+                    AND greoup_id=#{request.groupId}
+                </if>
+          )d ON d.devcode=dd.devcode
+          JOIN (
+                SELECT   deptid,id,group_name
+                FROM device_group
+                WHERE valid=1
+                <if test="request.groupId!='' and request.groupId != null">
+                    AND id=#{request.groupId}
+                </if>
+          ) dg ON dg.id=d.group_id
+          order by logtime desc
+
+    </select>
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml
new file mode 100644
index 0000000..2e07287
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml
@@ -0,0 +1,148 @@
+<?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.casic.missiles.mapper.DeviceGroupMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceGroup">
+        <id column="id" property="id" />
+        <result column="group_name" property="groupName" />
+        <result column="group_no" property="groupNo" />
+        <result column="descn" property="descn" />
+        <result column="deptid" property="deptid" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="owner" property="owner" />
+        <result column="valid" property="valid" />
+    </resultMap>
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, owner, subcribe_ids, descn, dept, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
+        SELECT
+            dg.id,
+            group_no AS "groupNo",
+            deptid,
+             deviceCount,
+            subscribeCount,
+            descn,
+            create_time AS "createTime",
+            group_name AS "groupName",
+            create_user_id AS "createUserId",
+            create_user_name AS "createUserName"
+        FROM
+          (
+             SELECT *
+             FROM device_group
+             WHERE valid = 1
+            <if test="request.groupNo != null and request.groupNo != '' ">
+                AND group_no =#{request.groupNo}
+            </if>
+            <if test="request.groupName != '' and request.groupName != null">
+                AND group_name =#{request.groupName}
+            </if>
+            <if test="request.ids != null">
+                and id in
+                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+            <if test="request.beginTime!='' and request.beginTime!=null">
+                AND create_time <![CDATA[  >=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.beginTime}"/>
+                </include>
+            </if>
+            <if test="request.endTime!='' and request.endTime!=null">
+                AND create_time <![CDATA[  <=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.endTime}"/>
+                </include>
+            </if>
+          ) dg
+            LEFT JOIN (
+                   SELECT count(id)  AS "deviceCount",group_id as groupId
+                   FROM device d
+                   WHERE VALID = 1
+                   GROUP BY group_id
+        ) d ON d.groupId = dg.id
+            LEFT JOIN (
+                 SELECT count(id)  AS "subscribeCount",group_id AS groupId
+                 FROM subscribe_store GROUP BY group_id
+           ) s ON s.groupId = dg.id
+         order by create_time desc
+    </select>
+
+    <select id="list" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
+        SELECT
+        dg.id,
+        group_no AS "groupNo",
+        deptid,
+        count( d.id ) AS "deviceCount",
+        count( s.id ) AS "subscribeCount",
+        descn,
+        create_time AS "createTime",
+        group_name AS "groupName"
+        FROM
+        (
+        SELECT *
+        FROM device_group
+        WHERE valid = 1
+        <if test="request.groupNo != null and request.groupNo != '' ">
+            AND group_no =#{request.groupNo}
+        </if>
+        <if test="request.groupName != '' and request.groupName != null">
+            AND group_name =#{request.groupName}
+        </if>
+        <if test="request.ids != null">
+            and id in
+            <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+        <if test="request.beginTime!='' and request.beginTime!=null">
+            AND create_time <![CDATA[  >=  ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{request.beginTime}"/>
+            </include>
+        </if>
+        <if test="request.endTime!='' and request.endTime!=null">
+            AND create_time <![CDATA[  <=  ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{request.endTime}"/>
+            </include>
+        </if>
+        ) dg
+        LEFT JOIN (
+            SELECT id, group_id AS "groupId"
+            FROM device d
+            WHERE VALID = 1
+        ) d ON d.groupId = dg.id
+        LEFT JOIN (
+            SELECT id, group_id AS "groupId"
+            FROM subscribe_store
+        ) s ON s.groupId = dg.id
+        GROUP BY dg.id
+        order by create_time desc
+    </select>
+
+    <select id="selectMaxNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(group_no, 12)), 0)
+        from device_group
+    </select>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
new file mode 100644
index 0000000..2c99706
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
@@ -0,0 +1,88 @@
+<?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.casic.missiles.mapper.DeviceMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.Device">
+        <id column="id" property="id" />
+        <result column="group_id" property="groupId" />
+        <result column="product_id" property="productId" />
+        <result column="devcode" property="devcode" />
+        <result column="device_type" property="deviceType" />
+        <result column="unit" property="unit" />
+        <result column="model" property="model" />
+        <result column="name" property="name" />
+        <result column="status" property="status" />
+        <result column="imei" property="imei" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="valid" property="valid" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, devcode, device_type, unit, name, product_id, status, imei, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.device.DeviceListVO">
+        SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime,
+        data_value AS "dataValue",model,imei,d.cell,name AS "deviceName",status,d.id,create_user_id AS "createUserId",
+        create_user_name AS "createUserName"
+        FROM (
+            SELECT *
+            FROM device
+            WHERE VALID=1
+            <if test="request.groupId!='' and request.groupId != null">
+                AND group_id =#{request.groupId}
+            </if>
+            <if test="request.devcode!='' and request.devcode != null">
+                AND devcode like CONCAT('%',#{request.devcode},'%')
+            </if>
+            <if test="request.imei!='' and request.imei != null">
+                AND imei like CONCAT('%',#{request.imei},'%')
+            </if>
+            <if test="request.deviceType!='' and request.deviceType != null">
+                AND device_type =#{request.deviceType}
+            </if>
+            <if test="request.status!='' and request.status != null">
+                AND status =#{request.status}
+            </if>
+            <if test="request.productId!='' and request.productId != null">
+                AND product_id =#{request.productId}
+            </if>
+            <if test="request.beginCell!='' and request.beginCell!=null">
+                AND cell <![CDATA[  >=  ]]> #{request.beginCell}
+
+            </if>
+            <if test="request.endCell!='' and request.endCell!=null">
+                AND cell <![CDATA[  <=  ]]> #{request.endCell}
+            </if>
+            <if test="request.ids != null">
+                and id in
+                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+            order by create_time desc
+        )d JOIN (
+            SELECT deptid,id
+            FROM device_group
+            WHERE VALID =1
+            <if test="request.groupId!='' and request.groupId != null">
+                AND id =#{request.groupId}
+            </if>
+        )dg ON dg.id=d.group_id
+        LEFT JOIN(
+            SELECT ddd.logtime AS logtime,data_value,ddd.devcode,cell
+            FROM device_data ddd
+            JOIN
+            (
+                SELECT Max(logtime) AS logtime,devcode
+                FROM  device_data
+                GROUP BY devcode
+            )dd  ON dd.logtime=ddd.logtime AND dd.devcode=ddd.devcode
+        )dd ON dd.devcode=d.devcode
+        order by create_time desc
+    </select>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml
new file mode 100644
index 0000000..a5bf5e7
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml
@@ -0,0 +1,20 @@
+<?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.casic.missiles.mapper.DeviceUpgradeTaskMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceUpgradeTask">
+        <id column="id" property="id" />
+        <result column="version_id" property="versionId" />
+        <result column="device_id" property="deviceId" />
+        <result column="status" property="status" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, version_id, device_id, status, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml
new file mode 100644
index 0000000..e39ec1f
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml
@@ -0,0 +1,23 @@
+<?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.casic.missiles.mapper.DeviceVersionMapper">
+
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceVersion">
+        <id column="Id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="version_file" property="versionFile" />
+        <result column="version" property="version" />
+        <result column="owner" property="owner" />
+        <result column="dscn" property="dscn" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        Id, product_id, version_file, version, owner, dscn, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductConfigItemMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductConfigItemMapper.xml
new file mode 100644
index 0000000..e2448be
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/ProductConfigItemMapper.xml
@@ -0,0 +1,22 @@
+<?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.casic.missiles.mapper.ProductConfigItemMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductConfigItem">
+        <id column="id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="param_name" property="paramName" />
+        <result column="param_code" property="paramCode" />
+        <result column="param_type" property="paramType" />
+        <result column="regular_expression" property="regularExpression" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, product_id, param_name, param_code, param_type, regular_expression, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductDataItemMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductDataItemMapper.xml
new file mode 100644
index 0000000..61a55ec
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/ProductDataItemMapper.xml
@@ -0,0 +1,21 @@
+<?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.casic.missiles.mapper.ProductDataItemMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductDataItem">
+        <id column="id" property="id" />
+        <result column="data_item_name" property="dataItemName" />
+        <result column="product_id" property="productId" />
+        <result column="data_item_type" property="dataItemType" />
+        <result column="data_item_field" property="dataItemField" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, data_item_name, product_id, data_item_type, data_item_field, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
new file mode 100644
index 0000000..26f3cb3
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
@@ -0,0 +1,30 @@
+<?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.casic.missiles.mapper.ProductInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductInfo">
+        <id column="Id" property="id" />
+        <result column="name" property="name" />
+        <result column="access_type" property="accessType" />
+        <result column="encipher_type" property="encipherType" />
+        <result column="descn" property="descn" />
+        <result column="product_type" property="productType" />
+        <result column="owners" property="owners" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_name" property="createUserName" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        Id, name, access_type, encipher_type, protocol_type, model, descn, product_type, owners, CreatorName, create_time, create_user_id
+    </sql>
+
+    <select id="selectMaxNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(product_no, 12)), 0)
+        from product_info
+    </select>
+
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/SubscribeStoreMapper.xml b/casic-iot-dao/src/main/resources/mapper/SubscribeStoreMapper.xml
new file mode 100644
index 0000000..415a670
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/SubscribeStoreMapper.xml
@@ -0,0 +1,61 @@
+<?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.casic.missiles.mapper.SubscribeStoreMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.SubscribeStore">
+        <id column="id" property="id"/>
+        <result column="subscribe_no" property="subscribeNo"/>
+        <result column="group_id" property="groupId"/>
+        <result column="message_type" property="messageType"/>
+        <result column="subscribe_type" property="subscribeType"/>
+        <result column="enable" property="enable"/>
+        <result column="subscribe_status" property="subscribeStatus"/>
+        <result column="subscribe_content_json" property="subscribeContentJson"/>
+        <result column="descn" property="descn"/>
+        <result column="create_time" property="createTime"/>
+        <result column="create_user_name" property="createUserName"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, message_type, subscribe_type, enable, subscribe_status, subscribe_content_json, descn, create_time, create_user_name
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.subscribe.SubscribeListVO">
+        SELECT message_type AS "messageType",create_time AS "createTime",subscribe_no AS
+            "subscribeNo",subscribe_content_json AS "subscribeContentJson",
+            subscribe_status AS "subscribeStatus",create_user_name AS "createUserName",
+           create_user_id AS "createUserId"
+        FROM (
+        SELECT *
+        FROM subscribe_store
+        WHERE 1=1
+        <if test="request.groupId!='' and request.groupId != null">
+            AND group_id =#{request.groupId}
+        </if>
+        <if test="request.messageType!='' and request.messageType != null">
+            AND message_type =#{request.messageType}
+        </if>
+        <if test="request.subscribeNo!='' and request.subscribeNo != null">
+            AND subscribe_no like CONCAT('%',#{request.subscribeNo},'%')
+        </if>
+        <if test="request.subscribeType!='' and request.subscribeType != null">
+            AND subscribe_type =#{request.subscribeType}
+        </if>
+        <if test="request.status!='' and request.status != null">
+            AND subscribe_status =#{request.status}
+        </if>
+        order by create_time desc
+        )d JOIN (
+        SELECT deptid,id
+        FROM device_group
+        WHERE VALID=1
+        <if test="request.groupId!='' and request.groupId != null">
+            AND id =#{request.groupId}
+        </if>
+        )dg ON dg.id=d.group_id
+        order by create_time desc
+    </select>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/common/SysCommonMapper.xml b/casic-iot-dao/src/main/resources/mapper/common/SysCommonMapper.xml
new file mode 100644
index 0000000..880f7d4
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/common/SysCommonMapper.xml
@@ -0,0 +1,21 @@
+<?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.casic.missiles.mapper.common.SysCommonMapper">
+
+    <select id="getDictMapByCode" resultType="java.util.Map">
+        SELECT  name,code
+        from sys_dict
+         where  pid=(
+            SELECT id
+            from  sys_dict
+            where  code=#{code}
+         )
+    </select>
+
+    <select id="getDeptMap" resultType="java.util.Map">
+        SELECT  id,SIMPLE_NAME AS  "simpleName"
+        from sys_dept
+    </select>
+
+
+</mapper>

diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml
new file mode 100644
index 0000000..bd2c2cc
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml
@@ -0,0 +1,22 @@
+<?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.casic.missiles.mapper.AlarmConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmConfig">
+        <id column="id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="name" property="name" />
+        <result column="alarm_content" property="alarmContent" />
+        <result column="period_high" property="periodHigh" />
+        <result column="period_low" property="periodLow" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, product_id, alarm_content, period_high, period_low, TypeName, CreatorId, creater_user_id, create_time
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml
new file mode 100644
index 0000000..4aee44a
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml
@@ -0,0 +1,23 @@
+<?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.casic.missiles.mapper.AlarmDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmData">
+        <id column="id" property="id" />
+        <result column="alarm_type" property="alarmType" />
+        <result column="alarm_content" property="alarmContent" />
+        <result column="devcode" property="devcode" />
+        <result column="alarm_time" property="alarmTime" />
+        <result column="alarm_value" property="alarmValue" />
+        <result column="status" property="status" />
+        <result column="create_name" property="createName" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, alarm_type, alarm_content, devcode, alarm_time, alarm_value, status, CreatorName, create_time
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml b/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml
new file mode 100644
index 0000000..b4965d6
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml
@@ -0,0 +1,70 @@
+<?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.casic.missiles.mapper.BusConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.BusConfig">
+        <id column="id" property="id"/>
+        <result column="devcode" property="devcode"/>
+        <result column="config_json" property="configJson"/>
+        <result column="status" property="status"/>
+        <result column="send_time" property="sendTime"/>
+        <result column="create_time" property="createTime"/>
+        <result column="create_user_id" property="createUserId"/>
+    </resultMap>
+
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, Pid, devcode, config_json, status, update_time, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.model.BusConfig">
+        select bc.id,bc.devcode,config_type AS "configType", config_json AS "configJson",bc.status,
+        send_time as "sendTime",bc.create_time AS "createTime",bc.create_user_id AS "createUserId",
+        bc.create_user_name AS "createUserName",dg.deptid
+        FROM (
+            SELECT *
+            FROM bus_config
+            WHERE 1=1
+            <if test="request.configType != null and request.configType != '' ">
+                AND config_type =#{request.configType}
+            </if>
+            <if test="request.devcode != '' and request.devcode != null">
+                AND devcode =#{request.devcode}
+            </if>
+            <if test="request.status != '' and request.status != null">
+                AND status =#{request.status}
+            </if>
+            <if test="request.beginTime!='' and request.beginTime!=null">
+                AND send_time <![CDATA[  >=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.beginTime}"/>
+                </include>
+            </if>
+            <if test="request.endTime!='' and request.endTime!=null">
+                AND send_time <![CDATA[  <=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.endTime}"/>
+                </include>
+            </if>
+        )bc
+        JOIN device d ON d.devcode=bc.devcode
+        JOIN device_group dg ON dg.id= d.group_id
+
+    </select>
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml
new file mode 100644
index 0000000..083b289
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml
@@ -0,0 +1,106 @@
+<?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.casic.missiles.mapper.DeviceDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceData">
+        <id column="id" property="id"/>
+        <result column="devcode" property="devcode"/>
+        <result column="device_type" property="deviceType"/>
+        <result column="cell" property="cell"/>
+        <result column="data_json" property="dataJson"/>
+        <result column="decrypt_before_data" property="decryptBeforeData"/>
+        <result column="decrypt_after_data" property="decryptAfterData"/>
+        <result column="uptime" property="uptime"/>
+        <result column="logtime" property="logtime"/>
+    </resultMap>
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, devcode, device_type, cell, data_json, decrypt_before_data, decrypt_after_data, uptime, logtime
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.data.DeviceDataListVO">
+          SELECT  	dd.id,
+                    dd.devcode,
+                    dd.device_type AS "deviceType",
+                    deptid,
+                    dd.cell,
+                    dd.data_json AS "dataJson",
+                    decrypt_before_data AS "decryptBeforeData",
+                    decrypt_after_data AS "decryptAfterData",
+                    uptime,
+                    logtime,
+                    d.STATUS,
+                    d.group_id AS "groupId",
+                    dg.group_name AS "groupName"
+        FROM (
+               SELECT *
+               FROM device_data
+               WHERE  1=1
+                <if test="request.devcode!='' and request.devcode != null">
+                    AND devcode like CONCAT('%',#{request.devcode},'%')
+                </if>
+                <if test="request.deviceType!='' and request.deviceType != null">
+                    AND device_type =#{request.deviceType}
+                </if>
+                <if test="request.beginTime!='' and request.beginTime!=null">
+                    AND logtime <![CDATA[  >=  ]]>
+                    <include refid="char_toDate">
+                        <property name="paramStr" value="#{request.beginTime}"/>
+                    </include>
+                </if>
+                <if test="request.endTime!='' and request.endTime!=null">
+                    AND logtime <![CDATA[  <=  ]]>
+                    <include refid="char_toDate">
+                        <property name="paramStr" value="#{request.endTime}"/>
+                    </include>
+                </if>
+                <if test="request.ids != null">
+                    and id in
+                    <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                        #{id}
+                    </foreach>
+                </if>
+
+          )dd
+          JOIN (
+                SELECT id, group_id,status,devcode
+                FROM device
+                WHERE valid=1
+                <if test="request.devcode!='' and request.devcode != null">
+                    AND devcode like CONCAT('%',#{request.devcode},'%')
+                </if>
+                <if test="request.deviceType!='' and request.deviceType != null">
+                    AND device_type =#{request.deviceType}
+                </if>
+                <if test="request.groupId!='' and request.groupId != null">
+                    AND greoup_id=#{request.groupId}
+                </if>
+          )d ON d.devcode=dd.devcode
+          JOIN (
+                SELECT   deptid,id,group_name
+                FROM device_group
+                WHERE valid=1
+                <if test="request.groupId!='' and request.groupId != null">
+                    AND id=#{request.groupId}
+                </if>
+          ) dg ON dg.id=d.group_id
+          order by logtime desc
+
+    </select>
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml
new file mode 100644
index 0000000..2e07287
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml
@@ -0,0 +1,148 @@
+<?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.casic.missiles.mapper.DeviceGroupMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceGroup">
+        <id column="id" property="id" />
+        <result column="group_name" property="groupName" />
+        <result column="group_no" property="groupNo" />
+        <result column="descn" property="descn" />
+        <result column="deptid" property="deptid" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="owner" property="owner" />
+        <result column="valid" property="valid" />
+    </resultMap>
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, owner, subcribe_ids, descn, dept, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
+        SELECT
+            dg.id,
+            group_no AS "groupNo",
+            deptid,
+             deviceCount,
+            subscribeCount,
+            descn,
+            create_time AS "createTime",
+            group_name AS "groupName",
+            create_user_id AS "createUserId",
+            create_user_name AS "createUserName"
+        FROM
+          (
+             SELECT *
+             FROM device_group
+             WHERE valid = 1
+            <if test="request.groupNo != null and request.groupNo != '' ">
+                AND group_no =#{request.groupNo}
+            </if>
+            <if test="request.groupName != '' and request.groupName != null">
+                AND group_name =#{request.groupName}
+            </if>
+            <if test="request.ids != null">
+                and id in
+                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+            <if test="request.beginTime!='' and request.beginTime!=null">
+                AND create_time <![CDATA[  >=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.beginTime}"/>
+                </include>
+            </if>
+            <if test="request.endTime!='' and request.endTime!=null">
+                AND create_time <![CDATA[  <=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.endTime}"/>
+                </include>
+            </if>
+          ) dg
+            LEFT JOIN (
+                   SELECT count(id)  AS "deviceCount",group_id as groupId
+                   FROM device d
+                   WHERE VALID = 1
+                   GROUP BY group_id
+        ) d ON d.groupId = dg.id
+            LEFT JOIN (
+                 SELECT count(id)  AS "subscribeCount",group_id AS groupId
+                 FROM subscribe_store GROUP BY group_id
+           ) s ON s.groupId = dg.id
+         order by create_time desc
+    </select>
+
+    <select id="list" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
+        SELECT
+        dg.id,
+        group_no AS "groupNo",
+        deptid,
+        count( d.id ) AS "deviceCount",
+        count( s.id ) AS "subscribeCount",
+        descn,
+        create_time AS "createTime",
+        group_name AS "groupName"
+        FROM
+        (
+        SELECT *
+        FROM device_group
+        WHERE valid = 1
+        <if test="request.groupNo != null and request.groupNo != '' ">
+            AND group_no =#{request.groupNo}
+        </if>
+        <if test="request.groupName != '' and request.groupName != null">
+            AND group_name =#{request.groupName}
+        </if>
+        <if test="request.ids != null">
+            and id in
+            <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+        <if test="request.beginTime!='' and request.beginTime!=null">
+            AND create_time <![CDATA[  >=  ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{request.beginTime}"/>
+            </include>
+        </if>
+        <if test="request.endTime!='' and request.endTime!=null">
+            AND create_time <![CDATA[  <=  ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{request.endTime}"/>
+            </include>
+        </if>
+        ) dg
+        LEFT JOIN (
+            SELECT id, group_id AS "groupId"
+            FROM device d
+            WHERE VALID = 1
+        ) d ON d.groupId = dg.id
+        LEFT JOIN (
+            SELECT id, group_id AS "groupId"
+            FROM subscribe_store
+        ) s ON s.groupId = dg.id
+        GROUP BY dg.id
+        order by create_time desc
+    </select>
+
+    <select id="selectMaxNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(group_no, 12)), 0)
+        from device_group
+    </select>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
new file mode 100644
index 0000000..2c99706
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
@@ -0,0 +1,88 @@
+<?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.casic.missiles.mapper.DeviceMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.Device">
+        <id column="id" property="id" />
+        <result column="group_id" property="groupId" />
+        <result column="product_id" property="productId" />
+        <result column="devcode" property="devcode" />
+        <result column="device_type" property="deviceType" />
+        <result column="unit" property="unit" />
+        <result column="model" property="model" />
+        <result column="name" property="name" />
+        <result column="status" property="status" />
+        <result column="imei" property="imei" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="valid" property="valid" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, devcode, device_type, unit, name, product_id, status, imei, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.device.DeviceListVO">
+        SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime,
+        data_value AS "dataValue",model,imei,d.cell,name AS "deviceName",status,d.id,create_user_id AS "createUserId",
+        create_user_name AS "createUserName"
+        FROM (
+            SELECT *
+            FROM device
+            WHERE VALID=1
+            <if test="request.groupId!='' and request.groupId != null">
+                AND group_id =#{request.groupId}
+            </if>
+            <if test="request.devcode!='' and request.devcode != null">
+                AND devcode like CONCAT('%',#{request.devcode},'%')
+            </if>
+            <if test="request.imei!='' and request.imei != null">
+                AND imei like CONCAT('%',#{request.imei},'%')
+            </if>
+            <if test="request.deviceType!='' and request.deviceType != null">
+                AND device_type =#{request.deviceType}
+            </if>
+            <if test="request.status!='' and request.status != null">
+                AND status =#{request.status}
+            </if>
+            <if test="request.productId!='' and request.productId != null">
+                AND product_id =#{request.productId}
+            </if>
+            <if test="request.beginCell!='' and request.beginCell!=null">
+                AND cell <![CDATA[  >=  ]]> #{request.beginCell}
+
+            </if>
+            <if test="request.endCell!='' and request.endCell!=null">
+                AND cell <![CDATA[  <=  ]]> #{request.endCell}
+            </if>
+            <if test="request.ids != null">
+                and id in
+                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+            order by create_time desc
+        )d JOIN (
+            SELECT deptid,id
+            FROM device_group
+            WHERE VALID =1
+            <if test="request.groupId!='' and request.groupId != null">
+                AND id =#{request.groupId}
+            </if>
+        )dg ON dg.id=d.group_id
+        LEFT JOIN(
+            SELECT ddd.logtime AS logtime,data_value,ddd.devcode,cell
+            FROM device_data ddd
+            JOIN
+            (
+                SELECT Max(logtime) AS logtime,devcode
+                FROM  device_data
+                GROUP BY devcode
+            )dd  ON dd.logtime=ddd.logtime AND dd.devcode=ddd.devcode
+        )dd ON dd.devcode=d.devcode
+        order by create_time desc
+    </select>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml
new file mode 100644
index 0000000..a5bf5e7
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml
@@ -0,0 +1,20 @@
+<?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.casic.missiles.mapper.DeviceUpgradeTaskMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceUpgradeTask">
+        <id column="id" property="id" />
+        <result column="version_id" property="versionId" />
+        <result column="device_id" property="deviceId" />
+        <result column="status" property="status" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, version_id, device_id, status, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml
new file mode 100644
index 0000000..e39ec1f
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml
@@ -0,0 +1,23 @@
+<?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.casic.missiles.mapper.DeviceVersionMapper">
+
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceVersion">
+        <id column="Id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="version_file" property="versionFile" />
+        <result column="version" property="version" />
+        <result column="owner" property="owner" />
+        <result column="dscn" property="dscn" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        Id, product_id, version_file, version, owner, dscn, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductConfigItemMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductConfigItemMapper.xml
new file mode 100644
index 0000000..e2448be
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/ProductConfigItemMapper.xml
@@ -0,0 +1,22 @@
+<?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.casic.missiles.mapper.ProductConfigItemMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductConfigItem">
+        <id column="id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="param_name" property="paramName" />
+        <result column="param_code" property="paramCode" />
+        <result column="param_type" property="paramType" />
+        <result column="regular_expression" property="regularExpression" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, product_id, param_name, param_code, param_type, regular_expression, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductDataItemMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductDataItemMapper.xml
new file mode 100644
index 0000000..61a55ec
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/ProductDataItemMapper.xml
@@ -0,0 +1,21 @@
+<?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.casic.missiles.mapper.ProductDataItemMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductDataItem">
+        <id column="id" property="id" />
+        <result column="data_item_name" property="dataItemName" />
+        <result column="product_id" property="productId" />
+        <result column="data_item_type" property="dataItemType" />
+        <result column="data_item_field" property="dataItemField" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, data_item_name, product_id, data_item_type, data_item_field, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
new file mode 100644
index 0000000..26f3cb3
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
@@ -0,0 +1,30 @@
+<?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.casic.missiles.mapper.ProductInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductInfo">
+        <id column="Id" property="id" />
+        <result column="name" property="name" />
+        <result column="access_type" property="accessType" />
+        <result column="encipher_type" property="encipherType" />
+        <result column="descn" property="descn" />
+        <result column="product_type" property="productType" />
+        <result column="owners" property="owners" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_name" property="createUserName" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        Id, name, access_type, encipher_type, protocol_type, model, descn, product_type, owners, CreatorName, create_time, create_user_id
+    </sql>
+
+    <select id="selectMaxNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(product_no, 12)), 0)
+        from product_info
+    </select>
+
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/SubscribeStoreMapper.xml b/casic-iot-dao/src/main/resources/mapper/SubscribeStoreMapper.xml
new file mode 100644
index 0000000..415a670
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/SubscribeStoreMapper.xml
@@ -0,0 +1,61 @@
+<?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.casic.missiles.mapper.SubscribeStoreMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.SubscribeStore">
+        <id column="id" property="id"/>
+        <result column="subscribe_no" property="subscribeNo"/>
+        <result column="group_id" property="groupId"/>
+        <result column="message_type" property="messageType"/>
+        <result column="subscribe_type" property="subscribeType"/>
+        <result column="enable" property="enable"/>
+        <result column="subscribe_status" property="subscribeStatus"/>
+        <result column="subscribe_content_json" property="subscribeContentJson"/>
+        <result column="descn" property="descn"/>
+        <result column="create_time" property="createTime"/>
+        <result column="create_user_name" property="createUserName"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, message_type, subscribe_type, enable, subscribe_status, subscribe_content_json, descn, create_time, create_user_name
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.subscribe.SubscribeListVO">
+        SELECT message_type AS "messageType",create_time AS "createTime",subscribe_no AS
+            "subscribeNo",subscribe_content_json AS "subscribeContentJson",
+            subscribe_status AS "subscribeStatus",create_user_name AS "createUserName",
+           create_user_id AS "createUserId"
+        FROM (
+        SELECT *
+        FROM subscribe_store
+        WHERE 1=1
+        <if test="request.groupId!='' and request.groupId != null">
+            AND group_id =#{request.groupId}
+        </if>
+        <if test="request.messageType!='' and request.messageType != null">
+            AND message_type =#{request.messageType}
+        </if>
+        <if test="request.subscribeNo!='' and request.subscribeNo != null">
+            AND subscribe_no like CONCAT('%',#{request.subscribeNo},'%')
+        </if>
+        <if test="request.subscribeType!='' and request.subscribeType != null">
+            AND subscribe_type =#{request.subscribeType}
+        </if>
+        <if test="request.status!='' and request.status != null">
+            AND subscribe_status =#{request.status}
+        </if>
+        order by create_time desc
+        )d JOIN (
+        SELECT deptid,id
+        FROM device_group
+        WHERE VALID=1
+        <if test="request.groupId!='' and request.groupId != null">
+            AND id =#{request.groupId}
+        </if>
+        )dg ON dg.id=d.group_id
+        order by create_time desc
+    </select>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/common/SysCommonMapper.xml b/casic-iot-dao/src/main/resources/mapper/common/SysCommonMapper.xml
new file mode 100644
index 0000000..880f7d4
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/common/SysCommonMapper.xml
@@ -0,0 +1,21 @@
+<?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.casic.missiles.mapper.common.SysCommonMapper">
+
+    <select id="getDictMapByCode" resultType="java.util.Map">
+        SELECT  name,code
+        from sys_dict
+         where  pid=(
+            SELECT id
+            from  sys_dict
+            where  code=#{code}
+         )
+    </select>
+
+    <select id="getDeptMap" resultType="java.util.Map">
+        SELECT  id,SIMPLE_NAME AS  "simpleName"
+        from sys_dept
+    </select>
+
+
+</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/AlarmConfigMapper.xml b/casic-iot-dao/src/resource/mapper/AlarmConfigMapper.xml
deleted file mode 100644
index bd2c2cc..0000000
--- a/casic-iot-dao/src/resource/mapper/AlarmConfigMapper.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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.casic.missiles.mapper.AlarmConfigMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmConfig">
-        <id column="id" property="id" />
-        <result column="product_id" property="productId" />
-        <result column="name" property="name" />
-        <result column="alarm_content" property="alarmContent" />
-        <result column="period_high" property="periodHigh" />
-        <result column="period_low" property="periodLow" />
-        <result column="create_user_id" property="createUserId" />
-        <result column="create_time" property="createTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, name, product_id, alarm_content, period_high, period_low, TypeName, CreatorId, creater_user_id, create_time
-    </sql>
-
-</mapper>

diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml
new file mode 100644
index 0000000..bd2c2cc
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml
@@ -0,0 +1,22 @@
+<?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.casic.missiles.mapper.AlarmConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmConfig">
+        <id column="id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="name" property="name" />
+        <result column="alarm_content" property="alarmContent" />
+        <result column="period_high" property="periodHigh" />
+        <result column="period_low" property="periodLow" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, product_id, alarm_content, period_high, period_low, TypeName, CreatorId, creater_user_id, create_time
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml
new file mode 100644
index 0000000..4aee44a
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml
@@ -0,0 +1,23 @@
+<?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.casic.missiles.mapper.AlarmDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmData">
+        <id column="id" property="id" />
+        <result column="alarm_type" property="alarmType" />
+        <result column="alarm_content" property="alarmContent" />
+        <result column="devcode" property="devcode" />
+        <result column="alarm_time" property="alarmTime" />
+        <result column="alarm_value" property="alarmValue" />
+        <result column="status" property="status" />
+        <result column="create_name" property="createName" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, alarm_type, alarm_content, devcode, alarm_time, alarm_value, status, CreatorName, create_time
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml b/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml
new file mode 100644
index 0000000..b4965d6
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml
@@ -0,0 +1,70 @@
+<?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.casic.missiles.mapper.BusConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.BusConfig">
+        <id column="id" property="id"/>
+        <result column="devcode" property="devcode"/>
+        <result column="config_json" property="configJson"/>
+        <result column="status" property="status"/>
+        <result column="send_time" property="sendTime"/>
+        <result column="create_time" property="createTime"/>
+        <result column="create_user_id" property="createUserId"/>
+    </resultMap>
+
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, Pid, devcode, config_json, status, update_time, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.model.BusConfig">
+        select bc.id,bc.devcode,config_type AS "configType", config_json AS "configJson",bc.status,
+        send_time as "sendTime",bc.create_time AS "createTime",bc.create_user_id AS "createUserId",
+        bc.create_user_name AS "createUserName",dg.deptid
+        FROM (
+            SELECT *
+            FROM bus_config
+            WHERE 1=1
+            <if test="request.configType != null and request.configType != '' ">
+                AND config_type =#{request.configType}
+            </if>
+            <if test="request.devcode != '' and request.devcode != null">
+                AND devcode =#{request.devcode}
+            </if>
+            <if test="request.status != '' and request.status != null">
+                AND status =#{request.status}
+            </if>
+            <if test="request.beginTime!='' and request.beginTime!=null">
+                AND send_time <![CDATA[  >=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.beginTime}"/>
+                </include>
+            </if>
+            <if test="request.endTime!='' and request.endTime!=null">
+                AND send_time <![CDATA[  <=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.endTime}"/>
+                </include>
+            </if>
+        )bc
+        JOIN device d ON d.devcode=bc.devcode
+        JOIN device_group dg ON dg.id= d.group_id
+
+    </select>
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml
new file mode 100644
index 0000000..083b289
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml
@@ -0,0 +1,106 @@
+<?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.casic.missiles.mapper.DeviceDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceData">
+        <id column="id" property="id"/>
+        <result column="devcode" property="devcode"/>
+        <result column="device_type" property="deviceType"/>
+        <result column="cell" property="cell"/>
+        <result column="data_json" property="dataJson"/>
+        <result column="decrypt_before_data" property="decryptBeforeData"/>
+        <result column="decrypt_after_data" property="decryptAfterData"/>
+        <result column="uptime" property="uptime"/>
+        <result column="logtime" property="logtime"/>
+    </resultMap>
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, devcode, device_type, cell, data_json, decrypt_before_data, decrypt_after_data, uptime, logtime
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.data.DeviceDataListVO">
+          SELECT  	dd.id,
+                    dd.devcode,
+                    dd.device_type AS "deviceType",
+                    deptid,
+                    dd.cell,
+                    dd.data_json AS "dataJson",
+                    decrypt_before_data AS "decryptBeforeData",
+                    decrypt_after_data AS "decryptAfterData",
+                    uptime,
+                    logtime,
+                    d.STATUS,
+                    d.group_id AS "groupId",
+                    dg.group_name AS "groupName"
+        FROM (
+               SELECT *
+               FROM device_data
+               WHERE  1=1
+                <if test="request.devcode!='' and request.devcode != null">
+                    AND devcode like CONCAT('%',#{request.devcode},'%')
+                </if>
+                <if test="request.deviceType!='' and request.deviceType != null">
+                    AND device_type =#{request.deviceType}
+                </if>
+                <if test="request.beginTime!='' and request.beginTime!=null">
+                    AND logtime <![CDATA[  >=  ]]>
+                    <include refid="char_toDate">
+                        <property name="paramStr" value="#{request.beginTime}"/>
+                    </include>
+                </if>
+                <if test="request.endTime!='' and request.endTime!=null">
+                    AND logtime <![CDATA[  <=  ]]>
+                    <include refid="char_toDate">
+                        <property name="paramStr" value="#{request.endTime}"/>
+                    </include>
+                </if>
+                <if test="request.ids != null">
+                    and id in
+                    <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                        #{id}
+                    </foreach>
+                </if>
+
+          )dd
+          JOIN (
+                SELECT id, group_id,status,devcode
+                FROM device
+                WHERE valid=1
+                <if test="request.devcode!='' and request.devcode != null">
+                    AND devcode like CONCAT('%',#{request.devcode},'%')
+                </if>
+                <if test="request.deviceType!='' and request.deviceType != null">
+                    AND device_type =#{request.deviceType}
+                </if>
+                <if test="request.groupId!='' and request.groupId != null">
+                    AND greoup_id=#{request.groupId}
+                </if>
+          )d ON d.devcode=dd.devcode
+          JOIN (
+                SELECT   deptid,id,group_name
+                FROM device_group
+                WHERE valid=1
+                <if test="request.groupId!='' and request.groupId != null">
+                    AND id=#{request.groupId}
+                </if>
+          ) dg ON dg.id=d.group_id
+          order by logtime desc
+
+    </select>
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml
new file mode 100644
index 0000000..2e07287
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml
@@ -0,0 +1,148 @@
+<?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.casic.missiles.mapper.DeviceGroupMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceGroup">
+        <id column="id" property="id" />
+        <result column="group_name" property="groupName" />
+        <result column="group_no" property="groupNo" />
+        <result column="descn" property="descn" />
+        <result column="deptid" property="deptid" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="owner" property="owner" />
+        <result column="valid" property="valid" />
+    </resultMap>
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, owner, subcribe_ids, descn, dept, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
+        SELECT
+            dg.id,
+            group_no AS "groupNo",
+            deptid,
+             deviceCount,
+            subscribeCount,
+            descn,
+            create_time AS "createTime",
+            group_name AS "groupName",
+            create_user_id AS "createUserId",
+            create_user_name AS "createUserName"
+        FROM
+          (
+             SELECT *
+             FROM device_group
+             WHERE valid = 1
+            <if test="request.groupNo != null and request.groupNo != '' ">
+                AND group_no =#{request.groupNo}
+            </if>
+            <if test="request.groupName != '' and request.groupName != null">
+                AND group_name =#{request.groupName}
+            </if>
+            <if test="request.ids != null">
+                and id in
+                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+            <if test="request.beginTime!='' and request.beginTime!=null">
+                AND create_time <![CDATA[  >=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.beginTime}"/>
+                </include>
+            </if>
+            <if test="request.endTime!='' and request.endTime!=null">
+                AND create_time <![CDATA[  <=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.endTime}"/>
+                </include>
+            </if>
+          ) dg
+            LEFT JOIN (
+                   SELECT count(id)  AS "deviceCount",group_id as groupId
+                   FROM device d
+                   WHERE VALID = 1
+                   GROUP BY group_id
+        ) d ON d.groupId = dg.id
+            LEFT JOIN (
+                 SELECT count(id)  AS "subscribeCount",group_id AS groupId
+                 FROM subscribe_store GROUP BY group_id
+           ) s ON s.groupId = dg.id
+         order by create_time desc
+    </select>
+
+    <select id="list" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
+        SELECT
+        dg.id,
+        group_no AS "groupNo",
+        deptid,
+        count( d.id ) AS "deviceCount",
+        count( s.id ) AS "subscribeCount",
+        descn,
+        create_time AS "createTime",
+        group_name AS "groupName"
+        FROM
+        (
+        SELECT *
+        FROM device_group
+        WHERE valid = 1
+        <if test="request.groupNo != null and request.groupNo != '' ">
+            AND group_no =#{request.groupNo}
+        </if>
+        <if test="request.groupName != '' and request.groupName != null">
+            AND group_name =#{request.groupName}
+        </if>
+        <if test="request.ids != null">
+            and id in
+            <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+        <if test="request.beginTime!='' and request.beginTime!=null">
+            AND create_time <![CDATA[  >=  ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{request.beginTime}"/>
+            </include>
+        </if>
+        <if test="request.endTime!='' and request.endTime!=null">
+            AND create_time <![CDATA[  <=  ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{request.endTime}"/>
+            </include>
+        </if>
+        ) dg
+        LEFT JOIN (
+            SELECT id, group_id AS "groupId"
+            FROM device d
+            WHERE VALID = 1
+        ) d ON d.groupId = dg.id
+        LEFT JOIN (
+            SELECT id, group_id AS "groupId"
+            FROM subscribe_store
+        ) s ON s.groupId = dg.id
+        GROUP BY dg.id
+        order by create_time desc
+    </select>
+
+    <select id="selectMaxNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(group_no, 12)), 0)
+        from device_group
+    </select>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
new file mode 100644
index 0000000..2c99706
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
@@ -0,0 +1,88 @@
+<?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.casic.missiles.mapper.DeviceMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.Device">
+        <id column="id" property="id" />
+        <result column="group_id" property="groupId" />
+        <result column="product_id" property="productId" />
+        <result column="devcode" property="devcode" />
+        <result column="device_type" property="deviceType" />
+        <result column="unit" property="unit" />
+        <result column="model" property="model" />
+        <result column="name" property="name" />
+        <result column="status" property="status" />
+        <result column="imei" property="imei" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="valid" property="valid" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, devcode, device_type, unit, name, product_id, status, imei, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.device.DeviceListVO">
+        SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime,
+        data_value AS "dataValue",model,imei,d.cell,name AS "deviceName",status,d.id,create_user_id AS "createUserId",
+        create_user_name AS "createUserName"
+        FROM (
+            SELECT *
+            FROM device
+            WHERE VALID=1
+            <if test="request.groupId!='' and request.groupId != null">
+                AND group_id =#{request.groupId}
+            </if>
+            <if test="request.devcode!='' and request.devcode != null">
+                AND devcode like CONCAT('%',#{request.devcode},'%')
+            </if>
+            <if test="request.imei!='' and request.imei != null">
+                AND imei like CONCAT('%',#{request.imei},'%')
+            </if>
+            <if test="request.deviceType!='' and request.deviceType != null">
+                AND device_type =#{request.deviceType}
+            </if>
+            <if test="request.status!='' and request.status != null">
+                AND status =#{request.status}
+            </if>
+            <if test="request.productId!='' and request.productId != null">
+                AND product_id =#{request.productId}
+            </if>
+            <if test="request.beginCell!='' and request.beginCell!=null">
+                AND cell <![CDATA[  >=  ]]> #{request.beginCell}
+
+            </if>
+            <if test="request.endCell!='' and request.endCell!=null">
+                AND cell <![CDATA[  <=  ]]> #{request.endCell}
+            </if>
+            <if test="request.ids != null">
+                and id in
+                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+            order by create_time desc
+        )d JOIN (
+            SELECT deptid,id
+            FROM device_group
+            WHERE VALID =1
+            <if test="request.groupId!='' and request.groupId != null">
+                AND id =#{request.groupId}
+            </if>
+        )dg ON dg.id=d.group_id
+        LEFT JOIN(
+            SELECT ddd.logtime AS logtime,data_value,ddd.devcode,cell
+            FROM device_data ddd
+            JOIN
+            (
+                SELECT Max(logtime) AS logtime,devcode
+                FROM  device_data
+                GROUP BY devcode
+            )dd  ON dd.logtime=ddd.logtime AND dd.devcode=ddd.devcode
+        )dd ON dd.devcode=d.devcode
+        order by create_time desc
+    </select>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml
new file mode 100644
index 0000000..a5bf5e7
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml
@@ -0,0 +1,20 @@
+<?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.casic.missiles.mapper.DeviceUpgradeTaskMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceUpgradeTask">
+        <id column="id" property="id" />
+        <result column="version_id" property="versionId" />
+        <result column="device_id" property="deviceId" />
+        <result column="status" property="status" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, version_id, device_id, status, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml
new file mode 100644
index 0000000..e39ec1f
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml
@@ -0,0 +1,23 @@
+<?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.casic.missiles.mapper.DeviceVersionMapper">
+
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceVersion">
+        <id column="Id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="version_file" property="versionFile" />
+        <result column="version" property="version" />
+        <result column="owner" property="owner" />
+        <result column="dscn" property="dscn" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        Id, product_id, version_file, version, owner, dscn, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductConfigItemMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductConfigItemMapper.xml
new file mode 100644
index 0000000..e2448be
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/ProductConfigItemMapper.xml
@@ -0,0 +1,22 @@
+<?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.casic.missiles.mapper.ProductConfigItemMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductConfigItem">
+        <id column="id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="param_name" property="paramName" />
+        <result column="param_code" property="paramCode" />
+        <result column="param_type" property="paramType" />
+        <result column="regular_expression" property="regularExpression" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, product_id, param_name, param_code, param_type, regular_expression, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductDataItemMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductDataItemMapper.xml
new file mode 100644
index 0000000..61a55ec
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/ProductDataItemMapper.xml
@@ -0,0 +1,21 @@
+<?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.casic.missiles.mapper.ProductDataItemMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductDataItem">
+        <id column="id" property="id" />
+        <result column="data_item_name" property="dataItemName" />
+        <result column="product_id" property="productId" />
+        <result column="data_item_type" property="dataItemType" />
+        <result column="data_item_field" property="dataItemField" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, data_item_name, product_id, data_item_type, data_item_field, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
new file mode 100644
index 0000000..26f3cb3
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
@@ -0,0 +1,30 @@
+<?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.casic.missiles.mapper.ProductInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductInfo">
+        <id column="Id" property="id" />
+        <result column="name" property="name" />
+        <result column="access_type" property="accessType" />
+        <result column="encipher_type" property="encipherType" />
+        <result column="descn" property="descn" />
+        <result column="product_type" property="productType" />
+        <result column="owners" property="owners" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_name" property="createUserName" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        Id, name, access_type, encipher_type, protocol_type, model, descn, product_type, owners, CreatorName, create_time, create_user_id
+    </sql>
+
+    <select id="selectMaxNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(product_no, 12)), 0)
+        from product_info
+    </select>
+
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/SubscribeStoreMapper.xml b/casic-iot-dao/src/main/resources/mapper/SubscribeStoreMapper.xml
new file mode 100644
index 0000000..415a670
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/SubscribeStoreMapper.xml
@@ -0,0 +1,61 @@
+<?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.casic.missiles.mapper.SubscribeStoreMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.SubscribeStore">
+        <id column="id" property="id"/>
+        <result column="subscribe_no" property="subscribeNo"/>
+        <result column="group_id" property="groupId"/>
+        <result column="message_type" property="messageType"/>
+        <result column="subscribe_type" property="subscribeType"/>
+        <result column="enable" property="enable"/>
+        <result column="subscribe_status" property="subscribeStatus"/>
+        <result column="subscribe_content_json" property="subscribeContentJson"/>
+        <result column="descn" property="descn"/>
+        <result column="create_time" property="createTime"/>
+        <result column="create_user_name" property="createUserName"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, message_type, subscribe_type, enable, subscribe_status, subscribe_content_json, descn, create_time, create_user_name
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.subscribe.SubscribeListVO">
+        SELECT message_type AS "messageType",create_time AS "createTime",subscribe_no AS
+            "subscribeNo",subscribe_content_json AS "subscribeContentJson",
+            subscribe_status AS "subscribeStatus",create_user_name AS "createUserName",
+           create_user_id AS "createUserId"
+        FROM (
+        SELECT *
+        FROM subscribe_store
+        WHERE 1=1
+        <if test="request.groupId!='' and request.groupId != null">
+            AND group_id =#{request.groupId}
+        </if>
+        <if test="request.messageType!='' and request.messageType != null">
+            AND message_type =#{request.messageType}
+        </if>
+        <if test="request.subscribeNo!='' and request.subscribeNo != null">
+            AND subscribe_no like CONCAT('%',#{request.subscribeNo},'%')
+        </if>
+        <if test="request.subscribeType!='' and request.subscribeType != null">
+            AND subscribe_type =#{request.subscribeType}
+        </if>
+        <if test="request.status!='' and request.status != null">
+            AND subscribe_status =#{request.status}
+        </if>
+        order by create_time desc
+        )d JOIN (
+        SELECT deptid,id
+        FROM device_group
+        WHERE VALID=1
+        <if test="request.groupId!='' and request.groupId != null">
+            AND id =#{request.groupId}
+        </if>
+        )dg ON dg.id=d.group_id
+        order by create_time desc
+    </select>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/common/SysCommonMapper.xml b/casic-iot-dao/src/main/resources/mapper/common/SysCommonMapper.xml
new file mode 100644
index 0000000..880f7d4
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/common/SysCommonMapper.xml
@@ -0,0 +1,21 @@
+<?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.casic.missiles.mapper.common.SysCommonMapper">
+
+    <select id="getDictMapByCode" resultType="java.util.Map">
+        SELECT  name,code
+        from sys_dict
+         where  pid=(
+            SELECT id
+            from  sys_dict
+            where  code=#{code}
+         )
+    </select>
+
+    <select id="getDeptMap" resultType="java.util.Map">
+        SELECT  id,SIMPLE_NAME AS  "simpleName"
+        from sys_dept
+    </select>
+
+
+</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/AlarmConfigMapper.xml b/casic-iot-dao/src/resource/mapper/AlarmConfigMapper.xml
deleted file mode 100644
index bd2c2cc..0000000
--- a/casic-iot-dao/src/resource/mapper/AlarmConfigMapper.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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.casic.missiles.mapper.AlarmConfigMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmConfig">
-        <id column="id" property="id" />
-        <result column="product_id" property="productId" />
-        <result column="name" property="name" />
-        <result column="alarm_content" property="alarmContent" />
-        <result column="period_high" property="periodHigh" />
-        <result column="period_low" property="periodLow" />
-        <result column="create_user_id" property="createUserId" />
-        <result column="create_time" property="createTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, name, product_id, alarm_content, period_high, period_low, TypeName, CreatorId, creater_user_id, create_time
-    </sql>
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/AlarmDataMapper.xml b/casic-iot-dao/src/resource/mapper/AlarmDataMapper.xml
deleted file mode 100644
index 4aee44a..0000000
--- a/casic-iot-dao/src/resource/mapper/AlarmDataMapper.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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.casic.missiles.mapper.AlarmDataMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmData">
-        <id column="id" property="id" />
-        <result column="alarm_type" property="alarmType" />
-        <result column="alarm_content" property="alarmContent" />
-        <result column="devcode" property="devcode" />
-        <result column="alarm_time" property="alarmTime" />
-        <result column="alarm_value" property="alarmValue" />
-        <result column="status" property="status" />
-        <result column="create_name" property="createName" />
-        <result column="create_time" property="createTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, alarm_type, alarm_content, devcode, alarm_time, alarm_value, status, CreatorName, create_time
-    </sql>
-
-</mapper>

diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml
new file mode 100644
index 0000000..bd2c2cc
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml
@@ -0,0 +1,22 @@
+<?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.casic.missiles.mapper.AlarmConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmConfig">
+        <id column="id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="name" property="name" />
+        <result column="alarm_content" property="alarmContent" />
+        <result column="period_high" property="periodHigh" />
+        <result column="period_low" property="periodLow" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, product_id, alarm_content, period_high, period_low, TypeName, CreatorId, creater_user_id, create_time
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml
new file mode 100644
index 0000000..4aee44a
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml
@@ -0,0 +1,23 @@
+<?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.casic.missiles.mapper.AlarmDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmData">
+        <id column="id" property="id" />
+        <result column="alarm_type" property="alarmType" />
+        <result column="alarm_content" property="alarmContent" />
+        <result column="devcode" property="devcode" />
+        <result column="alarm_time" property="alarmTime" />
+        <result column="alarm_value" property="alarmValue" />
+        <result column="status" property="status" />
+        <result column="create_name" property="createName" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, alarm_type, alarm_content, devcode, alarm_time, alarm_value, status, CreatorName, create_time
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml b/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml
new file mode 100644
index 0000000..b4965d6
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml
@@ -0,0 +1,70 @@
+<?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.casic.missiles.mapper.BusConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.BusConfig">
+        <id column="id" property="id"/>
+        <result column="devcode" property="devcode"/>
+        <result column="config_json" property="configJson"/>
+        <result column="status" property="status"/>
+        <result column="send_time" property="sendTime"/>
+        <result column="create_time" property="createTime"/>
+        <result column="create_user_id" property="createUserId"/>
+    </resultMap>
+
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, Pid, devcode, config_json, status, update_time, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.model.BusConfig">
+        select bc.id,bc.devcode,config_type AS "configType", config_json AS "configJson",bc.status,
+        send_time as "sendTime",bc.create_time AS "createTime",bc.create_user_id AS "createUserId",
+        bc.create_user_name AS "createUserName",dg.deptid
+        FROM (
+            SELECT *
+            FROM bus_config
+            WHERE 1=1
+            <if test="request.configType != null and request.configType != '' ">
+                AND config_type =#{request.configType}
+            </if>
+            <if test="request.devcode != '' and request.devcode != null">
+                AND devcode =#{request.devcode}
+            </if>
+            <if test="request.status != '' and request.status != null">
+                AND status =#{request.status}
+            </if>
+            <if test="request.beginTime!='' and request.beginTime!=null">
+                AND send_time <![CDATA[  >=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.beginTime}"/>
+                </include>
+            </if>
+            <if test="request.endTime!='' and request.endTime!=null">
+                AND send_time <![CDATA[  <=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.endTime}"/>
+                </include>
+            </if>
+        )bc
+        JOIN device d ON d.devcode=bc.devcode
+        JOIN device_group dg ON dg.id= d.group_id
+
+    </select>
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml
new file mode 100644
index 0000000..083b289
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml
@@ -0,0 +1,106 @@
+<?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.casic.missiles.mapper.DeviceDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceData">
+        <id column="id" property="id"/>
+        <result column="devcode" property="devcode"/>
+        <result column="device_type" property="deviceType"/>
+        <result column="cell" property="cell"/>
+        <result column="data_json" property="dataJson"/>
+        <result column="decrypt_before_data" property="decryptBeforeData"/>
+        <result column="decrypt_after_data" property="decryptAfterData"/>
+        <result column="uptime" property="uptime"/>
+        <result column="logtime" property="logtime"/>
+    </resultMap>
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, devcode, device_type, cell, data_json, decrypt_before_data, decrypt_after_data, uptime, logtime
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.data.DeviceDataListVO">
+          SELECT  	dd.id,
+                    dd.devcode,
+                    dd.device_type AS "deviceType",
+                    deptid,
+                    dd.cell,
+                    dd.data_json AS "dataJson",
+                    decrypt_before_data AS "decryptBeforeData",
+                    decrypt_after_data AS "decryptAfterData",
+                    uptime,
+                    logtime,
+                    d.STATUS,
+                    d.group_id AS "groupId",
+                    dg.group_name AS "groupName"
+        FROM (
+               SELECT *
+               FROM device_data
+               WHERE  1=1
+                <if test="request.devcode!='' and request.devcode != null">
+                    AND devcode like CONCAT('%',#{request.devcode},'%')
+                </if>
+                <if test="request.deviceType!='' and request.deviceType != null">
+                    AND device_type =#{request.deviceType}
+                </if>
+                <if test="request.beginTime!='' and request.beginTime!=null">
+                    AND logtime <![CDATA[  >=  ]]>
+                    <include refid="char_toDate">
+                        <property name="paramStr" value="#{request.beginTime}"/>
+                    </include>
+                </if>
+                <if test="request.endTime!='' and request.endTime!=null">
+                    AND logtime <![CDATA[  <=  ]]>
+                    <include refid="char_toDate">
+                        <property name="paramStr" value="#{request.endTime}"/>
+                    </include>
+                </if>
+                <if test="request.ids != null">
+                    and id in
+                    <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                        #{id}
+                    </foreach>
+                </if>
+
+          )dd
+          JOIN (
+                SELECT id, group_id,status,devcode
+                FROM device
+                WHERE valid=1
+                <if test="request.devcode!='' and request.devcode != null">
+                    AND devcode like CONCAT('%',#{request.devcode},'%')
+                </if>
+                <if test="request.deviceType!='' and request.deviceType != null">
+                    AND device_type =#{request.deviceType}
+                </if>
+                <if test="request.groupId!='' and request.groupId != null">
+                    AND greoup_id=#{request.groupId}
+                </if>
+          )d ON d.devcode=dd.devcode
+          JOIN (
+                SELECT   deptid,id,group_name
+                FROM device_group
+                WHERE valid=1
+                <if test="request.groupId!='' and request.groupId != null">
+                    AND id=#{request.groupId}
+                </if>
+          ) dg ON dg.id=d.group_id
+          order by logtime desc
+
+    </select>
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml
new file mode 100644
index 0000000..2e07287
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml
@@ -0,0 +1,148 @@
+<?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.casic.missiles.mapper.DeviceGroupMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceGroup">
+        <id column="id" property="id" />
+        <result column="group_name" property="groupName" />
+        <result column="group_no" property="groupNo" />
+        <result column="descn" property="descn" />
+        <result column="deptid" property="deptid" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="owner" property="owner" />
+        <result column="valid" property="valid" />
+    </resultMap>
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, owner, subcribe_ids, descn, dept, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
+        SELECT
+            dg.id,
+            group_no AS "groupNo",
+            deptid,
+             deviceCount,
+            subscribeCount,
+            descn,
+            create_time AS "createTime",
+            group_name AS "groupName",
+            create_user_id AS "createUserId",
+            create_user_name AS "createUserName"
+        FROM
+          (
+             SELECT *
+             FROM device_group
+             WHERE valid = 1
+            <if test="request.groupNo != null and request.groupNo != '' ">
+                AND group_no =#{request.groupNo}
+            </if>
+            <if test="request.groupName != '' and request.groupName != null">
+                AND group_name =#{request.groupName}
+            </if>
+            <if test="request.ids != null">
+                and id in
+                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+            <if test="request.beginTime!='' and request.beginTime!=null">
+                AND create_time <![CDATA[  >=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.beginTime}"/>
+                </include>
+            </if>
+            <if test="request.endTime!='' and request.endTime!=null">
+                AND create_time <![CDATA[  <=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.endTime}"/>
+                </include>
+            </if>
+          ) dg
+            LEFT JOIN (
+                   SELECT count(id)  AS "deviceCount",group_id as groupId
+                   FROM device d
+                   WHERE VALID = 1
+                   GROUP BY group_id
+        ) d ON d.groupId = dg.id
+            LEFT JOIN (
+                 SELECT count(id)  AS "subscribeCount",group_id AS groupId
+                 FROM subscribe_store GROUP BY group_id
+           ) s ON s.groupId = dg.id
+         order by create_time desc
+    </select>
+
+    <select id="list" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
+        SELECT
+        dg.id,
+        group_no AS "groupNo",
+        deptid,
+        count( d.id ) AS "deviceCount",
+        count( s.id ) AS "subscribeCount",
+        descn,
+        create_time AS "createTime",
+        group_name AS "groupName"
+        FROM
+        (
+        SELECT *
+        FROM device_group
+        WHERE valid = 1
+        <if test="request.groupNo != null and request.groupNo != '' ">
+            AND group_no =#{request.groupNo}
+        </if>
+        <if test="request.groupName != '' and request.groupName != null">
+            AND group_name =#{request.groupName}
+        </if>
+        <if test="request.ids != null">
+            and id in
+            <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+        <if test="request.beginTime!='' and request.beginTime!=null">
+            AND create_time <![CDATA[  >=  ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{request.beginTime}"/>
+            </include>
+        </if>
+        <if test="request.endTime!='' and request.endTime!=null">
+            AND create_time <![CDATA[  <=  ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{request.endTime}"/>
+            </include>
+        </if>
+        ) dg
+        LEFT JOIN (
+            SELECT id, group_id AS "groupId"
+            FROM device d
+            WHERE VALID = 1
+        ) d ON d.groupId = dg.id
+        LEFT JOIN (
+            SELECT id, group_id AS "groupId"
+            FROM subscribe_store
+        ) s ON s.groupId = dg.id
+        GROUP BY dg.id
+        order by create_time desc
+    </select>
+
+    <select id="selectMaxNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(group_no, 12)), 0)
+        from device_group
+    </select>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
new file mode 100644
index 0000000..2c99706
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
@@ -0,0 +1,88 @@
+<?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.casic.missiles.mapper.DeviceMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.Device">
+        <id column="id" property="id" />
+        <result column="group_id" property="groupId" />
+        <result column="product_id" property="productId" />
+        <result column="devcode" property="devcode" />
+        <result column="device_type" property="deviceType" />
+        <result column="unit" property="unit" />
+        <result column="model" property="model" />
+        <result column="name" property="name" />
+        <result column="status" property="status" />
+        <result column="imei" property="imei" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="valid" property="valid" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, devcode, device_type, unit, name, product_id, status, imei, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.device.DeviceListVO">
+        SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime,
+        data_value AS "dataValue",model,imei,d.cell,name AS "deviceName",status,d.id,create_user_id AS "createUserId",
+        create_user_name AS "createUserName"
+        FROM (
+            SELECT *
+            FROM device
+            WHERE VALID=1
+            <if test="request.groupId!='' and request.groupId != null">
+                AND group_id =#{request.groupId}
+            </if>
+            <if test="request.devcode!='' and request.devcode != null">
+                AND devcode like CONCAT('%',#{request.devcode},'%')
+            </if>
+            <if test="request.imei!='' and request.imei != null">
+                AND imei like CONCAT('%',#{request.imei},'%')
+            </if>
+            <if test="request.deviceType!='' and request.deviceType != null">
+                AND device_type =#{request.deviceType}
+            </if>
+            <if test="request.status!='' and request.status != null">
+                AND status =#{request.status}
+            </if>
+            <if test="request.productId!='' and request.productId != null">
+                AND product_id =#{request.productId}
+            </if>
+            <if test="request.beginCell!='' and request.beginCell!=null">
+                AND cell <![CDATA[  >=  ]]> #{request.beginCell}
+
+            </if>
+            <if test="request.endCell!='' and request.endCell!=null">
+                AND cell <![CDATA[  <=  ]]> #{request.endCell}
+            </if>
+            <if test="request.ids != null">
+                and id in
+                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+            order by create_time desc
+        )d JOIN (
+            SELECT deptid,id
+            FROM device_group
+            WHERE VALID =1
+            <if test="request.groupId!='' and request.groupId != null">
+                AND id =#{request.groupId}
+            </if>
+        )dg ON dg.id=d.group_id
+        LEFT JOIN(
+            SELECT ddd.logtime AS logtime,data_value,ddd.devcode,cell
+            FROM device_data ddd
+            JOIN
+            (
+                SELECT Max(logtime) AS logtime,devcode
+                FROM  device_data
+                GROUP BY devcode
+            )dd  ON dd.logtime=ddd.logtime AND dd.devcode=ddd.devcode
+        )dd ON dd.devcode=d.devcode
+        order by create_time desc
+    </select>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml
new file mode 100644
index 0000000..a5bf5e7
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml
@@ -0,0 +1,20 @@
+<?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.casic.missiles.mapper.DeviceUpgradeTaskMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceUpgradeTask">
+        <id column="id" property="id" />
+        <result column="version_id" property="versionId" />
+        <result column="device_id" property="deviceId" />
+        <result column="status" property="status" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, version_id, device_id, status, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml
new file mode 100644
index 0000000..e39ec1f
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml
@@ -0,0 +1,23 @@
+<?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.casic.missiles.mapper.DeviceVersionMapper">
+
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceVersion">
+        <id column="Id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="version_file" property="versionFile" />
+        <result column="version" property="version" />
+        <result column="owner" property="owner" />
+        <result column="dscn" property="dscn" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        Id, product_id, version_file, version, owner, dscn, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductConfigItemMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductConfigItemMapper.xml
new file mode 100644
index 0000000..e2448be
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/ProductConfigItemMapper.xml
@@ -0,0 +1,22 @@
+<?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.casic.missiles.mapper.ProductConfigItemMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductConfigItem">
+        <id column="id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="param_name" property="paramName" />
+        <result column="param_code" property="paramCode" />
+        <result column="param_type" property="paramType" />
+        <result column="regular_expression" property="regularExpression" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, product_id, param_name, param_code, param_type, regular_expression, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductDataItemMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductDataItemMapper.xml
new file mode 100644
index 0000000..61a55ec
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/ProductDataItemMapper.xml
@@ -0,0 +1,21 @@
+<?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.casic.missiles.mapper.ProductDataItemMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductDataItem">
+        <id column="id" property="id" />
+        <result column="data_item_name" property="dataItemName" />
+        <result column="product_id" property="productId" />
+        <result column="data_item_type" property="dataItemType" />
+        <result column="data_item_field" property="dataItemField" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, data_item_name, product_id, data_item_type, data_item_field, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
new file mode 100644
index 0000000..26f3cb3
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
@@ -0,0 +1,30 @@
+<?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.casic.missiles.mapper.ProductInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductInfo">
+        <id column="Id" property="id" />
+        <result column="name" property="name" />
+        <result column="access_type" property="accessType" />
+        <result column="encipher_type" property="encipherType" />
+        <result column="descn" property="descn" />
+        <result column="product_type" property="productType" />
+        <result column="owners" property="owners" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_name" property="createUserName" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        Id, name, access_type, encipher_type, protocol_type, model, descn, product_type, owners, CreatorName, create_time, create_user_id
+    </sql>
+
+    <select id="selectMaxNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(product_no, 12)), 0)
+        from product_info
+    </select>
+
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/SubscribeStoreMapper.xml b/casic-iot-dao/src/main/resources/mapper/SubscribeStoreMapper.xml
new file mode 100644
index 0000000..415a670
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/SubscribeStoreMapper.xml
@@ -0,0 +1,61 @@
+<?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.casic.missiles.mapper.SubscribeStoreMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.SubscribeStore">
+        <id column="id" property="id"/>
+        <result column="subscribe_no" property="subscribeNo"/>
+        <result column="group_id" property="groupId"/>
+        <result column="message_type" property="messageType"/>
+        <result column="subscribe_type" property="subscribeType"/>
+        <result column="enable" property="enable"/>
+        <result column="subscribe_status" property="subscribeStatus"/>
+        <result column="subscribe_content_json" property="subscribeContentJson"/>
+        <result column="descn" property="descn"/>
+        <result column="create_time" property="createTime"/>
+        <result column="create_user_name" property="createUserName"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, message_type, subscribe_type, enable, subscribe_status, subscribe_content_json, descn, create_time, create_user_name
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.subscribe.SubscribeListVO">
+        SELECT message_type AS "messageType",create_time AS "createTime",subscribe_no AS
+            "subscribeNo",subscribe_content_json AS "subscribeContentJson",
+            subscribe_status AS "subscribeStatus",create_user_name AS "createUserName",
+           create_user_id AS "createUserId"
+        FROM (
+        SELECT *
+        FROM subscribe_store
+        WHERE 1=1
+        <if test="request.groupId!='' and request.groupId != null">
+            AND group_id =#{request.groupId}
+        </if>
+        <if test="request.messageType!='' and request.messageType != null">
+            AND message_type =#{request.messageType}
+        </if>
+        <if test="request.subscribeNo!='' and request.subscribeNo != null">
+            AND subscribe_no like CONCAT('%',#{request.subscribeNo},'%')
+        </if>
+        <if test="request.subscribeType!='' and request.subscribeType != null">
+            AND subscribe_type =#{request.subscribeType}
+        </if>
+        <if test="request.status!='' and request.status != null">
+            AND subscribe_status =#{request.status}
+        </if>
+        order by create_time desc
+        )d JOIN (
+        SELECT deptid,id
+        FROM device_group
+        WHERE VALID=1
+        <if test="request.groupId!='' and request.groupId != null">
+            AND id =#{request.groupId}
+        </if>
+        )dg ON dg.id=d.group_id
+        order by create_time desc
+    </select>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/common/SysCommonMapper.xml b/casic-iot-dao/src/main/resources/mapper/common/SysCommonMapper.xml
new file mode 100644
index 0000000..880f7d4
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/common/SysCommonMapper.xml
@@ -0,0 +1,21 @@
+<?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.casic.missiles.mapper.common.SysCommonMapper">
+
+    <select id="getDictMapByCode" resultType="java.util.Map">
+        SELECT  name,code
+        from sys_dict
+         where  pid=(
+            SELECT id
+            from  sys_dict
+            where  code=#{code}
+         )
+    </select>
+
+    <select id="getDeptMap" resultType="java.util.Map">
+        SELECT  id,SIMPLE_NAME AS  "simpleName"
+        from sys_dept
+    </select>
+
+
+</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/AlarmConfigMapper.xml b/casic-iot-dao/src/resource/mapper/AlarmConfigMapper.xml
deleted file mode 100644
index bd2c2cc..0000000
--- a/casic-iot-dao/src/resource/mapper/AlarmConfigMapper.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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.casic.missiles.mapper.AlarmConfigMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmConfig">
-        <id column="id" property="id" />
-        <result column="product_id" property="productId" />
-        <result column="name" property="name" />
-        <result column="alarm_content" property="alarmContent" />
-        <result column="period_high" property="periodHigh" />
-        <result column="period_low" property="periodLow" />
-        <result column="create_user_id" property="createUserId" />
-        <result column="create_time" property="createTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, name, product_id, alarm_content, period_high, period_low, TypeName, CreatorId, creater_user_id, create_time
-    </sql>
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/AlarmDataMapper.xml b/casic-iot-dao/src/resource/mapper/AlarmDataMapper.xml
deleted file mode 100644
index 4aee44a..0000000
--- a/casic-iot-dao/src/resource/mapper/AlarmDataMapper.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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.casic.missiles.mapper.AlarmDataMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmData">
-        <id column="id" property="id" />
-        <result column="alarm_type" property="alarmType" />
-        <result column="alarm_content" property="alarmContent" />
-        <result column="devcode" property="devcode" />
-        <result column="alarm_time" property="alarmTime" />
-        <result column="alarm_value" property="alarmValue" />
-        <result column="status" property="status" />
-        <result column="create_name" property="createName" />
-        <result column="create_time" property="createTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, alarm_type, alarm_content, devcode, alarm_time, alarm_value, status, CreatorName, create_time
-    </sql>
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/BusConfigMapper.xml b/casic-iot-dao/src/resource/mapper/BusConfigMapper.xml
deleted file mode 100644
index b4965d6..0000000
--- a/casic-iot-dao/src/resource/mapper/BusConfigMapper.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?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.casic.missiles.mapper.BusConfigMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.BusConfig">
-        <id column="id" property="id"/>
-        <result column="devcode" property="devcode"/>
-        <result column="config_json" property="configJson"/>
-        <result column="status" property="status"/>
-        <result column="send_time" property="sendTime"/>
-        <result column="create_time" property="createTime"/>
-        <result column="create_user_id" property="createUserId"/>
-    </resultMap>
-
-
-    <sql id="char_toDate" databaseId="mysql">
-        ${paramStr}
-    </sql>
-
-    <sql id="char_toDate" databaseId="pgsql">
-       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
-    </sql>
-
-    <sql id="char_toDate" databaseId="oracle">
-        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
-    </sql>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, Pid, devcode, config_json, status, update_time, create_time, create_user_id
-    </sql>
-
-    <select id="listPage" resultType="com.casic.missiles.model.BusConfig">
-        select bc.id,bc.devcode,config_type AS "configType", config_json AS "configJson",bc.status,
-        send_time as "sendTime",bc.create_time AS "createTime",bc.create_user_id AS "createUserId",
-        bc.create_user_name AS "createUserName",dg.deptid
-        FROM (
-            SELECT *
-            FROM bus_config
-            WHERE 1=1
-            <if test="request.configType != null and request.configType != '' ">
-                AND config_type =#{request.configType}
-            </if>
-            <if test="request.devcode != '' and request.devcode != null">
-                AND devcode =#{request.devcode}
-            </if>
-            <if test="request.status != '' and request.status != null">
-                AND status =#{request.status}
-            </if>
-            <if test="request.beginTime!='' and request.beginTime!=null">
-                AND send_time <![CDATA[  >=  ]]>
-                <include refid="char_toDate">
-                    <property name="paramStr" value="#{request.beginTime}"/>
-                </include>
-            </if>
-            <if test="request.endTime!='' and request.endTime!=null">
-                AND send_time <![CDATA[  <=  ]]>
-                <include refid="char_toDate">
-                    <property name="paramStr" value="#{request.endTime}"/>
-                </include>
-            </if>
-        )bc
-        JOIN device d ON d.devcode=bc.devcode
-        JOIN device_group dg ON dg.id= d.group_id
-
-    </select>
-
-
-</mapper>

diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml
new file mode 100644
index 0000000..bd2c2cc
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml
@@ -0,0 +1,22 @@
+<?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.casic.missiles.mapper.AlarmConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmConfig">
+        <id column="id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="name" property="name" />
+        <result column="alarm_content" property="alarmContent" />
+        <result column="period_high" property="periodHigh" />
+        <result column="period_low" property="periodLow" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, product_id, alarm_content, period_high, period_low, TypeName, CreatorId, creater_user_id, create_time
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml
new file mode 100644
index 0000000..4aee44a
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml
@@ -0,0 +1,23 @@
+<?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.casic.missiles.mapper.AlarmDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmData">
+        <id column="id" property="id" />
+        <result column="alarm_type" property="alarmType" />
+        <result column="alarm_content" property="alarmContent" />
+        <result column="devcode" property="devcode" />
+        <result column="alarm_time" property="alarmTime" />
+        <result column="alarm_value" property="alarmValue" />
+        <result column="status" property="status" />
+        <result column="create_name" property="createName" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, alarm_type, alarm_content, devcode, alarm_time, alarm_value, status, CreatorName, create_time
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml b/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml
new file mode 100644
index 0000000..b4965d6
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml
@@ -0,0 +1,70 @@
+<?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.casic.missiles.mapper.BusConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.BusConfig">
+        <id column="id" property="id"/>
+        <result column="devcode" property="devcode"/>
+        <result column="config_json" property="configJson"/>
+        <result column="status" property="status"/>
+        <result column="send_time" property="sendTime"/>
+        <result column="create_time" property="createTime"/>
+        <result column="create_user_id" property="createUserId"/>
+    </resultMap>
+
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, Pid, devcode, config_json, status, update_time, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.model.BusConfig">
+        select bc.id,bc.devcode,config_type AS "configType", config_json AS "configJson",bc.status,
+        send_time as "sendTime",bc.create_time AS "createTime",bc.create_user_id AS "createUserId",
+        bc.create_user_name AS "createUserName",dg.deptid
+        FROM (
+            SELECT *
+            FROM bus_config
+            WHERE 1=1
+            <if test="request.configType != null and request.configType != '' ">
+                AND config_type =#{request.configType}
+            </if>
+            <if test="request.devcode != '' and request.devcode != null">
+                AND devcode =#{request.devcode}
+            </if>
+            <if test="request.status != '' and request.status != null">
+                AND status =#{request.status}
+            </if>
+            <if test="request.beginTime!='' and request.beginTime!=null">
+                AND send_time <![CDATA[  >=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.beginTime}"/>
+                </include>
+            </if>
+            <if test="request.endTime!='' and request.endTime!=null">
+                AND send_time <![CDATA[  <=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.endTime}"/>
+                </include>
+            </if>
+        )bc
+        JOIN device d ON d.devcode=bc.devcode
+        JOIN device_group dg ON dg.id= d.group_id
+
+    </select>
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml
new file mode 100644
index 0000000..083b289
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml
@@ -0,0 +1,106 @@
+<?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.casic.missiles.mapper.DeviceDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceData">
+        <id column="id" property="id"/>
+        <result column="devcode" property="devcode"/>
+        <result column="device_type" property="deviceType"/>
+        <result column="cell" property="cell"/>
+        <result column="data_json" property="dataJson"/>
+        <result column="decrypt_before_data" property="decryptBeforeData"/>
+        <result column="decrypt_after_data" property="decryptAfterData"/>
+        <result column="uptime" property="uptime"/>
+        <result column="logtime" property="logtime"/>
+    </resultMap>
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, devcode, device_type, cell, data_json, decrypt_before_data, decrypt_after_data, uptime, logtime
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.data.DeviceDataListVO">
+          SELECT  	dd.id,
+                    dd.devcode,
+                    dd.device_type AS "deviceType",
+                    deptid,
+                    dd.cell,
+                    dd.data_json AS "dataJson",
+                    decrypt_before_data AS "decryptBeforeData",
+                    decrypt_after_data AS "decryptAfterData",
+                    uptime,
+                    logtime,
+                    d.STATUS,
+                    d.group_id AS "groupId",
+                    dg.group_name AS "groupName"
+        FROM (
+               SELECT *
+               FROM device_data
+               WHERE  1=1
+                <if test="request.devcode!='' and request.devcode != null">
+                    AND devcode like CONCAT('%',#{request.devcode},'%')
+                </if>
+                <if test="request.deviceType!='' and request.deviceType != null">
+                    AND device_type =#{request.deviceType}
+                </if>
+                <if test="request.beginTime!='' and request.beginTime!=null">
+                    AND logtime <![CDATA[  >=  ]]>
+                    <include refid="char_toDate">
+                        <property name="paramStr" value="#{request.beginTime}"/>
+                    </include>
+                </if>
+                <if test="request.endTime!='' and request.endTime!=null">
+                    AND logtime <![CDATA[  <=  ]]>
+                    <include refid="char_toDate">
+                        <property name="paramStr" value="#{request.endTime}"/>
+                    </include>
+                </if>
+                <if test="request.ids != null">
+                    and id in
+                    <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                        #{id}
+                    </foreach>
+                </if>
+
+          )dd
+          JOIN (
+                SELECT id, group_id,status,devcode
+                FROM device
+                WHERE valid=1
+                <if test="request.devcode!='' and request.devcode != null">
+                    AND devcode like CONCAT('%',#{request.devcode},'%')
+                </if>
+                <if test="request.deviceType!='' and request.deviceType != null">
+                    AND device_type =#{request.deviceType}
+                </if>
+                <if test="request.groupId!='' and request.groupId != null">
+                    AND greoup_id=#{request.groupId}
+                </if>
+          )d ON d.devcode=dd.devcode
+          JOIN (
+                SELECT   deptid,id,group_name
+                FROM device_group
+                WHERE valid=1
+                <if test="request.groupId!='' and request.groupId != null">
+                    AND id=#{request.groupId}
+                </if>
+          ) dg ON dg.id=d.group_id
+          order by logtime desc
+
+    </select>
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml
new file mode 100644
index 0000000..2e07287
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml
@@ -0,0 +1,148 @@
+<?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.casic.missiles.mapper.DeviceGroupMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceGroup">
+        <id column="id" property="id" />
+        <result column="group_name" property="groupName" />
+        <result column="group_no" property="groupNo" />
+        <result column="descn" property="descn" />
+        <result column="deptid" property="deptid" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="owner" property="owner" />
+        <result column="valid" property="valid" />
+    </resultMap>
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, owner, subcribe_ids, descn, dept, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
+        SELECT
+            dg.id,
+            group_no AS "groupNo",
+            deptid,
+             deviceCount,
+            subscribeCount,
+            descn,
+            create_time AS "createTime",
+            group_name AS "groupName",
+            create_user_id AS "createUserId",
+            create_user_name AS "createUserName"
+        FROM
+          (
+             SELECT *
+             FROM device_group
+             WHERE valid = 1
+            <if test="request.groupNo != null and request.groupNo != '' ">
+                AND group_no =#{request.groupNo}
+            </if>
+            <if test="request.groupName != '' and request.groupName != null">
+                AND group_name =#{request.groupName}
+            </if>
+            <if test="request.ids != null">
+                and id in
+                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+            <if test="request.beginTime!='' and request.beginTime!=null">
+                AND create_time <![CDATA[  >=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.beginTime}"/>
+                </include>
+            </if>
+            <if test="request.endTime!='' and request.endTime!=null">
+                AND create_time <![CDATA[  <=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.endTime}"/>
+                </include>
+            </if>
+          ) dg
+            LEFT JOIN (
+                   SELECT count(id)  AS "deviceCount",group_id as groupId
+                   FROM device d
+                   WHERE VALID = 1
+                   GROUP BY group_id
+        ) d ON d.groupId = dg.id
+            LEFT JOIN (
+                 SELECT count(id)  AS "subscribeCount",group_id AS groupId
+                 FROM subscribe_store GROUP BY group_id
+           ) s ON s.groupId = dg.id
+         order by create_time desc
+    </select>
+
+    <select id="list" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
+        SELECT
+        dg.id,
+        group_no AS "groupNo",
+        deptid,
+        count( d.id ) AS "deviceCount",
+        count( s.id ) AS "subscribeCount",
+        descn,
+        create_time AS "createTime",
+        group_name AS "groupName"
+        FROM
+        (
+        SELECT *
+        FROM device_group
+        WHERE valid = 1
+        <if test="request.groupNo != null and request.groupNo != '' ">
+            AND group_no =#{request.groupNo}
+        </if>
+        <if test="request.groupName != '' and request.groupName != null">
+            AND group_name =#{request.groupName}
+        </if>
+        <if test="request.ids != null">
+            and id in
+            <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+        <if test="request.beginTime!='' and request.beginTime!=null">
+            AND create_time <![CDATA[  >=  ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{request.beginTime}"/>
+            </include>
+        </if>
+        <if test="request.endTime!='' and request.endTime!=null">
+            AND create_time <![CDATA[  <=  ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{request.endTime}"/>
+            </include>
+        </if>
+        ) dg
+        LEFT JOIN (
+            SELECT id, group_id AS "groupId"
+            FROM device d
+            WHERE VALID = 1
+        ) d ON d.groupId = dg.id
+        LEFT JOIN (
+            SELECT id, group_id AS "groupId"
+            FROM subscribe_store
+        ) s ON s.groupId = dg.id
+        GROUP BY dg.id
+        order by create_time desc
+    </select>
+
+    <select id="selectMaxNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(group_no, 12)), 0)
+        from device_group
+    </select>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
new file mode 100644
index 0000000..2c99706
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
@@ -0,0 +1,88 @@
+<?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.casic.missiles.mapper.DeviceMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.Device">
+        <id column="id" property="id" />
+        <result column="group_id" property="groupId" />
+        <result column="product_id" property="productId" />
+        <result column="devcode" property="devcode" />
+        <result column="device_type" property="deviceType" />
+        <result column="unit" property="unit" />
+        <result column="model" property="model" />
+        <result column="name" property="name" />
+        <result column="status" property="status" />
+        <result column="imei" property="imei" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="valid" property="valid" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, devcode, device_type, unit, name, product_id, status, imei, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.device.DeviceListVO">
+        SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime,
+        data_value AS "dataValue",model,imei,d.cell,name AS "deviceName",status,d.id,create_user_id AS "createUserId",
+        create_user_name AS "createUserName"
+        FROM (
+            SELECT *
+            FROM device
+            WHERE VALID=1
+            <if test="request.groupId!='' and request.groupId != null">
+                AND group_id =#{request.groupId}
+            </if>
+            <if test="request.devcode!='' and request.devcode != null">
+                AND devcode like CONCAT('%',#{request.devcode},'%')
+            </if>
+            <if test="request.imei!='' and request.imei != null">
+                AND imei like CONCAT('%',#{request.imei},'%')
+            </if>
+            <if test="request.deviceType!='' and request.deviceType != null">
+                AND device_type =#{request.deviceType}
+            </if>
+            <if test="request.status!='' and request.status != null">
+                AND status =#{request.status}
+            </if>
+            <if test="request.productId!='' and request.productId != null">
+                AND product_id =#{request.productId}
+            </if>
+            <if test="request.beginCell!='' and request.beginCell!=null">
+                AND cell <![CDATA[  >=  ]]> #{request.beginCell}
+
+            </if>
+            <if test="request.endCell!='' and request.endCell!=null">
+                AND cell <![CDATA[  <=  ]]> #{request.endCell}
+            </if>
+            <if test="request.ids != null">
+                and id in
+                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+            order by create_time desc
+        )d JOIN (
+            SELECT deptid,id
+            FROM device_group
+            WHERE VALID =1
+            <if test="request.groupId!='' and request.groupId != null">
+                AND id =#{request.groupId}
+            </if>
+        )dg ON dg.id=d.group_id
+        LEFT JOIN(
+            SELECT ddd.logtime AS logtime,data_value,ddd.devcode,cell
+            FROM device_data ddd
+            JOIN
+            (
+                SELECT Max(logtime) AS logtime,devcode
+                FROM  device_data
+                GROUP BY devcode
+            )dd  ON dd.logtime=ddd.logtime AND dd.devcode=ddd.devcode
+        )dd ON dd.devcode=d.devcode
+        order by create_time desc
+    </select>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml
new file mode 100644
index 0000000..a5bf5e7
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml
@@ -0,0 +1,20 @@
+<?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.casic.missiles.mapper.DeviceUpgradeTaskMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceUpgradeTask">
+        <id column="id" property="id" />
+        <result column="version_id" property="versionId" />
+        <result column="device_id" property="deviceId" />
+        <result column="status" property="status" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, version_id, device_id, status, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml
new file mode 100644
index 0000000..e39ec1f
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml
@@ -0,0 +1,23 @@
+<?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.casic.missiles.mapper.DeviceVersionMapper">
+
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceVersion">
+        <id column="Id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="version_file" property="versionFile" />
+        <result column="version" property="version" />
+        <result column="owner" property="owner" />
+        <result column="dscn" property="dscn" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        Id, product_id, version_file, version, owner, dscn, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductConfigItemMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductConfigItemMapper.xml
new file mode 100644
index 0000000..e2448be
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/ProductConfigItemMapper.xml
@@ -0,0 +1,22 @@
+<?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.casic.missiles.mapper.ProductConfigItemMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductConfigItem">
+        <id column="id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="param_name" property="paramName" />
+        <result column="param_code" property="paramCode" />
+        <result column="param_type" property="paramType" />
+        <result column="regular_expression" property="regularExpression" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, product_id, param_name, param_code, param_type, regular_expression, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductDataItemMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductDataItemMapper.xml
new file mode 100644
index 0000000..61a55ec
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/ProductDataItemMapper.xml
@@ -0,0 +1,21 @@
+<?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.casic.missiles.mapper.ProductDataItemMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductDataItem">
+        <id column="id" property="id" />
+        <result column="data_item_name" property="dataItemName" />
+        <result column="product_id" property="productId" />
+        <result column="data_item_type" property="dataItemType" />
+        <result column="data_item_field" property="dataItemField" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, data_item_name, product_id, data_item_type, data_item_field, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
new file mode 100644
index 0000000..26f3cb3
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
@@ -0,0 +1,30 @@
+<?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.casic.missiles.mapper.ProductInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductInfo">
+        <id column="Id" property="id" />
+        <result column="name" property="name" />
+        <result column="access_type" property="accessType" />
+        <result column="encipher_type" property="encipherType" />
+        <result column="descn" property="descn" />
+        <result column="product_type" property="productType" />
+        <result column="owners" property="owners" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_name" property="createUserName" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        Id, name, access_type, encipher_type, protocol_type, model, descn, product_type, owners, CreatorName, create_time, create_user_id
+    </sql>
+
+    <select id="selectMaxNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(product_no, 12)), 0)
+        from product_info
+    </select>
+
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/SubscribeStoreMapper.xml b/casic-iot-dao/src/main/resources/mapper/SubscribeStoreMapper.xml
new file mode 100644
index 0000000..415a670
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/SubscribeStoreMapper.xml
@@ -0,0 +1,61 @@
+<?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.casic.missiles.mapper.SubscribeStoreMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.SubscribeStore">
+        <id column="id" property="id"/>
+        <result column="subscribe_no" property="subscribeNo"/>
+        <result column="group_id" property="groupId"/>
+        <result column="message_type" property="messageType"/>
+        <result column="subscribe_type" property="subscribeType"/>
+        <result column="enable" property="enable"/>
+        <result column="subscribe_status" property="subscribeStatus"/>
+        <result column="subscribe_content_json" property="subscribeContentJson"/>
+        <result column="descn" property="descn"/>
+        <result column="create_time" property="createTime"/>
+        <result column="create_user_name" property="createUserName"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, message_type, subscribe_type, enable, subscribe_status, subscribe_content_json, descn, create_time, create_user_name
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.subscribe.SubscribeListVO">
+        SELECT message_type AS "messageType",create_time AS "createTime",subscribe_no AS
+            "subscribeNo",subscribe_content_json AS "subscribeContentJson",
+            subscribe_status AS "subscribeStatus",create_user_name AS "createUserName",
+           create_user_id AS "createUserId"
+        FROM (
+        SELECT *
+        FROM subscribe_store
+        WHERE 1=1
+        <if test="request.groupId!='' and request.groupId != null">
+            AND group_id =#{request.groupId}
+        </if>
+        <if test="request.messageType!='' and request.messageType != null">
+            AND message_type =#{request.messageType}
+        </if>
+        <if test="request.subscribeNo!='' and request.subscribeNo != null">
+            AND subscribe_no like CONCAT('%',#{request.subscribeNo},'%')
+        </if>
+        <if test="request.subscribeType!='' and request.subscribeType != null">
+            AND subscribe_type =#{request.subscribeType}
+        </if>
+        <if test="request.status!='' and request.status != null">
+            AND subscribe_status =#{request.status}
+        </if>
+        order by create_time desc
+        )d JOIN (
+        SELECT deptid,id
+        FROM device_group
+        WHERE VALID=1
+        <if test="request.groupId!='' and request.groupId != null">
+            AND id =#{request.groupId}
+        </if>
+        )dg ON dg.id=d.group_id
+        order by create_time desc
+    </select>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/common/SysCommonMapper.xml b/casic-iot-dao/src/main/resources/mapper/common/SysCommonMapper.xml
new file mode 100644
index 0000000..880f7d4
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/common/SysCommonMapper.xml
@@ -0,0 +1,21 @@
+<?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.casic.missiles.mapper.common.SysCommonMapper">
+
+    <select id="getDictMapByCode" resultType="java.util.Map">
+        SELECT  name,code
+        from sys_dict
+         where  pid=(
+            SELECT id
+            from  sys_dict
+            where  code=#{code}
+         )
+    </select>
+
+    <select id="getDeptMap" resultType="java.util.Map">
+        SELECT  id,SIMPLE_NAME AS  "simpleName"
+        from sys_dept
+    </select>
+
+
+</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/AlarmConfigMapper.xml b/casic-iot-dao/src/resource/mapper/AlarmConfigMapper.xml
deleted file mode 100644
index bd2c2cc..0000000
--- a/casic-iot-dao/src/resource/mapper/AlarmConfigMapper.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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.casic.missiles.mapper.AlarmConfigMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmConfig">
-        <id column="id" property="id" />
-        <result column="product_id" property="productId" />
-        <result column="name" property="name" />
-        <result column="alarm_content" property="alarmContent" />
-        <result column="period_high" property="periodHigh" />
-        <result column="period_low" property="periodLow" />
-        <result column="create_user_id" property="createUserId" />
-        <result column="create_time" property="createTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, name, product_id, alarm_content, period_high, period_low, TypeName, CreatorId, creater_user_id, create_time
-    </sql>
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/AlarmDataMapper.xml b/casic-iot-dao/src/resource/mapper/AlarmDataMapper.xml
deleted file mode 100644
index 4aee44a..0000000
--- a/casic-iot-dao/src/resource/mapper/AlarmDataMapper.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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.casic.missiles.mapper.AlarmDataMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmData">
-        <id column="id" property="id" />
-        <result column="alarm_type" property="alarmType" />
-        <result column="alarm_content" property="alarmContent" />
-        <result column="devcode" property="devcode" />
-        <result column="alarm_time" property="alarmTime" />
-        <result column="alarm_value" property="alarmValue" />
-        <result column="status" property="status" />
-        <result column="create_name" property="createName" />
-        <result column="create_time" property="createTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, alarm_type, alarm_content, devcode, alarm_time, alarm_value, status, CreatorName, create_time
-    </sql>
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/BusConfigMapper.xml b/casic-iot-dao/src/resource/mapper/BusConfigMapper.xml
deleted file mode 100644
index b4965d6..0000000
--- a/casic-iot-dao/src/resource/mapper/BusConfigMapper.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?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.casic.missiles.mapper.BusConfigMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.BusConfig">
-        <id column="id" property="id"/>
-        <result column="devcode" property="devcode"/>
-        <result column="config_json" property="configJson"/>
-        <result column="status" property="status"/>
-        <result column="send_time" property="sendTime"/>
-        <result column="create_time" property="createTime"/>
-        <result column="create_user_id" property="createUserId"/>
-    </resultMap>
-
-
-    <sql id="char_toDate" databaseId="mysql">
-        ${paramStr}
-    </sql>
-
-    <sql id="char_toDate" databaseId="pgsql">
-       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
-    </sql>
-
-    <sql id="char_toDate" databaseId="oracle">
-        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
-    </sql>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, Pid, devcode, config_json, status, update_time, create_time, create_user_id
-    </sql>
-
-    <select id="listPage" resultType="com.casic.missiles.model.BusConfig">
-        select bc.id,bc.devcode,config_type AS "configType", config_json AS "configJson",bc.status,
-        send_time as "sendTime",bc.create_time AS "createTime",bc.create_user_id AS "createUserId",
-        bc.create_user_name AS "createUserName",dg.deptid
-        FROM (
-            SELECT *
-            FROM bus_config
-            WHERE 1=1
-            <if test="request.configType != null and request.configType != '' ">
-                AND config_type =#{request.configType}
-            </if>
-            <if test="request.devcode != '' and request.devcode != null">
-                AND devcode =#{request.devcode}
-            </if>
-            <if test="request.status != '' and request.status != null">
-                AND status =#{request.status}
-            </if>
-            <if test="request.beginTime!='' and request.beginTime!=null">
-                AND send_time <![CDATA[  >=  ]]>
-                <include refid="char_toDate">
-                    <property name="paramStr" value="#{request.beginTime}"/>
-                </include>
-            </if>
-            <if test="request.endTime!='' and request.endTime!=null">
-                AND send_time <![CDATA[  <=  ]]>
-                <include refid="char_toDate">
-                    <property name="paramStr" value="#{request.endTime}"/>
-                </include>
-            </if>
-        )bc
-        JOIN device d ON d.devcode=bc.devcode
-        JOIN device_group dg ON dg.id= d.group_id
-
-    </select>
-
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml
deleted file mode 100644
index 083b289..0000000
--- a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?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.casic.missiles.mapper.DeviceDataMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceData">
-        <id column="id" property="id"/>
-        <result column="devcode" property="devcode"/>
-        <result column="device_type" property="deviceType"/>
-        <result column="cell" property="cell"/>
-        <result column="data_json" property="dataJson"/>
-        <result column="decrypt_before_data" property="decryptBeforeData"/>
-        <result column="decrypt_after_data" property="decryptAfterData"/>
-        <result column="uptime" property="uptime"/>
-        <result column="logtime" property="logtime"/>
-    </resultMap>
-
-    <sql id="char_toDate" databaseId="mysql">
-        ${paramStr}
-    </sql>
-
-    <sql id="char_toDate" databaseId="pgsql">
-       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
-    </sql>
-
-    <sql id="char_toDate" databaseId="oracle">
-        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
-    </sql>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, devcode, device_type, cell, data_json, decrypt_before_data, decrypt_after_data, uptime, logtime
-    </sql>
-
-    <select id="listPage" resultType="com.casic.missiles.dto.data.DeviceDataListVO">
-          SELECT  	dd.id,
-                    dd.devcode,
-                    dd.device_type AS "deviceType",
-                    deptid,
-                    dd.cell,
-                    dd.data_json AS "dataJson",
-                    decrypt_before_data AS "decryptBeforeData",
-                    decrypt_after_data AS "decryptAfterData",
-                    uptime,
-                    logtime,
-                    d.STATUS,
-                    d.group_id AS "groupId",
-                    dg.group_name AS "groupName"
-        FROM (
-               SELECT *
-               FROM device_data
-               WHERE  1=1
-                <if test="request.devcode!='' and request.devcode != null">
-                    AND devcode like CONCAT('%',#{request.devcode},'%')
-                </if>
-                <if test="request.deviceType!='' and request.deviceType != null">
-                    AND device_type =#{request.deviceType}
-                </if>
-                <if test="request.beginTime!='' and request.beginTime!=null">
-                    AND logtime <![CDATA[  >=  ]]>
-                    <include refid="char_toDate">
-                        <property name="paramStr" value="#{request.beginTime}"/>
-                    </include>
-                </if>
-                <if test="request.endTime!='' and request.endTime!=null">
-                    AND logtime <![CDATA[  <=  ]]>
-                    <include refid="char_toDate">
-                        <property name="paramStr" value="#{request.endTime}"/>
-                    </include>
-                </if>
-                <if test="request.ids != null">
-                    and id in
-                    <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
-                        #{id}
-                    </foreach>
-                </if>
-
-          )dd
-          JOIN (
-                SELECT id, group_id,status,devcode
-                FROM device
-                WHERE valid=1
-                <if test="request.devcode!='' and request.devcode != null">
-                    AND devcode like CONCAT('%',#{request.devcode},'%')
-                </if>
-                <if test="request.deviceType!='' and request.deviceType != null">
-                    AND device_type =#{request.deviceType}
-                </if>
-                <if test="request.groupId!='' and request.groupId != null">
-                    AND greoup_id=#{request.groupId}
-                </if>
-          )d ON d.devcode=dd.devcode
-          JOIN (
-                SELECT   deptid,id,group_name
-                FROM device_group
-                WHERE valid=1
-                <if test="request.groupId!='' and request.groupId != null">
-                    AND id=#{request.groupId}
-                </if>
-          ) dg ON dg.id=d.group_id
-          order by logtime desc
-
-    </select>
-
-
-</mapper>

diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml
new file mode 100644
index 0000000..bd2c2cc
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml
@@ -0,0 +1,22 @@
+<?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.casic.missiles.mapper.AlarmConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmConfig">
+        <id column="id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="name" property="name" />
+        <result column="alarm_content" property="alarmContent" />
+        <result column="period_high" property="periodHigh" />
+        <result column="period_low" property="periodLow" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, product_id, alarm_content, period_high, period_low, TypeName, CreatorId, creater_user_id, create_time
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml
new file mode 100644
index 0000000..4aee44a
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml
@@ -0,0 +1,23 @@
+<?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.casic.missiles.mapper.AlarmDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmData">
+        <id column="id" property="id" />
+        <result column="alarm_type" property="alarmType" />
+        <result column="alarm_content" property="alarmContent" />
+        <result column="devcode" property="devcode" />
+        <result column="alarm_time" property="alarmTime" />
+        <result column="alarm_value" property="alarmValue" />
+        <result column="status" property="status" />
+        <result column="create_name" property="createName" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, alarm_type, alarm_content, devcode, alarm_time, alarm_value, status, CreatorName, create_time
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml b/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml
new file mode 100644
index 0000000..b4965d6
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml
@@ -0,0 +1,70 @@
+<?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.casic.missiles.mapper.BusConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.BusConfig">
+        <id column="id" property="id"/>
+        <result column="devcode" property="devcode"/>
+        <result column="config_json" property="configJson"/>
+        <result column="status" property="status"/>
+        <result column="send_time" property="sendTime"/>
+        <result column="create_time" property="createTime"/>
+        <result column="create_user_id" property="createUserId"/>
+    </resultMap>
+
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, Pid, devcode, config_json, status, update_time, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.model.BusConfig">
+        select bc.id,bc.devcode,config_type AS "configType", config_json AS "configJson",bc.status,
+        send_time as "sendTime",bc.create_time AS "createTime",bc.create_user_id AS "createUserId",
+        bc.create_user_name AS "createUserName",dg.deptid
+        FROM (
+            SELECT *
+            FROM bus_config
+            WHERE 1=1
+            <if test="request.configType != null and request.configType != '' ">
+                AND config_type =#{request.configType}
+            </if>
+            <if test="request.devcode != '' and request.devcode != null">
+                AND devcode =#{request.devcode}
+            </if>
+            <if test="request.status != '' and request.status != null">
+                AND status =#{request.status}
+            </if>
+            <if test="request.beginTime!='' and request.beginTime!=null">
+                AND send_time <![CDATA[  >=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.beginTime}"/>
+                </include>
+            </if>
+            <if test="request.endTime!='' and request.endTime!=null">
+                AND send_time <![CDATA[  <=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.endTime}"/>
+                </include>
+            </if>
+        )bc
+        JOIN device d ON d.devcode=bc.devcode
+        JOIN device_group dg ON dg.id= d.group_id
+
+    </select>
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml
new file mode 100644
index 0000000..083b289
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml
@@ -0,0 +1,106 @@
+<?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.casic.missiles.mapper.DeviceDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceData">
+        <id column="id" property="id"/>
+        <result column="devcode" property="devcode"/>
+        <result column="device_type" property="deviceType"/>
+        <result column="cell" property="cell"/>
+        <result column="data_json" property="dataJson"/>
+        <result column="decrypt_before_data" property="decryptBeforeData"/>
+        <result column="decrypt_after_data" property="decryptAfterData"/>
+        <result column="uptime" property="uptime"/>
+        <result column="logtime" property="logtime"/>
+    </resultMap>
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, devcode, device_type, cell, data_json, decrypt_before_data, decrypt_after_data, uptime, logtime
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.data.DeviceDataListVO">
+          SELECT  	dd.id,
+                    dd.devcode,
+                    dd.device_type AS "deviceType",
+                    deptid,
+                    dd.cell,
+                    dd.data_json AS "dataJson",
+                    decrypt_before_data AS "decryptBeforeData",
+                    decrypt_after_data AS "decryptAfterData",
+                    uptime,
+                    logtime,
+                    d.STATUS,
+                    d.group_id AS "groupId",
+                    dg.group_name AS "groupName"
+        FROM (
+               SELECT *
+               FROM device_data
+               WHERE  1=1
+                <if test="request.devcode!='' and request.devcode != null">
+                    AND devcode like CONCAT('%',#{request.devcode},'%')
+                </if>
+                <if test="request.deviceType!='' and request.deviceType != null">
+                    AND device_type =#{request.deviceType}
+                </if>
+                <if test="request.beginTime!='' and request.beginTime!=null">
+                    AND logtime <![CDATA[  >=  ]]>
+                    <include refid="char_toDate">
+                        <property name="paramStr" value="#{request.beginTime}"/>
+                    </include>
+                </if>
+                <if test="request.endTime!='' and request.endTime!=null">
+                    AND logtime <![CDATA[  <=  ]]>
+                    <include refid="char_toDate">
+                        <property name="paramStr" value="#{request.endTime}"/>
+                    </include>
+                </if>
+                <if test="request.ids != null">
+                    and id in
+                    <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                        #{id}
+                    </foreach>
+                </if>
+
+          )dd
+          JOIN (
+                SELECT id, group_id,status,devcode
+                FROM device
+                WHERE valid=1
+                <if test="request.devcode!='' and request.devcode != null">
+                    AND devcode like CONCAT('%',#{request.devcode},'%')
+                </if>
+                <if test="request.deviceType!='' and request.deviceType != null">
+                    AND device_type =#{request.deviceType}
+                </if>
+                <if test="request.groupId!='' and request.groupId != null">
+                    AND greoup_id=#{request.groupId}
+                </if>
+          )d ON d.devcode=dd.devcode
+          JOIN (
+                SELECT   deptid,id,group_name
+                FROM device_group
+                WHERE valid=1
+                <if test="request.groupId!='' and request.groupId != null">
+                    AND id=#{request.groupId}
+                </if>
+          ) dg ON dg.id=d.group_id
+          order by logtime desc
+
+    </select>
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml
new file mode 100644
index 0000000..2e07287
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml
@@ -0,0 +1,148 @@
+<?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.casic.missiles.mapper.DeviceGroupMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceGroup">
+        <id column="id" property="id" />
+        <result column="group_name" property="groupName" />
+        <result column="group_no" property="groupNo" />
+        <result column="descn" property="descn" />
+        <result column="deptid" property="deptid" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="owner" property="owner" />
+        <result column="valid" property="valid" />
+    </resultMap>
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, owner, subcribe_ids, descn, dept, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
+        SELECT
+            dg.id,
+            group_no AS "groupNo",
+            deptid,
+             deviceCount,
+            subscribeCount,
+            descn,
+            create_time AS "createTime",
+            group_name AS "groupName",
+            create_user_id AS "createUserId",
+            create_user_name AS "createUserName"
+        FROM
+          (
+             SELECT *
+             FROM device_group
+             WHERE valid = 1
+            <if test="request.groupNo != null and request.groupNo != '' ">
+                AND group_no =#{request.groupNo}
+            </if>
+            <if test="request.groupName != '' and request.groupName != null">
+                AND group_name =#{request.groupName}
+            </if>
+            <if test="request.ids != null">
+                and id in
+                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+            <if test="request.beginTime!='' and request.beginTime!=null">
+                AND create_time <![CDATA[  >=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.beginTime}"/>
+                </include>
+            </if>
+            <if test="request.endTime!='' and request.endTime!=null">
+                AND create_time <![CDATA[  <=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.endTime}"/>
+                </include>
+            </if>
+          ) dg
+            LEFT JOIN (
+                   SELECT count(id)  AS "deviceCount",group_id as groupId
+                   FROM device d
+                   WHERE VALID = 1
+                   GROUP BY group_id
+        ) d ON d.groupId = dg.id
+            LEFT JOIN (
+                 SELECT count(id)  AS "subscribeCount",group_id AS groupId
+                 FROM subscribe_store GROUP BY group_id
+           ) s ON s.groupId = dg.id
+         order by create_time desc
+    </select>
+
+    <select id="list" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
+        SELECT
+        dg.id,
+        group_no AS "groupNo",
+        deptid,
+        count( d.id ) AS "deviceCount",
+        count( s.id ) AS "subscribeCount",
+        descn,
+        create_time AS "createTime",
+        group_name AS "groupName"
+        FROM
+        (
+        SELECT *
+        FROM device_group
+        WHERE valid = 1
+        <if test="request.groupNo != null and request.groupNo != '' ">
+            AND group_no =#{request.groupNo}
+        </if>
+        <if test="request.groupName != '' and request.groupName != null">
+            AND group_name =#{request.groupName}
+        </if>
+        <if test="request.ids != null">
+            and id in
+            <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+        <if test="request.beginTime!='' and request.beginTime!=null">
+            AND create_time <![CDATA[  >=  ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{request.beginTime}"/>
+            </include>
+        </if>
+        <if test="request.endTime!='' and request.endTime!=null">
+            AND create_time <![CDATA[  <=  ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{request.endTime}"/>
+            </include>
+        </if>
+        ) dg
+        LEFT JOIN (
+            SELECT id, group_id AS "groupId"
+            FROM device d
+            WHERE VALID = 1
+        ) d ON d.groupId = dg.id
+        LEFT JOIN (
+            SELECT id, group_id AS "groupId"
+            FROM subscribe_store
+        ) s ON s.groupId = dg.id
+        GROUP BY dg.id
+        order by create_time desc
+    </select>
+
+    <select id="selectMaxNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(group_no, 12)), 0)
+        from device_group
+    </select>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
new file mode 100644
index 0000000..2c99706
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
@@ -0,0 +1,88 @@
+<?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.casic.missiles.mapper.DeviceMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.Device">
+        <id column="id" property="id" />
+        <result column="group_id" property="groupId" />
+        <result column="product_id" property="productId" />
+        <result column="devcode" property="devcode" />
+        <result column="device_type" property="deviceType" />
+        <result column="unit" property="unit" />
+        <result column="model" property="model" />
+        <result column="name" property="name" />
+        <result column="status" property="status" />
+        <result column="imei" property="imei" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="valid" property="valid" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, devcode, device_type, unit, name, product_id, status, imei, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.device.DeviceListVO">
+        SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime,
+        data_value AS "dataValue",model,imei,d.cell,name AS "deviceName",status,d.id,create_user_id AS "createUserId",
+        create_user_name AS "createUserName"
+        FROM (
+            SELECT *
+            FROM device
+            WHERE VALID=1
+            <if test="request.groupId!='' and request.groupId != null">
+                AND group_id =#{request.groupId}
+            </if>
+            <if test="request.devcode!='' and request.devcode != null">
+                AND devcode like CONCAT('%',#{request.devcode},'%')
+            </if>
+            <if test="request.imei!='' and request.imei != null">
+                AND imei like CONCAT('%',#{request.imei},'%')
+            </if>
+            <if test="request.deviceType!='' and request.deviceType != null">
+                AND device_type =#{request.deviceType}
+            </if>
+            <if test="request.status!='' and request.status != null">
+                AND status =#{request.status}
+            </if>
+            <if test="request.productId!='' and request.productId != null">
+                AND product_id =#{request.productId}
+            </if>
+            <if test="request.beginCell!='' and request.beginCell!=null">
+                AND cell <![CDATA[  >=  ]]> #{request.beginCell}
+
+            </if>
+            <if test="request.endCell!='' and request.endCell!=null">
+                AND cell <![CDATA[  <=  ]]> #{request.endCell}
+            </if>
+            <if test="request.ids != null">
+                and id in
+                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+            order by create_time desc
+        )d JOIN (
+            SELECT deptid,id
+            FROM device_group
+            WHERE VALID =1
+            <if test="request.groupId!='' and request.groupId != null">
+                AND id =#{request.groupId}
+            </if>
+        )dg ON dg.id=d.group_id
+        LEFT JOIN(
+            SELECT ddd.logtime AS logtime,data_value,ddd.devcode,cell
+            FROM device_data ddd
+            JOIN
+            (
+                SELECT Max(logtime) AS logtime,devcode
+                FROM  device_data
+                GROUP BY devcode
+            )dd  ON dd.logtime=ddd.logtime AND dd.devcode=ddd.devcode
+        )dd ON dd.devcode=d.devcode
+        order by create_time desc
+    </select>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml
new file mode 100644
index 0000000..a5bf5e7
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml
@@ -0,0 +1,20 @@
+<?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.casic.missiles.mapper.DeviceUpgradeTaskMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceUpgradeTask">
+        <id column="id" property="id" />
+        <result column="version_id" property="versionId" />
+        <result column="device_id" property="deviceId" />
+        <result column="status" property="status" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, version_id, device_id, status, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml
new file mode 100644
index 0000000..e39ec1f
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml
@@ -0,0 +1,23 @@
+<?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.casic.missiles.mapper.DeviceVersionMapper">
+
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceVersion">
+        <id column="Id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="version_file" property="versionFile" />
+        <result column="version" property="version" />
+        <result column="owner" property="owner" />
+        <result column="dscn" property="dscn" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        Id, product_id, version_file, version, owner, dscn, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductConfigItemMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductConfigItemMapper.xml
new file mode 100644
index 0000000..e2448be
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/ProductConfigItemMapper.xml
@@ -0,0 +1,22 @@
+<?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.casic.missiles.mapper.ProductConfigItemMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductConfigItem">
+        <id column="id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="param_name" property="paramName" />
+        <result column="param_code" property="paramCode" />
+        <result column="param_type" property="paramType" />
+        <result column="regular_expression" property="regularExpression" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, product_id, param_name, param_code, param_type, regular_expression, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductDataItemMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductDataItemMapper.xml
new file mode 100644
index 0000000..61a55ec
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/ProductDataItemMapper.xml
@@ -0,0 +1,21 @@
+<?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.casic.missiles.mapper.ProductDataItemMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductDataItem">
+        <id column="id" property="id" />
+        <result column="data_item_name" property="dataItemName" />
+        <result column="product_id" property="productId" />
+        <result column="data_item_type" property="dataItemType" />
+        <result column="data_item_field" property="dataItemField" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, data_item_name, product_id, data_item_type, data_item_field, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
new file mode 100644
index 0000000..26f3cb3
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
@@ -0,0 +1,30 @@
+<?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.casic.missiles.mapper.ProductInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductInfo">
+        <id column="Id" property="id" />
+        <result column="name" property="name" />
+        <result column="access_type" property="accessType" />
+        <result column="encipher_type" property="encipherType" />
+        <result column="descn" property="descn" />
+        <result column="product_type" property="productType" />
+        <result column="owners" property="owners" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_name" property="createUserName" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        Id, name, access_type, encipher_type, protocol_type, model, descn, product_type, owners, CreatorName, create_time, create_user_id
+    </sql>
+
+    <select id="selectMaxNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(product_no, 12)), 0)
+        from product_info
+    </select>
+
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/SubscribeStoreMapper.xml b/casic-iot-dao/src/main/resources/mapper/SubscribeStoreMapper.xml
new file mode 100644
index 0000000..415a670
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/SubscribeStoreMapper.xml
@@ -0,0 +1,61 @@
+<?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.casic.missiles.mapper.SubscribeStoreMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.SubscribeStore">
+        <id column="id" property="id"/>
+        <result column="subscribe_no" property="subscribeNo"/>
+        <result column="group_id" property="groupId"/>
+        <result column="message_type" property="messageType"/>
+        <result column="subscribe_type" property="subscribeType"/>
+        <result column="enable" property="enable"/>
+        <result column="subscribe_status" property="subscribeStatus"/>
+        <result column="subscribe_content_json" property="subscribeContentJson"/>
+        <result column="descn" property="descn"/>
+        <result column="create_time" property="createTime"/>
+        <result column="create_user_name" property="createUserName"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, message_type, subscribe_type, enable, subscribe_status, subscribe_content_json, descn, create_time, create_user_name
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.subscribe.SubscribeListVO">
+        SELECT message_type AS "messageType",create_time AS "createTime",subscribe_no AS
+            "subscribeNo",subscribe_content_json AS "subscribeContentJson",
+            subscribe_status AS "subscribeStatus",create_user_name AS "createUserName",
+           create_user_id AS "createUserId"
+        FROM (
+        SELECT *
+        FROM subscribe_store
+        WHERE 1=1
+        <if test="request.groupId!='' and request.groupId != null">
+            AND group_id =#{request.groupId}
+        </if>
+        <if test="request.messageType!='' and request.messageType != null">
+            AND message_type =#{request.messageType}
+        </if>
+        <if test="request.subscribeNo!='' and request.subscribeNo != null">
+            AND subscribe_no like CONCAT('%',#{request.subscribeNo},'%')
+        </if>
+        <if test="request.subscribeType!='' and request.subscribeType != null">
+            AND subscribe_type =#{request.subscribeType}
+        </if>
+        <if test="request.status!='' and request.status != null">
+            AND subscribe_status =#{request.status}
+        </if>
+        order by create_time desc
+        )d JOIN (
+        SELECT deptid,id
+        FROM device_group
+        WHERE VALID=1
+        <if test="request.groupId!='' and request.groupId != null">
+            AND id =#{request.groupId}
+        </if>
+        )dg ON dg.id=d.group_id
+        order by create_time desc
+    </select>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/common/SysCommonMapper.xml b/casic-iot-dao/src/main/resources/mapper/common/SysCommonMapper.xml
new file mode 100644
index 0000000..880f7d4
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/common/SysCommonMapper.xml
@@ -0,0 +1,21 @@
+<?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.casic.missiles.mapper.common.SysCommonMapper">
+
+    <select id="getDictMapByCode" resultType="java.util.Map">
+        SELECT  name,code
+        from sys_dict
+         where  pid=(
+            SELECT id
+            from  sys_dict
+            where  code=#{code}
+         )
+    </select>
+
+    <select id="getDeptMap" resultType="java.util.Map">
+        SELECT  id,SIMPLE_NAME AS  "simpleName"
+        from sys_dept
+    </select>
+
+
+</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/AlarmConfigMapper.xml b/casic-iot-dao/src/resource/mapper/AlarmConfigMapper.xml
deleted file mode 100644
index bd2c2cc..0000000
--- a/casic-iot-dao/src/resource/mapper/AlarmConfigMapper.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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.casic.missiles.mapper.AlarmConfigMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmConfig">
-        <id column="id" property="id" />
-        <result column="product_id" property="productId" />
-        <result column="name" property="name" />
-        <result column="alarm_content" property="alarmContent" />
-        <result column="period_high" property="periodHigh" />
-        <result column="period_low" property="periodLow" />
-        <result column="create_user_id" property="createUserId" />
-        <result column="create_time" property="createTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, name, product_id, alarm_content, period_high, period_low, TypeName, CreatorId, creater_user_id, create_time
-    </sql>
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/AlarmDataMapper.xml b/casic-iot-dao/src/resource/mapper/AlarmDataMapper.xml
deleted file mode 100644
index 4aee44a..0000000
--- a/casic-iot-dao/src/resource/mapper/AlarmDataMapper.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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.casic.missiles.mapper.AlarmDataMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmData">
-        <id column="id" property="id" />
-        <result column="alarm_type" property="alarmType" />
-        <result column="alarm_content" property="alarmContent" />
-        <result column="devcode" property="devcode" />
-        <result column="alarm_time" property="alarmTime" />
-        <result column="alarm_value" property="alarmValue" />
-        <result column="status" property="status" />
-        <result column="create_name" property="createName" />
-        <result column="create_time" property="createTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, alarm_type, alarm_content, devcode, alarm_time, alarm_value, status, CreatorName, create_time
-    </sql>
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/BusConfigMapper.xml b/casic-iot-dao/src/resource/mapper/BusConfigMapper.xml
deleted file mode 100644
index b4965d6..0000000
--- a/casic-iot-dao/src/resource/mapper/BusConfigMapper.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?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.casic.missiles.mapper.BusConfigMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.BusConfig">
-        <id column="id" property="id"/>
-        <result column="devcode" property="devcode"/>
-        <result column="config_json" property="configJson"/>
-        <result column="status" property="status"/>
-        <result column="send_time" property="sendTime"/>
-        <result column="create_time" property="createTime"/>
-        <result column="create_user_id" property="createUserId"/>
-    </resultMap>
-
-
-    <sql id="char_toDate" databaseId="mysql">
-        ${paramStr}
-    </sql>
-
-    <sql id="char_toDate" databaseId="pgsql">
-       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
-    </sql>
-
-    <sql id="char_toDate" databaseId="oracle">
-        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
-    </sql>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, Pid, devcode, config_json, status, update_time, create_time, create_user_id
-    </sql>
-
-    <select id="listPage" resultType="com.casic.missiles.model.BusConfig">
-        select bc.id,bc.devcode,config_type AS "configType", config_json AS "configJson",bc.status,
-        send_time as "sendTime",bc.create_time AS "createTime",bc.create_user_id AS "createUserId",
-        bc.create_user_name AS "createUserName",dg.deptid
-        FROM (
-            SELECT *
-            FROM bus_config
-            WHERE 1=1
-            <if test="request.configType != null and request.configType != '' ">
-                AND config_type =#{request.configType}
-            </if>
-            <if test="request.devcode != '' and request.devcode != null">
-                AND devcode =#{request.devcode}
-            </if>
-            <if test="request.status != '' and request.status != null">
-                AND status =#{request.status}
-            </if>
-            <if test="request.beginTime!='' and request.beginTime!=null">
-                AND send_time <![CDATA[  >=  ]]>
-                <include refid="char_toDate">
-                    <property name="paramStr" value="#{request.beginTime}"/>
-                </include>
-            </if>
-            <if test="request.endTime!='' and request.endTime!=null">
-                AND send_time <![CDATA[  <=  ]]>
-                <include refid="char_toDate">
-                    <property name="paramStr" value="#{request.endTime}"/>
-                </include>
-            </if>
-        )bc
-        JOIN device d ON d.devcode=bc.devcode
-        JOIN device_group dg ON dg.id= d.group_id
-
-    </select>
-
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml
deleted file mode 100644
index 083b289..0000000
--- a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?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.casic.missiles.mapper.DeviceDataMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceData">
-        <id column="id" property="id"/>
-        <result column="devcode" property="devcode"/>
-        <result column="device_type" property="deviceType"/>
-        <result column="cell" property="cell"/>
-        <result column="data_json" property="dataJson"/>
-        <result column="decrypt_before_data" property="decryptBeforeData"/>
-        <result column="decrypt_after_data" property="decryptAfterData"/>
-        <result column="uptime" property="uptime"/>
-        <result column="logtime" property="logtime"/>
-    </resultMap>
-
-    <sql id="char_toDate" databaseId="mysql">
-        ${paramStr}
-    </sql>
-
-    <sql id="char_toDate" databaseId="pgsql">
-       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
-    </sql>
-
-    <sql id="char_toDate" databaseId="oracle">
-        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
-    </sql>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, devcode, device_type, cell, data_json, decrypt_before_data, decrypt_after_data, uptime, logtime
-    </sql>
-
-    <select id="listPage" resultType="com.casic.missiles.dto.data.DeviceDataListVO">
-          SELECT  	dd.id,
-                    dd.devcode,
-                    dd.device_type AS "deviceType",
-                    deptid,
-                    dd.cell,
-                    dd.data_json AS "dataJson",
-                    decrypt_before_data AS "decryptBeforeData",
-                    decrypt_after_data AS "decryptAfterData",
-                    uptime,
-                    logtime,
-                    d.STATUS,
-                    d.group_id AS "groupId",
-                    dg.group_name AS "groupName"
-        FROM (
-               SELECT *
-               FROM device_data
-               WHERE  1=1
-                <if test="request.devcode!='' and request.devcode != null">
-                    AND devcode like CONCAT('%',#{request.devcode},'%')
-                </if>
-                <if test="request.deviceType!='' and request.deviceType != null">
-                    AND device_type =#{request.deviceType}
-                </if>
-                <if test="request.beginTime!='' and request.beginTime!=null">
-                    AND logtime <![CDATA[  >=  ]]>
-                    <include refid="char_toDate">
-                        <property name="paramStr" value="#{request.beginTime}"/>
-                    </include>
-                </if>
-                <if test="request.endTime!='' and request.endTime!=null">
-                    AND logtime <![CDATA[  <=  ]]>
-                    <include refid="char_toDate">
-                        <property name="paramStr" value="#{request.endTime}"/>
-                    </include>
-                </if>
-                <if test="request.ids != null">
-                    and id in
-                    <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
-                        #{id}
-                    </foreach>
-                </if>
-
-          )dd
-          JOIN (
-                SELECT id, group_id,status,devcode
-                FROM device
-                WHERE valid=1
-                <if test="request.devcode!='' and request.devcode != null">
-                    AND devcode like CONCAT('%',#{request.devcode},'%')
-                </if>
-                <if test="request.deviceType!='' and request.deviceType != null">
-                    AND device_type =#{request.deviceType}
-                </if>
-                <if test="request.groupId!='' and request.groupId != null">
-                    AND greoup_id=#{request.groupId}
-                </if>
-          )d ON d.devcode=dd.devcode
-          JOIN (
-                SELECT   deptid,id,group_name
-                FROM device_group
-                WHERE valid=1
-                <if test="request.groupId!='' and request.groupId != null">
-                    AND id=#{request.groupId}
-                </if>
-          ) dg ON dg.id=d.group_id
-          order by logtime desc
-
-    </select>
-
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml
deleted file mode 100644
index 2e07287..0000000
--- a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?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.casic.missiles.mapper.DeviceGroupMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceGroup">
-        <id column="id" property="id" />
-        <result column="group_name" property="groupName" />
-        <result column="group_no" property="groupNo" />
-        <result column="descn" property="descn" />
-        <result column="deptid" property="deptid" />
-        <result column="create_time" property="createTime" />
-        <result column="create_user_id" property="createUserId" />
-        <result column="owner" property="owner" />
-        <result column="valid" property="valid" />
-    </resultMap>
-
-    <sql id="char_toDate" databaseId="mysql">
-        ${paramStr}
-    </sql>
-
-    <sql id="char_toDate" databaseId="pgsql">
-       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
-    </sql>
-
-    <sql id="char_toDate" databaseId="oracle">
-        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
-    </sql>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, name, owner, subcribe_ids, descn, dept, create_time, create_user_id
-    </sql>
-
-    <select id="listPage" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
-        SELECT
-            dg.id,
-            group_no AS "groupNo",
-            deptid,
-             deviceCount,
-            subscribeCount,
-            descn,
-            create_time AS "createTime",
-            group_name AS "groupName",
-            create_user_id AS "createUserId",
-            create_user_name AS "createUserName"
-        FROM
-          (
-             SELECT *
-             FROM device_group
-             WHERE valid = 1
-            <if test="request.groupNo != null and request.groupNo != '' ">
-                AND group_no =#{request.groupNo}
-            </if>
-            <if test="request.groupName != '' and request.groupName != null">
-                AND group_name =#{request.groupName}
-            </if>
-            <if test="request.ids != null">
-                and id in
-                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
-                    #{id}
-                </foreach>
-            </if>
-            <if test="request.beginTime!='' and request.beginTime!=null">
-                AND create_time <![CDATA[  >=  ]]>
-                <include refid="char_toDate">
-                    <property name="paramStr" value="#{request.beginTime}"/>
-                </include>
-            </if>
-            <if test="request.endTime!='' and request.endTime!=null">
-                AND create_time <![CDATA[  <=  ]]>
-                <include refid="char_toDate">
-                    <property name="paramStr" value="#{request.endTime}"/>
-                </include>
-            </if>
-          ) dg
-            LEFT JOIN (
-                   SELECT count(id)  AS "deviceCount",group_id as groupId
-                   FROM device d
-                   WHERE VALID = 1
-                   GROUP BY group_id
-        ) d ON d.groupId = dg.id
-            LEFT JOIN (
-                 SELECT count(id)  AS "subscribeCount",group_id AS groupId
-                 FROM subscribe_store GROUP BY group_id
-           ) s ON s.groupId = dg.id
-         order by create_time desc
-    </select>
-
-    <select id="list" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
-        SELECT
-        dg.id,
-        group_no AS "groupNo",
-        deptid,
-        count( d.id ) AS "deviceCount",
-        count( s.id ) AS "subscribeCount",
-        descn,
-        create_time AS "createTime",
-        group_name AS "groupName"
-        FROM
-        (
-        SELECT *
-        FROM device_group
-        WHERE valid = 1
-        <if test="request.groupNo != null and request.groupNo != '' ">
-            AND group_no =#{request.groupNo}
-        </if>
-        <if test="request.groupName != '' and request.groupName != null">
-            AND group_name =#{request.groupName}
-        </if>
-        <if test="request.ids != null">
-            and id in
-            <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
-                #{id}
-            </foreach>
-        </if>
-        <if test="request.beginTime!='' and request.beginTime!=null">
-            AND create_time <![CDATA[  >=  ]]>
-            <include refid="char_toDate">
-                <property name="paramStr" value="#{request.beginTime}"/>
-            </include>
-        </if>
-        <if test="request.endTime!='' and request.endTime!=null">
-            AND create_time <![CDATA[  <=  ]]>
-            <include refid="char_toDate">
-                <property name="paramStr" value="#{request.endTime}"/>
-            </include>
-        </if>
-        ) dg
-        LEFT JOIN (
-            SELECT id, group_id AS "groupId"
-            FROM device d
-            WHERE VALID = 1
-        ) d ON d.groupId = dg.id
-        LEFT JOIN (
-            SELECT id, group_id AS "groupId"
-            FROM subscribe_store
-        ) s ON s.groupId = dg.id
-        GROUP BY dg.id
-        order by create_time desc
-    </select>
-
-    <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(group_no, 12)), 0)
-        from device_group
-    </select>
-
-</mapper>

diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml
new file mode 100644
index 0000000..bd2c2cc
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml
@@ -0,0 +1,22 @@
+<?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.casic.missiles.mapper.AlarmConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmConfig">
+        <id column="id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="name" property="name" />
+        <result column="alarm_content" property="alarmContent" />
+        <result column="period_high" property="periodHigh" />
+        <result column="period_low" property="periodLow" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, product_id, alarm_content, period_high, period_low, TypeName, CreatorId, creater_user_id, create_time
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml
new file mode 100644
index 0000000..4aee44a
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml
@@ -0,0 +1,23 @@
+<?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.casic.missiles.mapper.AlarmDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmData">
+        <id column="id" property="id" />
+        <result column="alarm_type" property="alarmType" />
+        <result column="alarm_content" property="alarmContent" />
+        <result column="devcode" property="devcode" />
+        <result column="alarm_time" property="alarmTime" />
+        <result column="alarm_value" property="alarmValue" />
+        <result column="status" property="status" />
+        <result column="create_name" property="createName" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, alarm_type, alarm_content, devcode, alarm_time, alarm_value, status, CreatorName, create_time
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml b/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml
new file mode 100644
index 0000000..b4965d6
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml
@@ -0,0 +1,70 @@
+<?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.casic.missiles.mapper.BusConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.BusConfig">
+        <id column="id" property="id"/>
+        <result column="devcode" property="devcode"/>
+        <result column="config_json" property="configJson"/>
+        <result column="status" property="status"/>
+        <result column="send_time" property="sendTime"/>
+        <result column="create_time" property="createTime"/>
+        <result column="create_user_id" property="createUserId"/>
+    </resultMap>
+
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, Pid, devcode, config_json, status, update_time, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.model.BusConfig">
+        select bc.id,bc.devcode,config_type AS "configType", config_json AS "configJson",bc.status,
+        send_time as "sendTime",bc.create_time AS "createTime",bc.create_user_id AS "createUserId",
+        bc.create_user_name AS "createUserName",dg.deptid
+        FROM (
+            SELECT *
+            FROM bus_config
+            WHERE 1=1
+            <if test="request.configType != null and request.configType != '' ">
+                AND config_type =#{request.configType}
+            </if>
+            <if test="request.devcode != '' and request.devcode != null">
+                AND devcode =#{request.devcode}
+            </if>
+            <if test="request.status != '' and request.status != null">
+                AND status =#{request.status}
+            </if>
+            <if test="request.beginTime!='' and request.beginTime!=null">
+                AND send_time <![CDATA[  >=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.beginTime}"/>
+                </include>
+            </if>
+            <if test="request.endTime!='' and request.endTime!=null">
+                AND send_time <![CDATA[  <=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.endTime}"/>
+                </include>
+            </if>
+        )bc
+        JOIN device d ON d.devcode=bc.devcode
+        JOIN device_group dg ON dg.id= d.group_id
+
+    </select>
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml
new file mode 100644
index 0000000..083b289
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml
@@ -0,0 +1,106 @@
+<?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.casic.missiles.mapper.DeviceDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceData">
+        <id column="id" property="id"/>
+        <result column="devcode" property="devcode"/>
+        <result column="device_type" property="deviceType"/>
+        <result column="cell" property="cell"/>
+        <result column="data_json" property="dataJson"/>
+        <result column="decrypt_before_data" property="decryptBeforeData"/>
+        <result column="decrypt_after_data" property="decryptAfterData"/>
+        <result column="uptime" property="uptime"/>
+        <result column="logtime" property="logtime"/>
+    </resultMap>
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, devcode, device_type, cell, data_json, decrypt_before_data, decrypt_after_data, uptime, logtime
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.data.DeviceDataListVO">
+          SELECT  	dd.id,
+                    dd.devcode,
+                    dd.device_type AS "deviceType",
+                    deptid,
+                    dd.cell,
+                    dd.data_json AS "dataJson",
+                    decrypt_before_data AS "decryptBeforeData",
+                    decrypt_after_data AS "decryptAfterData",
+                    uptime,
+                    logtime,
+                    d.STATUS,
+                    d.group_id AS "groupId",
+                    dg.group_name AS "groupName"
+        FROM (
+               SELECT *
+               FROM device_data
+               WHERE  1=1
+                <if test="request.devcode!='' and request.devcode != null">
+                    AND devcode like CONCAT('%',#{request.devcode},'%')
+                </if>
+                <if test="request.deviceType!='' and request.deviceType != null">
+                    AND device_type =#{request.deviceType}
+                </if>
+                <if test="request.beginTime!='' and request.beginTime!=null">
+                    AND logtime <![CDATA[  >=  ]]>
+                    <include refid="char_toDate">
+                        <property name="paramStr" value="#{request.beginTime}"/>
+                    </include>
+                </if>
+                <if test="request.endTime!='' and request.endTime!=null">
+                    AND logtime <![CDATA[  <=  ]]>
+                    <include refid="char_toDate">
+                        <property name="paramStr" value="#{request.endTime}"/>
+                    </include>
+                </if>
+                <if test="request.ids != null">
+                    and id in
+                    <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                        #{id}
+                    </foreach>
+                </if>
+
+          )dd
+          JOIN (
+                SELECT id, group_id,status,devcode
+                FROM device
+                WHERE valid=1
+                <if test="request.devcode!='' and request.devcode != null">
+                    AND devcode like CONCAT('%',#{request.devcode},'%')
+                </if>
+                <if test="request.deviceType!='' and request.deviceType != null">
+                    AND device_type =#{request.deviceType}
+                </if>
+                <if test="request.groupId!='' and request.groupId != null">
+                    AND greoup_id=#{request.groupId}
+                </if>
+          )d ON d.devcode=dd.devcode
+          JOIN (
+                SELECT   deptid,id,group_name
+                FROM device_group
+                WHERE valid=1
+                <if test="request.groupId!='' and request.groupId != null">
+                    AND id=#{request.groupId}
+                </if>
+          ) dg ON dg.id=d.group_id
+          order by logtime desc
+
+    </select>
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml
new file mode 100644
index 0000000..2e07287
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml
@@ -0,0 +1,148 @@
+<?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.casic.missiles.mapper.DeviceGroupMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceGroup">
+        <id column="id" property="id" />
+        <result column="group_name" property="groupName" />
+        <result column="group_no" property="groupNo" />
+        <result column="descn" property="descn" />
+        <result column="deptid" property="deptid" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="owner" property="owner" />
+        <result column="valid" property="valid" />
+    </resultMap>
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, owner, subcribe_ids, descn, dept, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
+        SELECT
+            dg.id,
+            group_no AS "groupNo",
+            deptid,
+             deviceCount,
+            subscribeCount,
+            descn,
+            create_time AS "createTime",
+            group_name AS "groupName",
+            create_user_id AS "createUserId",
+            create_user_name AS "createUserName"
+        FROM
+          (
+             SELECT *
+             FROM device_group
+             WHERE valid = 1
+            <if test="request.groupNo != null and request.groupNo != '' ">
+                AND group_no =#{request.groupNo}
+            </if>
+            <if test="request.groupName != '' and request.groupName != null">
+                AND group_name =#{request.groupName}
+            </if>
+            <if test="request.ids != null">
+                and id in
+                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+            <if test="request.beginTime!='' and request.beginTime!=null">
+                AND create_time <![CDATA[  >=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.beginTime}"/>
+                </include>
+            </if>
+            <if test="request.endTime!='' and request.endTime!=null">
+                AND create_time <![CDATA[  <=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.endTime}"/>
+                </include>
+            </if>
+          ) dg
+            LEFT JOIN (
+                   SELECT count(id)  AS "deviceCount",group_id as groupId
+                   FROM device d
+                   WHERE VALID = 1
+                   GROUP BY group_id
+        ) d ON d.groupId = dg.id
+            LEFT JOIN (
+                 SELECT count(id)  AS "subscribeCount",group_id AS groupId
+                 FROM subscribe_store GROUP BY group_id
+           ) s ON s.groupId = dg.id
+         order by create_time desc
+    </select>
+
+    <select id="list" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
+        SELECT
+        dg.id,
+        group_no AS "groupNo",
+        deptid,
+        count( d.id ) AS "deviceCount",
+        count( s.id ) AS "subscribeCount",
+        descn,
+        create_time AS "createTime",
+        group_name AS "groupName"
+        FROM
+        (
+        SELECT *
+        FROM device_group
+        WHERE valid = 1
+        <if test="request.groupNo != null and request.groupNo != '' ">
+            AND group_no =#{request.groupNo}
+        </if>
+        <if test="request.groupName != '' and request.groupName != null">
+            AND group_name =#{request.groupName}
+        </if>
+        <if test="request.ids != null">
+            and id in
+            <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+        <if test="request.beginTime!='' and request.beginTime!=null">
+            AND create_time <![CDATA[  >=  ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{request.beginTime}"/>
+            </include>
+        </if>
+        <if test="request.endTime!='' and request.endTime!=null">
+            AND create_time <![CDATA[  <=  ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{request.endTime}"/>
+            </include>
+        </if>
+        ) dg
+        LEFT JOIN (
+            SELECT id, group_id AS "groupId"
+            FROM device d
+            WHERE VALID = 1
+        ) d ON d.groupId = dg.id
+        LEFT JOIN (
+            SELECT id, group_id AS "groupId"
+            FROM subscribe_store
+        ) s ON s.groupId = dg.id
+        GROUP BY dg.id
+        order by create_time desc
+    </select>
+
+    <select id="selectMaxNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(group_no, 12)), 0)
+        from device_group
+    </select>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
new file mode 100644
index 0000000..2c99706
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
@@ -0,0 +1,88 @@
+<?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.casic.missiles.mapper.DeviceMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.Device">
+        <id column="id" property="id" />
+        <result column="group_id" property="groupId" />
+        <result column="product_id" property="productId" />
+        <result column="devcode" property="devcode" />
+        <result column="device_type" property="deviceType" />
+        <result column="unit" property="unit" />
+        <result column="model" property="model" />
+        <result column="name" property="name" />
+        <result column="status" property="status" />
+        <result column="imei" property="imei" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="valid" property="valid" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, devcode, device_type, unit, name, product_id, status, imei, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.device.DeviceListVO">
+        SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime,
+        data_value AS "dataValue",model,imei,d.cell,name AS "deviceName",status,d.id,create_user_id AS "createUserId",
+        create_user_name AS "createUserName"
+        FROM (
+            SELECT *
+            FROM device
+            WHERE VALID=1
+            <if test="request.groupId!='' and request.groupId != null">
+                AND group_id =#{request.groupId}
+            </if>
+            <if test="request.devcode!='' and request.devcode != null">
+                AND devcode like CONCAT('%',#{request.devcode},'%')
+            </if>
+            <if test="request.imei!='' and request.imei != null">
+                AND imei like CONCAT('%',#{request.imei},'%')
+            </if>
+            <if test="request.deviceType!='' and request.deviceType != null">
+                AND device_type =#{request.deviceType}
+            </if>
+            <if test="request.status!='' and request.status != null">
+                AND status =#{request.status}
+            </if>
+            <if test="request.productId!='' and request.productId != null">
+                AND product_id =#{request.productId}
+            </if>
+            <if test="request.beginCell!='' and request.beginCell!=null">
+                AND cell <![CDATA[  >=  ]]> #{request.beginCell}
+
+            </if>
+            <if test="request.endCell!='' and request.endCell!=null">
+                AND cell <![CDATA[  <=  ]]> #{request.endCell}
+            </if>
+            <if test="request.ids != null">
+                and id in
+                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+            order by create_time desc
+        )d JOIN (
+            SELECT deptid,id
+            FROM device_group
+            WHERE VALID =1
+            <if test="request.groupId!='' and request.groupId != null">
+                AND id =#{request.groupId}
+            </if>
+        )dg ON dg.id=d.group_id
+        LEFT JOIN(
+            SELECT ddd.logtime AS logtime,data_value,ddd.devcode,cell
+            FROM device_data ddd
+            JOIN
+            (
+                SELECT Max(logtime) AS logtime,devcode
+                FROM  device_data
+                GROUP BY devcode
+            )dd  ON dd.logtime=ddd.logtime AND dd.devcode=ddd.devcode
+        )dd ON dd.devcode=d.devcode
+        order by create_time desc
+    </select>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml
new file mode 100644
index 0000000..a5bf5e7
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml
@@ -0,0 +1,20 @@
+<?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.casic.missiles.mapper.DeviceUpgradeTaskMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceUpgradeTask">
+        <id column="id" property="id" />
+        <result column="version_id" property="versionId" />
+        <result column="device_id" property="deviceId" />
+        <result column="status" property="status" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, version_id, device_id, status, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml
new file mode 100644
index 0000000..e39ec1f
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml
@@ -0,0 +1,23 @@
+<?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.casic.missiles.mapper.DeviceVersionMapper">
+
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceVersion">
+        <id column="Id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="version_file" property="versionFile" />
+        <result column="version" property="version" />
+        <result column="owner" property="owner" />
+        <result column="dscn" property="dscn" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        Id, product_id, version_file, version, owner, dscn, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductConfigItemMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductConfigItemMapper.xml
new file mode 100644
index 0000000..e2448be
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/ProductConfigItemMapper.xml
@@ -0,0 +1,22 @@
+<?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.casic.missiles.mapper.ProductConfigItemMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductConfigItem">
+        <id column="id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="param_name" property="paramName" />
+        <result column="param_code" property="paramCode" />
+        <result column="param_type" property="paramType" />
+        <result column="regular_expression" property="regularExpression" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, product_id, param_name, param_code, param_type, regular_expression, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductDataItemMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductDataItemMapper.xml
new file mode 100644
index 0000000..61a55ec
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/ProductDataItemMapper.xml
@@ -0,0 +1,21 @@
+<?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.casic.missiles.mapper.ProductDataItemMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductDataItem">
+        <id column="id" property="id" />
+        <result column="data_item_name" property="dataItemName" />
+        <result column="product_id" property="productId" />
+        <result column="data_item_type" property="dataItemType" />
+        <result column="data_item_field" property="dataItemField" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, data_item_name, product_id, data_item_type, data_item_field, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
new file mode 100644
index 0000000..26f3cb3
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
@@ -0,0 +1,30 @@
+<?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.casic.missiles.mapper.ProductInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductInfo">
+        <id column="Id" property="id" />
+        <result column="name" property="name" />
+        <result column="access_type" property="accessType" />
+        <result column="encipher_type" property="encipherType" />
+        <result column="descn" property="descn" />
+        <result column="product_type" property="productType" />
+        <result column="owners" property="owners" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_name" property="createUserName" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        Id, name, access_type, encipher_type, protocol_type, model, descn, product_type, owners, CreatorName, create_time, create_user_id
+    </sql>
+
+    <select id="selectMaxNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(product_no, 12)), 0)
+        from product_info
+    </select>
+
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/SubscribeStoreMapper.xml b/casic-iot-dao/src/main/resources/mapper/SubscribeStoreMapper.xml
new file mode 100644
index 0000000..415a670
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/SubscribeStoreMapper.xml
@@ -0,0 +1,61 @@
+<?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.casic.missiles.mapper.SubscribeStoreMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.SubscribeStore">
+        <id column="id" property="id"/>
+        <result column="subscribe_no" property="subscribeNo"/>
+        <result column="group_id" property="groupId"/>
+        <result column="message_type" property="messageType"/>
+        <result column="subscribe_type" property="subscribeType"/>
+        <result column="enable" property="enable"/>
+        <result column="subscribe_status" property="subscribeStatus"/>
+        <result column="subscribe_content_json" property="subscribeContentJson"/>
+        <result column="descn" property="descn"/>
+        <result column="create_time" property="createTime"/>
+        <result column="create_user_name" property="createUserName"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, message_type, subscribe_type, enable, subscribe_status, subscribe_content_json, descn, create_time, create_user_name
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.subscribe.SubscribeListVO">
+        SELECT message_type AS "messageType",create_time AS "createTime",subscribe_no AS
+            "subscribeNo",subscribe_content_json AS "subscribeContentJson",
+            subscribe_status AS "subscribeStatus",create_user_name AS "createUserName",
+           create_user_id AS "createUserId"
+        FROM (
+        SELECT *
+        FROM subscribe_store
+        WHERE 1=1
+        <if test="request.groupId!='' and request.groupId != null">
+            AND group_id =#{request.groupId}
+        </if>
+        <if test="request.messageType!='' and request.messageType != null">
+            AND message_type =#{request.messageType}
+        </if>
+        <if test="request.subscribeNo!='' and request.subscribeNo != null">
+            AND subscribe_no like CONCAT('%',#{request.subscribeNo},'%')
+        </if>
+        <if test="request.subscribeType!='' and request.subscribeType != null">
+            AND subscribe_type =#{request.subscribeType}
+        </if>
+        <if test="request.status!='' and request.status != null">
+            AND subscribe_status =#{request.status}
+        </if>
+        order by create_time desc
+        )d JOIN (
+        SELECT deptid,id
+        FROM device_group
+        WHERE VALID=1
+        <if test="request.groupId!='' and request.groupId != null">
+            AND id =#{request.groupId}
+        </if>
+        )dg ON dg.id=d.group_id
+        order by create_time desc
+    </select>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/common/SysCommonMapper.xml b/casic-iot-dao/src/main/resources/mapper/common/SysCommonMapper.xml
new file mode 100644
index 0000000..880f7d4
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/common/SysCommonMapper.xml
@@ -0,0 +1,21 @@
+<?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.casic.missiles.mapper.common.SysCommonMapper">
+
+    <select id="getDictMapByCode" resultType="java.util.Map">
+        SELECT  name,code
+        from sys_dict
+         where  pid=(
+            SELECT id
+            from  sys_dict
+            where  code=#{code}
+         )
+    </select>
+
+    <select id="getDeptMap" resultType="java.util.Map">
+        SELECT  id,SIMPLE_NAME AS  "simpleName"
+        from sys_dept
+    </select>
+
+
+</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/AlarmConfigMapper.xml b/casic-iot-dao/src/resource/mapper/AlarmConfigMapper.xml
deleted file mode 100644
index bd2c2cc..0000000
--- a/casic-iot-dao/src/resource/mapper/AlarmConfigMapper.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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.casic.missiles.mapper.AlarmConfigMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmConfig">
-        <id column="id" property="id" />
-        <result column="product_id" property="productId" />
-        <result column="name" property="name" />
-        <result column="alarm_content" property="alarmContent" />
-        <result column="period_high" property="periodHigh" />
-        <result column="period_low" property="periodLow" />
-        <result column="create_user_id" property="createUserId" />
-        <result column="create_time" property="createTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, name, product_id, alarm_content, period_high, period_low, TypeName, CreatorId, creater_user_id, create_time
-    </sql>
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/AlarmDataMapper.xml b/casic-iot-dao/src/resource/mapper/AlarmDataMapper.xml
deleted file mode 100644
index 4aee44a..0000000
--- a/casic-iot-dao/src/resource/mapper/AlarmDataMapper.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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.casic.missiles.mapper.AlarmDataMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmData">
-        <id column="id" property="id" />
-        <result column="alarm_type" property="alarmType" />
-        <result column="alarm_content" property="alarmContent" />
-        <result column="devcode" property="devcode" />
-        <result column="alarm_time" property="alarmTime" />
-        <result column="alarm_value" property="alarmValue" />
-        <result column="status" property="status" />
-        <result column="create_name" property="createName" />
-        <result column="create_time" property="createTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, alarm_type, alarm_content, devcode, alarm_time, alarm_value, status, CreatorName, create_time
-    </sql>
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/BusConfigMapper.xml b/casic-iot-dao/src/resource/mapper/BusConfigMapper.xml
deleted file mode 100644
index b4965d6..0000000
--- a/casic-iot-dao/src/resource/mapper/BusConfigMapper.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?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.casic.missiles.mapper.BusConfigMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.BusConfig">
-        <id column="id" property="id"/>
-        <result column="devcode" property="devcode"/>
-        <result column="config_json" property="configJson"/>
-        <result column="status" property="status"/>
-        <result column="send_time" property="sendTime"/>
-        <result column="create_time" property="createTime"/>
-        <result column="create_user_id" property="createUserId"/>
-    </resultMap>
-
-
-    <sql id="char_toDate" databaseId="mysql">
-        ${paramStr}
-    </sql>
-
-    <sql id="char_toDate" databaseId="pgsql">
-       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
-    </sql>
-
-    <sql id="char_toDate" databaseId="oracle">
-        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
-    </sql>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, Pid, devcode, config_json, status, update_time, create_time, create_user_id
-    </sql>
-
-    <select id="listPage" resultType="com.casic.missiles.model.BusConfig">
-        select bc.id,bc.devcode,config_type AS "configType", config_json AS "configJson",bc.status,
-        send_time as "sendTime",bc.create_time AS "createTime",bc.create_user_id AS "createUserId",
-        bc.create_user_name AS "createUserName",dg.deptid
-        FROM (
-            SELECT *
-            FROM bus_config
-            WHERE 1=1
-            <if test="request.configType != null and request.configType != '' ">
-                AND config_type =#{request.configType}
-            </if>
-            <if test="request.devcode != '' and request.devcode != null">
-                AND devcode =#{request.devcode}
-            </if>
-            <if test="request.status != '' and request.status != null">
-                AND status =#{request.status}
-            </if>
-            <if test="request.beginTime!='' and request.beginTime!=null">
-                AND send_time <![CDATA[  >=  ]]>
-                <include refid="char_toDate">
-                    <property name="paramStr" value="#{request.beginTime}"/>
-                </include>
-            </if>
-            <if test="request.endTime!='' and request.endTime!=null">
-                AND send_time <![CDATA[  <=  ]]>
-                <include refid="char_toDate">
-                    <property name="paramStr" value="#{request.endTime}"/>
-                </include>
-            </if>
-        )bc
-        JOIN device d ON d.devcode=bc.devcode
-        JOIN device_group dg ON dg.id= d.group_id
-
-    </select>
-
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml
deleted file mode 100644
index 083b289..0000000
--- a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?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.casic.missiles.mapper.DeviceDataMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceData">
-        <id column="id" property="id"/>
-        <result column="devcode" property="devcode"/>
-        <result column="device_type" property="deviceType"/>
-        <result column="cell" property="cell"/>
-        <result column="data_json" property="dataJson"/>
-        <result column="decrypt_before_data" property="decryptBeforeData"/>
-        <result column="decrypt_after_data" property="decryptAfterData"/>
-        <result column="uptime" property="uptime"/>
-        <result column="logtime" property="logtime"/>
-    </resultMap>
-
-    <sql id="char_toDate" databaseId="mysql">
-        ${paramStr}
-    </sql>
-
-    <sql id="char_toDate" databaseId="pgsql">
-       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
-    </sql>
-
-    <sql id="char_toDate" databaseId="oracle">
-        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
-    </sql>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, devcode, device_type, cell, data_json, decrypt_before_data, decrypt_after_data, uptime, logtime
-    </sql>
-
-    <select id="listPage" resultType="com.casic.missiles.dto.data.DeviceDataListVO">
-          SELECT  	dd.id,
-                    dd.devcode,
-                    dd.device_type AS "deviceType",
-                    deptid,
-                    dd.cell,
-                    dd.data_json AS "dataJson",
-                    decrypt_before_data AS "decryptBeforeData",
-                    decrypt_after_data AS "decryptAfterData",
-                    uptime,
-                    logtime,
-                    d.STATUS,
-                    d.group_id AS "groupId",
-                    dg.group_name AS "groupName"
-        FROM (
-               SELECT *
-               FROM device_data
-               WHERE  1=1
-                <if test="request.devcode!='' and request.devcode != null">
-                    AND devcode like CONCAT('%',#{request.devcode},'%')
-                </if>
-                <if test="request.deviceType!='' and request.deviceType != null">
-                    AND device_type =#{request.deviceType}
-                </if>
-                <if test="request.beginTime!='' and request.beginTime!=null">
-                    AND logtime <![CDATA[  >=  ]]>
-                    <include refid="char_toDate">
-                        <property name="paramStr" value="#{request.beginTime}"/>
-                    </include>
-                </if>
-                <if test="request.endTime!='' and request.endTime!=null">
-                    AND logtime <![CDATA[  <=  ]]>
-                    <include refid="char_toDate">
-                        <property name="paramStr" value="#{request.endTime}"/>
-                    </include>
-                </if>
-                <if test="request.ids != null">
-                    and id in
-                    <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
-                        #{id}
-                    </foreach>
-                </if>
-
-          )dd
-          JOIN (
-                SELECT id, group_id,status,devcode
-                FROM device
-                WHERE valid=1
-                <if test="request.devcode!='' and request.devcode != null">
-                    AND devcode like CONCAT('%',#{request.devcode},'%')
-                </if>
-                <if test="request.deviceType!='' and request.deviceType != null">
-                    AND device_type =#{request.deviceType}
-                </if>
-                <if test="request.groupId!='' and request.groupId != null">
-                    AND greoup_id=#{request.groupId}
-                </if>
-          )d ON d.devcode=dd.devcode
-          JOIN (
-                SELECT   deptid,id,group_name
-                FROM device_group
-                WHERE valid=1
-                <if test="request.groupId!='' and request.groupId != null">
-                    AND id=#{request.groupId}
-                </if>
-          ) dg ON dg.id=d.group_id
-          order by logtime desc
-
-    </select>
-
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml
deleted file mode 100644
index 2e07287..0000000
--- a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?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.casic.missiles.mapper.DeviceGroupMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceGroup">
-        <id column="id" property="id" />
-        <result column="group_name" property="groupName" />
-        <result column="group_no" property="groupNo" />
-        <result column="descn" property="descn" />
-        <result column="deptid" property="deptid" />
-        <result column="create_time" property="createTime" />
-        <result column="create_user_id" property="createUserId" />
-        <result column="owner" property="owner" />
-        <result column="valid" property="valid" />
-    </resultMap>
-
-    <sql id="char_toDate" databaseId="mysql">
-        ${paramStr}
-    </sql>
-
-    <sql id="char_toDate" databaseId="pgsql">
-       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
-    </sql>
-
-    <sql id="char_toDate" databaseId="oracle">
-        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
-    </sql>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, name, owner, subcribe_ids, descn, dept, create_time, create_user_id
-    </sql>
-
-    <select id="listPage" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
-        SELECT
-            dg.id,
-            group_no AS "groupNo",
-            deptid,
-             deviceCount,
-            subscribeCount,
-            descn,
-            create_time AS "createTime",
-            group_name AS "groupName",
-            create_user_id AS "createUserId",
-            create_user_name AS "createUserName"
-        FROM
-          (
-             SELECT *
-             FROM device_group
-             WHERE valid = 1
-            <if test="request.groupNo != null and request.groupNo != '' ">
-                AND group_no =#{request.groupNo}
-            </if>
-            <if test="request.groupName != '' and request.groupName != null">
-                AND group_name =#{request.groupName}
-            </if>
-            <if test="request.ids != null">
-                and id in
-                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
-                    #{id}
-                </foreach>
-            </if>
-            <if test="request.beginTime!='' and request.beginTime!=null">
-                AND create_time <![CDATA[  >=  ]]>
-                <include refid="char_toDate">
-                    <property name="paramStr" value="#{request.beginTime}"/>
-                </include>
-            </if>
-            <if test="request.endTime!='' and request.endTime!=null">
-                AND create_time <![CDATA[  <=  ]]>
-                <include refid="char_toDate">
-                    <property name="paramStr" value="#{request.endTime}"/>
-                </include>
-            </if>
-          ) dg
-            LEFT JOIN (
-                   SELECT count(id)  AS "deviceCount",group_id as groupId
-                   FROM device d
-                   WHERE VALID = 1
-                   GROUP BY group_id
-        ) d ON d.groupId = dg.id
-            LEFT JOIN (
-                 SELECT count(id)  AS "subscribeCount",group_id AS groupId
-                 FROM subscribe_store GROUP BY group_id
-           ) s ON s.groupId = dg.id
-         order by create_time desc
-    </select>
-
-    <select id="list" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
-        SELECT
-        dg.id,
-        group_no AS "groupNo",
-        deptid,
-        count( d.id ) AS "deviceCount",
-        count( s.id ) AS "subscribeCount",
-        descn,
-        create_time AS "createTime",
-        group_name AS "groupName"
-        FROM
-        (
-        SELECT *
-        FROM device_group
-        WHERE valid = 1
-        <if test="request.groupNo != null and request.groupNo != '' ">
-            AND group_no =#{request.groupNo}
-        </if>
-        <if test="request.groupName != '' and request.groupName != null">
-            AND group_name =#{request.groupName}
-        </if>
-        <if test="request.ids != null">
-            and id in
-            <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
-                #{id}
-            </foreach>
-        </if>
-        <if test="request.beginTime!='' and request.beginTime!=null">
-            AND create_time <![CDATA[  >=  ]]>
-            <include refid="char_toDate">
-                <property name="paramStr" value="#{request.beginTime}"/>
-            </include>
-        </if>
-        <if test="request.endTime!='' and request.endTime!=null">
-            AND create_time <![CDATA[  <=  ]]>
-            <include refid="char_toDate">
-                <property name="paramStr" value="#{request.endTime}"/>
-            </include>
-        </if>
-        ) dg
-        LEFT JOIN (
-            SELECT id, group_id AS "groupId"
-            FROM device d
-            WHERE VALID = 1
-        ) d ON d.groupId = dg.id
-        LEFT JOIN (
-            SELECT id, group_id AS "groupId"
-            FROM subscribe_store
-        ) s ON s.groupId = dg.id
-        GROUP BY dg.id
-        order by create_time desc
-    </select>
-
-    <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(group_no, 12)), 0)
-        from device_group
-    </select>
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/DeviceMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceMapper.xml
deleted file mode 100644
index 2c99706..0000000
--- a/casic-iot-dao/src/resource/mapper/DeviceMapper.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?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.casic.missiles.mapper.DeviceMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.Device">
-        <id column="id" property="id" />
-        <result column="group_id" property="groupId" />
-        <result column="product_id" property="productId" />
-        <result column="devcode" property="devcode" />
-        <result column="device_type" property="deviceType" />
-        <result column="unit" property="unit" />
-        <result column="model" property="model" />
-        <result column="name" property="name" />
-        <result column="status" property="status" />
-        <result column="imei" property="imei" />
-        <result column="create_time" property="createTime" />
-        <result column="create_user_name" property="createUserName" />
-        <result column="valid" property="valid" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, devcode, device_type, unit, name, product_id, status, imei, create_time, create_user_id
-    </sql>
-
-    <select id="listPage" resultType="com.casic.missiles.dto.device.DeviceListVO">
-        SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime,
-        data_value AS "dataValue",model,imei,d.cell,name AS "deviceName",status,d.id,create_user_id AS "createUserId",
-        create_user_name AS "createUserName"
-        FROM (
-            SELECT *
-            FROM device
-            WHERE VALID=1
-            <if test="request.groupId!='' and request.groupId != null">
-                AND group_id =#{request.groupId}
-            </if>
-            <if test="request.devcode!='' and request.devcode != null">
-                AND devcode like CONCAT('%',#{request.devcode},'%')
-            </if>
-            <if test="request.imei!='' and request.imei != null">
-                AND imei like CONCAT('%',#{request.imei},'%')
-            </if>
-            <if test="request.deviceType!='' and request.deviceType != null">
-                AND device_type =#{request.deviceType}
-            </if>
-            <if test="request.status!='' and request.status != null">
-                AND status =#{request.status}
-            </if>
-            <if test="request.productId!='' and request.productId != null">
-                AND product_id =#{request.productId}
-            </if>
-            <if test="request.beginCell!='' and request.beginCell!=null">
-                AND cell <![CDATA[  >=  ]]> #{request.beginCell}
-
-            </if>
-            <if test="request.endCell!='' and request.endCell!=null">
-                AND cell <![CDATA[  <=  ]]> #{request.endCell}
-            </if>
-            <if test="request.ids != null">
-                and id in
-                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
-                    #{id}
-                </foreach>
-            </if>
-            order by create_time desc
-        )d JOIN (
-            SELECT deptid,id
-            FROM device_group
-            WHERE VALID =1
-            <if test="request.groupId!='' and request.groupId != null">
-                AND id =#{request.groupId}
-            </if>
-        )dg ON dg.id=d.group_id
-        LEFT JOIN(
-            SELECT ddd.logtime AS logtime,data_value,ddd.devcode,cell
-            FROM device_data ddd
-            JOIN
-            (
-                SELECT Max(logtime) AS logtime,devcode
-                FROM  device_data
-                GROUP BY devcode
-            )dd  ON dd.logtime=ddd.logtime AND dd.devcode=ddd.devcode
-        )dd ON dd.devcode=d.devcode
-        order by create_time desc
-    </select>
-
-</mapper>

diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml
new file mode 100644
index 0000000..bd2c2cc
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml
@@ -0,0 +1,22 @@
+<?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.casic.missiles.mapper.AlarmConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmConfig">
+        <id column="id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="name" property="name" />
+        <result column="alarm_content" property="alarmContent" />
+        <result column="period_high" property="periodHigh" />
+        <result column="period_low" property="periodLow" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, product_id, alarm_content, period_high, period_low, TypeName, CreatorId, creater_user_id, create_time
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml
new file mode 100644
index 0000000..4aee44a
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml
@@ -0,0 +1,23 @@
+<?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.casic.missiles.mapper.AlarmDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmData">
+        <id column="id" property="id" />
+        <result column="alarm_type" property="alarmType" />
+        <result column="alarm_content" property="alarmContent" />
+        <result column="devcode" property="devcode" />
+        <result column="alarm_time" property="alarmTime" />
+        <result column="alarm_value" property="alarmValue" />
+        <result column="status" property="status" />
+        <result column="create_name" property="createName" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, alarm_type, alarm_content, devcode, alarm_time, alarm_value, status, CreatorName, create_time
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml b/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml
new file mode 100644
index 0000000..b4965d6
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml
@@ -0,0 +1,70 @@
+<?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.casic.missiles.mapper.BusConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.BusConfig">
+        <id column="id" property="id"/>
+        <result column="devcode" property="devcode"/>
+        <result column="config_json" property="configJson"/>
+        <result column="status" property="status"/>
+        <result column="send_time" property="sendTime"/>
+        <result column="create_time" property="createTime"/>
+        <result column="create_user_id" property="createUserId"/>
+    </resultMap>
+
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, Pid, devcode, config_json, status, update_time, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.model.BusConfig">
+        select bc.id,bc.devcode,config_type AS "configType", config_json AS "configJson",bc.status,
+        send_time as "sendTime",bc.create_time AS "createTime",bc.create_user_id AS "createUserId",
+        bc.create_user_name AS "createUserName",dg.deptid
+        FROM (
+            SELECT *
+            FROM bus_config
+            WHERE 1=1
+            <if test="request.configType != null and request.configType != '' ">
+                AND config_type =#{request.configType}
+            </if>
+            <if test="request.devcode != '' and request.devcode != null">
+                AND devcode =#{request.devcode}
+            </if>
+            <if test="request.status != '' and request.status != null">
+                AND status =#{request.status}
+            </if>
+            <if test="request.beginTime!='' and request.beginTime!=null">
+                AND send_time <![CDATA[  >=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.beginTime}"/>
+                </include>
+            </if>
+            <if test="request.endTime!='' and request.endTime!=null">
+                AND send_time <![CDATA[  <=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.endTime}"/>
+                </include>
+            </if>
+        )bc
+        JOIN device d ON d.devcode=bc.devcode
+        JOIN device_group dg ON dg.id= d.group_id
+
+    </select>
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml
new file mode 100644
index 0000000..083b289
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml
@@ -0,0 +1,106 @@
+<?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.casic.missiles.mapper.DeviceDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceData">
+        <id column="id" property="id"/>
+        <result column="devcode" property="devcode"/>
+        <result column="device_type" property="deviceType"/>
+        <result column="cell" property="cell"/>
+        <result column="data_json" property="dataJson"/>
+        <result column="decrypt_before_data" property="decryptBeforeData"/>
+        <result column="decrypt_after_data" property="decryptAfterData"/>
+        <result column="uptime" property="uptime"/>
+        <result column="logtime" property="logtime"/>
+    </resultMap>
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, devcode, device_type, cell, data_json, decrypt_before_data, decrypt_after_data, uptime, logtime
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.data.DeviceDataListVO">
+          SELECT  	dd.id,
+                    dd.devcode,
+                    dd.device_type AS "deviceType",
+                    deptid,
+                    dd.cell,
+                    dd.data_json AS "dataJson",
+                    decrypt_before_data AS "decryptBeforeData",
+                    decrypt_after_data AS "decryptAfterData",
+                    uptime,
+                    logtime,
+                    d.STATUS,
+                    d.group_id AS "groupId",
+                    dg.group_name AS "groupName"
+        FROM (
+               SELECT *
+               FROM device_data
+               WHERE  1=1
+                <if test="request.devcode!='' and request.devcode != null">
+                    AND devcode like CONCAT('%',#{request.devcode},'%')
+                </if>
+                <if test="request.deviceType!='' and request.deviceType != null">
+                    AND device_type =#{request.deviceType}
+                </if>
+                <if test="request.beginTime!='' and request.beginTime!=null">
+                    AND logtime <![CDATA[  >=  ]]>
+                    <include refid="char_toDate">
+                        <property name="paramStr" value="#{request.beginTime}"/>
+                    </include>
+                </if>
+                <if test="request.endTime!='' and request.endTime!=null">
+                    AND logtime <![CDATA[  <=  ]]>
+                    <include refid="char_toDate">
+                        <property name="paramStr" value="#{request.endTime}"/>
+                    </include>
+                </if>
+                <if test="request.ids != null">
+                    and id in
+                    <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                        #{id}
+                    </foreach>
+                </if>
+
+          )dd
+          JOIN (
+                SELECT id, group_id,status,devcode
+                FROM device
+                WHERE valid=1
+                <if test="request.devcode!='' and request.devcode != null">
+                    AND devcode like CONCAT('%',#{request.devcode},'%')
+                </if>
+                <if test="request.deviceType!='' and request.deviceType != null">
+                    AND device_type =#{request.deviceType}
+                </if>
+                <if test="request.groupId!='' and request.groupId != null">
+                    AND greoup_id=#{request.groupId}
+                </if>
+          )d ON d.devcode=dd.devcode
+          JOIN (
+                SELECT   deptid,id,group_name
+                FROM device_group
+                WHERE valid=1
+                <if test="request.groupId!='' and request.groupId != null">
+                    AND id=#{request.groupId}
+                </if>
+          ) dg ON dg.id=d.group_id
+          order by logtime desc
+
+    </select>
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml
new file mode 100644
index 0000000..2e07287
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml
@@ -0,0 +1,148 @@
+<?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.casic.missiles.mapper.DeviceGroupMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceGroup">
+        <id column="id" property="id" />
+        <result column="group_name" property="groupName" />
+        <result column="group_no" property="groupNo" />
+        <result column="descn" property="descn" />
+        <result column="deptid" property="deptid" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="owner" property="owner" />
+        <result column="valid" property="valid" />
+    </resultMap>
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, owner, subcribe_ids, descn, dept, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
+        SELECT
+            dg.id,
+            group_no AS "groupNo",
+            deptid,
+             deviceCount,
+            subscribeCount,
+            descn,
+            create_time AS "createTime",
+            group_name AS "groupName",
+            create_user_id AS "createUserId",
+            create_user_name AS "createUserName"
+        FROM
+          (
+             SELECT *
+             FROM device_group
+             WHERE valid = 1
+            <if test="request.groupNo != null and request.groupNo != '' ">
+                AND group_no =#{request.groupNo}
+            </if>
+            <if test="request.groupName != '' and request.groupName != null">
+                AND group_name =#{request.groupName}
+            </if>
+            <if test="request.ids != null">
+                and id in
+                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+            <if test="request.beginTime!='' and request.beginTime!=null">
+                AND create_time <![CDATA[  >=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.beginTime}"/>
+                </include>
+            </if>
+            <if test="request.endTime!='' and request.endTime!=null">
+                AND create_time <![CDATA[  <=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.endTime}"/>
+                </include>
+            </if>
+          ) dg
+            LEFT JOIN (
+                   SELECT count(id)  AS "deviceCount",group_id as groupId
+                   FROM device d
+                   WHERE VALID = 1
+                   GROUP BY group_id
+        ) d ON d.groupId = dg.id
+            LEFT JOIN (
+                 SELECT count(id)  AS "subscribeCount",group_id AS groupId
+                 FROM subscribe_store GROUP BY group_id
+           ) s ON s.groupId = dg.id
+         order by create_time desc
+    </select>
+
+    <select id="list" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
+        SELECT
+        dg.id,
+        group_no AS "groupNo",
+        deptid,
+        count( d.id ) AS "deviceCount",
+        count( s.id ) AS "subscribeCount",
+        descn,
+        create_time AS "createTime",
+        group_name AS "groupName"
+        FROM
+        (
+        SELECT *
+        FROM device_group
+        WHERE valid = 1
+        <if test="request.groupNo != null and request.groupNo != '' ">
+            AND group_no =#{request.groupNo}
+        </if>
+        <if test="request.groupName != '' and request.groupName != null">
+            AND group_name =#{request.groupName}
+        </if>
+        <if test="request.ids != null">
+            and id in
+            <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+        <if test="request.beginTime!='' and request.beginTime!=null">
+            AND create_time <![CDATA[  >=  ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{request.beginTime}"/>
+            </include>
+        </if>
+        <if test="request.endTime!='' and request.endTime!=null">
+            AND create_time <![CDATA[  <=  ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{request.endTime}"/>
+            </include>
+        </if>
+        ) dg
+        LEFT JOIN (
+            SELECT id, group_id AS "groupId"
+            FROM device d
+            WHERE VALID = 1
+        ) d ON d.groupId = dg.id
+        LEFT JOIN (
+            SELECT id, group_id AS "groupId"
+            FROM subscribe_store
+        ) s ON s.groupId = dg.id
+        GROUP BY dg.id
+        order by create_time desc
+    </select>
+
+    <select id="selectMaxNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(group_no, 12)), 0)
+        from device_group
+    </select>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
new file mode 100644
index 0000000..2c99706
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
@@ -0,0 +1,88 @@
+<?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.casic.missiles.mapper.DeviceMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.Device">
+        <id column="id" property="id" />
+        <result column="group_id" property="groupId" />
+        <result column="product_id" property="productId" />
+        <result column="devcode" property="devcode" />
+        <result column="device_type" property="deviceType" />
+        <result column="unit" property="unit" />
+        <result column="model" property="model" />
+        <result column="name" property="name" />
+        <result column="status" property="status" />
+        <result column="imei" property="imei" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="valid" property="valid" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, devcode, device_type, unit, name, product_id, status, imei, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.device.DeviceListVO">
+        SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime,
+        data_value AS "dataValue",model,imei,d.cell,name AS "deviceName",status,d.id,create_user_id AS "createUserId",
+        create_user_name AS "createUserName"
+        FROM (
+            SELECT *
+            FROM device
+            WHERE VALID=1
+            <if test="request.groupId!='' and request.groupId != null">
+                AND group_id =#{request.groupId}
+            </if>
+            <if test="request.devcode!='' and request.devcode != null">
+                AND devcode like CONCAT('%',#{request.devcode},'%')
+            </if>
+            <if test="request.imei!='' and request.imei != null">
+                AND imei like CONCAT('%',#{request.imei},'%')
+            </if>
+            <if test="request.deviceType!='' and request.deviceType != null">
+                AND device_type =#{request.deviceType}
+            </if>
+            <if test="request.status!='' and request.status != null">
+                AND status =#{request.status}
+            </if>
+            <if test="request.productId!='' and request.productId != null">
+                AND product_id =#{request.productId}
+            </if>
+            <if test="request.beginCell!='' and request.beginCell!=null">
+                AND cell <![CDATA[  >=  ]]> #{request.beginCell}
+
+            </if>
+            <if test="request.endCell!='' and request.endCell!=null">
+                AND cell <![CDATA[  <=  ]]> #{request.endCell}
+            </if>
+            <if test="request.ids != null">
+                and id in
+                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+            order by create_time desc
+        )d JOIN (
+            SELECT deptid,id
+            FROM device_group
+            WHERE VALID =1
+            <if test="request.groupId!='' and request.groupId != null">
+                AND id =#{request.groupId}
+            </if>
+        )dg ON dg.id=d.group_id
+        LEFT JOIN(
+            SELECT ddd.logtime AS logtime,data_value,ddd.devcode,cell
+            FROM device_data ddd
+            JOIN
+            (
+                SELECT Max(logtime) AS logtime,devcode
+                FROM  device_data
+                GROUP BY devcode
+            )dd  ON dd.logtime=ddd.logtime AND dd.devcode=ddd.devcode
+        )dd ON dd.devcode=d.devcode
+        order by create_time desc
+    </select>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml
new file mode 100644
index 0000000..a5bf5e7
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml
@@ -0,0 +1,20 @@
+<?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.casic.missiles.mapper.DeviceUpgradeTaskMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceUpgradeTask">
+        <id column="id" property="id" />
+        <result column="version_id" property="versionId" />
+        <result column="device_id" property="deviceId" />
+        <result column="status" property="status" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, version_id, device_id, status, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml
new file mode 100644
index 0000000..e39ec1f
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml
@@ -0,0 +1,23 @@
+<?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.casic.missiles.mapper.DeviceVersionMapper">
+
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceVersion">
+        <id column="Id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="version_file" property="versionFile" />
+        <result column="version" property="version" />
+        <result column="owner" property="owner" />
+        <result column="dscn" property="dscn" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        Id, product_id, version_file, version, owner, dscn, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductConfigItemMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductConfigItemMapper.xml
new file mode 100644
index 0000000..e2448be
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/ProductConfigItemMapper.xml
@@ -0,0 +1,22 @@
+<?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.casic.missiles.mapper.ProductConfigItemMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductConfigItem">
+        <id column="id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="param_name" property="paramName" />
+        <result column="param_code" property="paramCode" />
+        <result column="param_type" property="paramType" />
+        <result column="regular_expression" property="regularExpression" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, product_id, param_name, param_code, param_type, regular_expression, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductDataItemMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductDataItemMapper.xml
new file mode 100644
index 0000000..61a55ec
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/ProductDataItemMapper.xml
@@ -0,0 +1,21 @@
+<?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.casic.missiles.mapper.ProductDataItemMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductDataItem">
+        <id column="id" property="id" />
+        <result column="data_item_name" property="dataItemName" />
+        <result column="product_id" property="productId" />
+        <result column="data_item_type" property="dataItemType" />
+        <result column="data_item_field" property="dataItemField" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, data_item_name, product_id, data_item_type, data_item_field, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
new file mode 100644
index 0000000..26f3cb3
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
@@ -0,0 +1,30 @@
+<?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.casic.missiles.mapper.ProductInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductInfo">
+        <id column="Id" property="id" />
+        <result column="name" property="name" />
+        <result column="access_type" property="accessType" />
+        <result column="encipher_type" property="encipherType" />
+        <result column="descn" property="descn" />
+        <result column="product_type" property="productType" />
+        <result column="owners" property="owners" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_name" property="createUserName" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        Id, name, access_type, encipher_type, protocol_type, model, descn, product_type, owners, CreatorName, create_time, create_user_id
+    </sql>
+
+    <select id="selectMaxNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(product_no, 12)), 0)
+        from product_info
+    </select>
+
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/SubscribeStoreMapper.xml b/casic-iot-dao/src/main/resources/mapper/SubscribeStoreMapper.xml
new file mode 100644
index 0000000..415a670
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/SubscribeStoreMapper.xml
@@ -0,0 +1,61 @@
+<?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.casic.missiles.mapper.SubscribeStoreMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.SubscribeStore">
+        <id column="id" property="id"/>
+        <result column="subscribe_no" property="subscribeNo"/>
+        <result column="group_id" property="groupId"/>
+        <result column="message_type" property="messageType"/>
+        <result column="subscribe_type" property="subscribeType"/>
+        <result column="enable" property="enable"/>
+        <result column="subscribe_status" property="subscribeStatus"/>
+        <result column="subscribe_content_json" property="subscribeContentJson"/>
+        <result column="descn" property="descn"/>
+        <result column="create_time" property="createTime"/>
+        <result column="create_user_name" property="createUserName"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, message_type, subscribe_type, enable, subscribe_status, subscribe_content_json, descn, create_time, create_user_name
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.subscribe.SubscribeListVO">
+        SELECT message_type AS "messageType",create_time AS "createTime",subscribe_no AS
+            "subscribeNo",subscribe_content_json AS "subscribeContentJson",
+            subscribe_status AS "subscribeStatus",create_user_name AS "createUserName",
+           create_user_id AS "createUserId"
+        FROM (
+        SELECT *
+        FROM subscribe_store
+        WHERE 1=1
+        <if test="request.groupId!='' and request.groupId != null">
+            AND group_id =#{request.groupId}
+        </if>
+        <if test="request.messageType!='' and request.messageType != null">
+            AND message_type =#{request.messageType}
+        </if>
+        <if test="request.subscribeNo!='' and request.subscribeNo != null">
+            AND subscribe_no like CONCAT('%',#{request.subscribeNo},'%')
+        </if>
+        <if test="request.subscribeType!='' and request.subscribeType != null">
+            AND subscribe_type =#{request.subscribeType}
+        </if>
+        <if test="request.status!='' and request.status != null">
+            AND subscribe_status =#{request.status}
+        </if>
+        order by create_time desc
+        )d JOIN (
+        SELECT deptid,id
+        FROM device_group
+        WHERE VALID=1
+        <if test="request.groupId!='' and request.groupId != null">
+            AND id =#{request.groupId}
+        </if>
+        )dg ON dg.id=d.group_id
+        order by create_time desc
+    </select>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/common/SysCommonMapper.xml b/casic-iot-dao/src/main/resources/mapper/common/SysCommonMapper.xml
new file mode 100644
index 0000000..880f7d4
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/common/SysCommonMapper.xml
@@ -0,0 +1,21 @@
+<?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.casic.missiles.mapper.common.SysCommonMapper">
+
+    <select id="getDictMapByCode" resultType="java.util.Map">
+        SELECT  name,code
+        from sys_dict
+         where  pid=(
+            SELECT id
+            from  sys_dict
+            where  code=#{code}
+         )
+    </select>
+
+    <select id="getDeptMap" resultType="java.util.Map">
+        SELECT  id,SIMPLE_NAME AS  "simpleName"
+        from sys_dept
+    </select>
+
+
+</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/AlarmConfigMapper.xml b/casic-iot-dao/src/resource/mapper/AlarmConfigMapper.xml
deleted file mode 100644
index bd2c2cc..0000000
--- a/casic-iot-dao/src/resource/mapper/AlarmConfigMapper.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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.casic.missiles.mapper.AlarmConfigMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmConfig">
-        <id column="id" property="id" />
-        <result column="product_id" property="productId" />
-        <result column="name" property="name" />
-        <result column="alarm_content" property="alarmContent" />
-        <result column="period_high" property="periodHigh" />
-        <result column="period_low" property="periodLow" />
-        <result column="create_user_id" property="createUserId" />
-        <result column="create_time" property="createTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, name, product_id, alarm_content, period_high, period_low, TypeName, CreatorId, creater_user_id, create_time
-    </sql>
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/AlarmDataMapper.xml b/casic-iot-dao/src/resource/mapper/AlarmDataMapper.xml
deleted file mode 100644
index 4aee44a..0000000
--- a/casic-iot-dao/src/resource/mapper/AlarmDataMapper.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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.casic.missiles.mapper.AlarmDataMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmData">
-        <id column="id" property="id" />
-        <result column="alarm_type" property="alarmType" />
-        <result column="alarm_content" property="alarmContent" />
-        <result column="devcode" property="devcode" />
-        <result column="alarm_time" property="alarmTime" />
-        <result column="alarm_value" property="alarmValue" />
-        <result column="status" property="status" />
-        <result column="create_name" property="createName" />
-        <result column="create_time" property="createTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, alarm_type, alarm_content, devcode, alarm_time, alarm_value, status, CreatorName, create_time
-    </sql>
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/BusConfigMapper.xml b/casic-iot-dao/src/resource/mapper/BusConfigMapper.xml
deleted file mode 100644
index b4965d6..0000000
--- a/casic-iot-dao/src/resource/mapper/BusConfigMapper.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?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.casic.missiles.mapper.BusConfigMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.BusConfig">
-        <id column="id" property="id"/>
-        <result column="devcode" property="devcode"/>
-        <result column="config_json" property="configJson"/>
-        <result column="status" property="status"/>
-        <result column="send_time" property="sendTime"/>
-        <result column="create_time" property="createTime"/>
-        <result column="create_user_id" property="createUserId"/>
-    </resultMap>
-
-
-    <sql id="char_toDate" databaseId="mysql">
-        ${paramStr}
-    </sql>
-
-    <sql id="char_toDate" databaseId="pgsql">
-       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
-    </sql>
-
-    <sql id="char_toDate" databaseId="oracle">
-        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
-    </sql>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, Pid, devcode, config_json, status, update_time, create_time, create_user_id
-    </sql>
-
-    <select id="listPage" resultType="com.casic.missiles.model.BusConfig">
-        select bc.id,bc.devcode,config_type AS "configType", config_json AS "configJson",bc.status,
-        send_time as "sendTime",bc.create_time AS "createTime",bc.create_user_id AS "createUserId",
-        bc.create_user_name AS "createUserName",dg.deptid
-        FROM (
-            SELECT *
-            FROM bus_config
-            WHERE 1=1
-            <if test="request.configType != null and request.configType != '' ">
-                AND config_type =#{request.configType}
-            </if>
-            <if test="request.devcode != '' and request.devcode != null">
-                AND devcode =#{request.devcode}
-            </if>
-            <if test="request.status != '' and request.status != null">
-                AND status =#{request.status}
-            </if>
-            <if test="request.beginTime!='' and request.beginTime!=null">
-                AND send_time <![CDATA[  >=  ]]>
-                <include refid="char_toDate">
-                    <property name="paramStr" value="#{request.beginTime}"/>
-                </include>
-            </if>
-            <if test="request.endTime!='' and request.endTime!=null">
-                AND send_time <![CDATA[  <=  ]]>
-                <include refid="char_toDate">
-                    <property name="paramStr" value="#{request.endTime}"/>
-                </include>
-            </if>
-        )bc
-        JOIN device d ON d.devcode=bc.devcode
-        JOIN device_group dg ON dg.id= d.group_id
-
-    </select>
-
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml
deleted file mode 100644
index 083b289..0000000
--- a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?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.casic.missiles.mapper.DeviceDataMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceData">
-        <id column="id" property="id"/>
-        <result column="devcode" property="devcode"/>
-        <result column="device_type" property="deviceType"/>
-        <result column="cell" property="cell"/>
-        <result column="data_json" property="dataJson"/>
-        <result column="decrypt_before_data" property="decryptBeforeData"/>
-        <result column="decrypt_after_data" property="decryptAfterData"/>
-        <result column="uptime" property="uptime"/>
-        <result column="logtime" property="logtime"/>
-    </resultMap>
-
-    <sql id="char_toDate" databaseId="mysql">
-        ${paramStr}
-    </sql>
-
-    <sql id="char_toDate" databaseId="pgsql">
-       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
-    </sql>
-
-    <sql id="char_toDate" databaseId="oracle">
-        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
-    </sql>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, devcode, device_type, cell, data_json, decrypt_before_data, decrypt_after_data, uptime, logtime
-    </sql>
-
-    <select id="listPage" resultType="com.casic.missiles.dto.data.DeviceDataListVO">
-          SELECT  	dd.id,
-                    dd.devcode,
-                    dd.device_type AS "deviceType",
-                    deptid,
-                    dd.cell,
-                    dd.data_json AS "dataJson",
-                    decrypt_before_data AS "decryptBeforeData",
-                    decrypt_after_data AS "decryptAfterData",
-                    uptime,
-                    logtime,
-                    d.STATUS,
-                    d.group_id AS "groupId",
-                    dg.group_name AS "groupName"
-        FROM (
-               SELECT *
-               FROM device_data
-               WHERE  1=1
-                <if test="request.devcode!='' and request.devcode != null">
-                    AND devcode like CONCAT('%',#{request.devcode},'%')
-                </if>
-                <if test="request.deviceType!='' and request.deviceType != null">
-                    AND device_type =#{request.deviceType}
-                </if>
-                <if test="request.beginTime!='' and request.beginTime!=null">
-                    AND logtime <![CDATA[  >=  ]]>
-                    <include refid="char_toDate">
-                        <property name="paramStr" value="#{request.beginTime}"/>
-                    </include>
-                </if>
-                <if test="request.endTime!='' and request.endTime!=null">
-                    AND logtime <![CDATA[  <=  ]]>
-                    <include refid="char_toDate">
-                        <property name="paramStr" value="#{request.endTime}"/>
-                    </include>
-                </if>
-                <if test="request.ids != null">
-                    and id in
-                    <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
-                        #{id}
-                    </foreach>
-                </if>
-
-          )dd
-          JOIN (
-                SELECT id, group_id,status,devcode
-                FROM device
-                WHERE valid=1
-                <if test="request.devcode!='' and request.devcode != null">
-                    AND devcode like CONCAT('%',#{request.devcode},'%')
-                </if>
-                <if test="request.deviceType!='' and request.deviceType != null">
-                    AND device_type =#{request.deviceType}
-                </if>
-                <if test="request.groupId!='' and request.groupId != null">
-                    AND greoup_id=#{request.groupId}
-                </if>
-          )d ON d.devcode=dd.devcode
-          JOIN (
-                SELECT   deptid,id,group_name
-                FROM device_group
-                WHERE valid=1
-                <if test="request.groupId!='' and request.groupId != null">
-                    AND id=#{request.groupId}
-                </if>
-          ) dg ON dg.id=d.group_id
-          order by logtime desc
-
-    </select>
-
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml
deleted file mode 100644
index 2e07287..0000000
--- a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?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.casic.missiles.mapper.DeviceGroupMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceGroup">
-        <id column="id" property="id" />
-        <result column="group_name" property="groupName" />
-        <result column="group_no" property="groupNo" />
-        <result column="descn" property="descn" />
-        <result column="deptid" property="deptid" />
-        <result column="create_time" property="createTime" />
-        <result column="create_user_id" property="createUserId" />
-        <result column="owner" property="owner" />
-        <result column="valid" property="valid" />
-    </resultMap>
-
-    <sql id="char_toDate" databaseId="mysql">
-        ${paramStr}
-    </sql>
-
-    <sql id="char_toDate" databaseId="pgsql">
-       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
-    </sql>
-
-    <sql id="char_toDate" databaseId="oracle">
-        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
-    </sql>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, name, owner, subcribe_ids, descn, dept, create_time, create_user_id
-    </sql>
-
-    <select id="listPage" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
-        SELECT
-            dg.id,
-            group_no AS "groupNo",
-            deptid,
-             deviceCount,
-            subscribeCount,
-            descn,
-            create_time AS "createTime",
-            group_name AS "groupName",
-            create_user_id AS "createUserId",
-            create_user_name AS "createUserName"
-        FROM
-          (
-             SELECT *
-             FROM device_group
-             WHERE valid = 1
-            <if test="request.groupNo != null and request.groupNo != '' ">
-                AND group_no =#{request.groupNo}
-            </if>
-            <if test="request.groupName != '' and request.groupName != null">
-                AND group_name =#{request.groupName}
-            </if>
-            <if test="request.ids != null">
-                and id in
-                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
-                    #{id}
-                </foreach>
-            </if>
-            <if test="request.beginTime!='' and request.beginTime!=null">
-                AND create_time <![CDATA[  >=  ]]>
-                <include refid="char_toDate">
-                    <property name="paramStr" value="#{request.beginTime}"/>
-                </include>
-            </if>
-            <if test="request.endTime!='' and request.endTime!=null">
-                AND create_time <![CDATA[  <=  ]]>
-                <include refid="char_toDate">
-                    <property name="paramStr" value="#{request.endTime}"/>
-                </include>
-            </if>
-          ) dg
-            LEFT JOIN (
-                   SELECT count(id)  AS "deviceCount",group_id as groupId
-                   FROM device d
-                   WHERE VALID = 1
-                   GROUP BY group_id
-        ) d ON d.groupId = dg.id
-            LEFT JOIN (
-                 SELECT count(id)  AS "subscribeCount",group_id AS groupId
-                 FROM subscribe_store GROUP BY group_id
-           ) s ON s.groupId = dg.id
-         order by create_time desc
-    </select>
-
-    <select id="list" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
-        SELECT
-        dg.id,
-        group_no AS "groupNo",
-        deptid,
-        count( d.id ) AS "deviceCount",
-        count( s.id ) AS "subscribeCount",
-        descn,
-        create_time AS "createTime",
-        group_name AS "groupName"
-        FROM
-        (
-        SELECT *
-        FROM device_group
-        WHERE valid = 1
-        <if test="request.groupNo != null and request.groupNo != '' ">
-            AND group_no =#{request.groupNo}
-        </if>
-        <if test="request.groupName != '' and request.groupName != null">
-            AND group_name =#{request.groupName}
-        </if>
-        <if test="request.ids != null">
-            and id in
-            <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
-                #{id}
-            </foreach>
-        </if>
-        <if test="request.beginTime!='' and request.beginTime!=null">
-            AND create_time <![CDATA[  >=  ]]>
-            <include refid="char_toDate">
-                <property name="paramStr" value="#{request.beginTime}"/>
-            </include>
-        </if>
-        <if test="request.endTime!='' and request.endTime!=null">
-            AND create_time <![CDATA[  <=  ]]>
-            <include refid="char_toDate">
-                <property name="paramStr" value="#{request.endTime}"/>
-            </include>
-        </if>
-        ) dg
-        LEFT JOIN (
-            SELECT id, group_id AS "groupId"
-            FROM device d
-            WHERE VALID = 1
-        ) d ON d.groupId = dg.id
-        LEFT JOIN (
-            SELECT id, group_id AS "groupId"
-            FROM subscribe_store
-        ) s ON s.groupId = dg.id
-        GROUP BY dg.id
-        order by create_time desc
-    </select>
-
-    <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(group_no, 12)), 0)
-        from device_group
-    </select>
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/DeviceMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceMapper.xml
deleted file mode 100644
index 2c99706..0000000
--- a/casic-iot-dao/src/resource/mapper/DeviceMapper.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?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.casic.missiles.mapper.DeviceMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.Device">
-        <id column="id" property="id" />
-        <result column="group_id" property="groupId" />
-        <result column="product_id" property="productId" />
-        <result column="devcode" property="devcode" />
-        <result column="device_type" property="deviceType" />
-        <result column="unit" property="unit" />
-        <result column="model" property="model" />
-        <result column="name" property="name" />
-        <result column="status" property="status" />
-        <result column="imei" property="imei" />
-        <result column="create_time" property="createTime" />
-        <result column="create_user_name" property="createUserName" />
-        <result column="valid" property="valid" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, devcode, device_type, unit, name, product_id, status, imei, create_time, create_user_id
-    </sql>
-
-    <select id="listPage" resultType="com.casic.missiles.dto.device.DeviceListVO">
-        SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime,
-        data_value AS "dataValue",model,imei,d.cell,name AS "deviceName",status,d.id,create_user_id AS "createUserId",
-        create_user_name AS "createUserName"
-        FROM (
-            SELECT *
-            FROM device
-            WHERE VALID=1
-            <if test="request.groupId!='' and request.groupId != null">
-                AND group_id =#{request.groupId}
-            </if>
-            <if test="request.devcode!='' and request.devcode != null">
-                AND devcode like CONCAT('%',#{request.devcode},'%')
-            </if>
-            <if test="request.imei!='' and request.imei != null">
-                AND imei like CONCAT('%',#{request.imei},'%')
-            </if>
-            <if test="request.deviceType!='' and request.deviceType != null">
-                AND device_type =#{request.deviceType}
-            </if>
-            <if test="request.status!='' and request.status != null">
-                AND status =#{request.status}
-            </if>
-            <if test="request.productId!='' and request.productId != null">
-                AND product_id =#{request.productId}
-            </if>
-            <if test="request.beginCell!='' and request.beginCell!=null">
-                AND cell <![CDATA[  >=  ]]> #{request.beginCell}
-
-            </if>
-            <if test="request.endCell!='' and request.endCell!=null">
-                AND cell <![CDATA[  <=  ]]> #{request.endCell}
-            </if>
-            <if test="request.ids != null">
-                and id in
-                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
-                    #{id}
-                </foreach>
-            </if>
-            order by create_time desc
-        )d JOIN (
-            SELECT deptid,id
-            FROM device_group
-            WHERE VALID =1
-            <if test="request.groupId!='' and request.groupId != null">
-                AND id =#{request.groupId}
-            </if>
-        )dg ON dg.id=d.group_id
-        LEFT JOIN(
-            SELECT ddd.logtime AS logtime,data_value,ddd.devcode,cell
-            FROM device_data ddd
-            JOIN
-            (
-                SELECT Max(logtime) AS logtime,devcode
-                FROM  device_data
-                GROUP BY devcode
-            )dd  ON dd.logtime=ddd.logtime AND dd.devcode=ddd.devcode
-        )dd ON dd.devcode=d.devcode
-        order by create_time desc
-    </select>
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/DeviceUpgradeTaskMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceUpgradeTaskMapper.xml
deleted file mode 100644
index a5bf5e7..0000000
--- a/casic-iot-dao/src/resource/mapper/DeviceUpgradeTaskMapper.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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.casic.missiles.mapper.DeviceUpgradeTaskMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceUpgradeTask">
-        <id column="id" property="id" />
-        <result column="version_id" property="versionId" />
-        <result column="device_id" property="deviceId" />
-        <result column="status" property="status" />
-        <result column="create_time" property="createTime" />
-        <result column="create_user_id" property="createUserId" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, version_id, device_id, status, create_time, create_user_id
-    </sql>
-
-</mapper>

diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml
new file mode 100644
index 0000000..bd2c2cc
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml
@@ -0,0 +1,22 @@
+<?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.casic.missiles.mapper.AlarmConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmConfig">
+        <id column="id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="name" property="name" />
+        <result column="alarm_content" property="alarmContent" />
+        <result column="period_high" property="periodHigh" />
+        <result column="period_low" property="periodLow" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, product_id, alarm_content, period_high, period_low, TypeName, CreatorId, creater_user_id, create_time
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml
new file mode 100644
index 0000000..4aee44a
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml
@@ -0,0 +1,23 @@
+<?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.casic.missiles.mapper.AlarmDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmData">
+        <id column="id" property="id" />
+        <result column="alarm_type" property="alarmType" />
+        <result column="alarm_content" property="alarmContent" />
+        <result column="devcode" property="devcode" />
+        <result column="alarm_time" property="alarmTime" />
+        <result column="alarm_value" property="alarmValue" />
+        <result column="status" property="status" />
+        <result column="create_name" property="createName" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, alarm_type, alarm_content, devcode, alarm_time, alarm_value, status, CreatorName, create_time
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml b/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml
new file mode 100644
index 0000000..b4965d6
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml
@@ -0,0 +1,70 @@
+<?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.casic.missiles.mapper.BusConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.BusConfig">
+        <id column="id" property="id"/>
+        <result column="devcode" property="devcode"/>
+        <result column="config_json" property="configJson"/>
+        <result column="status" property="status"/>
+        <result column="send_time" property="sendTime"/>
+        <result column="create_time" property="createTime"/>
+        <result column="create_user_id" property="createUserId"/>
+    </resultMap>
+
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, Pid, devcode, config_json, status, update_time, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.model.BusConfig">
+        select bc.id,bc.devcode,config_type AS "configType", config_json AS "configJson",bc.status,
+        send_time as "sendTime",bc.create_time AS "createTime",bc.create_user_id AS "createUserId",
+        bc.create_user_name AS "createUserName",dg.deptid
+        FROM (
+            SELECT *
+            FROM bus_config
+            WHERE 1=1
+            <if test="request.configType != null and request.configType != '' ">
+                AND config_type =#{request.configType}
+            </if>
+            <if test="request.devcode != '' and request.devcode != null">
+                AND devcode =#{request.devcode}
+            </if>
+            <if test="request.status != '' and request.status != null">
+                AND status =#{request.status}
+            </if>
+            <if test="request.beginTime!='' and request.beginTime!=null">
+                AND send_time <![CDATA[  >=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.beginTime}"/>
+                </include>
+            </if>
+            <if test="request.endTime!='' and request.endTime!=null">
+                AND send_time <![CDATA[  <=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.endTime}"/>
+                </include>
+            </if>
+        )bc
+        JOIN device d ON d.devcode=bc.devcode
+        JOIN device_group dg ON dg.id= d.group_id
+
+    </select>
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml
new file mode 100644
index 0000000..083b289
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml
@@ -0,0 +1,106 @@
+<?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.casic.missiles.mapper.DeviceDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceData">
+        <id column="id" property="id"/>
+        <result column="devcode" property="devcode"/>
+        <result column="device_type" property="deviceType"/>
+        <result column="cell" property="cell"/>
+        <result column="data_json" property="dataJson"/>
+        <result column="decrypt_before_data" property="decryptBeforeData"/>
+        <result column="decrypt_after_data" property="decryptAfterData"/>
+        <result column="uptime" property="uptime"/>
+        <result column="logtime" property="logtime"/>
+    </resultMap>
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, devcode, device_type, cell, data_json, decrypt_before_data, decrypt_after_data, uptime, logtime
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.data.DeviceDataListVO">
+          SELECT  	dd.id,
+                    dd.devcode,
+                    dd.device_type AS "deviceType",
+                    deptid,
+                    dd.cell,
+                    dd.data_json AS "dataJson",
+                    decrypt_before_data AS "decryptBeforeData",
+                    decrypt_after_data AS "decryptAfterData",
+                    uptime,
+                    logtime,
+                    d.STATUS,
+                    d.group_id AS "groupId",
+                    dg.group_name AS "groupName"
+        FROM (
+               SELECT *
+               FROM device_data
+               WHERE  1=1
+                <if test="request.devcode!='' and request.devcode != null">
+                    AND devcode like CONCAT('%',#{request.devcode},'%')
+                </if>
+                <if test="request.deviceType!='' and request.deviceType != null">
+                    AND device_type =#{request.deviceType}
+                </if>
+                <if test="request.beginTime!='' and request.beginTime!=null">
+                    AND logtime <![CDATA[  >=  ]]>
+                    <include refid="char_toDate">
+                        <property name="paramStr" value="#{request.beginTime}"/>
+                    </include>
+                </if>
+                <if test="request.endTime!='' and request.endTime!=null">
+                    AND logtime <![CDATA[  <=  ]]>
+                    <include refid="char_toDate">
+                        <property name="paramStr" value="#{request.endTime}"/>
+                    </include>
+                </if>
+                <if test="request.ids != null">
+                    and id in
+                    <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                        #{id}
+                    </foreach>
+                </if>
+
+          )dd
+          JOIN (
+                SELECT id, group_id,status,devcode
+                FROM device
+                WHERE valid=1
+                <if test="request.devcode!='' and request.devcode != null">
+                    AND devcode like CONCAT('%',#{request.devcode},'%')
+                </if>
+                <if test="request.deviceType!='' and request.deviceType != null">
+                    AND device_type =#{request.deviceType}
+                </if>
+                <if test="request.groupId!='' and request.groupId != null">
+                    AND greoup_id=#{request.groupId}
+                </if>
+          )d ON d.devcode=dd.devcode
+          JOIN (
+                SELECT   deptid,id,group_name
+                FROM device_group
+                WHERE valid=1
+                <if test="request.groupId!='' and request.groupId != null">
+                    AND id=#{request.groupId}
+                </if>
+          ) dg ON dg.id=d.group_id
+          order by logtime desc
+
+    </select>
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml
new file mode 100644
index 0000000..2e07287
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml
@@ -0,0 +1,148 @@
+<?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.casic.missiles.mapper.DeviceGroupMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceGroup">
+        <id column="id" property="id" />
+        <result column="group_name" property="groupName" />
+        <result column="group_no" property="groupNo" />
+        <result column="descn" property="descn" />
+        <result column="deptid" property="deptid" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="owner" property="owner" />
+        <result column="valid" property="valid" />
+    </resultMap>
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, owner, subcribe_ids, descn, dept, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
+        SELECT
+            dg.id,
+            group_no AS "groupNo",
+            deptid,
+             deviceCount,
+            subscribeCount,
+            descn,
+            create_time AS "createTime",
+            group_name AS "groupName",
+            create_user_id AS "createUserId",
+            create_user_name AS "createUserName"
+        FROM
+          (
+             SELECT *
+             FROM device_group
+             WHERE valid = 1
+            <if test="request.groupNo != null and request.groupNo != '' ">
+                AND group_no =#{request.groupNo}
+            </if>
+            <if test="request.groupName != '' and request.groupName != null">
+                AND group_name =#{request.groupName}
+            </if>
+            <if test="request.ids != null">
+                and id in
+                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+            <if test="request.beginTime!='' and request.beginTime!=null">
+                AND create_time <![CDATA[  >=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.beginTime}"/>
+                </include>
+            </if>
+            <if test="request.endTime!='' and request.endTime!=null">
+                AND create_time <![CDATA[  <=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.endTime}"/>
+                </include>
+            </if>
+          ) dg
+            LEFT JOIN (
+                   SELECT count(id)  AS "deviceCount",group_id as groupId
+                   FROM device d
+                   WHERE VALID = 1
+                   GROUP BY group_id
+        ) d ON d.groupId = dg.id
+            LEFT JOIN (
+                 SELECT count(id)  AS "subscribeCount",group_id AS groupId
+                 FROM subscribe_store GROUP BY group_id
+           ) s ON s.groupId = dg.id
+         order by create_time desc
+    </select>
+
+    <select id="list" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
+        SELECT
+        dg.id,
+        group_no AS "groupNo",
+        deptid,
+        count( d.id ) AS "deviceCount",
+        count( s.id ) AS "subscribeCount",
+        descn,
+        create_time AS "createTime",
+        group_name AS "groupName"
+        FROM
+        (
+        SELECT *
+        FROM device_group
+        WHERE valid = 1
+        <if test="request.groupNo != null and request.groupNo != '' ">
+            AND group_no =#{request.groupNo}
+        </if>
+        <if test="request.groupName != '' and request.groupName != null">
+            AND group_name =#{request.groupName}
+        </if>
+        <if test="request.ids != null">
+            and id in
+            <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+        <if test="request.beginTime!='' and request.beginTime!=null">
+            AND create_time <![CDATA[  >=  ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{request.beginTime}"/>
+            </include>
+        </if>
+        <if test="request.endTime!='' and request.endTime!=null">
+            AND create_time <![CDATA[  <=  ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{request.endTime}"/>
+            </include>
+        </if>
+        ) dg
+        LEFT JOIN (
+            SELECT id, group_id AS "groupId"
+            FROM device d
+            WHERE VALID = 1
+        ) d ON d.groupId = dg.id
+        LEFT JOIN (
+            SELECT id, group_id AS "groupId"
+            FROM subscribe_store
+        ) s ON s.groupId = dg.id
+        GROUP BY dg.id
+        order by create_time desc
+    </select>
+
+    <select id="selectMaxNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(group_no, 12)), 0)
+        from device_group
+    </select>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
new file mode 100644
index 0000000..2c99706
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
@@ -0,0 +1,88 @@
+<?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.casic.missiles.mapper.DeviceMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.Device">
+        <id column="id" property="id" />
+        <result column="group_id" property="groupId" />
+        <result column="product_id" property="productId" />
+        <result column="devcode" property="devcode" />
+        <result column="device_type" property="deviceType" />
+        <result column="unit" property="unit" />
+        <result column="model" property="model" />
+        <result column="name" property="name" />
+        <result column="status" property="status" />
+        <result column="imei" property="imei" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="valid" property="valid" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, devcode, device_type, unit, name, product_id, status, imei, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.device.DeviceListVO">
+        SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime,
+        data_value AS "dataValue",model,imei,d.cell,name AS "deviceName",status,d.id,create_user_id AS "createUserId",
+        create_user_name AS "createUserName"
+        FROM (
+            SELECT *
+            FROM device
+            WHERE VALID=1
+            <if test="request.groupId!='' and request.groupId != null">
+                AND group_id =#{request.groupId}
+            </if>
+            <if test="request.devcode!='' and request.devcode != null">
+                AND devcode like CONCAT('%',#{request.devcode},'%')
+            </if>
+            <if test="request.imei!='' and request.imei != null">
+                AND imei like CONCAT('%',#{request.imei},'%')
+            </if>
+            <if test="request.deviceType!='' and request.deviceType != null">
+                AND device_type =#{request.deviceType}
+            </if>
+            <if test="request.status!='' and request.status != null">
+                AND status =#{request.status}
+            </if>
+            <if test="request.productId!='' and request.productId != null">
+                AND product_id =#{request.productId}
+            </if>
+            <if test="request.beginCell!='' and request.beginCell!=null">
+                AND cell <![CDATA[  >=  ]]> #{request.beginCell}
+
+            </if>
+            <if test="request.endCell!='' and request.endCell!=null">
+                AND cell <![CDATA[  <=  ]]> #{request.endCell}
+            </if>
+            <if test="request.ids != null">
+                and id in
+                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+            order by create_time desc
+        )d JOIN (
+            SELECT deptid,id
+            FROM device_group
+            WHERE VALID =1
+            <if test="request.groupId!='' and request.groupId != null">
+                AND id =#{request.groupId}
+            </if>
+        )dg ON dg.id=d.group_id
+        LEFT JOIN(
+            SELECT ddd.logtime AS logtime,data_value,ddd.devcode,cell
+            FROM device_data ddd
+            JOIN
+            (
+                SELECT Max(logtime) AS logtime,devcode
+                FROM  device_data
+                GROUP BY devcode
+            )dd  ON dd.logtime=ddd.logtime AND dd.devcode=ddd.devcode
+        )dd ON dd.devcode=d.devcode
+        order by create_time desc
+    </select>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml
new file mode 100644
index 0000000..a5bf5e7
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml
@@ -0,0 +1,20 @@
+<?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.casic.missiles.mapper.DeviceUpgradeTaskMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceUpgradeTask">
+        <id column="id" property="id" />
+        <result column="version_id" property="versionId" />
+        <result column="device_id" property="deviceId" />
+        <result column="status" property="status" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, version_id, device_id, status, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml
new file mode 100644
index 0000000..e39ec1f
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml
@@ -0,0 +1,23 @@
+<?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.casic.missiles.mapper.DeviceVersionMapper">
+
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceVersion">
+        <id column="Id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="version_file" property="versionFile" />
+        <result column="version" property="version" />
+        <result column="owner" property="owner" />
+        <result column="dscn" property="dscn" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        Id, product_id, version_file, version, owner, dscn, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductConfigItemMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductConfigItemMapper.xml
new file mode 100644
index 0000000..e2448be
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/ProductConfigItemMapper.xml
@@ -0,0 +1,22 @@
+<?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.casic.missiles.mapper.ProductConfigItemMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductConfigItem">
+        <id column="id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="param_name" property="paramName" />
+        <result column="param_code" property="paramCode" />
+        <result column="param_type" property="paramType" />
+        <result column="regular_expression" property="regularExpression" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, product_id, param_name, param_code, param_type, regular_expression, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductDataItemMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductDataItemMapper.xml
new file mode 100644
index 0000000..61a55ec
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/ProductDataItemMapper.xml
@@ -0,0 +1,21 @@
+<?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.casic.missiles.mapper.ProductDataItemMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductDataItem">
+        <id column="id" property="id" />
+        <result column="data_item_name" property="dataItemName" />
+        <result column="product_id" property="productId" />
+        <result column="data_item_type" property="dataItemType" />
+        <result column="data_item_field" property="dataItemField" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, data_item_name, product_id, data_item_type, data_item_field, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
new file mode 100644
index 0000000..26f3cb3
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
@@ -0,0 +1,30 @@
+<?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.casic.missiles.mapper.ProductInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductInfo">
+        <id column="Id" property="id" />
+        <result column="name" property="name" />
+        <result column="access_type" property="accessType" />
+        <result column="encipher_type" property="encipherType" />
+        <result column="descn" property="descn" />
+        <result column="product_type" property="productType" />
+        <result column="owners" property="owners" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_name" property="createUserName" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        Id, name, access_type, encipher_type, protocol_type, model, descn, product_type, owners, CreatorName, create_time, create_user_id
+    </sql>
+
+    <select id="selectMaxNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(product_no, 12)), 0)
+        from product_info
+    </select>
+
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/SubscribeStoreMapper.xml b/casic-iot-dao/src/main/resources/mapper/SubscribeStoreMapper.xml
new file mode 100644
index 0000000..415a670
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/SubscribeStoreMapper.xml
@@ -0,0 +1,61 @@
+<?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.casic.missiles.mapper.SubscribeStoreMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.SubscribeStore">
+        <id column="id" property="id"/>
+        <result column="subscribe_no" property="subscribeNo"/>
+        <result column="group_id" property="groupId"/>
+        <result column="message_type" property="messageType"/>
+        <result column="subscribe_type" property="subscribeType"/>
+        <result column="enable" property="enable"/>
+        <result column="subscribe_status" property="subscribeStatus"/>
+        <result column="subscribe_content_json" property="subscribeContentJson"/>
+        <result column="descn" property="descn"/>
+        <result column="create_time" property="createTime"/>
+        <result column="create_user_name" property="createUserName"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, message_type, subscribe_type, enable, subscribe_status, subscribe_content_json, descn, create_time, create_user_name
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.subscribe.SubscribeListVO">
+        SELECT message_type AS "messageType",create_time AS "createTime",subscribe_no AS
+            "subscribeNo",subscribe_content_json AS "subscribeContentJson",
+            subscribe_status AS "subscribeStatus",create_user_name AS "createUserName",
+           create_user_id AS "createUserId"
+        FROM (
+        SELECT *
+        FROM subscribe_store
+        WHERE 1=1
+        <if test="request.groupId!='' and request.groupId != null">
+            AND group_id =#{request.groupId}
+        </if>
+        <if test="request.messageType!='' and request.messageType != null">
+            AND message_type =#{request.messageType}
+        </if>
+        <if test="request.subscribeNo!='' and request.subscribeNo != null">
+            AND subscribe_no like CONCAT('%',#{request.subscribeNo},'%')
+        </if>
+        <if test="request.subscribeType!='' and request.subscribeType != null">
+            AND subscribe_type =#{request.subscribeType}
+        </if>
+        <if test="request.status!='' and request.status != null">
+            AND subscribe_status =#{request.status}
+        </if>
+        order by create_time desc
+        )d JOIN (
+        SELECT deptid,id
+        FROM device_group
+        WHERE VALID=1
+        <if test="request.groupId!='' and request.groupId != null">
+            AND id =#{request.groupId}
+        </if>
+        )dg ON dg.id=d.group_id
+        order by create_time desc
+    </select>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/common/SysCommonMapper.xml b/casic-iot-dao/src/main/resources/mapper/common/SysCommonMapper.xml
new file mode 100644
index 0000000..880f7d4
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/common/SysCommonMapper.xml
@@ -0,0 +1,21 @@
+<?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.casic.missiles.mapper.common.SysCommonMapper">
+
+    <select id="getDictMapByCode" resultType="java.util.Map">
+        SELECT  name,code
+        from sys_dict
+         where  pid=(
+            SELECT id
+            from  sys_dict
+            where  code=#{code}
+         )
+    </select>
+
+    <select id="getDeptMap" resultType="java.util.Map">
+        SELECT  id,SIMPLE_NAME AS  "simpleName"
+        from sys_dept
+    </select>
+
+
+</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/AlarmConfigMapper.xml b/casic-iot-dao/src/resource/mapper/AlarmConfigMapper.xml
deleted file mode 100644
index bd2c2cc..0000000
--- a/casic-iot-dao/src/resource/mapper/AlarmConfigMapper.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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.casic.missiles.mapper.AlarmConfigMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmConfig">
-        <id column="id" property="id" />
-        <result column="product_id" property="productId" />
-        <result column="name" property="name" />
-        <result column="alarm_content" property="alarmContent" />
-        <result column="period_high" property="periodHigh" />
-        <result column="period_low" property="periodLow" />
-        <result column="create_user_id" property="createUserId" />
-        <result column="create_time" property="createTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, name, product_id, alarm_content, period_high, period_low, TypeName, CreatorId, creater_user_id, create_time
-    </sql>
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/AlarmDataMapper.xml b/casic-iot-dao/src/resource/mapper/AlarmDataMapper.xml
deleted file mode 100644
index 4aee44a..0000000
--- a/casic-iot-dao/src/resource/mapper/AlarmDataMapper.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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.casic.missiles.mapper.AlarmDataMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmData">
-        <id column="id" property="id" />
-        <result column="alarm_type" property="alarmType" />
-        <result column="alarm_content" property="alarmContent" />
-        <result column="devcode" property="devcode" />
-        <result column="alarm_time" property="alarmTime" />
-        <result column="alarm_value" property="alarmValue" />
-        <result column="status" property="status" />
-        <result column="create_name" property="createName" />
-        <result column="create_time" property="createTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, alarm_type, alarm_content, devcode, alarm_time, alarm_value, status, CreatorName, create_time
-    </sql>
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/BusConfigMapper.xml b/casic-iot-dao/src/resource/mapper/BusConfigMapper.xml
deleted file mode 100644
index b4965d6..0000000
--- a/casic-iot-dao/src/resource/mapper/BusConfigMapper.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?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.casic.missiles.mapper.BusConfigMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.BusConfig">
-        <id column="id" property="id"/>
-        <result column="devcode" property="devcode"/>
-        <result column="config_json" property="configJson"/>
-        <result column="status" property="status"/>
-        <result column="send_time" property="sendTime"/>
-        <result column="create_time" property="createTime"/>
-        <result column="create_user_id" property="createUserId"/>
-    </resultMap>
-
-
-    <sql id="char_toDate" databaseId="mysql">
-        ${paramStr}
-    </sql>
-
-    <sql id="char_toDate" databaseId="pgsql">
-       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
-    </sql>
-
-    <sql id="char_toDate" databaseId="oracle">
-        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
-    </sql>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, Pid, devcode, config_json, status, update_time, create_time, create_user_id
-    </sql>
-
-    <select id="listPage" resultType="com.casic.missiles.model.BusConfig">
-        select bc.id,bc.devcode,config_type AS "configType", config_json AS "configJson",bc.status,
-        send_time as "sendTime",bc.create_time AS "createTime",bc.create_user_id AS "createUserId",
-        bc.create_user_name AS "createUserName",dg.deptid
-        FROM (
-            SELECT *
-            FROM bus_config
-            WHERE 1=1
-            <if test="request.configType != null and request.configType != '' ">
-                AND config_type =#{request.configType}
-            </if>
-            <if test="request.devcode != '' and request.devcode != null">
-                AND devcode =#{request.devcode}
-            </if>
-            <if test="request.status != '' and request.status != null">
-                AND status =#{request.status}
-            </if>
-            <if test="request.beginTime!='' and request.beginTime!=null">
-                AND send_time <![CDATA[  >=  ]]>
-                <include refid="char_toDate">
-                    <property name="paramStr" value="#{request.beginTime}"/>
-                </include>
-            </if>
-            <if test="request.endTime!='' and request.endTime!=null">
-                AND send_time <![CDATA[  <=  ]]>
-                <include refid="char_toDate">
-                    <property name="paramStr" value="#{request.endTime}"/>
-                </include>
-            </if>
-        )bc
-        JOIN device d ON d.devcode=bc.devcode
-        JOIN device_group dg ON dg.id= d.group_id
-
-    </select>
-
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml
deleted file mode 100644
index 083b289..0000000
--- a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?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.casic.missiles.mapper.DeviceDataMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceData">
-        <id column="id" property="id"/>
-        <result column="devcode" property="devcode"/>
-        <result column="device_type" property="deviceType"/>
-        <result column="cell" property="cell"/>
-        <result column="data_json" property="dataJson"/>
-        <result column="decrypt_before_data" property="decryptBeforeData"/>
-        <result column="decrypt_after_data" property="decryptAfterData"/>
-        <result column="uptime" property="uptime"/>
-        <result column="logtime" property="logtime"/>
-    </resultMap>
-
-    <sql id="char_toDate" databaseId="mysql">
-        ${paramStr}
-    </sql>
-
-    <sql id="char_toDate" databaseId="pgsql">
-       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
-    </sql>
-
-    <sql id="char_toDate" databaseId="oracle">
-        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
-    </sql>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, devcode, device_type, cell, data_json, decrypt_before_data, decrypt_after_data, uptime, logtime
-    </sql>
-
-    <select id="listPage" resultType="com.casic.missiles.dto.data.DeviceDataListVO">
-          SELECT  	dd.id,
-                    dd.devcode,
-                    dd.device_type AS "deviceType",
-                    deptid,
-                    dd.cell,
-                    dd.data_json AS "dataJson",
-                    decrypt_before_data AS "decryptBeforeData",
-                    decrypt_after_data AS "decryptAfterData",
-                    uptime,
-                    logtime,
-                    d.STATUS,
-                    d.group_id AS "groupId",
-                    dg.group_name AS "groupName"
-        FROM (
-               SELECT *
-               FROM device_data
-               WHERE  1=1
-                <if test="request.devcode!='' and request.devcode != null">
-                    AND devcode like CONCAT('%',#{request.devcode},'%')
-                </if>
-                <if test="request.deviceType!='' and request.deviceType != null">
-                    AND device_type =#{request.deviceType}
-                </if>
-                <if test="request.beginTime!='' and request.beginTime!=null">
-                    AND logtime <![CDATA[  >=  ]]>
-                    <include refid="char_toDate">
-                        <property name="paramStr" value="#{request.beginTime}"/>
-                    </include>
-                </if>
-                <if test="request.endTime!='' and request.endTime!=null">
-                    AND logtime <![CDATA[  <=  ]]>
-                    <include refid="char_toDate">
-                        <property name="paramStr" value="#{request.endTime}"/>
-                    </include>
-                </if>
-                <if test="request.ids != null">
-                    and id in
-                    <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
-                        #{id}
-                    </foreach>
-                </if>
-
-          )dd
-          JOIN (
-                SELECT id, group_id,status,devcode
-                FROM device
-                WHERE valid=1
-                <if test="request.devcode!='' and request.devcode != null">
-                    AND devcode like CONCAT('%',#{request.devcode},'%')
-                </if>
-                <if test="request.deviceType!='' and request.deviceType != null">
-                    AND device_type =#{request.deviceType}
-                </if>
-                <if test="request.groupId!='' and request.groupId != null">
-                    AND greoup_id=#{request.groupId}
-                </if>
-          )d ON d.devcode=dd.devcode
-          JOIN (
-                SELECT   deptid,id,group_name
-                FROM device_group
-                WHERE valid=1
-                <if test="request.groupId!='' and request.groupId != null">
-                    AND id=#{request.groupId}
-                </if>
-          ) dg ON dg.id=d.group_id
-          order by logtime desc
-
-    </select>
-
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml
deleted file mode 100644
index 2e07287..0000000
--- a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?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.casic.missiles.mapper.DeviceGroupMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceGroup">
-        <id column="id" property="id" />
-        <result column="group_name" property="groupName" />
-        <result column="group_no" property="groupNo" />
-        <result column="descn" property="descn" />
-        <result column="deptid" property="deptid" />
-        <result column="create_time" property="createTime" />
-        <result column="create_user_id" property="createUserId" />
-        <result column="owner" property="owner" />
-        <result column="valid" property="valid" />
-    </resultMap>
-
-    <sql id="char_toDate" databaseId="mysql">
-        ${paramStr}
-    </sql>
-
-    <sql id="char_toDate" databaseId="pgsql">
-       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
-    </sql>
-
-    <sql id="char_toDate" databaseId="oracle">
-        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
-    </sql>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, name, owner, subcribe_ids, descn, dept, create_time, create_user_id
-    </sql>
-
-    <select id="listPage" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
-        SELECT
-            dg.id,
-            group_no AS "groupNo",
-            deptid,
-             deviceCount,
-            subscribeCount,
-            descn,
-            create_time AS "createTime",
-            group_name AS "groupName",
-            create_user_id AS "createUserId",
-            create_user_name AS "createUserName"
-        FROM
-          (
-             SELECT *
-             FROM device_group
-             WHERE valid = 1
-            <if test="request.groupNo != null and request.groupNo != '' ">
-                AND group_no =#{request.groupNo}
-            </if>
-            <if test="request.groupName != '' and request.groupName != null">
-                AND group_name =#{request.groupName}
-            </if>
-            <if test="request.ids != null">
-                and id in
-                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
-                    #{id}
-                </foreach>
-            </if>
-            <if test="request.beginTime!='' and request.beginTime!=null">
-                AND create_time <![CDATA[  >=  ]]>
-                <include refid="char_toDate">
-                    <property name="paramStr" value="#{request.beginTime}"/>
-                </include>
-            </if>
-            <if test="request.endTime!='' and request.endTime!=null">
-                AND create_time <![CDATA[  <=  ]]>
-                <include refid="char_toDate">
-                    <property name="paramStr" value="#{request.endTime}"/>
-                </include>
-            </if>
-          ) dg
-            LEFT JOIN (
-                   SELECT count(id)  AS "deviceCount",group_id as groupId
-                   FROM device d
-                   WHERE VALID = 1
-                   GROUP BY group_id
-        ) d ON d.groupId = dg.id
-            LEFT JOIN (
-                 SELECT count(id)  AS "subscribeCount",group_id AS groupId
-                 FROM subscribe_store GROUP BY group_id
-           ) s ON s.groupId = dg.id
-         order by create_time desc
-    </select>
-
-    <select id="list" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
-        SELECT
-        dg.id,
-        group_no AS "groupNo",
-        deptid,
-        count( d.id ) AS "deviceCount",
-        count( s.id ) AS "subscribeCount",
-        descn,
-        create_time AS "createTime",
-        group_name AS "groupName"
-        FROM
-        (
-        SELECT *
-        FROM device_group
-        WHERE valid = 1
-        <if test="request.groupNo != null and request.groupNo != '' ">
-            AND group_no =#{request.groupNo}
-        </if>
-        <if test="request.groupName != '' and request.groupName != null">
-            AND group_name =#{request.groupName}
-        </if>
-        <if test="request.ids != null">
-            and id in
-            <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
-                #{id}
-            </foreach>
-        </if>
-        <if test="request.beginTime!='' and request.beginTime!=null">
-            AND create_time <![CDATA[  >=  ]]>
-            <include refid="char_toDate">
-                <property name="paramStr" value="#{request.beginTime}"/>
-            </include>
-        </if>
-        <if test="request.endTime!='' and request.endTime!=null">
-            AND create_time <![CDATA[  <=  ]]>
-            <include refid="char_toDate">
-                <property name="paramStr" value="#{request.endTime}"/>
-            </include>
-        </if>
-        ) dg
-        LEFT JOIN (
-            SELECT id, group_id AS "groupId"
-            FROM device d
-            WHERE VALID = 1
-        ) d ON d.groupId = dg.id
-        LEFT JOIN (
-            SELECT id, group_id AS "groupId"
-            FROM subscribe_store
-        ) s ON s.groupId = dg.id
-        GROUP BY dg.id
-        order by create_time desc
-    </select>
-
-    <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(group_no, 12)), 0)
-        from device_group
-    </select>
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/DeviceMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceMapper.xml
deleted file mode 100644
index 2c99706..0000000
--- a/casic-iot-dao/src/resource/mapper/DeviceMapper.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?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.casic.missiles.mapper.DeviceMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.Device">
-        <id column="id" property="id" />
-        <result column="group_id" property="groupId" />
-        <result column="product_id" property="productId" />
-        <result column="devcode" property="devcode" />
-        <result column="device_type" property="deviceType" />
-        <result column="unit" property="unit" />
-        <result column="model" property="model" />
-        <result column="name" property="name" />
-        <result column="status" property="status" />
-        <result column="imei" property="imei" />
-        <result column="create_time" property="createTime" />
-        <result column="create_user_name" property="createUserName" />
-        <result column="valid" property="valid" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, devcode, device_type, unit, name, product_id, status, imei, create_time, create_user_id
-    </sql>
-
-    <select id="listPage" resultType="com.casic.missiles.dto.device.DeviceListVO">
-        SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime,
-        data_value AS "dataValue",model,imei,d.cell,name AS "deviceName",status,d.id,create_user_id AS "createUserId",
-        create_user_name AS "createUserName"
-        FROM (
-            SELECT *
-            FROM device
-            WHERE VALID=1
-            <if test="request.groupId!='' and request.groupId != null">
-                AND group_id =#{request.groupId}
-            </if>
-            <if test="request.devcode!='' and request.devcode != null">
-                AND devcode like CONCAT('%',#{request.devcode},'%')
-            </if>
-            <if test="request.imei!='' and request.imei != null">
-                AND imei like CONCAT('%',#{request.imei},'%')
-            </if>
-            <if test="request.deviceType!='' and request.deviceType != null">
-                AND device_type =#{request.deviceType}
-            </if>
-            <if test="request.status!='' and request.status != null">
-                AND status =#{request.status}
-            </if>
-            <if test="request.productId!='' and request.productId != null">
-                AND product_id =#{request.productId}
-            </if>
-            <if test="request.beginCell!='' and request.beginCell!=null">
-                AND cell <![CDATA[  >=  ]]> #{request.beginCell}
-
-            </if>
-            <if test="request.endCell!='' and request.endCell!=null">
-                AND cell <![CDATA[  <=  ]]> #{request.endCell}
-            </if>
-            <if test="request.ids != null">
-                and id in
-                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
-                    #{id}
-                </foreach>
-            </if>
-            order by create_time desc
-        )d JOIN (
-            SELECT deptid,id
-            FROM device_group
-            WHERE VALID =1
-            <if test="request.groupId!='' and request.groupId != null">
-                AND id =#{request.groupId}
-            </if>
-        )dg ON dg.id=d.group_id
-        LEFT JOIN(
-            SELECT ddd.logtime AS logtime,data_value,ddd.devcode,cell
-            FROM device_data ddd
-            JOIN
-            (
-                SELECT Max(logtime) AS logtime,devcode
-                FROM  device_data
-                GROUP BY devcode
-            )dd  ON dd.logtime=ddd.logtime AND dd.devcode=ddd.devcode
-        )dd ON dd.devcode=d.devcode
-        order by create_time desc
-    </select>
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/DeviceUpgradeTaskMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceUpgradeTaskMapper.xml
deleted file mode 100644
index a5bf5e7..0000000
--- a/casic-iot-dao/src/resource/mapper/DeviceUpgradeTaskMapper.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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.casic.missiles.mapper.DeviceUpgradeTaskMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceUpgradeTask">
-        <id column="id" property="id" />
-        <result column="version_id" property="versionId" />
-        <result column="device_id" property="deviceId" />
-        <result column="status" property="status" />
-        <result column="create_time" property="createTime" />
-        <result column="create_user_id" property="createUserId" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, version_id, device_id, status, create_time, create_user_id
-    </sql>
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/DeviceVersionMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceVersionMapper.xml
deleted file mode 100644
index e39ec1f..0000000
--- a/casic-iot-dao/src/resource/mapper/DeviceVersionMapper.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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.casic.missiles.mapper.DeviceVersionMapper">
-
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceVersion">
-        <id column="Id" property="id" />
-        <result column="product_id" property="productId" />
-        <result column="version_file" property="versionFile" />
-        <result column="version" property="version" />
-        <result column="owner" property="owner" />
-        <result column="dscn" property="dscn" />
-        <result column="create_time" property="createTime" />
-        <result column="create_user_id" property="createUserId" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        Id, product_id, version_file, version, owner, dscn, create_time, create_user_id
-    </sql>
-
-</mapper>

diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml
new file mode 100644
index 0000000..bd2c2cc
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml
@@ -0,0 +1,22 @@
+<?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.casic.missiles.mapper.AlarmConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmConfig">
+        <id column="id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="name" property="name" />
+        <result column="alarm_content" property="alarmContent" />
+        <result column="period_high" property="periodHigh" />
+        <result column="period_low" property="periodLow" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, product_id, alarm_content, period_high, period_low, TypeName, CreatorId, creater_user_id, create_time
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml
new file mode 100644
index 0000000..4aee44a
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml
@@ -0,0 +1,23 @@
+<?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.casic.missiles.mapper.AlarmDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmData">
+        <id column="id" property="id" />
+        <result column="alarm_type" property="alarmType" />
+        <result column="alarm_content" property="alarmContent" />
+        <result column="devcode" property="devcode" />
+        <result column="alarm_time" property="alarmTime" />
+        <result column="alarm_value" property="alarmValue" />
+        <result column="status" property="status" />
+        <result column="create_name" property="createName" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, alarm_type, alarm_content, devcode, alarm_time, alarm_value, status, CreatorName, create_time
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml b/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml
new file mode 100644
index 0000000..b4965d6
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml
@@ -0,0 +1,70 @@
+<?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.casic.missiles.mapper.BusConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.BusConfig">
+        <id column="id" property="id"/>
+        <result column="devcode" property="devcode"/>
+        <result column="config_json" property="configJson"/>
+        <result column="status" property="status"/>
+        <result column="send_time" property="sendTime"/>
+        <result column="create_time" property="createTime"/>
+        <result column="create_user_id" property="createUserId"/>
+    </resultMap>
+
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, Pid, devcode, config_json, status, update_time, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.model.BusConfig">
+        select bc.id,bc.devcode,config_type AS "configType", config_json AS "configJson",bc.status,
+        send_time as "sendTime",bc.create_time AS "createTime",bc.create_user_id AS "createUserId",
+        bc.create_user_name AS "createUserName",dg.deptid
+        FROM (
+            SELECT *
+            FROM bus_config
+            WHERE 1=1
+            <if test="request.configType != null and request.configType != '' ">
+                AND config_type =#{request.configType}
+            </if>
+            <if test="request.devcode != '' and request.devcode != null">
+                AND devcode =#{request.devcode}
+            </if>
+            <if test="request.status != '' and request.status != null">
+                AND status =#{request.status}
+            </if>
+            <if test="request.beginTime!='' and request.beginTime!=null">
+                AND send_time <![CDATA[  >=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.beginTime}"/>
+                </include>
+            </if>
+            <if test="request.endTime!='' and request.endTime!=null">
+                AND send_time <![CDATA[  <=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.endTime}"/>
+                </include>
+            </if>
+        )bc
+        JOIN device d ON d.devcode=bc.devcode
+        JOIN device_group dg ON dg.id= d.group_id
+
+    </select>
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml
new file mode 100644
index 0000000..083b289
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml
@@ -0,0 +1,106 @@
+<?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.casic.missiles.mapper.DeviceDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceData">
+        <id column="id" property="id"/>
+        <result column="devcode" property="devcode"/>
+        <result column="device_type" property="deviceType"/>
+        <result column="cell" property="cell"/>
+        <result column="data_json" property="dataJson"/>
+        <result column="decrypt_before_data" property="decryptBeforeData"/>
+        <result column="decrypt_after_data" property="decryptAfterData"/>
+        <result column="uptime" property="uptime"/>
+        <result column="logtime" property="logtime"/>
+    </resultMap>
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, devcode, device_type, cell, data_json, decrypt_before_data, decrypt_after_data, uptime, logtime
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.data.DeviceDataListVO">
+          SELECT  	dd.id,
+                    dd.devcode,
+                    dd.device_type AS "deviceType",
+                    deptid,
+                    dd.cell,
+                    dd.data_json AS "dataJson",
+                    decrypt_before_data AS "decryptBeforeData",
+                    decrypt_after_data AS "decryptAfterData",
+                    uptime,
+                    logtime,
+                    d.STATUS,
+                    d.group_id AS "groupId",
+                    dg.group_name AS "groupName"
+        FROM (
+               SELECT *
+               FROM device_data
+               WHERE  1=1
+                <if test="request.devcode!='' and request.devcode != null">
+                    AND devcode like CONCAT('%',#{request.devcode},'%')
+                </if>
+                <if test="request.deviceType!='' and request.deviceType != null">
+                    AND device_type =#{request.deviceType}
+                </if>
+                <if test="request.beginTime!='' and request.beginTime!=null">
+                    AND logtime <![CDATA[  >=  ]]>
+                    <include refid="char_toDate">
+                        <property name="paramStr" value="#{request.beginTime}"/>
+                    </include>
+                </if>
+                <if test="request.endTime!='' and request.endTime!=null">
+                    AND logtime <![CDATA[  <=  ]]>
+                    <include refid="char_toDate">
+                        <property name="paramStr" value="#{request.endTime}"/>
+                    </include>
+                </if>
+                <if test="request.ids != null">
+                    and id in
+                    <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                        #{id}
+                    </foreach>
+                </if>
+
+          )dd
+          JOIN (
+                SELECT id, group_id,status,devcode
+                FROM device
+                WHERE valid=1
+                <if test="request.devcode!='' and request.devcode != null">
+                    AND devcode like CONCAT('%',#{request.devcode},'%')
+                </if>
+                <if test="request.deviceType!='' and request.deviceType != null">
+                    AND device_type =#{request.deviceType}
+                </if>
+                <if test="request.groupId!='' and request.groupId != null">
+                    AND greoup_id=#{request.groupId}
+                </if>
+          )d ON d.devcode=dd.devcode
+          JOIN (
+                SELECT   deptid,id,group_name
+                FROM device_group
+                WHERE valid=1
+                <if test="request.groupId!='' and request.groupId != null">
+                    AND id=#{request.groupId}
+                </if>
+          ) dg ON dg.id=d.group_id
+          order by logtime desc
+
+    </select>
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml
new file mode 100644
index 0000000..2e07287
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml
@@ -0,0 +1,148 @@
+<?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.casic.missiles.mapper.DeviceGroupMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceGroup">
+        <id column="id" property="id" />
+        <result column="group_name" property="groupName" />
+        <result column="group_no" property="groupNo" />
+        <result column="descn" property="descn" />
+        <result column="deptid" property="deptid" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="owner" property="owner" />
+        <result column="valid" property="valid" />
+    </resultMap>
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, owner, subcribe_ids, descn, dept, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
+        SELECT
+            dg.id,
+            group_no AS "groupNo",
+            deptid,
+             deviceCount,
+            subscribeCount,
+            descn,
+            create_time AS "createTime",
+            group_name AS "groupName",
+            create_user_id AS "createUserId",
+            create_user_name AS "createUserName"
+        FROM
+          (
+             SELECT *
+             FROM device_group
+             WHERE valid = 1
+            <if test="request.groupNo != null and request.groupNo != '' ">
+                AND group_no =#{request.groupNo}
+            </if>
+            <if test="request.groupName != '' and request.groupName != null">
+                AND group_name =#{request.groupName}
+            </if>
+            <if test="request.ids != null">
+                and id in
+                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+            <if test="request.beginTime!='' and request.beginTime!=null">
+                AND create_time <![CDATA[  >=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.beginTime}"/>
+                </include>
+            </if>
+            <if test="request.endTime!='' and request.endTime!=null">
+                AND create_time <![CDATA[  <=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.endTime}"/>
+                </include>
+            </if>
+          ) dg
+            LEFT JOIN (
+                   SELECT count(id)  AS "deviceCount",group_id as groupId
+                   FROM device d
+                   WHERE VALID = 1
+                   GROUP BY group_id
+        ) d ON d.groupId = dg.id
+            LEFT JOIN (
+                 SELECT count(id)  AS "subscribeCount",group_id AS groupId
+                 FROM subscribe_store GROUP BY group_id
+           ) s ON s.groupId = dg.id
+         order by create_time desc
+    </select>
+
+    <select id="list" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
+        SELECT
+        dg.id,
+        group_no AS "groupNo",
+        deptid,
+        count( d.id ) AS "deviceCount",
+        count( s.id ) AS "subscribeCount",
+        descn,
+        create_time AS "createTime",
+        group_name AS "groupName"
+        FROM
+        (
+        SELECT *
+        FROM device_group
+        WHERE valid = 1
+        <if test="request.groupNo != null and request.groupNo != '' ">
+            AND group_no =#{request.groupNo}
+        </if>
+        <if test="request.groupName != '' and request.groupName != null">
+            AND group_name =#{request.groupName}
+        </if>
+        <if test="request.ids != null">
+            and id in
+            <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+        <if test="request.beginTime!='' and request.beginTime!=null">
+            AND create_time <![CDATA[  >=  ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{request.beginTime}"/>
+            </include>
+        </if>
+        <if test="request.endTime!='' and request.endTime!=null">
+            AND create_time <![CDATA[  <=  ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{request.endTime}"/>
+            </include>
+        </if>
+        ) dg
+        LEFT JOIN (
+            SELECT id, group_id AS "groupId"
+            FROM device d
+            WHERE VALID = 1
+        ) d ON d.groupId = dg.id
+        LEFT JOIN (
+            SELECT id, group_id AS "groupId"
+            FROM subscribe_store
+        ) s ON s.groupId = dg.id
+        GROUP BY dg.id
+        order by create_time desc
+    </select>
+
+    <select id="selectMaxNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(group_no, 12)), 0)
+        from device_group
+    </select>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
new file mode 100644
index 0000000..2c99706
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
@@ -0,0 +1,88 @@
+<?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.casic.missiles.mapper.DeviceMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.Device">
+        <id column="id" property="id" />
+        <result column="group_id" property="groupId" />
+        <result column="product_id" property="productId" />
+        <result column="devcode" property="devcode" />
+        <result column="device_type" property="deviceType" />
+        <result column="unit" property="unit" />
+        <result column="model" property="model" />
+        <result column="name" property="name" />
+        <result column="status" property="status" />
+        <result column="imei" property="imei" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="valid" property="valid" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, devcode, device_type, unit, name, product_id, status, imei, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.device.DeviceListVO">
+        SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime,
+        data_value AS "dataValue",model,imei,d.cell,name AS "deviceName",status,d.id,create_user_id AS "createUserId",
+        create_user_name AS "createUserName"
+        FROM (
+            SELECT *
+            FROM device
+            WHERE VALID=1
+            <if test="request.groupId!='' and request.groupId != null">
+                AND group_id =#{request.groupId}
+            </if>
+            <if test="request.devcode!='' and request.devcode != null">
+                AND devcode like CONCAT('%',#{request.devcode},'%')
+            </if>
+            <if test="request.imei!='' and request.imei != null">
+                AND imei like CONCAT('%',#{request.imei},'%')
+            </if>
+            <if test="request.deviceType!='' and request.deviceType != null">
+                AND device_type =#{request.deviceType}
+            </if>
+            <if test="request.status!='' and request.status != null">
+                AND status =#{request.status}
+            </if>
+            <if test="request.productId!='' and request.productId != null">
+                AND product_id =#{request.productId}
+            </if>
+            <if test="request.beginCell!='' and request.beginCell!=null">
+                AND cell <![CDATA[  >=  ]]> #{request.beginCell}
+
+            </if>
+            <if test="request.endCell!='' and request.endCell!=null">
+                AND cell <![CDATA[  <=  ]]> #{request.endCell}
+            </if>
+            <if test="request.ids != null">
+                and id in
+                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+            order by create_time desc
+        )d JOIN (
+            SELECT deptid,id
+            FROM device_group
+            WHERE VALID =1
+            <if test="request.groupId!='' and request.groupId != null">
+                AND id =#{request.groupId}
+            </if>
+        )dg ON dg.id=d.group_id
+        LEFT JOIN(
+            SELECT ddd.logtime AS logtime,data_value,ddd.devcode,cell
+            FROM device_data ddd
+            JOIN
+            (
+                SELECT Max(logtime) AS logtime,devcode
+                FROM  device_data
+                GROUP BY devcode
+            )dd  ON dd.logtime=ddd.logtime AND dd.devcode=ddd.devcode
+        )dd ON dd.devcode=d.devcode
+        order by create_time desc
+    </select>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml
new file mode 100644
index 0000000..a5bf5e7
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml
@@ -0,0 +1,20 @@
+<?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.casic.missiles.mapper.DeviceUpgradeTaskMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceUpgradeTask">
+        <id column="id" property="id" />
+        <result column="version_id" property="versionId" />
+        <result column="device_id" property="deviceId" />
+        <result column="status" property="status" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, version_id, device_id, status, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml
new file mode 100644
index 0000000..e39ec1f
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml
@@ -0,0 +1,23 @@
+<?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.casic.missiles.mapper.DeviceVersionMapper">
+
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceVersion">
+        <id column="Id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="version_file" property="versionFile" />
+        <result column="version" property="version" />
+        <result column="owner" property="owner" />
+        <result column="dscn" property="dscn" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        Id, product_id, version_file, version, owner, dscn, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductConfigItemMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductConfigItemMapper.xml
new file mode 100644
index 0000000..e2448be
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/ProductConfigItemMapper.xml
@@ -0,0 +1,22 @@
+<?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.casic.missiles.mapper.ProductConfigItemMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductConfigItem">
+        <id column="id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="param_name" property="paramName" />
+        <result column="param_code" property="paramCode" />
+        <result column="param_type" property="paramType" />
+        <result column="regular_expression" property="regularExpression" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, product_id, param_name, param_code, param_type, regular_expression, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductDataItemMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductDataItemMapper.xml
new file mode 100644
index 0000000..61a55ec
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/ProductDataItemMapper.xml
@@ -0,0 +1,21 @@
+<?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.casic.missiles.mapper.ProductDataItemMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductDataItem">
+        <id column="id" property="id" />
+        <result column="data_item_name" property="dataItemName" />
+        <result column="product_id" property="productId" />
+        <result column="data_item_type" property="dataItemType" />
+        <result column="data_item_field" property="dataItemField" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, data_item_name, product_id, data_item_type, data_item_field, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
new file mode 100644
index 0000000..26f3cb3
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
@@ -0,0 +1,30 @@
+<?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.casic.missiles.mapper.ProductInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductInfo">
+        <id column="Id" property="id" />
+        <result column="name" property="name" />
+        <result column="access_type" property="accessType" />
+        <result column="encipher_type" property="encipherType" />
+        <result column="descn" property="descn" />
+        <result column="product_type" property="productType" />
+        <result column="owners" property="owners" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_name" property="createUserName" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        Id, name, access_type, encipher_type, protocol_type, model, descn, product_type, owners, CreatorName, create_time, create_user_id
+    </sql>
+
+    <select id="selectMaxNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(product_no, 12)), 0)
+        from product_info
+    </select>
+
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/SubscribeStoreMapper.xml b/casic-iot-dao/src/main/resources/mapper/SubscribeStoreMapper.xml
new file mode 100644
index 0000000..415a670
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/SubscribeStoreMapper.xml
@@ -0,0 +1,61 @@
+<?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.casic.missiles.mapper.SubscribeStoreMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.SubscribeStore">
+        <id column="id" property="id"/>
+        <result column="subscribe_no" property="subscribeNo"/>
+        <result column="group_id" property="groupId"/>
+        <result column="message_type" property="messageType"/>
+        <result column="subscribe_type" property="subscribeType"/>
+        <result column="enable" property="enable"/>
+        <result column="subscribe_status" property="subscribeStatus"/>
+        <result column="subscribe_content_json" property="subscribeContentJson"/>
+        <result column="descn" property="descn"/>
+        <result column="create_time" property="createTime"/>
+        <result column="create_user_name" property="createUserName"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, message_type, subscribe_type, enable, subscribe_status, subscribe_content_json, descn, create_time, create_user_name
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.subscribe.SubscribeListVO">
+        SELECT message_type AS "messageType",create_time AS "createTime",subscribe_no AS
+            "subscribeNo",subscribe_content_json AS "subscribeContentJson",
+            subscribe_status AS "subscribeStatus",create_user_name AS "createUserName",
+           create_user_id AS "createUserId"
+        FROM (
+        SELECT *
+        FROM subscribe_store
+        WHERE 1=1
+        <if test="request.groupId!='' and request.groupId != null">
+            AND group_id =#{request.groupId}
+        </if>
+        <if test="request.messageType!='' and request.messageType != null">
+            AND message_type =#{request.messageType}
+        </if>
+        <if test="request.subscribeNo!='' and request.subscribeNo != null">
+            AND subscribe_no like CONCAT('%',#{request.subscribeNo},'%')
+        </if>
+        <if test="request.subscribeType!='' and request.subscribeType != null">
+            AND subscribe_type =#{request.subscribeType}
+        </if>
+        <if test="request.status!='' and request.status != null">
+            AND subscribe_status =#{request.status}
+        </if>
+        order by create_time desc
+        )d JOIN (
+        SELECT deptid,id
+        FROM device_group
+        WHERE VALID=1
+        <if test="request.groupId!='' and request.groupId != null">
+            AND id =#{request.groupId}
+        </if>
+        )dg ON dg.id=d.group_id
+        order by create_time desc
+    </select>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/common/SysCommonMapper.xml b/casic-iot-dao/src/main/resources/mapper/common/SysCommonMapper.xml
new file mode 100644
index 0000000..880f7d4
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/common/SysCommonMapper.xml
@@ -0,0 +1,21 @@
+<?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.casic.missiles.mapper.common.SysCommonMapper">
+
+    <select id="getDictMapByCode" resultType="java.util.Map">
+        SELECT  name,code
+        from sys_dict
+         where  pid=(
+            SELECT id
+            from  sys_dict
+            where  code=#{code}
+         )
+    </select>
+
+    <select id="getDeptMap" resultType="java.util.Map">
+        SELECT  id,SIMPLE_NAME AS  "simpleName"
+        from sys_dept
+    </select>
+
+
+</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/AlarmConfigMapper.xml b/casic-iot-dao/src/resource/mapper/AlarmConfigMapper.xml
deleted file mode 100644
index bd2c2cc..0000000
--- a/casic-iot-dao/src/resource/mapper/AlarmConfigMapper.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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.casic.missiles.mapper.AlarmConfigMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmConfig">
-        <id column="id" property="id" />
-        <result column="product_id" property="productId" />
-        <result column="name" property="name" />
-        <result column="alarm_content" property="alarmContent" />
-        <result column="period_high" property="periodHigh" />
-        <result column="period_low" property="periodLow" />
-        <result column="create_user_id" property="createUserId" />
-        <result column="create_time" property="createTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, name, product_id, alarm_content, period_high, period_low, TypeName, CreatorId, creater_user_id, create_time
-    </sql>
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/AlarmDataMapper.xml b/casic-iot-dao/src/resource/mapper/AlarmDataMapper.xml
deleted file mode 100644
index 4aee44a..0000000
--- a/casic-iot-dao/src/resource/mapper/AlarmDataMapper.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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.casic.missiles.mapper.AlarmDataMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmData">
-        <id column="id" property="id" />
-        <result column="alarm_type" property="alarmType" />
-        <result column="alarm_content" property="alarmContent" />
-        <result column="devcode" property="devcode" />
-        <result column="alarm_time" property="alarmTime" />
-        <result column="alarm_value" property="alarmValue" />
-        <result column="status" property="status" />
-        <result column="create_name" property="createName" />
-        <result column="create_time" property="createTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, alarm_type, alarm_content, devcode, alarm_time, alarm_value, status, CreatorName, create_time
-    </sql>
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/BusConfigMapper.xml b/casic-iot-dao/src/resource/mapper/BusConfigMapper.xml
deleted file mode 100644
index b4965d6..0000000
--- a/casic-iot-dao/src/resource/mapper/BusConfigMapper.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?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.casic.missiles.mapper.BusConfigMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.BusConfig">
-        <id column="id" property="id"/>
-        <result column="devcode" property="devcode"/>
-        <result column="config_json" property="configJson"/>
-        <result column="status" property="status"/>
-        <result column="send_time" property="sendTime"/>
-        <result column="create_time" property="createTime"/>
-        <result column="create_user_id" property="createUserId"/>
-    </resultMap>
-
-
-    <sql id="char_toDate" databaseId="mysql">
-        ${paramStr}
-    </sql>
-
-    <sql id="char_toDate" databaseId="pgsql">
-       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
-    </sql>
-
-    <sql id="char_toDate" databaseId="oracle">
-        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
-    </sql>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, Pid, devcode, config_json, status, update_time, create_time, create_user_id
-    </sql>
-
-    <select id="listPage" resultType="com.casic.missiles.model.BusConfig">
-        select bc.id,bc.devcode,config_type AS "configType", config_json AS "configJson",bc.status,
-        send_time as "sendTime",bc.create_time AS "createTime",bc.create_user_id AS "createUserId",
-        bc.create_user_name AS "createUserName",dg.deptid
-        FROM (
-            SELECT *
-            FROM bus_config
-            WHERE 1=1
-            <if test="request.configType != null and request.configType != '' ">
-                AND config_type =#{request.configType}
-            </if>
-            <if test="request.devcode != '' and request.devcode != null">
-                AND devcode =#{request.devcode}
-            </if>
-            <if test="request.status != '' and request.status != null">
-                AND status =#{request.status}
-            </if>
-            <if test="request.beginTime!='' and request.beginTime!=null">
-                AND send_time <![CDATA[  >=  ]]>
-                <include refid="char_toDate">
-                    <property name="paramStr" value="#{request.beginTime}"/>
-                </include>
-            </if>
-            <if test="request.endTime!='' and request.endTime!=null">
-                AND send_time <![CDATA[  <=  ]]>
-                <include refid="char_toDate">
-                    <property name="paramStr" value="#{request.endTime}"/>
-                </include>
-            </if>
-        )bc
-        JOIN device d ON d.devcode=bc.devcode
-        JOIN device_group dg ON dg.id= d.group_id
-
-    </select>
-
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml
deleted file mode 100644
index 083b289..0000000
--- a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?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.casic.missiles.mapper.DeviceDataMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceData">
-        <id column="id" property="id"/>
-        <result column="devcode" property="devcode"/>
-        <result column="device_type" property="deviceType"/>
-        <result column="cell" property="cell"/>
-        <result column="data_json" property="dataJson"/>
-        <result column="decrypt_before_data" property="decryptBeforeData"/>
-        <result column="decrypt_after_data" property="decryptAfterData"/>
-        <result column="uptime" property="uptime"/>
-        <result column="logtime" property="logtime"/>
-    </resultMap>
-
-    <sql id="char_toDate" databaseId="mysql">
-        ${paramStr}
-    </sql>
-
-    <sql id="char_toDate" databaseId="pgsql">
-       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
-    </sql>
-
-    <sql id="char_toDate" databaseId="oracle">
-        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
-    </sql>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, devcode, device_type, cell, data_json, decrypt_before_data, decrypt_after_data, uptime, logtime
-    </sql>
-
-    <select id="listPage" resultType="com.casic.missiles.dto.data.DeviceDataListVO">
-          SELECT  	dd.id,
-                    dd.devcode,
-                    dd.device_type AS "deviceType",
-                    deptid,
-                    dd.cell,
-                    dd.data_json AS "dataJson",
-                    decrypt_before_data AS "decryptBeforeData",
-                    decrypt_after_data AS "decryptAfterData",
-                    uptime,
-                    logtime,
-                    d.STATUS,
-                    d.group_id AS "groupId",
-                    dg.group_name AS "groupName"
-        FROM (
-               SELECT *
-               FROM device_data
-               WHERE  1=1
-                <if test="request.devcode!='' and request.devcode != null">
-                    AND devcode like CONCAT('%',#{request.devcode},'%')
-                </if>
-                <if test="request.deviceType!='' and request.deviceType != null">
-                    AND device_type =#{request.deviceType}
-                </if>
-                <if test="request.beginTime!='' and request.beginTime!=null">
-                    AND logtime <![CDATA[  >=  ]]>
-                    <include refid="char_toDate">
-                        <property name="paramStr" value="#{request.beginTime}"/>
-                    </include>
-                </if>
-                <if test="request.endTime!='' and request.endTime!=null">
-                    AND logtime <![CDATA[  <=  ]]>
-                    <include refid="char_toDate">
-                        <property name="paramStr" value="#{request.endTime}"/>
-                    </include>
-                </if>
-                <if test="request.ids != null">
-                    and id in
-                    <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
-                        #{id}
-                    </foreach>
-                </if>
-
-          )dd
-          JOIN (
-                SELECT id, group_id,status,devcode
-                FROM device
-                WHERE valid=1
-                <if test="request.devcode!='' and request.devcode != null">
-                    AND devcode like CONCAT('%',#{request.devcode},'%')
-                </if>
-                <if test="request.deviceType!='' and request.deviceType != null">
-                    AND device_type =#{request.deviceType}
-                </if>
-                <if test="request.groupId!='' and request.groupId != null">
-                    AND greoup_id=#{request.groupId}
-                </if>
-          )d ON d.devcode=dd.devcode
-          JOIN (
-                SELECT   deptid,id,group_name
-                FROM device_group
-                WHERE valid=1
-                <if test="request.groupId!='' and request.groupId != null">
-                    AND id=#{request.groupId}
-                </if>
-          ) dg ON dg.id=d.group_id
-          order by logtime desc
-
-    </select>
-
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml
deleted file mode 100644
index 2e07287..0000000
--- a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?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.casic.missiles.mapper.DeviceGroupMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceGroup">
-        <id column="id" property="id" />
-        <result column="group_name" property="groupName" />
-        <result column="group_no" property="groupNo" />
-        <result column="descn" property="descn" />
-        <result column="deptid" property="deptid" />
-        <result column="create_time" property="createTime" />
-        <result column="create_user_id" property="createUserId" />
-        <result column="owner" property="owner" />
-        <result column="valid" property="valid" />
-    </resultMap>
-
-    <sql id="char_toDate" databaseId="mysql">
-        ${paramStr}
-    </sql>
-
-    <sql id="char_toDate" databaseId="pgsql">
-       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
-    </sql>
-
-    <sql id="char_toDate" databaseId="oracle">
-        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
-    </sql>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, name, owner, subcribe_ids, descn, dept, create_time, create_user_id
-    </sql>
-
-    <select id="listPage" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
-        SELECT
-            dg.id,
-            group_no AS "groupNo",
-            deptid,
-             deviceCount,
-            subscribeCount,
-            descn,
-            create_time AS "createTime",
-            group_name AS "groupName",
-            create_user_id AS "createUserId",
-            create_user_name AS "createUserName"
-        FROM
-          (
-             SELECT *
-             FROM device_group
-             WHERE valid = 1
-            <if test="request.groupNo != null and request.groupNo != '' ">
-                AND group_no =#{request.groupNo}
-            </if>
-            <if test="request.groupName != '' and request.groupName != null">
-                AND group_name =#{request.groupName}
-            </if>
-            <if test="request.ids != null">
-                and id in
-                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
-                    #{id}
-                </foreach>
-            </if>
-            <if test="request.beginTime!='' and request.beginTime!=null">
-                AND create_time <![CDATA[  >=  ]]>
-                <include refid="char_toDate">
-                    <property name="paramStr" value="#{request.beginTime}"/>
-                </include>
-            </if>
-            <if test="request.endTime!='' and request.endTime!=null">
-                AND create_time <![CDATA[  <=  ]]>
-                <include refid="char_toDate">
-                    <property name="paramStr" value="#{request.endTime}"/>
-                </include>
-            </if>
-          ) dg
-            LEFT JOIN (
-                   SELECT count(id)  AS "deviceCount",group_id as groupId
-                   FROM device d
-                   WHERE VALID = 1
-                   GROUP BY group_id
-        ) d ON d.groupId = dg.id
-            LEFT JOIN (
-                 SELECT count(id)  AS "subscribeCount",group_id AS groupId
-                 FROM subscribe_store GROUP BY group_id
-           ) s ON s.groupId = dg.id
-         order by create_time desc
-    </select>
-
-    <select id="list" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
-        SELECT
-        dg.id,
-        group_no AS "groupNo",
-        deptid,
-        count( d.id ) AS "deviceCount",
-        count( s.id ) AS "subscribeCount",
-        descn,
-        create_time AS "createTime",
-        group_name AS "groupName"
-        FROM
-        (
-        SELECT *
-        FROM device_group
-        WHERE valid = 1
-        <if test="request.groupNo != null and request.groupNo != '' ">
-            AND group_no =#{request.groupNo}
-        </if>
-        <if test="request.groupName != '' and request.groupName != null">
-            AND group_name =#{request.groupName}
-        </if>
-        <if test="request.ids != null">
-            and id in
-            <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
-                #{id}
-            </foreach>
-        </if>
-        <if test="request.beginTime!='' and request.beginTime!=null">
-            AND create_time <![CDATA[  >=  ]]>
-            <include refid="char_toDate">
-                <property name="paramStr" value="#{request.beginTime}"/>
-            </include>
-        </if>
-        <if test="request.endTime!='' and request.endTime!=null">
-            AND create_time <![CDATA[  <=  ]]>
-            <include refid="char_toDate">
-                <property name="paramStr" value="#{request.endTime}"/>
-            </include>
-        </if>
-        ) dg
-        LEFT JOIN (
-            SELECT id, group_id AS "groupId"
-            FROM device d
-            WHERE VALID = 1
-        ) d ON d.groupId = dg.id
-        LEFT JOIN (
-            SELECT id, group_id AS "groupId"
-            FROM subscribe_store
-        ) s ON s.groupId = dg.id
-        GROUP BY dg.id
-        order by create_time desc
-    </select>
-
-    <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(group_no, 12)), 0)
-        from device_group
-    </select>
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/DeviceMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceMapper.xml
deleted file mode 100644
index 2c99706..0000000
--- a/casic-iot-dao/src/resource/mapper/DeviceMapper.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?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.casic.missiles.mapper.DeviceMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.Device">
-        <id column="id" property="id" />
-        <result column="group_id" property="groupId" />
-        <result column="product_id" property="productId" />
-        <result column="devcode" property="devcode" />
-        <result column="device_type" property="deviceType" />
-        <result column="unit" property="unit" />
-        <result column="model" property="model" />
-        <result column="name" property="name" />
-        <result column="status" property="status" />
-        <result column="imei" property="imei" />
-        <result column="create_time" property="createTime" />
-        <result column="create_user_name" property="createUserName" />
-        <result column="valid" property="valid" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, devcode, device_type, unit, name, product_id, status, imei, create_time, create_user_id
-    </sql>
-
-    <select id="listPage" resultType="com.casic.missiles.dto.device.DeviceListVO">
-        SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime,
-        data_value AS "dataValue",model,imei,d.cell,name AS "deviceName",status,d.id,create_user_id AS "createUserId",
-        create_user_name AS "createUserName"
-        FROM (
-            SELECT *
-            FROM device
-            WHERE VALID=1
-            <if test="request.groupId!='' and request.groupId != null">
-                AND group_id =#{request.groupId}
-            </if>
-            <if test="request.devcode!='' and request.devcode != null">
-                AND devcode like CONCAT('%',#{request.devcode},'%')
-            </if>
-            <if test="request.imei!='' and request.imei != null">
-                AND imei like CONCAT('%',#{request.imei},'%')
-            </if>
-            <if test="request.deviceType!='' and request.deviceType != null">
-                AND device_type =#{request.deviceType}
-            </if>
-            <if test="request.status!='' and request.status != null">
-                AND status =#{request.status}
-            </if>
-            <if test="request.productId!='' and request.productId != null">
-                AND product_id =#{request.productId}
-            </if>
-            <if test="request.beginCell!='' and request.beginCell!=null">
-                AND cell <![CDATA[  >=  ]]> #{request.beginCell}
-
-            </if>
-            <if test="request.endCell!='' and request.endCell!=null">
-                AND cell <![CDATA[  <=  ]]> #{request.endCell}
-            </if>
-            <if test="request.ids != null">
-                and id in
-                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
-                    #{id}
-                </foreach>
-            </if>
-            order by create_time desc
-        )d JOIN (
-            SELECT deptid,id
-            FROM device_group
-            WHERE VALID =1
-            <if test="request.groupId!='' and request.groupId != null">
-                AND id =#{request.groupId}
-            </if>
-        )dg ON dg.id=d.group_id
-        LEFT JOIN(
-            SELECT ddd.logtime AS logtime,data_value,ddd.devcode,cell
-            FROM device_data ddd
-            JOIN
-            (
-                SELECT Max(logtime) AS logtime,devcode
-                FROM  device_data
-                GROUP BY devcode
-            )dd  ON dd.logtime=ddd.logtime AND dd.devcode=ddd.devcode
-        )dd ON dd.devcode=d.devcode
-        order by create_time desc
-    </select>
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/DeviceUpgradeTaskMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceUpgradeTaskMapper.xml
deleted file mode 100644
index a5bf5e7..0000000
--- a/casic-iot-dao/src/resource/mapper/DeviceUpgradeTaskMapper.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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.casic.missiles.mapper.DeviceUpgradeTaskMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceUpgradeTask">
-        <id column="id" property="id" />
-        <result column="version_id" property="versionId" />
-        <result column="device_id" property="deviceId" />
-        <result column="status" property="status" />
-        <result column="create_time" property="createTime" />
-        <result column="create_user_id" property="createUserId" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, version_id, device_id, status, create_time, create_user_id
-    </sql>
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/DeviceVersionMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceVersionMapper.xml
deleted file mode 100644
index e39ec1f..0000000
--- a/casic-iot-dao/src/resource/mapper/DeviceVersionMapper.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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.casic.missiles.mapper.DeviceVersionMapper">
-
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceVersion">
-        <id column="Id" property="id" />
-        <result column="product_id" property="productId" />
-        <result column="version_file" property="versionFile" />
-        <result column="version" property="version" />
-        <result column="owner" property="owner" />
-        <result column="dscn" property="dscn" />
-        <result column="create_time" property="createTime" />
-        <result column="create_user_id" property="createUserId" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        Id, product_id, version_file, version, owner, dscn, create_time, create_user_id
-    </sql>
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/ProductConfigItemMapper.xml b/casic-iot-dao/src/resource/mapper/ProductConfigItemMapper.xml
deleted file mode 100644
index e2448be..0000000
--- a/casic-iot-dao/src/resource/mapper/ProductConfigItemMapper.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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.casic.missiles.mapper.ProductConfigItemMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductConfigItem">
-        <id column="id" property="id" />
-        <result column="product_id" property="productId" />
-        <result column="param_name" property="paramName" />
-        <result column="param_code" property="paramCode" />
-        <result column="param_type" property="paramType" />
-        <result column="regular_expression" property="regularExpression" />
-        <result column="create_time" property="createTime" />
-        <result column="create_user_id" property="createUserId" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, product_id, param_name, param_code, param_type, regular_expression, create_time, create_user_id
-    </sql>
-
-</mapper>

diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml
new file mode 100644
index 0000000..bd2c2cc
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml
@@ -0,0 +1,22 @@
+<?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.casic.missiles.mapper.AlarmConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmConfig">
+        <id column="id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="name" property="name" />
+        <result column="alarm_content" property="alarmContent" />
+        <result column="period_high" property="periodHigh" />
+        <result column="period_low" property="periodLow" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, product_id, alarm_content, period_high, period_low, TypeName, CreatorId, creater_user_id, create_time
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml
new file mode 100644
index 0000000..4aee44a
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml
@@ -0,0 +1,23 @@
+<?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.casic.missiles.mapper.AlarmDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmData">
+        <id column="id" property="id" />
+        <result column="alarm_type" property="alarmType" />
+        <result column="alarm_content" property="alarmContent" />
+        <result column="devcode" property="devcode" />
+        <result column="alarm_time" property="alarmTime" />
+        <result column="alarm_value" property="alarmValue" />
+        <result column="status" property="status" />
+        <result column="create_name" property="createName" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, alarm_type, alarm_content, devcode, alarm_time, alarm_value, status, CreatorName, create_time
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml b/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml
new file mode 100644
index 0000000..b4965d6
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml
@@ -0,0 +1,70 @@
+<?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.casic.missiles.mapper.BusConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.BusConfig">
+        <id column="id" property="id"/>
+        <result column="devcode" property="devcode"/>
+        <result column="config_json" property="configJson"/>
+        <result column="status" property="status"/>
+        <result column="send_time" property="sendTime"/>
+        <result column="create_time" property="createTime"/>
+        <result column="create_user_id" property="createUserId"/>
+    </resultMap>
+
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, Pid, devcode, config_json, status, update_time, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.model.BusConfig">
+        select bc.id,bc.devcode,config_type AS "configType", config_json AS "configJson",bc.status,
+        send_time as "sendTime",bc.create_time AS "createTime",bc.create_user_id AS "createUserId",
+        bc.create_user_name AS "createUserName",dg.deptid
+        FROM (
+            SELECT *
+            FROM bus_config
+            WHERE 1=1
+            <if test="request.configType != null and request.configType != '' ">
+                AND config_type =#{request.configType}
+            </if>
+            <if test="request.devcode != '' and request.devcode != null">
+                AND devcode =#{request.devcode}
+            </if>
+            <if test="request.status != '' and request.status != null">
+                AND status =#{request.status}
+            </if>
+            <if test="request.beginTime!='' and request.beginTime!=null">
+                AND send_time <![CDATA[  >=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.beginTime}"/>
+                </include>
+            </if>
+            <if test="request.endTime!='' and request.endTime!=null">
+                AND send_time <![CDATA[  <=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.endTime}"/>
+                </include>
+            </if>
+        )bc
+        JOIN device d ON d.devcode=bc.devcode
+        JOIN device_group dg ON dg.id= d.group_id
+
+    </select>
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml
new file mode 100644
index 0000000..083b289
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml
@@ -0,0 +1,106 @@
+<?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.casic.missiles.mapper.DeviceDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceData">
+        <id column="id" property="id"/>
+        <result column="devcode" property="devcode"/>
+        <result column="device_type" property="deviceType"/>
+        <result column="cell" property="cell"/>
+        <result column="data_json" property="dataJson"/>
+        <result column="decrypt_before_data" property="decryptBeforeData"/>
+        <result column="decrypt_after_data" property="decryptAfterData"/>
+        <result column="uptime" property="uptime"/>
+        <result column="logtime" property="logtime"/>
+    </resultMap>
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, devcode, device_type, cell, data_json, decrypt_before_data, decrypt_after_data, uptime, logtime
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.data.DeviceDataListVO">
+          SELECT  	dd.id,
+                    dd.devcode,
+                    dd.device_type AS "deviceType",
+                    deptid,
+                    dd.cell,
+                    dd.data_json AS "dataJson",
+                    decrypt_before_data AS "decryptBeforeData",
+                    decrypt_after_data AS "decryptAfterData",
+                    uptime,
+                    logtime,
+                    d.STATUS,
+                    d.group_id AS "groupId",
+                    dg.group_name AS "groupName"
+        FROM (
+               SELECT *
+               FROM device_data
+               WHERE  1=1
+                <if test="request.devcode!='' and request.devcode != null">
+                    AND devcode like CONCAT('%',#{request.devcode},'%')
+                </if>
+                <if test="request.deviceType!='' and request.deviceType != null">
+                    AND device_type =#{request.deviceType}
+                </if>
+                <if test="request.beginTime!='' and request.beginTime!=null">
+                    AND logtime <![CDATA[  >=  ]]>
+                    <include refid="char_toDate">
+                        <property name="paramStr" value="#{request.beginTime}"/>
+                    </include>
+                </if>
+                <if test="request.endTime!='' and request.endTime!=null">
+                    AND logtime <![CDATA[  <=  ]]>
+                    <include refid="char_toDate">
+                        <property name="paramStr" value="#{request.endTime}"/>
+                    </include>
+                </if>
+                <if test="request.ids != null">
+                    and id in
+                    <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                        #{id}
+                    </foreach>
+                </if>
+
+          )dd
+          JOIN (
+                SELECT id, group_id,status,devcode
+                FROM device
+                WHERE valid=1
+                <if test="request.devcode!='' and request.devcode != null">
+                    AND devcode like CONCAT('%',#{request.devcode},'%')
+                </if>
+                <if test="request.deviceType!='' and request.deviceType != null">
+                    AND device_type =#{request.deviceType}
+                </if>
+                <if test="request.groupId!='' and request.groupId != null">
+                    AND greoup_id=#{request.groupId}
+                </if>
+          )d ON d.devcode=dd.devcode
+          JOIN (
+                SELECT   deptid,id,group_name
+                FROM device_group
+                WHERE valid=1
+                <if test="request.groupId!='' and request.groupId != null">
+                    AND id=#{request.groupId}
+                </if>
+          ) dg ON dg.id=d.group_id
+          order by logtime desc
+
+    </select>
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml
new file mode 100644
index 0000000..2e07287
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml
@@ -0,0 +1,148 @@
+<?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.casic.missiles.mapper.DeviceGroupMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceGroup">
+        <id column="id" property="id" />
+        <result column="group_name" property="groupName" />
+        <result column="group_no" property="groupNo" />
+        <result column="descn" property="descn" />
+        <result column="deptid" property="deptid" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="owner" property="owner" />
+        <result column="valid" property="valid" />
+    </resultMap>
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, owner, subcribe_ids, descn, dept, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
+        SELECT
+            dg.id,
+            group_no AS "groupNo",
+            deptid,
+             deviceCount,
+            subscribeCount,
+            descn,
+            create_time AS "createTime",
+            group_name AS "groupName",
+            create_user_id AS "createUserId",
+            create_user_name AS "createUserName"
+        FROM
+          (
+             SELECT *
+             FROM device_group
+             WHERE valid = 1
+            <if test="request.groupNo != null and request.groupNo != '' ">
+                AND group_no =#{request.groupNo}
+            </if>
+            <if test="request.groupName != '' and request.groupName != null">
+                AND group_name =#{request.groupName}
+            </if>
+            <if test="request.ids != null">
+                and id in
+                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+            <if test="request.beginTime!='' and request.beginTime!=null">
+                AND create_time <![CDATA[  >=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.beginTime}"/>
+                </include>
+            </if>
+            <if test="request.endTime!='' and request.endTime!=null">
+                AND create_time <![CDATA[  <=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.endTime}"/>
+                </include>
+            </if>
+          ) dg
+            LEFT JOIN (
+                   SELECT count(id)  AS "deviceCount",group_id as groupId
+                   FROM device d
+                   WHERE VALID = 1
+                   GROUP BY group_id
+        ) d ON d.groupId = dg.id
+            LEFT JOIN (
+                 SELECT count(id)  AS "subscribeCount",group_id AS groupId
+                 FROM subscribe_store GROUP BY group_id
+           ) s ON s.groupId = dg.id
+         order by create_time desc
+    </select>
+
+    <select id="list" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
+        SELECT
+        dg.id,
+        group_no AS "groupNo",
+        deptid,
+        count( d.id ) AS "deviceCount",
+        count( s.id ) AS "subscribeCount",
+        descn,
+        create_time AS "createTime",
+        group_name AS "groupName"
+        FROM
+        (
+        SELECT *
+        FROM device_group
+        WHERE valid = 1
+        <if test="request.groupNo != null and request.groupNo != '' ">
+            AND group_no =#{request.groupNo}
+        </if>
+        <if test="request.groupName != '' and request.groupName != null">
+            AND group_name =#{request.groupName}
+        </if>
+        <if test="request.ids != null">
+            and id in
+            <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+        <if test="request.beginTime!='' and request.beginTime!=null">
+            AND create_time <![CDATA[  >=  ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{request.beginTime}"/>
+            </include>
+        </if>
+        <if test="request.endTime!='' and request.endTime!=null">
+            AND create_time <![CDATA[  <=  ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{request.endTime}"/>
+            </include>
+        </if>
+        ) dg
+        LEFT JOIN (
+            SELECT id, group_id AS "groupId"
+            FROM device d
+            WHERE VALID = 1
+        ) d ON d.groupId = dg.id
+        LEFT JOIN (
+            SELECT id, group_id AS "groupId"
+            FROM subscribe_store
+        ) s ON s.groupId = dg.id
+        GROUP BY dg.id
+        order by create_time desc
+    </select>
+
+    <select id="selectMaxNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(group_no, 12)), 0)
+        from device_group
+    </select>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
new file mode 100644
index 0000000..2c99706
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
@@ -0,0 +1,88 @@
+<?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.casic.missiles.mapper.DeviceMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.Device">
+        <id column="id" property="id" />
+        <result column="group_id" property="groupId" />
+        <result column="product_id" property="productId" />
+        <result column="devcode" property="devcode" />
+        <result column="device_type" property="deviceType" />
+        <result column="unit" property="unit" />
+        <result column="model" property="model" />
+        <result column="name" property="name" />
+        <result column="status" property="status" />
+        <result column="imei" property="imei" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="valid" property="valid" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, devcode, device_type, unit, name, product_id, status, imei, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.device.DeviceListVO">
+        SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime,
+        data_value AS "dataValue",model,imei,d.cell,name AS "deviceName",status,d.id,create_user_id AS "createUserId",
+        create_user_name AS "createUserName"
+        FROM (
+            SELECT *
+            FROM device
+            WHERE VALID=1
+            <if test="request.groupId!='' and request.groupId != null">
+                AND group_id =#{request.groupId}
+            </if>
+            <if test="request.devcode!='' and request.devcode != null">
+                AND devcode like CONCAT('%',#{request.devcode},'%')
+            </if>
+            <if test="request.imei!='' and request.imei != null">
+                AND imei like CONCAT('%',#{request.imei},'%')
+            </if>
+            <if test="request.deviceType!='' and request.deviceType != null">
+                AND device_type =#{request.deviceType}
+            </if>
+            <if test="request.status!='' and request.status != null">
+                AND status =#{request.status}
+            </if>
+            <if test="request.productId!='' and request.productId != null">
+                AND product_id =#{request.productId}
+            </if>
+            <if test="request.beginCell!='' and request.beginCell!=null">
+                AND cell <![CDATA[  >=  ]]> #{request.beginCell}
+
+            </if>
+            <if test="request.endCell!='' and request.endCell!=null">
+                AND cell <![CDATA[  <=  ]]> #{request.endCell}
+            </if>
+            <if test="request.ids != null">
+                and id in
+                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+            order by create_time desc
+        )d JOIN (
+            SELECT deptid,id
+            FROM device_group
+            WHERE VALID =1
+            <if test="request.groupId!='' and request.groupId != null">
+                AND id =#{request.groupId}
+            </if>
+        )dg ON dg.id=d.group_id
+        LEFT JOIN(
+            SELECT ddd.logtime AS logtime,data_value,ddd.devcode,cell
+            FROM device_data ddd
+            JOIN
+            (
+                SELECT Max(logtime) AS logtime,devcode
+                FROM  device_data
+                GROUP BY devcode
+            )dd  ON dd.logtime=ddd.logtime AND dd.devcode=ddd.devcode
+        )dd ON dd.devcode=d.devcode
+        order by create_time desc
+    </select>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml
new file mode 100644
index 0000000..a5bf5e7
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml
@@ -0,0 +1,20 @@
+<?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.casic.missiles.mapper.DeviceUpgradeTaskMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceUpgradeTask">
+        <id column="id" property="id" />
+        <result column="version_id" property="versionId" />
+        <result column="device_id" property="deviceId" />
+        <result column="status" property="status" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, version_id, device_id, status, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml
new file mode 100644
index 0000000..e39ec1f
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml
@@ -0,0 +1,23 @@
+<?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.casic.missiles.mapper.DeviceVersionMapper">
+
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceVersion">
+        <id column="Id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="version_file" property="versionFile" />
+        <result column="version" property="version" />
+        <result column="owner" property="owner" />
+        <result column="dscn" property="dscn" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        Id, product_id, version_file, version, owner, dscn, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductConfigItemMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductConfigItemMapper.xml
new file mode 100644
index 0000000..e2448be
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/ProductConfigItemMapper.xml
@@ -0,0 +1,22 @@
+<?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.casic.missiles.mapper.ProductConfigItemMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductConfigItem">
+        <id column="id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="param_name" property="paramName" />
+        <result column="param_code" property="paramCode" />
+        <result column="param_type" property="paramType" />
+        <result column="regular_expression" property="regularExpression" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, product_id, param_name, param_code, param_type, regular_expression, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductDataItemMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductDataItemMapper.xml
new file mode 100644
index 0000000..61a55ec
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/ProductDataItemMapper.xml
@@ -0,0 +1,21 @@
+<?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.casic.missiles.mapper.ProductDataItemMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductDataItem">
+        <id column="id" property="id" />
+        <result column="data_item_name" property="dataItemName" />
+        <result column="product_id" property="productId" />
+        <result column="data_item_type" property="dataItemType" />
+        <result column="data_item_field" property="dataItemField" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, data_item_name, product_id, data_item_type, data_item_field, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
new file mode 100644
index 0000000..26f3cb3
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
@@ -0,0 +1,30 @@
+<?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.casic.missiles.mapper.ProductInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductInfo">
+        <id column="Id" property="id" />
+        <result column="name" property="name" />
+        <result column="access_type" property="accessType" />
+        <result column="encipher_type" property="encipherType" />
+        <result column="descn" property="descn" />
+        <result column="product_type" property="productType" />
+        <result column="owners" property="owners" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_name" property="createUserName" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        Id, name, access_type, encipher_type, protocol_type, model, descn, product_type, owners, CreatorName, create_time, create_user_id
+    </sql>
+
+    <select id="selectMaxNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(product_no, 12)), 0)
+        from product_info
+    </select>
+
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/SubscribeStoreMapper.xml b/casic-iot-dao/src/main/resources/mapper/SubscribeStoreMapper.xml
new file mode 100644
index 0000000..415a670
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/SubscribeStoreMapper.xml
@@ -0,0 +1,61 @@
+<?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.casic.missiles.mapper.SubscribeStoreMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.SubscribeStore">
+        <id column="id" property="id"/>
+        <result column="subscribe_no" property="subscribeNo"/>
+        <result column="group_id" property="groupId"/>
+        <result column="message_type" property="messageType"/>
+        <result column="subscribe_type" property="subscribeType"/>
+        <result column="enable" property="enable"/>
+        <result column="subscribe_status" property="subscribeStatus"/>
+        <result column="subscribe_content_json" property="subscribeContentJson"/>
+        <result column="descn" property="descn"/>
+        <result column="create_time" property="createTime"/>
+        <result column="create_user_name" property="createUserName"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, message_type, subscribe_type, enable, subscribe_status, subscribe_content_json, descn, create_time, create_user_name
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.subscribe.SubscribeListVO">
+        SELECT message_type AS "messageType",create_time AS "createTime",subscribe_no AS
+            "subscribeNo",subscribe_content_json AS "subscribeContentJson",
+            subscribe_status AS "subscribeStatus",create_user_name AS "createUserName",
+           create_user_id AS "createUserId"
+        FROM (
+        SELECT *
+        FROM subscribe_store
+        WHERE 1=1
+        <if test="request.groupId!='' and request.groupId != null">
+            AND group_id =#{request.groupId}
+        </if>
+        <if test="request.messageType!='' and request.messageType != null">
+            AND message_type =#{request.messageType}
+        </if>
+        <if test="request.subscribeNo!='' and request.subscribeNo != null">
+            AND subscribe_no like CONCAT('%',#{request.subscribeNo},'%')
+        </if>
+        <if test="request.subscribeType!='' and request.subscribeType != null">
+            AND subscribe_type =#{request.subscribeType}
+        </if>
+        <if test="request.status!='' and request.status != null">
+            AND subscribe_status =#{request.status}
+        </if>
+        order by create_time desc
+        )d JOIN (
+        SELECT deptid,id
+        FROM device_group
+        WHERE VALID=1
+        <if test="request.groupId!='' and request.groupId != null">
+            AND id =#{request.groupId}
+        </if>
+        )dg ON dg.id=d.group_id
+        order by create_time desc
+    </select>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/common/SysCommonMapper.xml b/casic-iot-dao/src/main/resources/mapper/common/SysCommonMapper.xml
new file mode 100644
index 0000000..880f7d4
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/common/SysCommonMapper.xml
@@ -0,0 +1,21 @@
+<?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.casic.missiles.mapper.common.SysCommonMapper">
+
+    <select id="getDictMapByCode" resultType="java.util.Map">
+        SELECT  name,code
+        from sys_dict
+         where  pid=(
+            SELECT id
+            from  sys_dict
+            where  code=#{code}
+         )
+    </select>
+
+    <select id="getDeptMap" resultType="java.util.Map">
+        SELECT  id,SIMPLE_NAME AS  "simpleName"
+        from sys_dept
+    </select>
+
+
+</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/AlarmConfigMapper.xml b/casic-iot-dao/src/resource/mapper/AlarmConfigMapper.xml
deleted file mode 100644
index bd2c2cc..0000000
--- a/casic-iot-dao/src/resource/mapper/AlarmConfigMapper.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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.casic.missiles.mapper.AlarmConfigMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmConfig">
-        <id column="id" property="id" />
-        <result column="product_id" property="productId" />
-        <result column="name" property="name" />
-        <result column="alarm_content" property="alarmContent" />
-        <result column="period_high" property="periodHigh" />
-        <result column="period_low" property="periodLow" />
-        <result column="create_user_id" property="createUserId" />
-        <result column="create_time" property="createTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, name, product_id, alarm_content, period_high, period_low, TypeName, CreatorId, creater_user_id, create_time
-    </sql>
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/AlarmDataMapper.xml b/casic-iot-dao/src/resource/mapper/AlarmDataMapper.xml
deleted file mode 100644
index 4aee44a..0000000
--- a/casic-iot-dao/src/resource/mapper/AlarmDataMapper.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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.casic.missiles.mapper.AlarmDataMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmData">
-        <id column="id" property="id" />
-        <result column="alarm_type" property="alarmType" />
-        <result column="alarm_content" property="alarmContent" />
-        <result column="devcode" property="devcode" />
-        <result column="alarm_time" property="alarmTime" />
-        <result column="alarm_value" property="alarmValue" />
-        <result column="status" property="status" />
-        <result column="create_name" property="createName" />
-        <result column="create_time" property="createTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, alarm_type, alarm_content, devcode, alarm_time, alarm_value, status, CreatorName, create_time
-    </sql>
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/BusConfigMapper.xml b/casic-iot-dao/src/resource/mapper/BusConfigMapper.xml
deleted file mode 100644
index b4965d6..0000000
--- a/casic-iot-dao/src/resource/mapper/BusConfigMapper.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?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.casic.missiles.mapper.BusConfigMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.BusConfig">
-        <id column="id" property="id"/>
-        <result column="devcode" property="devcode"/>
-        <result column="config_json" property="configJson"/>
-        <result column="status" property="status"/>
-        <result column="send_time" property="sendTime"/>
-        <result column="create_time" property="createTime"/>
-        <result column="create_user_id" property="createUserId"/>
-    </resultMap>
-
-
-    <sql id="char_toDate" databaseId="mysql">
-        ${paramStr}
-    </sql>
-
-    <sql id="char_toDate" databaseId="pgsql">
-       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
-    </sql>
-
-    <sql id="char_toDate" databaseId="oracle">
-        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
-    </sql>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, Pid, devcode, config_json, status, update_time, create_time, create_user_id
-    </sql>
-
-    <select id="listPage" resultType="com.casic.missiles.model.BusConfig">
-        select bc.id,bc.devcode,config_type AS "configType", config_json AS "configJson",bc.status,
-        send_time as "sendTime",bc.create_time AS "createTime",bc.create_user_id AS "createUserId",
-        bc.create_user_name AS "createUserName",dg.deptid
-        FROM (
-            SELECT *
-            FROM bus_config
-            WHERE 1=1
-            <if test="request.configType != null and request.configType != '' ">
-                AND config_type =#{request.configType}
-            </if>
-            <if test="request.devcode != '' and request.devcode != null">
-                AND devcode =#{request.devcode}
-            </if>
-            <if test="request.status != '' and request.status != null">
-                AND status =#{request.status}
-            </if>
-            <if test="request.beginTime!='' and request.beginTime!=null">
-                AND send_time <![CDATA[  >=  ]]>
-                <include refid="char_toDate">
-                    <property name="paramStr" value="#{request.beginTime}"/>
-                </include>
-            </if>
-            <if test="request.endTime!='' and request.endTime!=null">
-                AND send_time <![CDATA[  <=  ]]>
-                <include refid="char_toDate">
-                    <property name="paramStr" value="#{request.endTime}"/>
-                </include>
-            </if>
-        )bc
-        JOIN device d ON d.devcode=bc.devcode
-        JOIN device_group dg ON dg.id= d.group_id
-
-    </select>
-
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml
deleted file mode 100644
index 083b289..0000000
--- a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?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.casic.missiles.mapper.DeviceDataMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceData">
-        <id column="id" property="id"/>
-        <result column="devcode" property="devcode"/>
-        <result column="device_type" property="deviceType"/>
-        <result column="cell" property="cell"/>
-        <result column="data_json" property="dataJson"/>
-        <result column="decrypt_before_data" property="decryptBeforeData"/>
-        <result column="decrypt_after_data" property="decryptAfterData"/>
-        <result column="uptime" property="uptime"/>
-        <result column="logtime" property="logtime"/>
-    </resultMap>
-
-    <sql id="char_toDate" databaseId="mysql">
-        ${paramStr}
-    </sql>
-
-    <sql id="char_toDate" databaseId="pgsql">
-       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
-    </sql>
-
-    <sql id="char_toDate" databaseId="oracle">
-        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
-    </sql>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, devcode, device_type, cell, data_json, decrypt_before_data, decrypt_after_data, uptime, logtime
-    </sql>
-
-    <select id="listPage" resultType="com.casic.missiles.dto.data.DeviceDataListVO">
-          SELECT  	dd.id,
-                    dd.devcode,
-                    dd.device_type AS "deviceType",
-                    deptid,
-                    dd.cell,
-                    dd.data_json AS "dataJson",
-                    decrypt_before_data AS "decryptBeforeData",
-                    decrypt_after_data AS "decryptAfterData",
-                    uptime,
-                    logtime,
-                    d.STATUS,
-                    d.group_id AS "groupId",
-                    dg.group_name AS "groupName"
-        FROM (
-               SELECT *
-               FROM device_data
-               WHERE  1=1
-                <if test="request.devcode!='' and request.devcode != null">
-                    AND devcode like CONCAT('%',#{request.devcode},'%')
-                </if>
-                <if test="request.deviceType!='' and request.deviceType != null">
-                    AND device_type =#{request.deviceType}
-                </if>
-                <if test="request.beginTime!='' and request.beginTime!=null">
-                    AND logtime <![CDATA[  >=  ]]>
-                    <include refid="char_toDate">
-                        <property name="paramStr" value="#{request.beginTime}"/>
-                    </include>
-                </if>
-                <if test="request.endTime!='' and request.endTime!=null">
-                    AND logtime <![CDATA[  <=  ]]>
-                    <include refid="char_toDate">
-                        <property name="paramStr" value="#{request.endTime}"/>
-                    </include>
-                </if>
-                <if test="request.ids != null">
-                    and id in
-                    <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
-                        #{id}
-                    </foreach>
-                </if>
-
-          )dd
-          JOIN (
-                SELECT id, group_id,status,devcode
-                FROM device
-                WHERE valid=1
-                <if test="request.devcode!='' and request.devcode != null">
-                    AND devcode like CONCAT('%',#{request.devcode},'%')
-                </if>
-                <if test="request.deviceType!='' and request.deviceType != null">
-                    AND device_type =#{request.deviceType}
-                </if>
-                <if test="request.groupId!='' and request.groupId != null">
-                    AND greoup_id=#{request.groupId}
-                </if>
-          )d ON d.devcode=dd.devcode
-          JOIN (
-                SELECT   deptid,id,group_name
-                FROM device_group
-                WHERE valid=1
-                <if test="request.groupId!='' and request.groupId != null">
-                    AND id=#{request.groupId}
-                </if>
-          ) dg ON dg.id=d.group_id
-          order by logtime desc
-
-    </select>
-
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml
deleted file mode 100644
index 2e07287..0000000
--- a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?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.casic.missiles.mapper.DeviceGroupMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceGroup">
-        <id column="id" property="id" />
-        <result column="group_name" property="groupName" />
-        <result column="group_no" property="groupNo" />
-        <result column="descn" property="descn" />
-        <result column="deptid" property="deptid" />
-        <result column="create_time" property="createTime" />
-        <result column="create_user_id" property="createUserId" />
-        <result column="owner" property="owner" />
-        <result column="valid" property="valid" />
-    </resultMap>
-
-    <sql id="char_toDate" databaseId="mysql">
-        ${paramStr}
-    </sql>
-
-    <sql id="char_toDate" databaseId="pgsql">
-       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
-    </sql>
-
-    <sql id="char_toDate" databaseId="oracle">
-        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
-    </sql>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, name, owner, subcribe_ids, descn, dept, create_time, create_user_id
-    </sql>
-
-    <select id="listPage" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
-        SELECT
-            dg.id,
-            group_no AS "groupNo",
-            deptid,
-             deviceCount,
-            subscribeCount,
-            descn,
-            create_time AS "createTime",
-            group_name AS "groupName",
-            create_user_id AS "createUserId",
-            create_user_name AS "createUserName"
-        FROM
-          (
-             SELECT *
-             FROM device_group
-             WHERE valid = 1
-            <if test="request.groupNo != null and request.groupNo != '' ">
-                AND group_no =#{request.groupNo}
-            </if>
-            <if test="request.groupName != '' and request.groupName != null">
-                AND group_name =#{request.groupName}
-            </if>
-            <if test="request.ids != null">
-                and id in
-                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
-                    #{id}
-                </foreach>
-            </if>
-            <if test="request.beginTime!='' and request.beginTime!=null">
-                AND create_time <![CDATA[  >=  ]]>
-                <include refid="char_toDate">
-                    <property name="paramStr" value="#{request.beginTime}"/>
-                </include>
-            </if>
-            <if test="request.endTime!='' and request.endTime!=null">
-                AND create_time <![CDATA[  <=  ]]>
-                <include refid="char_toDate">
-                    <property name="paramStr" value="#{request.endTime}"/>
-                </include>
-            </if>
-          ) dg
-            LEFT JOIN (
-                   SELECT count(id)  AS "deviceCount",group_id as groupId
-                   FROM device d
-                   WHERE VALID = 1
-                   GROUP BY group_id
-        ) d ON d.groupId = dg.id
-            LEFT JOIN (
-                 SELECT count(id)  AS "subscribeCount",group_id AS groupId
-                 FROM subscribe_store GROUP BY group_id
-           ) s ON s.groupId = dg.id
-         order by create_time desc
-    </select>
-
-    <select id="list" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
-        SELECT
-        dg.id,
-        group_no AS "groupNo",
-        deptid,
-        count( d.id ) AS "deviceCount",
-        count( s.id ) AS "subscribeCount",
-        descn,
-        create_time AS "createTime",
-        group_name AS "groupName"
-        FROM
-        (
-        SELECT *
-        FROM device_group
-        WHERE valid = 1
-        <if test="request.groupNo != null and request.groupNo != '' ">
-            AND group_no =#{request.groupNo}
-        </if>
-        <if test="request.groupName != '' and request.groupName != null">
-            AND group_name =#{request.groupName}
-        </if>
-        <if test="request.ids != null">
-            and id in
-            <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
-                #{id}
-            </foreach>
-        </if>
-        <if test="request.beginTime!='' and request.beginTime!=null">
-            AND create_time <![CDATA[  >=  ]]>
-            <include refid="char_toDate">
-                <property name="paramStr" value="#{request.beginTime}"/>
-            </include>
-        </if>
-        <if test="request.endTime!='' and request.endTime!=null">
-            AND create_time <![CDATA[  <=  ]]>
-            <include refid="char_toDate">
-                <property name="paramStr" value="#{request.endTime}"/>
-            </include>
-        </if>
-        ) dg
-        LEFT JOIN (
-            SELECT id, group_id AS "groupId"
-            FROM device d
-            WHERE VALID = 1
-        ) d ON d.groupId = dg.id
-        LEFT JOIN (
-            SELECT id, group_id AS "groupId"
-            FROM subscribe_store
-        ) s ON s.groupId = dg.id
-        GROUP BY dg.id
-        order by create_time desc
-    </select>
-
-    <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(group_no, 12)), 0)
-        from device_group
-    </select>
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/DeviceMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceMapper.xml
deleted file mode 100644
index 2c99706..0000000
--- a/casic-iot-dao/src/resource/mapper/DeviceMapper.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?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.casic.missiles.mapper.DeviceMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.Device">
-        <id column="id" property="id" />
-        <result column="group_id" property="groupId" />
-        <result column="product_id" property="productId" />
-        <result column="devcode" property="devcode" />
-        <result column="device_type" property="deviceType" />
-        <result column="unit" property="unit" />
-        <result column="model" property="model" />
-        <result column="name" property="name" />
-        <result column="status" property="status" />
-        <result column="imei" property="imei" />
-        <result column="create_time" property="createTime" />
-        <result column="create_user_name" property="createUserName" />
-        <result column="valid" property="valid" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, devcode, device_type, unit, name, product_id, status, imei, create_time, create_user_id
-    </sql>
-
-    <select id="listPage" resultType="com.casic.missiles.dto.device.DeviceListVO">
-        SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime,
-        data_value AS "dataValue",model,imei,d.cell,name AS "deviceName",status,d.id,create_user_id AS "createUserId",
-        create_user_name AS "createUserName"
-        FROM (
-            SELECT *
-            FROM device
-            WHERE VALID=1
-            <if test="request.groupId!='' and request.groupId != null">
-                AND group_id =#{request.groupId}
-            </if>
-            <if test="request.devcode!='' and request.devcode != null">
-                AND devcode like CONCAT('%',#{request.devcode},'%')
-            </if>
-            <if test="request.imei!='' and request.imei != null">
-                AND imei like CONCAT('%',#{request.imei},'%')
-            </if>
-            <if test="request.deviceType!='' and request.deviceType != null">
-                AND device_type =#{request.deviceType}
-            </if>
-            <if test="request.status!='' and request.status != null">
-                AND status =#{request.status}
-            </if>
-            <if test="request.productId!='' and request.productId != null">
-                AND product_id =#{request.productId}
-            </if>
-            <if test="request.beginCell!='' and request.beginCell!=null">
-                AND cell <![CDATA[  >=  ]]> #{request.beginCell}
-
-            </if>
-            <if test="request.endCell!='' and request.endCell!=null">
-                AND cell <![CDATA[  <=  ]]> #{request.endCell}
-            </if>
-            <if test="request.ids != null">
-                and id in
-                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
-                    #{id}
-                </foreach>
-            </if>
-            order by create_time desc
-        )d JOIN (
-            SELECT deptid,id
-            FROM device_group
-            WHERE VALID =1
-            <if test="request.groupId!='' and request.groupId != null">
-                AND id =#{request.groupId}
-            </if>
-        )dg ON dg.id=d.group_id
-        LEFT JOIN(
-            SELECT ddd.logtime AS logtime,data_value,ddd.devcode,cell
-            FROM device_data ddd
-            JOIN
-            (
-                SELECT Max(logtime) AS logtime,devcode
-                FROM  device_data
-                GROUP BY devcode
-            )dd  ON dd.logtime=ddd.logtime AND dd.devcode=ddd.devcode
-        )dd ON dd.devcode=d.devcode
-        order by create_time desc
-    </select>
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/DeviceUpgradeTaskMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceUpgradeTaskMapper.xml
deleted file mode 100644
index a5bf5e7..0000000
--- a/casic-iot-dao/src/resource/mapper/DeviceUpgradeTaskMapper.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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.casic.missiles.mapper.DeviceUpgradeTaskMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceUpgradeTask">
-        <id column="id" property="id" />
-        <result column="version_id" property="versionId" />
-        <result column="device_id" property="deviceId" />
-        <result column="status" property="status" />
-        <result column="create_time" property="createTime" />
-        <result column="create_user_id" property="createUserId" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, version_id, device_id, status, create_time, create_user_id
-    </sql>
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/DeviceVersionMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceVersionMapper.xml
deleted file mode 100644
index e39ec1f..0000000
--- a/casic-iot-dao/src/resource/mapper/DeviceVersionMapper.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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.casic.missiles.mapper.DeviceVersionMapper">
-
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceVersion">
-        <id column="Id" property="id" />
-        <result column="product_id" property="productId" />
-        <result column="version_file" property="versionFile" />
-        <result column="version" property="version" />
-        <result column="owner" property="owner" />
-        <result column="dscn" property="dscn" />
-        <result column="create_time" property="createTime" />
-        <result column="create_user_id" property="createUserId" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        Id, product_id, version_file, version, owner, dscn, create_time, create_user_id
-    </sql>
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/ProductConfigItemMapper.xml b/casic-iot-dao/src/resource/mapper/ProductConfigItemMapper.xml
deleted file mode 100644
index e2448be..0000000
--- a/casic-iot-dao/src/resource/mapper/ProductConfigItemMapper.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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.casic.missiles.mapper.ProductConfigItemMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductConfigItem">
-        <id column="id" property="id" />
-        <result column="product_id" property="productId" />
-        <result column="param_name" property="paramName" />
-        <result column="param_code" property="paramCode" />
-        <result column="param_type" property="paramType" />
-        <result column="regular_expression" property="regularExpression" />
-        <result column="create_time" property="createTime" />
-        <result column="create_user_id" property="createUserId" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, product_id, param_name, param_code, param_type, regular_expression, create_time, create_user_id
-    </sql>
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/ProductDataItemMapper.xml b/casic-iot-dao/src/resource/mapper/ProductDataItemMapper.xml
deleted file mode 100644
index 61a55ec..0000000
--- a/casic-iot-dao/src/resource/mapper/ProductDataItemMapper.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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.casic.missiles.mapper.ProductDataItemMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductDataItem">
-        <id column="id" property="id" />
-        <result column="data_item_name" property="dataItemName" />
-        <result column="product_id" property="productId" />
-        <result column="data_item_type" property="dataItemType" />
-        <result column="data_item_field" property="dataItemField" />
-        <result column="create_time" property="createTime" />
-        <result column="create_user_id" property="createUserId" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, data_item_name, product_id, data_item_type, data_item_field, create_time, create_user_id
-    </sql>
-
-</mapper>

diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml
new file mode 100644
index 0000000..bd2c2cc
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml
@@ -0,0 +1,22 @@
+<?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.casic.missiles.mapper.AlarmConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmConfig">
+        <id column="id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="name" property="name" />
+        <result column="alarm_content" property="alarmContent" />
+        <result column="period_high" property="periodHigh" />
+        <result column="period_low" property="periodLow" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, product_id, alarm_content, period_high, period_low, TypeName, CreatorId, creater_user_id, create_time
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml
new file mode 100644
index 0000000..4aee44a
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml
@@ -0,0 +1,23 @@
+<?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.casic.missiles.mapper.AlarmDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmData">
+        <id column="id" property="id" />
+        <result column="alarm_type" property="alarmType" />
+        <result column="alarm_content" property="alarmContent" />
+        <result column="devcode" property="devcode" />
+        <result column="alarm_time" property="alarmTime" />
+        <result column="alarm_value" property="alarmValue" />
+        <result column="status" property="status" />
+        <result column="create_name" property="createName" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, alarm_type, alarm_content, devcode, alarm_time, alarm_value, status, CreatorName, create_time
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml b/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml
new file mode 100644
index 0000000..b4965d6
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml
@@ -0,0 +1,70 @@
+<?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.casic.missiles.mapper.BusConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.BusConfig">
+        <id column="id" property="id"/>
+        <result column="devcode" property="devcode"/>
+        <result column="config_json" property="configJson"/>
+        <result column="status" property="status"/>
+        <result column="send_time" property="sendTime"/>
+        <result column="create_time" property="createTime"/>
+        <result column="create_user_id" property="createUserId"/>
+    </resultMap>
+
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, Pid, devcode, config_json, status, update_time, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.model.BusConfig">
+        select bc.id,bc.devcode,config_type AS "configType", config_json AS "configJson",bc.status,
+        send_time as "sendTime",bc.create_time AS "createTime",bc.create_user_id AS "createUserId",
+        bc.create_user_name AS "createUserName",dg.deptid
+        FROM (
+            SELECT *
+            FROM bus_config
+            WHERE 1=1
+            <if test="request.configType != null and request.configType != '' ">
+                AND config_type =#{request.configType}
+            </if>
+            <if test="request.devcode != '' and request.devcode != null">
+                AND devcode =#{request.devcode}
+            </if>
+            <if test="request.status != '' and request.status != null">
+                AND status =#{request.status}
+            </if>
+            <if test="request.beginTime!='' and request.beginTime!=null">
+                AND send_time <![CDATA[  >=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.beginTime}"/>
+                </include>
+            </if>
+            <if test="request.endTime!='' and request.endTime!=null">
+                AND send_time <![CDATA[  <=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.endTime}"/>
+                </include>
+            </if>
+        )bc
+        JOIN device d ON d.devcode=bc.devcode
+        JOIN device_group dg ON dg.id= d.group_id
+
+    </select>
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml
new file mode 100644
index 0000000..083b289
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml
@@ -0,0 +1,106 @@
+<?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.casic.missiles.mapper.DeviceDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceData">
+        <id column="id" property="id"/>
+        <result column="devcode" property="devcode"/>
+        <result column="device_type" property="deviceType"/>
+        <result column="cell" property="cell"/>
+        <result column="data_json" property="dataJson"/>
+        <result column="decrypt_before_data" property="decryptBeforeData"/>
+        <result column="decrypt_after_data" property="decryptAfterData"/>
+        <result column="uptime" property="uptime"/>
+        <result column="logtime" property="logtime"/>
+    </resultMap>
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, devcode, device_type, cell, data_json, decrypt_before_data, decrypt_after_data, uptime, logtime
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.data.DeviceDataListVO">
+          SELECT  	dd.id,
+                    dd.devcode,
+                    dd.device_type AS "deviceType",
+                    deptid,
+                    dd.cell,
+                    dd.data_json AS "dataJson",
+                    decrypt_before_data AS "decryptBeforeData",
+                    decrypt_after_data AS "decryptAfterData",
+                    uptime,
+                    logtime,
+                    d.STATUS,
+                    d.group_id AS "groupId",
+                    dg.group_name AS "groupName"
+        FROM (
+               SELECT *
+               FROM device_data
+               WHERE  1=1
+                <if test="request.devcode!='' and request.devcode != null">
+                    AND devcode like CONCAT('%',#{request.devcode},'%')
+                </if>
+                <if test="request.deviceType!='' and request.deviceType != null">
+                    AND device_type =#{request.deviceType}
+                </if>
+                <if test="request.beginTime!='' and request.beginTime!=null">
+                    AND logtime <![CDATA[  >=  ]]>
+                    <include refid="char_toDate">
+                        <property name="paramStr" value="#{request.beginTime}"/>
+                    </include>
+                </if>
+                <if test="request.endTime!='' and request.endTime!=null">
+                    AND logtime <![CDATA[  <=  ]]>
+                    <include refid="char_toDate">
+                        <property name="paramStr" value="#{request.endTime}"/>
+                    </include>
+                </if>
+                <if test="request.ids != null">
+                    and id in
+                    <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                        #{id}
+                    </foreach>
+                </if>
+
+          )dd
+          JOIN (
+                SELECT id, group_id,status,devcode
+                FROM device
+                WHERE valid=1
+                <if test="request.devcode!='' and request.devcode != null">
+                    AND devcode like CONCAT('%',#{request.devcode},'%')
+                </if>
+                <if test="request.deviceType!='' and request.deviceType != null">
+                    AND device_type =#{request.deviceType}
+                </if>
+                <if test="request.groupId!='' and request.groupId != null">
+                    AND greoup_id=#{request.groupId}
+                </if>
+          )d ON d.devcode=dd.devcode
+          JOIN (
+                SELECT   deptid,id,group_name
+                FROM device_group
+                WHERE valid=1
+                <if test="request.groupId!='' and request.groupId != null">
+                    AND id=#{request.groupId}
+                </if>
+          ) dg ON dg.id=d.group_id
+          order by logtime desc
+
+    </select>
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml
new file mode 100644
index 0000000..2e07287
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml
@@ -0,0 +1,148 @@
+<?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.casic.missiles.mapper.DeviceGroupMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceGroup">
+        <id column="id" property="id" />
+        <result column="group_name" property="groupName" />
+        <result column="group_no" property="groupNo" />
+        <result column="descn" property="descn" />
+        <result column="deptid" property="deptid" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="owner" property="owner" />
+        <result column="valid" property="valid" />
+    </resultMap>
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, owner, subcribe_ids, descn, dept, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
+        SELECT
+            dg.id,
+            group_no AS "groupNo",
+            deptid,
+             deviceCount,
+            subscribeCount,
+            descn,
+            create_time AS "createTime",
+            group_name AS "groupName",
+            create_user_id AS "createUserId",
+            create_user_name AS "createUserName"
+        FROM
+          (
+             SELECT *
+             FROM device_group
+             WHERE valid = 1
+            <if test="request.groupNo != null and request.groupNo != '' ">
+                AND group_no =#{request.groupNo}
+            </if>
+            <if test="request.groupName != '' and request.groupName != null">
+                AND group_name =#{request.groupName}
+            </if>
+            <if test="request.ids != null">
+                and id in
+                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+            <if test="request.beginTime!='' and request.beginTime!=null">
+                AND create_time <![CDATA[  >=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.beginTime}"/>
+                </include>
+            </if>
+            <if test="request.endTime!='' and request.endTime!=null">
+                AND create_time <![CDATA[  <=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.endTime}"/>
+                </include>
+            </if>
+          ) dg
+            LEFT JOIN (
+                   SELECT count(id)  AS "deviceCount",group_id as groupId
+                   FROM device d
+                   WHERE VALID = 1
+                   GROUP BY group_id
+        ) d ON d.groupId = dg.id
+            LEFT JOIN (
+                 SELECT count(id)  AS "subscribeCount",group_id AS groupId
+                 FROM subscribe_store GROUP BY group_id
+           ) s ON s.groupId = dg.id
+         order by create_time desc
+    </select>
+
+    <select id="list" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
+        SELECT
+        dg.id,
+        group_no AS "groupNo",
+        deptid,
+        count( d.id ) AS "deviceCount",
+        count( s.id ) AS "subscribeCount",
+        descn,
+        create_time AS "createTime",
+        group_name AS "groupName"
+        FROM
+        (
+        SELECT *
+        FROM device_group
+        WHERE valid = 1
+        <if test="request.groupNo != null and request.groupNo != '' ">
+            AND group_no =#{request.groupNo}
+        </if>
+        <if test="request.groupName != '' and request.groupName != null">
+            AND group_name =#{request.groupName}
+        </if>
+        <if test="request.ids != null">
+            and id in
+            <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+        <if test="request.beginTime!='' and request.beginTime!=null">
+            AND create_time <![CDATA[  >=  ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{request.beginTime}"/>
+            </include>
+        </if>
+        <if test="request.endTime!='' and request.endTime!=null">
+            AND create_time <![CDATA[  <=  ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{request.endTime}"/>
+            </include>
+        </if>
+        ) dg
+        LEFT JOIN (
+            SELECT id, group_id AS "groupId"
+            FROM device d
+            WHERE VALID = 1
+        ) d ON d.groupId = dg.id
+        LEFT JOIN (
+            SELECT id, group_id AS "groupId"
+            FROM subscribe_store
+        ) s ON s.groupId = dg.id
+        GROUP BY dg.id
+        order by create_time desc
+    </select>
+
+    <select id="selectMaxNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(group_no, 12)), 0)
+        from device_group
+    </select>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
new file mode 100644
index 0000000..2c99706
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
@@ -0,0 +1,88 @@
+<?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.casic.missiles.mapper.DeviceMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.Device">
+        <id column="id" property="id" />
+        <result column="group_id" property="groupId" />
+        <result column="product_id" property="productId" />
+        <result column="devcode" property="devcode" />
+        <result column="device_type" property="deviceType" />
+        <result column="unit" property="unit" />
+        <result column="model" property="model" />
+        <result column="name" property="name" />
+        <result column="status" property="status" />
+        <result column="imei" property="imei" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="valid" property="valid" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, devcode, device_type, unit, name, product_id, status, imei, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.device.DeviceListVO">
+        SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime,
+        data_value AS "dataValue",model,imei,d.cell,name AS "deviceName",status,d.id,create_user_id AS "createUserId",
+        create_user_name AS "createUserName"
+        FROM (
+            SELECT *
+            FROM device
+            WHERE VALID=1
+            <if test="request.groupId!='' and request.groupId != null">
+                AND group_id =#{request.groupId}
+            </if>
+            <if test="request.devcode!='' and request.devcode != null">
+                AND devcode like CONCAT('%',#{request.devcode},'%')
+            </if>
+            <if test="request.imei!='' and request.imei != null">
+                AND imei like CONCAT('%',#{request.imei},'%')
+            </if>
+            <if test="request.deviceType!='' and request.deviceType != null">
+                AND device_type =#{request.deviceType}
+            </if>
+            <if test="request.status!='' and request.status != null">
+                AND status =#{request.status}
+            </if>
+            <if test="request.productId!='' and request.productId != null">
+                AND product_id =#{request.productId}
+            </if>
+            <if test="request.beginCell!='' and request.beginCell!=null">
+                AND cell <![CDATA[  >=  ]]> #{request.beginCell}
+
+            </if>
+            <if test="request.endCell!='' and request.endCell!=null">
+                AND cell <![CDATA[  <=  ]]> #{request.endCell}
+            </if>
+            <if test="request.ids != null">
+                and id in
+                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+            order by create_time desc
+        )d JOIN (
+            SELECT deptid,id
+            FROM device_group
+            WHERE VALID =1
+            <if test="request.groupId!='' and request.groupId != null">
+                AND id =#{request.groupId}
+            </if>
+        )dg ON dg.id=d.group_id
+        LEFT JOIN(
+            SELECT ddd.logtime AS logtime,data_value,ddd.devcode,cell
+            FROM device_data ddd
+            JOIN
+            (
+                SELECT Max(logtime) AS logtime,devcode
+                FROM  device_data
+                GROUP BY devcode
+            )dd  ON dd.logtime=ddd.logtime AND dd.devcode=ddd.devcode
+        )dd ON dd.devcode=d.devcode
+        order by create_time desc
+    </select>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml
new file mode 100644
index 0000000..a5bf5e7
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml
@@ -0,0 +1,20 @@
+<?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.casic.missiles.mapper.DeviceUpgradeTaskMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceUpgradeTask">
+        <id column="id" property="id" />
+        <result column="version_id" property="versionId" />
+        <result column="device_id" property="deviceId" />
+        <result column="status" property="status" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, version_id, device_id, status, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml
new file mode 100644
index 0000000..e39ec1f
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml
@@ -0,0 +1,23 @@
+<?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.casic.missiles.mapper.DeviceVersionMapper">
+
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceVersion">
+        <id column="Id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="version_file" property="versionFile" />
+        <result column="version" property="version" />
+        <result column="owner" property="owner" />
+        <result column="dscn" property="dscn" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        Id, product_id, version_file, version, owner, dscn, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductConfigItemMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductConfigItemMapper.xml
new file mode 100644
index 0000000..e2448be
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/ProductConfigItemMapper.xml
@@ -0,0 +1,22 @@
+<?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.casic.missiles.mapper.ProductConfigItemMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductConfigItem">
+        <id column="id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="param_name" property="paramName" />
+        <result column="param_code" property="paramCode" />
+        <result column="param_type" property="paramType" />
+        <result column="regular_expression" property="regularExpression" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, product_id, param_name, param_code, param_type, regular_expression, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductDataItemMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductDataItemMapper.xml
new file mode 100644
index 0000000..61a55ec
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/ProductDataItemMapper.xml
@@ -0,0 +1,21 @@
+<?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.casic.missiles.mapper.ProductDataItemMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductDataItem">
+        <id column="id" property="id" />
+        <result column="data_item_name" property="dataItemName" />
+        <result column="product_id" property="productId" />
+        <result column="data_item_type" property="dataItemType" />
+        <result column="data_item_field" property="dataItemField" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, data_item_name, product_id, data_item_type, data_item_field, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
new file mode 100644
index 0000000..26f3cb3
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
@@ -0,0 +1,30 @@
+<?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.casic.missiles.mapper.ProductInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductInfo">
+        <id column="Id" property="id" />
+        <result column="name" property="name" />
+        <result column="access_type" property="accessType" />
+        <result column="encipher_type" property="encipherType" />
+        <result column="descn" property="descn" />
+        <result column="product_type" property="productType" />
+        <result column="owners" property="owners" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_name" property="createUserName" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        Id, name, access_type, encipher_type, protocol_type, model, descn, product_type, owners, CreatorName, create_time, create_user_id
+    </sql>
+
+    <select id="selectMaxNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(product_no, 12)), 0)
+        from product_info
+    </select>
+
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/SubscribeStoreMapper.xml b/casic-iot-dao/src/main/resources/mapper/SubscribeStoreMapper.xml
new file mode 100644
index 0000000..415a670
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/SubscribeStoreMapper.xml
@@ -0,0 +1,61 @@
+<?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.casic.missiles.mapper.SubscribeStoreMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.SubscribeStore">
+        <id column="id" property="id"/>
+        <result column="subscribe_no" property="subscribeNo"/>
+        <result column="group_id" property="groupId"/>
+        <result column="message_type" property="messageType"/>
+        <result column="subscribe_type" property="subscribeType"/>
+        <result column="enable" property="enable"/>
+        <result column="subscribe_status" property="subscribeStatus"/>
+        <result column="subscribe_content_json" property="subscribeContentJson"/>
+        <result column="descn" property="descn"/>
+        <result column="create_time" property="createTime"/>
+        <result column="create_user_name" property="createUserName"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, message_type, subscribe_type, enable, subscribe_status, subscribe_content_json, descn, create_time, create_user_name
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.subscribe.SubscribeListVO">
+        SELECT message_type AS "messageType",create_time AS "createTime",subscribe_no AS
+            "subscribeNo",subscribe_content_json AS "subscribeContentJson",
+            subscribe_status AS "subscribeStatus",create_user_name AS "createUserName",
+           create_user_id AS "createUserId"
+        FROM (
+        SELECT *
+        FROM subscribe_store
+        WHERE 1=1
+        <if test="request.groupId!='' and request.groupId != null">
+            AND group_id =#{request.groupId}
+        </if>
+        <if test="request.messageType!='' and request.messageType != null">
+            AND message_type =#{request.messageType}
+        </if>
+        <if test="request.subscribeNo!='' and request.subscribeNo != null">
+            AND subscribe_no like CONCAT('%',#{request.subscribeNo},'%')
+        </if>
+        <if test="request.subscribeType!='' and request.subscribeType != null">
+            AND subscribe_type =#{request.subscribeType}
+        </if>
+        <if test="request.status!='' and request.status != null">
+            AND subscribe_status =#{request.status}
+        </if>
+        order by create_time desc
+        )d JOIN (
+        SELECT deptid,id
+        FROM device_group
+        WHERE VALID=1
+        <if test="request.groupId!='' and request.groupId != null">
+            AND id =#{request.groupId}
+        </if>
+        )dg ON dg.id=d.group_id
+        order by create_time desc
+    </select>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/common/SysCommonMapper.xml b/casic-iot-dao/src/main/resources/mapper/common/SysCommonMapper.xml
new file mode 100644
index 0000000..880f7d4
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/common/SysCommonMapper.xml
@@ -0,0 +1,21 @@
+<?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.casic.missiles.mapper.common.SysCommonMapper">
+
+    <select id="getDictMapByCode" resultType="java.util.Map">
+        SELECT  name,code
+        from sys_dict
+         where  pid=(
+            SELECT id
+            from  sys_dict
+            where  code=#{code}
+         )
+    </select>
+
+    <select id="getDeptMap" resultType="java.util.Map">
+        SELECT  id,SIMPLE_NAME AS  "simpleName"
+        from sys_dept
+    </select>
+
+
+</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/AlarmConfigMapper.xml b/casic-iot-dao/src/resource/mapper/AlarmConfigMapper.xml
deleted file mode 100644
index bd2c2cc..0000000
--- a/casic-iot-dao/src/resource/mapper/AlarmConfigMapper.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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.casic.missiles.mapper.AlarmConfigMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmConfig">
-        <id column="id" property="id" />
-        <result column="product_id" property="productId" />
-        <result column="name" property="name" />
-        <result column="alarm_content" property="alarmContent" />
-        <result column="period_high" property="periodHigh" />
-        <result column="period_low" property="periodLow" />
-        <result column="create_user_id" property="createUserId" />
-        <result column="create_time" property="createTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, name, product_id, alarm_content, period_high, period_low, TypeName, CreatorId, creater_user_id, create_time
-    </sql>
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/AlarmDataMapper.xml b/casic-iot-dao/src/resource/mapper/AlarmDataMapper.xml
deleted file mode 100644
index 4aee44a..0000000
--- a/casic-iot-dao/src/resource/mapper/AlarmDataMapper.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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.casic.missiles.mapper.AlarmDataMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmData">
-        <id column="id" property="id" />
-        <result column="alarm_type" property="alarmType" />
-        <result column="alarm_content" property="alarmContent" />
-        <result column="devcode" property="devcode" />
-        <result column="alarm_time" property="alarmTime" />
-        <result column="alarm_value" property="alarmValue" />
-        <result column="status" property="status" />
-        <result column="create_name" property="createName" />
-        <result column="create_time" property="createTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, alarm_type, alarm_content, devcode, alarm_time, alarm_value, status, CreatorName, create_time
-    </sql>
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/BusConfigMapper.xml b/casic-iot-dao/src/resource/mapper/BusConfigMapper.xml
deleted file mode 100644
index b4965d6..0000000
--- a/casic-iot-dao/src/resource/mapper/BusConfigMapper.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?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.casic.missiles.mapper.BusConfigMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.BusConfig">
-        <id column="id" property="id"/>
-        <result column="devcode" property="devcode"/>
-        <result column="config_json" property="configJson"/>
-        <result column="status" property="status"/>
-        <result column="send_time" property="sendTime"/>
-        <result column="create_time" property="createTime"/>
-        <result column="create_user_id" property="createUserId"/>
-    </resultMap>
-
-
-    <sql id="char_toDate" databaseId="mysql">
-        ${paramStr}
-    </sql>
-
-    <sql id="char_toDate" databaseId="pgsql">
-       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
-    </sql>
-
-    <sql id="char_toDate" databaseId="oracle">
-        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
-    </sql>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, Pid, devcode, config_json, status, update_time, create_time, create_user_id
-    </sql>
-
-    <select id="listPage" resultType="com.casic.missiles.model.BusConfig">
-        select bc.id,bc.devcode,config_type AS "configType", config_json AS "configJson",bc.status,
-        send_time as "sendTime",bc.create_time AS "createTime",bc.create_user_id AS "createUserId",
-        bc.create_user_name AS "createUserName",dg.deptid
-        FROM (
-            SELECT *
-            FROM bus_config
-            WHERE 1=1
-            <if test="request.configType != null and request.configType != '' ">
-                AND config_type =#{request.configType}
-            </if>
-            <if test="request.devcode != '' and request.devcode != null">
-                AND devcode =#{request.devcode}
-            </if>
-            <if test="request.status != '' and request.status != null">
-                AND status =#{request.status}
-            </if>
-            <if test="request.beginTime!='' and request.beginTime!=null">
-                AND send_time <![CDATA[  >=  ]]>
-                <include refid="char_toDate">
-                    <property name="paramStr" value="#{request.beginTime}"/>
-                </include>
-            </if>
-            <if test="request.endTime!='' and request.endTime!=null">
-                AND send_time <![CDATA[  <=  ]]>
-                <include refid="char_toDate">
-                    <property name="paramStr" value="#{request.endTime}"/>
-                </include>
-            </if>
-        )bc
-        JOIN device d ON d.devcode=bc.devcode
-        JOIN device_group dg ON dg.id= d.group_id
-
-    </select>
-
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml
deleted file mode 100644
index 083b289..0000000
--- a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?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.casic.missiles.mapper.DeviceDataMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceData">
-        <id column="id" property="id"/>
-        <result column="devcode" property="devcode"/>
-        <result column="device_type" property="deviceType"/>
-        <result column="cell" property="cell"/>
-        <result column="data_json" property="dataJson"/>
-        <result column="decrypt_before_data" property="decryptBeforeData"/>
-        <result column="decrypt_after_data" property="decryptAfterData"/>
-        <result column="uptime" property="uptime"/>
-        <result column="logtime" property="logtime"/>
-    </resultMap>
-
-    <sql id="char_toDate" databaseId="mysql">
-        ${paramStr}
-    </sql>
-
-    <sql id="char_toDate" databaseId="pgsql">
-       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
-    </sql>
-
-    <sql id="char_toDate" databaseId="oracle">
-        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
-    </sql>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, devcode, device_type, cell, data_json, decrypt_before_data, decrypt_after_data, uptime, logtime
-    </sql>
-
-    <select id="listPage" resultType="com.casic.missiles.dto.data.DeviceDataListVO">
-          SELECT  	dd.id,
-                    dd.devcode,
-                    dd.device_type AS "deviceType",
-                    deptid,
-                    dd.cell,
-                    dd.data_json AS "dataJson",
-                    decrypt_before_data AS "decryptBeforeData",
-                    decrypt_after_data AS "decryptAfterData",
-                    uptime,
-                    logtime,
-                    d.STATUS,
-                    d.group_id AS "groupId",
-                    dg.group_name AS "groupName"
-        FROM (
-               SELECT *
-               FROM device_data
-               WHERE  1=1
-                <if test="request.devcode!='' and request.devcode != null">
-                    AND devcode like CONCAT('%',#{request.devcode},'%')
-                </if>
-                <if test="request.deviceType!='' and request.deviceType != null">
-                    AND device_type =#{request.deviceType}
-                </if>
-                <if test="request.beginTime!='' and request.beginTime!=null">
-                    AND logtime <![CDATA[  >=  ]]>
-                    <include refid="char_toDate">
-                        <property name="paramStr" value="#{request.beginTime}"/>
-                    </include>
-                </if>
-                <if test="request.endTime!='' and request.endTime!=null">
-                    AND logtime <![CDATA[  <=  ]]>
-                    <include refid="char_toDate">
-                        <property name="paramStr" value="#{request.endTime}"/>
-                    </include>
-                </if>
-                <if test="request.ids != null">
-                    and id in
-                    <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
-                        #{id}
-                    </foreach>
-                </if>
-
-          )dd
-          JOIN (
-                SELECT id, group_id,status,devcode
-                FROM device
-                WHERE valid=1
-                <if test="request.devcode!='' and request.devcode != null">
-                    AND devcode like CONCAT('%',#{request.devcode},'%')
-                </if>
-                <if test="request.deviceType!='' and request.deviceType != null">
-                    AND device_type =#{request.deviceType}
-                </if>
-                <if test="request.groupId!='' and request.groupId != null">
-                    AND greoup_id=#{request.groupId}
-                </if>
-          )d ON d.devcode=dd.devcode
-          JOIN (
-                SELECT   deptid,id,group_name
-                FROM device_group
-                WHERE valid=1
-                <if test="request.groupId!='' and request.groupId != null">
-                    AND id=#{request.groupId}
-                </if>
-          ) dg ON dg.id=d.group_id
-          order by logtime desc
-
-    </select>
-
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml
deleted file mode 100644
index 2e07287..0000000
--- a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?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.casic.missiles.mapper.DeviceGroupMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceGroup">
-        <id column="id" property="id" />
-        <result column="group_name" property="groupName" />
-        <result column="group_no" property="groupNo" />
-        <result column="descn" property="descn" />
-        <result column="deptid" property="deptid" />
-        <result column="create_time" property="createTime" />
-        <result column="create_user_id" property="createUserId" />
-        <result column="owner" property="owner" />
-        <result column="valid" property="valid" />
-    </resultMap>
-
-    <sql id="char_toDate" databaseId="mysql">
-        ${paramStr}
-    </sql>
-
-    <sql id="char_toDate" databaseId="pgsql">
-       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
-    </sql>
-
-    <sql id="char_toDate" databaseId="oracle">
-        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
-    </sql>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, name, owner, subcribe_ids, descn, dept, create_time, create_user_id
-    </sql>
-
-    <select id="listPage" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
-        SELECT
-            dg.id,
-            group_no AS "groupNo",
-            deptid,
-             deviceCount,
-            subscribeCount,
-            descn,
-            create_time AS "createTime",
-            group_name AS "groupName",
-            create_user_id AS "createUserId",
-            create_user_name AS "createUserName"
-        FROM
-          (
-             SELECT *
-             FROM device_group
-             WHERE valid = 1
-            <if test="request.groupNo != null and request.groupNo != '' ">
-                AND group_no =#{request.groupNo}
-            </if>
-            <if test="request.groupName != '' and request.groupName != null">
-                AND group_name =#{request.groupName}
-            </if>
-            <if test="request.ids != null">
-                and id in
-                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
-                    #{id}
-                </foreach>
-            </if>
-            <if test="request.beginTime!='' and request.beginTime!=null">
-                AND create_time <![CDATA[  >=  ]]>
-                <include refid="char_toDate">
-                    <property name="paramStr" value="#{request.beginTime}"/>
-                </include>
-            </if>
-            <if test="request.endTime!='' and request.endTime!=null">
-                AND create_time <![CDATA[  <=  ]]>
-                <include refid="char_toDate">
-                    <property name="paramStr" value="#{request.endTime}"/>
-                </include>
-            </if>
-          ) dg
-            LEFT JOIN (
-                   SELECT count(id)  AS "deviceCount",group_id as groupId
-                   FROM device d
-                   WHERE VALID = 1
-                   GROUP BY group_id
-        ) d ON d.groupId = dg.id
-            LEFT JOIN (
-                 SELECT count(id)  AS "subscribeCount",group_id AS groupId
-                 FROM subscribe_store GROUP BY group_id
-           ) s ON s.groupId = dg.id
-         order by create_time desc
-    </select>
-
-    <select id="list" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
-        SELECT
-        dg.id,
-        group_no AS "groupNo",
-        deptid,
-        count( d.id ) AS "deviceCount",
-        count( s.id ) AS "subscribeCount",
-        descn,
-        create_time AS "createTime",
-        group_name AS "groupName"
-        FROM
-        (
-        SELECT *
-        FROM device_group
-        WHERE valid = 1
-        <if test="request.groupNo != null and request.groupNo != '' ">
-            AND group_no =#{request.groupNo}
-        </if>
-        <if test="request.groupName != '' and request.groupName != null">
-            AND group_name =#{request.groupName}
-        </if>
-        <if test="request.ids != null">
-            and id in
-            <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
-                #{id}
-            </foreach>
-        </if>
-        <if test="request.beginTime!='' and request.beginTime!=null">
-            AND create_time <![CDATA[  >=  ]]>
-            <include refid="char_toDate">
-                <property name="paramStr" value="#{request.beginTime}"/>
-            </include>
-        </if>
-        <if test="request.endTime!='' and request.endTime!=null">
-            AND create_time <![CDATA[  <=  ]]>
-            <include refid="char_toDate">
-                <property name="paramStr" value="#{request.endTime}"/>
-            </include>
-        </if>
-        ) dg
-        LEFT JOIN (
-            SELECT id, group_id AS "groupId"
-            FROM device d
-            WHERE VALID = 1
-        ) d ON d.groupId = dg.id
-        LEFT JOIN (
-            SELECT id, group_id AS "groupId"
-            FROM subscribe_store
-        ) s ON s.groupId = dg.id
-        GROUP BY dg.id
-        order by create_time desc
-    </select>
-
-    <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(group_no, 12)), 0)
-        from device_group
-    </select>
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/DeviceMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceMapper.xml
deleted file mode 100644
index 2c99706..0000000
--- a/casic-iot-dao/src/resource/mapper/DeviceMapper.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?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.casic.missiles.mapper.DeviceMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.Device">
-        <id column="id" property="id" />
-        <result column="group_id" property="groupId" />
-        <result column="product_id" property="productId" />
-        <result column="devcode" property="devcode" />
-        <result column="device_type" property="deviceType" />
-        <result column="unit" property="unit" />
-        <result column="model" property="model" />
-        <result column="name" property="name" />
-        <result column="status" property="status" />
-        <result column="imei" property="imei" />
-        <result column="create_time" property="createTime" />
-        <result column="create_user_name" property="createUserName" />
-        <result column="valid" property="valid" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, devcode, device_type, unit, name, product_id, status, imei, create_time, create_user_id
-    </sql>
-
-    <select id="listPage" resultType="com.casic.missiles.dto.device.DeviceListVO">
-        SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime,
-        data_value AS "dataValue",model,imei,d.cell,name AS "deviceName",status,d.id,create_user_id AS "createUserId",
-        create_user_name AS "createUserName"
-        FROM (
-            SELECT *
-            FROM device
-            WHERE VALID=1
-            <if test="request.groupId!='' and request.groupId != null">
-                AND group_id =#{request.groupId}
-            </if>
-            <if test="request.devcode!='' and request.devcode != null">
-                AND devcode like CONCAT('%',#{request.devcode},'%')
-            </if>
-            <if test="request.imei!='' and request.imei != null">
-                AND imei like CONCAT('%',#{request.imei},'%')
-            </if>
-            <if test="request.deviceType!='' and request.deviceType != null">
-                AND device_type =#{request.deviceType}
-            </if>
-            <if test="request.status!='' and request.status != null">
-                AND status =#{request.status}
-            </if>
-            <if test="request.productId!='' and request.productId != null">
-                AND product_id =#{request.productId}
-            </if>
-            <if test="request.beginCell!='' and request.beginCell!=null">
-                AND cell <![CDATA[  >=  ]]> #{request.beginCell}
-
-            </if>
-            <if test="request.endCell!='' and request.endCell!=null">
-                AND cell <![CDATA[  <=  ]]> #{request.endCell}
-            </if>
-            <if test="request.ids != null">
-                and id in
-                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
-                    #{id}
-                </foreach>
-            </if>
-            order by create_time desc
-        )d JOIN (
-            SELECT deptid,id
-            FROM device_group
-            WHERE VALID =1
-            <if test="request.groupId!='' and request.groupId != null">
-                AND id =#{request.groupId}
-            </if>
-        )dg ON dg.id=d.group_id
-        LEFT JOIN(
-            SELECT ddd.logtime AS logtime,data_value,ddd.devcode,cell
-            FROM device_data ddd
-            JOIN
-            (
-                SELECT Max(logtime) AS logtime,devcode
-                FROM  device_data
-                GROUP BY devcode
-            )dd  ON dd.logtime=ddd.logtime AND dd.devcode=ddd.devcode
-        )dd ON dd.devcode=d.devcode
-        order by create_time desc
-    </select>
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/DeviceUpgradeTaskMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceUpgradeTaskMapper.xml
deleted file mode 100644
index a5bf5e7..0000000
--- a/casic-iot-dao/src/resource/mapper/DeviceUpgradeTaskMapper.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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.casic.missiles.mapper.DeviceUpgradeTaskMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceUpgradeTask">
-        <id column="id" property="id" />
-        <result column="version_id" property="versionId" />
-        <result column="device_id" property="deviceId" />
-        <result column="status" property="status" />
-        <result column="create_time" property="createTime" />
-        <result column="create_user_id" property="createUserId" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, version_id, device_id, status, create_time, create_user_id
-    </sql>
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/DeviceVersionMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceVersionMapper.xml
deleted file mode 100644
index e39ec1f..0000000
--- a/casic-iot-dao/src/resource/mapper/DeviceVersionMapper.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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.casic.missiles.mapper.DeviceVersionMapper">
-
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceVersion">
-        <id column="Id" property="id" />
-        <result column="product_id" property="productId" />
-        <result column="version_file" property="versionFile" />
-        <result column="version" property="version" />
-        <result column="owner" property="owner" />
-        <result column="dscn" property="dscn" />
-        <result column="create_time" property="createTime" />
-        <result column="create_user_id" property="createUserId" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        Id, product_id, version_file, version, owner, dscn, create_time, create_user_id
-    </sql>
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/ProductConfigItemMapper.xml b/casic-iot-dao/src/resource/mapper/ProductConfigItemMapper.xml
deleted file mode 100644
index e2448be..0000000
--- a/casic-iot-dao/src/resource/mapper/ProductConfigItemMapper.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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.casic.missiles.mapper.ProductConfigItemMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductConfigItem">
-        <id column="id" property="id" />
-        <result column="product_id" property="productId" />
-        <result column="param_name" property="paramName" />
-        <result column="param_code" property="paramCode" />
-        <result column="param_type" property="paramType" />
-        <result column="regular_expression" property="regularExpression" />
-        <result column="create_time" property="createTime" />
-        <result column="create_user_id" property="createUserId" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, product_id, param_name, param_code, param_type, regular_expression, create_time, create_user_id
-    </sql>
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/ProductDataItemMapper.xml b/casic-iot-dao/src/resource/mapper/ProductDataItemMapper.xml
deleted file mode 100644
index 61a55ec..0000000
--- a/casic-iot-dao/src/resource/mapper/ProductDataItemMapper.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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.casic.missiles.mapper.ProductDataItemMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductDataItem">
-        <id column="id" property="id" />
-        <result column="data_item_name" property="dataItemName" />
-        <result column="product_id" property="productId" />
-        <result column="data_item_type" property="dataItemType" />
-        <result column="data_item_field" property="dataItemField" />
-        <result column="create_time" property="createTime" />
-        <result column="create_user_id" property="createUserId" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, data_item_name, product_id, data_item_type, data_item_field, create_time, create_user_id
-    </sql>
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/ProductInfoMapper.xml b/casic-iot-dao/src/resource/mapper/ProductInfoMapper.xml
deleted file mode 100644
index 26f3cb3..0000000
--- a/casic-iot-dao/src/resource/mapper/ProductInfoMapper.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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.casic.missiles.mapper.ProductInfoMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductInfo">
-        <id column="Id" property="id" />
-        <result column="name" property="name" />
-        <result column="access_type" property="accessType" />
-        <result column="encipher_type" property="encipherType" />
-        <result column="descn" property="descn" />
-        <result column="product_type" property="productType" />
-        <result column="owners" property="owners" />
-        <result column="create_time" property="createTime" />
-        <result column="create_user_name" property="createUserName" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        Id, name, access_type, encipher_type, protocol_type, model, descn, product_type, owners, CreatorName, create_time, create_user_id
-    </sql>
-
-    <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(product_no, 12)), 0)
-        from product_info
-    </select>
-
-
-
-</mapper>

diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml
new file mode 100644
index 0000000..bd2c2cc
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml
@@ -0,0 +1,22 @@
+<?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.casic.missiles.mapper.AlarmConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmConfig">
+        <id column="id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="name" property="name" />
+        <result column="alarm_content" property="alarmContent" />
+        <result column="period_high" property="periodHigh" />
+        <result column="period_low" property="periodLow" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, product_id, alarm_content, period_high, period_low, TypeName, CreatorId, creater_user_id, create_time
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml
new file mode 100644
index 0000000..4aee44a
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml
@@ -0,0 +1,23 @@
+<?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.casic.missiles.mapper.AlarmDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmData">
+        <id column="id" property="id" />
+        <result column="alarm_type" property="alarmType" />
+        <result column="alarm_content" property="alarmContent" />
+        <result column="devcode" property="devcode" />
+        <result column="alarm_time" property="alarmTime" />
+        <result column="alarm_value" property="alarmValue" />
+        <result column="status" property="status" />
+        <result column="create_name" property="createName" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, alarm_type, alarm_content, devcode, alarm_time, alarm_value, status, CreatorName, create_time
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml b/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml
new file mode 100644
index 0000000..b4965d6
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml
@@ -0,0 +1,70 @@
+<?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.casic.missiles.mapper.BusConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.BusConfig">
+        <id column="id" property="id"/>
+        <result column="devcode" property="devcode"/>
+        <result column="config_json" property="configJson"/>
+        <result column="status" property="status"/>
+        <result column="send_time" property="sendTime"/>
+        <result column="create_time" property="createTime"/>
+        <result column="create_user_id" property="createUserId"/>
+    </resultMap>
+
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, Pid, devcode, config_json, status, update_time, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.model.BusConfig">
+        select bc.id,bc.devcode,config_type AS "configType", config_json AS "configJson",bc.status,
+        send_time as "sendTime",bc.create_time AS "createTime",bc.create_user_id AS "createUserId",
+        bc.create_user_name AS "createUserName",dg.deptid
+        FROM (
+            SELECT *
+            FROM bus_config
+            WHERE 1=1
+            <if test="request.configType != null and request.configType != '' ">
+                AND config_type =#{request.configType}
+            </if>
+            <if test="request.devcode != '' and request.devcode != null">
+                AND devcode =#{request.devcode}
+            </if>
+            <if test="request.status != '' and request.status != null">
+                AND status =#{request.status}
+            </if>
+            <if test="request.beginTime!='' and request.beginTime!=null">
+                AND send_time <![CDATA[  >=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.beginTime}"/>
+                </include>
+            </if>
+            <if test="request.endTime!='' and request.endTime!=null">
+                AND send_time <![CDATA[  <=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.endTime}"/>
+                </include>
+            </if>
+        )bc
+        JOIN device d ON d.devcode=bc.devcode
+        JOIN device_group dg ON dg.id= d.group_id
+
+    </select>
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml
new file mode 100644
index 0000000..083b289
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml
@@ -0,0 +1,106 @@
+<?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.casic.missiles.mapper.DeviceDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceData">
+        <id column="id" property="id"/>
+        <result column="devcode" property="devcode"/>
+        <result column="device_type" property="deviceType"/>
+        <result column="cell" property="cell"/>
+        <result column="data_json" property="dataJson"/>
+        <result column="decrypt_before_data" property="decryptBeforeData"/>
+        <result column="decrypt_after_data" property="decryptAfterData"/>
+        <result column="uptime" property="uptime"/>
+        <result column="logtime" property="logtime"/>
+    </resultMap>
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, devcode, device_type, cell, data_json, decrypt_before_data, decrypt_after_data, uptime, logtime
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.data.DeviceDataListVO">
+          SELECT  	dd.id,
+                    dd.devcode,
+                    dd.device_type AS "deviceType",
+                    deptid,
+                    dd.cell,
+                    dd.data_json AS "dataJson",
+                    decrypt_before_data AS "decryptBeforeData",
+                    decrypt_after_data AS "decryptAfterData",
+                    uptime,
+                    logtime,
+                    d.STATUS,
+                    d.group_id AS "groupId",
+                    dg.group_name AS "groupName"
+        FROM (
+               SELECT *
+               FROM device_data
+               WHERE  1=1
+                <if test="request.devcode!='' and request.devcode != null">
+                    AND devcode like CONCAT('%',#{request.devcode},'%')
+                </if>
+                <if test="request.deviceType!='' and request.deviceType != null">
+                    AND device_type =#{request.deviceType}
+                </if>
+                <if test="request.beginTime!='' and request.beginTime!=null">
+                    AND logtime <![CDATA[  >=  ]]>
+                    <include refid="char_toDate">
+                        <property name="paramStr" value="#{request.beginTime}"/>
+                    </include>
+                </if>
+                <if test="request.endTime!='' and request.endTime!=null">
+                    AND logtime <![CDATA[  <=  ]]>
+                    <include refid="char_toDate">
+                        <property name="paramStr" value="#{request.endTime}"/>
+                    </include>
+                </if>
+                <if test="request.ids != null">
+                    and id in
+                    <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                        #{id}
+                    </foreach>
+                </if>
+
+          )dd
+          JOIN (
+                SELECT id, group_id,status,devcode
+                FROM device
+                WHERE valid=1
+                <if test="request.devcode!='' and request.devcode != null">
+                    AND devcode like CONCAT('%',#{request.devcode},'%')
+                </if>
+                <if test="request.deviceType!='' and request.deviceType != null">
+                    AND device_type =#{request.deviceType}
+                </if>
+                <if test="request.groupId!='' and request.groupId != null">
+                    AND greoup_id=#{request.groupId}
+                </if>
+          )d ON d.devcode=dd.devcode
+          JOIN (
+                SELECT   deptid,id,group_name
+                FROM device_group
+                WHERE valid=1
+                <if test="request.groupId!='' and request.groupId != null">
+                    AND id=#{request.groupId}
+                </if>
+          ) dg ON dg.id=d.group_id
+          order by logtime desc
+
+    </select>
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml
new file mode 100644
index 0000000..2e07287
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml
@@ -0,0 +1,148 @@
+<?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.casic.missiles.mapper.DeviceGroupMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceGroup">
+        <id column="id" property="id" />
+        <result column="group_name" property="groupName" />
+        <result column="group_no" property="groupNo" />
+        <result column="descn" property="descn" />
+        <result column="deptid" property="deptid" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="owner" property="owner" />
+        <result column="valid" property="valid" />
+    </resultMap>
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, owner, subcribe_ids, descn, dept, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
+        SELECT
+            dg.id,
+            group_no AS "groupNo",
+            deptid,
+             deviceCount,
+            subscribeCount,
+            descn,
+            create_time AS "createTime",
+            group_name AS "groupName",
+            create_user_id AS "createUserId",
+            create_user_name AS "createUserName"
+        FROM
+          (
+             SELECT *
+             FROM device_group
+             WHERE valid = 1
+            <if test="request.groupNo != null and request.groupNo != '' ">
+                AND group_no =#{request.groupNo}
+            </if>
+            <if test="request.groupName != '' and request.groupName != null">
+                AND group_name =#{request.groupName}
+            </if>
+            <if test="request.ids != null">
+                and id in
+                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+            <if test="request.beginTime!='' and request.beginTime!=null">
+                AND create_time <![CDATA[  >=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.beginTime}"/>
+                </include>
+            </if>
+            <if test="request.endTime!='' and request.endTime!=null">
+                AND create_time <![CDATA[  <=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.endTime}"/>
+                </include>
+            </if>
+          ) dg
+            LEFT JOIN (
+                   SELECT count(id)  AS "deviceCount",group_id as groupId
+                   FROM device d
+                   WHERE VALID = 1
+                   GROUP BY group_id
+        ) d ON d.groupId = dg.id
+            LEFT JOIN (
+                 SELECT count(id)  AS "subscribeCount",group_id AS groupId
+                 FROM subscribe_store GROUP BY group_id
+           ) s ON s.groupId = dg.id
+         order by create_time desc
+    </select>
+
+    <select id="list" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
+        SELECT
+        dg.id,
+        group_no AS "groupNo",
+        deptid,
+        count( d.id ) AS "deviceCount",
+        count( s.id ) AS "subscribeCount",
+        descn,
+        create_time AS "createTime",
+        group_name AS "groupName"
+        FROM
+        (
+        SELECT *
+        FROM device_group
+        WHERE valid = 1
+        <if test="request.groupNo != null and request.groupNo != '' ">
+            AND group_no =#{request.groupNo}
+        </if>
+        <if test="request.groupName != '' and request.groupName != null">
+            AND group_name =#{request.groupName}
+        </if>
+        <if test="request.ids != null">
+            and id in
+            <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+        <if test="request.beginTime!='' and request.beginTime!=null">
+            AND create_time <![CDATA[  >=  ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{request.beginTime}"/>
+            </include>
+        </if>
+        <if test="request.endTime!='' and request.endTime!=null">
+            AND create_time <![CDATA[  <=  ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{request.endTime}"/>
+            </include>
+        </if>
+        ) dg
+        LEFT JOIN (
+            SELECT id, group_id AS "groupId"
+            FROM device d
+            WHERE VALID = 1
+        ) d ON d.groupId = dg.id
+        LEFT JOIN (
+            SELECT id, group_id AS "groupId"
+            FROM subscribe_store
+        ) s ON s.groupId = dg.id
+        GROUP BY dg.id
+        order by create_time desc
+    </select>
+
+    <select id="selectMaxNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(group_no, 12)), 0)
+        from device_group
+    </select>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
new file mode 100644
index 0000000..2c99706
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
@@ -0,0 +1,88 @@
+<?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.casic.missiles.mapper.DeviceMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.Device">
+        <id column="id" property="id" />
+        <result column="group_id" property="groupId" />
+        <result column="product_id" property="productId" />
+        <result column="devcode" property="devcode" />
+        <result column="device_type" property="deviceType" />
+        <result column="unit" property="unit" />
+        <result column="model" property="model" />
+        <result column="name" property="name" />
+        <result column="status" property="status" />
+        <result column="imei" property="imei" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="valid" property="valid" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, devcode, device_type, unit, name, product_id, status, imei, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.device.DeviceListVO">
+        SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime,
+        data_value AS "dataValue",model,imei,d.cell,name AS "deviceName",status,d.id,create_user_id AS "createUserId",
+        create_user_name AS "createUserName"
+        FROM (
+            SELECT *
+            FROM device
+            WHERE VALID=1
+            <if test="request.groupId!='' and request.groupId != null">
+                AND group_id =#{request.groupId}
+            </if>
+            <if test="request.devcode!='' and request.devcode != null">
+                AND devcode like CONCAT('%',#{request.devcode},'%')
+            </if>
+            <if test="request.imei!='' and request.imei != null">
+                AND imei like CONCAT('%',#{request.imei},'%')
+            </if>
+            <if test="request.deviceType!='' and request.deviceType != null">
+                AND device_type =#{request.deviceType}
+            </if>
+            <if test="request.status!='' and request.status != null">
+                AND status =#{request.status}
+            </if>
+            <if test="request.productId!='' and request.productId != null">
+                AND product_id =#{request.productId}
+            </if>
+            <if test="request.beginCell!='' and request.beginCell!=null">
+                AND cell <![CDATA[  >=  ]]> #{request.beginCell}
+
+            </if>
+            <if test="request.endCell!='' and request.endCell!=null">
+                AND cell <![CDATA[  <=  ]]> #{request.endCell}
+            </if>
+            <if test="request.ids != null">
+                and id in
+                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+            order by create_time desc
+        )d JOIN (
+            SELECT deptid,id
+            FROM device_group
+            WHERE VALID =1
+            <if test="request.groupId!='' and request.groupId != null">
+                AND id =#{request.groupId}
+            </if>
+        )dg ON dg.id=d.group_id
+        LEFT JOIN(
+            SELECT ddd.logtime AS logtime,data_value,ddd.devcode,cell
+            FROM device_data ddd
+            JOIN
+            (
+                SELECT Max(logtime) AS logtime,devcode
+                FROM  device_data
+                GROUP BY devcode
+            )dd  ON dd.logtime=ddd.logtime AND dd.devcode=ddd.devcode
+        )dd ON dd.devcode=d.devcode
+        order by create_time desc
+    </select>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml
new file mode 100644
index 0000000..a5bf5e7
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml
@@ -0,0 +1,20 @@
+<?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.casic.missiles.mapper.DeviceUpgradeTaskMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceUpgradeTask">
+        <id column="id" property="id" />
+        <result column="version_id" property="versionId" />
+        <result column="device_id" property="deviceId" />
+        <result column="status" property="status" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, version_id, device_id, status, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml
new file mode 100644
index 0000000..e39ec1f
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml
@@ -0,0 +1,23 @@
+<?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.casic.missiles.mapper.DeviceVersionMapper">
+
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceVersion">
+        <id column="Id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="version_file" property="versionFile" />
+        <result column="version" property="version" />
+        <result column="owner" property="owner" />
+        <result column="dscn" property="dscn" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        Id, product_id, version_file, version, owner, dscn, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductConfigItemMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductConfigItemMapper.xml
new file mode 100644
index 0000000..e2448be
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/ProductConfigItemMapper.xml
@@ -0,0 +1,22 @@
+<?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.casic.missiles.mapper.ProductConfigItemMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductConfigItem">
+        <id column="id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="param_name" property="paramName" />
+        <result column="param_code" property="paramCode" />
+        <result column="param_type" property="paramType" />
+        <result column="regular_expression" property="regularExpression" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, product_id, param_name, param_code, param_type, regular_expression, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductDataItemMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductDataItemMapper.xml
new file mode 100644
index 0000000..61a55ec
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/ProductDataItemMapper.xml
@@ -0,0 +1,21 @@
+<?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.casic.missiles.mapper.ProductDataItemMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductDataItem">
+        <id column="id" property="id" />
+        <result column="data_item_name" property="dataItemName" />
+        <result column="product_id" property="productId" />
+        <result column="data_item_type" property="dataItemType" />
+        <result column="data_item_field" property="dataItemField" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, data_item_name, product_id, data_item_type, data_item_field, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
new file mode 100644
index 0000000..26f3cb3
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
@@ -0,0 +1,30 @@
+<?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.casic.missiles.mapper.ProductInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductInfo">
+        <id column="Id" property="id" />
+        <result column="name" property="name" />
+        <result column="access_type" property="accessType" />
+        <result column="encipher_type" property="encipherType" />
+        <result column="descn" property="descn" />
+        <result column="product_type" property="productType" />
+        <result column="owners" property="owners" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_name" property="createUserName" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        Id, name, access_type, encipher_type, protocol_type, model, descn, product_type, owners, CreatorName, create_time, create_user_id
+    </sql>
+
+    <select id="selectMaxNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(product_no, 12)), 0)
+        from product_info
+    </select>
+
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/SubscribeStoreMapper.xml b/casic-iot-dao/src/main/resources/mapper/SubscribeStoreMapper.xml
new file mode 100644
index 0000000..415a670
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/SubscribeStoreMapper.xml
@@ -0,0 +1,61 @@
+<?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.casic.missiles.mapper.SubscribeStoreMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.SubscribeStore">
+        <id column="id" property="id"/>
+        <result column="subscribe_no" property="subscribeNo"/>
+        <result column="group_id" property="groupId"/>
+        <result column="message_type" property="messageType"/>
+        <result column="subscribe_type" property="subscribeType"/>
+        <result column="enable" property="enable"/>
+        <result column="subscribe_status" property="subscribeStatus"/>
+        <result column="subscribe_content_json" property="subscribeContentJson"/>
+        <result column="descn" property="descn"/>
+        <result column="create_time" property="createTime"/>
+        <result column="create_user_name" property="createUserName"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, message_type, subscribe_type, enable, subscribe_status, subscribe_content_json, descn, create_time, create_user_name
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.subscribe.SubscribeListVO">
+        SELECT message_type AS "messageType",create_time AS "createTime",subscribe_no AS
+            "subscribeNo",subscribe_content_json AS "subscribeContentJson",
+            subscribe_status AS "subscribeStatus",create_user_name AS "createUserName",
+           create_user_id AS "createUserId"
+        FROM (
+        SELECT *
+        FROM subscribe_store
+        WHERE 1=1
+        <if test="request.groupId!='' and request.groupId != null">
+            AND group_id =#{request.groupId}
+        </if>
+        <if test="request.messageType!='' and request.messageType != null">
+            AND message_type =#{request.messageType}
+        </if>
+        <if test="request.subscribeNo!='' and request.subscribeNo != null">
+            AND subscribe_no like CONCAT('%',#{request.subscribeNo},'%')
+        </if>
+        <if test="request.subscribeType!='' and request.subscribeType != null">
+            AND subscribe_type =#{request.subscribeType}
+        </if>
+        <if test="request.status!='' and request.status != null">
+            AND subscribe_status =#{request.status}
+        </if>
+        order by create_time desc
+        )d JOIN (
+        SELECT deptid,id
+        FROM device_group
+        WHERE VALID=1
+        <if test="request.groupId!='' and request.groupId != null">
+            AND id =#{request.groupId}
+        </if>
+        )dg ON dg.id=d.group_id
+        order by create_time desc
+    </select>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/common/SysCommonMapper.xml b/casic-iot-dao/src/main/resources/mapper/common/SysCommonMapper.xml
new file mode 100644
index 0000000..880f7d4
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/common/SysCommonMapper.xml
@@ -0,0 +1,21 @@
+<?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.casic.missiles.mapper.common.SysCommonMapper">
+
+    <select id="getDictMapByCode" resultType="java.util.Map">
+        SELECT  name,code
+        from sys_dict
+         where  pid=(
+            SELECT id
+            from  sys_dict
+            where  code=#{code}
+         )
+    </select>
+
+    <select id="getDeptMap" resultType="java.util.Map">
+        SELECT  id,SIMPLE_NAME AS  "simpleName"
+        from sys_dept
+    </select>
+
+
+</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/AlarmConfigMapper.xml b/casic-iot-dao/src/resource/mapper/AlarmConfigMapper.xml
deleted file mode 100644
index bd2c2cc..0000000
--- a/casic-iot-dao/src/resource/mapper/AlarmConfigMapper.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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.casic.missiles.mapper.AlarmConfigMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmConfig">
-        <id column="id" property="id" />
-        <result column="product_id" property="productId" />
-        <result column="name" property="name" />
-        <result column="alarm_content" property="alarmContent" />
-        <result column="period_high" property="periodHigh" />
-        <result column="period_low" property="periodLow" />
-        <result column="create_user_id" property="createUserId" />
-        <result column="create_time" property="createTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, name, product_id, alarm_content, period_high, period_low, TypeName, CreatorId, creater_user_id, create_time
-    </sql>
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/AlarmDataMapper.xml b/casic-iot-dao/src/resource/mapper/AlarmDataMapper.xml
deleted file mode 100644
index 4aee44a..0000000
--- a/casic-iot-dao/src/resource/mapper/AlarmDataMapper.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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.casic.missiles.mapper.AlarmDataMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmData">
-        <id column="id" property="id" />
-        <result column="alarm_type" property="alarmType" />
-        <result column="alarm_content" property="alarmContent" />
-        <result column="devcode" property="devcode" />
-        <result column="alarm_time" property="alarmTime" />
-        <result column="alarm_value" property="alarmValue" />
-        <result column="status" property="status" />
-        <result column="create_name" property="createName" />
-        <result column="create_time" property="createTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, alarm_type, alarm_content, devcode, alarm_time, alarm_value, status, CreatorName, create_time
-    </sql>
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/BusConfigMapper.xml b/casic-iot-dao/src/resource/mapper/BusConfigMapper.xml
deleted file mode 100644
index b4965d6..0000000
--- a/casic-iot-dao/src/resource/mapper/BusConfigMapper.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?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.casic.missiles.mapper.BusConfigMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.BusConfig">
-        <id column="id" property="id"/>
-        <result column="devcode" property="devcode"/>
-        <result column="config_json" property="configJson"/>
-        <result column="status" property="status"/>
-        <result column="send_time" property="sendTime"/>
-        <result column="create_time" property="createTime"/>
-        <result column="create_user_id" property="createUserId"/>
-    </resultMap>
-
-
-    <sql id="char_toDate" databaseId="mysql">
-        ${paramStr}
-    </sql>
-
-    <sql id="char_toDate" databaseId="pgsql">
-       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
-    </sql>
-
-    <sql id="char_toDate" databaseId="oracle">
-        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
-    </sql>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, Pid, devcode, config_json, status, update_time, create_time, create_user_id
-    </sql>
-
-    <select id="listPage" resultType="com.casic.missiles.model.BusConfig">
-        select bc.id,bc.devcode,config_type AS "configType", config_json AS "configJson",bc.status,
-        send_time as "sendTime",bc.create_time AS "createTime",bc.create_user_id AS "createUserId",
-        bc.create_user_name AS "createUserName",dg.deptid
-        FROM (
-            SELECT *
-            FROM bus_config
-            WHERE 1=1
-            <if test="request.configType != null and request.configType != '' ">
-                AND config_type =#{request.configType}
-            </if>
-            <if test="request.devcode != '' and request.devcode != null">
-                AND devcode =#{request.devcode}
-            </if>
-            <if test="request.status != '' and request.status != null">
-                AND status =#{request.status}
-            </if>
-            <if test="request.beginTime!='' and request.beginTime!=null">
-                AND send_time <![CDATA[  >=  ]]>
-                <include refid="char_toDate">
-                    <property name="paramStr" value="#{request.beginTime}"/>
-                </include>
-            </if>
-            <if test="request.endTime!='' and request.endTime!=null">
-                AND send_time <![CDATA[  <=  ]]>
-                <include refid="char_toDate">
-                    <property name="paramStr" value="#{request.endTime}"/>
-                </include>
-            </if>
-        )bc
-        JOIN device d ON d.devcode=bc.devcode
-        JOIN device_group dg ON dg.id= d.group_id
-
-    </select>
-
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml
deleted file mode 100644
index 083b289..0000000
--- a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?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.casic.missiles.mapper.DeviceDataMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceData">
-        <id column="id" property="id"/>
-        <result column="devcode" property="devcode"/>
-        <result column="device_type" property="deviceType"/>
-        <result column="cell" property="cell"/>
-        <result column="data_json" property="dataJson"/>
-        <result column="decrypt_before_data" property="decryptBeforeData"/>
-        <result column="decrypt_after_data" property="decryptAfterData"/>
-        <result column="uptime" property="uptime"/>
-        <result column="logtime" property="logtime"/>
-    </resultMap>
-
-    <sql id="char_toDate" databaseId="mysql">
-        ${paramStr}
-    </sql>
-
-    <sql id="char_toDate" databaseId="pgsql">
-       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
-    </sql>
-
-    <sql id="char_toDate" databaseId="oracle">
-        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
-    </sql>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, devcode, device_type, cell, data_json, decrypt_before_data, decrypt_after_data, uptime, logtime
-    </sql>
-
-    <select id="listPage" resultType="com.casic.missiles.dto.data.DeviceDataListVO">
-          SELECT  	dd.id,
-                    dd.devcode,
-                    dd.device_type AS "deviceType",
-                    deptid,
-                    dd.cell,
-                    dd.data_json AS "dataJson",
-                    decrypt_before_data AS "decryptBeforeData",
-                    decrypt_after_data AS "decryptAfterData",
-                    uptime,
-                    logtime,
-                    d.STATUS,
-                    d.group_id AS "groupId",
-                    dg.group_name AS "groupName"
-        FROM (
-               SELECT *
-               FROM device_data
-               WHERE  1=1
-                <if test="request.devcode!='' and request.devcode != null">
-                    AND devcode like CONCAT('%',#{request.devcode},'%')
-                </if>
-                <if test="request.deviceType!='' and request.deviceType != null">
-                    AND device_type =#{request.deviceType}
-                </if>
-                <if test="request.beginTime!='' and request.beginTime!=null">
-                    AND logtime <![CDATA[  >=  ]]>
-                    <include refid="char_toDate">
-                        <property name="paramStr" value="#{request.beginTime}"/>
-                    </include>
-                </if>
-                <if test="request.endTime!='' and request.endTime!=null">
-                    AND logtime <![CDATA[  <=  ]]>
-                    <include refid="char_toDate">
-                        <property name="paramStr" value="#{request.endTime}"/>
-                    </include>
-                </if>
-                <if test="request.ids != null">
-                    and id in
-                    <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
-                        #{id}
-                    </foreach>
-                </if>
-
-          )dd
-          JOIN (
-                SELECT id, group_id,status,devcode
-                FROM device
-                WHERE valid=1
-                <if test="request.devcode!='' and request.devcode != null">
-                    AND devcode like CONCAT('%',#{request.devcode},'%')
-                </if>
-                <if test="request.deviceType!='' and request.deviceType != null">
-                    AND device_type =#{request.deviceType}
-                </if>
-                <if test="request.groupId!='' and request.groupId != null">
-                    AND greoup_id=#{request.groupId}
-                </if>
-          )d ON d.devcode=dd.devcode
-          JOIN (
-                SELECT   deptid,id,group_name
-                FROM device_group
-                WHERE valid=1
-                <if test="request.groupId!='' and request.groupId != null">
-                    AND id=#{request.groupId}
-                </if>
-          ) dg ON dg.id=d.group_id
-          order by logtime desc
-
-    </select>
-
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml
deleted file mode 100644
index 2e07287..0000000
--- a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?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.casic.missiles.mapper.DeviceGroupMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceGroup">
-        <id column="id" property="id" />
-        <result column="group_name" property="groupName" />
-        <result column="group_no" property="groupNo" />
-        <result column="descn" property="descn" />
-        <result column="deptid" property="deptid" />
-        <result column="create_time" property="createTime" />
-        <result column="create_user_id" property="createUserId" />
-        <result column="owner" property="owner" />
-        <result column="valid" property="valid" />
-    </resultMap>
-
-    <sql id="char_toDate" databaseId="mysql">
-        ${paramStr}
-    </sql>
-
-    <sql id="char_toDate" databaseId="pgsql">
-       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
-    </sql>
-
-    <sql id="char_toDate" databaseId="oracle">
-        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
-    </sql>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, name, owner, subcribe_ids, descn, dept, create_time, create_user_id
-    </sql>
-
-    <select id="listPage" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
-        SELECT
-            dg.id,
-            group_no AS "groupNo",
-            deptid,
-             deviceCount,
-            subscribeCount,
-            descn,
-            create_time AS "createTime",
-            group_name AS "groupName",
-            create_user_id AS "createUserId",
-            create_user_name AS "createUserName"
-        FROM
-          (
-             SELECT *
-             FROM device_group
-             WHERE valid = 1
-            <if test="request.groupNo != null and request.groupNo != '' ">
-                AND group_no =#{request.groupNo}
-            </if>
-            <if test="request.groupName != '' and request.groupName != null">
-                AND group_name =#{request.groupName}
-            </if>
-            <if test="request.ids != null">
-                and id in
-                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
-                    #{id}
-                </foreach>
-            </if>
-            <if test="request.beginTime!='' and request.beginTime!=null">
-                AND create_time <![CDATA[  >=  ]]>
-                <include refid="char_toDate">
-                    <property name="paramStr" value="#{request.beginTime}"/>
-                </include>
-            </if>
-            <if test="request.endTime!='' and request.endTime!=null">
-                AND create_time <![CDATA[  <=  ]]>
-                <include refid="char_toDate">
-                    <property name="paramStr" value="#{request.endTime}"/>
-                </include>
-            </if>
-          ) dg
-            LEFT JOIN (
-                   SELECT count(id)  AS "deviceCount",group_id as groupId
-                   FROM device d
-                   WHERE VALID = 1
-                   GROUP BY group_id
-        ) d ON d.groupId = dg.id
-            LEFT JOIN (
-                 SELECT count(id)  AS "subscribeCount",group_id AS groupId
-                 FROM subscribe_store GROUP BY group_id
-           ) s ON s.groupId = dg.id
-         order by create_time desc
-    </select>
-
-    <select id="list" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
-        SELECT
-        dg.id,
-        group_no AS "groupNo",
-        deptid,
-        count( d.id ) AS "deviceCount",
-        count( s.id ) AS "subscribeCount",
-        descn,
-        create_time AS "createTime",
-        group_name AS "groupName"
-        FROM
-        (
-        SELECT *
-        FROM device_group
-        WHERE valid = 1
-        <if test="request.groupNo != null and request.groupNo != '' ">
-            AND group_no =#{request.groupNo}
-        </if>
-        <if test="request.groupName != '' and request.groupName != null">
-            AND group_name =#{request.groupName}
-        </if>
-        <if test="request.ids != null">
-            and id in
-            <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
-                #{id}
-            </foreach>
-        </if>
-        <if test="request.beginTime!='' and request.beginTime!=null">
-            AND create_time <![CDATA[  >=  ]]>
-            <include refid="char_toDate">
-                <property name="paramStr" value="#{request.beginTime}"/>
-            </include>
-        </if>
-        <if test="request.endTime!='' and request.endTime!=null">
-            AND create_time <![CDATA[  <=  ]]>
-            <include refid="char_toDate">
-                <property name="paramStr" value="#{request.endTime}"/>
-            </include>
-        </if>
-        ) dg
-        LEFT JOIN (
-            SELECT id, group_id AS "groupId"
-            FROM device d
-            WHERE VALID = 1
-        ) d ON d.groupId = dg.id
-        LEFT JOIN (
-            SELECT id, group_id AS "groupId"
-            FROM subscribe_store
-        ) s ON s.groupId = dg.id
-        GROUP BY dg.id
-        order by create_time desc
-    </select>
-
-    <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(group_no, 12)), 0)
-        from device_group
-    </select>
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/DeviceMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceMapper.xml
deleted file mode 100644
index 2c99706..0000000
--- a/casic-iot-dao/src/resource/mapper/DeviceMapper.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?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.casic.missiles.mapper.DeviceMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.Device">
-        <id column="id" property="id" />
-        <result column="group_id" property="groupId" />
-        <result column="product_id" property="productId" />
-        <result column="devcode" property="devcode" />
-        <result column="device_type" property="deviceType" />
-        <result column="unit" property="unit" />
-        <result column="model" property="model" />
-        <result column="name" property="name" />
-        <result column="status" property="status" />
-        <result column="imei" property="imei" />
-        <result column="create_time" property="createTime" />
-        <result column="create_user_name" property="createUserName" />
-        <result column="valid" property="valid" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, devcode, device_type, unit, name, product_id, status, imei, create_time, create_user_id
-    </sql>
-
-    <select id="listPage" resultType="com.casic.missiles.dto.device.DeviceListVO">
-        SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime,
-        data_value AS "dataValue",model,imei,d.cell,name AS "deviceName",status,d.id,create_user_id AS "createUserId",
-        create_user_name AS "createUserName"
-        FROM (
-            SELECT *
-            FROM device
-            WHERE VALID=1
-            <if test="request.groupId!='' and request.groupId != null">
-                AND group_id =#{request.groupId}
-            </if>
-            <if test="request.devcode!='' and request.devcode != null">
-                AND devcode like CONCAT('%',#{request.devcode},'%')
-            </if>
-            <if test="request.imei!='' and request.imei != null">
-                AND imei like CONCAT('%',#{request.imei},'%')
-            </if>
-            <if test="request.deviceType!='' and request.deviceType != null">
-                AND device_type =#{request.deviceType}
-            </if>
-            <if test="request.status!='' and request.status != null">
-                AND status =#{request.status}
-            </if>
-            <if test="request.productId!='' and request.productId != null">
-                AND product_id =#{request.productId}
-            </if>
-            <if test="request.beginCell!='' and request.beginCell!=null">
-                AND cell <![CDATA[  >=  ]]> #{request.beginCell}
-
-            </if>
-            <if test="request.endCell!='' and request.endCell!=null">
-                AND cell <![CDATA[  <=  ]]> #{request.endCell}
-            </if>
-            <if test="request.ids != null">
-                and id in
-                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
-                    #{id}
-                </foreach>
-            </if>
-            order by create_time desc
-        )d JOIN (
-            SELECT deptid,id
-            FROM device_group
-            WHERE VALID =1
-            <if test="request.groupId!='' and request.groupId != null">
-                AND id =#{request.groupId}
-            </if>
-        )dg ON dg.id=d.group_id
-        LEFT JOIN(
-            SELECT ddd.logtime AS logtime,data_value,ddd.devcode,cell
-            FROM device_data ddd
-            JOIN
-            (
-                SELECT Max(logtime) AS logtime,devcode
-                FROM  device_data
-                GROUP BY devcode
-            )dd  ON dd.logtime=ddd.logtime AND dd.devcode=ddd.devcode
-        )dd ON dd.devcode=d.devcode
-        order by create_time desc
-    </select>
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/DeviceUpgradeTaskMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceUpgradeTaskMapper.xml
deleted file mode 100644
index a5bf5e7..0000000
--- a/casic-iot-dao/src/resource/mapper/DeviceUpgradeTaskMapper.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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.casic.missiles.mapper.DeviceUpgradeTaskMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceUpgradeTask">
-        <id column="id" property="id" />
-        <result column="version_id" property="versionId" />
-        <result column="device_id" property="deviceId" />
-        <result column="status" property="status" />
-        <result column="create_time" property="createTime" />
-        <result column="create_user_id" property="createUserId" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, version_id, device_id, status, create_time, create_user_id
-    </sql>
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/DeviceVersionMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceVersionMapper.xml
deleted file mode 100644
index e39ec1f..0000000
--- a/casic-iot-dao/src/resource/mapper/DeviceVersionMapper.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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.casic.missiles.mapper.DeviceVersionMapper">
-
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceVersion">
-        <id column="Id" property="id" />
-        <result column="product_id" property="productId" />
-        <result column="version_file" property="versionFile" />
-        <result column="version" property="version" />
-        <result column="owner" property="owner" />
-        <result column="dscn" property="dscn" />
-        <result column="create_time" property="createTime" />
-        <result column="create_user_id" property="createUserId" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        Id, product_id, version_file, version, owner, dscn, create_time, create_user_id
-    </sql>
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/ProductConfigItemMapper.xml b/casic-iot-dao/src/resource/mapper/ProductConfigItemMapper.xml
deleted file mode 100644
index e2448be..0000000
--- a/casic-iot-dao/src/resource/mapper/ProductConfigItemMapper.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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.casic.missiles.mapper.ProductConfigItemMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductConfigItem">
-        <id column="id" property="id" />
-        <result column="product_id" property="productId" />
-        <result column="param_name" property="paramName" />
-        <result column="param_code" property="paramCode" />
-        <result column="param_type" property="paramType" />
-        <result column="regular_expression" property="regularExpression" />
-        <result column="create_time" property="createTime" />
-        <result column="create_user_id" property="createUserId" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, product_id, param_name, param_code, param_type, regular_expression, create_time, create_user_id
-    </sql>
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/ProductDataItemMapper.xml b/casic-iot-dao/src/resource/mapper/ProductDataItemMapper.xml
deleted file mode 100644
index 61a55ec..0000000
--- a/casic-iot-dao/src/resource/mapper/ProductDataItemMapper.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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.casic.missiles.mapper.ProductDataItemMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductDataItem">
-        <id column="id" property="id" />
-        <result column="data_item_name" property="dataItemName" />
-        <result column="product_id" property="productId" />
-        <result column="data_item_type" property="dataItemType" />
-        <result column="data_item_field" property="dataItemField" />
-        <result column="create_time" property="createTime" />
-        <result column="create_user_id" property="createUserId" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, data_item_name, product_id, data_item_type, data_item_field, create_time, create_user_id
-    </sql>
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/ProductInfoMapper.xml b/casic-iot-dao/src/resource/mapper/ProductInfoMapper.xml
deleted file mode 100644
index 26f3cb3..0000000
--- a/casic-iot-dao/src/resource/mapper/ProductInfoMapper.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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.casic.missiles.mapper.ProductInfoMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductInfo">
-        <id column="Id" property="id" />
-        <result column="name" property="name" />
-        <result column="access_type" property="accessType" />
-        <result column="encipher_type" property="encipherType" />
-        <result column="descn" property="descn" />
-        <result column="product_type" property="productType" />
-        <result column="owners" property="owners" />
-        <result column="create_time" property="createTime" />
-        <result column="create_user_name" property="createUserName" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        Id, name, access_type, encipher_type, protocol_type, model, descn, product_type, owners, CreatorName, create_time, create_user_id
-    </sql>
-
-    <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(product_no, 12)), 0)
-        from product_info
-    </select>
-
-
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml b/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml
deleted file mode 100644
index 415a670..0000000
--- a/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?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.casic.missiles.mapper.SubscribeStoreMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.SubscribeStore">
-        <id column="id" property="id"/>
-        <result column="subscribe_no" property="subscribeNo"/>
-        <result column="group_id" property="groupId"/>
-        <result column="message_type" property="messageType"/>
-        <result column="subscribe_type" property="subscribeType"/>
-        <result column="enable" property="enable"/>
-        <result column="subscribe_status" property="subscribeStatus"/>
-        <result column="subscribe_content_json" property="subscribeContentJson"/>
-        <result column="descn" property="descn"/>
-        <result column="create_time" property="createTime"/>
-        <result column="create_user_name" property="createUserName"/>
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, message_type, subscribe_type, enable, subscribe_status, subscribe_content_json, descn, create_time, create_user_name
-    </sql>
-
-    <select id="listPage" resultType="com.casic.missiles.dto.subscribe.SubscribeListVO">
-        SELECT message_type AS "messageType",create_time AS "createTime",subscribe_no AS
-            "subscribeNo",subscribe_content_json AS "subscribeContentJson",
-            subscribe_status AS "subscribeStatus",create_user_name AS "createUserName",
-           create_user_id AS "createUserId"
-        FROM (
-        SELECT *
-        FROM subscribe_store
-        WHERE 1=1
-        <if test="request.groupId!='' and request.groupId != null">
-            AND group_id =#{request.groupId}
-        </if>
-        <if test="request.messageType!='' and request.messageType != null">
-            AND message_type =#{request.messageType}
-        </if>
-        <if test="request.subscribeNo!='' and request.subscribeNo != null">
-            AND subscribe_no like CONCAT('%',#{request.subscribeNo},'%')
-        </if>
-        <if test="request.subscribeType!='' and request.subscribeType != null">
-            AND subscribe_type =#{request.subscribeType}
-        </if>
-        <if test="request.status!='' and request.status != null">
-            AND subscribe_status =#{request.status}
-        </if>
-        order by create_time desc
-        )d JOIN (
-        SELECT deptid,id
-        FROM device_group
-        WHERE VALID=1
-        <if test="request.groupId!='' and request.groupId != null">
-            AND id =#{request.groupId}
-        </if>
-        )dg ON dg.id=d.group_id
-        order by create_time desc
-    </select>
-
-</mapper>

diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml
new file mode 100644
index 0000000..bd2c2cc
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml
@@ -0,0 +1,22 @@
+<?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.casic.missiles.mapper.AlarmConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmConfig">
+        <id column="id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="name" property="name" />
+        <result column="alarm_content" property="alarmContent" />
+        <result column="period_high" property="periodHigh" />
+        <result column="period_low" property="periodLow" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, product_id, alarm_content, period_high, period_low, TypeName, CreatorId, creater_user_id, create_time
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml
new file mode 100644
index 0000000..4aee44a
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml
@@ -0,0 +1,23 @@
+<?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.casic.missiles.mapper.AlarmDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmData">
+        <id column="id" property="id" />
+        <result column="alarm_type" property="alarmType" />
+        <result column="alarm_content" property="alarmContent" />
+        <result column="devcode" property="devcode" />
+        <result column="alarm_time" property="alarmTime" />
+        <result column="alarm_value" property="alarmValue" />
+        <result column="status" property="status" />
+        <result column="create_name" property="createName" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, alarm_type, alarm_content, devcode, alarm_time, alarm_value, status, CreatorName, create_time
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml b/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml
new file mode 100644
index 0000000..b4965d6
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/BusConfigMapper.xml
@@ -0,0 +1,70 @@
+<?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.casic.missiles.mapper.BusConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.BusConfig">
+        <id column="id" property="id"/>
+        <result column="devcode" property="devcode"/>
+        <result column="config_json" property="configJson"/>
+        <result column="status" property="status"/>
+        <result column="send_time" property="sendTime"/>
+        <result column="create_time" property="createTime"/>
+        <result column="create_user_id" property="createUserId"/>
+    </resultMap>
+
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, Pid, devcode, config_json, status, update_time, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.model.BusConfig">
+        select bc.id,bc.devcode,config_type AS "configType", config_json AS "configJson",bc.status,
+        send_time as "sendTime",bc.create_time AS "createTime",bc.create_user_id AS "createUserId",
+        bc.create_user_name AS "createUserName",dg.deptid
+        FROM (
+            SELECT *
+            FROM bus_config
+            WHERE 1=1
+            <if test="request.configType != null and request.configType != '' ">
+                AND config_type =#{request.configType}
+            </if>
+            <if test="request.devcode != '' and request.devcode != null">
+                AND devcode =#{request.devcode}
+            </if>
+            <if test="request.status != '' and request.status != null">
+                AND status =#{request.status}
+            </if>
+            <if test="request.beginTime!='' and request.beginTime!=null">
+                AND send_time <![CDATA[  >=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.beginTime}"/>
+                </include>
+            </if>
+            <if test="request.endTime!='' and request.endTime!=null">
+                AND send_time <![CDATA[  <=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.endTime}"/>
+                </include>
+            </if>
+        )bc
+        JOIN device d ON d.devcode=bc.devcode
+        JOIN device_group dg ON dg.id= d.group_id
+
+    </select>
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml
new file mode 100644
index 0000000..083b289
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceDataMapper.xml
@@ -0,0 +1,106 @@
+<?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.casic.missiles.mapper.DeviceDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceData">
+        <id column="id" property="id"/>
+        <result column="devcode" property="devcode"/>
+        <result column="device_type" property="deviceType"/>
+        <result column="cell" property="cell"/>
+        <result column="data_json" property="dataJson"/>
+        <result column="decrypt_before_data" property="decryptBeforeData"/>
+        <result column="decrypt_after_data" property="decryptAfterData"/>
+        <result column="uptime" property="uptime"/>
+        <result column="logtime" property="logtime"/>
+    </resultMap>
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, devcode, device_type, cell, data_json, decrypt_before_data, decrypt_after_data, uptime, logtime
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.data.DeviceDataListVO">
+          SELECT  	dd.id,
+                    dd.devcode,
+                    dd.device_type AS "deviceType",
+                    deptid,
+                    dd.cell,
+                    dd.data_json AS "dataJson",
+                    decrypt_before_data AS "decryptBeforeData",
+                    decrypt_after_data AS "decryptAfterData",
+                    uptime,
+                    logtime,
+                    d.STATUS,
+                    d.group_id AS "groupId",
+                    dg.group_name AS "groupName"
+        FROM (
+               SELECT *
+               FROM device_data
+               WHERE  1=1
+                <if test="request.devcode!='' and request.devcode != null">
+                    AND devcode like CONCAT('%',#{request.devcode},'%')
+                </if>
+                <if test="request.deviceType!='' and request.deviceType != null">
+                    AND device_type =#{request.deviceType}
+                </if>
+                <if test="request.beginTime!='' and request.beginTime!=null">
+                    AND logtime <![CDATA[  >=  ]]>
+                    <include refid="char_toDate">
+                        <property name="paramStr" value="#{request.beginTime}"/>
+                    </include>
+                </if>
+                <if test="request.endTime!='' and request.endTime!=null">
+                    AND logtime <![CDATA[  <=  ]]>
+                    <include refid="char_toDate">
+                        <property name="paramStr" value="#{request.endTime}"/>
+                    </include>
+                </if>
+                <if test="request.ids != null">
+                    and id in
+                    <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                        #{id}
+                    </foreach>
+                </if>
+
+          )dd
+          JOIN (
+                SELECT id, group_id,status,devcode
+                FROM device
+                WHERE valid=1
+                <if test="request.devcode!='' and request.devcode != null">
+                    AND devcode like CONCAT('%',#{request.devcode},'%')
+                </if>
+                <if test="request.deviceType!='' and request.deviceType != null">
+                    AND device_type =#{request.deviceType}
+                </if>
+                <if test="request.groupId!='' and request.groupId != null">
+                    AND greoup_id=#{request.groupId}
+                </if>
+          )d ON d.devcode=dd.devcode
+          JOIN (
+                SELECT   deptid,id,group_name
+                FROM device_group
+                WHERE valid=1
+                <if test="request.groupId!='' and request.groupId != null">
+                    AND id=#{request.groupId}
+                </if>
+          ) dg ON dg.id=d.group_id
+          order by logtime desc
+
+    </select>
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml
new file mode 100644
index 0000000..2e07287
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceGroupMapper.xml
@@ -0,0 +1,148 @@
+<?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.casic.missiles.mapper.DeviceGroupMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceGroup">
+        <id column="id" property="id" />
+        <result column="group_name" property="groupName" />
+        <result column="group_no" property="groupNo" />
+        <result column="descn" property="descn" />
+        <result column="deptid" property="deptid" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="owner" property="owner" />
+        <result column="valid" property="valid" />
+    </resultMap>
+
+    <sql id="char_toDate" databaseId="mysql">
+        ${paramStr}
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, owner, subcribe_ids, descn, dept, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
+        SELECT
+            dg.id,
+            group_no AS "groupNo",
+            deptid,
+             deviceCount,
+            subscribeCount,
+            descn,
+            create_time AS "createTime",
+            group_name AS "groupName",
+            create_user_id AS "createUserId",
+            create_user_name AS "createUserName"
+        FROM
+          (
+             SELECT *
+             FROM device_group
+             WHERE valid = 1
+            <if test="request.groupNo != null and request.groupNo != '' ">
+                AND group_no =#{request.groupNo}
+            </if>
+            <if test="request.groupName != '' and request.groupName != null">
+                AND group_name =#{request.groupName}
+            </if>
+            <if test="request.ids != null">
+                and id in
+                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+            <if test="request.beginTime!='' and request.beginTime!=null">
+                AND create_time <![CDATA[  >=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.beginTime}"/>
+                </include>
+            </if>
+            <if test="request.endTime!='' and request.endTime!=null">
+                AND create_time <![CDATA[  <=  ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{request.endTime}"/>
+                </include>
+            </if>
+          ) dg
+            LEFT JOIN (
+                   SELECT count(id)  AS "deviceCount",group_id as groupId
+                   FROM device d
+                   WHERE VALID = 1
+                   GROUP BY group_id
+        ) d ON d.groupId = dg.id
+            LEFT JOIN (
+                 SELECT count(id)  AS "subscribeCount",group_id AS groupId
+                 FROM subscribe_store GROUP BY group_id
+           ) s ON s.groupId = dg.id
+         order by create_time desc
+    </select>
+
+    <select id="list" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
+        SELECT
+        dg.id,
+        group_no AS "groupNo",
+        deptid,
+        count( d.id ) AS "deviceCount",
+        count( s.id ) AS "subscribeCount",
+        descn,
+        create_time AS "createTime",
+        group_name AS "groupName"
+        FROM
+        (
+        SELECT *
+        FROM device_group
+        WHERE valid = 1
+        <if test="request.groupNo != null and request.groupNo != '' ">
+            AND group_no =#{request.groupNo}
+        </if>
+        <if test="request.groupName != '' and request.groupName != null">
+            AND group_name =#{request.groupName}
+        </if>
+        <if test="request.ids != null">
+            and id in
+            <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+        <if test="request.beginTime!='' and request.beginTime!=null">
+            AND create_time <![CDATA[  >=  ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{request.beginTime}"/>
+            </include>
+        </if>
+        <if test="request.endTime!='' and request.endTime!=null">
+            AND create_time <![CDATA[  <=  ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{request.endTime}"/>
+            </include>
+        </if>
+        ) dg
+        LEFT JOIN (
+            SELECT id, group_id AS "groupId"
+            FROM device d
+            WHERE VALID = 1
+        ) d ON d.groupId = dg.id
+        LEFT JOIN (
+            SELECT id, group_id AS "groupId"
+            FROM subscribe_store
+        ) s ON s.groupId = dg.id
+        GROUP BY dg.id
+        order by create_time desc
+    </select>
+
+    <select id="selectMaxNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(group_no, 12)), 0)
+        from device_group
+    </select>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
new file mode 100644
index 0000000..2c99706
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
@@ -0,0 +1,88 @@
+<?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.casic.missiles.mapper.DeviceMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.Device">
+        <id column="id" property="id" />
+        <result column="group_id" property="groupId" />
+        <result column="product_id" property="productId" />
+        <result column="devcode" property="devcode" />
+        <result column="device_type" property="deviceType" />
+        <result column="unit" property="unit" />
+        <result column="model" property="model" />
+        <result column="name" property="name" />
+        <result column="status" property="status" />
+        <result column="imei" property="imei" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="valid" property="valid" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, devcode, device_type, unit, name, product_id, status, imei, create_time, create_user_id
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.device.DeviceListVO">
+        SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime,
+        data_value AS "dataValue",model,imei,d.cell,name AS "deviceName",status,d.id,create_user_id AS "createUserId",
+        create_user_name AS "createUserName"
+        FROM (
+            SELECT *
+            FROM device
+            WHERE VALID=1
+            <if test="request.groupId!='' and request.groupId != null">
+                AND group_id =#{request.groupId}
+            </if>
+            <if test="request.devcode!='' and request.devcode != null">
+                AND devcode like CONCAT('%',#{request.devcode},'%')
+            </if>
+            <if test="request.imei!='' and request.imei != null">
+                AND imei like CONCAT('%',#{request.imei},'%')
+            </if>
+            <if test="request.deviceType!='' and request.deviceType != null">
+                AND device_type =#{request.deviceType}
+            </if>
+            <if test="request.status!='' and request.status != null">
+                AND status =#{request.status}
+            </if>
+            <if test="request.productId!='' and request.productId != null">
+                AND product_id =#{request.productId}
+            </if>
+            <if test="request.beginCell!='' and request.beginCell!=null">
+                AND cell <![CDATA[  >=  ]]> #{request.beginCell}
+
+            </if>
+            <if test="request.endCell!='' and request.endCell!=null">
+                AND cell <![CDATA[  <=  ]]> #{request.endCell}
+            </if>
+            <if test="request.ids != null">
+                and id in
+                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+            order by create_time desc
+        )d JOIN (
+            SELECT deptid,id
+            FROM device_group
+            WHERE VALID =1
+            <if test="request.groupId!='' and request.groupId != null">
+                AND id =#{request.groupId}
+            </if>
+        )dg ON dg.id=d.group_id
+        LEFT JOIN(
+            SELECT ddd.logtime AS logtime,data_value,ddd.devcode,cell
+            FROM device_data ddd
+            JOIN
+            (
+                SELECT Max(logtime) AS logtime,devcode
+                FROM  device_data
+                GROUP BY devcode
+            )dd  ON dd.logtime=ddd.logtime AND dd.devcode=ddd.devcode
+        )dd ON dd.devcode=d.devcode
+        order by create_time desc
+    </select>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml
new file mode 100644
index 0000000..a5bf5e7
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml
@@ -0,0 +1,20 @@
+<?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.casic.missiles.mapper.DeviceUpgradeTaskMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceUpgradeTask">
+        <id column="id" property="id" />
+        <result column="version_id" property="versionId" />
+        <result column="device_id" property="deviceId" />
+        <result column="status" property="status" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, version_id, device_id, status, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml
new file mode 100644
index 0000000..e39ec1f
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml
@@ -0,0 +1,23 @@
+<?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.casic.missiles.mapper.DeviceVersionMapper">
+
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceVersion">
+        <id column="Id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="version_file" property="versionFile" />
+        <result column="version" property="version" />
+        <result column="owner" property="owner" />
+        <result column="dscn" property="dscn" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        Id, product_id, version_file, version, owner, dscn, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductConfigItemMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductConfigItemMapper.xml
new file mode 100644
index 0000000..e2448be
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/ProductConfigItemMapper.xml
@@ -0,0 +1,22 @@
+<?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.casic.missiles.mapper.ProductConfigItemMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductConfigItem">
+        <id column="id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="param_name" property="paramName" />
+        <result column="param_code" property="paramCode" />
+        <result column="param_type" property="paramType" />
+        <result column="regular_expression" property="regularExpression" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, product_id, param_name, param_code, param_type, regular_expression, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductDataItemMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductDataItemMapper.xml
new file mode 100644
index 0000000..61a55ec
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/ProductDataItemMapper.xml
@@ -0,0 +1,21 @@
+<?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.casic.missiles.mapper.ProductDataItemMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductDataItem">
+        <id column="id" property="id" />
+        <result column="data_item_name" property="dataItemName" />
+        <result column="product_id" property="productId" />
+        <result column="data_item_type" property="dataItemType" />
+        <result column="data_item_field" property="dataItemField" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_id" property="createUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, data_item_name, product_id, data_item_type, data_item_field, create_time, create_user_id
+    </sql>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
new file mode 100644
index 0000000..26f3cb3
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
@@ -0,0 +1,30 @@
+<?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.casic.missiles.mapper.ProductInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductInfo">
+        <id column="Id" property="id" />
+        <result column="name" property="name" />
+        <result column="access_type" property="accessType" />
+        <result column="encipher_type" property="encipherType" />
+        <result column="descn" property="descn" />
+        <result column="product_type" property="productType" />
+        <result column="owners" property="owners" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user_name" property="createUserName" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        Id, name, access_type, encipher_type, protocol_type, model, descn, product_type, owners, CreatorName, create_time, create_user_id
+    </sql>
+
+    <select id="selectMaxNo" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(product_no, 12)), 0)
+        from product_info
+    </select>
+
+
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/SubscribeStoreMapper.xml b/casic-iot-dao/src/main/resources/mapper/SubscribeStoreMapper.xml
new file mode 100644
index 0000000..415a670
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/SubscribeStoreMapper.xml
@@ -0,0 +1,61 @@
+<?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.casic.missiles.mapper.SubscribeStoreMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.SubscribeStore">
+        <id column="id" property="id"/>
+        <result column="subscribe_no" property="subscribeNo"/>
+        <result column="group_id" property="groupId"/>
+        <result column="message_type" property="messageType"/>
+        <result column="subscribe_type" property="subscribeType"/>
+        <result column="enable" property="enable"/>
+        <result column="subscribe_status" property="subscribeStatus"/>
+        <result column="subscribe_content_json" property="subscribeContentJson"/>
+        <result column="descn" property="descn"/>
+        <result column="create_time" property="createTime"/>
+        <result column="create_user_name" property="createUserName"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, message_type, subscribe_type, enable, subscribe_status, subscribe_content_json, descn, create_time, create_user_name
+    </sql>
+
+    <select id="listPage" resultType="com.casic.missiles.dto.subscribe.SubscribeListVO">
+        SELECT message_type AS "messageType",create_time AS "createTime",subscribe_no AS
+            "subscribeNo",subscribe_content_json AS "subscribeContentJson",
+            subscribe_status AS "subscribeStatus",create_user_name AS "createUserName",
+           create_user_id AS "createUserId"
+        FROM (
+        SELECT *
+        FROM subscribe_store
+        WHERE 1=1
+        <if test="request.groupId!='' and request.groupId != null">
+            AND group_id =#{request.groupId}
+        </if>
+        <if test="request.messageType!='' and request.messageType != null">
+            AND message_type =#{request.messageType}
+        </if>
+        <if test="request.subscribeNo!='' and request.subscribeNo != null">
+            AND subscribe_no like CONCAT('%',#{request.subscribeNo},'%')
+        </if>
+        <if test="request.subscribeType!='' and request.subscribeType != null">
+            AND subscribe_type =#{request.subscribeType}
+        </if>
+        <if test="request.status!='' and request.status != null">
+            AND subscribe_status =#{request.status}
+        </if>
+        order by create_time desc
+        )d JOIN (
+        SELECT deptid,id
+        FROM device_group
+        WHERE VALID=1
+        <if test="request.groupId!='' and request.groupId != null">
+            AND id =#{request.groupId}
+        </if>
+        )dg ON dg.id=d.group_id
+        order by create_time desc
+    </select>
+
+</mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/common/SysCommonMapper.xml b/casic-iot-dao/src/main/resources/mapper/common/SysCommonMapper.xml
new file mode 100644
index 0000000..880f7d4
--- /dev/null
+++ b/casic-iot-dao/src/main/resources/mapper/common/SysCommonMapper.xml
@@ -0,0 +1,21 @@
+<?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.casic.missiles.mapper.common.SysCommonMapper">
+
+    <select id="getDictMapByCode" resultType="java.util.Map">
+        SELECT  name,code
+        from sys_dict
+         where  pid=(
+            SELECT id
+            from  sys_dict
+            where  code=#{code}
+         )
+    </select>
+
+    <select id="getDeptMap" resultType="java.util.Map">
+        SELECT  id,SIMPLE_NAME AS  "simpleName"
+        from sys_dept
+    </select>
+
+
+</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/AlarmConfigMapper.xml b/casic-iot-dao/src/resource/mapper/AlarmConfigMapper.xml
deleted file mode 100644
index bd2c2cc..0000000
--- a/casic-iot-dao/src/resource/mapper/AlarmConfigMapper.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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.casic.missiles.mapper.AlarmConfigMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmConfig">
-        <id column="id" property="id" />
-        <result column="product_id" property="productId" />
-        <result column="name" property="name" />
-        <result column="alarm_content" property="alarmContent" />
-        <result column="period_high" property="periodHigh" />
-        <result column="period_low" property="periodLow" />
-        <result column="create_user_id" property="createUserId" />
-        <result column="create_time" property="createTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, name, product_id, alarm_content, period_high, period_low, TypeName, CreatorId, creater_user_id, create_time
-    </sql>
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/AlarmDataMapper.xml b/casic-iot-dao/src/resource/mapper/AlarmDataMapper.xml
deleted file mode 100644
index 4aee44a..0000000
--- a/casic-iot-dao/src/resource/mapper/AlarmDataMapper.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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.casic.missiles.mapper.AlarmDataMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.AlarmData">
-        <id column="id" property="id" />
-        <result column="alarm_type" property="alarmType" />
-        <result column="alarm_content" property="alarmContent" />
-        <result column="devcode" property="devcode" />
-        <result column="alarm_time" property="alarmTime" />
-        <result column="alarm_value" property="alarmValue" />
-        <result column="status" property="status" />
-        <result column="create_name" property="createName" />
-        <result column="create_time" property="createTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, alarm_type, alarm_content, devcode, alarm_time, alarm_value, status, CreatorName, create_time
-    </sql>
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/BusConfigMapper.xml b/casic-iot-dao/src/resource/mapper/BusConfigMapper.xml
deleted file mode 100644
index b4965d6..0000000
--- a/casic-iot-dao/src/resource/mapper/BusConfigMapper.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?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.casic.missiles.mapper.BusConfigMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.BusConfig">
-        <id column="id" property="id"/>
-        <result column="devcode" property="devcode"/>
-        <result column="config_json" property="configJson"/>
-        <result column="status" property="status"/>
-        <result column="send_time" property="sendTime"/>
-        <result column="create_time" property="createTime"/>
-        <result column="create_user_id" property="createUserId"/>
-    </resultMap>
-
-
-    <sql id="char_toDate" databaseId="mysql">
-        ${paramStr}
-    </sql>
-
-    <sql id="char_toDate" databaseId="pgsql">
-       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
-    </sql>
-
-    <sql id="char_toDate" databaseId="oracle">
-        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
-    </sql>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, Pid, devcode, config_json, status, update_time, create_time, create_user_id
-    </sql>
-
-    <select id="listPage" resultType="com.casic.missiles.model.BusConfig">
-        select bc.id,bc.devcode,config_type AS "configType", config_json AS "configJson",bc.status,
-        send_time as "sendTime",bc.create_time AS "createTime",bc.create_user_id AS "createUserId",
-        bc.create_user_name AS "createUserName",dg.deptid
-        FROM (
-            SELECT *
-            FROM bus_config
-            WHERE 1=1
-            <if test="request.configType != null and request.configType != '' ">
-                AND config_type =#{request.configType}
-            </if>
-            <if test="request.devcode != '' and request.devcode != null">
-                AND devcode =#{request.devcode}
-            </if>
-            <if test="request.status != '' and request.status != null">
-                AND status =#{request.status}
-            </if>
-            <if test="request.beginTime!='' and request.beginTime!=null">
-                AND send_time <![CDATA[  >=  ]]>
-                <include refid="char_toDate">
-                    <property name="paramStr" value="#{request.beginTime}"/>
-                </include>
-            </if>
-            <if test="request.endTime!='' and request.endTime!=null">
-                AND send_time <![CDATA[  <=  ]]>
-                <include refid="char_toDate">
-                    <property name="paramStr" value="#{request.endTime}"/>
-                </include>
-            </if>
-        )bc
-        JOIN device d ON d.devcode=bc.devcode
-        JOIN device_group dg ON dg.id= d.group_id
-
-    </select>
-
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml
deleted file mode 100644
index 083b289..0000000
--- a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?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.casic.missiles.mapper.DeviceDataMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceData">
-        <id column="id" property="id"/>
-        <result column="devcode" property="devcode"/>
-        <result column="device_type" property="deviceType"/>
-        <result column="cell" property="cell"/>
-        <result column="data_json" property="dataJson"/>
-        <result column="decrypt_before_data" property="decryptBeforeData"/>
-        <result column="decrypt_after_data" property="decryptAfterData"/>
-        <result column="uptime" property="uptime"/>
-        <result column="logtime" property="logtime"/>
-    </resultMap>
-
-    <sql id="char_toDate" databaseId="mysql">
-        ${paramStr}
-    </sql>
-
-    <sql id="char_toDate" databaseId="pgsql">
-       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
-    </sql>
-
-    <sql id="char_toDate" databaseId="oracle">
-        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
-    </sql>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, devcode, device_type, cell, data_json, decrypt_before_data, decrypt_after_data, uptime, logtime
-    </sql>
-
-    <select id="listPage" resultType="com.casic.missiles.dto.data.DeviceDataListVO">
-          SELECT  	dd.id,
-                    dd.devcode,
-                    dd.device_type AS "deviceType",
-                    deptid,
-                    dd.cell,
-                    dd.data_json AS "dataJson",
-                    decrypt_before_data AS "decryptBeforeData",
-                    decrypt_after_data AS "decryptAfterData",
-                    uptime,
-                    logtime,
-                    d.STATUS,
-                    d.group_id AS "groupId",
-                    dg.group_name AS "groupName"
-        FROM (
-               SELECT *
-               FROM device_data
-               WHERE  1=1
-                <if test="request.devcode!='' and request.devcode != null">
-                    AND devcode like CONCAT('%',#{request.devcode},'%')
-                </if>
-                <if test="request.deviceType!='' and request.deviceType != null">
-                    AND device_type =#{request.deviceType}
-                </if>
-                <if test="request.beginTime!='' and request.beginTime!=null">
-                    AND logtime <![CDATA[  >=  ]]>
-                    <include refid="char_toDate">
-                        <property name="paramStr" value="#{request.beginTime}"/>
-                    </include>
-                </if>
-                <if test="request.endTime!='' and request.endTime!=null">
-                    AND logtime <![CDATA[  <=  ]]>
-                    <include refid="char_toDate">
-                        <property name="paramStr" value="#{request.endTime}"/>
-                    </include>
-                </if>
-                <if test="request.ids != null">
-                    and id in
-                    <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
-                        #{id}
-                    </foreach>
-                </if>
-
-          )dd
-          JOIN (
-                SELECT id, group_id,status,devcode
-                FROM device
-                WHERE valid=1
-                <if test="request.devcode!='' and request.devcode != null">
-                    AND devcode like CONCAT('%',#{request.devcode},'%')
-                </if>
-                <if test="request.deviceType!='' and request.deviceType != null">
-                    AND device_type =#{request.deviceType}
-                </if>
-                <if test="request.groupId!='' and request.groupId != null">
-                    AND greoup_id=#{request.groupId}
-                </if>
-          )d ON d.devcode=dd.devcode
-          JOIN (
-                SELECT   deptid,id,group_name
-                FROM device_group
-                WHERE valid=1
-                <if test="request.groupId!='' and request.groupId != null">
-                    AND id=#{request.groupId}
-                </if>
-          ) dg ON dg.id=d.group_id
-          order by logtime desc
-
-    </select>
-
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml
deleted file mode 100644
index 2e07287..0000000
--- a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?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.casic.missiles.mapper.DeviceGroupMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceGroup">
-        <id column="id" property="id" />
-        <result column="group_name" property="groupName" />
-        <result column="group_no" property="groupNo" />
-        <result column="descn" property="descn" />
-        <result column="deptid" property="deptid" />
-        <result column="create_time" property="createTime" />
-        <result column="create_user_id" property="createUserId" />
-        <result column="owner" property="owner" />
-        <result column="valid" property="valid" />
-    </resultMap>
-
-    <sql id="char_toDate" databaseId="mysql">
-        ${paramStr}
-    </sql>
-
-    <sql id="char_toDate" databaseId="pgsql">
-       TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
-    </sql>
-
-    <sql id="char_toDate" databaseId="oracle">
-        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
-    </sql>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, name, owner, subcribe_ids, descn, dept, create_time, create_user_id
-    </sql>
-
-    <select id="listPage" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
-        SELECT
-            dg.id,
-            group_no AS "groupNo",
-            deptid,
-             deviceCount,
-            subscribeCount,
-            descn,
-            create_time AS "createTime",
-            group_name AS "groupName",
-            create_user_id AS "createUserId",
-            create_user_name AS "createUserName"
-        FROM
-          (
-             SELECT *
-             FROM device_group
-             WHERE valid = 1
-            <if test="request.groupNo != null and request.groupNo != '' ">
-                AND group_no =#{request.groupNo}
-            </if>
-            <if test="request.groupName != '' and request.groupName != null">
-                AND group_name =#{request.groupName}
-            </if>
-            <if test="request.ids != null">
-                and id in
-                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
-                    #{id}
-                </foreach>
-            </if>
-            <if test="request.beginTime!='' and request.beginTime!=null">
-                AND create_time <![CDATA[  >=  ]]>
-                <include refid="char_toDate">
-                    <property name="paramStr" value="#{request.beginTime}"/>
-                </include>
-            </if>
-            <if test="request.endTime!='' and request.endTime!=null">
-                AND create_time <![CDATA[  <=  ]]>
-                <include refid="char_toDate">
-                    <property name="paramStr" value="#{request.endTime}"/>
-                </include>
-            </if>
-          ) dg
-            LEFT JOIN (
-                   SELECT count(id)  AS "deviceCount",group_id as groupId
-                   FROM device d
-                   WHERE VALID = 1
-                   GROUP BY group_id
-        ) d ON d.groupId = dg.id
-            LEFT JOIN (
-                 SELECT count(id)  AS "subscribeCount",group_id AS groupId
-                 FROM subscribe_store GROUP BY group_id
-           ) s ON s.groupId = dg.id
-         order by create_time desc
-    </select>
-
-    <select id="list" resultType="com.casic.missiles.dto.group.DeviceGroupListVO">
-        SELECT
-        dg.id,
-        group_no AS "groupNo",
-        deptid,
-        count( d.id ) AS "deviceCount",
-        count( s.id ) AS "subscribeCount",
-        descn,
-        create_time AS "createTime",
-        group_name AS "groupName"
-        FROM
-        (
-        SELECT *
-        FROM device_group
-        WHERE valid = 1
-        <if test="request.groupNo != null and request.groupNo != '' ">
-            AND group_no =#{request.groupNo}
-        </if>
-        <if test="request.groupName != '' and request.groupName != null">
-            AND group_name =#{request.groupName}
-        </if>
-        <if test="request.ids != null">
-            and id in
-            <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
-                #{id}
-            </foreach>
-        </if>
-        <if test="request.beginTime!='' and request.beginTime!=null">
-            AND create_time <![CDATA[  >=  ]]>
-            <include refid="char_toDate">
-                <property name="paramStr" value="#{request.beginTime}"/>
-            </include>
-        </if>
-        <if test="request.endTime!='' and request.endTime!=null">
-            AND create_time <![CDATA[  <=  ]]>
-            <include refid="char_toDate">
-                <property name="paramStr" value="#{request.endTime}"/>
-            </include>
-        </if>
-        ) dg
-        LEFT JOIN (
-            SELECT id, group_id AS "groupId"
-            FROM device d
-            WHERE VALID = 1
-        ) d ON d.groupId = dg.id
-        LEFT JOIN (
-            SELECT id, group_id AS "groupId"
-            FROM subscribe_store
-        ) s ON s.groupId = dg.id
-        GROUP BY dg.id
-        order by create_time desc
-    </select>
-
-    <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(group_no, 12)), 0)
-        from device_group
-    </select>
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/DeviceMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceMapper.xml
deleted file mode 100644
index 2c99706..0000000
--- a/casic-iot-dao/src/resource/mapper/DeviceMapper.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?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.casic.missiles.mapper.DeviceMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.Device">
-        <id column="id" property="id" />
-        <result column="group_id" property="groupId" />
-        <result column="product_id" property="productId" />
-        <result column="devcode" property="devcode" />
-        <result column="device_type" property="deviceType" />
-        <result column="unit" property="unit" />
-        <result column="model" property="model" />
-        <result column="name" property="name" />
-        <result column="status" property="status" />
-        <result column="imei" property="imei" />
-        <result column="create_time" property="createTime" />
-        <result column="create_user_name" property="createUserName" />
-        <result column="valid" property="valid" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, devcode, device_type, unit, name, product_id, status, imei, create_time, create_user_id
-    </sql>
-
-    <select id="listPage" resultType="com.casic.missiles.dto.device.DeviceListVO">
-        SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime,
-        data_value AS "dataValue",model,imei,d.cell,name AS "deviceName",status,d.id,create_user_id AS "createUserId",
-        create_user_name AS "createUserName"
-        FROM (
-            SELECT *
-            FROM device
-            WHERE VALID=1
-            <if test="request.groupId!='' and request.groupId != null">
-                AND group_id =#{request.groupId}
-            </if>
-            <if test="request.devcode!='' and request.devcode != null">
-                AND devcode like CONCAT('%',#{request.devcode},'%')
-            </if>
-            <if test="request.imei!='' and request.imei != null">
-                AND imei like CONCAT('%',#{request.imei},'%')
-            </if>
-            <if test="request.deviceType!='' and request.deviceType != null">
-                AND device_type =#{request.deviceType}
-            </if>
-            <if test="request.status!='' and request.status != null">
-                AND status =#{request.status}
-            </if>
-            <if test="request.productId!='' and request.productId != null">
-                AND product_id =#{request.productId}
-            </if>
-            <if test="request.beginCell!='' and request.beginCell!=null">
-                AND cell <![CDATA[  >=  ]]> #{request.beginCell}
-
-            </if>
-            <if test="request.endCell!='' and request.endCell!=null">
-                AND cell <![CDATA[  <=  ]]> #{request.endCell}
-            </if>
-            <if test="request.ids != null">
-                and id in
-                <foreach collection="request.ids" index="index" item="id" open="(" separator="," close=")">
-                    #{id}
-                </foreach>
-            </if>
-            order by create_time desc
-        )d JOIN (
-            SELECT deptid,id
-            FROM device_group
-            WHERE VALID =1
-            <if test="request.groupId!='' and request.groupId != null">
-                AND id =#{request.groupId}
-            </if>
-        )dg ON dg.id=d.group_id
-        LEFT JOIN(
-            SELECT ddd.logtime AS logtime,data_value,ddd.devcode,cell
-            FROM device_data ddd
-            JOIN
-            (
-                SELECT Max(logtime) AS logtime,devcode
-                FROM  device_data
-                GROUP BY devcode
-            )dd  ON dd.logtime=ddd.logtime AND dd.devcode=ddd.devcode
-        )dd ON dd.devcode=d.devcode
-        order by create_time desc
-    </select>
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/DeviceUpgradeTaskMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceUpgradeTaskMapper.xml
deleted file mode 100644
index a5bf5e7..0000000
--- a/casic-iot-dao/src/resource/mapper/DeviceUpgradeTaskMapper.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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.casic.missiles.mapper.DeviceUpgradeTaskMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceUpgradeTask">
-        <id column="id" property="id" />
-        <result column="version_id" property="versionId" />
-        <result column="device_id" property="deviceId" />
-        <result column="status" property="status" />
-        <result column="create_time" property="createTime" />
-        <result column="create_user_id" property="createUserId" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, version_id, device_id, status, create_time, create_user_id
-    </sql>
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/DeviceVersionMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceVersionMapper.xml
deleted file mode 100644
index e39ec1f..0000000
--- a/casic-iot-dao/src/resource/mapper/DeviceVersionMapper.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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.casic.missiles.mapper.DeviceVersionMapper">
-
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.DeviceVersion">
-        <id column="Id" property="id" />
-        <result column="product_id" property="productId" />
-        <result column="version_file" property="versionFile" />
-        <result column="version" property="version" />
-        <result column="owner" property="owner" />
-        <result column="dscn" property="dscn" />
-        <result column="create_time" property="createTime" />
-        <result column="create_user_id" property="createUserId" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        Id, product_id, version_file, version, owner, dscn, create_time, create_user_id
-    </sql>
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/ProductConfigItemMapper.xml b/casic-iot-dao/src/resource/mapper/ProductConfigItemMapper.xml
deleted file mode 100644
index e2448be..0000000
--- a/casic-iot-dao/src/resource/mapper/ProductConfigItemMapper.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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.casic.missiles.mapper.ProductConfigItemMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductConfigItem">
-        <id column="id" property="id" />
-        <result column="product_id" property="productId" />
-        <result column="param_name" property="paramName" />
-        <result column="param_code" property="paramCode" />
-        <result column="param_type" property="paramType" />
-        <result column="regular_expression" property="regularExpression" />
-        <result column="create_time" property="createTime" />
-        <result column="create_user_id" property="createUserId" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, product_id, param_name, param_code, param_type, regular_expression, create_time, create_user_id
-    </sql>
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/ProductDataItemMapper.xml b/casic-iot-dao/src/resource/mapper/ProductDataItemMapper.xml
deleted file mode 100644
index 61a55ec..0000000
--- a/casic-iot-dao/src/resource/mapper/ProductDataItemMapper.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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.casic.missiles.mapper.ProductDataItemMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductDataItem">
-        <id column="id" property="id" />
-        <result column="data_item_name" property="dataItemName" />
-        <result column="product_id" property="productId" />
-        <result column="data_item_type" property="dataItemType" />
-        <result column="data_item_field" property="dataItemField" />
-        <result column="create_time" property="createTime" />
-        <result column="create_user_id" property="createUserId" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, data_item_name, product_id, data_item_type, data_item_field, create_time, create_user_id
-    </sql>
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/ProductInfoMapper.xml b/casic-iot-dao/src/resource/mapper/ProductInfoMapper.xml
deleted file mode 100644
index 26f3cb3..0000000
--- a/casic-iot-dao/src/resource/mapper/ProductInfoMapper.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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.casic.missiles.mapper.ProductInfoMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.ProductInfo">
-        <id column="Id" property="id" />
-        <result column="name" property="name" />
-        <result column="access_type" property="accessType" />
-        <result column="encipher_type" property="encipherType" />
-        <result column="descn" property="descn" />
-        <result column="product_type" property="productType" />
-        <result column="owners" property="owners" />
-        <result column="create_time" property="createTime" />
-        <result column="create_user_name" property="createUserName" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        Id, name, access_type, encipher_type, protocol_type, model, descn, product_type, owners, CreatorName, create_time, create_user_id
-    </sql>
-
-    <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(product_no, 12)), 0)
-        from product_info
-    </select>
-
-
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml b/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml
deleted file mode 100644
index 415a670..0000000
--- a/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?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.casic.missiles.mapper.SubscribeStoreMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.casic.missiles.model.SubscribeStore">
-        <id column="id" property="id"/>
-        <result column="subscribe_no" property="subscribeNo"/>
-        <result column="group_id" property="groupId"/>
-        <result column="message_type" property="messageType"/>
-        <result column="subscribe_type" property="subscribeType"/>
-        <result column="enable" property="enable"/>
-        <result column="subscribe_status" property="subscribeStatus"/>
-        <result column="subscribe_content_json" property="subscribeContentJson"/>
-        <result column="descn" property="descn"/>
-        <result column="create_time" property="createTime"/>
-        <result column="create_user_name" property="createUserName"/>
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, message_type, subscribe_type, enable, subscribe_status, subscribe_content_json, descn, create_time, create_user_name
-    </sql>
-
-    <select id="listPage" resultType="com.casic.missiles.dto.subscribe.SubscribeListVO">
-        SELECT message_type AS "messageType",create_time AS "createTime",subscribe_no AS
-            "subscribeNo",subscribe_content_json AS "subscribeContentJson",
-            subscribe_status AS "subscribeStatus",create_user_name AS "createUserName",
-           create_user_id AS "createUserId"
-        FROM (
-        SELECT *
-        FROM subscribe_store
-        WHERE 1=1
-        <if test="request.groupId!='' and request.groupId != null">
-            AND group_id =#{request.groupId}
-        </if>
-        <if test="request.messageType!='' and request.messageType != null">
-            AND message_type =#{request.messageType}
-        </if>
-        <if test="request.subscribeNo!='' and request.subscribeNo != null">
-            AND subscribe_no like CONCAT('%',#{request.subscribeNo},'%')
-        </if>
-        <if test="request.subscribeType!='' and request.subscribeType != null">
-            AND subscribe_type =#{request.subscribeType}
-        </if>
-        <if test="request.status!='' and request.status != null">
-            AND subscribe_status =#{request.status}
-        </if>
-        order by create_time desc
-        )d JOIN (
-        SELECT deptid,id
-        FROM device_group
-        WHERE VALID=1
-        <if test="request.groupId!='' and request.groupId != null">
-            AND id =#{request.groupId}
-        </if>
-        )dg ON dg.id=d.group_id
-        order by create_time desc
-    </select>
-
-</mapper>
diff --git a/casic-iot-dao/src/resource/mapper/common/SysCommonMapper.xml b/casic-iot-dao/src/resource/mapper/common/SysCommonMapper.xml
deleted file mode 100644
index 880f7d4..0000000
--- a/casic-iot-dao/src/resource/mapper/common/SysCommonMapper.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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.casic.missiles.mapper.common.SysCommonMapper">
-
-    <select id="getDictMapByCode" resultType="java.util.Map">
-        SELECT  name,code
-        from sys_dict
-         where  pid=(
-            SELECT id
-            from  sys_dict
-            where  code=#{code}
-         )
-    </select>
-
-    <select id="getDeptMap" resultType="java.util.Map">
-        SELECT  id,SIMPLE_NAME AS  "simpleName"
-        from sys_dept
-    </select>
-
-
-</mapper>