Browse Source

Merge branch 'photo'

private_deployment
lrh 1 year ago
parent
commit
68e4bc7289
9 changed files with 46 additions and 47 deletions
  1. +2
    -0
      suimangAdmin/src/main/resources/db/migration/V202306271409_voice_material.sql
  2. +7
    -0
      suimangCApi/src/main/java/com/iformall/controller/PhotoSpeakVideoController.java
  3. +4
    -1
      suimangCApi/src/main/java/com/iformall/controller/VoiceMaterialController.java
  4. +8
    -10
      suimangCApi/src/main/java/com/iformall/controller/WxUserGrantController.java
  5. +8
    -9
      suimangService/src/main/java/com/iformall/domain/po/sm/VoiceInfo.java
  6. +12
    -24
      suimangService/src/main/java/com/iformall/domain/po/sm/VoiceLanguage.java
  7. +3
    -1
      suimangService/src/main/java/com/iformall/domain/po/sm/VoiceMaterial.java
  8. +1
    -1
      suimangService/src/main/java/com/iformall/mapper/VoiceLanguageMapper.java
  9. +1
    -1
      suimangService/src/main/java/com/iformall/service/sm/impl/VoiceLanguageServiceImpl.java

+ 2
- 0
suimangAdmin/src/main/resources/db/migration/V202306271409_voice_material.sql View File

@@ -0,0 +1,2 @@
ALTER TABLE `mallink_suimang_test`.`voice_material`
ADD COLUMN `type` int NULL COMMENT '1-上传、2-录音' AFTER `type`;

+ 7
- 0
suimangCApi/src/main/java/com/iformall/controller/PhotoSpeakVideoController.java View File

