From cd817dbf574cb9d69313e71630ecf1eac4999848 Mon Sep 17 00:00:00 2001 From: shahaibo <1023316923@qq.com> Date: Wed, 22 May 2024 09:50:34 +0800 Subject: [PATCH] TASK:style; --- .../ai/da/common/config/MyTaskScheduler.java | 4 +- .../ai/da/controller/WorkspaceController.java | 19 ++- .../com/ai/da/mapper/primary/StyleMapper.java | 17 +++ .../primary/WorkspaceRelStyleMapper.java | 15 +++ .../ai/da/mapper/primary/entity/Style.java | 17 +++ .../primary/entity/WorkspaceRelStyle.java | 18 +++ .../com/ai/da/model/dto/WorkspaceDTO.java | 2 + .../java/com/ai/da/model/enums/StyleEnum.java | 57 +++++++++ src/main/java/com/ai/da/model/vo/StyleVO.java | 16 +++ .../java/com/ai/da/model/vo/WorkspaceVO.java | 2 + .../com/ai/da/service/WorkspaceService.java | 8 +- .../da/service/impl/WorkspaceServiceImpl.java | 119 ++++++++++-------- 12 files changed, 234 insertions(+), 60 deletions(-) create mode 100644 src/main/java/com/ai/da/mapper/primary/StyleMapper.java create mode 100644 src/main/java/com/ai/da/mapper/primary/WorkspaceRelStyleMapper.java create mode 100644 src/main/java/com/ai/da/mapper/primary/entity/Style.java create mode 100644 src/main/java/com/ai/da/mapper/primary/entity/WorkspaceRelStyle.java create mode 100644 src/main/java/com/ai/da/model/enums/StyleEnum.java create mode 100644 src/main/java/com/ai/da/model/vo/StyleVO.java diff --git a/src/main/java/com/ai/da/common/config/MyTaskScheduler.java b/src/main/java/com/ai/da/common/config/MyTaskScheduler.java index 6e443ba9..bd8f2687 100644 --- a/src/main/java/com/ai/da/common/config/MyTaskScheduler.java +++ b/src/main/java/com/ai/da/common/config/MyTaskScheduler.java @@ -34,7 +34,7 @@ public class MyTaskScheduler { // 定时任务,每十五天执行一次 // @Scheduled(cron = "0 0 0 ? * MON") - @Scheduled(cron = "0 0 0 */15 * ?") +// @Scheduled(cron = "0 0 0 */15 * ?") public void checkExpiry() { // 检测正式用户是否快要过期 QueryWrapper qw = new QueryWrapper<>(); @@ -68,7 +68,7 @@ public class MyTaskScheduler { } } } - @Scheduled(cron = "0 0 8 * * ?") +// @Scheduled(cron = "0 0 8 * * ?") public void sendTrialOrderExcelToManagements() { // 获取前一天日期 LocalDate yesterday = LocalDate.now().minusDays(1); diff --git a/src/main/java/com/ai/da/controller/WorkspaceController.java b/src/main/java/com/ai/da/controller/WorkspaceController.java index b0c089f0..e5346487 100644 --- a/src/main/java/com/ai/da/controller/WorkspaceController.java +++ b/src/main/java/com/ai/da/controller/WorkspaceController.java @@ -1,10 +1,12 @@ package com.ai.da.controller; import com.ai.da.common.response.Response; +import com.ai.da.mapper.primary.entity.Style; import com.ai.da.mapper.primary.entity.Workspace; import com.ai.da.model.dto.WorkspaceDTO; import com.ai.da.model.enums.BizJson; import com.ai.da.model.vo.ModelsVO; +import com.ai.da.model.vo.StyleVO; import com.ai.da.model.vo.WorkspaceVO; import com.ai.da.service.WorkspaceService; import io.swagger.annotations.Api; @@ -44,8 +46,8 @@ public class WorkspaceController { @GetMapping("/detail") @ApiOperationSupport(order = 1) @ApiOperation(value = "详情", notes = "传入workspace") - public Response detail(@ApiParam(value = "主键集合", required = true) @RequestParam Long id) { - Workspace detail = workspaceService.getByIdNew(id); + public Response detail(@ApiParam(value = "主键集合", required = true) @RequestParam Long id) { + WorkspaceVO detail = workspaceService.getByIdNew(id); return Response.success(detail); } @@ -66,8 +68,8 @@ public class WorkspaceController { @PostMapping("/saveOrUpdate") @ApiOperationSupport(order = 3) @ApiOperation(value = "新增或编辑", notes = "传入workspace") - public Response saveOrUpdate(@Valid @RequestBody Workspace workspace) { - return Response.success(workspaceService.saveOrUpdate(workspace)); + public Response saveOrUpdate(@Valid @RequestBody WorkspaceDTO workspaceDTO) { + return Response.success(workspaceService.saveOrUpdate(workspaceDTO)); } @@ -115,10 +117,17 @@ public class WorkspaceController { } @PostMapping("maleDataInsert") - @ApiOperationSupport(order = 7) + @ApiOperationSupport(order = 8) @ApiOperation(value = "男装数据入库入minio") public Response maleDataInsert() throws FileNotFoundException { workspaceService.maleDataInsert(); return Response.success(true); } + + @PostMapping("styleList") + @ApiOperationSupport(order = 9) + @ApiOperation(value = "获取style列表") + public Response> styleList() { + return Response.success(workspaceService.styleList()); + } } diff --git a/src/main/java/com/ai/da/mapper/primary/StyleMapper.java b/src/main/java/com/ai/da/mapper/primary/StyleMapper.java new file mode 100644 index 00000000..be697be8 --- /dev/null +++ b/src/main/java/com/ai/da/mapper/primary/StyleMapper.java @@ -0,0 +1,17 @@ +package com.ai.da.mapper.primary; + +import com.ai.da.common.config.mybatis.plus.CommonMapper; +import com.ai.da.mapper.primary.entity.Style; + +import java.util.List; + +/** + * Mapper 接口 + * + * @author easy-generator + * @since 2022-06-13 + */ +public interface StyleMapper extends CommonMapper