diff --git a/suimangCApi/src/main/java/com/iformall/controller/VoiceMouldController.java b/suimangCApi/src/main/java/com/iformall/controller/VoiceMouldController.java index 14671a9..2113d5f 100644 --- a/suimangCApi/src/main/java/com/iformall/controller/VoiceMouldController.java +++ b/suimangCApi/src/main/java/com/iformall/controller/VoiceMouldController.java @@ -110,7 +110,7 @@ public class VoiceMouldController extends BaseController { voiceMould.setSex(sex); voiceMould.setSendType(EnumMouldSendType.auto.getCode()); voiceMould.setStatus(EnumaMouldPatchStatus.put_on.getCode()); - voiceMould.setLanguages(anEnum.getCode()); + voiceMould.setLanguages(anEnum.getCode().longValue()); voiceMould.setSortColumns(BaseEntity.SortField.UpdateDate_DESC); final PageInfo page = voiceMouldService.cListAsPage(voiceMould, pageNum, pageSize); return new ResultData(page); diff --git a/suimangService/src/main/java/com/iformall/domain/po/sm/UserMouldVideo.java b/suimangService/src/main/java/com/iformall/domain/po/sm/UserMouldVideo.java index 7015185..4077e60 100644 --- a/suimangService/src/main/java/com/iformall/domain/po/sm/UserMouldVideo.java +++ b/suimangService/src/main/java/com/iformall/domain/po/sm/UserMouldVideo.java @@ -101,8 +101,11 @@ public class UserMouldVideo extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="文案",name="paperwork") private String paperwork; + /** + * 后期从表中获取 + */ @io.swagger.annotations.ApiModelProperty(value="EnumLanguages",name="languages") - private Integer languages; + private Long languages; @io.swagger.annotations.ApiModelProperty(value="背景模板ID",name="backgroundId") private Long backgroundId; /** diff --git a/suimangService/src/main/java/com/iformall/domain/po/sm/VoiceMould.java b/suimangService/src/main/java/com/iformall/domain/po/sm/VoiceMould.java index 6a814e4..64e3a08 100644 --- a/suimangService/src/main/java/com/iformall/domain/po/sm/VoiceMould.java +++ b/suimangService/src/main/java/com/iformall/domain/po/sm/VoiceMould.java @@ -86,8 +86,11 @@ public class VoiceMould extends TenantEntity { return ageTypeStr; } + /** + * 后期改成从表中获取 + */ @io.swagger.annotations.ApiModelProperty(value="EnumLanguages",name="languages") - private Integer languages; + private Long languages; @io.swagger.annotations.ApiModelProperty(value="标签",name="sceneSign") private String sceneSign; diff --git a/suimangService/src/main/java/com/iformall/service/sm/impl/UserMouldVideoServiceImpl.java b/suimangService/src/main/java/com/iformall/service/sm/impl/UserMouldVideoServiceImpl.java index 7f6b54e..11eb298 100644 --- a/suimangService/src/main/java/com/iformall/service/sm/impl/UserMouldVideoServiceImpl.java +++ b/suimangService/src/main/java/com/iformall/service/sm/impl/UserMouldVideoServiceImpl.java @@ -90,7 +90,6 @@ public class UserMouldVideoServiceImpl implements UserMouldVideoService { } record.setVideoType(personMould.getVideoType()); JSONObject personMouldObject = new JSONObject(); - personMouldObject.put("id",personMould.getId()); personMouldObject.put("videoType",personMould.getVideoType()); personMouldObject.put("title",personMould.getTitle()); personMouldObject.put("mouldSmId",personMould.getMouldSmId()); @@ -105,8 +104,6 @@ public class UserMouldVideoServiceImpl implements UserMouldVideoService { JSONObject personObject = JSONObject.parseObject(record.getPersonJson()); if(personObject != null && !personObject.isEmpty()){ isPerson = true; - Long id = personObject.getLong("id"); - Integer type = personObject.getInteger("type"); String material = personObject.getString("material"); int x = personObject.getIntValue("x"); int y = personObject.getIntValue("y"); @@ -121,8 +118,6 @@ public class UserMouldVideoServiceImpl implements UserMouldVideoService { //给数字人默认属性 if(!isPerson){ JSONObject personObject = new JSONObject(); - personObject.put("id",personMould.getId()); - personObject.put("type",EnumMouldPatchType.person_mould.getCode()); personObject.put("material",personMould.getMaterial()); //竖屏 数字人尺寸按竖屏尺寸处理 1080*1920 if(EnumVideoType.VERTICAL_PLATE.getCode().equals(record.getVideoType())){ @@ -163,7 +158,6 @@ public class UserMouldVideoServiceImpl implements UserMouldVideoService { } JSONObject voiceMouldObject = new JSONObject(); voiceMouldObject.put("title",voiceMould.getTitle()); - voiceMouldObject.put("languages",voiceMould.getLanguages()); voiceMouldObject.put("mouldSmId",voiceMould.getMouldSmId()); voiceMouldObject.put("personType",0); voiceMouldObject.put("personTypeStr","默认"); @@ -185,7 +179,6 @@ public class UserMouldVideoServiceImpl implements UserMouldVideoService { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"未查询到背景信息"); } JSONObject backgroundObject = new JSONObject(); - backgroundObject.put("id",background.getId()); backgroundObject.put("title",background.getTitle()); backgroundObject.put("material",background.getMaterial()); record.setBackgroundSm(backgroundObject.toJSONString()); diff --git a/suimangService/src/main/resources/mapper/UserMouldVideoMapper.xml b/suimangService/src/main/resources/mapper/UserMouldVideoMapper.xml index 66607bf..3f3c9ad 100644 --- a/suimangService/src/main/resources/mapper/UserMouldVideoMapper.xml +++ b/suimangService/src/main/resources/mapper/UserMouldVideoMapper.xml @@ -12,7 +12,7 @@ - + diff --git a/suimangService/src/main/resources/mapper/VoiceMouldMapper.xml b/suimangService/src/main/resources/mapper/VoiceMouldMapper.xml index 605d9a7..099e252 100644 --- a/suimangService/src/main/resources/mapper/VoiceMouldMapper.xml +++ b/suimangService/src/main/resources/mapper/VoiceMouldMapper.xml @@ -14,7 +14,7 @@ - +