Browse Source

Merge branch 'master' of https://git.malls.iformall.com/suimang/suimangServer into photo

private_deployment
xhxu 1 year ago
parent
commit
dfcc501619
6 changed files with 11 additions and 12 deletions
  1. +1
    -1
      suimangCApi/src/main/java/com/iformall/controller/VoiceMouldController.java
  2. +4
    -1
      suimangService/src/main/java/com/iformall/domain/po/sm/UserMouldVideo.java
  3. +4
    -1
      suimangService/src/main/java/com/iformall/domain/po/sm/VoiceMould.java
  4. +0
    -7
      suimangService/src/main/java/com/iformall/service/sm/impl/UserMouldVideoServiceImpl.java
  5. +1
    -1
      suimangService/src/main/resources/mapper/UserMouldVideoMapper.xml
  6. +1
    -1
      suimangService/src/main/resources/mapper/VoiceMouldMapper.xml

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

@@ -125,7 +125,7 @@ public class VoiceMouldController extends BaseController {
voiceMould.setSex(sex); voiceMould.setSex(sex);
voiceMould.setSendType(EnumMouldSendType.auto.getCode()); voiceMould.setSendType(EnumMouldSendType.auto.getCode());
voiceMould.setStatus(EnumaMouldPatchStatus.put_on.getCode()); voiceMould.setStatus(EnumaMouldPatchStatus.put_on.getCode());
voiceMould.setLanguages(anEnum.getCode());
voiceMould.setLanguages(anEnum.getCode().longValue());
voiceMould.setSortColumns(BaseEntity.SortField.UpdateDate_DESC); voiceMould.setSortColumns(BaseEntity.SortField.UpdateDate_DESC);
final PageInfo<VoiceMould> page = voiceMouldService.cListAsPage(voiceMould, pageNum, pageSize); final PageInfo<VoiceMould> page = voiceMouldService.cListAsPage(voiceMould, pageNum, pageSize);
return new ResultData(page); return new ResultData(page);


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

@@ -101,8 +101,11 @@ public class UserMouldVideo extends TenantEntity {


@io.swagger.annotations.ApiModelProperty(value="文案",name="paperwork") @io.swagger.annotations.ApiModelProperty(value="文案",name="paperwork")
private String paperwork; private String paperwork;
/**
* 后期从表中获取
*/
@io.swagger.annotations.ApiModelProperty(value="EnumLanguages",name="languages") @io.swagger.annotations.ApiModelProperty(value="EnumLanguages",name="languages")
private Integer languages;
private Long languages;
@io.swagger.annotations.ApiModelProperty(value="背景模板ID",name="backgroundId") @io.swagger.annotations.ApiModelProperty(value="背景模板ID",name="backgroundId")
private Long backgroundId; private Long backgroundId;
/** /**


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

@@ -86,8 +86,11 @@ public class VoiceMould extends TenantEntity {
return ageTypeStr; return ageTypeStr;
} }


/**
* 后期改成从表中获取
*/
@io.swagger.annotations.ApiModelProperty(value="EnumLanguages",name="languages") @io.swagger.annotations.ApiModelProperty(value="EnumLanguages",name="languages")
private Integer languages;
private Long languages;


@io.swagger.annotations.ApiModelProperty(value="标签",name="sceneSign") @io.swagger.annotations.ApiModelProperty(value="标签",name="sceneSign")
private String sceneSign; private String sceneSign;


+ 0
- 7
suimangService/src/main/java/com/iformall/service/sm/impl/UserMouldVideoServiceImpl.java View File

@@ -90,7 +90,6 @@ public class UserMouldVideoServiceImpl implements UserMouldVideoService {
} }
record.setVideoType(personMould.getVideoType()); record.setVideoType(personMould.getVideoType());
JSONObject personMouldObject = new JSONObject(); JSONObject personMouldObject = new JSONObject();
personMouldObject.put("id",personMould.getId());
personMouldObject.put("videoType",personMould.getVideoType()); personMouldObject.put("videoType",personMould.getVideoType());
personMouldObject.put("title",personMould.getTitle()); personMouldObject.put("title",personMould.getTitle());
personMouldObject.put("mouldSmId",personMould.getMouldSmId()); personMouldObject.put("mouldSmId",personMould.getMouldSmId());
@@ -105,8 +104,6 @@ public class UserMouldVideoServiceImpl implements UserMouldVideoService {
JSONObject personObject = JSONObject.parseObject(record.getPersonJson()); JSONObject personObject = JSONObject.parseObject(record.getPersonJson());
if(personObject != null && !personObject.isEmpty()){ if(personObject != null && !personObject.isEmpty()){
isPerson = true; isPerson = true;
Long id = personObject.getLong("id");
Integer type = personObject.getInteger("type");
String material = personObject.getString("material"); String material = personObject.getString("material");
int x = personObject.getIntValue("x"); int x = personObject.getIntValue("x");
int y = personObject.getIntValue("y"); int y = personObject.getIntValue("y");
@@ -121,8 +118,6 @@ public class UserMouldVideoServiceImpl implements UserMouldVideoService {
//给数字人默认属性 //给数字人默认属性
if(!isPerson){ if(!isPerson){
JSONObject personObject = new JSONObject(); JSONObject personObject = new JSONObject();
personObject.put("id",personMould.getId());
personObject.put("type",EnumMouldPatchType.person_mould.getCode());
personObject.put("material",personMould.getMaterial()); personObject.put("material",personMould.getMaterial());
//竖屏 数字人尺寸按竖屏尺寸处理 1080*1920 //竖屏 数字人尺寸按竖屏尺寸处理 1080*1920
if(EnumVideoType.VERTICAL_PLATE.getCode().equals(record.getVideoType())){ if(EnumVideoType.VERTICAL_PLATE.getCode().equals(record.getVideoType())){
@@ -163,7 +158,6 @@ public class UserMouldVideoServiceImpl implements UserMouldVideoService {
} }
JSONObject voiceMouldObject = new JSONObject(); JSONObject voiceMouldObject = new JSONObject();
voiceMouldObject.put("title",voiceMould.getTitle()); voiceMouldObject.put("title",voiceMould.getTitle());
voiceMouldObject.put("languages",voiceMould.getLanguages());
voiceMouldObject.put("mouldSmId",voiceMould.getMouldSmId()); voiceMouldObject.put("mouldSmId",voiceMould.getMouldSmId());
voiceMouldObject.put("personType",0); voiceMouldObject.put("personType",0);
voiceMouldObject.put("personTypeStr","默认"); voiceMouldObject.put("personTypeStr","默认");
@@ -185,7 +179,6 @@ public class UserMouldVideoServiceImpl implements UserMouldVideoService {
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"未查询到背景信息"); return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"未查询到背景信息");
} }
JSONObject backgroundObject = new JSONObject(); JSONObject backgroundObject = new JSONObject();
backgroundObject.put("id",background.getId());
backgroundObject.put("title",background.getTitle()); backgroundObject.put("title",background.getTitle());
backgroundObject.put("material",background.getMaterial()); backgroundObject.put("material",background.getMaterial());
record.setBackgroundSm(backgroundObject.toJSONString()); record.setBackgroundSm(backgroundObject.toJSONString());


+ 1
- 1
suimangService/src/main/resources/mapper/UserMouldVideoMapper.xml View File

@@ -12,7 +12,7 @@
<result column="person_json" jdbcType="VARCHAR" property="personJson"/> <result column="person_json" jdbcType="VARCHAR" property="personJson"/>
<result column="voice_mould_id" jdbcType="BIGINT" property="voiceMouldId"/> <result column="voice_mould_id" jdbcType="BIGINT" property="voiceMouldId"/>
<result column="voice_mould_sm" jdbcType="VARCHAR" property="voiceMouldSm"/> <result column="voice_mould_sm" jdbcType="VARCHAR" property="voiceMouldSm"/>
<result column="languages" jdbcType="INTEGER" property="languages"/>
<result column="languages" jdbcType="BIGINT" property="languages"/>
<result column="paperwork" jdbcType="VARCHAR" property="paperwork"/> <result column="paperwork" jdbcType="VARCHAR" property="paperwork"/>
<result column="background_id" jdbcType="BIGINT" property="backgroundId"/> <result column="background_id" jdbcType="BIGINT" property="backgroundId"/>
<result column="background_sm" jdbcType="VARCHAR" property="backgroundSm"/> <result column="background_sm" jdbcType="VARCHAR" property="backgroundSm"/>


+ 1
- 1
suimangService/src/main/resources/mapper/VoiceMouldMapper.xml View File

@@ -14,7 +14,7 @@
<result column="sub_title" jdbcType="VARCHAR" property="subTitle"/> <result column="sub_title" jdbcType="VARCHAR" property="subTitle"/>
<result column="sex" jdbcType="INTEGER" property="sex"/> <result column="sex" jdbcType="INTEGER" property="sex"/>
<result column="age_type" jdbcType="INTEGER" property="ageType"/> <result column="age_type" jdbcType="INTEGER" property="ageType"/>
<result column="languages" jdbcType="INTEGER" property="languages"/>
<result column="languages" jdbcType="BIGINT" property="languages"/>
<result column="scene_sign" jdbcType="VARCHAR" property="sceneSign"/> <result column="scene_sign" jdbcType="VARCHAR" property="sceneSign"/>
<result column="sale_price" jdbcType="INTEGER" property="salePrice"/> <result column="sale_price" jdbcType="INTEGER" property="salePrice"/>
<result column="price" jdbcType="INTEGER" property="price"/> <result column="price" jdbcType="INTEGER" property="price"/>


Loading…
Cancel
Save