parent
a9b0d8806c
commit
c9637b5ae6
|
@ -198,7 +198,14 @@ public class ModelVersion extends BaseEntity {
|
|||
*/
|
||||
@ApiModelProperty(value = "是否收藏")
|
||||
@TableField(exist = false)
|
||||
private Integer isCollect = 0;
|
||||
private Integer isCollect;
|
||||
|
||||
/**
|
||||
* 是否下载
|
||||
*/
|
||||
@ApiModelProperty(value = "是否下载")
|
||||
@TableField(exist = false)
|
||||
private Integer isDownload;
|
||||
|
||||
/**
|
||||
* 文件hash
|
||||
|
|
|
@ -32,6 +32,12 @@ public class ResponseCollect {
|
|||
@ApiModelProperty(value = "文件名")
|
||||
private String fileName;
|
||||
|
||||
@ApiModelProperty(value = "加密后文件名")
|
||||
private String encryptionFileName;
|
||||
|
||||
@ApiModelProperty(value = "是否加密 0不加密 1加密")
|
||||
private Integer isEncrypt;
|
||||
|
||||
@ApiModelProperty(value = "模型名")
|
||||
private String productName;
|
||||
|
||||
|
|
|
@ -78,6 +78,11 @@ public class CollectServiceImpl implements CollectService {
|
|||
//校验是否下载
|
||||
for (ResponseCollect collect : responseCollectList) {
|
||||
|
||||
//校验是否加密
|
||||
if (collect.getIsEncrypt() == 1){
|
||||
collect.setFileName(collect.getEncryptionFileName());
|
||||
}
|
||||
|
||||
collect.setIsDownload(downloadRecordService.selectDownloadByUser(userIdMax,collect.getId(),0));
|
||||
//翻译类型
|
||||
collect.setType(DictInit.getDictValue(DictConstants.MODE_VERSION_TYPE,collect.getType()));
|
||||
|
|
|
@ -5,10 +5,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|||
import com.mcwl.common.constant.DictConstants;
|
||||
import com.mcwl.common.constant.HttpStatus;
|
||||
import com.mcwl.common.core.domain.R;
|
||||
import com.mcwl.common.core.domain.entity.SysUser;
|
||||
import com.mcwl.common.utils.SecurityUtils;
|
||||
import com.mcwl.common.utils.StringUtils;
|
||||
import com.mcwl.resource.domain.*;
|
||||
import com.mcwl.resource.domain.DownloadRecord;
|
||||
import com.mcwl.resource.domain.request.RequestDownload;
|
||||
import com.mcwl.resource.domain.vo.PageVo;
|
||||
import com.mcwl.resource.mapper.*;
|
||||
|
@ -59,43 +58,43 @@ public class DownloadRecordServiceImpl implements DownloadRecordService {
|
|||
downloadRecord.setUserId(SecurityUtils.getUserId());
|
||||
downloadRecord.setCreateTime(new Date());
|
||||
|
||||
//获取作品信息
|
||||
if (downloadRecord.getProductType() == 0){
|
||||
|
||||
//查询文件/名称信息
|
||||
ModelVersion modelVersion = modelVersionMapper.selectById(downloadRecord.getProductId());
|
||||
downloadRecord.setFileName(modelVersion.getFileName());
|
||||
downloadRecord.setFileSize(modelVersion.getFileSize());
|
||||
downloadRecord.setModelVersionType(modelVersion.getModelVersionType()+"");
|
||||
|
||||
//根据版本查找封面信息
|
||||
ModelProduct modelProduct = modelMapper.selectById(modelVersion.getModelId());
|
||||
downloadRecord.setCover(modelProduct.getSurfaceUrl());
|
||||
downloadRecord.setProductName(modelProduct.getModelName());
|
||||
|
||||
//查询作者信息
|
||||
SysUser sysUser = sysUserMapper.selectUserById(modelProduct.getUserId());
|
||||
downloadRecord.setAuthorName(sysUser.getNickName());
|
||||
|
||||
}else {
|
||||
|
||||
//查询文件/名称信息
|
||||
WorkFlowVersion workFlowVersion = workFlowVersionMapper.selectById(downloadRecord.getProductId());
|
||||
downloadRecord.setFileName(workFlowVersion.getFileName());
|
||||
downloadRecord.setFileSize(workFlowVersion.getFileSize());
|
||||
|
||||
|
||||
//根据版本查找封面信息
|
||||
WorkFlow workFlow = workFlowMapper.selectById(workFlowVersion.getWorkFlowId());
|
||||
downloadRecord.setCover(workFlow.getCoverPath());
|
||||
downloadRecord.setProductName(workFlow.getWorkflowName());
|
||||
|
||||
|
||||
//查询作者信息
|
||||
SysUser sysUser = sysUserMapper.selectUserById(workFlow.getUserId());
|
||||
downloadRecord.setAuthorName(sysUser.getNickName());
|
||||
|
||||
}
|
||||
// //获取作品信息
|
||||
// if (downloadRecord.getProductType() == 0){
|
||||
//
|
||||
// //查询文件/名称信息
|
||||
// ModelVersion modelVersion = modelVersionMapper.selectById(downloadRecord.getProductId());
|
||||
// downloadRecord.setFileName(modelVersion.getFileName());
|
||||
// downloadRecord.setFileSize(modelVersion.getFileSize());
|
||||
// downloadRecord.setModelVersionType(modelVersion.getModelVersionType()+"");
|
||||
//
|
||||
// //根据版本查找封面信息
|
||||
// ModelProduct modelProduct = modelMapper.selectById(modelVersion.getModelId());
|
||||
// downloadRecord.setCover(modelProduct.getSurfaceUrl());
|
||||
// downloadRecord.setProductName(modelProduct.getModelName());
|
||||
//
|
||||
// //查询作者信息
|
||||
// SysUser sysUser = sysUserMapper.selectUserById(modelProduct.getUserId());
|
||||
// downloadRecord.setAuthorName(sysUser.getNickName());
|
||||
//
|
||||
// }else {
|
||||
//
|
||||
// //查询文件/名称信息
|
||||
// WorkFlowVersion workFlowVersion = workFlowVersionMapper.selectById(downloadRecord.getProductId());
|
||||
// downloadRecord.setFileName(workFlowVersion.getFileName());
|
||||
// downloadRecord.setFileSize(workFlowVersion.getFileSize());
|
||||
//
|
||||
//
|
||||
// //根据版本查找封面信息
|
||||
// WorkFlow workFlow = workFlowMapper.selectById(workFlowVersion.getWorkFlowId());
|
||||
// downloadRecord.setCover(workFlow.getCoverPath());
|
||||
// downloadRecord.setProductName(workFlow.getWorkflowName());
|
||||
//
|
||||
//
|
||||
// //查询作者信息
|
||||
// SysUser sysUser = sysUserMapper.selectUserById(workFlow.getUserId());
|
||||
// downloadRecord.setAuthorName(sysUser.getNickName());
|
||||
//
|
||||
// }
|
||||
|
||||
downloadRecordMapper.insert(downloadRecord);
|
||||
|
||||
|
|
|
@ -27,10 +27,7 @@ import com.mcwl.resource.domain.response.ResponseModelProduct;
|
|||
import com.mcwl.resource.domain.vo.MallProductVo;
|
||||
import com.mcwl.resource.domain.vo.ModelVo;
|
||||
import com.mcwl.resource.domain.vo.PageVo;
|
||||
import com.mcwl.resource.mapper.ModelLikeMapper;
|
||||
import com.mcwl.resource.mapper.ModelMapper;
|
||||
import com.mcwl.resource.mapper.ModelVersionMapper;
|
||||
import com.mcwl.resource.mapper.SysUserAttentionMapper;
|
||||
import com.mcwl.resource.mapper.*;
|
||||
import com.mcwl.resource.service.ModelService;
|
||||
import com.mcwl.resource.service.ToActivityService;
|
||||
import com.mcwl.system.init.DictInit;
|
||||
|
@ -65,6 +62,8 @@ public class ModelServiceImpl extends ServiceImpl<ModelMapper,ModelProduct> impl
|
|||
@Autowired
|
||||
private ISysUserService sysUserService;
|
||||
|
||||
@Autowired
|
||||
private DownloadRecordServiceImpl downloadRecordService;
|
||||
|
||||
@Autowired
|
||||
private ThreadPoolTaskExecutor threadPoolTaskExecutor;
|
||||
|
@ -131,6 +130,9 @@ public class ModelServiceImpl extends ServiceImpl<ModelMapper,ModelProduct> impl
|
|||
if (userIdMax == 0){
|
||||
//收藏为空
|
||||
modelVersion.setIsCollect(0);
|
||||
|
||||
//下载为空
|
||||
modelVersion.setIsDownload(0);
|
||||
}else {
|
||||
//查询是否收藏
|
||||
Collect collect = collectService.selectCollectById(modelVersion.getId(), userIdMax, 0);
|
||||
|
@ -142,6 +144,9 @@ public class ModelServiceImpl extends ServiceImpl<ModelMapper,ModelProduct> impl
|
|||
modelVersion.setIsCollect(1);
|
||||
}
|
||||
|
||||
//校验是否下载
|
||||
modelVersion.setIsDownload(downloadRecordService.selectDownloadByUser(userIdMax,modelVersion.getModelId(),0));
|
||||
|
||||
}
|
||||
|
||||
responseModelProduct.setModelVersion(modelVersion);
|
||||
|
|
|
@ -134,6 +134,10 @@ public class ModelVersionServiceImpl extends ServiceImpl< ModelVersionMapper,Mo
|
|||
}
|
||||
|
||||
if (modelVersion.getIsEncrypt() == 1){
|
||||
if (StringUtils.isEmpty(modelVersion.getEncryptionFilePath())){
|
||||
|
||||
return R.fail(HttpStatus.SHOW_ERROR_MSG,"该模型加密未完成,请稍后再试");
|
||||
}
|
||||
return R.ok(modelVersion.getEncryptionFilePath(),modelVersion.getEncryptionFileName());
|
||||
}
|
||||
return R.ok(modelVersion.getFilePath(),modelVersion.getFileName());
|
||||
|
|
|
@ -26,7 +26,8 @@
|
|||
</select>
|
||||
|
||||
<select id="selectCollectModel" resultType="com.mcwl.resource.domain.response.ResponseCollect">
|
||||
SELECT c.product_id as id,m.surface_url as file_path,v.file_name,m.model_name as product_name,u.nick_name,v.file_size,c.create_time,v.model_version_type as type,v.trigger_words
|
||||
SELECT c.product_id as id,m.surface_url as file_path,v.file_name,m.model_name as product_name,u.nick_name,
|
||||
v.file_size,c.create_time,v.model_version_type as type,v.trigger_words,v.is_encrypt,v.encryption_file_name
|
||||
FROM collect as c
|
||||
LEFT JOIN model_version as v on c.product_id = v.id
|
||||
LEFT JOIN model as m on v.model_id = m.id
|
||||
|
|
Loading…
Reference in New Issue