diff --git a/src/main/java/iflytop/app/controler/UserControler.java b/src/main/java/iflytop/app/controler/UserControler.java index 2d1aa58..034b9a2 100644 --- a/src/main/java/iflytop/app/controler/UserControler.java +++ b/src/main/java/iflytop/app/controler/UserControler.java @@ -1,7 +1,7 @@ package iflytop.app.controler; -import iflytop.app.service.UserMgrService; +import iflytop.app.service.data.UserMgrService; import iflytop.app.type.db.AppUser; import iflytop.app.type.db.IflytopRet; import iflytop.app.type.exception.AppException; diff --git a/src/main/java/iflytop/app/controler/ws/AppEventWSEndpoint.java b/src/main/java/iflytop/app/controler/ws/AppEventWSEndpoint.java index 271c0ab..76c1b78 100644 --- a/src/main/java/iflytop/app/controler/ws/AppEventWSEndpoint.java +++ b/src/main/java/iflytop/app/controler/ws/AppEventWSEndpoint.java @@ -1,6 +1,6 @@ package iflytop.app.controler.ws; -import iflytop.app.service.AppWebSocketEndpointMgr; +import iflytop.app.service.ui.AppWebSocketEndpointMgr; import iflytop.app.utils.SpringBootBeanUtil; import jakarta.websocket.*; import jakarta.websocket.server.ServerEndpoint; diff --git a/src/main/java/iflytop/app/controler/ws/AppStateWSEndpoint.java b/src/main/java/iflytop/app/controler/ws/AppStateWSEndpoint.java index d9b4545..e1ed75c 100644 --- a/src/main/java/iflytop/app/controler/ws/AppStateWSEndpoint.java +++ b/src/main/java/iflytop/app/controler/ws/AppStateWSEndpoint.java @@ -1,6 +1,6 @@ package iflytop.app.controler.ws; -import iflytop.app.service.AppWebSocketEndpointMgr; +import iflytop.app.service.ui.AppWebSocketEndpointMgr; import iflytop.app.utils.SpringBootBeanUtil; import jakarta.websocket.*; import jakarta.websocket.server.ServerEndpoint; diff --git a/src/main/java/iflytop/app/service/MeasurementTaskCtrlService.java b/src/main/java/iflytop/app/service/MeasurementTaskCtrlService.java deleted file mode 100644 index fe8174a..0000000 --- a/src/main/java/iflytop/app/service/MeasurementTaskCtrlService.java +++ /dev/null @@ -1,14 +0,0 @@ -package iflytop.app.service; - -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - - -@Component -@Slf4j -public class MeasurementTaskCtrlService { - - - - -} diff --git a/src/main/java/iflytop/app/service/AppEventBusService.java b/src/main/java/iflytop/app/service/base/AppEventBusService.java similarity index 98% rename from src/main/java/iflytop/app/service/AppEventBusService.java rename to src/main/java/iflytop/app/service/base/AppEventBusService.java index 10a9ee0..181fc9f 100644 --- a/src/main/java/iflytop/app/service/AppEventBusService.java +++ b/src/main/java/iflytop/app/service/base/AppEventBusService.java @@ -1,4 +1,4 @@ -package iflytop.app.service; +package iflytop.app.service.base; import iflytop.app.type.event.AppEvent; import jakarta.annotation.PostConstruct; diff --git a/src/main/java/iflytop/app/service/UserMgrService.java b/src/main/java/iflytop/app/service/data/UserMgrService.java similarity index 85% rename from src/main/java/iflytop/app/service/UserMgrService.java rename to src/main/java/iflytop/app/service/data/UserMgrService.java index a043f07..1dc6cf4 100644 --- a/src/main/java/iflytop/app/service/UserMgrService.java +++ b/src/main/java/iflytop/app/service/data/UserMgrService.java @@ -1,4 +1,4 @@ -package iflytop.app.service; +package iflytop.app.service.data; import iflytop.app.type.db.AppUser; import org.springframework.stereotype.Service; diff --git a/src/main/java/iflytop/app/service/SubDeviceUartClientMockService.java b/src/main/java/iflytop/app/service/mock/SubDeviceUartClientMockService.java similarity index 99% rename from src/main/java/iflytop/app/service/SubDeviceUartClientMockService.java rename to src/main/java/iflytop/app/service/mock/SubDeviceUartClientMockService.java index 57b383a..6b30a5f 100644 --- a/src/main/java/iflytop/app/service/SubDeviceUartClientMockService.java +++ b/src/main/java/iflytop/app/service/mock/SubDeviceUartClientMockService.java @@ -1,4 +1,4 @@ -package iflytop.app.service; +package iflytop.app.service.mock; import com.fazecast.jSerialComm.SerialPort; import com.fazecast.jSerialComm.SerialPortDataListener; diff --git a/src/main/java/iflytop/app/service/task/MeasurementTaskCtrlService.java b/src/main/java/iflytop/app/service/task/MeasurementTaskCtrlService.java new file mode 100644 index 0000000..c868bfb --- /dev/null +++ b/src/main/java/iflytop/app/service/task/MeasurementTaskCtrlService.java @@ -0,0 +1,24 @@ +package iflytop.app.service.task; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + + +/** + * 测量任务控制服务 + * + */ +@Component +@Slf4j +public class MeasurementTaskCtrlService { + + // + // API + // new Task + // start + // commit report + // reMeasure + // + + +} diff --git a/src/main/java/iflytop/app/service/AppWebSocketEndpointMgr.java b/src/main/java/iflytop/app/service/ui/AppWebSocketEndpointMgr.java similarity index 96% rename from src/main/java/iflytop/app/service/AppWebSocketEndpointMgr.java rename to src/main/java/iflytop/app/service/ui/AppWebSocketEndpointMgr.java index fdc8689..3d5583b 100644 --- a/src/main/java/iflytop/app/service/AppWebSocketEndpointMgr.java +++ b/src/main/java/iflytop/app/service/ui/AppWebSocketEndpointMgr.java @@ -1,5 +1,6 @@ -package iflytop.app.service; +package iflytop.app.service.ui; +import iflytop.app.service.base.AppEventBusService; import iflytop.app.utils.ZJsonHelper; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; diff --git a/src/main/java/iflytop/app/service/ui/UIStateControlService.java b/src/main/java/iflytop/app/service/ui/UIStateControlService.java new file mode 100644 index 0000000..38e8646 --- /dev/null +++ b/src/main/java/iflytop/app/service/ui/UIStateControlService.java @@ -0,0 +1,2 @@ +package iflytop.app.service.ui;public class UIStateControlService { +}