漏洞修复

zd-common/common-swagger/src/main/java/com/zd/common/swagger/config/AppListener.java

@@ -39,7 +39,8 @@ public class AppListener implements ApplicationListener<ApplicationStartedEvent>
                     env.getProperty("server.port")
             );
         } catch (UnknownHostException e) {
-            e.printStackTrace();
+            //e.printStackTrace();
+            logger.error("UnknownHostException", e);
         }
     }
 }

zd-modules/zd-algorithm/src/main/java/com/zd/alg/face/FaceApi.java

@@ -247,7 +247,7 @@ public class FaceApi {
             os.close();
             ins.close();
         } catch (Exception e) {
-            e.printStackTrace();
+            //e.printStackTrace();
         }
     }
 

zd-modules/zd-algorithm/src/main/java/com/zd/alg/fire/controller/FireDeviceController.java

@@ -373,7 +373,7 @@ public class FireDeviceController extends BaseController {
         try {
             Thread.sleep(waitTime*1000);
         } catch (InterruptedException e) {
-            e.printStackTrace();
+            //e.printStackTrace();
         }
         Map<String, Object> map = new HashMap<>();
         //设备是否在线
@@ -402,7 +402,7 @@ public class FireDeviceController extends BaseController {
             try {
                 map = outFireCom(subjectId,map);
             } catch (InterruptedException e) {
-                e.printStackTrace();
+                //e.printStackTrace();
             }
         }
     }

zd-modules/zd-algorithm/src/main/java/com/zd/alg/forward/component/AppStartedListener.java

@@ -39,14 +39,15 @@ public class AppStartedListener implements ApplicationListener<ApplicationStarte
             //关闭服务
             applicationStartedEvent.getApplicationContext().close();
         } catch (IOException e) {
-            e.printStackTrace();
+            //e.printStackTrace();
             logger.error("检查日志地址连通性测试失败！url:{},请检查实验室项目是否正常，或url配置是否正确！", algorithmYml.getCheckLogUrl());
         } finally {
             if (in != null) {
                 try {
                     in.close();
                 } catch (IOException e) {
-                    e.printStackTrace();
+                    //e.printStackTrace();
+                    logger.error("流关闭异常 :",e);
                 }
             }
         }
@@ -73,7 +74,7 @@ public class AppStartedListener implements ApplicationListener<ApplicationStarte
                 value.setCheckResultValid((CheckResultValid) o);
             } catch (Exception e) {
                 logger.error("算法结果解析注入失败!");
-                e.printStackTrace();
+                //e.printStackTrace();
                 logger.error("关闭项目！！！!请检查算法结果解析配置！！");
                 //关闭服务
                 applicationStartedEvent.getApplicationContext().close();
@@ -95,7 +96,7 @@ public class AppStartedListener implements ApplicationListener<ApplicationStarte
 
             } catch (Exception e) {
                 logger.error("视频算法结果解析注入失败!");
-                e.printStackTrace();
+                //e.printStackTrace();
                 logger.error("关闭项目！！！!请检查算法结果解析配置！！");
                 //关闭服务
                 applicationStartedEvent.getApplicationContext().close();

zd-modules/zd-algorithm/src/main/java/com/zd/alg/forward/controller/AlarmPhotoController.java

@@ -39,7 +39,7 @@ public class AlarmPhotoController {
             }
             return R.fail("图片抓拍失败");
         } catch (IOException|ServiceException e) {
-            e.printStackTrace();
+            //e.printStackTrace();
         }
         return R.fail();
     }

zd-modules/zd-algorithm/src/main/java/com/zd/alg/forward/utils/Base64DecodedMultipartFile.java

@@ -86,7 +86,7 @@ public class Base64DecodedMultipartFile implements MultipartFile {
             }
             return new Base64DecodedMultipartFile(b, baseStrs[0]);
         } catch (IOException e) {
-            e.printStackTrace();
+            //e.printStackTrace();
             return null;
         }
     }

zd-modules/zd-algorithm/src/main/java/com/zd/alg/forward/utils/ImageBioChangeUtil.java

@@ -35,7 +35,7 @@ public class ImageBioChangeUtil {
 
             return encoder.encodeBuffer(bytes).trim();
         } catch (IOException e) {
-            e.printStackTrace();
+            //e.printStackTrace();
         }
         return null;
     }
@@ -79,7 +79,7 @@ public class ImageBioChangeUtil {
                 }
                 ImageIO.write(bi1, "jpg", w2);//不管输出什么格式图片，此处不需改动
             } catch (IOException e) {
-                e.printStackTrace();
+                //e.printStackTrace();
             }
 		}
     }

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java

@@ -251,7 +251,8 @@ public class SIPCommander implements ISIPCommander {
 			transmitRequest(device, request);
 			return true;
 		} catch (SipException | ParseException | InvalidArgumentException e) {
-			e.printStackTrace();
+			//e.printStackTrace();
+			logger.error("SIP异常：", e);
 		}
 		return false;
 	}
@@ -291,7 +292,7 @@ public class SIPCommander implements ISIPCommander {
 			transmitRequest(device, request);
 			return true;
 		} catch (SipException | ParseException | InvalidArgumentException e) {
-			e.printStackTrace();
+			//e.printStackTrace();
 		}
 		return false;
 	}
@@ -325,7 +326,7 @@ public class SIPCommander implements ISIPCommander {
 			transmitRequest(device, request);
 			return true;
 		} catch (SipException | ParseException | InvalidArgumentException e) {
-			e.printStackTrace();
+			//e.printStackTrace();
 		}
 		return false;
 	}
@@ -430,7 +431,7 @@ public class SIPCommander implements ISIPCommander {
 				streamSession.put(device.getDeviceId(), channelId , e.getDialog());
 			});
 		} catch ( SipException | ParseException | InvalidArgumentException e) {
-			e.printStackTrace();
+			//e.printStackTrace();
 		}
 	}
 
@@ -530,7 +531,8 @@ public class SIPCommander implements ISIPCommander {
 				streamSession.put(device.getDeviceId(), channelId, dialog);
 			});
 		} catch ( SipException | ParseException | InvalidArgumentException e) {
-			e.printStackTrace();
+			//e.printStackTrace();
+			logger.error("", e);
 		}
 	}
 
