Merge branch 'feature/admin' into preview
commit
96c68ed485
|
@ -41,7 +41,9 @@ import org.springframework.stereotype.Service;
|
|||
import java.util.*;
|
||||
|
||||
|
||||
/**模型 业务实现层
|
||||
/**
|
||||
* 模型 业务实现层
|
||||
*
|
||||
* @Author:ChenYan
|
||||
* @Project:McWl
|
||||
* @Package:com.mcwl.resource.service.impl
|
||||
|
@ -92,6 +94,7 @@ public class ModelServiceImpl extends ServiceImpl<ModelMapper,ModelProduct> impl
|
|||
public void setModelTop(Long id, boolean isTop) {
|
||||
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[] split = filePath.split(",");
|
||||
|
@ -329,13 +331,9 @@ public class ModelServiceImpl extends ServiceImpl<ModelMapper,ModelProduct> impl
|
|||
modelVersionMapper.addModelVersion(modelVersion);
|
||||
}
|
||||
|
||||
if (requestModel.getModelProduct().getIsOfficial() == 0){
|
||||
//执行审核方法
|
||||
audit(requestModel);
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
return R.ok("添加成功,等待审核");
|
||||
}
|
||||
|
@ -380,6 +378,7 @@ public class ModelServiceImpl extends ServiceImpl<ModelMapper,ModelProduct> impl
|
|||
audit(requestModel);
|
||||
|
||||
}
|
||||
|
||||
private void audit(RequestModel requestModel) {
|
||||
|
||||
// 执行审核操作
|
||||
|
@ -570,8 +569,6 @@ public class ModelServiceImpl extends ServiceImpl<ModelMapper,ModelProduct> impl
|
|||
}
|
||||
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
public R<ModelProduct> selectModelById(Long id) {
|
||||
//查询详情
|
||||
|
@ -612,6 +609,4 @@ public class ModelServiceImpl extends ServiceImpl<ModelMapper,ModelProduct> impl
|
|||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
|
@ -94,7 +94,6 @@ public class WorkFlowServiceImpl extends ServiceImpl<WorkFlowMapper, WorkFlow> i
|
|||
}
|
||||
|
||||
|
||||
|
||||
for (AddWorkFlowVersion addWorkFlowVersion : addRequestWorkFlo.getWorkFlowVersionList()) {
|
||||
|
||||
//校验名字
|
||||
|
@ -132,11 +131,7 @@ public class WorkFlowServiceImpl extends ServiceImpl<WorkFlowMapper, WorkFlow> i
|
|||
//批量添加版本
|
||||
workFlowVersionMapper.addWorkFlowVersion(requestWorkFlow.getWorkFlow(), addRequestWorkFlo.getWorkFlowVersionList());
|
||||
|
||||
//校验是否魔创未来官方发布
|
||||
if (addRequestWorkFlo.getWorkFlow().getIsOfficial() == 0){
|
||||
audit(requestWorkFlow);
|
||||
}
|
||||
|
||||
|
||||
|
||||
return R.ok();
|
||||
|
@ -570,5 +565,4 @@ public class WorkFlowServiceImpl extends ServiceImpl<WorkFlowMapper, WorkFlow> i
|
|||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue