From e1fbf4eb8ea825248da82abb2db8d6b4cc411fb3 Mon Sep 17 00:00:00 2001
From: diaoruifeng <18351522362@163.com>
Date: Tue, 29 Mar 2022 18:08:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/pms/ocp/model/entity/OcpApiParam.java   | 12 ++++++------
 .../com/pms/ocp/model/entity/PmsApiManagement.java   |  2 +-
 .../com/pms/ocp/model/entity/PmsApiMangageApi.java   | 12 ++++++------
 .../service/impl/PmsApiManagementServiceImpl.java    |  5 ++++-
 src/main/resources/mapper/OcpApiGroupMapper.xml      |  5 +++--
 5 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/pms/ocp/model/entity/OcpApiParam.java b/src/main/java/com/pms/ocp/model/entity/OcpApiParam.java
index feccdfa..88f4d49 100644
--- a/src/main/java/com/pms/ocp/model/entity/OcpApiParam.java
+++ b/src/main/java/com/pms/ocp/model/entity/OcpApiParam.java
@@ -13,7 +13,7 @@ import java.sql.Timestamp;
 
 @Data
 @Accessors(chain = true)
-@TableName("ocp_apiParam")
+@TableName("ocp_api_param")
 @ApiModel("服务参数表")
 public class OcpApiParam   implements Serializable {
 
@@ -26,7 +26,7 @@ public class OcpApiParam   implements Serializable {
   private String apiCode;
 
   @ApiModelProperty("参数版本")
-  private String apiParamversion;
+  private String apiParamVersion;
 
   @ApiModelProperty("参数分类out出参  in入参 ")
   private String apiParamClassification;
@@ -66,12 +66,12 @@ public class OcpApiParam   implements Serializable {
         this.apiCode = apiCode;
     }
 
-    public String getApiParamversion() {
-        return apiParamversion;
+    public String getApiParamVersion() {
+        return apiParamVersion;
     }
 
-    public void setApiParamversion(String apiParamversion) {
-        this.apiParamversion = apiParamversion;
+    public void setApiParamVersion(String apiParamVersion) {
+        this.apiParamVersion = apiParamVersion;
     }
 
     public String getApiParamClassification() {
diff --git a/src/main/java/com/pms/ocp/model/entity/PmsApiManagement.java b/src/main/java/com/pms/ocp/model/entity/PmsApiManagement.java
index 4b0dbc1..720120a 100644
--- a/src/main/java/com/pms/ocp/model/entity/PmsApiManagement.java
+++ b/src/main/java/com/pms/ocp/model/entity/PmsApiManagement.java
@@ -13,7 +13,7 @@ import java.sql.Timestamp;
 @Accessors(chain = true)
 @ApiModel("服务管理")
 public class PmsApiManagement {
-
+    @TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty("主键ID")
     private String objId;
 
diff --git a/src/main/java/com/pms/ocp/model/entity/PmsApiMangageApi.java b/src/main/java/com/pms/ocp/model/entity/PmsApiMangageApi.java
index a1d75b2..d5dcdc1 100644
--- a/src/main/java/com/pms/ocp/model/entity/PmsApiMangageApi.java
+++ b/src/main/java/com/pms/ocp/model/entity/PmsApiMangageApi.java
@@ -34,10 +34,10 @@ public class PmsApiMangageApi {
     private String apiUrl;
 
     @ApiModelProperty("服务创建时间")
-    private Timestamp apiCtime;
+    private String apiCtime;
 
     @ApiModelProperty("服务修改时间")
-    private Timestamp apiMtime;
+    private String apiMtime;
 
     @ApiModelProperty("创建者用户ID")
     private String apiUserId;
@@ -222,19 +222,19 @@ public class PmsApiMangageApi {
         this.apiUrl = apiUrl;
     }
 
-    public Timestamp getApiCtime() {
+    public String getApiCtime() {
         return apiCtime;
     }
 
-    public void setApiCtime(Timestamp apiCtime) {
+    public void setApiCtime(String apiCtime) {
         this.apiCtime = apiCtime;
     }
 
-    public Timestamp getApiMtime() {
+    public String getApiMtime() {
         return apiMtime;
     }
 
-    public void setApiMtime(Timestamp apiMtime) {
+    public void setApiMtime(String apiMtime) {
         this.apiMtime = apiMtime;
     }
 
diff --git a/src/main/java/com/pms/ocp/service/impl/PmsApiManagementServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/PmsApiManagementServiceImpl.java
index 9344e67..202c48a 100644
--- a/src/main/java/com/pms/ocp/service/impl/PmsApiManagementServiceImpl.java
+++ b/src/main/java/com/pms/ocp/service/impl/PmsApiManagementServiceImpl.java
@@ -7,6 +7,7 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.pms.ocp.common.constants.CodeEnum;
 import com.pms.ocp.common.utils.GUIDGenerator;
+import com.pms.ocp.common.utils.RandomStringUtils;
 import com.pms.ocp.mapper.*;
 import com.pms.ocp.model.CommonCode;
 import com.pms.ocp.model.ResponseResult;
@@ -62,7 +63,9 @@ public class PmsApiManagementServiceImpl extends ServiceImpl<PmsApiManagementMap
 
     @Override
     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);
         pmsApiMangageApi.setApiCode(pmsApiMangageApi.getApiGroupName());
         pmsApiManagementMapper.addOag(pmsApiMangageApi);
diff --git a/src/main/resources/mapper/OcpApiGroupMapper.xml b/src/main/resources/mapper/OcpApiGroupMapper.xml
index 0f53dc4..c6e0d11 100644
--- a/src/main/resources/mapper/OcpApiGroupMapper.xml
+++ b/src/main/resources/mapper/OcpApiGroupMapper.xml
@@ -72,10 +72,10 @@
     <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
+        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_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 ">
@@ -105,6 +105,7 @@
                 and oab.api_name like CONCAT('%', #{keyword}::text,'%')
             </if>
         </where>
+        order by oab.api_mtime desc
     </select>
 
 
-- 
2.26.0