소스 검색

Merge remote-tracking branch 'origin/photo' into private_deployment

# Conflicts:
#	suimangService/src/main/java/com/iformall/service/sm/impl/UserMouldVideoServiceImpl.java
private_deployment
xmzhao71 1 년 전
부모
커밋
b688de295d
13개의 변경된 파일188개의 추가작업 그리고 9개의 파일을 삭제
  1. +3
    -2
      open-api/src/main/java/com/iformall/controller/ai/AiVideoController.java
  2. +1
    -1
      open-api/src/main/java/com/iformall/service/AiVideoService.java
  3. +2
    -2
      open-api/src/main/java/com/iformall/service/impl/AiVideoServiceImpl.java
  4. +14
    -0
      suimangAdmin/src/main/java/com/iformall/controller/sm/ServiceInfoController.java
  5. +1
    -0
      suimangCApi/src/main/java/com/iformall/controller/UserLiveController.java
  6. +61
    -0
      suimangService/src/main/java/com/iformall/domain/po/UserLevelCreditLog.java
  7. +12
    -0
      suimangService/src/main/java/com/iformall/mapper/UserLevelCreditLogMapper.java
  8. +0
    -1
      suimangService/src/main/java/com/iformall/service/impl/WxCUserAuthorityServiceImpl.java
  9. +4
    -0
      suimangService/src/main/java/com/iformall/service/sm/ServiceInfoService.java
  10. +11
    -0
      suimangService/src/main/java/com/iformall/service/sm/impl/ServiceInfoServiceImpl.java
  11. +1
    -0
      suimangService/src/main/java/com/iformall/service/sm/impl/UserMouldVideoServiceImpl.java
  12. +7
    -3
      suimangService/src/main/java/com/iformall/sm/AiVideoHelper.java
  13. +71
    -0
      suimangService/src/main/resources/mapper/UserLevelCreditLogMapper.xml

+ 3
- 2
open-api/src/main/java/com/iformall/controller/ai/AiVideoController.java 파일 보기

@@ -5,6 +5,7 @@ import com.iformall.controller.BaseController;
import com.iformall.dto.GenerateVideoDTO; import com.iformall.dto.GenerateVideoDTO;
import com.iformall.dto.PreviewVideoDTO; import com.iformall.dto.PreviewVideoDTO;
import com.iformall.service.AiVideoService; import com.iformall.service.AiVideoService;
import com.iformall.sm.AiVideoParam;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -29,7 +30,7 @@ public class AiVideoController extends BaseController {


@ApiOperation("生成视频") @ApiOperation("生成视频")
@PostMapping("generateVideo") @PostMapping("generateVideo")
public ResultData generateVideo(@RequestBody GenerateVideoDTO dto) {
return new ResultData(aiVideoService.generateVideo(dto.getAiVideoParam(), dto.getId(), getServiceId()));
public ResultData generateVideo(@RequestBody AiVideoParam aiVideoParam) {
return new ResultData(aiVideoService.generateVideo(aiVideoParam, getServiceId()));
} }
} }

+ 1
- 1
open-api/src/main/java/com/iformall/service/AiVideoService.java 파일 보기

@@ -23,5 +23,5 @@ public interface AiVideoService {
* @param aiVideoParam * @param aiVideoParam
* @return {@link AiVideoResult} * @return {@link AiVideoResult}
*/ */
AiVideoResult generateVideo(AiVideoParam aiVideoParam, Long taskId, Long serviceId);
AiVideoResult generateVideo(AiVideoParam aiVideoParam, Long serviceId);
} }

+ 2
- 2
open-api/src/main/java/com/iformall/service/impl/AiVideoServiceImpl.java 파일 보기

@@ -25,8 +25,8 @@ public class AiVideoServiceImpl implements AiVideoService {
} }


