From ee241cda1bad71379fd610ae2228af438bc248db Mon Sep 17 00:00:00 2001
From: guoapeng <GuoAnPeng@163.com>
Date: Wed, 26 Mar 2025 16:35:41 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=9D=90=E6=A0=87=E6=9B=B4=E6=94=B9?=
 =?UTF-8?q?=E5=90=8E=E9=87=8D=E6=96=B0=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/qyft/ms/app/controller/PositionController.java | 9 ++++++++-
 src/main/java/com/qyft/ms/app/controller/SystemController.java   | 3 +++
 .../java/com/qyft/ms/app/device/spray/SprayTaskExecutor.java     | 2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/qyft/ms/app/controller/PositionController.java b/src/main/java/com/qyft/ms/app/controller/PositionController.java
index e31f9f1..80528df 100644
--- a/src/main/java/com/qyft/ms/app/controller/PositionController.java
+++ b/src/main/java/com/qyft/ms/app/controller/PositionController.java
@@ -3,6 +3,7 @@ package com.qyft.ms.app.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.qyft.ms.app.device.spray.SprayTaskExecutor;
 import com.qyft.ms.app.model.entity.Position;
 import com.qyft.ms.app.service.PositionService;
 import com.qyft.ms.system.common.base.BasePageQuery;
@@ -23,6 +24,7 @@ import org.springframework.web.bind.annotation.*;
 public class PositionController {
 
     private final PositionService positionService;
+    private final SprayTaskExecutor sprayTaskExecutor;
 
     @Operation(summary = "新增坐标")
     @PostMapping("/add")
@@ -48,7 +50,12 @@ public class PositionController {
     @Operation(summary = "坐标更新")
     @PutMapping
     public Result<Boolean> update(@RequestBody Position position) {
-        return Result.success(positionService.updateById(position));
+        boolean b = positionService.updateById(position);
+        if (!b) {
+            return Result.failed("更新失败");
+        }
+        sprayTaskExecutor.init();
+        return Result.success(true);
     }
 
     @Operation(summary = "坐标删除")
diff --git a/src/main/java/com/qyft/ms/app/controller/SystemController.java b/src/main/java/com/qyft/ms/app/controller/SystemController.java
index 2cc9ebb..2e52e76 100644
--- a/src/main/java/com/qyft/ms/app/controller/SystemController.java
+++ b/src/main/java/com/qyft/ms/app/controller/SystemController.java
@@ -1,5 +1,6 @@
 package com.qyft.ms.app.controller;
 
+import com.qyft.ms.app.device.spray.SprayTaskExecutor;
 import com.qyft.ms.app.service.PositionService;
 import com.qyft.ms.app.service.SysSettingsService;
 import com.qyft.ms.system.common.result.Result;
@@ -19,6 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
 public class SystemController {
     private final PositionService positionService;
     private final SysSettingsService sysSettingsService;
+    private final SprayTaskExecutor sprayTaskExecutor;
 
     @Operation(summary = "还原出厂配置")
     @GetMapping("/reset")
@@ -26,6 +28,7 @@ public class SystemController {
         try {
             positionService.resetToFactorySettings();
             sysSettingsService.resetToFactorySettings();
+            sprayTaskExecutor.init();
             return Result.success();
         } catch (Exception e) {
             log.error("还原出厂配置失败", e);
diff --git a/src/main/java/com/qyft/ms/app/device/spray/SprayTaskExecutor.java b/src/main/java/com/qyft/ms/app/device/spray/SprayTaskExecutor.java
index ac36b69..08d1d90 100644
--- a/src/main/java/com/qyft/ms/app/device/spray/SprayTaskExecutor.java
+++ b/src/main/java/com/qyft/ms/app/device/spray/SprayTaskExecutor.java
@@ -46,7 +46,7 @@ public class SprayTaskExecutor {
     private Double[][] slideArr;
 
     @PostConstruct
-    private void init() {
+    public void init() {
         Position slidePosition1 = positionService.getOne(new LambdaQueryWrapper<Position>().eq(Position::getPointCode, "slide_position1"));
         Position slidePosition2 = positionService.getOne(new LambdaQueryWrapper<Position>().eq(Position::getPointCode, "slide_position2"));
         Position slidePosition3 = positionService.getOne(new LambdaQueryWrapper<Position>().eq(Position::getPointCode, "slide_position3"));