diff --git a/config/application-local.properties b/config/application-local.properties index 5f2f82b3..0dc7f667 100644 --- a/config/application-local.properties +++ b/config/application-local.properties @@ -26,7 +26,7 @@ mybatis.mapper-locations=classpath*:mappers/*.xml mybatis.type-aliases-package=com.dispose.pojo.entity mybatis.configuration.default-enum-type-handler=com.dispose.common.CommonEnumHandler #config log -logging.config=file:config/logback_debug.xml +logging.config=file:config/logback.xml #config tomcat server.tomcat.max-threads=128 #Json sort diff --git a/src/main/java/com/dispose/manager/DisposeTaskManager.java b/src/main/java/com/dispose/manager/DisposeTaskManager.java index f3d6b8a8..adfe7887 100644 --- a/src/main/java/com/dispose/manager/DisposeTaskManager.java +++ b/src/main/java/com/dispose/manager/DisposeTaskManager.java @@ -1,5 +1,6 @@ package com.dispose.manager; +import com.dispose.common.DisposeCapacityType; import com.dispose.common.DisposeTaskStatus; import com.dispose.common.ErrorCode; import com.dispose.pojo.entity.DisposeTask; @@ -94,4 +95,14 @@ public interface DisposeTaskManager { * @param mask the mask */ void setAttackTypeMaskStatus(Long taskId, Long mask); + + /** + * Gets task status. + * + * @param deviceId the device id + * @param disposeIp the dispose ip + * @param capType the cap type + * @return the task status + */ + DisposeTaskStatus getTaskStatus(Long deviceId, String disposeIp, DisposeCapacityType capType); } diff --git a/src/main/java/com/dispose/manager/impl/DisposeTaskManagerImpl.java b/src/main/java/com/dispose/manager/impl/DisposeTaskManagerImpl.java index 86253b5c..0c83d6c2 100644 --- a/src/main/java/com/dispose/manager/impl/DisposeTaskManagerImpl.java +++ b/src/main/java/com/dispose/manager/impl/DisposeTaskManagerImpl.java @@ -1,5 +1,6 @@ package com.dispose.manager.impl; +import com.dispose.common.DisposeCapacityType; import com.dispose.common.DisposeTaskStatus; import com.dispose.common.ErrorCode; import com.dispose.manager.DisposeTaskManager; @@ -140,4 +141,9 @@ public class DisposeTaskManagerImpl implements DisposeTaskManager { public ErrorCode setDisposeTaskStatus(Long taskId, DisposeTaskStatus status) { return null; } + + @Override + public DisposeTaskStatus getTaskStatus(Long deviceId, String disposeIp, DisposeCapacityType capType) { + return null; + } } diff --git a/src/main/java/com/dispose/mapper/DisposeTaskMapper.java b/src/main/java/com/dispose/mapper/DisposeTaskMapper.java index 43b4d718..eb02f498 100644 --- a/src/main/java/com/dispose/mapper/DisposeTaskMapper.java +++ b/src/main/java/com/dispose/mapper/DisposeTaskMapper.java @@ -1,5 +1,6 @@ package com.dispose.mapper; +import com.dispose.common.DisposeCapacityType; import com.dispose.common.DisposeTaskStatus; import com.dispose.pojo.entity.DisposeTask; import org.apache.ibatis.annotations.Param; @@ -44,4 +45,16 @@ public interface DisposeTaskMapper { */ int changTaskStatus(@Param("id") Long taskId, @Param("status") DisposeTaskStatus status); + + /** + * Gets dispose task. + * + * @param deviceId the device id + * @param capType the cap type + * @param disposeIp the dispose ip + * @return the dispose task + */ + List getDisposeTask(@Param("deviceId") Long deviceId, + @Param("capType") DisposeCapacityType capType, + @Param("disposeIp") String disposeIp); } diff --git a/src/main/java/com/dispose/pojo/entity/TaskInfo.java b/src/main/java/com/dispose/pojo/entity/TaskInfo.java index 32c30792..bc697515 100644 --- a/src/main/java/com/dispose/pojo/entity/TaskInfo.java +++ b/src/main/java/com/dispose/pojo/entity/TaskInfo.java @@ -44,10 +44,6 @@ public class TaskInfo implements Serializable { * The Task id. */ private Long taskId; - /** - * The Device id. - */ - private Long deviceId; /** * The Begin time. */ diff --git a/src/main/java/com/dispose/service/DisposeTaskService.java b/src/main/java/com/dispose/service/DisposeTaskService.java new file mode 100644 index 00000000..6749a23e --- /dev/null +++ b/src/main/java/com/dispose/service/DisposeTaskService.java @@ -0,0 +1,37 @@ +package com.dispose.service; + +import com.dispose.common.ErrorCode; +import com.dispose.pojo.entity.TaskInfo; +import com.dispose.pojo.po.MulReturnType; + +/** + * The interface Dispose task service. + * + * @author + */ +public interface DisposeTaskService { + + /** + * Create task mul return type. + * + * @param task the task + * @return the mul return type + */ + MulReturnType createTask(TaskInfo task); + + /** + * Start task error code. + * + * @param taskId the task id + * @return the error code + */ + ErrorCode startTask(Long taskId); + + /** + * Stop task error code. + * + * @param taskId the task id + * @return the error code + */ + ErrorCode stopTask(Long taskId); +} diff --git a/src/main/java/com/dispose/service/impl/DisposeTaskServiceImpl.java b/src/main/java/com/dispose/service/impl/DisposeTaskServiceImpl.java new file mode 100644 index 00000000..ce45f9c6 --- /dev/null +++ b/src/main/java/com/dispose/service/impl/DisposeTaskServiceImpl.java @@ -0,0 +1,52 @@ +package com.dispose.service.impl; + +import com.dispose.common.ErrorCode; +import com.dispose.manager.DisposeTaskManager; +import com.dispose.pojo.entity.TaskInfo; +import com.dispose.pojo.po.MulReturnType; +import com.dispose.service.DisposeTaskService; + +import javax.annotation.Resource; + +/** + * The type Dispose task service. + * + * @author + */ +public class DisposeTaskServiceImpl implements DisposeTaskService { + @Resource + DisposeTaskManager disposeTaskManager; + + /** + * Create task mul return type. + * + * @param task the task + * @return the mul return type + */ + @Override + public MulReturnType createTask(TaskInfo task) { + return null; + } + + /** + * Start task error code. + * + * @param taskId the task id + * @return the error code + */ + @Override + public ErrorCode startTask(Long taskId) { + return null; + } + + /** + * Stop task error code. + * + * @param taskId the task id + * @return the error code + */ + @Override + public ErrorCode stopTask(Long taskId) { + return null; + } +} diff --git a/src/main/resources/mappers/DisposeTask.xml b/src/main/resources/mappers/DisposeTask.xml index ba07e885..1ee752af 100644 --- a/src/main/resources/mappers/DisposeTask.xml +++ b/src/main/resources/mappers/DisposeTask.xml @@ -3,8 +3,8 @@ - - + + @@ -17,10 +17,10 @@ - - + + @@ -28,8 +28,19 @@ + + taskList = disposeTaskMapper.getDisposeTask(-1L, + DisposeCapacityType.CLEANUP, + "192.168.0.1"); + + log.debug("Step1: {}", objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(taskList)); + + taskList = disposeTaskMapper.getDisposeTask(570L, + DisposeCapacityType.CLEANUP, + "192.168.0.1"); + + log.debug("Step2: {}", objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(taskList)); + } + /** * C 1 chang task status. */