|
@@ -1,18 +1,16 @@
|
|
|
package com.ruoyi.interfaces.controller;
|
|
package com.ruoyi.interfaces.controller;
|
|
|
|
|
|
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
|
|
|
+import java.util.HashMap;
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
|
|
|
|
|
import com.ruoyi.common.utils.StringUtils;
|
|
import com.ruoyi.common.utils.StringUtils;
|
|
|
-import com.ruoyi.interfaces.domain.MdModelFlow;
|
|
|
|
|
-import com.ruoyi.interfaces.domain.MdModelInfo;
|
|
|
|
|
-import com.ruoyi.interfaces.domain.PtService;
|
|
|
|
|
|
|
+import com.ruoyi.interfaces.domain.*;
|
|
|
import com.ruoyi.interfaces.domain.vo.MdModelInfoVo;
|
|
import com.ruoyi.interfaces.domain.vo.MdModelInfoVo;
|
|
|
-import com.ruoyi.interfaces.service.IMdModelFlowService;
|
|
|
|
|
-import com.ruoyi.interfaces.service.IMdModelInfoService;
|
|
|
|
|
-import com.ruoyi.interfaces.service.PtServiceService;
|
|
|
|
|
|
|
+import com.ruoyi.interfaces.mapper.PtServiceParamMapper;
|
|
|
|
|
+import com.ruoyi.interfaces.service.*;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.GetMapping;
|
|
import org.springframework.web.bind.annotation.GetMapping;
|
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
@@ -26,8 +24,6 @@ import com.ruoyi.common.annotation.Log;
|
|
|
import com.ruoyi.common.core.controller.BaseController;
|
|
import com.ruoyi.common.core.controller.BaseController;
|
|
|
import com.ruoyi.common.core.domain.AjaxResult;
|
|
import com.ruoyi.common.core.domain.AjaxResult;
|
|
|
import com.ruoyi.common.enums.BusinessType;
|
|
import com.ruoyi.common.enums.BusinessType;
|
|
|
-import com.ruoyi.interfaces.domain.PtTreeCate;
|
|
|
|
|
-import com.ruoyi.interfaces.service.IPtTreeCateService;
|
|
|
|
|
import com.ruoyi.common.utils.poi.ExcelUtil;
|
|
import com.ruoyi.common.utils.poi.ExcelUtil;
|
|
|
import com.ruoyi.common.core.page.TableDataInfo;
|
|
import com.ruoyi.common.core.page.TableDataInfo;
|
|
|
|
|
|
|
@@ -52,6 +48,16 @@ public class PtTreeCateController extends BaseController {
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private IMdModelFlowService mdModelFlowService;
|
|
private IMdModelFlowService mdModelFlowService;
|
|
|
|
|
|
|
|
|
|
+
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private PtServiceParamMapper ptServiceParamMapper;
|
|
|
|
|
+
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private PtServiceReturnService ptServiceReturnService;
|
|
|
|
|
+
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private PtServiceFileService ptServiceFileService;
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 查询树状目录列表
|
|
* 查询树状目录列表
|
|
|
*/
|
|
*/
|
|
@@ -93,6 +99,7 @@ public class PtTreeCateController extends BaseController {
|
|
|
return success(ptTreeCateService.buildDataTreeSelect(ptTreeCates));
|
|
return success(ptTreeCateService.buildDataTreeSelect(ptTreeCates));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 构建模型流程图树状列表
|
|
* 构建模型流程图树状列表
|
|
|
*
|
|
*
|
|
@@ -111,9 +118,12 @@ public class PtTreeCateController extends BaseController {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
List<MdModelFlow> mdModelFlows = mdModelFlowService.selectMdModelFlowList(new MdModelFlow());
|
|
List<MdModelFlow> mdModelFlows = mdModelFlowService.selectMdModelFlowList(new MdModelFlow());
|
|
|
|
|
+
|
|
|
for (MdModelFlow mdModelFlow : mdModelFlows) {
|
|
for (MdModelFlow mdModelFlow : mdModelFlows) {
|
|
|
if (StringUtils.isNotNull(mdModelFlow.getMdid()) && StringUtils.isNotNull(mdModelFlow.getFlowId())
|
|
if (StringUtils.isNotNull(mdModelFlow.getMdid()) && StringUtils.isNotNull(mdModelFlow.getFlowId())
|
|
|
&& StringUtils.isNotNull(mdModelFlow.getFlowName())) {
|
|
&& StringUtils.isNotNull(mdModelFlow.getFlowName())) {
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
ptTreeCates.add(new PtTreeCate(mdModelFlow.getFlowId().toString(), mdModelFlow.getMdid(), mdModelFlow.getFlowName(), "FLOW"));
|
|
ptTreeCates.add(new PtTreeCate(mdModelFlow.getFlowId().toString(), mdModelFlow.getMdid(), mdModelFlow.getFlowName(), "FLOW"));
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -179,7 +189,18 @@ public class PtTreeCateController extends BaseController {
|
|
|
if (StringUtils.isNotNull(ptService.getSrvId()) &&
|
|
if (StringUtils.isNotNull(ptService.getSrvId()) &&
|
|
|
StringUtils.isNotNull(ptService.getMdid()) &&
|
|
StringUtils.isNotNull(ptService.getMdid()) &&
|
|
|
StringUtils.isNotNull(ptService.getName())) {
|
|
StringUtils.isNotNull(ptService.getName())) {
|
|
|
- ptTreeCates.add(new PtTreeCate(ptService.getSrvId(), ptService.getMdid(), ptService.getName(), "SERVICE",ptService));
|
|
|
|
|
|
|
+ HashMap<String,Object> dataMap = new HashMap<>();
|
|
|
|
|
+
|
|
|
|
|
+ List<PtServiceParam> list = ptServiceParamMapper.selectAll(ptService.getSrvId());
|
|
|
|
|
+ List<PtServiceReturn> returnList = ptServiceReturnService.listBysrvId(ptService.getSrvId());
|
|
|
|
|
+ List<PtServiceFile> fileList = ptServiceFileService.selectAll(ptService.getSrvId());
|
|
|
|
|
+ dataMap.put("ptService", ptService);
|
|
|
|
|
+ dataMap.put("list", list);
|
|
|
|
|
+ dataMap.put("returnList", returnList);
|
|
|
|
|
+ dataMap.put("fileList", fileList);
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+ ptTreeCates.add(new PtTreeCate(ptService.getSrvId(), ptService.getMdid(), ptService.getName(), "SERVICE",dataMap));
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|