From 58f51c889aecd7065a82b99d29b3ef4aee891ec1 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Wed, 25 Oct 2017 16:31:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/monitor/service/LoggerService.java | 9
src/main/java/com/moral/monitor/entity/MonitorpointExample.java | 1011 +++++++++++
src/main/java/com/moral/monitor/entity/History.java | 53
src/main/java/com/moral/monitor/dao/MonitorpointDao.java | 30
src/main/java/com/moral/monitor/entity/Logger.java | 45
src/main/java/com/moral/monitor/service/impl/LoggerServiceImpl.java | 22
pom.xml | 366 ++-
src/main/java/com/moral/monitor/entity/Equipment.java | 99
src/main/java/com/moral/monitor/entity/SensorExample.java | 880 +++++++++
src/main/java/com/moral/monitor/service/HistoryService.java | 9
src/main/java/com/moral/monitor/controller/ApiController.java | 4
src/main/java/com/moral/monitor/controller/MgrController.java | 8
src/main/resources/rabbitmq.xml | 6
src/main/java/com/moral/monitor/entity/HistoryExample.java | 591 ++++++
src/main/java/com/moral/monitor/controller/Dashboard.java | 16
src/main/java/com/moral/monitor/service/EquipmentService.java | 9
src/main/java/com/moral/monitor/entity/EquipmentExample.java | 1201 +++++++++++++
src/main/java/com/moral/monitor/dao/LoggerMapper.java | 30
src/main/java/com/moral/monitor/controller/MonitorPointController.java | 16
src/main/java/com/moral/monitor/dao/EquipmentMapper.java | 30
src/main/java/com/moral/monitor/service/impl/MonitorpointServiceImpl.java | 45
/dev/null | 35
src/main/java/com/moral/monitor/entity/Sensor.java | 143
src/main/java/com/moral/monitor/dao/TaskDao.java | 2
src/main/java/com/moral/monitor/dao/HistoryMapper.java | 30
src/main/java/com/moral/monitor/dao/MgrDao.java | 4
src/main/java/com/moral/monitor/service/MonitorpointService.java | 28
src/main/java/com/moral/monitor/listener/MonitorListener.java | 2
src/main/java/com/moral/monitor/entity/LoggerExample.java | 461 +++++
src/main/java/com/moral/monitor/dao/SensorMapper.java | 30
src/main/java/com/moral/monitor/service/MgrService.java | 8
src/main/java/com/moral/monitor/entity/Monitorpoint.java | 125 +
src/main/resources/application.xml | 4
33 files changed, 4,970 insertions(+), 382 deletions(-)
diff --git a/pom.xml b/pom.xml
index b63862d..6b3180c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,197 +1,217 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>com.moral.monitor</groupId>
- <artifactId>task</artifactId>
- <packaging>war</packaging>
- <version>1.0-SNAPSHOT</version>
- <name>task Maven Webapp</name>
- <url>http://maven.apache.org</url>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>com.moral.monitor</groupId>
+ <artifactId>task</artifactId>
+ <packaging>war</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>task Maven Webapp</name>
+ <url>http://maven.apache.org</url>
- <properties>
- <springversion>4.3.7.RELEASE</springversion>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- </properties>
+ <properties>
+ <springversion>4.3.7.RELEASE</springversion>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ </properties>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-webmvc</artifactId>
- <version>${springversion}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jdbc</artifactId>
- <version>${springversion}</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>fastjson</artifactId>
- <version>1.2.7</version>
- </dependency>
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>druid</artifactId>
- <version>1.0.18</version>
- </dependency>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>5.1.30</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.mybatis</groupId>
- <artifactId>mybatis</artifactId>
- <version>3.4.1</version>
- </dependency>
- <dependency>
- <groupId>org.mybatis</groupId>
- <artifactId>mybatis-spring</artifactId>
- <version>1.3.0</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.amqp</groupId>
- <artifactId>spring-rabbit</artifactId>
- <version>1.6.3.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>com.rabbitmq</groupId>
- <artifactId>amqp-client</artifactId>
- <version>3.3.5</version>
- </dependency>
- <!-- logging -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.7.5</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.7.5</version>
- </dependency>
- <dependency>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.11</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ <version>${springversion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ <version>${springversion}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>fastjson</artifactId>
+ <version>1.2.7</version>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>druid</artifactId>
+ <version>1.0.18</version>
+ </dependency>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>5.1.30</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mybatis</groupId>
+ <artifactId>mybatis</artifactId>
+ <version>3.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mybatis</groupId>
+ <artifactId>mybatis-spring</artifactId>
+ <version>1.3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.amqp</groupId>
+ <artifactId>spring-rabbit</artifactId>
+ <version>1.6.3.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>com.rabbitmq</groupId>
+ <artifactId>amqp-client</artifactId>
+ <version>3.3.5</version>
+ </dependency>
+ <!-- logging -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.7.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.7.5</version>
+ </dependency>
+ <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.16</version>
- </dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.16</version>
+ </dependency>
- <!-- springframe start -->
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context-support</artifactId>
- <version>${springversion}</version>
- </dependency>
+ <!-- springframe start -->
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context-support</artifactId>
+ <version>${springversion}</version>
+ </dependency>
- <!-- ������������-->
- <dependency>
- <groupId>javabuilder</groupId>
- <artifactId>javabuilder</artifactId>
- <version>1.0</version>
- <scope>system</scope>
- <systemPath>${project.basedir}/src/main/webapp/WEB-INF/lib/taobao-sdk-java-auto_1455552377940-20160607.jar</systemPath>
- </dependency>
+ <!-- ������������ -->
+ <dependency>
+ <groupId>javabuilder</groupId>
+ <artifactId>javabuilder</artifactId>
+ <version>1.0</version>
+ <scope>system</scope>
+ <systemPath>${project.basedir}/src/main/webapp/WEB-INF/lib/taobao-sdk-java-auto_1455552377940-20160607.jar</systemPath>
+ </dependency>
- <dependency>
- <groupId>net.sf.json-lib</groupId>
- <artifactId>json-lib</artifactId>
- <version>2.4</version>
- <classifier>jdk15</classifier>
- </dependency>
+ <dependency>
+ <groupId>net.sf.json-lib</groupId>
+ <artifactId>json-lib</artifactId>
+ <version>2.4</version>
+ <classifier>jdk15</classifier>
+ </dependency>
- <dependency>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- <version>20160810</version>
- </dependency>
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>20160810</version>
+ </dependency>
- <!-- mail -->
- <!-- https://mvnrepository.com/artifact/javax.mail/mail -->
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>1.4</version>
- </dependency>
+ <!-- mail -->
+ <!-- https://mvnrepository.com/artifact/javax.mail/mail -->
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>1.4</version>
+ </dependency>
- <!-- https://mvnrepository.com/artifact/org.quartz-scheduler/quartz -->
- <dependency>
- <groupId>org.quartz-scheduler</groupId>
- <artifactId>quartz</artifactId>
- <version>2.2.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.5</version>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.9.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-collections4</artifactId>
- <version>4.1</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.2</version>
- </dependency>
+ <!-- https://mvnrepository.com/artifact/org.quartz-scheduler/quartz -->
+ <dependency>
+ <groupId>org.quartz-scheduler</groupId>
+ <artifactId>quartz</artifactId>
+ <version>2.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.5</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.9.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
+ <version>4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.2</version>
+ </dependency>
- <!-- ������������ -->
- <dependency>
- <groupId>cn.jpush.api</groupId>
- <artifactId>jpush-client</artifactId>
- <version>3.2.17</version>
- </dependency>
+ <!-- ������������ -->
+ <dependency>
+ <groupId>cn.jpush.api</groupId>
+ <artifactId>jpush-client</artifactId>
+ <version>3.2.17</version>
+ </dependency>
- <!-- https://mvnrepository.com/artifact/io.netty/netty-all -->
+ <!-- https://mvnrepository.com/artifact/io.netty/netty-all -->
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-all</artifactId>
+ <version>4.1.7.Final</version>
+ </dependency>
- <!-- Redis -->
- <dependency>
- <groupId>org.springframework.data</groupId>
- <artifactId>spring-data-redis</artifactId>
- <version>1.8.7.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>redis.clients</groupId>
- <artifactId>jedis</artifactId>
- <version>2.9.0</version>
- </dependency>
- </dependencies>
+ </dependencies>
- <build>
- <finalName>task</finalName>
- </build>
+
+ <build>
+ <finalName>task</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>3.0.0</version>
+ <configuration>
+ <webappDirectory>${basedir}/src/main/webapp</webappDirectory>
+ <warSourceDirectory>${basedir}/src/main/webapp</warSourceDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/src/main/java/com/moral/monitor/controller/ApiController.java b/src/main/java/com/moral/monitor/controller/ApiController.java
index ef4e3ad..3744c0b 100644
--- a/src/main/java/com/moral/monitor/controller/ApiController.java
+++ b/src/main/java/com/moral/monitor/controller/ApiController.java
@@ -275,7 +275,7 @@
ae.setDevice_name(e.getName());
ae.setMac(e.getMac());
ae.setStatus(e.getState());
- ae.setFei(e.getFei());
+// ae.setFei(e.get);
// ae.setCreate_time(DateConvert.dateConvert(e.getTime()));
apiEquipments.add(ae);
@@ -330,7 +330,7 @@
ae.setDevice_name(e.getName());
ae.setMac(e.getMac());
ae.setStatus(e.getState());
- ae.setFei(e.getFei());
+// ae.setFei(e.getFei());
ae.setCreate_time(DateConvert.dateConvert(e.getTime()));
apiEquipments.add(ae);
diff --git a/src/main/java/com/moral/monitor/controller/Dashboard.java b/src/main/java/com/moral/monitor/controller/Dashboard.java
index 311a3b0..024b9e6 100644
--- a/src/main/java/com/moral/monitor/controller/Dashboard.java
+++ b/src/main/java/com/moral/monitor/controller/Dashboard.java
@@ -134,13 +134,13 @@
for(Equipment e:equipments){
int state = e.getState();
- if (state==0){
- e.setStatedesc("������");
- }else if(state==4){
- e.setStatedesc("������");
- }else if(state==1||state==2||state==3){
- e.setStatedesc("������");
- }
+// if (state==0){
+// e.setStatedesc("������");
+// }else if(state==4){
+// e.setStatedesc("������");
+// }else if(state==1||state==2||state==3){
+// e.setStatedesc("������");
+// }
}
s.put("rows",equipments);
@@ -357,7 +357,7 @@
for (History a:historys){
String format = sdf.format(a.getTime());
xtime.add(format);
- yvalue.add(a.getMac_value());
+ yvalue.add(a.getMacValue());
}
s.put("xtime",xtime);
s.put("yvalue",yvalue);
diff --git a/src/main/java/com/moral/monitor/controller/MgrController.java b/src/main/java/com/moral/monitor/controller/MgrController.java
index 3beb0fb..34454a8 100644
--- a/src/main/java/com/moral/monitor/controller/MgrController.java
+++ b/src/main/java/com/moral/monitor/controller/MgrController.java
@@ -27,12 +27,12 @@
@ResponseBody
public Map randpoint(){
- List<MonitorPoint> randpoint = mgrService.randpoint();
+ List<Monitorpoint> randpoint = mgrService.randpoint();
LinkedHashMap<String, List<Equipment>> point_equ = new LinkedHashMap<String, List<Equipment>>();
- for (MonitorPoint point:randpoint){
+ for (Monitorpoint point:randpoint){
String name = point.getName();
List<Equipment> equipments = mgrService.pointequ(name);
if (equipments.size()>0){
@@ -125,13 +125,13 @@
@ResponseBody
public String top100(){
- List<MonitorPoint> randpoint = mgrService.allpoint();
+ List<Monitorpoint> randpoint = mgrService.allpoint();
LinkedHashMap<String, List<Equipment>> point_equ = new LinkedHashMap<String, List<Equipment>>();
- for (MonitorPoint point:randpoint){
+ for (Monitorpoint point:randpoint){
String name = point.getName();
List<Equipment> equipments = mgrService.pointequ(name);
if (equipments.size()>0){
diff --git a/src/main/java/com/moral/monitor/controller/MonitorPointController.java b/src/main/java/com/moral/monitor/controller/MonitorPointController.java
index 73b6938..0715c34 100644
--- a/src/main/java/com/moral/monitor/controller/MonitorPointController.java
+++ b/src/main/java/com/moral/monitor/controller/MonitorPointController.java
@@ -1,16 +1,16 @@
package com.moral.monitor.controller;
-import com.moral.monitor.entity.MonitorPoint;
+import com.moral.monitor.entity.Monitorpoint;
import com.moral.monitor.entity.QueryHelper;
-import com.moral.monitor.service.MonitorPointService;
+import com.moral.monitor.service.MonitorpointService;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
-import javax.annotation.Resource;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -23,8 +23,8 @@
private static final Log log = LogFactory.getLog(MonitorPointController.class);
- @Resource
- MonitorPointService monitorPointService;
+ @Autowired
+ MonitorpointService monitorPointService;
@RequestMapping("/findAllMonitorpoint")
@ResponseBody
@@ -36,7 +36,7 @@
}
LinkedHashMap<String, Object> s = new LinkedHashMap<String, Object>();
- List<MonitorPoint> equs = monitorPointService.allMonitorPoint(queryHelper);
+ List<Monitorpoint> equs = monitorPointService.allMonitorpoint(queryHelper);
s.put("rows",equs);
int total = monitorPointService.monitorCount(queryHelper);
@@ -69,7 +69,7 @@
@RequestMapping("/addMonitorpoint")
@ResponseBody
- public String addMonitorpoint(@RequestBody MonitorPoint monitorPoint){
+ public String addMonitorpoint(@RequestBody Monitorpoint monitorPoint){
try {
String name = monitorPoint.getName();
@@ -90,7 +90,7 @@
@RequestMapping("/editMonitorPoint")
@ResponseBody
- public String editMonitorPoint(@RequestBody MonitorPoint monitorPoint){
+ public String editMonitorPoint(@RequestBody Monitorpoint monitorPoint){
try {
monitorPointService.updateMonitorpoint(monitorPoint);
}catch (Exception e){
diff --git a/src/main/java/com/moral/monitor/dao/EquipmentMapper.java b/src/main/java/com/moral/monitor/dao/EquipmentMapper.java
new file mode 100644
index 0000000..8d82c75
--- /dev/null
+++ b/src/main/java/com/moral/monitor/dao/EquipmentMapper.java
@@ -0,0 +1,30 @@
+package com.moral.monitor.dao;
+
+import com.moral.monitor.entity.Equipment;
+import com.moral.monitor.entity.EquipmentExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface EquipmentMapper {
+ long countByExample(EquipmentExample example);
+
+ int deleteByExample(EquipmentExample example);
+
+ int deleteByPrimaryKey(Integer id);
+
+ int insert(Equipment record);
+
+ int insertSelective(Equipment record);
+
+ List<Equipment> selectByExample(EquipmentExample example);
+
+ Equipment selectByPrimaryKey(Integer id);
+
+ int updateByExampleSelective(@Param("record") Equipment record, @Param("example") EquipmentExample example);
+
+ int updateByExample(@Param("record") Equipment record, @Param("example") EquipmentExample example);
+
+ int updateByPrimaryKeySelective(Equipment record);
+
+ int updateByPrimaryKey(Equipment record);
+}
\ No newline at end of file
diff --git a/src/main/java/com/moral/monitor/dao/HistoryMapper.java b/src/main/java/com/moral/monitor/dao/HistoryMapper.java
new file mode 100644
index 0000000..50033a9
--- /dev/null
+++ b/src/main/java/com/moral/monitor/dao/HistoryMapper.java
@@ -0,0 +1,30 @@
+package com.moral.monitor.dao;
+
+import com.moral.monitor.entity.History;
+import com.moral.monitor.entity.HistoryExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface HistoryMapper {
+ long countByExample(HistoryExample example);
+
+ int deleteByExample(HistoryExample example);
+
+ int deleteByPrimaryKey(Integer id);
+
+ int insert(History record);
+
+ int insertSelective(History record);
+
+ List<History> selectByExample(HistoryExample example);
+
+ History selectByPrimaryKey(Integer id);
+
+ int updateByExampleSelective(@Param("record") History record, @Param("example") HistoryExample example);
+
+ int updateByExample(@Param("record") History record, @Param("example") HistoryExample example);
+
+ int updateByPrimaryKeySelective(History record);
+
+ int updateByPrimaryKey(History record);
+}
\ No newline at end of file
diff --git a/src/main/java/com/moral/monitor/dao/LoggerMapper.java b/src/main/java/com/moral/monitor/dao/LoggerMapper.java
new file mode 100644
index 0000000..f5526d3
--- /dev/null
+++ b/src/main/java/com/moral/monitor/dao/LoggerMapper.java
@@ -0,0 +1,30 @@
+package com.moral.monitor.dao;
+
+import com.moral.monitor.entity.Logger;
+import com.moral.monitor.entity.LoggerExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface LoggerMapper {
+ long countByExample(LoggerExample example);
+
+ int deleteByExample(LoggerExample example);
+
+ int deleteByPrimaryKey(Integer id);
+
+ int insert(Logger record);
+
+ int insertSelective(Logger record);
+
+ List<Logger> selectByExample(LoggerExample example);
+
+ Logger selectByPrimaryKey(Integer id);
+
+ int updateByExampleSelective(@Param("record") Logger record, @Param("example") LoggerExample example);
+
+ int updateByExample(@Param("record") Logger record, @Param("example") LoggerExample example);
+
+ int updateByPrimaryKeySelective(Logger record);
+
+ int updateByPrimaryKey(Logger record);
+}
\ No newline at end of file
diff --git a/src/main/java/com/moral/monitor/dao/MgrDao.java b/src/main/java/com/moral/monitor/dao/MgrDao.java
index e74fd86..99c4143 100644
--- a/src/main/java/com/moral/monitor/dao/MgrDao.java
+++ b/src/main/java/com/moral/monitor/dao/MgrDao.java
@@ -12,12 +12,12 @@
@Repository
public interface MgrDao {
- public List<MonitorPoint> randpoint();
+ public List<Monitorpoint> randpoint();
public List<Equipment> pointequ(String monitorpoint);
public List<State> equsensorstate(@Param("mac") String mac);
- public List<MonitorPoint> allpoint();
+ public List<Monitorpoint> allpoint();
public List<PointAvg> allPointsData(QueryHelper queryHelper);
public int pointcount(QueryHelper queryHelper);
diff --git a/src/main/java/com/moral/monitor/dao/MonitorPointDao.java b/src/main/java/com/moral/monitor/dao/MonitorPointDao.java
deleted file mode 100644
index 23fe58c..0000000
--- a/src/main/java/com/moral/monitor/dao/MonitorPointDao.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.moral.monitor.dao;
-
-import com.moral.monitor.entity.Equipment;
-import com.moral.monitor.entity.MonitorPoint;
-import com.moral.monitor.entity.QueryHelper;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-/**
- * Created by a on 2017/7/18.
- */
-@Repository
-public interface MonitorPointDao {
-
- public List<MonitorPoint> allMonitorPoint(QueryHelper queryHelper);
- public int monitorCount(QueryHelper queryHelper);
-
- public void deleteMonitor(String id);
-
- public void addMonitorpoint(MonitorPoint monitorPoint);
-
- public void updateMonitorpoint(MonitorPoint monitorPoint);
-}
diff --git a/src/main/java/com/moral/monitor/dao/MonitorpointDao.java b/src/main/java/com/moral/monitor/dao/MonitorpointDao.java
new file mode 100644
index 0000000..43c238d
--- /dev/null
+++ b/src/main/java/com/moral/monitor/dao/MonitorpointDao.java
@@ -0,0 +1,30 @@
+package com.moral.monitor.dao;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+import com.moral.monitor.entity.Monitorpoint;
+import com.moral.monitor.entity.MonitorpointExample;
+
+public interface MonitorpointDao {
+ long countByExample(MonitorpointExample example);
+
+ int deleteByExample(MonitorpointExample example);
+
+ int deleteByPrimaryKey(String id);
+
+ int insert(Monitorpoint record);
+
+ int insertSelective(Monitorpoint record);
+
+ List<Monitorpoint> selectByExample(MonitorpointExample example);
+
+ Monitorpoint selectByPrimaryKey(String id);
+
+ int updateByExampleSelective(@Param("record") Monitorpoint record, @Param("example") MonitorpointExample example);
+
+ int updateByExample(@Param("record") Monitorpoint record, @Param("example") MonitorpointExample example);
+
+ int updateByPrimaryKeySelective(Monitorpoint record);
+
+ int updateByPrimaryKey(Monitorpoint record);
+}
\ No newline at end of file
diff --git a/src/main/java/com/moral/monitor/dao/SensorMapper.java b/src/main/java/com/moral/monitor/dao/SensorMapper.java
new file mode 100644
index 0000000..9dd3e70
--- /dev/null
+++ b/src/main/java/com/moral/monitor/dao/SensorMapper.java
@@ -0,0 +1,30 @@
+package com.moral.monitor.dao;
+
+import com.moral.monitor.entity.Sensor;
+import com.moral.monitor.entity.SensorExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface SensorMapper {
+ long countByExample(SensorExample example);
+
+ int deleteByExample(SensorExample example);
+
+ int deleteByPrimaryKey(Integer id);
+
+ int insert(Sensor record);
+
+ int insertSelective(Sensor record);
+
+ List<Sensor> selectByExample(SensorExample example);
+
+ Sensor selectByPrimaryKey(Integer id);
+
+ int updateByExampleSelective(@Param("record") Sensor record, @Param("example") SensorExample example);
+
+ int updateByExample(@Param("record") Sensor record, @Param("example") SensorExample example);
+
+ int updateByPrimaryKeySelective(Sensor record);
+
+ int updateByPrimaryKey(Sensor record);
+}
\ No newline at end of file
diff --git a/src/main/java/com/moral/monitor/dao/TaskDao.java b/src/main/java/com/moral/monitor/dao/TaskDao.java
index 80b806d..4275d84 100644
--- a/src/main/java/com/moral/monitor/dao/TaskDao.java
+++ b/src/main/java/com/moral/monitor/dao/TaskDao.java
@@ -18,7 +18,7 @@
public void insertTohistory(String mac, String sensor, String mac_key, String mac_value);
//������state���
public List<State> selectFromstate(String mac, String mac_key);
- //������stata���
+ //������state���
public void deleteFromstateBymacandmackey(String mac, String mac_key);
//������state���
public void insertTostate(String mac, String sensor, String mac_key, String mac_value);
diff --git a/src/main/java/com/moral/monitor/entity/Equipment.java b/src/main/java/com/moral/monitor/entity/Equipment.java
index 62c8236..5f85f86 100644
--- a/src/main/java/com/moral/monitor/entity/Equipment.java
+++ b/src/main/java/com/moral/monitor/entity/Equipment.java
@@ -2,33 +2,42 @@
import java.util.Date;
-/**���������
- * Created by a on 2017/4/10.
- */
public class Equipment {
- private int id;
+ private Integer id;
+
private String name;
+
private String address;
- private double longitude;
- private double latitude;
+
+ private Double longitude;
+
+ private Double latitude;
+
private String mac;
- private String province;
- private String city;
- private String area;
- private int state;
+
+ private Integer state;
+
private Date time;
+
private String installer;
+
private String repairman;
- private String fei;
- private String statedesc;
+ private String province;
+ private String city;
- public int getId() {
+ private String area;
+
+ private String monitorpoint;
+
+ private String ownerId;
+
+ public Integer getId() {
return id;
}
- public void setId(int id) {
+ public void setId(Integer id) {
this.id = id;
}
@@ -37,7 +46,7 @@
}
public void setName(String name) {
- this.name = name;
+ this.name = name == null ? null : name.trim();
}
public String getAddress() {
@@ -45,22 +54,22 @@
}
public void setAddress(String address) {
- this.address = address;
+ this.address = address == null ? null : address.trim();
}
- public double getLongitude() {
+ public Double getLongitude() {
return longitude;
}
- public void setLongitude(double longitude) {
+ public void setLongitude(Double longitude) {
this.longitude = longitude;
}
- public double getLatitude() {
+ public Double getLatitude() {
return latitude;
}
- public void setLatitude(double latitude) {
+ public void setLatitude(Double latitude) {
this.latitude = latitude;
}
@@ -69,14 +78,14 @@
}
public void setMac(String mac) {
- this.mac = mac;
+ this.mac = mac == null ? null : mac.trim();
}
- public int getState() {
+ public Integer getState() {
return state;
}
- public void setState(int state) {
+ public void setState(Integer state) {
this.state = state;
}
@@ -93,7 +102,7 @@
}
public void setInstaller(String installer) {
- this.installer = installer;
+ this.installer = installer == null ? null : installer.trim();
}
public String getRepairman() {
@@ -101,23 +110,7 @@
}
public void setRepairman(String repairman) {
- this.repairman = repairman;
- }
-
- public String getFei() {
- return fei;
- }
-
- public void setFei(String fei) {
- this.fei = fei;
- }
-
- public String getStatedesc() {
- return statedesc;
- }
-
- public void setStatedesc(String statedesc) {
- this.statedesc = statedesc;
+ this.repairman = repairman == null ? null : repairman.trim();
}
public String getProvince() {
@@ -125,7 +118,7 @@
}
public void setProvince(String province) {
- this.province = province;
+ this.province = province == null ? null : province.trim();
}
public String getCity() {
@@ -133,7 +126,7 @@
}
public void setCity(String city) {
- this.city = city;
+ this.city = city == null ? null : city.trim();
}
public String getArea() {
@@ -141,6 +134,22 @@
}
public void setArea(String area) {
- this.area = area;
+ this.area = area == null ? null : area.trim();
}
-}
+
+ public String getMonitorpoint() {
+ return monitorpoint;
+ }
+
+ public void setMonitorpoint(String monitorpoint) {
+ this.monitorpoint = monitorpoint == null ? null : monitorpoint.trim();
+ }
+
+ public String getOwnerId() {
+ return ownerId;
+ }
+
+ public void setOwnerId(String ownerId) {
+ this.ownerId = ownerId == null ? null : ownerId.trim();
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/moral/monitor/entity/EquipmentExample.java b/src/main/java/com/moral/monitor/entity/EquipmentExample.java
new file mode 100644
index 0000000..9d0d255
--- /dev/null
+++ b/src/main/java/com/moral/monitor/entity/EquipmentExample.java
@@ -0,0 +1,1201 @@
+package com.moral.monitor.entity;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class EquipmentExample {
+ protected String orderByClause;
+
+ protected boolean distinct;
+
+ protected List<Criteria> oredCriteria;
+
+ public EquipmentExample() {
+ oredCriteria = new ArrayList<Criteria>();
+ }
+
+ public void setOrderByClause(String orderByClause) {
+ this.orderByClause = orderByClause;
+ }
+
+ public String getOrderByClause() {
+ return orderByClause;
+ }
+
+ public void setDistinct(boolean distinct) {
+ this.distinct = distinct;
+ }
+
+ public boolean isDistinct() {
+ return distinct;
+ }
+
+ public List<Criteria> getOredCriteria() {
+ return oredCriteria;
+ }
+
+ public void or(Criteria criteria) {
+ oredCriteria.add(criteria);
+ }
+
+ public Criteria or() {
+ Criteria criteria = createCriteriaInternal();
+ oredCriteria.add(criteria);
+ return criteria;
+ }
+
+ public Criteria createCriteria() {
+ Criteria criteria = createCriteriaInternal();
+ if (oredCriteria.size() == 0) {
+ oredCriteria.add(criteria);
+ }
+ return criteria;
+ }
+
+ protected Criteria createCriteriaInternal() {
+ Criteria criteria = new Criteria();
+ return criteria;
+ }
+
+ public void clear() {
+ oredCriteria.clear();
+ orderByClause = null;
+ distinct = false;
+ }
+
+ protected abstract static class GeneratedCriteria {
+ protected List<Criterion> criteria;
+
+ protected GeneratedCriteria() {
+ super();
+ criteria = new ArrayList<Criterion>();
+ }
+
+ public boolean isValid() {
+ return criteria.size() > 0;
+ }
+
+ public List<Criterion> getAllCriteria() {
+ return criteria;
+ }
+
+ public List<Criterion> getCriteria() {
+ return criteria;
+ }
+
+ protected void addCriterion(String condition) {
+ if (condition == null) {
+ throw new RuntimeException("Value for condition cannot be null");
+ }
+ criteria.add(new Criterion(condition));
+ }
+
+ protected void addCriterion(String condition, Object value, String property) {
+ if (value == null) {
+ throw new RuntimeException("Value for " + property + " cannot be null");
+ }
+ criteria.add(new Criterion(condition, value));
+ }
+
+ protected void addCriterion(String condition, Object value1, Object value2, String property) {
+ if (value1 == null || value2 == null) {
+ throw new RuntimeException("Between values for " + property + " cannot be null");
+ }
+ criteria.add(new Criterion(condition, value1, value2));
+ }
+
+ public Criteria andIdIsNull() {
+ addCriterion("id is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdIsNotNull() {
+ addCriterion("id is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdEqualTo(Integer value) {
+ addCriterion("id =", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdNotEqualTo(Integer value) {
+ addCriterion("id <>", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdGreaterThan(Integer value) {
+ addCriterion("id >", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+ addCriterion("id >=", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdLessThan(Integer value) {
+ addCriterion("id <", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdLessThanOrEqualTo(Integer value) {
+ addCriterion("id <=", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdIn(List<Integer> values) {
+ addCriterion("id in", values, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdNotIn(List<Integer> values) {
+ addCriterion("id not in", values, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdBetween(Integer value1, Integer value2) {
+ addCriterion("id between", value1, value2, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdNotBetween(Integer value1, Integer value2) {
+ addCriterion("id not between", value1, value2, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andNameIsNull() {
+ addCriterion("name is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andNameIsNotNull() {
+ addCriterion("name is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andNameEqualTo(String value) {
+ addCriterion("name =", value, "name");
+ return (Criteria) this;
+ }
+
+ public Criteria andNameNotEqualTo(String value) {
+ addCriterion("name <>", value, "name");
+ return (Criteria) this;
+ }
+
+ public Criteria andNameGreaterThan(String value) {
+ addCriterion("name >", value, "name");
+ return (Criteria) this;
+ }
+
+ public Criteria andNameGreaterThanOrEqualTo(String value) {
+ addCriterion("name >=", value, "name");
+ return (Criteria) this;
+ }
+
+ public Criteria andNameLessThan(String value) {
+ addCriterion("name <", value, "name");
+ return (Criteria) this;
+ }
+
+ public Criteria andNameLessThanOrEqualTo(String value) {
+ addCriterion("name <=", value, "name");
+ return (Criteria) this;
+ }
+
+ public Criteria andNameLike(String value) {
+ addCriterion("name like", value, "name");
+ return (Criteria) this;
+ }
+
+ public Criteria andNameNotLike(String value) {
+ addCriterion("name not like", value, "name");
+ return (Criteria) this;
+ }
+
+ public Criteria andNameIn(List<String> values) {
+ addCriterion("name in", values, "name");
+ return (Criteria) this;
+ }
+
+ public Criteria andNameNotIn(List<String> values) {
+ addCriterion("name not in", values, "name");
+ return (Criteria) this;
+ }
+
+ public Criteria andNameBetween(String value1, String value2) {
+ addCriterion("name between", value1, value2, "name");
+ return (Criteria) this;
+ }
+
+ public Criteria andNameNotBetween(String value1, String value2) {
+ addCriterion("name not between", value1, value2, "name");
+ return (Criteria) this;
+ }
+
+ public Criteria andAddressIsNull() {
+ addCriterion("address is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andAddressIsNotNull() {
+ addCriterion("address is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andAddressEqualTo(String value) {
+ addCriterion("address =", value, "address");
+ return (Criteria) this;
+ }
+
+ public Criteria andAddressNotEqualTo(String value) {
+ addCriterion("address <>", value, "address");
+ return (Criteria) this;
+ }
+
+ public Criteria andAddressGreaterThan(String value) {
+ addCriterion("address >", value, "address");
+ return (Criteria) this;
+ }
+
+ public Criteria andAddressGreaterThanOrEqualTo(String value) {
+ addCriterion("address >=", value, "address");
+ return (Criteria) this;
+ }
+
+ public Criteria andAddressLessThan(String value) {
+ addCriterion("address <", value, "address");
+ return (Criteria) this;
+ }
+
+ public Criteria andAddressLessThanOrEqualTo(String value) {
+ addCriterion("address <=", value, "address");
+ return (Criteria) this;
+ }
+
+ public Criteria andAddressLike(String value) {
+ addCriterion("address like", value, "address");
+ return (Criteria) this;
+ }
+
+ public Criteria andAddressNotLike(String value) {
+ addCriterion("address not like", value, "address");
+ return (Criteria) this;
+ }
+
+ public Criteria andAddressIn(List<String> values) {
+ addCriterion("address in", values, "address");
+ return (Criteria) this;
+ }
+
+ public Criteria andAddressNotIn(List<String> values) {
+ addCriterion("address not in", values, "address");
+ return (Criteria) this;
+ }
+
+ public Criteria andAddressBetween(String value1, String value2) {
+ addCriterion("address between", value1, value2, "address");
+ return (Criteria) this;
+ }
+
+ public Criteria andAddressNotBetween(String value1, String value2) {
+ addCriterion("address not between", value1, value2, "address");
+ return (Criteria) this;
+ }
+
+ public Criteria andLongitudeIsNull() {
+ addCriterion("longitude is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andLongitudeIsNotNull() {
+ addCriterion("longitude is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andLongitudeEqualTo(Double value) {
+ addCriterion("longitude =", value, "longitude");
+ return (Criteria) this;
+ }
+
+ public Criteria andLongitudeNotEqualTo(Double value) {
+ addCriterion("longitude <>", value, "longitude");
+ return (Criteria) this;
+ }
+
+ public Criteria andLongitudeGreaterThan(Double value) {
+ addCriterion("longitude >", value, "longitude");
+ return (Criteria) this;
+ }
+
+ public Criteria andLongitudeGreaterThanOrEqualTo(Double value) {
+ addCriterion("longitude >=", value, "longitude");
+ return (Criteria) this;
+ }
+
+ public Criteria andLongitudeLessThan(Double value) {
+ addCriterion("longitude <", value, "longitude");
+ return (Criteria) this;
+ }
+
+ public Criteria andLongitudeLessThanOrEqualTo(Double value) {
+ addCriterion("longitude <=", value, "longitude");
+ return (Criteria) this;
+ }
+
+ public Criteria andLongitudeIn(List<Double> values) {
+ addCriterion("longitude in", values, "longitude");
+ return (Criteria) this;
+ }
+
+ public Criteria andLongitudeNotIn(List<Double> values) {
+ addCriterion("longitude not in", values, "longitude");
+ return (Criteria) this;
+ }
+
+ public Criteria andLongitudeBetween(Double value1, Double value2) {
+ addCriterion("longitude between", value1, value2, "longitude");
+ return (Criteria) this;
+ }
+
+ public Criteria andLongitudeNotBetween(Double value1, Double value2) {
+ addCriterion("longitude not between", value1, value2, "longitude");
+ return (Criteria) this;
+ }
+
+ public Criteria andLatitudeIsNull() {
+ addCriterion("latitude is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andLatitudeIsNotNull() {
+ addCriterion("latitude is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andLatitudeEqualTo(Double value) {
+ addCriterion("latitude =", value, "latitude");
+ return (Criteria) this;
+ }
+
+ public Criteria andLatitudeNotEqualTo(Double value) {
+ addCriterion("latitude <>", value, "latitude");
+ return (Criteria) this;
+ }
+
+ public Criteria andLatitudeGreaterThan(Double value) {
+ addCriterion("latitude >", value, "latitude");
+ return (Criteria) this;
+ }
+
+ public Criteria andLatitudeGreaterThanOrEqualTo(Double value) {
+ addCriterion("latitude >=", value, "latitude");
+ return (Criteria) this;
+ }
+
+ public Criteria andLatitudeLessThan(Double value) {
+ addCriterion("latitude <", value, "latitude");
+ return (Criteria) this;
+ }
+
+ public Criteria andLatitudeLessThanOrEqualTo(Double value) {
+ addCriterion("latitude <=", value, "latitude");
+ return (Criteria) this;
+ }
+
+ public Criteria andLatitudeIn(List<Double> values) {
+ addCriterion("latitude in", values, "latitude");
+ return (Criteria) this;
+ }
+
+ public Criteria andLatitudeNotIn(List<Double> values) {
+ addCriterion("latitude not in", values, "latitude");
+ return (Criteria) this;
+ }
+
+ public Criteria andLatitudeBetween(Double value1, Double value2) {
+ addCriterion("latitude between", value1, value2, "latitude");
+ return (Criteria) this;
+ }
+
+ public Criteria andLatitudeNotBetween(Double value1, Double value2) {
+ addCriterion("latitude not between", value1, value2, "latitude");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacIsNull() {
+ addCriterion("mac is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacIsNotNull() {
+ addCriterion("mac is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacEqualTo(String value) {
+ addCriterion("mac =", value, "mac");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacNotEqualTo(String value) {
+ addCriterion("mac <>", value, "mac");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacGreaterThan(String value) {
+ addCriterion("mac >", value, "mac");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacGreaterThanOrEqualTo(String value) {
+ addCriterion("mac >=", value, "mac");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacLessThan(String value) {
+ addCriterion("mac <", value, "mac");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacLessThanOrEqualTo(String value) {
+ addCriterion("mac <=", value, "mac");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacLike(String value) {
+ addCriterion("mac like", value, "mac");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacNotLike(String value) {
+ addCriterion("mac not like", value, "mac");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacIn(List<String> values) {
+ addCriterion("mac in", values, "mac");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacNotIn(List<String> values) {
+ addCriterion("mac not in", values, "mac");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacBetween(String value1, String value2) {
+ addCriterion("mac between", value1, value2, "mac");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacNotBetween(String value1, String value2) {
+ addCriterion("mac not between", value1, value2, "mac");
+ return (Criteria) this;
+ }
+
+ public Criteria andStateIsNull() {
+ addCriterion("state is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andStateIsNotNull() {
+ addCriterion("state is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andStateEqualTo(Integer value) {
+ addCriterion("state =", value, "state");
+ return (Criteria) this;
+ }
+
+ public Criteria andStateNotEqualTo(Integer value) {
+ addCriterion("state <>", value, "state");
+ return (Criteria) this;
+ }
+
+ public Criteria andStateGreaterThan(Integer value) {
+ addCriterion("state >", value, "state");
+ return (Criteria) this;
+ }
+
+ public Criteria andStateGreaterThanOrEqualTo(Integer value) {
+ addCriterion("state >=", value, "state");
+ return (Criteria) this;
+ }
+
+ public Criteria andStateLessThan(Integer value) {
+ addCriterion("state <", value, "state");
+ return (Criteria) this;
+ }
+
+ public Criteria andStateLessThanOrEqualTo(Integer value) {
+ addCriterion("state <=", value, "state");
+ return (Criteria) this;
+ }
+
+ public Criteria andStateIn(List<Integer> values) {
+ addCriterion("state in", values, "state");
+ return (Criteria) this;
+ }
+
+ public Criteria andStateNotIn(List<Integer> values) {
+ addCriterion("state not in", values, "state");
+ return (Criteria) this;
+ }
+
+ public Criteria andStateBetween(Integer value1, Integer value2) {
+ addCriterion("state between", value1, value2, "state");
+ return (Criteria) this;
+ }
+
+ public Criteria andStateNotBetween(Integer value1, Integer value2) {
+ addCriterion("state not between", value1, value2, "state");
+ return (Criteria) this;
+ }
+
+ public Criteria andTimeIsNull() {
+ addCriterion("time is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andTimeIsNotNull() {
+ addCriterion("time is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andTimeEqualTo(Date value) {
+ addCriterion("time =", value, "time");
+ return (Criteria) this;
+ }
+
+ public Criteria andTimeNotEqualTo(Date value) {
+ addCriterion("time <>", value, "time");
+ return (Criteria) this;
+ }
+
+ public Criteria andTimeGreaterThan(Date value) {
+ addCriterion("time >", value, "time");
+ return (Criteria) this;
+ }
+
+ public Criteria andTimeGreaterThanOrEqualTo(Date value) {
+ addCriterion("time >=", value, "time");
+ return (Criteria) this;
+ }
+
+ public Criteria andTimeLessThan(Date value) {
+ addCriterion("time <", value, "time");
+ return (Criteria) this;
+ }
+
+ public Criteria andTimeLessThanOrEqualTo(Date value) {
+ addCriterion("time <=", value, "time");
+ return (Criteria) this;
+ }
+
+ public Criteria andTimeIn(List<Date> values) {
+ addCriterion("time in", values, "time");
+ return (Criteria) this;
+ }
+
+ public Criteria andTimeNotIn(List<Date> values) {
+ addCriterion("time not in", values, "time");
+ return (Criteria) this;
+ }
+
+ public Criteria andTimeBetween(Date value1, Date value2) {
+ addCriterion("time between", value1, value2, "time");
+ return (Criteria) this;
+ }
+
+ public Criteria andTimeNotBetween(Date value1, Date value2) {
+ addCriterion("time not between", value1, value2, "time");
+ return (Criteria) this;
+ }
+
+ public Criteria andInstallerIsNull() {
+ addCriterion("installer is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andInstallerIsNotNull() {
+ addCriterion("installer is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andInstallerEqualTo(String value) {
+ addCriterion("installer =", value, "installer");
+ return (Criteria) this;
+ }
+
+ public Criteria andInstallerNotEqualTo(String value) {
+ addCriterion("installer <>", value, "installer");
+ return (Criteria) this;
+ }
+
+ public Criteria andInstallerGreaterThan(String value) {
+ addCriterion("installer >", value, "installer");
+ return (Criteria) this;
+ }
+
+ public Criteria andInstallerGreaterThanOrEqualTo(String value) {
+ addCriterion("installer >=", value, "installer");
+ return (Criteria) this;
+ }
+
+ public Criteria andInstallerLessThan(String value) {
+ addCriterion("installer <", value, "installer");
+ return (Criteria) this;
+ }
+
+ public Criteria andInstallerLessThanOrEqualTo(String value) {
+ addCriterion("installer <=", value, "installer");
+ return (Criteria) this;
+ }
+
+ public Criteria andInstallerLike(String value) {
+ addCriterion("installer like", value, "installer");
+ return (Criteria) this;
+ }
+
+ public Criteria andInstallerNotLike(String value) {
+ addCriterion("installer not like", value, "installer");
+ return (Criteria) this;
+ }
+
+ public Criteria andInstallerIn(List<String> values) {
+ addCriterion("installer in", values, "installer");
+ return (Criteria) this;
+ }
+
+ public Criteria andInstallerNotIn(List<String> values) {
+ addCriterion("installer not in", values, "installer");
+ return (Criteria) this;
+ }
+
+ public Criteria andInstallerBetween(String value1, String value2) {
+ addCriterion("installer between", value1, value2, "installer");
+ return (Criteria) this;
+ }
+
+ public Criteria andInstallerNotBetween(String value1, String value2) {
+ addCriterion("installer not between", value1, value2, "installer");
+ return (Criteria) this;
+ }
+
+ public Criteria andRepairmanIsNull() {
+ addCriterion("repairman is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andRepairmanIsNotNull() {
+ addCriterion("repairman is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andRepairmanEqualTo(String value) {
+ addCriterion("repairman =", value, "repairman");
+ return (Criteria) this;
+ }
+
+ public Criteria andRepairmanNotEqualTo(String value) {
+ addCriterion("repairman <>", value, "repairman");
+ return (Criteria) this;
+ }
+
+ public Criteria andRepairmanGreaterThan(String value) {
+ addCriterion("repairman >", value, "repairman");
+ return (Criteria) this;
+ }
+
+ public Criteria andRepairmanGreaterThanOrEqualTo(String value) {
+ addCriterion("repairman >=", value, "repairman");
+ return (Criteria) this;
+ }
+
+ public Criteria andRepairmanLessThan(String value) {
+ addCriterion("repairman <", value, "repairman");
+ return (Criteria) this;
+ }
+
+ public Criteria andRepairmanLessThanOrEqualTo(String value) {
+ addCriterion("repairman <=", value, "repairman");
+ return (Criteria) this;
+ }
+
+ public Criteria andRepairmanLike(String value) {
+ addCriterion("repairman like", value, "repairman");
+ return (Criteria) this;
+ }
+
+ public Criteria andRepairmanNotLike(String value) {
+ addCriterion("repairman not like", value, "repairman");
+ return (Criteria) this;
+ }
+
+ public Criteria andRepairmanIn(List<String> values) {
+ addCriterion("repairman in", values, "repairman");
+ return (Criteria) this;
+ }
+
+ public Criteria andRepairmanNotIn(List<String> values) {
+ addCriterion("repairman not in", values, "repairman");
+ return (Criteria) this;
+ }
+
+ public Criteria andRepairmanBetween(String value1, String value2) {
+ addCriterion("repairman between", value1, value2, "repairman");
+ return (Criteria) this;
+ }
+
+ public Criteria andRepairmanNotBetween(String value1, String value2) {
+ addCriterion("repairman not between", value1, value2, "repairman");
+ return (Criteria) this;
+ }
+
+ public Criteria andProvinceIsNull() {
+ addCriterion("province is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andProvinceIsNotNull() {
+ addCriterion("province is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andProvinceEqualTo(String value) {
+ addCriterion("province =", value, "province");
+ return (Criteria) this;
+ }
+
+ public Criteria andProvinceNotEqualTo(String value) {
+ addCriterion("province <>", value, "province");
+ return (Criteria) this;
+ }
+
+ public Criteria andProvinceGreaterThan(String value) {
+ addCriterion("province >", value, "province");
+ return (Criteria) this;
+ }
+
+ public Criteria andProvinceGreaterThanOrEqualTo(String value) {
+ addCriterion("province >=", value, "province");
+ return (Criteria) this;
+ }
+
+ public Criteria andProvinceLessThan(String value) {
+ addCriterion("province <", value, "province");
+ return (Criteria) this;
+ }
+
+ public Criteria andProvinceLessThanOrEqualTo(String value) {
+ addCriterion("province <=", value, "province");
+ return (Criteria) this;
+ }
+
+ public Criteria andProvinceLike(String value) {
+ addCriterion("province like", value, "province");
+ return (Criteria) this;
+ }
+
+ public Criteria andProvinceNotLike(String value) {
+ addCriterion("province not like", value, "province");
+ return (Criteria) this;
+ }
+
+ public Criteria andProvinceIn(List<String> values) {
+ addCriterion("province in", values, "province");
+ return (Criteria) this;
+ }
+
+ public Criteria andProvinceNotIn(List<String> values) {
+ addCriterion("province not in", values, "province");
+ return (Criteria) this;
+ }
+
+ public Criteria andProvinceBetween(String value1, String value2) {
+ addCriterion("province between", value1, value2, "province");
+ return (Criteria) this;
+ }
+
+ public Criteria andProvinceNotBetween(String value1, String value2) {
+ addCriterion("province not between", value1, value2, "province");
+ return (Criteria) this;
+ }
+
+ public Criteria andCityIsNull() {
+ addCriterion("city is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andCityIsNotNull() {
+ addCriterion("city is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andCityEqualTo(String value) {
+ addCriterion("city =", value, "city");
+ return (Criteria) this;
+ }
+
+ public Criteria andCityNotEqualTo(String value) {
+ addCriterion("city <>", value, "city");
+ return (Criteria) this;
+ }
+
+ public Criteria andCityGreaterThan(String value) {
+ addCriterion("city >", value, "city");
+ return (Criteria) this;
+ }
+
+ public Criteria andCityGreaterThanOrEqualTo(String value) {
+ addCriterion("city >=", value, "city");
+ return (Criteria) this;
+ }
+
+ public Criteria andCityLessThan(String value) {
+ addCriterion("city <", value, "city");
+ return (Criteria) this;
+ }
+
+ public Criteria andCityLessThanOrEqualTo(String value) {
+ addCriterion("city <=", value, "city");
+ return (Criteria) this;
+ }
+
+ public Criteria andCityLike(String value) {
+ addCriterion("city like", value, "city");
+ return (Criteria) this;
+ }
+
+ public Criteria andCityNotLike(String value) {
+ addCriterion("city not like", value, "city");
+ return (Criteria) this;
+ }
+
+ public Criteria andCityIn(List<String> values) {
+ addCriterion("city in", values, "city");
+ return (Criteria) this;
+ }
+
+ public Criteria andCityNotIn(List<String> values) {
+ addCriterion("city not in", values, "city");
+ return (Criteria) this;
+ }
+
+ public Criteria andCityBetween(String value1, String value2) {
+ addCriterion("city between", value1, value2, "city");
+ return (Criteria) this;
+ }
+
+ public Criteria andCityNotBetween(String value1, String value2) {
+ addCriterion("city not between", value1, value2, "city");
+ return (Criteria) this;
+ }
+
+ public Criteria andAreaIsNull() {
+ addCriterion("area is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andAreaIsNotNull() {
+ addCriterion("area is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andAreaEqualTo(String value) {
+ addCriterion("area =", value, "area");
+ return (Criteria) this;
+ }
+
+ public Criteria andAreaNotEqualTo(String value) {
+ addCriterion("area <>", value, "area");
+ return (Criteria) this;
+ }
+
+ public Criteria andAreaGreaterThan(String value) {
+ addCriterion("area >", value, "area");
+ return (Criteria) this;
+ }
+
+ public Criteria andAreaGreaterThanOrEqualTo(String value) {
+ addCriterion("area >=", value, "area");
+ return (Criteria) this;
+ }
+
+ public Criteria andAreaLessThan(String value) {
+ addCriterion("area <", value, "area");
+ return (Criteria) this;
+ }
+
+ public Criteria andAreaLessThanOrEqualTo(String value) {
+ addCriterion("area <=", value, "area");
+ return (Criteria) this;
+ }
+
+ public Criteria andAreaLike(String value) {
+ addCriterion("area like", value, "area");
+ return (Criteria) this;
+ }
+
+ public Criteria andAreaNotLike(String value) {
+ addCriterion("area not like", value, "area");
+ return (Criteria) this;
+ }
+
+ public Criteria andAreaIn(List<String> values) {
+ addCriterion("area in", values, "area");
+ return (Criteria) this;
+ }
+
+ public Criteria andAreaNotIn(List<String> values) {
+ addCriterion("area not in", values, "area");
+ return (Criteria) this;
+ }
+
+ public Criteria andAreaBetween(String value1, String value2) {
+ addCriterion("area between", value1, value2, "area");
+ return (Criteria) this;
+ }
+
+ public Criteria andAreaNotBetween(String value1, String value2) {
+ addCriterion("area not between", value1, value2, "area");
+ return (Criteria) this;
+ }
+
+ public Criteria andMonitorpointIsNull() {
+ addCriterion("monitorpoint is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andMonitorpointIsNotNull() {
+ addCriterion("monitorpoint is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andMonitorpointEqualTo(String value) {
+ addCriterion("monitorpoint =", value, "monitorpoint");
+ return (Criteria) this;
+ }
+
+ public Criteria andMonitorpointNotEqualTo(String value) {
+ addCriterion("monitorpoint <>", value, "monitorpoint");
+ return (Criteria) this;
+ }
+
+ public Criteria andMonitorpointGreaterThan(String value) {
+ addCriterion("monitorpoint >", value, "monitorpoint");
+ return (Criteria) this;
+ }
+
+ public Criteria andMonitorpointGreaterThanOrEqualTo(String value) {
+ addCriterion("monitorpoint >=", value, "monitorpoint");
+ return (Criteria) this;
+ }
+
+ public Criteria andMonitorpointLessThan(String value) {
+ addCriterion("monitorpoint <", value, "monitorpoint");
+ return (Criteria) this;
+ }
+
+ public Criteria andMonitorpointLessThanOrEqualTo(String value) {
+ addCriterion("monitorpoint <=", value, "monitorpoint");
+ return (Criteria) this;
+ }
+
+ public Criteria andMonitorpointLike(String value) {
+ addCriterion("monitorpoint like", value, "monitorpoint");
+ return (Criteria) this;
+ }
+
+ public Criteria andMonitorpointNotLike(String value) {
+ addCriterion("monitorpoint not like", value, "monitorpoint");
+ return (Criteria) this;
+ }
+
+ public Criteria andMonitorpointIn(List<String> values) {
+ addCriterion("monitorpoint in", values, "monitorpoint");
+ return (Criteria) this;
+ }
+
+ public Criteria andMonitorpointNotIn(List<String> values) {
+ addCriterion("monitorpoint not in", values, "monitorpoint");
+ return (Criteria) this;
+ }
+
+ public Criteria andMonitorpointBetween(String value1, String value2) {
+ addCriterion("monitorpoint between", value1, value2, "monitorpoint");
+ return (Criteria) this;
+ }
+
+ public Criteria andMonitorpointNotBetween(String value1, String value2) {
+ addCriterion("monitorpoint not between", value1, value2, "monitorpoint");
+ return (Criteria) this;
+ }
+
+ public Criteria andOwnerIdIsNull() {
+ addCriterion("owner_id is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andOwnerIdIsNotNull() {
+ addCriterion("owner_id is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andOwnerIdEqualTo(String value) {
+ addCriterion("owner_id =", value, "ownerId");
+ return (Criteria) this;
+ }
+
+ public Criteria andOwnerIdNotEqualTo(String value) {
+ addCriterion("owner_id <>", value, "ownerId");
+ return (Criteria) this;
+ }
+
+ public Criteria andOwnerIdGreaterThan(String value) {
+ addCriterion("owner_id >", value, "ownerId");
+ return (Criteria) this;
+ }
+
+ public Criteria andOwnerIdGreaterThanOrEqualTo(String value) {
+ addCriterion("owner_id >=", value, "ownerId");
+ return (Criteria) this;
+ }
+
+ public Criteria andOwnerIdLessThan(String value) {
+ addCriterion("owner_id <", value, "ownerId");
+ return (Criteria) this;
+ }
+
+ public Criteria andOwnerIdLessThanOrEqualTo(String value) {
+ addCriterion("owner_id <=", value, "ownerId");
+ return (Criteria) this;
+ }
+
+ public Criteria andOwnerIdLike(String value) {
+ addCriterion("owner_id like", value, "ownerId");
+ return (Criteria) this;
+ }
+
+ public Criteria andOwnerIdNotLike(String value) {
+ addCriterion("owner_id not like", value, "ownerId");
+ return (Criteria) this;
+ }
+
+ public Criteria andOwnerIdIn(List<String> values) {
+ addCriterion("owner_id in", values, "ownerId");
+ return (Criteria) this;
+ }
+
+ public Criteria andOwnerIdNotIn(List<String> values) {
+ addCriterion("owner_id not in", values, "ownerId");
+ return (Criteria) this;
+ }
+
+ public Criteria andOwnerIdBetween(String value1, String value2) {
+ addCriterion("owner_id between", value1, value2, "ownerId");
+ return (Criteria) this;
+ }
+
+ public Criteria andOwnerIdNotBetween(String value1, String value2) {
+ addCriterion("owner_id not between", value1, value2, "ownerId");
+ return (Criteria) this;
+ }
+ }
+
+ public static class Criteria extends GeneratedCriteria {
+
+ protected Criteria() {
+ super();
+ }
+ }
+
+ public static class Criterion {
+ private String condition;
+
+ private Object value;
+
+ private Object secondValue;
+
+ private boolean noValue;
+
+ private boolean singleValue;
+
+ private boolean betweenValue;
+
+ private boolean listValue;
+
+ private String typeHandler;
+
+ public String getCondition() {
+ return condition;
+ }
+
+ public Object getValue() {
+ return value;
+ }
+
+ public Object getSecondValue() {
+ return secondValue;
+ }
+
+ public boolean isNoValue() {
+ return noValue;
+ }
+
+ public boolean isSingleValue() {
+ return singleValue;
+ }
+
+ public boolean isBetweenValue() {
+ return betweenValue;
+ }
+
+ public boolean isListValue() {
+ return listValue;
+ }
+
+ public String getTypeHandler() {
+ return typeHandler;
+ }
+
+ protected Criterion(String condition) {
+ super();
+ this.condition = condition;
+ this.typeHandler = null;
+ this.noValue = true;
+ }
+
+ protected Criterion(String condition, Object value, String typeHandler) {
+ super();
+ this.condition = condition;
+ this.value = value;
+ this.typeHandler = typeHandler;
+ if (value instanceof List<?>) {
+ this.listValue = true;
+ } else {
+ this.singleValue = true;
+ }
+ }
+
+ protected Criterion(String condition, Object value) {
+ this(condition, value, null);
+ }
+
+ protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+ super();
+ this.condition = condition;
+ this.value = value;
+ this.secondValue = secondValue;
+ this.typeHandler = typeHandler;
+ this.betweenValue = true;
+ }
+
+ protected Criterion(String condition, Object value, Object secondValue) {
+ this(condition, value, secondValue, null);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/moral/monitor/entity/History.java b/src/main/java/com/moral/monitor/entity/History.java
index d417fb2..b0ae9d5 100644
--- a/src/main/java/com/moral/monitor/entity/History.java
+++ b/src/main/java/com/moral/monitor/entity/History.java
@@ -2,24 +2,33 @@
import java.util.Date;
-/**
- * Created by a on 2017/6/20.
- * ������������������������������������������������
- */
public class History {
+ private Integer id;
+
private String mac;
+
private String sensor;
- private String mac_key;
- private Double mac_value;
+
+ private String macKey;
+
+ private Double macValue;
+
private Date time;
- private String units;
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
public String getMac() {
return mac;
}
public void setMac(String mac) {
- this.mac = mac;
+ this.mac = mac == null ? null : mac.trim();
}
public String getSensor() {
@@ -27,23 +36,23 @@
}
public void setSensor(String sensor) {
- this.sensor = sensor;
+ this.sensor = sensor == null ? null : sensor.trim();
}
- public String getMac_key() {
- return mac_key;
+ public String getMacKey() {
+ return macKey;
}
- public void setMac_key(String mac_key) {
- this.mac_key = mac_key;
+ public void setMacKey(String macKey) {
+ this.macKey = macKey == null ? null : macKey.trim();
}
- public Double getMac_value() {
- return mac_value;
+ public Double getMacValue() {
+ return macValue;
}
- public void setMac_value(Double mac_value) {
- this.mac_value = mac_value;
+ public void setMacValue(Double macValue) {
+ this.macValue = macValue;
}
public Date getTime() {
@@ -53,12 +62,4 @@
public void setTime(Date time) {
this.time = time;
}
-
- public String getUnits() {
- return units;
- }
-
- public void setUnits(String units) {
- this.units = units;
- }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/moral/monitor/entity/HistoryExample.java b/src/main/java/com/moral/monitor/entity/HistoryExample.java
new file mode 100644
index 0000000..2c1f791
--- /dev/null
+++ b/src/main/java/com/moral/monitor/entity/HistoryExample.java
@@ -0,0 +1,591 @@
+package com.moral.monitor.entity;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class HistoryExample {
+ protected String orderByClause;
+
+ protected boolean distinct;
+
+ protected List<Criteria> oredCriteria;
+
+ public HistoryExample() {
+ oredCriteria = new ArrayList<Criteria>();
+ }
+
+ public void setOrderByClause(String orderByClause) {
+ this.orderByClause = orderByClause;
+ }
+
+ public String getOrderByClause() {
+ return orderByClause;
+ }
+
+ public void setDistinct(boolean distinct) {
+ this.distinct = distinct;
+ }
+
+ public boolean isDistinct() {
+ return distinct;
+ }
+
+ public List<Criteria> getOredCriteria() {
+ return oredCriteria;
+ }
+
+ public void or(Criteria criteria) {
+ oredCriteria.add(criteria);
+ }
+
+ public Criteria or() {
+ Criteria criteria = createCriteriaInternal();
+ oredCriteria.add(criteria);
+ return criteria;
+ }
+
+ public Criteria createCriteria() {
+ Criteria criteria = createCriteriaInternal();
+ if (oredCriteria.size() == 0) {
+ oredCriteria.add(criteria);
+ }
+ return criteria;
+ }
+
+ protected Criteria createCriteriaInternal() {
+ Criteria criteria = new Criteria();
+ return criteria;
+ }
+
+ public void clear() {
+ oredCriteria.clear();
+ orderByClause = null;
+ distinct = false;
+ }
+
+ protected abstract static class GeneratedCriteria {
+ protected List<Criterion> criteria;
+
+ protected GeneratedCriteria() {
+ super();
+ criteria = new ArrayList<Criterion>();
+ }
+
+ public boolean isValid() {
+ return criteria.size() > 0;
+ }
+
+ public List<Criterion> getAllCriteria() {
+ return criteria;
+ }
+
+ public List<Criterion> getCriteria() {
+ return criteria;
+ }
+
+ protected void addCriterion(String condition) {
+ if (condition == null) {
+ throw new RuntimeException("Value for condition cannot be null");
+ }
+ criteria.add(new Criterion(condition));
+ }
+
+ protected void addCriterion(String condition, Object value, String property) {
+ if (value == null) {
+ throw new RuntimeException("Value for " + property + " cannot be null");
+ }
+ criteria.add(new Criterion(condition, value));
+ }
+
+ protected void addCriterion(String condition, Object value1, Object value2, String property) {
+ if (value1 == null || value2 == null) {
+ throw new RuntimeException("Between values for " + property + " cannot be null");
+ }
+ criteria.add(new Criterion(condition, value1, value2));
+ }
+
+ public Criteria andIdIsNull() {
+ addCriterion("id is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdIsNotNull() {
+ addCriterion("id is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdEqualTo(Integer value) {
+ addCriterion("id =", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdNotEqualTo(Integer value) {
+ addCriterion("id <>", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdGreaterThan(Integer value) {
+ addCriterion("id >", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+ addCriterion("id >=", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdLessThan(Integer value) {
+ addCriterion("id <", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdLessThanOrEqualTo(Integer value) {
+ addCriterion("id <=", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdIn(List<Integer> values) {
+ addCriterion("id in", values, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdNotIn(List<Integer> values) {
+ addCriterion("id not in", values, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdBetween(Integer value1, Integer value2) {
+ addCriterion("id between", value1, value2, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdNotBetween(Integer value1, Integer value2) {
+ addCriterion("id not between", value1, value2, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacIsNull() {
+ addCriterion("mac is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacIsNotNull() {
+ addCriterion("mac is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacEqualTo(String value) {
+ addCriterion("mac =", value, "mac");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacNotEqualTo(String value) {
+ addCriterion("mac <>", value, "mac");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacGreaterThan(String value) {
+ addCriterion("mac >", value, "mac");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacGreaterThanOrEqualTo(String value) {
+ addCriterion("mac >=", value, "mac");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacLessThan(String value) {
+ addCriterion("mac <", value, "mac");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacLessThanOrEqualTo(String value) {
+ addCriterion("mac <=", value, "mac");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacLike(String value) {
+ addCriterion("mac like", value, "mac");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacNotLike(String value) {
+ addCriterion("mac not like", value, "mac");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacIn(List<String> values) {
+ addCriterion("mac in", values, "mac");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacNotIn(List<String> values) {
+ addCriterion("mac not in", values, "mac");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacBetween(String value1, String value2) {
+ addCriterion("mac between", value1, value2, "mac");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacNotBetween(String value1, String value2) {
+ addCriterion("mac not between", value1, value2, "mac");
+ return (Criteria) this;
+ }
+
+ public Criteria andSensorIsNull() {
+ addCriterion("sensor is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andSensorIsNotNull() {
+ addCriterion("sensor is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andSensorEqualTo(String value) {
+ addCriterion("sensor =", value, "sensor");
+ return (Criteria) this;
+ }
+
+ public Criteria andSensorNotEqualTo(String value) {
+ addCriterion("sensor <>", value, "sensor");
+ return (Criteria) this;
+ }
+
+ public Criteria andSensorGreaterThan(String value) {
+ addCriterion("sensor >", value, "sensor");
+ return (Criteria) this;
+ }
+
+ public Criteria andSensorGreaterThanOrEqualTo(String value) {
+ addCriterion("sensor >=", value, "sensor");
+ return (Criteria) this;
+ }
+
+ public Criteria andSensorLessThan(String value) {
+ addCriterion("sensor <", value, "sensor");
+ return (Criteria) this;
+ }
+
+ public Criteria andSensorLessThanOrEqualTo(String value) {
+ addCriterion("sensor <=", value, "sensor");
+ return (Criteria) this;
+ }
+
+ public Criteria andSensorLike(String value) {
+ addCriterion("sensor like", value, "sensor");
+ return (Criteria) this;
+ }
+
+ public Criteria andSensorNotLike(String value) {
+ addCriterion("sensor not like", value, "sensor");
+ return (Criteria) this;
+ }
+
+ public Criteria andSensorIn(List<String> values) {
+ addCriterion("sensor in", values, "sensor");
+ return (Criteria) this;
+ }
+
+ public Criteria andSensorNotIn(List<String> values) {
+ addCriterion("sensor not in", values, "sensor");
+ return (Criteria) this;
+ }
+
+ public Criteria andSensorBetween(String value1, String value2) {
+ addCriterion("sensor between", value1, value2, "sensor");
+ return (Criteria) this;
+ }
+
+ public Criteria andSensorNotBetween(String value1, String value2) {
+ addCriterion("sensor not between", value1, value2, "sensor");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacKeyIsNull() {
+ addCriterion("mac_key is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacKeyIsNotNull() {
+ addCriterion("mac_key is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacKeyEqualTo(String value) {
+ addCriterion("mac_key =", value, "macKey");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacKeyNotEqualTo(String value) {
+ addCriterion("mac_key <>", value, "macKey");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacKeyGreaterThan(String value) {
+ addCriterion("mac_key >", value, "macKey");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacKeyGreaterThanOrEqualTo(String value) {
+ addCriterion("mac_key >=", value, "macKey");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacKeyLessThan(String value) {
+ addCriterion("mac_key <", value, "macKey");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacKeyLessThanOrEqualTo(String value) {
+ addCriterion("mac_key <=", value, "macKey");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacKeyLike(String value) {
+ addCriterion("mac_key like", value, "macKey");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacKeyNotLike(String value) {
+ addCriterion("mac_key not like", value, "macKey");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacKeyIn(List<String> values) {
+ addCriterion("mac_key in", values, "macKey");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacKeyNotIn(List<String> values) {
+ addCriterion("mac_key not in", values, "macKey");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacKeyBetween(String value1, String value2) {
+ addCriterion("mac_key between", value1, value2, "macKey");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacKeyNotBetween(String value1, String value2) {
+ addCriterion("mac_key not between", value1, value2, "macKey");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacValueIsNull() {
+ addCriterion("mac_value is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacValueIsNotNull() {
+ addCriterion("mac_value is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacValueEqualTo(Double value) {
+ addCriterion("mac_value =", value, "macValue");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacValueNotEqualTo(Double value) {
+ addCriterion("mac_value <>", value, "macValue");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacValueGreaterThan(Double value) {
+ addCriterion("mac_value >", value, "macValue");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacValueGreaterThanOrEqualTo(Double value) {
+ addCriterion("mac_value >=", value, "macValue");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacValueLessThan(Double value) {
+ addCriterion("mac_value <", value, "macValue");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacValueLessThanOrEqualTo(Double value) {
+ addCriterion("mac_value <=", value, "macValue");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacValueIn(List<Double> values) {
+ addCriterion("mac_value in", values, "macValue");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacValueNotIn(List<Double> values) {
+ addCriterion("mac_value not in", values, "macValue");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacValueBetween(Double value1, Double value2) {
+ addCriterion("mac_value between", value1, value2, "macValue");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacValueNotBetween(Double value1, Double value2) {
+ addCriterion("mac_value not between", value1, value2, "macValue");
+ return (Criteria) this;
+ }
+
+ public Criteria andTimeIsNull() {
+ addCriterion("time is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andTimeIsNotNull() {
+ addCriterion("time is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andTimeEqualTo(Date value) {
+ addCriterion("time =", value, "time");
+ return (Criteria) this;
+ }
+
+ public Criteria andTimeNotEqualTo(Date value) {
+ addCriterion("time <>", value, "time");
+ return (Criteria) this;
+ }
+
+ public Criteria andTimeGreaterThan(Date value) {
+ addCriterion("time >", value, "time");
+ return (Criteria) this;
+ }
+
+ public Criteria andTimeGreaterThanOrEqualTo(Date value) {
+ addCriterion("time >=", value, "time");
+ return (Criteria) this;
+ }
+
+ public Criteria andTimeLessThan(Date value) {
+ addCriterion("time <", value, "time");
+ return (Criteria) this;
+ }
+
+ public Criteria andTimeLessThanOrEqualTo(Date value) {
+ addCriterion("time <=", value, "time");
+ return (Criteria) this;
+ }
+
+ public Criteria andTimeIn(List<Date> values) {
+ addCriterion("time in", values, "time");
+ return (Criteria) this;
+ }
+
+ public Criteria andTimeNotIn(List<Date> values) {
+ addCriterion("time not in", values, "time");
+ return (Criteria) this;
+ }
+
+ public Criteria andTimeBetween(Date value1, Date value2) {
+ addCriterion("time between", value1, value2, "time");
+ return (Criteria) this;
+ }
+
+ public Criteria andTimeNotBetween(Date value1, Date value2) {
+ addCriterion("time not between", value1, value2, "time");
+ return (Criteria) this;
+ }
+ }
+
+ public static class Criteria extends GeneratedCriteria {
+
+ protected Criteria() {
+ super();
+ }
+ }
+
+ public static class Criterion {
+ private String condition;
+
+ private Object value;
+
+ private Object secondValue;
+
+ private boolean noValue;
+
+ private boolean singleValue;
+
+ private boolean betweenValue;
+
+ private boolean listValue;
+
+ private String typeHandler;
+
+ public String getCondition() {
+ return condition;
+ }
+
+ public Object getValue() {
+ return value;
+ }
+
+ public Object getSecondValue() {
+ return secondValue;
+ }
+
+ public boolean isNoValue() {
+ return noValue;
+ }
+
+ public boolean isSingleValue() {
+ return singleValue;
+ }
+
+ public boolean isBetweenValue() {
+ return betweenValue;
+ }
+
+ public boolean isListValue() {
+ return listValue;
+ }
+
+ public String getTypeHandler() {
+ return typeHandler;
+ }
+
+ protected Criterion(String condition) {
+ super();
+ this.condition = condition;
+ this.typeHandler = null;
+ this.noValue = true;
+ }
+
+ protected Criterion(String condition, Object value, String typeHandler) {
+ super();
+ this.condition = condition;
+ this.value = value;
+ this.typeHandler = typeHandler;
+ if (value instanceof List<?>) {
+ this.listValue = true;
+ } else {
+ this.singleValue = true;
+ }
+ }
+
+ protected Criterion(String condition, Object value) {
+ this(condition, value, null);
+ }
+
+ protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+ super();
+ this.condition = condition;
+ this.value = value;
+ this.secondValue = secondValue;
+ this.typeHandler = typeHandler;
+ this.betweenValue = true;
+ }
+
+ protected Criterion(String condition, Object value, Object secondValue) {
+ this(condition, value, secondValue, null);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/moral/monitor/entity/Logger.java b/src/main/java/com/moral/monitor/entity/Logger.java
new file mode 100644
index 0000000..f23586d
--- /dev/null
+++ b/src/main/java/com/moral/monitor/entity/Logger.java
@@ -0,0 +1,45 @@
+package com.moral.monitor.entity;
+
+import java.util.Date;
+
+public class Logger {
+ private Integer id;
+
+ private String mac;
+
+ private String macLog;
+
+ private Date time;
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public String getMac() {
+ return mac;
+ }
+
+ public void setMac(String mac) {
+ this.mac = mac == null ? null : mac.trim();
+ }
+
+ public String getMacLog() {
+ return macLog;
+ }
+
+ public void setMacLog(String macLog) {
+ this.macLog = macLog == null ? null : macLog.trim();
+ }
+
+ public Date getTime() {
+ return time;
+ }
+
+ public void setTime(Date time) {
+ this.time = time;
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/moral/monitor/entity/LoggerExample.java b/src/main/java/com/moral/monitor/entity/LoggerExample.java
new file mode 100644
index 0000000..6739bee
--- /dev/null
+++ b/src/main/java/com/moral/monitor/entity/LoggerExample.java
@@ -0,0 +1,461 @@
+package com.moral.monitor.entity;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class LoggerExample {
+ protected String orderByClause;
+
+ protected boolean distinct;
+
+ protected List<Criteria> oredCriteria;
+
+ public LoggerExample() {
+ oredCriteria = new ArrayList<Criteria>();
+ }
+
+ public void setOrderByClause(String orderByClause) {
+ this.orderByClause = orderByClause;
+ }
+
+ public String getOrderByClause() {
+ return orderByClause;
+ }
+
+ public void setDistinct(boolean distinct) {
+ this.distinct = distinct;
+ }
+
+ public boolean isDistinct() {
+ return distinct;
+ }
+
+ public List<Criteria> getOredCriteria() {
+ return oredCriteria;
+ }
+
+ public void or(Criteria criteria) {
+ oredCriteria.add(criteria);
+ }
+
+ public Criteria or() {
+ Criteria criteria = createCriteriaInternal();
+ oredCriteria.add(criteria);
+ return criteria;
+ }
+
+ public Criteria createCriteria() {
+ Criteria criteria = createCriteriaInternal();
+ if (oredCriteria.size() == 0) {
+ oredCriteria.add(criteria);
+ }
+ return criteria;
+ }
+
+ protected Criteria createCriteriaInternal() {
+ Criteria criteria = new Criteria();
+ return criteria;
+ }
+
+ public void clear() {
+ oredCriteria.clear();
+ orderByClause = null;
+ distinct = false;
+ }
+
+ protected abstract static class GeneratedCriteria {
+ protected List<Criterion> criteria;
+
+ protected GeneratedCriteria() {
+ super();
+ criteria = new ArrayList<Criterion>();
+ }
+
+ public boolean isValid() {
+ return criteria.size() > 0;
+ }
+
+ public List<Criterion> getAllCriteria() {
+ return criteria;
+ }
+
+ public List<Criterion> getCriteria() {
+ return criteria;
+ }
+
+ protected void addCriterion(String condition) {
+ if (condition == null) {
+ throw new RuntimeException("Value for condition cannot be null");
+ }
+ criteria.add(new Criterion(condition));
+ }
+
+ protected void addCriterion(String condition, Object value, String property) {
+ if (value == null) {
+ throw new RuntimeException("Value for " + property + " cannot be null");
+ }
+ criteria.add(new Criterion(condition, value));
+ }
+
+ protected void addCriterion(String condition, Object value1, Object value2, String property) {
+ if (value1 == null || value2 == null) {
+ throw new RuntimeException("Between values for " + property + " cannot be null");
+ }
+ criteria.add(new Criterion(condition, value1, value2));
+ }
+
+ public Criteria andIdIsNull() {
+ addCriterion("id is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdIsNotNull() {
+ addCriterion("id is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdEqualTo(Integer value) {
+ addCriterion("id =", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdNotEqualTo(Integer value) {
+ addCriterion("id <>", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdGreaterThan(Integer value) {
+ addCriterion("id >", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+ addCriterion("id >=", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdLessThan(Integer value) {
+ addCriterion("id <", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdLessThanOrEqualTo(Integer value) {
+ addCriterion("id <=", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdIn(List<Integer> values) {
+ addCriterion("id in", values, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdNotIn(List<Integer> values) {
+ addCriterion("id not in", values, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdBetween(Integer value1, Integer value2) {
+ addCriterion("id between", value1, value2, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdNotBetween(Integer value1, Integer value2) {
+ addCriterion("id not between", value1, value2, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacIsNull() {
+ addCriterion("mac is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacIsNotNull() {
+ addCriterion("mac is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacEqualTo(String value) {
+ addCriterion("mac =", value, "mac");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacNotEqualTo(String value) {
+ addCriterion("mac <>", value, "mac");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacGreaterThan(String value) {
+ addCriterion("mac >", value, "mac");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacGreaterThanOrEqualTo(String value) {
+ addCriterion("mac >=", value, "mac");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacLessThan(String value) {
+ addCriterion("mac <", value, "mac");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacLessThanOrEqualTo(String value) {
+ addCriterion("mac <=", value, "mac");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacLike(String value) {
+ addCriterion("mac like", value, "mac");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacNotLike(String value) {
+ addCriterion("mac not like", value, "mac");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacIn(List<String> values) {
+ addCriterion("mac in", values, "mac");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacNotIn(List<String> values) {
+ addCriterion("mac not in", values, "mac");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacBetween(String value1, String value2) {
+ addCriterion("mac between", value1, value2, "mac");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacNotBetween(String value1, String value2) {
+ addCriterion("mac not between", value1, value2, "mac");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacLogIsNull() {
+ addCriterion("mac_log is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacLogIsNotNull() {
+ addCriterion("mac_log is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacLogEqualTo(String value) {
+ addCriterion("mac_log =", value, "macLog");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacLogNotEqualTo(String value) {
+ addCriterion("mac_log <>", value, "macLog");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacLogGreaterThan(String value) {
+ addCriterion("mac_log >", value, "macLog");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacLogGreaterThanOrEqualTo(String value) {
+ addCriterion("mac_log >=", value, "macLog");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacLogLessThan(String value) {
+ addCriterion("mac_log <", value, "macLog");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacLogLessThanOrEqualTo(String value) {
+ addCriterion("mac_log <=", value, "macLog");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacLogLike(String value) {
+ addCriterion("mac_log like", value, "macLog");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacLogNotLike(String value) {
+ addCriterion("mac_log not like", value, "macLog");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacLogIn(List<String> values) {
+ addCriterion("mac_log in", values, "macLog");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacLogNotIn(List<String> values) {
+ addCriterion("mac_log not in", values, "macLog");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacLogBetween(String value1, String value2) {
+ addCriterion("mac_log between", value1, value2, "macLog");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacLogNotBetween(String value1, String value2) {
+ addCriterion("mac_log not between", value1, value2, "macLog");
+ return (Criteria) this;
+ }
+
+ public Criteria andTimeIsNull() {
+ addCriterion("time is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andTimeIsNotNull() {
+ addCriterion("time is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andTimeEqualTo(Date value) {
+ addCriterion("time =", value, "time");
+ return (Criteria) this;
+ }
+
+ public Criteria andTimeNotEqualTo(Date value) {
+ addCriterion("time <>", value, "time");
+ return (Criteria) this;
+ }
+
+ public Criteria andTimeGreaterThan(Date value) {
+ addCriterion("time >", value, "time");
+ return (Criteria) this;
+ }
+
+ public Criteria andTimeGreaterThanOrEqualTo(Date value) {
+ addCriterion("time >=", value, "time");
+ return (Criteria) this;
+ }
+
+ public Criteria andTimeLessThan(Date value) {
+ addCriterion("time <", value, "time");
+ return (Criteria) this;
+ }
+
+ public Criteria andTimeLessThanOrEqualTo(Date value) {
+ addCriterion("time <=", value, "time");
+ return (Criteria) this;
+ }
+
+ public Criteria andTimeIn(List<Date> values) {
+ addCriterion("time in", values, "time");
+ return (Criteria) this;
+ }
+
+ public Criteria andTimeNotIn(List<Date> values) {
+ addCriterion("time not in", values, "time");
+ return (Criteria) this;
+ }
+
+ public Criteria andTimeBetween(Date value1, Date value2) {
+ addCriterion("time between", value1, value2, "time");
+ return (Criteria) this;
+ }
+
+ public Criteria andTimeNotBetween(Date value1, Date value2) {
+ addCriterion("time not between", value1, value2, "time");
+ return (Criteria) this;
+ }
+ }
+
+ public static class Criteria extends GeneratedCriteria {
+
+ protected Criteria() {
+ super();
+ }
+ }
+
+ public static class Criterion {
+ private String condition;
+
+ private Object value;
+
+ private Object secondValue;
+
+ private boolean noValue;
+
+ private boolean singleValue;
+
+ private boolean betweenValue;
+
+ private boolean listValue;
+
+ private String typeHandler;
+
+ public String getCondition() {
+ return condition;
+ }
+
+ public Object getValue() {
+ return value;
+ }
+
+ public Object getSecondValue() {
+ return secondValue;
+ }
+
+ public boolean isNoValue() {
+ return noValue;
+ }
+
+ public boolean isSingleValue() {
+ return singleValue;
+ }
+
+ public boolean isBetweenValue() {
+ return betweenValue;
+ }
+
+ public boolean isListValue() {
+ return listValue;
+ }
+
+ public String getTypeHandler() {
+ return typeHandler;
+ }
+
+ protected Criterion(String condition) {
+ super();
+ this.condition = condition;
+ this.typeHandler = null;
+ this.noValue = true;
+ }
+
+ protected Criterion(String condition, Object value, String typeHandler) {
+ super();
+ this.condition = condition;
+ this.value = value;
+ this.typeHandler = typeHandler;
+ if (value instanceof List<?>) {
+ this.listValue = true;
+ } else {
+ this.singleValue = true;
+ }
+ }
+
+ protected Criterion(String condition, Object value) {
+ this(condition, value, null);
+ }
+
+ protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+ super();
+ this.condition = condition;
+ this.value = value;
+ this.secondValue = secondValue;
+ this.typeHandler = typeHandler;
+ this.betweenValue = true;
+ }
+
+ protected Criterion(String condition, Object value, Object secondValue) {
+ this(condition, value, secondValue, null);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/moral/monitor/entity/MonitorPoint.java b/src/main/java/com/moral/monitor/entity/MonitorPoint.java
deleted file mode 100644
index 7d2f154..0000000
--- a/src/main/java/com/moral/monitor/entity/MonitorPoint.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.moral.monitor.entity;
-
-import java.util.Date;
-
-/**
- * Created by a on 2017/7/18.
- */
-public class MonitorPoint {
-
- private int id;
- private String name;
- private String address;
- private String repairman;
- private Date create_time;
- private String owner;
- private int equcount;
-
- public int getId() {
- return id;
- }
-
- public void setId(int id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getAddress() {
- return address;
- }
-
- public void setAddress(String address) {
- this.address = address;
- }
-
- public String getRepairman() {
- return repairman;
- }
-
- public void setRepairman(String repairman) {
- this.repairman = repairman;
- }
-
- public Date getCreate_time() {
- return create_time;
- }
-
- public void setCreate_time(Date create_time) {
- this.create_time = create_time;
- }
-
- public String getOwner() {
- return owner;
- }
-
- public void setOwner(String owner) {
- this.owner = owner;
- }
-
- public int getEqucount() {
- return equcount;
- }
-
- public void setEqucount(int equcount) {
- this.equcount = equcount;
- }
-}
diff --git a/src/main/java/com/moral/monitor/entity/Monitorpoint.java b/src/main/java/com/moral/monitor/entity/Monitorpoint.java
new file mode 100644
index 0000000..1e0c672
--- /dev/null
+++ b/src/main/java/com/moral/monitor/entity/Monitorpoint.java
@@ -0,0 +1,125 @@
+package com.moral.monitor.entity;
+
+import java.util.Date;
+
+public class Monitorpoint {
+ private String id;
+
+ private String name;
+
+ private Double longitude;
+
+ private Double latitude;
+
+ private String provincecode;
+
+ private String citycode;
+
+ private String areacode;
+
+ private String address;
+
+ private String repairman;
+
+ private String regionDescription;
+
+ private Date createTime;
+
+ private String owner;
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id == null ? null : id.trim();
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name == null ? null : name.trim();
+ }
+
+ public Double getLongitude() {
+ return longitude;
+ }
+
+ public void setLongitude(Double longitude) {
+ this.longitude = longitude;
+ }
+
+ public Double getLatitude() {
+ return latitude;
+ }
+
+ public void setLatitude(Double latitude) {
+ this.latitude = latitude;
+ }
+
+ public String getProvincecode() {
+ return provincecode;
+ }
+
+ public void setProvincecode(String provincecode) {
+ this.provincecode = provincecode == null ? null : provincecode.trim();
+ }
+
+ public String getCitycode() {
+ return citycode;
+ }
+
+ public void setCitycode(String citycode) {
+ this.citycode = citycode == null ? null : citycode.trim();
+ }
+
+ public String getAreacode() {
+ return areacode;
+ }
+
+ public void setAreacode(String areacode) {
+ this.areacode = areacode == null ? null : areacode.trim();
+ }
+
+ public String getAddress() {
+ return address;
+ }
+
+ public void setAddress(String address) {
+ this.address = address == null ? null : address.trim();
+ }
+
+ public String getRepairman() {
+ return repairman;
+ }
+
+ public void setRepairman(String repairman) {
+ this.repairman = repairman == null ? null : repairman.trim();
+ }
+
+ public String getRegionDescription() {
+ return regionDescription;
+ }
+
+ public void setRegionDescription(String regionDescription) {
+ this.regionDescription = regionDescription == null ? null : regionDescription.trim();
+ }
+
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public String getOwner() {
+ return owner;
+ }
+
+ public void setOwner(String owner) {
+ this.owner = owner == null ? null : owner.trim();
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/moral/monitor/entity/MonitorpointExample.java b/src/main/java/com/moral/monitor/entity/MonitorpointExample.java
new file mode 100644
index 0000000..9b9de0f
--- /dev/null
+++ b/src/main/java/com/moral/monitor/entity/MonitorpointExample.java
@@ -0,0 +1,1011 @@
+package com.moral.monitor.entity;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class MonitorpointExample {
+ protected String orderByClause;
+
+ protected boolean distinct;
+
+ protected List<Criteria> oredCriteria;
+
+ public MonitorpointExample() {
+ oredCriteria = new ArrayList<Criteria>();
+ }
+
+ public void setOrderByClause(String orderByClause) {
+ this.orderByClause = orderByClause;
+ }
+
+ public String getOrderByClause() {
+ return orderByClause;
+ }
+
+ public void setDistinct(boolean distinct) {
+ this.distinct = distinct;
+ }
+
+ public boolean isDistinct() {
+ return distinct;
+ }
+
+ public List<Criteria> getOredCriteria() {
+ return oredCriteria;
+ }
+
+ public void or(Criteria criteria) {
+ oredCriteria.add(criteria);
+ }
+
+ public Criteria or() {
+ Criteria criteria = createCriteriaInternal();
+ oredCriteria.add(criteria);
+ return criteria;
+ }
+
+ public Criteria createCriteria() {
+ Criteria criteria = createCriteriaInternal();
+ if (oredCriteria.size() == 0) {
+ oredCriteria.add(criteria);
+ }
+ return criteria;
+ }
+
+ protected Criteria createCriteriaInternal() {
+ Criteria criteria = new Criteria();
+ return criteria;
+ }
+
+ public void clear() {
+ oredCriteria.clear();
+ orderByClause = null;
+ distinct = false;
+ }
+
+ protected abstract static class GeneratedCriteria {
+ protected List<Criterion> criteria;
+
+ protected GeneratedCriteria() {
+ super();
+ criteria = new ArrayList<Criterion>();
+ }
+
+ public boolean isValid() {
+ return criteria.size() > 0;
+ }
+
+ public List<Criterion> getAllCriteria() {
+ return criteria;
+ }
+
+ public List<Criterion> getCriteria() {
+ return criteria;
+ }
+
+ protected void addCriterion(String condition) {
+ if (condition == null) {
+ throw new RuntimeException("Value for condition cannot be null");
+ }
+ criteria.add(new Criterion(condition));
+ }
+
+ protected void addCriterion(String condition, Object value, String property) {
+ if (value == null) {
+ throw new RuntimeException("Value for " + property + " cannot be null");
+ }
+ criteria.add(new Criterion(condition, value));
+ }
+
+ protected void addCriterion(String condition, Object value1, Object value2, String property) {
+ if (value1 == null || value2 == null) {
+ throw new RuntimeException("Between values for " + property + " cannot be null");
+ }
+ criteria.add(new Criterion(condition, value1, value2));
+ }
+
+ public Criteria andIdIsNull() {
+ addCriterion("id is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdIsNotNull() {
+ addCriterion("id is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdEqualTo(String value) {
+ addCriterion("id =", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdNotEqualTo(String value) {
+ addCriterion("id <>", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdGreaterThan(String value) {
+ addCriterion("id >", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdGreaterThanOrEqualTo(String value) {
+ addCriterion("id >=", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdLessThan(String value) {
+ addCriterion("id <", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdLessThanOrEqualTo(String value) {
+ addCriterion("id <=", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdLike(String value) {
+ addCriterion("id like", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdNotLike(String value) {
+ addCriterion("id not like", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdIn(List<String> values) {
+ addCriterion("id in", values, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdNotIn(List<String> values) {
+ addCriterion("id not in", values, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdBetween(String value1, String value2) {
+ addCriterion("id between", value1, value2, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdNotBetween(String value1, String value2) {
+ addCriterion("id not between", value1, value2, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andNameIsNull() {
+ addCriterion("name is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andNameIsNotNull() {
+ addCriterion("name is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andNameEqualTo(String value) {
+ addCriterion("name =", value, "name");
+ return (Criteria) this;
+ }
+
+ public Criteria andNameNotEqualTo(String value) {
+ addCriterion("name <>", value, "name");
+ return (Criteria) this;
+ }
+
+ public Criteria andNameGreaterThan(String value) {
+ addCriterion("name >", value, "name");
+ return (Criteria) this;
+ }
+
+ public Criteria andNameGreaterThanOrEqualTo(String value) {
+ addCriterion("name >=", value, "name");
+ return (Criteria) this;
+ }
+
+ public Criteria andNameLessThan(String value) {
+ addCriterion("name <", value, "name");
+ return (Criteria) this;
+ }
+
+ public Criteria andNameLessThanOrEqualTo(String value) {
+ addCriterion("name <=", value, "name");
+ return (Criteria) this;
+ }
+
+ public Criteria andNameLike(String value) {
+ addCriterion("name like", value, "name");
+ return (Criteria) this;
+ }
+
+ public Criteria andNameNotLike(String value) {
+ addCriterion("name not like", value, "name");
+ return (Criteria) this;
+ }
+
+ public Criteria andNameIn(List<String> values) {
+ addCriterion("name in", values, "name");
+ return (Criteria) this;
+ }
+
+ public Criteria andNameNotIn(List<String> values) {
+ addCriterion("name not in", values, "name");
+ return (Criteria) this;
+ }
+
+ public Criteria andNameBetween(String value1, String value2) {
+ addCriterion("name between", value1, value2, "name");
+ return (Criteria) this;
+ }
+
+ public Criteria andNameNotBetween(String value1, String value2) {
+ addCriterion("name not between", value1, value2, "name");
+ return (Criteria) this;
+ }
+
+ public Criteria andLongitudeIsNull() {
+ addCriterion("longitude is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andLongitudeIsNotNull() {
+ addCriterion("longitude is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andLongitudeEqualTo(Double value) {
+ addCriterion("longitude =", value, "longitude");
+ return (Criteria) this;
+ }
+
+ public Criteria andLongitudeNotEqualTo(Double value) {
+ addCriterion("longitude <>", value, "longitude");
+ return (Criteria) this;
+ }
+
+ public Criteria andLongitudeGreaterThan(Double value) {
+ addCriterion("longitude >", value, "longitude");
+ return (Criteria) this;
+ }
+
+ public Criteria andLongitudeGreaterThanOrEqualTo(Double value) {
+ addCriterion("longitude >=", value, "longitude");
+ return (Criteria) this;
+ }
+
+ public Criteria andLongitudeLessThan(Double value) {
+ addCriterion("longitude <", value, "longitude");
+ return (Criteria) this;
+ }
+
+ public Criteria andLongitudeLessThanOrEqualTo(Double value) {
+ addCriterion("longitude <=", value, "longitude");
+ return (Criteria) this;
+ }
+
+ public Criteria andLongitudeIn(List<Double> values) {
+ addCriterion("longitude in", values, "longitude");
+ return (Criteria) this;
+ }
+
+ public Criteria andLongitudeNotIn(List<Double> values) {
+ addCriterion("longitude not in", values, "longitude");
+ return (Criteria) this;
+ }
+
+ public Criteria andLongitudeBetween(Double value1, Double value2) {
+ addCriterion("longitude between", value1, value2, "longitude");
+ return (Criteria) this;
+ }
+
+ public Criteria andLongitudeNotBetween(Double value1, Double value2) {
+ addCriterion("longitude not between", value1, value2, "longitude");
+ return (Criteria) this;
+ }
+
+ public Criteria andLatitudeIsNull() {
+ addCriterion("latitude is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andLatitudeIsNotNull() {
+ addCriterion("latitude is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andLatitudeEqualTo(Double value) {
+ addCriterion("latitude =", value, "latitude");
+ return (Criteria) this;
+ }
+
+ public Criteria andLatitudeNotEqualTo(Double value) {
+ addCriterion("latitude <>", value, "latitude");
+ return (Criteria) this;
+ }
+
+ public Criteria andLatitudeGreaterThan(Double value) {
+ addCriterion("latitude >", value, "latitude");
+ return (Criteria) this;
+ }
+
+ public Criteria andLatitudeGreaterThanOrEqualTo(Double value) {
+ addCriterion("latitude >=", value, "latitude");
+ return (Criteria) this;
+ }
+
+ public Criteria andLatitudeLessThan(Double value) {
+ addCriterion("latitude <", value, "latitude");
+ return (Criteria) this;
+ }
+
+ public Criteria andLatitudeLessThanOrEqualTo(Double value) {
+ addCriterion("latitude <=", value, "latitude");
+ return (Criteria) this;
+ }
+
+ public Criteria andLatitudeIn(List<Double> values) {
+ addCriterion("latitude in", values, "latitude");
+ return (Criteria) this;
+ }
+
+ public Criteria andLatitudeNotIn(List<Double> values) {
+ addCriterion("latitude not in", values, "latitude");
+ return (Criteria) this;
+ }
+
+ public Criteria andLatitudeBetween(Double value1, Double value2) {
+ addCriterion("latitude between", value1, value2, "latitude");
+ return (Criteria) this;
+ }
+
+ public Criteria andLatitudeNotBetween(Double value1, Double value2) {
+ addCriterion("latitude not between", value1, value2, "latitude");
+ return (Criteria) this;
+ }
+
+ public Criteria andProvincecodeIsNull() {
+ addCriterion("provincecode is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andProvincecodeIsNotNull() {
+ addCriterion("provincecode is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andProvincecodeEqualTo(String value) {
+ addCriterion("provincecode =", value, "provincecode");
+ return (Criteria) this;
+ }
+
+ public Criteria andProvincecodeNotEqualTo(String value) {
+ addCriterion("provincecode <>", value, "provincecode");
+ return (Criteria) this;
+ }
+
+ public Criteria andProvincecodeGreaterThan(String value) {
+ addCriterion("provincecode >", value, "provincecode");
+ return (Criteria) this;
+ }
+
+ public Criteria andProvincecodeGreaterThanOrEqualTo(String value) {
+ addCriterion("provincecode >=", value, "provincecode");
+ return (Criteria) this;
+ }
+
+ public Criteria andProvincecodeLessThan(String value) {
+ addCriterion("provincecode <", value, "provincecode");
+ return (Criteria) this;
+ }
+
+ public Criteria andProvincecodeLessThanOrEqualTo(String value) {
+ addCriterion("provincecode <=", value, "provincecode");
+ return (Criteria) this;
+ }
+
+ public Criteria andProvincecodeLike(String value) {
+ addCriterion("provincecode like", value, "provincecode");
+ return (Criteria) this;
+ }
+
+ public Criteria andProvincecodeNotLike(String value) {
+ addCriterion("provincecode not like", value, "provincecode");
+ return (Criteria) this;
+ }
+
+ public Criteria andProvincecodeIn(List<String> values) {
+ addCriterion("provincecode in", values, "provincecode");
+ return (Criteria) this;
+ }
+
+ public Criteria andProvincecodeNotIn(List<String> values) {
+ addCriterion("provincecode not in", values, "provincecode");
+ return (Criteria) this;
+ }
+
+ public Criteria andProvincecodeBetween(String value1, String value2) {
+ addCriterion("provincecode between", value1, value2, "provincecode");
+ return (Criteria) this;
+ }
+
+ public Criteria andProvincecodeNotBetween(String value1, String value2) {
+ addCriterion("provincecode not between", value1, value2, "provincecode");
+ return (Criteria) this;
+ }
+
+ public Criteria andCitycodeIsNull() {
+ addCriterion("citycode is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andCitycodeIsNotNull() {
+ addCriterion("citycode is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andCitycodeEqualTo(String value) {
+ addCriterion("citycode =", value, "citycode");
+ return (Criteria) this;
+ }
+
+ public Criteria andCitycodeNotEqualTo(String value) {
+ addCriterion("citycode <>", value, "citycode");
+ return (Criteria) this;
+ }
+
+ public Criteria andCitycodeGreaterThan(String value) {
+ addCriterion("citycode >", value, "citycode");
+ return (Criteria) this;
+ }
+
+ public Criteria andCitycodeGreaterThanOrEqualTo(String value) {
+ addCriterion("citycode >=", value, "citycode");
+ return (Criteria) this;
+ }
+
+ public Criteria andCitycodeLessThan(String value) {
+ addCriterion("citycode <", value, "citycode");
+ return (Criteria) this;
+ }
+
+ public Criteria andCitycodeLessThanOrEqualTo(String value) {
+ addCriterion("citycode <=", value, "citycode");
+ return (Criteria) this;
+ }
+
+ public Criteria andCitycodeLike(String value) {
+ addCriterion("citycode like", value, "citycode");
+ return (Criteria) this;
+ }
+
+ public Criteria andCitycodeNotLike(String value) {
+ addCriterion("citycode not like", value, "citycode");
+ return (Criteria) this;
+ }
+
+ public Criteria andCitycodeIn(List<String> values) {
+ addCriterion("citycode in", values, "citycode");
+ return (Criteria) this;
+ }
+
+ public Criteria andCitycodeNotIn(List<String> values) {
+ addCriterion("citycode not in", values, "citycode");
+ return (Criteria) this;
+ }
+
+ public Criteria andCitycodeBetween(String value1, String value2) {
+ addCriterion("citycode between", value1, value2, "citycode");
+ return (Criteria) this;
+ }
+
+ public Criteria andCitycodeNotBetween(String value1, String value2) {
+ addCriterion("citycode not between", value1, value2, "citycode");
+ return (Criteria) this;
+ }
+
+ public Criteria andAreacodeIsNull() {
+ addCriterion("areacode is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andAreacodeIsNotNull() {
+ addCriterion("areacode is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andAreacodeEqualTo(String value) {
+ addCriterion("areacode =", value, "areacode");
+ return (Criteria) this;
+ }
+
+ public Criteria andAreacodeNotEqualTo(String value) {
+ addCriterion("areacode <>", value, "areacode");
+ return (Criteria) this;
+ }
+
+ public Criteria andAreacodeGreaterThan(String value) {
+ addCriterion("areacode >", value, "areacode");
+ return (Criteria) this;
+ }
+
+ public Criteria andAreacodeGreaterThanOrEqualTo(String value) {
+ addCriterion("areacode >=", value, "areacode");
+ return (Criteria) this;
+ }
+
+ public Criteria andAreacodeLessThan(String value) {
+ addCriterion("areacode <", value, "areacode");
+ return (Criteria) this;
+ }
+
+ public Criteria andAreacodeLessThanOrEqualTo(String value) {
+ addCriterion("areacode <=", value, "areacode");
+ return (Criteria) this;
+ }
+
+ public Criteria andAreacodeLike(String value) {
+ addCriterion("areacode like", value, "areacode");
+ return (Criteria) this;
+ }
+
+ public Criteria andAreacodeNotLike(String value) {
+ addCriterion("areacode not like", value, "areacode");
+ return (Criteria) this;
+ }
+
+ public Criteria andAreacodeIn(List<String> values) {
+ addCriterion("areacode in", values, "areacode");
+ return (Criteria) this;
+ }
+
+ public Criteria andAreacodeNotIn(List<String> values) {
+ addCriterion("areacode not in", values, "areacode");
+ return (Criteria) this;
+ }
+
+ public Criteria andAreacodeBetween(String value1, String value2) {
+ addCriterion("areacode between", value1, value2, "areacode");
+ return (Criteria) this;
+ }
+
+ public Criteria andAreacodeNotBetween(String value1, String value2) {
+ addCriterion("areacode not between", value1, value2, "areacode");
+ return (Criteria) this;
+ }
+
+ public Criteria andAddressIsNull() {
+ addCriterion("address is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andAddressIsNotNull() {
+ addCriterion("address is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andAddressEqualTo(String value) {
+ addCriterion("address =", value, "address");
+ return (Criteria) this;
+ }
+
+ public Criteria andAddressNotEqualTo(String value) {
+ addCriterion("address <>", value, "address");
+ return (Criteria) this;
+ }
+
+ public Criteria andAddressGreaterThan(String value) {
+ addCriterion("address >", value, "address");
+ return (Criteria) this;
+ }
+
+ public Criteria andAddressGreaterThanOrEqualTo(String value) {
+ addCriterion("address >=", value, "address");
+ return (Criteria) this;
+ }
+
+ public Criteria andAddressLessThan(String value) {
+ addCriterion("address <", value, "address");
+ return (Criteria) this;
+ }
+
+ public Criteria andAddressLessThanOrEqualTo(String value) {
+ addCriterion("address <=", value, "address");
+ return (Criteria) this;
+ }
+
+ public Criteria andAddressLike(String value) {
+ addCriterion("address like", value, "address");
+ return (Criteria) this;
+ }
+
+ public Criteria andAddressNotLike(String value) {
+ addCriterion("address not like", value, "address");
+ return (Criteria) this;
+ }
+
+ public Criteria andAddressIn(List<String> values) {
+ addCriterion("address in", values, "address");
+ return (Criteria) this;
+ }
+
+ public Criteria andAddressNotIn(List<String> values) {
+ addCriterion("address not in", values, "address");
+ return (Criteria) this;
+ }
+
+ public Criteria andAddressBetween(String value1, String value2) {
+ addCriterion("address between", value1, value2, "address");
+ return (Criteria) this;
+ }
+
+ public Criteria andAddressNotBetween(String value1, String value2) {
+ addCriterion("address not between", value1, value2, "address");
+ return (Criteria) this;
+ }
+
+ public Criteria andRepairmanIsNull() {
+ addCriterion("repairman is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andRepairmanIsNotNull() {
+ addCriterion("repairman is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andRepairmanEqualTo(String value) {
+ addCriterion("repairman =", value, "repairman");
+ return (Criteria) this;
+ }
+
+ public Criteria andRepairmanNotEqualTo(String value) {
+ addCriterion("repairman <>", value, "repairman");
+ return (Criteria) this;
+ }
+
+ public Criteria andRepairmanGreaterThan(String value) {
+ addCriterion("repairman >", value, "repairman");
+ return (Criteria) this;
+ }
+
+ public Criteria andRepairmanGreaterThanOrEqualTo(String value) {
+ addCriterion("repairman >=", value, "repairman");
+ return (Criteria) this;
+ }
+
+ public Criteria andRepairmanLessThan(String value) {
+ addCriterion("repairman <", value, "repairman");
+ return (Criteria) this;
+ }
+
+ public Criteria andRepairmanLessThanOrEqualTo(String value) {
+ addCriterion("repairman <=", value, "repairman");
+ return (Criteria) this;
+ }
+
+ public Criteria andRepairmanLike(String value) {
+ addCriterion("repairman like", value, "repairman");
+ return (Criteria) this;
+ }
+
+ public Criteria andRepairmanNotLike(String value) {
+ addCriterion("repairman not like", value, "repairman");
+ return (Criteria) this;
+ }
+
+ public Criteria andRepairmanIn(List<String> values) {
+ addCriterion("repairman in", values, "repairman");
+ return (Criteria) this;
+ }
+
+ public Criteria andRepairmanNotIn(List<String> values) {
+ addCriterion("repairman not in", values, "repairman");
+ return (Criteria) this;
+ }
+
+ public Criteria andRepairmanBetween(String value1, String value2) {
+ addCriterion("repairman between", value1, value2, "repairman");
+ return (Criteria) this;
+ }
+
+ public Criteria andRepairmanNotBetween(String value1, String value2) {
+ addCriterion("repairman not between", value1, value2, "repairman");
+ return (Criteria) this;
+ }
+
+ public Criteria andRegionDescriptionIsNull() {
+ addCriterion("region_description is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andRegionDescriptionIsNotNull() {
+ addCriterion("region_description is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andRegionDescriptionEqualTo(String value) {
+ addCriterion("region_description =", value, "regionDescription");
+ return (Criteria) this;
+ }
+
+ public Criteria andRegionDescriptionNotEqualTo(String value) {
+ addCriterion("region_description <>", value, "regionDescription");
+ return (Criteria) this;
+ }
+
+ public Criteria andRegionDescriptionGreaterThan(String value) {
+ addCriterion("region_description >", value, "regionDescription");
+ return (Criteria) this;
+ }
+
+ public Criteria andRegionDescriptionGreaterThanOrEqualTo(String value) {
+ addCriterion("region_description >=", value, "regionDescription");
+ return (Criteria) this;
+ }
+
+ public Criteria andRegionDescriptionLessThan(String value) {
+ addCriterion("region_description <", value, "regionDescription");
+ return (Criteria) this;
+ }
+
+ public Criteria andRegionDescriptionLessThanOrEqualTo(String value) {
+ addCriterion("region_description <=", value, "regionDescription");
+ return (Criteria) this;
+ }
+
+ public Criteria andRegionDescriptionLike(String value) {
+ addCriterion("region_description like", value, "regionDescription");
+ return (Criteria) this;
+ }
+
+ public Criteria andRegionDescriptionNotLike(String value) {
+ addCriterion("region_description not like", value, "regionDescription");
+ return (Criteria) this;
+ }
+
+ public Criteria andRegionDescriptionIn(List<String> values) {
+ addCriterion("region_description in", values, "regionDescription");
+ return (Criteria) this;
+ }
+
+ public Criteria andRegionDescriptionNotIn(List<String> values) {
+ addCriterion("region_description not in", values, "regionDescription");
+ return (Criteria) this;
+ }
+
+ public Criteria andRegionDescriptionBetween(String value1, String value2) {
+ addCriterion("region_description between", value1, value2, "regionDescription");
+ return (Criteria) this;
+ }
+
+ public Criteria andRegionDescriptionNotBetween(String value1, String value2) {
+ addCriterion("region_description not between", value1, value2, "regionDescription");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateTimeIsNull() {
+ addCriterion("create_time is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateTimeIsNotNull() {
+ addCriterion("create_time is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateTimeEqualTo(Date value) {
+ addCriterion("create_time =", value, "createTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateTimeNotEqualTo(Date value) {
+ addCriterion("create_time <>", value, "createTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateTimeGreaterThan(Date value) {
+ addCriterion("create_time >", value, "createTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+ addCriterion("create_time >=", value, "createTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateTimeLessThan(Date value) {
+ addCriterion("create_time <", value, "createTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+ addCriterion("create_time <=", value, "createTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateTimeIn(List<Date> values) {
+ addCriterion("create_time in", values, "createTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateTimeNotIn(List<Date> values) {
+ addCriterion("create_time not in", values, "createTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateTimeBetween(Date value1, Date value2) {
+ addCriterion("create_time between", value1, value2, "createTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+ addCriterion("create_time not between", value1, value2, "createTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andOwnerIsNull() {
+ addCriterion("owner is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andOwnerIsNotNull() {
+ addCriterion("owner is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andOwnerEqualTo(String value) {
+ addCriterion("owner =", value, "owner");
+ return (Criteria) this;
+ }
+
+ public Criteria andOwnerNotEqualTo(String value) {
+ addCriterion("owner <>", value, "owner");
+ return (Criteria) this;
+ }
+
+ public Criteria andOwnerGreaterThan(String value) {
+ addCriterion("owner >", value, "owner");
+ return (Criteria) this;
+ }
+
+ public Criteria andOwnerGreaterThanOrEqualTo(String value) {
+ addCriterion("owner >=", value, "owner");
+ return (Criteria) this;
+ }
+
+ public Criteria andOwnerLessThan(String value) {
+ addCriterion("owner <", value, "owner");
+ return (Criteria) this;
+ }
+
+ public Criteria andOwnerLessThanOrEqualTo(String value) {
+ addCriterion("owner <=", value, "owner");
+ return (Criteria) this;
+ }
+
+ public Criteria andOwnerLike(String value) {
+ addCriterion("owner like", value, "owner");
+ return (Criteria) this;
+ }
+
+ public Criteria andOwnerNotLike(String value) {
+ addCriterion("owner not like", value, "owner");
+ return (Criteria) this;
+ }
+
+ public Criteria andOwnerIn(List<String> values) {
+ addCriterion("owner in", values, "owner");
+ return (Criteria) this;
+ }
+
+ public Criteria andOwnerNotIn(List<String> values) {
+ addCriterion("owner not in", values, "owner");
+ return (Criteria) this;
+ }
+
+ public Criteria andOwnerBetween(String value1, String value2) {
+ addCriterion("owner between", value1, value2, "owner");
+ return (Criteria) this;
+ }
+
+ public Criteria andOwnerNotBetween(String value1, String value2) {
+ addCriterion("owner not between", value1, value2, "owner");
+ return (Criteria) this;
+ }
+ }
+
+ public static class Criteria extends GeneratedCriteria {
+
+ protected Criteria() {
+ super();
+ }
+ }
+
+ public static class Criterion {
+ private String condition;
+
+ private Object value;
+
+ private Object secondValue;
+
+ private boolean noValue;
+
+ private boolean singleValue;
+
+ private boolean betweenValue;
+
+ private boolean listValue;
+
+ private String typeHandler;
+
+ public String getCondition() {
+ return condition;
+ }
+
+ public Object getValue() {
+ return value;
+ }
+
+ public Object getSecondValue() {
+ return secondValue;
+ }
+
+ public boolean isNoValue() {
+ return noValue;
+ }
+
+ public boolean isSingleValue() {
+ return singleValue;
+ }
+
+ public boolean isBetweenValue() {
+ return betweenValue;
+ }
+
+ public boolean isListValue() {
+ return listValue;
+ }
+
+ public String getTypeHandler() {
+ return typeHandler;
+ }
+
+ protected Criterion(String condition) {
+ super();
+ this.condition = condition;
+ this.typeHandler = null;
+ this.noValue = true;
+ }
+
+ protected Criterion(String condition, Object value, String typeHandler) {
+ super();
+ this.condition = condition;
+ this.value = value;
+ this.typeHandler = typeHandler;
+ if (value instanceof List<?>) {
+ this.listValue = true;
+ } else {
+ this.singleValue = true;
+ }
+ }
+
+ protected Criterion(String condition, Object value) {
+ this(condition, value, null);
+ }
+
+ protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+ super();
+ this.condition = condition;
+ this.value = value;
+ this.secondValue = secondValue;
+ this.typeHandler = typeHandler;
+ this.betweenValue = true;
+ }
+
+ protected Criterion(String condition, Object value, Object secondValue) {
+ this(condition, value, secondValue, null);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/moral/monitor/entity/Sensor.java b/src/main/java/com/moral/monitor/entity/Sensor.java
index 796f42a..adae357 100644
--- a/src/main/java/com/moral/monitor/entity/Sensor.java
+++ b/src/main/java/com/moral/monitor/entity/Sensor.java
@@ -1,83 +1,32 @@
package com.moral.monitor.entity;
-/**���������������
- * Created by a on 2017/4/10.
- */
public class Sensor {
- private int id;
+ private Integer id;
+
private String type;
+
private String sensor;
- private String sensor_desc;
- private String mac_key;
+
+ private String sensorDesc;
+
+ private String macKey;
+
private String upper;
+
private String lower;
+
private String units;
- private int digit;
+
+ private Integer digit;
+
private String ver;
-
- public int getId() {
+ public Integer getId() {
return id;
}
- public void setId(int id) {
+ public void setId(Integer id) {
this.id = id;
- }
-
- public String getSensor() {
- return sensor;
- }
-
- public void setSensor(String sensor) {
- this.sensor = sensor;
- }
-
- public String getSensor_desc() {
- return sensor_desc;
- }
-
- public void setSensor_desc(String sensor_desc) {
- this.sensor_desc = sensor_desc;
- }
-
- public String getMac_key() {
- return mac_key;
- }
-
- public void setMac_key(String mac_key) {
- this.mac_key = mac_key;
- }
-
- public String getUpper() {
- return upper;
- }
-
- public void setUpper(String upper) {
- this.upper = upper;
- }
-
- public String getLower() {
- return lower;
- }
-
- public void setLower(String lower) {
- this.lower = lower;
- }
-
- public String getUnits() {
- return units;
- }
-
- public void setUnits(String units) {
- this.units = units;
- }
-
- public int getDigit() {
- return digit;
- }
-
- public void setDigit(int digit) {
- this.digit = digit;
}
public String getType() {
@@ -85,7 +34,63 @@
}
public void setType(String type) {
- this.type = type;
+ this.type = type == null ? null : type.trim();
+ }
+
+ public String getSensor() {
+ return sensor;
+ }
+
+ public void setSensor(String sensor) {
+ this.sensor = sensor == null ? null : sensor.trim();
+ }
+
+ public String getSensorDesc() {
+ return sensorDesc;
+ }
+
+ public void setSensorDesc(String sensorDesc) {
+ this.sensorDesc = sensorDesc == null ? null : sensorDesc.trim();
+ }
+
+ public String getMacKey() {
+ return macKey;
+ }
+
+ public void setMacKey(String macKey) {
+ this.macKey = macKey == null ? null : macKey.trim();
+ }
+
+ public String getUpper() {
+ return upper;
+ }
+
+ public void setUpper(String upper) {
+ this.upper = upper == null ? null : upper.trim();
+ }
+
+ public String getLower() {
+ return lower;
+ }
+
+ public void setLower(String lower) {
+ this.lower = lower == null ? null : lower.trim();
+ }
+
+ public String getUnits() {
+ return units;
+ }
+
+ public void setUnits(String units) {
+ this.units = units == null ? null : units.trim();
+ }
+
+ public Integer getDigit() {
+ return digit;
+ }
+
+ public void setDigit(Integer digit) {
+ this.digit = digit;
}
public String getVer() {
@@ -93,6 +98,6 @@
}
public void setVer(String ver) {
- this.ver = ver;
+ this.ver = ver == null ? null : ver.trim();
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/moral/monitor/entity/SensorExample.java b/src/main/java/com/moral/monitor/entity/SensorExample.java
new file mode 100644
index 0000000..5553556
--- /dev/null
+++ b/src/main/java/com/moral/monitor/entity/SensorExample.java
@@ -0,0 +1,880 @@
+package com.moral.monitor.entity;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SensorExample {
+ protected String orderByClause;
+
+ protected boolean distinct;
+
+ protected List<Criteria> oredCriteria;
+
+ public SensorExample() {
+ oredCriteria = new ArrayList<Criteria>();
+ }
+
+ public void setOrderByClause(String orderByClause) {
+ this.orderByClause = orderByClause;
+ }
+
+ public String getOrderByClause() {
+ return orderByClause;
+ }
+
+ public void setDistinct(boolean distinct) {
+ this.distinct = distinct;
+ }
+
+ public boolean isDistinct() {
+ return distinct;
+ }
+
+ public List<Criteria> getOredCriteria() {
+ return oredCriteria;
+ }
+
+ public void or(Criteria criteria) {
+ oredCriteria.add(criteria);
+ }
+
+ public Criteria or() {
+ Criteria criteria = createCriteriaInternal();
+ oredCriteria.add(criteria);
+ return criteria;
+ }
+
+ public Criteria createCriteria() {
+ Criteria criteria = createCriteriaInternal();
+ if (oredCriteria.size() == 0) {
+ oredCriteria.add(criteria);
+ }
+ return criteria;
+ }
+
+ protected Criteria createCriteriaInternal() {
+ Criteria criteria = new Criteria();
+ return criteria;
+ }
+
+ public void clear() {
+ oredCriteria.clear();
+ orderByClause = null;
+ distinct = false;
+ }
+
+ protected abstract static class GeneratedCriteria {
+ protected List<Criterion> criteria;
+
+ protected GeneratedCriteria() {
+ super();
+ criteria = new ArrayList<Criterion>();
+ }
+
+ public boolean isValid() {
+ return criteria.size() > 0;
+ }
+
+ public List<Criterion> getAllCriteria() {
+ return criteria;
+ }
+
+ public List<Criterion> getCriteria() {
+ return criteria;
+ }
+
+ protected void addCriterion(String condition) {
+ if (condition == null) {
+ throw new RuntimeException("Value for condition cannot be null");
+ }
+ criteria.add(new Criterion(condition));
+ }
+
+ protected void addCriterion(String condition, Object value, String property) {
+ if (value == null) {
+ throw new RuntimeException("Value for " + property + " cannot be null");
+ }
+ criteria.add(new Criterion(condition, value));
+ }
+
+ protected void addCriterion(String condition, Object value1, Object value2, String property) {
+ if (value1 == null || value2 == null) {
+ throw new RuntimeException("Between values for " + property + " cannot be null");
+ }
+ criteria.add(new Criterion(condition, value1, value2));
+ }
+
+ public Criteria andIdIsNull() {
+ addCriterion("id is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdIsNotNull() {
+ addCriterion("id is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdEqualTo(Integer value) {
+ addCriterion("id =", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdNotEqualTo(Integer value) {
+ addCriterion("id <>", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdGreaterThan(Integer value) {
+ addCriterion("id >", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+ addCriterion("id >=", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdLessThan(Integer value) {
+ addCriterion("id <", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdLessThanOrEqualTo(Integer value) {
+ addCriterion("id <=", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdIn(List<Integer> values) {
+ addCriterion("id in", values, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdNotIn(List<Integer> values) {
+ addCriterion("id not in", values, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdBetween(Integer value1, Integer value2) {
+ addCriterion("id between", value1, value2, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdNotBetween(Integer value1, Integer value2) {
+ addCriterion("id not between", value1, value2, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andTypeIsNull() {
+ addCriterion("type is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andTypeIsNotNull() {
+ addCriterion("type is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andTypeEqualTo(String value) {
+ addCriterion("type =", value, "type");
+ return (Criteria) this;
+ }
+
+ public Criteria andTypeNotEqualTo(String value) {
+ addCriterion("type <>", value, "type");
+ return (Criteria) this;
+ }
+
+ public Criteria andTypeGreaterThan(String value) {
+ addCriterion("type >", value, "type");
+ return (Criteria) this;
+ }
+
+ public Criteria andTypeGreaterThanOrEqualTo(String value) {
+ addCriterion("type >=", value, "type");
+ return (Criteria) this;
+ }
+
+ public Criteria andTypeLessThan(String value) {
+ addCriterion("type <", value, "type");
+ return (Criteria) this;
+ }
+
+ public Criteria andTypeLessThanOrEqualTo(String value) {
+ addCriterion("type <=", value, "type");
+ return (Criteria) this;
+ }
+
+ public Criteria andTypeLike(String value) {
+ addCriterion("type like", value, "type");
+ return (Criteria) this;
+ }
+
+ public Criteria andTypeNotLike(String value) {
+ addCriterion("type not like", value, "type");
+ return (Criteria) this;
+ }
+
+ public Criteria andTypeIn(List<String> values) {
+ addCriterion("type in", values, "type");
+ return (Criteria) this;
+ }
+
+ public Criteria andTypeNotIn(List<String> values) {
+ addCriterion("type not in", values, "type");
+ return (Criteria) this;
+ }
+
+ public Criteria andTypeBetween(String value1, String value2) {
+ addCriterion("type between", value1, value2, "type");
+ return (Criteria) this;
+ }
+
+ public Criteria andTypeNotBetween(String value1, String value2) {
+ addCriterion("type not between", value1, value2, "type");
+ return (Criteria) this;
+ }
+
+ public Criteria andSensorIsNull() {
+ addCriterion("sensor is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andSensorIsNotNull() {
+ addCriterion("sensor is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andSensorEqualTo(String value) {
+ addCriterion("sensor =", value, "sensor");
+ return (Criteria) this;
+ }
+
+ public Criteria andSensorNotEqualTo(String value) {
+ addCriterion("sensor <>", value, "sensor");
+ return (Criteria) this;
+ }
+
+ public Criteria andSensorGreaterThan(String value) {
+ addCriterion("sensor >", value, "sensor");
+ return (Criteria) this;
+ }
+
+ public Criteria andSensorGreaterThanOrEqualTo(String value) {
+ addCriterion("sensor >=", value, "sensor");
+ return (Criteria) this;
+ }
+
+ public Criteria andSensorLessThan(String value) {
+ addCriterion("sensor <", value, "sensor");
+ return (Criteria) this;
+ }
+
+ public Criteria andSensorLessThanOrEqualTo(String value) {
+ addCriterion("sensor <=", value, "sensor");
+ return (Criteria) this;
+ }
+
+ public Criteria andSensorLike(String value) {
+ addCriterion("sensor like", value, "sensor");
+ return (Criteria) this;
+ }
+
+ public Criteria andSensorNotLike(String value) {
+ addCriterion("sensor not like", value, "sensor");
+ return (Criteria) this;
+ }
+
+ public Criteria andSensorIn(List<String> values) {
+ addCriterion("sensor in", values, "sensor");
+ return (Criteria) this;
+ }
+
+ public Criteria andSensorNotIn(List<String> values) {
+ addCriterion("sensor not in", values, "sensor");
+ return (Criteria) this;
+ }
+
+ public Criteria andSensorBetween(String value1, String value2) {
+ addCriterion("sensor between", value1, value2, "sensor");
+ return (Criteria) this;
+ }
+
+ public Criteria andSensorNotBetween(String value1, String value2) {
+ addCriterion("sensor not between", value1, value2, "sensor");
+ return (Criteria) this;
+ }
+
+ public Criteria andSensorDescIsNull() {
+ addCriterion("sensor_desc is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andSensorDescIsNotNull() {
+ addCriterion("sensor_desc is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andSensorDescEqualTo(String value) {
+ addCriterion("sensor_desc =", value, "sensorDesc");
+ return (Criteria) this;
+ }
+
+ public Criteria andSensorDescNotEqualTo(String value) {
+ addCriterion("sensor_desc <>", value, "sensorDesc");
+ return (Criteria) this;
+ }
+
+ public Criteria andSensorDescGreaterThan(String value) {
+ addCriterion("sensor_desc >", value, "sensorDesc");
+ return (Criteria) this;
+ }
+
+ public Criteria andSensorDescGreaterThanOrEqualTo(String value) {
+ addCriterion("sensor_desc >=", value, "sensorDesc");
+ return (Criteria) this;
+ }
+
+ public Criteria andSensorDescLessThan(String value) {
+ addCriterion("sensor_desc <", value, "sensorDesc");
+ return (Criteria) this;
+ }
+
+ public Criteria andSensorDescLessThanOrEqualTo(String value) {
+ addCriterion("sensor_desc <=", value, "sensorDesc");
+ return (Criteria) this;
+ }
+
+ public Criteria andSensorDescLike(String value) {
+ addCriterion("sensor_desc like", value, "sensorDesc");
+ return (Criteria) this;
+ }
+
+ public Criteria andSensorDescNotLike(String value) {
+ addCriterion("sensor_desc not like", value, "sensorDesc");
+ return (Criteria) this;
+ }
+
+ public Criteria andSensorDescIn(List<String> values) {
+ addCriterion("sensor_desc in", values, "sensorDesc");
+ return (Criteria) this;
+ }
+
+ public Criteria andSensorDescNotIn(List<String> values) {
+ addCriterion("sensor_desc not in", values, "sensorDesc");
+ return (Criteria) this;
+ }
+
+ public Criteria andSensorDescBetween(String value1, String value2) {
+ addCriterion("sensor_desc between", value1, value2, "sensorDesc");
+ return (Criteria) this;
+ }
+
+ public Criteria andSensorDescNotBetween(String value1, String value2) {
+ addCriterion("sensor_desc not between", value1, value2, "sensorDesc");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacKeyIsNull() {
+ addCriterion("mac_key is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacKeyIsNotNull() {
+ addCriterion("mac_key is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacKeyEqualTo(String value) {
+ addCriterion("mac_key =", value, "macKey");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacKeyNotEqualTo(String value) {
+ addCriterion("mac_key <>", value, "macKey");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacKeyGreaterThan(String value) {
+ addCriterion("mac_key >", value, "macKey");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacKeyGreaterThanOrEqualTo(String value) {
+ addCriterion("mac_key >=", value, "macKey");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacKeyLessThan(String value) {
+ addCriterion("mac_key <", value, "macKey");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacKeyLessThanOrEqualTo(String value) {
+ addCriterion("mac_key <=", value, "macKey");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacKeyLike(String value) {
+ addCriterion("mac_key like", value, "macKey");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacKeyNotLike(String value) {
+ addCriterion("mac_key not like", value, "macKey");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacKeyIn(List<String> values) {
+ addCriterion("mac_key in", values, "macKey");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacKeyNotIn(List<String> values) {
+ addCriterion("mac_key not in", values, "macKey");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacKeyBetween(String value1, String value2) {
+ addCriterion("mac_key between", value1, value2, "macKey");
+ return (Criteria) this;
+ }
+
+ public Criteria andMacKeyNotBetween(String value1, String value2) {
+ addCriterion("mac_key not between", value1, value2, "macKey");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpperIsNull() {
+ addCriterion("upper is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpperIsNotNull() {
+ addCriterion("upper is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpperEqualTo(String value) {
+ addCriterion("upper =", value, "upper");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpperNotEqualTo(String value) {
+ addCriterion("upper <>", value, "upper");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpperGreaterThan(String value) {
+ addCriterion("upper >", value, "upper");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpperGreaterThanOrEqualTo(String value) {
+ addCriterion("upper >=", value, "upper");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpperLessThan(String value) {
+ addCriterion("upper <", value, "upper");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpperLessThanOrEqualTo(String value) {
+ addCriterion("upper <=", value, "upper");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpperLike(String value) {
+ addCriterion("upper like", value, "upper");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpperNotLike(String value) {
+ addCriterion("upper not like", value, "upper");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpperIn(List<String> values) {
+ addCriterion("upper in", values, "upper");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpperNotIn(List<String> values) {
+ addCriterion("upper not in", values, "upper");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpperBetween(String value1, String value2) {
+ addCriterion("upper between", value1, value2, "upper");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpperNotBetween(String value1, String value2) {
+ addCriterion("upper not between", value1, value2, "upper");
+ return (Criteria) this;
+ }
+
+ public Criteria andLowerIsNull() {
+ addCriterion("lower is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andLowerIsNotNull() {
+ addCriterion("lower is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andLowerEqualTo(String value) {
+ addCriterion("lower =", value, "lower");
+ return (Criteria) this;
+ }
+
+ public Criteria andLowerNotEqualTo(String value) {
+ addCriterion("lower <>", value, "lower");
+ return (Criteria) this;
+ }
+
+ public Criteria andLowerGreaterThan(String value) {
+ addCriterion("lower >", value, "lower");
+ return (Criteria) this;
+ }
+
+ public Criteria andLowerGreaterThanOrEqualTo(String value) {
+ addCriterion("lower >=", value, "lower");
+ return (Criteria) this;
+ }
+
+ public Criteria andLowerLessThan(String value) {
+ addCriterion("lower <", value, "lower");
+ return (Criteria) this;
+ }
+
+ public Criteria andLowerLessThanOrEqualTo(String value) {
+ addCriterion("lower <=", value, "lower");
+ return (Criteria) this;
+ }
+
+ public Criteria andLowerLike(String value) {
+ addCriterion("lower like", value, "lower");
+ return (Criteria) this;
+ }
+
+ public Criteria andLowerNotLike(String value) {
+ addCriterion("lower not like", value, "lower");
+ return (Criteria) this;
+ }
+
+ public Criteria andLowerIn(List<String> values) {
+ addCriterion("lower in", values, "lower");
+ return (Criteria) this;
+ }
+
+ public Criteria andLowerNotIn(List<String> values) {
+ addCriterion("lower not in", values, "lower");
+ return (Criteria) this;
+ }
+
+ public Criteria andLowerBetween(String value1, String value2) {
+ addCriterion("lower between", value1, value2, "lower");
+ return (Criteria) this;
+ }
+
+ public Criteria andLowerNotBetween(String value1, String value2) {
+ addCriterion("lower not between", value1, value2, "lower");
+ return (Criteria) this;
+ }
+
+ public Criteria andUnitsIsNull() {
+ addCriterion("units is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andUnitsIsNotNull() {
+ addCriterion("units is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andUnitsEqualTo(String value) {
+ addCriterion("units =", value, "units");
+ return (Criteria) this;
+ }
+
+ public Criteria andUnitsNotEqualTo(String value) {
+ addCriterion("units <>", value, "units");
+ return (Criteria) this;
+ }
+
+ public Criteria andUnitsGreaterThan(String value) {
+ addCriterion("units >", value, "units");
+ return (Criteria) this;
+ }
+
+ public Criteria andUnitsGreaterThanOrEqualTo(String value) {
+ addCriterion("units >=", value, "units");
+ return (Criteria) this;
+ }
+
+ public Criteria andUnitsLessThan(String value) {
+ addCriterion("units <", value, "units");
+ return (Criteria) this;
+ }
+
+ public Criteria andUnitsLessThanOrEqualTo(String value) {
+ addCriterion("units <=", value, "units");
+ return (Criteria) this;
+ }
+
+ public Criteria andUnitsLike(String value) {
+ addCriterion("units like", value, "units");
+ return (Criteria) this;
+ }
+
+ public Criteria andUnitsNotLike(String value) {
+ addCriterion("units not like", value, "units");
+ return (Criteria) this;
+ }
+
+ public Criteria andUnitsIn(List<String> values) {
+ addCriterion("units in", values, "units");
+ return (Criteria) this;
+ }
+
+ public Criteria andUnitsNotIn(List<String> values) {
+ addCriterion("units not in", values, "units");
+ return (Criteria) this;
+ }
+
+ public Criteria andUnitsBetween(String value1, String value2) {
+ addCriterion("units between", value1, value2, "units");
+ return (Criteria) this;
+ }
+
+ public Criteria andUnitsNotBetween(String value1, String value2) {
+ addCriterion("units not between", value1, value2, "units");
+ return (Criteria) this;
+ }
+
+ public Criteria andDigitIsNull() {
+ addCriterion("digit is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andDigitIsNotNull() {
+ addCriterion("digit is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andDigitEqualTo(Integer value) {
+ addCriterion("digit =", value, "digit");
+ return (Criteria) this;
+ }
+
+ public Criteria andDigitNotEqualTo(Integer value) {
+ addCriterion("digit <>", value, "digit");
+ return (Criteria) this;
+ }
+
+ public Criteria andDigitGreaterThan(Integer value) {
+ addCriterion("digit >", value, "digit");
+ return (Criteria) this;
+ }
+
+ public Criteria andDigitGreaterThanOrEqualTo(Integer value) {
+ addCriterion("digit >=", value, "digit");
+ return (Criteria) this;
+ }
+
+ public Criteria andDigitLessThan(Integer value) {
+ addCriterion("digit <", value, "digit");
+ return (Criteria) this;
+ }
+
+ public Criteria andDigitLessThanOrEqualTo(Integer value) {
+ addCriterion("digit <=", value, "digit");
+ return (Criteria) this;
+ }
+
+ public Criteria andDigitIn(List<Integer> values) {
+ addCriterion("digit in", values, "digit");
+ return (Criteria) this;
+ }
+
+ public Criteria andDigitNotIn(List<Integer> values) {
+ addCriterion("digit not in", values, "digit");
+ return (Criteria) this;
+ }
+
+ public Criteria andDigitBetween(Integer value1, Integer value2) {
+ addCriterion("digit between", value1, value2, "digit");
+ return (Criteria) this;
+ }
+
+ public Criteria andDigitNotBetween(Integer value1, Integer value2) {
+ addCriterion("digit not between", value1, value2, "digit");
+ return (Criteria) this;
+ }
+
+ public Criteria andVerIsNull() {
+ addCriterion("ver is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andVerIsNotNull() {
+ addCriterion("ver is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andVerEqualTo(String value) {
+ addCriterion("ver =", value, "ver");
+ return (Criteria) this;
+ }
+
+ public Criteria andVerNotEqualTo(String value) {
+ addCriterion("ver <>", value, "ver");
+ return (Criteria) this;
+ }
+
+ public Criteria andVerGreaterThan(String value) {
+ addCriterion("ver >", value, "ver");
+ return (Criteria) this;
+ }
+
+ public Criteria andVerGreaterThanOrEqualTo(String value) {
+ addCriterion("ver >=", value, "ver");
+ return (Criteria) this;
+ }
+
+ public Criteria andVerLessThan(String value) {
+ addCriterion("ver <", value, "ver");
+ return (Criteria) this;
+ }
+
+ public Criteria andVerLessThanOrEqualTo(String value) {
+ addCriterion("ver <=", value, "ver");
+ return (Criteria) this;
+ }
+
+ public Criteria andVerLike(String value) {
+ addCriterion("ver like", value, "ver");
+ return (Criteria) this;
+ }
+
+ public Criteria andVerNotLike(String value) {
+ addCriterion("ver not like", value, "ver");
+ return (Criteria) this;
+ }
+
+ public Criteria andVerIn(List<String> values) {
+ addCriterion("ver in", values, "ver");
+ return (Criteria) this;
+ }
+
+ public Criteria andVerNotIn(List<String> values) {
+ addCriterion("ver not in", values, "ver");
+ return (Criteria) this;
+ }
+
+ public Criteria andVerBetween(String value1, String value2) {
+ addCriterion("ver between", value1, value2, "ver");
+ return (Criteria) this;
+ }
+
+ public Criteria andVerNotBetween(String value1, String value2) {
+ addCriterion("ver not between", value1, value2, "ver");
+ return (Criteria) this;
+ }
+ }
+
+ public static class Criteria extends GeneratedCriteria {
+
+ protected Criteria() {
+ super();
+ }
+ }
+
+ public static class Criterion {
+ private String condition;
+
+ private Object value;
+
+ private Object secondValue;
+
+ private boolean noValue;
+
+ private boolean singleValue;
+
+ private boolean betweenValue;
+
+ private boolean listValue;
+
+ private String typeHandler;
+
+ public String getCondition() {
+ return condition;
+ }
+
+ public Object getValue() {
+ return value;
+ }
+
+ public Object getSecondValue() {
+ return secondValue;
+ }
+
+ public boolean isNoValue() {
+ return noValue;
+ }
+
+ public boolean isSingleValue() {
+ return singleValue;
+ }
+
+ public boolean isBetweenValue() {
+ return betweenValue;
+ }
+
+ public boolean isListValue() {
+ return listValue;
+ }
+
+ public String getTypeHandler() {
+ return typeHandler;
+ }
+
+ protected Criterion(String condition) {
+ super();
+ this.condition = condition;
+ this.typeHandler = null;
+ this.noValue = true;
+ }
+
+ protected Criterion(String condition, Object value, String typeHandler) {
+ super();
+ this.condition = condition;
+ this.value = value;
+ this.typeHandler = typeHandler;
+ if (value instanceof List<?>) {
+ this.listValue = true;
+ } else {
+ this.singleValue = true;
+ }
+ }
+
+ protected Criterion(String condition, Object value) {
+ this(condition, value, null);
+ }
+
+ protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+ super();
+ this.condition = condition;
+ this.value = value;
+ this.secondValue = secondValue;
+ this.typeHandler = typeHandler;
+ this.betweenValue = true;
+ }
+
+ protected Criterion(String condition, Object value, Object secondValue) {
+ this(condition, value, secondValue, null);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/moral/monitor/listener/MonitorListener.java b/src/main/java/com/moral/monitor/listener/MonitorListener.java
index df7c2f5..366c523 100644
--- a/src/main/java/com/moral/monitor/listener/MonitorListener.java
+++ b/src/main/java/com/moral/monitor/listener/MonitorListener.java
@@ -258,7 +258,7 @@
List<Sensor> sensors = taskDao.selectFromsensorByver(ver);
Map<String, String> ex_sensorMap = new LinkedHashMap<String, String>();
for (Sensor sensor : sensors) {
- ex_sensorMap.put(sensor.getMac_key(), sensor.getSensor());
+ ex_sensorMap.put(sensor.getMacKey(), sensor.getSensor());
}
return ex_sensorMap;
}
diff --git a/src/main/java/com/moral/monitor/service/EquipmentService.java b/src/main/java/com/moral/monitor/service/EquipmentService.java
new file mode 100644
index 0000000..ab0d6e9
--- /dev/null
+++ b/src/main/java/com/moral/monitor/service/EquipmentService.java
@@ -0,0 +1,9 @@
+package com.moral.monitor.service;
+/**
+ * @author fengxiang
+ * @Time���2017���10���25��� ������2:22:21
+ * @version 1.0
+ */
+public interface EquipmentService {
+
+}
diff --git a/src/main/java/com/moral/monitor/service/HistoryService.java b/src/main/java/com/moral/monitor/service/HistoryService.java
new file mode 100644
index 0000000..d823884
--- /dev/null
+++ b/src/main/java/com/moral/monitor/service/HistoryService.java
@@ -0,0 +1,9 @@
+package com.moral.monitor.service;
+/**
+ * @author fengxiang
+ * @Time���2017���10���25��� ������2:23:19
+ * @version 1.0
+ */
+public interface HistoryService {
+
+}
diff --git a/src/main/java/com/moral/monitor/service/LoggerService.java b/src/main/java/com/moral/monitor/service/LoggerService.java
new file mode 100644
index 0000000..50c5ecd
--- /dev/null
+++ b/src/main/java/com/moral/monitor/service/LoggerService.java
@@ -0,0 +1,9 @@
+package com.moral.monitor.service;
+/**
+ * @author fengxiang
+ * @Time���2017���10���25��� ������2:36:22
+ * @version 1.0
+ */
+public interface LoggerService {
+
+}
diff --git a/src/main/java/com/moral/monitor/service/MgrService.java b/src/main/java/com/moral/monitor/service/MgrService.java
index cbfbe72..651a575 100644
--- a/src/main/java/com/moral/monitor/service/MgrService.java
+++ b/src/main/java/com/moral/monitor/service/MgrService.java
@@ -15,18 +15,18 @@
@Resource
MgrDao mgrDao;
- public List<MonitorPoint> randpoint(){
+ public List<Monitorpoint> randpoint(){
return mgrDao.randpoint();
}
- public List<Equipment> pointequ(String monitorpoint){
- return mgrDao.pointequ(monitorpoint);
+ public List<Equipment> pointequ(String Monitorpoint){
+ return mgrDao.pointequ(Monitorpoint);
}
public List<State> equsensorstate(String mac){return mgrDao.equsensorstate(mac);}
- public List<MonitorPoint> allpoint(){
+ public List<Monitorpoint> allpoint(){
return mgrDao.allpoint();
}
diff --git a/src/main/java/com/moral/monitor/service/MonitorPointService.java b/src/main/java/com/moral/monitor/service/MonitorPointService.java
deleted file mode 100644
index dcd899b..0000000
--- a/src/main/java/com/moral/monitor/service/MonitorPointService.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.moral.monitor.service;
-
-import com.moral.monitor.dao.MonitorPointDao;
-import com.moral.monitor.entity.MonitorPoint;
-import com.moral.monitor.entity.QueryHelper;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * Created by a on 2017/7/18.
- */
-@Service
-public class MonitorPointService {
- @Resource
- MonitorPointDao monitorPointDao;
-
- public List<MonitorPoint> allMonitorPoint(QueryHelper queryHelper){return monitorPointDao.allMonitorPoint(queryHelper);}
- public int monitorCount(QueryHelper queryHelper){return monitorPointDao.monitorCount(queryHelper);}
-
-
- public void deleteMonitor(String id){monitorPointDao.deleteMonitor(id);}
-
-
- public void addMonitorpoint(MonitorPoint monitorPoint){monitorPointDao.addMonitorpoint(monitorPoint);}
-
- public void updateMonitorpoint(MonitorPoint monitorPoint){
- monitorPointDao.updateMonitorpoint(monitorPoint);
- }
-
-
-}
-
-
diff --git a/src/main/java/com/moral/monitor/service/MonitorpointService.java b/src/main/java/com/moral/monitor/service/MonitorpointService.java
new file mode 100644
index 0000000..e4a455f
--- /dev/null
+++ b/src/main/java/com/moral/monitor/service/MonitorpointService.java
@@ -0,0 +1,28 @@
+package com.moral.monitor.service;
+
+import com.moral.monitor.entity.Monitorpoint;
+import com.moral.monitor.entity.QueryHelper;
+import org.springframework.stereotype.Service;
+import java.util.List;
+
+/**
+ * Created by a on 2017/7/18.
+ */
+@Service
+public interface MonitorpointService {
+ public List<Monitorpoint> allMonitorpoint(QueryHelper queryHelper);
+
+ public int monitorCount(QueryHelper queryHelper);
+
+
+ public void deleteMonitor(String id);
+
+
+ public void addMonitorpoint(Monitorpoint Monitorpoint);
+
+ public void updateMonitorpoint(Monitorpoint Monitorpoint);
+
+
+}
+
+
diff --git a/src/main/java/com/moral/monitor/service/impl/LoggerServiceImpl.java b/src/main/java/com/moral/monitor/service/impl/LoggerServiceImpl.java
new file mode 100644
index 0000000..ad85272
--- /dev/null
+++ b/src/main/java/com/moral/monitor/service/impl/LoggerServiceImpl.java
@@ -0,0 +1,22 @@
+package com.moral.monitor.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.moral.monitor.dao.LoggerMapper;
+import com.moral.monitor.entity.Logger;
+import com.moral.monitor.service.LoggerService;
+
+/**
+ * @author fengxiang
+ * @Time���2017���10���25��� ������2:37:55
+ * @version 1.0
+ */
+@Service
+public class LoggerServiceImpl implements LoggerService {
+ @Autowired
+ LoggerMapper loggerMapper;
+ public void inserLogger(Logger logger) {
+
+ }
+}
diff --git a/src/main/java/com/moral/monitor/service/impl/MonitorpointServiceImpl.java b/src/main/java/com/moral/monitor/service/impl/MonitorpointServiceImpl.java
new file mode 100644
index 0000000..520800b
--- /dev/null
+++ b/src/main/java/com/moral/monitor/service/impl/MonitorpointServiceImpl.java
@@ -0,0 +1,45 @@
+package com.moral.monitor.service.impl;
+
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import com.moral.monitor.dao.MonitorpointDao;
+import com.moral.monitor.entity.Monitorpoint;
+import com.moral.monitor.entity.QueryHelper;
+import com.moral.monitor.service.MonitorpointService;
+
+/**
+ * @author fengxiang
+ * @Time���2017���10���25��� ������2:24:46
+ * @version 1.0
+ */
+public class MonitorpointServiceImpl implements MonitorpointService {
+ @Resource
+ MonitorpointDao monitorpointDao;
+ public List<Monitorpoint> allMonitorpoint(QueryHelper queryHelper) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public int monitorCount(QueryHelper queryHelper) {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ public void deleteMonitor(String id) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void addMonitorpoint(Monitorpoint Monitorpoint) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void updateMonitorpoint(Monitorpoint Monitorpoint) {
+ // TODO Auto-generated method stub
+
+ }
+
+}
diff --git a/src/main/resources/application.xml b/src/main/resources/application.xml
index 8905828..fb6c70f 100644
--- a/src/main/resources/application.xml
+++ b/src/main/resources/application.xml
@@ -48,5 +48,7 @@
<import resource="database.xml"/>
<import resource="rabbitmq.xml"/>
- <import resource="quartz.xml"/>
+ <!--
+ <import resource="quartz.xml"/>
+ -->
</beans>
\ No newline at end of file
diff --git a/src/main/resources/rabbitmq.xml b/src/main/resources/rabbitmq.xml
index fafc954..737f4f6 100644
--- a/src/main/resources/rabbitmq.xml
+++ b/src/main/resources/rabbitmq.xml
@@ -8,7 +8,7 @@
<!-- rabbitMQ������ -->
<bean id="rabbitConnectionFactory" class="org.springframework.amqp.rabbit.connection.CachingConnectionFactory">
- <constructor-arg value="101.37.22.173"/>
+ <constructor-arg value="116.62.12.115"/>
<property name="username" value="guest"/>
<property name="password" value="guest"/>
<property name="channelCacheSize" value="8"/>
@@ -17,14 +17,14 @@
<rabbit:admin connection-factory="rabbitConnectionFactory"/>
- <rabbit:queue name="monitor" durable="false" exclusive="false" auto-delete="false" />
+ <rabbit:queue name="monitors_storage_data" durable="false" exclusive="false" auto-delete="true"/>
<!--<bean id="amqpMsgListener" class="com.moral.monitor.listener.MonitorListener"/>-->
<bean id="amqpMsgListener" class="com.moral.monitor.listener.Listener"/>
<rabbit:listener-container connection-factory="rabbitConnectionFactory" acknowledge="auto" >
- <rabbit:listener queues="monitor" ref="amqpMsgListener" />
+ <rabbit:listener queues="monitors_storage_data" ref="amqpMsgListener" />
</rabbit:listener-container>
<bean id="rabbitTemplate" class="org.springframework.amqp.rabbit.core.RabbitTemplate">
--
Gitblit v1.8.0