ソースを参照

删除无用信息

chenyi406 3 年 前
コミット
088e513cff

+ 4 - 2
src/main/java/com/zy/bms/common/Constant.java

@@ -1,6 +1,8 @@
 package com.zy.bms.common;
 package com.zy.bms.common;
 
 
 /**
 /**
+ * 常量
+ *
  * @author yang xiao kun
  * @author yang xiao kun
  * create on 2021/2/2
  * create on 2021/2/2
  */
  */
@@ -12,8 +14,8 @@ public class Constant {
     /**
     /**
      * redis key前缀
      * redis key前缀
      */
      */
-    public static final String REDIS_LOCATION = "bms:device:location";//数据上传位置信息前缀
-    public static final String REDIS_TOKEN_PREFIX = "user:token:";//PC管理员登录token 前缀
+    public static final String REDIS_LOCATION = "omp:device:location";//数据上传位置信息前缀
+    public static final String REDIS_TOKEN_PREFIX = "omp:user:token:";//PC管理员登录token 前缀
 
 
     /**
     /**
      * MQTT 协议报文 中 M值
      * MQTT 协议报文 中 M值

+ 0 - 4
src/main/java/com/zy/bms/common/ServerResponse.java

@@ -42,10 +42,6 @@ public class ServerResponse implements Serializable {
         return new ServerResponse(ResponseCode.AUTHOR.code, null, ResponseCode.AUTHOR.msg);
         return new ServerResponse(ResponseCode.AUTHOR.code, null, ResponseCode.AUTHOR.msg);
     }
     }
 
 
-    public static ServerResponse createByIllegal() {
-        return new ServerResponse(ResponseCode.ILLEGAL.code, null, ResponseCode.ILLEGAL.msg);
-    }
-
     private ServerResponse(int status, Object data, String msg) {
     private ServerResponse(int status, Object data, String msg) {
         this.status = status;
         this.status = status;
         this.msg = msg;
         this.msg = msg;

+ 0 - 4
src/main/java/com/zy/bms/common/exception/ApiRuntimeException.java

@@ -20,8 +20,4 @@ public class ApiRuntimeException extends RuntimeException {
     public String getMessage() {
     public String getMessage() {
         return msg;
         return msg;
     }
     }
-
-    public String getMsg() {
-        return msg;
-    }
 }
 }

+ 1 - 1
src/main/resources/mapper/DeviceMapping.xml

@@ -5,11 +5,11 @@
     <select id="listPage" resultType="com.zy.bms.common.vo.DeviceFullDataVo">
     <select id="listPage" resultType="com.zy.bms.common.vo.DeviceFullDataVo">
         SELECT
         SELECT
             t1.num             AS deviceNum,
             t1.num             AS deviceNum,
+            t1.clientId        AS deviceId,
             t1.password,
             t1.password,
             t1.createTime,
             t1.createTime,
             t1.status,
             t1.status,
             t1.lastOnlineTime,
             t1.lastOnlineTime,
-            t2.deviceId,
             t2.`mode`,
             t2.`mode`,
             t2.lon,
             t2.lon,
             t2.lat,
             t2.lat,