Merge remote-tracking branch 'origin/master'

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

@@ -9,6 +9,7 @@ import com.pms.ocp.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -38,6 +39,9 @@ public class PmsApiDetailsController {
     @Autowired
     private PmsApiManagementService pmsApiManagementService;
 
+    @Autowired
+    private OcpApiTreeService service;
+
 
     @ApiOperation("服务订阅记录-查询")
     @PostMapping("/getocpapisublist")
@@ -102,8 +106,13 @@ public class PmsApiDetailsController {
 
     @ApiOperation("服务分类——添加服务")
     @PostMapping("/add")
-    public ResponseResult add(@RequestBody  PmsApiMangageApi pmsApiMangageApi) {
-        return pmsApiManagementService.add(pmsApiMangageApi);
+    public ResponseVO add(@RequestBody  PmsApiMangageApi pmsApiMangageApi) {
+        PmsApiMangageApi pmsApiMangageApi1 = pmsApiManagementService.add(pmsApiMangageApi);
+        if (StringUtils.isBlank(pmsApiMangageApi1.getObjId())){
+            return ResponseVO.error("id已存在");
+        }else {
+            return ResponseVO.ok(pmsApiMangageApi1);
+        }
     }
 
 

src/main/java/com/pms/ocp/model/CommonCode.java

@@ -6,6 +6,7 @@ import lombok.ToString;
 public enum CommonCode implements ResultCode {
 
     SUCCESS(true,0,"操作成功!"),
+    NOSUCCESS(true,999,"操作失败!"),
     UNAUTHENTICATED(false,10001,"此操作需要登陆系统!"),
     UNAUTHORISE(false,10002,"权限不足，无权操作!"),
     INVALID_PARAM(false,10003,"非法参数!"),

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

@@ -58,4 +58,8 @@ public class ResponseVO<T> extends BaseResponse {
         return tResponseVO;
     }
 
+    public static <T> ResponseVO<T> errorr(CodeEnum codeEnum) {
+        return new ResponseVO<T>(codeEnum);
+    }
+
 }
\ No newline at end of file

src/main/java/com/pms/ocp/service/PmsApiManagementService.java

@@ -4,8 +4,6 @@ package com.pms.ocp.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.github.pagehelper.PageInfo;
 import com.pms.ocp.model.ResponseResult;
-import com.pms.ocp.model.entity.OcpApiBase;
-import com.pms.ocp.model.entity.OcpApiGroup;
 import com.pms.ocp.model.entity.PmsApiManagement;
 import com.pms.ocp.model.entity.PmsApiMangageApi;
 import com.pms.ocp.model.vo.ResponseVO;
@@ -23,7 +21,7 @@ public interface PmsApiManagementService extends IService<PmsApiManagement> {
 
 
 
-    ResponseResult add(PmsApiMangageApi pmsApiMangageApi);
+    PmsApiMangageApi add(PmsApiMangageApi pmsApiMangageApi);
 
     ResponseResult deleteApi(PmsApiMangageApi pmsApiMangageApi);
 

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.pms.ocp.common.constants.Constant;
+import com.pms.ocp.common.utils.GUIDGenerator;
 import com.pms.ocp.mapper.OcpApiBaseMapper;
 import com.pms.ocp.mapper.OcpApiGroupMapper;
 import com.pms.ocp.mapper.PmsApiManagementMapper;
@@ -57,11 +59,12 @@ public class PmsApiManagementServiceImpl extends ServiceImpl<PmsApiManagementMap
 
 
     @Override
-    public ResponseResult add(PmsApiMangageApi pmsApiMangageApi) {
+    public PmsApiMangageApi add(PmsApiMangageApi pmsApiMangageApi) {
+        pmsApiMangageApi.setObjId(GUIDGenerator.generate32(true));
         pmsApiManagementMapper.addPamm(pmsApiMangageApi);
         pmsApiMangageApi.setApiCode(pmsApiMangageApi.getApiGroupName());
         pmsApiManagementMapper.addOag(pmsApiMangageApi);
-        return new ResponseResult(CommonCode.SUCCESS);
+        return pmsApiMangageApi;
     }
 
     @Override

src/main/resources/mapper/PmsApiManagementMapper.xml

@@ -13,7 +13,7 @@
         oab.api_resp,
         oab.api_url,
         oab.api_ctime,
-        api_mtime,
+        oab.api_mtime,
         oab.api_user_id,
         oab.api_unit,
         oab.owner_company_code,
@@ -45,9 +45,16 @@
             and api_user_name = #{apiUserName}
         </if>
 
-        <if test="apiMtime != null">
-            AND api_mtime >= DATE_FORMAT(#{apiMtime},'%Y-%m-%d ')
-        </if>
+<!--        <if test="startCTime !=null  ">-->
+<!--            <![CDATA[-->
+<!--                and oab.api_mtime >= #{startCTime}-->
+<!--                ]]>-->
+<!--        </if>-->
+<!--        <if test="endCTime !=null  ">-->
+<!--            <![CDATA[-->
+<!--            and oab.api_mtime <= #{endCTime}-->
+<!--            ]]>-->
+<!--        </if>-->
 
         <if test="apiMtime != null">
             AND api_mtime &lt;= DATE_FORMAT(#{apiMtime},'%Y-%m-%d ')
@@ -184,7 +191,6 @@
             <if test="apiGroupName != null and apiGroupName != ''">
                 api_group_name = #{apiGroupName},
             </if>
-
         </set>
         where 1 = 1
         <if test="apiGroupCode != null and apiGroupCode != '' ">