diff --git a/src/main/java/com/dreamworks/boditech/aspect/ControllerAspect.java b/src/main/java/com/dreamworks/boditech/aspect/ControllerAspect.java index 2d8d4c6..27810cd 100644 --- a/src/main/java/com/dreamworks/boditech/aspect/ControllerAspect.java +++ b/src/main/java/com/dreamworks/boditech/aspect/ControllerAspect.java @@ -1,13 +1,20 @@ package com.dreamworks.boditech.aspect; +import com.dreamworks.boditech.service.AccountService; import com.dreamworks.boditech.utils.MyCommon; +import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; @Aspect @Component public class ControllerAspect { + private static final Logger LOG = LoggerFactory.getLogger(AccountService.class); + @Before("execution(* com.dreamworks.boditech.controller.*.*(..))") - public void before() { - MyCommon.easySleep(1000); + public void before(JoinPoint point) { + LOG.info("{}({})", point.getSignature().toShortString(), MyCommon.objectToJson(point.getArgs())); + // MyCommon.easySleep(1000); } } diff --git a/src/main/java/com/dreamworks/boditech/controller/DeviceController.java b/src/main/java/com/dreamworks/boditech/controller/DeviceController.java index ceaf981..cd4063f 100644 --- a/src/main/java/com/dreamworks/boditech/controller/DeviceController.java +++ b/src/main/java/com/dreamworks/boditech/controller/DeviceController.java @@ -104,14 +104,19 @@ public class DeviceController extends BaseController { @ResponseBody @PostMapping("/api/device/status-get") public ApiResponse status() { + // @TODO : 这里需要将名字从翻译文件中获取 + String statusName = "就绪"; String status = "READY"; if ( this.deviceService.device.testCards.getIsLoaded() ) { status = "CONSUMABLES_LOADED"; + statusName = "耗材已加载"; } if ( this.deviceService.isExecutorRunning() ) { - status = this.deviceService.getExecutorWorkingStatus(); +// status = this.deviceService.getExecutorWorkingStatus(); + status = "RUNNING"; + statusName = "运行中"; } - return this.success(Map.of("status", status)); + return this.success(Map.of("status", status, "statusName", statusName)); } @ResponseBody