diff --git a/src/main/java/com/qyft/gd/controller/LogsController.java b/src/main/java/com/qyft/gd/controller/LogsController.java index af28bbe..1c2d9c9 100644 --- a/src/main/java/com/qyft/gd/controller/LogsController.java +++ b/src/main/java/com/qyft/gd/controller/LogsController.java @@ -1,7 +1,8 @@ package com.qyft.gd.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.qyft.gd.model.entity.Logs; -import com.qyft.gd.model.entity.Tasks; +import com.qyft.gd.service.LogsService; import com.qyft.gd.system.common.base.BasePageQuery; import com.qyft.gd.system.common.result.PageResult; import com.qyft.gd.system.common.result.Result; @@ -12,27 +13,36 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + @Tag(name = "日志") @RestController @RequestMapping("/api/logs") @RequiredArgsConstructor @Slf4j public class LogsController { + private final LogsService logsService; @Operation(summary = "日志列表") @GetMapping("/list") public PageResult getAllTasks(BasePageQuery pageQuery) { - return PageResult.success(null); + + return PageResult.success(logsService.page(new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize()))); } @Operation(summary = "日志详情") @GetMapping("/") public Result detail(@RequestParam Long id) { - return Result.success(null); + return Result.success(logsService.getBaseMapper().selectById(id)); } @Operation(summary = "删除日志") @DeleteMapping("/{ids}") - public Result deleteLog(@Parameter(description = "日志ID,多个以英文逗号(,)分割") @PathVariable String ids) { - return Result.success(); + public Result deleteLog(@Parameter(description = "日志ID,多个以英文逗号(,)分割") @PathVariable String ids) { + List idsArr = Arrays.stream(ids.split(",")) + .map(Long::parseLong) + .collect(Collectors.toList()); + return Result.success(logsService.removeByIds(idsArr)); } } diff --git a/src/main/java/com/qyft/gd/controller/TasksController.java b/src/main/java/com/qyft/gd/controller/TasksController.java index fb2966e..496be5f 100644 --- a/src/main/java/com/qyft/gd/controller/TasksController.java +++ b/src/main/java/com/qyft/gd/controller/TasksController.java @@ -1,14 +1,9 @@ package com.qyft.gd.controller; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.qyft.gd.model.dto.TaskDTO; -import com.qyft.gd.model.entity.Ores; -import com.qyft.gd.model.entity.Solutions; import com.qyft.gd.model.entity.Tasks; import com.qyft.gd.model.vo.TaskListVO; -import com.qyft.gd.service.CraftsService; import com.qyft.gd.service.TasksService; import com.qyft.gd.system.common.base.BasePageQuery; import com.qyft.gd.system.common.result.PageResult; @@ -20,8 +15,6 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; -import java.util.Collections; - @Tag(name = "实验") @RestController @RequestMapping("/api/tasks") diff --git a/src/main/java/com/qyft/gd/mapper/LogsMapper.java b/src/main/java/com/qyft/gd/mapper/LogsMapper.java new file mode 100644 index 0000000..16adebc --- /dev/null +++ b/src/main/java/com/qyft/gd/mapper/LogsMapper.java @@ -0,0 +1,12 @@ +package com.qyft.gd.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.qyft.gd.model.entity.Logs; +import org.apache.ibatis.annotations.Mapper; + +/** + * 日志持久层接口 + */ +@Mapper +public interface LogsMapper extends BaseMapper { +} diff --git a/src/main/java/com/qyft/gd/service/LogsService.java b/src/main/java/com/qyft/gd/service/LogsService.java new file mode 100644 index 0000000..d0fb63c --- /dev/null +++ b/src/main/java/com/qyft/gd/service/LogsService.java @@ -0,0 +1,11 @@ +package com.qyft.gd.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.qyft.gd.model.entity.Logs; + +/** + * 日志业务接口 + */ +public interface LogsService extends IService { + int insertLog(Logs logs); +} diff --git a/src/main/java/com/qyft/gd/service/impl/LogsServiceImpl.java b/src/main/java/com/qyft/gd/service/impl/LogsServiceImpl.java new file mode 100644 index 0000000..cdd15cc --- /dev/null +++ b/src/main/java/com/qyft/gd/service/impl/LogsServiceImpl.java @@ -0,0 +1,22 @@ +package com.qyft.gd.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.qyft.gd.mapper.LogsMapper; +import com.qyft.gd.model.entity.Logs; +import com.qyft.gd.service.LogsService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +/** + * 实验业务实现类 + */ +@Service +@RequiredArgsConstructor +public class LogsServiceImpl extends ServiceImpl implements LogsService { + private final LogsMapper logsMapper; + + @Override + public int insertLog(Logs logs) { + return logsMapper.insert(logs); + } +}