From 2e63883b0a6b3442d02c5d1853f107dd3dc07afb Mon Sep 17 00:00:00 2001
From: diaoruifeng <18351522362@163.com>
Date: Wed, 30 Mar 2022 17:18:22 +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

---
 .../ocp/controller/PmsApiDetailsController.java | 11 +++++++++--
 .../pms/ocp/mapper/PmsApiManagementMapper.java  |  6 ++----
 .../pms/ocp/model/entity/PmsApiMangageApi.java  | 12 ++++++++++++
 .../java/com/pms/ocp/model/vo/OcpApiBaseVo.java |  4 ++++
 .../ocp/service/PmsApiManagementService.java    |  2 +-
 .../impl/PmsApiManagementServiceImpl.java       | 17 ++++++++++-------
 src/main/resources/mapper/OcpApiGroupMapper.xml | 15 +++++++++++----
 7 files changed, 49 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/pms/ocp/controller/PmsApiDetailsController.java b/src/main/java/com/pms/ocp/controller/PmsApiDetailsController.java
index a90f140..835b7b7 100644
--- a/src/main/java/com/pms/ocp/controller/PmsApiDetailsController.java
+++ b/src/main/java/com/pms/ocp/controller/PmsApiDetailsController.java
@@ -130,8 +130,15 @@ public class PmsApiDetailsController {
 
     @ApiOperation("服务分类——编辑服务")
     @PostMapping("/update")
-    public ResponseResult update(@RequestBody  PmsApiMangageApi pmsApiMangageApi) {
-        return pmsApiManagementService.updateApi(pmsApiMangageApi);
+    public ResponseVO update(@RequestBody  PmsApiMangageApi pmsApiMangageApi) {
+        PmsApiMangageApi pmsApiMangageApi1 = pmsApiManagementService.updateApi(pmsApiMangageApi);
+        if (pmsApiMangageApi1.getBoole()){
+            return ResponseVO.ok(pmsApiMangageApi1);
+        }else {
+            return ResponseVO.error("修改失败");
+
+        }
+
     }
 
     @ApiOperation("模型分类导航")
diff --git a/src/main/java/com/pms/ocp/mapper/PmsApiManagementMapper.java b/src/main/java/com/pms/ocp/mapper/PmsApiManagementMapper.java
index e51e25f..6a6033b 100644
--- a/src/main/java/com/pms/ocp/mapper/PmsApiManagementMapper.java
+++ b/src/main/java/com/pms/ocp/mapper/PmsApiManagementMapper.java
@@ -30,9 +30,7 @@ public interface PmsApiManagementMapper extends BaseMapper<PmsApiManagement> {
 
     List<PmsApiManagement> getList(PmsApiManagement pmsApiManagement);
 
+    int updateExent(PmsApiMangageApi pmsApiMangageApi);
 
-
-
-
-
+    int uodateIcon(PmsApiMangageApi pmsApiMangageApi);
 }
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 d5dcdc1..0005b30 100644
--- a/src/main/java/com/pms/ocp/model/entity/PmsApiMangageApi.java
+++ b/src/main/java/com/pms/ocp/model/entity/PmsApiMangageApi.java
@@ -158,6 +158,18 @@ public class PmsApiMangageApi {
     @ApiModelProperty("关系创建用户")
     private String apiTenantRelUserName;
 
+    @ApiModelProperty("是否成功")
+    private boolean boole;
+
+
+    public boolean getBoole() {
+        return boole;
+    }
+
+    public void setBoole(boolean boole) {
+        this.boole = boole;
+    }
+
     public String getObjId() {
         return objId;
     }
diff --git a/src/main/java/com/pms/ocp/model/vo/OcpApiBaseVo.java b/src/main/java/com/pms/ocp/model/vo/OcpApiBaseVo.java
index 73e0d1c..db55e30 100644
--- a/src/main/java/com/pms/ocp/model/vo/OcpApiBaseVo.java
+++ b/src/main/java/com/pms/ocp/model/vo/OcpApiBaseVo.java
@@ -49,6 +49,10 @@ public class OcpApiBaseVo implements Serializable {
     @ApiModelProperty(value = "建设单位")
     @Excel(name = "建设单位")
     private String apiUnit;
+    @ApiModelProperty(value = "查询开始时间")
+    private String startTime;
+    @ApiModelProperty(value = "查询结束时间")
+    private String endTime;
     @ApiModelProperty(value = "出参入参")
     private List<OcpApiParam> apiParams;
     @ApiModelProperty(value = "出参集合")
diff --git a/src/main/java/com/pms/ocp/service/PmsApiManagementService.java b/src/main/java/com/pms/ocp/service/PmsApiManagementService.java
index f9bcf2d..3c59b39 100644
--- a/src/main/java/com/pms/ocp/service/PmsApiManagementService.java
+++ b/src/main/java/com/pms/ocp/service/PmsApiManagementService.java
@@ -29,7 +29,7 @@ public interface PmsApiManagementService extends IService<PmsApiManagement> {
 
     ResponseResult deleteApi(PmsApiMangageApi pmsApiMangageApi);
 
-    ResponseResult updateApi(PmsApiMangageApi pmsApiMangageApi);
+    PmsApiMangageApi updateApi(PmsApiMangageApi pmsApiMangageApi);
 
     ResponseVO<List<OcpApiGroupVo>> getApiNavigation();
 
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 61ca298..e4a591b 100644
--- a/src/main/java/com/pms/ocp/service/impl/PmsApiManagementServiceImpl.java
+++ b/src/main/java/com/pms/ocp/service/impl/PmsApiManagementServiceImpl.java
@@ -67,8 +67,6 @@ public class PmsApiManagementServiceImpl extends ServiceImpl<PmsApiManagementMap
         pmsApiMangageApi.setObjId(randomString);
         pmsApiMangageApi.setApiCtime(pmsApiMangageApi.getApiMtime());
         pmsApiManagementMapper.addPamm(pmsApiMangageApi);
-        pmsApiMangageApi.setApiCode(pmsApiMangageApi.getApiGroupName());
-        pmsApiManagementMapper.addOag(pmsApiMangageApi);
         return pmsApiMangageApi;
     }
 
@@ -83,11 +81,16 @@ public class PmsApiManagementServiceImpl extends ServiceImpl<PmsApiManagementMap
         }
 
     @Override
-    public ResponseResult updateApi(PmsApiMangageApi pmsApiMangageApi) {
-        pmsApiManagementMapper.updatePamm(pmsApiMangageApi);
-        pmsApiMangageApi.setApiCode(pmsApiMangageApi.getApiGroupName());
-        pmsApiManagementMapper.updateOag(pmsApiMangageApi);
-        return new ResponseResult(CommonCode.SUCCESS);
+    public PmsApiMangageApi updateApi(PmsApiMangageApi pmsApiMangageApi) {
+        int i = pmsApiManagementMapper.updatePamm(pmsApiMangageApi);
+        //pmsApiManagementMapper.updateExent(pmsApiMangageApi);
+        //pmsApiManagementMapper.uodateIcon(pmsApiMangageApi);
+        if(i==0){
+            pmsApiMangageApi.setBoole(false);
+        }else {
+            pmsApiMangageApi.setBoole(true);
+        }
+        return pmsApiMangageApi;
     }
 
     @Override
diff --git a/src/main/resources/mapper/OcpApiGroupMapper.xml b/src/main/resources/mapper/OcpApiGroupMapper.xml
index f3ec27b..c874a1f 100644
--- a/src/main/resources/mapper/OcpApiGroupMapper.xml
+++ b/src/main/resources/mapper/OcpApiGroupMapper.xml
@@ -92,17 +92,24 @@
             <if test="apiUnit !=null and apiUnit!=''">
                 and oab.api_unit = #{apiUnit}
             </if>
+            <if test="professionalKind !=null and professionalKind!=''">
+                and oab.professional_kind = #{professionalKind}
+            </if>
+            <if test="apiUserName !=null and apiUserName!=''">
+                and oab.api_user_name like CONCAT('%', #{apiUserName}::text,'%')
+            </if>
+
             <if test="apiPromotion !=null and apiPromotion!=''">
                 and oab.api_promotion = #{apiPromotion}
             </if>
-            <if test="startCTime !=null  ">
+            <if test="startTime !=null  ">
                 <![CDATA[
-                and oab.api_ctime >= #{startCTime}
+                and oab.api_ctime >= #{startTime}
                 ]]>
             </if>
-            <if test="endCTime !=null  ">
+            <if test="endTime !=null  ">
                 <![CDATA[
-            and oab.api_ctime <= #{endCTime}
+            and oab.api_ctime <= #{endTime}
             ]]>
             </if>
             <if test="keyword !=null and keyword != '' ">
-- 
2.26.0