From d76bbaa8a9a70124045dc4c9753e5a868ac4e7d2 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期五, 21 六月 2024 09:33:38 +0800
Subject: [PATCH] -
---
jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/service/ExternalInterface.java | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/service/ExternalInterface.java b/jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/service/ExternalInterface.java
index 428775a..a77555f 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/service/ExternalInterface.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/service/ExternalInterface.java
@@ -11,6 +11,7 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.jcdm.common.core.domain.AjaxResult;
import com.jcdm.common.utils.StringUtils;
+import com.jcdm.framework.websocket.WebSocketUsers;
import com.jcdm.main.bs.formulaChild.domain.BsFormulaChildInfo;
import com.jcdm.main.bs.formulaChild.service.IBsFormulaChildInfoService;
import com.jcdm.main.constant.Constants;
@@ -23,20 +24,29 @@
import com.jcdm.main.om.productionOrde.domain.OmProductionOrdeInfo;
import com.jcdm.main.om.productionOrde.service.IOmProductionOrdeInfoService;
import com.jcdm.main.restful.qingYan.doman.*;
+import lombok.extern.slf4j.Slf4j;
import org.aspectj.weaver.loadtime.Aj;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import javax.websocket.Session;
import java.lang.reflect.Field;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.concurrent.CompletableFuture;
import java.util.stream.Collectors;
-
+@Slf4j
@RestController
@RequestMapping("/jcdmMes")
public class ExternalInterface {
+ Map<String, Session> map = WebSocketUsers.getUsers();
+
+ private static final Logger logger = LoggerFactory.getLogger("sys-user");
+
public SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@Autowired
@@ -158,11 +168,22 @@
if(StringUtils.isNotBlank(parentVO.getProductNum())){
OmProductionOrdeInfo one = omProductionOrdeInfoService.getOne(new LambdaQueryWrapper<OmProductionOrdeInfo>().eq(OmProductionOrdeInfo::getProductNum, parentVO.getProductNum()));
if(ObjectUtil.isNotNull(one)){
+ logger.info("瑙ｇ粦灏忚溅{}锛宲ack鐮佹槸{}"+one.getTrolleyYard(),one.getProductNum());
one.setTrolleyYard("");
omProductionOrdeInfoService.saveOrUpdate(one);
}
}
}
+// try{
+// CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
+// logger.info("寮�濮嬫墽琛屽紓姝ユ柟娉�");
+// HttpResponse execute = HttpRequest.post(url).body(JSONUtil.toJsonStr(parentVO)).execute();
+// logger.info("寮傛鏂规硶鎵ц缁撴潫");
+// logger.info("鎺ユ敹娓呯爺锛屾皵瀵嗗紓姝ユ柟娉晎}"+execute.body());
+// });
+// }catch (Exception e){
+// System.out.println(e.getMessage());
+// }
HttpResponse execute = HttpRequest.post(url).body(JSONUtil.toJsonStr(parentVO)).execute();
return AjaxResult.success(execute.body());
}
@@ -244,6 +265,14 @@
}
+ /**
+ * 鏀捐璇风┖鐘舵��
+ */
+ @PostMapping("/sendWebSocket")
+ public void sendWebSocket(@RequestBody BsFormulaChildInfo bsFormulaChildInfo)
+ {
+ WebSocketUsers.sendMessageToUserByText(map.get(bsFormulaChildInfo.getLocationCode()), bsFormulaChildInfo.getResults());
+ }
/**
* 浣跨敤鍙嶅皠鑾峰彇瀵硅薄鐨勫睘鎬у��
--
Gitblit v1.9.3