@Override @Override
public AiVideoResult generateVideo(AiVideoParam aiVideoParam, Long taskId, Long serviceId) {
AiVideoResult video = AiVideoHelper.createVideo(aiVideoParam, taskId);
public AiVideoResult generateVideo(AiVideoParam aiVideoParam, Long serviceId) {
AiVideoResult video = AiVideoHelper.createVideo(aiVideoParam);
if (video.isSuccess()) { if (video.isSuccess()) {
// 记录时长 // 记录时长
SaveServiceVideoRecordDTO dto = SaveServiceVideoRecordDTO.builder() SaveServiceVideoRecordDTO dto = SaveServiceVideoRecordDTO.builder()


+ 14
- 0
suimangAdmin/src/main/java/com/iformall/controller/sm/ServiceInfoController.java 파일 보기

@@ -2,6 +2,7 @@ package com.iformall.controller.sm;


import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.iformall.annotation.ApiVersion; import com.iformall.annotation.ApiVersion;
import com.iformall.common.ErrorCode;
import com.iformall.common.R; import com.iformall.common.R;
import com.iformall.common.ResultData; import com.iformall.common.ResultData;
import com.iformall.constant.SwaggerConstant; import com.iformall.constant.SwaggerConstant;
@@ -10,12 +11,15 @@ import com.iformall.domain.dto.sm.SaveServiceInfoDTO;
import com.iformall.domain.dto.sm.UpdateServiceInfoDTO; import com.iformall.domain.dto.sm.UpdateServiceInfoDTO;
import com.iformall.domain.dto.sm.UpdateServiceInfoStatusDTO; import com.iformall.domain.dto.sm.UpdateServiceInfoStatusDTO;
import com.iformall.domain.po.sm.ServiceInfo; import com.iformall.domain.po.sm.ServiceInfo;
import com.iformall.exception.BizException;
import com.iformall.service.sm.ServiceInfoService; import com.iformall.service.sm.ServiceInfoService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;


import java.util.List;

@RestController @RestController
@RequestMapping("/serviceInfo") @RequestMapping("/serviceInfo")
@Api(tags = "合作商接口") @Api(tags = "合作商接口")
@@ -31,6 +35,16 @@ public class ServiceInfoController extends BaseController {
return R.ok(serviceInfoService.pageServiceInfo(serviceInfo, pageNum, pageSize)); return R.ok(serviceInfoService.pageServiceInfo(serviceInfo, pageNum, pageSize));
} }


@ApiVersion(group = SwaggerConstant.V_1_0_0)
@ApiOperation("单个查询合作商")
@GetMapping("/get")
public R<ServiceInfo> getServiceInfo(Long id) {
if (id == null) {
throw new BizException(ErrorCode.SYS_PARAMETER_NOT_NULL);
}
return R.ok(serviceInfoService.getServiceInfo(id));
}

@ApiVersion(group = SwaggerConstant.V_1_0_0) @ApiVersion(group = SwaggerConstant.V_1_0_0)
@ApiOperation("新增合作商") @ApiOperation("新增合作商")
@PostMapping("/save") @PostMapping("/save")


+ 1
- 0
suimangCApi/src/main/java/com/iformall/controller/UserLiveController.java 파일 보기

@@ -77,6 +77,7 @@ public class UserLiveController extends BaseController {


@Autowired @Autowired
private WxCUserAuthorityService wxCUserAuthorityService; private WxCUserAuthorityService wxCUserAuthorityService;

@Autowired @Autowired
private VoiceInfoService voiceInfoService; private VoiceInfoService voiceInfoService;




+ 61
- 0
suimangService/src/main/java/com/iformall/domain/po/UserLevelCreditLog.java 파일 보기

@@ -0,0 +1,61 @@
package com.iformall.domain.po;

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;

@TableName(value = "user_level_credit_log")
@Data
@ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true)
public class UserLevelCreditLog extends TenantEntity {

protected Long id;

@io.swagger.annotations.ApiModelProperty(value="",name="userId")
private Long userId;

@io.swagger.annotations.ApiModelProperty(value="EnumProject ",name="projectType")
private Integer projectType;

@io.swagger.annotations.ApiModelProperty(value="EnumPropertyLogType ",name="type")
private Integer type;

@io.swagger.annotations.ApiModelProperty(value="",name="befourCredit")
private Integer befourCredit;

@io.swagger.annotations.ApiModelProperty(value="",name="cieditNum")
private Integer creditNum;

@io.swagger.annotations.ApiModelProperty(value="",name="afterCredit")
private Integer afterCredit;

@io.swagger.annotations.ApiModelProperty(value="记录对应的业务ID",name="extraId")
private Long extraId;

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

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

@io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate")
private Date createDate;

@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value="",name="extraIds")
private List<Long> extraIds;

@TableField(exist = false)
private Date startDate;

@TableField(exist = false)
private Date endDate;

}

+ 12
- 0
suimangService/src/main/java/com/iformall/mapper/UserLevelCreditLogMapper.java 파일 보기

@@ -0,0 +1,12 @@
package com.iformall.mapper;

import com.iformall.common.CommonMapper;
import com.iformall.domain.po.UserLevelCreditLog;

import java.util.List;

public interface UserLevelCreditLogMapper extends CommonMapper<UserLevelCreditLog, Long>{
List<UserLevelCreditLog> findList(UserLevelCreditLog record);

}

+ 0
- 1
suimangService/src/main/java/com/iformall/service/impl/WxCUserAuthorityServiceImpl.java 파일 보기

@@ -20,7 +20,6 @@ public class WxCUserAuthorityServiceImpl implements WxCUserAuthorityService {
@Override @Override
public Map<String, Object> getAuthor(Long id, String code, Integer type, Long resourceId) { public Map<String, Object> getAuthor(Long id, String code, Integer type, Long resourceId) {


HashMap<String, Object> authorVos = new HashMap<>();
List<WxCUserAuthority> resultList = new ArrayList<WxCUserAuthority>(); List<WxCUserAuthority> resultList = new ArrayList<WxCUserAuthority>();


if (type == 0) { if (type == 0) {


+ 4
- 0
suimangService/src/main/java/com/iformall/service/sm/ServiceInfoService.java 파일 보기

@@ -7,6 +7,8 @@ import com.iformall.domain.dto.sm.UpdateServiceInfoStatusDTO;
import com.iformall.domain.po.sm.ServiceInfo; import com.iformall.domain.po.sm.ServiceInfo;
import com.iformall.domain.vo.neuver.PageServiceInfoVO; import com.iformall.domain.vo.neuver.PageServiceInfoVO;


import java.util.List;

/** /**
* 接入商service * 接入商service
* *
@@ -44,4 +46,6 @@ public interface ServiceInfoService {
* @param dto * @param dto
*/ */
void updateServiceInfoStatus(UpdateServiceInfoStatusDTO dto); void updateServiceInfoStatus(UpdateServiceInfoStatusDTO dto);

ServiceInfo getServiceInfo(Long id);
} }

+ 11
- 0
suimangService/src/main/java/com/iformall/service/sm/impl/ServiceInfoServiceImpl.java 파일 보기

@@ -14,10 +14,13 @@ import com.iformall.mapper.ServiceInfoMapper;
import com.iformall.mapper.WxThirdPartyApiMapper; import com.iformall.mapper.WxThirdPartyApiMapper;
import com.iformall.service.WxThirdPartyApiService; import com.iformall.service.WxThirdPartyApiService;
import com.iformall.service.sm.ServiceInfoService; import com.iformall.service.sm.ServiceInfoService;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;


import java.util.List;

@Service @Service
public class ServiceInfoServiceImpl implements ServiceInfoService { public class ServiceInfoServiceImpl implements ServiceInfoService {


@@ -76,4 +79,12 @@ public class ServiceInfoServiceImpl implements ServiceInfoService {
.eq(WxThirdPartyApi::getServiceId, dto.getId())); .eq(WxThirdPartyApi::getServiceId, dto.getId()));
} }
} }

@Override
public ServiceInfo getServiceInfo(Long id) {
ServiceInfo serviceInfo = new ServiceInfo();
serviceInfo.setId(id);
List<ServiceInfo> serviceInfos = serviceInfoMapper.listServiceInfo(serviceInfo);
return !CollectionUtils.isEmpty(serviceInfos) ? serviceInfos.get(0) : null;
}
} }

