Merge remote-tracking branch 'origin/master'

pqs-common/common-influxdb/src/main/java/com/njcn/influxdb/param/InfluxDBPublicParam.java

@@ -163,6 +163,8 @@ public interface InfluxDBPublicParam {
      * 时区
      */
     String TIME_ZONE = " tz('Asia/Shanghai')";
+    String TZ = "Asia/Shanghai";
+
 
     /**
      * 日起始时间
@@ -261,4 +263,9 @@ public interface InfluxDBPublicParam {
      */
     String PHASIC_TYPET = "T";
 
+    /**
+     * 每天固定时间分钟
+     */
+    Integer DAY_MINUTE = 1440;
+
 }

pqs-common/common-web/src/main/java/com/njcn/web/constant/ValidMessage.java

@@ -60,4 +60,6 @@ public interface ValidMessage {
 
     String IP_FORMAT_ERROR = "IP格式非法";
 
+    String DEVICE_VERSION_NOT_BLANK = "装置版本json文件不能为空，请检查deviceVersionFile参数";
+
 }