From 778d3d8b387ca0a8d1b51ef68f783fb0b407ef20 Mon Sep 17 00:00:00 2001
From: wujian <14790700720@163.com>
Date: 星期五, 26 七月 2024 11:52:34 +0800
Subject: [PATCH] fix6
---
jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/impl/DaPassingStationCollectionServiceImpl.java | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 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 e3edb00..63a8b47 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,6 +1,7 @@
package com.jcdm.main.da.passingStationCollection.service.impl;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson2.JSONObject;
import com.jcdm.common.utils.DateUtils;
import com.jcdm.common.utils.StringUtils;
@@ -213,14 +214,25 @@
@Override
public void insertRepairRecordByIds(DaPassingStationCollection daPassingStationCollection) {
Long[] conditions = daPassingStationCollection.getIds();
+ String sfcCode = "";
+ List<RmRepairRecord> save = new ArrayList<>();
+
for (int i = 0; i < conditions.length; i++) {
DaPassingStationCollection result = daPassingStationCollectionMapper.selectDaPassingStationCollectionById(conditions[i]);
+ if (i==0){
+ if (ObjectUtil.isNotEmpty(result)){
+ sfcCode = result.getSfcCode();
+ rmRepairRecordMapper.deleteRmRepairRecordByCode(sfcCode);
+ }
+ }
RmRepairRecord rmRepairRecord = new RmRepairRecord();
rmRepairRecord.setBoxCode(result.getSfcCode());
rmRepairRecord.setProcessesCode(result.getLocationCode());
rmRepairRecord.setOriginalResult(result.getOutRsSign());
rmRepairRecordMapper.insertRmRepairRecord(rmRepairRecord);
+ daPassingStationCollectionMapper.deleteDaPassingStationCollectionById(result.getId());
}
+
}
@Override
public String SelectSN(String SNcode,String node) {
@@ -236,7 +248,23 @@
}
}
- public String sendMessage(String message) throws Exception{
+// 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();
+// }
+
+ public String sendMessage(String message,String userid) throws Exception{
Map<String,Object> map = new HashMap<>();
// 鑾峰彇褰撳墠鏃ユ湡鍜屾椂闂�
@@ -248,7 +276,7 @@
map.put("server_message",message);
JSONObject jsonObject = new JSONObject(map);
- WebSocketServer.sendAllMessage(jsonObject.toString());
+ WebSocketServer.sendInfo(jsonObject.toString(),userid);
return jsonObject.toString();
}
}
--
Gitblit v1.9.3