+ 1
- 0
suimangService/src/main/java/com/iformall/service/sm/impl/UserMouldVideoServiceImpl.java 파일 보기

@@ -351,6 +351,7 @@ public class UserMouldVideoServiceImpl implements UserMouldVideoService {


try{ try{
AiVideoParam videoParam = new AiVideoParam(); AiVideoParam videoParam = new AiVideoParam();
videoParam.setTask_id(mouldVideo.getId());
videoParam.setGen_txt(paperwork.replaceAll(Constant.text_pause, "[*]")); videoParam.setGen_txt(paperwork.replaceAll(Constant.text_pause, "[*]"));
videoParam.setVideo_template_id(personMouldSmId); videoParam.setVideo_template_id(personMouldSmId);
videoParam.setSubtitle(subtitleMap); videoParam.setSubtitle(subtitleMap);


+ 7
- 3
suimangService/src/main/java/com/iformall/sm/AiVideoHelper.java 파일 보기

@@ -61,10 +61,14 @@ public class AiVideoHelper {
} }


public static AiVideoResult createVideo(AiVideoParam videoParam,Long taskId) {
public static AiVideoResult createVideo(AiVideoParam videoParam) {


videoParam.setTask_id(taskId);
videoParam.setCallback_url(callbackUrl + "/callback/oral/broadcasting");
// videoParam.setTask_id(taskId);
if (StringUtils.isNotBlank(videoParam.getCallback_url())) {
videoParam.setCallback_url(videoParam.getCallback_url());
} else {
videoParam.setCallback_url(callbackUrl + "/callback/oral/broadcasting");
}


log.info("生成视频start request:" + videoParam.neglectImgString()); log.info("生成视频start request:" + videoParam.neglectImgString());
log.info("完整参数:{}", JSONObject.toJSONString(videoParam)); log.info("完整参数:{}", JSONObject.toJSONString(videoParam));


+ 71
- 0
suimangService/src/main/resources/mapper/UserLevelCreditLogMapper.xml 파일 보기

@@ -0,0 +1,71 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.iformall.mapper.UserLevelCreditLogMapper">
<resultMap id="BaseResultMap" type="com.iformall.domain.po.UserLevelCreditLog">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="tenant_id" jdbcType="VARCHAR" property="tenantId" />
<result column="parent_tenant_id" jdbcType="VARCHAR" property="parentTenantId"/>
<result column="user_id" jdbcType="BIGINT" property="userId" />
<result column="project_type" jdbcType="INTEGER" property="projectType" />
<result column="type" jdbcType="INTEGER" property="type" />
<result column="befour_credit" jdbcType="INTEGER" property="befourCredit" />
<result column="credit_num" jdbcType="INTEGER" property="creditNum" />
<result column="after_credit" jdbcType="INTEGER" property="afterCredit" />
<result column="extra_id" jdbcType="BIGINT" property="extraId" />
<result column="remark" jdbcType="VARCHAR" property="remark" />
<result column="detail" jdbcType="VARCHAR" property="detail" />
<result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
</resultMap>
<sql id="allColumns">
`id`,`tenant_id`,`parent_tenant_id`,`user_id`,
`project_type`,`type`,`befour_credit`,`credit_num`,`after_credit`,
`extra_id`,`remark`,`detail`,`create_date`
</sql>

<sql id="dynamicWhereConditions">
where 1 = 1
<if test=" null != id "> and `id` = #{id} </if>
<if test=" null != tenantId and '' != tenantId">
and `tenant_id` = #{tenantId}
</if>
<if test=" null != parentTenantId and '' != parentTenantId">
and `parent_tenant_id` = #{parentTenantId}
</if>
<if test=" null != userId "> and `user_id` = #{userId} </if>
<if test=" null != projectType "> and `project_type` = #{projectType} </if>
<if test=" null != type "> and `type` = #{type} </if>

<if test=" null != extraId "> and `extra_id` = #{extraId} </if>


<if test=" null != startDate ">
and `create_date` &gt;= #{startDate}
</if>
<if test=" null != endDate">
and `create_date` &lt;= #{endDate}
</if>

<if test=" null != ids ">
and id in
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">
#{idItem}
</foreach>
</if>

<if test=" null != extraIds ">
and extra_id in
<foreach collection="extraIds" index="index" item="extIdItem" open="(" separator="," close=")">
#{extIdItem}
</foreach>
</if>
<if test=" null != sortColumns"> order by ${sortColumns} </if>
</sql>

<select id="findList" parameterType="com.iformall.domain.po.UserLevelCreditLog" resultMap="BaseResultMap">
select <include refid="allColumns" />
from user_basic_property_log
<include refid="dynamicWhereConditions" />
</select>

</mapper>

불러오는 중...
취소
저장