@@ -631,7 +633,7 @@ public class SIPCommander implements ISIPCommander {
 	        streamSession.put(device.getDeviceId(), channelId, ssrcInfo.getSsrc(), ssrcInfo.getStreamId(), mediaServerItem.getId(), transaction);
 
 		} catch ( SipException | ParseException | InvalidArgumentException e) {
-			e.printStackTrace();
+			//e.printStackTrace();
 		}
 	}
 
@@ -673,7 +675,7 @@ public class SIPCommander implements ISIPCommander {
 					eventListenersField.setAccessible(true);
 					eventListenersField.set(dialog, new HashSet<>());
 				} catch (NoSuchFieldException | IllegalAccessException e) {
-					e.printStackTrace();
+					//e.printStackTrace();
 				}
 			}
 
@@ -705,7 +707,7 @@ public class SIPCommander implements ISIPCommander {
 				streamSession.remove(deviceId, channelId);
 			}
 		} catch (SipException | ParseException e) {
-			e.printStackTrace();
+			//e.printStackTrace();
 		}
 	}
 
@@ -747,7 +749,7 @@ public class SIPCommander implements ISIPCommander {
 			transmitRequest(device, request);
 			return true;
 		} catch (SipException | ParseException | InvalidArgumentException e) {
-			e.printStackTrace();
+			//e.printStackTrace();
 		}
 		return false;
 	}
@@ -768,7 +770,7 @@ public class SIPCommander implements ISIPCommander {
 			Request request = headerProvider.createMessageRequest(device, broadcastXml.toString(), "z9hG4bK-ViaBcst-" + tm, "FromBcst" + tm, null, callIdHeader);
 			transmitRequest(device, request, errorEvent);
 		} catch (SipException | ParseException | InvalidArgumentException e) {
-			e.printStackTrace();
+			//e.printStackTrace();
 		}
 	}
 
@@ -802,7 +804,7 @@ public class SIPCommander implements ISIPCommander {
 			transmitRequest(device, request, errorEvent);
 			return true;
 		} catch (SipException | ParseException | InvalidArgumentException e) {
-			e.printStackTrace();
+			//e.printStackTrace();
 			return false;
 		}
 	}
@@ -830,7 +832,7 @@ public class SIPCommander implements ISIPCommander {
 			transmitRequest(device, request);
 			return true;
 		} catch (SipException | ParseException | InvalidArgumentException e) {
-			e.printStackTrace();
+			//e.printStackTrace();
 			return false;
 		}
 	}
@@ -859,7 +861,7 @@ public class SIPCommander implements ISIPCommander {
 			transmitRequest(device, request, errorEvent);
 			return true;
 		} catch (SipException | ParseException | InvalidArgumentException e) {
-			e.printStackTrace();
+			//e.printStackTrace();
 			return false;
 		}
 	}
@@ -902,7 +904,7 @@ public class SIPCommander implements ISIPCommander {
 			transmitRequest(device, request, errorEvent);
 			return true;
 		} catch (SipException | ParseException | InvalidArgumentException e) {
-			e.printStackTrace();
+			//e.printStackTrace();
 			return false;
 		}
 	}
@@ -938,7 +940,7 @@ public class SIPCommander implements ISIPCommander {
 			transmitRequest(device, request);
 			return true;
 		} catch (SipException | ParseException | InvalidArgumentException e) {
-			e.printStackTrace();
+			//e.printStackTrace();
 			return false;
 		}
 	}
@@ -992,7 +994,7 @@ public class SIPCommander implements ISIPCommander {
 			transmitRequest(device, request, errorEvent);
 			return true;
 		} catch (SipException | ParseException | InvalidArgumentException e) {
-			e.printStackTrace();
+			//e.printStackTrace();
 			return false;
 		}
 	}
@@ -1063,7 +1065,7 @@ public class SIPCommander implements ISIPCommander {
 			transmitRequest(device, request, errorEvent);
 			return true;
 		} catch (SipException | ParseException | InvalidArgumentException e) {
-			e.printStackTrace();
+			//e.printStackTrace();
 			return false;
 		}
 	}
@@ -1095,7 +1097,7 @@ public class SIPCommander implements ISIPCommander {
 			return true;
 
 		} catch (SipException | ParseException | InvalidArgumentException e) {
-			e.printStackTrace();
+			//e.printStackTrace();
 			return false;
 		}
 	}
@@ -1126,7 +1128,7 @@ public class SIPCommander implements ISIPCommander {
 			transmitRequest(device, request);
 
 		} catch (SipException | ParseException | InvalidArgumentException e) {
-			e.printStackTrace();
+			//e.printStackTrace();
 			return false;
 		}
 		return true;
@@ -1159,7 +1161,7 @@ public class SIPCommander implements ISIPCommander {
 
 			transmitRequest(device, request, errorEvent);
 		} catch (SipException | ParseException | InvalidArgumentException e) {
-			e.printStackTrace();
+			//e.printStackTrace();
 			return false;
 		}
 		return true;
@@ -1199,7 +1201,7 @@ public class SIPCommander implements ISIPCommander {
 
 			transmitRequest(device, request);
 		} catch (SipException | ParseException | InvalidArgumentException e) {
-			e.printStackTrace();
+			//e.printStackTrace();
 			return false;
 		}
 		return true;
@@ -1256,7 +1258,7 @@ public class SIPCommander implements ISIPCommander {
 			transmitRequest(device, request, errorEvent);
 			return true;
 		} catch (SipException | ParseException | InvalidArgumentException e) {
-			e.printStackTrace();
+			//e.printStackTrace();
 			return false;
 		}
 	}
@@ -1293,7 +1295,7 @@ public class SIPCommander implements ISIPCommander {
 			transmitRequest(device, request, errorEvent);
 			return true;
 		} catch (SipException | ParseException | InvalidArgumentException e) {
-			e.printStackTrace();
+			//e.printStackTrace();
 			return false;
 		}
 	}
@@ -1327,7 +1329,7 @@ public class SIPCommander implements ISIPCommander {
 			transmitRequest(device, request, errorEvent);
 			return true;
 		} catch (SipException | ParseException | InvalidArgumentException e) {
-			e.printStackTrace();
+			//e.printStackTrace();
 			return false;
 		}
 	}
@@ -1359,7 +1361,7 @@ public class SIPCommander implements ISIPCommander {
 			transmitRequest(device, request, errorEvent);
 
 		} catch (SipException | ParseException | InvalidArgumentException e) {
-			e.printStackTrace();
+			//e.printStackTrace();
 			return false;
 		}
 		return true;
