From 1435a356de5d5967bb11016efc1b34d8d59e5c67 Mon Sep 17 00:00:00 2001
From: lulicheng <licheng.lu@ipsplm.com>
Date: Tue, 6 Aug 2024 13:28:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../simulation/SimulationAnalysisController.java     |  4 ----
 .../dao/simulation/SimulationAnalysisMapper.java     | 12 ++++++++++++
 .../simulation/ISimulationAnalysisService.java       |  3 ++-
 .../impl/SimulationAnalysisServiceImpl.java          | 12 +++++++-----
 src/main/java/com/ipsplm/ws/SimulationWebsocket.java |  2 --
 .../mapper/simulation/SimulationAnalysisMapper.xml   |  5 +++++
 6 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/ipsplm/controller/simulation/SimulationAnalysisController.java b/src/main/java/com/ipsplm/controller/simulation/SimulationAnalysisController.java
index 878fc57..7189e08 100644
--- a/src/main/java/com/ipsplm/controller/simulation/SimulationAnalysisController.java
+++ b/src/main/java/com/ipsplm/controller/simulation/SimulationAnalysisController.java
@@ -64,8 +64,4 @@ public class SimulationAnalysisController {
         return ResponseDTO.ok(simulationAnalysisService.getBufferNum(process));
     }
 
-    @GetMapping("/test-socket")
-    public ResponseDTO testSocket(@RequestParam String param){
-        return ResponseDTO.ok(simulationService.getPlantData(param));
-    }
 }
diff --git a/src/main/java/com/ipsplm/dao/simulation/SimulationAnalysisMapper.java b/src/main/java/com/ipsplm/dao/simulation/SimulationAnalysisMapper.java
index c0688c6..f2706b1 100644
--- a/src/main/java/com/ipsplm/dao/simulation/SimulationAnalysisMapper.java
+++ b/src/main/java/com/ipsplm/dao/simulation/SimulationAnalysisMapper.java
@@ -116,5 +116,17 @@ public interface SimulationAnalysisMapper {
      */
     List<BufferNumZy> getBufferNumZy(@Param("bufferNameList") List<BufferVO> bufferNameList);
 
+    /**
+     * 获取字段信息
+     * @param tableId
+     * @param groupId
+     * @return
+     */
     List<FieldCnVO> getFieldInfo(@Param("tableId") Integer tableId,@Param("groupId") Integer groupId);
+
+    /**
+     * 获取仿真结束时间
+     * @return
+     */
+    String getSimEndTime();
 }
diff --git a/src/main/java/com/ipsplm/service/simulation/ISimulationAnalysisService.java b/src/main/java/com/ipsplm/service/simulation/ISimulationAnalysisService.java
index b81942a..88e9c2f 100644
--- a/src/main/java/com/ipsplm/service/simulation/ISimulationAnalysisService.java
+++ b/src/main/java/com/ipsplm/service/simulation/ISimulationAnalysisService.java
@@ -5,6 +5,7 @@ import com.ipsplm.entity.simulation.vo.OeeVO;
 import com.ipsplm.entity.simulation.vo.PlantEquipmentUtilizationVO;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description 仿真分析接口层
@@ -19,7 +20,7 @@ public interface ISimulationAnalysisService {
      * @param flag
      * @return
      */
-    List<OeeVO> getPlantEquipmentUtilization(Long flag);
+    Map<String,Object> getPlantEquipmentUtilization(Long flag);
 
     /**
      * 获取工序列表
diff --git a/src/main/java/com/ipsplm/service/simulation/impl/SimulationAnalysisServiceImpl.java b/src/main/java/com/ipsplm/service/simulation/impl/SimulationAnalysisServiceImpl.java
index 4cf59ec..90ea1ca 100644
--- a/src/main/java/com/ipsplm/service/simulation/impl/SimulationAnalysisServiceImpl.java
+++ b/src/main/java/com/ipsplm/service/simulation/impl/SimulationAnalysisServiceImpl.java
@@ -10,9 +10,7 @@ import com.ipsplm.service.simulation.ISimulationAnalysisService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @Description 仿真分析实现类
@@ -32,11 +30,15 @@ public class SimulationAnalysisServiceImpl implements ISimulationAnalysisService
      * @return
      */
     @Override
-    public List<OeeVO> getPlantEquipmentUtilization(Long flag) {
+    public Map<String,Object> getPlantEquipmentUtilization(Long flag) {
+        String simEndTime = simulationAnalysisMapper.getSimEndTime();
         List<PlantEquipmentUtilizationVO> plantEquipmentUtilization = simulationAnalysisMapper.getPlantEquipmentUtilization(flag);
         List<OeeVO> oeeVOList = beanToKeyValue(plantEquipmentUtilization);
         List<FieldCnVO> fieldCnVOList = simulationAnalysisMapper.getFieldInfo(null,1);
-        return fieldNameToChinese(fieldCnVOList,oeeVOList);
+        Map<String,Object> result = new HashMap<>();
+        result.put("simEndTime",simEndTime);
+        result.put("oeeList",fieldNameToChinese(fieldCnVOList,oeeVOList));
+        return result;
     }
 
     /**
diff --git a/src/main/java/com/ipsplm/ws/SimulationWebsocket.java b/src/main/java/com/ipsplm/ws/SimulationWebsocket.java
index 78f198d..dd48eb5 100644
--- a/src/main/java/com/ipsplm/ws/SimulationWebsocket.java
+++ b/src/main/java/com/ipsplm/ws/SimulationWebsocket.java
@@ -10,8 +10,6 @@ import javax.websocket.OnMessage;
 import javax.websocket.OnOpen;
 import javax.websocket.Session;
 import javax.websocket.server.ServerEndpoint;
-import java.util.Timer;
-import java.util.TimerTask;
 import java.util.concurrent.CopyOnWriteArraySet;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
diff --git a/src/main/resources/mapper/simulation/SimulationAnalysisMapper.xml b/src/main/resources/mapper/simulation/SimulationAnalysisMapper.xml
index 4da196c..f3e113d 100644
--- a/src/main/resources/mapper/simulation/SimulationAnalysisMapper.xml
+++ b/src/main/resources/mapper/simulation/SimulationAnalysisMapper.xml
@@ -129,6 +129,7 @@
         </foreach>
         from buffernum_zy order by flag desc,record_time limit 48
     </select>
+<!--    获取字段信息-->
     <select id="getFieldInfo" resultType="com.ipsplm.entity.simulation.vo.FieldCnVO">
         select field_code as fieldCode, field_des as fieldName from field_cn
         <where>
@@ -141,4 +142,8 @@
         </where>
         ;
     </select>
+<!--    获取仿真结束时间-->
+    <select id="getSimEndTime" resultType="java.lang.String">
+        select simtime from pts_message order by simtime desc limit 1
+    </select>
 </mapper>
\ No newline at end of file