Skip to content

O
operation-control-platform
Commit 65535957 authored by 王锦盛's avatar 王锦盛
Browse files
Options

需求修改test4

parent f1b87d85
Hide whitespace changes
Inline Side-by-side
Showing with 472 additions and 67 deletions
pom.xml
View file @ 65535957
......@@ -179,6 +179,13 @@
<version>${knife4j-ui.version}</version>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>dynamic-datasource-spring-boot-starter</artifactId>
<version>3.1.0</version>
</dependency>
</dependencies>
<profiles>
......
src/main/java/com/pms/ocp/biz/BizModelRequirementInfoService.java
View file @ 65535957
......@@ -81,7 +81,7 @@ public interface BizModelRequirementInfoService {
* @param
* @return
*/
PageInfo<ModelPropertyVersionRequirementVO> getModelPropertyRequirementInfoList(String requirementCode, String modelCode, int currentPage, int pageSize);
PageInfo<ModelPropertyVersionRequirementVO> getModelPropertyRequirementInfoList(String requirementCode, String modelCode, String columnName, int currentPage, int pageSize);
/**
* 获取模型需求
......
src/main/java/com/pms/ocp/biz/impl/BizModelRequirementInfoServiceImpl.java
View file @ 65535957
......@@ -16,12 +16,9 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
/**
* @Auther: wangjian
......@@ -54,9 +51,6 @@ public class BizModelRequirementInfoServiceImpl implements BizModelRequirementIn
/**
* 根据时间戳生成唯一id
*/
// SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSSS");
// String id = sdf.format(System.currentTimeMillis());
//id:202010221400070793
modelVersionRequirementDTO.setRequirementCode("MR-" + System.currentTimeMillis());
......@@ -69,7 +63,7 @@ public class BizModelRequirementInfoServiceImpl implements BizModelRequirementIn
// 需求审批信息创建
ModelRequirementApproval modelRequirementApproval = new ModelRequirementApproval();
modelRequirementApproval.setRequirementCode(modelVersionRequirementDTO.getRequirementCode());
modelRequirementApproval.setApprovalStatus(0);
modelRequirementApproval.setApprovalStats(0);
// 校验是否模型名称重复
ModelBaseVersion modelBaseVersion1 = modelBaseVersionService.getModelBaseVersion(modelVersionRequirementDTO.getObjId(), modelVersionRequirementDTO.getModelCode(), modelVersionRequirementDTO.getModelName());
......@@ -134,16 +128,18 @@ public class BizModelRequirementInfoServiceImpl implements BizModelRequirementIn
@Transactional
@Override
public Integer updateModelPropertyRequirementInfo(ModelPropertyVersionRequirementDTO modelPropertyVersionRequirementDTO) {
ModelRequirement modelRequirement = new ModelRequirement();
BeanUtils.copyProperties(modelPropertyVersionRequirementDTO, modelRequirement);
modelRequirement.setMtime(LocalDateTime.now());
// ModelRequirement modelRequirement = new ModelRequirement();
// BeanUtils.copyProperties(modelPropertyVersionRequirementDTO, modelRequirement);
// modelRequirement.setMtime(LocalDateTime.now());
ModelPropertyVersion modelPropertyVersion = new ModelPropertyVersion();
BeanUtils.copyProperties(modelPropertyVersionRequirementDTO, modelPropertyVersion);
modelPropertyVersion.setPropMtime(LocalDateTime.now());
modelPropertyVersionService.updateModelPropertyVersion(modelPropertyVersion);
modelRequirementService.updateModelRequirement(modelRequirement);
// modelRequirementService.updateModelRequirement(modelRequirement);
return 1;
}
......@@ -151,16 +147,11 @@ public class BizModelRequirementInfoServiceImpl implements BizModelRequirementIn
@Override
public Integer deleteModelRequirementInfo(String objId, String requirementCode, String modelCode) {
modelRequirementService.deleteModelRequirement(objId, requirementCode);
modelPropertyVersionService.deleteModelPropertyVersion(requirementCode, modelCode, null);
modelBaseVersionService.deleteModelBaseVersion(requirementCode, modelCode);
modelRequirementApprovalService.deleteModelRequirementApproval(null, requirementCode);
if (StringUtils.isNotEmpty(requirementCode)) {
modelBaseVersionService.deleteModelBaseVersion(requirementCode, modelCode);
modelPropertyVersionService.deleteModelPropertyVersion(requirementCode, modelCode, null);
}
modelRequirementService.deleteModelRequirement(objId, requirementCode);
return 1;
}
......@@ -203,10 +194,10 @@ public class BizModelRequirementInfoServiceImpl implements BizModelRequirementIn
}
@Override
public PageInfo<ModelPropertyVersionRequirementVO> getModelPropertyRequirementInfoList(String requirementCode, String modelCode, int currentPage, int pageSize) {
public PageInfo<ModelPropertyVersionRequirementVO> getModelPropertyRequirementInfoList(String requirementCode, String modelCode, String columnName, int currentPage, int pageSize) {
PageHelper.startPage(currentPage, pageSize);
List<ModelPropertyVersionRequirementVO> modelPropertyVersionRequirementVOList = modelRequirementService.getModelPropertyRequirementList(requirementCode, modelCode);
List<ModelPropertyVersionRequirementVO> modelPropertyVersionRequirementVOList = modelRequirementService.getModelPropertyRequirementList(requirementCode, modelCode, columnName);
PageInfo<ModelPropertyVersionRequirementVO> pageInfo = new PageInfo<>(modelPropertyVersionRequirementVOList);
return pageInfo;
......
src/main/java/com/pms/ocp/common/DataProcessUtil.java 0 → 100644
View file @ 65535957
//package com.pms.ocp.common;
//
//import com.pms.ocp.mapper.ModelRelationMapper;
//import com.pms.ocp.model.entity.ModelRelation;
//import com.pms.ocp.model.vo.ModelRelationInputMultiVO;
//import org.slf4j.Logger;
//import org.slf4j.LoggerFactory;
//import org.springframework.stereotype.Component;
//
//import java.util.List;
//
///**
// * @Auther: wangjian
// * @Date: 2022/4/12 14:28
// * @Description:
// */
//
//@Component
//public class DataProcessUtil {
//
// private static final Logger logger = LoggerFactory.getLogger(DataProcessUtil.class);
//
// /**
// * 生成单根树结构
// *
// * @param modelRelationMapper 数据查询Mapper
// * @param modelCode 区域id
// * @return 单根树
// */
// public ModelRelation recursiveTree(ModelRelationMapper modelRelationMapper, String modelCode) {
// /**
// * 查询：父节点
// */
// ModelRelation fatherNode = modelRelationMapper.queryRegionById(modelCode);
//
// /**
// * 查询：子节点
// */
// List<ModelRelation> childNodeList = modelRelationMapper.queryRegionByParentId(modelCode);
//
// for (ModelRelation child : childNodeList) {
// ModelRelation childNode = recursiveTree(modelRelationMapper, child.getModelCode());
//// fatherNode.getModelRelationList().add(childNode);
// }
// logger.info("区域树：{}", fatherNode);
// return fatherNode;
// }
//
// /**
// * 生成多根树结构
// *
// * @param modelRelationMapper
// * @param regionInputMultiVO
// * @return 多根数
// */
// public List<ModelRelation> recursiveTreeList(ModelRelationMapper modelRelationMapper, ModelRelationInputMultiVO regionInputMultiVO) {
// List<ModelRelation> regionTreeOutputVOS = modelRelationMapper.queryRegionByRegionIdList(regionInputMultiVO);
// for (ModelRelation modelRelation : regionTreeOutputVOS) {
// ModelRelation child = recursiveTree(modelRelationMapper, modelRelation.getModelCode());
// modelRelation.getModelRelationList().add(child);
// }
// return regionTreeOutputVOS;
// }
//
//}
src/main/java/com/pms/ocp/controller/ModelBaseController.java
View file @ 65535957
......@@ -9,9 +9,11 @@ import com.pms.ocp.model.dto.ModelRelationDTO;
import com.pms.ocp.model.dto.ModelSubscribeDTO;
import com.pms.ocp.model.entity.Model;
import com.pms.ocp.model.entity.ModelAudit;
import com.pms.ocp.model.entity.ModelRelation;
import com.pms.ocp.model.entity.ModelSubscribe;
import com.pms.ocp.model.vo.ModelAuditVO;
import com.pms.ocp.model.vo.ModelPropertyVO;
import com.pms.ocp.model.vo.ModelRelationInputMultiVO;
import com.pms.ocp.model.vo.ResponseVO;
import com.pms.ocp.service.*;
import io.swagger.annotations.Api;
......@@ -94,12 +96,12 @@ public class ModelBaseController {
*/
@ApiOperation("模型-查询列表")
@GetMapping("/get/model/getModeBaselList")
public ResponseVO getModeBaselList(@ApiParam(value = "所属级别") @RequestParam(value = "belongLevel",defaultValue = "0") String belongLevel,
public ResponseVO getModeBaselList(@ApiParam(value = "所属级别") @RequestParam(value = "belongLevel", defaultValue = "0") String belongLevel,
@ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode,
@ApiParam(value = "当前页") @RequestParam(value = "currentPage") Integer currentPage,
@ApiParam(value = "每页数量") @RequestParam(value = "pageSize") Integer pageSize,
@ApiParam(value = "模糊搜索条件") @RequestParam(value = "searchCondition",required = false) String searchCondition) {
return modelService.getModeBaselList(belongLevel, modelCode, currentPage, pageSize, searchCondition);
@ApiParam(value = "模糊搜索条件") @RequestParam(value = "searchCondition", required = false) String searchCondition) {
return modelService.getModeBaselList(belongLevel, modelCode, currentPage, pageSize, searchCondition);
}
......@@ -334,6 +336,18 @@ public class ModelBaseController {
return ResponseVO.ok(modelRelationService.getModelRelationList(objId, modelGroupCode, modelCode));
}
// /**
// * 模型拓扑关系-查询2
// *
// * @return
// */
// @ApiOperation("模型拓扑关系-查询2")
// @PostMapping("/region/tree/list")
// public ResponseVO<List<ModelRelation>> regionTreeOutputVOResponse(@RequestBody ModelRelationInputMultiVO regionInputMultiVO) {
// log.info("regionId入参 : {}", regionInputMultiVO);
// return ResponseVO.ok(modelRelationService.buildMultiRegionTreeByRegionIdList(regionInputMultiVO));
// }
/**
* 模型拓扑关系-删除
*
......
src/main/java/com/pms/ocp/controller/ModelControlDemandController.java
View file @ 65535957
......@@ -3,6 +3,7 @@ package com.pms.ocp.controller;
import com.pms.ocp.biz.BizModelRequirementInfoService;
import com.pms.ocp.common.constants.CodeEnum;
import com.pms.ocp.model.dto.ModelPropertyVersionRequirementDTO;
import com.pms.ocp.model.dto.ModelRequirementDeleteParamDTO;
import com.pms.ocp.model.dto.ModelVersionRequirementDTO;
import com.pms.ocp.model.vo.ResponseVO;
import io.swagger.annotations.Api;
......@@ -64,12 +65,14 @@ public class ModelControlDemandController {
*/
@ApiOperation("模型需求-删除")
@PostMapping("/delete/modelRequirement")
public ResponseVO deleteModelRequirement(@ApiParam(value = "需求编号") @RequestParam(value = "objId", required = false) String objId,
@ApiParam(value = "需求编码") @RequestParam(value = "requirementCode") String requirementCode,
@ApiParam(value = "模型编码") @RequestParam(value = "modelCode") String modelCode) {
public ResponseVO deleteModelRequirement(@RequestBody ModelRequirementDeleteParamDTO modelRequirementDeleteParamDTO) {
String requirementCode = modelRequirementDeleteParamDTO.getRequirementCode();
String modelCode = modelRequirementDeleteParamDTO.getModelCode();
// String propCode = modelRequirementDeleteParamDTO.getPropCode();
String objId = modelRequirementDeleteParamDTO.getObjId();
System.out.println("==============================================================" + requirementCode);
log.info("需求编码为：{}", requirementCode);
return ResponseVO.ok(bizModelRequirementInfoService.deleteModelRequirementInfo(objId, requirementCode, modelCode));
}
......@@ -80,9 +83,12 @@ public class ModelControlDemandController {
*/
@ApiOperation("模型属性需求-删除")
@PostMapping("/delete/modelPropertyRequirement")
public ResponseVO deleteModelPropertyRequirement(@ApiParam(value = "需求编码") @RequestParam(value = "requirementCode", required = false) String requirementCode,
@ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode,
@ApiParam(value = "属性编码") @RequestParam(value = "propCode", required = false) String propCode) {
public ResponseVO deleteModelPropertyRequirement(@RequestBody ModelRequirementDeleteParamDTO modelRequirementDeleteParamDTO) {
String requirementCode = modelRequirementDeleteParamDTO.getRequirementCode();
String modelCode = modelRequirementDeleteParamDTO.getModelCode();
String propCode = modelRequirementDeleteParamDTO.getPropCode();
return ResponseVO.ok(bizModelRequirementInfoService.deleteModelPropertyRequirementInfo(requirementCode, modelCode, propCode));
}
......@@ -133,9 +139,10 @@ public class ModelControlDemandController {
@GetMapping("/get/modelPropertyRequirement/list")
public ResponseVO getModelPropertyDemandList(@ApiParam(value = "需求编码") @RequestParam(value = "requirementCode", required = false) String requirementCode,
@ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode,
@ApiParam(value = "属性名称") @RequestParam(value = "columnName", required = false) String columnName,
@ApiParam(value = "当前页") @RequestParam(value = "currentPage") Integer currentPage,
@ApiParam(value = "每页数量") @RequestParam(value = "pageSize") Integer pageSize) {
return ResponseVO.ok(bizModelRequirementInfoService.getModelPropertyRequirementInfoList(requirementCode, modelCode, currentPage, pageSize));
return ResponseVO.ok(bizModelRequirementInfoService.getModelPropertyRequirementInfoList(requirementCode, modelCode, columnName, currentPage, pageSize));
}
......@@ -150,7 +157,7 @@ public class ModelControlDemandController {
@ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode,
@ApiParam(value = "当前页") @RequestParam(value = "currentPage") Integer currentPage,
@ApiParam(value = "每页数量") @RequestParam(value = "pageSize") Integer pageSize) {
return ResponseVO.ok(bizModelRequirementInfoService.getModelPropertyRequirementInfoList(requirementCode, modelCode, currentPage, pageSize));
return ResponseVO.ok(bizModelRequirementInfoService.getModelPropertyRequirementInfoList(requirementCode, modelCode, null, currentPage, pageSize));
}
......
src/main/java/com/pms/ocp/mapper/ModelRelationMapper.java
View file @ 65535957
......@@ -2,7 +2,11 @@ package com.pms.ocp.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.pms.ocp.model.entity.ModelRelation;
import com.pms.ocp.model.vo.ModelRelationInputMultiVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @Auther: wangjian
......@@ -12,4 +16,30 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface ModelRelationMapper extends BaseMapper<ModelRelation> {
/**
* 根据id查询区域信息
*
* @param modelCode
* @return 区域信息列表
*/
ModelRelation queryRegionById(@Param("modelCode") String modelCode);
/**
* 根据regionId列表，查询区域信息
*
* @param regionInputMultiVO 区域id列表
* @return 区域信息列表
*/
List<ModelRelation> queryRegionByRegionIdList(ModelRelationInputMultiVO regionInputMultiVO);
/**
* 根据parentId查询区域信息
*
* @param modelCode 区域id
* @return 区域信息列表
*/
List<ModelRelation> queryRegionByParentId(@Param("modelCode") String modelCode);
}
src/main/java/com/pms/ocp/mapper/ModelRequirementMapper.java
View file @ 65535957
......@@ -26,6 +26,7 @@ public interface ModelRequirementMapper extends BaseMapper<ModelRequirement> {
@Param("modelGroupCodes") List<String> modelGroupCodes);
List<ModelPropertyVersionRequirementVO> listModelPropertyVersionRequirementVO(@Param("requirementCode") String requirementCode,
@Param("modelCode") String modelCode);
@Param("modelCode") String modelCode,
@Param("columnName") String columnName);
}
\ No newline at end of file
src/main/java/com/pms/ocp/model/dto/ModelRequirementDeleteParamDTO.java 0 → 100644
View file @ 65535957
package com.pms.ocp.model.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Auther: wangjian
* @Date: 2022/4/12 16:09
* @Description:模型需求删除参数DTO
*/
@ApiModel("模型需求删除参数DTO")
@Data
public class ModelRequirementDeleteParamDTO {
@ApiModelProperty(value = "需求编号")
private String objId;
@ApiModelProperty(value = "需求编码")
private String requirementCode;
@ApiModelProperty(value = "模型编码")
private String modelCode;
@ApiModelProperty(value = "属性编码")
private String propCode;
}
src/main/java/com/pms/ocp/model/entity/ModelRelation.java
View file @ 65535957
......@@ -10,6 +10,8 @@ import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
/**
* @Auther: wangjian
......@@ -80,6 +82,9 @@ public class ModelRelation {
@TableField("is_delete")
private String boolDelete;
@TableField(exist = false)
private List<ModelProperty> modelRelationList = new ArrayList<>();
}
......
src/main/java/com/pms/ocp/model/entity/ModelRequirementApproval.java
View file @ 65535957
......@@ -34,7 +34,7 @@ public class ModelRequirementApproval {
/**
* 审批状态 0:未审核 1：审核通过 2：审核拒绝
*/
private Integer approvalStatus;
private Integer approvalStats;
/**
* 审核人单位
......
src/main/java/com/pms/ocp/model/vo/ModelRelationInputMultiVO.java 0 → 100644
View file @ 65535957
package com.pms.ocp.model.vo;
import java.util.List;
/**
* @Auther: wangjian
* @Date: 2022/4/12 14:25
* @Description:
*/
public class ModelRelationInputMultiVO {
private List<String> regionIdList;
public void setRegionIdList(List<String> regionIdList) {
this.regionIdList = regionIdList;
}
public List<String> getRegionIdList() {
return regionIdList;
}
@Override
public String toString() {
return "RegionInputMultiVO{" +
"regionIdList=" + regionIdList +
'}';
}
}
src/main/java/com/pms/ocp/model/vo/ModelRelationVO.java
View file @ 65535957
package com.pms.ocp.model.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.pms.ocp.model.entity.ModelProperty;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import java.util.List;
/**
* @Auther: wangjian
......@@ -83,4 +85,34 @@ public class ModelRelationVO {
*/
@ApiModelProperty(value = "是否已删除")
private String boolDelete;
/**
* 模型名称
*/
@ApiModelProperty(value = "模型名称")
private String modelName;
/**
* 坐标X
*/
@ApiModelProperty(value = "坐标X")
private Integer x;
/**
* 坐标Y
*/
@ApiModelProperty(value = "坐标Y")
private Integer y;
/**
* XXXX
*/
@ApiModelProperty(value = "XXXX")
private String state;
/**
* 属性列表
*/
@ApiModelProperty(value = "属性列表")
private List<ModelProperty> modelPropertyList;
}
src/main/java/com/pms/ocp/model/vo/ResponseVO.java
View file @ 65535957
......@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import lombok.extern.slf4j.Slf4j;
/**
* @author wuwanli
......
src/main/java/com/pms/ocp/service/ModelRelationService.java
View file @ 65535957
......@@ -3,6 +3,7 @@ package com.pms.ocp.service;
import com.pms.ocp.model.dto.ModelRelationDTO;
import com.pms.ocp.model.entity.ModelRelation;
import com.pms.ocp.model.vo.ModelRelationInputMultiVO;
import com.pms.ocp.model.vo.ModelRelationVO;
import java.util.List;
......@@ -53,7 +54,7 @@ public interface ModelRelationService {
* @param
* @return
*/
List<ModelRelation> getModelRelationList(String objId, String modelGroupCode, String modelCode);
List<ModelRelationVO> getModelRelationList(String objId, String modelGroupCode, String modelCode);
/**
* 获取模型关系列表
......@@ -62,4 +63,21 @@ public interface ModelRelationService {
* @return
*/
ModelRelationVO getModelRelation(String modelId);
//
// /**
// * 创建区域树
// *
// * @param regionId 省id
// * @return 区域树
// */
// ModelRelation buildRegionTreeByRegionId(String regionId);
//
// /**
// * 创建多级根节点区域树
// *
// * @param regionInputMultiVO 区域入参
// * @return 多级根节点区域树
// */
// List<ModelRelation> buildMultiRegionTreeByRegionIdList(ModelRelationInputMultiVO regionInputMultiVO);
}
src/main/java/com/pms/ocp/service/ModelRequirementService.java
View file @ 65535957
......@@ -53,7 +53,7 @@ public interface ModelRequirementService {
* @param
* @return
*/
List<ModelPropertyVersionRequirementVO> getModelPropertyRequirementList(String requirementCode, String modelCode);
List<ModelPropertyVersionRequirementVO> getModelPropertyRequirementList(String requirementCode, String modelCode, String columnName);
/**
* 获取模型需求列表
......
src/main/java/com/pms/ocp/service/impl/ModelRelationServiceImpl.java
View file @ 65535957
package com.pms.ocp.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
//import com.pms.ocp.common.DataProcessUtil;
import com.pms.ocp.mapper.ModelMapper;
import com.pms.ocp.mapper.ModelPropertyMapper;
import com.pms.ocp.mapper.ModelRelationMapper;
import com.pms.ocp.model.dto.ModelRelationDTO;
import com.pms.ocp.model.entity.Model;
import com.pms.ocp.model.entity.ModelClassify;
import com.pms.ocp.model.entity.ModelProperty;
import com.pms.ocp.model.entity.ModelRelation;
import com.pms.ocp.model.vo.ModelRelationInputMultiVO;
import com.pms.ocp.model.vo.ModelRelationVO;
import com.pms.ocp.service.ModelRelationService;
import com.pms.ocp.service.OcpModelGroupService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* @Auther: wangjian
......@@ -26,6 +38,12 @@ public class ModelRelationServiceImpl implements ModelRelationService {
@Autowired
private ModelRelationMapper modelRelationMapper;
@Autowired
private ModelMapper modelMapper;
@Autowired
private ModelPropertyMapper modelPropertyMapper;
@Override
public Integer createModelRelation(ModelRelationDTO modelRelationDTO) {
......@@ -64,27 +82,132 @@ public class ModelRelationServiceImpl implements ModelRelationService {
return null;
}
@Autowired
private OcpModelGroupService ocpModelGroupService;
@Override
public List<ModelRelation> getModelRelationList(String objId, String modelGroupCode, String modelCode) {
public List<ModelRelationVO> getModelRelationList(String objId, String modelGroupCode, String modelCode) {
QueryWrapper<ModelRelation> queryWrapper = new QueryWrapper();
if (StringUtils.isNotEmpty(objId)) {
queryWrapper.lambda().eq(ModelRelation::getObjId, objId);
if (StringUtils.isNotEmpty(modelCode)) {
if (StringUtils.isNotEmpty(modelCode)) {
queryWrapper.lambda().eq(ModelRelation::getModelCode, modelCode);
}
} else {
List<String> modelGroupCodeList = new ArrayList<>();
QueryWrapper<ModelClassify> queryWrapper1 = new QueryWrapper();
List<ModelClassify> modelClassifyList = ocpModelGroupService.list(queryWrapper1);
getParentNode(modelGroupCodeList, modelClassifyList, modelGroupCode);
modelGroupCodeList.add(modelGroupCode);
QueryWrapper<Model> queryWrapper2 = new QueryWrapper();
queryWrapper2.lambda().in(Model::getModelGroupCode, modelGroupCodeList);
List<Model> modelList = modelMapper.selectList(queryWrapper2);
List<String> modelCodeList = modelList.stream().map(Model::getModelCode).collect(Collectors.toList());
if (!modelGroupCodeList.isEmpty()) {
queryWrapper.lambda().in(ModelRelation::getModelCode, modelCodeList);
}
}
if (StringUtils.isNotEmpty(modelGroupCode)) {
queryWrapper.lambda().eq(ModelRelation::getModelPropCode, modelGroupCode);
List<ModelRelationVO> modelRelationVOList = new ArrayList<>();
List<ModelRelation> modelRelationList = modelRelationMapper.selectList(queryWrapper);
List<String> relationModelCodeList = modelRelationList.stream().map(ModelRelation::getRelationModeCode).collect(Collectors.toList());
relationModelCodeList.add(modelCode);
QueryWrapper<Model> queryWrapper4 = new QueryWrapper();
queryWrapper4.lambda().in(Model::getModelCode, relationModelCodeList);
List<Model> modelList1 = modelMapper.selectList(queryWrapper4);
for (Model model : modelList1) {
ModelRelationVO modelRelationVO = new ModelRelationVO();
BeanUtils.copyProperties(model, modelRelationVO);
modelRelationVOList.add(modelRelationVO);
}
if (StringUtils.isNotEmpty(modelCode)) {
queryWrapper.lambda().eq(ModelRelation::getModelCode, modelCode);
// 属性列表
QueryWrapper<ModelProperty> queryWrapper3 = new QueryWrapper();
queryWrapper3.lambda().in(ModelProperty::getModelCode, relationModelCodeList);
List<ModelProperty> modelPropertyList = modelPropertyMapper.selectList(queryWrapper3);
Map<String, List<ModelProperty>> map = modelPropertyList.stream().collect(Collectors.groupingBy(ModelProperty::getModelCode));
Map<String, List<ModelRelation>> map1 = modelRelationList.stream().collect(Collectors.groupingBy(ModelRelation::getRelationModeCode));
for (ModelRelationVO modelRelationVO : modelRelationVOList) {
String modelCode1 = modelRelationVO.getModelCode();
ModelRelation modelRelation = map1.get(modelCode1).get(0);
modelRelationVO.setModelPropCode(modelRelation.getModelPropCode());
modelRelationVO.setRelationModeCode(modelRelation.getRelationModeCode());
modelRelationVO.setRelationModePropCode(modelRelation.getRelationModePropCode());
modelRelationVO.setModelPropertyList(map.get(modelCode1));
}
return modelRelationMapper.selectList(queryWrapper);
return modelRelationVOList;
}
/**
* 递归获取某个父节点下面的所有子节点
*
* @param childMenu 要返回的结果
* @param menuList 数据库查询出来的所有集合
* @param modelGroupPcode 父类编码
*/
private static void getParentNode(List<String> childMenu, List<ModelClassify> menuList, String modelGroupPcode) {
menuList.stream()
//过滤出父id等于参数的id
.filter(menu -> StringUtils.isNotBlank(menu.getModelGroupPcode()) && menu.getModelGroupPcode().equals(modelGroupPcode))
.forEach(menu -> {
//递归遍历下一级
getParentNode(childMenu, menuList, menu.getModelGroupCode());
//添加
childMenu.add(menu.getModelGroupCode());
});
}
@Override
public ModelRelationVO getModelRelation(String modelId) {
return null;
}
// @Resource
// private DataProcessUtil dataProcessUtil;
//
// @Override
// public ModelRelation buildRegionTreeByRegionId(String regionId) {
// return dataProcessUtil.recursiveTree(modelRelationMapper, regionId);
// }
//
// @Override
// public List<ModelRelation> buildMultiRegionTreeByRegionIdList(ModelRelationInputMultiVO regionInputMultiVO) {
// return dataProcessUtil.recursiveTreeList(modelRelationMapper, regionInputMultiVO);
// }
}
src/main/java/com/pms/ocp/service/impl/ModelRequirementServiceImpl.java
View file @ 65535957
......@@ -68,8 +68,8 @@ public class ModelRequirementServiceImpl implements ModelRequirementService {
}
@Override
public List<ModelPropertyVersionRequirementVO> getModelPropertyRequirementList(String requirementCode, String modelCode) {
return modelRequirementMapper.listModelPropertyVersionRequirementVO(requirementCode, modelCode);
public List<ModelPropertyVersionRequirementVO> getModelPropertyRequirementList(String requirementCode, String modelCode, String columnName) {
return modelRequirementMapper.listModelPropertyVersionRequirementVO(requirementCode, modelCode, columnName);
}
@Override
......
src/main/resources/application-local.yml
View file @ 65535957
spring:
datasource:
driver-class-name: org.postgresql.Driver
username: postgres
password: 1234
type: com.zaxxer.hikari.HikariDataSource
# jdbc-url: jdbc:postgresql://192.168.43.20:33072/pms3?currentSchema=public&stringtype=unspecified&TimeZone=Asia/Shanghai&useAffectedRows=true
# jdbc-url: jdbc:postgresql://172.20.10.9:33072/pms3?currentSchema=public&stringtype=unspecified&TimeZone=Asia/Shanghai&useAffectedRows=true
url: jdbc:postgresql://localhost:5432/operatemonitordb?currentSchema=operating_platform&stringtype=unspecified&TimeZone=Asia/Shanghai&useAffectedRows=true
dynamic:
primary: master #设置默认的数据源或者数据源组,默认值即为master
strict: false #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候回抛出异常,不启动会使用默认数据源.
datasource:
master:
driver-class-name: org.postgresql.Driver
username: postgres
password: 1234qwer
type: com.zaxxer.hikari.HikariDataSource
url: jdbc:postgresql://localhost:5432/operatemonitordb?currentSchema=operating_platform&stringtype=unspecified&TimeZone=Asia/Shanghai&useAffectedRows=true
middleGround:
driver-class-name: org.postgresql.Driver
username: postgres
password: 1234qwer
type: com.zaxxer.hikari.HikariDataSource
url: jdbc:postgresql://localhost:5432/operatemonitordb?currentSchema=operating_platform&stringtype=unspecified&TimeZone=Asia/Shanghai&useAffectedRows=true
knife4j:
enable: true
#beagle:
# jwt:
# secret-key: ac2ceb11e6be4d9ea0a71c9b270c1cb8
# token-prefix: Bearer
# expire-time: 18000
\ No newline at end of file
src/main/resources/mapper/ModelRelationMapper.xml 0 → 100644
View file @ 65535957
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.pms.ocp.mapper.ModelRelationMapper">
<select id="queryRegionById" resultType="com.pms.ocp.model.entity.ModelRelation">
SELECT
omr.obj_id,
omr.model_code,
omr.model_prop_code,
omr.relation_mode_code,
omr.relation_mode_prop_code
FROM
ocp_model_rel omr
WHERE
omr.model_code = #{modelCode};
</select>
<select id="queryRegionByParentId" resultType="com.pms.ocp.model.entity.ModelRelation">
SELECT
omr.obj_id,
omr.model_code,
omr.model_prop_code,
omr.relation_mode_code,
omr.relation_mode_prop_code
FROM
ocp_model_rel omr
WHERE
omr.relation_mode_code = #{modelCode};
</select>
<select id="queryRegionByRegionIdList" parameterType="com.pms.ocp.model.vo.ModelRelationInputMultiVO" resultType="com.pms.ocp.model.entity.ModelRelation">
SELECT
omr.obj_id,
omr.model_code,
omr.model_prop_code,
omr.relation_mode_code,
omr.relation_mode_prop_code
FROM
ocp_model_rel omr
WHERE
<if test="regionIdList != null and regionIdList.size() > 0">
omr.model_code in
<foreach item="item" index="index" collection="regionIdList" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</select>
</mapper>
src/main/resources/mapper/ModelRequirementMapper.xml
View file @ 65535957
......@@ -36,20 +36,17 @@
<if test="modelGroupCodes.size > 0">
and omv.model_group_code in
<foreach item="modelGroupCode" collection="modelGroupCodes" index="index" open="(" close=")"
separator=",">
<foreach item="modelGroupCode" collection="modelGroupCodes" index="index" open="(" close=")" separator=",">
#{modelGroupCode}
</foreach>
</if>
</where>
</select>
<select id="listModelPropertyVersionRequirementVO"
resultType="com.pms.ocp.model.vo.ModelPropertyVersionRequirementVO">
<select id="listModelPropertyVersionRequirementVO" resultType="com.pms.ocp.model.vo.ModelPropertyVersionRequirementVO">
select * from ocp_model_prop_version ompv
left join ocp_model_version omv on omv.model_code = ompv.model_code and omv.requirement_code =
ompv.requirement_code
left join ocp_model_requirement omr on omv.requirement_code = omr.requirement_code
left join ocp_model_version omv on omv.model_code = ompv.model_code and omv.requirement_code = ompv.requirement_code
left join ocp_model_requirement omr on omv.requirement_code = omr.requirement_code
<where>
<if test="modelCode != null and modelCode != ''">
and ompv.model_code = #{modelCode}
......@@ -58,6 +55,10 @@
<if test="requirementCode != null and requirementCode != ''">
and ompv.requirement_code = #{requirementCode}
</if>
<if test="columnName != null and columnName != ''">
and ompv.column_name like CONCAT('%', #{columnName}::text,'%')
</if>
</where>
</select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment