maece/HSG-MCS-HS21_tapas
1
0
Fork 0
Code Issues 14 Pull Requests Packages Projects Releases 6 Wiki Activity

added common lib and added service uri's to properties file

Browse Source
This commit is contained in:
Marcel
2021-10-27 13:15:29 +02:00
parent d08a6d0b67
commit 6752454838
61 changed files with 1231 additions and 931 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
executor1/src/main/java/ch/unisg/executor1/executor/adapter/in/web/TaskAvailableController.java
View File

@@ -9,9 +9,9 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RestController;
import ch.unisg.executorBase.executor.application.port.in.TaskAvailableCommand;
import ch.unisg.executorBase.executor.application.port.in.TaskAvailableUseCase;
import ch.unisg.executorBase.executor.domain.ExecutorType;
import ch.unisg.executorbase.executor.application.port.in.TaskAvailableCommand;
import ch.unisg.executorbase.executor.application.port.in.TaskAvailableUseCase;
import ch.unisg.executorbase.executor.domain.ExecutorType;
@RestController
public class TaskAvailableController {

2
executor1/src/main/java/ch/unisg/executor1/executor/application/port/out/UserToRobotPort.java
View File

@@ -1,6 +1,6 @@
package ch.unisg.executor1.executor.application.port.out;
import ch.unisg.executorBase.executor.domain.ExecutorType;
import ch.unisg.executorbase.executor.domain.ExecutorType;
public interface UserToRobotPort {
String userToRobot();

8
executor1/src/main/java/ch/unisg/executor1/executor/application/service/TaskAvailableService.java
View File

@@ -3,9 +3,9 @@ package ch.unisg.executor1.executor.application.service;
import org.springframework.stereotype.Component;
import ch.unisg.executor1.executor.domain.Executor;
import ch.unisg.executorBase.executor.application.port.in.TaskAvailableCommand;
import ch.unisg.executorBase.executor.application.port.in.TaskAvailableUseCase;
import ch.unisg.executorBase.executor.domain.ExecutorStatus;
import ch.unisg.executorbase.executor.application.port.in.TaskAvailableCommand;
import ch.unisg.executorbase.executor.application.port.in.TaskAvailableUseCase;
import ch.unisg.executorbase.executor.domain.ExecutorStatus;
import lombok.RequiredArgsConstructor;
import javax.transaction.Transactional;
@@ -20,7 +20,7 @@ public class TaskAvailableService implements TaskAvailableUseCase {
Executor executor = Executor.getExecutor();
if (executor.getExecutorType() == command.getTaskType() &&
if (executor.getExecutorType() == command.getTaskType() &&
executor.getStatus() == ExecutorStatus.IDLING) {
executor.getAssignment();
}

4
executor1/src/main/java/ch/unisg/executor1/executor/domain/Executor.java
View File

@@ -10,8 +10,8 @@ import ch.unisg.executor1.executor.adapter.out.UserToRobotAdapter;
import ch.unisg.executor1.executor.application.port.out.DeleteUserFromRobotPort;
import ch.unisg.executor1.executor.application.port.out.InstructionToRobotPort;
import ch.unisg.executor1.executor.application.port.out.UserToRobotPort;
import ch.unisg.executorBase.executor.domain.ExecutorBase;
import ch.unisg.executorBase.executor.domain.ExecutorType;
import ch.unisg.executorbase.executor.domain.ExecutorBase;
import ch.unisg.executorbase.executor.domain.ExecutorType;
public class Executor extends ExecutorBase {