Merge remote-tracking branch 'origin/preview' into preview

# Conflicts:
#	mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelServiceImpl.java

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

@@ -1,12 +1,10 @@
 package com.mcwl.web.controller.resource;
 
-import com.mcwl.common.constant.DictConstants;
 import com.mcwl.common.core.controller.BaseController;
 import com.mcwl.common.core.domain.AjaxResult;
 import com.mcwl.common.core.page.TableDataInfo;
 import com.mcwl.resource.domain.ModelVersion;
 import com.mcwl.resource.service.ModelVersionService;
-import com.mcwl.system.init.DictInit;
 import com.mcwl.web.controller.common.OssUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -14,7 +12,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /** 模型版本
@@ -104,21 +101,12 @@ public class ModelVersionController  extends BaseController {
 
 
     @ApiOperation(value = "模型版本详情")
-    @PostMapping("finbyid")
+    @GetMapping("finbyid")
-    public AjaxResult finbyid(@RequestBody ModelVersion modelVersion)
+    public AjaxResult finbyid(@RequestParam Long id)
     {
 
 
-        ModelVersion modelVersion1 = modelVersionService.getById(modelVersion.getId());
+        ModelVersion modelVersion1 = modelVersionService.getById(id);
-
-        ArrayList<String> arrayList = new ArrayList<>();
-
-        //获取
-        String[] split = modelVersion1.getHigh().split(",");
-
-        for (String s : split) {
-            arrayList.add(DictInit.getDictValue(DictConstants.DICT_TYPE_MODEL_VERSION_HIGH,s));
-        }
 
         return AjaxResult.success(modelVersion1);
     }

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

@@ -110,10 +110,9 @@ public class ModelImage extends BaseEntity {
     @ApiModelProperty(value = "是否置顶")
     private Integer isTop;
 
-
     /**
-     * 审核（1公开 2自见）
+     * 审核失败原因
      */
-    @ApiModelProperty(value = "审核（1公开 2自见）")
+    @ApiModelProperty(value = "审核失败原因")
-    private Integer jurisdiction;
+    private String auditText;
 }

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

@@ -95,10 +95,10 @@ public class ModelVersion  extends BaseEntity {
     @ApiModelProperty(value = "是否公开")
     private Integer isPublic;
     /**
-     * 是否加密
+     * 是否加密(0不加密 1加密)
      */
     @ApiModelProperty(value = "是否加密")
-    private String isEncrypt;
+    private Integer isEncrypt;
     /**
      * 是否在线使用
      */

mcwl-resource/src/main/java/com/mcwl/resource/domain/dto/ModelImageRes.java

@@ -2,7 +2,6 @@ package com.mcwl.resource.domain.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Builder;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;

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

@@ -7,19 +7,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.mcwl.common.constant.DictConstants;
 import com.mcwl.common.constant.HttpStatus;
-import com.mcwl.common.core.domain.entity.SysDictData;
 import com.mcwl.common.core.domain.entity.SysUser;
-import com.mcwl.common.core.page.PageDomain;
 import com.mcwl.common.core.page.TableDataInfo;
 import com.mcwl.common.utils.SecurityUtils;
 import com.mcwl.common.utils.StringUtils;
 import com.mcwl.resource.domain.ModelImage;
-import com.mcwl.resource.domain.ModelImageComment;
-import com.mcwl.resource.domain.ModelProduct;
-import com.mcwl.resource.domain.dto.ModelImageCommentRes;
 import com.mcwl.resource.domain.dto.ModelImagePageRes;
 import com.mcwl.resource.domain.dto.ModelImageRes;
-import com.mcwl.resource.domain.vo.ModelImageCommentVo;
 import com.mcwl.resource.domain.vo.ModelImageVo;
 import com.mcwl.resource.mapper.ModelImageCommentMapper;
 import com.mcwl.resource.mapper.ModelImageMapper;
@@ -30,9 +24,7 @@ import com.mcwl.system.service.ISysUserService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
-import javax.validation.constraints.NotNull;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 

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

@@ -211,7 +211,6 @@ public class WorkFlowServiceImpl extends ServiceImpl<WorkFlowMapper, WorkFlow> i
                             }else {
                                 workFlowVersionMapper.updateByName(workFlowVersion);
                             }
-                            workFlowVersionMapper.updateByName(workFlowVersion);
                             log.info("图片审核未通过");
                             break;
                         }