diff --git a/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java b/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java index 1e8e7e6b9467a6918f81fdf31796ce20158b6f4c..55c86b1105841868e6efc0de2570e3e6afc28ac6 100644 --- a/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java +++ b/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java @@ -25,7 +25,9 @@ import javax.servlet.http.HttpServletResponse; import java.sql.Timestamp; import java.time.LocalDate; import java.util.ArrayList; +import java.util.Collections; import java.util.List; +import java.util.stream.Collectors; @Slf4j @RequestMapping("/api/basic") diff --git a/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java b/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java index 22cdc6b4f2f6deeaf9a8f2d2b1c392f95fc73338..88c157decfd8da8d649ea1a7323fc374fe07d01b 100644 --- a/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java +++ b/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java @@ -43,11 +43,8 @@ public class OcpApiTreeController { @PostMapping("/instertree") @ApiOperation("服务树分类--新增") public ResponseVO inseter(@RequestBody OcpApiGroup ocpApiGroup){ - boolean flag = service.insertTree(ocpApiGroup); - if (flag){ - return ResponseVO.ok(); - } - return ResponseVO.error("您的服务编码重复,请重新输入"); + OcpApiGroup ocpApiGroup1 = service.insertTree(ocpApiGroup); + return ResponseVO.ok(ocpApiGroup1); } @@ -58,7 +55,6 @@ public class OcpApiTreeController { return ResponseVO.ok(onePages); } - @PostMapping("/updatatree") @ApiOperation("服务树分类--修改") public ResponseVO updataTree(@RequestBody OcpApiGroup ocpApiGroup){ diff --git a/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java b/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java index 02ad59aeda0da52751f9ed4637022dc55ddf8767..082d54642a9f18840a5e2ce5f53f9b3a16085d76 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java +++ b/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java @@ -32,7 +32,7 @@ public interface OcpApiTreeMapper extends BaseMapper { List selectThreeApiGroupsList(Long apiGroupPromotionType, String apiGroupCode); - List selectLists(Long apiGroupPromotionType, String apiGroupCode,String apiGroupLevel); + List selectLists(Long apiGroupPromotionType, String apiGroupCode); //code重复问题 List selectGroupCode(); diff --git a/src/main/java/com/pms/ocp/model/dto/PageGroupDto.java b/src/main/java/com/pms/ocp/model/dto/PageGroupDto.java index 2395d25be2813ef012286b65f7cce2753766a202..b48ed5f3ccd7d2846160183999a0495f48c0e606 100644 --- a/src/main/java/com/pms/ocp/model/dto/PageGroupDto.java +++ b/src/main/java/com/pms/ocp/model/dto/PageGroupDto.java @@ -53,6 +53,18 @@ public class PageGroupDto extends PageParam { @ApiModelProperty("分层树层级 1中台层 2中心层 3 服务组层 4服务层 ") private String apiGroupLevel; + + @ApiModelProperty("模糊查询字段") + private String keyword; + + public String getKeyword() { + return keyword; + } + + public void setKeyword(String keyword) { + this.keyword = keyword; + } + public String getObjId() { return objId; } diff --git a/src/main/java/com/pms/ocp/model/dto/TenanBaseDto.java b/src/main/java/com/pms/ocp/model/dto/TenanBaseDto.java index 3c3c771ce32a1dae9bfb4bfa73132c54af86d2b0..b30ca9e7cd7f1d36467dc29003187e5a4658ebdb 100644 --- a/src/main/java/com/pms/ocp/model/dto/TenanBaseDto.java +++ b/src/main/java/com/pms/ocp/model/dto/TenanBaseDto.java @@ -131,7 +131,104 @@ public class TenanBaseDto extends OcpTenantGroup { return classIfy; } - public void setClassIfy(String classIfy) { + public String getTenantGroupName() { + return tenantGroupName; + } + + public void setTenantGroupName(String tenantGroupName) { + this.tenantGroupName = tenantGroupName; + } + + public String getTenantGroupCompanyCode() { + return tenantGroupCompanyCode; + } + + public void setTenantGroupCompanyCode(String tenantGroupCompanyCode) { + this.tenantGroupCompanyCode = tenantGroupCompanyCode; + } + + public String getTenantGroupPcode() { + return tenantGroupPcode; + } + + public void setTenantGroupPcode(String tenantGroupPcode) { + this.tenantGroupPcode = tenantGroupPcode; + } + + public String getTenantType() { + return tenantType; + } + + public void setTenantType(String tenantType) { + this.tenantType = tenantType; + } + + public String getTenantGroupVersion() { + return tenantGroupVersion; + } + + public void setTenantGroupVersion(String tenantGroupVersion) { + this.tenantGroupVersion = tenantGroupVersion; + } + + public Integer getTenantGroupOrderNo() { + return tenantGroupOrderNo; + } + + public void setTenantGroupOrderNo(Integer tenantGroupOrderNo) { + this.tenantGroupOrderNo = tenantGroupOrderNo; + } + + public String getTenantGroupUserId() { + return tenantGroupUserId; + } + + public void setTenantGroupUserId(String tenantGroupUserId) { + this.tenantGroupUserId = tenantGroupUserId; + } + + public String getTenantGroupUserName() { + return tenantGroupUserName; + } + + public void setTenantGroupUserName(String tenantGroupUserName) { + this.tenantGroupUserName = tenantGroupUserName; + } + + public Timestamp getTenantGroupCtime() { + return tenantGroupCtime; + } + + public void setTenantGroupCtime(Timestamp tenantGroupCtime) { + this.tenantGroupCtime = tenantGroupCtime; + } + + public Timestamp getTenantGroupMtime() { + return tenantGroupMtime; + } + + public void setTenantGroupMtime(Timestamp tenantGroupMtime) { + this.tenantGroupMtime = tenantGroupMtime; + } + + public Short getIsDelete() { + return isDelete; + } + + public void setIsDelete(Short isDelete) { + this.isDelete = isDelete; + } + + public String getTenantGroupLevel() { + return tenantGroupLevel; + } + + public void setTenantGroupLevel(String tenantGroupLevel) { + this.tenantGroupLevel = tenantGroupLevel; + } + + public OcpTenantGroup setClassIfy(String classIfy) { this.classIfy = classIfy; + return null; } } diff --git a/src/main/java/com/pms/ocp/model/entity/ModelProperty.java b/src/main/java/com/pms/ocp/model/entity/ModelProperty.java index 07d6833042b549b6ccd4145930205f0cc28e6bff..01955911b95bd56c81589ee67e01d1877947f053 100644 --- a/src/main/java/com/pms/ocp/model/entity/ModelProperty.java +++ b/src/main/java/com/pms/ocp/model/entity/ModelProperty.java @@ -116,23 +116,11 @@ public class ModelProperty{ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") // @TableField(typeHandler = TimestampTypeHandler.class) private LocalDateTime propMtime; + + /** + * 表名称 + */ + @TableField(exist = false) + private String modelTable; } -// 字段名称 字段描述 字段类型 允许为NULL 备注 -// prop_id 主键 varchar(42) 否 -// model_id 模型id varchar(42) 否 -// column_name 属性名称 varchar(50) 否 -// column_code 属性编码 varchar(42) 否 -// column_comments 属性描述 varchar(50) 否 -// data_type 数据类型 int4 否 -// data_length 数据长度 int4 是 -// data_scale 数据精度 int4 是 -// is_pk 是否主键 int4 否 0:否,1:是 -// is_required 是否必填 int4 是 0:否,1:是 -// company_id 省公司ID varchar(42) 是 -// company_name 省公司名称 varchar(50) 是 -// prop _dispidx 显示顺序 int4 否 -// prop_user_id 提交人id varchar(42) 否 -// prop_user_name 提交人姓名 varchar(64) 否 -// prop_ctime 创建时间 timestamp(6) 否 -// prop_mtime 修改时间 timestamp(6) 否 diff --git a/src/main/java/com/pms/ocp/model/entity/OcpTenantGroup.java b/src/main/java/com/pms/ocp/model/entity/OcpTenantGroup.java index 1aa6664e94a3349c8d0ba1181371471593df1f83..d23be9175578345eb463d1b65c7ed0c19b336da9 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpTenantGroup.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpTenantGroup.java @@ -1,6 +1,7 @@ package com.pms.ocp.model.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; @@ -106,7 +107,11 @@ public class OcpTenantGroup implements Serializable { @ApiModelProperty("应用树层级 1:应用分组层 2:应用层") private String tenantGroupLevel; + //上级分类名称 + @ApiModelProperty("上级分类名称") + @TableField(exist = false) + private String classIfy; public static long getSerialVersionUID() { return serialVersionUID; diff --git a/src/main/java/com/pms/ocp/service/OcpApiTreeService.java b/src/main/java/com/pms/ocp/service/OcpApiTreeService.java index 6f59c30ac3cfed66ea74dd80ece305984bc077ed..7fd9f90c708157929dfaca9ed9d0249b3f29fedc 100644 --- a/src/main/java/com/pms/ocp/service/OcpApiTreeService.java +++ b/src/main/java/com/pms/ocp/service/OcpApiTreeService.java @@ -19,7 +19,7 @@ public interface OcpApiTreeService extends IService { /** * 新增服务分类 */ - boolean insertTree(OcpApiGroup ocpApiGroup); + OcpApiGroup insertTree(OcpApiGroup ocpApiGroup); /* diff --git a/src/main/java/com/pms/ocp/service/impl/ModelServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ModelServiceImpl.java index 4b0ccff7453834d10e9dd9cf89b106d1eb4ab108..409bfa48aba2c414affd15c70d1928df2c0af78c 100644 --- a/src/main/java/com/pms/ocp/service/impl/ModelServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ModelServiceImpl.java @@ -150,7 +150,7 @@ public class ModelServiceImpl extends ServiceImpl implements if (ownerCompanyCodes != null && !ownerCompanyCodes.isEmpty()) { List modelList = new ArrayList<>(); - for (String ownerCompanyCode : ownerCompanyCodes){ + for (String ownerCompanyCode : ownerCompanyCodes) { queryWrapper.lambda().eq(Model::getOwnerCompanyCode, ownerCompanyCode); List modelList1; modelList1 = modelMapper.selectList(queryWrapper); @@ -162,7 +162,7 @@ public class ModelServiceImpl extends ServiceImpl implements if (modelGroupCodes != null && !modelGroupCodes.isEmpty()) { List modelList = new ArrayList<>(); - for (String modelGroupCode : modelGroupCodes){ + for (String modelGroupCode : modelGroupCodes) { queryWrapper.lambda().eq(Model::getModelGroupCode, modelGroupCode); List modelList1; modelList1 = modelMapper.selectList(queryWrapper); @@ -202,55 +202,64 @@ public class ModelServiceImpl extends ServiceImpl implements @Override public ResponseVO getModeBaselList(String belongLevel, String modelCode, Integer currentPage, Integer pageSize, String searchCondition) { - ResponseVO result; - switch (belongLevel){ + ResponseVO result; + switch (belongLevel) { case Constant.Character.STRINGTWO: - result = this.getModelInfoList(modelCode,currentPage,pageSize,searchCondition); - break; + result = this.getModelInfoList(modelCode, currentPage, pageSize, searchCondition); + break; case Constant.Character.STRINGTHREE: - result = this.getPropertyList(modelCode,currentPage,pageSize,searchCondition); - break; - default: return ResponseVO.ok(); + result = this.getPropertyList(modelCode, currentPage, pageSize, searchCondition); + break; + default: + return ResponseVO.ok(); } - return result; + return result; } + /** - * - * @author huxiuwu - * @date 2022/3/17 - * @param modelCode 分类编码 - * @param currentPage 当前页 - * @param pageSize 每页数量 + * @param modelCode 分类编码 + * @param currentPage 当前页 + * @param pageSize 每页数量 * @param searchCondition 搜索条件 * @return pms.ocp.model.vo.ResponseVO + * @author huxiuwu + * @date 2022/3/17 **/ private ResponseVO getModelInfoList(String modelCode, Integer currentPage, Integer pageSize, String searchCondition) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("model_group_code",modelCode).like(StringUtils.isNotEmpty(searchCondition),"ocp_model_prop",searchCondition); - List modelList = modelMapper.selectList(queryWrapper); - PageUtil pageUtil = new PageUtil<>(); - pageUtil.startPage(currentPage,pageSize,modelList); - return ResponseVO.ok(pageUtil); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("model_group_code", modelCode) + .like(StringUtils.isNotEmpty(searchCondition), "ocp_model_prop", searchCondition) + .orderByDesc("model_ctime"); + List modelList = modelMapper.selectList(queryWrapper); + PageUtil pageUtil = new PageUtil<>(); + pageUtil.startPage(currentPage, pageSize, modelList); + return ResponseVO.ok(pageUtil); } /** - * - * @author huxiuwu - * @date 2022/3/17 - * @param modelCode 分类编码 - * @param currentPage 当前页 - * @param pageSize 每页数量 + * @param modelCode 分类编码 + * @param currentPage 当前页 + * @param pageSize 每页数量 * @param searchCondition 搜索条件 * @return pms.ocp.model.vo.ResponseVO + * @author huxiuwu + * @date 2022/3/17 **/ private ResponseVO getPropertyList(String modelCode, Integer currentPage, Integer pageSize, String searchCondition) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("model_code",modelCode).like(StringUtils.isNotEmpty(searchCondition),"column_name",searchCondition); - List modelPropertiesList = modelPropertyMapper.selectList(queryWrapper); + QueryWrapper proWrapper = new QueryWrapper<>(); + //查询模型名称 + QueryWrapper modelWrapper = new QueryWrapper<>(); + modelWrapper.eq("model_code",modelCode); + List modelList = modelMapper.selectList(modelWrapper); + proWrapper.eq("model_code", modelCode) + .like(StringUtils.isNotEmpty(searchCondition), "column_name", searchCondition) + .orderByDesc("prop_ctime"); + List modelPropertiesList = modelPropertyMapper.selectList(proWrapper); + modelPropertiesList.forEach(pro -> + pro.setModelTable(modelList.get(0) == null ?"":modelList.get(0).getModelTable()) + ); PageUtil pageUtil = new PageUtil<>(); - pageUtil.startPage(currentPage,pageSize,modelPropertiesList); + pageUtil.startPage(currentPage, pageSize, modelPropertiesList); return ResponseVO.ok(pageUtil); } - - } diff --git a/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java index b54d0068dba9664a04ff851c6f0304eb7a57345e..dcc500077641c2fe8fbd23d8fd635a2ad34c5fe4 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java @@ -8,9 +8,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pms.ocp.common.utils.RandomStringUtils; import com.pms.ocp.mapper.OcpApiBaseMapper; import com.pms.ocp.mapper.OcpApiTreeMapper; +import com.pms.ocp.model.QueryResponseResult; import com.pms.ocp.model.dto.*; import com.pms.ocp.model.entity.OcpApiGroup; +import com.pms.ocp.model.entity.OcpTenantGroup; import com.pms.ocp.service.OcpApiTreeService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -25,7 +27,7 @@ import java.util.stream.Stream; @Service @Slf4j -public class OcpApiTreeServiceImpl extends ServiceImpl implements OcpApiTreeService { +public class OcpApiTreeServiceImpl extends ServiceImpl implements OcpApiTreeService { @Autowired @@ -41,19 +43,19 @@ public class OcpApiTreeServiceImpl extends ServiceImpl getByGroup(Long apiGroupPromotionType,String apiGroupCode) { - - if (!("".equals(apiGroupPromotionType)) && StringUtils.isBlank(apiGroupCode)){ - List ocpApiGroups = mapper.selectTwoApiGroups(apiGroupPromotionType); - return ocpApiGroups; - } else if(!("".equals(apiGroupPromotionType)) && !(StringUtils.isBlank(apiGroupCode))){ - List ocpApiGroups = mapper.selectThreeApiGroupsList(apiGroupPromotionType, apiGroupCode); - return ocpApiGroups; - } - - return null; + public List getByGroup(Long apiGroupPromotionType, String apiGroupCode) { + + if (!("".equals(apiGroupPromotionType)) && StringUtils.isBlank(apiGroupCode)) { + List ocpApiGroups = mapper.selectTwoApiGroups(apiGroupPromotionType); + return ocpApiGroups; + } else if (!("".equals(apiGroupPromotionType)) && !(StringUtils.isBlank(apiGroupCode))) { + List ocpApiGroups = mapper.selectThreeApiGroupsList(apiGroupPromotionType, apiGroupCode); + return ocpApiGroups; } + return null; + } + /** * 新增服务分类 @@ -61,35 +63,35 @@ public class OcpApiTreeServiceImpl extends ServiceImpl ocpApiGroups = mapper.selectList(null); - Stream ocpApiGroupStream = ocpApiGroups.stream().filter(item -> item.getApiGroupCode().equals(ocpApiGroup.getApiGroupPcode())); - Stream apiGroupStream1 = ocpApiGroupStream.filter(ocp -> ocp.getApiGroupName().equals(ocpApiGroup.getApiGroupName())); - if (!(apiGroupStream1.isParallel())){ - OcpApiGroup ocpApi = new OcpApiGroup(); - BeanUtils.copyProperties(ocpApiGroup,ocpApi); + Stream ocpApiGroupStream = ocpApiGroups.stream().filter(item -> item.getApiGroupCode().equals(ocpApiGroup.getApiGroupPcode())); + Stream apiGroupStream1 = ocpApiGroupStream.filter(ocp -> ocp.getApiGroupName().equals(ocpApiGroup.getApiGroupName())); + OcpApiGroup ocpApi = new OcpApiGroup(); + if (!(StringUtils.isBlank(apiGroupStream1.toString()))) { + ocpApi.setApiGroupPromotionType(ocpApiGroup.getApiGroupPromotionType()); + BeanUtils.copyProperties(ocpApiGroup, ocpApi); ocpApi.setObjId(""); ocpApi.setApiGroupMtime(timestamp); ocpApi.setApiGroupCtime(timestamp); ocpApi.setApiGroupPcode(ocpApiGroup.getApiGroupCode()); ocpApi.setApiGroupCode(code); - if(ocpApiGroup.getApiGroupLevel().equals("Middleground")){ + ocpApi.setApiGroupPromotionType(ocpApiGroup.getApiGroupPromotionType()); + if ("Middleground".equals(ocpApiGroup.getApiGroupLevel())) { ocpApiGroup.setApiGroupLevel("sys_center"); } - if(ocpApiGroup.getApiGroupLevel().equals("sys_center")){ + if ("sys_center".equals(ocpApiGroup.getApiGroupLevel())) { ocpApiGroup.setApiGroupLevel("api_group"); } - mapper.insert(ocpApi); - - }else { - return false; + } else { + return ocpApi; } - return flag; + return ocpApi; } @@ -123,18 +125,21 @@ public class OcpApiTreeServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(OcpApiGroup::getApiGroupCode, ocpApiGroup.getApiGroupCode()); String objId = ocpApiGroup.getObjId(); - OcpApiGroup ocpApiGroup1 = mapper.selectById(objId); - List ocpApiGroups = mapper.selectList(null); - for (OcpApiGroup apiGroup : ocpApiGroups) { - if ((ocpApiGroup1.getApiGroupCode()).equals(apiGroup.getApiGroupPcode())){ - flag = false; - break; - } + if (StringUtils.isBlank(ocpApiGroup.getApiGroupCode())) { + flag = false; + } else { + + LambdaQueryWrapper eq = queryWrapper.eq(OcpApiGroup::getApiGroupPcode, ocpApiGroup.getApiGroupCode()); + if (StringUtils.isBlank(eq.toString())) { + flag = false; + } } - if (flag){ + if (flag) { mapper.deleteById(objId); } return flag; @@ -149,17 +154,27 @@ public class OcpApiTreeServiceImpl extends ServiceImpl getOnePages(PageGroupDto pageGroupDto) { - Page pageInfo = new Page(pageGroupDto.getPageNum(), pageGroupDto.getPageSize()); - if (StringUtils.isBlank(pageGroupDto.getApiGroupCode())){ - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper(); - lambdaQueryWrapper.eq(OcpApiGroup::getApiGroupPromotionType, pageGroupDto.getApiGroupPromotionType()); - pageInfo = mapper.selectPage(pageInfo,lambdaQueryWrapper); - }else if (!(StringUtils.isBlank(pageGroupDto.getApiGroupCode()))){ - List ocpApiGroups = mapper.selectLists(pageGroupDto.getApiGroupPromotionType(),pageGroupDto.getApiGroupCode(),pageGroupDto.getApiGroupLevel()); - pageInfo.setRecords(ocpApiGroups); - pageInfo = mapper.selectPage(pageInfo, null); + LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); + if (!("".equals(pageGroupDto.getKeyword()))) { + if (StringUtils.isBlank(pageGroupDto.getApiGroupLevel())) { + + qw.eq(OcpApiGroup::getApiGroupPromotionType, pageGroupDto.getApiGroupPromotionType()); + mapper.selectPage(pageInfo, qw); + + } else if ("Middleground".equals(pageGroupDto.getApiGroupLevel()) || "sys_center".equals(pageGroupDto.getApiGroupLevel()) || "api_group".equals(pageGroupDto.getApiGroupLevel())) { + List ocpApiGroups = mapper.selectLists(pageGroupDto.getApiGroupPromotionType(), pageGroupDto.getApiGroupCode()); + pageInfo.setRecords(ocpApiGroups); + pageInfo.setTotal(ocpApiGroups.size()); + } + } else { + LambdaQueryWrapper ocpTenantGroupLambdaQueryWrapper = qw.and(c -> c.like(OcpApiGroup::getApiGroupName, pageGroupDto.getKeyword())) + .or().like(OcpApiGroup::getApiGroupUserName, pageGroupDto.getKeyword()) + .or().like(OcpApiGroup::getApiGroupPcode, pageGroupDto.getKeyword()); + mapper.selectPage(pageInfo, ocpTenantGroupLambdaQueryWrapper); } return pageInfo; } } + + diff --git a/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java index 8a3d4a4613f5531d57cd858235f7dc5592148c7f..82864993e6e4e3ef15271b94f5163d5f82fc5514 100644 --- a/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java @@ -13,7 +13,6 @@ import com.pms.ocp.model.dto.GroupDto; import com.pms.ocp.model.dto.OcpTenantBaseDto; import com.pms.ocp.model.dto.TenantDto; import com.pms.ocp.model.entity.*; - import com.pms.ocp.model.vo.ResponseVO; import com.pms.ocp.model.vo.TenantGroupVo; import com.pms.ocp.service.*; @@ -21,8 +20,6 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import java.sql.Timestamp; import java.time.LocalDateTime; import java.util.ArrayList; diff --git a/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java index fbfdd58849cb977164059024675a89a2ca57882d..a12e55bd050af3fc25547c4ff017f0cbca5a47e6 100644 --- a/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java @@ -86,8 +86,7 @@ public class TenantServiceImpl extends ServiceImpl if (tenanBaseDto.getTenantGroupLevel().equals("sys_center")){ group.setTenantGroupLevel("api_group"); } - - + group.setClassIfy(tenanBaseDto.getTenantGroupCompanyCode()); //判断是否含有相同的分类名称 if (falg) {