@@ -1397,7 +1399,7 @@ public class SIPCommander implements ISIPCommander {
 			return true;
 
 		} catch ( NumberFormatException | ParseException | InvalidArgumentException	| SipException e) {
-			e.printStackTrace();
+			//e.printStackTrace();
 			return false;
 		}
 	}
@@ -1454,7 +1456,7 @@ public class SIPCommander implements ISIPCommander {
 			return true;
 
 		} catch ( NumberFormatException | ParseException | InvalidArgumentException	| SipException e) {
-			e.printStackTrace();
+			//e.printStackTrace();
 			return false;
 		}
 	}

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java

@@ -103,14 +103,9 @@ public class SIPCommanderFroPlatform implements ISIPCommanderForPlatform {
 
             transmitRequest(parentPlatform, request, null, okEvent);
             return true;
-        } catch (ParseException e) {
-            e.printStackTrace();
-        } catch (InvalidArgumentException e) {
-            e.printStackTrace();
-        } catch (PeerUnavailableException e) {
-            e.printStackTrace();
-        } catch (SipException e) {
-            e.printStackTrace();
+        } catch (Exception e) {
+            //e.printStackTrace();
+            logger.error("SIP注册异常：", e);
         }
         return false;
     }
@@ -142,7 +137,7 @@ public class SIPCommanderFroPlatform implements ISIPCommanderForPlatform {
             transmitRequest(parentPlatform, request);
             callId = callIdHeader.getCallId();
         } catch (ParseException | InvalidArgumentException | SipException e) {
-            e.printStackTrace();
+            //e.printStackTrace();
         }
         return callId;
     }
@@ -226,7 +221,7 @@ public class SIPCommanderFroPlatform implements ISIPCommanderForPlatform {
             transmitRequest(parentPlatform, request);
 
         } catch (SipException | ParseException | InvalidArgumentException e) {
-            e.printStackTrace();
+            //e.printStackTrace();
             return false;
         }
         return true;
@@ -265,7 +260,7 @@ public class SIPCommanderFroPlatform implements ISIPCommanderForPlatform {
             transmitRequest(parentPlatform, request);
 
         } catch (SipException | ParseException | InvalidArgumentException e) {
-            e.printStackTrace();
+            //e.printStackTrace();
             return false;
         }
         return true;
@@ -302,7 +297,7 @@ public class SIPCommanderFroPlatform implements ISIPCommanderForPlatform {
             transmitRequest(parentPlatform, request);
 
         } catch (SipException | ParseException | InvalidArgumentException e) {
-            e.printStackTrace();
+            //e.printStackTrace();
             return false;
         }
         return true;

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/gb28181/transmit/request/SIPRequestAbstractProcessor.java

@@ -80,7 +80,7 @@ public abstract class SIPRequestAbstractProcessor implements ISIPRequestProcesso
 		try {
 			return SipFactory.getInstance().createAddressFactory();
 		} catch (PeerUnavailableException e) {
-			e.printStackTrace();
+			//e.printStackTrace();
 		}
 		return null;
 	}
@@ -89,7 +89,7 @@ public abstract class SIPRequestAbstractProcessor implements ISIPRequestProcesso
 		try {
 			return SipFactory.getInstance().createHeaderFactory();
 		} catch (PeerUnavailableException e) {
-			e.printStackTrace();
+			//e.printStackTrace();
 		}
 		return null;
 	}
@@ -98,7 +98,7 @@ public abstract class SIPRequestAbstractProcessor implements ISIPRequestProcesso
 		try {
 			return SipFactory.getInstance().createMessageFactory();
 		} catch (PeerUnavailableException e) {
-			e.printStackTrace();
+			//e.printStackTrace();
 		}
 		return null;
 	}

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/gb28181/transmit/request/impl/ByeRequestProcessor.java

@@ -85,12 +85,9 @@ public class ByeRequestProcessor extends SIPRequestAbstractProcessor {
 					mediaServerService.closeRTPServer(device, channelId);
 				}
 			}
-		} catch (SipException e) {
-			e.printStackTrace();
-		} catch (InvalidArgumentException e) {
-			e.printStackTrace();
-		} catch (ParseException e) {
-			e.printStackTrace();
+		} catch (Exception e) {
+			//e.printStackTrace();
+			logger.error("SIP异常：", e);
 		}
 	}
 

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/gb28181/transmit/request/impl/SubscribeRequestProcessor.java

@@ -49,12 +49,9 @@ public class SubscribeRequestProcessor extends SIPRequestAbstractProcessor {
 				logger.info("processRequest serverTransactionId is null.");
 			}
 
-		} catch (ParseException e) {
-			e.printStackTrace();
-		} catch (SipException e) {
-			e.printStackTrace();
-		} catch (InvalidArgumentException e) {
-			e.printStackTrace();
+		} catch (Exception e) {
+			//e.printStackTrace();
+			logger.error("异常：", e);
 		}
 	}
 }

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/gb28181/utils/DateUtil.java

@@ -28,7 +28,7 @@ public class DateUtil {
         try {
             return newsdf.format(oldsdf.parse(formatTime));
         } catch (ParseException e) {
-            e.printStackTrace();
+            //e.printStackTrace();
         }
         return "";
     }
@@ -40,7 +40,7 @@ public class DateUtil {
         try {
             return newsdf.format(oldsdf.parse(formatTime));
         } catch (ParseException e) {
-            e.printStackTrace();
+            //e.printStackTrace();
         }
         return "";
     }
@@ -55,7 +55,7 @@ public class DateUtil {
 			//转换为Date类
 			return timestamp;
 		} catch (ParseException e) {
-			e.printStackTrace();
+			//e.printStackTrace();
 		}
 		return 0;
 	}

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/vmanager/server/ServerController.java

@@ -110,7 +110,7 @@ public class ServerController {
                     AlgorithmApplication.restart();
                 } catch (InterruptedException ignored) {
                 } catch (ObjectInUseException e) {
-                    e.printStackTrace();
+                    //e.printStackTrace();
                 }
             }
         });

zd-modules/zd-algorithm/src/main/java/com/zd/alg/rfid/handler/SocketHandler.java

@@ -100,7 +100,7 @@ public class SocketHandler extends ChannelInboundHandlerAdapter {
 
     @Override
     public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause){
-        cause.printStackTrace();
+        //cause.printStackTrace();
         ctx.channel().close();
         clients.remove(ctx.channel());
     }

zd-modules/zd-algorithm/src/main/java/com/zd/alg/smartlock/service/impl/SlOpendoorApplyServiceImpl.java

