diff --git a/inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/sftp/SftpClient.java b/inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/sftp/SftpClient.java index a0b07dc..225f0e9 100644 --- a/inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/sftp/SftpClient.java +++ b/inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/sftp/SftpClient.java @@ -175,7 +175,7 @@ public class SftpClient { // ftps.connect("192.168.1.198", 21); // boolean loginRes = ftps.login("hangtian", "123qweasd"); // ftps.connect("124.221.104.159", 10990); - ftps.connect("192.168.1.193", 1990); + ftps.connect("k", 10990); boolean loginRes = ftps.login("ftpuser", "atia2018"); System.out.println(loginRes); ftps.setFileType(2); diff --git a/inspect-main/inspect-main-client/src/main/java/com/inspect/client/service/ClientService.java b/inspect-main/inspect-main-client/src/main/java/com/inspect/client/service/ClientService.java index df42bf2..b2f8a00 100644 --- a/inspect-main/inspect-main-client/src/main/java/com/inspect/client/service/ClientService.java +++ b/inspect-main/inspect-main-client/src/main/java/com/inspect/client/service/ClientService.java @@ -2,6 +2,7 @@ package com.inspect.client.service; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.inspect.base.core.utils.DateUtils; import com.inspect.client.domain.ReqDomain; import com.inspect.client.domain.ResDomain; import com.inspect.client.mapper.ClientStatisticsMapper; @@ -15,7 +16,10 @@ import com.inspect.system.base.openDomain.BasedataEqpBookMoMain; import com.inspect.task.controller.PatrolTaskController; import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Date; import java.util.HashMap; +import java.util.List; import javax.annotation.Resource; import com.inspect.task.domain.PatrolTask; @@ -219,6 +223,8 @@ public class ClientService { try { logger.info("[CLIENT] nestSystemCode: {}, lowMsgUrl: {}", nestSystemCode, lowMsgUrl); jsonObject.put("ReceiveCode", nestSystemCode); + jsonObject.computeIfAbsent("Time", k -> DateUtils.format(DateUtils.yyyyMMddHHmmss2, new Date())); + return CallDeviceApi.callDevice(lowMsgUrl, jsonObject.toJSONString()); } catch (Exception e) { throw new ServiceException("Call " + lowMsgUrl + " Exception!"); diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontHeartBeatConsumerHandle.java b/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontHeartBeatConsumerHandle.java index e828dc5..10a25df 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontHeartBeatConsumerHandle.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontHeartBeatConsumerHandle.java @@ -72,10 +72,10 @@ public class BasedataMontHeartBeatConsumerHandle implements IBasedataMontDataHan for (BasedataEqpBook book : eqpBooks) { String patrolDeviceCode = book.getPatrolDeviceCode(); Long eqpBookId = book.getEqpBookId(); - int heart_beat_interval = jsonObject.getInteger("heartBeatInterval"); - int heartBeatInterval = (int) Math.floor((double) heart_beat_interval * 1.5D); + int heartFromTcpServer = jsonObject.getInteger("HeartBeatInterval"); + int heartBeatInterval = (int) Math.floor((double) heartFromTcpServer * 1.5D); Date nowTime = DateUtils.getNowDate(); - this.patrolDeviceOnlineHandle(patrolDeviceCode, eqpBookId, heart_beat_interval, heartBeatInterval, nowTime); + this.patrolDeviceOnlineHandle(patrolDeviceCode, eqpBookId, heartFromTcpServer, heartBeatInterval, nowTime); } } else { basedataEqpBookService.insertBasedataEqpBook(basedataEqpbook); diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontNestRunDataConsumerHandle.java b/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontNestRunDataConsumerHandle.java index 9e92fa5..1225ea0 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontNestRunDataConsumerHandle.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontNestRunDataConsumerHandle.java @@ -49,7 +49,7 @@ public class BasedataMontNestRunDataConsumerHandle implements IBasedataMontDataH BasedataMontNestRunData basedataMontNestrundata = iterator.next(); BasedataEqpBook basedataEqpbook = new BasedataEqpBook(); basedataEqpbook.setPatrolDeviceCode(basedataMontNestrundata.getNestCode()); - List basedataEqpBookList = this.basedataEqpBookService.selectBasedataEqpBookList(basedataEqpbook); + List basedataEqpBookList = basedataEqpBookService.selectBasedataEqpBookList(basedataEqpbook); if (!basedataEqpBookList.isEmpty()) { basedataMontNestrundata.setEqpBookId(basedataEqpBookList.get(0).getEqpBookId()); } @@ -64,13 +64,12 @@ public class BasedataMontNestRunDataConsumerHandle implements IBasedataMontDataH } basedataMontNestrundata.setCreateTime(nowDate); - this.basedataMontNestRunDataService.insertBasedataMontNestRunData(basedataMontNestrundata); + basedataMontNestRunDataService.insertBasedataMontNestRunData(basedataMontNestrundata); basedataMontNestrundata.setCreateTime(null); } - HashMap> patrolDeviceDataMap = this.getPatrolDeviceData(list); + HashMap> patrolDeviceDataMap = getPatrolDeviceData(list); String sendCode = jsonObject.getString("SendCode"); - for (String itemKey : patrolDeviceDataMap.keySet()) { JSONObject returnJsonObject = new JSONObject(); JSONObject montJsonObject = new JSONObject(); @@ -82,8 +81,8 @@ public class BasedataMontNestRunDataConsumerHandle implements IBasedataMontDataH returnJsonObject.put("receiveTime", value_unit); returnJsonObject.put("event", "mont/montNestRunData"); String jsonString = JSON.toJSONString(returnJsonObject); - this.redisService.setCacheObject("mont_nest_run_data:" + itemKey, returnJsonObject); - this.parseMessage(jsonString); + redisService.setCacheObject("mont_nest_run_data:" + itemKey, returnJsonObject); + parseMessage(jsonString); System.out.println("发送机巢运行数据到websocket mont/montNestRunData:::" + jsonString); } @@ -96,17 +95,16 @@ public class BasedataMontNestRunDataConsumerHandle implements IBasedataMontDataH private HashMap> getPatrolDeviceData(List list) { HashMap> objectMap = new HashMap<>(); - for (BasedataMontNestRunData montNestRunData : list) { - String nest_code = montNestRunData.getNestCode(); - ArrayList dataList; - if (objectMap.containsKey(nest_code)) { - dataList = objectMap.get(nest_code); + String nestCode = montNestRunData.getNestCode(); + ArrayList dataList; + if (objectMap.containsKey(nestCode)) { + dataList = objectMap.get(nestCode); dataList.add(montNestRunData); } else { - dataList = new ArrayList(); + dataList = new ArrayList<>(); dataList.add(montNestRunData); - objectMap.put(nest_code, dataList); + objectMap.put(nestCode, dataList); } }