代码上传

.gitignore

@@ -0,0 +1,31 @@
+HELP.md
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**
+!**/src/test/**
+.mvn
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+
+### VS Code ###
+.vscode/

common/pom.xml

@@ -0,0 +1,210 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>smart-community-server</artifactId>
+        <groupId>com.jpsoft.smart</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>common</artifactId>
+    <name>common</name>
+    <description>智慧小区公共库</description>
+    <packaging>jar</packaging>
+    <properties>
+        <swagger2.version>2.7.0</swagger2.version>
+        <jwts.version>0.10.5</jwts.version>
+        <netty-all.version>4.1.6.Final</netty-all.version>
+        <fastjson.version>1.2.29</fastjson.version>
+        <alipay.version>4.8.10.ALL</alipay.version>
+        <ijpay.version>2.3.2</ijpay.version>
+        <poi.version>4.1.0</poi.version>
+    </properties>
+    <dependencies>
+
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.9</version>
+        </dependency>
+
+
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+            <version>${poi.version}</version>
+            <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-codec</artifactId>
+                    <groupId>commons-codec</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-scratchpad</artifactId>
+            <version>${poi.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>${poi.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml-schemas</artifactId>
+            <version>${poi.version}</version>
+            <!--  <scope>compile</scope>-->
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-codec</groupId>
+                    <artifactId>commons-codec</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <version>${swagger2.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>${swagger2.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-codec</groupId>
+                    <artifactId>commons-codec</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-all</artifactId>
+            <version>${netty-all.version}</version>
+        </dependency>
+        <!--json start-->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>${fastjson.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>net.sf.json-lib</groupId>
+            <artifactId>json-lib</artifactId>
+            <version>2.4</version>
+            <type>jar</type>
+            <classifier>jdk15</classifier>
+        </dependency>
+        <!--json end-->
+
+        <dependency>
+            <groupId>com.github.dozermapper</groupId>
+            <artifactId>dozer-core</artifactId>
+            <version>6.4.1</version>
+        </dependency>
+
+        <!-- 数据库相关 start-->
+        <dependency>
+            <groupId>org.mybatis.spring.boot</groupId>
+            <artifactId>mybatis-spring-boot-starter</artifactId>
+            <version>2.0.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper-spring-boot-starter</artifactId>
+            <version>LATEST</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-starter</artifactId>
+            <version>1.1.10</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+        <!-- 数据库相关 end-->
+
+        <!--短信相关 start-->
+        <dependency>
+            <groupId>com.taobao</groupId>
+            <artifactId>taobao-sdk-java</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <!--短信相关 end-->
+
+
+        <!-- aliyun oss start -->
+        <dependency>
+            <groupId>com.aliyun.oss</groupId>
+            <artifactId>aliyun-sdk-oss</artifactId>
+            <version>3.1.0</version>
+        </dependency>
+        <!-- aliyun oss end -->
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>joda-time</groupId>
+            <artifactId>joda-time</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.github.binarywang</groupId>
+            <artifactId>weixin-java-cp</artifactId>
+            <version>3.7.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov-jdk16</artifactId>
+            <version>1.46</version>
+        </dependency>
+
+        <!--rabbmitmq-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-amqp</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

common/src/main/java/com/jpsoft/smart/config/OSSConfig.java

@@ -0,0 +1,17 @@
+package com.jpsoft.smart.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@Component
+@ConfigurationProperties(prefix = "oss")
+@Data
+public class OSSConfig {
+    private String accessKeyId;
+    private String accessKeySecret;
+    private String endpoint;
+    private String bucketName;
+    private String urlPrefix;
+    private String objectPre;
+}

common/src/main/java/com/jpsoft/smart/config/ParkingConfig.java

@@ -0,0 +1,18 @@
+package com.jpsoft.smart.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author 墨鱼_mo
+ * @date 2020-4-13 14:47
+ */
+@Component
+@ConfigurationProperties(prefix = "parking")
+@Data
+public class ParkingConfig {
+
+    private String userName;
+    private String ip;
+}

common/src/main/java/com/jpsoft/smart/config/TemperatureConfig.java

@@ -0,0 +1,12 @@
+package com.jpsoft.smart.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@Component
+@Data
+public class TemperatureConfig {
+    private float max = 37.2F;
+    private float min = 36.1F;
+}

common/src/main/java/com/jpsoft/smart/config/WxConfig.java

@@ -0,0 +1,22 @@
+package com.jpsoft.smart.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author 墨鱼_mo
+ * @date 2020-3-21 13:42
+ */
+@Component
+@ConfigurationProperties(prefix = "wx.pay")
+@Data
+public class WxConfig {
+    private String appId;
+    private String appSecret;
+    private String token;
+    private String tokenUrl;
+    private String createQrCodeUrl;
+    private String showQrCodeUrl;
+    private String contentType;
+}

common/src/main/java/com/jpsoft/smart/config/WxCpConfig.java

@@ -0,0 +1,57 @@
+package com.jpsoft.smart.config;
+
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author 墨鱼_mo
+ * @date 2020-4-1 11:47
+ */
+@Component
+@ConfigurationProperties(prefix = "wx.cp")
+@Data
+public class WxCpConfig {
+
+    /**
+     * 设置微信企业号的corpId
+     */
+    private String corpId;
+
+    private List<AppConfig> appConfigs;
+
+
+    @Getter
+    @Setter
+    public static class AppConfig {
+        /**
+         * 设置微信企业应用的AgentId
+         */
+        private Integer agentId;
+
+        /**
+         * 设置微信企业应用的Secret
+         */
+        private String secret;
+
+        /**
+         * 设置微信企业号的token
+         */
+        private String token;
+
+        /**
+         * 设置微信企业号的EncodingAESKey
+         */
+        private String aesKey;
+
+    }
+
+
+
+
+
+}

common/src/main/java/com/jpsoft/smart/cpbuilder/AbstractBuilder.java

