Compare commits
No commits in common. "96c68ed48557174320b6feab30413f69accbe1af" and "0eca5db85472e491da9ffac6ccac1c01c7ab3acb" have entirely different histories.
96c68ed485
...
0eca5db854
|
@ -41,9 +41,7 @@ import org.springframework.stereotype.Service;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**模型 业务实现层
|
||||||
* 模型 业务实现层
|
|
||||||
*
|
|
||||||
* @Author:ChenYan
|
* @Author:ChenYan
|
||||||
* @Project:McWl
|
* @Project:McWl
|
||||||
* @Package:com.mcwl.resource.service.impl
|
* @Package:com.mcwl.resource.service.impl
|
||||||
|
@ -94,7 +92,6 @@ public class ModelServiceImpl extends ServiceImpl<ModelMapper, ModelProduct> imp
|
||||||
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);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取模型列表
|
* 获取模型列表
|
||||||
*
|
*
|
||||||
|
@ -311,6 +308,7 @@ public class ModelServiceImpl extends ServiceImpl<ModelMapper, ModelProduct> imp
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//获取封面图
|
//获取封面图
|
||||||
String filePath = requestModel.getModelVersionList().get(0).getSampleImagePaths();
|
String filePath = requestModel.getModelVersionList().get(0).getSampleImagePaths();
|
||||||
String[] split = filePath.split(",");
|
String[] split = filePath.split(",");
|
||||||
|
@ -331,9 +329,13 @@ public class ModelServiceImpl extends ServiceImpl<ModelMapper, ModelProduct> imp
|
||||||
modelVersionMapper.addModelVersion(modelVersion);
|
modelVersionMapper.addModelVersion(modelVersion);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (requestModel.getModelProduct().getIsOfficial() == 0){
|
||||||
//执行审核方法
|
//执行审核方法
|
||||||
audit(requestModel);
|
audit(requestModel);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
return R.ok("添加成功,等待审核");
|
return R.ok("添加成功,等待审核");
|
||||||
}
|
}
|
||||||
|
@ -378,7 +380,6 @@ public class ModelServiceImpl extends ServiceImpl<ModelMapper, ModelProduct> imp
|
||||||
audit(requestModel);
|
audit(requestModel);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void audit(RequestModel requestModel) {
|
private void audit(RequestModel requestModel) {
|
||||||
|
|
||||||
// 执行审核操作
|
// 执行审核操作
|
||||||
|
@ -569,6 +570,8 @@ public class ModelServiceImpl extends ServiceImpl<ModelMapper, ModelProduct> imp
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public R<ModelProduct> selectModelById(Long id) {
|
public R<ModelProduct> selectModelById(Long id) {
|
||||||
//查询详情
|
//查询详情
|
||||||
|
@ -609,4 +612,6 @@ public class ModelServiceImpl extends ServiceImpl<ModelMapper, ModelProduct> imp
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -94,6 +94,7 @@ public class WorkFlowServiceImpl extends ServiceImpl<WorkFlowMapper, WorkFlow> i
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
for (AddWorkFlowVersion addWorkFlowVersion : addRequestWorkFlo.getWorkFlowVersionList()) {
|
for (AddWorkFlowVersion addWorkFlowVersion : addRequestWorkFlo.getWorkFlowVersionList()) {
|
||||||
|
|
||||||
//校验名字
|
//校验名字
|
||||||
|
@ -131,7 +132,11 @@ 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();
|
||||||
|
@ -565,4 +570,5 @@ public class WorkFlowServiceImpl extends ServiceImpl<WorkFlowMapper, WorkFlow> i
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue