From 051792d20bcc05448efb0fd238dc4467119c03b9 Mon Sep 17 00:00:00 2001 From: winter Date: Mon, 6 Nov 2023 22:00:43 +0800 Subject: [PATCH] fix --- .../iformall/controller/ApiPersonMouldController.java | 1 + .../java/com/iformall/dto/PagePersonMouldDTO.java | 11 +++++++++++ .../service/impl/ApiPersonMouldServiceImpl.java | 7 +++++++ .../iformall/controller/sm/PersonMouldController.java | 2 +- 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/open-api/src/main/java/com/iformall/controller/ApiPersonMouldController.java b/open-api/src/main/java/com/iformall/controller/ApiPersonMouldController.java index 543dbaf..4e35d0f 100644 --- a/open-api/src/main/java/com/iformall/controller/ApiPersonMouldController.java +++ b/open-api/src/main/java/com/iformall/controller/ApiPersonMouldController.java @@ -27,6 +27,7 @@ public class ApiPersonMouldController extends BaseController { @ApiOperation("分页查询数字人模板") @GetMapping("page") public ResultData pagePersonMould(PagePersonMouldDTO dto) { + dto.setServiceId(this.getServiceId()); return new ResultData(apiPersonMouldService.pagePersonMould(dto)); } diff --git a/open-api/src/main/java/com/iformall/dto/PagePersonMouldDTO.java b/open-api/src/main/java/com/iformall/dto/PagePersonMouldDTO.java index ece5cd3..71e6a8b 100644 --- a/open-api/src/main/java/com/iformall/dto/PagePersonMouldDTO.java +++ b/open-api/src/main/java/com/iformall/dto/PagePersonMouldDTO.java @@ -1,6 +1,10 @@ package com.iformall.dto; +import java.util.List; + import com.iformall.domain.po.sm.PersonMould; +import com.iformall.enums.EnumaMouldPatchStatus; + import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -13,11 +17,18 @@ public class PagePersonMouldDTO extends PageDTO { private Integer sex; @ApiModelProperty("1:竖版,2:横版") private Integer videoType; + + private Long serviceId; + private Long id; + private List ids; public static PersonMould mappingPO(PagePersonMouldDTO dto) { PersonMould personMould = new PersonMould(); personMould.setSex(dto.getSex()); personMould.setVideoType(dto.getVideoType()); + personMould.setId(dto.getId()); + personMould.setIds(dto.getIds()); + personMould.setStatus(EnumaMouldPatchStatus.put_on.getCode()); return personMould; } } diff --git a/open-api/src/main/java/com/iformall/service/impl/ApiPersonMouldServiceImpl.java b/open-api/src/main/java/com/iformall/service/impl/ApiPersonMouldServiceImpl.java index bcc76cd..e6f3c31 100644 --- a/open-api/src/main/java/com/iformall/service/impl/ApiPersonMouldServiceImpl.java +++ b/open-api/src/main/java/com/iformall/service/impl/ApiPersonMouldServiceImpl.java @@ -11,6 +11,7 @@ import com.iformall.vo.PageVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; @@ -28,6 +29,12 @@ public class ApiPersonMouldServiceImpl implements ApiPersonMouldService { @Override public PageVO pagePersonMould(PagePersonMouldDTO dto) { + List mouidList = personMouldService.getServiceMouldIds(dto.getServiceId()); + if (null == mouidList || mouidList.size() <= 0 ) { + dto.setId(-1L); + }else { + dto.setIds(mouidList); + } PageInfo personMouldPage = personMouldService.cListAsPage(PagePersonMouldDTO.mappingPO(dto), dto.getPageNum(), dto.getPageSize()); List result = personMouldPage.getList().stream().map(PagePersonMouldVO::mapping).collect(Collectors.toList()); return PageVO.build(personMouldPage.getTotal(), result); diff --git a/suimangAdmin/src/main/java/com/iformall/controller/sm/PersonMouldController.java b/suimangAdmin/src/main/java/com/iformall/controller/sm/PersonMouldController.java index 16fa38a..3e28fc5 100644 --- a/suimangAdmin/src/main/java/com/iformall/controller/sm/PersonMouldController.java +++ b/suimangAdmin/src/main/java/com/iformall/controller/sm/PersonMouldController.java @@ -25,7 +25,7 @@ import org.springframework.web.bind.annotation.*; @RestController -@RequestMapping("/personPatch") +@RequestMapping("/personMould") @Api(description = "模板接口") public class PersonMouldController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass());