|
@@ -28,7 +28,7 @@ import java.util.UUID;
|
|
|
|
|
|
/**
|
|
/**
|
|
* <p>
|
|
* <p>
|
|
- * 服务实现类
|
|
|
|
|
|
+ * 服务实现类
|
|
* </p>
|
|
* </p>
|
|
*
|
|
*
|
|
* @author 吴涛涛
|
|
* @author 吴涛涛
|
|
@@ -46,10 +46,10 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
|
|
ProjectOperationDynamicsMapper projectOperationDynamicsMapper;
|
|
ProjectOperationDynamicsMapper projectOperationDynamicsMapper;
|
|
|
|
|
|
@Override
|
|
@Override
|
|
- public HttpRespMsg addFile(UserVO userVO,Integer blongType, MultipartFile file, String path) {
|
|
|
|
|
|
+ public HttpRespMsg addFile(UserVO userVO, Integer blongType, MultipartFile file, String path) {
|
|
HttpRespMsg msg = new HttpRespMsg();
|
|
HttpRespMsg msg = new HttpRespMsg();
|
|
User user = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", userVO.getToken()));
|
|
User user = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", userVO.getToken()));
|
|
- if(user != null){
|
|
|
|
|
|
+ if (user != null) {
|
|
if (file != null && !file.isEmpty()) {
|
|
if (file != null && !file.isEmpty()) {
|
|
MouldFile projectFile = new MouldFile();
|
|
MouldFile projectFile = new MouldFile();
|
|
projectFile.setUplodtorId(user.getId());
|
|
projectFile.setUplodtorId(user.getId());
|
|
@@ -72,7 +72,7 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
|
|
String sufix = fileName.substring(pos);
|
|
String sufix = fileName.substring(pos);
|
|
fileName = rand + sufix;
|
|
fileName = rand + sufix;
|
|
projectFile.setFileType(sufix);//文件后缀
|
|
projectFile.setFileType(sufix);//文件后缀
|
|
- projectFile.setFileUrl("/upload/"+fileName);
|
|
|
|
|
|
+ projectFile.setFileUrl("/upload/" + fileName);
|
|
projectFile.setBlongType(0);
|
|
projectFile.setBlongType(0);
|
|
if (user.getSubordinateType() == 0) {
|
|
if (user.getSubordinateType() == 0) {
|
|
//上传人为资产方,自动审核通过
|
|
//上传人为资产方,自动审核通过
|
|
@@ -107,7 +107,7 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
|
|
}
|
|
}
|
|
msg.data = projectFile;
|
|
msg.data = projectFile;
|
|
}
|
|
}
|
|
- }else{
|
|
|
|
|
|
+ } else {
|
|
msg.setError("当前用户不存在或者未登录");
|
|
msg.setError("当前用户不存在或者未登录");
|
|
}
|
|
}
|
|
return msg;
|
|
return msg;
|
|
@@ -120,7 +120,7 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
|
|
MouldFile mf = new MouldFile();
|
|
MouldFile mf = new MouldFile();
|
|
mf.setId(mouldFileId);
|
|
mf.setId(mouldFileId);
|
|
MouldFile oldData = mouldFileMapper.selectById(mouldFileId);
|
|
MouldFile oldData = mouldFileMapper.selectById(mouldFileId);
|
|
- if(user != null){
|
|
|
|
|
|
+ if (user != null) {
|
|
if (user.getSubordinateType() == 0) {
|
|
if (user.getSubordinateType() == 0) {
|
|
//资产方
|
|
//资产方
|
|
if (isPass == 1) {
|
|
if (isPass == 1) {
|
|
@@ -158,14 +158,14 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
|
|
public HttpRespMsg dowloadFile(MouldFile projectFile, String token) {
|
|
public HttpRespMsg dowloadFile(MouldFile projectFile, String token) {
|
|
HttpRespMsg msg = new HttpRespMsg();
|
|
HttpRespMsg msg = new HttpRespMsg();
|
|
User user = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", token));
|
|
User user = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", token));
|
|
- return null;
|
|
|
|
|
|
+ return msg;
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public HttpRespMsg getAllFileList(int mouldId, UserVO userVO) {
|
|
public HttpRespMsg getAllFileList(int mouldId, UserVO userVO) {
|
|
List<HashMap> dataList = new ArrayList<HashMap>();
|
|
List<HashMap> dataList = new ArrayList<HashMap>();
|
|
int maxBlongType = 5;
|
|
int maxBlongType = 5;
|
|
- for (int i=0;i<=maxBlongType; i++) {
|
|
|
|
|
|
+ for (int i = 0; i <= maxBlongType; i++) {
|
|
HashMap<String, Object> data = new HashMap<>();
|
|
HashMap<String, Object> data = new HashMap<>();
|
|
data.put("blongType", i);
|
|
data.put("blongType", i);
|
|
List<MouldFile> list = mouldFileMapper.selectList(new QueryWrapper<MouldFile>().eq("model_id", mouldId).eq("blong_type", i).orderByDesc("id"));
|
|
List<MouldFile> list = mouldFileMapper.selectList(new QueryWrapper<MouldFile>().eq("model_id", mouldId).eq("blong_type", i).orderByDesc("id"));
|
|
@@ -178,7 +178,7 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
- public HttpRespMsg getFileList(int mouldId,Integer blongType, UserVO userVO) {
|
|
|
|
|
|
+ public HttpRespMsg getFileList(int mouldId, Integer blongType, UserVO userVO) {
|
|
HttpRespMsg msg = new HttpRespMsg();
|
|
HttpRespMsg msg = new HttpRespMsg();
|
|
User user = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", userVO.getToken()));
|
|
User user = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", userVO.getToken()));
|
|
List<MouldFile> list = mouldFileMapper.selectList(new QueryWrapper<MouldFile>().eq("model_id", mouldId).eq("blong_type", blongType).orderByDesc("id"));
|
|
List<MouldFile> list = mouldFileMapper.selectList(new QueryWrapper<MouldFile>().eq("model_id", mouldId).eq("blong_type", blongType).orderByDesc("id"));
|