diff --git a/pom.xml b/pom.xml index 46173d6f8923f0eea4ef02111bd8e5d6bd81d782..047ea8015e7d2ca149b921d7fc0fa48ff1e33dc3 100644 --- a/pom.xml +++ b/pom.xml @@ -19,19 +19,19 @@ 2.4.2 3.0.0 - - - - - - - - - - - - - + + + + + + + + + + + + + 2.0.8 @@ -95,12 +95,6 @@ 2.0.9 - - javax.validation - validation-api - 1.1.0.Final - - org.springframework.boot spring-boot-starter-test @@ -112,6 +106,7 @@ + cn.hutool hutool-all diff --git a/src/main/java/com/pms/ocp/common/constants/CodeEnum.java b/src/main/java/com/pms/ocp/common/constants/CodeEnum.java index 90cdc11d603326d6dd333b1b906c1a84d12c8e61..2b646e510344b58eced0975bbf6a7295521846f3 100644 --- a/src/main/java/com/pms/ocp/common/constants/CodeEnum.java +++ b/src/main/java/com/pms/ocp/common/constants/CodeEnum.java @@ -39,7 +39,7 @@ public enum CodeEnum { /** * 数据异常 */ - NO_DATA("555", "数据库数据异常", false), + NO_DATA("200", "数据库无数据", false), UP_DATA_FAIL("401005", "更新失败", false), INSERT_FAIL("401006", "插入数据失败", false), DELETE_FAIL("401007", "修改失败", false); diff --git a/src/main/java/com/pms/ocp/common/utils/TreeUtils.java b/src/main/java/com/pms/ocp/common/utils/TreeUtils.java index e3298214624434ab19a392296453c86acd90858d..85a2d7bff65319e448518f68ab15fcec0f477ebf 100644 --- a/src/main/java/com/pms/ocp/common/utils/TreeUtils.java +++ b/src/main/java/com/pms/ocp/common/utils/TreeUtils.java @@ -61,7 +61,6 @@ public class TreeUtils { } result.add(node); } - return result; } diff --git a/src/main/java/com/pms/ocp/controller/ModelBaseController.java b/src/main/java/com/pms/ocp/controller/ModelBaseController.java index 169c91154ba17aa1c0a07baeabe314b4f71f2717..ced0393b7092517b4c8a88a651907f60d5f7879f 100644 --- a/src/main/java/com/pms/ocp/controller/ModelBaseController.java +++ b/src/main/java/com/pms/ocp/controller/ModelBaseController.java @@ -78,11 +78,13 @@ public class ModelBaseController { @GetMapping("/get/model/list") public ResponseVO getModelList(@ApiParam(value = "模型订阅编号") @RequestParam(value = "objId", required = false) String objId, @ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode, + @ApiParam(value = "归属省编码数组EQ: ddas232, 2e1ssda, 3232") @RequestParam(value = "ownerCompanyCodes", required = false) List ownerCompanyCodes, + @ApiParam(value = "归属分类编码数组") @RequestParam(value = "modelGroupCodes", required = false) List modelGroupCodes, @ApiParam(value = "当前页") @RequestParam(value = "currentPage", required = false) Integer currentPage, @ApiParam(value = "每页数量") @RequestParam(value = "pageSize", required = false) Integer pageSize) { PageHelper.startPage(currentPage, pageSize); - List modelList = modelService.getModelList(objId, modelCode); + List modelList = modelService.getModelList(objId, modelCode, ownerCompanyCodes, modelGroupCodes); PageInfo pageInfo = new PageInfo<>(modelList); return ResponseVO.ok(pageInfo); @@ -100,6 +102,7 @@ public class ModelBaseController { return ResponseVO.ok(modelService.deleteModel(objId, modelCode)); } + /** * 模型-修改 * diff --git a/src/main/java/com/pms/ocp/controller/OcpTenantController.java b/src/main/java/com/pms/ocp/controller/OcpTenantController.java index ee91ab473dfe7791d3f75eb5b0c92d668c2c6f8e..650b2969fbe5fe0581a5c29b7cf59e94e09ccc0e 100644 --- a/src/main/java/com/pms/ocp/controller/OcpTenantController.java +++ b/src/main/java/com/pms/ocp/controller/OcpTenantController.java @@ -11,6 +11,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -40,20 +41,20 @@ public class OcpTenantController { } @GetMapping("/tenantselect") @ApiModelProperty("应用树分类--查询") - private Page getselect(String tenantGroupCode,String tenantGroupCompanyCode,int currentPage,int pageSize,String keyword){ - Page tree= tenantService.getselects(tenantGroupCode,tenantGroupCompanyCode,currentPage,pageSize,keyword); - return tree; + private ResponseVO> getselect(String tenantGroupCode,String tenantGroupCompanyCode,int currentPage,int pageSize,String keyword,String lev ){ + Page tree= tenantService.getselects(tenantGroupCode,tenantGroupCompanyCode,currentPage,pageSize,keyword,lev); + return ResponseVO.ok(tree); } @PostMapping("/tenantinster") @ApiModelProperty("新增应用") - public ResponseVO tenantInster(@RequestBody TenanBaseDto TenanBaseDto){ - boolean falg = tenantService.getTenanInster(TenanBaseDto); - if (falg){ - return ResponseVO.ok("新建成功！"); - } - return ResponseVO.error("应用code已经存在！"); + OcpTenantGroup tenanInster = tenantService.getTenanInster(TenanBaseDto); + if ("".equals(tenanInster)){ + return ResponseVO.error("应用添加失败！"); + } + return ResponseVO.ok(tenanInster); + } @PostMapping("/tenantupdata") diff --git a/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java b/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java index 3e6f5e7bdb86946232905d833c50c436a5036d37..02ad59aeda0da52751f9ed4637022dc55ddf8767 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java +++ b/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java @@ -32,8 +32,11 @@ public interface OcpApiTreeMapper extends BaseMapper { List selectThreeApiGroupsList(Long apiGroupPromotionType, String apiGroupCode); - List selectLists(Long apiGroupPromotionType, String apiGroupCode,Long apiGroupLevel); + List selectLists(Long apiGroupPromotionType, String apiGroupCode,String apiGroupLevel); //code重复问题 List selectGroupCode(); + + //根据code查询整条数据 + OcpApiGroup selectCode(String code); } diff --git a/src/main/java/com/pms/ocp/mapper/TenantMapper.java b/src/main/java/com/pms/ocp/mapper/TenantMapper.java index aa28e63e13511cb74f6670db75a3f519f1115db9..70d1e171ef2ad7d5a453ff18a83e33276998729f 100644 --- a/src/main/java/com/pms/ocp/mapper/TenantMapper.java +++ b/src/main/java/com/pms/ocp/mapper/TenantMapper.java @@ -1,8 +1,11 @@ package com.pms.ocp.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.pms.ocp.model.dto.TenanBaseDto; import com.pms.ocp.model.entity.OcpTenantGroup; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.springframework.web.bind.annotation.RequestParam; import java.util.List; @@ -29,10 +32,11 @@ public interface TenantMapper extends BaseMapper { List selectGroups(String tenantGroupCompanyCode); - //模糊查询 - List queryLike(String keyword); + //服务树--查询 + List selectTenantGroupsList(String tenantGroupCode,String tenantGroupCompanyCode); + List selectGroupsList(String tenantGroupCompanyCode,String tenantGroupName); } 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 de444ddd8f0bd630b84a9ee71dcf175d88df3db6..2395d25be2813ef012286b65f7cce2753766a202 100644 --- a/src/main/java/com/pms/ocp/model/dto/PageGroupDto.java +++ b/src/main/java/com/pms/ocp/model/dto/PageGroupDto.java @@ -51,7 +51,7 @@ public class PageGroupDto extends PageParam { private long isDelete; @ApiModelProperty("分层树层级 1中台层 2中心层 3 服务组层 4服务层 ") - private long apiGroupLevel; + private String apiGroupLevel; public String getObjId() { return objId; @@ -157,11 +157,11 @@ public class PageGroupDto extends PageParam { this.isDelete = isDelete; } - public long getApiGroupLevel() { + public String getApiGroupLevel() { return apiGroupLevel; } - public void setApiGroupLevel(long apiGroupLevel) { + public void setApiGroupLevel(String apiGroupLevel) { this.apiGroupLevel = apiGroupLevel; } } 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 1f5b96169d74c646522f7565fa75415bae56221e..3c3c771ce32a1dae9bfb4bfa73132c54af86d2b0 100644 --- a/src/main/java/com/pms/ocp/model/dto/TenanBaseDto.java +++ b/src/main/java/com/pms/ocp/model/dto/TenanBaseDto.java @@ -2,11 +2,13 @@ package com.pms.ocp.model.dto; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.pms.ocp.model.entity.OcpTenantGroup; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; import java.sql.Timestamp; @@ -15,6 +17,7 @@ import java.sql.Timestamp; */ @ApiModel(value = "新增应用封装对象") @Data +@EqualsAndHashCode(callSuper=false) public class TenanBaseDto extends OcpTenantGroup { @@ -23,122 +26,112 @@ public class TenanBaseDto extends OcpTenantGroup { private String objId; /** - * 应用名称 + * 应用分类编码 */ - @ApiModelProperty("应用名称") - private String tenantName; + @ApiModelProperty("应用分类编码") + private String tenantGroupCode; /** - * 应用代码 + * 应用分类名称 */ - @ApiModelProperty("应用代码") - private String tenantCode; + @ApiModelProperty("应用分类名称") + private String tenantGroupName; /** - * 应用分类代码 + * 分类创建公司 */ - @ApiModelProperty("应用分类代码") - private String tenantGroupCode; + @ApiModelProperty("分类创建公司") + private String tenantGroupCompanyCode; /** - * 应用ip + * 上级code */ - @ApiModelProperty("应用ip") - private String tenantIp; + @ApiModelProperty("上级code") + private String tenantGroupPcode; /** - * 应用url + * 应用类别设备级、生态级等 */ - @ApiModelProperty("应用url") - private String tenantUrl; + @ApiModelProperty("应用类别设备级、生态级等") + private String tenantType; /** - * 所属专业 + * 分类版本 */ - @ApiModelProperty("所属专业") - private String professionalKind; + @ApiModelProperty("分类版本") + private String tenantGroupVersion; /** - * 创建者用户ID + * 显示顺序 */ - @ApiModelProperty("创建者用户ID") - private String tenantUserId; + @ApiModelProperty("显示顺序") + private Integer tenantGroupOrderNo; /** - * 排序 + * 提交人id */ - @ApiModelProperty("排序") - private Integer tenantOrderNo; + @ApiModelProperty("提交人id") + private String tenantGroupUserId; /** - * 创建时间 + * 提交人姓名 */ - @ApiModelProperty("创建时间") - private Timestamp tenantCtime; + @ApiModelProperty("提交人姓名") + private String tenantGroupUserName; /** - * 最后更新时间 + * 创建时间 */ - @ApiModelProperty("最后更新时间") - private Timestamp tenantMtime; + @ApiModelProperty("创建时间") + private Timestamp tenantGroupCtime; /** - * 部署名称 + * 修改时间 */ - @ApiModelProperty("部署名称") - private String deploymentName; + @ApiModelProperty("修改时间") + private Timestamp tenantGroupMtime; /** - * 描述 + * 是否删除 */ - @ApiModelProperty("描述") - private String tenantDescription; + @ApiModelProperty("是否删除") + private Short isDelete; /** - * 应用状态0:设计态；1:运行态 + * 应用树层级 1:应用分组层 2:应用层 */ - @ApiModelProperty("应用状态0:设计态；1:运行态") - private Short tenantState; + @ApiModelProperty("应用树层级 1:应用分组层 2:应用层") + private String tenantGroupLevel; - /** - * 建设单位 - */ - @ApiModelProperty("建设单位") - private String tenantUnit; - /** - * 所属公司编码 - */ - @ApiModelProperty("所属公司编码") - private String ownerCompanyCode; - /** - * 所属公司名称 - */ - @ApiModelProperty("所属公司名称") - private String ownerCompanyName; + //上级分类名称 - /** - * 是否删除0:否;1:是 - */ - @ApiModelProperty("是否删除0:否;1:是") - private Short isDelete; + @ApiModelProperty("上级分类名称") + @TableField(exist = false) + private String classIfy; - /** - * 所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区 - */ - @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区") - private Short tenantZone; + public String getObjId() { + return objId; + } - /** - * 所属层级 1:应用层;2:平台层;3:网络层;4:感知层; - */ - @ApiModelProperty("所属层级 1:应用层;2:平台层;3:网络层;4:感知层;") - private Short tenantLayer; + public void setObjId(String objId) { + this.objId = objId; + } - /** - * 应用版本（当前版本） - */ - @ApiModelProperty("应用版本（当前版本）") - private String tenantVersion; + public String getTenantGroupCode() { + return tenantGroupCode; + } + + public void setTenantGroupCode(String tenantGroupCode) { + this.tenantGroupCode = tenantGroupCode; + } + + public String getClassIfy() { + return classIfy; + } + + public void setClassIfy(String classIfy) { + this.classIfy = classIfy; + } } diff --git a/src/main/java/com/pms/ocp/model/entity/OcpApiAudit.java b/src/main/java/com/pms/ocp/model/entity/OcpApiAudit.java index e5e4a20270aecec0a641143f2153be8cd5933696..9fd2f66129f94a40476e64a88c6355de54ecc25a 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpApiAudit.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpApiAudit.java @@ -17,60 +17,54 @@ public class OcpApiAudit { @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty("主键ID") - @Excel(name = "主键ID",orderNum = "1") + @Excel(name = "编号",orderNum = "1") private String objId; @ApiModelProperty("服务编码") - @Excel(name = "服务编码",orderNum = "2") private String apiCode; @ApiModelProperty("操作状态0:新增,1:迭代；2，下线") - @Excel(name = "操作状态",orderNum = "3") + @Excel(name = "类型",orderNum = "3") private long operStatus; @ApiModelProperty("操作对象0:服务，1:入参，2:出参") - @Excel(name = "操作对象",orderNum = "4") private long operTarget; @ApiModelProperty("类型0:人工操作,1:流程管控,3:总部下发") - @Excel(name = "操作对象",orderNum = "4") private long auditType; @ApiModelProperty("备注简述") - @Excel(name = "备注简述",orderNum = "5") private String auditMessage; @ApiModelProperty("事记内容") - @Excel(name = "事记内容",orderNum = "6") + @Excel(name = "变更内容",orderNum = "4") private String auditJson; @ApiModelProperty("提交人id") - @Excel(name = "提交人id",orderNum = "7") private String auditUserId; @ApiModelProperty("提交人姓名") - @Excel(name = "提交人姓名",orderNum = "8") + @Excel(name = "变更人",orderNum = "5") private String auditUserName; @ApiModelProperty("创建时间") - @Excel(name = "创建时间",orderNum = "9") + @Excel(name = "创建时间",orderNum = "6") private Timestamp auditCtime; @ApiModelProperty("修改时间") - @Excel(name = "修改时间",orderNum = "10") private Timestamp auditMtime; @ApiModelProperty("是否删除0-否1-是") - @Excel(name = "是否删除",orderNum = "11") private long isDelete; @ApiModelProperty("当前版本") - @Excel(name = "当前版本",orderNum = "12") private long applyVersion; + @ApiModelProperty("上一版本") - @Excel(name = "上一版本",orderNum = "13") + @Excel(name = "上一版本",orderNum = "7") private long preApiVersion; @ApiModelProperty("服务接口中文名称") + @Excel(name = "服务名称",orderNum = "2") private String apiName; @ApiModelProperty("服务分类代码") @@ -80,9 +74,12 @@ public class OcpApiAudit { private long apiPromotion; @ApiModelProperty("服务请求体") + @Excel(name = "请求参数",orderNum = "8") private String apiReq; @ApiModelProperty("服务返回体") + @Excel(name = "返回参数",orderNum = "9") + private String apiResp; @ApiModelProperty("服务地址") @@ -113,6 +110,7 @@ public class OcpApiAudit { private long apiLayer; @ApiModelProperty("服务版本（最新版本）") + @Excel(name = "当前版本",orderNum = "6") private long apiVersion; public String getObjId() { diff --git a/src/main/java/com/pms/ocp/model/entity/OcpTenantAudit.java b/src/main/java/com/pms/ocp/model/entity/OcpTenantAudit.java index 7918098858a7d5c9101b230e65cf4b9f249d6d2c..125901205202362bbc88d82b7fc8bcc287477ad5 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpTenantAudit.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpTenantAudit.java @@ -83,7 +83,7 @@ public class OcpTenantAudit implements Serializable { */ @ApiModelProperty("创建时间") @Excel(name = "创建时间",orderNum = "9") - private Date auditCtime; + private Timestamp auditCtime; /** * 应用版本(当前版本) @@ -238,14 +238,10 @@ public class OcpTenantAudit implements Serializable { return auditCtime; } - public void setAuditCtime(Date auditCtime) { + public void setAuditCtime(Timestamp auditCtime) { this.auditCtime = auditCtime; } - public String getApplyVersion() { - return applyVersion; - } - public void setApplyVersion(String applyVersion) { this.applyVersion = applyVersion; } diff --git a/src/main/java/com/pms/ocp/service/ModelService.java b/src/main/java/com/pms/ocp/service/ModelService.java index 86b94244bdd79853747fc58748cb40ef8b4d8979..740e9a4a26cf15737d0d3beaa53fd5fa39f346c3 100644 --- a/src/main/java/com/pms/ocp/service/ModelService.java +++ b/src/main/java/com/pms/ocp/service/ModelService.java @@ -53,7 +53,7 @@ public interface ModelService { * @param * @return */ - List getModelList(String objId, String modelCode); + List getModelList(String objId, String modelCode, List ownerCompanyCodes, List modelGroupCodes); /** * 获取模型列表 diff --git a/src/main/java/com/pms/ocp/service/OcpApiTreeService.java b/src/main/java/com/pms/ocp/service/OcpApiTreeService.java index 0859ee146a36d4e17307cc0ead04d9d5ab2befab..6f59c30ac3cfed66ea74dd80ece305984bc077ed 100644 --- a/src/main/java/com/pms/ocp/service/OcpApiTreeService.java +++ b/src/main/java/com/pms/ocp/service/OcpApiTreeService.java @@ -3,8 +3,6 @@ package com.pms.ocp.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.pms.ocp.model.dto.ApiTreeGroupDto; -import com.pms.ocp.model.dto.OcpApiGroupDtos; import com.pms.ocp.model.dto.PageGroupDto; import com.pms.ocp.model.entity.OcpApiGroup; diff --git a/src/main/java/com/pms/ocp/service/TenantService.java b/src/main/java/com/pms/ocp/service/TenantService.java index c917957e91f5d3bb4c0efde1f6b7bebdf7753a84..fd1e814f83e94d2ff7b812e4fe7873f777a70221 100644 --- a/src/main/java/com/pms/ocp/service/TenantService.java +++ b/src/main/java/com/pms/ocp/service/TenantService.java @@ -23,7 +23,7 @@ public interface TenantService extends IService { * @param * @return */ - boolean getTenanInster(TenanBaseDto TenanBaseDto); + OcpTenantGroup getTenanInster(TenanBaseDto TenanBaseDto); /** * 修改应用 @@ -48,6 +48,6 @@ public interface TenantService extends IService { * @param tenantGroupCompanyCode * @return */ - Page getselects(String tenantGroupCode,String tenantGroupCompanyCode,int currentPage,int pageSize,String text); + Page getselects(String tenantGroupCode,String tenantGroupCompanyCode,int currentPage,int pageSize,String text,String lev); } diff --git a/src/main/java/com/pms/ocp/service/impl/ModelClassifyServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ModelClassifyServiceImpl.java index 1707f8d7e8d467e0a882793cf8329585e055074d..3a2651e22abe1a4b205c181ceb5b416b6648d22b 100644 --- a/src/main/java/com/pms/ocp/service/impl/ModelClassifyServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ModelClassifyServiceImpl.java @@ -125,7 +125,7 @@ public class ModelClassifyServiceImpl implements ModelClassifyService { if (!result) { return ResponseVO.error(CodeEnum.INSERT_FAIL); } - return ResponseVO.ok(); + return ResponseVO.ok(list); } /** 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 9c01612ea33914ab0328172f73a19f7e03ecbf03..bce3830aac70ad6447dc60939a78f537471c0163 100644 --- a/src/main/java/com/pms/ocp/service/impl/ModelServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ModelServiceImpl.java @@ -3,20 +3,16 @@ package com.pms.ocp.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pms.ocp.common.constants.CodeEnum; import com.pms.ocp.common.utils.ExcelUtils; import com.pms.ocp.mapper.ModelMapper; import com.pms.ocp.model.dto.ModelDTO; import com.pms.ocp.model.entity.Model; -import com.pms.ocp.model.entity.ModelProperty; import com.pms.ocp.model.vo.ModelVO; -import com.pms.ocp.model.vo.ResponseVO; import com.pms.ocp.service.ModelService; 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.util.CollectionUtils; import org.springframework.web.multipart.MultipartFile; import java.io.IOException; @@ -133,7 +129,7 @@ public class ModelServiceImpl extends ServiceImpl implements * @return */ @Override - public List getModelList(String objId, String modelCode) { + public List getModelList(String objId, String modelCode, List ownerCompanyCodes, List modelGroupCodes) { QueryWrapper queryWrapper = new QueryWrapper(); if (StringUtils.isNotEmpty(objId)) { @@ -144,6 +140,34 @@ public class ModelServiceImpl extends ServiceImpl implements queryWrapper.lambda().eq(Model::getModelCode, modelCode); } + if (ownerCompanyCodes != null && !ownerCompanyCodes.isEmpty()) { + List modelList = new ArrayList<>(); + for (String ownerCompanyCode : ownerCompanyCodes){ + queryWrapper.lambda().eq(Model::getOwnerCompanyCode, ownerCompanyCode); + List modelList1; + modelList1 = modelMapper.selectList(queryWrapper); + modelList.addAll(modelList1); + queryWrapper.lambda().clear(); + } + return modelList; + } + + if (modelGroupCodes != null && !modelGroupCodes.isEmpty()) { + List modelList = new ArrayList<>(); + for (String modelGroupCode : modelGroupCodes){ + queryWrapper.lambda().eq(Model::getModelGroupCode, modelGroupCode); + List modelList1; + modelList1 = modelMapper.selectList(queryWrapper); + modelList.addAll(modelList1); + queryWrapper.lambda().clear(); + } + return modelList; + } + + if (StringUtils.isNotEmpty(modelCode)) { + queryWrapper.lambda().eq(Model::getModelCode, modelCode); + } + return modelMapper.selectList(queryWrapper); } 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 11a7e4b39798aa3ad1b9cb4ce574235707d3ddbd..e550b9bfa69618cc190b968002f76eccd0a4ce48 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.PageInfo; import com.pms.ocp.common.utils.RandomStringUtils; import com.pms.ocp.mapper.OcpApiBaseMapper; import com.pms.ocp.mapper.OcpApiTreeMapper; @@ -21,6 +22,7 @@ import org.springframework.stereotype.Service; import java.sql.Timestamp; import java.util.ArrayList; import java.util.List; +import java.util.stream.Stream; @Service @@ -43,10 +45,6 @@ public class OcpApiTreeServiceImpl extends ServiceImpl getByGroup(Long apiGroupPromotionType,String apiGroupCode) { -// if (StringUtils.isBlank(apiGroupPromotionType) && StringUtils.isBlank(apiGroupCode)) { - // List ocpApiGroups = mapper.selectApiGroups(); - // return ocpApiGroups; -// }else if (!("".equals(apiGroupPromotionType)) && StringUtils.isBlank(apiGroupCode)){ List ocpApiGroups = mapper.selectTwoApiGroups(apiGroupPromotionType); return ocpApiGroups; @@ -69,12 +67,23 @@ 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); + ocpApi.setApiGroupPromotionType(ocpApiGroup.getApiGroupPromotionType()); + ocpApi.setObjId(""); + ocpApi.setApiGroupMtime(timestamp); + ocpApi.setApiGroupCtime(timestamp); + ocpApi.setApiGroupPcode(ocpApiGroup.getApiGroupCode()); + ocpApi.setApiGroupCode(code); + mapper.insert(ocpApi); + ocpApiGroup.setApiGroupLevel(ocpApiGroup.getApiGroupLevel() + 1); + }else { + return false; + } return flag; } @@ -107,21 +116,20 @@ public class OcpApiTreeServiceImpl extends ServiceImpl ocpApiGroups = mapper.selectList(null); - if (StringUtils.isBlank(ocpApiGroup1.getApiGroupPcode())) { - for (OcpApiGroup apiGroup : ocpApiGroups) { - if ((ocpApiGroup1.getApiGroupCode()).equals(apiGroup.getApiGroupPcode())){ + for (OcpApiGroup apiGroup : ocpApiGroups) { + if ((ocpApiGroup1.getApiGroupCode()).equals(apiGroup.getApiGroupPcode())){ flag = false; break; } - } - } - mapper.deleteById(objId); + if (flag){ + mapper.deleteById(objId); + } return flag; } @@ -135,18 +143,15 @@ public class OcpApiTreeServiceImpl extends ServiceImpl getOnePages(PageGroupDto pageGroupDto) { - Page pageInfo = new Page(pageGroupDto.getPageSize(), pageGroupDto.getPageNum()); + Page pageInfo = new Page(pageGroupDto.getPageNum(), pageGroupDto.getPageSize()); if (StringUtils.isBlank(pageGroupDto.getApiGroupCode())){ - List ocpApiGroups = mapper.selectTwoApiGroups(pageGroupDto.getApiGroupPromotionType()); - pageInfo.setRecords(ocpApiGroups); LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper(); - lambdaQueryWrapper.eq(OcpApiGroup::getApiGroupPromotionType,pageGroupDto.getApiGroupPromotionType()); - mapper.selectPage(pageInfo,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()); - LambdaQueryWrapper lwq = new LambdaQueryWrapper<>(); pageInfo.setRecords(ocpApiGroups); - mapper.selectPage(pageInfo, lwq); + pageInfo = mapper.selectPage(pageInfo, null); } return pageInfo; } 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 c07cbe8092799bf15bff17f41f0e4c0abe814814..89a138a5b8d00172cf7d99809bb2be3993632f0f 100644 --- a/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java @@ -1,7 +1,6 @@ package com.pms.ocp.service.impl; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -9,14 +8,13 @@ import com.pms.ocp.common.utils.RandomStringUtils; import com.pms.ocp.mapper.TenantBasicManagementMapper; import com.pms.ocp.mapper.TenantMapper; import com.pms.ocp.model.dto.*; -import com.pms.ocp.model.entity.OcpTenantBase; import com.pms.ocp.model.entity.OcpTenantGroup; import com.pms.ocp.service.TenantService; -import com.zaxxer.hikari.util.IsolationLevel; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + import java.sql.Timestamp; import java.util.*; @@ -35,23 +33,22 @@ public class TenantServiceImpl extends ServiceImpl * * @return */ - @Override - public List getTree(String tenantGroupCompanyCode ,String tenantGroupCode) { - List ocpTenantGroupList = null; - if (StringUtils.isBlank(tenantGroupCode) && StringUtils.isBlank(tenantGroupCompanyCode)){ + @Override + public List getTree(String tenantGroupCompanyCode, String tenantGroupCode) { + List ocpTenantGroupList = null; + if (StringUtils.isBlank(tenantGroupCode) && StringUtils.isBlank(tenantGroupCompanyCode)) { //顶级目录 ocpTenantGroupList = tenantMapper.oneTenantGroup(); - }else if (!(StringUtils.isBlank(tenantGroupCompanyCode)) && StringUtils.isBlank(tenantGroupCode)){ + } else if (!(StringUtils.isBlank(tenantGroupCompanyCode)) && StringUtils.isBlank(tenantGroupCode)) { //二级目录 ocpTenantGroupList = tenantMapper.selectGroups(tenantGroupCompanyCode); - } - else if (!(StringUtils.isBlank(tenantGroupCompanyCode)) &&!(StringUtils.isBlank(tenantGroupCompanyCode))){ - //三级目录 - ocpTenantGroupList = tenantMapper.selectTenantGroups(tenantGroupCode,tenantGroupCompanyCode); + } else if (!(StringUtils.isBlank(tenantGroupCompanyCode)) && !(StringUtils.isBlank(tenantGroupCompanyCode))) { + //三级目录 + ocpTenantGroupList = tenantMapper.selectTenantGroups(tenantGroupCode, tenantGroupCompanyCode); } - return ocpTenantGroupList; + return ocpTenantGroupList; } /** @@ -61,36 +58,56 @@ public class TenantServiceImpl extends ServiceImpl * @return */ @Override - public boolean getTenanInster(TenanBaseDto tenanBaseDto) { + public OcpTenantGroup getTenanInster(TenanBaseDto tenanBaseDto) { boolean falg = true; + OcpTenantGroup group = new OcpTenantGroup(); String tenantGroupCode = tenanBaseDto.getTenantGroupCode(); List ocpTenantGroups = tenantMapper.selectList(null); + + String randomString = RandomStringUtils.getRandomString(6); + Timestamp timestamp = new Timestamp(System.currentTimeMillis()); + BeanUtils.copyProperties(tenanBaseDto, group); + group.setTenantGroupPcode(tenanBaseDto.getTenantGroupCode()); + group.setTenantType("应用"); + group.setTenantGroupVersion("1.0"); + group.setTenantGroupCode(randomString); + group.setTenantGroupOrderNo(1); + group.setTenantGroupCtime(timestamp); + group.setTenantGroupMtime(timestamp); + group.setTenantGroupVersion("1.0"); + int i = (Integer.parseInt(tenanBaseDto.getTenantGroupLevel()) + 1); + + group.setTenantGroupLevel(String.valueOf(i)); + for (OcpTenantGroup tenantGroup : ocpTenantGroups) { - if (tenantGroup.getTenantGroupCode().equals(tenantGroupCode)){ + if (tenantGroup.getTenantGroupCode().equals(tenantGroupCode)) { falg = false; break; } } - String randomString = RandomStringUtils.getRandomString(6); - Timestamp timestamp = new Timestamp(System.currentTimeMillis()); - OcpTenantGroup ocpTenantGroup = new OcpTenantGroup(); - BeanUtils.copyProperties(tenanBaseDto,ocpTenantGroup); - if ("null".equals(tenanBaseDto.getOwnerCompanyCode())){ - ocpTenantGroup.setTenantGroupCode(randomString); - } - ocpTenantGroup.setTenantGroupCtime(timestamp); - ocpTenantGroup.setTenantGroupMtime(timestamp); - if ("".equals(tenanBaseDto.getTenantVersion())){ - ocpTenantGroup.setTenantGroupVersion("1.0"); - } - if ("null".equals(tenanBaseDto.getTenantGroupCode())){ + //判断是否含有相同的分类名称 + List ocpTenantGroupList = tenantMapper.selectGroupsList(tenanBaseDto.getTenantGroupCompanyCode(), tenanBaseDto.getTenantGroupName()); + if (StringUtils.isBlank(ocpTenantGroupList.toString())) { + falg = false; + } else { + for (OcpTenantGroup tenantGroup : ocpTenantGroupList) { + if (tenanBaseDto.getTenantGroupName().equals(tenantGroup.getTenantGroupName())) { + falg = false; + break; + } + } + } + if (falg) { + tenanBaseDto.setClassIfy(tenanBaseDto.getTenantGroupCode()); group.setTenantGroupCode(randomString); + tenantMapper.insert(group); + group = tenantMapper.selectById(tenanBaseDto.getObjId()); } - tenantMapper.insert(tenanBaseDto); - return falg; + + return group; } /** @@ -101,6 +118,7 @@ public class TenantServiceImpl extends ServiceImpl */ @Override public boolean getTenantUpdata(OcpTenantGroup ocpTenantGroup) { + Timestamp timestamp = new Timestamp(System.currentTimeMillis()); boolean falg = true; List ocpTenantGroupList = tenantMapper.selectList(null); for (OcpTenantGroup ocpApiGroup : ocpTenantGroupList) { @@ -110,7 +128,9 @@ public class TenantServiceImpl extends ServiceImpl break; } } - tenantMapper.updateById(ocpTenantGroup); + OcpTenantGroup ocpTenantGroup1 = new OcpTenantGroup(); + ocpTenantGroup1.setTenantGroupMtime(timestamp); + tenantMapper.updateById(ocpTenantGroup); return falg; } @@ -130,7 +150,7 @@ public class TenantServiceImpl extends ServiceImpl if (StringUtils.isBlank(ocpTenantGroup1.getTenantGroupPcode())) { for (OcpTenantGroup tenantGroup : ocpTenantGroupList) { String tenantGroupPcode = tenantGroup.getTenantGroupPcode(); - if ((ocpTenantGroup.getTenantGroupCode().equals(tenantGroupPcode))){ + if ((ocpTenantGroup.getTenantGroupCode().equals(tenantGroupPcode))) { flag = false; break; } @@ -150,35 +170,32 @@ public class TenantServiceImpl extends ServiceImpl * @return */ @Override - public Page getselects(String tenantGroupCode,String tenantGroupCompanyCode,int currentPage,int pageSize,String keyword) { + public Page getselects(String tenantGroupCode, String tenantGroupCompanyCode, int currentPage, int pageSize, String keyword,String lev) { LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); - List ocpTenantGroupList1 = tenantMapper.selectList(null); + Page page = new Page<>(currentPage, pageSize); - if ("".equals(keyword)) { - if (StringUtils.isBlank(tenantGroupCode)) { - for (OcpTenantGroup ocpTenantGroup : ocpTenantGroupList1) { - if (ocpTenantGroup.getTenantGroupPcode().equals(tenantGroupCode) && ocpTenantGroup.getTenantGroupCompanyCode().equals(tenantGroupCompanyCode)){ - List ocpTenantGroupList = tenantMapper.selectTenantGroup(tenantGroupCompanyCode); - page.setRecords(ocpTenantGroupList); - tenantMapper.selectPage(page,qw); - } - } - } else { - for (OcpTenantGroup ocpTenantGroup : ocpTenantGroupList1) { - if (ocpTenantGroup.getTenantGroupPcode().equals(tenantGroupCode) && ocpTenantGroup.getTenantGroupCompanyCode().equals(tenantGroupCompanyCode)) { - List ocpTenantGroupList = tenantMapper.selectTenantGroups(tenantGroupCode, tenantGroupCompanyCode); - page.setRecords(ocpTenantGroupList); - tenantMapper.selectPage(page,qw); - } - } + if (StringUtils.isBlank(keyword)) { + if(lev.equals("1")) { + // List ocpTenantGroupList = tenantMapper.selectTenantGroup(tenantGroupCompanyCode); + LambdaQueryWrapper eq = qw.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode); +// page.setRecords(ocpTenantGroupList); + tenantMapper.selectPage(page, eq); + }else if (lev.equals("2") || lev.equals("3")) { + LambdaQueryWrapper eq = qw.or(wq -> wq.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode)).eq(OcpTenantGroup::getTenantGroupPcode, tenantGroupCode); + tenantMapper.selectPage(page, eq); } - return page; - }else { - List ocpTenantGroupList = tenantMapper.queryLike(keyword); - page.setRecords(ocpTenantGroupList); - tenantMapper.selectPage(page,qw); - return page; + } else if (!(StringUtils.isBlank(keyword))) { + LambdaQueryWrapper ocpTenantGroupLambdaQueryWrapper = qw.and(c -> c.like(OcpTenantGroup::getTenantGroupCompanyCode, keyword)) + .or().like(OcpTenantGroup::getTenantGroupName, keyword) + .or().like(OcpTenantGroup::getTenantGroupPcode, keyword) + .or().like(OcpTenantGroup::getTenantGroupUserName, keyword); + tenantMapper.selectPage(page, ocpTenantGroupLambdaQueryWrapper); } - + return page; } } + + + + + diff --git a/src/main/resources/mapper/OcpApiTreeMapper.xml b/src/main/resources/mapper/OcpApiTreeMapper.xml index 272b0e2ef026c67d46e5af7d1a9fedfa691146d2..5af1723b6b3c6c827a53b5f8436d4ae0d9b4e101 100644 --- a/src/main/resources/mapper/OcpApiTreeMapper.xml +++ b/src/main/resources/mapper/OcpApiTreeMapper.xml @@ -7,7 +7,7 @@ + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/OcpTenantGroup.xml b/src/main/resources/mapper/OcpTenantGroup.xml index c0171773cd64fca368e7acf092faea5063b74227..41fd4f07d4ad4d2e12d9d1c32f306e47b4b477dd 100644 --- a/src/main/resources/mapper/OcpTenantGroup.xml +++ b/src/main/resources/mapper/OcpTenantGroup.xml @@ -8,69 +8,33 @@ - + - - - + SELECT * FROM ocp_tenant_group WHERE tenant_group_company_code = #{tenantGroupCompanyCode} and tenant_group_name = #{tenantGroupName}; + + +