优化

src/main/java/com/pms/ocp/model/vo/ApiProvinceVo.java

@@ -45,11 +45,160 @@ public class ApiProvinceVo implements Serializable {
     @Excel(name = "注册时间")
     private Timestamp apiCtime;
     @ApiModelProperty(value = "建设单位")
-    @Excel(name = "建设单位")
+    @Excel(name = "服务厂商")
     private String apiUnit;
-    /**
-     * 请求参数列表
-     */
+    @ApiModelProperty(value = "服务图标")
+    private String apiPic;
+    @ApiModelProperty(value = "服务返回体")
+    private String apiResp;
+    @ApiModelProperty(value = "服务请求体")
+    private String apiReq;
+    @ApiModelProperty(value = "所属专业")
+    private String professionalKind;
+    @ApiModelProperty(value = "用户名称")
+    private String apiUserName;
+    @ApiModelProperty(value = "用户id")
+    private String apiUserId;
+    @ApiModelProperty(value = "版本号")
+    private String apiVersion;
+
+    @ApiModelProperty(value = "请求参数列表")
     private List<OcpApiParam> apiParams;
+
+    public String getObjId() {
+        return objId;
+    }
+
+    public void setObjId(String objId) {
+        this.objId = objId;
+    }
+
+    public String getApiCode() {
+        return apiCode;
+    }
+
+    public void setApiCode(String apiCode) {
+        this.apiCode = apiCode;
+    }
+
+    public String getApiName() {
+        return apiName;
+    }
+
+    public void setApiName(String apiName) {
+        this.apiName = apiName;
+    }
+
+    public String getClusterName() {
+        return clusterName;
+    }
+
+    public void setClusterName(String clusterName) {
+        this.clusterName = clusterName;
+    }
+
+    public String getSpaceName() {
+        return spaceName;
+    }
+
+    public void setSpaceName(String spaceName) {
+        this.spaceName = spaceName;
+    }
+
+    public String getApiUrl() {
+        return apiUrl;
+    }
+
+    public void setApiUrl(String apiUrl) {
+        this.apiUrl = apiUrl;
+    }
+
+    public String getApiState() {
+        return apiState;
+    }
+
+    public void setApiState(String apiState) {
+        this.apiState = apiState;
+    }
+
+    public Timestamp getApiCtime() {
+        return apiCtime;
+    }
+
+    public void setApiCtime(Timestamp apiCtime) {
+        this.apiCtime = apiCtime;
+    }
+
+    public String getApiUnit() {
+        return apiUnit;
+    }
+
+    public void setApiUnit(String apiUnit) {
+        this.apiUnit = apiUnit;
+    }
+
+    public String getApiPic() {
+        return apiPic;
+    }
+
+    public void setApiPic(String apiPic) {
+        this.apiPic = apiPic;
+    }
+
+    public String getApiResp() {
+        return apiResp;
+    }
+
+    public void setApiResp(String apiResp) {
+        this.apiResp = apiResp;
+    }
+
+    public String getApiReq() {
+        return apiReq;
+    }
+
+    public void setApiReq(String apiReq) {
+        this.apiReq = apiReq;
+    }
+
+    public String getProfessionalKind() {
+        return professionalKind;
+    }
+
+    public void setProfessionalKind(String professionalKind) {
+        this.professionalKind = professionalKind;
+    }
+
+    public String getApiUserName() {
+        return apiUserName;
+    }
+
+    public void setApiUserName(String apiUserName) {
+        this.apiUserName = apiUserName;
+    }
+
+    public String getApiUserId() {
+        return apiUserId;
+    }
+
+    public void setApiUserId(String apiUserId) {
+        this.apiUserId = apiUserId;
+    }
+
+    public String getApiVersion() {
+        return apiVersion;
+    }
+
+    public void setApiVersion(String apiVersion) {
+        this.apiVersion = apiVersion;
+    }
+
+    public List<OcpApiParam> getApiParams() {
+        return apiParams;
+    }
+
+    public void setApiParams(List<OcpApiParam> apiParams) {
+        this.apiParams = apiParams;
+    }
 }
 

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

@@ -5,7 +5,10 @@ import com.pms.ocp.common.utils.RandomStringUtils;
 import com.pms.ocp.mapper.ApiDetailsMapper;
 import com.pms.ocp.mapper.ApiParamMapper;
 import com.pms.ocp.mapper.ApiProvinceMapper;
+import com.pms.ocp.mapper.AppRegisterMapper;
+import com.pms.ocp.model.dto.ImgDTO;
 import com.pms.ocp.model.entity.OcpApiParam;
+import com.pms.ocp.model.entity.OcpTenantIocn;
 import com.pms.ocp.model.vo.ApiProvinceVo;
 import com.pms.ocp.model.vo.OcpApiBaseVo;
 import com.pms.ocp.model.vo.ResponseVO;
@@ -16,6 +19,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
@@ -25,15 +29,24 @@ public class ApiProvinceServiceImpl implements ApiProvinceService {
     private ApiProvinceMapper apiProvinceMapper;
     @Autowired
     private ApiParamMapper apiParamDao;
+    @Autowired
+    private AppRegisterMapper appRegisterMapper;
 
     @Override
     public boolean updateOrCreate(ApiProvinceVo apiProvinceVo) {
         String code = RandomStringUtils.getRandomString(32);
         apiProvinceVo.setApiCode(code);
         apiProvinceMapper.insert(apiProvinceVo);
+
+        List<OcpTenantIocn> list = new ArrayList<>();
+        OcpTenantIocn ocpTenantIocn = new OcpTenantIocn();
+        ocpTenantIocn.setIocnType("api");
+        ocpTenantIocn.setCodeNo(apiProvinceVo.getApiCode());
+        ocpTenantIocn.setIocn(apiProvinceVo.getApiPic());
+        list.add(ocpTenantIocn);
+        int count = appRegisterMapper.batchInsert(list);
         List<OcpApiParam> apiParams = apiProvinceVo.getApiParams();
         if (CollectionUtils.isNotEmpty(apiParams)) {
-            //清除原有数据
             apiParams.forEach(apiParam -> {
                 apiParamDao.insert(apiParam);
                 apiParam.setApiCode(apiProvinceVo.getApiCode());

src/main/resources/mapper/OcpApiGroupMapper.xml

@@ -72,9 +72,11 @@
     <select id="selectPageLists" resultType="com.pms.ocp.model.vo.OcpApiBaseVo">
         select
         oab.obj_id,oab.api_code,oae.api_code,oab.api_name,oae.cluster_name,
-        oae.space_name,oab.api_url,oae.api_state ,oab.api_unit ,oab.api_ctime from ocp_api_base oab
-        LEFT JOIN ocp_api_extent oae
-        on oab.api_code = oae.api_code
+        oae.space_name,oab.api_url,oae.api_state ,oab.api_unit ,oab.api_ctime
+        oab.api_description,oab.professional_kind
+        from ocp_api_base oab
+        LEFT JOIN ocp_api_extent oae  on oab.api_code = oae.api_code
+        LEFT JOIN ocp_tenant_iocn oci on  oab.api_code = oci.code_no
         <where>
             <if test="apiGroupCodeList !=null ">
                 and oab.api_group_code in