整合

.gitignore

@@ -1 +1,2 @@
-target/
+target/
+target

src/main/java/com/ifish/bean/LiveRoomPageInfo.java

@@ -0,0 +1,196 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.ifish.bean;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ *
+ * @author Administrator
+ */
+public class LiveRoomPageInfo implements Serializable {
+
+    private static final long serialVersionUID = 2438713198151455034L;
+    //直播间ID
+    private Integer roomId;
+    //用户ID
+    private Integer userId;
+    //用户类型
+    private String userType;
+    //昵称
+    private String nickName;
+    //用户头像
+    private String userImg;
+    //用户最后一次登录时间
+    private Date loginTime;
+    //摄像头ID
+    private String cameraId;
+    //直播间名称
+    private String roomName;
+    //直播宣言
+    private String roomDesc;
+    //人气值
+    private Integer popularityValue;
+    //活跃度
+    private String liveness;
+    //直播天数
+    private Integer numberDays;
+    //距离
+    private Double distance;
+    //创建时间
+    private Date createTime;
+    //评论数
+    private Integer pinglunNum;
+    //点赞数量
+    private Integer zanNum;
+    //直播间展示图
+    private String roomImg;
+
+    public Integer getRoomId() {
+        return roomId;
+    }
+
+    public void setRoomId(Integer roomId) {
+        this.roomId = roomId;
+    }
+
+    public String getNickName() {
+        return nickName;
+    }
+
+    public void setNickName(String nickName) {
+        this.nickName = nickName;
+    }
+
+    public String getCameraId() {
+        return cameraId;
+    }
+
+    public void setCameraId(String cameraId) {
+        this.cameraId = cameraId;
+    }
+
+    public String getRoomName() {
+        return roomName;
+    }
+
+    public void setRoomName(String roomName) {
+        this.roomName = roomName;
+    }
+
+    public String getRoomDesc() {
+        return roomDesc;
+    }
+
+    public void setRoomDesc(String roomDesc) {
+        this.roomDesc = roomDesc;
+    }
+
+    public Integer getPopularityValue() {
+        return popularityValue;
+    }
+
+    public void setPopularityValue(Integer popularityValue) {
+        this.popularityValue = popularityValue;
+    }
+
+    public Integer getNumberDays() {
+        return numberDays;
+    }
+
+    public void setNumberDays(Integer numberDays) {
+        this.numberDays = numberDays;
+    }
+
+    public Double getDistance() {
+        return distance;
+    }
+
+    public void setDistance(Double distance) {
+        this.distance = distance;
+    }
+
+    public String getUserImg() {
+        return userImg;
+    }
+
+    public void setUserImg(String userImg) {
+        this.userImg = userImg;
+    }
+
+    public String getLiveness() {
+        return liveness;
+    }
+
+    public void setLiveness(String liveness) {
+        this.liveness = liveness;
+    }
+
+    public Date getLoginTime() {
+        return loginTime;
+    }
+
+    public void setLoginTime(Date loginTime) {
+        this.loginTime = loginTime;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getUserType() {
+        return userType;
+    }
+
+    public void setUserType(String userType) {
+        this.userType = userType;
+    }
+
+    public Integer getPinglunNum() {
+        return pinglunNum;
+    }
+
+    public void setPinglunNum(Integer pinglunNum) {
+        this.pinglunNum = pinglunNum;
+    }
+
+    public Integer getZanNum() {
+        return zanNum;
+    }
+
+    public void setZanNum(Integer zanNum) {
+        this.zanNum = zanNum;
+    }
+
+    /**
+     * @return the roomImg
+     */
+    public String getRoomImg() {
+        return roomImg;
+    }
+
+    /**
+     * @param roomImg the roomImg to set
+     */
+    public void setRoomImg(String roomImg) {
+        this.roomImg = roomImg;
+    }
+
+}

src/main/java/com/ifish/bean/LoginRecord.java

@@ -1,49 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package com.ifish.bean;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- *
- * @author Administrator
- */
-public class LoginRecord implements Serializable {
-
-    private static final long serialVersionUID = -5292867602998823697L;
-    //ID
-    private Integer recordId;
-    //mac地址
-    private String macAddress;
-    //登录时间
-    private Date loginTime;
-
-    public Integer getRecordId() {
-        return recordId;
-    }
-
-    public void setRecordId(Integer recordId) {
-        this.recordId = recordId;
-    }
-
-    public String getMacAddress() {
-        return macAddress;
-    }
-
-    public void setMacAddress(String macAddress) {
-        this.macAddress = macAddress;
-    }
-
-    public Date getLoginTime() {
-        return loginTime;
-    }
-
-    public void setLoginTime(Date loginTime) {
-        this.loginTime = loginTime;
-    }
-
-}

src/main/java/com/ifish/bean/Tbl_Activa_Code.java

@@ -0,0 +1,127 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.ifish.bean;
+
+import java.util.Date;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * 摄像头激活码(tbl_activa_code)
+ *
+ * @author bianj
+ * @version 1.0.0 2017-07-03
+ */
+@Entity
+@Table(name = "tbl_activa_code")
+public class Tbl_Activa_Code implements java.io.Serializable {
+
+    /**
+     * 版本号
+     */
+    private static final long serialVersionUID = -2477544371712460934L;
+
+    /**
+     * 激活码
+     */
+    @Id
+    @Column(name = "active_code", unique = true, nullable = false, length = 50)
+    private String activeCode;
+
+    /**
+     * 批次号
+     */
+    @Column(name = "batch_code", nullable = true, length = 50)
+    private String batchCode;
+
+    /**
+     *
+     */
+    @Column(name = "is_used", nullable = true, length = 1)
+    private String isUsed;
+
+    /**
+     *
+     */
+    @Column(name = "create_time", nullable = true)
+    private Date createTime;
+
+    /**
+     * 获取激活码
+     *
+     * @return 激活码
+     */
+    public String getActiveCode() {
+        return this.activeCode;
+    }
+
+    /**
+     * 设置激活码
+     *
+     * @param activeCode 激活码
+     */
+    public void setActiveCode(String activeCode) {
+        this.activeCode = activeCode;
+    }
+
+    /**
+     * 获取批次号
+     *
+     * @return 批次号
+     */
+    public String getBatchCode() {
+        return this.batchCode;
+    }
+
+    /**
+     * 设置批次号
+     *
+     * @param batchCode 批次号
+     */
+    public void setBatchCode(String batchCode) {
+        this.batchCode = batchCode;
+    }
+
+    /**
+     * 获取
+     *
+     * @return
+     */
+    public String getIsUsed() {
+        return this.isUsed;
+    }
+
+    /**
+     * 设置
+     *
+     * @param isUsed
+     *
+     */
+    public void setIsUsed(String isUsed) {
+        this.isUsed = isUsed;
+    }
+
+    /**
+     * 获取
+     *
+     * @return
+     */
+    public Date getCreateTime() {
+        return this.createTime;
+    }
+
+    /**
+     * 设置
+     *
+     * @param createTime
+     *
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+}

src/main/java/com/ifish/bean/Tbl_Device.java

@@ -23,7 +23,7 @@ public class Tbl_Device implements java.io.Serializable {
     /**
      * 版本号
      */
-    private static final long serialVersionUID = 3405700970095511149L;
+    private static final long serialVersionUID = 204106348073538365L;
 
     /**
      * 设备Id
@@ -63,7 +63,7 @@ public class Tbl_Device implements java.io.Serializable {
     private Date loginTime;
 
     /**
-     * 是否在黑名单：1不在、0在
+     * 是否在黑名单(是否授权)：1未授权，在、0已授权，不在
      */
     @Column(name = "is_blacklist", nullable = true, length = 1)
     private String isBlacklist;
@@ -75,7 +75,7 @@ public class Tbl_Device implements java.io.Serializable {
     private String hardwareType;
 
     /**
-     * 是否推送
+     * 是否温度报警
      */
     @Column(name = "on_off", nullable = true, length = 1)
     private String onOff;
@@ -119,7 +119,7 @@ public class Tbl_Device implements java.io.Serializable {
     /**
      * 摄像头ID
      */
-    @Column(name = "camera_id", nullable = true, length = 20)
+    @Column(name = "camera_id", unique = true, nullable = true, length = 20)
     private String cameraId;
 
     /**
@@ -255,18 +255,18 @@ public class Tbl_Device implements java.io.Serializable {
     }
 
     /**
-     * 获取是否在黑名单：1不在、0在
+     * 获取是否在黑名单(是否授权)：1未授权，在、0已授权，不在
      *
-     * @return 是否在黑名单
+     * @return 是否在黑名单(是否授权)：1未授权
      */
     public String getIsBlacklist() {
         return this.isBlacklist;
     }
 
     /**
-     * 设置是否在黑名单：1不在、0在
+     * 设置是否在黑名单(是否授权)：1未授权，在、0已授权，不在
      *
-     * @param isBlacklist 是否在黑名单：1不在、0在
+     * @param isBlacklist 是否在黑名单(是否授权)：1未授权，在、0已授权，不在
      */
     public void setIsBlacklist(String isBlacklist) {
         this.isBlacklist = isBlacklist;
@@ -291,18 +291,18 @@ public class Tbl_Device implements java.io.Serializable {
     }
 
     /**
-     * 获取是否推送
+     * 获取是否温度报警
      *
-     * @return 是否推送
+     * @return 是否温度报警
      */
     public String getOnOff() {
         return this.onOff;
     }
 
     /**
-     * 设置是否推送
+     * 设置是否温度报警
      *
-     * @param onOff 是否推送
+     * @param onOff 是否温度报警
      */
     public void setOnOff(String onOff) {
         this.onOff = onOff;

src/main/java/com/ifish/bean/Tbl_Device_User.java

@@ -24,7 +24,7 @@ public class Tbl_Device_User implements java.io.Serializable {
     /**
      * 版本号
      */
-    private static final long serialVersionUID = -4018159739383033383L;
+    private static final long serialVersionUID = 5123379244673522530L;
 
     /**
      * id
@@ -36,7 +36,7 @@ public class Tbl_Device_User implements java.io.Serializable {
     /**
      * 用户Id
      */
-    @Column(name = "user_id", unique = true, nullable = false, length = 10)
+    @Column(name = "user_id", nullable = false, length = 10)
     private Integer userId;
 
     /**
@@ -93,6 +93,12 @@ public class Tbl_Device_User implements java.io.Serializable {
     @Column(name = "is_live", nullable = true, length = 1)
     private String isLive;
 
+    /**
+     * 是否开启离线提醒，1开启，0关闭，默认1
+     */
+    @Column(name = "off_line", nullable = true, length = 1)
+    private String offLine;
+
     /**
      * 获取id
      *
@@ -290,4 +296,22 @@ public class Tbl_Device_User implements java.io.Serializable {
     public void setIsLive(String isLive) {
         this.isLive = isLive;
     }
+
+    /**
+     * 获取是否开启离线提醒，1开启，0关闭，默认1
+     *
+     * @return 是否开启离线提醒
+     */
+    public String getOffLine() {
+        return this.offLine;
+    }
+
+    /**
+     * 设置是否开启离线提醒，1开启，0关闭，默认1
+     *
+     * @param offLine 是否开启离线提醒，1开启，0关闭，默认1
+     */
+    public void setOffLine(String offLine) {
+        this.offLine = offLine;
+    }
 }

src/main/java/com/ifish/bean/Tbl_Live_Message.java

@@ -0,0 +1,231 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.ifish.bean;
+
+import java.util.Date;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * 直播间评论表(tbl_live_message)
+ *
+ * @author bianj
+ * @version 1.0.0 2017-07-03
+ */
+@Entity
+@Table(name = "tbl_live_message")
+public class Tbl_Live_Message implements java.io.Serializable {
+
+    /**
+     * 版本号
+     */
+    private static final long serialVersionUID = 4867709378808071267L;
+
+    /**
+     * 评论Id
+     */
+    @Id
+    @Column(name = "message_id", unique = true, nullable = false, length = 10)
+    private Integer messageId;
+
+    /**
+     * 直播间Id
+     */
+    @Column(name = "room_id", nullable = false, length = 10)
+    private Integer roomId;
+
+    /**
+     * 评论用户Id
+     */
+    @Column(name = "user_id", nullable = false, length = 10)
+    private Integer userId;
+
+    /**
+     * @用户Id
+     */
+    @Column(name = "as_user_id", nullable = true, length = 10)
+    private Integer asUserId;
+
+    /**
+     * 评论内容
+     */
+    @Column(name = "message_content", nullable = true, length = 200)
+    private String messageContent;
+
+    /**
+     * 评论时间
+     */
+    @Column(name = "create_time", nullable = true)
+    private Date createTime;
+
+    /**
+     * @人的用户名
+     */
+    private String asUserName;
+
+    /**
+     * 创建人的头像
+     */
+    private String userImg;
+
+    /**
+     * 创建人的用户名
+     */
+    private String userName;
+
+    /**
+     * @return the asUserName
+     */
+    public String getAsUserName() {
+        return asUserName;
+    }
+
+    /**
+     * @param asUserName the asUserName to set
+     */
+    public void setAsUserName(String asUserName) {
+        this.asUserName = asUserName;
+    }
+
+    /**
+     * @return the userImg
+     */
+    public String getUserImg() {
+        return userImg;
+    }
+
+    /**
+     * @param userImg the userImg to set
+     */
+    public void setUserImg(String userImg) {
+        this.userImg = userImg;
+    }
+
+    /**
+     * @return the userName
+     */
+    public String getUserName() {
+        return userName;
+    }
+
+    /**
+     * @param userName the userName to set
+     */
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    /**
+     * 获取评论Id
+     *
+     * @return 评论Id
+     */
+    public Integer getMessageId() {
+        return this.messageId;
+    }
+
+    /**
+     * 设置评论Id
+     *
+     * @param messageId 评论Id
+     */
+    public void setMessageId(Integer messageId) {
+        this.messageId = messageId;
+    }
+
+    /**
+     * 获取直播间Id
+     *
+     * @return 直播间Id
+     */
+    public Integer getRoomId() {
+        return this.roomId;
+    }
+
+    /**
+     * 设置直播间Id
+     *
+     * @param roomId 直播间Id
+     */
+    public void setRoomId(Integer roomId) {
+        this.roomId = roomId;
+    }
+
+    /**
+     * 获取评论用户Id
+     *
+     * @return 评论用户Id
+     */
+    public Integer getUserId() {
+        return this.userId;
+    }
+
+    /**
+     * 设置评论用户Id
+     *
+     * @param userId 评论用户Id
+     */
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    /**
+     * 获取@用户Id
+     *
+     * @return @用户Id
+     */
+    public Integer getAsUserId() {
+        return this.asUserId;
+    }
+
+    /**
+     * 设置@用户Id
+     *
+     * @param asUserId
+     * @用户Id
+     */
+    public void setAsUserId(Integer asUserId) {
+        this.asUserId = asUserId;
+    }
+
+    /**
+     * 获取评论内容
+     *
+     * @return 评论内容
+     */
+    public String getMessageContent() {
+        return this.messageContent;
+    }
+
+    /**
+     * 设置评论内容
+     *
+     * @param messageContent 评论内容
+     */
+    public void setMessageContent(String messageContent) {
+        this.messageContent = messageContent;
+    }
+
+    /**
+     * 获取评论时间
+     *
+     * @return 评论时间
+     */
+    public Date getCreateTime() {
+        return this.createTime;
+    }
+
+    /**
+     * 设置评论时间
+     *
+     * @param createTime 评论时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+}

src/main/java/com/ifish/bean/Tbl_Live_Room.java

@@ -0,0 +1,293 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.ifish.bean;
+
+import java.util.Date;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * 直播间详情表(tbl_live_room)
+ *
+ * @author bianj
+ * @version 1.0.0 2017-07-03
+ */
+@Entity
+@Table(name = "tbl_live_room")
+public class Tbl_Live_Room implements java.io.Serializable {
+
+    /**
+     * 版本号
+     */
+    private static final long serialVersionUID = -9036392996642877776L;
+
+    /**
+     * 直播间Id
+     */
+    @Id
+    @Column(name = "room_id", unique = true, nullable = false, length = 10)
+    private Integer roomId;
+
+    /**
+     * 用户Id
+     */
+    @Column(name = "user_id", unique = true, nullable = false, length = 10)
+    private Integer userId;
+
+    /**
+     * 摄像头ID
+     */
+    @Column(name = "camera_id", nullable = false, length = 20)
+    private String cameraId;
+
+    /**
+     * 直播间名称
+     */
+    @Column(name = "room_name", nullable = true, length = 20)
+    private String roomName;
+
+    /**
+     * 直播间描述
+     */
+    @Column(name = "room_desc", nullable = true, length = 70)
+    private String roomDesc;
+
+    /**
+     *     */
+    @Column(name = "room_img", nullable = true, length = 100)
+    private String roomImg;
+
+    /**
+     * 直播间状态：1直播、0关闭
+     */
+    @Column(name = "room_status", nullable = true, length = 1)
+    private String roomStatus;
+
+    /**
+     * 人气值
+     */
+    @Column(name = "popularity_value", nullable = false, length = 10)
+    private Integer popularityValue;
+
+    /**
+     * 点赞数量
+     */
+    @Column(name = "zanNum", nullable = true, length = 10)
+    private Integer zanNum;
+
+    /**
+     * 创建时间
+     */
+    @Column(name = "create_time", nullable = true)
+    private Date createTime;
+
+    /**
+     *     */
+    @Column(name = "update_time", nullable = true)
+    private Date updateTime;
+
+    /**
+     * 获取直播间Id
+     *
+     * @return 直播间Id
+     */
+    public Integer getRoomId() {
+        return this.roomId;
+    }
+
+    /**
+     * 设置直播间Id
+     *
+     * @param roomId 直播间Id
+     */
+    public void setRoomId(Integer roomId) {
+        this.roomId = roomId;
+    }
+
+    /**
+     * 获取用户Id
+     *
+     * @return 用户Id
+     */
+    public Integer getUserId() {
+        return this.userId;
+    }
+
+    /**
+     * 设置用户Id
+     *
+     * @param userId 用户Id
+     */
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    /**
+     * 获取摄像头ID
+     *
+     * @return 摄像头ID
+     */
+    public String getCameraId() {
+        return this.cameraId;
+    }
+
+    /**
+     * 设置摄像头ID
+     *
+     * @param cameraId 摄像头ID
+     */
+    public void setCameraId(String cameraId) {
+        this.cameraId = cameraId;
+    }
+
+    /**
+     * 获取直播间名称
+     *
+     * @return 直播间名称
+     */
+    public String getRoomName() {
+        return this.roomName;
+    }
+
+    /**
+     * 设置直播间名称
+     *
+     * @param roomName 直播间名称
+     */
+    public void setRoomName(String roomName) {
+        this.roomName = roomName;
+    }
+
+    /**
+     * 获取直播间描述
+     *
+     * @return 直播间描述
+     */
+    public String getRoomDesc() {
+        return this.roomDesc;
+    }
+
+    /**
+     * 设置直播间描述
+     *
+     * @param roomDesc 直播间描述
+     */
+    public void setRoomDesc(String roomDesc) {
+        this.roomDesc = roomDesc;
+    }
+
+    /**
+     * 获取
+     *
+     * @return
+     */
+    public String getRoomImg() {
+        return this.roomImg;
+    }
+
+    /**
+     * 设置
+     *
+     * @param roomImg
+     *
+     */
+    public void setRoomImg(String roomImg) {
+        this.roomImg = roomImg;
+    }
+
+    /**
+     * 获取直播间状态：1直播、0关闭
+     *
+     * @return 直播间状态
+     */
+    public String getRoomStatus() {
+        return this.roomStatus;
+    }
+
+    /**
+     * 设置直播间状态：1直播、0关闭
+     *
+     * @param roomStatus 直播间状态：1直播、0关闭
+     */
+    public void setRoomStatus(String roomStatus) {
+        this.roomStatus = roomStatus;
+    }
+
+    /**
+     * 获取人气值
+     *
+     * @return 人气值
+     */
+    public Integer getPopularityValue() {
+        return this.popularityValue;
+    }
+
+    /**
+     * 设置人气值
+     *
+     * @param popularityValue 人气值
+     */
+    public void setPopularityValue(Integer popularityValue) {
+        this.popularityValue = popularityValue;
+    }
+
+    /**
+     * 获取点赞数量
+     *
+     * @return 点赞数量
+     */
+    public Integer getZanNum() {
+        return this.zanNum;
+    }
+
+    /**
+     * 设置点赞数量
+     *
+     * @param zanNum 点赞数量
+     */
+    public void setZanNum(Integer zanNum) {
+        this.zanNum = zanNum;
+    }
+
+    /**
+     * 获取创建时间
+     *
+     * @return 创建时间
+     */
+    public Date getCreateTime() {
+        return this.createTime;
+    }
+
+    /**
+     * 设置创建时间
+     *
+     * @param createTime 创建时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 获取
+     *
+     * @return
+     */
+    public Date getUpdateTime() {
+        return this.updateTime;
+    }
+
+    /**
+     * 设置
+     *
+     * @param updateTime
+     *
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+}

src/main/java/com/ifish/bean/Tbl_Live_Watch.java

@@ -0,0 +1,126 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.ifish.bean;
+
+import java.util.Date;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * 用户观看直播记录(tbl_live_watch)
+ *
+ * @author bianj
+ * @version 1.0.0 2017-07-14
+ */
+@Entity
+@Table(name = "tbl_live_watch")
+public class Tbl_Live_Watch {
+
+    /**
+     * 版本号
+     */
+    private static final long serialVersionUID = -3178390426587691302L;
+
+    /**
+     * 直播间ID
+     */
+    @Id
+    @Column(name = "room_id", unique = true, nullable = false, length = 10)
+    private Integer roomId;
+
+    /**
+     * 用户id
+     */
+    @Id
+    @Column(name = "user_id", unique = true, nullable = false, length = 10)
+    private Integer userId;
+
+    /**
+     * 修改时间
+     */
+    @Column(name = "update_time", nullable = true)
+    private Date updateTime;
+
+    /**
+     * 创建时间
+     */
+    @Column(name = "create_time", nullable = false)
+    private Date createTime;
+
+    /**
+     * 获取直播间ID
+     *
+     * @return 直播间ID
+     */
+    public Integer getRoomId() {
+        return this.roomId;
+    }
+
+    /**
+     * 设置直播间ID
+     *
+     * @param roomId 直播间ID
+     */
+    public void setRoomId(Integer roomId) {
+        this.roomId = roomId;
+    }
+
+    /**
+     * 获取用户id
+     *
+     * @return 用户id
+     */
+    public Integer getUserId() {
+        return this.userId;
+    }
+
+    /**
+     * 设置用户id
+     *
+     * @param userId 用户id
+     */
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    /**
+     * 获取修改时间
+     *
+     * @return 修改时间
+     */
+    public Date getUpdateTime() {
+        return this.updateTime;
+    }
+
+    /**
+     * 设置修改时间
+     *
+     * @param updateTime 修改时间
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * 获取创建时间
+     *
+     * @return 创建时间
+     */
+    public Date getCreateTime() {
+        return this.createTime;
+    }
+
+    /**
+     * 设置创建时间
+     *
+     * @param createTime 创建时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+}

src/main/java/com/ifish/bean/Tbl_Login_Record.java

@@ -0,0 +1,107 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.ifish.bean;
+
+import java.util.Date;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ *
+ * @author Administrator
+ */
+/**
+ * 设备登陆记录表(tbl_login_record)
+ *
+ * @author bianj
+ * @version 1.0.0 2017-08-14
+ */
+@Entity
+@Table(name = "tbl_login_record")
+public class Tbl_Login_Record implements java.io.Serializable {
+
+    /**
+     * 版本号
+     */
+    private static final long serialVersionUID = -3544525221392465793L;
+
+    /**
+     * 记录Id
+     */
+    @Id
+    @Column(name = "record_id", unique = true, nullable = false, length = 10)
+    private Integer recordId;
+
+    /**
+     * 设备Mac地址
+     */
+    @Column(name = "mac_address", nullable = false, length = 255)
+    private String macAddress;
+
+    /**
+     * 登陆时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Column(name = "login_time", nullable = true)
+    private Date loginTime;
+
+    /**
+     * 获取记录Id
+     *
+     * @return 记录Id
+     */
+    public Integer getRecordId() {
+        return this.recordId;
+    }
+
+    /**
+     * 设置记录Id
+     *
+     * @param recordId 记录Id
+     */
+    public void setRecordId(Integer recordId) {
+        this.recordId = recordId;
+    }
+
+    /**
+     * 获取设备Mac地址
+     *
+     * @return 设备Mac地址
+     */
+    public String getMacAddress() {
+        return this.macAddress;
+    }
+
+    /**
+     * 设置设备Mac地址
+     *
+     * @param macAddress 设备Mac地址
+     */
+    public void setMacAddress(String macAddress) {
+        this.macAddress = macAddress;
+    }
+
+    /**
+     * 获取登陆时间
+     *
+     * @return 登陆时间
+     */
+    public Date getLoginTime() {
+        return this.loginTime;
+    }
+
+    /**
+     * 设置登陆时间
+     *
+     * @param loginTime 登陆时间
+     */
+    public void setLoginTime(Date loginTime) {
+        this.loginTime = loginTime;
+    }
+}

src/main/java/com/ifish/bean/Tbl_User.java

@@ -24,7 +24,7 @@ public class Tbl_User implements java.io.Serializable {
     /**
      * 版本号
      */
-    private static final long serialVersionUID = -3293426131332327827L;
+    private static final long serialVersionUID = -7318879296790573758L;
 
     /**
      * 用户Id
@@ -99,6 +99,11 @@ public class Tbl_User implements java.io.Serializable {
     @Column(name = "create_time", nullable = true)
     private Date createTime;
 
+    /**
+     *     */
+    @Column(name = "phone_type", nullable = true, length = 10)
+    private String phoneType;
+
     /**
      * 登陆手机类型
      */
@@ -147,6 +152,11 @@ public class Tbl_User implements java.io.Serializable {
     @Column(name = "jiguang_userid", nullable = true, length = 50)
     private String jiguangUserid;
 
+    /**
+     *     */
+    @Column(name = "token", nullable = true, length = 50)
+    private String token;
+
     /**
      * 经度
      */
@@ -375,6 +385,25 @@ public class Tbl_User implements java.io.Serializable {
         this.createTime = createTime;
     }
 
+    /**
+     * 获取
+     *
+     * @return
+     */
+    public String getPhoneType() {
+        return this.phoneType;
+    }
+
+    /**
+     * 设置
+     *
+     * @param phoneType
+     *
+     */
+    public void setPhoneType(String phoneType) {
+        this.phoneType = phoneType;
+    }
+
     /**
      * 获取登陆手机类型
      *
@@ -519,6 +548,25 @@ public class Tbl_User implements java.io.Serializable {
         this.jiguangUserid = jiguangUserid;
     }
 
+    /**
+     * 获取
+     *
+     * @return
+     */
+    public String getToken() {
+        return this.token;
+    }
+
+    /**
+     * 设置
+     *
+     * @param token
+     *
+     */
+    public void setToken(String token) {
+        this.token = token;
+    }
+
     /**
      * 获取经度
      *

src/main/java/com/ifish/config/RedisConfig.java

@@ -5,7 +5,7 @@
  */
 package com.ifish.config;
 
-import com.ifish.util.IfishFilePath;
+import com.ifish.util.IfishUtil;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
@@ -26,7 +26,7 @@ public class RedisConfig {
 
 //        //获取当前操作系统(servers_os为服务器设置的属性JAVA_OPTS=%JAVA_OPTS% -Dservers_os=online84)
 //        String servers_os = System.getProperty("servers_os") == null ? "" : System.getProperty("servers_os");
-        if (IfishFilePath.link_img_head.contains("ifish7")) {
+        if (IfishUtil.isOnLine()) {
             //站点线上服务器 
             cf.setHostName("120.55.190.56");
             cf.setPort(3796);

src/main/java/com/ifish/enums/PushTypeEnum.java

@@ -1,33 +1,39 @@
 package com.ifish.enums;
 
 public enum PushTypeEnum {
-	remove_device("remove_device","解绑通知"),
-	wendu_warn("wendu_warn","温度报警"),
-	qu_reply("qu_reply","问题反馈"),
-	app_update("app_update","IOS更新推送"),
-	remind_water("remind_water","换水提醒"),
-	offline_push("offline_push","离线通知");
-	
-	private PushTypeEnum(String key,String value){
-		this.key = key;
-		this.value = value;
-	}
-	
-	private String key;
-	private String value;
-	
-	
-	public String getKey() {
-		return key;
-	}
-	public void setKey(String key) {
-		this.key = key;
-	}
-	public String getValue() {
-		return value;
-	}
-	public void setValue(String value) {
-		this.value = value;
-	}
-	
+    remove_device("remove_device", "OUT OF CONTROL"),//解绑通知
+    wendu_warn("wendu_warn", "TEMPERTURE WARNING"),//温度预警
+    qu_reply("qu_reply", "问题反馈"),
+    app_update("app_update", "UPDATE NOTICE"),//IOS更新推送
+    remind_water("remind_water", "WATER CHANGE NOTIEC"),//换水提醒
+    offline_push("offline_push", "OFF-LINE NOTICE"),//离线通知
+    send_report("send_report", "看护报告"),
+    shops_push("shops_push", "看护通知"),
+    all_push("all_push", "所有用户推送"),
+    pinglun_push("pinglun_push", "直播间评论");
+
+    private PushTypeEnum(String key, String value) {
+        this.key = key;
+        this.value = value;
+    }
+
+    private String key;
+    private String value;
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
 }

src/main/java/com/ifish/helper/DeviceHelper.java

@@ -151,7 +151,7 @@ public class DeviceHelper implements DeviceHelperI {
             return null;
         }
     }
-
+    
     /**
      * 修改设备统计信息
      *
@@ -251,6 +251,7 @@ public class DeviceHelper implements DeviceHelperI {
      * @return
      * @throws Exception
      */
+    @Override
     public Tbl_Device_Statistics getDeviceStatisticsByDeviceId(Integer deviceId) throws Exception {
         Tbl_Device_Statistics device = null;
         String key = redisKeyHelperI.getTbl_Device_StatisticsRedisKeyByDeviceId(deviceId);
@@ -269,10 +270,12 @@ public class DeviceHelper implements DeviceHelperI {
     /**
      * 根据设备ID获取设备统计信息
      *
+     * @param macAddress
      * @param deviceId
      * @return
      * @throws Exception
      */
+    @Override
     public Tbl_Device_Statistics getDeviceStatisticsByMacAddress(String macAddress) throws Exception {
         Tbl_Device_Statistics device = null;
         String key = redisKeyHelperI.getTbl_Device_StatisticsRedisKeyByMacAddress(macAddress);
@@ -287,4 +290,50 @@ public class DeviceHelper implements DeviceHelperI {
         }
         return device;
     }
+
+    /**
+     * 根据设备Id获取设备详情
+     *
+     * @param deviceId
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public Tbl_Device getDeviceById(Integer deviceId) throws Exception {
+        Tbl_Device device = null;
+        String key = redisKeyHelperI.getTbl_DeviceRedisKeyByDeviceId(deviceId);
+        String redisString = redisHelperI.getRedis(key);
+        if (StringUtils.isNotBlank(redisString)) {
+            device = (Tbl_Device) IfishUtil.JsonToBean(redisString, Tbl_Device.class);
+        } else {
+            device = tbl_Device_Mapper.getDeviceById(deviceId);
+            if (device != null && device.getDeviceId() > 0) {
+                redisHelperI.setRedis(key, IfishUtil.ObjectToJson(device));
+            }
+        }
+        return device;
+    }
+
+    /**
+     * 根据摄像头ID从缓存中取得设备信息
+     *
+     * @param cameraId
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public Tbl_Device getDeviceByCameraId(String cameraId) throws Exception {
+        Tbl_Device device = null;
+        String key = redisKeyHelperI.getTbl_CameraRedisKeyByCameraId(cameraId);
+        String redisString = redisHelperI.getRedis(key);
+        if (StringUtils.isNotBlank(redisString)) {
+            device = (Tbl_Device) IfishUtil.JsonToBean(redisString, Tbl_Device.class);
+        } else {
+            device = tbl_Device_Mapper.getDeviceByCameraId(cameraId);
+            if (device != null && device.getDeviceId() > 0) {
+                redisHelperI.setRedis(key, IfishUtil.ObjectToJson(device));
+            }
+        }
+        return device;
+    }
 }

src/main/java/com/ifish/helper/DeviceHelperI.java

@@ -5,7 +5,6 @@
  */
 package com.ifish.helper;
 
-import com.ifish.bean.LoginRecord;
 import com.ifish.bean.Tbl_Device;
 import com.ifish.bean.Tbl_Device_Statistics;
 import com.ifish.bean.Tbl_Device_User;
@@ -44,6 +43,15 @@ public interface DeviceHelperI {
      */
     public void updateWarnOnoff(String macAddress, String onOff);
 
+    /**
+     * 根据设备Id获取设备详情
+     *
+     * @param deviceId
+     * @return
+     * @throws Exception
+     */
+    Tbl_Device getDeviceById(Integer deviceId) throws Exception;
+
     /**
      * 根据mac地址查找设备
      *
@@ -53,6 +61,14 @@ public interface DeviceHelperI {
      */
     public Tbl_Device getDeviceByMacAddress(String macAddress);
 
+    /**
+     * 根据摄像头ID获取设备信息
+     *
+     * @param cameraId
+     * @return
+     */
+    Tbl_Device getDeviceByCameraId(String cameraId) throws Exception;
+
     /**
      * 修改设备统计信息
      *
@@ -68,4 +84,23 @@ public interface DeviceHelperI {
      * @return
      */
     public List<Tbl_Device_User> getTbl_Device_UsersListByDeviceId(Integer deviceId);
+
+    /**
+     * 根据设备ID获取设备统计信息
+     *
+     * @param deviceId
+     * @return
+     * @throws Exception
+     */
+    public Tbl_Device_Statistics getDeviceStatisticsByMacAddress(String macAddress) throws Exception;
+
+    /**
+     * 根据设备ID获取设备统计信息
+     *
+     * @param deviceId
+     * @return
+     * @throws Exception
+     */
+    public Tbl_Device_Statistics getDeviceStatisticsByDeviceId(Integer deviceId) throws Exception;
+
 }

src/main/java/com/ifish/helper/JpushHelper.java

@@ -7,10 +7,15 @@ package com.ifish.helper;
 
 import cn.jpush.api.JPushClient;
 import cn.jpush.api.push.PushResult;
+import cn.jpush.api.push.model.Message;
+import cn.jpush.api.push.model.Options;
 import cn.jpush.api.push.model.Platform;
 import cn.jpush.api.push.model.PushPayload;
 import cn.jpush.api.push.model.audience.Audience;
+import cn.jpush.api.push.model.notification.IosNotification;
 import cn.jpush.api.push.model.notification.Notification;
+import com.ifish.util.IfishFilePath;
+import com.ifish.util.IfishUtil;
 import java.util.Map;
 import org.springframework.stereotype.Component;
 
@@ -26,10 +31,17 @@ public class JpushHelper implements JpushHelperI {
 //    private static final String masterSecret = "60162c8cf195ce9f4dc76629";
 //    private static final String appKey = "d970d5e193cb2a0bbe41653c";
     //测试
-    private final static String masterSecret = "a7d41825e75082b13675c326";
-    private final static String appKey = "d147124018074eb970474e48";
+    private static String masterSecret = "4f759a0609dcd9d2edb06125";
+    private static String appKey = "6e5e9d757570859b3f274bb8";
 
     static {
+        if (IfishUtil.isOnLine()) {
+            appKey = IfishFilePath.AppKeyFormal;
+            masterSecret = IfishFilePath.MasterSecretFormal;
+        } else {
+            appKey = IfishFilePath.AppKeyFormal;
+            masterSecret = IfishFilePath.MasterSecretFormal;
+        }
         jPushClient = new JPushClient(masterSecret, appKey);
     }
 
@@ -40,12 +52,13 @@ public class JpushHelper implements JpushHelperI {
      * @return
      */
     @Override
-    public boolean pushMessageByAndroid(String message, String registrationID, Map map) {
+    public boolean pushMessageByAndroid(String title, String message, String userId, Map map) {
         try {
             PushPayload payload = PushPayload.newBuilder()
                     .setPlatform(Platform.android())
-                    .setAudience(Audience.registrationId(registrationID))
-                    .setNotification(Notification.android("爱鱼奇提示", message, map))
+                    .setAudience(Audience.alias(userId))
+                    .setNotification(Notification.android(title, message, map))
+                    .setMessage(Message.newBuilder().setTitle(title).setMsgContent(message).addExtras(map).build())
                     .build();
 
             PushResult result = jPushClient.sendPush(payload);
@@ -65,12 +78,14 @@ public class JpushHelper implements JpushHelperI {
      * @return
      */
     @Override
-    public boolean pushMessageByIOS(String message, String registrationID, Map map) {
+    public boolean pushMessageByIOS(String title, String message, String userId, Map map) {
         try {
             PushPayload payload = PushPayload.newBuilder()
                     .setPlatform(Platform.ios())
-                    .setAudience(Audience.registrationId(registrationID))
-                    .setNotification(Notification.android("爱鱼奇提示", message, map))
+                    .setAudience(Audience.alias(userId))
+                    .setNotification(Notification.newBuilder().addPlatformNotification(IosNotification.newBuilder().setSound("happy").setAlert(message).build()).build())
+                    .setMessage(Message.newBuilder().setTitle(title).setMsgContent(message).addExtras(map).build())
+                    .setOptions(Options.newBuilder().setApnsProduction(false).build())
                     .build();
 
             PushResult result = jPushClient.sendPush(payload);

src/main/java/com/ifish/helper/JpushHelperI.java

@@ -19,7 +19,7 @@ public interface JpushHelperI {
      * @param message
      * @return
      */
-    boolean pushMessageByAndroid(String message, String registrationID, Map map);
+    boolean pushMessageByAndroid(String title, String message, String userId, Map map);
 
     /**
      * 向苹果手机推送一条信息
@@ -27,5 +27,5 @@ public interface JpushHelperI {
      * @param message
      * @return
      */
-    boolean pushMessageByIOS(String message, String registrationID, Map map);
+    boolean pushMessageByIOS(String title, String message, String userId, Map map);
 }

src/main/java/com/ifish/helper/RedisKeyHelper.java

@@ -8,7 +8,11 @@ package com.ifish.helper;
 import com.ifish.bean.Tbl_Device;
 import com.ifish.bean.Tbl_Device_Statistics;
 import com.ifish.bean.Tbl_Device_User;
+import com.ifish.bean.Tbl_Live_Message;
+import com.ifish.bean.Tbl_Live_Room;
+import com.ifish.bean.Tbl_Push_List;
 import com.ifish.bean.Tbl_User;
+import com.ifish.mapper.Tbl_Live_Room_Mapper;
 import com.ifish.util.RedisKey;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,9 +24,48 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class RedisKeyHelper implements RedisKeyHelperI {
-    
+
     @Autowired
     private RedisHelperI redisHelperI;
+    @Autowired
+    private DeviceHelperI deviceHelper;
+    @Autowired
+    private UserHelperI userHelperI;
+    @Autowired
+    private Tbl_Live_Room_Mapper tbl_Live_Room_Mapper;
+
+    /**
+     * 根据phoneNumber获取Tbl_User用户信息的Redis缓存key键值
+     *
+     * @param userId
+     * @return
+     */
+    @Override
+    public String getTbl_UserRedisKeyByPhoneNumber(String phoneNumber) {
+        return RedisKey.USER_PHONE + phoneNumber;
+    }
+
+    /**
+     * 根据token获取tbl_user用户信息的redis缓存key键值
+     *
+     * @param token
+     * @return
+     */
+    @Override
+    public String getTbl_UserRedisKeyByToken(String token) {
+        return RedisKey.USER_TOKEN + token;
+    }
+
+    /**
+     * 根据Email获取Tbl_User用户信息的Redis缓存key键值
+     *
+     * @param userId
+     * @return
+     */
+    @Override
+    public String getTbl_UserRedisKeyByEmail(String email) {
+        return RedisKey.USER_EMAIL + email;
+    }
 
     /**
      * 根据userId获取Tbl_User用户信息的Redis缓存key键值
@@ -30,10 +73,82 @@ public class RedisKeyHelper implements RedisKeyHelperI {
      * @param userId
      * @return
      */
+    @Override
     public String getTbl_UserRedisKeyByUserId(Integer userId) {
         return RedisKey.USER_ID_KEY + userId;
     }
 
+    /**
+     * 根据条件获取用户列表缓存key
+     *
+     * @param start
+     * @param length
+     * @param userId
+     * @param phoneNumber
+     * @param userEmail
+     * @param phoneType
+     * @param isRegisterGwell
+     * @param isRegisterJiguang
+     * @param sortField
+     * @param sortMode
+     * @param nickName
+     * @param remarks
+     * @param loginTime1
+     * @param loginTime2
+     * @param createTime1
+     * @param createTime2
+     * @return
+     */
+    @Override
+    public String getUserListRedisKey(Integer start, Integer length, String userId, String phoneNumber, String userEmail, String phoneType, String isRegisterGwell, String isRegisterJiguang, String sortField, String sortMode, String nickName, String remarks, String loginTime1, String loginTime2, String createTime1, String createTime2) {
+        return RedisKey.USER_LIST + userId + "_" + phoneNumber + "_" + userEmail + "_" + phoneType + "_" + isRegisterGwell + "_" + isRegisterJiguang + "_" + sortField + "_" + sortMode + "_" + nickName + "_" + remarks + "_" + loginTime1 + "_" + loginTime2 + "_" + createTime1 + "_" + createTime2 + "_" + start + "_" + length;
+    }
+
+    /**
+     * 根据条件搜索获取用户列表缓存key
+     *
+     * @param userId
+     * @param phoneNumber
+     * @param userEmail
+     * @param phoneType
+     * @param isRegisterGwell
+     * @param isRegisterJiguang
+     * @param sortField
+     * @param sortMode
+     * @param nickName
+     * @param remarks
+     * @param loginTime1
+     * @param loginTime2
+     * @param createTime1
+     * @param createTime2
+     * @return
+     */
+    @Override
+    public String getUserListCountRedisKey(String userId, String phoneNumber, String userEmail, String phoneType, String isRegisterGwell, String isRegisterJiguang, String sortField, String sortMode, String nickName, String remarks, String loginTime1, String loginTime2, String createTime1, String createTime2) {
+        return RedisKey.USER_LIST_COUNT + userId + "_" + phoneNumber + "_" + userEmail + "_" + phoneType + "_" + isRegisterGwell + "_" + isRegisterJiguang + "_" + sortField + "_" + sortMode + "_" + nickName + "_" + remarks + "_" + loginTime1 + "_" + loginTime2 + "_" + createTime1 + "_" + createTime2;
+    }
+
+    /**
+     * 获取用户列表总数
+     *
+     * @return
+     */
+    @Override
+    public String getAllUserListCountRedisKey() {
+        return RedisKey.USER_LIST_COUNT_ALL;
+    }
+
+    /**
+     * 根据userName获取Tbl_Security_User管理用户的redis缓存key键值
+     *
+     * @param userName
+     * @return
+     */
+    @Override
+    public String getTbl_Security_UserRedisKeyByUserName(String userName) {
+        return RedisKey.SECURITY_USER + userName;
+    }
+
     /**
      * 根据mac地址获取Tbl_Device的redis缓存key键值
      *
@@ -45,6 +160,17 @@ public class RedisKeyHelper implements RedisKeyHelperI {
         return RedisKey.DEVICE_KEY_MACADDRESS + macAddress;
     }
 
+    /**
+     * 根据摄像头Id获取Tbl_Device的redis缓存key键值
+     *
+     * @param macAddress
+     * @return
+     */
+    @Override
+    public String getTbl_CameraRedisKeyByCameraId(String CameraId) {
+        return RedisKey.DEVICE_KEY_CAMERAID + CameraId;
+    }
+
     /**
      * 根据Id获取Tbl_Device的redis缓存key键值
      *
@@ -80,6 +206,18 @@ public class RedisKeyHelper implements RedisKeyHelperI {
         return RedisKey.DEVICE_USER_LIST_DEVICEID + deviceId;
     }
 
+    /**
+     * 根据用户ID获取Tbl_Device_User(列表)的redis缓存key键值
+     *
+     * @param userId
+     * @param deviceId
+     * @return
+     */
+    @Override
+    public String getListTbl_Device_UserKeyByUserId(Integer userId) {
+        return RedisKey.DEVICE_USER_LIST_USERID + userId;
+    }
+
     /**
      * 根据mac地址获取Tbl_Device_Statistics的redis缓存key键值
      *
@@ -108,10 +246,132 @@ public class RedisKeyHelper implements RedisKeyHelperI {
      * @param typeCode
      * @return
      */
+    @Override
     public String getTbl_HardWare_TypeRedisKeyByTypeCode(String typeCode) {
         return RedisKey.HARD_WARE_TYPE + typeCode;
     }
 
+    /**
+     * 根据brandCode获取Tbl_Vender_list的redis缓存key键值
+     *
+     * @param brandCode
+     * @return
+     */
+    @Override
+    public String getTbl_Vender_ListRedisKeyByCode(String brandCode) {
+        return RedisKey.VENDER_CODE + brandCode;
+    }
+
+    /**
+     * 根据直播间Id获取Tbl_Live_Room的redis缓存key键值
+     *
+     * @param roomId
+     * @return
+     */
+    @Override
+    public String getTbl_Live_RoomRedisKeyByRoomId(Integer roomId) {
+        return RedisKey.LIVEROOM_ROOMID + roomId;
+    }
+
+    /**
+     * 根据摄像头Id获取Tbl_Live_Room的redis缓存key键值
+     *
+     * @param roomId
+     * @return
+     */
+    @Override
+    public String getTbl_Live_RoomRedisKeyByCameraId(String cameraId) {
+        return RedisKey.LIVEROOM_CAMERAID + cameraId;
+    }
+
+    /**
+     * 根据用户Id获取Tbl_Live_Room的redis缓存key键值
+     *
+     * @param roomId
+     * @return
+     */
+    @Override
+    public String getTbl_Live_RoomRedisKeyByUserId(Integer User) {
+        return RedisKey.LIVEROOM_USERID + User;
+    }
+
+    /**
+     * 根据分页和排序条件获取直播间列表缓存key键值
+     *
+     * @param first
+     * @param pageSize
+     * @param orders
+     * @return
+     */
+    @Override
+    public String getListTbl_Live_Room_RedisKey(Integer first, Integer pageSize, String orders) {
+        return RedisKey.LIVEROMM_LIST + "f_" + first + "_p_" + pageSize + "_o_" + orders;
+    }
+
+    /**
+     * 获取所有开启直播间总数量的redis缓存key键值
+     *
+     * @return
+     */
+    @Override
+    public String getTbl_Live_Room_CountRedisKey() {
+        return RedisKey.LIVEROOM_COUNT;
+    }
+
+    /**
+     * 获取直播间评论列表的redis缓存key键值
+     *
+     * @param roomId
+     * @return
+     */
+    @Override
+    public String getTbl_Live_Message(Integer firstResult, Integer pageSize, Integer roomId) {
+        return RedisKey.LIVEMESSAGE_ROOMID + roomId + "_f_" + firstResult + "_p_" + pageSize;
+    }
+
+    /**
+     * 获取直播间评论总数的redis缓存key键值
+     *
+     * @param roomId
+     * @return
+     */
+    @Override
+    public String getTbl_Live_MessageCount(Integer roomId) {
+        return RedisKey.LIVEMESSAGE_COUNT + roomId;
+    }
+
+    /**
+     * 根据pushId获取Tbl_push_list的redis缓存key键值
+     *
+     * @param pushId
+     * @return
+     */
+    @Override
+    public String getTbl_Push_List_RedisByPushId(Integer pushId) {
+        return RedisKey.PUSHLIST_PUSHID + pushId;
+    }
+
+    /**
+     * 根据MD5值获取redis缓存key键值
+     *
+     * @param md5
+     * @return
+     */
+    @Override
+    public String getEmailRedisKey(String md5) {
+        return RedisKey.EMAIL_REGIESTER + md5;
+    }
+
+    /**
+     * 根据MD5值获取redis缓存key键值（修改密码用）
+     *
+     * @param md5
+     * @return
+     */
+    public String getEmailUpdatePasswordRedisKey(String md5) {
+        return RedisKey.EMAIL_UPDATEPASSWORD + md5;
+    }
+
     /**
      * 删除redis中某个设备详情Tbl_Device的缓存
      *
@@ -120,12 +380,34 @@ public class RedisKeyHelper implements RedisKeyHelperI {
      */
     @Override
     public void deleteRedisByTbl_Device(Tbl_Device device) {
-        if (device.getDeviceId() > 0) {
+
+        try {
+            if (device.getDeviceId() != null && device.getDeviceId() != 0 && StringUtils.isBlank(device.getMacAddress())) {
+                device = deviceHelper.getDeviceById(device.getDeviceId());
+            }
+            if (StringUtils.isNotBlank(device.getMacAddress()) && (device.getDeviceId() == null || device.getDeviceId() == 0)) {
+                device = deviceHelper.getDeviceByMacAddress(device.getMacAddress());
+            }
+            if (StringUtils.isNotBlank(device.getCameraId()) && (device.getDeviceId() == null || device.getDeviceId() == 0)) {
+                device = deviceHelper.getDeviceByCameraId(device.getCameraId());
+            }
+            deleteTbl_DeviceInfo(device);
+            Tbl_Device_Statistics device_Statistics = deviceHelper.getDeviceStatisticsByDeviceId(device.getDeviceId());
+            deleteTbl_Device_StatisticsInfo(device_Statistics);
+        } catch (Exception e) {
+        }
+    }
+
+    public void deleteTbl_DeviceInfo(Tbl_Device device) {
+        if (device.getDeviceId() != null && device.getDeviceId() > 0) {
             redisHelperI.deleteRedis(getTbl_DeviceRedisKeyByDeviceId(device.getDeviceId()));
         }
         if (StringUtils.isNotBlank(device.getMacAddress())) {
             redisHelperI.deleteRedis(getTbl_DeviceRedisKeyByMacAddress(device.getMacAddress()));
         }
+        if (StringUtils.isNotBlank(device.getCameraId())) {
+            redisHelperI.deleteRedis(getTbl_CameraRedisKeyByCameraId(device.getCameraId()));
+        }
     }
 
     /**
@@ -136,12 +418,29 @@ public class RedisKeyHelper implements RedisKeyHelperI {
      */
     @Override
     public void deleteRedisByTbl_Device_Statistics(Tbl_Device_Statistics device) {
-        if (device.getDeviceId() > 0) {
-            redisHelperI.deleteRedis(getTbl_DeviceRedisKeyByDeviceId(device.getDeviceId()));
+
+        try {
+            if (device.getDeviceId() != null && device.getDeviceId() != 0 && StringUtils.isBlank(device.getMacAddress())) {
+                device = deviceHelper.getDeviceStatisticsByDeviceId(device.getDeviceId());
+            }
+            if (StringUtils.isNotBlank(device.getMacAddress()) && (device.getDeviceId() == null || device.getDeviceId() == 0)) {
+                device = deviceHelper.getDeviceStatisticsByMacAddress(device.getMacAddress());
+            }
+            deleteTbl_Device_StatisticsInfo(device);
+            Tbl_Device device1 = deviceHelper.getDeviceById(device.getDeviceId());
+            deleteTbl_DeviceInfo(device1);
+        } catch (Exception e) {
+        }
+    }
+
+    public void deleteTbl_Device_StatisticsInfo(Tbl_Device_Statistics device) {
+        if (device.getDeviceId() != null && device.getDeviceId() > 0) {
+            redisHelperI.deleteRedis(getTbl_Device_StatisticsRedisKeyByDeviceId(device.getDeviceId()));
         }
         if (StringUtils.isNotBlank(device.getMacAddress())) {
-            redisHelperI.deleteRedis(getTbl_DeviceRedisKeyByMacAddress(device.getMacAddress()));
+            redisHelperI.deleteRedis(getTbl_Device_StatisticsRedisKeyByMacAddress(device.getMacAddress()));
         }
+
     }
 
     /**
@@ -151,12 +450,27 @@ public class RedisKeyHelper implements RedisKeyHelperI {
      */
     @Override
     public void deleteRedisByTbl_Device_User(Tbl_Device_User tbl_Device_User) {
-        if (tbl_Device_User.getDeviceId() > 0 && tbl_Device_User.getUserId() > 0) {
+        deleteTbl_Device_UserInfo(tbl_Device_User);
+        try {
+            Tbl_Device device1 = deviceHelper.getDeviceById(tbl_Device_User.getDeviceId());
+            deleteTbl_DeviceInfo(device1);
+            Tbl_Device_Statistics device_Statistics = deviceHelper.getDeviceStatisticsByDeviceId(tbl_Device_User.getDeviceId());
+            deleteTbl_Device_StatisticsInfo(device_Statistics);
+        } catch (Exception e) {
+        }
+
+    }
+
+    public void deleteTbl_Device_UserInfo(Tbl_Device_User tbl_Device_User) {
+        if (tbl_Device_User.getDeviceId() != null && tbl_Device_User.getUserId() != null && tbl_Device_User.getDeviceId() > 0 && tbl_Device_User.getUserId() > 0) {
             redisHelperI.deleteRedis(getTbl_Device_UserRedisKeyByDeviceIdAndUserId(tbl_Device_User.getUserId(), tbl_Device_User.getDeviceId()));
         }
-        if (tbl_Device_User.getDeviceId() > 0) {
+        if (tbl_Device_User.getDeviceId() != null && tbl_Device_User.getDeviceId() > 0) {
             redisHelperI.deleteRedis(getListTbl_Device_UserKeyByDeviceId(tbl_Device_User.getDeviceId()));
         }
+        if (tbl_Device_User.getUserId() != null) {
+            redisHelperI.delRedisByTagKey(getListTbl_Device_UserKeyByUserId(tbl_Device_User.getUserId()));
+        }
     }
 
     /**
@@ -166,9 +480,157 @@ public class RedisKeyHelper implements RedisKeyHelperI {
      */
     @Override
     public void deleteRedisByTbl_User(Tbl_User tbl_User) {
-        if (tbl_User.getUserId() > 0) {
+        try {
+            if (tbl_User.getUserId() != null && tbl_User.getUserId() > 0) {
+                tbl_User = userHelperI.findById(tbl_User.getUserId());
+            }
+        } catch (Exception e) {
+        }
+        if (tbl_User.getUserId() != null && tbl_User.getUserId() > 0) {
             redisHelperI.deleteRedis(getTbl_UserRedisKeyByUserId(tbl_User.getUserId()));
         }
+        if (StringUtils.isNotBlank(tbl_User.getUserEmail())) {
+            redisHelperI.deleteRedis(getTbl_UserRedisKeyByEmail(tbl_User.getUserEmail()));
+        }
+        if (StringUtils.isNotBlank(tbl_User.getPhoneNumber())) {
+            redisHelperI.deleteRedis(getTbl_UserRedisKeyByPhoneNumber(tbl_User.getPhoneNumber()));
+        }
+        if (StringUtils.isNotBlank(tbl_User.getToken())) {
+            redisHelperI.deleteRedis(getTbl_UserRedisKeyByToken(tbl_User.getToken()));
+        }
+        redisHelperI.delRedisByTagKey(RedisKey.USER_LIST);
+        redisHelperI.delRedisByTagKey(RedisKey.USER_LIST_COUNT);
+        redisHelperI.delRedisByTagKey(RedisKey.USER_LIST_COUNT_ALL);
     }
-    
+
+    /**
+     * 删除redis中某个直播间Tbl_Live_Room的缓存
+     *
+     * @param live_Room
+     */
+    @Override
+    public void deleteRedisByTbl_Live_Room(Tbl_Live_Room live_Room) {
+        if ((live_Room.getRoomId() == null || live_Room.getRoomId() == 0) && StringUtils.isNotBlank(live_Room.getCameraId())) {
+            live_Room = tbl_Live_Room_Mapper.getTbl_Live_RoomByCameraId(live_Room.getCameraId());
+        } else if (StringUtils.isBlank(live_Room.getCameraId()) && (live_Room.getRoomId() != null && live_Room.getRoomId() > 0)) {
+            live_Room = tbl_Live_Room_Mapper.getTbl_Live_RoomById(live_Room.getRoomId());
+        }
+        if (live_Room.getRoomId() != null && live_Room.getRoomId() > 0) {
+            redisHelperI.deleteRedis(getTbl_Live_RoomRedisKeyByRoomId(live_Room.getRoomId()));
+        }
+        if (StringUtils.isNotBlank(live_Room.getCameraId())) {
+            redisHelperI.deleteRedis(getTbl_Live_RoomRedisKeyByCameraId(live_Room.getCameraId()));
+        }
+        if (live_Room.getUserId() != null && live_Room.getUserId() > 0) {
+            redisHelperI.deleteRedis(getTbl_Live_RoomRedisKeyByUserId(live_Room.getUserId()));
+        }
+        redisHelperI.deleteRedis(getTbl_Live_Room_CountRedisKey());
+        redisHelperI.delRedisByTagKey(RedisKey.LIVEROMM_LIST);
+    }
+
+    /**
+     * 删除redis中有直播间总数缓存
+     */
+    @Override
+    public void deleteRedisByLiveRoomListCount() {
+        redisHelperI.deleteRedis(getTbl_Live_Room_CountRedisKey());
+    }
+
+    /**
+     * 删除redis中某个直播间评论列表缓存
+     *
+     * @param tbl_Live_Message
+     */
+    @Override
+    public void deleteRedisByTbl_Live_Message(Tbl_Live_Message tbl_Live_Message) {
+        redisHelperI.delRedisByTagKey(RedisKey.LIVEMESSAGE_ROOMID + tbl_Live_Message.getRoomId());
+        redisHelperI.deleteRedis(RedisKey.LIVEMESSAGE_COUNT + tbl_Live_Message.getRoomId());
+    }
+
+    /**
+     * 后台推送消息列表缓存
+     *
+     * @param start
+     * @param length
+     * @param sdkVersion
+     * @param phoneNumber
+     * @param mac
+     * @param phoneType
+     * @param pushType
+     * @param sortField
+     * @param sortMode
+     * @return
+     */
+    @Override
+    public String getAdmin_Tbl_Push_List_BySelect(Integer start, Integer length, String sdkVersion, String phoneNumber, String mac, String phoneType, String pushType, String sortField, String sortMode) {
+        return RedisKey.PUSHLIST_SELECT + start + "_" + length + "_" + sdkVersion + "_" + phoneNumber + "_" + mac + "_" + phoneType + "_" + pushType + "_" + sortField + "_" + sortMode;
+    }
+
+    /**
+     * 后台推送消息列表查询数量缓存
+     *
+     * @param start
+     * @param length
+     * @param sdkVersion
+     * @param phoneNumber
+     * @param mac
+     * @param phoneType
+     * @param pushType
+     * @param sortField
+     * @param sortMode
+     * @return
+     */
+    @Override
+    public String getAdmin_Tbl_Push_List_Count_BySelect(String sdkVersion, String phoneNumber, String mac, String phoneType, String pushType, String sortField, String sortMode) {
+        return RedisKey.PUSHLIST_SELECT + "count_" + sdkVersion + "_" + phoneNumber + "_" + mac + "_" + phoneType + "_" + pushType + "_" + sortField + "_" + sortMode;
+    }
+
+    /**
+     * 后台推送消息列表总数缓存
+     *
+     * @param start
+     * @param length
+     * @param sdkVersion
+     * @param phoneNumber
+     * @param mac
+     * @param phoneType
+     * @param pushType
+     * @param sortField
+     * @param sortMode
+     * @return
+     */
+    @Override
+    public String getAdmin_Tbl_Push_List_AllCount() {
+        return RedisKey.PUSHLIST_SELECT;
+    }
+
+    /**
+     * 根据条件删除推送列表缓存
+     *
+     * @param pushId
+     */
+    @Override
+    public void deleteRedisByTbl_Push_List(Tbl_Push_List tbl_Push_List) {
+        if (tbl_Push_List.getPushId() != null) {
+            redisHelperI.deleteRedis(getTbl_Push_List_RedisByPushId(tbl_Push_List.getPushId()));
+        }
+        deleteRedisByTbl_Push_ListToAllRedisList();
+    }
+
+    /**
+     * 删除推送列表类缓存
+     */
+    @Override
+    public void deleteRedisByTbl_Push_ListToAllRedisList() {
+        redisHelperI.delRedisByTagKey(RedisKey.PUSHLIST_SELECT);
+    }
+
+    /**
+     * 删除鱼缸厂信息缓存
+     */
+    @Override
+    public void deleteTbl_Vender_List_RedisKey() {
+        redisHelperI.delRedisByTagKey(RedisKey.VENDER_CODE);
+    }
+
 }

src/main/java/com/ifish/helper/RedisKeyHelperI.java

@@ -8,6 +8,9 @@ package com.ifish.helper;
 import com.ifish.bean.Tbl_Device;
 import com.ifish.bean.Tbl_Device_Statistics;
 import com.ifish.bean.Tbl_Device_User;
+import com.ifish.bean.Tbl_Live_Message;
+import com.ifish.bean.Tbl_Live_Room;
+import com.ifish.bean.Tbl_Push_List;
 import com.ifish.bean.Tbl_User;
 
 /**
@@ -16,6 +19,14 @@ import com.ifish.bean.Tbl_User;
  */
 public interface RedisKeyHelperI {
 
+    /**
+     * 根据token获取tbl_user用户信息的redis缓存key键值
+     *
+     * @param token
+     * @return
+     */
+    public String getTbl_UserRedisKeyByToken(String token);
+
     /**
      * 根据userId获取Tbl_User用户信息的Redis缓存key键值
      *
@@ -24,6 +35,81 @@ public interface RedisKeyHelperI {
      */
     public String getTbl_UserRedisKeyByUserId(Integer userId);
 
+    /**
+     * 根据phoneNumber获取Tbl_User用户信息的Redis缓存key键值
+     *
+     * @param userId
+     * @return
+     */
+    public String getTbl_UserRedisKeyByPhoneNumber(String phoneNumber);
+
+    /**
+     * 根据Email获取Tbl_User用户信息的Redis缓存key键值
+     *
+     * @param userId
+     * @return
+     */
+    public String getTbl_UserRedisKeyByEmail(String email);
+
+    /**
+     * 根据条件获取用户列表缓存key
+     *
+     * @param start
+     * @param length
+     * @param userId
+     * @param phoneNumber
+     * @param userEmail
+     * @param phoneType
+     * @param isRegisterGwell
+     * @param isRegisterJiguang
+     * @param sortField
+     * @param sortMode
+     * @param nickName
+     * @param remarks
+     * @param loginTime1
+     * @param loginTime2
+     * @param createTime1
+     * @param createTime2
+     * @return
+     */
+    public String getUserListRedisKey(Integer start, Integer length, String userId, String phoneNumber, String userEmail, String phoneType, String isRegisterGwell, String isRegisterJiguang, String sortField, String sortMode, String nickName, String remarks, String loginTime1, String loginTime2, String createTime1, String createTime2);
+
+    /**
+     * 根据条件搜索获取用户列表缓存key
+     *
+     * @param userId
+     * @param phoneNumber
+     * @param userEmail
+     * @param phoneType
+     * @param isRegisterGwell
+     * @param isRegisterJiguang
+     * @param sortField
+     * @param sortMode
+     * @param nickName
+     * @param remarks
+     * @param loginTime1
+     * @param loginTime2
+     * @param createTime1
+     * @param createTime2
+     * @return
+     */
+    public String getUserListCountRedisKey(String userId, String phoneNumber, String userEmail, String phoneType, String isRegisterGwell, String isRegisterJiguang, String sortField, String sortMode, String nickName, String remarks, String loginTime1, String loginTime2, String createTime1, String createTime2);
+
+    /**
+     * 获取用户列表总数
+     *
+     * @return
+     */
+    public String getAllUserListCountRedisKey();
+
+    /**
+     * 根据userName获取Tbl_Security_User管理用户的redis缓存key键值
+     *
+     * @param userName
+     * @return
+     */
+    public String getTbl_Security_UserRedisKeyByUserName(String userName);
+
     /**
      * 根据mac地址获取Tbl_Device的redis缓存key键值
      *
@@ -32,6 +118,14 @@ public interface RedisKeyHelperI {
      */
     public String getTbl_DeviceRedisKeyByMacAddress(String macAddress);
 
+    /**
+     * 根据摄像头Id获取Tbl_Device的redis缓存key键值
+     *
+     * @param macAddress
+     * @return
+     */
+    public String getTbl_CameraRedisKeyByCameraId(String CameraId);
+
     /**
      * 根据Id获取Tbl_Device的redis缓存key键值
      *
@@ -74,6 +168,15 @@ public interface RedisKeyHelperI {
      */
     public String getListTbl_Device_UserKeyByDeviceId(Integer deviceId);
 
+    /**
+     * 根据用户ID获取Tbl_Device_User(列表)的redis缓存key键值
+     *
+     * @param userId
+     * @param deviceId
+     * @return
+     */
+    public String getListTbl_Device_UserKeyByUserId(Integer userId);
+
     /**
      * 根据typeCode获取Tbl_HardWare_Type的redis缓存key键值
      *
@@ -82,6 +185,143 @@ public interface RedisKeyHelperI {
      */
     public String getTbl_HardWare_TypeRedisKeyByTypeCode(String typeCode);
 
+    /**
+     * 根据brandCode获取Tbl_Vender_list的redis缓存key键值
+     *
+     * @param brandCode
+     * @return
+     */
+    public String getTbl_Vender_ListRedisKeyByCode(String brandCode);
+
+    /**
+     * 根据直播间Id获取Tbl_Live_Room的redis缓存key键值
+     *
+     * @param roomId
+     * @return
+     */
+    public String getTbl_Live_RoomRedisKeyByRoomId(Integer roomId);
+
+    /**
+     * 根据摄像头Id获取Tbl_Live_Room的redis缓存key键值
+     *
+     * @param roomId
+     * @return
+     */
+    public String getTbl_Live_RoomRedisKeyByCameraId(String cameraId);
+
+    /**
+     * 根据用户Id获取Tbl_Live_Room的redis缓存key键值
+     *
+     * @param roomId
+     * @return
+     */
+    public String getTbl_Live_RoomRedisKeyByUserId(Integer User);
+
+    /**
+     * 根据分页和排序条件获取直播间列表缓存key键值
+     *
+     * @param first
+     * @param pageSize
+     * @param orders
+     * @return
+     */
+    public String getListTbl_Live_Room_RedisKey(Integer first, Integer pageSize, String orders);
+
+    /**
+     * 获取所有开启直播间总数量的redis缓存key键值
+     *
+     * @return
+     */
+    public String getTbl_Live_Room_CountRedisKey();
+
+    /**
+     * 获取直播间评论列表的redis缓存key键值
+     *
+     * @param roomId
+     * @return
+     */
+    public String getTbl_Live_Message(Integer firstResult, Integer pageSize, Integer roomId);
+
+    /**
+     * 获取直播间评论总数的redis缓存key键值
+     *
+     * @param roomId
+     * @return
+     */
+    public String getTbl_Live_MessageCount(Integer roomId);
+
+    /**
+     * 根据pushId获取Tbl_push_list的redis缓存key键值
+     *
+     * @param pushId
+     * @return
+     */
+    public String getTbl_Push_List_RedisByPushId(Integer pushId);
+
+    /**
+     * 后台推送消息列表缓存
+     *
+     * @param start
+     * @param length
+     * @param sdkVersion
+     * @param phoneNumber
+     * @param mac
+     * @param phoneType
+     * @param pushType
+     * @param sortField
+     * @param sortMode
+     * @return
+     */
+    public String getAdmin_Tbl_Push_List_BySelect(Integer start, Integer length, String sdkVersion, String phoneNumber, String mac, String phoneType, String pushType, String sortField, String sortMode);
+
+    /**
+     * 后台推送消息列表查询数量缓存
+     *
+     * @param start
+     * @param length
+     * @param sdkVersion
+     * @param phoneNumber
+     * @param mac
+     * @param phoneType
+     * @param pushType
+     * @param sortField
+     * @param sortMode
+     * @return
+     */
+    public String getAdmin_Tbl_Push_List_Count_BySelect(String sdkVersion, String phoneNumber, String mac, String phoneType, String pushType, String sortField, String sortMode);
+
+    /**
+     * 后台推送消息列表总数缓存
+     *
+     * @param start
+     * @param length
+     * @param sdkVersion
+     * @param phoneNumber
+     * @param mac
+     * @param phoneType
+     * @param pushType
+     * @param sortField
+     * @param sortMode
+     * @return
+     */
+    public String getAdmin_Tbl_Push_List_AllCount();
+
+    /**
+     * 根据MD5值获取redis缓存key键值（注册账号用）
+     *
+     * @param md5
+     * @return
+     */
+    public String getEmailRedisKey(String md5);
+
+    /**
+     * 根据MD5值获取redis缓存key键值（修改密码用）
+     *
+     * @param md5
+     * @return
+     */
+    public String getEmailUpdatePasswordRedisKey(String md5);
+
     /**
      * 删除redis中某个设备详情的缓存
      *
@@ -111,4 +351,41 @@ public interface RedisKeyHelperI {
      * @param tbl_User
      */
     public void deleteRedisByTbl_User(Tbl_User tbl_User);
+
+    /**
+     * 删除redis中某个直播间Tbl_Live_Room的缓存
+     *
+     * @param live_Room
+     */
+    public void deleteRedisByTbl_Live_Room(Tbl_Live_Room live_Room);
+
+    /**
+     * 删除redis中有直播间总数缓存
+     */
+    public void deleteRedisByLiveRoomListCount();
+
+    /**
+     * 删除redis中某个直播间评论列表缓存
+     *
+     * @param tbl_Live_Message
+     */
+    public void deleteRedisByTbl_Live_Message(Tbl_Live_Message tbl_Live_Message);
+
+    /**
+     * 根据条件删除推送列表缓存
+     *
+     * @param pushId
+     */
+    public void deleteRedisByTbl_Push_List(Tbl_Push_List tbl_Push_List);
+
+    /**
+     * 删除推送列表类缓存
+     */
+    public void deleteRedisByTbl_Push_ListToAllRedisList();
+
+    /**
+     * 删除鱼缸厂信息缓存
+     */
+    public void deleteTbl_Vender_List_RedisKey();
+
 }

src/main/java/com/ifish/mapper/Tbl_Device_Mapper.java

@@ -5,6 +5,7 @@
  */
 package com.ifish.mapper;
 
+import com.ifish.bean.Tbl_Activa_Code;
 import com.ifish.bean.Tbl_Device;
 import com.ifish.bean.Tbl_Device_Statistics;
 import com.ifish.bean.Tbl_Device_User;
@@ -60,7 +61,7 @@ public interface Tbl_Device_Mapper {
      * @param deviceId
      * @return
      */
-    @Select("SELECT id,user_id,device_id,is_master,show_name,create_time,update_time,custom_icon_name,custom_show_name,is_look,is_live from tbl_device_user WHERE user_id = #{userid}")
+    @Select("SELECT id,user_id,device_id,is_master,show_name,create_time,update_time,custom_icon_name,custom_show_name,is_look,is_live,off_line from tbl_device_user WHERE user_id = #{userid}")
     List<Tbl_Device_User> getDeviceUsersByUserId(@Param("userid") Integer userid);
 
     /**
@@ -70,7 +71,7 @@ public interface Tbl_Device_Mapper {
      * @param deviceId
      * @return
      */
-    @Select("SELECT id,user_id,device_id,is_master,show_name,create_time,update_time,custom_icon_name,custom_show_name,is_look,is_live from tbl_device_user WHERE user_id <> ${userid} AND device_id = #{deviceid}")
+    @Select("SELECT id,user_id,device_id,is_master,show_name,create_time,update_time,custom_icon_name,custom_show_name,is_look,is_live,off_line from tbl_device_user WHERE user_id <> ${userid} AND device_id = #{deviceid}")
     List<Tbl_Device_User> getOtherDeviceUsersByOtherUserIdAndDeviceId(@Param("userid") Integer userid, @Param("deviceid") Integer deviceId);
 
     /**
@@ -80,7 +81,7 @@ public interface Tbl_Device_Mapper {
      * @param deviceId
      * @return
      */
-    @Select("SELECT id,user_id,device_id,is_master,show_name,create_time,update_time,custom_icon_name,custom_show_name,is_look,is_live from tbl_device_user WHERE user_id = #{userid} AND device_id = #{deviceid}")
+    @Select("SELECT id,user_id,device_id,is_master,show_name,create_time,update_time,custom_icon_name,custom_show_name,is_look,is_live,off_line from tbl_device_user WHERE user_id = #{userid} AND device_id = #{deviceid}")
     Tbl_Device_User getDeviceUsersByUserIdAndDeviceId(@Param("userid") Integer userid, @Param("deviceid") Integer deviceId);
 
     /**
@@ -89,7 +90,7 @@ public interface Tbl_Device_Mapper {
      * @param deviceId
      * @return
      */
-    @Select("SELECT id,user_id,device_id,is_master,show_name,create_time,update_time,custom_icon_name,custom_show_name,is_look,is_live from tbl_device_user WHERE device_id = #{deviceid}")
+    @Select("SELECT id,user_id,device_id,is_master,show_name,create_time,update_time,custom_icon_name,custom_show_name,is_look,is_live,off_line from tbl_device_user WHERE device_id = #{deviceid}")
     List<Tbl_Device_User> getDeviceUsersByDeviceId(@Param("deviceid") Integer deviceId);
 
     /**
@@ -178,6 +179,15 @@ public interface Tbl_Device_Mapper {
     @Delete("DELETE from tbl_device where id = #{id}")
     int deleteDeviceById(@Param("id") Integer id);
 
+    /**
+     * 根据激活码查询激活码对象
+     *
+     * @param activeCode
+     * @return
+     */
+    @Select("SELECT active_code,batch_code,is_used,create_time FROM tbl_activa_code WHERE active_code = #{code}")
+    Tbl_Activa_Code getActiva_CodeByCode(@Param("code") String activeCode);
+
     /**
      * 修改设备信息
      *

src/main/java/com/ifish/mapper/Tbl_Device_MapperSql.java

@@ -55,6 +55,9 @@ public class Tbl_Device_MapperSql {
         if (StringUtils.isNotBlank(device_User.getIsLive())) {
             sb.append("is_live = #{deviceUser.isLive}, ");
         }
+        if (StringUtils.isNotBlank(device_User.getOffLine())) {
+            sb.append("off_line = #{deviceUser.offLine}, ");
+        }
         sb.append("update_time = now() ");
         sb.append(" WHERE id = #{deviceUser.id}");
         return sb.toString();
@@ -87,13 +90,13 @@ public class Tbl_Device_MapperSql {
 
         sb.append("UPDATE tbl_device_statistics SET ");
 
-        if (device_Statistics.getDeviceId() > 0) {
+        if (device_Statistics.getDeviceId() != null && device_Statistics.getDeviceId() > 0) {
             sb.append("device_id = #{deviceStatistics.deviceId}, ");
         }
         if (StringUtils.isNotBlank(device_Statistics.getMacAddress())) {
             sb.append("mac_address = #{deviceStatistics.macAddress}, ");
         }
-        if (device_Statistics.getLoginCount() > 0) {
+        if (device_Statistics.getLoginCount() != null && device_Statistics.getLoginCount() > 0) {
             sb.append("login_count = #{deviceStatistics.loginCount}, ");
         }
         if (device_Statistics.getLoginTime() != null && StringUtils.isNotBlank(device_Statistics.getLoginTime().toString())) {

src/main/java/com/ifish/mapper/Tbl_Hardware_Type_Mapper.java

@@ -35,4 +35,14 @@ public interface Tbl_Hardware_Type_Mapper {
      */
     @Select("select brand_code,brand_name,brand_introduce,brand_logo from tbl_vender_list where brand_code=#{code}")
     Tbl_Vender getVenderListByBrandCode(@Param("code") String code);
+
+    /**
+     * 根据设备型号获取厂家信息
+     *
+     * @param code
+     * @return
+     * @throws Exception
+     */
+    @Select("select brand_code,brand_name,brand_introduce,brand_logo from tbl_vender_list a LEFT JOIN tbl_vender_hardware b ON a.brand_code = b.brand_code where b.hardware_type=#{code}")
+    Tbl_Vender getVenderListByHardwareTypeCode(@Param("code") String code);
 }

src/main/java/com/ifish/mapper/Tbl_Live_Room_Mapper.java

@@ -0,0 +1,235 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.ifish.mapper;
+
+import com.ifish.bean.LiveRoomPageInfo;
+import com.ifish.bean.Tbl_Live_Message;
+import com.ifish.bean.Tbl_Live_Room;
+import com.ifish.bean.Tbl_Live_Watch;
+import java.util.List;
+import java.util.Map;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.SelectKey;
+import org.apache.ibatis.annotations.Update;
+import org.apache.ibatis.annotations.UpdateProvider;
+
+/**
+ *
+ * @author Administrator
+ */
+public interface Tbl_Live_Room_Mapper {
+
+    /**
+     * 建立一个直播间
+     */
+    @Insert("INSERT INTO tbl_live_room (user_id,camera_id,room_name,room_desc,room_status,popularity_value,create_time,room_Img) VALUES("
+            + "#{liveroom.userId},#{liveroom.cameraId},#{liveroom.roomName},#{liveroom.roomDesc},#{liveroom.roomStatus},#{liveroom.popularityValue},now(),#{liveroom.roomImg})")
+    @SelectKey(statement = "select @@IDENTITY as room_id", keyProperty = "liveroom.roomId", keyColumn = "room_id", before = false, resultType = int.class)
+    Integer insertLiveRoom(@Param("liveroom") Tbl_Live_Room liveRoom);
+
+    /**
+     * 插入一条直播间评论
+     *
+     * @param live_Message
+     * @return
+     */
+    @Insert("INSERT INTO TBL_LIVE_MESSAGE (room_id,user_id,as_user_id,message_content,create_time) VALUES (#{livemessage.roomId},#{livemessage.userId},#{livemessage.asUserId},#{livemessage.messageContent},#{livemessage.createTime})")
+    @SelectKey(statement = "select @@IDENTITY as message_id", keyProperty = "livemessage.messageId", keyColumn = "message_id", before = false, resultType = int.class)
+    Integer insertLiveMessage(@Param("livemessage") Tbl_Live_Message live_Message);
+
+    /**
+     * 查询直播间总赞数
+     *
+     * @param roomID
+     * @return
+     */
+    @Select("select count(*) from tbl_live_room_zan where room_id=#{roomid} ")
+    Integer getLiveRoomZanCountByRoomId(@Param("roomid") Integer roomID);
+
+    /**
+     * 查询某个用户是否点赞了某个直播间
+     *
+     * @param roomID
+     * @param userID
+     * @return
+     */
+    @Select("SELECT COUNT(1) FROM TBL_LIVE_ROOM_ZAN WHERE ROOM_ID = #{roomid} AND USER_ID = #{userid}")
+    Integer IsZan(@Param("roomid") Integer roomID, @Param("userid") Integer userID);
+
+    /**
+     * 取消点赞
+     *
+     * @param roomID
+     * @param userID
+     * @return
+     */
+    @Delete("DELETE FROM TBL_LIVE_ROOM_ZAN WHERE  ROOM_ID = #{roomid} AND USER_ID = #{userid}")
+    Integer cancelZan(@Param("roomid") Integer roomID, @Param("userid") Integer userID);
+
+    /**
+     * 执行点赞
+     *
+     * @param roomID
+     * @param userID
+     * @return
+     */
+    @Insert("INSERT INTO TBL_LIVE_ROOM_ZAN(ROOM_ID,USER_ID,CREATE_TIME) VALUES (#{roomid},#{userid},NOW())")
+    Integer ImplementZan(@Param("roomid") Integer roomID, @Param("userid") Integer userID);
+
+    /**
+     * 根据房间ID查询直播间信息
+     *
+     * @param roomid
+     * @return
+     */
+    @Select("SELECT ROOM_ID,USER_ID,CAMERA_ID,ROOM_NAME,ROOM_DESC,ROOM_STATUS,POPULARITY_VALUE,CREATE_TIME,UPDATE_TIME,room_Img,zanNum FROM TBL_LIVE_ROOM WHERE ROOM_ID = #{roomid}")
+    Tbl_Live_Room getTbl_Live_RoomById(@Param("roomid") Integer roomid);
+
+    /**
+     * 根据摄像头ID查询直播间信息
+     *
+     * @param roomid
+     * @return
+     */
+    @Select("SELECT ROOM_ID,USER_ID,CAMERA_ID,ROOM_NAME,ROOM_DESC,ROOM_STATUS,POPULARITY_VALUE,CREATE_TIME,UPDATE_TIME,room_Img,zanNum FROM TBL_LIVE_ROOM WHERE CAMERA_ID = #{cameraid}")
+    Tbl_Live_Room getTbl_Live_RoomByCameraId(@Param("cameraid") String cameraid);
+
+    /**
+     * 根据开播时间来查询直播间
+     *
+     * @param pageSize
+     * @param FirstResult
+     * @return
+     */
+    @Select(" select a.roomId,a.userId,a.userType,a.nickName,a.userImg,a.loginTime,a.createTime,a.cameraId,a.roomName,a.roomDesc,a.popularityValue,a.roomImg,a.numberDays,a.zanNum,count(*) as pinglunNum from ("
+            + " SELECT l.room_id AS roomId,u.user_id AS userId,u.user_type AS userType,u.nick_name AS nickName,u.user_img AS userImg,u.login_time AS loginTime,l.create_time AS createTime,"
+            + " td.camera_id AS cameraId,l.room_name AS roomName,l.room_desc AS roomDesc,l.popularity_value AS popularityValue,l.room_Img AS roomImg,"
+            + " (TO_DAYS(NOW())-TO_DAYS(l.create_time)) AS numberDays,l.zanNum,b.message_id"
+            + " from tbl_user u"
+            + " LEFT JOIN tbl_device_user c ON u.user_id=c.user_id "
+            + " LEFT JOIN tbl_device td ON c.device_id = td.device_id"
+            + " LEFT JOIN tbl_live_room l ON u.user_id=l.user_id and l.camera_id = td.camera_id"
+            + " LEFT JOIN tbl_live_message b ON l.room_id = b.room_id"
+            + " where c.is_live='1' AND l.room_status='1' ) as a"
+            + " GROUP BY a.roomId,a.userId,a.userType,a.nickName,a.userImg,a.loginTime,a.createTime,a.cameraId,a.roomName,a.roomDesc,a.popularityValue,a.roomImg,a.numberDays,a.zanNum"
+            + " ORDER BY a.createTime DESC LIMIT ${first},${pagesize}")
+    List<LiveRoomPageInfo> getLiveRoomListByCreateTime(@Param("pagesize") Integer pageSize, @Param("first") Integer FirstResult);
+
+    /**
+     * 根据开播时间来查询直播间
+     *
+     * @param pageSize
+     * @param FirstResult
+     * @return
+     */
+    @Select(" select a.roomId,a.userId,a.userType,a.nickName,a.userImg,a.loginTime,a.createTime,a.cameraId,a.roomName,a.roomDesc,a.popularityValue,a.roomImg,a.numberDays,a.zanNum,count(*) as pinglunNum from ("
+            + " SELECT l.room_id AS roomId,u.user_id AS userId,u.user_type AS userType,u.nick_name AS nickName,u.user_img AS userImg,u.login_time AS loginTime,l.create_time AS createTime,"
+            + " td.camera_id AS cameraId,l.room_name AS roomName,l.room_desc AS roomDesc,l.popularity_value AS popularityValue,l.room_Img AS roomImg,"
+            + " (TO_DAYS(NOW())-TO_DAYS(l.create_time)) AS numberDays,l.zanNum,b.message_id"
+            + " from tbl_user u"
+            + " LEFT JOIN tbl_device_user c ON u.user_id=c.user_id "
+            + " LEFT JOIN tbl_device td ON c.device_id = td.device_id"
+            + " LEFT JOIN tbl_live_room l ON u.user_id=l.user_id and l.camera_id = td.camera_id"
+            + " LEFT JOIN tbl_live_message b ON l.room_id = b.room_id"
+            + " where c.is_live='1' AND l.room_status='1' ) as a"
+            + " GROUP BY a.roomId,a.userId,a.userType,a.nickName,a.userImg,a.loginTime,a.createTime,a.cameraId,a.roomName,a.roomDesc,a.popularityValue,a.roomImg,a.numberDays,a.zanNum"
+            + " ORDER BY a.popularityValue DESC LIMIT ${first},${pagesize}")
+    List<LiveRoomPageInfo> getLiveRoomListByRenqi(@Param("pagesize") Integer pageSize, @Param("first") Integer FirstResult);
+
+    /**
+     * 查询所有直播间数量
+     *
+     * @return
+     */
+    @Select("SELECT COUNT(1)"
+            + " from tbl_user u"
+            + " LEFT JOIN tbl_device_user c ON u.user_id=c.user_id "
+            + " LEFT JOIN tbl_device td ON c.device_id = td.device_id"
+            + " LEFT JOIN tbl_live_room l ON u.user_id=l.user_id and l.camera_id = td.camera_id"
+            + " where c.is_live='1' AND l.room_status='1'")
+    Integer getLiveRoomListCount();
+
+    /**
+     * 修改直播间信息
+     *
+     * @param live_Room
+     * @return
+     */
+    @UpdateProvider(type = Tbl_Live_Room_MapperSql.class, method = "updateLiveRoom")
+    Integer updateLiveRoom(@Param("live") Tbl_Live_Room live_Room);
+
+    /**
+     * 修改人气值
+     *
+     * @param live_Room
+     * @return
+     */
+    @Update("UPDATE TBL_LIVE_ROOM SET popularity_value = #{live.popularityValue} WHERE room_id = #{live.roomId}")
+    Integer updateLiveRoomPopularityValue(@Param("live") Tbl_Live_Room live_Room);
+
+    /**
+     * 根据直播间ID获取此直播间评论列表
+     *
+     * @param roomid
+     * @return
+     */
+    @Select("select l.message_id as messageId,l.room_id as roomId,l.user_id as userId,l.as_user_id as asUserId,"
+            + "uu.nick_name as asUserName,u.user_img as userImg,u.nick_name as userName,l.message_content as messageContent,l.create_time as createTime "
+            + "from tbl_live_message l "
+            + "LEFT JOIN tbl_user u ON l.user_id = u.user_id "
+            + "LEFT JOIN tbl_user uu ON l.as_user_id=uu.user_id "
+            + "WHERE room_id = #{roomid} ORDER BY l.create_time DESC LIMIT ${first},${page} ")
+    List<Map> getLive_MessagesListByRoomId(@Param("roomid") Integer roomid, @Param("first") Integer firstResult, @Param("page") Integer pageSize);
+
+    /**
+     * 获取直播间评论总数
+     *
+     * @param roomid
+     * @return
+     */
+    @Select("select count(1) from tbl_live_message WHERE room_id = #{roomid}")
+    Integer getLive_MessagesCountByRoomId(@Param("roomid") Integer roomid);
+
+    /**
+     * 根据直播间和用户ID获取观看记录
+     *
+     * @param roomId
+     * @param userId
+     * @return
+     */
+    @Select("SELECT ROOM_ID,USER_ID,UPDATE_TIME,CREATE_TIME FROM TBL_LIVE_WATCH WHERE ROOM_ID=#{roomid} AND USER_ID=#{userid}")
+    Tbl_Live_Watch getTbl_Live_WatchByRoomIdAndUserId(@Param("roomid") Integer roomId, @Param("userid") Integer userId);
+
+    /**
+     * 修改用户直播观看记录
+     *
+     * @param live
+     * @return
+     */
+    @Update("UPDATE TBL_LIVE_WATCH SET UPDATE_TIME=#{live.updateTime} WHERE room_id=#{live.roomId} AND user_id=#{live.userId}")
+    Integer updateTbl_Live_Watch(@Param("live") Tbl_Live_Watch live);
+
+    /**
+     * 插入一条用户观看记录
+     *
+     * @param live
+     * @return
+     */
+    @Insert("INSERT INTO TBL_LIVE_WATCH(room_id,user_id,update_time,create_time) VALUES (#{live.roomId},#{live.userId},#{live.updateTime},#{live.createTime})")
+    Integer insertTbl_Live_Watch(@Param("live") Tbl_Live_Watch live);
+
+    /**
+     * 根据摄像头ID删除直播间
+     *
+     * @param cameraId
+     * @return
+     */
+    @Delete("DELETE TBL_LIVE_ROOM WHERE camera_id = #{cameraid}")
+    Integer deleteLive_RoomByCameraId(@Param("cameraid") String cameraId);
+}

src/main/java/com/ifish/mapper/Tbl_Live_Room_MapperSql.java

@@ -0,0 +1,58 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.ifish.mapper;
+
+import com.ifish.bean.Tbl_Live_Room;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ *
+ * @author Administrator
+ */
+public class Tbl_Live_Room_MapperSql {
+
+    /**
+     * 修改直播间信息
+     *
+     * @param live_Room
+     * @return
+     */
+    public String updateLiveRoom(@Param("live") Tbl_Live_Room live_Room) {
+        StringBuilder sb = new StringBuilder();
+
+        sb.append("UPDATE TBL_LIVE_ROOM SET ");
+
+        if (StringUtils.isNotBlank(live_Room.getCameraId())) {
+            sb.append("camera_id = #{live.cameraId}, ");
+        }
+        if (StringUtils.isNotBlank(live_Room.getRoomDesc())) {
+            sb.append("room_desc = #{live.roomDesc}, ");
+        }
+        if (StringUtils.isNotBlank(live_Room.getRoomImg())) {
+            sb.append("room_img = #{live.roomImg}, ");
+        }
+        if (StringUtils.isNotBlank(live_Room.getRoomName())) {
+            sb.append("room_name = #{live.roomName}, ");
+        }
+        if (StringUtils.isNotBlank(live_Room.getRoomStatus())) {
+            sb.append("room_status = #{live.roomStatus}, ");
+        }
+        if (live_Room.getPopularityValue() != null && live_Room.getPopularityValue() >= 0) {
+            sb.append("popularity_value = #{live.popularityValue}, ");
+        }
+        if (live_Room.getZanNum() != null && live_Room.getZanNum() >= 0) {
+            sb.append("zanNum = #{live.zanNum}, ");
+        }
+        if (sb.lastIndexOf(",") == sb.length() - 2) {
+            sb.deleteCharAt(sb.length() - 2);
+        }
+        sb.append(" WHERE room_id=#{live.roomId} ");
+
+        return sb.toString();
+    }
+
+}

src/main/java/com/ifish/push/JiGuangPush.java

@@ -1,18 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package com.ifish.push;
-
-import cn.jiguang.common.ClientConfig;
-import cn.jpush.api.JPushClient;
-import cn.jpush.api.push.model.PushPayload;
-
-/**
- *
- * @author Administrator
- */
-public class JiGuangPush {
-
-}

src/main/java/com/ifish/socket/config/ExecuteJob.java

@@ -70,47 +70,49 @@ public class ExecuteJob implements Job {
                 //是否被绑定
                 if (list != null) {
                     for (Tbl_Device_User deviceUser : list) {
-                        Integer userId = deviceUser.getUserId();
-                        String showName = deviceUser.getShowName();
-                        String title = PushTypeEnum.offline_push.getValue();
-                        String msg = "【" + title + "】你的水族箱“" + showName + "”于" + timestamp + "离线,请及时查看！";
-                        Tbl_User user = userHelperI.findById(userId);
-                        //推送记录
-                        Tbl_Push_List pushList = new Tbl_Push_List();
-                        Integer deviceId = deviceUser.getDeviceId();
-                        if (user != null) {
-                            String loginType = user.getLoginType();
-                            String registrationID = user.getJiguangUserid();
-                            if (StringUtils.isNotBlank(loginType) && StringUtils.isNotBlank(registrationID)) {
-                                Map<String, String> map = new HashMap<String, String>();
-                                map.put("device_id", deviceId.toString());
-                                map.put("device_name", showName);
-                                map.put("timestamp", timestamp);
-                                map.put("msg_type", PushTypeEnum.offline_push.getKey());
-                                //极光推送
-                                boolean result = false;
-                                if (loginType.equals("android")) {
-                                    result = jpushHelperI.pushMessageByAndroid(msg, registrationID, map);
-                                } else if (loginType.equals("ios")) {
-                                    result = jpushHelperI.pushMessageByAndroid(msg, registrationID, map);
-                                }
-                                if (result) {
-                                    //推送记录
-                                    pushList.setUserId(userId);
-                                    pushList.setDeviceId(deviceId);
-                                    pushList.setPhoneType(loginType.toLowerCase());
-                                    pushList.setShowName(showName);
-                                    pushList.setPushType(PushTypeEnum.offline_push.getKey());
-                                    pushList.setJpushStatus(result ? "1" : "0");
-                                    pushList.setPushTitle(title);
-                                    pushList.setPushContext(msg);
-                                    pushList.setCreateTime(new Date());
-                                    pushList.setMcuCount(number1);
-                                    pushList.setModularCount(number2);
-                                    pushList.setRouterCount(number3);
-                                    pushList.setServerCount(number4);
-                                    pushList.setServerTryCount(number5);
-                                    userHelperI.save(pushList);
+                        //是否开启离线提醒
+                        if (deviceUser.getOffLine().equals("1")) {
+                            Integer userId = deviceUser.getUserId();
+                            String showName = deviceUser.getShowName();
+                            String title = PushTypeEnum.offline_push.getValue();
+                            String msg = "【" + title + "】Your aquarium “" + showName + "”was off-line at" + timestamp + ",please check it with out delay！";
+                            Tbl_User user = userHelperI.findById(userId);
+                            //推送记录
+                            Tbl_Push_List pushList = new Tbl_Push_List();
+                            Integer deviceId = deviceUser.getDeviceId();
+                            if (user != null) {
+                                String loginType = user.getLoginType();
+                                if (StringUtils.isNotBlank(loginType) && userId != null) {
+                                    Map<String, String> map = new HashMap<String, String>();
+                                    map.put("device_id", deviceId.toString());
+                                    map.put("device_name", showName);
+                                    map.put("timestamp", timestamp);
+                                    map.put("msg_type", PushTypeEnum.offline_push.getKey());
+                                    //极光推送
+                                    boolean result = false;
+                                    if (loginType.equals("android")) {
+                                        result = jpushHelperI.pushMessageByAndroid(title, msg, userId.toString(), map);
+                                    } else if (loginType.equals("ios")) {
+                                        result = jpushHelperI.pushMessageByIOS(title, msg, userId.toString(), map);
+                                    }
+                                    if (result) {
+                                        //推送记录
+                                        pushList.setUserId(userId);
+                                        pushList.setDeviceId(deviceId);
+                                        pushList.setPhoneType(loginType.toLowerCase());
+                                        pushList.setShowName(showName);
+                                        pushList.setPushType(PushTypeEnum.offline_push.getKey());
+                                        pushList.setJpushStatus(result ? "1" : "0");
+                                        pushList.setPushTitle(title);
+                                        pushList.setPushContext(msg);
+                                        pushList.setCreateTime(new Date());
+                                        pushList.setMcuCount(number1);
+                                        pushList.setModularCount(number2);
+                                        pushList.setRouterCount(number3);
+                                        pushList.setServerCount(number4);
+                                        pushList.setServerTryCount(number5);
+                                        userHelperI.save(pushList);
+                                    }
                                 }
                             }
                         }

src/main/java/com/ifish/socket/config/SomeServer.java

@@ -5,7 +5,6 @@
  */
 package com.ifish.socket.config;
 
-import com.ifish.bean.LoginRecord;
 import com.ifish.bean.Tbl_Device;
 import com.ifish.bean.Tbl_Device_Statistics;
 import com.ifish.bean.Tbl_Device_User;
@@ -20,6 +19,7 @@ import com.ifish.socket.model.OrderModel;
 import com.ifish.socket.model.receive.APPLoginResponseLength26;
 import com.ifish.socket.model.receive.DeviceLoginResponseLength25;
 import com.ifish.socket.model.receive.ServerHeartbeatLength17;
+import com.ifish.socket.model.send.APPLoginContextLength25;
 import com.ifish.socket.model.send.DeviceLoginContextLength24;
 import com.ifish.socket.model.send.ModelVersionLength22;
 import com.ifish.socket.model.send.ModelVersionLength38;
@@ -45,7 +45,7 @@ import org.springframework.beans.factory.annotation.Autowired;
  * @author Administrator
  */
 public class SomeServer {
-    
+
     @Autowired
     private UserHelperI userHelperI;
     @Autowired
@@ -60,7 +60,7 @@ public class SomeServer {
 
     //是否回复心跳
     public static boolean isReplay = true;
-    
+
     private static Logger log = LoggerFactory.getLogger(SomeServer.class);
     public static ConcurrentHashMap<String, String> remoteAddress = new ConcurrentHashMap<String, String>();
     public static ConcurrentHashMap<String, IoSession> sessions_cz = new ConcurrentHashMap<String, IoSession>();
@@ -113,9 +113,9 @@ public class SomeServer {
             //推送类型
             Integer warnType = receive.getWarn_type() & 0xff;
             if (warnType == 0) {
-                pushNotifcation(strSrc, PushTypeEnum.wendu_warn.getValue(), "温度达到" + (float) receive.getWendu() / 10f + "℃，已低于" + (float) receive.getWarn_wendu() / 10f + "℃，请及时查看！");
+                pushNotifcation(strSrc, PushTypeEnum.wendu_warn.getValue(), "'s temperature is" + (float) receive.getWendu() / 10f + "℃，lower than" + (float) receive.getWarn_wendu() / 10f + "℃，");
             } else if (warnType == 1) {
-                pushNotifcation(strSrc, PushTypeEnum.wendu_warn.getValue(), "温度达到" + (float) receive.getWendu() / 10f + "℃，已高于" + (float) receive.getWarn_wendu() / 10f + "℃，请及时查看！");
+                pushNotifcation(strSrc, PushTypeEnum.wendu_warn.getValue(), "'s temperature is" + (float) receive.getWendu() / 10f + "℃，high than" + (float) receive.getWarn_wendu() / 10f + "℃，");
             } else {
                 log.error("error warn_type:{},macAddress:{}", warnType, strSrc);
             }
@@ -144,8 +144,8 @@ public class SomeServer {
                 log.warn("save device login error:macAddress:{},error msg:{}", strSrc, e.toString());
             }
         } //APP登录服务器
-        else if (message instanceof APPLoginResponseLength26) {
-            APPLoginResponseLength26 receive = (APPLoginResponseLength26) message;
+        else if (message instanceof APPLoginContextLength25) {
+            APPLoginContextLength25 receive = (APPLoginContextLength25) message;
             byte[] srcBytes = receive.getSrc();
             byte[] destBytes = receive.getDest();
             String strDest = ByteUtil.bytesToHexString(receive.getDest());
@@ -183,10 +183,10 @@ public class SomeServer {
             try {
                 //查找设备
                 Tbl_Device device = deviceHelperI.getDeviceByMacAddress(strSrc);
-                Tbl_Device_Statistics device_Statistics = null;
+                Tbl_Device_Statistics device_Statistics = deviceHelperI.getDeviceStatisticsByMacAddress(strSrc);
                 if (device != null) {
                     //是否升级
-                    if (device_Statistics.getIsUpgrade().equals("1")) {
+                    if (StringUtils.isNotBlank(device_Statistics.getIsUpgrade()) && device_Statistics.getIsUpgrade().equals("1")) {
                         device_Statistics.setIsUpgrade("0");
                         device_Statistics.setUpgradeTime(new Date());
                         //升级版本
@@ -197,7 +197,7 @@ public class SomeServer {
                     //记录参数
                     device_Statistics.setSdkVersion(String.valueOf(receive.getVersion() & 0xff));
                     device_Statistics.setSdkTime(IfishUtil.StrToDate(receive.getYear() + "-" + (receive.getMonth() & 0xff) + "-" + (receive.getDay() & 0xff)));
-                    deviceHelperI.update(device);
+                    deviceHelperI.updateDevice_Statistics(device_Statistics);
                 }
             } catch (Exception e) {
                 log.warn("save device sdk version16 error:macAddress:{},error msg:{}", strSrc, e.toString());
@@ -210,10 +210,10 @@ public class SomeServer {
             try {
                 //查找设备
                 Tbl_Device device = deviceHelperI.getDeviceByMacAddress(strSrc);
-                Tbl_Device_Statistics device_Statistics = null;
+                Tbl_Device_Statistics device_Statistics = deviceHelperI.getDeviceStatisticsByMacAddress(strSrc);
                 if (device != null) {
                     //是否升级
-                    if (device_Statistics.getIsUpgrade().equals("1")) {
+                    if (StringUtils.isNotBlank(device_Statistics.getIsUpgrade()) && device_Statistics.getIsUpgrade().equals("1")) {
                         device_Statistics.setIsUpgrade("0");
                         device_Statistics.setUpgradeTime(new Date());
                         //升级版本
@@ -229,7 +229,7 @@ public class SomeServer {
                     device_Statistics.setRouterCount(receive.getNumber3());
                     device_Statistics.setServerCount(receive.getNumber4());
                     device_Statistics.setServerTryCount(receive.getNumber5());
-                    deviceHelperI.update(device);
+                    deviceHelperI.updateDevice_Statistics(device_Statistics);
                 }
             } catch (Exception e) {
                 log.warn("save device sdk version17 error:macAddress:{},error msg:{}", strSrc, e.toString());
@@ -304,14 +304,13 @@ public class SomeServer {
                         Integer userId = deviceUser.getUserId();
                         String showName = deviceUser.getShowName();
                         String timestamp = IfishUtil.format(new Date());
-                        String msg = "【" + title + "】你的水族箱“" + showName + "”在" + timestamp + contont;
+                        String msg = "【" + title + "】Your aquarium “" + showName + "”" + contont + "at" + timestamp + ", please check it with out delay!";
                         Tbl_User user = userHelperI.findById(userId);
                         if (user != null) {
                             //极光推送
                             boolean result = false;
                             String loginType = user.getLoginType();
-                            String registrationID = user.getJiguangUserid();
-                            if (StringUtils.isNotBlank(loginType) && StringUtils.isNotBlank(registrationID)) {
+                            if (StringUtils.isNotBlank(loginType) && userId != null) {
                                 //推送记录
                                 Tbl_Push_List pushList = new Tbl_Push_List();
                                 Map<String, String> map = new HashMap<String, String>();
@@ -319,11 +318,11 @@ public class SomeServer {
                                 map.put("device_name", showName);
                                 map.put("timestamp", timestamp);
                                 map.put("msg_type", PushTypeEnum.wendu_warn.getKey());
-                                
+
                                 if (loginType.equals("android")) {
-                                    result = jpushHelperI.pushMessageByAndroid(msg, registrationID, map);
+                                    result = jpushHelperI.pushMessageByAndroid(title, msg, userId.toString(), map);
                                 } else if (loginType.equals("ios")) {
-                                    result = jpushHelperI.pushMessageByAndroid(msg, registrationID, map);
+                                    result = jpushHelperI.pushMessageByIOS(title, msg, userId.toString(), map);
                                 }
                                 //记录推送
                                 if (result) {
@@ -346,7 +345,7 @@ public class SomeServer {
                             }
                         }
                     }
-                    
+
                 }
             }
         } catch (Exception e) {

src/main/java/com/ifish/util/IfishFilePath.java

@@ -16,40 +16,20 @@ import java.util.Properties;
  */
 public class IfishFilePath {
 
-    //头像地址
-    public static String path_img;
     /**
      * 图片头地址
      */
     public static String link_img_head;
-    //商家图片地址
-    public static String path_shops;
-    //商品介绍图片
-    public static String path_commodity;
-    //微信分享页面
-    public static String path_share_html;
-    //微信分享页图片
-    public static String path_share_img;
-    //看护报告页面
-    public static String path_look_html;
-    //看护报告图片
-    public static String path_look_img;
-    //html名字
-    public static String html_name;
     //图片上传格式
     public static String check_style;
-    //云信爱鱼奇官方帐号
-    public static String ifish_account;
-    //IM官方手机号
-    public static String netease_phone;
-    //直播间封面
-    public static String path_room_img;
-    //FastDFS商家视频上传URL访问路径(本地和测试环境)
-    public static String fastDFS_url_local;
-    //FastDFS商家视频上传URL访问路径(正式环境)
-    public static String fastDFS_url_app;
-    //开发模式
-    public static boolean devModel;
+
+    public static String AppKeyFormal;
+
+    public static String MasterSecretFormal;
+
+    public static String AppKey;
+
+    public static String MasterSecret;
     //本机IP
     public static String ifiship;
     //本机端口

src/main/java/com/ifish/util/IfishUtil.java

@@ -59,6 +59,19 @@ public class IfishUtil {
      */
     public static final int CacheTime_DAYS = 1;
 
+    /**
+     * 是否在线上运行,true在线上，false在测试环境
+     *
+     * @return
+     */
+    public static boolean isOnLine() {
+        if (IfishFilePath.link_img_head.contains("ifish7")) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
     /**
      * Object转Json
      */
@@ -140,7 +153,6 @@ public class IfishUtil {
         }
     }
 
-
     //返回时分秒的时间字符串
     public static String TimestampToStringAndSecond(Object timestamp) {
         DateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

src/main/java/com/ifish/util/RedisKey.java

@@ -15,6 +15,34 @@ public class RedisKey {
      * 用户缓存前缀,以id进行存储
      */
     public static final String USER_ID_KEY = "userE:id_";
+    /**
+     * 用户缓存前缀,以手机号进行存储
+     */
+    public static final String USER_PHONE = "userE:ph_";
+    /**
+     * 用户缓存前缀,以邮箱进行存储
+     */
+    public static final String USER_EMAIL = "userE:ema_";
+    /**
+     * 用户列表缓存前缀
+     */
+    public static final String USER_LIST = "userlistE:";
+    /**
+     * 用户列表总数缓存前缀(带条件)
+     */
+    public static final String USER_LIST_COUNT = "userlistcountE:";
+    /**
+     * 所有用户列表缓存前缀（不需条件）
+     */
+    public static final String USER_LIST_COUNT_ALL = "alluserlistcountE";
+    /**
+     * 用户缓存前缀，以token进行存储
+     */
+    public static final String USER_TOKEN = "userE:to_";
+    /**
+     * 管理用户缓存前缀
+     */
+    public static final String SECURITY_USER = "seuserE:un_";
 
     /**
      * 设备用户关系缓存前缀，以设备ID和用户ID进行存储
@@ -26,6 +54,11 @@ public class RedisKey {
      */
     public static final String DEVICE_USER_LIST_DEVICEID = "deviceUserlistE:id_";
 
+    /**
+     * 设备用户关系缓存前缀（列表），以用户ID进行存储
+     */
+    public static final String DEVICE_USER_LIST_USERID = "deviceUserlistE:u_";
+
     /**
      * 设备详情缓存前缀，以macAddress进行存储
      */
@@ -36,6 +69,11 @@ public class RedisKey {
      */
     public static final String DEVICE_KEY_DEVICEID = "deviceE:id_";
 
+    /**
+     * 设备详情缓存前缀，以摄像头ID进行存储
+     */
+    public static final String DEVICE_KEY_CAMERAID = "deviceE:cid_";
+
     /**
      * 设备统计信息表缓存前缀,以deviceId为前缀
      */
@@ -51,4 +89,64 @@ public class RedisKey {
      */
     public static final String HARD_WARE_TYPE = "hardwaretypeE:";
 
+    /**
+     * 鱼缸厂统计表缓存前缀，以鱼缸场代码进行存储
+     */
+    public static final String VENDER_CODE = "tblvenderE:code_";
+
+    /**
+     * 直播间详情表缓存前缀，以直播间ID进行存储
+     */
+    public static final String LIVEROOM_ROOMID = "liveroomE:id_";
+
+    /**
+     * 直播间详情表缓存前缀，以摄像头ID进行存储
+     */
+    public static final String LIVEROOM_CAMERAID = "liveroomE:cid_";
+
+    /**
+     * 直播间详情表缓存前缀，以直播间ID进行存储
+     */
+    public static final String LIVEROOM_USERID = "liveroomE:uid_";
+
+    /**
+     * 直播间列表缓存前缀，以分页和排序条件进行存储
+     */
+    public static final String LIVEROMM_LIST = "liveroomlistE:";
+
+    /**
+     * 所有开启的直播间缓存总数
+     */
+    public static final String LIVEROOM_COUNT = "liveroomE:num_";
+
+    /**
+     * 指定直播间评论列表
+     */
+    public static final String LIVEMESSAGE_ROOMID = "livemessageE:rid_";
+
+    /**
+     * 指定直播间评论总数
+     */
+    public static final String LIVEMESSAGE_COUNT = "livemessageCtE:rid_";
+
+    /**
+     * 推送信息表缓存前缀，以推送Id进行存储
+     */
+    public static final String PUSHLIST_PUSHID = "pushlistE:id_";
+
+    /**
+     * 后台推送列表缓存条件
+     */
+    public static final String PUSHLIST_SELECT = "pushlistE:se_";
+
+    /**
+     * 邮箱验证有效缓存key
+     */
+    public static final String EMAIL_REGIESTER = "emailkeyE:";
+
+    /**
+     * 邮箱验证修改密码有效缓存key
+     */
+    public static final String EMAIL_UPDATEPASSWORD = "emialupE:";
+
 }

src/main/resources/property.properties

@@ -1,29 +1,11 @@
-#\u5934\u50cf\u5b58\u50a8\u8def\u5f84
-path_img=/mydata/tmp/Img/app
-#\u5546\u5bb6\u8ba4\u8bc1\u56fe\u7247
-path_shops=/mydata/tmp/Img/shops
-#\u5546\u54c1\u4ecb\u7ecd\u56fe\u7247
-path_commodity=/mydata/tmp/Img/commodity
-#\u76f4\u64ad\u95f4\u5c01\u9762
-path_room_img=/mydata/tmp/Img/room
-#\u5fae\u4fe1\u5206\u4eab\u9875\u9762
-path_share_html=/mydata/tmp/html/
-#\u5fae\u4fe1\u5206\u4eab\u9875\u56fe\u7247
-path_share_img=/mydata/tmp/html/images/share
-#\u770b\u62a4\u62a5\u544a\u9875\u9762
-path_look_html=/mydata/tmp/look/
-#\u770b\u62a4\u62a5\u544a\u56fe\u7247
-path_look_img=/mydata/tmp/look/images/share
-#\u770b\u62a4\u62a5\u544a\u6a21\u7248html\u540d\u5b57
-html_name=index.html
-#\u4e91\u4fe1\u7231\u9c7c\u5947\u5b98\u65b9\u5e10\u53f7
-ifish_account=ifish
-#IM\u5b98\u65b9\u624b\u673a\u53f7
-netease_phone=18501773036
-#FastDFS\u6587\u4ef6URL\u8bbf\u95ee\u8def\u5f84(\u672c\u5730\u548c\u6d4b\u8bd5\u73af\u5883)
-fastDFS_url_local=https://app.zhangxinyanv5.top/
-#FastDFS\u6587\u4ef6URL\u8bbf\u95ee\u8def\u5f84(\u6b63\u5f0f\u73af\u5883)
-fastDFS_url_app=http://app.ifish7.com/
+#\u6b63\u5f0f\u73af\u5883\u6781\u5149AppKey
+AppKeyFormal=123
+#\u6b63\u5f0f\u73af\u5883\u6781\u5149Master Secret
+MasterSecretFormal=123
+#\u6d4b\u8bd5\u73af\u5883\u6781\u5149AppKey
+AppKey=6e5e9d757570859b3f274bb8
+#\u6d4b\u8bd5\u73af\u5883\u6781\u5149Master Secret
+MasterSecret=4f759a0609dcd9d2edb06125
 #\u672c\u5730
 #link_img_head=http://192.168.61.128:81/
 #\u6d4b\u8bd5\u73af\u5883
@@ -32,11 +14,8 @@ fastDFS_url_app=http://app.ifish7.com/
 link_img_head=https://app.ifish7.com/
 #\u56fe\u7247\u683c\u5f0f\u9a8c\u8bc1
 check_style=GIF,PNG,BMP,JPG,JPEG
-#\u662f\u5426\u5f00\u53d1\u6a21\u5f0f\uff0cfalse\u5219\u4ee3\u8868\u8981\u53d1\u5e03\u5230\u6d4b\u8bd5\u6216\u8005\u6b63\u5f0f\u73af\u5883\uff0c\u4f1a\u8fdb\u884c\u5168\u5c40\u5934\u90e8\u9a8c\u8bc1\uff0ctrue\u4ee3\u8868\u5728\u672c\u5730\u8fdb\u884c\u4ee3\u7801\u7f16\u5199\uff0c\u4e0d\u4f1a\u8fdb\u884c\u9a8c\u8bc1
-devModel=true
 #\u672c\u5730
 ifiship=192.168.199.129
-#ifiship=192.168.2.146
 #\u6d4b\u8bd5\u4e91
 #ifiship=139.196.24.156
 #\u6b63\u5f0f\u4e91