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 | 85 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 75 insertions(+), 10 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 8c46a12..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,15 +1,8 @@
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 cn.hutool.core.util.ObjectUtil;
+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 +14,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涓氬姟灞傚鐞�
@@ -75,6 +76,14 @@
{
List<DaPassingStationVO> result = new ArrayList<>();
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
+ LocalDateTime startTime = LocalDate.now().atStartOfDay();
+ LocalDateTime endTime = LocalDate.now().plusDays(1).atStartOfDay();
+ String s1 = startTime.format(formatter);
+ String s2 = endTime.format(formatter);
+ daPassingStationCollection.setStartTime(s1);
+ daPassingStationCollection.setEndTime(s2);
List<DaPassingStationCollection> list = daPassingStationCollectionMapper.selectDaPassingStationCollectionList(daPassingStationCollection);
//绛涢櫎鑺傛媿涓虹┖鐨勬暟鎹�
list = list.stream().filter(x -> StringUtils.isNotEmpty(x.getBeatTime())).collect(Collectors.toList());
@@ -205,13 +214,69 @@
@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) {
+ 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 "鏁版嵁鏌ヨ澶辫触锛�";
+ }
+ }
+
+// 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<>();
+
+ // 鑾峰彇褰撳墠鏃ユ湡鍜屾椂闂�
+ 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.sendInfo(jsonObject.toString(),userid);
+ return jsonObject.toString();
}
}
--
Gitblit v1.9.3