我的应用

src/main/java/com/pms/ocp/controller/OcpTenantGroupIocnController.java

+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<List<OcpTenantGroupIocnDto>> getApplyUser() {
+        List<OcpTenantGroupIocnDto> 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);
+    }
+
+
+}

src/main/java/com/pms/ocp/mapper/OcpTenantBaseMapper.java

@@ -7,4 +7,8 @@ import java.util.List;
 
 public interface OcpTenantBaseMapper extends BaseMapper<OcpTenantBase> {
 
+
+
+    OcpTenantBase updataIsDelect(String objId,Short isDelete);
+
 }

src/main/java/com/pms/ocp/model/dto/OcpTenantGroupIocnDto.java

+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;
+    }
+}

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<OcpTenantBase> {
 
 
-
-
+    /**
+     * 我的应用 -- 应用删除
+     * @param objId
+     * @return
+     */
+    boolean delectApply(String objId);
 }

src/main/java/com/pms/ocp/service/OcpTenantIocnService.java

 package com.pms.ocp.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.pms.ocp.model.entity.OcpTenantIocn;
 
 public interface OcpTenantIocnService extends IService<OcpTenantIocn> {
 }

src/main/java/com/pms/ocp/service/impl/OcpTenantBaseServiceImpl.java

 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<OcpTenantBaseMapper,OcpTenantBase> implements OcpTenantBaseService {
-
-
-
-
-
-
-
-
-
+public class OcpTenantBaseServiceImpl extends ServiceImpl<OcpTenantBaseMapper, OcpTenantBase> 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;
+    }
 }

src/main/java/com/pms/ocp/service/impl/OcpTenantIocnServiceImpl.java

 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<OcpTenantIocnMapper,OcpTenantIocn> implements OcpTenantIocnService {
+public class OcpTenantIocnServiceImpl extends ServiceImpl<OcpTenantIocnMapper, OcpTenantIocn> implements OcpTenantIocnService {
+
+
+    @Autowired
+    private OcpTenantBaseMapper ocpTenantBaseMapper;
+
+    @Autowired
+    private OcpTenantIocnMapper ocpTenantIocnMapper;
+
+    /**
+     * 我的应用--服务列表
+     *
+     * @return
+     */
+    @Override
+    public List<OcpTenantGroupIocnDto> getApplyUserList() {
+        List<OcpTenantGroupIocnDto> groupIocnDtos = new ArrayList<>();
+        List<OcpTenantBase> ocpTenantBases = ocpTenantBaseMapper.selectList(null);
+        List<OcpTenantIocn> ocpTenantIocns = ocpTenantIocnMapper.selectList(null);
+        List<String> 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;
+    }
+
+
 }

src/main/resources/mapper/OcpTenantBaseMapper.xml

@@ -7,4 +7,11 @@
         on otb.tenant_code = ote.tenant_code
         where otb.obj_id = #{objId}
     </select>
+
+    <select id="updataIsDelect" resultType="com.pms.ocp.model.entity.OcpTenantBase">
+        UPDATE ocp_tenant_base SET is_delete = #{isDelete} WHERE obj_id = #{objId};
+    </select>
+
+
+
 </mapper>
\ No newline at end of file