Merge remote-tracking branch 'origin/master'

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

 package com.pms.ocp.controller;
 
 
+import com.github.pagehelper.PageInfo;
 import com.pms.ocp.model.entity.*;
 import com.pms.ocp.model.vo.ResponseVO;
 import com.pms.ocp.service.*;
@@ -33,6 +34,9 @@ public class PmsApiDetailsController {
     @Autowired
     private PmsApiModelRelService pmsApiModelRelService;
 
+    @Autowired
+    private PmsApiManagementService pmsApiManagementService;
+
 
     @ApiOperation("服务订阅记录-查询")
     @PostMapping("/getocpapisublist")
@@ -82,6 +86,18 @@ public class PmsApiDetailsController {
         pmsApiAuditService.exportExcel(pmsApiAudit,request,response);
     }
 
+    @ApiOperation("服务分类")
+    @PostMapping("/getPamm")
+    public ResponseVO<PageInfo<PmsApiManagement>> getPamm(@RequestBody PmsApiManagement pmsApiManagement) {
+        return pmsApiManagementService.getPammList(pmsApiManagement);
+    }
+
+    @ApiOperation("服务分类——详情")
+    @PostMapping("/getPammByCode")
+    public ResponseVO<List<PmsApiManagement>> getPammByCode(@RequestBody PmsApiManagement pmsApiManagement) {
+        return pmsApiManagementService.getPammByCode(pmsApiManagement);
+    }
+
 
 
 }

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

+package com.pms.ocp.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.pms.ocp.model.entity.PmsApiManagement;
+
+import java.util.List;
+
+public interface PmsApiManagementMapper extends BaseMapper<PmsApiManagement> {
+
+    List<PmsApiManagement> getPammList(PmsApiManagement pmsApiManagement);
+
+    List<PmsApiManagement> getPammByCode(PmsApiManagement pmsApiManagement);
+}

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

+package com.pms.ocp.model.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.sql.Timestamp;
+
+@Data
+@Accessors(chain = true)
+@ApiModel("服务管理")
+public class PmsApiManagement {
+
+    @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 Integer currentPage;
+
+    @ApiModelProperty("每页条数")
+    private Integer pageSize;
+
+    public Integer getCurrentPage() {
+        return currentPage;
+    }
+
+    public void setCurrentPage(Integer currentPage) {
+        this.currentPage = currentPage;
+    }
+
+    public Integer getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+}

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

+package com.pms.ocp.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.pagehelper.PageInfo;
+import com.pms.ocp.model.entity.PmsApiManagement;
+import com.pms.ocp.model.vo.ResponseVO;
+
+
+
+
+public interface PmsApiManagementService extends IService<PmsApiManagement> {
+
+    ResponseVO<PageInfo<PmsApiManagement>> getPammList(PmsApiManagement pmsApiManagement);
+
+    ResponseVO getPammByCode(PmsApiManagement pmsApiManagement);
+}

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.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.pms.ocp.mapper.PmsApiManagementMapper;
+import com.pms.ocp.model.entity.PmsApiManagement;
+import com.pms.ocp.model.vo.ResponseVO;
+import com.pms.ocp.service.PmsApiManagementService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+@Service
+public class PmsApiManagementServiceImpl extends ServiceImpl<PmsApiManagementMapper, PmsApiManagement> implements PmsApiManagementService {
+
+    @Autowired
+    private PmsApiManagementMapper pmsApiManagementMapper;
+
+
+
+    @Override
+    public ResponseVO<PageInfo<PmsApiManagement>> getPammList(PmsApiManagement pmsApiManagement) {
+        if (pmsApiManagement.getCurrentPage() ==null || pmsApiManagement.getPageSize() == null) {
+            return ResponseVO.error("分页参数不能为空");
+        }
+        PageHelper.startPage(pmsApiManagement.getCurrentPage(),pmsApiManagement.getPageSize());
+        List<PmsApiManagement> pammList = pmsApiManagementMapper.getPammList(pmsApiManagement);
+        PageInfo<PmsApiManagement> pageInfo = new PageInfo<>(pammList);
+        return ResponseVO.ok(pageInfo);
+    }
+
+    @Override
+    public ResponseVO getPammByCode(PmsApiManagement pmsApiManagement) {
+        List<PmsApiManagement> pammByCode = pmsApiManagementMapper.getPammByCode(pmsApiManagement);
+        return ResponseVO.ok(pammByCode);
+    }
+}

