From 368af6ba3d8b53f9adc253185b4682e08437460a Mon Sep 17 00:00:00 2001 From: zhaochengming <18706295423@163.com> Date: Wed, 16 Mar 2022 15:37:07 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=B5=E5=91=88=E6=98=8E=20--=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E6=9C=8D=E5=8A=A1=E6=A0=91=E5=88=86=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocp/controller/ModelBaseController.java | 1 + .../ocp/controller/OcpTenantController.java | 17 ++- .../java/com/pms/ocp/mapper/TenantMapper.java | 8 +- .../com/pms/ocp/model/dto/TenanBaseDto.java | 141 +++++++++--------- .../pms/ocp/model/entity/OcpTenantGroup.java | 11 ++ .../pms/ocp/service/OcpApiTreeService.java | 2 - .../com/pms/ocp/service/TenantService.java | 2 +- .../service/impl/OcpApiTreeServiceImpl.java | 1 + .../ocp/service/impl/TenantServiceImpl.java | 132 +++++++++------- src/main/resources/mapper/OcpTenantGroup.xml | 62 ++------ 10 files changed, 183 insertions(+), 194 deletions(-) diff --git a/src/main/java/com/pms/ocp/controller/ModelBaseController.java b/src/main/java/com/pms/ocp/controller/ModelBaseController.java index 169c911..0bbbe16 100644 --- a/src/main/java/com/pms/ocp/controller/ModelBaseController.java +++ b/src/main/java/com/pms/ocp/controller/ModelBaseController.java @@ -100,6 +100,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 ee91ab4..e8b639f 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){ + private ResponseVO> getselect(String tenantGroupCode,String tenantGroupCompanyCode,int currentPage,int pageSize,String keyword){ Page tree= tenantService.getselects(tenantGroupCode,tenantGroupCompanyCode,currentPage,pageSize,keyword); - return tree; + 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/TenantMapper.java b/src/main/java/com/pms/ocp/mapper/TenantMapper.java index aa28e63..70d1e17 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/TenanBaseDto.java b/src/main/java/com/pms/ocp/model/dto/TenanBaseDto.java index 1f5b961..c15e88e 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 Short 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/OcpTenantGroup.java b/src/main/java/com/pms/ocp/model/entity/OcpTenantGroup.java index 5b06141..ca4a936 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpTenantGroup.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpTenantGroup.java @@ -109,6 +109,17 @@ public class OcpTenantGroup implements Serializable { private Short tenantGroupLevel; + @TableField(exist = false) + @ApiModelProperty("模糊查询字段") + private String keyword; + + public String getKeyword() { + return keyword; + } + + public void setKeyword(String keyword) { + this.keyword = keyword; + } 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 0859ee1..6f59c30 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 c917957..04ba99e 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); /** * 修改应用 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 11a7e4b..0d00e76 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java @@ -75,6 +75,7 @@ public class OcpApiTreeServiceImpl 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,54 @@ 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"); + group.setTenantGroupLevel((short) (tenanBaseDto.getTenantGroupLevel() + (short) 1)); + 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 +116,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 +126,9 @@ public class TenantServiceImpl extends ServiceImpl break; } } - tenantMapper.updateById(ocpTenantGroup); + OcpTenantGroup ocpTenantGroup1 = new OcpTenantGroup(); + ocpTenantGroup1.setTenantGroupMtime(timestamp); + tenantMapper.updateById(ocpTenantGroup); return falg; } @@ -130,7 +148,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 +168,33 @@ 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) { 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 (!("".equals(tenantGroupCompanyCode)) && StringUtils.isBlank(tenantGroupCode)) { +// List ocpTenantGroupList = tenantMapper.selectTenantGroup(tenantGroupCompanyCode); + qw.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode); +// page.setRecords(ocpTenantGroupList); + tenantMapper.selectPage(page, qw); + + } else if (!("".equals(tenantGroupCompanyCode)) && !("".equals(tenantGroupCode))) { + 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/OcpTenantGroup.xml b/src/main/resources/mapper/OcpTenantGroup.xml index c017177..41fd4f0 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}; + + + -- 2.26.0