Merge remote-tracking branch 'origin/master'

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

@@ -124,8 +124,9 @@ public class PmsApiDetailsController {
 
     @ApiOperation("服务分类——删除服务")
     @PostMapping("/delete")
-    public void delete(@RequestBody  PmsApiMangageApi pmsApiMangageApi) {
-        pmsApiManagementService.deleteApi(pmsApiMangageApi);
+    public ResponseVO delete(@RequestBody  PmsApiMangageApi pmsApiMangageApi) {
+        ResponseResult responseResult = pmsApiManagementService.deleteApi(pmsApiMangageApi);
+       return ResponseVO.ok(responseResult.getMessage());
     }
 
     @ApiOperation("服务分类——编辑服务")

src/main/java/com/pms/ocp/model/dto/ApiBaseDto.java

@@ -20,7 +20,8 @@ public class ApiBaseDto implements Serializable {
 
     @ApiModelProperty("服务编码")
     private String apiCode;
-
+    @ApiModelProperty("服务类型")
+    private String professionalKind;
     @ApiModelProperty("服务名称")
     private String apiName;
     @ApiModelProperty("服务分类编码")
@@ -72,6 +73,8 @@ public class ApiBaseDto implements Serializable {
     @ApiModelProperty("分类名称")
     private String apiGroupName;
 
+    @ApiModelProperty("用户名称")
+    private String apiUserName;
 
     private List<String> apiGroupCodeList;
 
@@ -218,4 +221,20 @@ public class ApiBaseDto implements Serializable {
     public void setCurrentPage(Integer currentPage) {
         this.currentPage = currentPage;
     }
+
+    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;
+    }
 }

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

@@ -161,6 +161,16 @@ public class PmsApiMangageApi {
     @ApiModelProperty("是否成功")
     private boolean boole;
 
+    @ApiModelProperty("是否成功")
+    private String[] objIds;
+
+    public String[] getObjIds() {
+        return objIds;
+    }
+
+    public void setObjIds(String[] objIds) {
+        this.objIds = objIds;
+    }
 
     public boolean getBoole() {
         return boole;

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

@@ -25,13 +25,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.sql.Timestamp;
+import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 
-import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.*;
 
-import java.util.Collections;
-import java.util.List;
 import java.util.stream.Collectors;
 
 @Service
@@ -189,8 +187,16 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl<ApiBasicManagemen
         PageInfo<OcpApiBaseVo> pageInfo = new PageInfo<>(ocpApiBaseVos);
         return ResponseVO.ok(pageInfo);
     }
-
-    @Override
+        public static String timedate(String time) {
+            SimpleDateFormat sdr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            @SuppressWarnings("unused")
+            long lcc = Long.valueOf(time);
+            int i = Integer.parseInt(time);
+            String times = sdr.format(new Date(i * 1000L));
+            return times;
+
+         }
+        @Override
     public List<OcpApiBase> apiBaseTreeApiList(String apiGroupCompanyCode, String apiGroupPcode) {
         QueryWrapper qw = new QueryWrapper();
         if (!StringUtils.isEmpty(apiGroupPcode)) {

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

@@ -65,7 +65,7 @@ public class PmsApiManagementServiceImpl extends ServiceImpl<PmsApiManagementMap
     public PmsApiMangageApi add(PmsApiMangageApi pmsApiMangageApi) {
         String randomString = RandomStringUtils.getRandomString(32);
         pmsApiMangageApi.setObjId(randomString);
-        pmsApiMangageApi.setApiCtime(pmsApiMangageApi.getApiMtime());
+//        pmsApiMangageApi.setApiCtime(pmsApiMangageApi.getApiMtime());
         pmsApiManagementMapper.addPamm(pmsApiMangageApi);
         return pmsApiMangageApi;
     }
@@ -76,8 +76,12 @@ public class PmsApiManagementServiceImpl extends ServiceImpl<PmsApiManagementMap
         int apiModelCount = pmsApiManagementMapper.getApiModel(pmsApiMangageApi.getApiCode());
         //应用服务
         int apiTenantCount  = pmsApiManagementMapper.getApitenant(pmsApiMangageApi.getApiCode());
-        pmsApiManagementMapper.deleteApi(pmsApiMangageApi);
-        return ResponseResult.SUCCESS(true);
+        if(apiModelCount==0 && apiTenantCount==0){
+            pmsApiManagementMapper.deleteApi(pmsApiMangageApi);
+            return ResponseResult.SUCCESS(true);
+        }
+       return ResponseResult.SUCCESS(false);
+
         }
 
     @Override

src/main/resources/mapper/OcpApiGroupMapper.xml

@@ -102,19 +102,22 @@
             <if test="apiPromotion !=null and apiPromotion!=''">
                 and oab.api_promotion = #{apiPromotion}
             </if>
-            <if test="startTime !=null  ">
+            <if test="startCTime !=null  and startCTime!= ''">
                 <![CDATA[
-                and oab.api_ctime >= #{startTime}
+                and oab.api_ctime >= #{startCTime}
                 ]]>
             </if>
-            <if test="endTime !=null  ">
+            <if test="endCTime !=null  and endCTime!= '' ">
                 <![CDATA[
-            and oab.api_ctime <= #{endTime}
+            and oab.api_ctime <= #{endCTime}
             ]]>
             </if>
             <if test="keyword !=null and keyword != '' ">
                 and oab.api_name like CONCAT('%', #{keyword}::text,'%')
             </if>
+            <if test="apiName !=null and apiName != '' ">
+                and oab.api_name like CONCAT('%', #{apiName}::text,'%')
+            </if>
             <if test="startMTime !=null  ">
                 <![CDATA[
                 and oab.api_mtime >= #{startMTime}

src/main/resources/mapper/PmsApiManagementMapper.xml

@@ -86,7 +86,14 @@
     </insert>
 
     <delete id="deleteApi">
-        delete  from ocp_api_base oab where  oab.api_code = #{apiCode}
+        delete  from ocp_api_base oab where  1=1
+        <if test="objIds !=null ">
+            AND oab.obj_id in
+            <foreach item="objId" collection="objIds" open="(" separator=","
+                     close=")">
+                #{objId}
+            </foreach>
+        </if>
     </delete>
 
     <select id="getApiModel" parameterType="java.lang.String" resultType="java.lang.Integer">