@@ -0,0 +1,16 @@
+package com.jpsoft.smart.cpbuilder;
+
+import me.chanjar.weixin.cp.api.WxCpService;
+import me.chanjar.weixin.cp.bean.WxCpXmlMessage;
+import me.chanjar.weixin.cp.bean.WxCpXmlOutMessage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ *  @author Binary Wang(https://github.com/binarywang)
+ */
+public abstract class AbstractBuilder {
+  protected final Logger logger = LoggerFactory.getLogger(getClass());
+
+  public abstract WxCpXmlOutMessage build(String content, WxCpXmlMessage wxMessage, WxCpService service);
+}

common/src/main/java/com/jpsoft/smart/cpbuilder/TextBuilder.java

@@ -0,0 +1,22 @@
+package com.jpsoft.smart.cpbuilder;
+
+import me.chanjar.weixin.cp.api.WxCpService;
+import me.chanjar.weixin.cp.bean.WxCpXmlMessage;
+import me.chanjar.weixin.cp.bean.WxCpXmlOutMessage;
+import me.chanjar.weixin.cp.bean.WxCpXmlOutTextMessage;
+
+/**
+ *  @author Binary Wang(https://github.com/binarywang)
+ */
+public class TextBuilder extends AbstractBuilder {
+
+  @Override
+  public WxCpXmlOutTextMessage build(String content, WxCpXmlMessage wxMessage,
+                                 WxCpService service) {
+    WxCpXmlOutTextMessage m = WxCpXmlOutMessage.TEXT().content(content)
+        .fromUser(wxMessage.getToUserName()).toUser(wxMessage.getFromUserName())
+        .build();
+    return m;
+  }
+
+}

common/src/main/java/com/jpsoft/smart/cphandler/AbstractHandler.java

@@ -0,0 +1,13 @@
+package com.jpsoft.smart.cphandler;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import me.chanjar.weixin.cp.message.WxCpMessageHandler;
+
+/**
+ * @author Binary Wang(https://github.com/binarywang)
+ */
+public abstract class AbstractHandler implements WxCpMessageHandler {
+  protected Logger logger = LoggerFactory.getLogger(getClass());
+}

common/src/main/java/com/jpsoft/smart/cphandler/ContactChangeHandler.java

@@ -0,0 +1,30 @@
+package com.jpsoft.smart.cphandler;
+
+import java.util.Map;
+
+import com.jpsoft.smart.cpbuilder.TextBuilder;
+import org.springframework.stereotype.Component;
+
+import me.chanjar.weixin.common.session.WxSessionManager;
+import me.chanjar.weixin.cp.api.WxCpService;
+import me.chanjar.weixin.cp.bean.WxCpXmlMessage;
+import me.chanjar.weixin.cp.bean.WxCpXmlOutMessage;
+
+/**
+ * 通讯录变更事件处理器.
+ *
+ * @author Binary Wang(https://github.com/binarywang)
+ */
+@Component
+public class ContactChangeHandler extends AbstractHandler {
+
+  @Override
+  public WxCpXmlOutMessage handle(WxCpXmlMessage wxMessage, Map<String, Object> context, WxCpService cpService,
+                                  WxSessionManager sessionManager) {
+    String content = "收到通讯录变更事件，内容：" + wxMessage;
+    this.logger.info(content);
+
+    return new TextBuilder().build(content, wxMessage, cpService);
+  }
+
+}

common/src/main/java/com/jpsoft/smart/cphandler/EnterAgentHandler.java

@@ -0,0 +1,29 @@
+package com.jpsoft.smart.cphandler;
+
+import java.util.Map;
+
+import lombok.extern.slf4j.Slf4j;
+import me.chanjar.weixin.common.error.WxErrorException;
+import me.chanjar.weixin.common.session.WxSessionManager;
+import me.chanjar.weixin.cp.api.WxCpService;
+import me.chanjar.weixin.cp.bean.WxCpXmlMessage;
+import me.chanjar.weixin.cp.bean.WxCpXmlOutMessage;
+
+/**
+ * <pre>
+ *
+ * Created by Binary Wang on 2018/8/27.
+ * </pre>
+ *
+ * @author <a href="https://github.com/binarywang">Binary Wang</a>
+ */
+@Slf4j
+public class EnterAgentHandler extends AbstractHandler {
+    private static final int TEST_AGENT = 1000002;
+
+    @Override
+    public WxCpXmlOutMessage handle(WxCpXmlMessage wxMessage, Map<String, Object> context, WxCpService wxCpService, WxSessionManager sessionManager) throws WxErrorException {
+        // do something
+        return null;
+    }
+}

common/src/main/java/com/jpsoft/smart/cphandler/LocationHandler.java

@@ -0,0 +1,43 @@
+package com.jpsoft.smart.cphandler;
+
+import java.util.Map;
+
+import com.jpsoft.smart.cpbuilder.TextBuilder;
+import org.springframework.stereotype.Component;
+
+import me.chanjar.weixin.common.api.WxConsts;
+import me.chanjar.weixin.common.session.WxSessionManager;
+import me.chanjar.weixin.cp.api.WxCpService;
+import me.chanjar.weixin.cp.bean.WxCpXmlMessage;
+import me.chanjar.weixin.cp.bean.WxCpXmlOutMessage;
+
+/**
+ * @author Binary Wang(https://github.com/binarywang)
+ */
+@Component
+public class LocationHandler extends AbstractHandler {
+
+  @Override
+  public WxCpXmlOutMessage handle(WxCpXmlMessage wxMessage, Map<String, Object> context, WxCpService cpService,
+                                  WxSessionManager sessionManager) {
+    if (wxMessage.getMsgType().equals(WxConsts.XmlMsgType.LOCATION)) {
+      //TODO 接收处理用户发送的地理位置消息
+      try {
+        String content = "感谢反馈，您的的地理位置已收到！";
+        return new TextBuilder().build(content, wxMessage, null);
+      } catch (Exception e) {
+        this.logger.error("位置消息接收处理失败", e);
+        return null;
+      }
+    }
+
+    //上报地理位置事件
+    this.logger.info("\n上报地理位置，纬度 : {}\n经度 : {}\n精度 : {}",
+        wxMessage.getLatitude(), wxMessage.getLongitude(), String.valueOf(wxMessage.getPrecision()));
+
+    //TODO  可以将用户地理位置信息保存到本地数据库，以便以后使用
+
+    return null;
+  }
+
+}

common/src/main/java/com/jpsoft/smart/cphandler/LogHandler.java

@@ -0,0 +1,24 @@
+package com.jpsoft.smart.cphandler;
+
+import java.util.Map;
+
+import org.springframework.stereotype.Component;
+
+import me.chanjar.weixin.common.session.WxSessionManager;
+import me.chanjar.weixin.cp.api.WxCpService;
+import me.chanjar.weixin.cp.bean.WxCpXmlMessage;
+import me.chanjar.weixin.cp.bean.WxCpXmlOutMessage;
+
+/**
+ *  @author Binary Wang(https://github.com/binarywang)
+ */
+@Component
+public class LogHandler extends AbstractHandler {
+  @Override
+  public WxCpXmlOutMessage handle(WxCpXmlMessage wxMessage, Map<String, Object> context, WxCpService cpService,
+                                  WxSessionManager sessionManager) {
+    this.logger.info("\n接收到请求消息，内容：{}", wxMessage);
+    return null;
+  }
+
+}

common/src/main/java/com/jpsoft/smart/cphandler/MenuHandler.java

@@ -0,0 +1,35 @@
+package com.jpsoft.smart.cphandler;
+
+import java.util.Map;
+
+import org.springframework.stereotype.Component;
+
+import me.chanjar.weixin.common.api.WxConsts.MenuButtonType;
+import me.chanjar.weixin.common.session.WxSessionManager;
+import me.chanjar.weixin.cp.api.WxCpService;
+import me.chanjar.weixin.cp.bean.WxCpXmlMessage;
+import me.chanjar.weixin.cp.bean.WxCpXmlOutMessage;
+
+/**
+ * @author Binary Wang(https://github.com/binarywang)
+ */
+@Component
+public class MenuHandler extends AbstractHandler {
+
+  @Override
+  public WxCpXmlOutMessage handle(WxCpXmlMessage wxMessage, Map<String, Object> context, WxCpService cpService,
+                                  WxSessionManager sessionManager) {
+
+    String msg = String.format("type:%s, event:%s, key:%s",
+        wxMessage.getMsgType(), wxMessage.getEvent(),
+        wxMessage.getEventKey());
+    if (MenuButtonType.VIEW.equals(wxMessage.getEvent())) {
+      return null;
+    }
+
+    return WxCpXmlOutMessage.TEXT().content(msg)
+        .fromUser(wxMessage.getToUserName()).toUser(wxMessage.getFromUserName())
+        .build();
+  }
+
+}

common/src/main/java/com/jpsoft/smart/cphandler/MsgHandler.java

@@ -0,0 +1,45 @@
+package com.jpsoft.smart.cphandler;
+
+import cn.hutool.json.JSONObject;
+import com.jpsoft.smart.cpbuilder.TextBuilder;
+import me.chanjar.weixin.common.api.WxConsts;
+import me.chanjar.weixin.common.session.WxSessionManager;
+import me.chanjar.weixin.cp.api.WxCpService;
+import me.chanjar.weixin.cp.bean.WxCpXmlMessage;
+import me.chanjar.weixin.cp.bean.WxCpXmlOutMessage;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+
+/**
+ * @author Binary Wang(https://github.com/binarywang)
+ */
+@Component
+public class MsgHandler extends AbstractHandler {
+
+    @Override
+    public WxCpXmlOutMessage handle(WxCpXmlMessage wxMessage, Map<String, Object> context, WxCpService cpService,
+                                    WxSessionManager sessionManager) {
+        final String msgType = wxMessage.getMsgType();
+        if (msgType == null) {
+            // 如果msgType没有，就自己根据具体报文内容做处理
+         //   return new TextBuilder().build("success", wxMessage, cpService);
+            logger.warn("安装测试"+wxMessage);
+            Map map = wxMessage.getAllFieldsMap();
+            String authCode = (String) map.get("AuthCode");
+            return new TextBuilder().build("success", wxMessage, cpService);
+        }
+
+        if (!msgType.equals(WxConsts.XmlMsgType.EVENT)) {
+            //TODO 可以选择将消息保存到本地
+        }
+
+        //TODO 组装回复消息
+        String content = "收到信息内容：" + wxMessage;
+
+        return new TextBuilder().build(content, wxMessage, cpService);
+
+    }
+
+}

common/src/main/java/com/jpsoft/smart/cphandler/NullHandler.java

@@ -0,0 +1,24 @@
+package com.jpsoft.smart.cphandler;
+
+import java.util.Map;
+
+import org.springframework.stereotype.Component;
+
+import me.chanjar.weixin.common.session.WxSessionManager;
+import me.chanjar.weixin.cp.api.WxCpService;
+import me.chanjar.weixin.cp.bean.WxCpXmlMessage;
+import me.chanjar.weixin.cp.bean.WxCpXmlOutMessage;
+
+/**
+ * @author Binary Wang(https://github.com/binarywang)
+ */
+@Component
+public class NullHandler extends AbstractHandler {
+
+  @Override
+  public WxCpXmlOutMessage handle(WxCpXmlMessage wxMessage, Map<String, Object> context, WxCpService cpService,
+                                  WxSessionManager sessionManager) {
+    return null;
+  }
+
+}

common/src/main/java/com/jpsoft/smart/cphandler/ScanHandler.java

@@ -0,0 +1,8 @@
+package com.jpsoft.smart.cphandler;
+
+/**
+ * @author Binary Wang(https://github.com/binarywang)
+ */
+public abstract class ScanHandler extends AbstractHandler {
+
+}

common/src/main/java/com/jpsoft/smart/cphandler/SubscribeHandler.java

@@ -0,0 +1,62 @@
+package com.jpsoft.smart.cphandler;
+
+import java.util.Map;
+
+import com.jpsoft.smart.cpbuilder.TextBuilder;
+import org.springframework.stereotype.Component;
+
+import me.chanjar.weixin.common.error.WxErrorException;
+import me.chanjar.weixin.common.session.WxSessionManager;
+import me.chanjar.weixin.cp.api.WxCpService;
+import me.chanjar.weixin.cp.bean.WxCpUser;
+import me.chanjar.weixin.cp.bean.WxCpXmlMessage;
+import me.chanjar.weixin.cp.bean.WxCpXmlOutMessage;
+
+/**
+ * @author Binary Wang(https://github.com/binarywang)
+ */
+@Component
+public class SubscribeHandler extends AbstractHandler {
+
+  @Override
+  public WxCpXmlOutMessage handle(WxCpXmlMessage wxMessage, Map<String, Object> context, WxCpService cpService,
+                                  WxSessionManager sessionManager) throws WxErrorException {
+
+    this.logger.info("新关注用户 OPENID: " + wxMessage.getFromUserName());
+
+    // 获取微信用户基本信息
+    WxCpUser userWxInfo = cpService.getUserService().getById(wxMessage.getFromUserName());
+
+    if (userWxInfo != null) {
+      // TODO 可以添加关注用户到本地
+    }
+
+    WxCpXmlOutMessage responseResult = null;
+    try {
+      responseResult = handleSpecial(wxMessage);
+    } catch (Exception e) {
+      this.logger.error(e.getMessage(), e);
+    }
+
+    if (responseResult != null) {
+      return responseResult;
+    }
+
+    try {
+      return new TextBuilder().build("感谢关注", wxMessage, cpService);
+    } catch (Exception e) {
+      this.logger.error(e.getMessage(), e);
+    }
+
+    return null;
+  }
+
+  /**
+   * 处理特殊请求，比如如果是扫码进来的，可以做相应处理
+   */
+  private WxCpXmlOutMessage handleSpecial(WxCpXmlMessage wxMessage) {
+    //TODO
+    return null;
+  }
+
+}

common/src/main/java/com/jpsoft/smart/cphandler/UnsubscribeHandler.java

@@ -0,0 +1,27 @@
+package com.jpsoft.smart.cphandler;
+
+import java.util.Map;
+
+import org.springframework.stereotype.Component;
+
+import me.chanjar.weixin.common.session.WxSessionManager;
+import me.chanjar.weixin.cp.api.WxCpService;
+import me.chanjar.weixin.cp.bean.WxCpXmlMessage;
+import me.chanjar.weixin.cp.bean.WxCpXmlOutMessage;
+
+/**
+ * @author Binary Wang(https://github.com/binarywang)
+ */
+@Component
+public class UnsubscribeHandler extends AbstractHandler {
+
+  @Override
+  public WxCpXmlOutMessage handle(WxCpXmlMessage wxMessage, Map<String, Object> context, WxCpService cpService,
+                                  WxSessionManager sessionManager) {
+    String openId = wxMessage.getFromUserName();
+    this.logger.info("取消关注用户 OPENID: " + openId);
+    // TODO 可以更新本地数据库为取消关注状态
+    return null;
+  }
+
+}

common/src/main/java/com/jpsoft/smart/modules/base/dao/AlarmConfigDAO.java

@@ -0,0 +1,21 @@
+package com.jpsoft.smart.modules.base.dao;
+
+import java.util.List;
+import org.springframework.stereotype.Repository;
+import com.jpsoft.smart.modules.base.entity.AlarmConfig;
+import java.util.Map;
+import com.jpsoft.smart.modules.common.dto.Sort;
+
+@Repository
+public interface AlarmConfigDAO {
+	int insert(AlarmConfig entity);
+	int update(AlarmConfig entity);
+	int exist(String id);
+	AlarmConfig get(String id);
+	int delete(String id);
+	List<AlarmConfig> list();
+	List<AlarmConfig> search(Map<String, Object> searchParams, List<Sort> sortList);
+    List<AlarmConfig> findByCompanyId(String companyId);
+
+    List<AlarmConfig> findByCompanyIdAndWeekDay(String companyId, String weekDay);
+}

common/src/main/java/com/jpsoft/smart/modules/base/dao/AlarmInfoDAO.java

@@ -0,0 +1,20 @@
+package com.jpsoft.smart.modules.base.dao;
+
+import com.jpsoft.smart.modules.base.entity.AlarmInfo;
+import com.jpsoft.smart.modules.common.dto.Sort;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+@Repository
+public interface AlarmInfoDAO {
+	int insert(AlarmInfo entity);
+	int update(AlarmInfo entity);
+	int exist(String id);
+	AlarmInfo get(String id);
+	int delete(String id);
+	AlarmInfo queryLatestAlarm(String type);
+	List<AlarmInfo> list();
+	List<AlarmInfo> search(Map<String, Object> searchParams, List<Sort> sortList);
+}

common/src/main/java/com/jpsoft/smart/modules/base/dao/CheckNumCompanyDAO.java

@@ -0,0 +1,47 @@
+package com.jpsoft.smart.modules.base.dao;
+import com.jpsoft.smart.modules.base.entity.CompanyInfo;
+import org.apache.ibatis.annotations.Param;
+
+import com.jpsoft.smart.modules.base.entity.CheckNumCompany;
+import com.jpsoft.smart.modules.common.dto.Sort;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author 墨鱼_mo
+ * @date 2020-3-27 10:35
+ */
+@Repository
+public interface CheckNumCompanyDAO {
+
+
+    int insert(CheckNumCompany entity);
+
+    int update(CheckNumCompany entity);
+
+    CheckNumCompany get(Long id);
+
+    int delete(Long id);
+
+    List<CheckNumCompany> list();
+
+    List<CheckNumCompany> search(Map<String, Object> searchParams, List<Sort> sortList);
+
+
+    CheckNumCompany  findByCompanyIdAndRecordTime(@Param("companyId")String companyId,@Param("recordTime")String recordTime);
+
+
+    Integer getDayCheckNum( @Param("recordTime") String recordTime);
+
+
+    Integer getDayCheckNumByCompanyList(@Param("recordTime") String recordTime, @Param("list") List<CompanyInfo> list);
+
+    List<CheckNumCompany> findByRecordTime(@Param("recordTime")String recordTime);
+
+
+    Integer getDayNormalNumByCompanyList(@Param("recordTime") String recordTime,@Param("list") List<CompanyInfo> list);
+
+    Integer getDayAbnormalNumByCompanyList(@Param("recordTime") String recordTime, @Param("list") List<CompanyInfo> list);
+}

common/src/main/java/com/jpsoft/smart/modules/base/dao/CompanyDeviceRelationDAO.java

@@ -0,0 +1,27 @@
+package com.jpsoft.smart.modules.base.dao;
+
+import java.util.List;
+
+import com.jpsoft.smart.modules.base.entity.DeviceInfo;
+import org.springframework.stereotype.Repository;
+import com.jpsoft.smart.modules.base.entity.CompanyDeviceRelation;
+import java.util.Map;
+import com.jpsoft.smart.modules.common.dto.Sort;
+
+@Repository
+public interface CompanyDeviceRelationDAO {
+	int insert(CompanyDeviceRelation entity);
+	int update(CompanyDeviceRelation entity);
+	int exist(String id);
+	CompanyDeviceRelation get(String id);
+	int delete(String id);
+	List<CompanyDeviceRelation> list();
+	List<CompanyDeviceRelation> search(Map<String,Object> searchParams,List<Sort> sortList);
+    List<DeviceInfo> findDeviceByCompanyId(String companyId);
+	CompanyDeviceRelation findByCompanyIdAndDeviceId(String companyId, String deviceId);
+	List<CompanyDeviceRelation> findByCompanyId(String companyId);
+	List<CompanyDeviceRelation> findByDeviceId(String deviceId);
+	int deleteByCompanyId(String companyId);
+	int deleteByDeviceId(String deviceId);
+    int deleteByCompanyIdAndDeviceId(String companyId, String deviceId);
+}

common/src/main/java/com/jpsoft/smart/modules/base/dao/CompanyInfoDAO.java

@@ -0,0 +1,41 @@
+package com.jpsoft.smart.modules.base.dao;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+import com.jpsoft.smart.modules.base.entity.CompanyInfo;
+import java.util.Map;
+import com.jpsoft.smart.modules.common.dto.Sort;
+
+@Repository
+public interface CompanyInfoDAO {
+	int insert(CompanyInfo entity);
+
+	int update(CompanyInfo entity);
+
+	int exist(String id);
+
+	CompanyInfo get(String id);
+
+	int delete(String id);
+
+	List<CompanyInfo> list();
+
+	List<CompanyInfo> search(Map<String, Object> searchParams, List<Sort> sortList);
+
+	List<CompanyInfo> findByCompanyCode(String code);
+
+	long countByParentId(@Param("parentId") String parentId);
+
+	long countByCompanyCode(String code,Long personId);
+
+	int updateCode(String oldCode,int startIndex, String newCode);
+
+    List<CompanyInfo> findByCompanyCode(String code, Long personId);
+
+    List<CompanyInfo> findByParentId(@Param("parentId") String parentId);
+
+	CompanyInfo findByName(String name);
+
+}

common/src/main/java/com/jpsoft/smart/modules/base/dao/CompanyPaymentInfoDAO.java

@@ -0,0 +1,16 @@
+package com.jpsoft.smart.modules.base.dao;
+
+import com.jpsoft.smart.modules.base.entity.CompanyPaymentInfo;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author 墨鱼_mo
+ * @date 2020-4-14 11:21
+ */
+@Repository
+public interface CompanyPaymentInfoDAO {
+
+    CompanyPaymentInfo findByCompanyId(String companyId);
+
+    CompanyPaymentInfo get(Long i);
+}

common/src/main/java/com/jpsoft/smart/modules/base/dao/CompanyPositionDAO.java

@@ -0,0 +1,19 @@
+package com.jpsoft.smart.modules.base.dao;
+
+import java.util.List;
+import org.springframework.stereotype.Repository;
+import com.jpsoft.smart.modules.base.entity.CompanyPosition;
+import java.util.Map;
+import com.jpsoft.smart.modules.common.dto.Sort;
+
+@Repository
+public interface CompanyPositionDAO {
+	int insert(CompanyPosition entity);
+	int update(CompanyPosition entity);
+	int exist(String id);
+	CompanyPosition get(String id);
+	int delete(String id);
+	List<CompanyPosition> findByCompanyId(String companyId);
+	List<CompanyPosition> list();
+	List<CompanyPosition> search(Map<String, Object> searchParams, List<Sort> sortList);
+}

common/src/main/java/com/jpsoft/smart/modules/base/dao/DeviceInfoDAO.java

@@ -0,0 +1,25 @@
+package com.jpsoft.smart.modules.base.dao;
+
+import java.util.List;
+import org.springframework.stereotype.Repository;
+import com.jpsoft.smart.modules.base.entity.DeviceInfo;
+import java.util.Map;
+import com.jpsoft.smart.modules.common.dto.Sort;
+
+@Repository
+public interface DeviceInfoDAO {
+	int insert(DeviceInfo entity);
+	int update(DeviceInfo entity);
+	int exist(String id);
+	DeviceInfo get(String id);
+	DeviceInfo getByDeviceNo(String deviceNo);
+	int delete(String id);
+	List<DeviceInfo> list();
+	List<DeviceInfo> findByDeviceIdList(List<String> deviceIdList);
+	List<DeviceInfo> findByCompanyId(String companyId);
+	List<DeviceInfo> search(Map<String, Object> searchParams, List<Sort> sortList);
+
+	DeviceInfo findByDeviceNo(String deviceNo);
+
+	List<DeviceInfo> listOnline();
+}

common/src/main/java/com/jpsoft/smart/modules/base/dao/ElectricClientInfoDAO.java

@@ -0,0 +1,23 @@
+package com.jpsoft.smart.modules.base.dao;
+
+import com.jpsoft.smart.modules.base.entity.ElectricClientInfo;
+import com.jpsoft.smart.modules.common.dto.Sort;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+@Repository
+public interface ElectricClientInfoDAO {
+	int insert(ElectricClientInfo entity);
+	int update(ElectricClientInfo entity);
+	int exist(String id);
+	int getCountByCNo(String customerNo,String excludeId);
+	ElectricClientInfo get(String id);
+	ElectricClientInfo getRoomMessage(String id);
+	int delete(String id);
+	List<ElectricClientInfo> list();
+	List<ElectricClientInfo> search(Map<String, Object> searchParams, List<Sort> sortList);
+    ElectricClientInfo findOneByRoomId(@Param("roomId") String roomId);
+}

common/src/main/java/com/jpsoft/smart/modules/base/dao/ElectricMeterInfoDAO.java

@@ -0,0 +1,20 @@
+package com.jpsoft.smart.modules.base.dao;
+
+import com.jpsoft.smart.modules.base.entity.ElectricMeterInfo;
+import com.jpsoft.smart.modules.common.dto.Sort;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+@Repository
+public interface ElectricMeterInfoDAO {
+	int insert(ElectricMeterInfo entity);
+	int update(ElectricMeterInfo entity);
+	int exist(String id);
+	ElectricMeterInfo get(String id);
+	int delete(String id);
+	int getCountByMNoAndUNo(String meterNo,String unitNo,String excludeId);
+	List<ElectricMeterInfo> list();
+	List<ElectricMeterInfo> search(Map<String, Object> searchParams, List<Sort> sortList);
+}

common/src/main/java/com/jpsoft/smart/modules/base/dao/EmployeeInfoDAO.java

@@ -0,0 +1,20 @@
+package com.jpsoft.smart.modules.base.dao;
+
+import java.util.List;
+import org.springframework.stereotype.Repository;
+import com.jpsoft.smart.modules.base.entity.EmployeeInfo;
+import java.util.Map;
+import com.jpsoft.smart.modules.common.dto.Sort;
+
+@Repository
+public interface EmployeeInfoDAO {
+	int insert(EmployeeInfo entity);
+	int update(EmployeeInfo entity);
+	int exist(Long id);
+	EmployeeInfo get(Long id);
+	int delete(Long id);
+	List<EmployeeInfo> list();
+	List<EmployeeInfo> search(Map<String,Object> searchParams,List<Sort> sortList);
+	List<EmployeeInfo> findByArray(String[] array);
+	EmployeeInfo findByOpenId(String openId);
+}

common/src/main/java/com/jpsoft/smart/modules/base/dao/HolidayInfoDAO.java

@@ -0,0 +1,20 @@
+package com.jpsoft.smart.modules.base.dao;
+
+import java.util.Date;
+import java.util.List;
+import org.springframework.stereotype.Repository;
+import com.jpsoft.smart.modules.base.entity.HolidayInfo;
+import java.util.Map;
+import com.jpsoft.smart.modules.common.dto.Sort;
+
+@Repository
+public interface HolidayInfoDAO {
+	int insert(HolidayInfo entity);
+	int update(HolidayInfo entity);
+	int exist(String id);
+	HolidayInfo get(String id);
+	int delete(String id);
+	List<HolidayInfo> list();
+	List<HolidayInfo> search(Map<String,Object> searchParams,List<Sort> sortList);
+	List<HolidayInfo> findByDate(Date startDate, Date endDate);
+}

common/src/main/java/com/jpsoft/smart/modules/base/dao/InformationInfoDAO.java

@@ -0,0 +1,21 @@
+package com.jpsoft.smart.modules.base.dao;
+
+import com.jpsoft.smart.modules.base.entity.InformationInfo;
+import com.jpsoft.smart.modules.common.dto.Sort;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+@Repository
+public interface InformationInfoDAO {
+	int insert(InformationInfo entity);
+	int update(InformationInfo entity);
+	int exist(String id);
+	InformationInfo get(String id);
+	int delete(String id);
+	List<InformationInfo> list();
+	List<InformationInfo> search(Map<String, Object> searchParams, List<Sort> sortList);
+
+    List<InformationInfo> findByOwnerIdAndType(String ownerId, String type);
+}

common/src/main/java/com/jpsoft/smart/modules/base/dao/MessageNoticeCompanyDAO.java

@@ -0,0 +1,22 @@
+package com.jpsoft.smart.modules.base.dao;
+
+import java.util.List;
+
+import com.jpsoft.smart.modules.base.entity.MessageNotice;
+import org.springframework.stereotype.Repository;
+import com.jpsoft.smart.modules.base.entity.MessageNoticeCompany;
+import java.util.Map;
+import com.jpsoft.smart.modules.common.dto.Sort;
+
+@Repository
+public interface MessageNoticeCompanyDAO {
+	int insert(MessageNoticeCompany entity);
+	int update(MessageNoticeCompany entity);
+	int exist(String id);
+	MessageNoticeCompany get(String id);
+	int delete(String id);
+	int deleteByNoticeId(String noticeId);
+	List<MessageNoticeCompany> findByNoticeId(String noticeId);
+	List<MessageNoticeCompany> list();
+	List<MessageNoticeCompany> search(Map<String,Object> searchParams,List<Sort> sortList);
+}

common/src/main/java/com/jpsoft/smart/modules/base/dao/MessageNoticeDAO.java

@@ -0,0 +1,21 @@
+package com.jpsoft.smart.modules.base.dao;
+
+import java.util.List;
+
+import com.jpsoft.smart.modules.base.entity.MessageNoticeCompany;
+import org.springframework.stereotype.Repository;
+import com.jpsoft.smart.modules.base.entity.MessageNotice;
+import java.util.Map;
+import com.jpsoft.smart.modules.common.dto.Sort;
+
+@Repository
+public interface MessageNoticeDAO {
+	int insert(MessageNotice entity);
+	int update(MessageNotice entity);
+	int exist(String id);
+	MessageNotice get(String id);
+	int delete(String id);
+	List<MessageNotice> list();
+	List<MessageNotice> search(Map<String,Object> searchParams,List<Sort> sortList);
+	List<MessageNotice> searchShort(Map<String,Object> searchParams,List<Sort> sortList);
+}

common/src/main/java/com/jpsoft/smart/modules/base/dao/MessageReportDAO.java

@@ -0,0 +1,18 @@
+package com.jpsoft.smart.modules.base.dao;
+
+import java.util.List;
+import org.springframework.stereotype.Repository;
+import com.jpsoft.smart.modules.base.entity.MessageReport;
+import java.util.Map;
+import com.jpsoft.smart.modules.common.dto.Sort;
+
+@Repository
+public interface MessageReportDAO {
+	int insert(MessageReport entity);
+	int update(MessageReport entity);
+	int exist(String id);
+	MessageReport get(String id);
+	int delete(String id);
+	List<MessageReport> list();
+	List<MessageReport> search(Map<String,Object> searchParams,List<Sort> sortList);
+}

common/src/main/java/com/jpsoft/smart/modules/base/dao/OwnerInfoDAO.java

@@ -0,0 +1,20 @@
+package com.jpsoft.smart.modules.base.dao;
+
+import com.jpsoft.smart.modules.base.entity.OwnerInfo;
+import com.jpsoft.smart.modules.common.dto.Sort;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+@Repository
+public interface OwnerInfoDAO {
+	int insert(OwnerInfo entity);
+	int update(OwnerInfo entity);
+	int exist(String id);
+	OwnerInfo get(String id);
+	int delete(String id);
+	List<OwnerInfo> list();
+	List<Map> findByTel(String tel);
+	List<OwnerInfo> search(Map<String, Object> searchParams, List<Sort> sortList);
+}

common/src/main/java/com/jpsoft/smart/modules/base/dao/ParkingApplyDAO.java

@@ -0,0 +1,19 @@
+package com.jpsoft.smart.modules.base.dao;
+
+import com.jpsoft.smart.modules.base.entity.ParkingApply;
+import com.jpsoft.smart.modules.common.dto.Sort;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+@Repository
+public interface ParkingApplyDAO {
+	int insert(ParkingApply entity);
+	int update(ParkingApply entity);
+	int exist(String id);
+	ParkingApply get(String id);
+	int delete(String id);
+	List<ParkingApply> list();
+	List<ParkingApply> search(Map<String, Object> searchParams, List<Sort> sortList);
+}

common/src/main/java/com/jpsoft/smart/modules/base/dao/ParkingDeviceDAO.java

@@ -0,0 +1,37 @@
+package com.jpsoft.smart.modules.base.dao;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.jpsoft.smart.modules.base.entity.AlarmConfig;
+import com.jpsoft.smart.modules.base.entity.ParkingDevice;
+import com.jpsoft.smart.modules.common.dto.Sort;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author 墨鱼_mo
+ * @date 2020-5-22 16:46
+ */
+@Repository
+public interface ParkingDeviceDAO {
+
+    int insert(ParkingDevice entity);
+
+    int update(ParkingDevice entity);
+
+    int exist(Long id);
+
+    ParkingDevice get(Long id);
+
+    int delete(Long id);
+
+    List<ParkingDevice> list();
+
+    List<ParkingDevice> search(Map<String, Object> searchParams, List<Sort> sortList);
+
+    ParkingDevice findByParkDeviceNo(@Param("parkDeviceNo") String parkDeviceNo);
+
+
+}

common/src/main/java/com/jpsoft/smart/modules/base/dao/ParkingInfoDAO.java

@@ -0,0 +1,19 @@
+package com.jpsoft.smart.modules.base.dao;
+
+import com.jpsoft.smart.modules.base.entity.ParkingInfo;
+import com.jpsoft.smart.modules.common.dto.Sort;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+@Repository
+public interface ParkingInfoDAO {
+	int insert(ParkingInfo entity);
+	int update(ParkingInfo entity);
+	int exist(String id);
+	ParkingInfo get(String id);
+	int delete(String id);
+	List<ParkingInfo> list();
+	List<ParkingInfo> search(Map<String, Object> searchParams, List<Sort> sortList);
+}

common/src/main/java/com/jpsoft/smart/modules/base/dao/ParkingRecordDAO.java

@@ -0,0 +1,24 @@
+package com.jpsoft.smart.modules.base.dao;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+import com.jpsoft.smart.modules.base.entity.ParkingRecord;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author 墨鱼_mo
+ * @date 2020-4-14 9:40
+ */
+@Repository
+public interface ParkingRecordDAO {
+
+    int insert(ParkingRecord parkingRecord);
+
+    ParkingRecord  findById(@Param("id")String id);
+
+    void update(ParkingRecord parkingRecord);
+
+    ParkingRecord  findBySerialNumber(@Param("serialNumber")String serialNumber);
+
+
+}

common/src/main/java/com/jpsoft/smart/modules/base/dao/PersonCompanyDAO.java

@@ -0,0 +1,20 @@
+package com.jpsoft.smart.modules.base.dao;
+
+import java.util.List;
+import org.springframework.stereotype.Repository;
+import com.jpsoft.smart.modules.base.entity.PersonCompany;
+import java.util.Map;
+import com.jpsoft.smart.modules.common.dto.Sort;
+
+@Repository
+public interface PersonCompanyDAO {
+	int insert(PersonCompany entity);
+	int update(PersonCompany entity);
+	int exist(String id);
+	PersonCompany get(String id);
+	int delete(String id);
+    int deleteByPersonId(Long personId);
+	List<PersonCompany> findByPersonId(Long personId);
+	List<PersonCompany> list();
+	List<PersonCompany> search(Map<String,Object> searchParams,List<Sort> sortList);
+}

common/src/main/java/com/jpsoft/smart/modules/base/dao/PersonDeviceFilterLogDAO.java

@@ -0,0 +1,73 @@
+package com.jpsoft.smart.modules.base.dao;
+import com.github.pagehelper.Page;
+import com.jpsoft.smart.modules.base.entity.*;
+import org.apache.ibatis.annotations.Param;
+
+import com.jpsoft.smart.modules.common.dto.Sort;
+import org.springframework.stereotype.Repository;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author 墨鱼_mo
+ * @date 2020-3-20 9:20
+ */
+@Repository
+public interface PersonDeviceFilterLogDAO {
+
+    void insert(PersonDeviceFilterLog personDeviceFilterLog);
+
+
+    PersonDeviceFilterLog findByPersonIdAndDeviceNoAndTimeZones(@Param("personId") Integer personId, @Param("deviceNo") String deviceNo, @Param("timeZones") String timeZones);
+
+    int update(PersonDeviceFilterLog personDeviceFilterLog);
+
+    List<PersonDeviceFilterLog> search(Map<String, Object> searchParams, List<Sort> sortList);
+
+    List<PersonDeviceFilterLog> findByPersonAndDate(@Param("personId") Long personId, @Param("startDate")String startDate, @Param("endDate")String endDate);
+
+    PersonDeviceFilterLog findByPersonOrderTemperature(@Param("personId") Long personId, @Param("startDate")String startDate, @Param("endDate")String endDate);
+
+    List<PersonDeviceFilterLog> temperatureNormalStatistics(String companyCode,BigDecimal temperature, Date startDate, Date endDate);
+
+    List<PersonDeviceFilterLog> temperatureUnusualStatistics(String companyCode,BigDecimal temperature,Date startDate,Date endDate);
+
+    List<PersonDeviceFilterLog> list();
+
+    List<Map<String, Object>> unusualStatistics(String companyCode,Long personId, BigDecimal temperature, Date startDate, Date endDate);
+
+    PersonDeviceFilterLog lastPersonLog(Long personId);
+
+    PersonDeviceFilterLog getByPersonIdAndDate(@Param("personId")Long personId,@Param("startDate")String startDate, @Param("endDate")String endDate);
+
+    PersonDeviceFilterLog get(Long id);
+
+    long countByTimeRangeAndCompanyCode(String companyCode,Long personId,int status,float temperatureMax, Date startDate, Date endDate);
+
+    Integer getDayAbnormalNum(@Param("startTime") Date startTime, @Param("endTime") Date endTime,float temperatureMax);
+
+    Integer getDayAbnormalNumByCompanyList(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("list") List<CompanyInfo> list,float temperatureMax);
+
+    Integer getDayNormalNumByCompanyId( @Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("companyId") String companyId,float temperatureMax);
+
+    Integer countDayByPersonIdAndDate(Long personId, Date startDate, Date endDate);
+
+    Integer countDetectedByCompanyId(String companyId, Date startDate, Date endDate);
+
+    long countUndetectedByCompanyCode(String companyCode, List<PersonCompany> personCompanyList, Date startTime, Date endTime);
+
+    List<PersonInfo> findUndetectedByCompanyCode(@Param("searchParams") Map<String, Object> searchParams);
+
+    Integer getDayCheckedPersonNumByCompanyList(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("list") List<CompanyInfo> list,  @Param("popedom") String popedom);
+
+    int deleteExpiredVisitorRecord(@Param("limit") int limit);
+
+    List<PersonDeviceFilterLog> getDayCheckedPersonByCompanyList(@Param("startDate") Date startDate, @Param("endDate") Date endDate, @Param("companyInfo") CompanyInfo companyInfo);
+
+    long countDetectedByCompanyIds(List<String> companyIds, Date startTime, Date endTime);
+
+    List<PersonInfo> findUndetectedPersonListByCompanyIds(Map<String, Object> searchParams);
+}

common/src/main/java/com/jpsoft/smart/modules/base/dao/PersonDeviceLogDAO.java

@@ -0,0 +1,62 @@
+package com.jpsoft.smart.modules.base.dao;
+
+import cn.hutool.core.date.DateTime;
+import com.jpsoft.smart.modules.base.entity.CompanyInfo;
+import com.jpsoft.smart.modules.base.entity.PersonDeviceFilterLog;
+import com.jpsoft.smart.modules.base.entity.PersonDeviceLog;
+import com.jpsoft.smart.modules.base.entity.PersonInfo;
+import com.jpsoft.smart.modules.common.dto.Sort;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author 墨鱼_mo
+ * @date 2020-3-15 14:22
+ */
+@Repository
+public interface PersonDeviceLogDAO {
+
+
+    void insert(PersonDeviceLog personDeviceLog);
+
+    List<PersonDeviceLog> search(Map<String, Object> searchParams, List<Sort> sortList);
+
+    List<PersonDeviceLog> simpleSearch(Map<String, Object> searchParams, List<Sort> sortList);
+
+    List<PersonDeviceLog> findByPersonAndDate(@Param("personId") Long personId, @Param("startDate")Date startDate, @Param("endDate")Date endDate);
+
+    PersonDeviceLog  get(String id);
+
+    List<PersonInfo> queryUnAttendanceList(String companyCode, Date startTime, Date endTime);
+    List<PersonInfo> queryAttendanceList(String companyCode, Date startTime, Date endTime);
+
+    PersonDeviceLog findLastPersonLog(Long personId, float temperatureMax);
+
+    Integer getDayCheckedVistorNumByDeviceNoList(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("list") List<String> list);
+
+    List<PersonDeviceLog> findAllPersonLogByCompanyIdAndDeviceNo(@Param("startTime") Date startTime, @Param("endTime") Date endTime,
+                                                                 @Param("companyList") List<CompanyInfo> companyList,
+                                                                 @Param("deviceNoList") List<String> deviceNoList);
+
+    List<PersonDeviceLog> findLastPersonLogByCompanyList(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("companyList") List<CompanyInfo> list);
+
+    List<PersonDeviceLog> findVisitorLogByDeviceNoList(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("list") List<String> list);
+
+    List<PersonDeviceLog> findLastTeacherLogByCompanyList(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("list") List<CompanyInfo> list);
+
+    List<PersonDeviceLog> findLastStudentLogByCompanyList(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("list") List<CompanyInfo> list);
+
+    Integer getDayCheckedPersonNumByCompanyList(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("list") List<CompanyInfo> list,  @Param("popedom") String popedom);
+
+    int delete(String id);
+
+    List<PersonDeviceLog> findExpiredVisitorRecord(@Param("limit") int limit);
+
+    long countByAttendance(String companyCode, Date beginDate, Date endDate);
+
+    Integer getDayAbnormalNumByDeviceNoList(Date startTime, Date endTime, List<String> list, float temperatureMax);
+}

common/src/main/java/com/jpsoft/smart/modules/base/dao/PersonDeviceRelationDAO.java

@@ -0,0 +1,34 @@
+package com.jpsoft.smart.modules.base.dao;
+import com.jpsoft.smart.modules.base.entity.DeviceInfo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
+import org.springframework.stereotype.Repository;
+import com.jpsoft.smart.modules.base.entity.PersonDeviceRelation;
+import java.util.Map;
+import com.jpsoft.smart.modules.common.dto.Sort;
+
+@Repository
+public interface PersonDeviceRelationDAO {
+	int insert(PersonDeviceRelation entity);
+	int update(PersonDeviceRelation entity);
+	int exist(String id);
+	PersonDeviceRelation get(String id);
+	int delete(String id);
+	List<PersonDeviceRelation> list();
+	List<PersonDeviceRelation> findByPersonId(Long personId);
+    List<PersonDeviceRelation> findByDeviceId(String deviceId);
+	List<Long> findByDerviceName(String derviceName);
+    PersonDeviceRelation findByDeviceIdAndPersonId(String deviceId,Long personId);
+	List<PersonDeviceRelation> search(Map<String, Object> searchParams, List<Sort> sortList);
+    List<DeviceInfo> findDeviceByPersonId(Long personId);
+
+    List<PersonDeviceRelation> findByIsBoundAndUpdateTime(Date updateTime, Integer limit);
+
+	void updateIsBound(PersonDeviceRelation personDeviceRelation);
+
+//    List<PersonDeviceRelation>  findByPersonId(@Param("personId")Long personId);
+
+
+}

common/src/main/java/com/jpsoft/smart/modules/base/dao/PersonInfoDAO.java

@@ -0,0 +1,46 @@
+package com.jpsoft.smart.modules.base.dao;
+
+import java.util.List;
+
+import com.jpsoft.smart.modules.base.entity.CompanyInfo;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+import com.jpsoft.smart.modules.base.entity.PersonInfo;
+import java.util.Map;
+import com.jpsoft.smart.modules.common.dto.Sort;
+
+@Repository
+public interface PersonInfoDAO {
+	int insert(PersonInfo entity);
+	int update(PersonInfo entity);
+	int exist(Long id);
+	PersonInfo get(Long id);
+	int delete(Long id);
+	List<PersonInfo> list();
+	List<PersonInfo> search(Map<String, Object> searchParams, List<Sort> sortList);
+    PersonInfo findByNameAndPhone(String name, String phone);
+	PersonInfo findByOpenId(String openId);
+    List<PersonInfo> findByCompanyId(String companyId);
+    long countByCompanyCode(String code,Long personId);
+
+	PersonInfo getIgnoreDelFlag(Long id);
+	List<PersonInfo> findByCompanyCode(Map<String,Object> searchParams,List<Sort> sortList);
+
+    long countByCompanyList(List<CompanyInfo> list);
+
+    long countByCompanyListAndPopedom(@Param("type") String type, @Param("list") List<CompanyInfo> list);
+
+	long countStudentByCompanyListAndPopedom(@Param("type") String type, @Param("list")List<CompanyInfo> list);
+
+	PersonInfo findById(long id);
+
+    long countByCompanyId(String companyId);
+
+    long countByCompanyIds(List<String> companyIds);
+
+    PersonInfo findByIdCardAndCompanyId(String idCard,String companyId);
+
+	List<PersonInfo> notGuestList();
+
+	int resetOpenId(Long personId);
+}

common/src/main/java/com/jpsoft/smart/modules/base/dao/ProjectInfoDAO.java

@@ -0,0 +1,22 @@
+package com.jpsoft.smart.modules.base.dao;
+
+import java.util.List;
+import org.springframework.stereotype.Repository;
+import com.jpsoft.smart.modules.base.entity.ProjectInfo;
+import java.util.Map;
+import com.jpsoft.smart.modules.common.dto.Sort;
+
+@Repository
+public interface ProjectInfoDAO {
+	int insert(ProjectInfo entity);
+	int update(ProjectInfo entity);
+	int exist(String id);
+	ProjectInfo get(String id);
+	int delete(String id);
+	List<ProjectInfo> list();
+	List<ProjectInfo> search(Map<String,Object> searchParams,List<Sort> sortList);
+
+    ProjectInfo findOneByCompanyId(String companyId);
+
+	ProjectInfo findOneByProjectCode(String projectCode);
+}

common/src/main/java/com/jpsoft/smart/modules/base/dao/PunchLocationDAO.java

@@ -0,0 +1,19 @@
+package com.jpsoft.smart.modules.base.dao;
+
+import com.jpsoft.smart.modules.base.entity.PunchLocation;
+import com.jpsoft.smart.modules.common.dto.Sort;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+@Repository
+public interface PunchLocationDAO {
+	int insert(PunchLocation entity);
+	int update(PunchLocation entity);
+	int exist(String id);
+	PunchLocation get(String id);
+	int delete(String id);
+	List<PunchLocation> list();
+	List<PunchLocation> search(Map<String, Object> searchParams, List<Sort> sortList);
+}

common/src/main/java/com/jpsoft/smart/modules/base/dao/PunchRecordDAO.java

@@ -0,0 +1,22 @@
+package com.jpsoft.smart.modules.base.dao;
+
+import com.jpsoft.smart.modules.base.entity.PunchRecord;
+import com.jpsoft.smart.modules.common.dto.Sort;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+@Repository
+public interface PunchRecordDAO {
+	int insert(PunchRecord entity);
+	int update(PunchRecord entity);
+	int exist(String id);
+	PunchRecord get(String id);
+	int delete(String id);
+	List<PunchRecord> list();
+	List<PunchRecord> search(Map<String, Object> searchParams, List<Sort> sortList);
+
+    List<PunchRecord> findByPersonAndDate(@Param("personId") Long personId, @Param("startDate") String startDate, @Param("endDate") String endDate);
+}

common/src/main/java/com/jpsoft/smart/modules/base/dao/RechargeRecordDAO.java

@@ -0,0 +1,20 @@
+package com.jpsoft.smart.modules.base.dao;
+
+import com.jpsoft.smart.modules.base.entity.RechargeRecord;
+import com.jpsoft.smart.modules.common.dto.Sort;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+@Repository
+public interface RechargeRecordDAO {
+	int insert(RechargeRecord entity);
+	int update(RechargeRecord entity);
+	int exist(String id);
+	RechargeRecord get(String id);
+	int delete(String id);
+	RechargeRecord getBySerialNum(String erialNum);
+	List<RechargeRecord> list();
+	List<RechargeRecord> search(Map<String, Object> searchParams, List<Sort> sortList);
+}

common/src/main/java/com/jpsoft/smart/modules/base/dao/RechargeRecordWaterDAO.java

@@ -0,0 +1,20 @@
+package com.jpsoft.smart.modules.base.dao;
+
+import com.jpsoft.smart.modules.base.entity.RechargeRecordWater;
+import com.jpsoft.smart.modules.common.dto.Sort;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+@Repository
+public interface RechargeRecordWaterDAO {
+	int insert(RechargeRecordWater entity);
+	int update(RechargeRecordWater entity);
+	int exist(String id);
+	RechargeRecordWater get(String id);
+	int delete(String id);
+	RechargeRecordWater getBySerialNum(String erialNum);
+	List<RechargeRecordWater> list();
+	List<RechargeRecordWater> search(Map<String, Object> searchParams, List<Sort> sortList);
+}

common/src/main/java/com/jpsoft/smart/modules/base/dao/RoomInfoDAO.java

@@ -0,0 +1,22 @@
+package com.jpsoft.smart.modules.base.dao;
+
+import com.jpsoft.smart.modules.base.entity.RoomInfo;
+import com.jpsoft.smart.modules.common.dto.Sort;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+@Repository
+public interface RoomInfoDAO {
+	int insert(RoomInfo entity);
+	int update(RoomInfo entity);
+	int exist(String id);
+	RoomInfo get(String id);
+	int delete(String id);
+	List<RoomInfo> list();
+	List<RoomInfo> search(Map<String, Object> searchParams, List<Sort> sortList);
+	List<RoomInfo> getChildren(String id);
+    List<RoomInfo> findByTypeAndParentId(String type, String parentId);
+	List<String> findIdByTypeAndParentIds(String type, List<String> parentIds);
+}

common/src/main/java/com/jpsoft/smart/modules/base/dao/TerminalInfoDAO.java

@@ -0,0 +1,20 @@
+package com.jpsoft.smart.modules.base.dao;
+
+import java.util.List;
+import org.springframework.stereotype.Repository;
+import com.jpsoft.smart.modules.base.entity.TerminalInfo;
+import java.util.Map;
+import com.jpsoft.smart.modules.common.dto.Sort;
+
+@Repository
+public interface TerminalInfoDAO {
+	int insert(TerminalInfo entity);
+	int update(TerminalInfo entity);
+	int exist(String id);
+	TerminalInfo get(String id);
+	int delete(String id);
+	int getCountByName(String name,String excludeId);
+	List<TerminalInfo> list();
+	List<TerminalInfo> search(Map<String, Object> searchParams, List<Sort> sortList);
+    int updateActiveByTerminalNo(String terminalNo, boolean active);
+}

common/src/main/java/com/jpsoft/smart/modules/base/dao/TotalCheckCompanyDAO.java

@@ -0,0 +1,43 @@
+package com.jpsoft.smart.modules.base.dao;
+import org.apache.ibatis.annotations.Param;
+
+import com.jpsoft.smart.modules.base.entity.CompanyInfo;
+import com.jpsoft.smart.modules.base.entity.TotalCheckCompany;
+import org.springframework.stereotype.Repository;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author 墨鱼_mo
+ * @date 2020-3-27 14:39
+ */
+@Repository
+public interface TotalCheckCompanyDAO {
+
+    TotalCheckCompany get(Long id);
+
+    Integer findMinNormalDay();
+
+    Integer getTotalAbnormalNum();
+
+    Integer findMinNormalDayByCompanyList(List<CompanyInfo> list);
+
+    Integer getTotalAbnormalNumByCompanyList(List<CompanyInfo> list);
+
+    TotalCheckCompany findByCompanyId(String id);
+
+    int insert(TotalCheckCompany totalCheckCompany);
+
+    int update(TotalCheckCompany totalCheckCompany);
+
+    Integer  getTotalCheckNum(@Param("list") List<CompanyInfo> list);
+
+
+    List<TotalCheckCompany> findAll();
+
+
+    Date findMaxAbnormalTimeByCompanyList(List<CompanyInfo> list);
+
+    Integer findMaxNormalDayByCompanyList(List<CompanyInfo> list);
+}

common/src/main/java/com/jpsoft/smart/modules/base/dao/WarningPusherDAO.java

@@ -0,0 +1,22 @@
+package com.jpsoft.smart.modules.base.dao;
+
+import java.util.List;
+import org.springframework.stereotype.Repository;
+import com.jpsoft.smart.modules.base.entity.WarningPusher;
+import java.util.Map;
+import com.jpsoft.smart.modules.common.dto.Sort;
+
+@Repository
+public interface WarningPusherDAO {
+	int insert(WarningPusher entity);
+	int update(WarningPusher entity);
+	int exist(String id);
+	WarningPusher get(String id);
+	int delete(String id);
+	List<WarningPusher> list();
+	List<WarningPusher> search(Map<String,Object> searchParams,List<Sort> sortList);
+
+    List<WarningPusher> findByCompanyId(String companyId);
+
+    List<WarningPusher> findByCompanyIdList(List<String> code);
+}

common/src/main/java/com/jpsoft/smart/modules/base/dto/CompanyInfoDTO.java

@@ -0,0 +1,67 @@
+package com.jpsoft.smart.modules.base.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jpsoft.smart.modules.base.entity.CompanyInfo;
+import com.jpsoft.smart.modules.base.entity.CompanyPosition;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class CompanyInfoDTO {
+    @ApiModelProperty(value = "公司编号")
+    private String id;
+    @ApiModelProperty(value = "公司logo")
+    private String logo;
+    @ApiModelProperty(value = "序号")
+    private Integer sortNo;
+    @ApiModelProperty(value = "公司名称")
+    private String name;
+    @ApiModelProperty(value = "公司简称")
+    private String shortName;
+    @ApiModelProperty(value = "备注")
+    private String remark;
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+    @ApiModelProperty(value = "是否删除")
+    private Boolean delFlag;
+    @ApiModelProperty(value = "位置1")
+    private String position1Name;
+    @ApiModelProperty(value = "位置2")
+    private String position2Name;
+    @ApiModelProperty(value = "位置3")
+    private String position3Name;
+    @ApiModelProperty(value = "位置4")
+    private String position4Name;
+    @ApiModelProperty(value = "位置5")
+    private String position5Name;
+    @ApiModelProperty(value = "上级单位编号")
+    private String parentId;
+    @ApiModelProperty(value = "单位编码")
+    private String code;
+    @ApiModelProperty(value = "上级单位")
+    private String parentName;
+    @ApiModelProperty(value = "单位性质")
+    private String type;
+    @ApiModelProperty(value = "单位性质翻译")
+    private String typeN;
+    @ApiModelProperty(value = "大屏公示墙网址")
+    private String wallUrl;
+    @ApiModelProperty(value = "是否有子单位")
+    private Boolean hasChildren;
+}

common/src/main/java/com/jpsoft/smart/modules/base/dto/CompanyRecordReportDTO.java

@@ -0,0 +1,24 @@
+package com.jpsoft.smart.modules.base.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author 墨鱼_mo
+ * @date 2020-4-7 9:20
+ */
+@Data
+public class CompanyRecordReportDTO {
+
+    @ApiModelProperty(value = "公司名称")
+    private String companyName;
+
+    @ApiModelProperty(value = "公司人数")
+    private Long personTotal;
+
+    @ApiModelProperty(value = "公司检测人数")
+    private Long checkPersonTotal;
+
+    @ApiModelProperty(value = "公司未检测人姓名")
+    private String unCheckPersonName;
+}

common/src/main/java/com/jpsoft/smart/modules/base/dto/EmployeeInfoDTO.java

@@ -0,0 +1,16 @@
+package com.jpsoft.smart.modules.base.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class EmployeeInfoDTO {
+    @ApiModelProperty(value = "openId")
+    private String openId;
+    @ApiModelProperty(value = "员工姓名")
+    private String name;
+    @ApiModelProperty(value = "所属公司")
+    private String companyId;
+    @ApiModelProperty(value = "照片网址")
+    private String photo;
+}

common/src/main/java/com/jpsoft/smart/modules/base/dto/PersonDeviceFilterLogDTO.java

@@ -0,0 +1,61 @@
+package com.jpsoft.smart.modules.base.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author 墨鱼_mo
+ * @date 2020-3-15 13:30
+ */
+@Data
+@ApiModel(value = "base_person_device_filter_log的实体类")
+public class PersonDeviceFilterLogDTO {
+    @ApiModelProperty(value = "ID")
+    private Long id;
+    @ApiModelProperty(value = "设备序列号")
+    private String deviceNo;
+    @ApiModelProperty(value = "设备名称")
+    private String deviceName;
+    @ApiModelProperty(value = "人员id")
+    private Integer personId;
+    @ApiModelProperty(value = "人员名称")
+    private String personName;
+    @ApiModelProperty(value = "记录温度")
+    private BigDecimal temperature;
+    @ApiModelProperty(value = "匹配状态")
+    private Integer matchStatus;
+    @ApiModelProperty(value = "匹配信息")
+    private String  matchMsg;
+    @ApiModelProperty(value = "匹配人脸 ID")
+    private Integer  matchFaceId;
+    @ApiModelProperty(value = "图片地址")
+    private String faceImage;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone ="GMT+8")
+    @ApiModelProperty(value = "记录时间")
+    private Date recordTime;
+    @ApiModelProperty(value = "是否删除")
+    private Boolean delFlag;
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+    @ApiModelProperty(value = "更新人")
+    private String  updateBy;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+    @ApiModelProperty(value = "时间段")
+    private String timeZones;
+    @ApiModelProperty(value = "温度是否正常")
+    private Boolean fever;
+}