@@ -200,7 +200,7 @@ public class SlOpendoorApplyServiceImpl implements ISlOpendoorApplyService {
         try {
             str = authPowerNew(id);
         } catch (Exception e) {
-            e.printStackTrace();
+            //e.printStackTrace();
             log.error("重新授权失败：" + e);
         }
         return str;

zd-modules/zd-algorithm/src/main/java/com/zd/alg/speaker/config/OkHttpConfiguration.java

@@ -77,7 +77,7 @@ public class OkHttpConfiguration {
             sslContext.init(null, new TrustManager[]{x509TrustManager()}, new SecureRandom());
             return sslContext.getSocketFactory();
         } catch (NoSuchAlgorithmException | KeyManagementException e) {
-            e.printStackTrace();
+            //e.printStackTrace();
         }
         return null;
     }

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/impl/AlarmRecordServiceImpl.java

@@ -241,7 +241,8 @@ public class AlarmRecordServiceImpl extends ServiceImpl<AlarmRecordMapper, Alarm
         try {
             stockService.sendSydSms(content, 1, null, phones.toArray(new String[]{}));
         } catch (Exception e) {
-            e.printStackTrace();
+            //e.printStackTrace();
+            log.error("发送报警异常：", e);
         }
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabAbnormalController.java

@@ -53,30 +53,6 @@ public class LabAbnormalController extends BaseController {
         }
     }
 
-    @GetMapping("/sendALL")
-    public void sendALL(String deviceNum, int type) {
-
-        /*if(type == 1){
-            for (int i = 1; i < 5; i++) {
-                socketService.sendCommand(Symbol.order.control, deviceNum, Symbol.command.open, i);
-                try {
-                    Thread.sleep(500);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
-        }else {
-            for (int i = 1; i < 5; i++) {
-                socketService.sendCommand(Symbol.order.control, deviceNum, Symbol.command.close, i);
-                try {
-                    Thread.sleep(500);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
-        }*/
-    }
-
     @PostMapping("/sendData")
     public void sendData(@RequestBody Map<String, String> params) {
 
@@ -124,8 +100,6 @@ public class LabAbnormalController extends BaseController {
             String dictLabel = Optional.ofNullable(dictList).filter(b->b.size()>0).orElseGet(Collections::emptyList).stream().filter(b->b.getDictValue().equals(a.getEquipmentType()+"")).map(b->b.getDictLabel()).findFirst().orElse("");
             a.setTypeStr(dictLabel+"-"+a.getHardwareTypeName());
         });
-//        ExcelUtil<LabAbnormalVO> util = new ExcelUtil<LabAbnormalVO>(LabAbnormalVO.class);
-//        util.exportExcel(response, list, "异常设备数据");
         ExcelUtil<LabAbnormalVO> util = new ExcelUtil<LabAbnormalVO>(LabAbnormalVO.class);
         //本地日期,不包括时分秒
         LocalDate nowDate = LocalDate.now();

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

@@ -4,7 +4,6 @@ import com.zd.common.core.redis.RedisService;
 import com.zd.common.core.utils.ReUtil;
 import com.zd.laboratory.api.entity.CabinetLock;
 import com.zd.laboratory.api.entity.CabinetV2Lock;
-import com.zd.laboratory.mqtt.service.impl.CommonSend;
 import com.zd.laboratory.netty.NettyPushMsgService;
 import com.zd.laboratory.socket.runner.TCPServer;
 import com.zd.laboratory.socket.service.SocketService;
