Merge remote-tracking branch 'origin/master'

src/main/java/com/pms/ocp/common/constants/Code.java

+package com.pms.ocp.common.constants;
+
+public interface Code {
+
+    //操作是否成功,true为成功，false操作失败
+    boolean success();
+
+    //操作代码
+    int code();
+
+    //提示信息
+    String message();
+
+}
\ No newline at end of file

src/main/java/com/pms/ocp/common/constants/CommonCode.java

+package com.pms.ocp.common.constants;
+
+import lombok.ToString;
+
+@ToString
+public enum CommonCode implements Code {
+
+    SUCCESS(true,0,"操作成功!"),
+    UNAUTHENTICATED(false,10001,"此操作需要登陆系统!"),
+    UNAUTHORISE(false,10002,"权限不足，无权操作!"),
+    INVALID_PARAM(false,10003,"非法参数!"),
+    PAGE_PARAMS_MISS(false,10004, "分页参数缺失!"),
+    RECORD_IS_NULL(false,10005, "数据不存在!"),
+    FAIL(false,11111,"操作失败!"),
+    CHECK_SUCCESS(true,10006,"校验成功!"),
+    SERVER_ERROR(false,99999,"抱歉，系统繁忙，请稍后重试!");
+    //    private static ImmutableMap<Integer, CommonCode> codes;
+
+    //操作是否成功
+    boolean success;
+
+    //操作代码
+    int code;
+
+    //提示信息
+    String message;
+
+    CommonCode(boolean success, int code, String message){
+        this.success = success;
+        this.code = code;
+        this.message = message;
+    }
+
+    @Override
+    public boolean success() {
+        return success;
+    }
+
+    @Override
+    public int code() {
+        return code;
+    }
+
+    @Override
+    public String message() {
+        return message;
+    }
+
+}

src/main/java/com/pms/ocp/common/constants/Constant.java

@@ -2,6 +2,11 @@ package com.pms.ocp.common.constants;
 
 import java.math.BigDecimal;
 
+/**
+ * 常量接口类
+ *
+ * @author luoY
+ */
 public interface Constant {
 
     /**
@@ -725,6 +730,4 @@ public interface Constant {
          */
         String SENDEMAIL = "qkjfdzyxt@isc.com";
     }
-
-
 }

src/main/java/com/pms/ocp/common/constants/Response.java

+package com.pms.ocp.common.constants;
+
+public interface Response {
+
+    public static final boolean SUCCESS = true;
+    public static final int SUCCESS_CODE = 0;
+
+}

src/main/java/com/pms/ocp/common/constants/ResponseResult.java

+package com.pms.ocp.common.constants;
+
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+@Data
+@ToString
+@NoArgsConstructor
+public class ResponseResult implements Response {
+
+    //操作是否成功
+    boolean success = SUCCESS;
+
+    //操作代码
+    int code = SUCCESS_CODE;
+
+    //提示信息
+    String message;
+
+    public ResponseResult(Code Code){
+        this.success = Code.success();
+        this.code = Code.code();
+        this.message = Code.message();
+    }
+
+    public ResponseResult(boolean success, int code, String msg){
+        this.success = success;
+        this.code = code;
+        this.message = msg;
+    }
+
+    public static  ResponseResult SUCCESS(){
+        return new ResponseResult(CommonCode.SUCCESS);
+    }
+
+    public static ResponseResult FAIL(){
+        return new ResponseResult(CommonCode.FAIL);
+    }
+
+}

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

@@ -20,7 +20,7 @@ import java.util.List;
 @Slf4j
 @RequestMapping("/tenant-group/v1")
 @RestController
