Merge branch 'feature/admin' into preview

feature/community-center
Diyu0904 2025-05-28 15:08:12 +08:00
commit 96c68ed485
2 changed files with 80 additions and 91 deletions

View File

@ -41,7 +41,9 @@ import org.springframework.stereotype.Service;
import java.util.*; import java.util.*;
/** /**
*
*
* @AuthorChenYan * @AuthorChenYan
* @ProjectMcWl * @ProjectMcWl
* @Packagecom.mcwl.resource.service.impl * @Packagecom.mcwl.resource.service.impl
@ -92,6 +94,7 @@ public class ModelServiceImpl extends ServiceImpl<ModelMapper,ModelProduct> impl
public void setModelTop(Long id, boolean isTop) { public void setModelTop(Long id, boolean isTop) {
postMapper.updateTopStatus(id, isTop ? 1 : 0); postMapper.updateTopStatus(id, isTop ? 1 : 0);
} }
/** /**
* *
* *
@ -308,7 +311,6 @@ public class ModelServiceImpl extends ServiceImpl<ModelMapper,ModelProduct> impl
} }
//获取封面图 //获取封面图
String filePath = requestModel.getModelVersionList().get(0).getSampleImagePaths(); String filePath = requestModel.getModelVersionList().get(0).getSampleImagePaths();
String[] split = filePath.split(","); String[] split = filePath.split(",");
@ -329,13 +331,9 @@ public class ModelServiceImpl extends ServiceImpl<ModelMapper,ModelProduct> impl
modelVersionMapper.addModelVersion(modelVersion); modelVersionMapper.addModelVersion(modelVersion);
} }
if (requestModel.getModelProduct().getIsOfficial() == 0){
//执行审核方法 //执行审核方法
audit(requestModel); audit(requestModel);
}
return R.ok("添加成功,等待审核"); return R.ok("添加成功,等待审核");
} }
@ -380,6 +378,7 @@ public class ModelServiceImpl extends ServiceImpl<ModelMapper,ModelProduct> impl
audit(requestModel); audit(requestModel);
} }
private void audit(RequestModel requestModel) { private void audit(RequestModel requestModel) {
// 执行审核操作 // 执行审核操作
@ -570,8 +569,6 @@ public class ModelServiceImpl extends ServiceImpl<ModelMapper,ModelProduct> impl
} }
@Override @Override
public R<ModelProduct> selectModelById(Long id) { public R<ModelProduct> selectModelById(Long id) {
//查询详情 //查询详情
@ -612,6 +609,4 @@ public class ModelServiceImpl extends ServiceImpl<ModelMapper,ModelProduct> impl
} }
} }

View File

@ -94,7 +94,6 @@ public class WorkFlowServiceImpl extends ServiceImpl<WorkFlowMapper, WorkFlow> i
} }
for (AddWorkFlowVersion addWorkFlowVersion : addRequestWorkFlo.getWorkFlowVersionList()) { for (AddWorkFlowVersion addWorkFlowVersion : addRequestWorkFlo.getWorkFlowVersionList()) {
//校验名字 //校验名字
@ -132,11 +131,7 @@ public class WorkFlowServiceImpl extends ServiceImpl<WorkFlowMapper, WorkFlow> i
//批量添加版本 //批量添加版本
workFlowVersionMapper.addWorkFlowVersion(requestWorkFlow.getWorkFlow(), addRequestWorkFlo.getWorkFlowVersionList()); workFlowVersionMapper.addWorkFlowVersion(requestWorkFlow.getWorkFlow(), addRequestWorkFlo.getWorkFlowVersionList());
//校验是否魔创未来官方发布
if (addRequestWorkFlo.getWorkFlow().getIsOfficial() == 0){
audit(requestWorkFlow); audit(requestWorkFlow);
}
return R.ok(); return R.ok();
@ -570,5 +565,4 @@ public class WorkFlowServiceImpl extends ServiceImpl<WorkFlowMapper, WorkFlow> i
} }
} }