@@ -34,8 +33,6 @@ public class DeviceRemoteController {
     private SocketService socketService;
     @Autowired
     private RedisService redisService;
-    @Autowired
-    private CommonSend commonSend;
 
     @Value("${sys.lockTimer:30}")
     private Integer lockTimer;
@@ -58,32 +55,15 @@ public class DeviceRemoteController {
         OutputStream ops = TCPServer.cacheMap.get(relayCode);
 
         try {
-//            ops.write(ReUtil.hexStringToByteArray(instruct));
-//            ops.flush();
-//            for (int i = 0; i < 5; i++) {
-//                NettyPushMsgService.push(cabinetV2Lock.getRelayCode(), ReUtil.hexStringToByteArray(instruct));
-//                logger.info("柜锁开锁指令：" + instruct);
-//
-//                Thread.sleep(1000);
-//            }
 
             NettyPushMsgService.push(cabinetV2Lock.getRelayCode(), ReUtil.hexStringToByteArray(instruct));
             logger.info("柜锁开锁指令：" + instruct);
             Thread.sleep(1000);
-//            ops.write(ReUtil.hexStringToByteArray(instruct));
-//            ops.flush();
-//
-//            Thread.sleep(1500);
-//            ops.write(ReUtil.hexStringToByteArray(instruct));
-//            ops.flush();
 
             instruct = CRCCHECK.getReadLockOrder(Integer.parseInt(cabinetV2Lock.getLockId()));
             int timer = lockTimer;
             Integer status;
             while (timer > 1){
-
-//                ops.write(ReUtil.hexStringToByteArray(instruct));
-//                ops.flush();
                 NettyPushMsgService.push(cabinetV2Lock.getRelayCode(), ReUtil.hexStringToByteArray(instruct));
                 timer-=3;
 
@@ -96,47 +76,11 @@ public class DeviceRemoteController {
             }
 
         } catch (Exception e) {
-            e.printStackTrace();
+            //e.printStackTrace();
             logger.error("柜锁连接失败：" + e.getMessage());
             return ResultData.fail("柜锁连接失败！");
         }
         return ResultData.fail("开锁失败");
-
-        //  mqtt 方式
-        /*String instruct = CRCCHECK.getOpenLockOrder(Integer.parseInt(cabinetV2Lock.getLockId()));
-        logger.info("柜锁MQTT开锁发送：" + instruct);
-        commonSend.send(socketService.getSteerSubscriptPrefix() + "/" + cabinetV2Lock.getRelayCode(),
-                ReUtil.hexStringToByteArray(instruct));
-
-        instruct = CRCCHECK.getReadLockOrder(Integer.parseInt(cabinetV2Lock.getLockId()));
-        int timer = lockTimer;
-        Integer status;
-        byte[] bytes = ReUtil.hexStringToByteArray(instruct);
-
-        try {
-            Thread.sleep(3000);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-        while (timer > 1){
-
-            commonSend.send(socketService.getSteerSubscriptPrefix() + "/" + cabinetV2Lock.getRelayCode(),
-                    bytes);
-            timer-=2;
-
-            try {
-                Thread.sleep(1900);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-
-            status = redisService.getCacheObject(cabinetV2Lock.getRelayCode() + ":" + cabinetV2Lock.getLockId());
-            logger.info("柜锁MQTT开锁状态查询：" + instruct + "，开锁结果：" + status);
-            if(status != null && status == 1){
-                return ResultData.success("开锁成功");
-            }
-        }
-        return ResultData.fail("开锁失败");*/
     }
 
     /**
@@ -144,73 +88,28 @@ public class DeviceRemoteController {
      */
     @PostMapping("/V2/closeLock")
     public ResultData cabinetV2CloseLock(@RequestBody CabinetV2Lock cabinetV2Lock){
-        /*try {
-            Thread.sleep(5 * 1000);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-        return ResultData.success("关锁成功");*/
-
-        // socket 方式发送
-//        String instruct = CRCCHECK.getCloseLockOrder(Integer.parseInt(cabinetV2Lock.getLockId()));
         String relayCode = cabinetV2Lock.getRelayCode();
         OutputStream ops = TCPServer.cacheMap.get(relayCode);
 
         try {
-            /*ops.write(ReUtil.hexStringToByteArray(instruct));
-            ops.flush();
-            logger.info("柜锁关锁指令：" + instruct);
-            Thread.sleep(1000);*/
-
             String instruct = CRCCHECK.getReadLockOrder(Integer.parseInt(cabinetV2Lock.getLockId()));
             int timer = lockTimer;
             Integer status;
-//            while (timer > 1){
-
-//                ops.write(ReUtil.hexStringToByteArray(instruct));
-//                ops.flush();
-                NettyPushMsgService.push(cabinetV2Lock.getRelayCode(), ReUtil.hexStringToByteArray(instruct));
-                timer-=2;
 
-                Thread.sleep(1900);
-                status = redisService.getCacheObject(relayCode + ":" + cabinetV2Lock.getLockId());
-                logger.info("柜锁关锁状态查询：" + instruct + "，关锁结果" + status);
-                if(status != null && status == 0){
-                    return ResultData.success("关锁成功");
-                }
-//            }
+            NettyPushMsgService.push(cabinetV2Lock.getRelayCode(), ReUtil.hexStringToByteArray(instruct));
+            timer-=2;
 
-//            return ResultData.success("关锁成功");
+            Thread.sleep(1900);
+            status = redisService.getCacheObject(relayCode + ":" + cabinetV2Lock.getLockId());
+            logger.info("柜锁关锁状态查询：" + instruct + "，关锁结果" + status);
+            if(status != null && status == 0){
+                return ResultData.success("关锁成功");
+            }
         } catch (Exception e) {
-            e.printStackTrace();
+            //e.printStackTrace();
             logger.error("柜锁连接失败：" + e.getMessage());
             return ResultData.fail("柜锁连接失败！");
         }
         return ResultData.fail("关锁失败：请手动按压柜锁，确认已关闭！");
-
-        // mqtt 方式
-        /*String instruct = CRCCHECK.getReadLockOrder(Integer.parseInt(cabinetV2Lock.getLockId()));
-        int timer = lockTimer;
-        Integer status;
-        byte[] bytes = ReUtil.hexStringToByteArray(instruct);
-        while (timer > 1){
-
-            commonSend.send(socketService.getSteerSubscriptPrefix() + "/" + cabinetV2Lock.getRelayCode(),
-                    bytes);
-            timer--;
-
-            try {
-                Thread.sleep(900);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-            status = redisService.getCacheObject(cabinetV2Lock.getRelayCode() + ":" + cabinetV2Lock.getLockId());
-            logger.info("柜锁MQTT关锁状态查询：" + instruct + "，开锁结果：" + status);
-            if(status != null && status == 1){
-                return ResultData.success("关锁成功");
-            }
-        }
-
-        return ResultData.fail("关锁失败");*/
     }
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/mqtt/config/MqttConfig.java

@@ -261,7 +261,7 @@ public class MqttConfig {
                     ReturnMessageProcessing(message, receivedTopic);
                 }
             } catch (Exception e) {
-                e.printStackTrace();
+                //e.printStackTrace();
             }
         };
     }

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

@@ -61,13 +61,5 @@ public class NettyServer {
             }
         });
         log.info("服务器启动成功");
-        //10. 关闭通道（并不是真正意义上的关闭通道，而是监听通道的关闭状态）和关闭链接
-        /*try {
-            channelFuture.channel().closeFuture().sync();
-            bossGroup.shutdownGracefully();
-            workerGroup.shutdownGracefully();
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }*/
     }
 }

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

@@ -128,7 +128,7 @@ public class NettyServerHandler implements ChannelInboundHandler {
      */
     @Override
     public void exceptionCaught(ChannelHandlerContext channelHandlerContext, Throwable throwable) throws Exception {
-        throwable.printStackTrace();
+        //throwable.printStackTrace();
         channelHandlerContext.close();
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabAudioSynthesisServiceImpl.java

@@ -105,7 +105,7 @@ public class LabAudioSynthesisServiceImpl implements ILabAudioSynthesisService
             try {
                 new Thread(()->this.exec(cmd)).start();
             }catch (Exception e) {
-                e.printStackTrace();
+                //e.printStackTrace();
                 flag = 0;
             }
         }
@@ -168,10 +168,7 @@ public class LabAudioSynthesisServiceImpl implements ILabAudioSynthesisService
             pro.waitFor();
             this.stop();
         } catch (Exception e) {
-            e.printStackTrace();
-        }finally {
-            //            Thread.sleep(1000*10);
-            //            Thread.sleep(1000*5);
+            //e.printStackTrace();
         }
     }
 
@@ -193,7 +190,7 @@ public class LabAudioSynthesisServiceImpl implements ILabAudioSynthesisService
             while ((str = br.readLine()) != null) {
             }
         } catch (IOException e) {
-            e.printStackTrace();
+            //e.printStackTrace();
         } finally {
             close(br, isr, stream);
         }
@@ -203,7 +200,7 @@ public class LabAudioSynthesisServiceImpl implements ILabAudioSynthesisService
             try {
                 ac.close();
             } catch (Exception e) {
-                e.printStackTrace();
+                //e.printStackTrace();
             }
         }
     }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabExitLineServiceImpl.java