common/src/main/java/com/jpsoft/smart/modules/base/dto/PersonDeviceLogDTO.java

@@ -0,0 +1,58 @@
+package com.jpsoft.smart.modules.base.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author 墨鱼_mo
+ * @date 2020-3-23 11:34
+ */
+@Data
+public class PersonDeviceLogDTO {
+    @ApiModelProperty(value = "ID")
+    private String id;
+    @ApiModelProperty(value = "设备序列号")
+    private String deviceNo;
+    @ApiModelProperty(value = "设备名称")
+    private String deviceName;
+    @ApiModelProperty(value = "人员id")
+    private Integer personId;
+    @ApiModelProperty(value = "人员名称")
+    private String personName;
+    @ApiModelProperty(value = "记录温度")
+    private BigDecimal temperature;
+    @ApiModelProperty(value = "匹配状态")
+    private Integer matchStatus;
+    @ApiModelProperty(value = "匹配信息")
+    private String  matchMsg;
+    @ApiModelProperty(value = "匹配人脸 ID")
+    private Integer  matchFaceId;
+    @ApiModelProperty(value = "图片地址")
+    private String faceImage;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone ="GMT+8")
+    @ApiModelProperty(value = "记录时间")
+    private Date recordTime;
+    @ApiModelProperty(value = "是否删除")
+    private Boolean delFlag;
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+    @ApiModelProperty(value = "更新人")
+    private String  updateBy;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+    @ApiModelProperty(value = "温度是否正常")
+    private Boolean fever;
+
+}

