From bf8cb657cd550ce3061401bdf2842723d3c190a2 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 03 Aug 2021 14:39:21 +0800
Subject: [PATCH] 中间数据迁入正式表，kafka小时数据存入中间表，删除中间表数据

---
 screen-job/src/main/resources/mapper/DeviceMapper.xml |   46 +++++++++++++++++++++++-----------------------
 1 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/screen-job/src/main/resources/mapper/DeviceMapper.xml b/screen-job/src/main/resources/mapper/DeviceMapper.xml
index 493dc7b..7831eb5 100644
--- a/screen-job/src/main/resources/mapper/DeviceMapper.xml
+++ b/screen-job/src/main/resources/mapper/DeviceMapper.xml
@@ -2,28 +2,28 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.moral.api.mapper.DeviceMapper">
 
-        <!-- ������������������������ -->
-        <resultMap id="BaseResultMap" type="com.moral.api.entity.Device">
-                    <id column="id" property="id" />
-                    <result column="name" property="name" />
-                    <result column="mac" property="mac" />
-                    <result column="address" property="address" />
-                    <result column="longitude" property="longitude" />
-                    <result column="latitude" property="latitude" />
-                    <result column="state" property="state" />
-                    <result column="operate_ids" property="operateIds" />
-                    <result column="monitor_point_id" property="monitorPointId" />
-                    <result column="organization_id" property="organizationId" />
-                    <result column="device_version_id" property="deviceVersionId" />
-                    <result column="profession" property="profession" />
-                    <result column="tech" property="tech" />
-                    <result column="detector" property="detector" />
-                    <result column="purchaser" property="purchaser" />
-                    <result column="create_time" property="createTime" />
-                    <result column="update_time" property="updateTime" />
-                    <result column="install_time" property="installTime" />
-                    <result column="is_delete" property="isDelete" />
-                    <result column="extend" property="extend" />
-        </resultMap>
+    <!-- ������������������������ -->
+    <resultMap id="BaseResultMap" type="com.moral.api.entity.Device">
+        <id column="id" property="id"/>
+        <result column="name" property="name"/>
+        <result column="mac" property="mac"/>
+        <result column="address" property="address"/>
+        <result column="longitude" property="longitude"/>
+        <result column="latitude" property="latitude"/>
+        <result column="state" property="state"/>
+        <result column="operate_ids" property="operateIds"/>
+        <result column="monitor_point_id" property="monitorPointId"/>
+        <result column="organization_id" property="organizationId"/>
+        <result column="device_version_id" property="deviceVersionId"/>
+        <result column="profession" property="profession"/>
+        <result column="tech" property="tech"/>
+        <result column="detector" property="detector"/>
+        <result column="purchaser" property="purchaser"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="install_time" property="installTime"/>
+        <result column="is_delete" property="isDelete"/>
+        <result column="extend" property="extend"/>
+    </resultMap>
 
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0