src/main/resources/mapper/PmsApiManagementMapper.xml

+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.pms.ocp.mapper.PmsApiManagementMapper">
+
+    <select id="getPammList" resultType="com.pms.ocp.model.entity.PmsApiManagement">
+        select
+        oab.obj_id,
+        oab.api_code,
+        api_name,
+        oab.api_group_code,
+        oab.api_promotion,
+        oab.api_req,
+        oab.api_resp,
+        oab.api_url,
+        oab.api_ctime,
+        DATE_FORMAT( api_mtime, '%Y','%m','%d') api_mtime_string,
+        oab.api_user_id,
+        oab.api_unit,
+        oab.owner_company_code,
+        oab.is_delete,
+        oab.api_zone,
+        oab.api_layer,
+        oab.api_version,
+        oab.api_center_code,
+        oab.api_description,
+        api_user_name,
+        api_group_name,
+        oti.iocn_type,
+	    oti.code_no,
+	    oti.iocn,
+	    oti.company_code
+        from ocp_api_base oab LEFT JOIN
+        ocp_api_group oag on oab.api_group_code = oag.api_group_code
+        INNER JOIN ocp_tenant_iocn oti on oab.api_code = oti.code_no
+
+        <if test="apiName != null and apiName != ''">
+            and api_name = #{apiName}
+        </if>
+
+        <if test="apiGroupName != null and apiGroupName != ''">
+            and api_group_name = #{apiGroupName}
+        </if>
+
+        <if test="apiUserName != null and apiUserName != ''">
+            and api_user_name = #{apiUserName}
+        </if>
+
+        <if test="apiMtime != null">
+            AND api_mtime >= DATE_FORMAT(#{apiMtime},'%Y-%m-%d ')
+        </if>
+
+        <if test="apiMtime != null">
+            AND api_mtime &lt;= DATE_FORMAT(#{apiMtime},'%Y-%m-%d ')
+        </if>
+    </select>
+
+    <select id="getPammByCode" resultType="com.pms.ocp.model.entity.PmsApiManagement">
+        select
+        oab.obj_id,
+        oab.api_code,
+        api_name,
+        oab.api_group_code,
+        oab.api_promotion,
+        oab.api_req,
+        oab.api_resp,
+        oab.api_url,
+        oab.api_ctime,
+        api_mtime,
+        oab.api_user_id,
+        oab.api_unit,
+        oab.owner_company_code,
+        oab.is_delete,
+        oab.api_zone,
+        oab.api_layer,
+        oab.api_version,
+        oab.api_center_code,
+        oab.api_description,
+        api_user_name,
+        api_group_name,
+        api_group_promotion_type,
+        api_group_company_code,
+        api_group_version,
+        api_group_order_no,
+        api_group_user_id,
+        api_group_user_name,
+        api_group_ctime,
+        api_group_mtime,
+        api_group_pcode,
+        api_group_level,
+        oti.iocn_type,
+        oti.code_no,
+        oti.iocn,
+        oti.company_code
+        from ocp_api_base oab LEFT JOIN
+        ocp_api_group oag on oab.api_group_code = oag.api_group_code
+        INNER JOIN ocp_tenant_iocn oti on oab.api_code = oti.code_no
+        where oab.api_code = #{apiCode}
+    </select>
+
+</mapper>
\ No newline at end of file