diff --git a/suimangAdmin/src/main/java/com/iformall/controller/sm/ServiceInfoController.java b/suimangAdmin/src/main/java/com/iformall/controller/sm/ServiceInfoController.java index 1e5cc1a..8371b6d 100644 --- a/suimangAdmin/src/main/java/com/iformall/controller/sm/ServiceInfoController.java +++ b/suimangAdmin/src/main/java/com/iformall/controller/sm/ServiceInfoController.java @@ -16,6 +16,7 @@ import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.sm.PersonMould; import com.iformall.domain.po.sm.ServiceInfo; +import com.iformall.domain.po.sm.ServicePersonMould; import com.iformall.domain.po.sm.ServiceVideoRecord; import com.iformall.enums.EnumProject; import com.iformall.enums.EnumUserAdmin; @@ -171,11 +172,11 @@ public class ServiceInfoController extends MallUserInfoBaseController{ @ApiVersion(group = SwaggerConstant.V_1_0_0) @ApiOperation("设置关联模板") @PostMapping("/associatedMould") - public R associatedMould(Long[] mouldIds,Long serviceId) { - if (null == mouldIds || mouldIds.length <= 0 ) { + public R associatedMould(@RequestBody ServicePersonMould spm) { + if (null == spm.getMouldIds() || spm.getMouldIds().size() <= 0 ) { throw new BizException(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"请选择模板"); } - serviceInfoService.associatedMoulds(mouldIds, serviceId); + serviceInfoService.associatedMoulds(spm.getMouldIds(), spm.getServiceId()); return R.ok(); } diff --git a/suimangAdmin/src/main/resources/application-dev.yml b/suimangAdmin/src/main/resources/application-dev.yml index bfb9c50..03b0235 100644 --- a/suimangAdmin/src/main/resources/application-dev.yml +++ b/suimangAdmin/src/main/resources/application-dev.yml @@ -210,7 +210,10 @@ suimang: digital_avatar: xxx digital_avatar_hy: xxx callbackUrl: xxx - + local_deploy: false +sdk: + sm: + base-url: https://mtest.metavatar.cc/public swagger: base-package: com.iformall.controller title: 遂芒_metavatar_接口文档 diff --git a/suimangAdmin/src/main/resources/application-prod.yml b/suimangAdmin/src/main/resources/application-prod.yml index a57e8c1..58baf6d 100644 --- a/suimangAdmin/src/main/resources/application-prod.yml +++ b/suimangAdmin/src/main/resources/application-prod.yml @@ -165,4 +165,8 @@ suimang: photo_speak_hy: xxx digital_avatar: xxx digital_avatar_hy: xxx - callbackUrl: xxx \ No newline at end of file + callbackUrl: xxx + local_deploy: false +sdk: + sm: + base-url: https://test.metavatar.cc/public \ No newline at end of file diff --git a/suimangAdmin/src/main/resources/db/migration/V2023110300001_personmould.sql b/suimangAdmin/src/main/resources/db/migration/V2023110300001_personmould.sql index 08719c5..c687765 100644 --- a/suimangAdmin/src/main/resources/db/migration/V2023110300001_personmould.sql +++ b/suimangAdmin/src/main/resources/db/migration/V2023110300001_personmould.sql @@ -37,8 +37,7 @@ CREATE TABLE `service_person_mould` ( `person_mould_id` bigint NOT NULL COMMENT 'PersonMould编号', `service_id` bigint NOT NULL COMMENT 'ServiceInfo编码', `create_date` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_date` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间', - `wx_third_party_api_id` bigint NOT NULL, + `update_date` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间' PRIMARY KEY (`id`) USING BTREE, UNIQUE KEY `id_UNIQUE` (`id`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='接入方关联模板'; @@ -47,3 +46,6 @@ ALTER TABLE `service_video_record` ADD COLUMN video_url varchar(300) COMMENT '视频链接'; +#wx_c_author 新增了user_name + + diff --git a/suimangService/src/main/java/com/iformall/domain/po/sm/ServicePersonMould.java b/suimangService/src/main/java/com/iformall/domain/po/sm/ServicePersonMould.java index 6c483a2..fc46cba 100644 --- a/suimangService/src/main/java/com/iformall/domain/po/sm/ServicePersonMould.java +++ b/suimangService/src/main/java/com/iformall/domain/po/sm/ServicePersonMould.java @@ -1,11 +1,13 @@ 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 = "service_person_mould") @Data @@ -25,4 +27,6 @@ public class ServicePersonMould extends BaseEntity { private Date createDate; @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") private Date updateDate; + @TableField(exist = false) + private List mouldIds; } diff --git a/suimangService/src/main/java/com/iformall/service/sm/ServiceInfoService.java b/suimangService/src/main/java/com/iformall/service/sm/ServiceInfoService.java index 711c32f..f4d3f97 100644 --- a/suimangService/src/main/java/com/iformall/service/sm/ServiceInfoService.java +++ b/suimangService/src/main/java/com/iformall/service/sm/ServiceInfoService.java @@ -52,7 +52,7 @@ public interface ServiceInfoService { ServiceInfo getServiceInfo(Long id); ServiceInfo getServiceInfoByMallUserInfo(Long mallUserInfoId); - void associatedMoulds(Long[] mouldIds,Long id); + void associatedMoulds(List mouldIds,Long id); void reduceTimes(Long serviceId,Long seconds); diff --git a/suimangService/src/main/java/com/iformall/service/sm/impl/ServiceInfoServiceImpl.java b/suimangService/src/main/java/com/iformall/service/sm/impl/ServiceInfoServiceImpl.java index 27ad3ab..eb6c948 100644 --- a/suimangService/src/main/java/com/iformall/service/sm/impl/ServiceInfoServiceImpl.java +++ b/suimangService/src/main/java/com/iformall/service/sm/impl/ServiceInfoServiceImpl.java @@ -109,14 +109,14 @@ public class ServiceInfoServiceImpl implements ServiceInfoService { } @Override - public void associatedMoulds(Long[] mouldIds, Long id) { + public void associatedMoulds(List mouldIds, Long id) { servicePersonMouldMapper.deleteByServiceId(id); - if (null != mouldIds && mouldIds.length > 0 ) { + if (null != mouldIds && mouldIds.size() > 0 ) { List spmlist = new ArrayList(); - for (int i = 0 ; i < mouldIds.length ; i ++) { + for (int i = 0 ; i < mouldIds.size() ; i ++) { ServicePersonMould spm = new ServicePersonMould(); spm.setId(IdWorker.get().nextId()); - spm.setPersonMouldId(mouldIds[i]); + spm.setPersonMouldId(mouldIds.get(i)); spm.setServiceId(id); spm.setCreateDate(new Date()); spm.setUpdateDate(new Date());