diff --git a/suimangAdmin/src/main/resources/db/migration/V2023110300001_personmould.sql b/suimangAdmin/src/main/resources/db/migration/V2023110300001_personmould.sql index 502eca5..5acbb2a 100644 --- a/suimangAdmin/src/main/resources/db/migration/V2023110300001_personmould.sql +++ b/suimangAdmin/src/main/resources/db/migration/V2023110300001_personmould.sql @@ -1,8 +1,12 @@ 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 ALTER TABLE `voice_language` ADD COLUMN customized int(1) NOT NULL DEFAULT 0 COMMENT '是否私人定制EnumYesOrNo' AFTER `is_del`; +ALTER TABLE `voice_language` +ADD COLUMN customized_user_id BIGINT(11) COMMENT '私人定制所属用户' AFTER `customized`; diff --git a/suimangCApi/src/main/java/com/iformall/controller/PersonMouldController.java b/suimangCApi/src/main/java/com/iformall/controller/PersonMouldController.java index dcc98a5..2c3b6a6 100644 --- a/suimangCApi/src/main/java/com/iformall/controller/PersonMouldController.java +++ b/suimangCApi/src/main/java/com/iformall/controller/PersonMouldController.java @@ -11,6 +11,7 @@ import com.iformall.domain.po.sm.UserMouldVideo; import com.iformall.enums.EnumLanguages; import com.iformall.enums.EnumMouldPatchType; import com.iformall.enums.EnumMouldSendType; +import com.iformall.enums.EnumYesOrNo; import com.iformall.enums.EnumaMouldPatchStatus; import com.iformall.language.LanguageDetect; import com.iformall.service.sm.MouldPatchService; @@ -46,7 +47,6 @@ public class PersonMouldController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute PersonMould record, Integer pageNum, Integer pageSize) { - logger.debug("[" + getIpAddr() + "] MouldPatchController::list"); if (record == null) record = new PersonMould(); if(record.getVideoType() != null && record.getVideoType().intValue() == -1){ record.setVideoType(null); @@ -60,6 +60,27 @@ public class PersonMouldController extends BaseController { final PageInfo page = personMouldService.cListAsPage(record, pageNum, pageSize); return new ResultData(page); } + + @ApiOperation("分页列表接口") + @GetMapping("loginList") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData loginList(@ModelAttribute PersonMould record, Integer pageNum, Integer pageSize) { + if (record == null) record = new PersonMould(); + if(record.getVideoType() != null && record.getVideoType().intValue() == -1){ + record.setVideoType(null); + } + if(record.getSex() != null && record.getSex().intValue() == -1){ + record.setSex(null); + } + record.setStatus(EnumaMouldPatchStatus.put_on.getCode()); + record.setSortColumns(BaseEntity.SortField.UpdateDate_DESC); + record.setCustomizedQuery(EnumYesOrNo.YES.getCode()); + record.setCustomizedUserId(getMemberId()); + final PageInfo page = personMouldService.cListAsPage(record, pageNum, pageSize); + return new ResultData(page); + } @AuthIgnore @ApiOperation("根据id查询接口") diff --git a/suimangCApi/src/main/java/com/iformall/controller/VoiceMouldController.java b/suimangCApi/src/main/java/com/iformall/controller/VoiceMouldController.java index b61e965..fc0b602 100644 --- a/suimangCApi/src/main/java/com/iformall/controller/VoiceMouldController.java +++ b/suimangCApi/src/main/java/com/iformall/controller/VoiceMouldController.java @@ -7,6 +7,7 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.sm.PersonMould; import com.iformall.domain.po.sm.UserMouldVideo; +import com.iformall.domain.po.sm.VoiceLanguage; import com.iformall.domain.po.sm.VoiceMould; import com.iformall.enums.*; import com.iformall.language.LanguageDetect; @@ -143,8 +144,17 @@ public class VoiceMouldController extends BaseController { @GetMapping("/voiceTotal") @ApiImplicitParams({}) public ResultData voiceTotal() { - logger.debug("[" + getIpAddr() + "] MouldPatchController::voiceTotal"); - return new ResultData(voiceLanguageService.voiceTotal()); + return new ResultData(voiceLanguageService.voiceTotal(new VoiceLanguage())); + } + + @ApiOperation("登录状态下语言选择下拉框") + @GetMapping("/loginVoiceTotal") + @ApiImplicitParams({}) + public ResultData loginVoiceTotal() { + VoiceLanguage vl = new VoiceLanguage(); + vl.setCustomizedQuery(EnumYesOrNo.YES.getCode()); + vl.setCustomizedUserId(getMemberId()); + return new ResultData(voiceLanguageService.voiceTotal(vl)); } @AuthIgnore 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 23d1f05..5c820a4 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 @@ -126,8 +126,15 @@ public class PersonMould extends TenantEntity { private Date updateDate; @io.swagger.annotations.ApiModelProperty(value="isDel",name="isDel") private Integer isDel; + + + @TableField(exist = false) + 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; + public String getSalePriceStr() { diff --git a/suimangService/src/main/java/com/iformall/domain/po/sm/VoiceLanguage.java b/suimangService/src/main/java/com/iformall/domain/po/sm/VoiceLanguage.java index 00a5a8f..fd97f0d 100644 --- a/suimangService/src/main/java/com/iformall/domain/po/sm/VoiceLanguage.java +++ b/suimangService/src/main/java/com/iformall/domain/po/sm/VoiceLanguage.java @@ -1,6 +1,7 @@ package com.iformall.domain.po.sm; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.domain.po.base.TenantEntity; import lombok.Data; @@ -60,7 +61,11 @@ public class VoiceLanguage extends TenantEntity { */ private Integer isDel; + @TableField(exist = false) + 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; } diff --git a/suimangService/src/main/java/com/iformall/mapper/VoiceLanguageMapper.java b/suimangService/src/main/java/com/iformall/mapper/VoiceLanguageMapper.java index 3acff8f..af567e3 100644 --- a/suimangService/src/main/java/com/iformall/mapper/VoiceLanguageMapper.java +++ b/suimangService/src/main/java/com/iformall/mapper/VoiceLanguageMapper.java @@ -15,6 +15,9 @@ import java.util.List; * @date 2023-10-13 */ public interface VoiceLanguageMapper extends CommonMapper { + + List findList(VoiceLanguage record); + void saveBatch(@Param("set") HashSet set); /** diff --git a/suimangService/src/main/java/com/iformall/service/sm/VoiceLanguageService.java b/suimangService/src/main/java/com/iformall/service/sm/VoiceLanguageService.java index 63c0493..8b852e0 100644 --- a/suimangService/src/main/java/com/iformall/service/sm/VoiceLanguageService.java +++ b/suimangService/src/main/java/com/iformall/service/sm/VoiceLanguageService.java @@ -7,7 +7,7 @@ import java.util.List; public interface VoiceLanguageService { - List voiceTotal(); + List voiceTotal(VoiceLanguage voiceLanguage); VoiceLanguage getLanguage(String paperwork); diff --git a/suimangService/src/main/java/com/iformall/service/sm/impl/VoiceLanguageServiceImpl.java b/suimangService/src/main/java/com/iformall/service/sm/impl/VoiceLanguageServiceImpl.java index f691465..e9c2330 100644 --- a/suimangService/src/main/java/com/iformall/service/sm/impl/VoiceLanguageServiceImpl.java +++ b/suimangService/src/main/java/com/iformall/service/sm/impl/VoiceLanguageServiceImpl.java @@ -26,8 +26,10 @@ public class VoiceLanguageServiceImpl implements VoiceLanguageService { private VoiceLanguageMapper voiceLanguageMapper; @Override - public List voiceTotal() { - List languages = voiceLanguageMapper.selectList(new LambdaQueryWrapper().eq(VoiceLanguage::getIsDel, 0).orderByAsc(VoiceLanguage::getLocal)); + public List voiceTotal(VoiceLanguage voiceLanguage) { + voiceLanguage.setIsDel(0); + voiceLanguage.setSortColumns("local asc"); + List languages = voiceLanguageMapper.findList(voiceLanguage); return CollectionUtils.isEmpty(languages) ? Lists.newArrayList() : languages; } diff --git a/suimangService/src/main/resources/mapper/PersonMouldMapper.xml b/suimangService/src/main/resources/mapper/PersonMouldMapper.xml index 89cc24b..fda220e 100644 --- a/suimangService/src/main/resources/mapper/PersonMouldMapper.xml +++ b/suimangService/src/main/resources/mapper/PersonMouldMapper.xml @@ -30,13 +30,14 @@ + `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` + `status`, `puton_date`, `create_date`, `update_date`,`is_del`,`customized`,`customized_user_id` @@ -107,6 +108,17 @@ and customized = #{customized} + + + and customized_user_id = #{customizedUserId} + + + + and ( customized = 0 or (customized = 1 and customized_user_id = #{customizedUserId}) ) + + + and customized = 0 + and id in @@ -115,7 +127,7 @@ - order by ${sortColumns} + order by customized desc,${sortColumns} diff --git a/suimangService/src/main/resources/mapper/VoiceLanguageMapper.xml b/suimangService/src/main/resources/mapper/VoiceLanguageMapper.xml index a783ab1..513f177 100644 --- a/suimangService/src/main/resources/mapper/VoiceLanguageMapper.xml +++ b/suimangService/src/main/resources/mapper/VoiceLanguageMapper.xml @@ -1,10 +1,68 @@ + + + + + + + + + + + + + + + + + - `id`, `tenant_id`, `parent_tenant_id`, `language`, `country`, `local`, `name`, `chinese_name`, `img`, `create_date`, `update_date`, `is_del`,`customized` + `id`, `tenant_id`, `parent_tenant_id`, `language`, `country`, `local`, `name`, `chinese_name`, `img`, `create_date`, + `update_date`, `is_del`,`customized`,`customized_user_id` + + + + where 1 = 1 + + + and `id` = #{id} + + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} + + + and `is_del` = #{isDel} + + + and ( customized = 0 or (customized = 1 and customized_user_id = #{customizedUserId}) ) + + + and customized = 0 + + + + and id in + + #{idItem} + + + + order by customized desc,${sortColumns} + + + INSERT INTO voice_language (`id`, `country`, `language`, `local`, `name`, `img`, `is_del`,`chinese_name`)