From 46722d87589760fb5fa03715122278d1d1b7684b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B?= <1063331231@qq.com>
Date: Sat, 14 Jun 2025 21:57:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=B7=A5=E8=89=BA=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BA=93=E5=8F=AA=E5=AD=98=E4=B8=89=E4=B8=AA=E5=8A=A0?=
 =?UTF-8?q?=E7=83=AD=E5=8C=BA=E7=9A=84=E4=B8=89=E6=9D=A1=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E6=AF=8F=E6=AC=A1=E9=83=BD=E8=A6=86=E7=9B=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iflytop/sgs/app/service/api/CraftsService.java  | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/iflytop/sgs/app/service/api/CraftsService.java b/src/main/java/com/iflytop/sgs/app/service/api/CraftsService.java
index cc11b58..e4dac24 100644
--- a/src/main/java/com/iflytop/sgs/app/service/api/CraftsService.java
+++ b/src/main/java/com/iflytop/sgs/app/service/api/CraftsService.java
@@ -77,16 +77,6 @@ public class CraftsService extends ServiceImpl<CraftsMapper, Crafts> {
         Crafts craft = this.getById(startCraftsDTO.getCraftId());
         HeatModuleCode heatModuleCode = startCraftsDTO.getHeatId();
         int currentIndex = 0;
-        CraftMonitor craftMonitor = new CraftMonitor();
-        if (startCraftsDTO.getCraftMonitorId() != null) {
-            craftMonitor = craftMonitorService.getById(startCraftsDTO.getCraftMonitorId());
-            craftMonitor.setModifyParam(startCraftsDTO.getModifyParam());
-            currentIndex = craftMonitor.getCurrentStepId();
-        } else {
-            craftMonitor.setColumns(JSONUtil.toJsonStr(startCraftsDTO.getColumns()));
-            craftMonitor.setCraftsId(startCraftsDTO.getCraftId());
-            craftMonitor.setCurrentStepId(currentIndex);
-        }
         if (craft == null) {
             throw new AppException(ResultCode.INVALID_PARAMETER);
         }
@@ -119,6 +109,17 @@ public class CraftsService extends ServiceImpl<CraftsMapper, Crafts> {
             log.error("加热模块温度过高");
             throw new AppException(ResultCode.HEAT_MODULE_TEMPERATURE_IS_HEIGHT);
         }
+        CraftMonitor craftMonitor = craftMonitorService.getByHeatModule(heatModuleCode);
+        if (craftMonitor == null) {
+            craftMonitor = new CraftMonitor();
+            craftMonitor.setCurrentStepId(currentIndex);
+        }else{
+            //currentIndex = craftMonitor.getCurrentStepId(); todo测试后放开
+        }
+        craftMonitor.setModifyParam(startCraftsDTO.getModifyParam());
+        craftMonitor.setColumns(JSONUtil.toJsonStr(startCraftsDTO.getColumns()));
+        craftMonitor.setCraftsId(startCraftsDTO.getCraftId());
+        craftMonitor.setCurrentStepId(currentIndex);
         craftMonitor.setHeatId(heatModuleCode);
         craftMonitorService.saveMonitor(craftMonitor);
         log.info("准备开始工艺，加热模块{},工艺{}", heatModuleCode, craft.getName());