@@ -353,7 +353,7 @@ public class LabExitLineServiceImpl implements ILabExitLineService
                     Thread.sleep(500);
                 } catch (InterruptedException e) {
                     Thread.currentThread().interrupt();
-                    e.printStackTrace();
+                    //e.printStackTrace();
                 }
             }
         }
@@ -430,28 +430,9 @@ public class LabExitLineServiceImpl implements ILabExitLineService
             if(lineJoins.size() == 0){
                 throw new ServiceException("执行疏散未查询到线路！");
             }
-//            LabExitLight labExitLight = new LabExitLight();
-//            labExitLight.setLightDirection(type);
-//            List<LabExitLight> exitLightList = labExitLightMapper.selectLabExitLightList(labExitLight);
-//            for(LabExitLight exitLight:exitLightList){
-//                LabExitLineJoinVO joinVO = new LabExitLineJoinVO();
-//                joinVO.setLightId(exitLight.getId());
-//                joinVO.setRelayCode(exitLight.getRelayCode());
-//                joinVO.setRelayBit(exitLight.getRelayBit()+"");
-//
-//                lineJoins.add(joinVO);
-//            }
         }
 
-
-//        List<LabExitLineJoinVO> lineJoins = selectLabExitLineIntelligentGuidance(subId, type);
-//        if(lineJoins.size() == 0){
-//            throw new ServiceException("执行疏散未查询到线路！");
-//        }
-
-
         // 根据楼层查询指示灯
-//        List<LabExitLight> allLines = labExitLightMapper.selectLabExitLightByBuildId(Long.parseLong(lineJoins.get(0).getBuildId()));
         List<LabExitLight> allLines = labExitLightMapper.selectLabExitLightList(new LabExitLight());
 
 
@@ -482,7 +463,7 @@ public class LabExitLineServiceImpl implements ILabExitLineService
                     Thread.sleep(500);
                 } catch (InterruptedException e) {
                     Thread.currentThread().interrupt();
-                    e.printStackTrace();
+                    //e.printStackTrace();
                 }
             }
         }
@@ -503,7 +484,8 @@ public class LabExitLineServiceImpl implements ILabExitLineService
                 try {
                     Thread.sleep(500);
                 } catch (InterruptedException e) {
-                    e.printStackTrace();
+                    //e.printStackTrace();
+                    logger.error("打开疏散指示灯异常", e);
                 }
             }
         }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabExitLineVertexServiceImpl.java

@@ -228,12 +228,12 @@ public class LabExitLineVertexServiceImpl implements ILabExitLineVertexService {
                         String commandStr = RelayConstants.AT_STACH + relay.getRelayBit() + "=" + RelayConstants.AT_CLOSE + RelayConstants.SPACE_WRAP;
                         NettyPushMsgService.push(relayCode, commandStr.getBytes());
                     } catch (IOException e) {
-                        e.printStackTrace();
+                        //e.printStackTrace();
                     }
                 }
             } catch (InterruptedException e) {
                 Thread.currentThread().interrupt();
-                e.printStackTrace();
+                //e.printStackTrace();
             }
         }
         // 关闭喇叭
@@ -321,9 +321,7 @@ public class LabExitLineVertexServiceImpl implements ILabExitLineVertexService {
                         }
                     } catch (InterruptedException e) {
                         Thread.currentThread().interrupt();
-                        e.printStackTrace();
-                    } catch (ExecutionException e) {
-                        e.printStackTrace();
+                        //e.printStackTrace();
                     }
                 });
 
@@ -373,12 +371,12 @@ public class LabExitLineVertexServiceImpl implements ILabExitLineVertexService {
                                 String commandStr = RelayConstants.AT_STACH + a.getRelayBit() + "=" + RelayConstants.AT_OPEN + RelayConstants.SPACE_WRAP;
                                 NettyPushMsgService.push(relayCode, commandStr.getBytes());
                             } catch (IOException e) {
-                                e.printStackTrace();
+                                //e.printStackTrace();
                             }
                         }
                     } catch (InterruptedException e) {
                         Thread.currentThread().interrupt();
-                        e.printStackTrace();
+                        //e.printStackTrace();
                     }
                 });
         Optional.ofNullable(labExitPointRelays).orElseGet(Collections::emptyList)
@@ -673,24 +671,6 @@ public class LabExitLineVertexServiceImpl implements ILabExitLineVertexService {
                     SaveUtil.setCommonAttr(a);
                     labExitPointRelayMapper.insertLabExitPointRelay(a);
                 });
-//        Consumer<List<LabExitJoinSubpoint>> consumer = a -> Optional.ofNullable(a)
-//                .orElseGet(Collections::emptyList)
-//                .stream()
-//                .forEach(b->{
-//                    //补全楼栋楼层id
-//                    b.setBuildId(lineVertexVo.getBuildId());
-//                    b.setFloorId(lineVertexVo.getFloorId());
-//                    //设置其他公共字段
-//                    SaveUtil.setCommonAttr(b);
-//                    labExitJoinSubpointMapper.insertLabExitJoinSubpoint(b);
-//                });
-//        // 删除楼层的点和实验室id关系数据
-//        LabExitJoinSubpoint labExitJoinSubpoint = new LabExitJoinSubpoint();
-//        labExitJoinSubpoint.setBuildId(lineVertexVo.getBuildId());
-//        labExitJoinSubpoint.setFloorId(lineVertexVo.getFloorId());
-//        labExitJoinSubpointMapper.deleteLabExitJoinSubpointByFloorId(labExitJoinSubpoint);
-//        // 消费者调用函数
-//        consumer.accept(lineVertexVo.getJoinSubpointList());
         return 1;
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabExitPointRelayServiceImpl.java

@@ -99,7 +99,7 @@ public class LabExitPointRelayServiceImpl implements ILabExitPointRelayService {
                         String commandStr = RelayConstants.AT_STACH + relay.getRelayBit() + "=" + RelayConstants.AT_OPEN + RelayConstants.SPACE_WRAP;
                         NettyPushMsgService.push(relayCode, commandStr.getBytes());
                     } catch (IOException e) {
-                        e.printStackTrace();
+                        //e.printStackTrace();
                     }
                 }
                 boolean flag = true;
@@ -120,7 +120,7 @@ public class LabExitPointRelayServiceImpl implements ILabExitPointRelayService {
                     lightPointSet.add(lineJoinPointVO);
                 }
             } catch (InterruptedException e) {
-                e.printStackTrace();
+                //e.printStackTrace();
             }
         }
         relayListMap.put("lightPointSet",lightPointSet);
