From 9b4f92beede93270a3596ac05d7fdb52367d789b Mon Sep 17 00:00:00 2001 From: Diyu0904 <1819728964@qq.com> Date: Fri, 21 Mar 2025 09:17:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BF=AE=E6=94=B9=E6=97=B6?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resource/MallProductController.java | 31 +++++++++--------- .../resource/WorkFlowController.java | 32 +++++++++---------- .../service/impl/ModelServiceImpl.java | 1 + 3 files changed, 31 insertions(+), 33 deletions(-) diff --git a/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/MallProductController.java b/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/MallProductController.java index 4d2bdfc..ba6bcd3 100644 --- a/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/MallProductController.java +++ b/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/MallProductController.java @@ -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(); diff --git a/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/WorkFlowController.java b/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/WorkFlowController.java index 6af5e3b..70a0824 100644 --- a/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/WorkFlowController.java +++ b/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/WorkFlowController.java @@ -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 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); 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 7448cbb..7c465c9 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 @@ -273,6 +273,7 @@ public class ModelServiceImpl extends ServiceImpl impl //校验是否实名 SysUser sysUser = sysUserService.selectUserInfoById(SecurityUtils.getUserId()); + log.info("查询到的个人数据:{}",sysUser); if (StringUtils.isEmpty(sysUser.getName())){ return R.fail(HttpStatus.SHOW_ERROR_MSG,"实名制后才可以发布");