From 424de0ebf93b979d3fb8ef33ab8a446d35d230e3 Mon Sep 17 00:00:00 2001 From: winter Date: Thu, 16 Nov 2023 11:32:55 +0800 Subject: [PATCH] fix --- .../migration/V2023110300001_personmould.sql | 2 - .../controller/PersonMouldController.java | 6 +- .../iformall/domain/po/sm/PersonMould.java | 7 ++- .../domain/po/sm/UserPersonMould.java | 32 +++++++++++ .../mapper/UserPersonMouldMapper.java | 17 ++++++ .../sm/impl/PersonMouldServiceImpl.java | 15 +++++ .../resources/mapper/PersonMouldMapper.xml | 12 ++-- .../mapper/UserPersonMouldMapper.xml | 56 +++++++++++++++++++ 8 files changed, 137 insertions(+), 10 deletions(-) create mode 100644 suimangService/src/main/java/com/iformall/domain/po/sm/UserPersonMould.java create mode 100644 suimangService/src/main/java/com/iformall/mapper/UserPersonMouldMapper.java create mode 100644 suimangService/src/main/resources/mapper/UserPersonMouldMapper.xml diff --git a/suimangAdmin/src/main/resources/db/migration/V2023110300001_personmould.sql b/suimangAdmin/src/main/resources/db/migration/V2023110300001_personmould.sql index c687765..fbb4f31 100644 --- a/suimangAdmin/src/main/resources/db/migration/V2023110300001_personmould.sql +++ b/suimangAdmin/src/main/resources/db/migration/V2023110300001_personmould.sql @@ -1,7 +1,5 @@ ALTER TABLE `person_mould` ADD COLUMN customized int(1) NOT NULL DEFAULT 0 COMMENT '是否私人定制EnumYesOrNo' AFTER `is_del`; -ALTER TABLE `person_mould` -ADD COLUMN customized_user_id BIGINT(11) COMMENT '私人定制所属用户' AFTER `customized`; ##更新这几个表 apimenu,apiguide,apidetail,thirdpartyapi diff --git a/suimangCApi/src/main/java/com/iformall/controller/PersonMouldController.java b/suimangCApi/src/main/java/com/iformall/controller/PersonMouldController.java index 3c1773e..a59dccc 100644 --- a/suimangCApi/src/main/java/com/iformall/controller/PersonMouldController.java +++ b/suimangCApi/src/main/java/com/iformall/controller/PersonMouldController.java @@ -21,6 +21,10 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; + +import java.util.ArrayList; +import java.util.List; + import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -77,7 +81,7 @@ public class PersonMouldController extends BaseController { record.setStatus(EnumaMouldPatchStatus.put_on.getCode()); record.setSortColumns(BaseEntity.SortField.UpdateDate_DESC); record.setCustomizedQuery(EnumYesOrNo.YES.getCode()); - record.setCustomizedUserId(getMemberId()); + record.setCuserId(getMemberId()); final PageInfo page = personMouldService.cListAsPage(record, pageNum, pageSize); return new ResultData(page); } diff --git a/suimangService/src/main/java/com/iformall/domain/po/sm/PersonMould.java b/suimangService/src/main/java/com/iformall/domain/po/sm/PersonMould.java index 5c820a4..7f7ed14 100644 --- a/suimangService/src/main/java/com/iformall/domain/po/sm/PersonMould.java +++ b/suimangService/src/main/java/com/iformall/domain/po/sm/PersonMould.java @@ -132,10 +132,11 @@ public class PersonMould extends TenantEntity { private Integer customizedQuery = 0; @io.swagger.annotations.ApiModelProperty(value="是否私人定制EnumYesOrNo",name="customized") private Integer customized; - @io.swagger.annotations.ApiModelProperty(value="私人定制所属用户",name="customizedUserId") - private Long customizedUserId; + @TableField(exist = false) + private List customPersonMouldIds; - + @TableField(exist = false) + private Long cuserId; public String getSalePriceStr() { if(salePrice!=null) { diff --git a/suimangService/src/main/java/com/iformall/domain/po/sm/UserPersonMould.java b/suimangService/src/main/java/com/iformall/domain/po/sm/UserPersonMould.java new file mode 100644 index 0000000..931c280 --- /dev/null +++ b/suimangService/src/main/java/com/iformall/domain/po/sm/UserPersonMould.java @@ -0,0 +1,32 @@ +package com.iformall.domain.po.sm; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.iformall.domain.po.base.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import java.util.Date; +import java.util.List; + +@TableName(value = "user_person_mould") +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) +public class UserPersonMould extends BaseEntity { + + private static final long serialVersionUID = 5153174991543978589L; + + protected Long id; + + @io.swagger.annotations.ApiModelProperty(value="PersonMould编号",name="personMouldId") + private Long personMouldId; + @io.swagger.annotations.ApiModelProperty(value="WxCuserBasicInfo编码",name="cUserId") + private Long cUserId; + @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") + private Date createDate; + @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") + private Date updateDate; + @TableField(exist = false) + private List cuserIds; +} diff --git a/suimangService/src/main/java/com/iformall/mapper/UserPersonMouldMapper.java b/suimangService/src/main/java/com/iformall/mapper/UserPersonMouldMapper.java new file mode 100644 index 0000000..2ca670f --- /dev/null +++ b/suimangService/src/main/java/com/iformall/mapper/UserPersonMouldMapper.java @@ -0,0 +1,17 @@ +package com.iformall.mapper; + +import com.iformall.common.CommonMapper; +import com.iformall.domain.po.sm.UserPersonMould; + +import org.apache.ibatis.annotations.Param; +import java.util.List; + +public interface UserPersonMouldMapper extends CommonMapper { + + List findMouldIdList(UserPersonMould record); + + void deleteByCuserId(@Param("cUserId") Long cUserId); + + void saveBatch(@Param("list") List list); + +} diff --git a/suimangService/src/main/java/com/iformall/service/sm/impl/PersonMouldServiceImpl.java b/suimangService/src/main/java/com/iformall/service/sm/impl/PersonMouldServiceImpl.java index d1535af..3120d85 100644 --- a/suimangService/src/main/java/com/iformall/service/sm/impl/PersonMouldServiceImpl.java +++ b/suimangService/src/main/java/com/iformall/service/sm/impl/PersonMouldServiceImpl.java @@ -8,12 +8,14 @@ import com.iformall.domain.po.sm.MouldPatch; import com.iformall.domain.po.sm.MouldPatchSign; import com.iformall.domain.po.sm.PersonMould; import com.iformall.domain.po.sm.ServicePersonMould; +import com.iformall.domain.po.sm.UserPersonMould; import com.iformall.enums.EnumColour; import com.iformall.enums.EnumMouldSendType; import com.iformall.enums.EnumaMouldPatchStatus; import com.iformall.mapper.MouldPatchMapper; import com.iformall.mapper.PersonMouldMapper; import com.iformall.mapper.ServicePersonMouldMapper; +import com.iformall.mapper.UserPersonMouldMapper; import com.iformall.service.sm.MouldPatchService; import com.iformall.service.sm.MouldPatchSignService; import com.iformall.service.sm.PersonMouldService; @@ -40,6 +42,9 @@ public class PersonMouldServiceImpl implements PersonMouldService { @Autowired ServicePersonMouldMapper servicePersonMouldMapper; + + @Autowired + UserPersonMouldMapper userPersonMouldMapper; @Override @@ -49,6 +54,16 @@ public class PersonMouldServiceImpl implements PersonMouldService { @Override public PageInfo cListAsPage(PersonMould record, Integer pageIndex, Integer pageSize) { + if (null != record.getCuserId()) { + UserPersonMould upm = new UserPersonMould(); + upm.setCUserId(record.getCuserId()); + List mouldIds = userPersonMouldMapper.findMouldIdList(upm); + if (null == mouldIds || mouldIds.size() <= 0 ) { + record.setId(-1L); + }else { + record.setCustomPersonMouldIds(mouldIds); + } + } return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> personMouldMapper.findCList(record)); } diff --git a/suimangService/src/main/resources/mapper/PersonMouldMapper.xml b/suimangService/src/main/resources/mapper/PersonMouldMapper.xml index a191d8f..5e8591e 100644 --- a/suimangService/src/main/resources/mapper/PersonMouldMapper.xml +++ b/suimangService/src/main/resources/mapper/PersonMouldMapper.xml @@ -30,14 +30,13 @@ - `id`, `tenant_id`, `parent_tenant_id`, `video_type`, `cover_img`, `cover_picture`, `detail_picture`, `title`, `sub_title`, `sex`, `age`, `colour`, `scene_sign`, `sale_price`, `price`, `send_type`, `detail`, `remark`, `mould_sm_id`,`material`,`background_id`,`background_material`, - `status`, `puton_date`, `create_date`, `update_date`,`is_del`,`customized`,`customized_user_id` + `status`, `puton_date`, `create_date`, `update_date`,`is_del`,`customized` @@ -106,7 +105,12 @@ - and ( customized = 0 or (customized = 1 and customized_user_id = #{customizedUserId}) ) + and ( customized = 0 or (customized = 1 + and id in + + #{cIdItem} + + )) and customized = 0 @@ -138,7 +142,7 @@ `id`, `video_type`, `cover_img`, `cover_picture`, `title`, `sub_title`, `sex`, `age`, `colour`, `scene_sign`, `sale_price`, `price`, `send_type`, `mould_sm_id`,`material`,`background_id`,`background_material`, - `status`, `create_date`, `update_date`,`customized`,`customized_user_id` + `status`, `create_date`, `update_date`,`customized` from person_mould diff --git a/suimangService/src/main/resources/mapper/UserPersonMouldMapper.xml b/suimangService/src/main/resources/mapper/UserPersonMouldMapper.xml new file mode 100644 index 0000000..ed5a458 --- /dev/null +++ b/suimangService/src/main/resources/mapper/UserPersonMouldMapper.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + `id`, `person_mould_id`, `c_user_id`, `create_date`, `update_date` + + + + where 1 = 1 + + + and `id` = #{id} + + + + and id in + + #{idItem} + + + + order by customized desc,${sortColumns} + + + + + + delete from user_person_mould where c_user_id = #{cUserId} + + + + INSERT INTO user_person_mould (`id`, `person_mould_id`, `c_user_id`,`create_date`, `update_date`) + VALUES + + ( + #{item.id}, + #{item.personMouldId}, + #{item.cUserId}, + #{item.createDate}, + #{item.updateDate} + ) + + + +