@@ -63,6 +63,9 @@ public class PhotoSpeakVideoController extends BaseController {
@Autowired
private MusicInfoService musicInfoService;

@Autowired
private VoiceMaterialService voiceMaterialService;

@ApiOperation("分页列表接口")
@GetMapping("list")
@ApiImplicitParams({
@@ -93,6 +96,10 @@ public class PhotoSpeakVideoController extends BaseController {
VoiceInfo voiceInfo = voiceInfoService.getById(photoSpeakVideo.getVoiceMouldId());
photoSpeakVideo.setVoiceInfo(voiceInfo);
}
if(photoSpeakVideo.getVoiceMaterialId() != null){
VoiceMaterial voiceMaterial = voiceMaterialService.getById(photoSpeakVideo.getVoiceMaterialId());
photoSpeakVideo.setVoiceMaterial(voiceMaterial);
}
return new ResultData(photoSpeakVideo);
}



+ 4
- 1
suimangCApi/src/main/java/com/iformall/controller/VoiceMaterialController.java View File

@@ -69,7 +69,7 @@ public class VoiceMaterialController extends BaseController {
public ResultData save(@RequestBody VoiceMaterial record) {
logger.debug("[" + getIpAddr() + "] VoiceMaterialController::save");
if(record == null)record = new VoiceMaterial();
record.setSendType(EnumMouldSendType.build.getCode());
// record.setSendType(EnumMouldSendType.build.getCode());
record.setUserId(getMemberId());
if(StringUtils.isBlank(record.getVideoId())){
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"音频为空");
@@ -77,6 +77,9 @@ public class VoiceMaterialController extends BaseController {
if(record.getTitle() == null){
record.setTitle("用户自建");
}
if(record.getSendType() == null){
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"上传音频类型不能为空");
}
record.setPrice(0);
record.setSalePrice(0);
record.setStatus(EnumaMouldPatchStatus.put_on.getCode());


+ 8
- 10
suimangCApi/src/main/java/com/iformall/controller/WxUserGrantController.java View File

@@ -366,11 +366,10 @@ public class WxUserGrantController extends BaseController {
// if(isValidCode) {
basicInfo = wxCUserBasicInfoService.register(getTenantInfo(),phone,password);

//TODO 用户
// Boolean aBoolean = userCreateVideoNumService.initializationUserCreateVideoNum(basicInfo.getId());
// if (!aBoolean){
// return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "初始化创建视频时间表失败");
// }
Boolean aBoolean = userCreateVideoNumService.initializationUserCreateVideoNum(basicInfo.getId());
if (!aBoolean){
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "初始化创建视频时间表失败");
}
return new ResultData();
// } else {
// return new ResultData(ErrorCode.MSG_VERIFY_CODE_NOT_FOUND);
@@ -416,11 +415,10 @@ public class WxUserGrantController extends BaseController {
// if(isValidCode) {
basicInfo = wxCUserBasicInfoService.registerEmail(getTenantInfo(),email,password);

//TODO 用户
// Boolean aBoolean = userCreateVideoNumService.initializationUserCreateVideoNum(basicInfo.getId());
// if (!aBoolean){
// return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "初始化创建视频时间表失败");
// }
Boolean aBoolean = userCreateVideoNumService.initializationUserCreateVideoNum(basicInfo.getId());
if (!aBoolean){
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "初始化创建视频时间表失败");
}
return new ResultData();
// } else {
// return new ResultData(ErrorCode.MSG_VERIFY_CODE_NOT_FOUND);


+ 8
- 9
suimangService/src/main/java/com/iformall/domain/po/sm/VoiceInfo.java View File

@@ -2,7 +2,11 @@ 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;
import lombok.EqualsAndHashCode;
import lombok.ToString;

import java.util.Date;
import java.util.List;
@@ -10,8 +14,11 @@ import java.util.List;
/**
* 声音表
*/
@TableName(value = "voice_info")
@Data
public class VoiceInfo {
@ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true)
public class VoiceInfo extends TenantEntity {
/**
* 主键ID
*/
@@ -21,14 +28,6 @@ public class VoiceInfo {
*/
private Long languageId;
/**
* 租户ID
*/
private String tenantId;
/**
* 父租户ID
*/
private String parentTenantId;
/**
* 性别
*/
private Integer sex;


+ 12
- 24
suimangService/src/main/java/com/iformall/domain/po/sm/VoiceLanguage.java View File

@@ -1,7 +1,11 @@
package com.iformall.domain.po.sm;


import com.baomidou.mybatisplus.annotation.TableName;
import com.iformall.domain.po.base.TenantEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;

import java.util.Date;
import java.util.Objects;
@@ -9,21 +13,16 @@ import java.util.Objects;
/**
* 语种表
*/
@TableName(value = "voice_language")
@Data
public class VoiceLanguage implements Comparable {
@ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true)
public class VoiceLanguage extends TenantEntity {

/**
* 主键ID
*/
private Long id;
/**
* 租户ID
*/
private String tenantId;
/**
* 父租户ID
*/
private String parentTenantId;
/**
* 国家code
*/
@@ -40,6 +39,10 @@ public class VoiceLanguage implements Comparable {
*
*/
private String name;
/**
*
*/
private String chineseName;
/**
* 图片
*/
@@ -57,19 +60,4 @@ public class VoiceLanguage implements Comparable {
*/
private Integer isDel;

@Override
public int compareTo(Object obj) {
// 判断是否是学生类型
if (obj instanceof VoiceLanguage) {
VoiceLanguage s = (VoiceLanguage) obj;
// 如果是学生类型,如果学号相等,则不加入Set
if (Objects.equals(s.getLanguage(), this.getLanguage()) && Objects.equals(s.getCountry(), this.getCountry())) {
return 0;
} else {
return 1;
}
} else {
return 0;
}
}
}

+ 3
- 1
suimangService/src/main/java/com/iformall/domain/po/sm/VoiceMaterial.java View File

@@ -118,5 +118,7 @@ public class VoiceMaterial extends TenantEntity {

@TableField(exist = false)
private List<Integer> sendTypes;

private Integer type;

}

+ 1
- 1
suimangService/src/main/java/com/iformall/mapper/VoiceLanguageMapper.java View File

@@ -7,7 +7,7 @@ import org.apache.ibatis.annotations.Param;

import java.util.HashSet;

public interface VoiceLanguageMapper extends CommonMapper<VoiceLanguage, String> {
public interface VoiceLanguageMapper extends CommonMapper<VoiceLanguage, Long> {
void saveBatch(@Param("set") HashSet<VoiceLanguage> set);
}


+ 1
- 1
suimangService/src/main/java/com/iformall/service/sm/impl/VoiceLanguageServiceImpl.java View File

@@ -20,7 +20,7 @@ public class VoiceLanguageServiceImpl implements VoiceLanguageService {

@Override
public List<VoiceLanguage> voiceTotal() {
List<VoiceLanguage> languages = voiceLanguageMapper.selectList(new LambdaQueryWrapper<VoiceLanguage>().eq(VoiceLanguage::getIsDel, 0).orderByAsc(VoiceLanguage::getName).select(VoiceLanguage::getId, VoiceLanguage::getName, VoiceLanguage::getImg));
List<VoiceLanguage> languages = voiceLanguageMapper.selectList(new LambdaQueryWrapper<VoiceLanguage>().eq(VoiceLanguage::getIsDel, 0).orderByAsc(VoiceLanguage::getName));
return CollectionUtils.isEmpty(languages) ? Lists.newArrayList() : languages;
}
}

Loading…
Cancel
Save