删除修改时校验文件
parent
d0238c2320
commit
9b4f92beed
|
@ -2,7 +2,6 @@ package com.mcwl.web.controller.resource;
|
|||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.mcwl.common.constant.HttpStatus;
|
||||
import com.mcwl.common.core.controller.BaseController;
|
||||
import com.mcwl.common.core.domain.AjaxResult;
|
||||
import com.mcwl.common.core.domain.R;
|
||||
|
@ -97,21 +96,21 @@ public class MallProductController extends BaseController {
|
|||
public AjaxResult updateModel(@RequestBody RequestModel requestModel) {
|
||||
|
||||
|
||||
for (ModelVersion modelVersion : requestModel.getModelVersionList()) {
|
||||
|
||||
//校验名字
|
||||
ModelVersion modelVersion1 = modelVersionMapper.selectByFileName(modelVersion.getFileName());
|
||||
if (modelVersion1 != null) {
|
||||
|
||||
return AjaxResult.error(HttpStatus.SHOW_ERROR_MSG,"文件名字重复");
|
||||
}
|
||||
//校验hash
|
||||
ModelVersion modelVersion2 = modelVersionMapper.selectByHash(modelVersion.getFileHash());
|
||||
if (modelVersion2 != null){
|
||||
|
||||
return AjaxResult.error(HttpStatus.SHOW_ERROR_MSG,"文件内容重复");
|
||||
}
|
||||
}
|
||||
// for (ModelVersion modelVersion : requestModel.getModelVersionList()) {
|
||||
//
|
||||
// //校验名字
|
||||
// ModelVersion modelVersion1 = modelVersionMapper.selectByFileName(modelVersion.getFileName());
|
||||
// if (modelVersion1 != null) {
|
||||
//
|
||||
// return AjaxResult.error(HttpStatus.SHOW_ERROR_MSG,"文件名字重复");
|
||||
// }
|
||||
// //校验hash
|
||||
// ModelVersion modelVersion2 = modelVersionMapper.selectByHash(modelVersion.getFileHash());
|
||||
// if (modelVersion2 != null){
|
||||
//
|
||||
// return AjaxResult.error(HttpStatus.SHOW_ERROR_MSG,"文件内容重复");
|
||||
// }
|
||||
// }
|
||||
|
||||
ModelProduct modelProduct = requestModel.getModelProduct();
|
||||
|
||||
|
|
|
@ -2,11 +2,9 @@ package com.mcwl.web.controller.resource;
|
|||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.mcwl.common.constant.HttpStatus;
|
||||
import com.mcwl.common.core.controller.BaseController;
|
||||
import com.mcwl.common.core.domain.R;
|
||||
import com.mcwl.resource.domain.WorkFlow;
|
||||
import com.mcwl.resource.domain.WorkFlowVersion;
|
||||
import com.mcwl.resource.domain.dto.AddRequestWorkFlow;
|
||||
import com.mcwl.resource.domain.request.RequestWorkFlow;
|
||||
import com.mcwl.resource.domain.response.ResponseWorkFlow;
|
||||
|
@ -101,21 +99,21 @@ public class WorkFlowController extends BaseController {
|
|||
public R<Object> updateWorkFlow(@RequestBody RequestWorkFlow requestWorkFlow) {
|
||||
|
||||
|
||||
for (WorkFlowVersion workFlowVersion : requestWorkFlow.getWorkFlowVersionList()) {
|
||||
|
||||
//校验名字
|
||||
WorkFlowVersion workFlowVersion1 = workFlowVersionMapper.selectByFileName(workFlowVersion.getFileName());
|
||||
if (workFlowVersion1 != null) {
|
||||
|
||||
return R.fail(HttpStatus.SHOW_ERROR_MSG,"文件名字重复");
|
||||
}
|
||||
//校验hash
|
||||
WorkFlowVersion workFlowVersion2 = workFlowVersionMapper.selectByHash(workFlowVersion.getFileHash());
|
||||
if (workFlowVersion2 != null){
|
||||
|
||||
return R.fail(HttpStatus.SHOW_ERROR_MSG,"文件内容重复");
|
||||
}
|
||||
}
|
||||
// for (WorkFlowVersion workFlowVersion : requestWorkFlow.getWorkFlowVersionList()) {
|
||||
//
|
||||
// //校验名字
|
||||
// WorkFlowVersion workFlowVersion1 = workFlowVersionMapper.selectByFileName(workFlowVersion.getFileName());
|
||||
// if (workFlowVersion1 != null) {
|
||||
//
|
||||
// return R.fail(HttpStatus.SHOW_ERROR_MSG,"文件名字重复");
|
||||
// }
|
||||
// //校验hash
|
||||
// WorkFlowVersion workFlowVersion2 = workFlowVersionMapper.selectByHash(workFlowVersion.getFileHash());
|
||||
// if (workFlowVersion2 != null){
|
||||
//
|
||||
// return R.fail(HttpStatus.SHOW_ERROR_MSG,"文件内容重复");
|
||||
// }
|
||||
// }
|
||||
|
||||
workFlowService.updateWorkFlow(requestWorkFlow);
|
||||
|
||||
|
|
|
@ -273,6 +273,7 @@ public class ModelServiceImpl extends ServiceImpl<ModelMapper,ModelProduct> impl
|
|||
|
||||
//校验是否实名
|
||||
SysUser sysUser = sysUserService.selectUserInfoById(SecurityUtils.getUserId());
|
||||
log.info("查询到的个人数据:{}",sysUser);
|
||||
if (StringUtils.isEmpty(sysUser.getName())){
|
||||
|
||||
return R.fail(HttpStatus.SHOW_ERROR_MSG,"实名制后才可以发布");
|
||||
|
|
Loading…
Reference in New Issue