diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/domain/ModelVersion.java b/mcwl-resource/src/main/java/com/mcwl/resource/domain/ModelVersion.java index dda603c..57a419f 100644 --- a/mcwl-resource/src/main/java/com/mcwl/resource/domain/ModelVersion.java +++ b/mcwl-resource/src/main/java/com/mcwl/resource/domain/ModelVersion.java @@ -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 diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/domain/response/ResponseCollect.java b/mcwl-resource/src/main/java/com/mcwl/resource/domain/response/ResponseCollect.java index d0aec9b..bf90cc2 100644 --- a/mcwl-resource/src/main/java/com/mcwl/resource/domain/response/ResponseCollect.java +++ b/mcwl-resource/src/main/java/com/mcwl/resource/domain/response/ResponseCollect.java @@ -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; diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/CollectServiceImpl.java b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/CollectServiceImpl.java index ae11a96..600b618 100644 --- a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/CollectServiceImpl.java +++ b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/CollectServiceImpl.java @@ -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())); diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/DownloadRecordServiceImpl.java b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/DownloadRecordServiceImpl.java index 9d57c01..f0c3be6 100644 --- a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/DownloadRecordServiceImpl.java +++ b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/DownloadRecordServiceImpl.java @@ -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); diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelServiceImpl.java b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelServiceImpl.java index 7c465c9..593c67d 100644 --- a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelServiceImpl.java +++ b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelServiceImpl.java @@ -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 impl @Autowired private ISysUserService sysUserService; + @Autowired + private DownloadRecordServiceImpl downloadRecordService; @Autowired private ThreadPoolTaskExecutor threadPoolTaskExecutor; @@ -131,6 +130,9 @@ public class ModelServiceImpl extends ServiceImpl 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 impl modelVersion.setIsCollect(1); } + //校验是否下载 + modelVersion.setIsDownload(downloadRecordService.selectDownloadByUser(userIdMax,modelVersion.getModelId(),0)); + } responseModelProduct.setModelVersion(modelVersion); diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelVersionServiceImpl.java b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelVersionServiceImpl.java index 279445a..0fcfe9e 100644 --- a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelVersionServiceImpl.java +++ b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelVersionServiceImpl.java @@ -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()); diff --git a/mcwl-resource/src/main/resources/mapper/resource/CollectMapper.xml b/mcwl-resource/src/main/resources/mapper/resource/CollectMapper.xml index 095996d..3de33dc 100644 --- a/mcwl-resource/src/main/resources/mapper/resource/CollectMapper.xml +++ b/mcwl-resource/src/main/resources/mapper/resource/CollectMapper.xml @@ -26,7 +26,8 @@