@@ -162,7 +162,7 @@ public class LabExitPointRelayServiceImpl implements ILabExitPointRelayService {
                         String commandStr = RelayConstants.AT_STACH + relay.getRelayBit() + "=" + RelayConstants.AT_CLOSE + RelayConstants.SPACE_WRAP;
                         NettyPushMsgService.push(relayCode, commandStr.getBytes());
                     } catch (IOException e) {
-                        e.printStackTrace();
+                        //e.printStackTrace();
                     }
                 }
                 if(lightPointSet!=null && lightPointSet.size()>0){
@@ -174,7 +174,7 @@ public class LabExitPointRelayServiceImpl implements ILabExitPointRelayService {
                 }
 
             } catch (InterruptedException e) {
-                e.printStackTrace();
+                //e.printStackTrace();
             }
         }
         relayListMap.put("lightPointSet",newLightPointSet);

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabRiskPlanServiceImpl.java

@@ -612,7 +612,7 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
                     }
 
                 }
-                a.setFunNum(funStr != "" ? funStr.substring(1) : funStr);
+                a.setFunNum(!"".equals(funStr) ? funStr.substring(1) : funStr);
             }
 
             a.setLabRiskPlanjoinsubList(labRiskPlanjoinsubMapper.selectLabRiskPlanjoinsubByPlanId(a.getId(), SecurityUtils.getUserId()));

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabSecurityApplyServiceImpl.java

@@ -451,14 +451,16 @@ public class LabSecurityApplyServiceImpl implements ILabSecurityApplyService
             }
             bos.close();
         }catch(Exception e){
-            e.printStackTrace();
+            //e.printStackTrace();
+            log.error("批量下载异常", e);
         }finally {
             try {
                 zos.close();
                 bis.close();
                 bos.close();
             } catch (IOException e) {
-                e.printStackTrace();
+                //e.printStackTrace();
+                log.error("批量下载关闭流异常", e);
             }
         }
     }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/WordService.java

@@ -104,7 +104,7 @@ public class WordService {
 
             WordUtils.getWord1(word1, list,response);
         } catch (IOException e) {
-            e.printStackTrace();
+            //e.printStackTrace();
             throw new ServiceException(e.getMessage());
         }
     }
@@ -243,7 +243,7 @@ public class WordService {
 
             WordUtils.getWord2(word2, list,response);
         } catch (IOException e) {
-            e.printStackTrace();
+            //e.printStackTrace();
             throw new ServiceException(e.getMessage());
         }
     }
@@ -380,7 +380,7 @@ public class WordService {
 
             WordUtils.getWord3(word3, list, descs, response);
         } catch (IOException e) {
-            e.printStackTrace();
+            //e.printStackTrace();
             throw new ServiceException(e.getMessage());
         }
     }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/socket/runner/SocketRunner.java

@@ -60,7 +60,8 @@ public class SocketRunner implements CommandLineRunner {
             }
 
         } catch (IOException e) {
-            e.printStackTrace();
+            //e.printStackTrace();
+            log.error("", e);
         }
     }
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/socket/runner/TCPServer.java

@@ -1,6 +1,5 @@
 package com.zd.laboratory.socket.runner;
 
-import cn.hutool.json.JSONUtil;
 import com.zd.common.core.utils.SpringUtils;
 import com.zd.common.core.utils.StringUtils;
 import com.zd.laboratory.socket.constant.JXCTPacket;
@@ -10,7 +9,6 @@ import com.zd.laboratory.socket.service.SocketService;
 import com.zd.laboratory.socket.vo.TransmissionVo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import java.io.*;
 import java.net.Socket;
 import java.net.SocketException;
@@ -36,13 +34,6 @@ public class TCPServer implements Runnable {
 
     @Override
     public void run() {
-        /*if(!SocketRunner.whitelist.contains(socket.getInetAddress().toString())){
-            try {
-                socket.close();
-            } catch (IOException e) {
-            }
-            return;
-        }*/
         // 设置连接超时90秒
         try {
             socket.setSoTimeout(212000);
@@ -62,7 +53,7 @@ public class TCPServer implements Runnable {
                     socket.close();
                 }
             } catch (IOException e) {
-                e.printStackTrace();
+                //e.printStackTrace();
             }
         }
     }
