Merge branch 'dev' of http://192.168.1.43:3000/v2/zd-parents into dev

zd-modules/zd-algorithm/src/main/java/com/zd/alg/speaker/service/impl/SpeakerServiceImpl.java

@@ -188,8 +188,8 @@ public class SpeakerServiceImpl implements ISpeakerService {
         String deviceIp =playVoList.get(0).getDeviceIp();
         PlayBatchVo playBatchVo=commonPatchTextUrlVoice(texts,playVoList,playNum,level);
         //清空原来队列
-        stopPriorityMusic(playBatchVo.getSns());
-        clearPlayMusic(playBatchVo.getSns());
+        //stopPriorityMusic(playBatchVo.getSns());
+        //clearPlayMusic(playBatchVo.getSns());
         boolean isTrue = invokePost(JSONObject.toJSON(playBatchVo).toString(), deviceIp,1, playVoList.get(0).getPort());
         if (isTrue) {
             textParseVoiceAppIps(texts,playVoList,playNum,level);
@@ -217,13 +217,13 @@ public class SpeakerServiceImpl implements ISpeakerService {
 
     @Override
     public boolean clearPlayMusic(String[] sns) {
-        logger.info("********************" + sns + "********************");
         String remoteUrlIp = remoteAddress.getProtocol() + "://" + remoteAddress.getTtsIp() + ":" + remoteAddress.getRemotePort() + "/api/sendtodevice";
         String token = getToken();
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("sns", sns);
         jsonObject.put("type", "req");
         jsonObject.put("name", "songs_queue_clear");
+        logger.info("********************" + jsonObject.toString() + "********************");
         String responseStr = okHttpRequest.doPostJson(remoteUrlIp, token, jsonObject.toString());
         logger.info("responseStr:+++++++++++++++++++++++++++" + responseStr + "+++++++++++++++++++++++++");
         return tokenRefresh(responseStr);
@@ -231,13 +231,13 @@ public class SpeakerServiceImpl implements ISpeakerService {
 
     @Override
     public boolean stopPriorityMusic(String[] sns) {
-        logger.info("********************" + sns + "********************");
         String remoteUrlIp = remoteAddress.getProtocol() + "://" + remoteAddress.getTtsIp() + ":" + remoteAddress.getRemotePort() + "/api/sendtodevice";
         String token = getToken();
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("sns", sns);
         jsonObject.put("type", "req");
         jsonObject.put("name", "priority_task_stop");
+        logger.info("********************" + jsonObject.toString() + "********************");
         String responseStr = okHttpRequest.doPostJson(remoteUrlIp, token, jsonObject.toString());
         logger.info("responseStr:+++++++++++++++++++++++++++" + responseStr + "+++++++++++++++++++++++++");
         return tokenRefresh(responseStr);

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/device/DeviceRemoteController.java

@@ -71,10 +71,13 @@ public class DeviceRemoteController {
         try {
 //            ops.write(ReUtil.hexStringToByteArray(instruct));
 //            ops.flush();
-            pushMsgService.push(cabinetV2Lock.getRelayCode(), ReUtil.hexStringToByteArray(instruct));
-            logger.info("柜锁开锁指令：" + instruct);
+            for (int i = 0; i < 5; i++) {
+                pushMsgService.push(cabinetV2Lock.getRelayCode(), ReUtil.hexStringToByteArray(instruct));
+                logger.info("柜锁开锁指令：" + instruct);
+
+                Thread.sleep(1000);
+            }
 
-            Thread.sleep(2000);
 //            ops.write(ReUtil.hexStringToByteArray(instruct));
 //            ops.flush();
 //
@@ -90,9 +93,9 @@ public class DeviceRemoteController {
 //                ops.write(ReUtil.hexStringToByteArray(instruct));
 //                ops.flush();
                 pushMsgService.push(cabinetV2Lock.getRelayCode(), ReUtil.hexStringToByteArray(instruct));
-                timer-=2;
+                timer-=3;
 
-                Thread.sleep(1900);
+                Thread.sleep(3000);
                 status = redisService.getCacheObject(relayCode + ":" + cabinetV2Lock.getLockId());
                 logger.info("柜锁开锁锁状态查询：" + instruct + "，开锁结果：" + status);
                 if(status != null && status == 1){

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/netty/NettyServerHandler.java

@@ -61,7 +61,13 @@ public class NettyServerHandler implements ChannelInboundHandler {
                 // 1开锁状态 0关锁状态
                 int status = CRCCHECK.getLockStatus(data);
 
-                log.info("netty柜锁回调：" + relayCode + ":" + bit + "，回调结果" + (status == 1 ? "开启": "关闭") + "，指令：" + data);
+                String openData = CRCCHECK.getOpenLockOrder((int)bit).replace(" ", "").toUpperCase();
+                if(data.equals(openData)){
+                    log.info("netty柜锁指令回调：" + relayCode + ":" + bit + "，指令：" + data);
+                    return;
+                }
+
+                log.info("netty柜锁状态回调：" + relayCode + ":" + bit + "，回调结果" + (status == 1 ? "开启": "关闭") + "，指令：" + data);
 
                 RedisService redisService = SpringUtils.getBean(RedisService.class);
                 redisService.setCacheObject(relayCode + ":" + bit, status, 3 * 60L, TimeUnit.SECONDS);
@@ -69,6 +75,7 @@ public class NettyServerHandler implements ChannelInboundHandler {
 
     }
 
+
     /**
     * @description: 读取消息后开始的操作
     */