Merge remote-tracking branch 'origin/master'

src/main/java/com/aps/controller/common/ChromosomeDataController.java

@@ -50,6 +50,10 @@ public class ChromosomeDataController {
                     sceneId, entityName, paged);
             return R.ok(result);
         } catch (Exception e) {
+            // 检查是否是场景文件不存在的异常
+            if (e.getMessage() != null && e.getMessage().contains("未找到场景ID为") && e.getMessage().contains("的Chromosome数据")) {
+                return R.ok(null);
+            }
             return R.failed("查询失败: " + e.getMessage());
         }
     }
@@ -71,28 +75,26 @@ public class ChromosomeDataController {
             @PathVariable String entityName,
             @RequestBody Paged paged) {
 
-        try {
-            // 获取sceneId（文件实体需要，数据库实体可选）
-            String sceneId = paged.getCondition("sceneId") != null ?
-                    paged.getCondition("sceneId").getFieldValue() : null;
 
-            // 文件实体必须要有sceneId
-            if (isFileEntity(entityName) && (sceneId == null || sceneId.isEmpty())) {
-                return R.failed("文件实体查询时sceneId不能为空");
-            }
+        // 获取sceneId（文件实体需要，数据库实体可选）
+        String sceneId = paged.getCondition("sceneId") != null ?
+                paged.getCondition("sceneId").getFieldValue() : null;
 
-            // 直接调用服务层的list查询方法
-            List<Object> result = chromosomeDataService.queryChromosomeDataList(sceneId, entityName, paged);
+        // 文件实体必须要有sceneId
+        if (isFileEntity(entityName) && (sceneId == null || sceneId.isEmpty())) {
+            return R.ok(null);
+        }
 
+        // 直接调用服务层的list查询方法
+        List<Object> result = chromosomeDataService.queryChromosomeDataList(sceneId, entityName, paged);
 
-            if (result == null) {
-                return R.ok(Collections.emptyList(), "查询成功，但未找到匹配的数据");
-            }
 
-            return R.ok(result);
-        } catch (Exception e) {
-            return R.failed("查询失败: " + e.getMessage());
+        if (result == null) {
+            return R.ok(Collections.emptyList(), "查询成功，但未找到匹配的数据");
         }
+
+        return R.ok(result);
+
     }
 
     /**
@@ -125,6 +127,10 @@ public class ChromosomeDataController {
                 return R.failed("未找到ID为 " + id + " 的数据");
             }
         } catch (Exception e) {
+            // 检查是否是场景文件不存在的异常
+            if (e.getMessage() != null && e.getMessage().contains("未找到场景ID为") && e.getMessage().contains("的Chromosome数据")) {
+                return R.ok(null);
+            }
             return R.failed("查询失败: " + e.getMessage());
         }
     }

src/main/java/com/aps/service/Algorithm/GeneticDecoder.java

@@ -369,7 +369,7 @@ if(finishedOrder==null||finishedOrder.size()==0)
                 .filter(t->t.getMachineId()==machine.getId())
                 .findFirst().orElse(null);
 
-
+        operation.setSelectMachineID(machine.getId());
 
 
         int teardownTime = machineOption.getTeardownTime();
@@ -490,7 +490,7 @@ if(finishedOrder==null||finishedOrder.size()==0)
         result.setOrderId(operation.getOrderId());
         result.setProductId(operation.getProductId());
         result.setMachineId(machine.getId());
-        operation.setSelectMachineID(machine.getId());
+
 
         result.setStartTime(startTime);
         result.setEndTime(endTime);
@@ -844,7 +844,7 @@ if(finishedOrder==null||finishedOrder.size()==0)
 //                    ? (int) discreteParameterMatrixService.getDiscreteParameterMatrixValue(prev, operation)
 //                    : 0;
             DiscreteParameterMatrixService service = SpringContextUtil.getBean(DiscreteParameterMatrixService.class);
-            if (service != null) {
+
 
                 double discreteParameterMatrixValue = service.getDiscreteParameterMatrixValue( operation,prev);
                 setupTime = (int) discreteParameterMatrixValue;
@@ -855,15 +855,15 @@ if(finishedOrder==null||finishedOrder.size()==0)
                     System.out.println("lastGene"+operation.getExecId());
 
                 }
-                System.out.println("换型时间"+discreteParameterMatrixValue);
+//                System.out.println("换型时间"+discreteParameterMatrixValue);
 //                System.out.println(setupTime+"换型时间"+"huanxingshijian ");
-            }
+
 
         }
 
         operation.setChangeLineTime(setupTime);
 
-        System.out.println("换型时间111"+setupTime);
+//        System.out.println("换型时间111"+setupTime);
 
         return setupTime;
     }

src/main/java/com/aps/service/impl/DiscreteParameterMatrixServiceImpl.java

@@ -30,6 +30,9 @@ public class DiscreteParameterMatrixServiceImpl extends ServiceImpl<DiscretePara
     
     @Override
     public double getDiscreteParameterMatrixValue(Entry entry, Entry lastEntry) {
+
+
+
         // 1. 参数验证
         if (entry == null || lastEntry == null) {
             return 0.0;
@@ -39,7 +42,7 @@ public class DiscreteParameterMatrixServiceImpl extends ServiceImpl<DiscretePara
         // 2. 获取基础数据
         List<RoutingDiscreteParam> firstParams = lastEntry.getDiscreteParameter();
         List<RoutingDiscreteParam> secondParams = entry.getDiscreteParameter();
-        
+
         // 检查参数列表是否为null
         if (firstParams == null || secondParams == null) {
             return 0.0;
@@ -60,6 +63,7 @@ public class DiscreteParameterMatrixServiceImpl extends ServiceImpl<DiscretePara
         long secondEquipTypeId = entry.getSelectMachineID() != null ? entry.getSelectMachineID() : 0L;
 
         if (firstEquipId == 0 || secondEquipId == 0 || firstEquipTypeId == 0 || secondEquipTypeId == 0) {
+            System.out.println(firstEquipId + "-- " + secondEquipId + "-- " + firstEquipTypeId + "-- " + secondEquipTypeId);
 
             return  0.0;