common/src/main/java/com/jpsoft/smart/modules/base/dto/PersonInfoDTO.java

@@ -0,0 +1,72 @@
+package com.jpsoft.smart.modules.base.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+public class PersonInfoDTO {
+    @ApiModelProperty(value = "编号")
+    private Long id;
+    @ApiModelProperty(value = "企业编号")
+    private String companyId;
+    @ApiModelProperty(value = "企业名称")
+    private String companyName;
+    @ApiModelProperty(value = "姓名")
+    private String name;
+    @ApiModelProperty(value = "手机号")
+    private String phone;
+    @ApiModelProperty(value = "身份证号")
+    private String idCard;
+    @ApiModelProperty(value = "微信openId")
+    private String openId;
+    @ApiModelProperty(value = "人脸")
+    private Boolean faceEnabled;
+    @ApiModelProperty(value = "是否已将人脸信息传给终端")
+    private Boolean faceBound;
+    @ApiModelProperty(value = "刷卡")
+    private Boolean cardEnabled;
+    @ApiModelProperty(value = "手机")
+    private Boolean appEnabled;
+    @ApiModelProperty(value = "密码")
+    private Boolean passwordEnabled;
+    @ApiModelProperty(value = "访客")
+    private Boolean guestEnabled;
+    @ApiModelProperty(value = "微信通知是否开启")
+    private Boolean wechatNoticeEnabled;
+    @ApiModelProperty(value = "位置1")
+    private String position1;
+    @ApiModelProperty(value = "位置2")
+    private String position2;
+    @ApiModelProperty(value = "位置3")
+    private String position3;
+    @ApiModelProperty(value = "位置4")
+    private String position4;
+    @ApiModelProperty(value = "位置5")
+    private String position5;
+    @ApiModelProperty(value = "是否删除")
+    private Boolean delFlag;
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+    @ApiModelProperty(value = "人脸相片地址")
+    private String faceImageUrl;
+    @ApiModelProperty(value="权限（1-个人用户，2-企业管理员）")
+    private String popedom;
+    @ApiModelProperty(value="设备")
+    private String deviceName;
+    @ApiModelProperty(value="单位性质")
+    private String companyType;
+}

common/src/main/java/com/jpsoft/smart/modules/base/dto/WorkAttendanceDTO.java

@@ -0,0 +1,47 @@
+package com.jpsoft.smart.modules.base.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * @author 墨鱼_mo
+ * @date 2020-4-27 10:22
+ */
+@Data
+public class WorkAttendanceDTO {
+
+    private Long personId;
+
+    private String personName;
+
+    private String faceImageUrl;
+
+    private String status;
+
+    private String approvalPersonName;
+
+    private String approvalContent;
+
+    private String typeN;
+
+    private String approvalNo;
+
+    private String companyName;
+
+    private String fillAttendanceDayAndTime;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    private String content;
+
+    private String fillAttendanceFilesUrl;
+
+
+}

common/src/main/java/com/jpsoft/smart/modules/base/dto/WorkDTO.java

@@ -0,0 +1,36 @@
+package com.jpsoft.smart.modules.base.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * @author 墨鱼_mo
+ * @date 2020-4-27 18:54
+ */
+@Data
+public class WorkDTO {
+
+    private String id;
+
+    /**
+     * 补卡记录id
+     */
+    private String fillAttendanceId;
+
+    private String status;
+
+    private String statusN;
+
+    @DateTimeFormat(pattern = "MM-dd HH:mm")
+    @JsonFormat(pattern = "MM-dd HH:mm", timezone = "GMT+8")
+    @ApiModelProperty(value = "记录时间")
+    private Date recordTime;
+
+    private String result;
+
+
+}

common/src/main/java/com/jpsoft/smart/modules/base/entity/AlarmConfig.java

@@ -0,0 +1,111 @@
+package com.jpsoft.smart.modules.base.entity;
+
+import java.util.Date;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * 描述:base_alarm_config的实体类
+ */
+@Data
+@ApiModel(value = "base_alarm_config的实体类")
+public class AlarmConfig {
+    /**
+     *主键
+     */
+    @ApiModelProperty(value = "主键")
+    private String id;
+    /**
+     * 单位编号
+     */
+    @ApiModelProperty(value = "单位编号")
+    private String companyId;
+    /**
+     * 单位名称
+     */
+    @ApiModelProperty(value = "单位名称")
+    private String companyName;
+    /**
+     * 星期几提醒，可以设置多个
+     */
+    @ApiModelProperty(value = "星期几提醒，可以设置多个")
+    private String weekdays;
+    /**
+     * 几时几分开始
+     */
+    @ApiModelProperty(value = "几时几分开始")
+    private String startTime;
+
+    /**
+     * 考勤时间
+     */
+    @ApiModelProperty(value = "考勤时间")
+    private String attendanceTime;
+
+
+    /**
+     * 几时几分结束
+     */
+    @ApiModelProperty(value = "几时几分结束")
+    private String endTime;
+
+    /**
+     * 是否删除
+     */
+    @ApiModelProperty(value = "是否删除")
+    private Boolean delFlag;
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+    /**
+     * 创建时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+    /**
+     * 更新人
+     */
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+    /**
+     * 更新时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+    /**
+     * 是否包含下级单位
+     */
+    @ApiModelProperty(value = "是否包含下级单位")
+    private Boolean subordinate;
+
+    /**
+     * 是否包含下级单位
+     */
+    @ApiModelProperty(value = "1-上班时间,2-下班时间")
+    private Integer classifier;
+
+    /**
+     * 是否需要测温
+     */
+    @ApiModelProperty(value = "是否需要测温")
+    private Boolean needMeasureTemperature;
+
+    public Boolean getNeedMeasureTemperature(){
+        if (this.needMeasureTemperature!=null){
+            return this.needMeasureTemperature;
+        }
+        else{
+            return false;
+        }
+    }
+}

common/src/main/java/com/jpsoft/smart/modules/base/entity/AlarmInfo.java

@@ -0,0 +1,201 @@
+package com.jpsoft.smart.modules.base.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+  描述:base_alarm_info的实体类
+ */
+public class AlarmInfo {
+	private String id;
+	private String createBy;
+	private Date createTime;
+	private String updateBy;
+	private Date updateTime;
+	private Boolean delFlag;
+	private String deviceNo;
+	private String channelName;
+	private String alertType;
+	private String type;
+	private String videoUrl;
+	private Boolean isRead;
+	private String message;
+	
+		/**
+	 *获取
+	 */
+	public String getId(){
+		return id;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setId(String id){
+		this.id = id;
+	}
+		/**
+	 *获取
+	 */
+	public String getCreateBy(){
+		return createBy;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setCreateBy(String createBy){
+		this.createBy = createBy;
+	}
+		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+		/**
+	 *获取
+	 */
+	public Date getCreateTime(){
+		return createTime;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setCreateTime(Date createTime){
+		this.createTime = createTime;
+	}
+		/**
+	 *获取
+	 */
+	public String getUpdateBy(){
+		return updateBy;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setUpdateBy(String updateBy){
+		this.updateBy = updateBy;
+	}
+		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+		/**
+	 *获取
+	 */
+	public Date getUpdateTime(){
+		return updateTime;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setUpdateTime(Date updateTime){
+		this.updateTime = updateTime;
+	}
+		/**
+	 *获取是否删除
+	 */
+	public Boolean getDelFlag(){
+		return delFlag;
+	}
+	
+	/**
+	 *设置是否删除
+	 */
+	public void setDelFlag(Boolean delFlag){
+		this.delFlag = delFlag;
+	}
+		/**
+	 *获取设备号
+	 */
+	public String getDeviceNo(){
+		return deviceNo;
+	}
+	
+	/**
+	 *设置设备号
+	 */
+	public void setDeviceNo(String deviceNo){
+		this.deviceNo = deviceNo;
+	}
+		/**
+	 *获取通道名称
+	 */
+	public String getChannelName(){
+		return channelName;
+	}
+	
+	/**
+	 *设置通道名称
+	 */
+	public void setChannelName(String channelName){
+		this.channelName = channelName;
+	}
+		/**
+	 *获取警报标识类型
+	 */
+	public String getAlertType(){
+		return alertType;
+	}
+	
+	/**
+	 *设置警报标识类型
+	 */
+	public void setAlertType(String alertType){
+		this.alertType = alertType;
+	}
+		/**
+	 *获取警报所属类型/1围墙/2警戒
+	 */
+	public String getType(){
+		return type;
+	}
+	
+	/**
+	 *设置警报所属类型/1围墙/2警戒
+	 */
+	public void setType(String type){
+		this.type = type;
+	}
+	/**
+	 *获取视频地址
+	 */
+	public String getVideoUrl(){
+		return videoUrl;
+	}
+
+	/**
+	 *设置视频地址
+	 */
+	public void setVideoUrl(String videoUrl){
+		this.videoUrl = videoUrl;
+	}
+
+	/**
+	 *获取是否已读
+	 */
+	public Boolean getIsRead(){
+		return isRead;
+	}
+
+	/**
+	 *设置是否已读
+	 */
+	public void setIsRead(Boolean isRead){
+		this.isRead = isRead;
+	}
+
+	/**
+	 *获取报警内容
+	 */
+	public String getMessage(){
+		return message;
+	}
+
+	/**
+	 *设置报警内容
+	 */
+	public void setMessage(String message){
+		this.message = message;
+	}
+}

common/src/main/java/com/jpsoft/smart/modules/base/entity/CheckNumCompany.java

@@ -0,0 +1,69 @@
+package com.jpsoft.smart.modules.base.entity;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel(value = "base_check_num_company的实体类")
+public class CheckNumCompany {
+    /**
+     * id
+     */
+    private Long id;
+
+    /**
+     * 公司id
+     */
+    private String companyId;
+
+    /**
+     * 检测人数
+     */
+    private Long checkNum;
+
+
+    /**
+     * 正常人数
+     */
+    private Long normalNum;
+
+    /**
+     * 异常人数
+     */
+    private Long abnormalNum;
+
+    /**
+     * 记录时间
+     */
+    private String recordTime;
+
+    /**
+     * 是否删除
+     */
+    private Boolean delFlag;
+
+    /**
+     * 创建人
+     */
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新人
+     */
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+
+}
+

common/src/main/java/com/jpsoft/smart/modules/base/entity/CompanyDeviceRelation.java

@@ -0,0 +1,69 @@
+package com.jpsoft.smart.modules.base.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+  描述:base_company_device_relation的实体类
+ */
+@Data
+@ApiModel(value = "base_company_device_relation的实体类")
+public class CompanyDeviceRelation {
+	/**
+	 *编号
+	 */
+        @ApiModelProperty(value = "编号")
+	private String id;
+	/**
+	 *单位编号
+	 */
+        @ApiModelProperty(value = "单位编号")
+	private String companyId;
+	/**
+	 *设备编号
+	 */
+        @ApiModelProperty(value = "设备编号")
+	private String deviceId;
+	/**
+	 *创建人
+	 */
+        @ApiModelProperty(value = "创建人")
+	private String createBy;
+	/**
+	 *创建时间
+	 */
+    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "创建时间")
+	private Date createTime;
+	/**
+	 *更新人
+	 */
+        @ApiModelProperty(value = "更新人")
+	private String updateBy;
+	/**
+	 *更新时间
+	 */
+    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "更新时间")
+	private Date updateTime;
+	/**
+	 *是否删除
+	 */
+	@ApiModelProperty(value = "是否删除")
+	private Boolean delFlag;
+
+	/**
+	 *人脸库ID
+	 */
+	@ApiModelProperty(value = "人脸库ID")
+	private String libraryId;
+}

common/src/main/java/com/jpsoft/smart/modules/base/entity/CompanyInfo.java

@@ -0,0 +1,57 @@
+package com.jpsoft.smart.modules.base.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModel;
+
+/**
+  描述:base_company_info的实体类
+ */
+@Data
+@ApiModel(value = "base_company_info的实体类")
+public class CompanyInfo {
+    @ApiModelProperty(value = "公司编号")
+	private String id;
+	@ApiModelProperty(value = "公司logo")
+	private String logo;
+    @ApiModelProperty(value = "序号")
+	private Integer sortNo;
+    @ApiModelProperty(value = "公司名称")
+	private String name;
+	@ApiModelProperty(value = "公司简称")
+	private String shortName;
+    @ApiModelProperty(value = "备注")
+	private String remark;
+    @ApiModelProperty(value = "创建人")
+	private String createBy;
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+    @ApiModelProperty(value = "创建时间")
+	private Date createTime;
+    @ApiModelProperty(value = "更新人")
+	private String updateBy;
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+    @ApiModelProperty(value = "更新时间")
+	private Date updateTime;
+    @ApiModelProperty(value = "是否删除")
+	private Boolean delFlag;
+	@ApiModelProperty(value = "上级公司")
+	private String parentId;
+	@ApiModelProperty(value = "企业编码")
+	private String code;
+	@ApiModelProperty(value = "上级单位")
+	private String parentName;
+	@ApiModelProperty(value = "单位性质")
+	private String type;
+	@ApiModelProperty(value = "单位性质翻译")
+	private String typeN;
+	@ApiModelProperty(value = "大屏公示墙网址")
+	private String wallUrl;
+}

common/src/main/java/com/jpsoft/smart/modules/base/entity/CompanyPaymentInfo.java

@@ -0,0 +1,40 @@
+package com.jpsoft.smart.modules.base.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.swing.*;
+import java.util.Date;
+
+/**
+ * @author 墨鱼_mo
+ * @date 2020-4-14 9:33
+ */
+@Data
+@ApiModel(value = "base_company_payment_info的实体类")
+public class CompanyPaymentInfo {
+
+
+    private Long id;
+    private String companyId;
+    private String parkingWechatNotifyUrl;
+    private String parkingAlipayNotifyUrl;
+    private String appId;
+    private String mchId;
+    private String subAppId;
+    private String subAppSecret;
+    private String subMchId;
+    private String appAuthToken;
+    private String createBy;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+    private String updateBy;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date updateTime;
+    private Boolean delFlag;
+
+}

common/src/main/java/com/jpsoft/smart/modules/base/entity/CompanyPosition.java

@@ -0,0 +1,83 @@
+package com.jpsoft.smart.modules.base.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+  描述:base_company_position的实体类
+ */
+@Data
+@ApiModel(value = "base_company_position的实体类")
+public class CompanyPosition {
+	/**
+	 *
+	 */
+        @ApiModelProperty(value = "")
+	private String id;
+	/**
+	 *企业编号
+	 */
+        @ApiModelProperty(value = "企业编号")
+	private String companyId;
+	/**
+	 *位置1名称
+	 */
+        @ApiModelProperty(value = "位置1名称")
+	private String position1Name;
+	/**
+	 *位置2名称
+	 */
+        @ApiModelProperty(value = "位置2名称")
+	private String position2Name;
+	/**
+	 *位置3名称
+	 */
+        @ApiModelProperty(value = "位置3名称")
+	private String position3Name;
+	/**
+	 *位置4名称
+	 */
+        @ApiModelProperty(value = "位置4名称")
+	private String position4Name;
+	/**
+	 *位置5名称
+	 */
+        @ApiModelProperty(value = "位置5名称")
+	private String position5Name;
+	/**
+	 *创建人
+	 */
+        @ApiModelProperty(value = "创建人")
+	private String createBy;
+	/**
+	 *创建时间
+	 */
+    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "创建时间")
+	private Date createTime;
+	/**
+	 *更新人
+	 */
+        @ApiModelProperty(value = "更新人")
+	private String updateBy;
+	/**
+	 *更新时间
+	 */
+    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "更新时间")
+	private Date updateTime;
+	/**
+	 *是否删除
+	 */
+        @ApiModelProperty(value = "是否删除")
+	private Boolean delFlag;
+}

common/src/main/java/com/jpsoft/smart/modules/base/entity/DeviceInfo.java

@@ -0,0 +1,193 @@
+package com.jpsoft.smart.modules.base.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+
+import com.github.pagehelper.util.StringUtil;
+import com.jpsoft.smart.modules.base.service.DeviceInfoService;
+import com.jpsoft.smart.modules.base.service.impl.DeviceInfoServiceImpl;
+import com.jpsoft.smart.modules.sys.dao.DataDictionaryDAO;
+import com.jpsoft.smart.modules.sys.service.DataDictionaryService;
+import com.jpsoft.smart.modules.sys.service.impl.DataDictionaryServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import javax.annotation.Resource;
+
+/**
+  描述:base_device_info的实体类
+ */
+@Data
+@ApiModel(value = "base_device_info的实体类")
+public class DeviceInfo {
+	/**
+	 *ID
+	 */
+	@ApiModelProperty(value = "ID")
+	private String id;
+	/**
+	 *表头
+	 */
+	@ApiModelProperty(value = "表头")
+	private String header;
+	/**
+	 *设备编号
+	 */
+	@ApiModelProperty(value = "设备编号")
+	private String deviceNo;
+	/**
+	 *设备别名
+	 */
+	@ApiModelProperty(value = "设备别名")
+	private String aliasName;
+	/**
+	 *单元楼栋
+	 */
+	@ApiModelProperty(value = "单元楼栋")
+	private String address;
+	/**
+	 *运行状态（是否在线）
+	 */
+	@ApiModelProperty(value = "运行状态（是否在线）")
+	private Boolean isOnline;
+	/**
+	 *运行状态（是否在线）
+	 */
+	private String isOnlineN;
+
+    /**
+     *公司ID
+     */
+    @ApiModelProperty(value = "公司ID")
+    private String companyId;
+
+	/**
+	 *公司名称
+	 */
+	@ApiModelProperty(value = "公司名称")
+	private String companyName;
+
+	/**
+	 *开锁密码
+	 */
+        @ApiModelProperty(value = "开锁密码")
+	private String unlockPassword;
+	/**
+	 *二维码地址
+	 */
+        @ApiModelProperty(value = "二维码地址")
+	private String codeAddress;
+	/**
+	 *ip地址
+	 */
+        @ApiModelProperty(value = "ip地址")
+	private String ipAddress;
+	/**
+	 *端口
+	 */
+        @ApiModelProperty(value = "端口")
+	private String port;
+	/**
+	 *类型
+	 */
+	@ApiModelProperty(value = "类型")
+	private String type;
+
+	/**
+	 *类型
+	 */
+	@ApiModelProperty(value = "类型")
+	private String typeN;
+	/**
+	 *是否开启自动更新
+	 */
+	@ApiModelProperty(value = "是否开启自动更新")
+	private Boolean isAutoUpdate;
+
+	@ApiModelProperty(value = "是否开启自动更新")
+	private String isAutoUpdateN;
+	/**
+	 *是否删除
+	 */
+        @ApiModelProperty(value = "是否删除")
+	private Boolean delFlag;
+	/**
+	 *创建人
+	 */
+        @ApiModelProperty(value = "创建人")
+	private String createBy;
+	/**
+	 *创建时间
+	 */
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	@ApiModelProperty(value = "创建时间")
+	private Date createTime;
+	/**
+	 *更新人
+	 */
+        @ApiModelProperty(value = "更新人")
+	private String updateBy;
+	/**
+	 *更新时间
+	 */
+    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "更新时间")
+	private Date updateTime;
+
+
+	@ApiModelProperty(value = "是否绑定人员(只做查询作用，不写入数据库)")
+	private Boolean isBindPerson;
+
+	@ApiModelProperty(value = "默认人脸库id")
+	private String defaultFaceLibraryId;
+
+
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone ="GMT+8")
+	@ApiModelProperty(value = "心跳更新时间")
+	private Date heartbeatUpdateTime;
+
+	@ApiModelProperty(value = "异常原因")
+	private String abnormalReason;
+
+	public String getIsOnlineN() {
+		if(isOnline!=null) {
+			if (isOnline) {
+				isOnlineN = "在线";
+			} else {
+				isOnlineN = "离线";
+			}
+		}
+		return isOnlineN;
+	}
+
+	public String getIsAutoUpdateN() {
+		if(isAutoUpdate!=null) {
+			if (isAutoUpdate) {
+				isAutoUpdateN = "是";
+			} else {
+				isAutoUpdateN = "否";
+			}
+		}
+		return isAutoUpdateN;
+	}
+
+	@ApiModelProperty(value = "异常原因")
+	private String isBind;
+
+	@ApiModelProperty(value = "经度")
+	private String longtitude;
+
+	@ApiModelProperty(value = "纬度")
+	private String latitude;
+
+	@ApiModelProperty(value = "设备场景值（数据库 1：为学校大门）")
+	private String deviceAddress;
+}

