diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/weigeng/CommDoorUtil.java b/casic-alarm/src/main/java/com/casic/missiles/modular/weigeng/CommDoorUtil.java index c8dbea5..d0dd29f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/weigeng/CommDoorUtil.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/weigeng/CommDoorUtil.java @@ -144,8 +144,10 @@ //重新关闭开关上电 DoorShortUtil.remoteControl(doors.split(",")[1], Long.valueOf(doors.split(",")[0]), 2, 2); - Thread.sleep(2 * 60 * 1000); + Thread.sleep(3 * 60 * 1000); return true; + }else { + Thread.sleep(3 * 60 * 1000); } } catch (Exception e) { e.printStackTrace(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/weigeng/CommDoorUtil.java b/casic-alarm/src/main/java/com/casic/missiles/modular/weigeng/CommDoorUtil.java index c8dbea5..d0dd29f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/weigeng/CommDoorUtil.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/weigeng/CommDoorUtil.java @@ -144,8 +144,10 @@ //重新关闭开关上电 DoorShortUtil.remoteControl(doors.split(",")[1], Long.valueOf(doors.split(",")[0]), 2, 2); - Thread.sleep(2 * 60 * 1000); + Thread.sleep(3 * 60 * 1000); return true; + }else { + Thread.sleep(3 * 60 * 1000); } } catch (Exception e) { e.printStackTrace(); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java index 54efd8e..58fc6f7 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java @@ -608,9 +608,12 @@ headerParams.put("token", "testToken"); Map fileParams = new HashMap<>(); fileParams.put("file", cMultiFile); - if ("1".equals(HttpClientUtils.getFlag())) - HttpClientUtils.uploadFile(uploadUrl, + if ("1".equals(HttpClientUtils.getFlag())){ + String result= HttpClientUtils.uploadFile(uploadUrl, fileParams, paramMaps, headerParams); + logger.info("****************调用报警消息推送返回信息:" + result + "***********"); + } + } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/weigeng/CommDoorUtil.java b/casic-alarm/src/main/java/com/casic/missiles/modular/weigeng/CommDoorUtil.java index c8dbea5..d0dd29f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/weigeng/CommDoorUtil.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/weigeng/CommDoorUtil.java @@ -144,8 +144,10 @@ //重新关闭开关上电 DoorShortUtil.remoteControl(doors.split(",")[1], Long.valueOf(doors.split(",")[0]), 2, 2); - Thread.sleep(2 * 60 * 1000); + Thread.sleep(3 * 60 * 1000); return true; + }else { + Thread.sleep(3 * 60 * 1000); } } catch (Exception e) { e.printStackTrace(); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java index 54efd8e..58fc6f7 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java @@ -608,9 +608,12 @@ headerParams.put("token", "testToken"); Map fileParams = new HashMap<>(); fileParams.put("file", cMultiFile); - if ("1".equals(HttpClientUtils.getFlag())) - HttpClientUtils.uploadFile(uploadUrl, + if ("1".equals(HttpClientUtils.getFlag())){ + String result= HttpClientUtils.uploadFile(uploadUrl, fileParams, paramMaps, headerParams); + logger.info("****************调用报警消息推送返回信息:" + result + "***********"); + } + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java index f11aa0c..43bc0f9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java @@ -94,6 +94,9 @@ private NettyClientSendMsg nettyClientSendMsg; + + private static long errorTimes = System.currentTimeMillis(); + /** * 注册设备 */ @@ -101,7 +104,8 @@ public Long register(String userName, String password, String deviceIp, String devicePort) { DeviceInfo deviceInfo = DeviceCommom.selectByDeviceIp(deviceIp); - if (ToolUtil.isNotEmpty(deviceInfo) && ToolUtil.isNotEmpty(deviceInfo.getUserId()) && deviceInfo.getUserId() >= 0) { + if (ToolUtil.isNotEmpty(deviceInfo) && ToolUtil.isNotEmpty(deviceInfo.getUserId()) && deviceInfo.getUserId() >= 0 + && deviceInfo.getUserId() <= 2047) { return deviceInfo.getUserId(); } @@ -115,9 +119,11 @@ //System.out.println("注册,设备IP:"+deviceIp); NativeLong lUserID = hCNetSDK.NET_DVR_Login_V30(deviceIp, (short) iPort, userName, password, m_strDeviceInfo); long userId = lUserID.longValue(); - if (userId <= -1) { + if (userId <= -1||userId>2048) { int error = hCNetSDK.NET_DVR_GetLastError(); - logger.debug(deviceIp.concat("register error, error code: ").concat(String.valueOf(error))); + if(((System.currentTimeMillis() - errorTimes) / 1000)%300<=1){ + logger.info(deviceIp.concat("register error, error code: ").concat(String.valueOf(error))); + } } else { logger.info(deviceIp.concat("register success, userId=").concat(String.valueOf(userId))); } @@ -160,7 +166,7 @@ NativeLong m_lSerialHandle = hCNetSDK.NET_DVR_SerialStart(new NativeLong(userId), new NativeLong(2), fSerialDataCallBack, 0); if (ToolUtil.isNotEmpty(deviceInfo)) { - if (m_lSerialHandle.longValue() >= 0) { + if (m_lSerialHandle.longValue() >= 0 && m_lSerialHandle.longValue()<2048) { logger.info(deviceInfo.getDeviceIp().concat("build transparent channel success, serialHandle=").concat(String.valueOf(m_lSerialHandle.longValue()))); DeviceCommom.addOrUpdateDeviceInfo(deviceInfo.getDeviceIp(), userId, null, m_lSerialHandle.longValue()); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/weigeng/CommDoorUtil.java b/casic-alarm/src/main/java/com/casic/missiles/modular/weigeng/CommDoorUtil.java index c8dbea5..d0dd29f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/weigeng/CommDoorUtil.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/weigeng/CommDoorUtil.java @@ -144,8 +144,10 @@ //重新关闭开关上电 DoorShortUtil.remoteControl(doors.split(",")[1], Long.valueOf(doors.split(",")[0]), 2, 2); - Thread.sleep(2 * 60 * 1000); + Thread.sleep(3 * 60 * 1000); return true; + }else { + Thread.sleep(3 * 60 * 1000); } } catch (Exception e) { e.printStackTrace(); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java index 54efd8e..58fc6f7 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java @@ -608,9 +608,12 @@ headerParams.put("token", "testToken"); Map fileParams = new HashMap<>(); fileParams.put("file", cMultiFile); - if ("1".equals(HttpClientUtils.getFlag())) - HttpClientUtils.uploadFile(uploadUrl, + if ("1".equals(HttpClientUtils.getFlag())){ + String result= HttpClientUtils.uploadFile(uploadUrl, fileParams, paramMaps, headerParams); + logger.info("****************调用报警消息推送返回信息:" + result + "***********"); + } + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java index f11aa0c..43bc0f9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java @@ -94,6 +94,9 @@ private NettyClientSendMsg nettyClientSendMsg; + + private static long errorTimes = System.currentTimeMillis(); + /** * 注册设备 */ @@ -101,7 +104,8 @@ public Long register(String userName, String password, String deviceIp, String devicePort) { DeviceInfo deviceInfo = DeviceCommom.selectByDeviceIp(deviceIp); - if (ToolUtil.isNotEmpty(deviceInfo) && ToolUtil.isNotEmpty(deviceInfo.getUserId()) && deviceInfo.getUserId() >= 0) { + if (ToolUtil.isNotEmpty(deviceInfo) && ToolUtil.isNotEmpty(deviceInfo.getUserId()) && deviceInfo.getUserId() >= 0 + && deviceInfo.getUserId() <= 2047) { return deviceInfo.getUserId(); } @@ -115,9 +119,11 @@ //System.out.println("注册,设备IP:"+deviceIp); NativeLong lUserID = hCNetSDK.NET_DVR_Login_V30(deviceIp, (short) iPort, userName, password, m_strDeviceInfo); long userId = lUserID.longValue(); - if (userId <= -1) { + if (userId <= -1||userId>2048) { int error = hCNetSDK.NET_DVR_GetLastError(); - logger.debug(deviceIp.concat("register error, error code: ").concat(String.valueOf(error))); + if(((System.currentTimeMillis() - errorTimes) / 1000)%300<=1){ + logger.info(deviceIp.concat("register error, error code: ").concat(String.valueOf(error))); + } } else { logger.info(deviceIp.concat("register success, userId=").concat(String.valueOf(userId))); } @@ -160,7 +166,7 @@ NativeLong m_lSerialHandle = hCNetSDK.NET_DVR_SerialStart(new NativeLong(userId), new NativeLong(2), fSerialDataCallBack, 0); if (ToolUtil.isNotEmpty(deviceInfo)) { - if (m_lSerialHandle.longValue() >= 0) { + if (m_lSerialHandle.longValue() >= 0 && m_lSerialHandle.longValue()<2048) { logger.info(deviceInfo.getDeviceIp().concat("build transparent channel success, serialHandle=").concat(String.valueOf(m_lSerialHandle.longValue()))); DeviceCommom.addOrUpdateDeviceInfo(deviceInfo.getDeviceIp(), userId, null, m_lSerialHandle.longValue()); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java b/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java index 8323102..9317cb1 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java @@ -92,12 +92,12 @@ private boolean registerAndStartSerial() { this.userId = ihcNetService.register(this.deviceUser, this.devicePassword, this.deviceIp, this.devicePort); - this.serialHandle = ihcNetService.serialHandle(userId); - if (this.userId >= 0 && this.serialHandle >= 0) { - return true; - } else { - return false; + if (this.userId >= 0 && this.userId < 2048) { + this.serialHandle = ihcNetService.serialHandle(userId); + if (this.serialHandle >= 0 && this.serialHandle < 2048) + return true; } + return false; } private Map map = new HashMap<>(); @@ -147,14 +147,50 @@ } + // +// @Override +// public void run() { +// System.out.println("Thread-" + deviceIp + " -> start... " + new Date()); +// // 一直尝试登录 +// while (true) { +// boolean register = registerAndStartSerial(); +// if (register) { +// break; +// } +// } + private Map restartMap = new HashMap<>(); + @Override public void run() { System.out.println("Thread-" + deviceIp + " -> start... " + new Date()); - // 一直尝试登录 + // 登录,登录失败就一直尝试登录 while (true) { boolean register = registerAndStartSerial(); if (register) { + System.out.println("0000000"); + restartMap.remove(deviceIp); break; + } else { + try { + //若没连上,一小时内,每隔3分钟通过控制门禁板,让设备重启 + if (null == restartMap.get(deviceIp)) { + logger.info("1111111111111"); + restartMap.put(deviceIp, System.currentTimeMillis()); + } else { + Long startTime = restartMap.get(deviceIp); + Long intervalTime = (System.currentTimeMillis() - startTime) / 1000; + if (intervalTime <= 60 * 60) { + logger.error(deviceIp.concat("-->pre door is opening! ********************* ")); + if (ihcNetService.interruptStart(this.deviceIp)) { + logger.error(deviceIp.concat("-->pre start success ********************* ")); + } else { + logger.error(deviceIp.concat("-->pre door start fail ********************* ")); + } + } + } + } catch (Exception e) { + e.printStackTrace(); + } } } // 登录成功后,按每秒一次查询甲烷数据 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/weigeng/CommDoorUtil.java b/casic-alarm/src/main/java/com/casic/missiles/modular/weigeng/CommDoorUtil.java index c8dbea5..d0dd29f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/weigeng/CommDoorUtil.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/weigeng/CommDoorUtil.java @@ -144,8 +144,10 @@ //重新关闭开关上电 DoorShortUtil.remoteControl(doors.split(",")[1], Long.valueOf(doors.split(",")[0]), 2, 2); - Thread.sleep(2 * 60 * 1000); + Thread.sleep(3 * 60 * 1000); return true; + }else { + Thread.sleep(3 * 60 * 1000); } } catch (Exception e) { e.printStackTrace(); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java index 54efd8e..58fc6f7 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java @@ -608,9 +608,12 @@ headerParams.put("token", "testToken"); Map fileParams = new HashMap<>(); fileParams.put("file", cMultiFile); - if ("1".equals(HttpClientUtils.getFlag())) - HttpClientUtils.uploadFile(uploadUrl, + if ("1".equals(HttpClientUtils.getFlag())){ + String result= HttpClientUtils.uploadFile(uploadUrl, fileParams, paramMaps, headerParams); + logger.info("****************调用报警消息推送返回信息:" + result + "***********"); + } + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java index f11aa0c..43bc0f9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java @@ -94,6 +94,9 @@ private NettyClientSendMsg nettyClientSendMsg; + + private static long errorTimes = System.currentTimeMillis(); + /** * 注册设备 */ @@ -101,7 +104,8 @@ public Long register(String userName, String password, String deviceIp, String devicePort) { DeviceInfo deviceInfo = DeviceCommom.selectByDeviceIp(deviceIp); - if (ToolUtil.isNotEmpty(deviceInfo) && ToolUtil.isNotEmpty(deviceInfo.getUserId()) && deviceInfo.getUserId() >= 0) { + if (ToolUtil.isNotEmpty(deviceInfo) && ToolUtil.isNotEmpty(deviceInfo.getUserId()) && deviceInfo.getUserId() >= 0 + && deviceInfo.getUserId() <= 2047) { return deviceInfo.getUserId(); } @@ -115,9 +119,11 @@ //System.out.println("注册,设备IP:"+deviceIp); NativeLong lUserID = hCNetSDK.NET_DVR_Login_V30(deviceIp, (short) iPort, userName, password, m_strDeviceInfo); long userId = lUserID.longValue(); - if (userId <= -1) { + if (userId <= -1||userId>2048) { int error = hCNetSDK.NET_DVR_GetLastError(); - logger.debug(deviceIp.concat("register error, error code: ").concat(String.valueOf(error))); + if(((System.currentTimeMillis() - errorTimes) / 1000)%300<=1){ + logger.info(deviceIp.concat("register error, error code: ").concat(String.valueOf(error))); + } } else { logger.info(deviceIp.concat("register success, userId=").concat(String.valueOf(userId))); } @@ -160,7 +166,7 @@ NativeLong m_lSerialHandle = hCNetSDK.NET_DVR_SerialStart(new NativeLong(userId), new NativeLong(2), fSerialDataCallBack, 0); if (ToolUtil.isNotEmpty(deviceInfo)) { - if (m_lSerialHandle.longValue() >= 0) { + if (m_lSerialHandle.longValue() >= 0 && m_lSerialHandle.longValue()<2048) { logger.info(deviceInfo.getDeviceIp().concat("build transparent channel success, serialHandle=").concat(String.valueOf(m_lSerialHandle.longValue()))); DeviceCommom.addOrUpdateDeviceInfo(deviceInfo.getDeviceIp(), userId, null, m_lSerialHandle.longValue()); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java b/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java index 8323102..9317cb1 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java @@ -92,12 +92,12 @@ private boolean registerAndStartSerial() { this.userId = ihcNetService.register(this.deviceUser, this.devicePassword, this.deviceIp, this.devicePort); - this.serialHandle = ihcNetService.serialHandle(userId); - if (this.userId >= 0 && this.serialHandle >= 0) { - return true; - } else { - return false; + if (this.userId >= 0 && this.userId < 2048) { + this.serialHandle = ihcNetService.serialHandle(userId); + if (this.serialHandle >= 0 && this.serialHandle < 2048) + return true; } + return false; } private Map map = new HashMap<>(); @@ -147,14 +147,50 @@ } + // +// @Override +// public void run() { +// System.out.println("Thread-" + deviceIp + " -> start... " + new Date()); +// // 一直尝试登录 +// while (true) { +// boolean register = registerAndStartSerial(); +// if (register) { +// break; +// } +// } + private Map restartMap = new HashMap<>(); + @Override public void run() { System.out.println("Thread-" + deviceIp + " -> start... " + new Date()); - // 一直尝试登录 + // 登录,登录失败就一直尝试登录 while (true) { boolean register = registerAndStartSerial(); if (register) { + System.out.println("0000000"); + restartMap.remove(deviceIp); break; + } else { + try { + //若没连上,一小时内,每隔3分钟通过控制门禁板,让设备重启 + if (null == restartMap.get(deviceIp)) { + logger.info("1111111111111"); + restartMap.put(deviceIp, System.currentTimeMillis()); + } else { + Long startTime = restartMap.get(deviceIp); + Long intervalTime = (System.currentTimeMillis() - startTime) / 1000; + if (intervalTime <= 60 * 60) { + logger.error(deviceIp.concat("-->pre door is opening! ********************* ")); + if (ihcNetService.interruptStart(this.deviceIp)) { + logger.error(deviceIp.concat("-->pre start success ********************* ")); + } else { + logger.error(deviceIp.concat("-->pre door start fail ********************* ")); + } + } + } + } catch (Exception e) { + e.printStackTrace(); + } } } // 登录成功后,按每秒一次查询甲烷数据 diff --git a/casic-web/src/main/resources/logback-spring.xml b/casic-web/src/main/resources/logback-spring.xml index 6e939ec..cf30f38 100644 --- a/casic-web/src/main/resources/logback-spring.xml +++ b/casic-web/src/main/resources/logback-spring.xml @@ -1,32 +1,61 @@ - + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - ${LOG_PATH}${LOG_FILE} - - %date [%level] [%thread] %logger{60} [%file : %line] %msg%n - + + /casic/logs/missiles.log + - - ${LOG_PATH}daily/${LOG_FILE}.%d{yyyy-MM-dd}.gz - 30 + + /casic/logs/missiles.%d{yyyy-MM-dd}.log.gz + + 60 + + + 20MB + + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + - - - - - - - - + \ No newline at end of file