Browse Source

fix: 坐标更改后重新获取

tags/1.0
guoapeng 4 months ago
parent
commit
ee241cda1b
  1. 9
      src/main/java/com/qyft/ms/app/controller/PositionController.java
  2. 3
      src/main/java/com/qyft/ms/app/controller/SystemController.java
  3. 2
      src/main/java/com/qyft/ms/app/device/spray/SprayTaskExecutor.java

9
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 = "坐标删除")

3
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);

2
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"));

Loading…
Cancel
Save