From 9881269076320945170b6995cbd7b6b4f5f53062 Mon Sep 17 00:00:00 2001
From: lulicheng <licheng.lu@ipsplm.com>
Date: Thu, 15 Aug 2024 14:05:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E9=A1=BA=E5=BA=8F=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SimulationAnalysisServiceImpl.java   | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

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 90ea1ca..e6ab2e1 100644
--- a/src/main/java/com/ipsplm/service/simulation/impl/SimulationAnalysisServiceImpl.java
+++ b/src/main/java/com/ipsplm/service/simulation/impl/SimulationAnalysisServiceImpl.java
@@ -10,6 +10,7 @@ import com.ipsplm.service.simulation.ISimulationAnalysisService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.lang.reflect.Field;
 import java.util.*;
 
 /**
@@ -157,20 +158,28 @@ public class SimulationAnalysisServiceImpl implements ISimulationAnalysisService
      */
     public List<OeeVO> beanToKeyValue(List oeeList) {
         List<OeeVO> oeeVOList = new ArrayList<>();
+        //通过反射获取字段
+        Class<?> clazz = oeeList.get(0).getClass();
+        Field[] fields = clazz.getDeclaredFields();
+
         for (Object object : oeeList) {
             JSONObject jsonObject = (JSONObject) JSON.toJSON(object);
             Object status = jsonObject.get("status");
-            for (Map.Entry<String, Object> entry : jsonObject.entrySet()) {
-                OeeVO oeeVO = new OeeVO();
-                Object value = entry.getValue();
-                String key = entry.getKey();
+
+            // 按字段顺序处理
+            for (Field field : fields) {
+                String key = field.getName();
                 if ("flag".equals(key) || "id".equals(key) || "status".equals(key)) {
                     continue;
                 }
-                oeeVO.setName(key);
-                oeeVO.setValue(value);
-                oeeVO.setStatus(status);
-                oeeVOList.add(oeeVO);
+
+                if (jsonObject.containsKey(key)) {
+                    OeeVO oeeVO = new OeeVO();
+                    oeeVO.setName(key);
+                    oeeVO.setValue(jsonObject.get(key));
+                    oeeVO.setStatus(status);
+                    oeeVOList.add(oeeVO);
+                }
             }
         }
         return oeeVOList;