diff --git a/inspect-job/src/main/java/com/inspect/job/task/UpTask.java b/inspect-job/src/main/java/com/inspect/job/task/UpTask.java index 6f5b0d8..1b08490 100644 --- a/inspect-job/src/main/java/com/inspect/job/task/UpTask.java +++ b/inspect-job/src/main/java/com/inspect/job/task/UpTask.java @@ -237,9 +237,9 @@ public class UpTask { try { JSONObject.parseObject(msg); return this.syncDataToUpstreamService.postMessage(msg); - } catch (Exception var3) { - this.logger.info("定时上报数据到上级系统的请求捕获异常", var3); - throw new ServiceException("上报数据失败,msg格式不正确"); + } catch (Exception e) { + this.logger.error("error", e); + throw e; } } 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 e577d06..a2410ee 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 @@ -18,6 +18,10 @@ import com.inspect.task.controller.PatrolTaskController; import java.math.BigDecimal; import java.util.Date; import java.util.HashMap; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; import javax.annotation.Resource; import com.inspect.task.domain.PatrolTask; @@ -47,6 +51,9 @@ public class ClientService { SyncDataToUpstreamService syncDataToUpstreamService; public static HashMap modelMap = new HashMap<>(); + private final ExecutorService threadPool = new ThreadPoolExecutor( + 2, 4, 60, TimeUnit.SECONDS, new LinkedBlockingQueue<>(4)); + public static void initModelMap() { modelMap.put("1", "host_file_path"); modelMap.put("2", "robot_file_path"); @@ -76,18 +83,27 @@ public class ClientService { break; case 61: try { - logger.info("CLIENT 处理上级系统下发消息 61"); - BasedataEqpBookMoMain basedataEqpbookMomain = new BasedataEqpBookMoMain(); - basedataEqpbookMomain.setType(deviceCode); - String eqpBookListInfo = patrolResultController.getEqpBookListInfo(basedataEqpbookMomain); - logger.info("CLIENT 处理上级系统下发消息 61, res: {}", eqpBookListInfo); - JSONObject parse = JSONObject.parseObject(eqpBookListInfo); - JSONObject itemJson = new JSONObject(); - itemJson.put(modelMap.get(deviceCode), parse.getString(modelMap.get(deviceCode))); - logger.info("上级模型查询上报内容:{}", itemJson.toJSONString()); - return AjaxResult.success("ok", itemJson.toJSONString()); + logger.info("使用线程池处理点位模型数据请求"); + threadPool.execute(new Runnable() { + @Override + public void run() { + logger.info("开始收集点位模型数据"); + BasedataEqpBookMoMain basedataEqpbookMomain = new BasedataEqpBookMoMain(); + basedataEqpbookMomain.setType(deviceCode); + String eqpBookListInfo = patrolResultController.getEqpBookListInfo(basedataEqpbookMomain); + logger.info("CLIENT 处理上级系统下发消息 61, res: {}", eqpBookListInfo); + JSONObject parse = JSONObject.parseObject(eqpBookListInfo); + JSONObject itemJson = new JSONObject(); + itemJson.put(modelMap.get(deviceCode), parse.getString(modelMap.get(deviceCode))); + String json = itemJson.toJSONString(); + logger.info("上报点位模型数据到上级系统"); + syncDataToUpstreamService.postMessage(json); + } + }); + return AjaxResult.success(); } catch (Exception e) { - e.printStackTrace(); + logger.error("error", e); + return AjaxResult.error(); } case 81: JSONArray jsonArray = jsonObject.getJSONArray("Items");