Commit e1fbf4eb authored by diaoruifeng's avatar diaoruifeng

优化

parent 4b1ad61c
...@@ -13,7 +13,7 @@ import java.sql.Timestamp; ...@@ -13,7 +13,7 @@ import java.sql.Timestamp;
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@TableName("ocp_apiParam") @TableName("ocp_api_param")
@ApiModel("服务参数表") @ApiModel("服务参数表")
public class OcpApiParam implements Serializable { public class OcpApiParam implements Serializable {
...@@ -26,7 +26,7 @@ public class OcpApiParam implements Serializable { ...@@ -26,7 +26,7 @@ public class OcpApiParam implements Serializable {
private String apiCode; private String apiCode;
@ApiModelProperty("参数版本") @ApiModelProperty("参数版本")
private String apiParamversion; private String apiParamVersion;
@ApiModelProperty("参数分类out出参 in入参 ") @ApiModelProperty("参数分类out出参 in入参 ")
private String apiParamClassification; private String apiParamClassification;
...@@ -66,12 +66,12 @@ public class OcpApiParam implements Serializable { ...@@ -66,12 +66,12 @@ public class OcpApiParam implements Serializable {
this.apiCode = apiCode; this.apiCode = apiCode;
} }
public String getApiParamversion() { public String getApiParamVersion() {
return apiParamversion; return apiParamVersion;
} }
public void setApiParamversion(String apiParamversion) { public void setApiParamVersion(String apiParamVersion) {
this.apiParamversion = apiParamversion; this.apiParamVersion = apiParamVersion;
} }
public String getApiParamClassification() { public String getApiParamClassification() {
......
...@@ -13,7 +13,7 @@ import java.sql.Timestamp; ...@@ -13,7 +13,7 @@ import java.sql.Timestamp;
@Accessors(chain = true) @Accessors(chain = true)
@ApiModel("服务管理") @ApiModel("服务管理")
public class PmsApiManagement { public class PmsApiManagement {
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty("主键ID") @ApiModelProperty("主键ID")
private String objId; private String objId;
......
...@@ -34,10 +34,10 @@ public class PmsApiMangageApi { ...@@ -34,10 +34,10 @@ public class PmsApiMangageApi {
private String apiUrl; private String apiUrl;
@ApiModelProperty("服务创建时间") @ApiModelProperty("服务创建时间")
private Timestamp apiCtime; private String apiCtime;
@ApiModelProperty("服务修改时间") @ApiModelProperty("服务修改时间")
private Timestamp apiMtime; private String apiMtime;
@ApiModelProperty("创建者用户ID") @ApiModelProperty("创建者用户ID")
private String apiUserId; private String apiUserId;
...@@ -222,19 +222,19 @@ public class PmsApiMangageApi { ...@@ -222,19 +222,19 @@ public class PmsApiMangageApi {
this.apiUrl = apiUrl; this.apiUrl = apiUrl;
} }
public Timestamp getApiCtime() { public String getApiCtime() {
return apiCtime; return apiCtime;
} }
public void setApiCtime(Timestamp apiCtime) { public void setApiCtime(String apiCtime) {
this.apiCtime = apiCtime; this.apiCtime = apiCtime;
} }
public Timestamp getApiMtime() { public String getApiMtime() {
return apiMtime; return apiMtime;
} }
public void setApiMtime(Timestamp apiMtime) { public void setApiMtime(String apiMtime) {
this.apiMtime = apiMtime; this.apiMtime = apiMtime;
} }
......
...@@ -7,6 +7,7 @@ import com.github.pagehelper.PageHelper; ...@@ -7,6 +7,7 @@ import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.pms.ocp.common.constants.CodeEnum; import com.pms.ocp.common.constants.CodeEnum;
import com.pms.ocp.common.utils.GUIDGenerator; import com.pms.ocp.common.utils.GUIDGenerator;
import com.pms.ocp.common.utils.RandomStringUtils;
import com.pms.ocp.mapper.*; import com.pms.ocp.mapper.*;
import com.pms.ocp.model.CommonCode; import com.pms.ocp.model.CommonCode;
import com.pms.ocp.model.ResponseResult; import com.pms.ocp.model.ResponseResult;
...@@ -62,7 +63,9 @@ public class PmsApiManagementServiceImpl extends ServiceImpl<PmsApiManagementMap ...@@ -62,7 +63,9 @@ public class PmsApiManagementServiceImpl extends ServiceImpl<PmsApiManagementMap
@Override @Override
public PmsApiMangageApi add(PmsApiMangageApi pmsApiMangageApi) { public PmsApiMangageApi add(PmsApiMangageApi pmsApiMangageApi) {
pmsApiMangageApi.setObjId(GUIDGenerator.generate32(true)); String randomString = RandomStringUtils.getRandomString(32);
pmsApiMangageApi.setObjId(randomString);
pmsApiMangageApi.setApiCtime(pmsApiMangageApi.getApiMtime());
pmsApiManagementMapper.addPamm(pmsApiMangageApi); pmsApiManagementMapper.addPamm(pmsApiMangageApi);
pmsApiMangageApi.setApiCode(pmsApiMangageApi.getApiGroupName()); pmsApiMangageApi.setApiCode(pmsApiMangageApi.getApiGroupName());
pmsApiManagementMapper.addOag(pmsApiMangageApi); pmsApiManagementMapper.addOag(pmsApiMangageApi);
......
...@@ -72,10 +72,10 @@ ...@@ -72,10 +72,10 @@
<select id="selectPageLists" resultType="com.pms.ocp.model.vo.OcpApiBaseVo"> <select id="selectPageLists" resultType="com.pms.ocp.model.vo.OcpApiBaseVo">
select select
oab.obj_id,oab.api_code,oae.api_code,oab.api_name,oae.cluster_name, 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 oae.space_name,oab.api_url,oae.api_state ,oab.api_unit ,oab.api_ctime,
oab.api_description,oab.professional_kind oab.api_description,oab.professional_kind
from ocp_api_base oab from ocp_api_base oab
LEFT JOIN ocp_api_extent oae on oab.api_code = oae.api_code 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 LEFT JOIN ocp_tenant_iocn oci on oab.api_code = oci.code_no
<where> <where>
<if test="apiGroupCodeList !=null "> <if test="apiGroupCodeList !=null ">
...@@ -105,6 +105,7 @@ ...@@ -105,6 +105,7 @@
and oab.api_name like CONCAT('%', #{keyword}::text,'%') and oab.api_name like CONCAT('%', #{keyword}::text,'%')
</if> </if>
</where> </where>
order by oab.api_mtime desc
</select> </select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment