From 0e1a4f15ff3389d5c3653f1c0511496a49563a28 Mon Sep 17 00:00:00 2001 From: zhaochengming <18706295423@163.com> Date: Fri, 25 Mar 2022 19:47:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E5=BA=94=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OcpTenantGroupIocnController.java | 58 ++++ .../pms/ocp/mapper/OcpTenantBaseMapper.java | 4 + .../ocp/model/dto/OcpTenantGroupIocnDto.java | 310 ++++++++++++++++++ .../pms/ocp/service/OcpTenantBaseService.java | 9 +- .../pms/ocp/service/OcpTenantIocnService.java | 2 - .../impl/OcpTenantBaseServiceImpl.java | 37 ++- .../impl/OcpTenantIocnServiceImpl.java | 49 ++- .../resources/mapper/OcpTenantBaseMapper.xml | 7 + 8 files changed, 453 insertions(+), 23 deletions(-) create mode 100644 src/main/java/com/pms/ocp/controller/OcpTenantGroupIocnController.java create mode 100644 src/main/java/com/pms/ocp/model/dto/OcpTenantGroupIocnDto.java diff --git a/src/main/java/com/pms/ocp/controller/OcpTenantGroupIocnController.java b/src/main/java/com/pms/ocp/controller/OcpTenantGroupIocnController.java new file mode 100644 index 0000000..14bdc96 --- /dev/null +++ b/src/main/java/com/pms/ocp/controller/OcpTenantGroupIocnController.java @@ -0,0 +1,58 @@ +package com.pms.ocp.controller; + + +import com.pms.ocp.model.dto.OcpTenantGroupIocnDto; +import com.pms.ocp.model.entity.OcpTenantBase; +import com.pms.ocp.model.vo.ResponseVO; +import com.pms.ocp.service.OcpTenantBaseService; +import com.pms.ocp.service.OcpTenantIocnService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModelProperty; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@Slf4j +@RequestMapping("/tenant-group/v1") +@RestController +@Api(tags = "我的应用-服务列表") +public class OcpTenantGroupIocnController { + + + @Autowired + private OcpTenantIocnService ocpTenantIocnService; + + @Autowired + private OcpTenantBaseService ocpTenantBaseService; + + + + /** + * 我的应用--服务列表 + * @return + */ + @GetMapping("/applyuser") + @ApiModelProperty("我的应用--服务列表") + private ResponseVO> getApplyUser() { + List ocpgroup = ocpTenantIocnService.getApplyUserList(); + return ResponseVO.ok(ocpgroup); + } + + /** + * 我的应用--应用删除 + * @return + */ + @GetMapping("/delectapplyuser") + @ApiModelProperty("我的应用--应用删除") + private ResponseVO delectApplyUser(String objId) { + boolean falg = ocpTenantBaseService.delectApply(objId); + return ResponseVO.ok(falg); + } + + +} diff --git a/src/main/java/com/pms/ocp/mapper/OcpTenantBaseMapper.java b/src/main/java/com/pms/ocp/mapper/OcpTenantBaseMapper.java index 4b01b4e..9a0c0dd 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpTenantBaseMapper.java +++ b/src/main/java/com/pms/ocp/mapper/OcpTenantBaseMapper.java @@ -7,4 +7,8 @@ import java.util.List; public interface OcpTenantBaseMapper extends BaseMapper { + + + OcpTenantBase updataIsDelect(String objId,Short isDelete); + } diff --git a/src/main/java/com/pms/ocp/model/dto/OcpTenantGroupIocnDto.java b/src/main/java/com/pms/ocp/model/dto/OcpTenantGroupIocnDto.java new file mode 100644 index 0000000..bf9594f --- /dev/null +++ b/src/main/java/com/pms/ocp/model/dto/OcpTenantGroupIocnDto.java @@ -0,0 +1,310 @@ +package com.pms.ocp.model.dto; + + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.sql.Timestamp; + +@ApiModel(value = "我的应用-服务详情Dto") +@Data +public class OcpTenantGroupIocnDto { + + @ApiModelProperty("应用名称") + private String tenantName; + + /** + * 应用代码 + */ + @ApiModelProperty("应用代码") + private String tenantCode; + + /** + * 应用分类代码 + */ + @ApiModelProperty("应用分类代码") + private String tenantGroupCode; + + /** + * 应用ip + */ + @ApiModelProperty("应用ip") + private String tenantIp; + + /** + * 应用url + */ + @ApiModelProperty("应用url") + private String tenantUrl; + + /** + * 所属专业 + */ + @ApiModelProperty("所属专业") + private String professionalKind; + + /** + * 创建者用户ID + */ + @ApiModelProperty("创建者用户ID") + private String tenantUserId; + + /** + * 排序 + */ + @ApiModelProperty("排序") + private Integer tenantOrderNo; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private Timestamp tenantCtime; + + /** + * 最后更新时间 + */ + @ApiModelProperty("最后更新时间") + private Timestamp tenantMtime; + + /** + * 部署名称 + */ +// @ApiModelProperty("部署名称") +// private String deploymentName; + + /** + * 描述 + */ + @ApiModelProperty("描述") + private String tenantDescription; +// +// /** +// * 应用状态0:设计态；1:运行态 +// */ +// @ApiModelProperty("应用状态0:设计态；1:运行态") +// private Short tenantState; +// /** +// * 推广类型0:统建；1:自建 +// */ +// @ApiModelProperty("推广类型0:统建；1:自建") +// private long tenantPromotion; + /** + * 建设单位 + */ + @ApiModelProperty("建设单位") + private String tenantUnit; + + /** + * 所属公司编码 + */ + @ApiModelProperty("所属公司编码") + private String ownerCompanyCode; + +// /** +// * 所属公司名称 +// */ +// @ApiModelProperty("所属公司名称") +// private String ownerCompanyName; + + /** + * 是否删除0:否;1:是 + */ + @ApiModelProperty("是否删除0:否;1:是") + private Short isDelete; + + /** + * 所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区 + */ + @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区") + private Short tenantZone; + + /** + * 所属层级 1:应用层;2:平台层;3:网络层;4:感知层; + */ + @ApiModelProperty("所属层级 1:应用层;2:平台层;3:网络层;4:感知层;") + private Short tenantLayer; + + /** + * 应用版本（当前版本） + */ + @ApiModelProperty("应用版本（当前版本）") + private String tenantVersion; + + + @ApiModelProperty("推广类型") + private Short tenantPromotion; + + + @ApiModelProperty("应用路径") + private String tenantFullPath; + + + /** + * 所属公司可能会根据公司分区 + */ + @ApiModelProperty(value = "所属公司可能会根据公司分区") + private String companyCode; + + public String getTenantName() { + return tenantName; + } + + public void setTenantName(String tenantName) { + this.tenantName = tenantName; + } + + public String getTenantCode() { + return tenantCode; + } + + public void setTenantCode(String tenantCode) { + this.tenantCode = tenantCode; + } + + public String getTenantGroupCode() { + return tenantGroupCode; + } + + public void setTenantGroupCode(String tenantGroupCode) { + this.tenantGroupCode = tenantGroupCode; + } + + public String getTenantIp() { + return tenantIp; + } + + public void setTenantIp(String tenantIp) { + this.tenantIp = tenantIp; + } + + public String getTenantUrl() { + return tenantUrl; + } + + public void setTenantUrl(String tenantUrl) { + this.tenantUrl = tenantUrl; + } + + public String getProfessionalKind() { + return professionalKind; + } + + public void setProfessionalKind(String professionalKind) { + this.professionalKind = professionalKind; + } + + public String getTenantUserId() { + return tenantUserId; + } + + public void setTenantUserId(String tenantUserId) { + this.tenantUserId = tenantUserId; + } + + public Integer getTenantOrderNo() { + return tenantOrderNo; + } + + public void setTenantOrderNo(Integer tenantOrderNo) { + this.tenantOrderNo = tenantOrderNo; + } + + public Timestamp getTenantCtime() { + return tenantCtime; + } + + public void setTenantCtime(Timestamp tenantCtime) { + this.tenantCtime = tenantCtime; + } + + public Timestamp getTenantMtime() { + return tenantMtime; + } + + public void setTenantMtime(Timestamp tenantMtime) { + this.tenantMtime = tenantMtime; + } + + public String getTenantDescription() { + return tenantDescription; + } + + public void setTenantDescription(String tenantDescription) { + this.tenantDescription = tenantDescription; + } + + public String getTenantUnit() { + return tenantUnit; + } + + public void setTenantUnit(String tenantUnit) { + this.tenantUnit = tenantUnit; + } + + public String getOwnerCompanyCode() { + return ownerCompanyCode; + } + + public void setOwnerCompanyCode(String ownerCompanyCode) { + this.ownerCompanyCode = ownerCompanyCode; + } + + public Short getIsDelete() { + return isDelete; + } + + public void setIsDelete(Short isDelete) { + this.isDelete = isDelete; + } + + public Short getTenantZone() { + return tenantZone; + } + + public void setTenantZone(Short tenantZone) { + this.tenantZone = tenantZone; + } + + public Short getTenantLayer() { + return tenantLayer; + } + + public void setTenantLayer(Short tenantLayer) { + this.tenantLayer = tenantLayer; + } + + public String getTenantVersion() { + return tenantVersion; + } + + public void setTenantVersion(String tenantVersion) { + this.tenantVersion = tenantVersion; + } + + public Short getTenantPromotion() { + return tenantPromotion; + } + + public void setTenantPromotion(Short tenantPromotion) { + this.tenantPromotion = tenantPromotion; + } + + public String getTenantFullPath() { + return tenantFullPath; + } + + public void setTenantFullPath(String tenantFullPath) { + this.tenantFullPath = tenantFullPath; + } + + + public String getCompanyCode() { + return companyCode; + } + + public void setCompanyCode(String companyCode) { + this.companyCode = companyCode; + } +} diff --git a/src/main/java/com/pms/ocp/service/OcpTenantBaseService.java b/src/main/java/com/pms/ocp/service/OcpTenantBaseService.java index 9a4c11b..c63d85f 100644 --- a/src/main/java/com/pms/ocp/service/OcpTenantBaseService.java +++ b/src/main/java/com/pms/ocp/service/OcpTenantBaseService.java @@ -2,11 +2,14 @@ package com.pms.ocp.service; import com.baomidou.mybatisplus.extension.service.IService; import com.pms.ocp.model.entity.OcpTenantBase; -import com.pms.ocp.model.vo.ResponseVO; public interface OcpTenantBaseService extends IService { - - + /** + * 我的应用 -- 应用删除 + * @param objId + * @return + */ + boolean delectApply(String objId); } diff --git a/src/main/java/com/pms/ocp/service/OcpTenantIocnService.java b/src/main/java/com/pms/ocp/service/OcpTenantIocnService.java index ccd79cd..a9e6675 100644 --- a/src/main/java/com/pms/ocp/service/OcpTenantIocnService.java +++ b/src/main/java/com/pms/ocp/service/OcpTenantIocnService.java @@ -1,7 +1,5 @@ package com.pms.ocp.service; -import com.baomidou.mybatisplus.extension.service.IService; -import com.pms.ocp.model.entity.OcpTenantIocn; public interface OcpTenantIocnService extends IService { } diff --git a/src/main/java/com/pms/ocp/service/impl/OcpTenantBaseServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpTenantBaseServiceImpl.java index 59beec8..9ee14cd 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpTenantBaseServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpTenantBaseServiceImpl.java @@ -1,29 +1,32 @@ package com.pms.ocp.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pms.ocp.common.constants.*; -import com.pms.ocp.common.exception.ServiceException; import com.pms.ocp.mapper.OcpTenantBaseMapper; import com.pms.ocp.model.entity.OcpTenantBase; -import com.pms.ocp.model.vo.ResponseVO; import com.pms.ocp.service.OcpTenantBaseService; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.LinkedList; -import java.util.List; - - @Service -public class OcpTenantBaseServiceImpl extends ServiceImpl implements OcpTenantBaseService { - - - - - - - - - +public class OcpTenantBaseServiceImpl extends ServiceImpl implements OcpTenantBaseService { + + @Autowired + private OcpTenantBaseMapper ocpTenantBaseMapper; + + /** + * 我的应用 -- 应用删除 + * + * @param objId + * @return + */ + @Override + public boolean delectApply(String objId) { + OcpTenantBase ocpTenantBase = ocpTenantBaseMapper.selectById(objId); + ocpTenantBase.setIsDelete((short) 1); + ocpTenantBaseMapper.updateById(ocpTenantBase); + + return true; + } } diff --git a/src/main/java/com/pms/ocp/service/impl/OcpTenantIocnServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpTenantIocnServiceImpl.java index 60b6644..68f13c0 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpTenantIocnServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpTenantIocnServiceImpl.java @@ -1,11 +1,58 @@ package com.pms.ocp.service.impl; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.pms.ocp.mapper.OcpTenantBaseMapper; import com.pms.ocp.mapper.OcpTenantIocnMapper; +import com.pms.ocp.model.dto.OcpTenantGroupIocnDto; +import com.pms.ocp.model.entity.OcpTenantBase; import com.pms.ocp.model.entity.OcpTenantIocn; import com.pms.ocp.service.OcpTenantIocnService; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.List; + + @Service -public class OcpTenantIocnServiceImpl extends ServiceImpl implements OcpTenantIocnService { +public class OcpTenantIocnServiceImpl extends ServiceImpl implements OcpTenantIocnService { + + + @Autowired + private OcpTenantBaseMapper ocpTenantBaseMapper; + + @Autowired + private OcpTenantIocnMapper ocpTenantIocnMapper; + + /** + * 我的应用--服务列表 + * + * @return + */ + @Override + public List getApplyUserList() { + List groupIocnDtos = new ArrayList<>(); + List ocpTenantBases = ocpTenantBaseMapper.selectList(null); + List ocpTenantIocns = ocpTenantIocnMapper.selectList(null); + List companyCodes = new ArrayList<>(); + for (OcpTenantBase ocpTenantBase : ocpTenantBases) { + OcpTenantGroupIocnDto ocpTenantGroupIocnDto = new OcpTenantGroupIocnDto(); + if (ocpTenantBase.getIsDelete() == 0) { + BeanUtils.copyProperties(ocpTenantBase, ocpTenantGroupIocnDto); + String ownerCompanyCode = ocpTenantBase.getOwnerCompanyCode(); + ocpTenantGroupIocnDto.setCompanyCode(ownerCompanyCode); + groupIocnDtos.add(ocpTenantGroupIocnDto); + for (OcpTenantIocn ocpTenantIocn : ocpTenantIocns) { + if (ocpTenantIocn.getCompanyCode().equals(ocpTenantBase.getOwnerCompanyCode())){ + BeanUtils.copyProperties(ocpTenantIocn, ocpTenantGroupIocnDto); + } + } + } + } + return groupIocnDtos; + } + + } diff --git a/src/main/resources/mapper/OcpTenantBaseMapper.xml b/src/main/resources/mapper/OcpTenantBaseMapper.xml index 7784a8e..3e409c5 100644 --- a/src/main/resources/mapper/OcpTenantBaseMapper.xml +++ b/src/main/resources/mapper/OcpTenantBaseMapper.xml @@ -7,4 +7,11 @@ on otb.tenant_code = ote.tenant_code where otb.obj_id = #{objId} + + + + + \ No newline at end of file -- 2.26.0