Merge pull request #23 from bitkylin/developer

Developer 阶段更新为1.9.2版

Author: bitkylin

ClusterDevicePlatform-client/build.gradle

@@ -1,11 +1,9 @@
 buildscript {
     ext {
-        springBootVersion = '2.0.0.RC2'
+        springBootVersion = '2.0.0.RELEASE'
     }
     repositories {
         mavenCentral()
-        maven { url "https://repo.spring.io/snapshot" }
-        maven { url "https://repo.spring.io/milestone" }
     }
     dependencies {
         classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
@@ -18,13 +16,11 @@ apply plugin: 'org.springframework.boot'
 apply plugin: 'io.spring.dependency-management'
 
 group = 'cc.bitky.ClusterDevicePlatform'
-version = '1.8.9-release'
+version = '1.9.1-release'
 sourceCompatibility = 1.8
 
 repositories {
     mavenCentral()
-    maven { url "https://repo.spring.io/snapshot" }
-    maven { url "https://repo.spring.io/milestone" }
 }
 
 tasks.withType(JavaCompile) {
@@ -34,12 +30,12 @@ tasks.withType(JavaCompile) {
 dependencies {
     compile('org.springframework.boot:spring-boot-starter')
     compile('org.springframework.boot:spring-boot-starter-web')
-    compile group: 'io.netty', name: 'netty-all', version: '4.1.19.Final'
-    compile group: 'com.alibaba', name: 'fastjson', version: '1.2.44'
+    compile group: 'io.netty', name: 'netty-all', version: '4.1.22.Final'
+    compile group: 'com.alibaba', name: 'fastjson', version: '1.2.46'
     compile 'com.jfoenix:jfoenix:1.10.0'
     compile 'io.datafx:datafx:8.0.1'
     compile 'io.datafx:flow:8.0.1'
-    compile files('../messageUtils/build/libs/messageUtils-1.8.jar')
+    compile files('../messageUtils/build/libs/messageUtils-1.9.1.jar')
 
     testCompile('org.springframework.boot:spring-boot-starter-test')
 }

ClusterDevicePlatform-client/src/main/java/cc/bitky/clusterdeviceplatform/client/config/CommSetting.java

@@ -4,7 +4,7 @@ public class CommSetting {
     /**
      * 待发送缓冲队列中，帧发送间隔「单位/ms」
      */
-    public static int FRAME_SEND_INTERVAL = 50;
+    public static int FRAME_SEND_INTERVAL = 10;
     /**
      * 服务器主机名
      */

ClusterDevicePlatform-client/src/main/java/cc/bitky/clusterdeviceplatform/client/server/ServerWebHandler.java

@@ -73,6 +73,6 @@ private void createNeedMsg(int probability, int errorProbability, int count) {
     }
 
     public void runTest1() {
-        createNeedMsg(1, 1, 1);
+        createNeedMsg(1, 1, 100);
     }
 }

ClusterDevicePlatform-server/.gitignore

@@ -1,6 +1,7 @@
 setting
 src/test/java/
 *.exe
+*.dll
 
 /.gradle/
 /build/

ClusterDevicePlatform-server/build.gradle

@@ -1,11 +1,9 @@
 buildscript {
     ext {
-        springBootVersion = '2.0.0.RC2'
+        springBootVersion = '2.0.0.RELEASE'
     }
     repositories {
         mavenCentral()
-        maven { url "https://repo.spring.io/snapshot" }
-        maven { url "https://repo.spring.io/milestone" }
     }
     dependencies {
         classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
@@ -18,13 +16,11 @@ apply plugin: 'org.springframework.boot'
 apply plugin: 'io.spring.dependency-management'
 
 group = 'cc.bitky.ClusterDevicePlatform'
-version = '1.8.9-release'
+version = '1.9.2-release'
 sourceCompatibility = 1.8
 
 repositories {
     mavenCentral()
-    maven { url "https://repo.spring.io/snapshot" }
-    maven { url "https://repo.spring.io/milestone" }
 }
 
 tasks.withType(JavaCompile) {
@@ -34,7 +30,8 @@ tasks.withType(JavaCompile) {
 dependencies {
     compile('org.springframework.boot:spring-boot-starter-data-mongodb-reactive')
     compile('org.springframework.boot:spring-boot-starter-web')
-    compile 'io.netty:netty-all:4.1.19.Final'
-    compile 'com.alibaba:fastjson:1.2.44'
-    compile files('../messageUtils/build/libs/messageUtils-1.8.jar')
+    compile 'io.netty:netty-all:4.1.22.Final'
+    compile 'com.alibaba:fastjson:1.2.46'
+    testCompile('org.springframework.boot:spring-boot-starter-test')
+    compile files('../messageUtils/build/libs/messageUtils-1.9.1.jar')
 }

ClusterDevicePlatform-server/src/main/java/cc/bitky/clusterdeviceplatform/server/ServerApplication.java

@@ -20,6 +20,7 @@
 import cc.bitky.clusterdeviceplatform.server.config.DbSetting;
 import cc.bitky.clusterdeviceplatform.server.config.LocalProfile;
 import cc.bitky.clusterdeviceplatform.server.config.ServerSetting;
+import cc.bitky.clusterdeviceplatform.server.server.statistic.utils.IpUtil;
 
 @SpringBootApplication
 public class ServerApplication {
@@ -99,6 +100,7 @@ private static boolean initSetting() {
         if (localProfile != null) {
             trimProfileProperty(localProfile);
             DbSetting.MONGODB_HOST = localProfile.数据库服务器的主机名或IP;
+            DbSetting.MONGODB_IP =  IpUtil.getIP(DbSetting.MONGODB_HOST)[0];
             CommSetting.FRAME_SEND_INTERVAL = localProfile.帧发送间隔;
             CommSetting.DEPLOY_REMAIN_CHARGE_TIMES = localProfile.部署剩余充电次数阈值 >= CommSetting.REMAIN_CHARGE_TIMES_CLEAR ? CommSetting.REMAIN_CHARGE_TIMES_CLEAR - 1 : localProfile.部署剩余充电次数阈值;
             DbSetting.DEFAULT_EMPLOYEE_CARD_NUMBER = localProfile.员工默认卡号;

ClusterDevicePlatform-server/src/main/java/cc/bitky/clusterdeviceplatform/server/config/DbSetting.java

@@ -9,6 +9,10 @@ public class DbSetting {
      * MongoDB 的端口号
      */
     public static int MONGODB_PORT = 27017;
+    /**
+     * MongoDB 的IP地址
+     */
+    public static String MONGODB_IP = "未知";
     /**
      * 数据库
      */

ClusterDevicePlatform-server/src/main/java/cc/bitky/clusterdeviceplatform/server/config/ServerSetting.java

@@ -14,7 +14,7 @@ public class ServerSetting {
     /**
      * 项目版本号
      */
-    public static final String VERSION = "1.8.9";
+    public static final String VERSION = "1.9.1";
     /**
      * 本地配置文件名
      */

ClusterDevicePlatform-server/src/main/java/cc/bitky/clusterdeviceplatform/server/db/DbPresenter.java

@@ -22,7 +22,7 @@
 import cc.bitky.clusterdeviceplatform.server.db.operate.DeviceOperate;
 import cc.bitky.clusterdeviceplatform.server.db.operate.EmployeeOperate;
 import cc.bitky.clusterdeviceplatform.server.db.statistic.repo.ProcessedMsgRepo;
-import cc.bitky.clusterdeviceplatform.server.db.work.bean.StatusItem;
+import cc.bitky.clusterdeviceplatform.server.server.repo.bean.StatusItem;
 import cc.bitky.clusterdeviceplatform.server.server.repo.DeviceStatusRepository;
 import cc.bitky.clusterdeviceplatform.server.server.repo.TcpFeedBackRepository;
 import cc.bitky.clusterdeviceplatform.server.tcp.statistic.except.TcpFeedbackItem;
@@ -108,17 +108,6 @@ public StatusItem obtainStatusByCache(int groupId, int deviceId, MsgReplyDeviceS
         return deviceStatusRepository.getStatus(groupId, deviceId, type);
     }
 
-    /**
-     * 获取设备组最近通信时刻的时间戳
-     *
-     * @param groupId 设备组 ID
-     * @return 特定的时间戳
-     */
-    public long getDeviceGroupRecentCommTime(int groupId) {
-        return deviceStatusRepository.getDeviceGroupRecentCommTime(groupId);
-    }
-
-
     /**
      * 总帧数统计
      *

ClusterDevicePlatform-server/src/main/java/cc/bitky/clusterdeviceplatform/server/db/bean/Employee.java

@@ -4,20 +4,20 @@
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.core.mapping.Field;
 
+import java.util.Objects;
+
 @Document(collection = "Employee")
 public class Employee {
 
     @Id
     private String id;
 
-    //个人信息
     @Field("Name")
     private String name;
 
     @Field("Department")
     private String department;
 
-    //设备位置
     @Field("GroupId")
     private int groupId;
 
@@ -79,4 +79,26 @@ public String toString() {
                 ", deviceId=" + deviceId +
                 '}';
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        Employee employee = (Employee) o;
+        return groupId == employee.groupId &&
+                deviceId == employee.deviceId &&
+                Objects.equals(id, employee.id) &&
+                Objects.equals(name, employee.name) &&
+                Objects.equals(department, employee.department);
+    }
+
+    @Override
+    public int hashCode() {
+
+        return Objects.hash(id, name, department, groupId, deviceId);
+    }
 }