From dba72443e05e7b0a52ee85bfd9f4641aebc42c60 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Thu, 07 Dec 2017 08:58:09 +0800
Subject: [PATCH] app接口
---
src/main/resources/mapper/OperateUserMapper.xml | 289 -------
src/main/java/com/moral/common/mapper/BaseMapper.java | 29
src/main/java/com/moral/mapper/OrganizationRelationMapper.java | 6
src/main/resources/mapper/OrganizationRelationMapper.xml | 172 ----
src/main/java/com/moral/config/MapperScannerConfig.java | 26
src/main/java/com/moral/controller/MobileController.java | 71 +
src/main/java/com/moral/mapper/HistoryMapper.java | 3
src/main/java/com/moral/service/OperateUserService.java | 4
src/main/resources/mapper/AccountMapper.xml | 275 ------
src/main/java/com/moral/config/PageHelperConfig.java | 25
src/main/java/com/moral/mapper/UserMapper.java | 2
src/main/java/com/moral/service/impl/OperateUserServiceImpl.java | 37
pom.xml | 22
src/main/java/com/moral/common/util/ValidateUtil.java | 37
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 38
src/main/java/com/moral/mapper/AccountMapper.java | 6
src/main/java/com/moral/service/DeviceService.java | 6
src/main/java/com/moral/entity/OperateUser.java | 5
src/main/java/com/moral/mapper/DeviceMapper.java | 5
src/main/java/com/moral/controller/ScreenController.java | 28
src/main/resources/mapper/OrganizationMapper.xml | 320 -------
src/main/java/com/moral/service/impl/AccountServiceImpl.java | 15
src/main/java/com/moral/common/exception/ValidateException.java | 26
src/main/resources/mapper/DeviceMapper.xml | 375 ---------
src/main/java/com/moral/common/bean/ResultBean.java | 22
src/main/java/com/moral/entity/Device.java | 51 +
/dev/null | 380 ---------
src/main/java/com/moral/service/impl/HistoryServiceImpl.java | 1
src/main/java/com/moral/mapper/OperateUserMapper.java | 6
src/test/java/com/moral/MybatisConfig.java | 23
src/main/java/com/moral/common/aop/ControllerAOP.java | 55 +
src/main/java/com/moral/service/impl/OrganizationServiceImpl.java | 7
src/main/java/com/moral/mapper/OrganizationMapper.java | 6
src/main/resources/application.yml | 8
34 files changed, 446 insertions(+), 1,935 deletions(-)
diff --git a/pom.xml b/pom.xml
index 46215af..5e54f94 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,11 +95,11 @@
<artifactId>mysql-connector-java</artifactId>
<version>5.1.44</version>
</dependency>
+
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-mongodb</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
@@ -122,15 +122,25 @@
<classifier>jdk15</classifier>
</dependency>
<dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <version>1.16.18</version>
- </dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>1.16.18</version>
+ </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-aop</artifactId>
</dependency>
- </dependencies>
+ <dependency>
+ <groupId>com.github.pagehelper</groupId>
+ <artifactId>pagehelper</artifactId>
+ <version>4.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>tk.mybatis</groupId>
+ <artifactId>mapper</artifactId>
+ <version>3.3.9</version>
+ </dependency>
+ </dependencies>
<build>
<plugins>
diff --git a/src/main/java/com/moral/common/aop/ControllerAOP.java b/src/main/java/com/moral/common/aop/ControllerAOP.java
index bd542c7..a30d404 100644
--- a/src/main/java/com/moral/common/aop/ControllerAOP.java
+++ b/src/main/java/com/moral/common/aop/ControllerAOP.java
@@ -1,14 +1,21 @@
package com.moral.common.aop;
+import java.lang.reflect.Method;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
import java.util.HashMap;
import java.util.Map;
import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.Signature;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.reflect.MethodSignature;
import org.springframework.stereotype.Component;
+import com.moral.common.bean.ResultBean;
import com.moral.common.exception.BusinessException;
+import com.moral.common.exception.ValidateException;
import lombok.extern.log4j.Log4j;
@@ -16,13 +23,15 @@
@Aspect
@Component
public class ControllerAOP {
-
+
@Around("execution(* com.moral.controller.*Controller.*(..))")
- public Object handlerControllerMethod(ProceedingJoinPoint pjp) {
+ public Object handlerControllerMethod(ProceedingJoinPoint pjp) throws Exception {
+
long startTime = System.currentTimeMillis();
- Map<String, Object> result;
+ Object result;
+
try {
- result = (Map<String, Object>) pjp.proceed();
+ result = pjp.proceed();
log.info(pjp.getSignature() + "use time:" + (System.currentTimeMillis() - startTime));
} catch (Throwable e) {
result = handlerException(pjp, e);
@@ -31,18 +40,40 @@
return result;
}
- private Map<String, Object> handlerException(ProceedingJoinPoint pjp, Throwable e) {
- Map<String, Object> result = new HashMap<String, Object>();
-
- // ������������
+ @SuppressWarnings("rawtypes")
+ private Object handlerException(ProceedingJoinPoint pjp, Throwable e) throws Exception {
+ Signature sig = pjp.getSignature();
+ MethodSignature msig = null;
+ if (!(sig instanceof MethodSignature)) {
+ throw new IllegalArgumentException("���������������������������");
+ }
+ msig = (MethodSignature) sig;
+ Object target = pjp.getTarget();
+ Method currentMethod = target.getClass().getMethod(msig.getName(), msig.getParameterTypes());
+ Type type = currentMethod.getGenericReturnType();
+ String message = "";
if (e instanceof BusinessException) {
- result.put("msg", e.getLocalizedMessage());
+ message = e.getLocalizedMessage();
+ } else if (e instanceof ValidateException) {
+ message = e.getLocalizedMessage();
} else {
log.error(pjp.getSignature() + " error ", e);
- result.put("msg", e.toString());
- //TODO ������������������������������������������������������������������
+ message = e.toString();
}
- return result;
+ if (type instanceof ParameterizedType) {
+ Type rawType = ((ParameterizedType) type).getRawType();
+ if (rawType == ResultBean.class) {
+ ResultBean<?> resultBean = new ResultBean(ResultBean.FAIL);
+ resultBean.setMessage(message);
+ return resultBean;
+ } else if (rawType == Map.class) {
+ Map<String, Object> result = new HashMap<String, Object>();
+ result.put("msg",message);
+ return result;
+ }
+ }
+ return null;
+
}
}
diff --git a/src/main/java/com/moral/common/bean/ResultBean.java b/src/main/java/com/moral/common/bean/ResultBean.java
index 6506493..7e74ecb 100644
--- a/src/main/java/com/moral/common/bean/ResultBean.java
+++ b/src/main/java/com/moral/common/bean/ResultBean.java
@@ -9,11 +9,11 @@
private static final long serialVersionUID = 1L;
- public static final int FAIL = 0;
- public static final int SUCCESS = 1;
+ public static final int SUCCESS = 0;
+ public static final int FAIL = 1;
public static final int NO_PERMISSION = 2;
- private String msg = "success";
- private int code = SUCCESS;
+ private String message = "success";
+ private int errno = SUCCESS;
private T data;
public ResultBean() {
super();
@@ -25,16 +25,16 @@
public ResultBean(Throwable e) {
super();
- this.msg = e.toString();
- this.code = FAIL;
+ this.message = e.toString();
+ this.errno = FAIL;
}
- public ResultBean(String msg, int code) {
+ public ResultBean(String message, int errno) {
super();
- this.msg = msg;
- this.code = code;
+ this.message = message;
+ this.errno = errno;
}
- public ResultBean(int code) {
+ public ResultBean(int errno) {
super();
- this.code = code;
+ this.errno = errno;
}
}
diff --git a/src/main/java/com/moral/common/exception/ValidateException.java b/src/main/java/com/moral/common/exception/ValidateException.java
new file mode 100644
index 0000000..124a371
--- /dev/null
+++ b/src/main/java/com/moral/common/exception/ValidateException.java
@@ -0,0 +1,26 @@
+package com.moral.common.exception;
+
+public class ValidateException extends RuntimeException {
+
+ private static final long serialVersionUID = 1L;
+
+ public ValidateException() {
+ }
+
+ public ValidateException(String message) {
+ super(message);
+ }
+
+ public ValidateException(Throwable cause) {
+ super(cause);
+ }
+
+ public ValidateException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+ public ValidateException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+ super(message, cause, enableSuppression, writableStackTrace);
+ }
+
+}
diff --git a/src/main/java/com/moral/common/mapper/BaseMapper.java b/src/main/java/com/moral/common/mapper/BaseMapper.java
index 20a1454..139da85 100644
--- a/src/main/java/com/moral/common/mapper/BaseMapper.java
+++ b/src/main/java/com/moral/common/mapper/BaseMapper.java
@@ -1,31 +1,8 @@
package com.moral.common.mapper;
-import java.io.Serializable;
-import java.util.List;
+import tk.mybatis.mapper.common.Mapper;
+import tk.mybatis.mapper.common.MySqlMapper;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.dao.DataAccessException;
+public interface BaseMapper<T> extends Mapper<T>,MySqlMapper<T> {
-public interface BaseMapper<Entity, Example, PK extends Serializable> extends Serializable {
- int insert(Entity record) throws DataAccessException;
-
- int insertSelective(Entity record) throws DataAccessException;
-
- int deleteByPrimaryKey(PK PK) throws DataAccessException;
-
- int deleteByExample(Example example) throws DataAccessException;
-
- int updateByPrimaryKeySelective(Entity record) throws DataAccessException;
-
- int updateByPrimaryKey(Entity record) throws DataAccessException;
-
- int updateByExampleSelective(@Param("record") Entity record, @Param("example") Example example)throws DataAccessException;
-
- int updateByExample(@Param("record") Entity record, @Param("example") Example example) throws DataAccessException;
-
- int countByExample(Example example) throws DataAccessException;
-
- Entity selectByPrimaryKey(PK pk) throws DataAccessException;
-
- List<Entity> selectByExample(Example example) throws DataAccessException;
}
diff --git a/src/main/java/com/moral/common/util/ValidateUtil.java b/src/main/java/com/moral/common/util/ValidateUtil.java
new file mode 100644
index 0000000..da579bc
--- /dev/null
+++ b/src/main/java/com/moral/common/util/ValidateUtil.java
@@ -0,0 +1,37 @@
+package com.moral.common.util;
+
+import java.util.Locale;
+
+import org.springframework.context.MessageSource;
+
+import com.moral.common.exception.ValidateException;
+
+public class ValidateUtil {
+ private static MessageSource resources;
+
+ public static void setResources(MessageSource resources) {
+ ValidateUtil.resources = resources;
+ }
+
+ public static void check(boolean condition, String msgKey, Object... args) {
+ if (!condition) {
+ fail(msgKey, args);
+ }
+ }
+
+ public static void notEmpty(String str, String msgKey, Object... args) {
+ if (str == null || str.trim().isEmpty()) {
+ fail(msgKey, args);
+ }
+ }
+
+ public static void notNull(Object obj, String msgKey, Object... args) {
+ if (obj == null) {
+ fail(msgKey, args);
+ }
+ }
+
+ private static void fail(String msgKey, Object... args) {
+ throw new ValidateException(resources.getMessage(msgKey, args, Locale.CHINESE));
+ }
+}
diff --git a/src/main/java/com/moral/config/MapperScannerConfig.java b/src/main/java/com/moral/config/MapperScannerConfig.java
new file mode 100644
index 0000000..c612d32
--- /dev/null
+++ b/src/main/java/com/moral/config/MapperScannerConfig.java
@@ -0,0 +1,26 @@
+package com.moral.config;
+
+import java.util.Properties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import com.moral.common.mapper.BaseMapper;
+
+import tk.mybatis.spring.mapper.MapperScannerConfigurer;
+
+@Configuration
+public class MapperScannerConfig {
+ @Bean
+ public MapperScannerConfigurer mapperScannerConfigurer() {
+ MapperScannerConfigurer mapperScannerConfigurer = new MapperScannerConfigurer();
+ mapperScannerConfigurer.setSqlSessionFactoryBeanName("sqlSessionFactory");
+ mapperScannerConfigurer.setBasePackage("com.moral.mapper");//���������������������dao
+ Properties properties = new Properties();
+ properties.setProperty("mappers", BaseMapper.class.getName());//������dao
+ properties.setProperty("notEmpty", "false");
+ properties.setProperty("IDENTITY", "MYSQL");
+ mapperScannerConfigurer.setProperties(properties);
+ return mapperScannerConfigurer;
+ }
+
+}
diff --git a/src/main/java/com/moral/config/PageHelperConfig.java b/src/main/java/com/moral/config/PageHelperConfig.java
new file mode 100644
index 0000000..d51c7e7
--- /dev/null
+++ b/src/main/java/com/moral/config/PageHelperConfig.java
@@ -0,0 +1,25 @@
+package com.moral.config;
+
+import java.util.Properties;
+
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import com.github.pagehelper.PageHelper;
+
+@Configuration
+@EnableCaching
+public class PageHelperConfig {
+ @Bean
+ public PageHelper pageHelper(){
+ PageHelper pageHelper = new PageHelper();
+ Properties properties = new Properties();
+ properties.setProperty("offsetAsPageNum","true");
+ properties.setProperty("rowBoundsWithCount","true");
+ properties.setProperty("reasonable","true");
+ properties.setProperty("dialect","mysql"); //������mysql������������������
+ pageHelper.setProperties(properties);
+ return pageHelper;
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/moral/controller/MobileController.java b/src/main/java/com/moral/controller/MobileController.java
new file mode 100644
index 0000000..d178bc7
--- /dev/null
+++ b/src/main/java/com/moral/controller/MobileController.java
@@ -0,0 +1,71 @@
+package com.moral.controller;
+
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.github.pagehelper.PageHelper;
+import com.moral.common.bean.PageBean;
+import com.moral.common.bean.ResultBean;
+import com.moral.entity.Device;
+import com.moral.entity.OperateUser;
+import com.moral.service.DeviceService;
+import com.moral.service.OperateUserService;
+
+@RestController
+@RequestMapping(value = "mobile")
+@CrossOrigin(origins = "*", maxAge = 3600)
+public class MobileController {
+
+ @Resource
+ private OperateUserService operateUserService;
+
+ @Resource
+ private DeviceService deviceService;
+
+ // 1������
+ @GetMapping(value = "accountlogin")
+ public ResultBean<OperateUser> mobileLogin(String username, String password) {
+ OperateUser operateUser = operateUserService.mobileLogin(username,password);
+ return new ResultBean<OperateUser>(operateUser);
+ }
+
+ // 4������������
+ @GetMapping(value = "upPassword")
+ public ResultBean<OperateUser> updatePassword(Integer uid, String password, String newpassword) {
+ OperateUser operateUser = operateUserService.updatePassword(uid,password,newpassword);
+ return new ResultBean<OperateUser>(operateUser);
+ }
+
+ // 11������������
+ @GetMapping(value = "reportDevice")
+ public ResultBean<String> installDevice(Device device) {
+ deviceService.saveOrUpdateDevice(device);
+ return new ResultBean<String>("");
+ }
+
+ // 5������������������(������)
+ @GetMapping(value = "myRelease")
+ public ResultBean<List<Device>> getInstallDevicesByOperateUser(Integer uid, Integer pageIndex, Integer pageSize) {
+ List<Device> devices = deviceService.getInstallDevicesByOperateUser(uid,pageIndex,pageSize);
+ return new ResultBean<List<Device>>(devices);
+ }
+
+ @GetMapping(value = "getEquInfoByMac")
+ public void getEquInfoByMac(String mac) {
+ }
+
+ @GetMapping(value = "getMpointsByAreaName")
+ public void getMpointsByAreaName(String areaName) {
+ }
+
+ @GetMapping(value = "getOrgsByAreaName")
+ public void getOrgsByAreaName(String areaName) {
+
+ }
+}
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index f752dc3..0da945c 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -26,15 +26,14 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONReader;
import com.alibaba.fastjson.TypeReference;
-import com.moral.common.bean.ResultBean;
import com.moral.common.exception.BusinessException;
-import com.moral.entity.Account;
+import com.moral.common.util.ValidateUtil;
import com.moral.service.AccountService;
import com.moral.service.DeviceService;
import com.moral.service.HistoryService;
/**
- * The Class ScreenController.
+ * The Class ScreenController.������������
*/
@RestController
@RequestMapping(value = "screen")
@@ -84,22 +83,6 @@
return resultMap;
}
- @GetMapping("login1")
- public ResultBean<Account> screenLogin1(HttpServletRequest request) {
- ResultBean<Account> resultBean = new ResultBean<Account>(ResultBean.FAIL);
- try {
- Map<String, Object> parameters = getParametersStartingWith(request, null);
- if (!(parameters.containsKey("account") && parameters.containsKey("password"))) {
- resultBean.setMsg("������������������������������������");
- } else {
- resultBean = accountService.screenLogin1(parameters);
- }
- } catch (Exception e) {
- e.printStackTrace();
- resultBean = new ResultBean<Account>(e);
- }
- return resultBean;
- }
/**
* Gets the equipment states. ���������������������������������������
@@ -156,11 +139,8 @@
@GetMapping("sensor-standard")
public Map<String, Object> getStandardBySensor(@RequestParam("macKey") String macKey) {
Map<String, Object> result = new HashMap<String, Object>();
- if (isEmpty(macKey)) {
- throw new BusinessException("���������������������");
- } else {
- result.put("standard", getValue(macKey + "-standard"));
- }
+ ValidateUtil.notEmpty(macKey, "���������������������");
+ result.put("standard", getValue(macKey + "-standard"));
return result;
}
diff --git a/src/main/java/com/moral/entity/AccountExample.java b/src/main/java/com/moral/entity/AccountExample.java
deleted file mode 100644
index afe9f2a..0000000
--- a/src/main/java/com/moral/entity/AccountExample.java
+++ /dev/null
@@ -1,855 +0,0 @@
-package com.moral.entity;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-public class AccountExample {
- protected String orderByClause;
-
- protected boolean distinct;
-
- protected List<Criteria> oredCriteria;
-
- public AccountExample() {
- 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 andAccountNameIsNull() {
- addCriterion("account_name is null");
- return (Criteria) this;
- }
-
- public Criteria andAccountNameIsNotNull() {
- addCriterion("account_name is not null");
- return (Criteria) this;
- }
-
- public Criteria andAccountNameEqualTo(String value) {
- addCriterion("account_name =", value, "accountName");
- return (Criteria) this;
- }
-
- public Criteria andAccountNameNotEqualTo(String value) {
- addCriterion("account_name <>", value, "accountName");
- return (Criteria) this;
- }
-
- public Criteria andAccountNameGreaterThan(String value) {
- addCriterion("account_name >", value, "accountName");
- return (Criteria) this;
- }
-
- public Criteria andAccountNameGreaterThanOrEqualTo(String value) {
- addCriterion("account_name >=", value, "accountName");
- return (Criteria) this;
- }
-
- public Criteria andAccountNameLessThan(String value) {
- addCriterion("account_name <", value, "accountName");
- return (Criteria) this;
- }
-
- public Criteria andAccountNameLessThanOrEqualTo(String value) {
- addCriterion("account_name <=", value, "accountName");
- return (Criteria) this;
- }
-
- public Criteria andAccountNameLike(String value) {
- addCriterion("account_name like", value, "accountName");
- return (Criteria) this;
- }
-
- public Criteria andAccountNameNotLike(String value) {
- addCriterion("account_name not like", value, "accountName");
- return (Criteria) this;
- }
-
- public Criteria andAccountNameIn(List<String> values) {
- addCriterion("account_name in", values, "accountName");
- return (Criteria) this;
- }
-
- public Criteria andAccountNameNotIn(List<String> values) {
- addCriterion("account_name not in", values, "accountName");
- return (Criteria) this;
- }
-
- public Criteria andAccountNameBetween(String value1, String value2) {
- addCriterion("account_name between", value1, value2, "accountName");
- return (Criteria) this;
- }
-
- public Criteria andAccountNameNotBetween(String value1, String value2) {
- addCriterion("account_name not between", value1, value2, "accountName");
- return (Criteria) this;
- }
-
- public Criteria andPasswordIsNull() {
- addCriterion("password is null");
- return (Criteria) this;
- }
-
- public Criteria andPasswordIsNotNull() {
- addCriterion("password is not null");
- return (Criteria) this;
- }
-
- public Criteria andPasswordEqualTo(String value) {
- addCriterion("password =", value, "password");
- return (Criteria) this;
- }
-
- public Criteria andPasswordNotEqualTo(String value) {
- addCriterion("password <>", value, "password");
- return (Criteria) this;
- }
-
- public Criteria andPasswordGreaterThan(String value) {
- addCriterion("password >", value, "password");
- return (Criteria) this;
- }
-
- public Criteria andPasswordGreaterThanOrEqualTo(String value) {
- addCriterion("password >=", value, "password");
- return (Criteria) this;
- }
-
- public Criteria andPasswordLessThan(String value) {
- addCriterion("password <", value, "password");
- return (Criteria) this;
- }
-
- public Criteria andPasswordLessThanOrEqualTo(String value) {
- addCriterion("password <=", value, "password");
- return (Criteria) this;
- }
-
- public Criteria andPasswordLike(String value) {
- addCriterion("password like", value, "password");
- return (Criteria) this;
- }
-
- public Criteria andPasswordNotLike(String value) {
- addCriterion("password not like", value, "password");
- return (Criteria) this;
- }
-
- public Criteria andPasswordIn(List<String> values) {
- addCriterion("password in", values, "password");
- return (Criteria) this;
- }
-
- public Criteria andPasswordNotIn(List<String> values) {
- addCriterion("password not in", values, "password");
- return (Criteria) this;
- }
-
- public Criteria andPasswordBetween(String value1, String value2) {
- addCriterion("password between", value1, value2, "password");
- return (Criteria) this;
- }
-
- public Criteria andPasswordNotBetween(String value1, String value2) {
- addCriterion("password not between", value1, value2, "password");
- return (Criteria) this;
- }
-
- public Criteria andOrganizationIdIsNull() {
- addCriterion("organization_id is null");
- return (Criteria) this;
- }
-
- public Criteria andOrganizationIdIsNotNull() {
- addCriterion("organization_id is not null");
- return (Criteria) this;
- }
-
- public Criteria andOrganizationIdEqualTo(Integer value) {
- addCriterion("organization_id =", value, "organizationId");
- return (Criteria) this;
- }
-
- public Criteria andOrganizationIdNotEqualTo(Integer value) {
- addCriterion("organization_id <>", value, "organizationId");
- return (Criteria) this;
- }
-
- public Criteria andOrganizationIdGreaterThan(Integer value) {
- addCriterion("organization_id >", value, "organizationId");
- return (Criteria) this;
- }
-
- public Criteria andOrganizationIdGreaterThanOrEqualTo(Integer value) {
- addCriterion("organization_id >=", value, "organizationId");
- return (Criteria) this;
- }
-
- public Criteria andOrganizationIdLessThan(Integer value) {
- addCriterion("organization_id <", value, "organizationId");
- return (Criteria) this;
- }
-
- public Criteria andOrganizationIdLessThanOrEqualTo(Integer value) {
- addCriterion("organization_id <=", value, "organizationId");
- return (Criteria) this;
- }
-
- public Criteria andOrganizationIdIn(List<Integer> values) {
- addCriterion("organization_id in", values, "organizationId");
- return (Criteria) this;
- }
-
- public Criteria andOrganizationIdNotIn(List<Integer> values) {
- addCriterion("organization_id not in", values, "organizationId");
- return (Criteria) this;
- }
-
- public Criteria andOrganizationIdBetween(Integer value1, Integer value2) {
- addCriterion("organization_id between", value1, value2, "organizationId");
- return (Criteria) this;
- }
-
- public Criteria andOrganizationIdNotBetween(Integer value1, Integer value2) {
- addCriterion("organization_id not between", value1, value2, "organizationId");
- return (Criteria) this;
- }
-
- public Criteria andEmailIsNull() {
- addCriterion("email is null");
- return (Criteria) this;
- }
-
- public Criteria andEmailIsNotNull() {
- addCriterion("email is not null");
- return (Criteria) this;
- }
-
- public Criteria andEmailEqualTo(String value) {
- addCriterion("email =", value, "email");
- return (Criteria) this;
- }
-
- public Criteria andEmailNotEqualTo(String value) {
- addCriterion("email <>", value, "email");
- return (Criteria) this;
- }
-
- public Criteria andEmailGreaterThan(String value) {
- addCriterion("email >", value, "email");
- return (Criteria) this;
- }
-
- public Criteria andEmailGreaterThanOrEqualTo(String value) {
- addCriterion("email >=", value, "email");
- return (Criteria) this;
- }
-
- public Criteria andEmailLessThan(String value) {
- addCriterion("email <", value, "email");
- return (Criteria) this;
- }
-
- public Criteria andEmailLessThanOrEqualTo(String value) {
- addCriterion("email <=", value, "email");
- return (Criteria) this;
- }
-
- public Criteria andEmailLike(String value) {
- addCriterion("email like", value, "email");
- return (Criteria) this;
- }
-
- public Criteria andEmailNotLike(String value) {
- addCriterion("email not like", value, "email");
- return (Criteria) this;
- }
-
- public Criteria andEmailIn(List<String> values) {
- addCriterion("email in", values, "email");
- return (Criteria) this;
- }
-
- public Criteria andEmailNotIn(List<String> values) {
- addCriterion("email not in", values, "email");
- return (Criteria) this;
- }
-
- public Criteria andEmailBetween(String value1, String value2) {
- addCriterion("email between", value1, value2, "email");
- return (Criteria) this;
- }
-
- public Criteria andEmailNotBetween(String value1, String value2) {
- addCriterion("email not between", value1, value2, "email");
- return (Criteria) this;
- }
-
- public Criteria andMobileIsNull() {
- addCriterion("mobile is null");
- return (Criteria) this;
- }
-
- public Criteria andMobileIsNotNull() {
- addCriterion("mobile is not null");
- return (Criteria) this;
- }
-
- public Criteria andMobileEqualTo(String value) {
- addCriterion("mobile =", value, "mobile");
- return (Criteria) this;
- }
-
- public Criteria andMobileNotEqualTo(String value) {
- addCriterion("mobile <>", value, "mobile");
- return (Criteria) this;
- }
-
- public Criteria andMobileGreaterThan(String value) {
- addCriterion("mobile >", value, "mobile");
- return (Criteria) this;
- }
-
- public Criteria andMobileGreaterThanOrEqualTo(String value) {
- addCriterion("mobile >=", value, "mobile");
- return (Criteria) this;
- }
-
- public Criteria andMobileLessThan(String value) {
- addCriterion("mobile <", value, "mobile");
- return (Criteria) this;
- }
-
- public Criteria andMobileLessThanOrEqualTo(String value) {
- addCriterion("mobile <=", value, "mobile");
- return (Criteria) this;
- }
-
- public Criteria andMobileLike(String value) {
- addCriterion("mobile like", value, "mobile");
- return (Criteria) this;
- }
-
- public Criteria andMobileNotLike(String value) {
- addCriterion("mobile not like", value, "mobile");
- return (Criteria) this;
- }
-
- public Criteria andMobileIn(List<String> values) {
- addCriterion("mobile in", values, "mobile");
- return (Criteria) this;
- }
-
- public Criteria andMobileNotIn(List<String> values) {
- addCriterion("mobile not in", values, "mobile");
- return (Criteria) this;
- }
-
- public Criteria andMobileBetween(String value1, String value2) {
- addCriterion("mobile between", value1, value2, "mobile");
- return (Criteria) this;
- }
-
- public Criteria andMobileNotBetween(String value1, String value2) {
- addCriterion("mobile not between", value1, value2, "mobile");
- return (Criteria) this;
- }
-
- public Criteria andWeixinIsNull() {
- addCriterion("weixin is null");
- return (Criteria) this;
- }
-
- public Criteria andWeixinIsNotNull() {
- addCriterion("weixin is not null");
- return (Criteria) this;
- }
-
- public Criteria andWeixinEqualTo(String value) {
- addCriterion("weixin =", value, "weixin");
- return (Criteria) this;
- }
-
- public Criteria andWeixinNotEqualTo(String value) {
- addCriterion("weixin <>", value, "weixin");
- return (Criteria) this;
- }
-
- public Criteria andWeixinGreaterThan(String value) {
- addCriterion("weixin >", value, "weixin");
- return (Criteria) this;
- }
-
- public Criteria andWeixinGreaterThanOrEqualTo(String value) {
- addCriterion("weixin >=", value, "weixin");
- return (Criteria) this;
- }
-
- public Criteria andWeixinLessThan(String value) {
- addCriterion("weixin <", value, "weixin");
- return (Criteria) this;
- }
-
- public Criteria andWeixinLessThanOrEqualTo(String value) {
- addCriterion("weixin <=", value, "weixin");
- return (Criteria) this;
- }
-
- public Criteria andWeixinLike(String value) {
- addCriterion("weixin like", value, "weixin");
- return (Criteria) this;
- }
-
- public Criteria andWeixinNotLike(String value) {
- addCriterion("weixin not like", value, "weixin");
- return (Criteria) this;
- }
-
- public Criteria andWeixinIn(List<String> values) {
- addCriterion("weixin in", values, "weixin");
- return (Criteria) this;
- }
-
- public Criteria andWeixinNotIn(List<String> values) {
- addCriterion("weixin not in", values, "weixin");
- return (Criteria) this;
- }
-
- public Criteria andWeixinBetween(String value1, String value2) {
- addCriterion("weixin between", value1, value2, "weixin");
- return (Criteria) this;
- }
-
- public Criteria andWeixinNotBetween(String value1, String value2) {
- addCriterion("weixin not between", value1, value2, "weixin");
- return (Criteria) this;
- }
-
- public Criteria andIsDeleteIsNull() {
- addCriterion("is_delete is null");
- return (Criteria) this;
- }
-
- public Criteria andIsDeleteIsNotNull() {
- addCriterion("is_delete is not null");
- return (Criteria) this;
- }
-
- public Criteria andIsDeleteEqualTo(String value) {
- addCriterion("is_delete =", value, "isDelete");
- return (Criteria) this;
- }
-
- public Criteria andIsDeleteNotEqualTo(String value) {
- addCriterion("is_delete <>", value, "isDelete");
- return (Criteria) this;
- }
-
- public Criteria andIsDeleteGreaterThan(String value) {
- addCriterion("is_delete >", value, "isDelete");
- return (Criteria) this;
- }
-
- public Criteria andIsDeleteGreaterThanOrEqualTo(String value) {
- addCriterion("is_delete >=", value, "isDelete");
- return (Criteria) this;
- }
-
- public Criteria andIsDeleteLessThan(String value) {
- addCriterion("is_delete <", value, "isDelete");
- return (Criteria) this;
- }
-
- public Criteria andIsDeleteLessThanOrEqualTo(String value) {
- addCriterion("is_delete <=", value, "isDelete");
- return (Criteria) this;
- }
-
- public Criteria andIsDeleteLike(String value) {
- addCriterion("is_delete like", value, "isDelete");
- return (Criteria) this;
- }
-
- public Criteria andIsDeleteNotLike(String value) {
- addCriterion("is_delete not like", value, "isDelete");
- return (Criteria) this;
- }
-
- public Criteria andIsDeleteIn(List<String> values) {
- addCriterion("is_delete in", values, "isDelete");
- return (Criteria) this;
- }
-
- public Criteria andIsDeleteNotIn(List<String> values) {
- addCriterion("is_delete not in", values, "isDelete");
- return (Criteria) this;
- }
-
- public Criteria andIsDeleteBetween(String value1, String value2) {
- addCriterion("is_delete between", value1, value2, "isDelete");
- return (Criteria) this;
- }
-
- public Criteria andIsDeleteNotBetween(String value1, String value2) {
- addCriterion("is_delete not between", value1, value2, "isDelete");
- 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 andExpireTimeIsNull() {
- addCriterion("expire_time is null");
- return (Criteria) this;
- }
-
- public Criteria andExpireTimeIsNotNull() {
- addCriterion("expire_time is not null");
- return (Criteria) this;
- }
-
- public Criteria andExpireTimeEqualTo(Date value) {
- addCriterion("expire_time =", value, "expireTime");
- return (Criteria) this;
- }
-
- public Criteria andExpireTimeNotEqualTo(Date value) {
- addCriterion("expire_time <>", value, "expireTime");
- return (Criteria) this;
- }
-
- public Criteria andExpireTimeGreaterThan(Date value) {
- addCriterion("expire_time >", value, "expireTime");
- return (Criteria) this;
- }
-
- public Criteria andExpireTimeGreaterThanOrEqualTo(Date value) {
- addCriterion("expire_time >=", value, "expireTime");
- return (Criteria) this;
- }
-
- public Criteria andExpireTimeLessThan(Date value) {
- addCriterion("expire_time <", value, "expireTime");
- return (Criteria) this;
- }
-
- public Criteria andExpireTimeLessThanOrEqualTo(Date value) {
- addCriterion("expire_time <=", value, "expireTime");
- return (Criteria) this;
- }
-
- public Criteria andExpireTimeIn(List<Date> values) {
- addCriterion("expire_time in", values, "expireTime");
- return (Criteria) this;
- }
-
- public Criteria andExpireTimeNotIn(List<Date> values) {
- addCriterion("expire_time not in", values, "expireTime");
- return (Criteria) this;
- }
-
- public Criteria andExpireTimeBetween(Date value1, Date value2) {
- addCriterion("expire_time between", value1, value2, "expireTime");
- return (Criteria) this;
- }
-
- public Criteria andExpireTimeNotBetween(Date value1, Date value2) {
- addCriterion("expire_time not between", value1, value2, "expireTime");
- 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/entity/Device.java b/src/main/java/com/moral/entity/Device.java
index 83a0858..ca4ebc2 100644
--- a/src/main/java/com/moral/entity/Device.java
+++ b/src/main/java/com/moral/entity/Device.java
@@ -4,6 +4,10 @@
import lombok.Data;
+
+/**
+ * Instantiates a new device.
+ */
@Data
public class Device {/**
* This field was generated by MyBatis Generator. This field corresponds to the database column device.id
@@ -65,4 +69,51 @@
* @mbggenerated Wed Nov 29 16:17:59 CST 2017
*/
private Integer deviceVersionId;
+
+ /**
+ * Sets the uid.
+ *
+ * @param uid the new uid
+ */
+ public void setUid(Integer uid) {
+ this.operateUserId = uid;
+ }
+
+ /**
+ * Sets the device name.
+ *
+ * @param device_name the new device name
+ */
+ public void setDevice_name(String device_name) {
+ this.name = device_name;
+ }
+
+ /**
+ * Gets the device name.
+ *
+ * @return the device name
+ */
+ public String getDevice_name() {
+ return name;
+ }
+
+ /**
+ * Sets the monitorpoint.
+ *
+ * @param monitorpoint the new monitorpoint
+ */
+ public void setMonitorpoint(Integer monitorpoint) {
+ this.monitorPointId = monitorpoint;
+ }
+
+ /**
+ * Gets the status.
+ *
+ * @return the status
+ */
+ public String getStatus() {
+ return state;
+ }
+
+
}
\ No newline at end of file
diff --git a/src/main/java/com/moral/entity/DeviceExample.java b/src/main/java/com/moral/entity/DeviceExample.java
deleted file mode 100644
index 756e5fe..0000000
--- a/src/main/java/com/moral/entity/DeviceExample.java
+++ /dev/null
@@ -1,1020 +0,0 @@
-package com.moral.entity;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-public class DeviceExample {
- /**
- * This field was generated by MyBatis Generator. This field corresponds to the database table device
- * @mbggenerated Wed Nov 29 16:17:59 CST 2017
- */
- protected String orderByClause;
- /**
- * This field was generated by MyBatis Generator. This field corresponds to the database table device
- * @mbggenerated Wed Nov 29 16:17:59 CST 2017
- */
- protected boolean distinct;
- /**
- * This field was generated by MyBatis Generator. This field corresponds to the database table device
- * @mbggenerated Wed Nov 29 16:17:59 CST 2017
- */
- protected List<Criteria> oredCriteria;
-
- /**
- * This method was generated by MyBatis Generator. This method corresponds to the database table device
- * @mbggenerated Wed Nov 29 16:17:59 CST 2017
- */
- public DeviceExample() {
- oredCriteria = new ArrayList<Criteria>();
- }
-
- /**
- * This method was generated by MyBatis Generator. This method corresponds to the database table device
- * @mbggenerated Wed Nov 29 16:17:59 CST 2017
- */
- public void setOrderByClause(String orderByClause) {
- this.orderByClause = orderByClause;
- }
-
- /**
- * This method was generated by MyBatis Generator. This method corresponds to the database table device
- * @mbggenerated Wed Nov 29 16:17:59 CST 2017
- */
- public String getOrderByClause() {
- return orderByClause;
- }
-
- /**
- * This method was generated by MyBatis Generator. This method corresponds to the database table device
- * @mbggenerated Wed Nov 29 16:17:59 CST 2017
- */
- public void setDistinct(boolean distinct) {
- this.distinct = distinct;
- }
-
- /**
- * This method was generated by MyBatis Generator. This method corresponds to the database table device
- * @mbggenerated Wed Nov 29 16:17:59 CST 2017
- */
- public boolean isDistinct() {
- return distinct;
- }
-
- /**
- * This method was generated by MyBatis Generator. This method corresponds to the database table device
- * @mbggenerated Wed Nov 29 16:17:59 CST 2017
- */
- public List<Criteria> getOredCriteria() {
- return oredCriteria;
- }
-
- /**
- * This method was generated by MyBatis Generator. This method corresponds to the database table device
- * @mbggenerated Wed Nov 29 16:17:59 CST 2017
- */
- public void or(Criteria criteria) {
- oredCriteria.add(criteria);
- }
-
- /**
- * This method was generated by MyBatis Generator. This method corresponds to the database table device
- * @mbggenerated Wed Nov 29 16:17:59 CST 2017
- */
- public Criteria or() {
- Criteria criteria = createCriteriaInternal();
- oredCriteria.add(criteria);
- return criteria;
- }
-
- /**
- * This method was generated by MyBatis Generator. This method corresponds to the database table device
- * @mbggenerated Wed Nov 29 16:17:59 CST 2017
- */
- public Criteria createCriteria() {
- Criteria criteria = createCriteriaInternal();
- if (oredCriteria.size() == 0) {
- oredCriteria.add(criteria);
- }
- return criteria;
- }
-
- /**
- * This method was generated by MyBatis Generator. This method corresponds to the database table device
- * @mbggenerated Wed Nov 29 16:17:59 CST 2017
- */
- protected Criteria createCriteriaInternal() {
- Criteria criteria = new Criteria();
- return criteria;
- }
-
- /**
- * This method was generated by MyBatis Generator. This method corresponds to the database table device
- * @mbggenerated Wed Nov 29 16:17:59 CST 2017
- */
- public void clear() {
- oredCriteria.clear();
- orderByClause = null;
- distinct = false;
- }
-
- /**
- * This class was generated by MyBatis Generator. This class corresponds to the database table device
- * @mbggenerated Wed Nov 29 16:17:59 CST 2017
- */
- 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(Float value) {
- addCriterion("longitude =", value, "longitude");
- return (Criteria) this;
- }
-
- public Criteria andLongitudeNotEqualTo(Float value) {
- addCriterion("longitude <>", value, "longitude");
- return (Criteria) this;
- }
-
- public Criteria andLongitudeGreaterThan(Float value) {
- addCriterion("longitude >", value, "longitude");
- return (Criteria) this;
- }
-
- public Criteria andLongitudeGreaterThanOrEqualTo(Float value) {
- addCriterion("longitude >=", value, "longitude");
- return (Criteria) this;
- }
-
- public Criteria andLongitudeLessThan(Float value) {
- addCriterion("longitude <", value, "longitude");
- return (Criteria) this;
- }
-
- public Criteria andLongitudeLessThanOrEqualTo(Float value) {
- addCriterion("longitude <=", value, "longitude");
- return (Criteria) this;
- }
-
- public Criteria andLongitudeIn(List<Float> values) {
- addCriterion("longitude in", values, "longitude");
- return (Criteria) this;
- }
-
- public Criteria andLongitudeNotIn(List<Float> values) {
- addCriterion("longitude not in", values, "longitude");
- return (Criteria) this;
- }
-
- public Criteria andLongitudeBetween(Float value1, Float value2) {
- addCriterion("longitude between", value1, value2, "longitude");
- return (Criteria) this;
- }
-
- public Criteria andLongitudeNotBetween(Float value1, Float 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(Float value) {
- addCriterion("latitude =", value, "latitude");
- return (Criteria) this;
- }
-
- public Criteria andLatitudeNotEqualTo(Float value) {
- addCriterion("latitude <>", value, "latitude");
- return (Criteria) this;
- }
-
- public Criteria andLatitudeGreaterThan(Float value) {
- addCriterion("latitude >", value, "latitude");
- return (Criteria) this;
- }
-
- public Criteria andLatitudeGreaterThanOrEqualTo(Float value) {
- addCriterion("latitude >=", value, "latitude");
- return (Criteria) this;
- }
-
- public Criteria andLatitudeLessThan(Float value) {
- addCriterion("latitude <", value, "latitude");
- return (Criteria) this;
- }
-
- public Criteria andLatitudeLessThanOrEqualTo(Float value) {
- addCriterion("latitude <=", value, "latitude");
- return (Criteria) this;
- }
-
- public Criteria andLatitudeIn(List<Float> values) {
- addCriterion("latitude in", values, "latitude");
- return (Criteria) this;
- }
-
- public Criteria andLatitudeNotIn(List<Float> values) {
- addCriterion("latitude not in", values, "latitude");
- return (Criteria) this;
- }
-
- public Criteria andLatitudeBetween(Float value1, Float value2) {
- addCriterion("latitude between", value1, value2, "latitude");
- return (Criteria) this;
- }
-
- public Criteria andLatitudeNotBetween(Float value1, Float 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 andOperateUserIdIsNull() {
- addCriterion("operate_user_id is null");
- return (Criteria) this;
- }
-
- public Criteria andOperateUserIdIsNotNull() {
- addCriterion("operate_user_id is not null");
- return (Criteria) this;
- }
-
- public Criteria andOperateUserIdEqualTo(Integer value) {
- addCriterion("operate_user_id =", value, "operateUserId");
- return (Criteria) this;
- }
-
- public Criteria andOperateUserIdNotEqualTo(Integer value) {
- addCriterion("operate_user_id <>", value, "operateUserId");
- return (Criteria) this;
- }
-
- public Criteria andOperateUserIdGreaterThan(Integer value) {
- addCriterion("operate_user_id >", value, "operateUserId");
- return (Criteria) this;
- }
-
- public Criteria andOperateUserIdGreaterThanOrEqualTo(Integer value) {
- addCriterion("operate_user_id >=", value, "operateUserId");
- return (Criteria) this;
- }
-
- public Criteria andOperateUserIdLessThan(Integer value) {
- addCriterion("operate_user_id <", value, "operateUserId");
- return (Criteria) this;
- }
-
- public Criteria andOperateUserIdLessThanOrEqualTo(Integer value) {
- addCriterion("operate_user_id <=", value, "operateUserId");
- return (Criteria) this;
- }
-
- public Criteria andOperateUserIdIn(List<Integer> values) {
- addCriterion("operate_user_id in", values, "operateUserId");
- return (Criteria) this;
- }
-
- public Criteria andOperateUserIdNotIn(List<Integer> values) {
- addCriterion("operate_user_id not in", values, "operateUserId");
- return (Criteria) this;
- }
-
- public Criteria andOperateUserIdBetween(Integer value1, Integer value2) {
- addCriterion("operate_user_id between", value1, value2, "operateUserId");
- return (Criteria) this;
- }
-
- public Criteria andOperateUserIdNotBetween(Integer value1, Integer value2) {
- addCriterion("operate_user_id not between", value1, value2, "operateUserId");
- 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(String value) {
- addCriterion("state =", value, "state");
- return (Criteria) this;
- }
-
- public Criteria andStateNotEqualTo(String value) {
- addCriterion("state <>", value, "state");
- return (Criteria) this;
- }
-
- public Criteria andStateGreaterThan(String value) {
- addCriterion("state >", value, "state");
- return (Criteria) this;
- }
-
- public Criteria andStateGreaterThanOrEqualTo(String value) {
- addCriterion("state >=", value, "state");
- return (Criteria) this;
- }
-
- public Criteria andStateLessThan(String value) {
- addCriterion("state <", value, "state");
- return (Criteria) this;
- }
-
- public Criteria andStateLessThanOrEqualTo(String value) {
- addCriterion("state <=", value, "state");
- return (Criteria) this;
- }
-
- public Criteria andStateLike(String value) {
- addCriterion("state like", value, "state");
- return (Criteria) this;
- }
-
- public Criteria andStateNotLike(String value) {
- addCriterion("state not like", value, "state");
- return (Criteria) this;
- }
-
- public Criteria andStateIn(List<String> values) {
- addCriterion("state in", values, "state");
- return (Criteria) this;
- }
-
- public Criteria andStateNotIn(List<String> values) {
- addCriterion("state not in", values, "state");
- return (Criteria) this;
- }
-
- public Criteria andStateBetween(String value1, String value2) {
- addCriterion("state between", value1, value2, "state");
- return (Criteria) this;
- }
-
- public Criteria andStateNotBetween(String value1, String value2) {
- addCriterion("state not between", value1, value2, "state");
- 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 andInstallTimeIsNull() {
- addCriterion("install_time is null");
- return (Criteria) this;
- }
-
- public Criteria andInstallTimeIsNotNull() {
- addCriterion("install_time is not null");
- return (Criteria) this;
- }
-
- public Criteria andInstallTimeEqualTo(Date value) {
- addCriterion("install_time =", value, "installTime");
- return (Criteria) this;
- }
-
- public Criteria andInstallTimeNotEqualTo(Date value) {
- addCriterion("install_time <>", value, "installTime");
- return (Criteria) this;
- }
-
- public Criteria andInstallTimeGreaterThan(Date value) {
- addCriterion("install_time >", value, "installTime");
- return (Criteria) this;
- }
-
- public Criteria andInstallTimeGreaterThanOrEqualTo(Date value) {
- addCriterion("install_time >=", value, "installTime");
- return (Criteria) this;
- }
-
- public Criteria andInstallTimeLessThan(Date value) {
- addCriterion("install_time <", value, "installTime");
- return (Criteria) this;
- }
-
- public Criteria andInstallTimeLessThanOrEqualTo(Date value) {
- addCriterion("install_time <=", value, "installTime");
- return (Criteria) this;
- }
-
- public Criteria andInstallTimeIn(List<Date> values) {
- addCriterion("install_time in", values, "installTime");
- return (Criteria) this;
- }
-
- public Criteria andInstallTimeNotIn(List<Date> values) {
- addCriterion("install_time not in", values, "installTime");
- return (Criteria) this;
- }
-
- public Criteria andInstallTimeBetween(Date value1, Date value2) {
- addCriterion("install_time between", value1, value2, "installTime");
- return (Criteria) this;
- }
-
- public Criteria andInstallTimeNotBetween(Date value1, Date value2) {
- addCriterion("install_time not between", value1, value2, "installTime");
- return (Criteria) this;
- }
-
- public Criteria andMonitorPointIdIsNull() {
- addCriterion("monitor_point_id is null");
- return (Criteria) this;
- }
-
- public Criteria andMonitorPointIdIsNotNull() {
- addCriterion("monitor_point_id is not null");
- return (Criteria) this;
- }
-
- public Criteria andMonitorPointIdEqualTo(Integer value) {
- addCriterion("monitor_point_id =", value, "monitorPointId");
- return (Criteria) this;
- }
-
- public Criteria andMonitorPointIdNotEqualTo(Integer value) {
- addCriterion("monitor_point_id <>", value, "monitorPointId");
- return (Criteria) this;
- }
-
- public Criteria andMonitorPointIdGreaterThan(Integer value) {
- addCriterion("monitor_point_id >", value, "monitorPointId");
- return (Criteria) this;
- }
-
- public Criteria andMonitorPointIdGreaterThanOrEqualTo(Integer value) {
- addCriterion("monitor_point_id >=", value, "monitorPointId");
- return (Criteria) this;
- }
-
- public Criteria andMonitorPointIdLessThan(Integer value) {
- addCriterion("monitor_point_id <", value, "monitorPointId");
- return (Criteria) this;
- }
-
- public Criteria andMonitorPointIdLessThanOrEqualTo(Integer value) {
- addCriterion("monitor_point_id <=", value, "monitorPointId");
- return (Criteria) this;
- }
-
- public Criteria andMonitorPointIdIn(List<Integer> values) {
- addCriterion("monitor_point_id in", values, "monitorPointId");
- return (Criteria) this;
- }
-
- public Criteria andMonitorPointIdNotIn(List<Integer> values) {
- addCriterion("monitor_point_id not in", values, "monitorPointId");
- return (Criteria) this;
- }
-
- public Criteria andMonitorPointIdBetween(Integer value1, Integer value2) {
- addCriterion("monitor_point_id between", value1, value2, "monitorPointId");
- return (Criteria) this;
- }
-
- public Criteria andMonitorPointIdNotBetween(Integer value1, Integer value2) {
- addCriterion("monitor_point_id not between", value1, value2, "monitorPointId");
- return (Criteria) this;
- }
-
- public Criteria andDeviceVersionIdIsNull() {
- addCriterion("device_version_id is null");
- return (Criteria) this;
- }
-
- public Criteria andDeviceVersionIdIsNotNull() {
- addCriterion("device_version_id is not null");
- return (Criteria) this;
- }
-
- public Criteria andDeviceVersionIdEqualTo(Integer value) {
- addCriterion("device_version_id =", value, "deviceVersionId");
- return (Criteria) this;
- }
-
- public Criteria andDeviceVersionIdNotEqualTo(Integer value) {
- addCriterion("device_version_id <>", value, "deviceVersionId");
- return (Criteria) this;
- }
-
- public Criteria andDeviceVersionIdGreaterThan(Integer value) {
- addCriterion("device_version_id >", value, "deviceVersionId");
- return (Criteria) this;
- }
-
- public Criteria andDeviceVersionIdGreaterThanOrEqualTo(Integer value) {
- addCriterion("device_version_id >=", value, "deviceVersionId");
- return (Criteria) this;
- }
-
- public Criteria andDeviceVersionIdLessThan(Integer value) {
- addCriterion("device_version_id <", value, "deviceVersionId");
- return (Criteria) this;
- }
-
- public Criteria andDeviceVersionIdLessThanOrEqualTo(Integer value) {
- addCriterion("device_version_id <=", value, "deviceVersionId");
- return (Criteria) this;
- }
-
- public Criteria andDeviceVersionIdIn(List<Integer> values) {
- addCriterion("device_version_id in", values, "deviceVersionId");
- return (Criteria) this;
- }
-
- public Criteria andDeviceVersionIdNotIn(List<Integer> values) {
- addCriterion("device_version_id not in", values, "deviceVersionId");
- return (Criteria) this;
- }
-
- public Criteria andDeviceVersionIdBetween(Integer value1, Integer value2) {
- addCriterion("device_version_id between", value1, value2, "deviceVersionId");
- return (Criteria) this;
- }
-
- public Criteria andDeviceVersionIdNotBetween(Integer value1, Integer value2) {
- addCriterion("device_version_id not between", value1, value2, "deviceVersionId");
- return (Criteria) this;
- }
- }
-
- /**
- * This class was generated by MyBatis Generator. This class corresponds to the database table device
- * @mbggenerated Wed Nov 29 16:17:59 CST 2017
- */
- 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);
- }
- }
-
- /**
- * This class was generated by MyBatis Generator. This class corresponds to the database table device
- * @mbggenerated do_not_delete_during_merge
- */
- public static class Criteria extends GeneratedCriteria {
- protected Criteria() {
- super();
- }
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/moral/entity/OperateUser.java b/src/main/java/com/moral/entity/OperateUser.java
index 10a6ed5..405d8db 100644
--- a/src/main/java/com/moral/entity/OperateUser.java
+++ b/src/main/java/com/moral/entity/OperateUser.java
@@ -27,5 +27,10 @@
private Date createTime;
private Date expireTime;
+
+ public Integer getUid() {
+ return id;
+ }
+
}
\ No newline at end of file
diff --git a/src/main/java/com/moral/entity/OperateUserExample.java b/src/main/java/com/moral/entity/OperateUserExample.java
deleted file mode 100644
index 3e67a6b..0000000
--- a/src/main/java/com/moral/entity/OperateUserExample.java
+++ /dev/null
@@ -1,931 +0,0 @@
-package com.moral.entity;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-public class OperateUserExample {
- protected String orderByClause;
-
- protected boolean distinct;
-
- protected List<Criteria> oredCriteria;
-
- public OperateUserExample() {
- 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 andJobNumberIsNull() {
- addCriterion("job_number is null");
- return (Criteria) this;
- }
-
- public Criteria andJobNumberIsNotNull() {
- addCriterion("job_number is not null");
- return (Criteria) this;
- }
-
- public Criteria andJobNumberEqualTo(String value) {
- addCriterion("job_number =", value, "jobNumber");
- return (Criteria) this;
- }
-
- public Criteria andJobNumberNotEqualTo(String value) {
- addCriterion("job_number <>", value, "jobNumber");
- return (Criteria) this;
- }
-
- public Criteria andJobNumberGreaterThan(String value) {
- addCriterion("job_number >", value, "jobNumber");
- return (Criteria) this;
- }
-
- public Criteria andJobNumberGreaterThanOrEqualTo(String value) {
- addCriterion("job_number >=", value, "jobNumber");
- return (Criteria) this;
- }
-
- public Criteria andJobNumberLessThan(String value) {
- addCriterion("job_number <", value, "jobNumber");
- return (Criteria) this;
- }
-
- public Criteria andJobNumberLessThanOrEqualTo(String value) {
- addCriterion("job_number <=", value, "jobNumber");
- return (Criteria) this;
- }
-
- public Criteria andJobNumberLike(String value) {
- addCriterion("job_number like", value, "jobNumber");
- return (Criteria) this;
- }
-
- public Criteria andJobNumberNotLike(String value) {
- addCriterion("job_number not like", value, "jobNumber");
- return (Criteria) this;
- }
-
- public Criteria andJobNumberIn(List<String> values) {
- addCriterion("job_number in", values, "jobNumber");
- return (Criteria) this;
- }
-
- public Criteria andJobNumberNotIn(List<String> values) {
- addCriterion("job_number not in", values, "jobNumber");
- return (Criteria) this;
- }
-
- public Criteria andJobNumberBetween(String value1, String value2) {
- addCriterion("job_number between", value1, value2, "jobNumber");
- return (Criteria) this;
- }
-
- public Criteria andJobNumberNotBetween(String value1, String value2) {
- addCriterion("job_number not between", value1, value2, "jobNumber");
- 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 andPasswordIsNull() {
- addCriterion("password is null");
- return (Criteria) this;
- }
-
- public Criteria andPasswordIsNotNull() {
- addCriterion("password is not null");
- return (Criteria) this;
- }
-
- public Criteria andPasswordEqualTo(String value) {
- addCriterion("password =", value, "password");
- return (Criteria) this;
- }
-
- public Criteria andPasswordNotEqualTo(String value) {
- addCriterion("password <>", value, "password");
- return (Criteria) this;
- }
-
- public Criteria andPasswordGreaterThan(String value) {
- addCriterion("password >", value, "password");
- return (Criteria) this;
- }
-
- public Criteria andPasswordGreaterThanOrEqualTo(String value) {
- addCriterion("password >=", value, "password");
- return (Criteria) this;
- }
-
- public Criteria andPasswordLessThan(String value) {
- addCriterion("password <", value, "password");
- return (Criteria) this;
- }
-
- public Criteria andPasswordLessThanOrEqualTo(String value) {
- addCriterion("password <=", value, "password");
- return (Criteria) this;
- }
-
- public Criteria andPasswordLike(String value) {
- addCriterion("password like", value, "password");
- return (Criteria) this;
- }
-
- public Criteria andPasswordNotLike(String value) {
- addCriterion("password not like", value, "password");
- return (Criteria) this;
- }
-
- public Criteria andPasswordIn(List<String> values) {
- addCriterion("password in", values, "password");
- return (Criteria) this;
- }
-
- public Criteria andPasswordNotIn(List<String> values) {
- addCriterion("password not in", values, "password");
- return (Criteria) this;
- }
-
- public Criteria andPasswordBetween(String value1, String value2) {
- addCriterion("password between", value1, value2, "password");
- return (Criteria) this;
- }
-
- public Criteria andPasswordNotBetween(String value1, String value2) {
- addCriterion("password not between", value1, value2, "password");
- return (Criteria) this;
- }
-
- public Criteria andOrganizationIdIsNull() {
- addCriterion("organization_id is null");
- return (Criteria) this;
- }
-
- public Criteria andOrganizationIdIsNotNull() {
- addCriterion("organization_id is not null");
- return (Criteria) this;
- }
-
- public Criteria andOrganizationIdEqualTo(Integer value) {
- addCriterion("organization_id =", value, "organizationId");
- return (Criteria) this;
- }
-
- public Criteria andOrganizationIdNotEqualTo(Integer value) {
- addCriterion("organization_id <>", value, "organizationId");
- return (Criteria) this;
- }
-
- public Criteria andOrganizationIdGreaterThan(Integer value) {
- addCriterion("organization_id >", value, "organizationId");
- return (Criteria) this;
- }
-
- public Criteria andOrganizationIdGreaterThanOrEqualTo(Integer value) {
- addCriterion("organization_id >=", value, "organizationId");
- return (Criteria) this;
- }
-
- public Criteria andOrganizationIdLessThan(Integer value) {
- addCriterion("organization_id <", value, "organizationId");
- return (Criteria) this;
- }
-
- public Criteria andOrganizationIdLessThanOrEqualTo(Integer value) {
- addCriterion("organization_id <=", value, "organizationId");
- return (Criteria) this;
- }
-
- public Criteria andOrganizationIdIn(List<Integer> values) {
- addCriterion("organization_id in", values, "organizationId");
- return (Criteria) this;
- }
-
- public Criteria andOrganizationIdNotIn(List<Integer> values) {
- addCriterion("organization_id not in", values, "organizationId");
- return (Criteria) this;
- }
-
- public Criteria andOrganizationIdBetween(Integer value1, Integer value2) {
- addCriterion("organization_id between", value1, value2, "organizationId");
- return (Criteria) this;
- }
-
- public Criteria andOrganizationIdNotBetween(Integer value1, Integer value2) {
- addCriterion("organization_id not between", value1, value2, "organizationId");
- return (Criteria) this;
- }
-
- public Criteria andMobileIsNull() {
- addCriterion("mobile is null");
- return (Criteria) this;
- }
-
- public Criteria andMobileIsNotNull() {
- addCriterion("mobile is not null");
- return (Criteria) this;
- }
-
- public Criteria andMobileEqualTo(String value) {
- addCriterion("mobile =", value, "mobile");
- return (Criteria) this;
- }
-
- public Criteria andMobileNotEqualTo(String value) {
- addCriterion("mobile <>", value, "mobile");
- return (Criteria) this;
- }
-
- public Criteria andMobileGreaterThan(String value) {
- addCriterion("mobile >", value, "mobile");
- return (Criteria) this;
- }
-
- public Criteria andMobileGreaterThanOrEqualTo(String value) {
- addCriterion("mobile >=", value, "mobile");
- return (Criteria) this;
- }
-
- public Criteria andMobileLessThan(String value) {
- addCriterion("mobile <", value, "mobile");
- return (Criteria) this;
- }
-
- public Criteria andMobileLessThanOrEqualTo(String value) {
- addCriterion("mobile <=", value, "mobile");
- return (Criteria) this;
- }
-
- public Criteria andMobileLike(String value) {
- addCriterion("mobile like", value, "mobile");
- return (Criteria) this;
- }
-
- public Criteria andMobileNotLike(String value) {
- addCriterion("mobile not like", value, "mobile");
- return (Criteria) this;
- }
-
- public Criteria andMobileIn(List<String> values) {
- addCriterion("mobile in", values, "mobile");
- return (Criteria) this;
- }
-
- public Criteria andMobileNotIn(List<String> values) {
- addCriterion("mobile not in", values, "mobile");
- return (Criteria) this;
- }
-
- public Criteria andMobileBetween(String value1, String value2) {
- addCriterion("mobile between", value1, value2, "mobile");
- return (Criteria) this;
- }
-
- public Criteria andMobileNotBetween(String value1, String value2) {
- addCriterion("mobile not between", value1, value2, "mobile");
- return (Criteria) this;
- }
-
- public Criteria andEmailIsNull() {
- addCriterion("email is null");
- return (Criteria) this;
- }
-
- public Criteria andEmailIsNotNull() {
- addCriterion("email is not null");
- return (Criteria) this;
- }
-
- public Criteria andEmailEqualTo(String value) {
- addCriterion("email =", value, "email");
- return (Criteria) this;
- }
-
- public Criteria andEmailNotEqualTo(String value) {
- addCriterion("email <>", value, "email");
- return (Criteria) this;
- }
-
- public Criteria andEmailGreaterThan(String value) {
- addCriterion("email >", value, "email");
- return (Criteria) this;
- }
-
- public Criteria andEmailGreaterThanOrEqualTo(String value) {
- addCriterion("email >=", value, "email");
- return (Criteria) this;
- }
-
- public Criteria andEmailLessThan(String value) {
- addCriterion("email <", value, "email");
- return (Criteria) this;
- }
-
- public Criteria andEmailLessThanOrEqualTo(String value) {
- addCriterion("email <=", value, "email");
- return (Criteria) this;
- }
-
- public Criteria andEmailLike(String value) {
- addCriterion("email like", value, "email");
- return (Criteria) this;
- }
-
- public Criteria andEmailNotLike(String value) {
- addCriterion("email not like", value, "email");
- return (Criteria) this;
- }
-
- public Criteria andEmailIn(List<String> values) {
- addCriterion("email in", values, "email");
- return (Criteria) this;
- }
-
- public Criteria andEmailNotIn(List<String> values) {
- addCriterion("email not in", values, "email");
- return (Criteria) this;
- }
-
- public Criteria andEmailBetween(String value1, String value2) {
- addCriterion("email between", value1, value2, "email");
- return (Criteria) this;
- }
-
- public Criteria andEmailNotBetween(String value1, String value2) {
- addCriterion("email not between", value1, value2, "email");
- return (Criteria) this;
- }
-
- public Criteria andWeixinIsNull() {
- addCriterion("weixin is null");
- return (Criteria) this;
- }
-
- public Criteria andWeixinIsNotNull() {
- addCriterion("weixin is not null");
- return (Criteria) this;
- }
-
- public Criteria andWeixinEqualTo(String value) {
- addCriterion("weixin =", value, "weixin");
- return (Criteria) this;
- }
-
- public Criteria andWeixinNotEqualTo(String value) {
- addCriterion("weixin <>", value, "weixin");
- return (Criteria) this;
- }
-
- public Criteria andWeixinGreaterThan(String value) {
- addCriterion("weixin >", value, "weixin");
- return (Criteria) this;
- }
-
- public Criteria andWeixinGreaterThanOrEqualTo(String value) {
- addCriterion("weixin >=", value, "weixin");
- return (Criteria) this;
- }
-
- public Criteria andWeixinLessThan(String value) {
- addCriterion("weixin <", value, "weixin");
- return (Criteria) this;
- }
-
- public Criteria andWeixinLessThanOrEqualTo(String value) {
- addCriterion("weixin <=", value, "weixin");
- return (Criteria) this;
- }
-
- public Criteria andWeixinLike(String value) {
- addCriterion("weixin like", value, "weixin");
- return (Criteria) this;
- }
-
- public Criteria andWeixinNotLike(String value) {
- addCriterion("weixin not like", value, "weixin");
- return (Criteria) this;
- }
-
- public Criteria andWeixinIn(List<String> values) {
- addCriterion("weixin in", values, "weixin");
- return (Criteria) this;
- }
-
- public Criteria andWeixinNotIn(List<String> values) {
- addCriterion("weixin not in", values, "weixin");
- return (Criteria) this;
- }
-
- public Criteria andWeixinBetween(String value1, String value2) {
- addCriterion("weixin between", value1, value2, "weixin");
- return (Criteria) this;
- }
-
- public Criteria andWeixinNotBetween(String value1, String value2) {
- addCriterion("weixin not between", value1, value2, "weixin");
- return (Criteria) this;
- }
-
- public Criteria andIsDeleteIsNull() {
- addCriterion("is_delete is null");
- return (Criteria) this;
- }
-
- public Criteria andIsDeleteIsNotNull() {
- addCriterion("is_delete is not null");
- return (Criteria) this;
- }
-
- public Criteria andIsDeleteEqualTo(String value) {
- addCriterion("is_delete =", value, "isDelete");
- return (Criteria) this;
- }
-
- public Criteria andIsDeleteNotEqualTo(String value) {
- addCriterion("is_delete <>", value, "isDelete");
- return (Criteria) this;
- }
-
- public Criteria andIsDeleteGreaterThan(String value) {
- addCriterion("is_delete >", value, "isDelete");
- return (Criteria) this;
- }
-
- public Criteria andIsDeleteGreaterThanOrEqualTo(String value) {
- addCriterion("is_delete >=", value, "isDelete");
- return (Criteria) this;
- }
-
- public Criteria andIsDeleteLessThan(String value) {
- addCriterion("is_delete <", value, "isDelete");
- return (Criteria) this;
- }
-
- public Criteria andIsDeleteLessThanOrEqualTo(String value) {
- addCriterion("is_delete <=", value, "isDelete");
- return (Criteria) this;
- }
-
- public Criteria andIsDeleteLike(String value) {
- addCriterion("is_delete like", value, "isDelete");
- return (Criteria) this;
- }
-
- public Criteria andIsDeleteNotLike(String value) {
- addCriterion("is_delete not like", value, "isDelete");
- return (Criteria) this;
- }
-
- public Criteria andIsDeleteIn(List<String> values) {
- addCriterion("is_delete in", values, "isDelete");
- return (Criteria) this;
- }
-
- public Criteria andIsDeleteNotIn(List<String> values) {
- addCriterion("is_delete not in", values, "isDelete");
- return (Criteria) this;
- }
-
- public Criteria andIsDeleteBetween(String value1, String value2) {
- addCriterion("is_delete between", value1, value2, "isDelete");
- return (Criteria) this;
- }
-
- public Criteria andIsDeleteNotBetween(String value1, String value2) {
- addCriterion("is_delete not between", value1, value2, "isDelete");
- 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 andExpireTimeIsNull() {
- addCriterion("expire_time is null");
- return (Criteria) this;
- }
-
- public Criteria andExpireTimeIsNotNull() {
- addCriterion("expire_time is not null");
- return (Criteria) this;
- }
-
- public Criteria andExpireTimeEqualTo(Date value) {
- addCriterion("expire_time =", value, "expireTime");
- return (Criteria) this;
- }
-
- public Criteria andExpireTimeNotEqualTo(Date value) {
- addCriterion("expire_time <>", value, "expireTime");
- return (Criteria) this;
- }
-
- public Criteria andExpireTimeGreaterThan(Date value) {
- addCriterion("expire_time >", value, "expireTime");
- return (Criteria) this;
- }
-
- public Criteria andExpireTimeGreaterThanOrEqualTo(Date value) {
- addCriterion("expire_time >=", value, "expireTime");
- return (Criteria) this;
- }
-
- public Criteria andExpireTimeLessThan(Date value) {
- addCriterion("expire_time <", value, "expireTime");
- return (Criteria) this;
- }
-
- public Criteria andExpireTimeLessThanOrEqualTo(Date value) {
- addCriterion("expire_time <=", value, "expireTime");
- return (Criteria) this;
- }
-
- public Criteria andExpireTimeIn(List<Date> values) {
- addCriterion("expire_time in", values, "expireTime");
- return (Criteria) this;
- }
-
- public Criteria andExpireTimeNotIn(List<Date> values) {
- addCriterion("expire_time not in", values, "expireTime");
- return (Criteria) this;
- }
-
- public Criteria andExpireTimeBetween(Date value1, Date value2) {
- addCriterion("expire_time between", value1, value2, "expireTime");
- return (Criteria) this;
- }
-
- public Criteria andExpireTimeNotBetween(Date value1, Date value2) {
- addCriterion("expire_time not between", value1, value2, "expireTime");
- 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/entity/OrganizationExample.java b/src/main/java/com/moral/entity/OrganizationExample.java
deleted file mode 100644
index d18d01b..0000000
--- a/src/main/java/com/moral/entity/OrganizationExample.java
+++ /dev/null
@@ -1,1041 +0,0 @@
-package com.moral.entity;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-public class OrganizationExample {
- protected String orderByClause;
-
- protected boolean distinct;
-
- protected List<Criteria> oredCriteria;
-
- public OrganizationExample() {
- 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 andRankIsNull() {
- addCriterion("rank is null");
- return (Criteria) this;
- }
-
- public Criteria andRankIsNotNull() {
- addCriterion("rank is not null");
- return (Criteria) this;
- }
-
- public Criteria andRankEqualTo(Integer value) {
- addCriterion("rank =", value, "rank");
- return (Criteria) this;
- }
-
- public Criteria andRankNotEqualTo(Integer value) {
- addCriterion("rank <>", value, "rank");
- return (Criteria) this;
- }
-
- public Criteria andRankGreaterThan(Integer value) {
- addCriterion("rank >", value, "rank");
- return (Criteria) this;
- }
-
- public Criteria andRankGreaterThanOrEqualTo(Integer value) {
- addCriterion("rank >=", value, "rank");
- return (Criteria) this;
- }
-
- public Criteria andRankLessThan(Integer value) {
- addCriterion("rank <", value, "rank");
- return (Criteria) this;
- }
-
- public Criteria andRankLessThanOrEqualTo(Integer value) {
- addCriterion("rank <=", value, "rank");
- return (Criteria) this;
- }
-
- public Criteria andRankIn(List<Integer> values) {
- addCriterion("rank in", values, "rank");
- return (Criteria) this;
- }
-
- public Criteria andRankNotIn(List<Integer> values) {
- addCriterion("rank not in", values, "rank");
- return (Criteria) this;
- }
-
- public Criteria andRankBetween(Integer value1, Integer value2) {
- addCriterion("rank between", value1, value2, "rank");
- return (Criteria) this;
- }
-
- public Criteria andRankNotBetween(Integer value1, Integer value2) {
- addCriterion("rank not between", value1, value2, "rank");
- return (Criteria) this;
- }
-
- public Criteria andProvinceCodeIsNull() {
- addCriterion("province_code is null");
- return (Criteria) this;
- }
-
- public Criteria andProvinceCodeIsNotNull() {
- addCriterion("province_code is not null");
- return (Criteria) this;
- }
-
- public Criteria andProvinceCodeEqualTo(Integer value) {
- addCriterion("province_code =", value, "provinceCode");
- return (Criteria) this;
- }
-
- public Criteria andProvinceCodeNotEqualTo(Integer value) {
- addCriterion("province_code <>", value, "provinceCode");
- return (Criteria) this;
- }
-
- public Criteria andProvinceCodeGreaterThan(Integer value) {
- addCriterion("province_code >", value, "provinceCode");
- return (Criteria) this;
- }
-
- public Criteria andProvinceCodeGreaterThanOrEqualTo(Integer value) {
- addCriterion("province_code >=", value, "provinceCode");
- return (Criteria) this;
- }
-
- public Criteria andProvinceCodeLessThan(Integer value) {
- addCriterion("province_code <", value, "provinceCode");
- return (Criteria) this;
- }
-
- public Criteria andProvinceCodeLessThanOrEqualTo(Integer value) {
- addCriterion("province_code <=", value, "provinceCode");
- return (Criteria) this;
- }
-
- public Criteria andProvinceCodeIn(List<Integer> values) {
- addCriterion("province_code in", values, "provinceCode");
- return (Criteria) this;
- }
-
- public Criteria andProvinceCodeNotIn(List<Integer> values) {
- addCriterion("province_code not in", values, "provinceCode");
- return (Criteria) this;
- }
-
- public Criteria andProvinceCodeBetween(Integer value1, Integer value2) {
- addCriterion("province_code between", value1, value2, "provinceCode");
- return (Criteria) this;
- }
-
- public Criteria andProvinceCodeNotBetween(Integer value1, Integer value2) {
- addCriterion("province_code not between", value1, value2, "provinceCode");
- return (Criteria) this;
- }
-
- public Criteria andCityCodeIsNull() {
- addCriterion("city_code is null");
- return (Criteria) this;
- }
-
- public Criteria andCityCodeIsNotNull() {
- addCriterion("city_code is not null");
- return (Criteria) this;
- }
-
- public Criteria andCityCodeEqualTo(Integer value) {
- addCriterion("city_code =", value, "cityCode");
- return (Criteria) this;
- }
-
- public Criteria andCityCodeNotEqualTo(Integer value) {
- addCriterion("city_code <>", value, "cityCode");
- return (Criteria) this;
- }
-
- public Criteria andCityCodeGreaterThan(Integer value) {
- addCriterion("city_code >", value, "cityCode");
- return (Criteria) this;
- }
-
- public Criteria andCityCodeGreaterThanOrEqualTo(Integer value) {
- addCriterion("city_code >=", value, "cityCode");
- return (Criteria) this;
- }
-
- public Criteria andCityCodeLessThan(Integer value) {
- addCriterion("city_code <", value, "cityCode");
- return (Criteria) this;
- }
-
- public Criteria andCityCodeLessThanOrEqualTo(Integer value) {
- addCriterion("city_code <=", value, "cityCode");
- return (Criteria) this;
- }
-
- public Criteria andCityCodeIn(List<Integer> values) {
- addCriterion("city_code in", values, "cityCode");
- return (Criteria) this;
- }
-
- public Criteria andCityCodeNotIn(List<Integer> values) {
- addCriterion("city_code not in", values, "cityCode");
- return (Criteria) this;
- }
-
- public Criteria andCityCodeBetween(Integer value1, Integer value2) {
- addCriterion("city_code between", value1, value2, "cityCode");
- return (Criteria) this;
- }
-
- public Criteria andCityCodeNotBetween(Integer value1, Integer value2) {
- addCriterion("city_code not between", value1, value2, "cityCode");
- return (Criteria) this;
- }
-
- public Criteria andAreaCodeIsNull() {
- addCriterion("area_code is null");
- return (Criteria) this;
- }
-
- public Criteria andAreaCodeIsNotNull() {
- addCriterion("area_code is not null");
- return (Criteria) this;
- }
-
- public Criteria andAreaCodeEqualTo(Integer value) {
- addCriterion("area_code =", value, "areaCode");
- return (Criteria) this;
- }
-
- public Criteria andAreaCodeNotEqualTo(Integer value) {
- addCriterion("area_code <>", value, "areaCode");
- return (Criteria) this;
- }
-
- public Criteria andAreaCodeGreaterThan(Integer value) {
- addCriterion("area_code >", value, "areaCode");
- return (Criteria) this;
- }
-
- public Criteria andAreaCodeGreaterThanOrEqualTo(Integer value) {
- addCriterion("area_code >=", value, "areaCode");
- return (Criteria) this;
- }
-
- public Criteria andAreaCodeLessThan(Integer value) {
- addCriterion("area_code <", value, "areaCode");
- return (Criteria) this;
- }
-
- public Criteria andAreaCodeLessThanOrEqualTo(Integer value) {
- addCriterion("area_code <=", value, "areaCode");
- return (Criteria) this;
- }
-
- public Criteria andAreaCodeIn(List<Integer> values) {
- addCriterion("area_code in", values, "areaCode");
- return (Criteria) this;
- }
-
- public Criteria andAreaCodeNotIn(List<Integer> values) {
- addCriterion("area_code not in", values, "areaCode");
- return (Criteria) this;
- }
-
- public Criteria andAreaCodeBetween(Integer value1, Integer value2) {
- addCriterion("area_code between", value1, value2, "areaCode");
- return (Criteria) this;
- }
-
- public Criteria andAreaCodeNotBetween(Integer value1, Integer value2) {
- addCriterion("area_code 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 andTelephoneIsNull() {
- addCriterion("telephone is null");
- return (Criteria) this;
- }
-
- public Criteria andTelephoneIsNotNull() {
- addCriterion("telephone is not null");
- return (Criteria) this;
- }
-
- public Criteria andTelephoneEqualTo(String value) {
- addCriterion("telephone =", value, "telephone");
- return (Criteria) this;
- }
-
- public Criteria andTelephoneNotEqualTo(String value) {
- addCriterion("telephone <>", value, "telephone");
- return (Criteria) this;
- }
-
- public Criteria andTelephoneGreaterThan(String value) {
- addCriterion("telephone >", value, "telephone");
- return (Criteria) this;
- }
-
- public Criteria andTelephoneGreaterThanOrEqualTo(String value) {
- addCriterion("telephone >=", value, "telephone");
- return (Criteria) this;
- }
-
- public Criteria andTelephoneLessThan(String value) {
- addCriterion("telephone <", value, "telephone");
- return (Criteria) this;
- }
-
- public Criteria andTelephoneLessThanOrEqualTo(String value) {
- addCriterion("telephone <=", value, "telephone");
- return (Criteria) this;
- }
-
- public Criteria andTelephoneLike(String value) {
- addCriterion("telephone like", value, "telephone");
- return (Criteria) this;
- }
-
- public Criteria andTelephoneNotLike(String value) {
- addCriterion("telephone not like", value, "telephone");
- return (Criteria) this;
- }
-
- public Criteria andTelephoneIn(List<String> values) {
- addCriterion("telephone in", values, "telephone");
- return (Criteria) this;
- }
-
- public Criteria andTelephoneNotIn(List<String> values) {
- addCriterion("telephone not in", values, "telephone");
- return (Criteria) this;
- }
-
- public Criteria andTelephoneBetween(String value1, String value2) {
- addCriterion("telephone between", value1, value2, "telephone");
- return (Criteria) this;
- }
-
- public Criteria andTelephoneNotBetween(String value1, String value2) {
- addCriterion("telephone not between", value1, value2, "telephone");
- return (Criteria) this;
- }
-
- public Criteria andEmailIsNull() {
- addCriterion("email is null");
- return (Criteria) this;
- }
-
- public Criteria andEmailIsNotNull() {
- addCriterion("email is not null");
- return (Criteria) this;
- }
-
- public Criteria andEmailEqualTo(String value) {
- addCriterion("email =", value, "email");
- return (Criteria) this;
- }
-
- public Criteria andEmailNotEqualTo(String value) {
- addCriterion("email <>", value, "email");
- return (Criteria) this;
- }
-
- public Criteria andEmailGreaterThan(String value) {
- addCriterion("email >", value, "email");
- return (Criteria) this;
- }
-
- public Criteria andEmailGreaterThanOrEqualTo(String value) {
- addCriterion("email >=", value, "email");
- return (Criteria) this;
- }
-
- public Criteria andEmailLessThan(String value) {
- addCriterion("email <", value, "email");
- return (Criteria) this;
- }
-
- public Criteria andEmailLessThanOrEqualTo(String value) {
- addCriterion("email <=", value, "email");
- return (Criteria) this;
- }
-
- public Criteria andEmailLike(String value) {
- addCriterion("email like", value, "email");
- return (Criteria) this;
- }
-
- public Criteria andEmailNotLike(String value) {
- addCriterion("email not like", value, "email");
- return (Criteria) this;
- }
-
- public Criteria andEmailIn(List<String> values) {
- addCriterion("email in", values, "email");
- return (Criteria) this;
- }
-
- public Criteria andEmailNotIn(List<String> values) {
- addCriterion("email not in", values, "email");
- return (Criteria) this;
- }
-
- public Criteria andEmailBetween(String value1, String value2) {
- addCriterion("email between", value1, value2, "email");
- return (Criteria) this;
- }
-
- public Criteria andEmailNotBetween(String value1, String value2) {
- addCriterion("email not between", value1, value2, "email");
- return (Criteria) this;
- }
-
- public Criteria andIsDeleteIsNull() {
- addCriterion("is_delete is null");
- return (Criteria) this;
- }
-
- public Criteria andIsDeleteIsNotNull() {
- addCriterion("is_delete is not null");
- return (Criteria) this;
- }
-
- public Criteria andIsDeleteEqualTo(String value) {
- addCriterion("is_delete =", value, "isDelete");
- return (Criteria) this;
- }
-
- public Criteria andIsDeleteNotEqualTo(String value) {
- addCriterion("is_delete <>", value, "isDelete");
- return (Criteria) this;
- }
-
- public Criteria andIsDeleteGreaterThan(String value) {
- addCriterion("is_delete >", value, "isDelete");
- return (Criteria) this;
- }
-
- public Criteria andIsDeleteGreaterThanOrEqualTo(String value) {
- addCriterion("is_delete >=", value, "isDelete");
- return (Criteria) this;
- }
-
- public Criteria andIsDeleteLessThan(String value) {
- addCriterion("is_delete <", value, "isDelete");
- return (Criteria) this;
- }
-
- public Criteria andIsDeleteLessThanOrEqualTo(String value) {
- addCriterion("is_delete <=", value, "isDelete");
- return (Criteria) this;
- }
-
- public Criteria andIsDeleteLike(String value) {
- addCriterion("is_delete like", value, "isDelete");
- return (Criteria) this;
- }
-
- public Criteria andIsDeleteNotLike(String value) {
- addCriterion("is_delete not like", value, "isDelete");
- return (Criteria) this;
- }
-
- public Criteria andIsDeleteIn(List<String> values) {
- addCriterion("is_delete in", values, "isDelete");
- return (Criteria) this;
- }
-
- public Criteria andIsDeleteNotIn(List<String> values) {
- addCriterion("is_delete not in", values, "isDelete");
- return (Criteria) this;
- }
-
- public Criteria andIsDeleteBetween(String value1, String value2) {
- addCriterion("is_delete between", value1, value2, "isDelete");
- return (Criteria) this;
- }
-
- public Criteria andIsDeleteNotBetween(String value1, String value2) {
- addCriterion("is_delete not between", value1, value2, "isDelete");
- 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 andExpireTimeIsNull() {
- addCriterion("expire_time is null");
- return (Criteria) this;
- }
-
- public Criteria andExpireTimeIsNotNull() {
- addCriterion("expire_time is not null");
- return (Criteria) this;
- }
-
- public Criteria andExpireTimeEqualTo(Date value) {
- addCriterion("expire_time =", value, "expireTime");
- return (Criteria) this;
- }
-
- public Criteria andExpireTimeNotEqualTo(Date value) {
- addCriterion("expire_time <>", value, "expireTime");
- return (Criteria) this;
- }
-
- public Criteria andExpireTimeGreaterThan(Date value) {
- addCriterion("expire_time >", value, "expireTime");
- return (Criteria) this;
- }
-
- public Criteria andExpireTimeGreaterThanOrEqualTo(Date value) {
- addCriterion("expire_time >=", value, "expireTime");
- return (Criteria) this;
- }
-
- public Criteria andExpireTimeLessThan(Date value) {
- addCriterion("expire_time <", value, "expireTime");
- return (Criteria) this;
- }
-
- public Criteria andExpireTimeLessThanOrEqualTo(Date value) {
- addCriterion("expire_time <=", value, "expireTime");
- return (Criteria) this;
- }
-
- public Criteria andExpireTimeIn(List<Date> values) {
- addCriterion("expire_time in", values, "expireTime");
- return (Criteria) this;
- }
-
- public Criteria andExpireTimeNotIn(List<Date> values) {
- addCriterion("expire_time not in", values, "expireTime");
- return (Criteria) this;
- }
-
- public Criteria andExpireTimeBetween(Date value1, Date value2) {
- addCriterion("expire_time between", value1, value2, "expireTime");
- return (Criteria) this;
- }
-
- public Criteria andExpireTimeNotBetween(Date value1, Date value2) {
- addCriterion("expire_time not between", value1, value2, "expireTime");
- return (Criteria) this;
- }
-
- public Criteria andDescriptionIsNull() {
- addCriterion("description is null");
- return (Criteria) this;
- }
-
- public Criteria andDescriptionIsNotNull() {
- addCriterion("description is not null");
- return (Criteria) this;
- }
-
- public Criteria andDescriptionEqualTo(String value) {
- addCriterion("description =", value, "description");
- return (Criteria) this;
- }
-
- public Criteria andDescriptionNotEqualTo(String value) {
- addCriterion("description <>", value, "description");
- return (Criteria) this;
- }
-
- public Criteria andDescriptionGreaterThan(String value) {
- addCriterion("description >", value, "description");
- return (Criteria) this;
- }
-
- public Criteria andDescriptionGreaterThanOrEqualTo(String value) {
- addCriterion("description >=", value, "description");
- return (Criteria) this;
- }
-
- public Criteria andDescriptionLessThan(String value) {
- addCriterion("description <", value, "description");
- return (Criteria) this;
- }
-
- public Criteria andDescriptionLessThanOrEqualTo(String value) {
- addCriterion("description <=", value, "description");
- return (Criteria) this;
- }
-
- public Criteria andDescriptionLike(String value) {
- addCriterion("description like", value, "description");
- return (Criteria) this;
- }
-
- public Criteria andDescriptionNotLike(String value) {
- addCriterion("description not like", value, "description");
- return (Criteria) this;
- }
-
- public Criteria andDescriptionIn(List<String> values) {
- addCriterion("description in", values, "description");
- return (Criteria) this;
- }
-
- public Criteria andDescriptionNotIn(List<String> values) {
- addCriterion("description not in", values, "description");
- return (Criteria) this;
- }
-
- public Criteria andDescriptionBetween(String value1, String value2) {
- addCriterion("description between", value1, value2, "description");
- return (Criteria) this;
- }
-
- public Criteria andDescriptionNotBetween(String value1, String value2) {
- addCriterion("description not between", value1, value2, "description");
- 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/entity/OrganizationRelationExample.java b/src/main/java/com/moral/entity/OrganizationRelationExample.java
deleted file mode 100644
index 6367c29..0000000
--- a/src/main/java/com/moral/entity/OrganizationRelationExample.java
+++ /dev/null
@@ -1,380 +0,0 @@
-package com.moral.entity;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class OrganizationRelationExample {
- protected String orderByClause;
-
- protected boolean distinct;
-
- protected List<Criteria> oredCriteria;
-
- public OrganizationRelationExample() {
- 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 andParentIdIsNull() {
- addCriterion("parent_id is null");
- return (Criteria) this;
- }
-
- public Criteria andParentIdIsNotNull() {
- addCriterion("parent_id is not null");
- return (Criteria) this;
- }
-
- public Criteria andParentIdEqualTo(Integer value) {
- addCriterion("parent_id =", value, "parentId");
- return (Criteria) this;
- }
-
- public Criteria andParentIdNotEqualTo(Integer value) {
- addCriterion("parent_id <>", value, "parentId");
- return (Criteria) this;
- }
-
- public Criteria andParentIdGreaterThan(Integer value) {
- addCriterion("parent_id >", value, "parentId");
- return (Criteria) this;
- }
-
- public Criteria andParentIdGreaterThanOrEqualTo(Integer value) {
- addCriterion("parent_id >=", value, "parentId");
- return (Criteria) this;
- }
-
- public Criteria andParentIdLessThan(Integer value) {
- addCriterion("parent_id <", value, "parentId");
- return (Criteria) this;
- }
-
- public Criteria andParentIdLessThanOrEqualTo(Integer value) {
- addCriterion("parent_id <=", value, "parentId");
- return (Criteria) this;
- }
-
- public Criteria andParentIdIn(List<Integer> values) {
- addCriterion("parent_id in", values, "parentId");
- return (Criteria) this;
- }
-
- public Criteria andParentIdNotIn(List<Integer> values) {
- addCriterion("parent_id not in", values, "parentId");
- return (Criteria) this;
- }
-
- public Criteria andParentIdBetween(Integer value1, Integer value2) {
- addCriterion("parent_id between", value1, value2, "parentId");
- return (Criteria) this;
- }
-
- public Criteria andParentIdNotBetween(Integer value1, Integer value2) {
- addCriterion("parent_id not between", value1, value2, "parentId");
- return (Criteria) this;
- }
-
- public Criteria andChildIdIsNull() {
- addCriterion("child_id is null");
- return (Criteria) this;
- }
-
- public Criteria andChildIdIsNotNull() {
- addCriterion("child_id is not null");
- return (Criteria) this;
- }
-
- public Criteria andChildIdEqualTo(Integer value) {
- addCriterion("child_id =", value, "childId");
- return (Criteria) this;
- }
-
- public Criteria andChildIdNotEqualTo(Integer value) {
- addCriterion("child_id <>", value, "childId");
- return (Criteria) this;
- }
-
- public Criteria andChildIdGreaterThan(Integer value) {
- addCriterion("child_id >", value, "childId");
- return (Criteria) this;
- }
-
- public Criteria andChildIdGreaterThanOrEqualTo(Integer value) {
- addCriterion("child_id >=", value, "childId");
- return (Criteria) this;
- }
-
- public Criteria andChildIdLessThan(Integer value) {
- addCriterion("child_id <", value, "childId");
- return (Criteria) this;
- }
-
- public Criteria andChildIdLessThanOrEqualTo(Integer value) {
- addCriterion("child_id <=", value, "childId");
- return (Criteria) this;
- }
-
- public Criteria andChildIdIn(List<Integer> values) {
- addCriterion("child_id in", values, "childId");
- return (Criteria) this;
- }
-
- public Criteria andChildIdNotIn(List<Integer> values) {
- addCriterion("child_id not in", values, "childId");
- return (Criteria) this;
- }
-
- public Criteria andChildIdBetween(Integer value1, Integer value2) {
- addCriterion("child_id between", value1, value2, "childId");
- return (Criteria) this;
- }
-
- public Criteria andChildIdNotBetween(Integer value1, Integer value2) {
- addCriterion("child_id not between", value1, value2, "childId");
- 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/mapper/AccountMapper.java b/src/main/java/com/moral/mapper/AccountMapper.java
index 6d2c135..22aaf08 100644
--- a/src/main/java/com/moral/mapper/AccountMapper.java
+++ b/src/main/java/com/moral/mapper/AccountMapper.java
@@ -3,14 +3,10 @@
import java.util.List;
import java.util.Map;
-import org.apache.ibatis.annotations.Mapper;
-
import com.moral.common.mapper.BaseMapper;
import com.moral.entity.Account;
-import com.moral.entity.AccountExample;
-@Mapper
-public interface AccountMapper extends BaseMapper<Account, AccountExample, Integer> {
+public interface AccountMapper extends BaseMapper<Account> {
List<Map<String, Object>> getRoleNameByAccountId(Integer accountId);
}
\ No newline at end of file
diff --git a/src/main/java/com/moral/mapper/DeviceMapper.java b/src/main/java/com/moral/mapper/DeviceMapper.java
index ee2a7f9..f4ce1f4 100644
--- a/src/main/java/com/moral/mapper/DeviceMapper.java
+++ b/src/main/java/com/moral/mapper/DeviceMapper.java
@@ -3,15 +3,12 @@
import java.util.List;
import java.util.Map;
-import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import com.moral.common.mapper.BaseMapper;
import com.moral.entity.Device;
-import com.moral.entity.DeviceExample;
-@Mapper
-public interface DeviceMapper extends BaseMapper<Device, DeviceExample, Integer>{
+public interface DeviceMapper extends BaseMapper<Device>{
List<Map<String, Object>> getDeviceStatesByAccount(Map<String, Object> parameters);
diff --git a/src/main/java/com/moral/mapper/HistoryMapper.java b/src/main/java/com/moral/mapper/HistoryMapper.java
index 8fecdda..2247950 100644
--- a/src/main/java/com/moral/mapper/HistoryMapper.java
+++ b/src/main/java/com/moral/mapper/HistoryMapper.java
@@ -3,9 +3,6 @@
import java.util.List;
import java.util.Map;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
public interface HistoryMapper{
Map<String, Double> getDayAQIByDevice(Map<String, Object> parameters);
diff --git a/src/main/java/com/moral/mapper/OperateUserMapper.java b/src/main/java/com/moral/mapper/OperateUserMapper.java
index b8b4008..5c1bdbc 100644
--- a/src/main/java/com/moral/mapper/OperateUserMapper.java
+++ b/src/main/java/com/moral/mapper/OperateUserMapper.java
@@ -1,11 +1,7 @@
package com.moral.mapper;
-import org.apache.ibatis.annotations.Mapper;
-
import com.moral.common.mapper.BaseMapper;
import com.moral.entity.OperateUser;
-import com.moral.entity.OperateUserExample;
-@Mapper
-public interface OperateUserMapper extends BaseMapper<OperateUser, OperateUserExample, Integer> {
+public interface OperateUserMapper extends BaseMapper<OperateUser> {
}
\ No newline at end of file
diff --git a/src/main/java/com/moral/mapper/OrganizationMapper.java b/src/main/java/com/moral/mapper/OrganizationMapper.java
index 1f93400..f0ce07d 100644
--- a/src/main/java/com/moral/mapper/OrganizationMapper.java
+++ b/src/main/java/com/moral/mapper/OrganizationMapper.java
@@ -1,11 +1,7 @@
package com.moral.mapper;
-import org.apache.ibatis.annotations.Mapper;
-
import com.moral.common.mapper.BaseMapper;
import com.moral.entity.Organization;
-import com.moral.entity.OrganizationExample;
-@Mapper
-public interface OrganizationMapper extends BaseMapper<Organization, OrganizationExample, Integer> {
+public interface OrganizationMapper extends BaseMapper<Organization> {
}
\ No newline at end of file
diff --git a/src/main/java/com/moral/mapper/OrganizationRelationMapper.java b/src/main/java/com/moral/mapper/OrganizationRelationMapper.java
index 4fa020c..d72c0aa 100644
--- a/src/main/java/com/moral/mapper/OrganizationRelationMapper.java
+++ b/src/main/java/com/moral/mapper/OrganizationRelationMapper.java
@@ -1,11 +1,7 @@
package com.moral.mapper;
-import org.apache.ibatis.annotations.Mapper;
-
import com.moral.common.mapper.BaseMapper;
import com.moral.entity.OrganizationRelation;
-import com.moral.entity.OrganizationRelationExample;
-@Mapper
-public interface OrganizationRelationMapper extends BaseMapper<OrganizationRelation, OrganizationRelationExample, Integer> {
+public interface OrganizationRelationMapper extends BaseMapper<OrganizationRelation> {
}
\ No newline at end of file
diff --git a/src/main/java/com/moral/mapper/UserMapper.java b/src/main/java/com/moral/mapper/UserMapper.java
index 4e611a6..d8af37d 100644
--- a/src/main/java/com/moral/mapper/UserMapper.java
+++ b/src/main/java/com/moral/mapper/UserMapper.java
@@ -1,7 +1,7 @@
package com.moral.mapper;
import com.moral.entity.auth.AuthUser;
-import org.apache.ibatis.annotations.Mapper;
+//import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
//@Mapper
diff --git a/src/main/java/com/moral/service/DeviceService.java b/src/main/java/com/moral/service/DeviceService.java
index 4e0da7e..b0f9d49 100644
--- a/src/main/java/com/moral/service/DeviceService.java
+++ b/src/main/java/com/moral/service/DeviceService.java
@@ -3,9 +3,15 @@
import java.util.List;
import java.util.Map;
+import com.moral.entity.Device;
+
public interface DeviceService {
Map<String, Object> getDeviceStatesByAccount(Map<String, Object> parameters);
List<Map<String, Object>> getSensorsByDevice(String mac);
+
+ void saveOrUpdateDevice(Device device);
+
+ List<Device> getInstallDevicesByOperateUser(Integer uid, Integer pageIndex, Integer pageSize);
}
diff --git a/src/main/java/com/moral/service/OperateUserService.java b/src/main/java/com/moral/service/OperateUserService.java
index 42b4845..8c24053 100644
--- a/src/main/java/com/moral/service/OperateUserService.java
+++ b/src/main/java/com/moral/service/OperateUserService.java
@@ -7,5 +7,9 @@
public interface OperateUserService {
List<OperateUser> getUserList(String mobile);
+
+ OperateUser mobileLogin(String mobile, String password);
+
+ OperateUser updatePassword(Integer uid, String password, String newPassword);
}
diff --git a/src/main/java/com/moral/service/impl/AccountServiceImpl.java b/src/main/java/com/moral/service/impl/AccountServiceImpl.java
index 7d414c8..4993b3c 100644
--- a/src/main/java/com/moral/service/impl/AccountServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/AccountServiceImpl.java
@@ -18,10 +18,11 @@
import com.moral.common.exception.BusinessException;
import com.moral.entity.Account;
-import com.moral.entity.AccountExample;
import com.moral.mapper.AccountMapper;
import com.moral.service.AccountService;
import com.moral.service.OrganizationService;
+
+import tk.mybatis.mapper.entity.Example;
@Service
public class AccountServiceImpl implements AccountService {
@@ -35,9 +36,9 @@
@Override
public Map<String, Object> screenLogin(Map<String, Object> parameters) {
Map<String, Object> result = new HashMap<String, Object>();
- AccountExample example = new AccountExample();
+ Example example = new Example(Account.class);
String password = md5((String) parameters.get("account"));
- example.or().andAccountNameEqualTo((String) parameters.get("account")).andPasswordEqualTo(password);
+ example.or().andEqualTo("accountName",parameters.get("account")).andEqualTo("password",password);
List<Account> accounts = accountMapper.selectByExample(example);
if (isEmpty(accounts) || accounts.size() != 1) {
result.put("msg", "���������������������������������");
@@ -56,15 +57,15 @@
@Override
public List<Account> getAccountLists(String accountName, String password) {
- AccountExample example = new AccountExample();
- example.or().andAccountNameEqualTo(accountName).andPasswordEqualTo(password);
+ Example example = new Example(Account.class);
+ example.or().andEqualTo("accountName",accountName).andEqualTo("password",password);
return accountMapper.selectByExample(example);
}
@Override
public List<Account> getAccountList(String accountName) {
- AccountExample example = new AccountExample();
- example.or().andAccountNameEqualTo(accountName);
+ Example example = new Example(Account.class);
+ example.or().andEqualTo("accountName",accountName);
return accountMapper.selectByExample(example);
}
diff --git a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
index 828e58d..b21b0af 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -1,5 +1,6 @@
package com.moral.service.impl;
+import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -7,10 +8,17 @@
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+import com.github.pagehelper.PageHelper;
+import com.moral.common.exception.BusinessException;
+import com.moral.common.util.ValidateUtil;
+import com.moral.entity.Device;
import com.moral.mapper.DeviceMapper;
import com.moral.service.AccountService;
import com.moral.service.DeviceService;
+
+import tk.mybatis.mapper.entity.Example;
@Service
public class DeviceServiceImpl implements DeviceService {
@@ -53,4 +61,34 @@
return deviceMapper.getSensorsByDevice(mac);
}
+ @Override
+ public void saveOrUpdateDevice(Device device) {
+ ValidateUtil.notNull(device, "������������������");
+ ValidateUtil.notEmpty(device.getMac(), "������������������");
+ Example example = new Example(Device.class);
+ example.or().andEqualTo("mac",device.getMac());
+ List<Device> devices = deviceMapper.selectByExample(example);
+ Date operateDate = new Date();
+ device.setInstallTime(operateDate);
+ if (ObjectUtils.isEmpty(devices)) {
+ device.setCreateTime(operateDate);
+ device.setState("4");
+ deviceMapper.insertSelective(device);
+ }else if (devices.size() > 1) {
+ throw new BusinessException("���������������������������������������");
+ }else {
+ device.setId(devices.get(0).getId());
+ deviceMapper.updateByPrimaryKeySelective(device);
+ }
+ }
+
+ @Override
+ public List<Device> getInstallDevicesByOperateUser(Integer uid, Integer pageIndex, Integer pageSize) {
+ Example example = new Example(Device.class);
+ example.or().andEqualTo("operateUserId",uid);
+ PageHelper.startPage(pageIndex, pageSize);
+ List<Device> devices = deviceMapper.selectByExample(example);
+ return devices;
+ }
+
}
diff --git a/src/main/java/com/moral/service/impl/HistoryServiceImpl.java b/src/main/java/com/moral/service/impl/HistoryServiceImpl.java
index 394a69c..e20f449 100644
--- a/src/main/java/com/moral/service/impl/HistoryServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HistoryServiceImpl.java
@@ -22,7 +22,6 @@
import javax.annotation.Resource;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.aggregation.Aggregation;
import org.springframework.data.mongodb.core.aggregation.AggregationResults;
diff --git a/src/main/java/com/moral/service/impl/OperateUserServiceImpl.java b/src/main/java/com/moral/service/impl/OperateUserServiceImpl.java
index b8a83d9..f574667 100644
--- a/src/main/java/com/moral/service/impl/OperateUserServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/OperateUserServiceImpl.java
@@ -5,11 +5,15 @@
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+import com.moral.common.exception.BusinessException;
+import com.moral.common.util.Crypto;
import com.moral.entity.OperateUser;
-import com.moral.entity.OperateUserExample;
import com.moral.mapper.OperateUserMapper;
import com.moral.service.OperateUserService;
+
+import tk.mybatis.mapper.entity.Example;
@Service
public class OperateUserServiceImpl implements OperateUserService {
@@ -19,9 +23,36 @@
@Override
public List<OperateUser> getUserList(String mobile) {
- OperateUserExample example = new OperateUserExample();
- example.or().andMobileEqualTo(mobile);
+ Example example = new Example(OperateUser.class);
+ example.or().andEqualTo("mobile", mobile);
return operateUserMapper.selectByExample(example);
}
+ @Override
+ public OperateUser mobileLogin(String mobile, String password) {
+ Example example = new Example(OperateUser.class);
+ example.or().andEqualTo("mobile", mobile).andEqualTo("password", Crypto.md5(password));
+ List<OperateUser> operateUsers = operateUserMapper.selectByExample(example);
+ if (ObjectUtils.isEmpty(operateUsers) || operateUsers.size() > 1) {
+ throw new BusinessException("������������������������,���������������");
+ }else {
+ OperateUser operateUser = operateUsers.get(0);
+ operateUser.setPassword(password);
+ return operateUser;
+ }
+ }
+
+ @Override
+ public OperateUser updatePassword(Integer uid, String password, String newPassword) {
+ OperateUser operateUser = operateUserMapper.selectByPrimaryKey(uid);
+ if (ObjectUtils.isEmpty(operateUser) || !Crypto.md5(password).equals(operateUser.getPassword())) {
+ throw new BusinessException("���������������,���������������������");
+ }else {
+ operateUser.setPassword(Crypto.md5(newPassword));
+ operateUserMapper.updateByPrimaryKeySelective(operateUser);
+ operateUser.setPassword(newPassword);
+ return operateUser;
+ }
+ }
+
}
diff --git a/src/main/java/com/moral/service/impl/OrganizationServiceImpl.java b/src/main/java/com/moral/service/impl/OrganizationServiceImpl.java
index c572a32..a262729 100644
--- a/src/main/java/com/moral/service/impl/OrganizationServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/OrganizationServiceImpl.java
@@ -12,10 +12,11 @@
import com.moral.entity.Organization;
import com.moral.entity.OrganizationRelation;
-import com.moral.entity.OrganizationRelationExample;
import com.moral.mapper.OrganizationMapper;
import com.moral.mapper.OrganizationRelationMapper;
import com.moral.service.OrganizationService;
+
+import tk.mybatis.mapper.entity.Example;
@Service
public class OrganizationServiceImpl implements OrganizationService {
@@ -30,8 +31,8 @@
public Set<Integer> getChildOrganizationIds(Integer orgId){
Set<Integer> orgIds = new HashSet<Integer>();
orgIds.add(orgId);
- OrganizationRelationExample example = new OrganizationRelationExample();
- example.or().andParentIdEqualTo(orgId);
+ Example example = new Example(OrganizationRelation.class);
+ example.or().andEqualTo("parentId",orgId);
Organization organization = organizationMapper.selectByPrimaryKey(orgId);
if (IS_DELETE_FALSE.equals(organization.getIsDelete())) {
List<OrganizationRelation> organizationRelations = organizationRelationMapper.selectByExample(example);
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 6eaebf7..aa91078 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -59,8 +59,8 @@
data:
mongodb:
- uri: mongodb://47.96.26.152:27017/monitor
+ uri: mongodb://47.96.171.62:27017/monitor
-mybatis:
- mapper-locations: classpath*:/mapper/*Mapper.xml
- type-aliases-package: com.moral.entity
\ No newline at end of file
+#mybatis:
+# mapper-locations: classpath*:/mapper/*Mapper.xml
+# type-aliases-package: com.moral.entity
\ No newline at end of file
diff --git a/src/main/resources/mapper/AccountMapper.xml b/src/main/resources/mapper/AccountMapper.xml
index 6279878..8545989 100644
--- a/src/main/resources/mapper/AccountMapper.xml
+++ b/src/main/resources/mapper/AccountMapper.xml
@@ -13,281 +13,6 @@
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="expire_time" jdbcType="TIMESTAMP" property="expireTime" />
</resultMap>
- <sql id="Example_Where_Clause">
- <where>
- <foreach collection="oredCriteria" item="criteria" separator="or">
- <if test="criteria.valid">
- <trim prefix="(" prefixOverrides="and" suffix=")">
- <foreach collection="criteria.criteria" item="criterion">
- <choose>
- <when test="criterion.noValue">
- and ${criterion.condition}
- </when>
- <when test="criterion.singleValue">
- and ${criterion.condition} #{criterion.value}
- </when>
- <when test="criterion.betweenValue">
- and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
- </when>
- <when test="criterion.listValue">
- and ${criterion.condition}
- <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
- #{listItem}
- </foreach>
- </when>
- </choose>
- </foreach>
- </trim>
- </if>
- </foreach>
- </where>
- </sql>
- <sql id="Update_By_Example_Where_Clause">
- <where>
- <foreach collection="example.oredCriteria" item="criteria" separator="or">
- <if test="criteria.valid">
- <trim prefix="(" prefixOverrides="and" suffix=")">
- <foreach collection="criteria.criteria" item="criterion">
- <choose>
- <when test="criterion.noValue">
- and ${criterion.condition}
- </when>
- <when test="criterion.singleValue">
- and ${criterion.condition} #{criterion.value}
- </when>
- <when test="criterion.betweenValue">
- and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
- </when>
- <when test="criterion.listValue">
- and ${criterion.condition}
- <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
- #{listItem}
- </foreach>
- </when>
- </choose>
- </foreach>
- </trim>
- </if>
- </foreach>
- </where>
- </sql>
- <sql id="Base_Column_List">
- id, account_name, password, organization_id, email, mobile, weixin, is_delete, create_time,
- expire_time
- </sql>
- <select id="selectByExample" parameterType="com.moral.entity.AccountExample" resultMap="BaseResultMap">
- select
- <if test="distinct">
- distinct
- </if>
- <include refid="Base_Column_List" />
- from account
- <if test="_parameter != null">
- <include refid="Example_Where_Clause" />
- </if>
- <if test="orderByClause != null">
- order by ${orderByClause}
- </if>
- </select>
- <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
- select
- <include refid="Base_Column_List" />
- from account
- where id = #{id,jdbcType=INTEGER}
- </select>
- <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
- delete from account
- where id = #{id,jdbcType=INTEGER}
- </delete>
- <delete id="deleteByExample" parameterType="com.moral.entity.AccountExample">
- delete from account
- <if test="_parameter != null">
- <include refid="Example_Where_Clause" />
- </if>
- </delete>
- <insert id="insert" parameterType="com.moral.entity.Account">
- insert into account (id, account_name, password,
- organization_id, email, mobile,
- weixin, is_delete, create_time,
- expire_time)
- values (#{id,jdbcType=INTEGER}, #{accountName,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR},
- #{organizationId,jdbcType=INTEGER}, #{email,jdbcType=VARCHAR}, #{mobile,jdbcType=VARCHAR},
- #{weixin,jdbcType=VARCHAR}, #{isDelete,jdbcType=CHAR}, #{createTime,jdbcType=TIMESTAMP},
- #{expireTime,jdbcType=TIMESTAMP})
- </insert>
- <insert id="insertSelective" parameterType="com.moral.entity.Account">
- insert into account
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null">
- id,
- </if>
- <if test="accountName != null">
- account_name,
- </if>
- <if test="password != null">
- password,
- </if>
- <if test="organizationId != null">
- organization_id,
- </if>
- <if test="email != null">
- email,
- </if>
- <if test="mobile != null">
- mobile,
- </if>
- <if test="weixin != null">
- weixin,
- </if>
- <if test="isDelete != null">
- is_delete,
- </if>
- <if test="createTime != null">
- create_time,
- </if>
- <if test="expireTime != null">
- expire_time,
- </if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="id != null">
- #{id,jdbcType=INTEGER},
- </if>
- <if test="accountName != null">
- #{accountName,jdbcType=VARCHAR},
- </if>
- <if test="password != null">
- #{password,jdbcType=VARCHAR},
- </if>
- <if test="organizationId != null">
- #{organizationId,jdbcType=INTEGER},
- </if>
- <if test="email != null">
- #{email,jdbcType=VARCHAR},
- </if>
- <if test="mobile != null">
- #{mobile,jdbcType=VARCHAR},
- </if>
- <if test="weixin != null">
- #{weixin,jdbcType=VARCHAR},
- </if>
- <if test="isDelete != null">
- #{isDelete,jdbcType=CHAR},
- </if>
- <if test="createTime != null">
- #{createTime,jdbcType=TIMESTAMP},
- </if>
- <if test="expireTime != null">
- #{expireTime,jdbcType=TIMESTAMP},
- </if>
- </trim>
- </insert>
- <select id="countByExample" parameterType="com.moral.entity.AccountExample" resultType="java.lang.Integer">
- select count(*) from account
- <if test="_parameter != null">
- <include refid="Example_Where_Clause" />
- </if>
- </select>
- <update id="updateByExampleSelective" parameterType="map">
- update account
- <set>
- <if test="record.id != null">
- id = #{record.id,jdbcType=INTEGER},
- </if>
- <if test="record.accountName != null">
- account_name = #{record.accountName,jdbcType=VARCHAR},
- </if>
- <if test="record.password != null">
- password = #{record.password,jdbcType=VARCHAR},
- </if>
- <if test="record.organizationId != null">
- organization_id = #{record.organizationId,jdbcType=INTEGER},
- </if>
- <if test="record.email != null">
- email = #{record.email,jdbcType=VARCHAR},
- </if>
- <if test="record.mobile != null">
- mobile = #{record.mobile,jdbcType=VARCHAR},
- </if>
- <if test="record.weixin != null">
- weixin = #{record.weixin,jdbcType=VARCHAR},
- </if>
- <if test="record.isDelete != null">
- is_delete = #{record.isDelete,jdbcType=CHAR},
- </if>
- <if test="record.createTime != null">
- create_time = #{record.createTime,jdbcType=TIMESTAMP},
- </if>
- <if test="record.expireTime != null">
- expire_time = #{record.expireTime,jdbcType=TIMESTAMP},
- </if>
- </set>
- <if test="_parameter != null">
- <include refid="Update_By_Example_Where_Clause" />
- </if>
- </update>
- <update id="updateByExample" parameterType="map">
- update account
- set id = #{record.id,jdbcType=INTEGER},
- account_name = #{record.accountName,jdbcType=VARCHAR},
- password = #{record.password,jdbcType=VARCHAR},
- organization_id = #{record.organizationId,jdbcType=INTEGER},
- email = #{record.email,jdbcType=VARCHAR},
- mobile = #{record.mobile,jdbcType=VARCHAR},
- weixin = #{record.weixin,jdbcType=VARCHAR},
- is_delete = #{record.isDelete,jdbcType=CHAR},
- create_time = #{record.createTime,jdbcType=TIMESTAMP},
- expire_time = #{record.expireTime,jdbcType=TIMESTAMP}
- <if test="_parameter != null">
- <include refid="Update_By_Example_Where_Clause" />
- </if>
- </update>
- <update id="updateByPrimaryKeySelective" parameterType="com.moral.entity.Account">
- update account
- <set>
- <if test="accountName != null">
- account_name = #{accountName,jdbcType=VARCHAR},
- </if>
- <if test="password != null">
- password = #{password,jdbcType=VARCHAR},
- </if>
- <if test="organizationId != null">
- organization_id = #{organizationId,jdbcType=INTEGER},
- </if>
- <if test="email != null">
- email = #{email,jdbcType=VARCHAR},
- </if>
- <if test="mobile != null">
- mobile = #{mobile,jdbcType=VARCHAR},
- </if>
- <if test="weixin != null">
- weixin = #{weixin,jdbcType=VARCHAR},
- </if>
- <if test="isDelete != null">
- is_delete = #{isDelete,jdbcType=CHAR},
- </if>
- <if test="createTime != null">
- create_time = #{createTime,jdbcType=TIMESTAMP},
- </if>
- <if test="expireTime != null">
- expire_time = #{expireTime,jdbcType=TIMESTAMP},
- </if>
- </set>
- where id = #{id,jdbcType=INTEGER}
- </update>
- <update id="updateByPrimaryKey" parameterType="com.moral.entity.Account">
- update account
- set account_name = #{accountName,jdbcType=VARCHAR},
- password = #{password,jdbcType=VARCHAR},
- organization_id = #{organizationId,jdbcType=INTEGER},
- email = #{email,jdbcType=VARCHAR},
- mobile = #{mobile,jdbcType=VARCHAR},
- weixin = #{weixin,jdbcType=VARCHAR},
- is_delete = #{isDelete,jdbcType=CHAR},
- create_time = #{createTime,jdbcType=TIMESTAMP},
- expire_time = #{expireTime,jdbcType=TIMESTAMP}
- where id = #{id,jdbcType=INTEGER}
- </update>
<select id="getRoleNameByAccountId" resultType="map">
SELECT
diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml
index d9ff9bf..9f49de0 100644
--- a/src/main/resources/mapper/DeviceMapper.xml
+++ b/src/main/resources/mapper/DeviceMapper.xml
@@ -20,381 +20,6 @@
<result column="monitor_point_id" jdbcType="INTEGER" property="monitorPointId" />
<result column="device_version_id" jdbcType="INTEGER" property="deviceVersionId" />
</resultMap>
- <sql id="Example_Where_Clause">
- <!--
- WARNING - @mbggenerated
- This element is automatically generated by MyBatis Generator, do not modify.
- This element was generated on Wed Nov 29 16:17:59 CST 2017.
- -->
- <where>
- <foreach collection="oredCriteria" item="criteria" separator="or">
- <if test="criteria.valid">
- <trim prefix="(" prefixOverrides="and" suffix=")">
- <foreach collection="criteria.criteria" item="criterion">
- <choose>
- <when test="criterion.noValue">
- and ${criterion.condition}
- </when>
- <when test="criterion.singleValue">
- and ${criterion.condition} #{criterion.value}
- </when>
- <when test="criterion.betweenValue">
- and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
- </when>
- <when test="criterion.listValue">
- and ${criterion.condition}
- <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
- #{listItem}
- </foreach>
- </when>
- </choose>
- </foreach>
- </trim>
- </if>
- </foreach>
- </where>
- </sql>
- <sql id="Update_By_Example_Where_Clause">
- <!--
- WARNING - @mbggenerated
- This element is automatically generated by MyBatis Generator, do not modify.
- This element was generated on Wed Nov 29 16:17:59 CST 2017.
- -->
- <where>
- <foreach collection="example.oredCriteria" item="criteria" separator="or">
- <if test="criteria.valid">
- <trim prefix="(" prefixOverrides="and" suffix=")">
- <foreach collection="criteria.criteria" item="criterion">
- <choose>
- <when test="criterion.noValue">
- and ${criterion.condition}
- </when>
- <when test="criterion.singleValue">
- and ${criterion.condition} #{criterion.value}
- </when>
- <when test="criterion.betweenValue">
- and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
- </when>
- <when test="criterion.listValue">
- and ${criterion.condition}
- <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
- #{listItem}
- </foreach>
- </when>
- </choose>
- </foreach>
- </trim>
- </if>
- </foreach>
- </where>
- </sql>
- <sql id="Base_Column_List">
- <!--
- WARNING - @mbggenerated
- This element is automatically generated by MyBatis Generator, do not modify.
- This element was generated on Wed Nov 29 16:17:59 CST 2017.
- -->
- id, name, address, longitude, latitude, mac, operate_user_id, state, create_time,
- install_time, monitor_point_id, device_version_id
- </sql>
- <select id="selectByExample" parameterType="com.moral.entity.DeviceExample" resultMap="BaseResultMap">
- <!--
- WARNING - @mbggenerated
- This element is automatically generated by MyBatis Generator, do not modify.
- This element was generated on Wed Nov 29 16:17:59 CST 2017.
- -->
- select
- <if test="distinct">
- distinct
- </if>
- <include refid="Base_Column_List" />
- from device
- <if test="_parameter != null">
- <include refid="Example_Where_Clause" />
- </if>
- <if test="orderByClause != null">
- order by ${orderByClause}
- </if>
- </select>
- <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
- <!--
- WARNING - @mbggenerated
- This element is automatically generated by MyBatis Generator, do not modify.
- This element was generated on Wed Nov 29 16:17:59 CST 2017.
- -->
- select
- <include refid="Base_Column_List" />
- from device
- where id = #{id,jdbcType=INTEGER}
- </select>
- <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
- <!--
- WARNING - @mbggenerated
- This element is automatically generated by MyBatis Generator, do not modify.
- This element was generated on Wed Nov 29 16:17:59 CST 2017.
- -->
- delete from device
- where id = #{id,jdbcType=INTEGER}
- </delete>
- <delete id="deleteByExample" parameterType="com.moral.entity.DeviceExample">
- <!--
- WARNING - @mbggenerated
- This element is automatically generated by MyBatis Generator, do not modify.
- This element was generated on Wed Nov 29 16:17:59 CST 2017.
- -->
- delete from device
- <if test="_parameter != null">
- <include refid="Example_Where_Clause" />
- </if>
- </delete>
- <insert id="insert" parameterType="com.moral.entity.Device">
- <!--
- WARNING - @mbggenerated
- This element is automatically generated by MyBatis Generator, do not modify.
- This element was generated on Wed Nov 29 16:17:59 CST 2017.
- -->
- insert into device (id, name, address,
- longitude, latitude, mac,
- operate_user_id, state, create_time,
- install_time, monitor_point_id, device_version_id
- )
- values (#{id,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR},
- #{longitude,jdbcType=REAL}, #{latitude,jdbcType=REAL}, #{mac,jdbcType=VARCHAR},
- #{operateUserId,jdbcType=INTEGER}, #{state,jdbcType=CHAR}, #{createTime,jdbcType=TIMESTAMP},
- #{installTime,jdbcType=TIMESTAMP}, #{monitorPointId,jdbcType=INTEGER}, #{deviceVersionId,jdbcType=INTEGER}
- )
- </insert>
- <insert id="insertSelective" parameterType="com.moral.entity.Device">
- <!--
- WARNING - @mbggenerated
- This element is automatically generated by MyBatis Generator, do not modify.
- This element was generated on Wed Nov 29 16:17:59 CST 2017.
- -->
- insert into device
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null">
- id,
- </if>
- <if test="name != null">
- name,
- </if>
- <if test="address != null">
- address,
- </if>
- <if test="longitude != null">
- longitude,
- </if>
- <if test="latitude != null">
- latitude,
- </if>
- <if test="mac != null">
- mac,
- </if>
- <if test="operateUserId != null">
- operate_user_id,
- </if>
- <if test="state != null">
- state,
- </if>
- <if test="createTime != null">
- create_time,
- </if>
- <if test="installTime != null">
- install_time,
- </if>
- <if test="monitorPointId != null">
- monitor_point_id,
- </if>
- <if test="deviceVersionId != null">
- device_version_id,
- </if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="id != null">
- #{id,jdbcType=INTEGER},
- </if>
- <if test="name != null">
- #{name,jdbcType=VARCHAR},
- </if>
- <if test="address != null">
- #{address,jdbcType=VARCHAR},
- </if>
- <if test="longitude != null">
- #{longitude,jdbcType=REAL},
- </if>
- <if test="latitude != null">
- #{latitude,jdbcType=REAL},
- </if>
- <if test="mac != null">
- #{mac,jdbcType=VARCHAR},
- </if>
- <if test="operateUserId != null">
- #{operateUserId,jdbcType=INTEGER},
- </if>
- <if test="state != null">
- #{state,jdbcType=CHAR},
- </if>
- <if test="createTime != null">
- #{createTime,jdbcType=TIMESTAMP},
- </if>
- <if test="installTime != null">
- #{installTime,jdbcType=TIMESTAMP},
- </if>
- <if test="monitorPointId != null">
- #{monitorPointId,jdbcType=INTEGER},
- </if>
- <if test="deviceVersionId != null">
- #{deviceVersionId,jdbcType=INTEGER},
- </if>
- </trim>
- </insert>
- <select id="countByExample" parameterType="com.moral.entity.DeviceExample" resultType="java.lang.Integer">
- <!--
- WARNING - @mbggenerated
- This element is automatically generated by MyBatis Generator, do not modify.
- This element was generated on Wed Nov 29 16:17:59 CST 2017.
- -->
- select count(*) from device
- <if test="_parameter != null">
- <include refid="Example_Where_Clause" />
- </if>
- </select>
- <update id="updateByExampleSelective" parameterType="map">
- <!--
- WARNING - @mbggenerated
- This element is automatically generated by MyBatis Generator, do not modify.
- This element was generated on Wed Nov 29 16:17:59 CST 2017.
- -->
- update device
- <set>
- <if test="record.id != null">
- id = #{record.id,jdbcType=INTEGER},
- </if>
- <if test="record.name != null">
- name = #{record.name,jdbcType=VARCHAR},
- </if>
- <if test="record.address != null">
- address = #{record.address,jdbcType=VARCHAR},
- </if>
- <if test="record.longitude != null">
- longitude = #{record.longitude,jdbcType=REAL},
- </if>
- <if test="record.latitude != null">
- latitude = #{record.latitude,jdbcType=REAL},
- </if>
- <if test="record.mac != null">
- mac = #{record.mac,jdbcType=VARCHAR},
- </if>
- <if test="record.operateUserId != null">
- operate_user_id = #{record.operateUserId,jdbcType=INTEGER},
- </if>
- <if test="record.state != null">
- state = #{record.state,jdbcType=CHAR},
- </if>
- <if test="record.createTime != null">
- create_time = #{record.createTime,jdbcType=TIMESTAMP},
- </if>
- <if test="record.installTime != null">
- install_time = #{record.installTime,jdbcType=TIMESTAMP},
- </if>
- <if test="record.monitorPointId != null">
- monitor_point_id = #{record.monitorPointId,jdbcType=INTEGER},
- </if>
- <if test="record.deviceVersionId != null">
- device_version_id = #{record.deviceVersionId,jdbcType=INTEGER},
- </if>
- </set>
- <if test="_parameter != null">
- <include refid="Update_By_Example_Where_Clause" />
- </if>
- </update>
- <update id="updateByExample" parameterType="map">
- <!--
- WARNING - @mbggenerated
- This element is automatically generated by MyBatis Generator, do not modify.
- This element was generated on Wed Nov 29 16:17:59 CST 2017.
- -->
- update device
- set id = #{record.id,jdbcType=INTEGER},
- name = #{record.name,jdbcType=VARCHAR},
- address = #{record.address,jdbcType=VARCHAR},
- longitude = #{record.longitude,jdbcType=REAL},
- latitude = #{record.latitude,jdbcType=REAL},
- mac = #{record.mac,jdbcType=VARCHAR},
- operate_user_id = #{record.operateUserId,jdbcType=INTEGER},
- state = #{record.state,jdbcType=CHAR},
- create_time = #{record.createTime,jdbcType=TIMESTAMP},
- install_time = #{record.installTime,jdbcType=TIMESTAMP},
- monitor_point_id = #{record.monitorPointId,jdbcType=INTEGER},
- device_version_id = #{record.deviceVersionId,jdbcType=INTEGER}
- <if test="_parameter != null">
- <include refid="Update_By_Example_Where_Clause" />
- </if>
- </update>
- <update id="updateByPrimaryKeySelective" parameterType="com.moral.entity.Device">
- <!--
- WARNING - @mbggenerated
- This element is automatically generated by MyBatis Generator, do not modify.
- This element was generated on Wed Nov 29 16:17:59 CST 2017.
- -->
- update device
- <set>
- <if test="name != null">
- name = #{name,jdbcType=VARCHAR},
- </if>
- <if test="address != null">
- address = #{address,jdbcType=VARCHAR},
- </if>
- <if test="longitude != null">
- longitude = #{longitude,jdbcType=REAL},
- </if>
- <if test="latitude != null">
- latitude = #{latitude,jdbcType=REAL},
- </if>
- <if test="mac != null">
- mac = #{mac,jdbcType=VARCHAR},
- </if>
- <if test="operateUserId != null">
- operate_user_id = #{operateUserId,jdbcType=INTEGER},
- </if>
- <if test="state != null">
- state = #{state,jdbcType=CHAR},
- </if>
- <if test="createTime != null">
- create_time = #{createTime,jdbcType=TIMESTAMP},
- </if>
- <if test="installTime != null">
- install_time = #{installTime,jdbcType=TIMESTAMP},
- </if>
- <if test="monitorPointId != null">
- monitor_point_id = #{monitorPointId,jdbcType=INTEGER},
- </if>
- <if test="deviceVersionId != null">
- device_version_id = #{deviceVersionId,jdbcType=INTEGER},
- </if>
- </set>
- where id = #{id,jdbcType=INTEGER}
- </update>
- <update id="updateByPrimaryKey" parameterType="com.moral.entity.Device">
- <!--
- WARNING - @mbggenerated
- This element is automatically generated by MyBatis Generator, do not modify.
- This element was generated on Wed Nov 29 16:17:59 CST 2017.
- -->
- update device
- set name = #{name,jdbcType=VARCHAR},
- address = #{address,jdbcType=VARCHAR},
- longitude = #{longitude,jdbcType=REAL},
- latitude = #{latitude,jdbcType=REAL},
- mac = #{mac,jdbcType=VARCHAR},
- operate_user_id = #{operateUserId,jdbcType=INTEGER},
- state = #{state,jdbcType=CHAR},
- create_time = #{createTime,jdbcType=TIMESTAMP},
- install_time = #{installTime,jdbcType=TIMESTAMP},
- monitor_point_id = #{monitorPointId,jdbcType=INTEGER},
- device_version_id = #{deviceVersionId,jdbcType=INTEGER}
- where id = #{id,jdbcType=INTEGER}
- </update>
<select id="getDeviceStatesByAccount" resultType="map">
SELECT
COUNT( d.state ) count,
diff --git a/src/main/resources/mapper/OperateUserMapper.xml b/src/main/resources/mapper/OperateUserMapper.xml
index b9dc0e9..37a87c8 100644
--- a/src/main/resources/mapper/OperateUserMapper.xml
+++ b/src/main/resources/mapper/OperateUserMapper.xml
@@ -14,293 +14,4 @@
<result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
<result column="expire_time" property="expireTime" jdbcType="TIMESTAMP" />
</resultMap>
- <sql id="Example_Where_Clause" >
- <where >
- <foreach collection="oredCriteria" item="criteria" separator="or" >
- <if test="criteria.valid" >
- <trim prefix="(" suffix=")" prefixOverrides="and" >
- <foreach collection="criteria.criteria" item="criterion" >
- <choose >
- <when test="criterion.noValue" >
- and ${criterion.condition}
- </when>
- <when test="criterion.singleValue" >
- and ${criterion.condition} #{criterion.value}
- </when>
- <when test="criterion.betweenValue" >
- and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
- </when>
- <when test="criterion.listValue" >
- and ${criterion.condition}
- <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
- #{listItem}
- </foreach>
- </when>
- </choose>
- </foreach>
- </trim>
- </if>
- </foreach>
- </where>
- </sql>
- <sql id="Update_By_Example_Where_Clause" >
- <where >
- <foreach collection="example.oredCriteria" item="criteria" separator="or" >
- <if test="criteria.valid" >
- <trim prefix="(" suffix=")" prefixOverrides="and" >
- <foreach collection="criteria.criteria" item="criterion" >
- <choose >
- <when test="criterion.noValue" >
- and ${criterion.condition}
- </when>
- <when test="criterion.singleValue" >
- and ${criterion.condition} #{criterion.value}
- </when>
- <when test="criterion.betweenValue" >
- and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
- </when>
- <when test="criterion.listValue" >
- and ${criterion.condition}
- <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
- #{listItem}
- </foreach>
- </when>
- </choose>
- </foreach>
- </trim>
- </if>
- </foreach>
- </where>
- </sql>
- <sql id="Base_Column_List" >
- id, job_number, name, password, organization_id, mobile, email, weixin, is_delete,
- create_time, expire_time
- </sql>
- <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.moral.entity.OperateUserExample" >
- select
- <if test="distinct" >
- distinct
- </if>
- <include refid="Base_Column_List" />
- from operate_user
- <if test="_parameter != null" >
- <include refid="Example_Where_Clause" />
- </if>
- <if test="orderByClause != null" >
- order by ${orderByClause}
- </if>
- </select>
- <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
- select
- <include refid="Base_Column_List" />
- from operate_user
- where id = #{id,jdbcType=INTEGER}
- </select>
- <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
- delete from operate_user
- where id = #{id,jdbcType=INTEGER}
- </delete>
- <delete id="deleteByExample" parameterType="com.moral.entity.OperateUserExample" >
- delete from operate_user
- <if test="_parameter != null" >
- <include refid="Example_Where_Clause" />
- </if>
- </delete>
- <insert id="insert" parameterType="com.moral.entity.OperateUser" >
- insert into operate_user (id, job_number, name,
- password, organization_id, mobile,
- email, weixin, is_delete,
- create_time, expire_time)
- values (#{id,jdbcType=INTEGER}, #{jobNumber,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR},
- #{password,jdbcType=VARCHAR}, #{organizationId,jdbcType=INTEGER}, #{mobile,jdbcType=VARCHAR},
- #{email,jdbcType=VARCHAR}, #{weixin,jdbcType=VARCHAR}, #{isDelete,jdbcType=CHAR},
- #{createTime,jdbcType=TIMESTAMP}, #{expireTime,jdbcType=TIMESTAMP})
- </insert>
- <insert id="insertSelective" parameterType="com.moral.entity.OperateUser" >
- insert into operate_user
- <trim prefix="(" suffix=")" suffixOverrides="," >
- <if test="id != null" >
- id,
- </if>
- <if test="jobNumber != null" >
- job_number,
- </if>
- <if test="name != null" >
- name,
- </if>
- <if test="password != null" >
- password,
- </if>
- <if test="organizationId != null" >
- organization_id,
- </if>
- <if test="mobile != null" >
- mobile,
- </if>
- <if test="email != null" >
- email,
- </if>
- <if test="weixin != null" >
- weixin,
- </if>
- <if test="isDelete != null" >
- is_delete,
- </if>
- <if test="createTime != null" >
- create_time,
- </if>
- <if test="expireTime != null" >
- expire_time,
- </if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides="," >
- <if test="id != null" >
- #{id,jdbcType=INTEGER},
- </if>
- <if test="jobNumber != null" >
- #{jobNumber,jdbcType=VARCHAR},
- </if>
- <if test="name != null" >
- #{name,jdbcType=VARCHAR},
- </if>
- <if test="password != null" >
- #{password,jdbcType=VARCHAR},
- </if>
- <if test="organizationId != null" >
- #{organizationId,jdbcType=INTEGER},
- </if>
- <if test="mobile != null" >
- #{mobile,jdbcType=VARCHAR},
- </if>
- <if test="email != null" >
- #{email,jdbcType=VARCHAR},
- </if>
- <if test="weixin != null" >
- #{weixin,jdbcType=VARCHAR},
- </if>
- <if test="isDelete != null" >
- #{isDelete,jdbcType=CHAR},
- </if>
- <if test="createTime != null" >
- #{createTime,jdbcType=TIMESTAMP},
- </if>
- <if test="expireTime != null" >
- #{expireTime,jdbcType=TIMESTAMP},
- </if>
- </trim>
- </insert>
- <select id="countByExample" parameterType="com.moral.entity.OperateUserExample" resultType="java.lang.Integer" >
- select count(*) from operate_user
- <if test="_parameter != null" >
- <include refid="Example_Where_Clause" />
- </if>
- </select>
- <update id="updateByExampleSelective" parameterType="map" >
- update operate_user
- <set >
- <if test="record.id != null" >
- id = #{record.id,jdbcType=INTEGER},
- </if>
- <if test="record.jobNumber != null" >
- job_number = #{record.jobNumber,jdbcType=VARCHAR},
- </if>
- <if test="record.name != null" >
- name = #{record.name,jdbcType=VARCHAR},
- </if>
- <if test="record.password != null" >
- password = #{record.password,jdbcType=VARCHAR},
- </if>
- <if test="record.organizationId != null" >
- organization_id = #{record.organizationId,jdbcType=INTEGER},
- </if>
- <if test="record.mobile != null" >
- mobile = #{record.mobile,jdbcType=VARCHAR},
- </if>
- <if test="record.email != null" >
- email = #{record.email,jdbcType=VARCHAR},
- </if>
- <if test="record.weixin != null" >
- weixin = #{record.weixin,jdbcType=VARCHAR},
- </if>
- <if test="record.isDelete != null" >
- is_delete = #{record.isDelete,jdbcType=CHAR},
- </if>
- <if test="record.createTime != null" >
- create_time = #{record.createTime,jdbcType=TIMESTAMP},
- </if>
- <if test="record.expireTime != null" >
- expire_time = #{record.expireTime,jdbcType=TIMESTAMP},
- </if>
- </set>
- <if test="_parameter != null" >
- <include refid="Update_By_Example_Where_Clause" />
- </if>
- </update>
- <update id="updateByExample" parameterType="map" >
- update operate_user
- set id = #{record.id,jdbcType=INTEGER},
- job_number = #{record.jobNumber,jdbcType=VARCHAR},
- name = #{record.name,jdbcType=VARCHAR},
- password = #{record.password,jdbcType=VARCHAR},
- organization_id = #{record.organizationId,jdbcType=INTEGER},
- mobile = #{record.mobile,jdbcType=VARCHAR},
- email = #{record.email,jdbcType=VARCHAR},
- weixin = #{record.weixin,jdbcType=VARCHAR},
- is_delete = #{record.isDelete,jdbcType=CHAR},
- create_time = #{record.createTime,jdbcType=TIMESTAMP},
- expire_time = #{record.expireTime,jdbcType=TIMESTAMP}
- <if test="_parameter != null" >
- <include refid="Update_By_Example_Where_Clause" />
- </if>
- </update>
- <update id="updateByPrimaryKeySelective" parameterType="com.moral.entity.OperateUser" >
- update operate_user
- <set >
- <if test="jobNumber != null" >
- job_number = #{jobNumber,jdbcType=VARCHAR},
- </if>
- <if test="name != null" >
- name = #{name,jdbcType=VARCHAR},
- </if>
- <if test="password != null" >
- password = #{password,jdbcType=VARCHAR},
- </if>
- <if test="organizationId != null" >
- organization_id = #{organizationId,jdbcType=INTEGER},
- </if>
- <if test="mobile != null" >
- mobile = #{mobile,jdbcType=VARCHAR},
- </if>
- <if test="email != null" >
- email = #{email,jdbcType=VARCHAR},
- </if>
- <if test="weixin != null" >
- weixin = #{weixin,jdbcType=VARCHAR},
- </if>
- <if test="isDelete != null" >
- is_delete = #{isDelete,jdbcType=CHAR},
- </if>
- <if test="createTime != null" >
- create_time = #{createTime,jdbcType=TIMESTAMP},
- </if>
- <if test="expireTime != null" >
- expire_time = #{expireTime,jdbcType=TIMESTAMP},
- </if>
- </set>
- where id = #{id,jdbcType=INTEGER}
- </update>
- <update id="updateByPrimaryKey" parameterType="com.moral.entity.OperateUser" >
- update operate_user
- set job_number = #{jobNumber,jdbcType=VARCHAR},
- name = #{name,jdbcType=VARCHAR},
- password = #{password,jdbcType=VARCHAR},
- organization_id = #{organizationId,jdbcType=INTEGER},
- mobile = #{mobile,jdbcType=VARCHAR},
- email = #{email,jdbcType=VARCHAR},
- weixin = #{weixin,jdbcType=VARCHAR},
- is_delete = #{isDelete,jdbcType=CHAR},
- create_time = #{createTime,jdbcType=TIMESTAMP},
- expire_time = #{expireTime,jdbcType=TIMESTAMP}
- where id = #{id,jdbcType=INTEGER}
- </update>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/OrganizationMapper.xml b/src/main/resources/mapper/OrganizationMapper.xml
index aa64439..bb995d4 100644
--- a/src/main/resources/mapper/OrganizationMapper.xml
+++ b/src/main/resources/mapper/OrganizationMapper.xml
@@ -16,323 +16,5 @@
<result column="expire_time" property="expireTime" jdbcType="TIMESTAMP" />
<result column="description" property="description" jdbcType="VARCHAR" />
</resultMap>
- <sql id="Example_Where_Clause" >
- <where >
- <foreach collection="oredCriteria" item="criteria" separator="or" >
- <if test="criteria.valid" >
- <trim prefix="(" suffix=")" prefixOverrides="and" >
- <foreach collection="criteria.criteria" item="criterion" >
- <choose >
- <when test="criterion.noValue" >
- and ${criterion.condition}
- </when>
- <when test="criterion.singleValue" >
- and ${criterion.condition} #{criterion.value}
- </when>
- <when test="criterion.betweenValue" >
- and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
- </when>
- <when test="criterion.listValue" >
- and ${criterion.condition}
- <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
- #{listItem}
- </foreach>
- </when>
- </choose>
- </foreach>
- </trim>
- </if>
- </foreach>
- </where>
- </sql>
- <sql id="Update_By_Example_Where_Clause" >
- <where >
- <foreach collection="example.oredCriteria" item="criteria" separator="or" >
- <if test="criteria.valid" >
- <trim prefix="(" suffix=")" prefixOverrides="and" >
- <foreach collection="criteria.criteria" item="criterion" >
- <choose >
- <when test="criterion.noValue" >
- and ${criterion.condition}
- </when>
- <when test="criterion.singleValue" >
- and ${criterion.condition} #{criterion.value}
- </when>
- <when test="criterion.betweenValue" >
- and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
- </when>
- <when test="criterion.listValue" >
- and ${criterion.condition}
- <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
- #{listItem}
- </foreach>
- </when>
- </choose>
- </foreach>
- </trim>
- </if>
- </foreach>
- </where>
- </sql>
- <sql id="Base_Column_List" >
- id, name, rank, province_code, city_code, area_code, address, telephone, email, is_delete,
- create_time, expire_time, description
- </sql>
- <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.moral.entity.OrganizationExample" >
- select
- <if test="distinct" >
- distinct
- </if>
- <include refid="Base_Column_List" />
- from organization
- <if test="_parameter != null" >
- <include refid="Example_Where_Clause" />
- </if>
- <if test="orderByClause != null" >
- order by ${orderByClause}
- </if>
- </select>
- <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
- select
- <include refid="Base_Column_List" />
- from organization
- where id = #{id,jdbcType=INTEGER}
- </select>
- <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
- delete from organization
- where id = #{id,jdbcType=INTEGER}
- </delete>
- <delete id="deleteByExample" parameterType="com.moral.entity.OrganizationExample" >
- delete from organization
- <if test="_parameter != null" >
- <include refid="Example_Where_Clause" />
- </if>
- </delete>
- <insert id="insert" parameterType="com.moral.entity.Organization" >
- insert into organization (id, name, rank,
- province_code, city_code, area_code,
- address, telephone, email,
- is_delete, create_time, expire_time,
- description)
- values (#{id,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{rank,jdbcType=INTEGER},
- #{provinceCode,jdbcType=INTEGER}, #{cityCode,jdbcType=INTEGER}, #{areaCode,jdbcType=INTEGER},
- #{address,jdbcType=VARCHAR}, #{telephone,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR},
- #{isDelete,jdbcType=CHAR}, #{createTime,jdbcType=TIMESTAMP}, #{expireTime,jdbcType=TIMESTAMP},
- #{description,jdbcType=VARCHAR})
- </insert>
- <insert id="insertSelective" parameterType="com.moral.entity.Organization" >
- insert into organization
- <trim prefix="(" suffix=")" suffixOverrides="," >
- <if test="id != null" >
- id,
- </if>
- <if test="name != null" >
- name,
- </if>
- <if test="rank != null" >
- rank,
- </if>
- <if test="provinceCode != null" >
- province_code,
- </if>
- <if test="cityCode != null" >
- city_code,
- </if>
- <if test="areaCode != null" >
- area_code,
- </if>
- <if test="address != null" >
- address,
- </if>
- <if test="telephone != null" >
- telephone,
- </if>
- <if test="email != null" >
- email,
- </if>
- <if test="isDelete != null" >
- is_delete,
- </if>
- <if test="createTime != null" >
- create_time,
- </if>
- <if test="expireTime != null" >
- expire_time,
- </if>
- <if test="description != null" >
- description,
- </if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides="," >
- <if test="id != null" >
- #{id,jdbcType=INTEGER},
- </if>
- <if test="name != null" >
- #{name,jdbcType=VARCHAR},
- </if>
- <if test="rank != null" >
- #{rank,jdbcType=INTEGER},
- </if>
- <if test="provinceCode != null" >
- #{provinceCode,jdbcType=INTEGER},
- </if>
- <if test="cityCode != null" >
- #{cityCode,jdbcType=INTEGER},
- </if>
- <if test="areaCode != null" >
- #{areaCode,jdbcType=INTEGER},
- </if>
- <if test="address != null" >
- #{address,jdbcType=VARCHAR},
- </if>
- <if test="telephone != null" >
- #{telephone,jdbcType=VARCHAR},
- </if>
- <if test="email != null" >
- #{email,jdbcType=VARCHAR},
- </if>
- <if test="isDelete != null" >
- #{isDelete,jdbcType=CHAR},
- </if>
- <if test="createTime != null" >
- #{createTime,jdbcType=TIMESTAMP},
- </if>
- <if test="expireTime != null" >
- #{expireTime,jdbcType=TIMESTAMP},
- </if>
- <if test="description != null" >
- #{description,jdbcType=VARCHAR},
- </if>
- </trim>
- </insert>
- <select id="countByExample" parameterType="com.moral.entity.OrganizationExample" resultType="java.lang.Integer" >
- select count(*) from organization
- <if test="_parameter != null" >
- <include refid="Example_Where_Clause" />
- </if>
- </select>
- <update id="updateByExampleSelective" parameterType="map" >
- update organization
- <set >
- <if test="record.id != null" >
- id = #{record.id,jdbcType=INTEGER},
- </if>
- <if test="record.name != null" >
- name = #{record.name,jdbcType=VARCHAR},
- </if>
- <if test="record.rank != null" >
- rank = #{record.rank,jdbcType=INTEGER},
- </if>
- <if test="record.provinceCode != null" >
- province_code = #{record.provinceCode,jdbcType=INTEGER},
- </if>
- <if test="record.cityCode != null" >
- city_code = #{record.cityCode,jdbcType=INTEGER},
- </if>
- <if test="record.areaCode != null" >
- area_code = #{record.areaCode,jdbcType=INTEGER},
- </if>
- <if test="record.address != null" >
- address = #{record.address,jdbcType=VARCHAR},
- </if>
- <if test="record.telephone != null" >
- telephone = #{record.telephone,jdbcType=VARCHAR},
- </if>
- <if test="record.email != null" >
- email = #{record.email,jdbcType=VARCHAR},
- </if>
- <if test="record.isDelete != null" >
- is_delete = #{record.isDelete,jdbcType=CHAR},
- </if>
- <if test="record.createTime != null" >
- create_time = #{record.createTime,jdbcType=TIMESTAMP},
- </if>
- <if test="record.expireTime != null" >
- expire_time = #{record.expireTime,jdbcType=TIMESTAMP},
- </if>
- <if test="record.description != null" >
- description = #{record.description,jdbcType=VARCHAR},
- </if>
- </set>
- <if test="_parameter != null" >
- <include refid="Update_By_Example_Where_Clause" />
- </if>
- </update>
- <update id="updateByExample" parameterType="map" >
- update organization
- set id = #{record.id,jdbcType=INTEGER},
- name = #{record.name,jdbcType=VARCHAR},
- rank = #{record.rank,jdbcType=INTEGER},
- province_code = #{record.provinceCode,jdbcType=INTEGER},
- city_code = #{record.cityCode,jdbcType=INTEGER},
- area_code = #{record.areaCode,jdbcType=INTEGER},
- address = #{record.address,jdbcType=VARCHAR},
- telephone = #{record.telephone,jdbcType=VARCHAR},
- email = #{record.email,jdbcType=VARCHAR},
- is_delete = #{record.isDelete,jdbcType=CHAR},
- create_time = #{record.createTime,jdbcType=TIMESTAMP},
- expire_time = #{record.expireTime,jdbcType=TIMESTAMP},
- description = #{record.description,jdbcType=VARCHAR}
- <if test="_parameter != null" >
- <include refid="Update_By_Example_Where_Clause" />
- </if>
- </update>
- <update id="updateByPrimaryKeySelective" parameterType="com.moral.entity.Organization" >
- update organization
- <set >
- <if test="name != null" >
- name = #{name,jdbcType=VARCHAR},
- </if>
- <if test="rank != null" >
- rank = #{rank,jdbcType=INTEGER},
- </if>
- <if test="provinceCode != null" >
- province_code = #{provinceCode,jdbcType=INTEGER},
- </if>
- <if test="cityCode != null" >
- city_code = #{cityCode,jdbcType=INTEGER},
- </if>
- <if test="areaCode != null" >
- area_code = #{areaCode,jdbcType=INTEGER},
- </if>
- <if test="address != null" >
- address = #{address,jdbcType=VARCHAR},
- </if>
- <if test="telephone != null" >
- telephone = #{telephone,jdbcType=VARCHAR},
- </if>
- <if test="email != null" >
- email = #{email,jdbcType=VARCHAR},
- </if>
- <if test="isDelete != null" >
- is_delete = #{isDelete,jdbcType=CHAR},
- </if>
- <if test="createTime != null" >
- create_time = #{createTime,jdbcType=TIMESTAMP},
- </if>
- <if test="expireTime != null" >
- expire_time = #{expireTime,jdbcType=TIMESTAMP},
- </if>
- <if test="description != null" >
- description = #{description,jdbcType=VARCHAR},
- </if>
- </set>
- where id = #{id,jdbcType=INTEGER}
- </update>
- <update id="updateByPrimaryKey" parameterType="com.moral.entity.Organization" >
- update organization
- set name = #{name,jdbcType=VARCHAR},
- rank = #{rank,jdbcType=INTEGER},
- province_code = #{provinceCode,jdbcType=INTEGER},
- city_code = #{cityCode,jdbcType=INTEGER},
- area_code = #{areaCode,jdbcType=INTEGER},
- address = #{address,jdbcType=VARCHAR},
- telephone = #{telephone,jdbcType=VARCHAR},
- email = #{email,jdbcType=VARCHAR},
- is_delete = #{isDelete,jdbcType=CHAR},
- create_time = #{createTime,jdbcType=TIMESTAMP},
- expire_time = #{expireTime,jdbcType=TIMESTAMP},
- description = #{description,jdbcType=VARCHAR}
- where id = #{id,jdbcType=INTEGER}
- </update>
+
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/OrganizationRelationMapper.xml b/src/main/resources/mapper/OrganizationRelationMapper.xml
index 4af8ead..7794fba 100644
--- a/src/main/resources/mapper/OrganizationRelationMapper.xml
+++ b/src/main/resources/mapper/OrganizationRelationMapper.xml
@@ -6,176 +6,4 @@
<result column="parent_id" property="parentId" jdbcType="INTEGER" />
<result column="child_id" property="childId" jdbcType="INTEGER" />
</resultMap>
- <sql id="Example_Where_Clause" >
- <where >
- <foreach collection="oredCriteria" item="criteria" separator="or" >
- <if test="criteria.valid" >
- <trim prefix="(" suffix=")" prefixOverrides="and" >
- <foreach collection="criteria.criteria" item="criterion" >
- <choose >
- <when test="criterion.noValue" >
- and ${criterion.condition}
- </when>
- <when test="criterion.singleValue" >
- and ${criterion.condition} #{criterion.value}
- </when>
- <when test="criterion.betweenValue" >
- and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
- </when>
- <when test="criterion.listValue" >
- and ${criterion.condition}
- <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
- #{listItem}
- </foreach>
- </when>
- </choose>
- </foreach>
- </trim>
- </if>
- </foreach>
- </where>
- </sql>
- <sql id="Update_By_Example_Where_Clause" >
- <where >
- <foreach collection="example.oredCriteria" item="criteria" separator="or" >
- <if test="criteria.valid" >
- <trim prefix="(" suffix=")" prefixOverrides="and" >
- <foreach collection="criteria.criteria" item="criterion" >
- <choose >
- <when test="criterion.noValue" >
- and ${criterion.condition}
- </when>
- <when test="criterion.singleValue" >
- and ${criterion.condition} #{criterion.value}
- </when>
- <when test="criterion.betweenValue" >
- and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
- </when>
- <when test="criterion.listValue" >
- and ${criterion.condition}
- <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
- #{listItem}
- </foreach>
- </when>
- </choose>
- </foreach>
- </trim>
- </if>
- </foreach>
- </where>
- </sql>
- <sql id="Base_Column_List" >
- id, parent_id, child_id
- </sql>
- <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.moral.entity.OrganizationRelationExample" >
- select
- <if test="distinct" >
- distinct
- </if>
- <include refid="Base_Column_List" />
- from organization_relation
- <if test="_parameter != null" >
- <include refid="Example_Where_Clause" />
- </if>
- <if test="orderByClause != null" >
- order by ${orderByClause}
- </if>
- </select>
- <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
- select
- <include refid="Base_Column_List" />
- from organization_relation
- where id = #{id,jdbcType=INTEGER}
- </select>
- <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
- delete from organization_relation
- where id = #{id,jdbcType=INTEGER}
- </delete>
- <delete id="deleteByExample" parameterType="com.moral.entity.OrganizationRelationExample" >
- delete from organization_relation
- <if test="_parameter != null" >
- <include refid="Example_Where_Clause" />
- </if>
- </delete>
- <insert id="insert" parameterType="com.moral.entity.OrganizationRelation" >
- insert into organization_relation (id, parent_id, child_id
- )
- values (#{id,jdbcType=INTEGER}, #{parentId,jdbcType=INTEGER}, #{childId,jdbcType=INTEGER}
- )
- </insert>
- <insert id="insertSelective" parameterType="com.moral.entity.OrganizationRelation" >
- insert into organization_relation
- <trim prefix="(" suffix=")" suffixOverrides="," >
- <if test="id != null" >
- id,
- </if>
- <if test="parentId != null" >
- parent_id,
- </if>
- <if test="childId != null" >
- child_id,
- </if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides="," >
- <if test="id != null" >
- #{id,jdbcType=INTEGER},
- </if>
- <if test="parentId != null" >
- #{parentId,jdbcType=INTEGER},
- </if>
- <if test="childId != null" >
- #{childId,jdbcType=INTEGER},
- </if>
- </trim>
- </insert>
- <select id="countByExample" parameterType="com.moral.entity.OrganizationRelationExample" resultType="java.lang.Integer" >
- select count(*) from organization_relation
- <if test="_parameter != null" >
- <include refid="Example_Where_Clause" />
- </if>
- </select>
- <update id="updateByExampleSelective" parameterType="map" >
- update organization_relation
- <set >
- <if test="record.id != null" >
- id = #{record.id,jdbcType=INTEGER},
- </if>
- <if test="record.parentId != null" >
- parent_id = #{record.parentId,jdbcType=INTEGER},
- </if>
- <if test="record.childId != null" >
- child_id = #{record.childId,jdbcType=INTEGER},
- </if>
- </set>
- <if test="_parameter != null" >
- <include refid="Update_By_Example_Where_Clause" />
- </if>
- </update>
- <update id="updateByExample" parameterType="map" >
- update organization_relation
- set id = #{record.id,jdbcType=INTEGER},
- parent_id = #{record.parentId,jdbcType=INTEGER},
- child_id = #{record.childId,jdbcType=INTEGER}
- <if test="_parameter != null" >
- <include refid="Update_By_Example_Where_Clause" />
- </if>
- </update>
- <update id="updateByPrimaryKeySelective" parameterType="com.moral.entity.OrganizationRelation" >
- update organization_relation
- <set >
- <if test="parentId != null" >
- parent_id = #{parentId,jdbcType=INTEGER},
- </if>
- <if test="childId != null" >
- child_id = #{childId,jdbcType=INTEGER},
- </if>
- </set>
- where id = #{id,jdbcType=INTEGER}
- </update>
- <update id="updateByPrimaryKey" parameterType="com.moral.entity.OrganizationRelation" >
- update organization_relation
- set parent_id = #{parentId,jdbcType=INTEGER},
- child_id = #{childId,jdbcType=INTEGER}
- where id = #{id,jdbcType=INTEGER}
- </update>
</mapper>
\ No newline at end of file
diff --git a/src/test/java/com/moral/MybatisConfig.java b/src/test/java/com/moral/MybatisConfig.java
new file mode 100644
index 0000000..0ebce67
--- /dev/null
+++ b/src/test/java/com/moral/MybatisConfig.java
@@ -0,0 +1,23 @@
+package com.moral;
+
+import java.util.Properties;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import com.github.pagehelper.PageHelper;
+
+@Configuration
+public class MybatisConfig {
+ @Bean
+ public PageHelper pageHelper(){
+ PageHelper pageHelper = new PageHelper();
+ Properties properties = new Properties();
+ properties.setProperty("offsetAsPageNum","true");
+ properties.setProperty("rowBoundsWithCount","true");
+ properties.setProperty("reasonable","true");
+ properties.setProperty("dialect","mysql"); //������mysql������������������
+ pageHelper.setProperties(properties);
+ return pageHelper;
+ }
+}
\ No newline at end of file
--
Gitblit v1.8.0