From 9e6d86cfea30f99668cde150b49abae780239a55 Mon Sep 17 00:00:00 2001
From: wujian <14790700720@163.com>
Date: 星期五, 22 三月 2024 08:38:20 +0800
Subject: [PATCH] change 通信逻辑 fix 相关问题修改
---
jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/impl/DaPassingStationCollectionServiceImpl.java | 59 ++++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 36 insertions(+), 23 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/impl/DaPassingStationCollectionServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/impl/DaPassingStationCollectionServiceImpl.java
index fe4d082..e3edb00 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/impl/DaPassingStationCollectionServiceImpl.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/impl/DaPassingStationCollectionServiceImpl.java
@@ -1,15 +1,7 @@
package com.jcdm.main.da.passingStationCollection.service.impl;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.*;
-import java.util.stream.Collectors;
-
import cn.hutool.core.collection.CollUtil;
-import com.jcdm.common.constant.Constants;
+import com.alibaba.fastjson2.JSONObject;
import com.jcdm.common.utils.DateUtils;
import com.jcdm.common.utils.StringUtils;
import com.jcdm.main.bs.orderScheduling.domain.BsOrderScheduling;
@@ -21,9 +13,17 @@
import com.jcdm.main.da.passingStationCollection.vo.DaPassingStationVO;
import com.jcdm.main.rm.repairRecord.domain.RmRepairRecord;
import com.jcdm.main.rm.repairRecord.mapper.RmRepairRecordMapper;
+import com.jcdm.main.websocket.WebSocketServer;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* 浜у搧杩囩珯閲囬泦Service涓氬姟灞傚鐞�
@@ -223,19 +223,32 @@
}
}
@Override
- public String SelectSN(String SNcode){
- return "1";
+ public String SelectSN(String SNcode,String node) {
+ try {
+ Map<String, Object> params = new HashMap<>();
+ params.put("SN_CODE",SNcode);
+ params.put("Node",node);
+ params.put("Success","");
+ daPassingStationCollectionMapper.SelectSN(params);
+ return (String)params.get("Success");
+ } catch (Exception e) {
+ return "鏁版嵁鏌ヨ澶辫触锛�";
+ }
+ }
-// --璁㈠崟鎺掍骇
-// select * from bs_order_scheduling where engine_no='2V91Y-F RA182118'
-//
-// --宸ヨ壓璺嚎瀛愯〃淇℃伅
-// select * from bs_technology_route_child_info where route_code='H_191S'
-//
-// --杩斾慨鏁版嵁
-// select * from rm_repair_record where box_code='2V91Y-F RA182118'
-//
-// --杩囩珯閲囬泦
-// select * from da_passing_station_collection --where sfc_code='2V91Y-F RA182118'
+ public String sendMessage(String message) throws Exception{
+ Map<String,Object> map = new HashMap<>();
+
+ // 鑾峰彇褰撳墠鏃ユ湡鍜屾椂闂�
+ LocalDateTime nowDateTime = LocalDateTime.now();
+ DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+ System.out.println(dateTimeFormatter.format(nowDateTime));
+ map.put("server_time",dateTimeFormatter.format(nowDateTime));
+ map.put("server_code","200");
+
+ map.put("server_message",message);
+ JSONObject jsonObject = new JSONObject(map);
+ WebSocketServer.sendAllMessage(jsonObject.toString());
+ return jsonObject.toString();
}
}
--
Gitblit v1.9.3