-@Api(tags = "我的应用-服务列表")
+@Api(tags = "应用接入-我的应用-服务列表")
 public class OcpTenantGroupIocnController {
 
 
@@ -51,7 +51,12 @@ public class OcpTenantGroupIocnController {
     @ApiModelProperty("我的应用--应用删除")
     private ResponseVO delectApplyUser(String objId) {
         boolean falg = ocpTenantBaseService.delectApply(objId);
+        if (falg){
             return ResponseVO.ok(falg);
+        }else {
+            return ResponseVO.error("请点击需要删除的应用！");
+        }
+
     }
 
 

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

@@ -2,6 +2,7 @@ package com.pms.ocp.controller;
 
 
 import com.github.pagehelper.PageInfo;
+import com.pms.ocp.model.ResponseResult;
 import com.pms.ocp.model.entity.*;
 import com.pms.ocp.model.vo.ResponseVO;
 import com.pms.ocp.service.*;
@@ -100,4 +101,12 @@ public class PmsApiDetailsController {
 
 
 
+
+    @ApiOperation("服务分类——编辑服务")
+    @PostMapping("/updatePammByCode")
+    public ResponseResult UpdatePammByCode(@RequestBody OcpApiBase ocpApiBase) {
+        return pmsApiManagementService.UpdatePammByCode(ocpApiBase);
+    }
+
+
 }

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

@@ -2,6 +2,7 @@ package com.pms.ocp.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.pms.ocp.model.entity.PmsApiManagement;
+import com.pms.ocp.model.entity.PmsApiMangageApi;
 
 import java.util.List;
 
@@ -9,5 +10,12 @@ public interface PmsApiManagementMapper extends BaseMapper<PmsApiManagement> {
 
     List<PmsApiManagement> getPammList(PmsApiManagement pmsApiManagement);
 
+
     List<PmsApiManagement> getPammByCode(PmsApiManagement pmsApiManagement);
+
+
+
+
+
+
 }

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

@@ -11,6 +11,10 @@ import java.sql.Timestamp;
 @Data
 public class OcpTenantGroupIocnDto {
 
+
+    @ApiModelProperty("应用id")
+    private String objId;
+
     @ApiModelProperty("应用名称")
     private String tenantName;
 
@@ -141,12 +145,73 @@ public class OcpTenantGroupIocnDto {
     private String tenantFullPath;
 
 
+    /**
+     * 图标种类tenant:应用图标api:服务图标
+     */
+    @ApiModelProperty(value = "图标种类——tenant:应用图标,api:服务图标")
+    private String iocnType;
+
+    /**
+     * 编码值
+     */
+    @ApiModelProperty(value = "编码值")
+    private String codeNo;
+
+    /**
+     * 应用调用的服务数量图标数据
+     */
+    @ApiModelProperty(value = "应用调用的服务数量图标数据")
+    private Object iocn;
+
     /**
      * 所属公司可能会根据公司分区
      */
     @ApiModelProperty(value = "所属公司可能会根据公司分区")
     private String companyCode;
 
+    @ApiModelProperty("应用状态 '0: ''待审核'',1: ''已审核'',2: ''未通过'', 3: ''未提交'',4:''建设中'',5:''下架'',6:''发布'''")
+    private Short tenantState;
+
+    public Short getTenantState() {
+        return tenantState;
+    }
+
+    public void setTenantState(Short tenantState) {
+        this.tenantState = tenantState;
+    }
+
+    public String getIocnType() {
+        return iocnType;
+    }
+
+    public void setIocnType(String iocnType) {
+        this.iocnType = iocnType;
+    }
+
+    public String getCodeNo() {
+        return codeNo;
+    }
+
+    public void setCodeNo(String codeNo) {
+        this.codeNo = codeNo;
+    }
+
+    public Object getIocn() {
+        return iocn;
+    }
+
+    public void setIocn(Object iocn) {
+        this.iocn = iocn;
+    }
+
+    public String getObjId() {
+        return objId;
+    }
+
+    public void setObjId(String objId) {
+        this.objId = objId;
+    }
+
     public String getTenantName() {
         return tenantName;
     }

src/main/java/com/pms/ocp/model/entity/PmsApiMangageApi.java

+package com.pms.ocp.model.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.sql.Timestamp;
+
+public class PmsApiMangageApi {
+
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty("主键ID")
+    private String objId;
+
+    @ApiModelProperty("服务代码")
+    private String apiCode;
+
+    @ApiModelProperty("服务接口中文名称")
+    private String apiName;
+
+    @ApiModelProperty("服务分类代码")
+    private String apiGroupCode;
+
+    @ApiModelProperty("推广类型0:统建；1:自建")
+    private long apiPromotion;
+
+    @ApiModelProperty("服务请求体")
+    private String apiReq;
+
+    @ApiModelProperty("服务返回体")
+    private String apiResp;
+
+    @ApiModelProperty("服务地址")
+    private String apiUrl;
+
+    @ApiModelProperty("服务创建时间")
+    private Timestamp apiCtime;
+
+    @ApiModelProperty("服务修改时间")
+    private Timestamp apiMtime;
+
+    @ApiModelProperty("创建者用户ID")
+    private String apiUserId;
+
+    @ApiModelProperty("建设单位")
+    private String apiUnit;
+
+    @ApiModelProperty("服务所属公司")
+    private String ownerCompanyCode;
+
+    @ApiModelProperty("是否删除0-否1-是")
+    private long isDelete;
+
+    @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区")
+    private long apiZone;
+
+    @ApiModelProperty("'所属层级 1:应用层;2:平台层;3:网络层;4:感知层;")
+    private long apiLayer;
+
+    @ApiModelProperty("服务版本（最新版本）")
+    private String apiVersion;
+
+    @ApiModelProperty("服务所属中心编码所属中心")
+    private String apiCenterCode;
+
+    @ApiModelProperty("服务简述")
+    private String apiDescription;
+
+    @ApiModelProperty("创建者姓名")
+    private String apiUserName;
+
+    //
+
+    @ApiModelProperty("分类名称")
+    private String apiGroupName;
+
+    @ApiModelProperty("推广类型0统推，1自建")
+    private long apiGroupPromotionType;
+
+    @ApiModelProperty("分类所属公司")
+    private String apiGroupCompanyCode;
+
+    @ApiModelProperty("分类版本")
+    private String apiGroupVersion;
+
+    @ApiModelProperty("显示顺序")
+    private long apiGroupOrderNo;
+
+    @ApiModelProperty("提交人id")
+    private String apiGroupUserId;
+
+    @ApiModelProperty("提交人姓名")
+    private String apiGroupUserName;
+
+    @ApiModelProperty("创建时间")
+    private Timestamp apiGroupCtime;
+
+    @ApiModelProperty("修改时间")
+    private Timestamp apiGroupMtime;
+
+    @ApiModelProperty("上级code")
+    private String apiGroupPcode;
+
+    @ApiModelProperty("分层树层级 1中台层 2中心层 3 服务组层 4服务层 ")
+    private String apiGroupLevel;
+
+
+    //
+    @ApiModelProperty("图标种类tenant:应用图标api:服务图标")
+    private String iocnType;
+
+    @ApiModelProperty("编码值")
+    private String codeNo;
+
+    @ApiModelProperty("应用调用的服务数量图标数据")
+    private Object iocn;
+
+    @ApiModelProperty("所属公司可能会根据公司分区")
+    private String companyCode;
+
+
+
+
+
+    @ApiModelProperty("模型编码")
+    private String modelCode;
+
+    @ApiModelProperty("模型部署公司")
+    private String modelDepCompanyCode;
+
+
+    @ApiModelProperty("服务部署公司")
+    private String apiDepCompanyCode;
+
+    @ApiModelProperty("关系添加时间")
+    private Timestamp relationCtime;
+
+
+
+
+    @ApiModelProperty("应用编码")
+    private String tenantCode;
+
+
+
+    @ApiModelProperty("应用所属公司")
+    private String tenantDepCompanyCode;
+
+    @ApiModelProperty("关系创建时间")
+    private Timestamp apiTenantRelCtime;
+
+    @ApiModelProperty("关系创建时间")
+    private Timestamp apiTenantRelMtime;
+
+    @ApiModelProperty("关系创建用户ID")
+    private String apiTenantRelUserId;
+
+    @ApiModelProperty("关系创建用户")
+    private String apiTenantRelUserName;
+
+    public long getIsDelete() {
+        return isDelete;
+    }
+
+    public void setIsDelete(long isDelete) {
+        this.isDelete = isDelete;
+    }
+
+    public String getApiCode() {
+        return apiCode;
+    }
+
+    public void setApiCode(String apiCode) {
+        this.apiCode = apiCode;
+    }
+
+    public String getApiVersion() {
+        return apiVersion;
+    }
+
+    public void setApiVersion(String apiVersion) {
+        this.apiVersion = apiVersion;
+    }
+
+    public String getApiGroupName() {
+        return apiGroupName;
+    }
+
+    public void setApiGroupName(String apiGroupName) {
+        this.apiGroupName = apiGroupName;
+    }
+}

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

@@ -3,7 +3,10 @@ package com.pms.ocp.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.github.pagehelper.PageInfo;
+import com.pms.ocp.model.ResponseResult;
+import com.pms.ocp.model.entity.OcpApiBase;
 import com.pms.ocp.model.entity.PmsApiManagement;
+import com.pms.ocp.model.entity.PmsApiMangageApi;
 import com.pms.ocp.model.vo.ResponseVO;
 
 
@@ -14,4 +17,10 @@ public interface PmsApiManagementService extends IService<PmsApiManagement> {
     ResponseVO<PageInfo<PmsApiManagement>> getPammList(PmsApiManagement pmsApiManagement);
 
     ResponseVO getPammByCode(PmsApiManagement pmsApiManagement);
+
+//    ResponseVO updatePamm(PmsApiManagement pmsApiManagement);
+
+//    ResponseVO getDeletePammByCode(PmsApiMangageApi pmsApiMangageApi);
+
+    ResponseResult UpdatePammByCode(OcpApiBase ocpApiBase);
 }

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

 package com.pms.ocp.service.impl;
 
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.pms.ocp.mapper.OcpTenantBaseMapper;
 import com.pms.ocp.model.entity.OcpTenantBase;
@@ -23,6 +24,11 @@ public class OcpTenantBaseServiceImpl extends ServiceImpl<OcpTenantBaseMapper, O
      */
     @Override
     public boolean delectApply(String objId) {
+
+
+        if (StringUtils.isNotBlank(objId)){
+            return false;
+        }
         OcpTenantBase ocpTenantBase = ocpTenantBaseMapper.selectById(objId);
         ocpTenantBase.setIsDelete((short) 1);
         ocpTenantBaseMapper.updateById(ocpTenantBase);

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

@@ -3,9 +3,11 @@ 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.OcpTenantExtentMapper;
 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.OcpTenantExtent;
 import com.pms.ocp.model.entity.OcpTenantIocn;
 import com.pms.ocp.service.OcpTenantIocnService;
 import org.springframework.beans.BeanUtils;
@@ -26,6 +28,10 @@ public class OcpTenantIocnServiceImpl extends ServiceImpl<OcpTenantIocnMapper, O
     @Autowired
     private OcpTenantIocnMapper ocpTenantIocnMapper;
 
+
+    @Autowired
+    private OcpTenantExtentMapper ocpTenantExtentMapper;
+
     /**
      * 我的应用--服务列表
      *
@@ -36,19 +42,25 @@ public class OcpTenantIocnServiceImpl extends ServiceImpl<OcpTenantIocnMapper, O
         List<OcpTenantGroupIocnDto> groupIocnDtos = new ArrayList<>();
         List<OcpTenantBase> ocpTenantBases = ocpTenantBaseMapper.selectList(null);
         List<OcpTenantIocn> ocpTenantIocns = ocpTenantIocnMapper.selectList(null);
-        List<String> companyCodes = new ArrayList<>();
+        List<OcpTenantExtent> ocpTenantExtents = ocpTenantExtentMapper.selectList(null);
         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);
+                String tenantCode = ocpTenantBase.getTenantCode();
+//                ocpTenantGroupIocnDto.setCompanyCode(ownerCompanyCode);
                 for (OcpTenantIocn ocpTenantIocn : ocpTenantIocns) {
-                    if (ocpTenantIocn.getCompanyCode().equals(ocpTenantBase.getOwnerCompanyCode())){
+                    if (tenantCode.equals(ocpTenantIocn.getCodeNo())){
                         BeanUtils.copyProperties(ocpTenantIocn, ocpTenantGroupIocnDto);
                     }
                 }
+                    for (OcpTenantExtent ocpTenantExtent : ocpTenantExtents) {
+                        if (ocpTenantBase.getTenantCode().equals(ocpTenantBase.getTenantCode())){
+                        Short tenantState = ocpTenantExtent.getTenantState();
+                        ocpTenantGroupIocnDto.setTenantState(tenantState);
+                    }
+                }
+                groupIocnDtos.add(ocpTenantGroupIocnDto);
             }
         }
         return groupIocnDtos;

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

 package com.pms.ocp.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.pms.ocp.mapper.OcpApiBaseMapper;
+import com.pms.ocp.mapper.OcpApiGroupMapper;
 import com.pms.ocp.mapper.PmsApiManagementMapper;
-import com.pms.ocp.model.entity.PmsApiManagement;
+import com.pms.ocp.mapper.PmsApiModelRelMapper;
+import com.pms.ocp.model.CommonCode;
+import com.pms.ocp.model.ResponseResult;
+import com.pms.ocp.model.entity.*;
 import com.pms.ocp.model.vo.ResponseVO;
 import com.pms.ocp.service.PmsApiManagementService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -20,6 +26,15 @@ public class PmsApiManagementServiceImpl extends ServiceImpl<PmsApiManagementMap
     @Autowired
     private PmsApiManagementMapper pmsApiManagementMapper;
 
+    @Autowired
+    private OcpApiBaseMapper ocpApiBaseMapper;
+
+    @Autowired
+    private OcpApiGroupMapper ocpApiGroupMapper;
+
+    @Autowired
+    private PmsApiModelRelMapper pmsApiModelRelMapper;
+
 
 
     @Override
@@ -38,4 +53,32 @@ public class PmsApiManagementServiceImpl extends ServiceImpl<PmsApiManagementMap
         List<PmsApiManagement> pammByCode = pmsApiManagementMapper.getPammByCode(pmsApiManagement);
         return ResponseVO.ok(pammByCode);
     }
+
+
+    @Override
+    public ResponseResult UpdatePammByCode(OcpApiBase ocpApiBase) {
+        if(ocpApiBase == null){
+            ocpApiBase = new OcpApiBase();
+        }
+        QueryWrapper<OcpApiBase> oab = getCondition(ocpApiBase.getApiCode());
+        OcpApiBase one = ocpApiBaseMapper.selectOne(oab);
+        if(one != null) {
+            ocpApiBase.setObjId(null);
+            int update = ocpApiBaseMapper.update(ocpApiBase, oab);
+            if (update < 0) {
+                return new ResponseResult(CommonCode.FAIL);
+            }
+            return new ResponseResult(CommonCode.SUCCESS);
+        }
+        return new ResponseResult(CommonCode.FAIL);
+    }
+    private QueryWrapper<OcpApiBase> getCondition(String apiCode){
+        QueryWrapper<OcpApiBase> qw = new QueryWrapper<>();
+
+        if(StringUtils.isNotBlank(apiCode)){
+            qw.eq("api_code",apiCode);
+        }
+        return qw;
+    }
+
 }

src/main/resources/mapper/PmsApiManagementMapper.xml

@@ -13,7 +13,7 @@
         oab.api_resp,
         oab.api_url,
         oab.api_ctime,
-        DATE_FORMAT( api_mtime, '%Y','%m','%d') api_mtime_string,
+        api_mtime,
         oab.api_user_id,
         oab.api_unit,
         oab.owner_company_code,
@@ -52,6 +52,10 @@
         <if test="apiMtime != null">
             AND api_mtime &lt;= DATE_FORMAT(#{apiMtime},'%Y-%m-%d ')
         </if>
+
+        <if test="isDelete != null and isDelete != ''">
+            and oab.is_delete = #{isDelete}
+        </if>
     </select>
 
     <select id="getPammByCode" resultType="com.pms.ocp.model.entity.PmsApiManagement">
@@ -97,4 +101,7 @@
         where oab.api_code = #{apiCode}
     </select>
 
+
+
+
 </mapper>
\ No newline at end of file