@@ -72,11 +63,6 @@ public class TCPServer implements Runnable {
         StringBuilder ret = new StringBuilder();
         InputStream in = socket.getInputStream();
 
-        // 解析二进制数据
-//        BufferedInputStream bs = new BufferedInputStream(socket.getInputStream());
-
-//        DataInputStream dis = new DataInputStream(bs);
-
         byte[] bytes = new byte[1];
         while (in.read(bytes) != -1){
             ret.append(bytesToHexString(bytes) + " ");
@@ -120,28 +106,17 @@ public class TCPServer implements Runnable {
 
     private void analyticRelayData(String data) {
         try {
-            /*final byte b[] = new byte[512];
-            int len = socket.getInputStream().read(b);//读取数据
-            if (len > 0) {
-                byte[] datas = new byte[len];
-                System.arraycopy(b, 0, datas, 0, len);
-                String data = SocketUtils.formatBytes(datas, " ");*/
-                JXCTPacket packet = new JXCTPacket(data.replace(" ", "").toUpperCase());
-                BaseRouter baseRouter = BaseRouter.routerMap.get(packet.order);
-                if (baseRouter == null) {
-                    log.error("不识别指令：" + packet.order);
-                    return;
-                }
-                cacheMap.put(packet.deviceNumber, socket.getOutputStream());
-                String sendBody = baseRouter.routePacket(packet);
-                //解析数据
-                if (sendBody != null) {
-                    //log.info(packet.deviceNumber + " 下发:" + sendBody);
-                    //socket.getOutputStream().write(SocketUtils.str2byte(sendBody));
-                }
-            //}
+
+            JXCTPacket packet = new JXCTPacket(data.replace(" ", "").toUpperCase());
+            BaseRouter baseRouter = BaseRouter.routerMap.get(packet.order);
+            if (baseRouter == null) {
+                log.error("不识别指令：" + packet.order);
+                return;
+            }
+            cacheMap.put(packet.deviceNumber, socket.getOutputStream());
+
         }catch (Exception e){
-            e.printStackTrace();
+            //e.printStackTrace();
             log.error(e.toString());
         }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/socket/service/SocketService.java

@@ -86,39 +86,26 @@ public class SocketService {
     @Async("labExecutor")
     public void setSensorData(String data)  {
 
-        //try {
-            TransmissionVo transmissionVo = new TransmissionVo(data);
-
-            log.info("传感器解析结果：" + transmissionVo.toString());
-
-            log.info("传感器设备ID：" + transmissionVo.getA3());
-//
-//            SensorConfig sensorConfig = saveRelayInfo(transmissionVo.getA3(), Integer.parseInt(transmissionVo.getA6(), Character.FORMAT)/4, 2);
-
-            /*if(sensorConfig != null){
-                confiSensorData(transmissionVo, sensorConfig);
-            }*/
-
-            String redisKey = CacheDevice.SENSOR_KEY.getRedisKey() + transmissionVo.getA3();
-            if(!redisService.hasKey(redisKey)){
-                SensorStatus sensorStatus = new SensorStatus();
-                sensorStatus.setNum(transmissionVo.getA3());
-                sensorStatus.setSenseState(SenseStateEnum.TURN_ON);
-                SensorStatusEvent sensorStatusEvent = new SensorStatusEvent(sensorStatus);
-                SpringUtils.getApplicationContext().publishEvent(sensorStatusEvent);
-            }
-            //缓存数据
-            redisService.setCacheObject(redisKey, transmissionVo.toString(), CacheDevice.SENSOR_KEY.getRedisTime(), TimeUnit.SECONDS);
-            redisService.setCacheObject( CacheDevice.SENSOR_LIFE.getRedisKey() + transmissionVo.getA3(), transmissionVo.getA3(),
-                    CacheDevice.SENSOR_LIFE.getRedisTime() ,TimeUnit.SECONDS);
-
-            //抛出传感器解析事件
-            SubFunctionEvent subFunctionEvent = new SubFunctionEvent(transmissionVo.getA3());
-            SpringUtils.getApplicationContext().publishEvent(subFunctionEvent);
-        /*}catch (Exception e){
-            e.printStackTrace();
-            log.error("传感器推送数据异常：" + e.getMessage());
-        }*/
+        TransmissionVo transmissionVo = new TransmissionVo(data);
+        log.info("传感器解析结果：" + transmissionVo.toString());
+        log.info("传感器设备ID：" + transmissionVo.getA3());
+
+        String redisKey = CacheDevice.SENSOR_KEY.getRedisKey() + transmissionVo.getA3();
+        if(!redisService.hasKey(redisKey)){
+            SensorStatus sensorStatus = new SensorStatus();
+            sensorStatus.setNum(transmissionVo.getA3());
+            sensorStatus.setSenseState(SenseStateEnum.TURN_ON);
+            SensorStatusEvent sensorStatusEvent = new SensorStatusEvent(sensorStatus);
+            SpringUtils.getApplicationContext().publishEvent(sensorStatusEvent);
+        }
+        //缓存数据
+        redisService.setCacheObject(redisKey, transmissionVo.toString(), CacheDevice.SENSOR_KEY.getRedisTime(), TimeUnit.SECONDS);
+        redisService.setCacheObject( CacheDevice.SENSOR_LIFE.getRedisKey() + transmissionVo.getA3(), transmissionVo.getA3(),
+                CacheDevice.SENSOR_LIFE.getRedisTime() ,TimeUnit.SECONDS);
+
+        //抛出传感器解析事件
+        SubFunctionEvent subFunctionEvent = new SubFunctionEvent(transmissionVo.getA3());
+        SpringUtils.getApplicationContext().publishEvent(subFunctionEvent);
     }
 
     /**
@@ -327,7 +314,7 @@ public class SocketService {
                     relayCode.set(a.getKey());
                 }
             } catch (IOException e) {
-                e.printStackTrace();
+                //e.printStackTrace();
             }
         });
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/socket/util/SocketUtils.java

@@ -108,7 +108,7 @@ public class SocketUtils {
         try {
             result = Integer.parseInt(s, 16);
         } catch (Exception e) {
-            e.printStackTrace();
+            //e.printStackTrace();
         }
         return result;
     }
@@ -148,7 +148,7 @@ public class SocketUtils {
         try {
             bit = Integer.toBinaryString(Integer.parseInt(bitHex, 16));
         } catch (Exception e) {
-            e.printStackTrace();
+            //e.printStackTrace();
         }
         StringBuilder s = new StringBuilder();
         for (int i = 0; i < count; i++) {

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/utils/HexUtils.java

@@ -93,9 +93,6 @@ public class HexUtils {
         File fa[] = f.listFiles();//用数组接收  F:笔记总结C#, F:笔记总结if语句.txt
         for (int i = 0; i < fa.length; i++) {//循环遍历
             File fs = fa[i];//获取数组中的第i个
-            if (fs.isDirectory()) {
-            } else {
-            }
             list.add(fs.getName());
         }
         return list;

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/utils/word/SignPicPolicy.java

@@ -118,7 +118,7 @@ public class SignPicPolicy extends AbstractRenderPolicy<SignPictureRenderData> {
                 anchor = drawing.getAnchorArray(0);
                 anchor.setGraphic(ctGraphicalObject);
             } catch (XmlException e) {
-                e.printStackTrace();
+                //e.printStackTrace();
             }
             return anchor;
         }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/utils/word/WordUtils.java

@@ -44,7 +44,7 @@ public class WordUtils {
 
                             put(name, value);
                         } catch (IllegalAccessException e) {
-                            e.printStackTrace();
+                            //e.printStackTrace();
                         }
                     }
                     put("details",list);
@@ -72,7 +72,7 @@ public class WordUtils {
 
                             put(name, value);
                         } catch (IllegalAccessException e) {
-                            e.printStackTrace();
+                            //e.printStackTrace();
                         }
                     }
 //                    put("details",wordPolicy);
@@ -105,14 +105,13 @@ public class WordUtils {
 
                             put(name, value);
                         } catch (IllegalAccessException e) {
-                            e.printStackTrace();
+                            //e.printStackTrace();
                         }
                     }
                     put("details",list);
                     ClassPathResource classpathResource = new ClassPathResource("word/word3_detail.docx");
                     put("descs", Includes.ofStream(classpathResource.getInputStream()).setRenderModel(descs).create());
                 }});
-//        template.writeAndClose(new FileOutputStream("E:\\out3.docx"));
         template.write(response.getOutputStream());
     }
 }