common/src/main/java/com/jpsoft/smart/modules/base/entity/ElectricClientInfo.java

@@ -0,0 +1,336 @@
+package com.jpsoft.smart.modules.base.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+  描述:base_electric_client_info的实体类
+ */
+public class ElectricClientInfo {
+	private String id;
+	private String customerNo;
+	private String roomId;
+	private RoomInfo room;
+	private RoomInfo building;
+	private RoomInfo area;
+	private String roomName;
+	private String roomUseType;
+	private String meterId;
+	private String meterName;
+	private Integer electricityTotal;
+	private BigDecimal amountTotal;
+	private Integer buyNum;
+	private Integer electricityRemaining;
+	private BigDecimal amountRemaining;
+	private String createBy;
+	private Date createTime;
+	private String updateBy;
+	private Date updateTime;
+	private Boolean delFlag;
+	private Integer rechargeTimes;
+	private Boolean active;
+	private Integer warningValue;
+	
+		/**
+	 *获取
+	 */
+	public String getId(){
+		return id;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setId(String id){
+		this.id = id;
+	}
+		/**
+	 *获取户号
+	 */
+	public String getCustomerNo(){
+		return customerNo;
+	}
+	
+	/**
+	 *设置户号
+	 */
+	public void setCustomerNo(String customerNo){
+		this.customerNo = customerNo;
+	}
+		/**
+	 *获取房间号ID
+	 */
+	public String getRoomId(){
+		return roomId;
+	}
+
+	/**
+	 *设置房间号ID
+	 */
+	public void setRoomId(String roomId){
+		this.roomId = roomId;
+	}
+	/**
+	 *获取房间号名称
+	 */
+	public String getRoomName(){
+		return roomName;
+	}
+
+	/**
+	 *设置房间号名称
+	 */
+	public void setRoomName(String roomName){
+		this.roomName = roomName;
+	}
+		/**
+	 *获取电表号ID
+	 */
+	public String getMeterId(){
+		return meterId;
+	}
+	
+	/**
+	 *设置电表号ID
+	 */
+	public void setMeterId(String meterId){
+		this.meterId = meterId;
+	}
+	/**
+	 *获取电表号名称
+	 */
+	public String getMeterName(){
+		return meterName;
+	}
+
+	/**
+	 *设置电表号名称
+	 */
+	public void setMeterName(String meterName){
+		this.meterName = meterName;
+	}
+		/**
+	 *获取总购电量
+	 */
+	public Integer getElectricityTotal(){
+		return electricityTotal;
+	}
+	
+	/**
+	 *设置总购电量
+	 */
+	public void setElectricityTotal(Integer electricityTotal){
+		this.electricityTotal = electricityTotal;
+	}
+		/**
+	 *获取总购电金额
+	 */
+	public BigDecimal getAmountTotal(){
+		return amountTotal;
+	}
+	
+	/**
+	 *设置总购电金额
+	 */
+	public void setAmountTotal(BigDecimal amountTotal){
+		this.amountTotal = amountTotal;
+	}
+		/**
+	 *获取购买次数
+	 */
+	public Integer getBuyNum(){
+		return buyNum;
+	}
+	
+	/**
+	 *设置购买次数
+	 */
+	public void setBuyNum(Integer buyNum){
+		this.buyNum = buyNum;
+	}
+		/**
+	 *获取剩余电量
+	 */
+	public Integer getElectricityRemaining(){
+		return electricityRemaining;
+	}
+	
+	/**
+	 *设置剩余电量
+	 */
+	public void setElectricityRemaining(Integer electricityRemaining){
+		this.electricityRemaining = electricityRemaining;
+	}
+		/**
+	 *获取剩余金额
+	 */
+	public BigDecimal getAmountRemaining(){
+		return amountRemaining;
+	}
+	
+	/**
+	 *设置剩余金额
+	 */
+	public void setAmountRemaining(BigDecimal amountRemaining){
+		this.amountRemaining = amountRemaining;
+	}
+		/**
+	 *获取
+	 */
+	public String getCreateBy(){
+		return createBy;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setCreateBy(String createBy){
+		this.createBy = createBy;
+	}
+		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+		/**
+	 *获取
+	 */
+	public Date getCreateTime(){
+		return createTime;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setCreateTime(Date createTime){
+		this.createTime = createTime;
+	}
+		/**
+	 *获取
+	 */
+	public String getUpdateBy(){
+		return updateBy;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setUpdateBy(String updateBy){
+		this.updateBy = updateBy;
+	}
+		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+		/**
+	 *获取
+	 */
+	public Date getUpdateTime(){
+		return updateTime;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setUpdateTime(Date updateTime){
+		this.updateTime = updateTime;
+	}
+		/**
+	 *获取是否删除
+	 */
+	public Boolean getDelFlag(){
+		return delFlag;
+	}
+	
+	/**
+	 *设置是否删除
+	 */
+	public void setDelFlag(Boolean delFlag){
+		this.delFlag = delFlag;
+	}
+
+	/**
+	 *获取用电类型
+	 */
+	public String getRoomUseType(){
+		return roomUseType;
+	}
+
+	/**
+	 *设置用电类型
+	 */
+	public void setRoomUseType(String roomUseType){
+		this.roomUseType = roomUseType;
+	}
+
+	/**
+	 *获取
+	 */
+	public RoomInfo getRoom(){
+		return room;
+	}
+
+	/**
+	 *设置
+	 */
+	public void setRoom(RoomInfo room){
+		this.room = room;
+	}
+	/**
+	 *获取
+	 */
+	public RoomInfo getBuilding(){
+		return building;
+	}
+
+	/**
+	 *设置
+	 */
+	public void setBuilding(RoomInfo building){
+		this.building = building;
+	}
+	/**
+	 *获取
+	 */
+	public RoomInfo getArea(){
+		return area;
+	}
+
+	/**
+	 *设置
+	 */
+	public void setArea(RoomInfo area){
+		this.area = area;
+	}
+
+	public Integer getRechargeTimes() {
+		return rechargeTimes;
+	}
+
+	public void setRechargeTimes(Integer rechargeTimes) {
+		this.rechargeTimes = rechargeTimes;
+	}
+
+	/**
+	 * 是否通电
+	 * @return
+	 */
+	public Boolean getActive() {
+		return active;
+	}
+
+	public void setActive(Boolean active) {
+		this.active = active;
+	}
+
+	/**
+	 * 报警数值
+	 * @return
+	 */
+	public Integer getWarningValue() {
+		return warningValue;
+	}
+
+	public void setWarningValue(Integer active) {
+		this.warningValue = warningValue;
+	}
+
+}

common/src/main/java/com/jpsoft/smart/modules/base/entity/ElectricMeterInfo.java

@@ -0,0 +1,187 @@
+package com.jpsoft.smart.modules.base.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+  描述:base_electric_meter_info的实体类
+ */
+public class ElectricMeterInfo {
+	private String id;
+	private String meterNo;
+	private String unitNo;
+	private String name;
+	private String terminalId;
+	private String terminalName;
+	private String terminalRemark;
+	private String createBy;
+	private Date createTime;
+	private String updateBy;
+	private Date updateTime;
+	private Boolean delFlag;
+	
+		/**
+	 *获取
+	 */
+	public String getId(){
+		return id;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setId(String id){
+		this.id = id;
+	}
+		/**
+	 *获取表号
+	 */
+	public String getMeterNo(){
+		return meterNo;
+	}
+	
+	/**
+	 *设置表号
+	 */
+	public void setMeterNo(String meterNo){
+		this.meterNo = meterNo;
+	}
+		/**
+	 *获取单位号
+	 */
+	public String getUnitNo(){
+		return unitNo;
+	}
+	
+	/**
+	 *设置单位号
+	 */
+	public void setUnitNo(String unitNo){
+		this.unitNo = unitNo;
+	}
+		/**
+	 *获取标识名称
+	 */
+	public String getName(){
+		return name;
+	}
+	
+	/**
+	 *设置标识名称
+	 */
+	public void setName(String name){
+		this.name = name;
+	}
+		/**
+	 *获取所属终端ID
+	 */
+	public String getTerminalId(){
+		return terminalId;
+	}
+	
+	/**
+	 *设置所属终端ID
+	 */
+	public void setTerminalId(String terminalId){
+		this.terminalId = terminalId;
+	}
+
+	/**
+	 *获取所属终端名称
+	 */
+	public String getTerminalName(){
+		return terminalName;
+	}
+
+	/**
+	 *设置所属终端名称
+	 */
+	public void setTerminalName(String terminalName){
+		this.terminalName = terminalName;
+	}
+	/**
+	 *获取所属终端备注
+	 */
+	public String getTerminalRemark(){
+		return terminalRemark;
+	}
+
+	/**
+	 *设置所属终端备注
+	 */
+	public void setTerminalRemark(String terminalRemark){
+		this.terminalRemark = terminalRemark;
+	}
+
+		/**
+	 *获取
+	 */
+	public String getCreateBy(){
+		return createBy;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setCreateBy(String createBy){
+		this.createBy = createBy;
+	}
+		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+		/**
+	 *获取
+	 */
+	public Date getCreateTime(){
+		return createTime;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setCreateTime(Date createTime){
+		this.createTime = createTime;
+	}
+		/**
+	 *获取
+	 */
+	public String getUpdateBy(){
+		return updateBy;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setUpdateBy(String updateBy){
+		this.updateBy = updateBy;
+	}
+		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+		/**
+	 *获取
+	 */
+	public Date getUpdateTime(){
+		return updateTime;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setUpdateTime(Date updateTime){
+		this.updateTime = updateTime;
+	}
+		/**
+	 *获取是否删除
+	 */
+	public Boolean getDelFlag(){
+		return delFlag;
+	}
+	
+	/**
+	 *设置是否删除
+	 */
+	public void setDelFlag(Boolean delFlag){
+		this.delFlag = delFlag;
+	}
+}

common/src/main/java/com/jpsoft/smart/modules/base/entity/EmployeeInfo.java

@@ -0,0 +1,227 @@
+package com.jpsoft.smart.modules.base.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModel;
+
+/**
+  描述:base_employee_info的实体类
+ */
+@ApiModel(value = "base_employee_info的实体类")
+public class EmployeeInfo {
+    @ApiModelProperty(value = "员工编号")
+	private Long id;
+    @ApiModelProperty(value = "员工姓名")
+	private String name;
+    @ApiModelProperty(value = "所属公司")
+	private String companyId;
+    @ApiModelProperty(value = "照片网址")
+	private String photo;
+    @ApiModelProperty(value = "工牌号")
+	private String no;
+    @ApiModelProperty(value = "创建人")
+	private String createBy;
+    @ApiModelProperty(value = "创建时间")
+	private Date createTime;
+    @ApiModelProperty(value = "更新人")
+	private String updateBy;
+    @ApiModelProperty(value = "更新时间")
+	private Date updateTime;
+    @ApiModelProperty(value = "是否删除")
+	private Boolean delFlag;
+    @ApiModelProperty(value = "序号")
+	private Integer sortNo;
+	@ApiModelProperty(value = "openId")
+	private String openId;
+	@ApiModelProperty(value = "companyName")
+	private String companyName;
+	@ApiModelProperty(value = "exportStatus")
+	private Boolean exportStatus;
+	@ApiModelProperty(value = "phone")
+	private String phone;
+
+	/**
+	 *获取员工编号
+	 */
+    	public Long getId(){
+		return id;
+	}
+	
+	/**
+	 *设置员工编号
+	 */
+	public void setId(Long id){
+		this.id = id;
+	}
+	/**
+	 *获取员工姓名
+	 */
+    	public String getName(){
+		return name;
+	}
+	
+	/**
+	 *设置员工姓名
+	 */
+	public void setName(String name){
+		this.name = name;
+	}
+	/**
+	 *获取所属公司
+	 */
+    	public String getCompanyId(){
+		return companyId;
+	}
+	
+	/**
+	 *设置所属公司
+	 */
+	public void setCompanyId(String companyId){
+		this.companyId = companyId;
+	}
+	/**
+	 *获取照片网址
+	 */
+    	public String getPhoto(){
+		return photo;
+	}
+	
+	/**
+	 *设置照片网址
+	 */
+	public void setPhoto(String photo){
+		this.photo = photo;
+	}
+	/**
+	 *获取工牌号
+	 */
+    	public String getNo(){
+		return no;
+	}
+	
+	/**
+	 *设置工牌号
+	 */
+	public void setNo(String no){
+		this.no = no;
+	}
+	/**
+	 *获取创建人
+	 */
+    	public String getCreateBy(){
+		return createBy;
+	}
+	
+	/**
+	 *设置创建人
+	 */
+	public void setCreateBy(String createBy){
+		this.createBy = createBy;
+	}
+	/**
+	 *获取创建时间
+	 */
+    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+		public Date getCreateTime(){
+		return createTime;
+	}
+	
+	/**
+	 *设置创建时间
+	 */
+	public void setCreateTime(Date createTime){
+		this.createTime = createTime;
+	}
+	/**
+	 *获取更新人
+	 */
+    	public String getUpdateBy(){
+		return updateBy;
+	}
+	
+	/**
+	 *设置更新人
+	 */
+	public void setUpdateBy(String updateBy){
+		this.updateBy = updateBy;
+	}
+	/**
+	 *获取更新时间
+	 */
+    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+		public Date getUpdateTime(){
+		return updateTime;
+	}
+	
+	/**
+	 *设置更新时间
+	 */
+	public void setUpdateTime(Date updateTime){
+		this.updateTime = updateTime;
+	}
+	/**
+	 *获取是否删除
+	 */
+    	public Boolean getDelFlag(){
+		return delFlag;
+	}
+	
+	/**
+	 *设置是否删除
+	 */
+	public void setDelFlag(Boolean delFlag){
+		this.delFlag = delFlag;
+	}
+	/**
+	 *获取序号
+	 */
+    	public Integer getSortNo(){
+		return sortNo;
+	}
+	
+	/**
+	 *设置序号
+	 */
+	public void setSortNo(Integer sortNo){
+		this.sortNo = sortNo;
+	}
+
+	public String getOpenId() {
+		return openId;
+	}
+
+	public void setOpenId(String openId) {
+		this.openId = openId;
+	}
+
+	public String getCompanyName() {
+		return companyName;
+	}
+
+	public void setCompanyName(String companyName) {
+		this.companyName = companyName;
+	}
+
+	public Boolean getExportStatus() {
+		return exportStatus;
+	}
+
+	public void setExportStatus(Boolean exportStatus) {
+		this.exportStatus = exportStatus;
+	}
+
+	public String getPhone() {
+		return phone;
+	}
+
+	public void setPhone(String phone) {
+		this.phone = phone;
+	}
+}

common/src/main/java/com/jpsoft/smart/modules/base/entity/HolidayInfo.java

@@ -0,0 +1,79 @@
+package com.jpsoft.smart.modules.base.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+
+import org.springframework.format.annotation.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * 描述:base_holiday_info的实体类
+ */
+@Data
+@ApiModel(value = "base_holiday_info的实体类")
+public class HolidayInfo {
+	/**
+	 * 主键
+	 */
+	@ApiModelProperty(value = "主键")
+	private String id;
+	/**
+	 * 节假日名称
+	 */
+	@ApiModelProperty(value = "节假日名称")
+	private String holidayName;
+	/**
+	 * 节假日开始日期
+	 */
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+	@ApiModelProperty(value = "节假日开始日期")
+	private Date beginDate;
+	/**
+	 * 节假日结束日期
+	 */
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+	@ApiModelProperty(value = "节假日结束日期")
+	private Date endDate;
+	/**
+	 * 创建人
+	 */
+	@ApiModelProperty(value = "创建人")
+	private String createBy;
+	/**
+	 * 创建时间
+	 */
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+	@ApiModelProperty(value = "创建时间")
+	private Date createTime;
+	/**
+	 * 更新人
+	 */
+	@ApiModelProperty(value = "更新人")
+	private String updateBy;
+	/**
+	 * 更新时间
+	 */
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+	@ApiModelProperty(value = "更新时间")
+	private Date updateTime;
+	/**
+	 * 是否删除
+	 */
+	@ApiModelProperty(value = "是否删除")
+	private Boolean delFlag;
+
+	@ApiModelProperty(value = "是否需要上班")
+	private Boolean working;
+
+	@ApiModelProperty(value = "参考上班日")
+	private int refWeekday;
+}

common/src/main/java/com/jpsoft/smart/modules/base/entity/InformationInfo.java

@@ -0,0 +1,216 @@
+package com.jpsoft.smart.modules.base.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+  描述:base_information_info的实体类
+ */
+public class InformationInfo {
+	private String id;
+	private String createBy;
+	private Date createTime;
+	private String updateBy;
+	private Date updateTime;
+	private Boolean delFlag;
+	private String ownerId;
+	private OwnerInfo owner;
+	private String community;
+	private String content;
+	private String status;
+	private String returnContent;
+	private Date returnTime;
+	private String type;
+	
+		/**
+	 *获取
+	 */
+	public String getId(){
+		return id;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setId(String id){
+		this.id = id;
+	}
+		/**
+	 *获取
+	 */
+	public String getCreateBy(){
+		return createBy;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setCreateBy(String createBy){
+		this.createBy = createBy;
+	}
+		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+		/**
+	 *获取
+	 */
+	public Date getCreateTime(){
+		return createTime;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setCreateTime(Date createTime){
+		this.createTime = createTime;
+	}
+		/**
+	 *获取
+	 */
+	public String getUpdateBy(){
+		return updateBy;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setUpdateBy(String updateBy){
+		this.updateBy = updateBy;
+	}
+		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+		/**
+	 *获取
+	 */
+	public Date getUpdateTime(){
+		return updateTime;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setUpdateTime(Date updateTime){
+		this.updateTime = updateTime;
+	}
+		/**
+	 *获取是否删除
+	 */
+	public Boolean getDelFlag(){
+		return delFlag;
+	}
+	
+	/**
+	 *设置是否删除
+	 */
+	public void setDelFlag(Boolean delFlag){
+		this.delFlag = delFlag;
+	}
+		/**
+	 *获取提交人ID
+	 */
+	public String getOwnerId(){
+		return ownerId;
+	}
+	
+	/**
+	 *设置提交人ID
+	 */
+	public void setOwnerId(String ownerId){
+		this.ownerId = ownerId;
+	}
+		/**
+	 *获取所在小区
+	 */
+	public String getCommunity(){
+		return community;
+	}
+	
+	/**
+	 *设置所在小区
+	 */
+	public void setCommunity(String community){
+		this.community = community;
+	}
+		/**
+	 *获取提交内容
+	 */
+	public String getContent(){
+		return content;
+	}
+	
+	/**
+	 *设置提交内容
+	 */
+	public void setContent(String content){
+		this.content = content;
+	}
+		/**
+	 *获取提交状态
+	 */
+	public String getStatus(){
+		return status;
+	}
+	
+	/**
+	 *设置提交状态
+	 */
+	public void setStatus(String status){
+		this.status = status;
+	}
+		/**
+	 *获取回复内容
+	 */
+	public String getReturnContent(){
+		return returnContent;
+	}
+	
+	/**
+	 *设置回复内容
+	 */
+	public void setReturnContent(String returnContent){
+		this.returnContent = returnContent;
+	}
+		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+		/**
+	 *获取回复时间
+	 */
+	public Date getReturnTime(){
+		return returnTime;
+	}
+	
+	/**
+	 *设置回复时间
+	 */
+	public void setReturnTime(Date returnTime){
+		this.returnTime = returnTime;
+	}
+		/**
+	 *获取状态/1投诉/2报修
+	 */
+	public String getType(){
+		return type;
+	}
+	
+	/**
+	 *设置状态/1投诉/2报修
+	 */
+	public void setType(String type){
+		this.type = type;
+	}
+
+	/**
+	 *获取用户
+	 */
+	public OwnerInfo getOwner(){
+		return owner;
+	}
+
+	/**
+	 *设置用户
+	 */
+	public void setOwner(OwnerInfo owner){
+		this.owner = owner;
+	}
+}

common/src/main/java/com/jpsoft/smart/modules/base/entity/MessageNotice.java

@@ -0,0 +1,82 @@
+package com.jpsoft.smart.modules.base.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+  描述:base_message_notice的实体类
+ */
+@Data
+@ApiModel(value = "base_message_notice的实体类")
+public class MessageNotice {
+	/**
+	 *ID
+	 */
+        @ApiModelProperty(value = "ID")
+	private String id;
+	/**
+	 *标题
+	 */
+        @ApiModelProperty(value = "标题")
+	private String title;
+	/**
+	 *内容
+	 */
+        @ApiModelProperty(value = "内容")
+	private String content;
+	/**
+	 *发件人ID
+	 */
+        @ApiModelProperty(value = "发件人ID")
+	private String senderId;
+	/**
+	 *收件人ID
+	 */
+        @ApiModelProperty(value = "收件人ID")
+	private String recipientId;
+	/**
+	 *状态(未读/已读)
+	 */
+        @ApiModelProperty(value = "状态(未读/已读)")
+	private Boolean status;
+	/**
+	 *是否删除
+	 */
+        @ApiModelProperty(value = "是否删除")
+	private Boolean delFlag;
+	/**
+	 *创建人
+	 */
+        @ApiModelProperty(value = "创建人")
+	private String createBy;
+	/**
+	 *创建时间
+	 */
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd",timezone ="GMT+8")
+	@ApiModelProperty(value = "创建时间")
+	private Date createTime;
+	/**
+	 *更新人
+	 */
+        @ApiModelProperty(value = "更新人")
+	private String updateBy;
+	/**
+	 *更新时间
+	 */
+    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "更新时间")
+	private Date updateTime;
+
+
+	@ApiModelProperty(value="接收公司")
+	private String noticeCompany;
+}

common/src/main/java/com/jpsoft/smart/modules/base/entity/MessageNoticeCompany.java

@@ -0,0 +1,63 @@
+package com.jpsoft.smart.modules.base.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+  描述:base_message_notice_company的实体类
+ */
+@Data
+@ApiModel(value = "base_message_notice_company的实体类")
+public class MessageNoticeCompany {
+	/**
+	 *编号
+	 */
+        @ApiModelProperty(value = "编号")
+	private String id;
+	/**
+	 *单位编号
+	 */
+        @ApiModelProperty(value = "单位编号")
+	private String companyId;
+	/**
+	 *通知消息ID
+	 */
+        @ApiModelProperty(value = "通知消息ID")
+	private String noticeId;
+	/**
+	 *创建人
+	 */
+        @ApiModelProperty(value = "创建人")
+	private String createBy;
+	/**
+	 *创建时间
+	 */
+    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "创建时间")
+	private Date createTime;
+	/**
+	 *更新人
+	 */
+        @ApiModelProperty(value = "更新人")
+	private String updateBy;
+	/**
+	 *更新时间
+	 */
+    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "更新时间")
+	private Date updateTime;
+	/**
+	 *是否删除
+	 */
+        @ApiModelProperty(value = "是否删除")
+	private Boolean delFlag;
+}

common/src/main/java/com/jpsoft/smart/modules/base/entity/MessageReport.java

@@ -0,0 +1,78 @@
+package com.jpsoft.smart.modules.base.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+  描述:base_message_report的实体类
+ */
+@Data
+@ApiModel(value = "base_message_report的实体类")
+public class MessageReport {
+	/**
+	 *ID
+	 */
+        @ApiModelProperty(value = "ID")
+	private String id;
+	/**
+	 *标题
+	 */
+        @ApiModelProperty(value = "标题")
+	private String title;
+	/**
+	 *内容
+	 */
+        @ApiModelProperty(value = "内容")
+	private String content;
+	/**
+	 *发件人ID
+	 */
+        @ApiModelProperty(value = "发件人ID")
+	private String senderId;
+	/**
+	 *收件人ID
+	 */
+        @ApiModelProperty(value = "收件人ID")
+	private String recipientId;
+	/**
+	 *状态(未读/已读)
+	 */
+        @ApiModelProperty(value = "状态(未读/已读)")
+	private Boolean status;
+	/**
+	 *是否删除
+	 */
+        @ApiModelProperty(value = "是否删除")
+	private Boolean delFlag;
+	/**
+	 *创建人
+	 */
+        @ApiModelProperty(value = "创建人")
+	private String createBy;
+	/**
+	 *创建时间
+	 */
+    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "创建时间")
+	private Date createTime;
+	/**
+	 *更新人
+	 */
+        @ApiModelProperty(value = "更新人")
+	private String updateBy;
+	/**
+	 *更新时间
+	 */
+    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "更新时间")
+	private Date updateTime;
+}

common/src/main/java/com/jpsoft/smart/modules/base/entity/OwnerInfo.java

@@ -0,0 +1,287 @@
+package com.jpsoft.smart.modules.base.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+  描述:base_owner_info的实体类
+ */
+public class OwnerInfo {
+	private String id;
+	private String createBy;
+	private Date createTime;
+	private String updateBy;
+	private Date updateTime;
+	private Boolean delFlag;
+	private String name;
+	private String tel;
+	private String park;
+	private String building;
+	private String area;
+	private Date checkinTime;
+	private BigDecimal propertyCosts;
+	private String cardNo;
+	private String authority;
+	private String carNo;
+	private Boolean isAccessControl;
+	private Boolean isThePublic;
+	private String roomId;
+	
+		/**
+	 *获取
+	 */
+	public String getId(){
+		return id;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setId(String id){
+		this.id = id;
+	}
+		/**
+	 *获取
+	 */
+	public String getCreateBy(){
+		return createBy;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setCreateBy(String createBy){
+		this.createBy = createBy;
+	}
+		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+		/**
+	 *获取
+	 */
+	public Date getCreateTime(){
+		return createTime;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setCreateTime(Date createTime){
+		this.createTime = createTime;
+	}
+		/**
+	 *获取
+	 */
+	public String getUpdateBy(){
+		return updateBy;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setUpdateBy(String updateBy){
+		this.updateBy = updateBy;
+	}
+		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+		/**
+	 *获取
+	 */
+	public Date getUpdateTime(){
+		return updateTime;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setUpdateTime(Date updateTime){
+		this.updateTime = updateTime;
+	}
+		/**
+	 *获取是否删除
+	 */
+	public Boolean getDelFlag(){
+		return delFlag;
+	}
+	
+	/**
+	 *设置是否删除
+	 */
+	public void setDelFlag(Boolean delFlag){
+		this.delFlag = delFlag;
+	}
+		/**
+	 *获取业主名称
+	 */
+	public String getName(){
+		return name;
+	}
+	
+	/**
+	 *设置业主名称
+	 */
+	public void setName(String name){
+		this.name = name;
+	}
+		/**
+	 *获取手机号码
+	 */
+	public String getTel(){
+		return tel;
+	}
+	
+	/**
+	 *设置手机号码
+	 */
+	public void setTel(String tel){
+		this.tel = tel;
+	}
+		/**
+	 *获取所在园区
+	 */
+	public String getPark(){
+		return park;
+	}
+	
+	/**
+	 *设置所在园区
+	 */
+	public void setPark(String park){
+		this.park = park;
+	}
+		/**
+	 *获取楼栋/单元/房号
+	 */
+	public String getBuilding(){
+		return building;
+	}
+	
+	/**
+	 *设置楼栋/单元/房号
+	 */
+	public void setBuilding(String building){
+		this.building = building;
+	}
+		/**
+	 *获取面积
+	 */
+	public String getArea(){
+		return area;
+	}
+	
+	/**
+	 *设置面积
+	 */
+	public void setArea(String area){
+		this.area = area;
+	}
+		@DateTimeFormat(pattern="yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd",timezone ="GMT+8")
+		/**
+	 *获取入住时间
+	 */
+	public Date getCheckinTime(){
+		return checkinTime;
+	}
+	
+	/**
+	 *设置入住时间
+	 */
+	public void setCheckinTime(Date checkinTime){
+		this.checkinTime = checkinTime;
+	}
+		/**
+	 *获取应缴物业费
+	 */
+	public BigDecimal getPropertyCosts(){
+		return propertyCosts;
+	}
+	
+	/**
+	 *设置应缴物业费
+	 */
+	public void setPropertyCosts(BigDecimal propertyCosts){
+		this.propertyCosts = propertyCosts;
+	}
+		/**
+	 *获取卡号
+	 */
+	public String getCardNo(){
+		return cardNo;
+	}
+	
+	/**
+	 *设置卡号
+	 */
+	public void setCardNo(String cardNo){
+		this.cardNo = cardNo;
+	}
+		/**
+	 *获取权限
+	 */
+	public String getAuthority(){
+		return authority;
+	}
+	
+	/**
+	 *设置权限
+	 */
+	public void setAuthority(String authority){
+		this.authority = authority;
+	}
+		/**
+	 *获取车牌
+	 */
+	public String getCarNo(){
+		return carNo;
+	}
+	
+	/**
+	 *设置车牌
+	 */
+	public void setCarNo(String carNo){
+		this.carNo = carNo;
+	}
+		/**
+	 *获取是否绑定门禁
+	 */
+	public Boolean getIsAccessControl(){
+		return isAccessControl;
+	}
+	
+	/**
+	 *设置是否绑定门禁
+	 */
+	public void setIsAccessControl(Boolean isAccessControl){
+		this.isAccessControl = isAccessControl;
+	}
+		/**
+	 *获取是否绑定公众号
+	 */
+	public Boolean getIsThePublic(){
+		return isThePublic;
+	}
+	
+	/**
+	 *设置是否绑定公众号
+	 */
+	public void setIsThePublic(Boolean isThePublic){
+		this.isThePublic = isThePublic;
+	}
+
+	/**
+	 *获取房间号
+	 */
+	public String getRoomId(){
+		return roomId;
+	}
+
+	/**
+	 *设置房间号
+	 */
+	public void setRoomId(String roomId){
+		this.roomId = roomId;
+	}
+}

common/src/main/java/com/jpsoft/smart/modules/base/entity/ParkingApply.java

@@ -0,0 +1,206 @@
+package com.jpsoft.smart.modules.base.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+  描述:base_parking_apply的实体类
+ */
+public class ParkingApply {
+	private String id;
+	private String createBy;
+	private Date createTime;
+	private String updateBy;
+	private Date updateTime;
+	private Boolean delFlag;
+	private String parkingId;
+	private ParkingInfo parking;
+	private String ownerId;
+	private OwnerInfo owner;
+	private String contractType;
+	private Integer contractDuration;
+	private Date startTime;
+	
+		/**
+	 *获取
+	 */
+	public String getId(){
+		return id;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setId(String id){
+		this.id = id;
+	}
+		/**
+	 *获取
+	 */
+	public String getCreateBy(){
+		return createBy;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setCreateBy(String createBy){
+		this.createBy = createBy;
+	}
+		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+		/**
+	 *获取
+	 */
+	public Date getCreateTime(){
+		return createTime;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setCreateTime(Date createTime){
+		this.createTime = createTime;
+	}
+		/**
+	 *获取
+	 */
+	public String getUpdateBy(){
+		return updateBy;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setUpdateBy(String updateBy){
+		this.updateBy = updateBy;
+	}
+		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+		/**
+	 *获取
+	 */
+	public Date getUpdateTime(){
+		return updateTime;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setUpdateTime(Date updateTime){
+		this.updateTime = updateTime;
+	}
+		/**
+	 *获取是否删除
+	 */
+	public Boolean getDelFlag(){
+		return delFlag;
+	}
+	
+	/**
+	 *设置是否删除
+	 */
+	public void setDelFlag(Boolean delFlag){
+		this.delFlag = delFlag;
+	}
+		/**
+	 *获取申请车位ID
+	 */
+	public String getParkingId(){
+		return parkingId;
+	}
+	
+	/**
+	 *设置申请车位ID
+	 */
+	public void setParkingId(String parkingId){
+		this.parkingId = parkingId;
+	}
+		/**
+	 *获取申请人ID
+	 */
+	public String getOwnerId(){
+		return ownerId;
+	}
+	
+	/**
+	 *设置申请人ID
+	 */
+	public void setOwnerId(String ownerId){
+		this.ownerId = ownerId;
+	}
+		/**
+	 *获取申请类型
+	 */
+	public String getContractType(){
+		return contractType;
+	}
+	
+	/**
+	 *设置申请类型
+	 */
+	public void setContractType(String contractType){
+		this.contractType = contractType;
+	}
+		/**
+	 *获取租赁时长(月)
+	 */
+	public Integer getContractDuration(){
+		return contractDuration;
+	}
+	
+	/**
+	 *设置租赁时长(月)
+	 */
+	public void setContractDuration(Integer contractDuration){
+		this.contractDuration = contractDuration;
+	}
+
+	/**
+	 *获取用户
+	 */
+	public OwnerInfo getOwner(){
+		return owner;
+	}
+
+	/**
+	 *设置用户
+	 */
+	public void setOwner(OwnerInfo owner){
+		this.owner = owner;
+	}
+
+	/**
+	 *获取车位
+	 */
+	public ParkingInfo getParking(){
+		return parking;
+	}
+
+	/**
+	 *设置车位
+	 */
+	public void setParking(ParkingInfo parking){
+		this.parking = parking;
+	}
+
+	/**
+	 *获取车位
+	 */
+	@DateTimeFormat(pattern="yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd",timezone ="GMT+8")
+	public Date getStartTime(){
+		return startTime;
+	}
+
+	/**
+	 *设置车位
+	 */
+	public void setStartTime(Date startTime){
+		this.startTime = startTime;
+	}
+
+
+}

common/src/main/java/com/jpsoft/smart/modules/base/entity/ParkingDevice.java

@@ -0,0 +1,74 @@
+package com.jpsoft.smart.modules.base.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * @author 墨鱼_mo
+ * @date 2020-5-22 16:39
+ */
+@Data
+@ApiModel(value = "base_parking_device的实体类")
+public class ParkingDevice {
+
+    /**
+     *主键
+     */
+    @ApiModelProperty(value = "主键")
+    private Long id;
+    /**
+     * 编号
+     */
+    @ApiModelProperty(value = "道闸编号")
+    private String parkDeviceNo;
+    /**
+     * 名称
+     */
+    @ApiModelProperty(value = "道闸名称")
+    private String parkDeviceName;
+
+
+
+    @ApiModelProperty(value = "ip_port")
+    private String ipPort;
+
+
+    private String key;
+
+    /**
+     * 是否删除
+     */
+    @ApiModelProperty(value = "是否删除")
+    private Boolean delFlag;
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+    /**
+     * 创建时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+    /**
+     * 更新人
+     */
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+}

common/src/main/java/com/jpsoft/smart/modules/base/entity/ParkingInfo.java

@@ -0,0 +1,222 @@
+package com.jpsoft.smart.modules.base.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+  描述:base_parking_info的实体类
+ */
+public class ParkingInfo {
+	private String id;
+	private String createBy;
+	private Date createTime;
+	private String updateBy;
+	private Date updateTime;
+	private Boolean delFlag;
+	private String parkingNumber;
+	private BigDecimal parkingPrice;
+	private Integer rentPrice;
+	private String contractType;
+	private String ownerId;
+	private OwnerInfo owner;
+	private Date effectiveTime;
+	private Date expirationTime;
+	
+		/**
+	 *获取
+	 */
+	public String getId(){
+		return id;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setId(String id){
+		this.id = id;
+	}
+		/**
+	 *获取
+	 */
+	public String getCreateBy(){
+		return createBy;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setCreateBy(String createBy){
+		this.createBy = createBy;
+	}
+		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+		/**
+	 *获取
+	 */
+	public Date getCreateTime(){
+		return createTime;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setCreateTime(Date createTime){
+		this.createTime = createTime;
+	}
+		/**
+	 *获取
+	 */
+	public String getUpdateBy(){
+		return updateBy;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setUpdateBy(String updateBy){
+		this.updateBy = updateBy;
+	}
+		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+		/**
+	 *获取
+	 */
+	public Date getUpdateTime(){
+		return updateTime;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setUpdateTime(Date updateTime){
+		this.updateTime = updateTime;
+	}
+		/**
+	 *获取是否删除
+	 */
+	public Boolean getDelFlag(){
+		return delFlag;
+	}
+	
+	/**
+	 *设置是否删除
+	 */
+	public void setDelFlag(Boolean delFlag){
+		this.delFlag = delFlag;
+	}
+		/**
+	 *获取
+车位编号
+	 */
+	public String getParkingNumber(){
+		return parkingNumber;
+	}
+	
+	/**
+	 *设置
+车位编号
+	 */
+	public void setParkingNumber(String parkingNumber){
+		this.parkingNumber = parkingNumber;
+	}
+		/**
+	 *获取车位售价
+	 */
+	public BigDecimal getParkingPrice(){
+		return parkingPrice;
+	}
+	
+	/**
+	 *设置车位售价
+	 */
+	public void setParkingPrice(BigDecimal parkingPrice){
+		this.parkingPrice = parkingPrice;
+	}
+		/**
+	 *获取租赁价格(月)
+	 */
+	public Integer getRentPrice(){
+		return rentPrice;
+	}
+	
+	/**
+	 *设置租赁价格(月)
+	 */
+	public void setRentPrice(Integer rentPrice){
+		this.rentPrice = rentPrice;
+	}
+		/**
+	 *获取合约类型
+	 */
+	public String getContractType(){
+		return contractType;
+	}
+	
+	/**
+	 *设置合约类型
+	 */
+	public void setContractType(String contractType){
+		this.contractType = contractType;
+	}
+		/**
+	 *获取申请人ID
+	 */
+	public String getOwnerId(){
+		return ownerId;
+	}
+	
+	/**
+	 *设置申请人ID
+	 */
+	public void setOwnerId(String ownerId){
+		this.ownerId = ownerId;
+	}
+		@DateTimeFormat(pattern="yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd",timezone ="GMT+8")
+		/**
+	 *获取生效日期
+	 */
+	public Date getEffectiveTime(){
+		return effectiveTime;
+	}
+	
+	/**
+	 *设置生效日期
+	 */
+	public void setEffectiveTime(Date effectiveTime){
+		this.effectiveTime = effectiveTime;
+	}
+		@DateTimeFormat(pattern="yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd",timezone ="GMT+8")
+		/**
+	 *获取有效期
+	 */
+	public Date getExpirationTime(){
+		return expirationTime;
+	}
+	
+	/**
+	 *设置有效期
+	 */
+	public void setExpirationTime(Date expirationTime){
+		this.expirationTime = expirationTime;
+	}
+
+	/**
+	 *获取用户
+	 */
+	public OwnerInfo getOwner(){
+		return owner;
+	}
+
+	/**
+	 *设置用户
+	 */
+	public void setOwner(OwnerInfo owner){
+		this.owner = owner;
+	}
+
+}

common/src/main/java/com/jpsoft/smart/modules/base/entity/ParkingRecord.java

@@ -0,0 +1,49 @@
+package com.jpsoft.smart.modules.base.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author 墨鱼_mo
+ * @date 2020-4-14 9:15
+ */
+@Data
+public class ParkingRecord {
+
+
+    private String id;
+    private String companyId;
+    private String carNum;
+    private String parkingDeviceNo;
+    private BigDecimal parkingTime;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date inParkingTime;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date paymentTime;
+    private BigDecimal payAmount;
+    private String payStatus;
+    private String payType;
+    private String serialNumber;
+    private String transactionNumber;
+    private String productTheme;
+    private String openId;
+    private String createBy;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+    private String updateBy;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date updateTime;
+    private Boolean delFlag;
+}

common/src/main/java/com/jpsoft/smart/modules/base/entity/PersonCompany.java

@@ -0,0 +1,63 @@
+package com.jpsoft.smart.modules.base.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+  描述:base_person_company的实体类
+ */
+@Data
+@ApiModel(value = "base_person_company的实体类")
+public class PersonCompany {
+	/**
+	 *编号
+	 */
+        @ApiModelProperty(value = "编号")
+	private String id;
+	/**
+	 *人员编号
+	 */
+        @ApiModelProperty(value = "人员编号")
+	private Long personId;
+	/**
+	 *单位编号
+	 */
+        @ApiModelProperty(value = "单位编号")
+	private String companyId;
+	/**
+	 *是否删除
+	 */
+        @ApiModelProperty(value = "是否删除")
+	private Boolean delFlag;
+	/**
+	 *创建人
+	 */
+        @ApiModelProperty(value = "创建人")
+	private String createBy;
+	/**
+	 *创建时间
+	 */
+    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "创建时间")
+	private Date createTime;
+	/**
+	 *更新人
+	 */
+        @ApiModelProperty(value = "更新人")
+	private String updateBy;
+	/**
+	 *更新时间
+	 */
+    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "更新时间")
+	private Date updateTime;
+}

common/src/main/java/com/jpsoft/smart/modules/base/entity/PersonDeviceFilterLog.java

@@ -0,0 +1,125 @@
+package com.jpsoft.smart.modules.base.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author 墨鱼_mo
+ * @date 2020-3-15 13:30
+ */
+@Data
+@ApiModel(value = "base_person_device_filter_log的实体类")
+public class PersonDeviceFilterLog {
+
+    /**
+     * 主体id
+     */
+    @ApiModelProperty(value = "ID")
+    private Long id;
+
+    /**
+     * 设备序列号
+     */
+    @ApiModelProperty(value = "设备序列号")
+    private String deviceNo;
+
+
+
+
+    /**
+     * 人员id
+     */
+    @ApiModelProperty(value = "人员id")
+    private Long personId;
+
+
+    /**
+     * 记录温度
+     */
+    @ApiModelProperty(value = "记录温度")
+    private BigDecimal temperature;
+
+
+    /**
+     * 匹配状态
+     */
+    @ApiModelProperty(value = "匹配状态")
+    private Integer matchStatus;
+
+    /**
+     * 匹配信息
+     */
+    @ApiModelProperty(value = "匹配信息")
+    private String  matchMsg;
+
+
+    /**
+     * 匹配人脸 ID
+     */
+    @ApiModelProperty(value = "匹配人脸 ID")
+    private Integer  matchFaceId;
+
+    /**
+     * 图片地址
+     */
+    @ApiModelProperty(value = "图片地址")
+    private String faceImage;
+
+    /**
+     * 记录时间
+     */
+
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone ="GMT+8")
+    @ApiModelProperty(value = "记录时间")
+    private Date recordTime;
+
+
+
+    /**
+     * 是否删除
+     */
+    @ApiModelProperty(value = "是否删除")
+    private Boolean delFlag;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 更新人
+     */
+    @ApiModelProperty(value = "更新人")
+    private String  updateBy;
+
+    /**
+     * 更新时间
+     */
+
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+
+    @ApiModelProperty(value = "时间段")
+    private String timeZones;
+
+
+}

common/src/main/java/com/jpsoft/smart/modules/base/entity/PersonDeviceLog.java

@@ -0,0 +1,147 @@
+package com.jpsoft.smart.modules.base.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.Date;
+
+/**
+ * @author 墨鱼_mo
+ * @date 2020-3-15 13:30
+ */
+@Data
+@ApiModel(value = "base_person_device_log的实体类")
+public class PersonDeviceLog {
+
+    /**
+     * 主体id
+     */
+    @ApiModelProperty(value = "ID")
+    private String id;
+
+    /**
+     * 设备序列号
+     */
+    @ApiModelProperty(value = "设备序列号")
+    private String deviceNo;
+
+    @ApiModelProperty(value = "设备信息")
+    private DeviceInfo device;
+
+
+    /**
+     * 人员id
+     */
+    @ApiModelProperty(value = "人员id")
+    private Long personId;
+
+    /**
+     * 人员姓名
+     */
+    @ApiModelProperty(value = "人员姓名")
+    private String personName;
+
+    @ApiModelProperty(value = "人员信息")
+    private PersonInfo person;
+
+    /**
+     * 记录温度
+     */
+    @ApiModelProperty(value = "记录温度")
+    private BigDecimal temperature;
+
+    /**
+     * 验证号码
+     */
+    @ApiModelProperty(value = "验证号码")
+    private String identityNo;
+
+
+    /**
+     * 匹配状态
+     */
+    @ApiModelProperty(value = "匹配状态")
+    private Integer matchStatus;
+
+    /**
+     * 匹配信息
+     */
+    @ApiModelProperty(value = "匹配信息")
+    private String  matchMsg;
+
+
+    /**
+     * 匹配人脸 ID
+     */
+    @ApiModelProperty(value = "匹配人脸 ID")
+    private Integer  matchFaceId;
+
+    /**
+     * 图片地址
+     */
+    @ApiModelProperty(value = "图片地址")
+    private String faceImage;
+
+    /**
+     * 记录时间
+     */
+
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone ="GMT+8")
+    @ApiModelProperty(value = "记录时间")
+    private Date recordTime;
+
+    /**
+     * 是否有效数据
+     */
+    @ApiModelProperty(value = "是否有效数据")
+    private Boolean isEffective;
+
+    /**
+     * 是否删除
+     */
+    @ApiModelProperty(value = "是否删除")
+    private Boolean delFlag;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 更新人
+     */
+    @ApiModelProperty(value = "更新人")
+    private String  updateBy;
+
+    /**
+     * 更新时间
+     */
+
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+    /**
+     * 关联用户是否状态
+     */
+    @ApiModelProperty(value = "关联用户是否删除")
+    private Boolean personFlag;
+
+
+}

common/src/main/java/com/jpsoft/smart/modules/base/entity/PersonDeviceRelation.java

@@ -0,0 +1,96 @@
+package com.jpsoft.smart.modules.base.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+  描述:base_person_device_relation的实体类
+ */
+@Data
+@ApiModel(value = "base_person_device_relation的实体类")
+public class PersonDeviceRelation {
+	/**
+	 *ID
+	 */
+        @ApiModelProperty(value = "ID")
+	private String id;
+	/**
+	 *设备ID
+	 */
+        @ApiModelProperty(value = "设备ID")
+	private String deviceId;
+
+	@ApiModelProperty(value = "设备信息")
+	private DeviceInfo deviceInfo;
+	/**
+	 *人员ID
+	 */
+        @ApiModelProperty(value = "人员ID")
+	private Long personId;
+
+	@ApiModelProperty(value = "人员信息")
+	private PersonInfo personInfo;
+	/**
+	 *是否删除
+	 */
+	@ApiModelProperty(value = "是否删除")
+	private Boolean isWrite;
+	/**
+	 *是否删除
+	 */
+        @ApiModelProperty(value = "是否删除")
+	private Boolean delFlag;
+	/**
+	 *创建人
+	 */
+        @ApiModelProperty(value = "创建人")
+	private String createBy;
+	/**
+	 *创建时间
+	 */
+    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "创建时间")
+	private Date createTime;
+	/**
+	 *更新人
+	 */
+        @ApiModelProperty(value = "更新人")
+	private String updateBy;
+	/**
+	 *更新时间
+	 */
+    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "更新时间")
+	private Date updateTime;
+
+	public DeviceInfo getDeviceInfo() {
+		return deviceInfo;
+	}
+
+	public void setDeviceInfo(DeviceInfo deviceInfo) {
+		this.deviceInfo = deviceInfo;
+	}
+
+	public PersonInfo getPersonInfo() {
+		return personInfo;
+	}
+
+	public void setPersonInfo(PersonInfo personInfo) {
+		this.personInfo = personInfo;
+	}
+
+	/**
+	 *人脸信息是否绑定到终端
+	 */
+	@ApiModelProperty(value = "人脸信息是否绑定到终端")
+	private Boolean isBound;
+}

common/src/main/java/com/jpsoft/smart/modules/base/entity/PersonInfo.java

@@ -0,0 +1,179 @@
+package com.jpsoft.smart.modules.base.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+
+import org.springframework.format.annotation.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * 描述:base_person_info的实体类
+ */
+@Data
+@ApiModel(value = "base_person_info的实体类")
+public class PersonInfo {
+    /**
+     * 编号
+     */
+    @ApiModelProperty(value = "编号")
+    private Long id;
+    /**
+     * 企业编号
+     */
+    @ApiModelProperty(value = "企业编号")
+    private String companyId;
+    /**
+     * 企业名称
+     */
+    @ApiModelProperty(value = "企业名称")
+    private String companyName;
+    /**
+     * 姓名
+     */
+    @ApiModelProperty(value = "姓名")
+    private String name;
+    /**
+     * 手机号
+     */
+    @ApiModelProperty(value = "手机号")
+    private String phone;
+    /**
+     * 身份证号
+     */
+    @ApiModelProperty(value = "身份证号")
+    private String idCard;
+    /**
+     * 微信openId
+     */
+    @ApiModelProperty(value = "微信openId")
+    private String openId;
+    /**
+     * 人脸
+     */
+    @ApiModelProperty(value = "人脸")
+    private Boolean faceEnabled;
+
+    @ApiModelProperty(value = "是否已将人脸信息传给终端")
+    private Boolean faceBound;
+
+    /**
+     * 刷卡
+     */
+    @ApiModelProperty(value = "刷卡")
+    private Boolean cardEnabled;
+    /**
+     * 手机
+     */
+    @ApiModelProperty(value = "手机")
+    private Boolean appEnabled;
+    /**
+     * 密码
+     */
+    @ApiModelProperty(value = "密码")
+    private Boolean passwordEnabled;
+    /**
+     * 访客
+     */
+    @ApiModelProperty(value = "访客")
+    private Boolean guestEnabled;
+    /**
+     * 位置1
+     */
+    @ApiModelProperty(value = "位置1")
+    private String position1;
+    /**
+     * 位置2
+     */
+    @ApiModelProperty(value = "位置2")
+    private String position2;
+    /**
+     * 位置3
+     */
+    @ApiModelProperty(value = "位置3")
+    private String position3;
+    /**
+     * 位置4
+     */
+    @ApiModelProperty(value = "位置4")
+    private String position4;
+    /**
+     * 位置5
+     */
+    @ApiModelProperty(value = "位置5")
+    private String position5;
+    /**
+     * 是否删除
+     */
+    @ApiModelProperty(value = "是否删除")
+    private Boolean delFlag;
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+    /**
+     * 创建时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 更新人
+     */
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+    /**
+     * 更新时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "人脸相片地址")
+    private String faceImageUrl;
+
+    @ApiModelProperty(value="权限（1-个人用户，2-企业管理员）")
+    private String popedom;
+
+    private BigDecimal lastTemperatureLog;
+
+    private Boolean isNormal;
+
+    @ApiModelProperty(value="关联单位")
+    private String personCompany;
+
+    @ApiModelProperty(value="是否接收微信通知")
+    private Boolean wechatNoticeEnabled;
+
+    @ApiModelProperty(value="是否允许查看本单位数据")
+    private Boolean allowViewLocal;
+
+    public Boolean getAllowViewLocal() {
+        if(allowViewLocal==null){
+            return false;
+        }
+        else{
+            return allowViewLocal;
+        }
+    }
+
+    @ApiModelProperty(value="单位性质")
+    private String companyType;
+
+    @ApiModelProperty(value="健康照路径")
+    private String healthErtificateUrl;
+
+    @ApiModelProperty(value="是否同步")
+    private Boolean isSync;
+
+    @ApiModelProperty(value = "性别")
+    private String sex;
+}

common/src/main/java/com/jpsoft/smart/modules/base/entity/ProjectInfo.java

@@ -0,0 +1,79 @@
+package com.jpsoft.smart.modules.base.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+
+import org.springframework.format.annotation.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * 描述:base_project_info的实体类
+ */
+@Data
+@ApiModel(value = "base_project_info的实体类")
+public class ProjectInfo {
+    /**
+     *
+     */
+    @ApiModelProperty(value = "")
+    private String id;
+    /**
+     * 项目编码
+     */
+    @ApiModelProperty(value = "项目编码")
+    private String projectCode;
+    /**
+     * 接口ID
+     */
+    @ApiModelProperty(value = "接口ID")
+    private String appId;
+    /**
+     * 接口秘钥
+     */
+    @ApiModelProperty(value = "接口秘钥")
+    private String appSecret;
+    /**
+     * 单位编号
+     */
+    @ApiModelProperty(value = "单位编号")
+    private String companyId;
+    /**
+     * 企业统一社会信用代码
+     */
+    @ApiModelProperty(value = "企业统一社会信用代码")
+    private String socialCreditCode;
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+    /**
+     * 创建时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+    /**
+     * 更新人
+     */
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+    /**
+     * 更新时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+    /**
+     * 是否删除
+     */
+    @ApiModelProperty(value = "是否删除")
+    private Boolean delFlag;
+}

common/src/main/java/com/jpsoft/smart/modules/base/entity/PunchLocation.java

@@ -0,0 +1,86 @@
+package com.jpsoft.smart.modules.base.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+  描述:base_punch_location的实体类
+ */
+@Data
+@ApiModel(value = "base_punch_location的实体类")
+public class PunchLocation {
+	/**
+	 *
+	 */
+        @ApiModelProperty(value = "")
+	private String id;
+	/**
+	 *学校ID
+	 */
+        @ApiModelProperty(value = "学校ID")
+	private String companyId;
+	/**
+	 *学校ID
+	 */
+	@ApiModelProperty(value = "学校ID")
+	private String companyName;
+	/**
+	 *打卡点名称
+	 */
+        @ApiModelProperty(value = "打卡点名称")
+	private String name;
+	/**
+	 *打卡点经度
+	 */
+        @ApiModelProperty(value = "打卡点经度")
+	private String longtitude;
+	/**
+	 *打卡点维度
+	 */
+        @ApiModelProperty(value = "打卡点维度")
+	private String latitude;
+	/**
+	 *备注描述
+	 */
+        @ApiModelProperty(value = "备注描述")
+	private String remark;
+	/**
+	 *是否启用
+	 */
+        @ApiModelProperty(value = "是否启用")
+	private Boolean isEnable;
+	/**
+	 *是否删除
+	 */
+        @ApiModelProperty(value = "是否删除")
+	private Boolean delFlag;
+	/**
+	 *创建人
+	 */
+        @ApiModelProperty(value = "创建人")
+	private String createBy;
+	/**
+	 *创建时间
+	 */
+    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "创建时间")
+	private Date createTime;
+	/**
+	 *更新人
+	 */
+        @ApiModelProperty(value = "更新人")
+	private String updateBy;
+	/**
+	 *更新时间
+	 */
+    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "更新时间")
+	private Date updateTime;
+}

common/src/main/java/com/jpsoft/smart/modules/base/entity/PunchRecord.java

@@ -0,0 +1,76 @@
+package com.jpsoft.smart.modules.base.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * 描述:base_punch_record的实体类
+ */
+@Data
+@ApiModel(value = "base_punch_record的实体类")
+public class PunchRecord {
+    /**
+     *
+     */
+    @ApiModelProperty(value = "")
+    private String id;
+    /**
+     * 打卡人ID
+     */
+    @ApiModelProperty(value = "打卡人ID")
+    private Long personId;
+    /**
+     * 打卡点ID
+     */
+    @ApiModelProperty(value = "打卡点ID")
+    private String punchId;
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注")
+    private String remark;
+    /**
+     * 当前经度
+     */
+    @ApiModelProperty(value = "当前经度")
+    private String longtitude;
+    /**
+     * 当前维度
+     */
+    @ApiModelProperty(value = "当前维度")
+    private String latitude;
+    /**
+     * 是否删除
+     */
+    @ApiModelProperty(value = "是否删除")
+    private Boolean delFlag;
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+    /**
+     * 创建时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+    /**
+     * 更新人
+     */
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+    /**
+     * 更新时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+}

common/src/main/java/com/jpsoft/smart/modules/base/entity/RechargeRecord.java

@@ -0,0 +1,366 @@
+package com.jpsoft.smart.modules.base.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+  描述:base_recharge_record的实体类
+ */
+public class RechargeRecord {
+	private String id;
+	private String createBy;
+	private Date createTime;
+	private String updateBy;
+	private Date updateTime;
+	private Boolean delFlag;
+	private String serialNumber;
+	private BigDecimal buyAmount;
+	private Integer buyElectricity;
+	private String buyType;
+	private String roomId;
+	private RoomInfo room;
+	private RoomInfo building;
+	private RoomInfo area;
+	private String clientId;
+	private String customerNo;
+	private String transactionNumber;
+	private String productTheme;
+	private String paymentStatus;
+	private String chargingStatus;
+	private Date paymentTime;
+	private String openId;
+	private String errorLog;
+	private Integer dumpEnergy;
+	
+		/**
+	 *获取
+	 */
+	public String getId(){
+		return id;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setId(String id){
+		this.id = id;
+	}
+		/**
+	 *获取
+	 */
+	public String getCreateBy(){
+		return createBy;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setCreateBy(String createBy){
+		this.createBy = createBy;
+	}
+		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+		/**
+	 *获取
+	 */
+	public Date getCreateTime(){
+		return createTime;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setCreateTime(Date createTime){
+		this.createTime = createTime;
+	}
+		/**
+	 *获取
+	 */
+	public String getUpdateBy(){
+		return updateBy;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setUpdateBy(String updateBy){
+		this.updateBy = updateBy;
+	}
+		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+		/**
+	 *获取
+	 */
+	public Date getUpdateTime(){
+		return updateTime;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setUpdateTime(Date updateTime){
+		this.updateTime = updateTime;
+	}
+		/**
+	 *获取是否删除
+	 */
+	public Boolean getDelFlag(){
+		return delFlag;
+	}
+	
+	/**
+	 *设置是否删除
+	 */
+	public void setDelFlag(Boolean delFlag){
+		this.delFlag = delFlag;
+	}
+		/**
+	 *获取流水号
+	 */
+	public String getSerialNumber(){
+		return serialNumber;
+	}
+	
+	/**
+	 *设置流水号
+	 */
+	public void setSerialNumber(String serialNumber){
+		this.serialNumber = serialNumber;
+	}
+		/**
+	 *获取充值金额
+	 */
+	public BigDecimal getBuyAmount(){
+		return buyAmount;
+	}
+	
+	/**
+	 *设置充值金额
+	 */
+	public void setBuyAmount(BigDecimal buyAmount){
+		this.buyAmount = buyAmount;
+	}
+		/**
+	 *获取充值度数
+	 */
+	public Integer getBuyElectricity(){
+		return buyElectricity;
+	}
+	
+	/**
+	 *设置充值度数
+	 */
+	public void setBuyElectricity(Integer buyElectricity){
+		this.buyElectricity = buyElectricity;
+	}
+		/**
+	 *获取支付类型:微信,支付宝,现金等
+	 */
+	public String getBuyType(){
+		return buyType;
+	}
+	
+	/**
+	 *设置支付类型:微信,支付宝,现金等
+	 */
+	public void setBuyType(String buyType){
+		this.buyType = buyType;
+	}
+
+	/**
+	 *获取
+	 */
+	public String getClientId(){
+		return clientId;
+	}
+
+	/**
+	 *设置
+	 */
+	public void setClientId(String clientId){
+		this.clientId = clientId;
+	}
+	/**
+	 *获取户号
+	 */
+	public String getCustomerNo(){
+		return customerNo;
+	}
+
+	/**
+	 *设置户号
+	 */
+	public void setCustomerNo(String customerNo){
+		this.customerNo = customerNo;
+	}
+
+	/**
+	 *获取
+	 */
+	public String getRoomId(){
+		return roomId;
+	}
+
+	/**
+	 *设置
+	 */
+	public void setRoomId(String roomId){
+		this.roomId = roomId;
+	}
+
+
+	/**
+	 *获取交易号
+	 */
+	public String getTransactionNumber(){
+		return transactionNumber;
+	}
+
+	/**
+	 *设置交易号
+	 */
+	public void setTransactionNumber(String transactionNumber){
+		this.transactionNumber = transactionNumber;
+	}
+
+	/**
+	 *获取商品主题
+	 */
+	public String getProductTheme(){
+		return productTheme;
+	}
+
+	/**
+	 *设置商品主题
+	 */
+	public void setProductTheme(String productTheme){
+		this.productTheme = productTheme;
+	}
+
+	/**
+	 *获取支付状态
+	 */
+	public String getPaymentStatus(){
+		return paymentStatus;
+	}
+
+	/**
+	 *设置支付状态
+	 */
+	public void setPaymentStatus(String paymentStatus){
+		this.paymentStatus = paymentStatus;
+	}
+
+	/**
+	 *获取充电状态
+	 */
+	public String getChargingStatus(){
+		return chargingStatus;
+	}
+
+	/**
+	 *设置充电状态
+	 */
+	public void setChargingStatus(String chargingStatus){
+		this.chargingStatus = chargingStatus;
+	}
+
+	/**
+	 *获取支付时间
+	 */
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	public Date getPaymentTime(){
+		return paymentTime;
+	}
+
+	/**
+	 *设置支付时间
+	 */
+	public void setPaymentTime(Date paymentTime){
+		this.paymentTime = paymentTime;
+	}
+
+	/**
+	 *获取
+	 */
+	public String getOpenId(){
+		return openId;
+	}
+
+	/**
+	 *设置
+	 */
+	public void setOpenId(String openId){
+		this.openId = openId;
+	}
+
+	/**
+	 *获取错误日志
+	 */
+	public String getErrorLog(){
+		return errorLog;
+	}
+
+	/**
+	 *设置错误日志
+	 */
+	public void setErrorLog(String errorLog){
+		this.errorLog = errorLog;
+	}
+
+
+
+	/**
+	 *获取
+	 */
+	public RoomInfo getRoom(){
+		return room;
+	}
+
+	/**
+	 *设置
+	 */
+	public void setRoom(RoomInfo room){
+		this.room = room;
+	}
+
+	/**
+	 *获取
+	 */
+	public RoomInfo getBuilding(){
+		return building;
+	}
+
+	/**
+	 *设置
+	 */
+	public void setBuilding(RoomInfo building){
+		this.building = building;
+	}
+
+	/**
+	 *获取
+	 */
+	public RoomInfo getArea(){
+		return area;
+	}
+
+	/**
+	 *设置
+	 */
+	public void setArea(RoomInfo area){
+		this.area = area;
+	}
+
+	public Integer getDumpEnergy() {
+		return dumpEnergy;
+	}
+
+	public void setDumpEnergy(Integer dumpEnergy) {
+		this.dumpEnergy = dumpEnergy;
+	}
+}

common/src/main/java/com/jpsoft/smart/modules/base/entity/RechargeRecordWater.java

@@ -0,0 +1,377 @@
+package com.jpsoft.smart.modules.base.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+  描述:base_recharge_record的实体类
+ */
+public class RechargeRecordWater {
+	private String id;
+	private String createBy;
+	private Date createTime;
+	private String updateBy;
+	private Date updateTime;
+	private Boolean delFlag;
+	private String serialNumber;
+	private BigDecimal buyAmount;
+	private Integer buyElectricity;
+	private String buyType;
+	private String roomId;
+	private RoomInfo room;
+	private RoomInfo building;
+	private RoomInfo area;
+	private String clientId;
+	private String customerNo;
+	private String transactionNumber;
+	private String productTheme;
+	private String paymentStatus;
+	private String chargingStatus;
+	private Date paymentTime;
+	private String openId;
+	private String errorLog;
+	private Integer dumpEnergy;
+	private String type;
+	
+		/**
+	 *获取
+	 */
+	public String getId(){
+		return id;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setId(String id){
+		this.id = id;
+	}
+		/**
+	 *获取
+	 */
+	public String getCreateBy(){
+		return createBy;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setCreateBy(String createBy){
+		this.createBy = createBy;
+	}
+		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+		/**
+	 *获取
+	 */
+	public Date getCreateTime(){
+		return createTime;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setCreateTime(Date createTime){
+		this.createTime = createTime;
+	}
+		/**
+	 *获取
+	 */
+	public String getUpdateBy(){
+		return updateBy;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setUpdateBy(String updateBy){
+		this.updateBy = updateBy;
+	}
+		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+		/**
+	 *获取
+	 */
+	public Date getUpdateTime(){
+		return updateTime;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setUpdateTime(Date updateTime){
+		this.updateTime = updateTime;
+	}
+		/**
+	 *获取是否删除
+	 */
+	public Boolean getDelFlag(){
+		return delFlag;
+	}
+	
+	/**
+	 *设置是否删除
+	 */
+	public void setDelFlag(Boolean delFlag){
+		this.delFlag = delFlag;
+	}
+		/**
+	 *获取流水号
+	 */
+	public String getSerialNumber(){
+		return serialNumber;
+	}
+	
+	/**
+	 *设置流水号
+	 */
+	public void setSerialNumber(String serialNumber){
+		this.serialNumber = serialNumber;
+	}
+		/**
+	 *获取充值金额
+	 */
+	public BigDecimal getBuyAmount(){
+		return buyAmount;
+	}
+	
+	/**
+	 *设置充值金额
+	 */
+	public void setBuyAmount(BigDecimal buyAmount){
+		this.buyAmount = buyAmount;
+	}
+		/**
+	 *获取充值度数
+	 */
+	public Integer getBuyElectricity(){
+		return buyElectricity;
+	}
+	
+	/**
+	 *设置充值度数
+	 */
+	public void setBuyElectricity(Integer buyElectricity){
+		this.buyElectricity = buyElectricity;
+	}
+		/**
+	 *获取支付类型:微信,支付宝,现金等
+	 */
+	public String getBuyType(){
+		return buyType;
+	}
+	
+	/**
+	 *设置支付类型:微信,支付宝,现金等
+	 */
+	public void setBuyType(String buyType){
+		this.buyType = buyType;
+	}
+
+	/**
+	 *获取
+	 */
+	public String getClientId(){
+		return clientId;
+	}
+
+	/**
+	 *设置
+	 */
+	public void setClientId(String clientId){
+		this.clientId = clientId;
+	}
+	/**
+	 *获取户号
+	 */
+	public String getCustomerNo(){
+		return customerNo;
+	}
+
+	/**
+	 *设置户号
+	 */
+	public void setCustomerNo(String customerNo){
+		this.customerNo = customerNo;
+	}
+
+	/**
+	 *获取
+	 */
+	public String getRoomId(){
+		return roomId;
+	}
+
+	/**
+	 *设置
+	 */
+	public void setRoomId(String roomId){
+		this.roomId = roomId;
+	}
+
+
+	/**
+	 *获取交易号
+	 */
+	public String getTransactionNumber(){
+		return transactionNumber;
+	}
+
+	/**
+	 *设置交易号
+	 */
+	public void setTransactionNumber(String transactionNumber){
+		this.transactionNumber = transactionNumber;
+	}
+
+	/**
+	 *获取商品主题
+	 */
+	public String getProductTheme(){
+		return productTheme;
+	}
+
+	/**
+	 *设置商品主题
+	 */
+	public void setProductTheme(String productTheme){
+		this.productTheme = productTheme;
+	}
+
+	/**
+	 *获取支付状态
+	 */
+	public String getPaymentStatus(){
+		return paymentStatus;
+	}
+
+	/**
+	 *设置支付状态
+	 */
+	public void setPaymentStatus(String paymentStatus){
+		this.paymentStatus = paymentStatus;
+	}
+
+	/**
+	 *获取充电状态
+	 */
+	public String getChargingStatus(){
+		return chargingStatus;
+	}
+
+	/**
+	 *设置充电状态
+	 */
+	public void setChargingStatus(String chargingStatus){
+		this.chargingStatus = chargingStatus;
+	}
+
+	/**
+	 *获取支付时间
+	 */
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	public Date getPaymentTime(){
+		return paymentTime;
+	}
+
+	/**
+	 *设置支付时间
+	 */
+	public void setPaymentTime(Date paymentTime){
+		this.paymentTime = paymentTime;
+	}
+
+	/**
+	 *获取
+	 */
+	public String getOpenId(){
+		return openId;
+	}
+
+	/**
+	 *设置
+	 */
+	public void setOpenId(String openId){
+		this.openId = openId;
+	}
+
+	/**
+	 *获取错误日志
+	 */
+	public String getErrorLog(){
+		return errorLog;
+	}
+
+	/**
+	 *设置错误日志
+	 */
+	public void setErrorLog(String errorLog){
+		this.errorLog = errorLog;
+	}
+
+
+
+	/**
+	 *获取
+	 */
+	public RoomInfo getRoom(){
+		return room;
+	}
+
+	/**
+	 *设置
+	 */
+	public void setRoom(RoomInfo room){
+		this.room = room;
+	}
+
+	/**
+	 *获取
+	 */
+	public RoomInfo getBuilding(){
+		return building;
+	}
+
+	/**
+	 *设置
+	 */
+	public void setBuilding(RoomInfo building){
+		this.building = building;
+	}
+
+	/**
+	 *获取
+	 */
+	public RoomInfo getArea(){
+		return area;
+	}
+
+	/**
+	 *设置
+	 */
+	public void setArea(RoomInfo area){
+		this.area = area;
+	}
+
+	public Integer getDumpEnergy() {
+		return dumpEnergy;
+	}
+
+	public void setDumpEnergy(Integer dumpEnergy) {
+		this.dumpEnergy = dumpEnergy;
+	}
+
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+}

common/src/main/java/com/jpsoft/smart/modules/base/entity/RoomInfo.java

@@ -0,0 +1,236 @@
+package com.jpsoft.smart.modules.base.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+  描述:base_room_info的实体类
+ */
+public class RoomInfo {
+	private String id;
+	private String name;
+	private Integer number;
+	private String type;
+	private String useType;
+	private String useTypeN;
+	private Integer sortNo;
+	private String parentId;
+	private String parentName;
+	private Boolean hasChildren;
+	private List<RoomInfo> children;
+	private String createBy;
+	private Date createTime;
+	private String updateBy;
+	private Date updateTime;
+	private Boolean delFlag;
+	
+		/**
+	 *获取
+	 */
+	public String getId(){
+		return id;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setId(String id){
+		this.id = id;
+	}
+		/**
+	 *获取名称
+	 */
+	public String getName(){
+		return name;
+	}
+	
+	/**
+	 *设置名称
+	 */
+	public void setName(String name){
+		this.name = name;
+	}
+		/**
+	 *获取编号
+	 */
+	public Integer getNumber(){
+		return number;
+	}
+	
+	/**
+	 *设置编号
+	 */
+	public void setNumber(Integer number){
+		this.number = number;
+	}
+		/**
+	 *获取类型:园区/楼栋/房号
+	 */
+	public String getType(){
+		return type;
+	}
+	
+	/**
+	 *设置类型:园区/楼栋/房号
+	 */
+	public void setType(String type){
+		this.type = type;
+	}
+
+	/**
+	 *获取用电类型
+	 */
+	public String getUseType(){
+		return useType;
+	}
+
+	/**
+	 *设置用电类型
+	 */
+	public void setUseType(String useType){
+		this.useType = useType;
+	}
+
+	/**
+	 *获取用电类型翻译
+	 */
+	public String getUseTypeN(){
+		return useTypeN;
+	}
+
+	/**
+	 *设置用电类型翻译
+	 */
+	public void setUseTypeN(String useTypeN){
+		this.useTypeN = useTypeN;
+	}
+		/**
+	 *获取排序号
+	 */
+	public Integer getSortNo(){
+		return sortNo;
+	}
+	
+	/**
+	 *设置排序号
+	 */
+	public void setSortNo(Integer sortNo){
+		this.sortNo = sortNo;
+	}
+		/**
+	 *获取
+	 */
+	public String getParentId(){
+		return parentId;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setParentId(String parentId){
+		this.parentId = parentId;
+	}
+		/**
+	 *获取
+	 */
+	public String getCreateBy(){
+		return createBy;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setCreateBy(String createBy){
+		this.createBy = createBy;
+	}
+		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+		/**
+	 *获取
+	 */
+	public Date getCreateTime(){
+		return createTime;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setCreateTime(Date createTime){
+		this.createTime = createTime;
+	}
+		/**
+	 *获取
+	 */
+	public String getUpdateBy(){
+		return updateBy;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setUpdateBy(String updateBy){
+		this.updateBy = updateBy;
+	}
+		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+		/**
+	 *获取
+	 */
+	public Date getUpdateTime(){
+		return updateTime;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setUpdateTime(Date updateTime){
+		this.updateTime = updateTime;
+	}
+		/**
+	 *获取是否删除
+	 */
+	public Boolean getDelFlag(){
+		return delFlag;
+	}
+	
+	/**
+	 *设置是否删除
+	 */
+	public void setDelFlag(Boolean delFlag){
+		this.delFlag = delFlag;
+	}
+
+	/**
+	 *获取
+	 */
+	public Boolean getHasChildren(){
+		return hasChildren;
+	}
+
+	/**
+	 *设置
+	 */
+	public void setHasChildren(Boolean hasChildren){
+		this.hasChildren = hasChildren;
+	}
+
+
+	public String getParentName() {
+		return parentName;
+	}
+
+	public void setParentName(String parentName) {
+		this.parentName = parentName;
+	}
+
+	public List<RoomInfo> getChildren() {
+		return children;
+	}
+
+	public void setChildren(List<RoomInfo> children) {
+		this.children = children;
+	}
+}

common/src/main/java/com/jpsoft/smart/modules/base/entity/TerminalInfo.java

@@ -0,0 +1,156 @@
+package com.jpsoft.smart.modules.base.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+  描述:base_terminal_info的实体类
+ */
+public class TerminalInfo {
+	private String id;
+	private String name;
+	private String remark;
+	private String createBy;
+	private Date createTime;
+	private String updateBy;
+	private Date updateTime;
+	private Boolean delFlag;
+	private Integer sortNo;
+	private Boolean active;
+	
+		/**
+	 *获取
+	 */
+	public String getId(){
+		return id;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setId(String id){
+		this.id = id;
+	}
+		/**
+	 *获取终端注释
+	 */
+	public String getName(){
+		return name;
+	}
+	
+	/**
+	 *设置终端注释
+	 */
+	public void setName(String name){
+		this.name = name;
+	}
+		/**
+	 *获取备注
+	 */
+	public String getRemark(){
+		return remark;
+	}
+	
+	/**
+	 *设置备注
+	 */
+	public void setRemark(String remark){
+		this.remark = remark;
+	}
+		/**
+	 *获取
+	 */
+	public String getCreateBy(){
+		return createBy;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setCreateBy(String createBy){
+		this.createBy = createBy;
+	}
+		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+		/**
+	 *获取
+	 */
+	public Date getCreateTime(){
+		return createTime;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setCreateTime(Date createTime){
+		this.createTime = createTime;
+	}
+		/**
+	 *获取
+	 */
+	public String getUpdateBy(){
+		return updateBy;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setUpdateBy(String updateBy){
+		this.updateBy = updateBy;
+	}
+		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+		/**
+	 *获取
+	 */
+	public Date getUpdateTime(){
+		return updateTime;
+	}
+	
+	/**
+	 *设置
+	 */
+	public void setUpdateTime(Date updateTime){
+		this.updateTime = updateTime;
+	}
+		/**
+	 *获取是否删除
+	 */
+	public Boolean getDelFlag(){
+		return delFlag;
+	}
+	
+	/**
+	 *设置是否删除
+	 */
+	public void setDelFlag(Boolean delFlag){
+		this.delFlag = delFlag;
+	}
+	/**
+	 *获取排序号
+	 */
+	public Integer getSortNo(){
+		return sortNo;
+	}
+
+	/**
+	 *设置排序号
+	 */
+	public void setSortNo(Integer sortNo){
+		this.sortNo = sortNo;
+	}
+
+	/**
+	 * 是否在线
+	 * @return
+	 */
+	public Boolean getActive() {
+		return active;
+	}
+
+	public void setActive(Boolean active) {
+		this.active = active;
+	}
+}

common/src/main/java/com/jpsoft/smart/modules/base/entity/TotalCheckCompany.java

@@ -0,0 +1,75 @@
+package com.jpsoft.smart.modules.base.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import lombok.Data;
+
+@Data
+public class TotalCheckCompany {
+    /**
+     *
+     */
+    @ApiModelProperty(value = "")
+    private Long id;
+
+    /**
+     * 公司id
+     */
+    @ApiModelProperty(value = "公司id")
+    private String companyId;
+
+    /**
+     * 无异常天数
+     */
+    @ApiModelProperty(value = "无异常天数")
+    private Long normalDay;
+
+    /**
+     * 除今天外总检测人次
+     */
+    @ApiModelProperty(value = "除今天外总检测人次")
+    private Long totalCheckNum;
+
+    /**
+     * 除今天外总异常人数
+     */
+    @ApiModelProperty(value = "除今天外总异常人数")
+    private Long totalAbnormalNum;
+
+    /**
+     * 是否删除
+     */
+    @ApiModelProperty(value = "是否删除")
+    private Boolean delFlag;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 更新人
+     */
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+    /**
+     * 发生异常的日期
+     */
+    @ApiModelProperty(value = "发生异常的日期")
+    private Date abnormalTime;
+}
+

common/src/main/java/com/jpsoft/smart/modules/base/entity/WarningPusher.java

@@ -0,0 +1,99 @@
+package com.jpsoft.smart.modules.base.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+  描述:base_warning_pusher的实体类
+ */
+@Data
+@ApiModel(value = "base_warning_pusher的实体类")
+public class WarningPusher {
+	/**
+	 *编号
+	 */
+        @ApiModelProperty(value = "编号")
+	private String id;
+	/**
+	 *所属公司编号
+	 */
+        @ApiModelProperty(value = "所属公司编号")
+	private String companyId;
+
+	/**
+	 *所属公司编号
+	 */
+	@ApiModelProperty(value = "所属公司名称")
+	private String companyName;
+	/**
+	 *最大测温次数
+	 */
+        @ApiModelProperty(value = "最大测温次数")
+	private Integer times;
+	/**
+	 *预警温度
+	 */
+        @ApiModelProperty(value = "预警温度")
+	private BigDecimal temperature;
+	/**
+	 *姓名
+	 */
+        @ApiModelProperty(value = "姓名")
+	private String name;
+	/**
+	 *手机号
+	 */
+        @ApiModelProperty(value = "手机号")
+	private String phone;
+	/**
+	 *微信openId
+	 */
+        @ApiModelProperty(value = "微信openId")
+	private String openId;
+	/**
+	 *备注
+	 */
+        @ApiModelProperty(value = "备注")
+	private String remark;
+	/**
+	 *是否删除
+	 */
+        @ApiModelProperty(value = "是否删除")
+	private Boolean delFlag;
+	/**
+	 *创建人
+	 */
+        @ApiModelProperty(value = "创建人")
+	private String createBy;
+	/**
+	 *创建时间
+	 */
+    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "创建时间")
+	private Date createTime;
+	/**
+	 *更新人
+	 */
+        @ApiModelProperty(value = "更新人")
+	private String updateBy;
+	/**
+	 *更新时间
+	 */
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	@ApiModelProperty(value = "更新时间")
+	private Date updateTime;
+	/**
+	 * 未测温提醒
+	 */
+	@ApiModelProperty(value = "未测温提醒")
+	private Boolean missingNoticeEnabled;
+}

common/src/main/java/com/jpsoft/smart/modules/base/service/AlarmConfigService.java

@@ -0,0 +1,25 @@
+package com.jpsoft.smart.modules.base.service;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import com.jpsoft.smart.modules.base.entity.AlarmConfig;
+import com.github.pagehelper.Page;
+import com.jpsoft.smart.modules.common.dto.Sort;
+
+public interface AlarmConfigService {
+	AlarmConfig get(String id);
+	boolean exist(String id);
+	int insert(AlarmConfig model);
+	int update(AlarmConfig model);
+	int delete(String id);
+	List<AlarmConfig> list();
+	Page<AlarmConfig> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
+
+    List<AlarmConfig> findByCompanyId(String companyId);
+
+    Set<Integer> getWeekdaySetByCompanyId(String companyId);
+
+	List<AlarmConfig> findByCompanyIdAndWeekDay(String companyId, String weekDay);
+}

common/src/main/java/com/jpsoft/smart/modules/base/service/AlarmInfoService.java

@@ -0,0 +1,19 @@
+package com.jpsoft.smart.modules.base.service;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.smart.modules.base.entity.AlarmInfo;
+import com.jpsoft.smart.modules.common.dto.Sort;
+
+import java.util.List;
+import java.util.Map;
+
+public interface AlarmInfoService {
+	AlarmInfo get(String id);
+	boolean exist(String id);
+	int insert(AlarmInfo model);
+	int update(AlarmInfo model);
+	int delete(String id);
+	AlarmInfo queryLatestAlarm(String type);
+	List<AlarmInfo> list();
+	Page<AlarmInfo> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, List<Sort> sortList);
+}