|
|
@ -1,11 +1,14 @@ |
|
|
|
package com.qyft.ms.app.front.cmd.business; |
|
|
|
|
|
|
|
import cn.hutool.json.JSONUtil; |
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|
|
|
import com.qyft.ms.app.common.generator.PathGenerator; |
|
|
|
import com.qyft.ms.app.device.spray.SprayTaskExecutor; |
|
|
|
import com.qyft.ms.app.device.status.DeviceStatus; |
|
|
|
import com.qyft.ms.app.device.status.SprayTask; |
|
|
|
import com.qyft.ms.app.model.entity.OperationLog; |
|
|
|
import com.qyft.ms.app.model.entity.Position; |
|
|
|
import com.qyft.ms.app.service.OperationLogService; |
|
|
|
import com.qyft.ms.app.service.PositionService; |
|
|
|
import com.qyft.ms.system.common.annotation.CommandMapping; |
|
|
|
import com.qyft.ms.system.common.constant.CommandStatus; |
|
|
@ -44,7 +47,7 @@ public class MatrixSprayStart extends BaseCommandHandler { |
|
|
|
private final SprayTaskExecutor sprayTaskExecutor; |
|
|
|
private final PositionService positionService; |
|
|
|
private final DeviceStatus deviceStatus; |
|
|
|
|
|
|
|
private final OperationLogService operationLogService; |
|
|
|
|
|
|
|
private static boolean nonNullCheck(ResponseBodyEmitter emitter, String cmdId, String cmdCode, |
|
|
|
String matrixPathType, |
|
|
@ -135,8 +138,11 @@ public class MatrixSprayStart extends BaseCommandHandler { |
|
|
|
// 3. 设定喷涂参数 |
|
|
|
sprayTask.setSprayParam(matrixPathType, motorZHeight, gasPressure, volume, highVoltage, highVoltageValue, spacing, movingSpeed, times, positionList); |
|
|
|
|
|
|
|
// 7.循环喷涂区域 |
|
|
|
OperationLog operationLog = new OperationLog(); |
|
|
|
operationLog.setMatrixInfo(JSONUtil.toJsonStr(sprayTask.getSprayParams())); |
|
|
|
operationLogService.add(operationLog); |
|
|
|
|
|
|
|
// 7.循环喷涂区域 |
|
|
|
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")); |
|
|
|