feat: 解决部分协议冲突

guzijian
1 parent d266a714
Showing 8 changed files with 116 additions and 95 deletions
Bsth-admin/src/main/java/com/ruoyi/common/cache/NowSchedulingCache.java
Bsth-admin/src/main/java/com/ruoyi/common/cache/SchedulingCache.java
Bsth-admin/src/main/java/com/ruoyi/system/protocol/ThinkraceUtil.java
Bsth-admin/src/main/java/com/ruoyi/system/protocol/adapter/callback/ICallbackHeartCheckPacketAdapter.java
Bsth-admin/src/main/java/com/ruoyi/system/protocol/adapter/device/IQueryBluetoothPacketAdapter.java
Bsth-admin/src/main/java/com/ruoyi/system/protocol/adapter/device/ITemperature50PacketAdapter.java
Bsth-admin/src/main/resources/application-druid-dev.yml
Bsth-admin/src/main/resources/application-druid-uat.yml
@@ -29,7 +29,7 @@ public class NowSchedulingCache {
         this.schedulingMapper = driverSchedulingMapper;
         this.errorJobcodeService = errorJobcodeService;
         log.info("项目启动加载中获取排班表并存入缓存-----");
-        cacheNowDaySchedulingInit();
+//        cacheNowDaySchedulingInit();
     }
     /**
@@ -36,7 +36,7 @@ public class SchedulingCache {
     public SchedulingCache(SchedulerProperty property) {
         log.info("项目启动加载中获取实时班次并存入缓存-----");
-        schedulingInit(property);
+//        schedulingInit(property);
     }
@@ -26,7 +26,7 @@ public class ThinkraceUtil {
     private static final String COMMAND_SEND = "command:send:";
     public static final Integer COMMAND_LABEL_SURE = 1;
     public static final Integer COMMAND_LABEL_INIT = 0;
-    private static final Long SN_LENGTH = 1000000L;
+    public static final Long SN_LENGTH = 1000000L;
     private static RedisCache REDIS_CACHE;
     /**
      * 指令列表
@@ -109,6 +109,7 @@ public class ThinkraceUtil {
         public static final String ALARM_REQ = "IWAP10";
         public static final String IMAGE_REQ = "IWAP42";
         public static final String HEART_REQ = "IWAP49";
+        // 这两协议 在st2和智能手表标准协议中都有
         public static final String TEMPERATURE_50_REQ = "IWAP50";
         public static final String QUERY_BLUETOOTH_REQ = "IWAP51";
         public static final String CDMA_GPS_REQ = "IWAP91";
@@ -140,7 +141,7 @@ public class ThinkraceUtil {
         public static final String SOS_REQ = "IWAP12";
-        public static final String UPLOAD_GPS_TIME_REQ = "IWAP15";
+        public static final String UPLOAD_GPS_TIME_REQ = "IWAP16";
         public static final String RECOVERY_RESET_REQ = "IWAP17";
         public static final String RESET_POWER_REQ = "IWAP18";
 package com.ruoyi.system.protocol.adapter.callback;
+import com.ruoyi.system.domain.command.HealthInfo;
 import com.ruoyi.system.protocol.ThinkraceUtil;
 import com.ruoyi.system.protocol.adapter.ICommandAdapter;
+import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.util.AttributeKey;
+import io.netty.util.CharsetUtil;
 import org.springframework.stereotype.Service;
 @Service(ThinkraceUtil.REQ.HEART_CHECK_REQ)
 public class ICallbackHeartCheckPacketAdapter extends ICommandAdapter {
     @Override
     public Object resolveCommand(String command, ChannelHandlerContext ctx) {
-        //终端响应格式：
-        //IWAP50,指令流水号,执行结果#	终端响应示例：
-        //IWAP50,080835,1#
-        //080835:指令流水号
-        //1：表示终端执行成功,0 表示终端执行失败
-        //心跳数据检测完成后，终端使用 AP49 上传心跳检测数据
-        String[] params = command.replace(ThinkraceUtil.END_SYMBOL, "").split(",");
-        String sn = params[1];
-        // TODO
-        String result = params[2];
-        String imei = ctx.channel().attr(AttributeKey.valueOf(ThinkraceUtil.IMEI)).toString();
-        return ThinkraceUtil.askCommand("下发心跳检测指令", imei, command, sn);
+        // IWAP50,36.7,90#
+        String sub = command.substring(0, command.length() - 1);
+        String[] params = sub.split(",");
+        String param = params[1];
+        if (param.length() == ThinkraceUtil.SN_LENGTH.toString().length() - 1) {
+            //终端响应格式：
+            //IWAP50,指令流水号,执行结果#	终端响应示例：
+            //IWAP50,080835,1#
+            //080835:指令流水号
+            //1：表示终端执行成功,0 表示终端执行失败
+            //心跳数据检测完成后，终端使用 AP49 上传心跳检测数据
+            String sn = params[1];
+            // TODO
+            String result = params[2];
+            String imei = ctx.channel().attr(AttributeKey.valueOf(ThinkraceUtil.IMEI)).toString();
+            return ThinkraceUtil.askCommand("下发心跳检测指令", imei, command, sn);
+        }
+        HealthInfo hi = new HealthInfo();
+        hi.setImei(ctx.channel().attr(AttributeKey.valueOf(ThinkraceUtil.IMEI)).toString());
+        log.info("设备:{},温度数据上传命令:{}", hi.getImei(), command);
+        hi.setTemperature(Float.parseFloat(params[1]));
+        hi.setPower(params[2]);
+        // IWBP50#
+        String response = ThinkraceUtil.RES.TEMPERATURE_50_RES + ThinkraceUtil.END_SYMBOL;
+        ctx.channel().writeAndFlush(Unpooled.copiedBuffer(response, CharsetUtil.UTF_8));
+        responseLog(hi.getImei(), response);
+        return hi;
+
+
     }
     @Override
-package com.ruoyi.system.protocol.adapter.device;
-
-import com.ruoyi.system.protocol.ThinkraceUtil;
-import com.ruoyi.system.protocol.adapter.ICommandAdapter;
-import io.netty.buffer.Unpooled;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.util.AttributeKey;
-import io.netty.util.CharsetUtil;
-import org.springframework.stereotype.Service;
-
-/**
- * 10	查询手表对应的蓝牙温度计SN
- *
- * @author 20412
- */
-@Service(ThinkraceUtil.REQ.QUERY_BLUETOOTH_REQ)
-public class IQueryBluetoothPacketAdapter extends ICommandAdapter {
-
-    @Override
-    public Object resolveCommand(String command, ChannelHandlerContext ctx) {
-        String imei = ctx.channel().attr(AttributeKey.valueOf(ThinkraceUtil.IMEI)).toString();
-        log.info("设备:{},查询手表对应的蓝牙温度计SN命令:{}", imei, command);
-        // IWBP51,123456#
-        String response = ThinkraceUtil.RES.QUERY_BLUETOOTH_RES + "," + 123456 + ThinkraceUtil.END_SYMBOL;
-        ctx.channel().writeAndFlush(Unpooled.copiedBuffer(response, CharsetUtil.UTF_8));
-        responseLog(imei, response);
-        return null;
-    }
-
-    @Override
-    public CommandListen sendCommand(Object params) {
-        return null;
-    }
-}
+//package com.ruoyi.system.protocol.adapter.device;
+//
+//import com.ruoyi.system.protocol.ThinkraceUtil;
+//import com.ruoyi.system.protocol.adapter.ICommandAdapter;
+//import io.netty.buffer.Unpooled;
+//import io.netty.channel.ChannelHandlerContext;
+//import io.netty.util.AttributeKey;
+//import io.netty.util.CharsetUtil;
+//import org.springframework.stereotype.Service;
+//
+///**
+// * 10	查询手表对应的蓝牙温度计SN
+// *
+// * @author 20412
+// */
+//@Service(ThinkraceUtil.REQ.QUERY_BLUETOOTH_REQ)
+//public class IQueryBluetoothPacketAdapter extends ICommandAdapter {
+//
+//    @Override
+//    public Object resolveCommand(String command, ChannelHandlerContext ctx) {
+//        String imei = ctx.channel().attr(AttributeKey.valueOf(ThinkraceUtil.IMEI)).toString();
+//        log.info("设备:{},查询手表对应的蓝牙温度计SN命令:{}", imei, command);
+//        // IWBP51,123456#
+//        String response = ThinkraceUtil.RES.QUERY_BLUETOOTH_RES + "," + 123456 + ThinkraceUtil.END_SYMBOL;
+//        ctx.channel().writeAndFlush(Unpooled.copiedBuffer(response, CharsetUtil.UTF_8));
+//        responseLog(imei, response);
+//        return null;
+//    }
+//
+//    @Override
+//    public CommandListen sendCommand(Object params) {
+//        return null;
+//    }
+//}
-package com.ruoyi.system.protocol.adapter.device;
-
-import com.ruoyi.system.domain.command.HealthInfo;
-import com.ruoyi.system.protocol.ThinkraceUtil;
-import com.ruoyi.system.protocol.adapter.ICommandAdapter;
-import io.netty.buffer.Unpooled;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.util.AttributeKey;
-import io.netty.util.CharsetUtil;
-import org.springframework.stereotype.Service;
-
-/**
- * 9	温度数据上传
- *
- * @author 20412
- */
-@Service(ThinkraceUtil.REQ.TEMPERATURE_50_REQ)
-public class ITemperature50PacketAdapter extends ICommandAdapter {
-
-    @Override
-    public Object resolveCommand(String command, ChannelHandlerContext ctx) {
-        // IWAP50,36.7,90#
-        String sub = command.substring(0, command.length() - 1);
-        String[] params = sub.split(",");
-        HealthInfo hi = new HealthInfo();
-        hi.setImei(ctx.channel().attr(AttributeKey.valueOf(ThinkraceUtil.IMEI)).toString());
-        log.info("设备:{},温度数据上传命令:{}", hi.getImei(), command);
-        hi.setTemperature(Float.parseFloat(params[1]));
-        hi.setPower(params[2]);
-        // IWBP50#
-        String response = ThinkraceUtil.RES.TEMPERATURE_50_RES + ThinkraceUtil.END_SYMBOL;
-        ctx.channel().writeAndFlush(Unpooled.copiedBuffer(response, CharsetUtil.UTF_8));
-        responseLog(hi.getImei(), response);
-        return hi;
-    }
-
-    @Override
-    public CommandListen sendCommand(Object params) {
-        return null;
-    }
-}
+//package com.ruoyi.system.protocol.adapter.device;
+//
+//import com.ruoyi.system.domain.command.HealthInfo;
+//import com.ruoyi.system.protocol.ThinkraceUtil;
+//import com.ruoyi.system.protocol.adapter.ICommandAdapter;
+//import io.netty.buffer.Unpooled;
+//import io.netty.channel.ChannelHandlerContext;
+//import io.netty.util.AttributeKey;
+//import io.netty.util.CharsetUtil;
+//import org.springframework.stereotype.Service;
+//
+///**
+// * 9	温度数据上传
+// *
+// * @author 20412
+// */
+//@Service(ThinkraceUtil.REQ.TEMPERATURE_50_REQ)
+//public class ITemperature50PacketAdapter extends ICommandAdapter {
+//
+//    @Override
+//    public Object resolveCommand(String command, ChannelHandlerContext ctx) {
+//        // IWAP50,36.7,90#
+//        String sub = command.substring(0, command.length() - 1);
+//        String[] params = sub.split(",");
+//        HealthInfo hi = new HealthInfo();
+//        hi.setImei(ctx.channel().attr(AttributeKey.valueOf(ThinkraceUtil.IMEI)).toString());
+//        log.info("设备:{},温度数据上传命令:{}", hi.getImei(), command);
+//        hi.setTemperature(Float.parseFloat(params[1]));
+//        hi.setPower(params[2]);
+//        // IWBP50#
+//        String response = ThinkraceUtil.RES.TEMPERATURE_50_RES + ThinkraceUtil.END_SYMBOL;
+//        ctx.channel().writeAndFlush(Unpooled.copiedBuffer(response, CharsetUtil.UTF_8));
+//        responseLog(hi.getImei(), response);
+//        return hi;
+//    }
+//
+//    @Override
+//    public CommandListen sendCommand(Object params) {
+//        return null;
+//    }
+//}
@@ -184,7 +184,7 @@ server:
     port: 8100
 netty:
     # 是否开启netty服务
-    enabled: false
+    enabled: true
     socket:
         # 相对路径 classpath
         catalogue:
@@ -133,7 +133,7 @@ ruoyi:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-  profile: /home/sign/uploadPath
+  profile: /home/health/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数字计算 char 字符验证
@@ -198,10 +198,10 @@ api:
     people:
       url: https://api.dingtalk.com/v1.0/yida/forms/instances/search
 log:
-  path: /home/sign/logs
+  path: /home/health/logs
 netty:
   # 是否开启netty服务
-  enabled: false
+  enabled: true
   socket:
     # 相对路径 classpath
     catalogue: