Browse Source

调整一下结构

master
白凤吉 2 months ago
parent
commit
fdd88cfbbe
  1. 2
      build.gradle
  2. 1
      src/main/java/com/iflytop/gd/app/command/debug/DebugTransportationArmMoveCommand.java
  3. 2
      src/main/java/com/iflytop/gd/app/controller/SelfTestController.java
  4. 2
      src/main/java/com/iflytop/gd/app/core/aspect/DeviceStateChangeAspect.java
  5. 2
      src/main/java/com/iflytop/gd/app/model/bo/status/SelfTestState.java
  6. 2
      src/main/java/com/iflytop/gd/app/service/device/SelfTestService.java
  7. 2
      src/main/java/com/iflytop/gd/common/constant/CommandStatus.java

2
build.gradle

@ -21,8 +21,6 @@ repositories {
}
dependencies {
implementation 'org.springframework.boot:spring-boot-starter'
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.springframework.boot:spring-boot-starter-websocket:3.4.2'

1
src/main/java/com/iflytop/gd/app/command/debug/DebugTransportationArmMoveCommand.java

@ -39,7 +39,6 @@ public class DebugTransportationArmMoveCommand extends BaseCommandHandler {
Double yDimVelocity = cmdDTO.getDoubleParam("yDimVelocity");
Double zDimVelocity = cmdDTO.getDoubleParam("zDimVelocity");
Integer times = cmdDTO.getIntegerParam("times");
times = null;
List<CommandFuture> futuresList = new ArrayList<>();
if (xDimVelocity != null) {
DeviceCommandBundle deviceCommand = DeviceCommandGenerator.gantryXSet(xDimVelocity);

2
src/main/java/com/iflytop/gd/app/controller/SelfTestController.java

@ -1,6 +1,6 @@
package com.iflytop.gd.app.controller;
import com.iflytop.gd.app.model.bo.status.device.SelfTestState;
import com.iflytop.gd.app.model.bo.status.SelfTestState;
import com.iflytop.gd.app.service.device.SelfTestService;
import com.iflytop.gd.app.service.device.DeviceStateService;
import com.iflytop.gd.app.service.device.module.CapModuleService;

2
src/main/java/com/iflytop/gd/app/core/aspect/DeviceStateChangeAspect.java

@ -38,7 +38,7 @@ public class DeviceStateChangeAspect {
}
}
@After("execution(* com.iflytop.gd.app.service.command..set*(..))")
@After("execution(* com.iflytop.gd.app.model.bo.status..set*(..))")
public void afterSetMethod(JoinPoint joinPoint) {
try {
String className = joinPoint.getSignature().getDeclaringType().getName(); // 获取类名

2
src/main/java/com/iflytop/gd/app/model/bo/status/device/SelfTestState.java → src/main/java/com/iflytop/gd/app/model/bo/status/SelfTestState.java

@ -1,4 +1,4 @@
package com.iflytop.gd.app.model.bo.status.device;
package com.iflytop.gd.app.model.bo.status;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

2
src/main/java/com/iflytop/gd/app/service/device/SelfTestService.java

@ -1,6 +1,6 @@
package com.iflytop.gd.app.service.device;
import com.iflytop.gd.app.model.bo.status.device.SelfTestState;
import com.iflytop.gd.app.model.bo.status.SelfTestState;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;

2
src/main/java/com/iflytop/gd/common/constant/CommandStatus.java

@ -15,7 +15,7 @@ public class CommandStatus {
*/
public static final String START = "start";
/**
* 开始执行指令
* 等待执行指令
*/
public static final String WAIT = "wait";
/**

Loading…
Cancel
Save