From 9b23af5cecdcea86540738dd04f4431cd03efbf8 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Mon, 22 Jan 2018 11:32:25 +0800
Subject: [PATCH] 更新

---
 /dev/null                                  |   16 ----------------
 src/main/java/com/moral/entity/Sensor.java |    8 +++-----
 2 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/moral/entity/Sensor.java b/src/main/java/com/moral/entity/Sensor.java
index 32502d1..3f24712 100644
--- a/src/main/java/com/moral/entity/Sensor.java
+++ b/src/main/java/com/moral/entity/Sensor.java
@@ -1,9 +1,8 @@
 package com.moral.entity;
 
-import lombok.Data;
-
-import javax.persistence.Column;
 import javax.persistence.Id;
+
+import lombok.Data;
 
 @Data
 public class Sensor {
@@ -12,8 +11,7 @@
 
     private String name;
 
-    @Column(name = "`key`")
-    private String key;
+    private String sensorKey;
 
     private Double upper;
 
diff --git a/src/main/resources/mapper/SensorMapper.xml b/src/main/resources/mapper/SensorMapper.xml
deleted file mode 100644
index 3894d48..0000000
--- a/src/main/resources/mapper/SensorMapper.xml
+++ /dev/null
@@ -1,16 +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.moral.mapper.SensorMapper" >
-  <resultMap id="BaseResultMap" type="com.moral.entity.Sensor" >
-    <id column="id" property="id" jdbcType="INTEGER" />
-    <result column="name" property="name" jdbcType="VARCHAR" />
-    <result column="key" property="key" jdbcType="VARCHAR" />
-    <result column="upper" property="upper" jdbcType="DOUBLE" />
-    <result column="lower" property="lower" jdbcType="DOUBLE" />
-    <result column="unit" property="unit" jdbcType="VARCHAR" />
-    <result column="description" property="description" jdbcType="VARCHAR" />
-  </resultMap>
-  <sql id="Base_Column_List" >
-    id, name, key, upper, lower, unit, description
-  </sql>
-</mapper>
\ No newline at end of file

--
Gitblit v1.8.0