Merge branch 'feature/admin' into preview

mcwl-admin/src/main/java/com/mcwl/web/controller/resource/DownloadRecordController.java

@@ -1,5 +1,6 @@
 package com.mcwl.web.controller.resource;
 
+import com.mcwl.common.annotation.RepeatSubmit;
 import com.mcwl.common.core.domain.R;
 import com.mcwl.resource.domain.DownloadRecord;
 import com.mcwl.resource.domain.request.RequestDownload;
@@ -36,6 +37,7 @@ public class DownloadRecordController {
      * @return
      */
     @ApiOperation(value = "新增下载记录")
+    @RepeatSubmit(interval = 1000)
     @PostMapping("/addDownloadRecord")
     public R addDownloadRecord(@RequestBody DownloadRecord downloadRecord){
 
@@ -85,4 +87,11 @@ public class DownloadRecordController {
         return downloadRecordService.selectByFileName(requestDownload);
     }
 
+    @ApiOperation(value = "根据文件名删除数据")
+    @PostMapping("/deleteDownloadRecordByFileName")
+    public R deleteDownloadRecordByFileName(@RequestBody DownloadRecord downloadRecord){
+
+        return downloadRecordService.deleteDownloadRecordByFileName(downloadRecord);
+    }
+
 }

mcwl-resource/src/main/java/com/mcwl/resource/domain/DownloadRecord.java

@@ -47,7 +47,7 @@ public class DownloadRecord {
     /**
      * 作品类型（0模型 1工作流）
      */
-    @ApiModelProperty(value = "作品类型（0模型 1工作流）")
+    @ApiModelProperty(value = "作品类型")
     private Long productType;
 
     /**

mcwl-resource/src/main/java/com/mcwl/resource/domain/WorkFlowVersion.java

@@ -113,4 +113,11 @@ public class WorkFlowVersion {
      */
     @ApiModelProperty(value = "文件hash")
     private String fileHash;
+
+    /**
+     * 是否下载
+     */
+    @ApiModelProperty(value = "是否下载")
+    @TableField(exist = false)
+    private Integer isDownload;
 }

mcwl-resource/src/main/java/com/mcwl/resource/service/DownloadRecordService.java

@@ -24,4 +24,6 @@ public interface DownloadRecordService {
     Integer selectDownloadByUser(Long userIdMax, Long id, int i);
 
     R selectByFileName(RequestDownload requestDownload);
+
+    R deleteDownloadRecordByFileName(DownloadRecord downloadRecord);
 }

mcwl-resource/src/main/java/com/mcwl/resource/service/impl/DownloadRecordServiceImpl.java

@@ -56,6 +56,17 @@ public class DownloadRecordServiceImpl implements DownloadRecordService {
         downloadRecord.setUserId(SecurityUtils.getUserId());
         downloadRecord.setCreateTime(new Date());
 
+        //校验是否存在下载记录
+        LambdaQueryWrapper<DownloadRecord> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(DownloadRecord::getUserId,SecurityUtils.getUserId());
+        wrapper.eq(DownloadRecord::getDownloadType,downloadRecord.getDownloadType());
+        wrapper.eq(DownloadRecord::getProductId,downloadRecord.getProductId());
+        List<DownloadRecord> downloadRecords = downloadRecordMapper.selectList(wrapper);
+        if (StringUtils.isNotEmpty(downloadRecords)){
+            //记录存在直接返回
+            return R.ok();
+        }
+
 //        //获取作品信息
 //        if (downloadRecord.getProductType() == 0){
 //
@@ -178,4 +189,17 @@ public class DownloadRecordServiceImpl implements DownloadRecordService {
 
         return R.ok(downloadRecords);
     }
+
+    @Override
+    public R deleteDownloadRecordByFileName(DownloadRecord downloadRecord) {
+
+        LambdaQueryWrapper<DownloadRecord> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(DownloadRecord::getFileName,downloadRecord.getFileName());
+        wrapper.eq(DownloadRecord::getUserId,SecurityUtils.getUserId());
+
+        downloadRecordMapper.delete(wrapper);
+
+        return R.ok();
+    }
+
 }

mcwl-resource/src/main/java/com/mcwl/resource/service/impl/WorkFlowServiceImpl.java

@@ -76,6 +76,9 @@ public class WorkFlowServiceImpl extends ServiceImpl<WorkFlowMapper, WorkFlow> i
     @Autowired
     private ThreadPoolTaskExecutor threadPoolTaskExecutor;
 
+    @Autowired
+    private DownloadRecordServiceImpl downloadRecordService;
+
 
     @Override
     public R<Object> addWorkFlow(AddRequestWorkFlow addRequestWorkFlo) {
@@ -530,6 +533,9 @@ public class WorkFlowServiceImpl extends ServiceImpl<WorkFlowMapper, WorkFlow> i
                 if (userIdMax == 0){
                     //收藏为空
                     workFlowVersion.setIsCollect(0);
+
+                    //下载为空
+                    workFlowVersion.setIsDownload(0);
                 }else {
                     //查询是否收藏
                     Collect collect = collectService.selectCollectById(workFlowVersion.getId(), userIdMax, 1);
@@ -541,6 +547,7 @@ public class WorkFlowServiceImpl extends ServiceImpl<WorkFlowMapper, WorkFlow> i
                         workFlowVersion.setIsCollect(1);
                     }
 
+                    workFlowVersion.setIsDownload(downloadRecordService.selectDownloadByUser(userIdMax,workFlowVersion.getWorkFlowId(),1));
                 }
 
                 responseWorkFlow.setWorkFlowVersion(workFlowVersion);

mcwl-resource/src/main/resources/mapper/resource/DownloadRecordMapper.xml

@@ -15,6 +15,7 @@
     <select id="selectDownloadByUser" resultType="com.mcwl.resource.domain.DownloadRecord">
         SELECT * FROM download_record WHERE user_id = #{userIdMax}
                                             and product_id = #{id}
-                                            and product_type = #{i}
+                                            and download_type = #{i}
+        limit 1
     </select>
 </mapper>