|
@@ -1,5 +1,6 @@
|
|
|
package cn.cslg.pas.service.business;
|
|
|
|
|
|
+import cn.cslg.pas.common.dto.business.QueryTreeNodeDTO;
|
|
|
import cn.cslg.pas.common.dto.business.TreeNodeDTO;
|
|
|
import cn.cslg.pas.common.model.cronModel.*;
|
|
|
import cn.cslg.pas.common.model.request.GroupRequest;
|
|
@@ -33,6 +34,7 @@ import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
* 架构的Service层
|
|
|
+ *
|
|
|
* @Author xiexiang
|
|
|
* @Date 2023/10/26
|
|
|
*/
|
|
@@ -62,20 +64,36 @@ public class TreeNodeService extends ServiceImpl<TreeNodeMapper, TreeNode> imple
|
|
|
|
|
|
@Override
|
|
|
public Object queryMessage(QueryRequest queryRequest) throws Exception {
|
|
|
- List<String> sqls = formatQueryService.reSqls(queryRequest,"treeNode");
|
|
|
- //根据sql查询产品架构信息
|
|
|
- List<TreeNodeVO> treeNodeVOS = treeNodeMapper.getTreeNode(sqls.get(0),sqls.get(1),sqls.get(2));
|
|
|
- //装载产品类别信息
|
|
|
- this.loadTreeNode(treeNodeVOS);
|
|
|
- Records records = new Records();
|
|
|
- records.setCurrent(queryRequest.getCurrent());
|
|
|
- records.setSize(queryRequest.getSize());
|
|
|
- records.setData(treeNodeVOS);
|
|
|
-// records.setTotal(total);
|
|
|
- return records;
|
|
|
+
|
|
|
+ return null;
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
+ public Object queryMessage(QueryTreeNodeDTO queryTreeNodeDTO) throws Exception {
|
|
|
+ Integer type = queryTreeNodeDTO.getType();
|
|
|
+ Integer typeId = queryTreeNodeDTO.getTypeId();
|
|
|
+ Integer id = queryTreeNodeDTO.getId();
|
|
|
+ String name = queryTreeNodeDTO.getName();
|
|
|
+ //校验格式
|
|
|
+ if (type == null || typeId == null) {
|
|
|
+ throw new XiaoShiException("参数错误");
|
|
|
+ }
|
|
|
+ LambdaQueryWrapper<TreeNode> queryWrapper =new LambdaQueryWrapper<>();
|
|
|
+ queryWrapper.eq(TreeNode::getType,type)
|
|
|
+ .eq(TreeNode::getTypeId,typeId);
|
|
|
+ if(id!=null){
|
|
|
+ queryWrapper.eq(TreeNode::getId,id);
|
|
|
+ }
|
|
|
+ if(name!=null){
|
|
|
+ queryWrapper.like(TreeNode::getName,name);
|
|
|
+ }
|
|
|
+ List<TreeNode> treeNodes =new ArrayList<>();
|
|
|
+ return null;
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 新增架构
|
|
|
+ *
|
|
|
* @param object
|
|
|
* @param files
|
|
|
* @return
|
|
@@ -83,7 +101,7 @@ public class TreeNodeService extends ServiceImpl<TreeNodeMapper, TreeNode> imple
|
|
|
@Override
|
|
|
public Object addMessage(Object object, List<MultipartFile> files) {
|
|
|
//object to treeNode
|
|
|
- TreeNodeDTO treeNodeDTO = (TreeNodeDTO)object;
|
|
|
+ TreeNodeDTO treeNodeDTO = (TreeNodeDTO) object;
|
|
|
//检测名称是否规范
|
|
|
treeNodeDTO.setName(treeNodeDTO.getName().trim());
|
|
|
//根据名称查询是否重复
|
|
@@ -91,7 +109,7 @@ public class TreeNodeService extends ServiceImpl<TreeNodeMapper, TreeNode> imple
|
|
|
LambdaQueryWrapper<TreeNode> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
queryWrapper.eq(TreeNode::getName, name);
|
|
|
List<TreeNode> treeNodes = this.list(queryWrapper);
|
|
|
- if(treeNodes != null && treeNodes.size() != 0){
|
|
|
+ if (treeNodes != null && treeNodes.size() != 0) {
|
|
|
throw new XiaoShiException("参数错误");
|
|
|
}
|
|
|
//获取登录人信息
|
|
@@ -99,7 +117,7 @@ public class TreeNodeService extends ServiceImpl<TreeNodeMapper, TreeNode> imple
|
|
|
try {
|
|
|
personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
|
|
|
} catch (Exception e) {
|
|
|
- throw new UnLoginException("未登录");
|
|
|
+ throw new UnLoginException("未登录");
|
|
|
}
|
|
|
//赋值
|
|
|
TreeNode treeNode = new TreeNode();
|
|
@@ -107,20 +125,20 @@ public class TreeNodeService extends ServiceImpl<TreeNodeMapper, TreeNode> imple
|
|
|
treeNode.setCreateId(personnelVO.getId());
|
|
|
treeNode.insert();
|
|
|
//处理文件
|
|
|
- if(files != null && files.size() != 0){
|
|
|
+ if (files != null && files.size() != 0) {
|
|
|
try {
|
|
|
List<String> guids = fileManagerService.uploadFileGetGuid(files);
|
|
|
List<AssoTreeNodeFile> assoTreeNodeFiles = new ArrayList<>();
|
|
|
- for(String item:guids){
|
|
|
- AssoTreeNodeFile assoTreeNodeFile = new AssoTreeNodeFile();
|
|
|
- assoTreeNodeFile.setTreeNodeId(treeNode.getId());
|
|
|
- assoTreeNodeFile.setFileGuid(item);
|
|
|
- assoTreeNodeFile.setCreateId(personnelVO.getId());
|
|
|
- assoTreeNodeFiles.add(assoTreeNodeFile);
|
|
|
- }
|
|
|
- if(assoTreeNodeFiles != null && assoTreeNodeFiles.size() != 0){
|
|
|
- assoTreeNodeFileService.saveBatch(assoTreeNodeFiles);
|
|
|
- }
|
|
|
+ for (String item : guids) {
|
|
|
+ AssoTreeNodeFile assoTreeNodeFile = new AssoTreeNodeFile();
|
|
|
+ assoTreeNodeFile.setTreeNodeId(treeNode.getId());
|
|
|
+ assoTreeNodeFile.setFileGuid(item);
|
|
|
+ assoTreeNodeFile.setCreateId(personnelVO.getId());
|
|
|
+ assoTreeNodeFiles.add(assoTreeNodeFile);
|
|
|
+ }
|
|
|
+ if (assoTreeNodeFiles != null && assoTreeNodeFiles.size() != 0) {
|
|
|
+ assoTreeNodeFileService.saveBatch(assoTreeNodeFiles);
|
|
|
+ }
|
|
|
} catch (Exception e) {
|
|
|
|
|
|
}
|
|
@@ -131,6 +149,7 @@ public class TreeNodeService extends ServiceImpl<TreeNodeMapper, TreeNode> imple
|
|
|
|
|
|
/**
|
|
|
* 删除架构
|
|
|
+ *
|
|
|
* @param ids
|
|
|
* @return
|
|
|
*/
|
|
@@ -143,7 +162,7 @@ public class TreeNodeService extends ServiceImpl<TreeNodeMapper, TreeNode> imple
|
|
|
List<AssoTreeNodeFile> assoTreeNodeFiles = assoTreeNodeFileService.list(queryWrapper);
|
|
|
List<String> guids = assoTreeNodeFiles.stream().map(AssoTreeNodeFile::getFileGuid).collect(Collectors.toList());
|
|
|
//TODO 根据guids删除文件
|
|
|
- if(guids.size() != 0){
|
|
|
+ if (guids.size() != 0) {
|
|
|
fileManagerService.deleteFileFromFMS(guids);
|
|
|
}
|
|
|
//删除架构和文件关联表
|
|
@@ -155,6 +174,7 @@ public class TreeNodeService extends ServiceImpl<TreeNodeMapper, TreeNode> imple
|
|
|
|
|
|
/**
|
|
|
* 更新架构
|
|
|
+ *
|
|
|
* @param object
|
|
|
* @param files
|
|
|
* @return
|
|
@@ -162,7 +182,7 @@ public class TreeNodeService extends ServiceImpl<TreeNodeMapper, TreeNode> imple
|
|
|
@Override
|
|
|
public Object updateMessage(Object object, List<MultipartFile> files) {
|
|
|
//object to treeNode
|
|
|
- TreeNodeDTO treeNodeDTO = (TreeNodeDTO)object;
|
|
|
+ TreeNodeDTO treeNodeDTO = (TreeNodeDTO) object;
|
|
|
//获取登录人信息
|
|
|
PersonnelVO personnelVO;
|
|
|
try {
|
|
@@ -176,7 +196,7 @@ public class TreeNodeService extends ServiceImpl<TreeNodeMapper, TreeNode> imple
|
|
|
LambdaQueryWrapper<TreeNode> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
queryWrapper.eq(TreeNode::getName, name);
|
|
|
List<TreeNode> treeNodes = this.list(queryWrapper);
|
|
|
- if(treeNodes == null && treeNodes.size() == 0){
|
|
|
+ if (treeNodes == null && treeNodes.size() == 0) {
|
|
|
return null;
|
|
|
}
|
|
|
//赋值
|
|
@@ -186,11 +206,11 @@ public class TreeNodeService extends ServiceImpl<TreeNodeMapper, TreeNode> imple
|
|
|
//数据入表
|
|
|
treeNode.insert();
|
|
|
//处理文件
|
|
|
- if(files != null && files.size() != 0){
|
|
|
+ if (files != null && files.size() != 0) {
|
|
|
try {
|
|
|
List<String> guids = fileManagerService.uploadFileGetGuid(files);
|
|
|
List<AssoTreeNodeFile> assoTreeNodeFiles = new ArrayList<>();
|
|
|
- for(String item:guids){
|
|
|
+ for (String item : guids) {
|
|
|
AssoTreeNodeFile assoTreeNodeFile = new AssoTreeNodeFile();
|
|
|
assoTreeNodeFile.setTreeNodeId(treeNode.getId());
|
|
|
assoTreeNodeFile.setFileGuid(item);
|
|
@@ -198,7 +218,7 @@ public class TreeNodeService extends ServiceImpl<TreeNodeMapper, TreeNode> imple
|
|
|
assoTreeNodeFile.setCreateId(null);
|
|
|
assoTreeNodeFiles.add(assoTreeNodeFile);
|
|
|
}
|
|
|
- if(assoTreeNodeFiles != null && assoTreeNodeFiles.size() != 0){
|
|
|
+ if (assoTreeNodeFiles != null && assoTreeNodeFiles.size() != 0) {
|
|
|
assoTreeNodeFileService.saveBatch(assoTreeNodeFiles);
|
|
|
}
|
|
|
} catch (Exception e) {
|
|
@@ -210,7 +230,7 @@ public class TreeNodeService extends ServiceImpl<TreeNodeMapper, TreeNode> imple
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public GroupVO getGroup(GroupRequest groupRequest,String tableName) throws Exception {
|
|
|
+ public GroupVO getGroup(GroupRequest groupRequest, String tableName) throws Exception {
|
|
|
return null;
|
|
|
}
|
|
|
|
|
@@ -229,7 +249,7 @@ public class TreeNodeService extends ServiceImpl<TreeNodeMapper, TreeNode> imple
|
|
|
List<Integer> ids = new ArrayList<>();
|
|
|
treeNodeVOS.forEach(
|
|
|
item -> {
|
|
|
- if(item.getCreateId() != null){
|
|
|
+ if (item.getCreateId() != null) {
|
|
|
createIds.add(item.getCreateId());
|
|
|
}
|
|
|
if (item.getId() != null) {
|
|
@@ -267,15 +287,15 @@ public class TreeNodeService extends ServiceImpl<TreeNodeMapper, TreeNode> imple
|
|
|
}
|
|
|
|
|
|
//装载信息
|
|
|
- for(TreeNodeVO treeNodeVO:treeNodeVOS){
|
|
|
+ for (TreeNodeVO treeNodeVO : treeNodeVOS) {
|
|
|
//装载人员信息
|
|
|
Personnel personnel = personnels.stream().filter(item -> item.getGuid().equals(treeNodeVO.getCreateId())).findFirst().orElse(null);
|
|
|
- if(personnel != null){
|
|
|
+ if (personnel != null) {
|
|
|
treeNodeVO.setCreateName(personnel.getPersonnelName());
|
|
|
}
|
|
|
//装载文件信息
|
|
|
List<AssoTreeNodeFile> assoTreeNodeFilesTemp = assoTreeNodeFiles.stream().filter(item -> item.getTreeNodeId().equals(treeNodeVO.getId())).collect(Collectors.toList());
|
|
|
- if(assoTreeNodeFilesTemp.size() != 0){
|
|
|
+ if (assoTreeNodeFilesTemp.size() != 0) {
|
|
|
List<String> guidTemp = assoTreeNodeFilesTemp.stream().map(AssoTreeNodeFile::getFileGuid).collect(Collectors.toList());
|
|
|
if (guidTemp.size() != 0) {
|
|
|
List<SystemFile> systemFileTemp = systemFiles.stream().filter(item -> guidTemp.contains(item.getGuid())).collect(Collectors.toList());
|