讲外网代码同步到n网

src/main/java/com/pms/ocp/StartApp.java

+package com.pms.ocp;
+
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
+import org.springframework.context.annotation.Bean;
+import springfox.documentation.oas.annotations.EnableOpenApi;
+
+import java.util.TimeZone;
+
+/**
+ * @Auther: wangjian
+ * @Date: 2022/2/21 15:48
+ * @Description:启动类
+ */
+
+@SpringBootApplication
+@MapperScan(basePackages = {"com.pms.ocp.mapper"})
+@ConfigurationPropertiesScan
+@EnableOpenApi
+public class StartApp {
+    public static void main(String[] args) {
+        TimeZone.setDefault(TimeZone.getTimeZone("GMT+8"));
+        SpringApplication.run(StartApp.class, args);
+    }
+
+    /**
+     * 注册分页插件
+     */
+    @Bean
+    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.POSTGRE_SQL));
+        return interceptor;
+    }
+}

src/main/java/com/pms/ocp/common/constants/CodeEnum.java

@@ -43,7 +43,7 @@ public enum CodeEnum {
     UP_DATA_FAIL("401005", "更新失败", false),
     INSERT_FAIL("401006", "插入数据失败", false),
     DELETE_FAIL("401007", "修改失败", false),
-    DATA_REPETITION("250", "分类编码或分类名称重复", false),
+    DATA_REPETITION("250", "分类编码重复", false),
     MODEL_NAME_REPETITION("251", "模型名称不能重复", false);
 
     /**

src/main/java/com/pms/ocp/common/constants/ExportUtils.java

@@ -56,7 +56,7 @@ public class ExportUtils {
             out.flush();
         } catch (IOException e) {
             e.printStackTrace();
-            throw new ServiceException(com.pms.ocp.common.constants.ResultCode.INTERNAL_SERVER_ERROR);
+            throw new ServiceException(ResultCode.INTERNAL_SERVER_ERROR);
         } finally {
             if (out != null){
                 try {

src/main/java/com/pms/ocp/common/handler/MYLocalDateTimeTypeHandler.java

@@ -42,7 +42,7 @@ public class MYLocalDateTimeTypeHandler extends LocalDateTimeTypeHandler {
 
 //        System.out.println(object);
         // 如有需要 在这里强行转换，将sql的时间转换为LocalDateTime
-        if (object instanceof java.sql.Timestamp) {
+        if (object instanceof Timestamp) {
             //可以根据自己的需要进行转化
             return LocalDateTime.ofInstant(((Timestamp) object).toInstant(), ZoneOffset.ofHours(8));
         }

src/main/java/com/pms/ocp/common/utils/ParamTree.java

+package com.pms.ocp.common.utils;
+
+import com.pms.ocp.model.entity.ApiParam;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author guofanfan
+ * 树形
+ */
+public class ParamTree {
+    private List<ApiParam> apiParamList = new ArrayList<>();
+
+    public ParamTree(List<ApiParam> apiParamList) {
+        this.apiParamList = apiParamList;
+    }
+
+    //建立属性结构
+    public List<ApiParam> buildTree() {
+        List<ApiParam> treeMenus = new ArrayList<>();
+        for (ApiParam apiParam : getRootNode()) {
+            apiParam = buildChildren(apiParam);
+            treeMenus.add(apiParam);
+        }
+        return treeMenus;
+    }
+    //递归  子树
+    private  ApiParam buildChildren(ApiParam apiParam){
+        List<ApiParam> list = new ArrayList<>();
+        for (ApiParam param : apiParamList) {
+            if (param.getPid().equals(apiParam.getApiCode())){
+                list.add(buildChildren(param));
+            }
+        }
+        apiParam.setInChildrenList(list);
+        return apiParam;
+    }
+
+//父节点
+    private List<ApiParam> getRootNode() {
+        List<ApiParam> objects = new ArrayList<>();
+        for (ApiParam apiParam : apiParamList) {
+            if (BeagleStringUtils.isEmpty(apiParam.getPid())) {
+                objects.add(apiParam);
+            }
+        }
+        return objects;
+    }
+}
+

src/main/java/com/pms/ocp/common/utils/SimilarityRatio.java

+package com.pms.ocp.common.utils;
+
+/**
+ * 重合度算法
+ *
+ * @author Administrator
+ */
+public class SimilarityRatio {
+    private static int compare(String string, String target) {
+        // 矩阵
+        int d[][];
+        int n = string.length();
+        int m = target.length();
+        // 遍历string和target
+        int i, j;
+        // string和target
+        char ch1, ch2;
+        int temp;
+        if (n == 0) {
+            return m;
+        }
+        if (m == 0) {
+            return n;
+        }
+        d = new int[n + 1][m + 1];
+        // 初始化第一列
+        for (i = 0; i <= n; i++) {
+            d[i][0] = i;
+        }
+        // 初始化第一行
+        for (j = 0; j <= m; j++) {
+            d[0][j] = j;
+        }
+
+        for (i = 1; i <= n; i++) {
+            ch1 = string.charAt(i - 1);
+            for (j = 1; j <= m; j++) {
+                ch2 = target.charAt(j - 1);
+                if (ch1 == ch2 || ch1 == ch2 + 32 || ch1 + 32 == ch2) {
+                    temp = 0;
+                } else {
+                    temp = 1;
+                }
+                d[i][j] = min(d[i - 1][j] + 1, d[i][j - 1] + 1, d[i - 1][j - 1] + temp);
+            }
+        }
+        return d[n][m];
+    }
+
+    private static int min(int one, int two, int three) {
+        return (one = one < two ? one : two) < three ? one : three;
+    }
+
+    public static float getSimilarityRatio(String string, String target) {
+        int max = Math.max(string.length(), target.length());
+        return 1 - (float) compare(string, target) / max;
+    }
+
+//    public static void main(String[] args) {
+//        String a1 = "123456";
+//        String a2 = "kijfoi";
+//        String a3 = "oijgbv";
+//
+//        String t1 = a1 + a2;
+//        String t2 = a1 + a3;
+//        System.out.println(getSimilarityRatio(t1, t2));
+//    }
+
+}

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

+package com.pms.ocp.controller;
+
+import com.pms.ocp.common.aspectj.WebLog;
+import com.pms.ocp.model.dto.AcceptDTO;
+import com.pms.ocp.model.dto.CommitDTO;
+import com.pms.ocp.model.dto.RatioDTO;
+import com.pms.ocp.model.vo.ResponseVO;
+import com.pms.ocp.service.AcceptInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 服务验收控制器
+ *
+ * @author Administrator
+ */
+@RestController
+@RequestMapping("acceptInfo")
+@Api(tags = "重合度相关")
+public class AcceptInfoController {
+
+
+    @Autowired
+    private AcceptInfoService acceptInfoService;
+
+    @ApiOperation("服务验收")
+    @PostMapping("accept")
+    @WebLog(description = "服务验收")
+    public ResponseVO acceptInfo(@RequestBody AcceptDTO acceptDTO) {
+        ResponseVO vo = acceptInfoService.acceptInfo(acceptDTO);
+        return vo;
+    }
+
+    @ApiOperation("重合度")
+    @PostMapping("apiModelRepeat")
+    @WebLog(description = "重合度")
+    public ResponseVO apiModelRepeat(@RequestBody RatioDTO ratioDTO) {
+        ResponseVO vo = acceptInfoService.apiModelRepeat(ratioDTO);
+        return vo;
+    }
+
+
+    @ApiOperation("提交")
+    @PostMapping("apiModelRepeatCommit")
+    @WebLog(description = "提交")
+    public ResponseVO apiModelRepeatCommit(@RequestBody CommitDTO commitDTO) {
+        ResponseVO vo = acceptInfoService.apiModelRepeatCommit(commitDTO);
+        return vo;
+    }
+
+    @ApiOperation("审核人信息")
+    @PostMapping("acceptPeopleInfo")
+    @WebLog(description = "审核人信息")
+    public ResponseVO acceptPeopleInfo(@RequestBody AcceptDTO acceptDTO) {
+        ResponseVO vo = acceptInfoService.acceptPeopleInfo(acceptDTO);
+        return vo;
+    }
+
+}

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

+package com.pms.ocp.controller;
+
+import com.pms.ocp.model.dto.GroupDto;
+import com.pms.ocp.model.dto.OcpApiRequirementDto;
+import com.pms.ocp.model.dto.TenantApiDto;
+import com.pms.ocp.model.entity.ApiParam;
+import com.pms.ocp.model.entity.OcpApiModelRel;
+import com.pms.ocp.model.entity.OcpApiParam;
+import com.pms.ocp.model.entity.OcpApiTenantRel;
+import com.pms.ocp.model.vo.ResponseVO;
+import com.pms.ocp.service.OcpApiRequirementService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author guofanfan
+ * @date 2022/4/6
+ */
+@RequestMapping("/api-control")
+@RestController
+@Api(tags = "服务管控-新增-迭代 -下线")
+public class ApiControlController {
+    @Autowired
+    private OcpApiRequirementService ocpApiRequirementService;
+
+    /**
+     * @param ocpApiRequirementDto
+     * @return
+     * @author guofanfan
+     */
+    @ApiOperation("新增-服务信息填写")
+    @PostMapping("/addDemand")
+    public ResponseVO addDemand(@RequestBody OcpApiRequirementDto ocpApiRequirementDto) {
+        return ocpApiRequirementService.addDemand(ocpApiRequirementDto);
+    }
+
+    /**
+     * @param ocpApiRequirementDto
+     * @return
+     * @author guofanfan
+     */
+    @ApiOperation("新增-关联模型")
+    @PostMapping("/correlationModel")
+    public ResponseVO correlationModel(@RequestBody OcpApiRequirementDto ocpApiRequirementDto) {
+        return ocpApiRequirementService.correlationModel(ocpApiRequirementDto);
+    }
+
+    /**
+     * @param ocpApiRequirementDto
+     * @return
+     * @author guofanfan
+     */
+    @ApiOperation("新增-关联应用")
+    @PostMapping("/correlationTenant")
+    public ResponseVO correlationTenant(@RequestBody OcpApiRequirementDto ocpApiRequirementDto) {
+        return ocpApiRequirementService.correlationTenant(ocpApiRequirementDto);
+    }
+
+    /**
+     * @param tenantGroupCompanyCode
+     * @param tenantGroupCode
+     * @return
+     * @author guofanfan
+     */
+    @ApiOperation("新增-关联应用-左侧树")
+    @GetMapping("/correlationTenantTree")
+    public ResponseVO<List<GroupDto>> correlationTenantTree(@RequestParam(required = false) String tenantGroupCompanyCode,
+                                                            @RequestParam(required = false) String tenantGroupCode) {
+        List<GroupDto> list = ocpApiRequirementService.correlationTenantTree(tenantGroupCompanyCode, tenantGroupCode);
+        return ResponseVO.ok(list);
+    }
+
+    /**
+     * @param ocpApiRequirementDto
+     * @return
+     * @author guofanfan
+     */
+    @ApiOperation("新增-关联表字段")
+    @PostMapping("/correlationTableField")
+    public ResponseVO correlationTableField(@RequestBody OcpApiRequirementDto ocpApiRequirementDto) {
+        return ocpApiRequirementService.correlationTableField(ocpApiRequirementDto);
+    }
+
+
+    /**
+     * @param apiCode
+     * @return
+     * @Author：zhaochengming
+     */
+    @ApiOperation("服务--下线")
+    @GetMapping("/updatetable")
+    public ResponseVO updateTable(String apiCode) {
+        ocpApiRequirementService.updateTables(apiCode);
+        return ResponseVO.ok("请等待管理员审核");
+    }
+
+    /**
+     * 迭代-模型回显
+     * @param apiCode
+     * @return
+     * @author guofanfan
+     */
+    @ApiOperation("迭代-模型入参出参回显")
+    @GetMapping("/echoModelParameter")
+    public ResponseVO <List<OcpApiParam>> echoModelParameter(@RequestParam(required = false) String apiCode) {
+        return  ocpApiRequirementService.echoModelParameter(apiCode);
+
+    }
+
+    @ApiOperation("迭代-模型回显")
+    @GetMapping("/echoModel")
+    public ResponseVO<List<OcpApiModelRel>> echoModel(@RequestParam(required = false) String apiCode) {
+        return  ocpApiRequirementService.echoModel(apiCode);
+
+    }
+
+    /**
+     * 迭代-表字段回显
+     * @param apiCode
+     * @return
+     * @author guofanfan
+     */
+    @ApiOperation("迭代-表字段回显")
+    @GetMapping("/echoTableField")
+    public ResponseVO <Map<String,List<ApiParam>>>echoTableField(@RequestParam(required = false) String apiCode) {
+        return ocpApiRequirementService.echoTableField(apiCode);
+    }
+
+    /**
+     * @author guofanfan
+     * @param apiCode
+     * @return
+     * 迭代-应用回显
+     */
+    @ApiOperation("迭代-应用回显")
+    @GetMapping("/echoTenant")
+    public ResponseVO <List<TenantApiDto>>echoTenant(@RequestParam(required = false) String apiCode) {
+        return ocpApiRequirementService.echoTenant(apiCode);
+
+
+    }
+
+    @ApiOperation("迭代-服务信息填写")
+    @PostMapping("/updateDemand")
+    public ResponseVO updateDemand(@RequestBody OcpApiRequirementDto ocpApiRequirementDto) {
+        return ocpApiRequirementService.updateDemand(ocpApiRequirementDto);
+    }
+
+
+    @ApiOperation("迭代-审核状态")
+    @GetMapping("/selectAuditStatus")
+    public ResponseVO selectAuditStatus(@RequestParam(required = false) String apiCode) {
+        return ocpApiRequirementService.selectAuditStatus(apiCode);
+
+
+    }
+
+}

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

@@ -52,7 +52,14 @@ public class ApiManagementController {
 
         return ResponseVO.ok(list);
     }
+    @ApiOperation(value = "服务apiCode查重")
+    @GetMapping("/queryByApiCode")
+    public ResponseVO queryByApiCode(String apiCode) {
 
+        Integer count =apiManagementService.queryByApiCode(apiCode);
+
+        return ResponseVO.ok(count);
+    }
     @ApiOperation(value = "服务管理新增")
     @PostMapping("/insert/management")
     public ResponseVO insertManagement(@RequestBody ApiManagementDto apiManagementDto){

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

@@ -3,11 +3,9 @@ package com.pms.ocp.controller;
 
 
 import com.pms.ocp.model.dto.OcpGroupBaseDto;
-import com.pms.ocp.model.entity.OcpApiBase;
 import com.pms.ocp.model.vo.ApiProvinceVo;
 import com.pms.ocp.model.vo.OcpApiBaseVo;
 import com.pms.ocp.model.vo.ResponseVO;
-
 import com.pms.ocp.service.ApiBasicManagementService;
 import com.pms.ocp.service.ApiDetailsService;
 import com.pms.ocp.service.ApiProvinceService;
@@ -23,7 +21,9 @@ import java.util.List;
 @RequestMapping("/apiProvince")
 @RestController
 @Api(tags = "服务省侧服务列表接口")
-public class ApiProvinceController {
+public class
+
+ApiProvinceController {
     @Autowired
     private ApiProvinceService apiProvinceService;
     @Autowired

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

+package com.pms.ocp.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.pms.ocp.common.utils.ExcelUtils;
+import com.pms.ocp.common.utils.FileExport;
+import com.pms.ocp.common.utils.FileUtil;
+import com.pms.ocp.model.dto.ApiBaseDto;
+import com.pms.ocp.model.dto.OcpGroupBaseDto;
+import com.pms.ocp.model.entity.OcpApiBase;
+import com.pms.ocp.model.vo.OcpApiBaseVo;
+import com.pms.ocp.model.vo.ResponseVO;
+import com.pms.ocp.service.ApiBasicManagementService;
+import com.pms.ocp.service.ApiDetailsService;
+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.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.sql.Timestamp;
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author guofanfan
+ */
+@Slf4j
+@RequestMapping("/api/province")
+@RestController
+@Api(tags = "服务库省侧管理接口")
+public class ApiProvinceTreeController {
+    @Autowired
+    private ApiDetailsService apiDetailsService;
+    @Autowired
+    private ApiBasicManagementService apiBasicManagementService;
+
+
+    @ApiOperation("服务分类层级")
+    @GetMapping("/apiBaseTreeOther")
+    public ResponseVO<List<OcpGroupBaseDto>> apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupCode, Integer apiGroupPromotionType,String apiCode) {
+        List<OcpGroupBaseDto> apiTreeGroupDtos = apiBasicManagementService.apiBaseTreeOther(apiGroupCompanyCode, apiGroupCode, apiGroupPromotionType,apiCode);
+        return ResponseVO.ok(apiTreeGroupDtos);
+    }
+
+    @ApiOperation("服务树列表")
+    @GetMapping("/apiBaseTreeList")
+    public ResponseVO<List<OcpApiBase>> apiBaseTreeList(String apiGroupCompanyCode, String apiGroupCode) {
+        List<OcpApiBase> apiBaseList = apiBasicManagementService.apiBaseTreeApiList(apiGroupCompanyCode, apiGroupCode);
+        return ResponseVO.ok(apiBaseList);
+    }
+
+    @ApiOperation("服务库服务详情-查询")
+    @GetMapping("/query")
+    public ResponseVO<OcpApiBaseVo> getApiDetails(String apiCode) {
+        return apiDetailsService.getApiDetails(apiCode);
+    }
+
+}

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

@@ -9,11 +9,9 @@ import com.pms.ocp.model.dto.ModelRelationDTO;
 import com.pms.ocp.model.dto.ModelSubscribeDTO;
 import com.pms.ocp.model.entity.Model;
 import com.pms.ocp.model.entity.ModelAudit;
-import com.pms.ocp.model.entity.ModelRelation;
 import com.pms.ocp.model.entity.ModelSubscribe;
 import com.pms.ocp.model.vo.ModelAuditVO;
 import com.pms.ocp.model.vo.ModelPropertyVO;
-import com.pms.ocp.model.vo.ModelRelationInputMultiVO;
 import com.pms.ocp.model.vo.ResponseVO;
 import com.pms.ocp.service.*;
 import io.swagger.annotations.Api;
@@ -96,12 +94,12 @@ public class ModelBaseController {
      */
     @ApiOperation("模型-查询列表")
     @GetMapping("/get/model/getModeBaselList")
-    public ResponseVO getModeBaselList(@ApiParam(value = "所属级别") @RequestParam(value = "belongLevel", defaultValue = "0") String belongLevel,
+    public ResponseVO getModeBaselList(@ApiParam(value = "所属级别") @RequestParam(value = "belongLevel",defaultValue = "0") String belongLevel,
                                        @ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode,
                                        @ApiParam(value = "当前页") @RequestParam(value = "currentPage") Integer currentPage,
                                        @ApiParam(value = "每页数量") @RequestParam(value = "pageSize") Integer pageSize,
-                                       @ApiParam(value = "模糊搜索条件") @RequestParam(value = "searchCondition", required = false) String searchCondition) {
-        return modelService.getModeBaselList(belongLevel, modelCode, currentPage, pageSize, searchCondition);
+                                       @ApiParam(value = "模糊搜索条件") @RequestParam(value = "searchCondition",required = false) String searchCondition) {
+            return modelService.getModeBaselList(belongLevel, modelCode, currentPage, pageSize, searchCondition);
 
     }
 
@@ -336,18 +334,6 @@ public class ModelBaseController {
         return ResponseVO.ok(modelRelationService.getModelRelationList(objId, modelGroupCode, modelCode));
     }
 
-//    /**
-//     * 模型拓扑关系-查询2
-//     *
-//     * @return
-//     */
-//    @ApiOperation("模型拓扑关系-查询2")
-//    @PostMapping("/region/tree/list")
-//    public ResponseVO<List<ModelRelation>> regionTreeOutputVOResponse(@RequestBody ModelRelationInputMultiVO regionInputMultiVO) {
-//        log.info("regionId入参 : {}", regionInputMultiVO);
-//        return ResponseVO.ok(modelRelationService.buildMultiRegionTreeByRegionIdList(regionInputMultiVO));
-//    }
-
     /**
      * 模型拓扑关系-删除
      *

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

 package com.pms.ocp.controller;
 
-import com.pms.ocp.model.vo.ResponseVO;
-import com.pms.ocp.service.ModelCheckRuleService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.List;
-
 /**
  * @author huxiuwu
  * @version 1.0
  * @date 2022/4/11 17:15
  */
-@Slf4j
-@RequestMapping("/modelCheck")
-@RestController
-@Api(tags = "模型管控-模型信息校验")
 public class ModelCheckRuleController {
-
-    @Resource
-    private ModelCheckRuleService modelCheckRuleService;
-
-    @ApiOperation("模型校验")
-    @GetMapping("/checkRule")
-    public ResponseVO checkRule(@ApiParam(value = "搜索条件") @RequestParam(value = "modelCode", required = false)String modelCode,@ApiParam(value = "搜索条件") @RequestParam(value = "requirementCode", required = false)String requirementCode){
-        List<String> checkRules = modelCheckRuleService.checkRule(modelCode, requirementCode);
-        return ResponseVO.ok(checkRules);
-    }
-
 }

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

+package com.pms.ocp.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.pms.ocp.model.entity.PmsApiModelRel;
+import com.pms.ocp.model.entity.PmsApiTenantRel;
+import com.pms.ocp.model.vo.ApiRequirentVo;
+import com.pms.ocp.model.vo.OcpApiGroupVo;
+import com.pms.ocp.model.vo.OcpApiRequirementVo;
+import com.pms.ocp.model.vo.ResponseVO;
+import com.pms.ocp.service.OcpApiReqService;
+import com.pms.ocp.service.PmsApiModelRelService;
+import com.pms.ocp.service.PmsApiTenantRelService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@Slf4j
+@RequestMapping("/apireq")
+@RestController
+@Api(tags = "服务管控接口")
+public class OcpApiReqController {
+
+    @Autowired
+    private OcpApiReqService ocpApiReqService;
+
+    @ApiOperation("服务管控导航树-统推/自建")
+    @GetMapping("OacrTree")
+    public ResponseVO<List<OcpApiRequirementVo>> OacrTree(OcpApiRequirementVo ocpApiRequirementVo) {
+        return ocpApiReqService.OacrTree(ocpApiRequirementVo);
+    }
+
+    @ApiOperation("服务管控导航树-查询中心")
+    @GetMapping("OacrTreeCenter")
+    public ResponseVO<List<OcpApiRequirementVo>> OacrTreeCenter(OcpApiRequirementVo ocpApiRequirementVo) {
+        return ocpApiReqService.OacrTreeCenter(ocpApiRequirementVo);
+    }
+
+
+    @ApiOperation("服务管控导航树-查询所属服务")
+    @GetMapping("OacrTreeApi")
+    public ResponseVO<List<OcpApiRequirementVo>> OacrTreeApi(OcpApiRequirementVo ocpApiRequirementVo) {
+        return ocpApiReqService.OacrTreeApi(ocpApiRequirementVo);
+    }
+
+
+    @ApiOperation("服务管控-列表")
+    @GetMapping("OarcList")
+    public ResponseVO<PageInfo<OcpApiRequirementVo>> OarcList(OcpApiRequirementVo ocpApiRequirementVo) {
+        return ocpApiReqService.OcpApiReq(ocpApiRequirementVo);
+    }
+
+    @ApiOperation("服务管控需求变更-审核")
+    @GetMapping("OarcCheck")
+    public ResponseVO<List<OcpApiRequirementVo>> OarcCheck(OcpApiRequirementVo ocpApiRequirementVo) {
+        return ocpApiReqService.OarcCheck(ocpApiRequirementVo);
+    }
+
+    @ApiOperation("服务管控-列表详情")
+    @GetMapping("SelectOarcList")
+    public ResponseVO SelectOarcList(String apiCode) {
+        ApiRequirentVo apiRequirentVo = ocpApiReqService.selectOarcList(apiCode);
+        return ResponseVO.ok(apiRequirentVo);
+    }
+
+    @ApiOperation("服务管控-验收列表")
+    @GetMapping("OaratList")
+    public ResponseVO<PageInfo<OcpApiRequirementVo>> OaratList(OcpApiRequirementVo ocpApiRequirementVo) {
+        return ocpApiReqService.OcpApiReqAcc(ocpApiRequirementVo);
+    }
+
+    @ApiOperation("服务管控-验收列表详情")
+    @GetMapping("SelectOaratList")
+    public ResponseVO<List<OcpApiRequirementVo>> SelectOaratList(OcpApiRequirementVo ocpApiRequirementVo) {
+        return ocpApiReqService.selectOcpApiReqAcc(ocpApiRequirementVo);
+    }
+
+//    @ApiOperation("服务与模型关联关系")
+//    @PostMapping("/getoamrlist")
+//    public ResponseVO<List<PmsApiModelRel>> getOamrList(@RequestBody PmsApiModelRel pmsApiModelRel) {
+//        return pmsApiModelRelService.getOamrList(pmsApiModelRel);
+//    }
+
+    @ApiOperation("服务与应用关联关系")
+    @PostMapping("/getoatrlist")
+    public ResponseVO<List<OcpApiRequirementVo>> getOatrList(@RequestBody OcpApiRequirementVo ocpApiRequirementVo) {
+        return ocpApiReqService.getOcpTenantApiList(ocpApiRequirementVo);
+    }
+
+    @ApiOperation("服务需求审核进度")
+    @GetMapping("OcpApiCheck")
+    public ResponseVO<List<OcpApiRequirementVo>> OcpApiCheck(OcpApiRequirementVo ocpApiRequirementVo) {
+        return ocpApiReqService.OcpApiCheck(ocpApiRequirementVo);
+    }
+
+
+
+
+
+
+}

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

+package com.pms.ocp.controller;
+
+
+import com.pms.ocp.model.dto.ApiRequirementDto;
+import com.pms.ocp.model.entity.OcpApiRequirement;
+import com.pms.ocp.model.entity.OcpApiRequirementAccept;
+import com.pms.ocp.model.entity.OcpApiRequirementApproval;
+import com.pms.ocp.model.vo.ResponseVO;
+import com.pms.ocp.service.OcpApiRequirementApprovalService;
+import com.pms.ocp.service.OcpApiRequirementService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.*;
+
+
+/**
+ * @author zhaochengming
+ */
+
+@Slf4j
+@RequestMapping("/api/v1/requirement")
+@RestController
+@Api(tags = "服务需求审批")
+public class OcpApiRequirementApprovalController {
+
+
+
+
+    @Autowired
+    private OcpApiRequirementApprovalService ocpApiRequirementApprovalService;
+
+    @Autowired
+    private OcpApiRequirementService ocpApiRequirementService;
+
+
+    /**@author:zhaochengming
+     * 查询
+     * @param apiCode 唯一主键
+     * @return
+     */
+    @ApiOperation("服务需求审批 --回显")
+    @GetMapping("/approval")
+    public ResponseVO getApproval(String apiCode){
+        if (StringUtils.isEmpty(apiCode)){
+            return ResponseVO.error("请选择审批服务");
+        }
+        ApiRequirementDto ocpApiRequirement =  ocpApiRequirementService.getSelects(apiCode);
+        return ResponseVO.ok(ocpApiRequirement);
+    }
+
+    /**@author:zhaochengming
+     * 查询
+     * @param
+     */
+
+    @ApiOperation("服务需求审批--审核")
+    @PostMapping("/approval-inseter")
+    public ResponseVO inseterApproval(@RequestBody OcpApiRequirementApproval ocpApiRequirementApproval){
+        if (StringUtils.isEmpty(ocpApiRequirementApproval)){
+            return ResponseVO.error("带*的参数不能为空！");
+        }
+        ocpApiRequirementApprovalService.inseterObj(ocpApiRequirementApproval);
+
+        return ResponseVO.ok();
+    }
+
+    @ApiOperation("服务需求审批-- 拓展图")
+    @GetMapping("/approval-photo")
+    public ResponseVO selectPhoto(String  apiCode){
+       return ocpApiRequirementApprovalService.selectPhotos(apiCode);
+    }
+
+
+    @ApiOperation("验收列表--提交验收")
+    @PostMapping("/approval-groupsObj")
+    public ResponseVO inseterGroupsObj(@RequestBody OcpApiRequirementAccept ocpApiRequirementAccept){
+        return ocpApiRequirementApprovalService.inseterGroupObj(ocpApiRequirementAccept);
+    }
+
+
+}

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

@@ -142,7 +142,7 @@ public class PmsApiDetailsController {
 
     }
 
-    @ApiOperation("模型分类导航")
+    @ApiOperation("服务分类导航")
     @GetMapping("/navigation")
     public ResponseVO<List<OcpApiGroupVo>> getApiNavigation() {
         return pmsApiManagementService.getApiNavigation();

src/main/java/com/pms/ocp/mapper/AcceptInfoMapper.java

+package com.pms.ocp.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.pms.ocp.model.entity.OcpApiRequirementAccept;
+import com.pms.ocp.model.entity.OcpApiRequirementApproval;
+import com.pms.ocp.model.vo.ApiAndModelVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @author Administrator
+ */
+@Mapper
+public interface AcceptInfoMapper extends BaseMapper<OcpApiRequirementAccept> {
+
+    /**
+     * 得到所有除本条服务数据外的所有服务数据，其结构已经封装
+     *
+     * @return
+     */
+    List<ApiAndModelVO> getAllApiAndModel();
+
+    /**
+     * 将计算得到的重合度刷新到数据库中，模型重合度
+     *
+     * @param ratio
+     * @param apiCode
+     */
+    void updateRatioByApiCode(@Param("ratio") float ratio, @Param("apiCode") String apiCode);
+
+    /**
+     * 所有的重合度已经计算完毕，封装所有数据信息，供前端使用
+     *
+     * @return
+     */
+    List<ApiAndModelVO> getFinalRatio();
+
+    /**
+     * 将即将要比对的本条服删除状态置为1，表示删除状态
+     *
+     * @param apiCode
+     */
+    void updateDel(@Param("apiCode") String apiCode);
+
+    /**
+     * 将即将要比对的本条服务数据信息组合封装
+     *
+     * @param apiCode
+     * @return
+     */
+    ApiAndModelVO getRatioByApiCode(@Param("apiCode") String apiCode);
+
+    /**
+     * 将计算得到的重合度刷新到数据库中，字段重合度
+     *
+     * @param ratio2
+     * @param apiCode
+     */
+    void updateRatioParamByApiCode(@Param("ratio2") float ratio2, @Param("apiCode") String apiCode);
+
+    /**
+     * 将之前删除状态置为1的服务数据的删除状态回滚为0
+     *
+     * @param apiCode
+     */
+    void returnDel(@Param("apiCode") String apiCode);
+
+    /**
+     * 查询当前服务是否已经存入到数据库中
+     *
+     * @param apiCode
+     * @return
+     */
+    int getNowApiCode(String apiCode);
+
+    /**
+     * 审核人信息列表
+     *
+     * @param requirementCode
+     * @return
+     */
+    List<OcpApiRequirementApproval> getAcceptPeopleInfo(String requirementCode);
+}

src/main/java/com/pms/ocp/mapper/ApiBasicManagementMapper.java

@@ -2,14 +2,14 @@ package com.pms.ocp.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.pms.ocp.model.dto.ApiBaseDto;
-import com.pms.ocp.model.dto.OcpApiBaseDto;
+import com.pms.ocp.model.dto.OcpModelGroupDto;
 import com.pms.ocp.model.entity.OcpApiBase;
 import com.pms.ocp.model.vo.OcpApiBaseVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import java.sql.Timestamp;
 import java.util.List;
+
 /**
  * @author guofanfan
  */
@@ -18,6 +18,9 @@ public interface ApiBasicManagementMapper extends BaseMapper<OcpApiBase> {
     List<OcpApiBaseVo> selectApiExport(List<String> list);
 
 
-
     List<OcpApiBase> selectByCondition(ApiBaseDto apiBaseReq);
+
+    List<OcpModelGroupDto> modelTree(@Param("modelGroupCode") String modelGroupCode);
+
+    List<OcpModelGroupDto> modelTreeOther(@Param("modelGroupCode") String modelGroupCode);
 }

src/main/java/com/pms/ocp/mapper/ApiManagementMapper.java

@@ -13,7 +13,7 @@ import java.util.List;
 @Mapper
 public interface ApiManagementMapper extends BaseMapper<OcpApiBase> {
 
-    List<ApiManagementVO> queryApiManagementList(@Param("apiName") String apiName,@Param("apiGroupCode") String apiGroupCode,@Param("apiUrl") String apiUrl,@Param("startTime") Timestamp startTime,@Param("endTime") Timestamp endTime,@Param("pageSize")Integer pageSize,@Param("pageNum") Integer pageNum);
+    List<ApiManagementVO> queryApiManagementList(@Param("apiName") String apiName, @Param("apiGroupCode") String apiGroupCode, @Param("apiUrl") String apiUrl, @Param("startTime") Timestamp startTime, @Param("endTime") Timestamp endTime, @Param("pageSize") Integer pageSize, @Param("pageNum") Integer pageNum);
 
     List<ApiManagementVO> selectApiExport(List<String> list);
 }

src/main/java/com/pms/ocp/mapper/MiddleGroundModelMapper.java

@@ -16,5 +16,5 @@ public interface MiddleGroundModelMapper {
 
     List<String> selectModels(@Param("modelName") String modelName);
 
-    ModelPropInfo selectMiddleGroundModeByName(@Param("modelName") String modelName,@Param("schemaName")String schemaName);
+    ModelPropInfo selectMiddleGroundModeByName(@Param("modelName") String modelName, @Param("schemaName") String schemaName);
 }

src/main/java/com/pms/ocp/mapper/ModelAcceptMapper.java

@@ -36,4 +36,6 @@ public interface ModelAcceptMapper {
     boolean deleteAcceptVersion(Model model);
 
     boolean deleteModelRelationProp(Model model);
+
+    int insertPropList(@Param("entities") List<PropInfo> entities);
 }

src/main/java/com/pms/ocp/mapper/ModelBaseMapper.java

+package com.pms.ocp.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import com.pms.ocp.model.entity.Model;
+
+public interface ModelBaseMapper extends BaseMapper<Model> {
+
+    //根据modeCode查询
+    Model  selectByModelCode(String modelCode);
+}

src/main/java/com/pms/ocp/mapper/ModelCheckMapper.java

@@ -25,10 +25,12 @@ public interface ModelCheckMapper {
 
     boolean saveAccept(OcpModelRequirementAcceptDto ocp);
 
-    List<ModelPropInfo> selectModelOwnerProp(@Param("modelCode")String modelCode);
+    List<ModelPropInfo> selectModelOwnerProp(@Param("modelCode") String modelCode);
 
     List<String> selectModelCodeList(@Param("modelCode") String modelCode);
 
     void deleteByRequirementCode(ModelAuditDto ocp);
 
+
+    int selectModelByRequirementCode(ModelAuditDto ocp);
 }

src/main/java/com/pms/ocp/mapper/ModelRelationMapper.java

@@ -2,11 +2,8 @@ package com.pms.ocp.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.pms.ocp.model.entity.ModelRelation;
-import com.pms.ocp.model.vo.ModelRelationInputMultiVO;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
 
 /**
  * @Auther: wangjian
@@ -18,28 +15,28 @@ import java.util.List;
 public interface ModelRelationMapper extends BaseMapper<ModelRelation> {
 
 
-    /**
-     * 根据id查询区域信息
-     *
-     * @param modelCode
-     * @return 区域信息列表
-     */
-    ModelRelation queryRegionById(@Param("modelCode") String modelCode);
-
-    /**
-     * 根据regionId列表，查询区域信息
-     *
-     * @param regionInputMultiVO 区域id列表
-     * @return 区域信息列表
-     */
-    List<ModelRelation> queryRegionByRegionIdList(ModelRelationInputMultiVO regionInputMultiVO);
-
-    /**
-     * 根据parentId查询区域信息
-     *
-     * @param modelCode 区域id
-     * @return 区域信息列表
-     */
-    List<ModelRelation> queryRegionByParentId(@Param("modelCode") String modelCode);
+//    /**
+//     * 根据id查询区域信息
+//     *
+//     * @param modelCode
+//     * @return 区域信息列表
+//     */
+//    ModelRelation queryRegionById(@Param("modelCode") String modelCode);
+//
+//    /**
+//     * 根据regionId列表，查询区域信息
+//     *
+//     * @param regionInputMultiVO 区域id列表
+//     * @return 区域信息列表
+//     */
+//    List<ModelRelation> queryRegionByRegionIdList(ModelRelationInputMultiVO regionInputMultiVO);
+//
+//    /**
+//     * 根据parentId查询区域信息
+//     *
+//     * @param modelCode 区域id
+//     * @return 区域信息列表
+//     */
+//    List<ModelRelation> queryRegionByParentId(@Param("modelCode") String modelCode);
 
 }

src/main/java/com/pms/ocp/mapper/ModelRequirementMapper.java

 package com.pms.ocp.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.pms.ocp.model.dto.ModelVersionRequirementDTO;
 import com.pms.ocp.model.entity.ModelRequirement;
-import com.pms.ocp.model.vo.ModelPropertyVO;
 import com.pms.ocp.model.vo.ModelPropertyVersionRequirementVO;
 import com.pms.ocp.model.vo.ModelVersionRequirementVO;
 import org.apache.ibatis.annotations.Mapper;

src/main/java/com/pms/ocp/mapper/OcpApiAcceptMapper.java

+package com.pms.ocp.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.pms.ocp.model.entity.OcpApiRequirementAccept;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface OcpApiAcceptMapper extends BaseMapper<OcpApiRequirementAccept> {
+
+
+    //    根据apiCode查询验收表
+    OcpApiRequirementAccept selectByCodeList(String apiCode);
+}

src/main/java/com/pms/ocp/mapper/OcpApiBaseMapper.java

@@ -5,5 +5,8 @@ import com.pms.ocp.model.entity.OcpApiBase;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
-public interface OcpApiBaseMapper extends BaseMapper<OcpApiBase> {
+public interface  OcpApiBaseMapper extends BaseMapper<OcpApiBase> {
+
+    //根据apiCode查询服务对象
+    OcpApiBase selectCode(String apiCode);
 }

src/main/java/com/pms/ocp/mapper/OcpApiGroupMapper.java

@@ -17,15 +17,15 @@ public interface OcpApiGroupMapper extends BaseMapper<OcpApiGroup> {
 
     List<OcpApiGroup> selectTreeList(String apiGroupCompanyCode);
 
-    List<OcpApiGroup> apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupPcode,Integer apiGroupPromotionType);
+    List<OcpApiGroup> apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupPcode, Integer apiGroupPromotionType);
 
     List<OcpApiBase> selectByPcode(String code);
 
     List<OcpApiBaseVo> selectPageLists(ApiBaseDto apiBaseReq);
 
-    List<OcpGroupBaseDto> apiTree(OcpApiBaseVo  ocpApiBaseVo);
+    List<OcpGroupBaseDto> apiTree(OcpApiBaseVo ocpApiBaseVo);
 
-    List<OcpGroupBaseDto> selectBase(String apiGroupCompanyCode, String apiGroupPcode,Integer apiGroupPromotionType);
+    List<OcpGroupBaseDto> selectBase(String apiGroupCompanyCode, String apiGroupPcode, Integer apiGroupPromotionType);
 
 
 //    List<WholeLinkTreeVo> queryApiTreeData1();

src/main/java/com/pms/ocp/mapper/OcpApiGroupVoMapper.java

@@ -2,10 +2,15 @@ package com.pms.ocp.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.pms.ocp.model.entity.PmsApiTenantRel;
 import com.pms.ocp.model.vo.OcpApiGroupVo;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 @Mapper
 public interface OcpApiGroupVoMapper extends BaseMapper<OcpApiGroupVo> {
 
+
+
 }
\ No newline at end of file

src/main/java/com/pms/ocp/mapper/OcpApiModelRelMapper.java

@@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.pms.ocp.model.entity.OcpApiModelRel;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 @Mapper
 public interface OcpApiModelRelMapper extends BaseMapper<OcpApiModelRel> {
 
-
+    List<OcpApiModelRel> selectApiGroupds(String apiCode);
 
 }

src/main/java/com/pms/ocp/mapper/OcpApiPMapper.java

+package com.pms.ocp.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.pms.ocp.model.entity.OcpApiParam;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface OcpApiPMapper extends BaseMapper<OcpApiParam> {
+
+    /**@Author:zhaochengming
+     * 根据服务编码查询服务出参入参
+     * @param apiCode
+     * @return
+     */
+    List<OcpApiParam> selects(String apiCode);
+
+    //托参图
+    List<OcpApiParam> selectByList(String apiCode);
+
+    //根据modelcode
+    List<OcpApiParam> selectsByModelCode(String modelCode);
+}

src/main/java/com/pms/ocp/mapper/OcpApiReqMapper.java

+package com.pms.ocp.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.pms.ocp.model.vo.OcpApiGroupVo;
+import com.pms.ocp.model.vo.OcpApiRequirementVo;
+
+import java.util.List;
+
+public interface OcpApiReqMapper extends BaseMapper<OcpApiRequirementVo> {
+
+    List<OcpApiRequirementVo> OcpApiReq(OcpApiRequirementVo ocpApiRequirementVo);
+
+    List<OcpApiRequirementVo> selectOarcList(OcpApiRequirementVo ocpApiRequirementVo);
+
+    List<OcpApiRequirementVo> OcpApiReqAcc(OcpApiRequirementVo ocpApiRequirementVo);
+
+    List<OcpApiRequirementVo> selectOcpApiReq(OcpApiRequirementVo ocpApiRequirementVo);
+
+    List<OcpApiRequirementVo> OcpApiCheck(OcpApiRequirementVo ocpApiRequirementVo);
+
+    List<OcpApiRequirementVo> OarcCheck(OcpApiRequirementVo ocpApiRequirementVo);
+
+    List<OcpApiRequirementVo> selectOcpAg(OcpApiRequirementVo ocpApiRequirementVo);
+
+    List<OcpApiRequirementVo> getOcpTree(OcpApiRequirementVo ocpApiRequirementVo);
+
+    List<OcpApiRequirementVo> OacrTreeCenter(OcpApiRequirementVo ocpApiRequirementVo);
+
+    List<OcpApiRequirementVo> getOcpTenantApiList(OcpApiRequirementVo ocpApiRequirementVo);
+}

src/main/java/com/pms/ocp/mapper/OcpApiRequirementApprovalMapper.java

+package com.pms.ocp.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.pms.ocp.model.entity.OcpApiRequirementApproval;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+
+@Mapper
+public interface OcpApiRequirementApprovalMapper extends BaseMapper<OcpApiRequirementApproval> {
+
+    /**
+     * 根基code获取对象id
+     * @param apiCode
+     * @return
+     */
+    List<OcpApiRequirementApproval> selectByCodes(String apiCode);
+
+    //根据apiCode和lastApprovalStats获取对象
+    List<OcpApiRequirementApproval> selectByLast(String apiCode, Long lastApprovalStats);
+
+    OcpApiRequirementApproval selectByReqCodes(String requirementCode);
+}

src/main/java/com/pms/ocp/mapper/OcpApiRequirementMapper.java

+package com.pms.ocp.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.pms.ocp.model.entity.OcpApiRequirement;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface OcpApiRequirementMapper extends BaseMapper<OcpApiRequirement> {
+
+
+    //根据rrequirementCode获取ocp_api_requirement表中requirement_type字段类型
+    OcpApiRequirement selectbyCode(String requirementCode);
+
+
+    //根据apiCode获取OcpApiRequirement对象
+    OcpApiRequirement selectByCodes(String apiCode);
+}

src/main/java/com/pms/ocp/mapper/OcpApiTenantRelMapper.java

 package com.pms.ocp.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.pms.ocp.model.dto.TenantApiDto;
 import com.pms.ocp.model.entity.OcpApiTenantRel;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -10,4 +12,5 @@ import java.util.List;
 public interface OcpApiTenantRelMapper extends BaseMapper<OcpApiTenantRel> {
 
 
+    List<TenantApiDto> echoTenant(@Param("apiCode") String apiCode);
 }

src/main/java/com/pms/ocp/mapper/OcpBaseMapper.java

+package com.pms.ocp.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.pms.ocp.model.entity.Model;
+import com.pms.ocp.model.entity.OcpApiBase;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**Author：zhaochengming
+ * 模型关系表
+ */
+@Mapper
+public interface OcpBaseMapper  extends BaseMapper<Model> {
+
+
+    /**
+     * 根据modelCode查询模型信息
+     * @param modelCode
+     * @return
+     */
+    List<Model> selectModelBase(String modelCode);
+
+
+    //根据apiCode查询服务对象
+    OcpApiBase selectCode(String apiCode);
+
+
+}

src/main/java/com/pms/ocp/mapper/OcpModelGroupMapper.java

 package com.pms.ocp.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.pms.ocp.model.dto.OcpModelGroupDto;
 import com.pms.ocp.model.entity.ModelClassify;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * @author huxiuwu
  * @version 1.0
@@ -11,4 +14,5 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface OcpModelGroupMapper extends BaseMapper<ModelClassify> {
+
 }

src/main/java/com/pms/ocp/mapper/OcpTenantBaseMapper.java

 package com.pms.ocp.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.pms.ocp.model.dto.GroupDto;
 import com.pms.ocp.model.dto.OcpTenantGroupIocnDto;
 import com.pms.ocp.model.entity.OcpTenantBase;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -23,7 +25,16 @@ public interface OcpTenantBaseMapper extends BaseMapper<OcpTenantBase> {
     int queryCount(String appCode);
 
 
-   List<OcpTenantBase> selcctCodeList(String ocpTenantGroup);
+    List<OcpTenantBase> selcctCodeList(String ocpTenantGroup);
 
     int queryName(String appName);
+
+    List<GroupDto> correlationTenantTree(@Param("tenantGroupCompanyCode") String tenantGroupCompanyCode, @Param("tenantGroupCode") String tenantGroupCode);
+
+    /**
+     * 根据tenantCode查询应用
+     * @param tenantCode
+     * @return
+     */
+    OcpTenantBase selectTenants(String tenantCode);
 }

src/main/java/com/pms/ocp/mapper/OcpTenantGroupMapper.java

@@ -3,12 +3,10 @@ package com.pms.ocp.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.pms.ocp.model.dto.GroupDto;
-
 import com.pms.ocp.model.dto.OcpTenantBaseDto;
 import com.pms.ocp.model.dto.TenantDto;
 import com.pms.ocp.model.entity.OcpApiGroup;
 import com.pms.ocp.model.entity.OcpTenantGroup;
-
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -21,8 +19,10 @@ public interface OcpTenantGroupMapper extends BaseMapper<OcpTenantGroup> {
     List<OcpTenantBaseDto> selectPageLists(TenantDto tenantDto);
 
 
-
     List<GroupDto> selectBase(@Param("tenantGroupCode") String tenantGroupCode, String tenantGroupCompanyCode);
 
     List<OcpApiGroup> selectCentre(String center);
+
+
+    List<GroupDto> correlationTenantTree(@Param("tenantGroupCompanyCode") String tenantGroupCompanyCode, @Param("tenantGroupCode") String tenantGroupCode);
 }

src/main/java/com/pms/ocp/mapper/OcpTenantIocnMapper.java

@@ -2,6 +2,7 @@ package com.pms.ocp.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.pms.ocp.model.entity.OcpTenantIocn;
+import com.pms.ocp.model.entity.PmsApiMangageApi;
 
 import java.util.List;
 
@@ -16,4 +17,6 @@ public interface OcpTenantIocnMapper extends BaseMapper<OcpTenantIocn> {
 
     //查询轮播图
     List<OcpTenantIocn> selectCodes(String tenantCode);
+
+    int deleteIconCodes(PmsApiMangageApi pmsApiMangageApi);
 }

src/main/java/com/pms/ocp/mapper/OcptenantRelMapper.java

+package com.pms.ocp.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.pms.ocp.model.entity.OcpApiTenantRel;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+
+/**@Author：zhaochengming
+ *应用关系mapper
+ */
+@Mapper
+public interface OcptenantRelMapper extends BaseMapper<OcpApiTenantRel> {
+
+
+    /**
+     * 根据apiCode查询应用关系表
+     * @param apiCode
+     * @return
+     */
+    List<OcpApiTenantRel> selectTenant(String apiCode);
+}

src/main/java/com/pms/ocp/mapper/ParamMapper.java

+package com.pms.ocp.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.pms.ocp.model.entity.ApiParam;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface ParamMapper extends BaseMapper<ApiParam>{
+}

src/main/java/com/pms/ocp/mapper/PmsApiAuditMapper.java

@@ -21,6 +21,6 @@ public interface PmsApiAuditMapper extends BaseMapper<PmsApiAudit> {
 
     List<PmsApiAudit> sById(PmsApiAudit pmsApiAudit);
 
-    List<PmsApiAudit> versionId (PmsApiAudit pmsApiAudit);
+    List<PmsApiAudit> versionId(PmsApiAudit pmsApiAudit);
 
 }

src/main/java/com/pms/ocp/mapper/TenantMapper.java

@@ -22,9 +22,9 @@ public interface TenantMapper extends BaseMapper<OcpTenantGroup> {
 
 
     //二级目录树
-   List<OcpTenantGroup> twoTenantGroups(String tenantGroupCode,String tenantGroupCompanyCode);
+   List<OcpTenantGroup> twoTenantGroups();
 
-    List<OcpTenantGroup>  selectTenantGroups(String tenantGroupCode,String tenantGroupCompanyCode);
+    List<OcpTenantGroup>  selectTenantGroups(String tenantGroupCode, String tenantGroupCompanyCode);
 
     List<OcpTenantGroup> selectTenantGroup(String tenantGroupCompanyCode);
 
@@ -33,10 +33,10 @@ public interface TenantMapper extends BaseMapper<OcpTenantGroup> {
 
 
     //服务树--查询
-    List<OcpTenantGroup> selectTenantGroupsList(String tenantGroupCode,String tenantGroupCompanyCode);
+    List<OcpTenantGroup> selectTenantGroupsList(String tenantGroupCode, String tenantGroupCompanyCode);
 
 
-    List<OcpTenantGroup> selectGroupsList(String tenantGroupCompanyCode,String tenantGroupName);
+    List<OcpTenantGroup> selectGroupsList(String tenantGroupCompanyCode, String tenantGroupName);
 
     /**
      * 根据code查询这条数据

src/main/java/com/pms/ocp/mapper/ocpRequirementAcceptMapper.java

+package com.pms.ocp.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.pms.ocp.model.entity.OcpApiRequirement;
+import com.pms.ocp.model.entity.OcpApiRequirementAccept;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface ocpRequirementAcceptMapper  extends BaseMapper<OcpApiRequirementAccept> {
+}

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

+package com.pms.ocp.model.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * 验收入参实体类
+ *
+ * @author Administrator
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("验收入参")
+public class AcceptDTO implements Serializable {
+
+
+
+    @ApiModelProperty("1-验收通过,2-验收拒绝")
+    private String acceptCode;
+
+    @ApiModelProperty("需求编码")
+    private String requirementCode;
+
+    @ApiModelProperty("服务编码")
+    private String apiCode;
+
+    @ApiModelProperty("验收单位")
+    private String acceptCompanyCode;
+
+    @ApiModelProperty("验收部门")
+    private String acceptDepartment;
+
+    @ApiModelProperty("验收人")
+    private String acceptUserId;
+
+    @ApiModelProperty("验收人姓名")
+    private String acceptUserName;
+
+    public String getRequirementCode() {
+        return requirementCode;
+    }
+
+    public void setRequirementCode(String requirementCode) {
+        this.requirementCode = requirementCode;
+    }
+
+    public String getApiCode() {
+        return apiCode;
+    }
+
+    public void setApiCode(String apiCode) {
+        this.apiCode = apiCode;
+    }
+
+    public String getAcceptCompanyCode() {
+        return acceptCompanyCode;
+    }
+
+    public void setAcceptCompanyCode(String acceptCompanyCode) {
+        this.acceptCompanyCode = acceptCompanyCode;
+    }
+
+    public String getAcceptDepartment() {
+        return acceptDepartment;
+    }
+
+    public void setAcceptDepartment(String acceptDepartment) {
+        this.acceptDepartment = acceptDepartment;
+    }
+
+    public String getAcceptUserId() {
+        return acceptUserId;
+    }
+
+    public void setAcceptUserId(String acceptUserId) {
+        this.acceptUserId = acceptUserId;
+    }
+
+    public String getAcceptUserName() {
+        return acceptUserName;
+    }
+
+    public void setAcceptUserName(String acceptUserName) {
+        this.acceptUserName = acceptUserName;
+    }
+}

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

+package com.pms.ocp.model.dto;
+
+
+import com.pms.ocp.model.entity.Model;
+import com.pms.ocp.model.entity.OcpApiParam;
+import com.pms.ocp.model.entity.OcpApiRequirement;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+import java.io.Serializable;
+import java.util.List;
+
+
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "服务审查回显封装类")
+public class ApiRequirementDto extends OcpApiRequirement implements Serializable {
+
+
+    @ApiModelProperty("出参")
+    private List<OcpApiParam> outList;
+
+    @ApiModelProperty("出参")
+    private  List<OcpApiParam> inList;
+
+    @ApiModelProperty("影响模型")
+    private List<Model> apiModelNames;
+
+    @ApiModelProperty("影响模型描述")
+    private List<String> ModelDescription;
+
+    @ApiModelProperty("影响应用")
+    private  List<String> apiTenantGroupNames;
+
+    @ApiModelProperty("影响应用描述")
+    private  List<String> tenantDescription;
+
+
+
+    public void setApiModelNames(List<Model> apiModelNames) {
+        this.apiModelNames = apiModelNames;
+    }
+
+    public List<String> getModelDescription() {
+        return ModelDescription;
+    }
+
+    public void setModelDescription(List<String> modelDescription) {
+        ModelDescription = modelDescription;
+    }
+
+    public List<String> getTenantDescription() {
+        return tenantDescription;
+    }
+
+    public void setTenantDescription(List<String> tenantDescription) {
+        this.tenantDescription = tenantDescription;
+    }
+
+    public List<OcpApiParam> getOutList() {
+        return outList;
+    }
+
+    public void setOutList(List<OcpApiParam> outList) {
+        this.outList = outList;
+    }
+
+    public List<OcpApiParam> getInList() {
+        return inList;
+    }
+
+    public void setInList(List<OcpApiParam> inList) {
+        this.inList = inList;
+    }
+
+    public List<Model> getApiModelNames() {
+        return apiModelNames;
+    }
+
+    public List<String> getApiTenantGroupNames() {
+        return apiTenantGroupNames;
+    }
+
+    public void setApiTenantGroupNames(List<String> apiTenantGroupNames) {
+        this.apiTenantGroupNames = apiTenantGroupNames;
+    }
+
+
+}

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

+package com.pms.ocp.model.dto;
+
+import lombok.Data;
+
+@Data
+public class CommitDTO {
+
+    private String requirementCode;
+
+    private String apiCode;
+
+    public String getRequirementCode() {
+        return requirementCode;
+    }
+
+    public void setRequirementCode(String requirementCode) {
+        this.requirementCode = requirementCode;
+    }
+
+    public String getApiCode() {
+        return apiCode;
+    }
+
+    public void setApiCode(String apiCode) {
+        this.apiCode = apiCode;
+    }
+}

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

@@ -26,7 +26,8 @@ public class GroupDto extends OcpTenantGroup implements Serializable {
     @ApiModelProperty("flag")
     private Integer flag;
 
-
+    @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区")
+    private Short tenantZone;
     /**
      * 应用分类代码
      */
@@ -56,4 +57,20 @@ public class GroupDto extends OcpTenantGroup implements Serializable {
     public void setTenantGroupCode(String tenantGroupCode) {
         this.tenantGroupCode = tenantGroupCode;
     }
+
+    public Integer getFlag() {
+        return flag;
+    }
+
+    public void setFlag(Integer flag) {
+        this.flag = flag;
+    }
+
+    public Short getTenantZone() {
+        return tenantZone;
+    }
+
+    public void setTenantZone(Short tenantZone) {
+        this.tenantZone = tenantZone;
+    }
 }

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

@@ -2,6 +2,8 @@ package com.pms.ocp.model.dto;
 
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * @author huxiuwu
  * @version 1.0
@@ -28,4 +30,22 @@ public class ModelAuditDto {
      * 审核意见
      */
     private String checkOpinion;
+
+    /**
+     * 审核部门
+     */
+    private String approvalCompanyCode;
+    /**
+     * 审核id
+     */
+    private String approvalUserId;
+    /**
+     * 审核姓名
+     */
+    private String approvalUserName;
+
+    /**
+     * 审核时间
+     */
+    private Date approvalCtime;
 }

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

+package com.pms.ocp.model.dto;
+
+import com.pms.ocp.model.entity.ApiParam;
+import com.pms.ocp.model.entity.OcpApiParam;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.sql.Timestamp;
+import java.util.List;
+
+@Data
+@ApiModel(value = "服务需求表dto")
+@AllArgsConstructor
+@NoArgsConstructor
+public class OcpApiRequirementDto implements Serializable {
+    @ApiModelProperty("主键ID")
+    private String objId;
+
+    @ApiModelProperty("需求编码")
+    private String requirementCode;
+
+    @ApiModelProperty("需求类型0:新增，1:迭代，2下线")
+    private Long requirementType;
+
+    @ApiModelProperty("需求简述")
+    private String requirementComments;
+
+    @ApiModelProperty("服务编码")
+    private String apiCode;
+
+
+    @ApiModelProperty("服务名称")
+    private String apiName;
+
+    @ApiModelProperty("服务分类代码")
+    private String apiGroupCode;
+
+    @ApiModelProperty("服务地址")
+    private String apiUrl;
+
+    @ApiModelProperty("服务版本号")
+    private String apiVersion;
+
+    @ApiModelProperty("需求填报人id")
+    private String requirementUserId;
+
+    @ApiModelProperty("需求填报人姓名")
+    private String requirementUserName;
+
+    @ApiModelProperty("需求创建时间")
+    private Timestamp requirementCtime;
+
+    @ApiModelProperty("需求修改时间")
+    private Timestamp requirementMtime;
+
+    @ApiModelProperty("是否删除0：否 1：是")
+    private Long isDelete;
+
+    @ApiModelProperty("所属区域1:生成控制大区 2：信息关联大区3：互联网大区")
+    private Long apiZone;
+
+    @ApiModelProperty("所属层级1: 应用层 2：平台层、3：网络层 4：感知层")
+    private Long apiLayer;
+
+    @ApiModelProperty("建设单位")
+    private String apiUnit;
+
+    @ApiModelProperty("服务所属公司")
+    private String ownerCompanyCode;
+
+    @ApiModelProperty("推广类型0:统建 1:自建")
+    private Long apiPromotion;
+
+    @ApiModelProperty("服务请求体    ")
+    private String apiReq;
+
+    @ApiModelProperty("服务返回体")
+    private String apiResp;
+
+    @ApiModelProperty("需求填报人部门")
+    private String requirementUserDepg;
+
+    @ApiModelProperty(value = "添加状态1，2，3，4，5")
+    private String addStatus;
+    @ApiModelProperty(value = "模型code字符串")
+    private String [] modelCodes;
+    @ApiModelProperty(value = "应用编码字符串")
+    private String[] tenantCodes;
+
+    @ApiModelProperty(value = "表字段集合")
+    List<ApiParam> apiParamList;
+
+    @ApiModelProperty(value = "模型表字段集合")
+    private List<OcpApiParam> ocpApiParamList;
+
+    @ApiModelProperty(value = "模型表请求字段集合")
+    private List<ApiParam> reqList;
+    @ApiModelProperty(value = "模型表返回字段集合")
+    private List<ApiParam> respList;
+    /**
+     * 集群名称
+     */
+    @ApiModelProperty("集群名称")
+    private String clusterName;
+
+    /**
+     * 命名空间
+     */
+    @ApiModelProperty("命名空间")
+    private String spaceName;
+
+    @ApiModelProperty("推广类型0统推，1自建")
+    private long apiGroupPromotionType;
+
+    @ApiModelProperty("服务应用描述")
+    private String apiTenantDescription;
+
+    public String getAddStatus() {
+        return addStatus;
+    }
+
+    public void setAddStatus(String addStatus) {
+        this.addStatus = addStatus;
+    }
+
+    public String[] getModelCodes() {
+        return modelCodes;
+    }
+
+    public void setModelCodes(String[] modelCodes) {
+        this.modelCodes = modelCodes;
+    }
+//    public String getModelCodes() {
+//        return modelCodes;
+//    }
+//
+//    public void setModelCodes(String modelCodes) {
+//        this.modelCodes = modelCodes;
+//    }
+
+//    public String getTenantCodes() {
+//        return tenantCodes;
+//    }
+//
+//    public void setTenantCodes(String tenantCodes) {
+//        this.tenantCodes = tenantCodes;
+//    }
+
+    public String[] getTenantCodes() {
+        return tenantCodes;
+    }
+
+    public void setTenantCodes(String[] tenantCodes) {
+        this.tenantCodes = tenantCodes;
+    }
+
+//    public List<ApiParam> getParamList() {
+//        return paramList;
+//    }
+//
+//    public void setParamList(List<ApiParam> paramList) {
+//        this.paramList = paramList;
+//    }
+//
+//    public List<OcpApiParam> getOcpApiParamList() {
+//        return ocpApiParamList;
+//    }
+
+    public String getClusterName() {
+        return clusterName;
+    }
+
+    public void setClusterName(String clusterName) {
+        this.clusterName = clusterName;
+    }
+
+    public String getSpaceName() {
+        return spaceName;
+    }
+
+    public void setSpaceName(String spaceName) {
+        this.spaceName = spaceName;
+    }
+
+    public void setOcpApiParamList(List<OcpApiParam> ocpApiParamList) {
+        this.ocpApiParamList = ocpApiParamList;
+
+
+    }
+
+    public long getApiGroupPromotionType() {
+        return apiGroupPromotionType;
+    }
+
+    public void setApiGroupPromotionType(long apiGroupPromotionType) {
+        this.apiGroupPromotionType = apiGroupPromotionType;
+    }
+
+
+    public List<ApiParam> getApiParamList() {
+        return apiParamList;
+    }
+
+    public void setApiParamList(List<ApiParam> apiParamList) {
+        this.apiParamList = apiParamList;
+    }
+
+    public List<OcpApiParam> getOcpApiParamList() {
+        return ocpApiParamList;
+    }
+
+    public String getApiTenantDescription() {
+        return apiTenantDescription;
+    }
+
+    public void setApiTenantDescription(String apiTenantDescription) {
+        this.apiTenantDescription = apiTenantDescription;
+    }
+
+
+    public String getObjId() {
+        return objId;
+    }
+
+    public void setObjId(String objId) {
+        this.objId = objId;
+    }
+
+    public String getRequirementCode() {
+        return requirementCode;
+    }
+
+    public void setRequirementCode(String requirementCode) {
+        this.requirementCode = requirementCode;
+    }
+
+    public Long getRequirementType() {
+        return requirementType;
+    }
+
+    public void setRequirementType(Long requirementType) {
+        this.requirementType = requirementType;
+    }
+
+    public String getRequirementComments() {
+        return requirementComments;
+    }
+
+    public void setRequirementComments(String requirementComments) {
+        this.requirementComments = requirementComments;
+    }
+
+    public String getApiCode() {
+        return apiCode;
+    }
+
+    public void setApiCode(String apiCode) {
+        this.apiCode = apiCode;
+    }
+
+    public String getApiName() {
+        return apiName;
+    }
+
+    public void setApiName(String apiName) {
+        this.apiName = apiName;
+    }
+
+    public String getApiGroupCode() {
+        return apiGroupCode;
+    }
+
+    public void setApiGroupCode(String apiGroupCode) {
+        this.apiGroupCode = apiGroupCode;
+    }
+
+    public String getApiUrl() {
+        return apiUrl;
+    }
+
+    public void setApiUrl(String apiUrl) {
+        this.apiUrl = apiUrl;
+    }
+
+    public String getApiVersion() {
+        return apiVersion;
+    }
+
+    public void setApiVersion(String apiVersion) {
+        this.apiVersion = apiVersion;
+    }
+
+    public String getRequirementUserId() {
+        return requirementUserId;
+    }
+
+    public void setRequirementUserId(String requirementUserId) {
+        this.requirementUserId = requirementUserId;
+    }
+
+    public String getRequirementUserName() {
+        return requirementUserName;
+    }
+
+    public void setRequirementUserName(String requirementUserName) {
+        this.requirementUserName = requirementUserName;
+    }
+
+    public Timestamp getRequirementCtime() {
+        return requirementCtime;
+    }
+
+    public void setRequirementCtime(Timestamp requirementCtime) {
+        this.requirementCtime = requirementCtime;
+    }
+
+    public Timestamp getRequirementMtime() {
+        return requirementMtime;
+    }
+
+    public void setRequirementMtime(Timestamp requirementMtime) {
+        this.requirementMtime = requirementMtime;
+    }
+
+    public Long getIsDelete() {
+        return isDelete;
+    }
+
+    public void setIsDelete(Long isDelete) {
+        this.isDelete = isDelete;
+    }
+
+    public Long getApiZone() {
+        return apiZone;
+    }
+
+    public void setApiZone(Long apiZone) {
+        this.apiZone = apiZone;
+    }
+
+    public Long getApiLayer() {
+        return apiLayer;
+    }
+
+    public void setApiLayer(Long apiLayer) {
+        this.apiLayer = apiLayer;
+    }
+
+    public String getApiUnit() {
+        return apiUnit;
+    }
+
+    public void setApiUnit(String apiUnit) {
+        this.apiUnit = apiUnit;
+    }
+
+    public String getOwnerCompanyCode() {
+        return ownerCompanyCode;
+    }
+
+    public void setOwnerCompanyCode(String ownerCompanyCode) {
+        this.ownerCompanyCode = ownerCompanyCode;
+    }
+
+    public Long getApiPromotion() {
+        return apiPromotion;
+    }
+
+    public void setApiPromotion(Long apiPromotion) {
+        this.apiPromotion = apiPromotion;
+    }
+
+    public String getApiReq() {
+        return apiReq;
+    }
+
+    public void setApiReq(String apiReq) {
+        this.apiReq = apiReq;
+    }
+
+    public String getApiResp() {
+        return apiResp;
+    }
+
+    public void setApiResp(String apiResp) {
+        this.apiResp = apiResp;
+    }
+
+    public String getRequirementUserDepg() {
+        return requirementUserDepg;
+    }
+
+    public void setRequirementUserDepg(String requirementUserDepg) {
+        this.requirementUserDepg = requirementUserDepg;
+    }
+
+    public List<ApiParam> getReqList() {
+        return reqList;
+    }
+
+    public void setReqList(List<ApiParam> reqList) {
+        this.reqList = reqList;
+    }
+
+    public List<ApiParam> getRespList() {
+        return respList;
+    }
+
+    public void setRespList(List<ApiParam> respList) {
+        this.respList = respList;
+    }
+}
+

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

+package com.pms.ocp.model.dto;
+
+import com.pms.ocp.model.vo.OcpModelGroupVO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class OcpModelGroupDto extends OcpModelGroupVO implements Serializable {
+
+    @ApiModelProperty("模型编码")
+    private String modelCode;
+
+    @ApiModelProperty("服务接口中文名称")
+    private String modelName;
+
+//    @ApiModelProperty("服务分类代码")
+//    private String modelGroupCode;
+
+
+    public String getModelCode() {
+        return modelCode;
+    }
+
+    public void setModelCode(String modelCode) {
+        this.modelCode = modelCode;
+    }
+
+    public String getModelName() {
+        return modelName;
+    }
+
+    public void setModelName(String modelName) {
+        this.modelName = modelName;
+    }
+
+//    public String getModelGroupCode() {
+//        return modelGroupCode;
+//    }
+//
+//    public void setModelGroupCode(String modelGroupCode) {
+//        this.modelGroupCode = modelGroupCode;
+//    }
+}

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

@@ -4,6 +4,7 @@ import com.pms.ocp.common.config.PageParam;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.sql.Timestamp;
+import java.util.List;
 
 /**
  * 分页查询dto
@@ -64,6 +65,16 @@ public class PageGroupDto{
     @ApiModelProperty("分页树")
     private int pageSize;
 
+    private List<String> apiGroupCodeList;
+
+    public List<String> getApiGroupCodeList() {
+        return apiGroupCodeList;
+    }
+
+    public void setApiGroupCodeList(List<String> apiGroupCodeList) {
+        this.apiGroupCodeList = apiGroupCodeList;
+    }
+
     public int getCurrentPage() {
         return currentPage;
     }

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

+package com.pms.ocp.model.dto;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel("拓展图封装类")
+public class PhotoDto {
+
+    @ApiModelProperty("模型名称")
+    private  String title;
+
+    @ApiModelProperty("模型表(表的英文名称)表的英文名称")
+    private String ModelTable;
+
+    @ApiModelProperty("出参")
+    private List<String> outPutList;
+
+    @ApiModelProperty("入参")
+    private List<String> inPutList;
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getModelTable() {
+        return ModelTable;
+    }
+
+    public void setModelTable(String modelTable) {
+        ModelTable = modelTable;
+    }
+
+    public List<String> getOutPutList() {
+        return outPutList;
+    }
+
+    public void setOutPutList(List<String> outPutList) {
+        this.outPutList = outPutList;
+    }
+
+    public List<String> getInPutList() {
+        return inPutList;
+    }
+
+    public void setInPutList(List<String> inPutList) {
+        this.inPutList = inPutList;
+    }
+}

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

+package com.pms.ocp.model.dto;
+
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel("拓展图封装返回类")
+public class PhotoListDto {
+
+
+    private List<PhotoDto> list;
+
+    public List<PhotoDto> getList() {
+        return list;
+    }
+
+    public void setList(List<PhotoDto> list) {
+        this.list = list;
+    }
+}

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

+package com.pms.ocp.model.dto;
+
+import lombok.Data;
+
+@Data
+public class RatioDTO {
+    private String apiCode;
+
+    public String getApiCode() {
+        return apiCode;
+    }
+
+    public void setApiCode(String apiCode) {
+        this.apiCode = apiCode;
+    }
+}

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

+package com.pms.ocp.model.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "服务应用回显dto")
+public class TenantApiDto {
+    @ApiModelProperty("分类名称")
+    private String apiGroupName;
+    @ApiModelProperty("上级分类名称")
+    private String apiGroupPname;
+
+    @ApiModelProperty("服务应用描述")
+    private String apiTenantDescription;
+
+    @ApiModelProperty("应用编码")
+    private String tenantCode;
+    @ApiModelProperty("应用名称")
+    private String tenantName;
+
+    @ApiModelProperty("所属区域1:生成控制大区 2：信息关联大区3：互联网大区")
+    private Short tenantZone;
+    public String getApiGroupName() {
+        return apiGroupName;
+    }
+
+    public void setApiGroupName(String apiGroupName) {
+        this.apiGroupName = apiGroupName;
+    }
+
+    public String getApiGroupPname() {
+        return apiGroupPname;
+    }
+
+    public void setApiGroupPname(String apiGroupPname) {
+        this.apiGroupPname = apiGroupPname;
+    }
+
+    public String getApiTenantDescription() {
+        return apiTenantDescription;
+    }
+
+    public void setApiTenantDescription(String apiTenantDescription) {
+        this.apiTenantDescription = apiTenantDescription;
+    }
+
+    public String getTenantCode() {
+        return tenantCode;
+    }
+
+    public void setTenantCode(String tenantCode) {
+        this.tenantCode = tenantCode;
+    }
+
+    public String getTenantName() {
+        return tenantName;
+    }
+
+    public void setTenantName(String tenantName) {
+        this.tenantName = tenantName;
+    }
+
+    public Short getTenantZone() {
+        return tenantZone;
+    }
+
+    public void setTenantZone(Short tenantZone) {
+        this.tenantZone = tenantZone;
+    }
+}

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

+package com.pms.ocp.model.entity;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@TableName("t_public_manage_api_model")
+public class ApiParam {
+    private static final long serialVersionUID = 1L;
+    @TableId(value = "obj_id", type = IdType.ASSIGN_ID)
+    @ApiModelProperty("主键ID")
+    private String objId;
+
+    @TableField("model_id")
+    @ApiModelProperty("服务编码")//apiCode
+    private String apiCode;
+
+    @ApiModelProperty("服务名称")//apiName
+    @TableField("model_name")
+    private String apiName;//名称
+
+    @ApiModelProperty("参数类型")
+    private String prop;//参数类型 0,入参，1出参
+
+    @ApiModelProperty("字段类型")
+
+    private String propType;//类型
+
+    @ApiModelProperty("长度")
+
+    private String example;//长度
+
+    @ApiModelProperty("描述说明")
+
+    private String description;//说明
+    @ApiModelProperty("是否必填")
+
+    private String requireds;//0是，1否
+    @ApiModelProperty("类型是否json")
+
+    private String isJson;//0是，1否
+    @ApiModelProperty("")
+//    @Column(name = "GLDX", caption = "")
+    private String gldx;
+    @ApiModelProperty("层级")
+//    @Column(name = "LVL", caption = "层级")
+    private int lvl = 0;//层级
+    @ApiModelProperty("父级ID")
+//    @Column(name = "PID", caption = "父级ID")
+    private String pid;//父级id
+    @ApiModelProperty("示例")
+//    @Column(name = "OTHER", caption = "示例")
+    private String other;//示例
+
+    @ApiModelProperty("排序")
+    private int modelOrder;//排序
+
+    @ApiModelProperty("请求类型")
+    private int reqType = 2;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "出参子类集合")
+    private List<ApiParam> onChildrenList;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "入参子类集合")
+    private List<ApiParam> inChildrenList;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "出参子类集合")
+    private List<ApiParam> childrenList;
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public String getObjId() {
+        return objId;
+    }
+
+    public void setObjId(String objId) {
+        this.objId = objId;
+    }
+
+    public String getApiCode() {
+        return apiCode;
+    }
+
+    public void setApiCode(String apiCode) {
+        this.apiCode = apiCode;
+    }
+
+    public String getApiName() {
+        return apiName;
+    }
+
+    public void setApiName(String apiName) {
+        this.apiName = apiName;
+    }
+
+    public String getProp() {
+        return prop;
+    }
+
+    public void setProp(String prop) {
+        this.prop = prop;
+    }
+
+    public String getPropType() {
+        return propType;
+    }
+
+    public void setPropType(String propType) {
+        this.propType = propType;
+    }
+
+    public String getExample() {
+        return example;
+    }
+
+    public void setExample(String example) {
+        this.example = example;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getRequireds() {
+        return requireds;
+    }
+
+    public void setRequireds(String requireds) {
+        this.requireds = requireds;
+    }
+
+    public String getIsJson() {
+        return isJson;
+    }
+
+    public void setIsJson(String isJson) {
+        this.isJson = isJson;
+    }
+
+    public String getGldx() {
+        return gldx;
+    }
+
+    public void setGldx(String gldx) {
+        this.gldx = gldx;
+    }
+
+    public int getLvl() {
+        return lvl;
+    }
+
+    public void setLvl(int lvl) {
+        this.lvl = lvl;
+    }
+
+    public String getPid() {
+        return pid;
+    }
+
+    public void setPid(String pid) {
+        this.pid = pid;
+    }
+
+    public String getOther() {
+        return other;
+    }
+
+    public void setOther(String other) {
+        this.other = other;
+    }
+
+    public int getModelOrder() {
+        return modelOrder;
+    }
+
+    public void setModelOrder(int modelOrder) {
+        this.modelOrder = modelOrder;
+    }
+
+    public int getReqType() {
+        return reqType;
+    }
+
+    public void setReqType(int reqType) {
+        this.reqType = reqType;
+    }
+
+    public List<ApiParam> getOnChildrenList() {
+        return onChildrenList;
+    }
+
+    public void setOnChildrenList(List<ApiParam> onChildrenList) {
+        this.onChildrenList = onChildrenList;
+    }
+
+    public List<ApiParam> getInChildrenList() {
+        return inChildrenList;
+    }
+
+    public void setInChildrenList(List<ApiParam> inChildrenList) {
+        this.inChildrenList = inChildrenList;
+    }
+
+    public List<ApiParam> getChildrenList() {
+        return childrenList;
+    }
+
+    public void setChildrenList(List<ApiParam> childrenList) {
+        this.childrenList = childrenList;
+    }
+}

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

@@ -59,12 +59,24 @@ public class OcpApiGroup {
 
   @ApiModelProperty("分层树层级 1中台层 2中心层 3 服务组层 4服务层 ")
   private String apiGroupLevel;
-
+  @ApiModelProperty("上级code")
+  private String apiGroupPname;
 
   @ApiModelProperty("上级分类名称")
   @TableField(exist = false)
   private String classIfy;
 
+  @TableField(exist = false)
+  private List<String> apiGroupCodeList;
+
+  public List<String> getApiGroupCodeList() {
+    return apiGroupCodeList;
+  }
+
+  public void setApiGroupCodeList(List<String> apiGroupCodeList) {
+    this.apiGroupCodeList = apiGroupCodeList;
+  }
+
   public String getClassIfy() {
     return classIfy;
   }
@@ -197,6 +209,11 @@ public class OcpApiGroup {
     this.isDelete = isDelete;
   }
 
+  public String getApiGroupPname() {
+    return apiGroupPname;
+  }
 
-
+  public void setApiGroupPname(String apiGroupPname) {
+    this.apiGroupPname = apiGroupPname;
+  }
 }

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

@@ -49,6 +49,13 @@ public class OcpApiParam   implements Serializable {
   @ApiModelProperty("是否删除0:未删除 1已删除")
   private Integer isDelete;
 
+  @ApiModelProperty("模型名称")
+  private String ModelName;
+
+  @ApiModelProperty("模型名称")
+  private String ModelCode;
+
+
 
     public String getObjId() {
         return objId;

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

+package com.pms.ocp.model.entity;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.sql.Timestamp;
+
+@Data
+@Accessors(chain = true)
+@TableName("ocp_api_requirement")
+@ApiModel("服务需求表")
+public class OcpApiRequirement  {
+
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty("主键ID")
+    private String objId;
+
+    @ApiModelProperty("需求编码")
+    private String requirementCode;
+
+    @ApiModelProperty("需求类型0:新增，1:迭代，2下线")
+    private Long requirementType;
+
+    @ApiModelProperty("需求简述")
+    private String requirementComments;
+
+    @ApiModelProperty("服务编码")
+    private String apiCode;
+
+
+    @ApiModelProperty("服务名称")
+    private String apiName;
+
+    @ApiModelProperty("服务分类代码")
+    private String apiGroupCode;
+
+    @ApiModelProperty("服务地址")
+    private String apiUrl;
+
+    @ApiModelProperty("服务版本号")
+    private String apiVersion;
+
+    @ApiModelProperty("需求填报人id")
+    private String requirementUserId;
+
+    @ApiModelProperty("需求填报人姓名")
+    private String requirementUserName;
+
+    @ApiModelProperty("需求创建时间")
+    private Timestamp requirementCtime;
+
+    @ApiModelProperty("需求修改时间")
+    private Timestamp requirementMtime;
+
+    @ApiModelProperty("是否删除0：否 1：是")
+    private Long isDelete;
+
+    @ApiModelProperty("所属区域1:生成控制大区 2：信息关联大区3：互联网大区")
+    private Long apiZone;
+
+    @ApiModelProperty("所属层级1: 应用层 2：平台层、3：网络层 4：感知层")
+    private Long apiLayer;
+
+    @ApiModelProperty("建设单位")
+    private String apiUnit;
+
+    @ApiModelProperty("服务所属公司")
+    private String ownerCompanyCode;
+
+    @ApiModelProperty("推广类型0:统建 1:自建")
+    private Long apiPromotion;
+
+    @ApiModelProperty("服务请求体    ")
+    private String apiReq;
+
+    @ApiModelProperty("服务返回体")
+    private String apiResp;
+
+    @ApiModelProperty("需求填报人部门")
+    private String requirementUserDepg;
+
+    @TableField(exist = false)
+    @ApiModelProperty("初审")
+    private Integer approvalStats;
+    @TableField(exist = false)
+    @ApiModelProperty("终审")
+    private Integer lastApprovalStats;
+
+    public Integer getApprovalStats() {
+        return approvalStats;
+    }
+
+    public void setApprovalStats(Integer approvalStats) {
+        this.approvalStats = approvalStats;
+    }
+
+    public Integer getLastApprovalStats() {
+        return lastApprovalStats;
+    }
+
+    public void setLastApprovalStats(Integer lastApprovalStats) {
+        this.lastApprovalStats = lastApprovalStats;
+    }
+
+    public Long getRequirementType() {
+        return requirementType;
+    }
+
+    public void setRequirementType(Long requirementType) {
+        this.requirementType = requirementType;
+    }
+
+    public Long getIsDelete() {
+        return isDelete;
+    }
+
+    public void setIsDelete(Long isDelete) {
+        this.isDelete = isDelete;
+    }
+
+    public Long getApiZone() {
+        return apiZone;
+    }
+
+    public void setApiZone(Long apiZone) {
+        this.apiZone = apiZone;
+    }
+
+    public Long getApiLayer() {
+        return apiLayer;
+    }
+
+    public void setApiLayer(Long apiLayer) {
+        this.apiLayer = apiLayer;
+    }
+
+    public Long getApiPromotion() {
+        return apiPromotion;
+    }
+
+    public void setApiPromotion(Long apiPromotion) {
+        this.apiPromotion = apiPromotion;
+    }
+
+    public String getObjId() {
+        return objId;
+    }
+
+    public void setObjId(String objId) {
+        this.objId = objId;
+    }
+
+    public String getRequirementCode() {
+        return requirementCode;
+    }
+
+    public void setRequirementCode(String requirementCode) {
+        this.requirementCode = requirementCode;
+    }
+
+
+
+    public String getRequirementComments() {
+        return requirementComments;
+    }
+
+    public void setRequirementComments(String requirementComments) {
+        this.requirementComments = requirementComments;
+    }
+
+    public String getApiCode() {
+        return apiCode;
+    }
+
+    public void setApiCode(String apiCode) {
+        this.apiCode = apiCode;
+    }
+
+    public String getApiName() {
+        return apiName;
+    }
+
+    public void setApiName(String apiName) {
+        this.apiName = apiName;
+    }
+
+    public String getApiGroupCode() {
+        return apiGroupCode;
+    }
+
+    public void setApiGroupCode(String apiGroupCode) {
+        this.apiGroupCode = apiGroupCode;
+    }
+
+    public String getApiUrl() {
+        return apiUrl;
+    }
+
+    public void setApiUrl(String apiUrl) {
+        this.apiUrl = apiUrl;
+    }
+
+    public String getApiVersion() {
+        return apiVersion;
+    }
+
+    public void setApiVersion(String apiVersion) {
+        this.apiVersion = apiVersion;
+    }
+
+    public String getRequirementUserId() {
+        return requirementUserId;
+    }
+
+    public void setRequirementUserId(String requirementUserId) {
+        this.requirementUserId = requirementUserId;
+    }
+
+    public String getRequirementUserName() {
+        return requirementUserName;
+    }
+
+    public void setRequirementUserName(String requirementUserName) {
+        this.requirementUserName = requirementUserName;
+    }
+
+    public Timestamp getRequirementCtime() {
+        return requirementCtime;
+    }
+
+    public void setRequirementCtime(Timestamp requirementCtime) {
+        this.requirementCtime = requirementCtime;
+    }
+
+    public Timestamp getRequirementMtime() {
+        return requirementMtime;
+    }
+
+    public void setRequirementMtime(Timestamp requirementMtime) {
+        this.requirementMtime = requirementMtime;
+    }
+
+    public String getApiUnit() {
+        return apiUnit;
+    }
+
+    public void setApiUnit(String apiUnit) {
+        this.apiUnit = apiUnit;
+    }
+
+    public String getOwnerCompanyCode() {
+        return ownerCompanyCode;
+    }
+
+    public void setOwnerCompanyCode(String ownerCompanyCode) {
+        this.ownerCompanyCode = ownerCompanyCode;
+    }
+
+
+    public String getApiReq() {
+        return apiReq;
+    }
+
+    public void setApiReq(String apiReq) {
+        this.apiReq = apiReq;
+    }
+
+    public String getApiResp() {
+        return apiResp;
+    }
+
+    public void setApiResp(String apiResp) {
+        this.apiResp = apiResp;
+    }
+
+    public String getRequirementUserDepg() {
+        return requirementUserDepg;
+    }
+
+    public void setRequirementUserDepg(String requirementUserDepg) {
+        this.requirementUserDepg = requirementUserDepg;
+    }
+}

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

+package com.pms.ocp.model.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.sql.Timestamp;
+
+@Data
+@Accessors(chain = true)
+@TableName("ocp_api_requirement_accept")
+@ApiModel("服务需求验收表")
+public class OcpApiRequirementAccept {
+
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty("主键ID")
+    private String objId;
+
+
+    @ApiModelProperty("需求编码")
+    private String requirementCode;
+
+    @ApiModelProperty("服务编码")
+    private String apiCode;
+
+    @ApiModelProperty("验收状态0:未验收 1：验收通过 2：验收拒绝")
+    private Long acceptStats;
+
+    @ApiModelProperty("验收单位")
+    private String acceptCompanyCode;
+
+    @ApiModelProperty("验收部门")
+    private String acceptDepartment;
+
+    @ApiModelProperty("验收人")
+    private String acceptUserId;
+
+    @ApiModelProperty("验收人姓名")
+    private String acceptUserName;
+
+    @ApiModelProperty("验收时间")
+    private Timestamp acceptCtime;
+
+    @ApiModelProperty("修改时间")
+    private Timestamp acceptMtime;
+
+    @ApiModelProperty("是否删除0：否 1：是")
+    private Long isDelete;
+
+
+    public String getObjId() {
+        return objId;
+    }
+
+    public void setObjId(String objId) {
+        this.objId = objId;
+    }
+
+    public String getRequirementCode() {
+        return requirementCode;
+    }
+
+    public void setRequirementCode(String requirementCode) {
+        this.requirementCode = requirementCode;
+    }
+
+    public String getApiCode() {
+        return apiCode;
+    }
+
+    public void setApiCode(String apiCode) {
+        this.apiCode = apiCode;
+    }
+
+    public Long getAcceptStats() {
+        return acceptStats;
+    }
+
+    public void setAcceptStats(Long acceptStats) {
+        this.acceptStats = acceptStats;
+    }
+
+    public String getAcceptCompanyCode() {
+        return acceptCompanyCode;
+    }
+
+    public void setAcceptCompanyCode(String acceptCompanyCode) {
+        this.acceptCompanyCode = acceptCompanyCode;
+    }
+
+    public String getAcceptDepartment() {
+        return acceptDepartment;
+    }
+
+    public void setAcceptDepartment(String acceptDepartment) {
+        this.acceptDepartment = acceptDepartment;
+    }
+
+    public String getAcceptUserId() {
+        return acceptUserId;
+    }
+
+    public void setAcceptUserId(String acceptUserId) {
+        this.acceptUserId = acceptUserId;
+    }
+
+    public String getAcceptUserName() {
+        return acceptUserName;
+    }
+
+    public void setAcceptUserName(String acceptUserName) {
+        this.acceptUserName = acceptUserName;
+    }
+
+    public void setAcceptCtime(Timestamp acceptCtime) {
+        this.acceptCtime = acceptCtime;
+    }
+
+    public void setAcceptMtime(Timestamp acceptMtime) {
+        this.acceptMtime = acceptMtime;
+    }
+
+    public Long getIsDelete() {
+        return isDelete;
+    }
+
+    public void setIsDelete(Long isDelete) {
+        this.isDelete = isDelete;
+    }
+}

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

+package com.pms.ocp.model.entity;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.sql.Timestamp;
+
+@Data
+@Accessors(chain = true)
+@TableName("ocp_api_requirement_approval")
+@ApiModel("服务需求审批表")
+public class OcpApiRequirementApproval {
+
+
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty("主键ID")
+    private String objId;
+
+    @ApiModelProperty("需求编码")
+    private String requirementCode;
+
+    @ApiModelProperty("审批状态0:未审核 1：审核通过 2：审批拒绝")
+    private Long approvalStats;
+
+    @ApiModelProperty("最终审批状态0:未审核 1：审核通过 2：审批拒绝")
+    private Long lastApprovalStats;
+
+    @ApiModelProperty("审核人单位")
+    private String approvalCompanyCode;
+
+    @ApiModelProperty("审核人部门")
+    private String approvalDepartment;
+
+    @ApiModelProperty("审核人id")
+    private String approvalUserId;
+
+    @ApiModelProperty("审核人姓名")
+    private String approvalUserName;
+
+    @ApiModelProperty("审核时间")
+    private Timestamp approvalCtime;
+
+    @ApiModelProperty("修改时间")
+    private Timestamp approvalMtime;
+
+    @ApiModelProperty("是否删除0：否 1：是")
+    private Long isDelete;
+
+    @ApiModelProperty("审核意见")
+    private String approvalComment;
+
+    @ApiModelProperty("服务编码")
+    private String apiCode;
+    @ApiModelProperty("审核层次：0初审1终审")
+    private Long  approvalAudit;
+    @ApiModelProperty("判断：1: 管理员 2：领导")
+    @TableField(exist = false)
+    private String lev;
+
+    public String getApiCode() {
+        return apiCode;
+    }
+
+    public void setApiCode(String apiCode) {
+        this.apiCode = apiCode;
+    }
+
+    public String getLev() {
+        return lev;
+    }
+
+    public void setLev(String lev) {
+        this.lev = lev;
+    }
+
+    public String getObjId() {
+        return objId;
+    }
+
+    public void setObjId(String objId) {
+        this.objId = objId;
+    }
+
+    public String getRequirementCode() {
+        return requirementCode;
+    }
+
+    public void setRequirementCode(String requirementCode) {
+        this.requirementCode = requirementCode;
+    }
+
+    public Long getApprovalStats() {
+        return approvalStats;
+    }
+
+    public void setApprovalStats(Long approvalStats) {
+        this.approvalStats = approvalStats;
+    }
+
+    public Long getLastApprovalStats() {
+        return lastApprovalStats;
+    }
+
+    public void setLastApprovalStats(Long lastApprovalStats) {
+        this.lastApprovalStats = lastApprovalStats;
+    }
+
+    public String getApprovalCompanyCode() {
+        return approvalCompanyCode;
+    }
+
+    public void setApprovalCompanyCode(String approvalCompanyCode) {
+        this.approvalCompanyCode = approvalCompanyCode;
+    }
+
+    public String getApprovalDepartment() {
+        return approvalDepartment;
+    }
+
+    public void setApprovalDepartment(String approvalDepartment) {
+        this.approvalDepartment = approvalDepartment;
+    }
+
+    public String getApprovalUserId() {
+        return approvalUserId;
+    }
+
+    public void setApprovalUserId(String approvalUserId) {
+        this.approvalUserId = approvalUserId;
+    }
+
+    public String getApprovalUserName() {
+        return approvalUserName;
+    }
+
+    public void setApprovalUserName(String approvalUserName) {
+        this.approvalUserName = approvalUserName;
+    }
+
+    public Timestamp getApprovalCtime() {
+        return approvalCtime;
+    }
+
+    public void setApprovalCtime(Timestamp approvalCtime) {
+        this.approvalCtime = approvalCtime;
+    }
+
+    public Timestamp getApprovalMtime() {
+        return approvalMtime;
+    }
+
+    public void setApprovalMtime(Timestamp approvalMtime) {
+        this.approvalMtime = approvalMtime;
+    }
+
+    public Long getIsDelete() {
+        return isDelete;
+    }
+
+    public void setIsDelete(Long isDelete) {
+        this.isDelete = isDelete;
+    }
+
+    public String getApprovalComment() {
+        return approvalComment;
+    }
+
+    public void setApprovalComment(String approvalComment) {
+        this.approvalComment = approvalComment;
+    }
+}

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

+package com.pms.ocp.model.entity;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+@TableName("ocp_api_requirement_extent")
+@ApiModel("服务需求扩展表")
+public class OcpApiRequirementExtent {
+
+
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty("主键ID")
+    private String objId;
+
+    @ApiModelProperty("需求编码")
+    private String requirementCode;
+
+    @ApiModelProperty("服务编码")
+    private String apiCode;
+
+    @ApiModelProperty("K8s中的service名称")
+    private String serviceName;
+
+    @ApiModelProperty("所属集群")
+    private String clusterName;
+
+    @ApiModelProperty("部署在K8s中的deploymentname")
+    private String deployment;
+
+    @ApiModelProperty("添加时间")
+    private String apiCtime;
+
+    @ApiModelProperty("修改时间")
+    private String apiMtime;
+
+    @ApiModelProperty("部署包名称")
+    private String apiDepPacketname;
+
+    @ApiModelProperty("是否已删除")
+    private Long isDelete;
+
+    public String getObjId() {
+        return objId;
+    }
+
+    public void setObjId(String objId) {
+        this.objId = objId;
+    }
+
+    public String getRequirementCode() {
+        return requirementCode;
+    }
+
+    public void setRequirementCode(String requirementCode) {
+        this.requirementCode = requirementCode;
+    }
+
+    public String getApiCode() {
+        return apiCode;
+    }
+
+    public void setApiCode(String apiCode) {
+        this.apiCode = apiCode;
+    }
+
+    public String getServiceName() {
+        return serviceName;
+    }
+
+    public void setServiceName(String serviceName) {
+        this.serviceName = serviceName;
+    }
+
+    public String getClusterName() {
+        return clusterName;
+    }
+
+    public void setClusterName(String clusterName) {
+        this.clusterName = clusterName;
+    }
+
+    public String getDeployment() {
+        return deployment;
+    }
+
+    public void setDeployment(String deployment) {
+        this.deployment = deployment;
+    }
+
+
+    public String getApiDepPacketname() {
+        return apiDepPacketname;
+    }
+
+    public void setApiDepPacketname(String apiDepPacketname) {
+        this.apiDepPacketname = apiDepPacketname;
+    }
+
+    public String getApiCtime() {
+        return apiCtime;
+    }
+
+
+    public void setApiCtime(String apiCtime) {
+        this.apiCtime = apiCtime;
+    }
+
+    public String getApiMtime() {
+        return apiMtime;
+    }
+
+    public void setApiMtime(String apiMtime) {
+        this.apiMtime = apiMtime;
+    }
+
+    public Long getIsDelete() {
+        return isDelete;
+    }
+
+    public void setIsDelete(Long isDelete) {
+        this.isDelete = isDelete;
+    }
+}

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

@@ -43,6 +43,9 @@ public class OcpApiTenantRel {
   @ApiModelProperty("关系创建用户")
   private String apiTenantRelUserName;
 
+  @ApiModelProperty("服务应用描述")
+  private String apiTenantDescription;
+
   public String getObjId() {
     return objId;
   }
@@ -114,4 +117,12 @@ public class OcpApiTenantRel {
   public void setApiTenantRelUserName(String apiTenantRelUserName) {
     this.apiTenantRelUserName = apiTenantRelUserName;
   }
+
+  public String getApiTenantDescription() {
+    return apiTenantDescription;
+  }
+
+  public void setApiTenantDescription(String apiTenantDescription) {
+    this.apiTenantDescription = apiTenantDescription;
+  }
 }

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

@@ -3,6 +3,7 @@ package com.pms.ocp.model.entity;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.UUID;
 
 /**
  * @author huxiuwu
@@ -11,10 +12,20 @@ import java.util.Date;
  */
 @Data
 public class PropInfo {
+
+    /**
+     * 模型
+     */
+    private String modelCode="";
+    /**
+     * 主键
+     */
+    private String objId = UUID.randomUUID().toString();
+
     /**
      * 字段名称
      */
-    private String propName;
+    private String propName="";
 
     /**
      * 字段类型
@@ -91,4 +102,5 @@ public class PropInfo {
     private Integer propPromotion;
 
 
+
 }

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

+package com.pms.ocp.model.vo;
+
+import lombok.Data;
+
+@Data
+public class ApiAndModelVO {
+
+
+
+    private String apiName;
+
+    private String apiCode;
+
+    private String iString;
+
+    private String oString;
+
+    private String param1;
+
+    private String param2;
+
+    private float ratio;
+
+    private float ratio2;
+
+    public String getApiCode() {
+        return apiCode;
+    }
+
+    public void setApiCode(String apiCode) {
+        this.apiCode = apiCode;
+    }
+
+    public String getiString() {
+        return iString;
+    }
+
+    public void setiString(String iString) {
+        this.iString = iString;
+    }
+
+    public String getoString() {
+        return oString;
+    }
+
+    public void setoString(String oString) {
+        this.oString = oString;
+    }
+
+    public String getParam1() {
+        return param1;
+    }
+
+    public void setParam1(String param1) {
+        this.param1 = param1;
+    }
+
+    public String getParam2() {
+        return param2;
+    }
+
+    public void setParam2(String param2) {
+        this.param2 = param2;
+    }
+
+    public float getRatio() {
+        return ratio;
+    }
+
+    public void setRatio(float ratio) {
+        this.ratio = ratio;
+    }
+
+    public float getRatio2() {
+        return ratio2;
+    }
+
+    public void setRatio2(float ratio2) {
+        this.ratio2 = ratio2;
+    }
+
+    public String getApiName() {
+        return apiName;
+    }
+
+    public void setApiName(String apiName) {
+        this.apiName = apiName;
+    }
+
+
+}

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

+package com.pms.ocp.model.vo;
+
+import com.pms.ocp.model.entity.Model;
+import com.pms.ocp.model.entity.OcpApiParam;
+import com.pms.ocp.model.entity.OcpApiRequirement;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "服务管控封装类")
+public class ApiRequirentVo extends OcpApiRequirement implements Serializable {
+
+    @ApiModelProperty("出参")
+    private List<OcpApiParam> outList;
+
+    @ApiModelProperty("出参")
+    private  List<OcpApiParam> inList;
+
+    @ApiModelProperty("影响模型")
+    private List<Model> apiModelNames;
+
+    @ApiModelProperty("影响模型描述")
+    private List<String> ModelDescription;
+
+    @ApiModelProperty("影响应用")
+    private  List<String> apiTenantGroupNames;
+
+    @ApiModelProperty("影响应用描述")
+    private  List<String> tenantDescription;
+
+    public List<OcpApiParam> getOutList() {
+        return outList;
+    }
+
+    public void setOutList(List<OcpApiParam> outList) {
+        this.outList = outList;
+    }
+
+    public List<OcpApiParam> getInList() {
+        return inList;
+    }
+
+    public void setInList(List<OcpApiParam> inList) {
+        this.inList = inList;
+    }
+
+    public List<Model> getApiModelNames() {
+        return apiModelNames;
+    }
+
+    public void setApiModelNames(List<Model> apiModelNames) {
+        this.apiModelNames = apiModelNames;
+    }
+
+    public List<String> getModelDescription() {
+        return ModelDescription;
+    }
+
+    public void setModelDescription(List<String> modelDescription) {
+        ModelDescription = modelDescription;
+    }
+
+    public List<String> getApiTenantGroupNames() {
+        return apiTenantGroupNames;
+    }
+
+    public void setApiTenantGroupNames(List<String> apiTenantGroupNames) {
+        this.apiTenantGroupNames = apiTenantGroupNames;
+    }
+
+    public List<String> getTenantDescription() {
+        return tenantDescription;
+    }
+
+    public void setTenantDescription(List<String> tenantDescription) {
+        this.tenantDescription = tenantDescription;
+    }
+}

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

@@ -9,7 +9,6 @@ import lombok.Data;
  */
 @Data
 public class ModelAcceptListVo {
-
     private String modelCode;
     private String modelName;
     private String requirementCode;

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

@@ -129,4 +129,10 @@ public class ModelAcceptVo {
      */
     @ApiModelProperty(value = "建设厂商")
     private String apiUnit;
+
+    /**
+     * 推广类型
+     */
+    @ApiModelProperty(value = "推广类型")
+    private Integer modelPromotion;
 }

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

+package com.pms.ocp.model.vo;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.sql.Timestamp;
+import java.util.List;
+
+@Data
+@Accessors(chain = true)
+@TableName("ocp_api_requirement")
+@ApiModel("服务需求表")
+public class OcpApiRequirementVo {
+
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty("主键ID")
+    private String objId;
+
+    @ApiModelProperty("上级分类名称")
+    private String apiGroupPname;
+
+    @ApiModelProperty("推广类型0统推，1自建")
+    private String apiGroupPromotionType;
+
+    @ApiModelProperty("审核层次：0初审1终审")
+    private String  approvalAudit;
+
+    @ApiModelProperty("分层树层级 1中台层 2中心层 3 服务组层 4服务层 ")
+    private String apiGroupLevel;
+
+    @ApiModelProperty("上级code")
+    private String apiGroupPcode;
+
+    @ApiModelProperty("上级code")
+    private String apiGroupPCode;
+
+    @ApiModelProperty("分类名称")
+    private String apiGroupName;
+
+    @ApiModelProperty("需求编码")
+    private String requirementCode;
+
+    @ApiModelProperty("需求类型0:新增，1:迭代，2下线")
+    private String requirementType;
+
+    @ApiModelProperty("需求简述")
+    private String requirementComments;
+
+    @ApiModelProperty("服务编码")
+    private String apiCode;
+
+    @ApiModelProperty("分类所属公司")
+    private String apiGroupCompanyCode;
+
+    @ApiModelProperty("服务名称")
+    private String apiName;
+
+    @ApiModelProperty("服务分类代码")
+    private String apiGroupCode;
+
+    @ApiModelProperty("服务地址")
+    private String apiUrl;
+
+    @ApiModelProperty("审批状态0:未审核 1：审核通过 2：审批拒绝")
+    private Integer approvalStats;
+
+    @ApiModelProperty("服务版本号")
+    private String apiVersion;
+
+    @ApiModelProperty("需求填报人id")
+    private String requirementUserId;
+
+    @ApiModelProperty("需求填报人姓名")
+    private String requirementUserName;
+
+    @ApiModelProperty("需求创建时间")
+    private String requirementCtime;
+
+    @ApiModelProperty("需求修改时间")
+    private String requirementMtime;
+
+    @ApiModelProperty("是否删除0：否 1：是")
+    private Long isDelete;
+
+    @ApiModelProperty("所属区域1:生成控制大区 2：信息关联大区3：互联网大区")
+    private Long apiZone;
+
+    @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区")
+    private Short tenantZone;
+
+    @ApiModelProperty("所属层级1: 应用层 2：平台层、3：网络层 4：感知层")
+    private Long apiLayer;
+
+    @ApiModelProperty("建设单位")
+    private String apiUnit;
+
+    @ApiModelProperty("服务所属公司")
+    private String ownerCompanyCode;
+
+    @ApiModelProperty("推广类型0:统建 1:自建")
+    private Integer apiPromotion;
+
+    @ApiModelProperty("服务请求体    ")
+    private String apiReq;
+
+    @ApiModelProperty("服务返回体")
+    private String apiResp;
+
+    @ApiModelProperty("当前页")
+    private Integer currentPage;
+
+    @ApiModelProperty("每页条数")
+    private Integer pageSize;
+
+    @ApiModelProperty(value = "查询开始时间")
+    private String startCTime;
+
+    @ApiModelProperty(value = "查询结束时间")
+    private String endCTime;
+
+    @ApiModelProperty("审核人单位")
+    private String approvalCompanyCode;
+
+    @ApiModelProperty("审核人部门")
+    private String approvalDepartment;
+
+    @ApiModelProperty("审核人姓名")
+    private String approvalUserName;
+
+    @ApiModelProperty("审核时间")
+    private String approvalCtime;
+
+    @ApiModelProperty("审核意见")
+    private String approvalComment;
+
+    @ApiModelProperty("验收状态0:未验收 1：验收通过 2：验收拒绝")
+    private String acceptStats;
+
+    @ApiModelProperty("验收单位")
+    private String acceptCompanyCode;
+
+    @ApiModelProperty("验收部门")
+    private String acceptDepartment;
+
+    @ApiModelProperty("验收人")
+    private String acceptUserId;
+
+    @ApiModelProperty("验收人姓名")
+    private String acceptUserName;
+
+    @ApiModelProperty("验收时间")
+    private String acceptCtime;
+
+    @ApiModelProperty("最终审批状态0:未审核 1：审核通过 2：审批拒绝")
+    private Integer lastApprovalStats;
+
+    private List<String> apiGroupCodeList;
+
+    @ApiModelProperty("服务创建时间")
+    private Timestamp apiCtime;
+
+    @ApiModelProperty("服务修改时间")
+    private Timestamp apiMtime;
+
+    @ApiModelProperty("创建者用户ID")
+    private String apiUserId;
+
+    @ApiModelProperty("创建者姓名")
+    private String apiUserName;
+
+    @ApiModelProperty("参数版本")
+    private String apiParamVersion;
+
+    @ApiModelProperty("参数分类out出参  in入参 ")
+    private String apiParamClassification;
+
+    @ApiModelProperty("参数排序")
+    private Integer apiParamOrderNo;
+
+    @ApiModelProperty("参数名称")
+    private String apiParamName;
+
+    @ApiModelProperty("参数值")
+    private String apiParamValue;
+
+    @ApiModelProperty("是否必须0:不必要 1必要")
+    private Integer isRequire;
+
+    @ApiModelProperty("参数类型")
+    private String apiParamType;
+
+    @ApiModelProperty("模型名称")
+    private String modelName;
+
+    @ApiModelProperty("应用名称")
+    private String tenantName;
+
+    @ApiModelProperty("应用代码")
+    private String tenantCode;
+
+    @ApiModelProperty("服务调用总次数")
+    private Integer apiCallCount;
+
+    @ApiModelProperty("服务调用成功次数")
+    private Integer apiCallSuccessCount;
+
+    @ApiModelProperty("服务调用失败次数")
+    private String apiCallFailCount;
+
+    @ApiModelProperty("服务平均耗时单位:毫秒")
+    private String apiAvgCost;
+
+
+    public String getObjId() {
+        return objId;
+    }
+
+    public void setObjId(String objId) {
+        this.objId = objId;
+    }
+
+    public String getApiGroupPromotionType() {
+        return apiGroupPromotionType;
+    }
+
+    public void setApiGroupPromotionType(String apiGroupPromotionType) {
+        this.apiGroupPromotionType = apiGroupPromotionType;
+    }
+
+    public String getApiGroupLevel() {
+        return apiGroupLevel;
+    }
+
+    public void setApiGroupLevel(String apiGroupLevel) {
+        this.apiGroupLevel = apiGroupLevel;
+    }
+
+    public String getApiGroupPCode() {
+        return apiGroupPCode;
+    }
+
+    public void setApiGroupPCode(String apiGroupPCode) {
+        this.apiGroupPCode = apiGroupPCode;
+    }
+
+    public String getApiGroupName() {
+        return apiGroupName;
+    }
+
+    public void setApiGroupName(String apiGroupName) {
+        this.apiGroupName = apiGroupName;
+    }
+
+    public String getRequirementCode() {
+        return requirementCode;
+    }
+
+    public void setRequirementCode(String requirementCode) {
+        this.requirementCode = requirementCode;
+    }
+
+    public String getRequirementType() {
+        return requirementType;
+    }
+
+    public void setRequirementType(String requirementType) {
+        this.requirementType = requirementType;
+    }
+
+    public String getRequirementComments() {
+        return requirementComments;
+    }
+
+    public void setRequirementComments(String requirementComments) {
+        this.requirementComments = requirementComments;
+    }
+
+    public String getApiCode() {
+        return apiCode;
+    }
+
+    public String getApprovalAudit() {
+        return approvalAudit;
+    }
+
+    public void setApprovalAudit(String approvalAudit) {
+        this.approvalAudit = approvalAudit;
+    }
+
+    public void setApiCode(String apiCode) {
+        this.apiCode = apiCode;
+    }
+
+    public String getApiGroupCompanyCode() {
+        return apiGroupCompanyCode;
+    }
+
+    public void setApiGroupCompanyCode(String apiGroupCompanyCode) {
+        this.apiGroupCompanyCode = apiGroupCompanyCode;
+    }
+
+    public String getApiName() {
+        return apiName;
+    }
+
+    public void setApiName(String apiName) {
+        this.apiName = apiName;
+    }
+
+    public String getApiGroupCode() {
+        return apiGroupCode;
+    }
+
+    public void setApiGroupCode(String apiGroupCode) {
+        this.apiGroupCode = apiGroupCode;
+    }
+
+    public String getApiUrl() {
+        return apiUrl;
+    }
+
+    public void setApiUrl(String apiUrl) {
+        this.apiUrl = apiUrl;
+    }
+
+    public Integer getApprovalStats() {
+        return approvalStats;
+    }
+
+    public void setApprovalStats(Integer approvalStats) {
+        this.approvalStats = approvalStats;
+    }
+
+    public String getApiVersion() {
+        return apiVersion;
+    }
+
+    public void setApiVersion(String apiVersion) {
+        this.apiVersion = apiVersion;
+    }
+
+    public String getRequirementUserId() {
+        return requirementUserId;
+    }
+
+    public void setRequirementUserId(String requirementUserId) {
+        this.requirementUserId = requirementUserId;
+    }
+
+    public String getRequirementUserName() {
+        return requirementUserName;
+    }
+
+    public void setRequirementUserName(String requirementUserName) {
+        this.requirementUserName = requirementUserName;
+    }
+
+    public String getRequirementCtime() {
+        return requirementCtime;
+    }
+
+    public void setRequirementCtime(String requirementCtime) {
+        this.requirementCtime = requirementCtime;
+    }
+
+    public String getRequirementMtime() {
+        return requirementMtime;
+    }
+
+    public void setRequirementMtime(String requirementMtime) {
+        this.requirementMtime = requirementMtime;
+    }
+
+    public Long getIsDelete() {
+        return isDelete;
+    }
+
+    public void setIsDelete(Long isDelete) {
+        this.isDelete = isDelete;
+    }
+
+    public Long getApiZone() {
+        return apiZone;
+    }
+
+    public void setApiZone(Long apiZone) {
+        this.apiZone = apiZone;
+    }
+
+    public Short getTenantZone() {
+        return tenantZone;
+    }
+
+    public void setTenantZone(Short tenantZone) {
+        this.tenantZone = tenantZone;
+    }
+
+    public Long getApiLayer() {
+        return apiLayer;
+    }
+
+    public void setApiLayer(Long apiLayer) {
+        this.apiLayer = apiLayer;
+    }
+
+    public String getApiUnit() {
+        return apiUnit;
+    }
+
+    public void setApiUnit(String apiUnit) {
+        this.apiUnit = apiUnit;
+    }
+
+    public String getOwnerCompanyCode() {
+        return ownerCompanyCode;
+    }
+
+    public void setOwnerCompanyCode(String ownerCompanyCode) {
+        this.ownerCompanyCode = ownerCompanyCode;
+    }
+
+    public Integer getApiPromotion() {
+        return apiPromotion;
+    }
+
+    public void setApiPromotion(Integer apiPromotion) {
+        this.apiPromotion = apiPromotion;
+    }
+
+    public String getApiReq() {
+        return apiReq;
+    }
+
+    public void setApiReq(String apiReq) {
+        this.apiReq = apiReq;
+    }
+
+    public String getApiResp() {
+        return apiResp;
+    }
+
+    public void setApiResp(String apiResp) {
+        this.apiResp = apiResp;
+    }
+
+    public Integer getCurrentPage() {
+        return currentPage;
+    }
+
+    public void setCurrentPage(Integer currentPage) {
+        this.currentPage = currentPage;
+    }
+
+    public Integer getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    public String getStartCTime() {
+        return startCTime;
+    }
+
+    public void setStartCTime(String startCTime) {
+        this.startCTime = startCTime;
+    }
+
+    public String getEndCTime() {
+        return endCTime;
+    }
+
+    public void setEndCTime(String endCTime) {
+        this.endCTime = endCTime;
+    }
+
+    public String getApprovalCompanyCode() {
+        return approvalCompanyCode;
+    }
+
+    public void setApprovalCompanyCode(String approvalCompanyCode) {
+        this.approvalCompanyCode = approvalCompanyCode;
+    }
+
+    public String getApprovalDepartment() {
+        return approvalDepartment;
+    }
+
+    public void setApprovalDepartment(String approvalDepartment) {
+        this.approvalDepartment = approvalDepartment;
+    }
+
+    public String getApprovalUserName() {
+        return approvalUserName;
+    }
+
+    public void setApprovalUserName(String approvalUserName) {
+        this.approvalUserName = approvalUserName;
+    }
+
+    public String getApprovalCtime() {
+        return approvalCtime;
+    }
+
+    public void setApprovalCtime(String approvalCtime) {
+        this.approvalCtime = approvalCtime;
+    }
+
+    public String getApprovalComment() {
+        return approvalComment;
+    }
+
+    public void setApprovalComment(String approvalComment) {
+        this.approvalComment = approvalComment;
+    }
+
+    public String getAcceptStats() {
+        return acceptStats;
+    }
+
+    public void setAcceptStats(String acceptStats) {
+        this.acceptStats = acceptStats;
+    }
+
+    public String getAcceptCompanyCode() {
+        return acceptCompanyCode;
+    }
+
+    public void setAcceptCompanyCode(String acceptCompanyCode) {
+        this.acceptCompanyCode = acceptCompanyCode;
+    }
+
+    public String getAcceptDepartment() {
+        return acceptDepartment;
+    }
+
+    public void setAcceptDepartment(String acceptDepartment) {
+        this.acceptDepartment = acceptDepartment;
+    }
+
+    public String getAcceptUserId() {
+        return acceptUserId;
+    }
+
+    public void setAcceptUserId(String acceptUserId) {
+        this.acceptUserId = acceptUserId;
+    }
+
+    public String getAcceptUserName() {
+        return acceptUserName;
+    }
+
+    public void setAcceptUserName(String acceptUserName) {
+        this.acceptUserName = acceptUserName;
+    }
+
+    public String getAcceptCtime() {
+        return acceptCtime;
+    }
+
+    public void setAcceptCtime(String acceptCtime) {
+        this.acceptCtime = acceptCtime;
+    }
+
+    public Integer getLastApprovalStats() {
+        return lastApprovalStats;
+    }
+
+    public void setLastApprovalStats(Integer lastApprovalStats) {
+        this.lastApprovalStats = lastApprovalStats;
+    }
+
+    public List<String> getApiGroupCodeList() {
+        return apiGroupCodeList;
+    }
+
+    public void setApiGroupCodeList(List<String> apiGroupCodeList) {
+        this.apiGroupCodeList = apiGroupCodeList;
+    }
+
+    public Timestamp getApiCtime() {
+        return apiCtime;
+    }
+
+    public void setApiCtime(Timestamp apiCtime) {
+        this.apiCtime = apiCtime;
+    }
+
+    public Timestamp getApiMtime() {
+        return apiMtime;
+    }
+
+    public void setApiMtime(Timestamp apiMtime) {
+        this.apiMtime = apiMtime;
+    }
+
+    public String getApiUserId() {
+        return apiUserId;
+    }
+
+    public void setApiUserId(String apiUserId) {
+        this.apiUserId = apiUserId;
+    }
+
+    public String getApiUserName() {
+        return apiUserName;
+    }
+
+    public void setApiUserName(String apiUserName) {
+        this.apiUserName = apiUserName;
+    }
+
+    public String getApiParamVersion() {
+        return apiParamVersion;
+    }
+
+    public void setApiParamVersion(String apiParamVersion) {
+        this.apiParamVersion = apiParamVersion;
+    }
+
+    public String getApiParamClassification() {
+        return apiParamClassification;
+    }
+
+    public void setApiParamClassification(String apiParamClassification) {
+        this.apiParamClassification = apiParamClassification;
+    }
+
+    public Integer getApiParamOrderNo() {
+        return apiParamOrderNo;
+    }
+
+    public void setApiParamOrderNo(Integer apiParamOrderNo) {
+        this.apiParamOrderNo = apiParamOrderNo;
+    }
+
+    public String getApiParamName() {
+        return apiParamName;
+    }
+
+    public void setApiParamName(String apiParamName) {
+        this.apiParamName = apiParamName;
+    }
+
+    public String getApiParamValue() {
+        return apiParamValue;
+    }
+
+    public void setApiParamValue(String apiParamValue) {
+        this.apiParamValue = apiParamValue;
+    }
+
+    public Integer getIsRequire() {
+        return isRequire;
+    }
+
+    public void setIsRequire(Integer isRequire) {
+        this.isRequire = isRequire;
+    }
+
+    public String getApiParamType() {
+        return apiParamType;
+    }
+
+    public void setApiParamType(String apiParamType) {
+        this.apiParamType = apiParamType;
+    }
+
+    public String getModelName() {
+        return modelName;
+    }
+
+    public void setModelName(String modelName) {
+        this.modelName = modelName;
+    }
+
+    public String getTenantName() {
+        return tenantName;
+    }
+
+    public void setTenantName(String tenantName) {
+        this.tenantName = tenantName;
+    }
+
+    public String getTenantCode() {
+        return tenantCode;
+    }
+
+    public void setTenantCode(String tenantCode) {
+        this.tenantCode = tenantCode;
+    }
+
+    public Integer getApiCallCount() {
+        return apiCallCount;
+    }
+
+    public void setApiCallCount(Integer apiCallCount) {
+        this.apiCallCount = apiCallCount;
+    }
+
+    public Integer getApiCallSuccessCount() {
+        return apiCallSuccessCount;
+    }
+
+    public void setApiCallSuccessCount(Integer apiCallSuccessCount) {
+        this.apiCallSuccessCount = apiCallSuccessCount;
+    }
+
+    public String getApiCallFailCount() {
+        return apiCallFailCount;
+    }
+
+    public void setApiCallFailCount(String apiCallFailCount) {
+        this.apiCallFailCount = apiCallFailCount;
+    }
+
+    public String getApiAvgCost() {
+        return apiAvgCost;
+    }
+
+    public void setApiAvgCost(String apiAvgCost) {
+        this.apiAvgCost = apiAvgCost;
+    }
+}

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

+package com.pms.ocp.service;
+
+import com.pms.ocp.model.dto.AcceptDTO;
+import com.pms.ocp.model.dto.CommitDTO;
+import com.pms.ocp.model.dto.RatioDTO;
+import com.pms.ocp.model.entity.OcpApiRequirementAccept;
+import com.pms.ocp.model.vo.ResponseVO;
+
+/**
+ * 服务验收业务接口
+ *
+ * @author Administrator
+ */
+public interface AcceptInfoService {
+    /**
+     * 服务验收
+     *
+     * @param acceptDTO
+     * @return
+     */
+    ResponseVO acceptInfo(AcceptDTO acceptDTO);
+
+
+    /**
+     * 重合度
+     *
+     * @param ratioDTO
+     * @return
+     */
+    ResponseVO apiModelRepeat(RatioDTO ratioDTO);
+
+    /**
+     * 提交
+     *
+     * @param commitDTO
+     * @return
+     */
+    ResponseVO apiModelRepeatCommit(CommitDTO commitDTO);
+
+    /**
+     * 审核人信息
+     *
+     * @param acceptDTO
+     * @return
+     */
+    ResponseVO acceptPeopleInfo(AcceptDTO acceptDTO);
+}

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

@@ -15,7 +15,7 @@ import java.util.List;
  */
 public interface ApiManagementService {
     List<ApiManagementVO> queryManagement(String apiName, String apiGroupCode, String apiUrl,
-                                          Timestamp startTime, Timestamp endTime,Integer pageSize, Integer pageNum);
+                                          Timestamp startTime, Timestamp endTime, Integer pageSize, Integer pageNum);
 
     void insertManagement(ApiManagementDto apiManagementDto);
 
@@ -28,4 +28,6 @@ public interface ApiManagementService {
     void save(OcpApiBase ocpApiBase);
 
     List<ApiManagementVO> selectApiExport(String apiCodes);
+
+    Integer queryByApiCode(String apiCode);
 }

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

 package com.pms.ocp.service;
 
-import java.util.List;
-
 /**
  * @author huxiuwu
  * @version 1.0
  * @date 2022/4/11 17:17
  */
 public interface ModelCheckRuleService {
-    List<String> checkRule(String modelCode,String requirementCode);
 }

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

@@ -3,7 +3,7 @@ package com.pms.ocp.service;
 
 import com.pms.ocp.model.dto.ModelRelationDTO;
 import com.pms.ocp.model.entity.ModelRelation;
-import com.pms.ocp.model.vo.ModelRelationInputMultiVO;
+//import com.pms.ocp.model.vo.ModelRelationInputMultiVO;
 import com.pms.ocp.model.vo.ModelRelationVO;
 
 import java.util.List;

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

+package com.pms.ocp.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.pms.ocp.model.entity.OcpApiParam;
+
+public interface OcpApiParamService extends IService<OcpApiParam> {
+}

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

+package com.pms.ocp.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.pagehelper.PageInfo;
+import com.pms.ocp.model.vo.ApiRequirentVo;
+import com.pms.ocp.model.vo.OcpApiGroupVo;
+import com.pms.ocp.model.vo.OcpApiRequirementVo;
+import com.pms.ocp.model.vo.ResponseVO;
+
+import java.util.List;
+
+public interface OcpApiReqService extends IService<OcpApiRequirementVo> {
+
+    ResponseVO<PageInfo<OcpApiRequirementVo>> OcpApiReq(OcpApiRequirementVo ocpApiRequirementVo);
+
+    ResponseVO<List<OcpApiRequirementVo>> OacrTree(OcpApiRequirementVo ocpApiRequirementVo);
+
+    ResponseVO<List<OcpApiRequirementVo>> OacrTreeCenter(OcpApiRequirementVo ocpApiRequirementVo);
+
+    ApiRequirentVo selectOarcList(String apiCode);
+
+    ResponseVO<PageInfo<OcpApiRequirementVo>> OcpApiReqAcc(OcpApiRequirementVo ocpApiRequirementVo);
+
+    ResponseVO<List<OcpApiRequirementVo>> selectOcpApiReqAcc(OcpApiRequirementVo ocpApiRequirementVo);
+
+    ResponseVO<List<OcpApiRequirementVo>> OcpApiCheck(OcpApiRequirementVo ocpApiRequirementVo);
+
+    ResponseVO<List<OcpApiRequirementVo>> OarcCheck(OcpApiRequirementVo ocpApiRequirementVo);
+
+    ResponseVO<List<OcpApiRequirementVo>> OacrTreeApi(OcpApiRequirementVo ocpApiRequirementVo);
+
+    ResponseVO<List<OcpApiRequirementVo>> getOcpTenantApiList(OcpApiRequirementVo ocpApiRequirementVo);
+
+}

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

+package com.pms.ocp.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.pms.ocp.model.entity.OcpApiRequirementAccept;
+import com.pms.ocp.model.entity.OcpApiRequirementApproval;
+import com.pms.ocp.model.vo.ResponseVO;
+
+public interface OcpApiRequirementApprovalService extends IService<OcpApiRequirementApproval> {
+
+
+    /**@author：zhaochengming
+     * 服务审核--是否审核通过
+     * @param ocpApiRequirementApproval
+     */
+    ResponseVO inseterObj(OcpApiRequirementApproval ocpApiRequirementApproval);
+
+    /**
+     * 务需求审批-- 拓展图
+     * @param apiCode
+     * @return
+     */
+    ResponseVO selectPhotos(String apiCode);
+
+    /**
+     * 验收列表--提交验收
+     */
+    ResponseVO inseterGroupObj(OcpApiRequirementAccept ocpApiRequirementAccept);
+}

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

+package com.pms.ocp.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.pms.ocp.model.dto.ApiRequirementDto;
+import com.pms.ocp.model.dto.GroupDto;
+import com.pms.ocp.model.dto.OcpApiRequirementDto;
+import com.pms.ocp.model.dto.TenantApiDto;
+import com.pms.ocp.model.entity.*;
+import com.pms.ocp.model.vo.ResponseVO;
+
+import java.util.List;
+import java.util.Map;
+
+public interface OcpApiRequirementService extends IService<OcpApiRequirement> {
+
+    ResponseVO addDemand(OcpApiRequirementDto ocpApiRequirementDto);
+
+    ResponseVO correlationModel(OcpApiRequirementDto ocpApiRequirementDto);
+
+    ResponseVO correlationTenant(OcpApiRequirementDto ocpApiRequirementDto);
+
+
+    List<GroupDto> correlationTenantTree(String tenantGroupCompanyCode, String tenantGroupCode);
+
+
+    /**
+     * 审核查询 --回显
+     * @param apiCode
+     * @return
+     */
+    ApiRequirementDto getSelects(String apiCode);
+
+
+    /**
+     * 服务下线操作
+     * @param objId
+     */
+    void updateTables(String objId);
+
+    /**
+     * 关联表字段
+     * @param ocpApiRequirementDto
+     * @return
+     */
+    ResponseVO correlationTableField(OcpApiRequirementDto ocpApiRequirementDto);
+
+    /**
+     * 迭代-模型回显
+     * @param apiCode
+     * @return
+     */
+    ResponseVO<List<OcpApiModelRel>> echoModel(String apiCode);
+
+    /**
+     * 迭代-表字段回显
+     * @param apiCode
+     * @return
+     */
+    ResponseVO<Map<String,List<ApiParam>>> echoTableField(String apiCode);
+
+    /**
+     * 迭代-应用回显
+     * @param apiCode
+     * @return
+     */
+    ResponseVO<List<TenantApiDto>> echoTenant(String apiCode);
+
+    /**
+     * 迭代-服务信息填写
+     * @param ocpApiRequirementDto
+     * @return
+     */
+    ResponseVO updateDemand(OcpApiRequirementDto ocpApiRequirementDto);
+
+
+
+    /**
+     * 迭代-模型入参出参回显
+     * @param apiCode
+     * @return
+     */
+    ResponseVO<List<OcpApiParam>> echoModelParameter(String apiCode);
+
+    /**
+     * 迭代  审核状态
+     * @param apiCode
+     * @return
+     */
+    ResponseVO selectAuditStatus(String apiCode);
+
+
+
+
+
+
+}

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

@@ -18,7 +18,7 @@ public interface OcpApiTreeService extends IService<OcpApiGroup> {
     /**
      * 服务树分类
      */
-    List<OcpApiGroup> getByGroup(Long apiGroupPromotionType,String apiGroupCode);
+    List<OcpApiGroup> getByGroup(Long apiGroupPromotionType, String apiGroupCode);
 
     /**
      * 新增服务分类

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

+package com.pms.ocp.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.pms.ocp.model.entity.ApiParam;
+
+public interface ParamService extends IService<ApiParam> {
+}

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

@@ -25,7 +25,7 @@ public interface TenantBasicManagementService extends IService<OcpTenantBase> {
      * @param pageNum
      * @return
      */
-    List<OcpTenantBaseDto> queryOcpTenantBaseDto(String tenantGroupCode,String tenantCode, String keyword, String tenantUnit, Timestamp startTime, Timestamp endTime, Integer pageSize, Integer pageNum);
+    List<OcpTenantBaseDto> queryOcpTenantBaseDto(String tenantGroupCode, String tenantCode, String keyword, String tenantUnit, Timestamp startTime, Timestamp endTime, Integer pageSize, Integer pageNum);
 
     /**
      * 应用发布 改变其应用状态
@@ -38,7 +38,7 @@ public interface TenantBasicManagementService extends IService<OcpTenantBase> {
      * 应用订阅
      * @param tenantCodes
      */
-    ResponseVO tenantLogin(String tenantCodes,String companyCode);
+    ResponseVO tenantLogin(String tenantCodes, String companyCode);
 
     /**
      * 下线
@@ -59,7 +59,7 @@ public interface TenantBasicManagementService extends IService<OcpTenantBase> {
      * @param tenantGroupCompanyCode
      * @return
      */
-    List<GroupDto> tenantBaseTreeOther(String tenantGroupCode, String tenantGroupCompanyCode,String tenantCode);
+    List<GroupDto> tenantBaseTreeOther(String tenantGroupCode, String tenantGroupCompanyCode, String tenantCode);
 
     /**
      * 应用列表

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

@@ -17,7 +17,7 @@ public interface TenantService  extends IService<OcpTenantGroup> {
      * 应用树分类管理
      * @return
      */
-    List<OcpTenantGroup> getTree(String tenantGroupCode,String tenantGroupCompanyCode,String level);
+    List<OcpTenantGroup> getTree(String tenantGroupCode, String tenantGroupCompanyCode, String level);
 
     /**
      * 应用新增

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

+package com.pms.ocp.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.pms.ocp.common.utils.SimilarityRatio;
+import com.pms.ocp.common.utils.StringBusinessUtil;
+import com.pms.ocp.mapper.AcceptInfoMapper;
+import com.pms.ocp.mapper.OcpApiRequirementApprovalMapper;
+import com.pms.ocp.model.dto.AcceptDTO;
+
+import com.pms.ocp.model.dto.CommitDTO;
+import com.pms.ocp.model.dto.RatioDTO;
+import com.pms.ocp.model.entity.OcpApiRequirementAccept;
+
+import com.pms.ocp.model.entity.OcpApiRequirementApproval;
+import com.pms.ocp.model.vo.ApiAndModelVO;
+import com.pms.ocp.model.vo.ResponseVO;
+import com.pms.ocp.service.AcceptInfoService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.sql.Timestamp;
+import java.util.List;
+
+/**
+ * 服务验收业务实现
+ *
+ * @author Administrator
+ */
+@Service
+public class AcceptInfoServiceImpl implements AcceptInfoService {
+
+    @Autowired
+    AcceptInfoMapper acceptInfoMapper;
+
+    @Autowired
+    OcpApiRequirementApprovalMapper ocpApiRequirementApprovalMapper;
+
+    /**
+     * 验收通过
+     */
+    private static final String acceptOk = "1";
+
+    /**
+     * 验收不通过
+     */
+    private static final String acceptNo = "2";
+
+    @Override
+    public ResponseVO acceptInfo(AcceptDTO acceptDTO) {
+        OcpApiRequirementAccept ocpApiRequirementAccept = new OcpApiRequirementAccept();
+        if (acceptOk.equals(acceptDTO.getAcceptCode())) {
+            ocpApiRequirementAccept = new OcpApiRequirementAccept();
+
+            ocpApiRequirementAccept.setRequirementCode(acceptDTO.getRequirementCode());
+            ocpApiRequirementAccept.setApiCode(acceptDTO.getApiCode());
+            ocpApiRequirementAccept.setAcceptStats((long) 1);
+            ocpApiRequirementAccept.setAcceptCompanyCode(acceptDTO.getAcceptCompanyCode());
+            ocpApiRequirementAccept.setAcceptDepartment(acceptDTO.getAcceptDepartment());
+            ocpApiRequirementAccept.setAcceptUserId(acceptDTO.getAcceptUserId());
+            ocpApiRequirementAccept.setAcceptUserName(acceptDTO.getAcceptUserName());
+            ocpApiRequirementAccept.setAcceptCtime(new Timestamp(System.currentTimeMillis()));
+            ocpApiRequirementAccept.setIsDelete((long) 0);
+        }
+        if (acceptNo.equals(acceptDTO.getAcceptCode())) {
+            ocpApiRequirementAccept = new OcpApiRequirementAccept();
+
+            ocpApiRequirementAccept.setRequirementCode(acceptDTO.getRequirementCode());
+            ocpApiRequirementAccept.setApiCode(acceptDTO.getApiCode());
+            ocpApiRequirementAccept.setAcceptStats((long) 2);
+            ocpApiRequirementAccept.setAcceptCompanyCode(acceptDTO.getAcceptCompanyCode());
+            ocpApiRequirementAccept.setAcceptDepartment(acceptDTO.getAcceptDepartment());
+            ocpApiRequirementAccept.setAcceptUserId(acceptDTO.getAcceptUserId());
+            ocpApiRequirementAccept.setAcceptUserName(acceptDTO.getAcceptUserName());
+            ocpApiRequirementAccept.setAcceptCtime(new Timestamp(System.currentTimeMillis()));
+            ocpApiRequirementAccept.setIsDelete((long) 0);
+        }
+
+        LambdaQueryWrapper<OcpApiRequirementAccept> qw  =new LambdaQueryWrapper<>();
+        int i = acceptInfoMapper.update(ocpApiRequirementAccept,qw.eq(OcpApiRequirementAccept::getRequirementCode,acceptDTO.getRequirementCode())) ;
+
+        if (i > 0) {
+            return ResponseVO.ok("验收成功");
+        }
+        return ResponseVO.error("");
+    }
+
+    /**
+     * 重合度校验逻辑：1
+     * 首先需要知道，重合度校验的思想是——文本校验——SimilarityRatio.getSimilarityRatio()。
+     * <p>
+     * 根据业务需求，新增的本条服务已经存入数据库中，故先要将这条存在数据库中的服务的is_delete状态置为已删除。
+     * 后遍历排除掉本条服务之后的所有其他服务，用文本校验算法进行比对。
+     * 算法得到的重合度值需要刷新入数据库中。
+     * 查询排除掉本条服务的所有其余服务，按照重合度值排序取前五条。
+     * 最后将先前is_delete置为已删除的状态恢复。
+     * <p>
+     * 模型重合度：三个字段。
+     * 字段重合度：五个字段。
+     *
+     * @param ratioDTO
+     * @return
+     */
+    @Override
+    public ResponseVO apiModelRepeat(RatioDTO ratioDTO) {
+
+        if (acceptInfoMapper.getNowApiCode(ratioDTO.getApiCode()) == 0) {
+            return ResponseVO.error("当前服务尚未添加进数据库");
+        }
+
+        acceptInfoMapper.updateDel(ratioDTO.getApiCode());
+        ApiAndModelVO vo = acceptInfoMapper.getRatioByApiCode(ratioDTO.getApiCode());
+        // 模型重合度
+        String str = vo.getApiCode() + vo.getiString() + vo.getoString();
+        // 字段重合度
+        String str2 = vo.getApiCode() + vo.getiString() + vo.getoString() + vo.getParam1() + vo.getParam2();
+
+
+        List<ApiAndModelVO> list = acceptInfoMapper.getAllApiAndModel();
+
+        if (StringBusinessUtil.isNullOrEmpty(list)) {
+            return ResponseVO.error("所有服务数据仅一条,无法进行对比,请多增加服务数据以便对比");
+        }
+
+        for (ApiAndModelVO item : list) {
+
+            // 模型重合度
+            String tar = item.getApiCode() + item.getiString() + item.getoString();
+            // 字段重合度
+            String tar2 = item.getApiCode() + item.getiString() + item.getoString() + item.getParam1() + item.getParam2();
+
+            // 模型重合度
+            float ratio = SimilarityRatio.getSimilarityRatio(str, tar);
+            // 字段重合度
+            float ratio2 = SimilarityRatio.getSimilarityRatio(str2, tar2);
+
+            // 模型重合度
+            acceptInfoMapper.updateRatioByApiCode(ratio, item.getApiCode());
+            // 字段重合度
+            acceptInfoMapper.updateRatioParamByApiCode(ratio2, item.getApiCode());
+        }
+        List<ApiAndModelVO> finalList = acceptInfoMapper.getFinalRatio();
+
+        acceptInfoMapper.returnDel(ratioDTO.getApiCode());
+        return ResponseVO.ok(finalList);
+    }
+
+    @Override
+    public ResponseVO apiModelRepeatCommit(CommitDTO commitDTO) {
+        //先删
+        if (StringUtils.isEmpty(commitDTO.getApiCode())){
+            return ResponseVO.error("服务编码为空");
+        }
+
+        LambdaQueryWrapper<OcpApiRequirementApproval> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(StringUtils.isNotEmpty(commitDTO.getApiCode()),OcpApiRequirementApproval::getApiCode,commitDTO.getApiCode());
+        ocpApiRequirementApprovalMapper.delete(wrapper);
+
+        OcpApiRequirementApproval ocpApiRequirementApproval = new OcpApiRequirementApproval();
+        ocpApiRequirementApproval.setRequirementCode(commitDTO.getRequirementCode());
+        ocpApiRequirementApproval.setApprovalStats((long) 0);
+        ocpApiRequirementApproval.setLastApprovalStats((long) 0);
+        ocpApiRequirementApproval.setApprovalCompanyCode("0");
+        ocpApiRequirementApproval.setApprovalDepartment("0");
+        ocpApiRequirementApproval.setApprovalUserId("0");
+        ocpApiRequirementApproval.setApprovalUserName("0");
+        ocpApiRequirementApproval.setApprovalCtime(new Timestamp(System.currentTimeMillis()));
+        ocpApiRequirementApproval.setIsDelete((long) 0);
+        ocpApiRequirementApproval.setApiCode(commitDTO.getApiCode());
+
+        if (ocpApiRequirementApprovalMapper.insert(ocpApiRequirementApproval) == 0) {
+            return ResponseVO.error("提交失败");
+        }
+        return ResponseVO.ok("提交成功");
+    }
+
+    @Override
+    public ResponseVO acceptPeopleInfo(AcceptDTO acceptDTO) {
+        List<OcpApiRequirementApproval> list = acceptInfoMapper.getAcceptPeopleInfo(acceptDTO.getRequirementCode());
+
+        return ResponseVO.ok(list);
+    }
+}

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 
+import com.github.pagehelper.util.StringUtil;
 import com.pms.ocp.mapper.*;
 
 import com.pms.ocp.model.dto.ApiBaseDto;
@@ -275,24 +276,25 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl<ApiBasicManagemen
         if (apiBaseReq.getCurrentPage() == null || apiBaseReq.getPageSize() == null) {
             return ResponseVO.error("分页参数不能为空");
         }
-        apiGroupCode.add(apiBaseReq.getApiGroupCode());
-        setGroupIdValue(apiBaseReq.getApiGroupCompanyCode(), apiBaseReq.getApiGroupCode(), apiBaseReq.getApiPromotion());
-        PageHelper.startPage(apiBaseReq.getCurrentPage(), apiBaseReq.getPageSize());
-        apiBaseReq.setApiGroupCodeList(apiGroupCode);
-//        List<OcpApiBaseVo> ocpApiBaseVos = ocpApiGroupMapper.selectPageLists(apiBaseReq);
-        List<OcpApiBase> list = apiBasicManagementMapper.selectByCondition(apiBaseReq);
-        apiGroupCode.clear();
-        PageInfo<OcpApiBase> pageInfo = new PageInfo<>(list);
+        List<OcpApiBase> ocpApiBases =null;
+
+        if(StringUtil.isEmpty(apiBaseReq.getApiGroupCode())){
+            QueryWrapper<OcpApiBase> wrapper = new QueryWrapper<>();
+            wrapper.lambda().eq(OcpApiBase::getIsDelete, 0);
+            wrapper.lambda().like(OcpApiBase::getApiName, StringUtil.isEmpty(apiBaseReq.getApiName())?"":apiBaseReq.getApiName());
+            wrapper.lambda().like(OcpApiBase::getApiCode, StringUtil.isEmpty(apiBaseReq.getApiCode())?"":apiBaseReq.getApiCode());
+            PageHelper.startPage(apiBaseReq.getCurrentPage(), apiBaseReq.getPageSize());
+            ocpApiBases = apiBasicManagementMapper.selectList(wrapper);
+        }else {
+            apiGroupCode.add(apiBaseReq.getApiGroupCode());
+            setGroupIdValue(apiBaseReq.getApiGroupCompanyCode(), apiBaseReq.getApiGroupCode(), apiBaseReq.getApiPromotion());
+            apiBaseReq.setApiGroupCodeList(apiGroupCode);
+            PageHelper.startPage(apiBaseReq.getCurrentPage(), apiBaseReq.getPageSize());
+            ocpApiBases = apiBasicManagementMapper.selectByCondition(apiBaseReq);
+            apiGroupCode.clear();
+        }
+        PageInfo<OcpApiBase> pageInfo = new PageInfo<>(ocpApiBases);
         return ResponseVO.ok(pageInfo);
-
-//
-//        if (currentPage == null || pageSize == null) {
-//            return ResponseVO.error("分页参数不能为空");
-//        }
-//        PageHelper.startPage(currentPage, pageSize);
-//        List<OcpApiBase> list = apiBasicManagementMapper.selectByCondition(apiCode, apiName, apiCenterCode,apiGroupCode);
-//        PageInfo<OcpApiBase> pageInfo = new PageInfo<>(list);
-//        return ResponseVO.ok(pageInfo);
     }
 
     /**

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

 package com.pms.ocp.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.pms.ocp.mapper.ApiManagementMapper;
 import com.pms.ocp.model.dto.ApiManagementDto;
 import com.pms.ocp.model.entity.OcpApiBase;
 import com.pms.ocp.model.entity.OcpApiExtent;
+import com.pms.ocp.model.entity.OcpApiParam;
 import com.pms.ocp.model.vo.ApiManagementVO;
 import com.pms.ocp.service.ApiManagementService;
 import com.pms.ocp.service.OcpApiExtentService;
@@ -28,6 +30,8 @@ public class ApiManagementImpl implements ApiManagementService {
     @Autowired
     private OcpApiExtentService ocpApiExtentService;
 
+
+
     /**
      * @Description:服务管理查询
      * @param apiName,apiGroupCode,apiUrl,startTime,startTime,endTime,pageSize,pageNum
@@ -116,5 +120,13 @@ public class ApiManagementImpl implements ApiManagementService {
         return apiManagementMapper.selectApiExport(list);
     }
 
+    @Override
+    public Integer queryByApiCode(String apiCode) {
+        QueryWrapper<OcpApiBase> wrapper = new QueryWrapper<>();
+        wrapper.lambda().eq(OcpApiBase::getApiCode, apiCode);
+        Integer count = apiManagementMapper.selectCount(wrapper);
+        return count;
+    }
+
 
 }

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

 package com.pms.ocp.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
+//import com.baomidou.dynamic.datasource.annotation.DS;
 import com.pms.ocp.mapper.MiddleGroundModelMapper;
 import com.pms.ocp.model.entity.ModelPropInfo;
 import com.pms.ocp.service.MiddleGroundModelService;
@@ -16,7 +16,7 @@ import java.util.List;
  * @date 2022/4/9 14:40
  */
 @Service
-@DS("middleGround")
+//@DS("middleGround")
 public class MiddleGroundModelServiceImpl implements MiddleGroundModelService {
 
     @Resource
@@ -37,4 +37,5 @@ public class MiddleGroundModelServiceImpl implements MiddleGroundModelService {
         }
         return middleGroundModelMapper.selectMiddleGroundModeByName(ModelName,schemaNameList.get(0));
     }
+
 }

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

@@ -13,7 +13,6 @@ import com.pms.ocp.model.vo.ModelCheckVo;
 import com.pms.ocp.model.vo.ResponseVO;
 import com.pms.ocp.service.MiddleGroundModelService;
 import com.pms.ocp.service.ModelAcceptService;
-import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -22,6 +21,7 @@ import javax.annotation.Resource;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Objects;
+import java.util.UUID;
 import java.util.stream.Collectors;
 
 /**
@@ -83,7 +83,7 @@ public class ModelAcceptServiceImpl implements ModelAcceptService {
      * @param requirementCode 需求编码
      * @param modelCode       模型编码
      * @param tableName       表名称
-     * @return ResponseVO<java.util.List   <   com.pms.ocp.model.entity.ModelPropInfo>>
+     * @return ResponseVO<java.util.List < com.pms.ocp.model.entity.ModelPropInfo>>
      * @author huxiuwu
      * @date 2022/4/11
      **/
@@ -101,23 +101,39 @@ public class ModelAcceptServiceImpl implements ModelAcceptService {
 
     /**
      * @param model 模型数据
-     * @return ResponseVO<java.util.List   <   com.pms.ocp.model.entity.ModelPropInfo>>
+     * @return ResponseVO<java.util.List com.pms.ocp.model.entity.ModelPropInfo>>
      * @author huxiuwu
      * @date 2022/4/11
      **/
-    @SneakyThrows
     @Transactional(rollbackFor = Exception.class)
     @Override
     public ResponseVO<List<ModelPropInfo>> modelAcceptPass(Model model) {
         //新增至模型基础表
         modelMapper.insert(model);
+        //更行属性信息到模型属性基础表
+        String code = model.getModelCode() == null ? UUID.randomUUID().toString() : model.getModelCode();
+        List<ModelPropInfo> modelPropInfoList = modelCheckMapper.selectModelOwnerProp(code);
+        if (CollectionUtil.isNotEmpty(modelPropInfoList)
+                && CollectionUtil.isNotEmpty(modelPropInfoList.get(0).getPropList())
+                && CollectionUtil.isNotEmpty(modelPropInfoList.get(0).getPropList())) {
+            List<PropInfo> propList = modelPropInfoList.get(0).getPropList();
+            List<PropInfo> needPropList = new LinkedList<>();
+            for (PropInfo propInfo : propList) {
+                if (propInfo.getPropCode() != null && propInfo.getPropName() != null) {
+                    needPropList.add(propInfo);
+
+                }
+            }
+            if (CollectionUtil.isNotEmpty(needPropList)){
+                modelAcceptMapper.insertPropList(needPropList);
+            }
+
+        }
         //删除模型版本表,属性版本表,需求表,审核表
         modelAcceptMapper.deleteModelVersion(model);
         modelAcceptMapper.deletePropVersion(model);
         modelAcceptMapper.deleteRequirementVersion(model);
         modelAcceptMapper.deleteAcceptVersion(model);
-        //boolean modelRelationProp  =  modelAcceptMapper.deleteModelRelationProp(model);
-       // List<ModelPropInfo> modelPropInfoList = modelCheckMapper.selectModelOwnerProp(model.getModelCode());
         return ResponseVO.ok();
     }
 

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

 package com.pms.ocp.service.impl;
 
-import cn.hutool.core.collection.CollectionUtil;
-import com.pms.ocp.mapper.ModelCheckMapper;
-import com.pms.ocp.model.entity.ModelPropInfo;
-import com.pms.ocp.model.entity.PropInfo;
 import com.pms.ocp.service.ModelCheckRuleService;
-import org.apache.commons.collections4.list.TreeList;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
-import java.util.LinkedList;
-import java.util.List;
-
 /**
  * @author huxiuwu
  * @version 1.0
@@ -20,77 +11,4 @@ import java.util.List;
 @Service
 public class ModelCheckRuleServiceImpl implements ModelCheckRuleService {
 
-    @Resource
-    private ModelCheckMapper modelCheckMapper;
-
-    /**
-     * @param modelCode       模型编码
-     * @param requirementCode 需求编码
-     * @return List<String>
-     * @author huxiuwu
-     * @date 2022/4/11
-     **/
-    @Override
-    public List<String> checkRule(String modelCode, String requirementCode) {
-        List<ModelPropInfo> ownerProp = modelCheckMapper.selectModelOwnerProp(modelCode);
-        List<String> result = checkModelRule(ownerProp);
-        return result;
-    }
-
-    /**
-     * @param ownerProp 自己的属性
-     * @return List<String>
-     * @author huxiuwu
-     * @date 2022/4/11
-     **/
-    private List<String> checkModelRule(List<ModelPropInfo> ownerProp) {
-        ModelPropInfo modelPropInfo = ownerProp.get(0);
-        //校验
-        List<String> checkResult = checkRuleOne(modelPropInfo);
-        return checkResult;
-    }
-
-    private List<String> checkRuleOne(ModelPropInfo modelPropInfo) {
-        List<String> temp = new TreeList<>();
-        final String regular = ("([a-z]+)|([A-Z][a-z]*)|([A-Z]+)");
-        String modelTable = modelPropInfo.getModelTable();
-        String tableName = modelTable == null ? "" : modelTable;
-        if (!tableName.matches(regular) || checkRuleOther(tableName)) {
-            temp.add("表名要小写，下划线风格，采用四段式，不超过30个字符串");
-        }
-        temp = checkRuleTwo(modelPropInfo, temp);
-        return temp;
-    }
-
-    private List<String> checkRuleTwo(ModelPropInfo modelPropInfo, List<String> temp) {
-        List<PropInfo> propList = modelPropInfo.getPropList();
-        if (CollectionUtil.isEmpty(propList)) {
-            temp.add("属性必须有注释");
-            return temp;
-        }
-        List<Boolean> isHasPk = new LinkedList<>();
-        boolean isPk;
-        for (PropInfo propInfo : propList) {
-            if (propInfo.getColumnComments() == null) {
-                temp.add("属性必须有注释");
-            }
-            isPk = propInfo.getIsPk()==1;
-            if (isPk){
-                isHasPk.add(isPk);
-            }
-        }
-        if (CollectionUtil.isEmpty(isHasPk)){
-            temp.add("未有主键");
-        }
-        return temp;
-    }
-
-    private boolean checkRuleOther(String tableName) {
-        int length = tableName.split("_").length;
-        if (length <= 0||tableName.length() >= 30) {
-            return true;
-        }
-        return false;
-    }
-
 }

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

@@ -10,7 +10,6 @@ import com.pms.ocp.model.dto.OcpModelRequirementAcceptDto;
 import com.pms.ocp.model.entity.ModelPropInfo;
 import com.pms.ocp.model.vo.ModelCheckVo;
 import com.pms.ocp.model.vo.ResponseVO;
-import com.pms.ocp.service.ModelCheckRuleService;
 import com.pms.ocp.service.ModelCheckService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -32,9 +31,6 @@ public class ModelCheckServiceImpl implements ModelCheckService {
     @Resource
     private ModelCheckMapper modelCheckMapper;
 
-    @Resource
-    private ModelCheckRuleService modelCheckRuleService;
-
     /**
      * 模型审核列表
      * @author huxiuwu
@@ -49,10 +45,11 @@ public class ModelCheckServiceImpl implements ModelCheckService {
         PageHelper.startPage(currentPage,pageSize);
         List<ModelCheckVo> modelCheckVoList = modelCheckMapper.modelAuditList(searchCondition);
         //查询组织机构
-        List<ModelCheckVo> companyList = modelCheckMapper.selectCompanyList();
+        //PageHelper.startPage(currentPage,pageSize);
+        //List<ModelCheckVo> companyList = modelCheckMapper.selectCompanyList();
         //将组织机构表合并到审核list中
-        List<ModelCheckVo> result = pageList(modelCheckVoList,companyList);
-        PageInfo<ModelCheckVo> pageInfo = new PageInfo<>(result);
+       // List<ModelCheckVo> result = pageList(modelCheckVoList,companyList);
+        PageInfo<ModelCheckVo> pageInfo = new PageInfo<>(modelCheckVoList);
         return ResponseVO.ok(pageInfo);
     }
 
@@ -66,14 +63,19 @@ public class ModelCheckServiceImpl implements ModelCheckService {
     @Transactional(rollbackFor = Exception.class)
     @Override
     public ResponseVO updateAuditType(ModelAuditDto ocp) {
+        ocp.setApprovalCtime(new Date());
         //修改状态
         boolean isUpdateSucceed = modelCheckMapper.updateAuditState(ocp);
         boolean flag = isUpdateSucceed;
         if (ocp.getAuditState()== Constant.Number.ONE){
-            OcpModelRequirementAcceptDto dto = pageOcpDto(ocp);
-            //审核通过,新增至验收表
-            boolean isInsertSucceed = modelCheckMapper.saveAccept(dto);
-            flag = (isInsertSucceed && isUpdateSucceed) == true;
+            //判断记录是否存在
+            int count = modelCheckMapper.selectModelByRequirementCode(ocp);
+            if (count==0){
+                OcpModelRequirementAcceptDto dto = pageOcpDto(ocp);
+                //审核通过,新增至验收表
+                boolean isInsertSucceed = modelCheckMapper.saveAccept(dto);
+                flag = (isInsertSucceed && isUpdateSucceed) == true;
+            }
         }else{
             //其他状态删除该需求编码避免数据重复
             modelCheckMapper.deleteByRequirementCode(ocp);
@@ -94,9 +96,7 @@ public class ModelCheckServiceImpl implements ModelCheckService {
     @Override
     public ResponseVO<List<ModelPropInfo>> modelRelation(String modelCode) {
         //查询模型以及自己所拥有字段
-        List<ModelPropInfo> modelPropInfoList = modelCheckMapper.selectModelOwnerProp(null);
-        //校验模型数据
-
+        List<ModelPropInfo> modelPropInfoList = modelCheckMapper.selectModelOwnerProp(modelCode);
         //转换为map
         Map<String, ModelPropInfo> modelMap = modelPropInfoList.stream().collect(Collectors.toMap(ModelPropInfo::getModelCode, o -> o));
         //查询中间表获取关联模型code列表
@@ -124,7 +124,6 @@ public class ModelCheckServiceImpl implements ModelCheckService {
         return list;
     }
 
-
     /**
      * 封装审核通过新增验收表数据
      * @author huxiuwu

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

@@ -73,6 +73,8 @@ public class ModelClassifyServiceImpl implements ModelClassifyService {
         List<OcpModelGroupVO> ocpModelGroupVOList = this.selectByCondition(null,null);
         if (isTop){
             List<OcpModelGroupVO> dimConditionList = this.selectByCondition(null,subclassGroupName);
+            //获取上次分类名称
+            findParentName(dimConditionList);
             PageUtil<OcpModelGroupVO> pageUtil = getOcpModelGroupVOPageUtil(currentPage, pageSize, dimConditionList);
             return ResponseVO.ok(pageUtil);
         }
@@ -89,7 +91,30 @@ public class ModelClassifyServiceImpl implements ModelClassifyService {
         PageUtil<OcpModelGroupVO> pageUtil = getOcpModelGroupVOPageUtil(currentPage, pageSize, childrenList);
         return ResponseVO.ok(pageUtil);
     }
+    /**
+     * 查找上级分类名称
+     * @author huxiuwu
+     * @date 2022/4/14
+     * @param dimConditionList
+     * @return void
+     **/
+    private void findParentName(List<OcpModelGroupVO> dimConditionList) {
+        Map<String, OcpModelGroupVO> nodeMap = new LinkedHashMap<>(dimConditionList.size());
+        for (OcpModelGroupVO treeNode : dimConditionList) {
+            nodeMap.put(treeNode.getModelGroupCode(), treeNode);
+        }
+        for (OcpModelGroupVO ocpModelGroupVO : dimConditionList) {
+            OcpModelGroupVO vo = nodeMap.get(ocpModelGroupVO.getModelGroupPcode());
+            ocpModelGroupVO.setModelGroupPName(vo==null?"":vo.getModelGroupName());
+        }
+    }
 
+    /**
+     * 模糊搜索
+     * @param childrenList
+     * @param subclassGroupName
+     * @return
+     */
     private List<OcpModelGroupVO> dimSearchList(List<OcpModelGroupVO> childrenList, String subclassGroupName) {
         List<OcpModelGroupVO> list = new LinkedList<>();
         for (OcpModelGroupVO ocpModelGroupVO : childrenList) {
@@ -117,20 +142,28 @@ public class ModelClassifyServiceImpl implements ModelClassifyService {
      **/
     @Override
     public ResponseVO update(List<ModelClassify> list) {
-//        if (getModelClassify(list,()->new QueryWrapper<ModelClassify>().ne("obj_id",list.get(0).getObjId()))){
-//            return ResponseVO.error(CodeEnum.DATA_REPETITION);
-//        }
+        if (getModelClassify(list,()->new QueryWrapper<ModelClassify>().ne("obj_id",list.get(0).getObjId()))){
+            return ResponseVO.error(CodeEnum.DATA_REPETITION);
+        }
         boolean isUpdateSucceed = ocpService.saveOrUpdateBatch(list);
         if (!isUpdateSucceed) {
             ResponseVO.error(CodeEnum.UP_DATA_FAIL);
         }
         return ResponseVO.ok();
     }
-
+    /**
+     * 校验模型编码是否重复
+     * @author huxiuwu
+     * @date 2022/4/14
+     * @param list
+     * @param supplier
+     * @return boolean
+     **/
     private boolean getModelClassify(List<ModelClassify> list,Supplier<QueryWrapper<ModelClassify>> supplier) {
+       // .or().eq("model_group_name",data.getModelGroupName())
         ModelClassify data = list.get(0);
         QueryWrapper<ModelClassify> queryWrapper = supplier.get();
-        queryWrapper.and(QueryWrapper-> QueryWrapper.eq("model_group_code",data.getModelGroupCode()).or().eq("model_group_name",data.getModelGroupName()));
+        queryWrapper.and(QueryWrapper-> QueryWrapper.eq("model_group_code",data.getModelGroupCode()));
         List<ModelClassify> modelClassifyList = ocpModelGroupMapper.selectList(queryWrapper);
         if (CollectionUtil.isNotEmpty(modelClassifyList)){
             return true;
@@ -162,9 +195,9 @@ public class ModelClassifyServiceImpl implements ModelClassifyService {
      **/
     @Override
     public ResponseVO insert(List<ModelClassify> list) {
-//        if (getModelClassify(list,()->new  QueryWrapper<ModelClassify>())){
-//            return ResponseVO.error(CodeEnum.DATA_REPETITION);
-//        }
+        if (getModelClassify(list,()->new  QueryWrapper<ModelClassify>())){
+            return ResponseVO.error(CodeEnum.DATA_REPETITION);
+        }
         boolean result = ocpService.saveBatch(list);
         if (!result) {
             return ResponseVO.error(CodeEnum.INSERT_FAIL);
@@ -176,9 +209,6 @@ public class ModelClassifyServiceImpl implements ModelClassifyService {
      * 获取父节点下的所有子节点放入list中
      * @author huxiuwu
      * @date 2022/3/9
-     * @param
-     * @param
-     * @param
      * @return void
      **/
     private List<OcpModelGroupVO> findChildren(List<OcpModelGroupVO> groupList, OcpModelGroupVO parent, List<OcpModelGroupVO> childList) {

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

@@ -35,9 +35,9 @@ public class ModelPropertyVersionServiceImpl implements ModelPropertyVersionServ
     public Integer deleteModelPropertyVersion(String requirementCode, String modelCode, String propCode) {
         QueryWrapper<ModelPropertyVersion> queryWrapper = new QueryWrapper();
 
-//        if (StringUtils.isNotEmpty(requirementCode)) {
-//            queryWrapper.lambda().eq(ModelPropertyVersion::getRequirementCode, requirementCode);
-//        }
+        if (StringUtils.isNotEmpty(requirementCode)) {
+            queryWrapper.lambda().eq(ModelPropertyVersion::getRequirementCode, requirementCode);
+        }
 
         if (StringUtils.isNotEmpty(modelCode)) {
             queryWrapper.lambda().eq(ModelPropertyVersion::getModelCode, modelCode);

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

@@ -10,7 +10,7 @@ import com.pms.ocp.model.entity.Model;
 import com.pms.ocp.model.entity.ModelClassify;
 import com.pms.ocp.model.entity.ModelProperty;
 import com.pms.ocp.model.entity.ModelRelation;
-import com.pms.ocp.model.vo.ModelRelationInputMultiVO;
+//import com.pms.ocp.model.vo.ModelRelationInputMultiVO;
 import com.pms.ocp.model.vo.ModelRelationVO;
 import com.pms.ocp.service.ModelRelationService;
 import com.pms.ocp.service.OcpModelGroupService;
@@ -19,7 +19,6 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;

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

@@ -103,16 +103,16 @@ public class ModelSubscribeServiceImpl implements ModelSubscribeService {
         Map<Integer,List<TreeNode>> modelGroupMap = modelList.stream().collect(Collectors.groupingBy(TreeNode::getModelPromotion));
         //统推list
         List<TreeNode> unifiedPushList = setChildren(HandlingNullPointers(modelGroupMap.get(Constant.Number.ZERO)),modelGroupList ,(org, group) ->
-                org.getModelGroupCode().equals(group.getModelGroupCode()));
+                org.getModelGroupCode().equals(group.getModelGroupCode()),0);
         List<TreeNode> newModelGroupList = TreeUtils.build(unifiedPushList);
         modelNavigationVO.setUnifiedPush(newModelGroupList);
         List<TreeNode> selfModelBuildList = setChildren(HandlingNullPointers(modelGroupMap.get(Constant.Number.ONE)),modelGroupList ,(org, group) ->
-                org.getModelGroupCode().equals(group.getModelGroupCode()));
+                org.getModelGroupCode().equals(group.getModelGroupCode()),1);
         //查询组织机构表
         List<TreeNode> organList = modelSubscribeMapper.selectOrganData();
         //将分类放入各自所属于的组织机构下
         List<TreeNode> groupOrgList = setChildren(selfModelBuildList, organList,(org, group) ->
-                org.getCompanyCode().equals(group.getCompanyCode())
+                org.getCompanyCode().equals(group.getCompanyCode()),1
         );
         List<TreeNode> selfBuildList = TreeUtils.build(groupOrgList);
         modelNavigationVO.setSelfBuilt(selfBuildList);
@@ -135,10 +135,11 @@ public class ModelSubscribeServiceImpl implements ModelSubscribeService {
      * @param function
      * @return
      */
-    private List<TreeNode> setChildren(List<TreeNode> modelGroupList, List<TreeNode> organList, BiFunction<TreeNode,TreeNode,Boolean> function) {
+    private List<TreeNode> setChildren(List<TreeNode> modelGroupList, List<TreeNode> organList, BiFunction<TreeNode,TreeNode,Boolean> function ,int modelPromotion) {
         organList.forEach(org -> {
             modelGroupList.forEach(group -> {
                 if (function.apply(org, group) ) {
+                    group.setModelPromotion(modelPromotion);
                     if (org.getChildren() == null) {
                         org.setChildren(new LinkedList<>());
                     }

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

+package com.pms.ocp.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.pms.ocp.mapper.*;
+import com.pms.ocp.model.entity.*;
+import com.pms.ocp.model.vo.ApiRequirentVo;
+import com.pms.ocp.model.vo.OcpApiBaseVo;
+import com.pms.ocp.model.vo.OcpApiRequirementVo;
+import com.pms.ocp.model.vo.ResponseVO;
+import com.pms.ocp.service.OcpApiReqService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Service
+public class OcpApiReqServiceImpl extends ServiceImpl<OcpApiReqMapper, OcpApiRequirementVo> implements OcpApiReqService {
+
+    @Autowired
+    private OcpApiReqMapper ocpApiReqMapper;
+
+    @Autowired
+    private OcpApiBaseMapper ocpApiBaseMapper;
+
+    @Autowired
+    private OcpApiGroupMapper ocpApiGroupMapper;
+    @Autowired
+    private OcpApiModelRelMapper ocpApiModelRelMapper;
+
+    @Autowired
+    private OcpBaseMapper ocpBaseMapper;
+
+    @Autowired
+    private OcpTenantBaseMapper ocpTenantBaseMapper;
+
+    @Autowired
+    private OcpApiPMapper ocpApiPMapper;
+
+
+    @Autowired
+    private OcptenantRelMapper ocptenantRelMapper;
+
+    @Autowired
+    private OcpApiRequirementMapper ocpApiRequirementMapper;
+
+    @Autowired
+    private OcpApiRequirementApprovalMapper ocpApiRequirementApprovalMapper;
+
+    List<String> apiGroupCode = new ArrayList<>();
+
+    @Override
+    public ResponseVO<PageInfo<OcpApiRequirementVo>> OcpApiReq(OcpApiRequirementVo ocpApiRequirementVo) {
+        if (ocpApiRequirementVo.getCurrentPage() == null || ocpApiRequirementVo.getPageSize() == null) {
+            return ResponseVO.error("分页参数不能为空");
+        }
+
+        apiGroupCode.add(ocpApiRequirementVo.getApiGroupCode());
+        setGroupIdValue(ocpApiRequirementVo.getApiGroupCode(), ocpApiRequirementVo.getApiPromotion());
+        PageHelper.startPage(ocpApiRequirementVo.getCurrentPage(), ocpApiRequirementVo.getPageSize());
+        ocpApiRequirementVo.setApiGroupCodeList(apiGroupCode);
+        List<OcpApiRequirementVo> ocpApiRequirements = ocpApiReqMapper.OcpApiReq(ocpApiRequirementVo);
+        for (OcpApiRequirementVo cod : ocpApiRequirements) {
+            OcpApiRequirementApproval approval = ocpApiRequirementApprovalMapper.selectByReqCodes(cod.getRequirementCode());
+            if(approval!=null) {
+                cod.setLastApprovalStats(Math.toIntExact(approval.getLastApprovalStats()));
+                cod.setApprovalStats(Math.toIntExact(approval.getApprovalStats()));
+            }else {
+                cod.setLastApprovalStats(0);
+                cod.setApprovalStats(0);
+            }
+            }
+        apiGroupCode.clear();
+        PageInfo<OcpApiRequirementVo> pageInfo = new PageInfo<>(ocpApiRequirements);
+        return ResponseVO.ok(pageInfo);
+    }
+
+    /**
+     * 分组权限分组使用in查询
+     *
+     * @param
+     * @param
+     */
+    private void setGroupIdValue(String code, Integer apiGroupPromotionType) {
+        List<String> codes = getIdsByPIdPub(null,code, apiGroupPromotionType);
+        if (codes.size() > 0) {
+            for (String cod : codes) {
+                setGroupIdValue(cod, apiGroupPromotionType);
+                apiGroupCode.add(cod);
+            }
+            ;
+        }
+    }
+
+    public List<String> getIdsByPIdPub(String apiGroupCompanyCode, String code, Integer apiGroupPromotionType) {
+        List<OcpApiGroup> ocpApiGroups = ocpApiGroupMapper.apiBaseTreeOther(apiGroupCompanyCode, code, apiGroupPromotionType);
+        return ocpApiGroups.stream().map(OcpApiGroup::getApiGroupCode).collect(Collectors.toList());
+    }
+
+    @Override
+    public ResponseVO<List<OcpApiRequirementVo>> OacrTree(OcpApiRequirementVo ocpApiRequirementVo) {
+        List<OcpApiRequirementVo> ocpTree = ocpApiReqMapper.getOcpTree(ocpApiRequirementVo);
+        return ResponseVO.ok(ocpTree);
+    }
+
+    @Override
+    public ResponseVO<List<OcpApiRequirementVo>> OacrTreeCenter(OcpApiRequirementVo ocpApiRequirementVo) {
+        List<OcpApiRequirementVo> ocpTree = ocpApiReqMapper.OacrTreeCenter(ocpApiRequirementVo);
+        return ResponseVO.ok(ocpTree);
+    }
+
+
+    @Override
+    public ApiRequirentVo selectOarcList(String apiCode) {
+        //出参
+        List<OcpApiParam> list = new ArrayList<>();
+        //入参
+        List<OcpApiParam> lists = new ArrayList<>();
+        //应用描述
+        List<String> listTenant = new ArrayList<>();
+        //影响应用
+        List<String> list1Tenat = new ArrayList<>();
+        //影响模型
+        List<Model> listModel = new ArrayList<>();
+        //影响模型
+        List<String> list1Model = new ArrayList<>();
+
+        //返回值对象
+        ApiRequirentVo apiRequirentVo = new ApiRequirentVo();
+
+        //查询服务审批详情
+        OcpApiBase ocpApiBase = ocpBaseMapper.selectCode(apiCode);
+        OcpApiRequirement ocpApiRequirement = ocpApiRequirementMapper.selectByCodes(ocpApiBase.getApiCode());
+
+        OcpApiRequirementApproval approval = ocpApiRequirementApprovalMapper.selectByReqCodes(ocpApiRequirement.getRequirementCode());
+        if(approval!=null) {
+           ocpApiRequirement.setLastApprovalStats(Math.toIntExact(approval.getLastApprovalStats()));
+           ocpApiRequirement.setApprovalStats(Math.toIntExact(approval.getApprovalStats()));
+        }else {
+            ocpApiRequirement.setLastApprovalStats(0);
+            ocpApiRequirement.setApprovalStats(0);
+        }
+
+        //据apicode查询模型关系表
+        List<OcpApiModelRel> model = ocpApiModelRelMapper.selectApiGroupds(ocpApiRequirement.getApiCode());
+        //根据modelCode查询模型名称
+        for (OcpApiModelRel ocpApiModelRel : model) {
+            if (StringUtils.isNotEmpty(ocpApiModelRel.getModelCode())) {
+                List<Model> ocpModelBase = ocpBaseMapper.selectModelBase(ocpApiModelRel.getModelCode());
+                if (ocpModelBase.size() >= 1) {
+                    for (Model model1 : ocpModelBase) {
+                        listModel.add(model1);
+                        list1Model.add(model1.getApiUnit());
+                    }
+                    apiRequirentVo.setApiModelNames(listModel);
+                    apiRequirentVo.setModelDescription(list1Model);
+                }
+            }
+        }
+
+
+        //根据apicode查询应用关系表
+        List<OcpApiTenantRel> ocpApiTenantRelList = ocptenantRelMapper.selectTenant(ocpApiRequirement.getApiCode());
+        for (OcpApiTenantRel ocpApiTenantRel : ocpApiTenantRelList) {
+            //根据tenant_code查询每个应用名称
+            OcpTenantBase ocpTenantBase = ocpTenantBaseMapper.selectTenants(ocpApiTenantRel.getTenantCode());
+            listTenant.add(ocpTenantBase.getTenantDescription());
+            list1Tenat.add(ocpTenantBase.getTenantName());
+        }
+        apiRequirentVo.setTenantDescription(listTenant);
+        apiRequirentVo.setApiTenantGroupNames(list1Tenat);
+
+        //查询服务详情的出入参数
+        List<OcpApiParam> selects = ocpApiPMapper.selects(ocpApiRequirement.getApiCode());
+        BeanUtils.copyProperties(ocpApiRequirement, apiRequirentVo);
+        for (OcpApiParam select : selects) {
+            if (select.getApiParamClassification().equals("out")) {
+                list.add(select);
+            } else if (select.getApiParamClassification().equals("in")) {
+                lists.add(select);
+            }
+        }
+        apiRequirentVo.setOutList(list);
+        apiRequirentVo.setInList(lists);
+        return apiRequirentVo;
+    }
+
+
+
+    @Override
+    public ResponseVO<PageInfo<OcpApiRequirementVo>> OcpApiReqAcc(OcpApiRequirementVo ocpApiRequirementVo) {
+        if (ocpApiRequirementVo.getCurrentPage() == null || ocpApiRequirementVo.getPageSize() == null) {
+            return ResponseVO.error("分页参数不能为空");
+        }
+        apiGroupCode.add(ocpApiRequirementVo.getApiGroupCode());
+        setGroupIdValue(ocpApiRequirementVo.getApiGroupCode(), ocpApiRequirementVo.getApiPromotion());
+        PageHelper.startPage(ocpApiRequirementVo.getCurrentPage(), ocpApiRequirementVo.getPageSize());
+        ocpApiRequirementVo.setApiGroupCodeList(apiGroupCode);
+        List<OcpApiRequirementVo> ocpApiRequirements = ocpApiReqMapper.OcpApiReqAcc(ocpApiRequirementVo);
+        apiGroupCode.clear();
+        PageInfo<OcpApiRequirementVo> pageInfo = new PageInfo<>(ocpApiRequirements);
+        return ResponseVO.ok(pageInfo);
+    }
+
+
+
+    @Override
+    public ResponseVO<List<OcpApiRequirementVo>> selectOcpApiReqAcc(OcpApiRequirementVo ocpApiRequirementVo) {
+        List<OcpApiRequirementVo> ocpApiRequirements = ocpApiReqMapper.selectOcpApiReq(ocpApiRequirementVo);
+        return ResponseVO.ok(ocpApiRequirements);
+    }
+
+    @Override
+    public ResponseVO<List<OcpApiRequirementVo>> OcpApiCheck(OcpApiRequirementVo ocpApiRequirementVo) {
+        List<OcpApiRequirementVo> ocpApiRequirementVos = ocpApiReqMapper.OcpApiCheck(ocpApiRequirementVo);
+        return ResponseVO.ok(ocpApiRequirementVos);
+    }
+
+    @Override
+    public ResponseVO<List<OcpApiRequirementVo>> OarcCheck(OcpApiRequirementVo ocpApiRequirementVo) {
+        List<OcpApiRequirementVo> ocpApiRequirementVos = ocpApiReqMapper.OarcCheck(ocpApiRequirementVo);
+        return ResponseVO.ok(ocpApiRequirementVos);
+    }
+
+
+    @Override
+    public ResponseVO<List<OcpApiRequirementVo>> OacrTreeApi(OcpApiRequirementVo ocpApiRequirementVo) {
+        apiGroupCode.add(ocpApiRequirementVo.getApiGroupCode());
+        setGroupIdValue(ocpApiRequirementVo.getApiGroupCode(), ocpApiRequirementVo.getApiPromotion());
+        ocpApiRequirementVo.setApiGroupCodeList(apiGroupCode);
+        List<OcpApiRequirementVo> ocpApiRequirementVos = ocpApiReqMapper.selectOcpAg(ocpApiRequirementVo);
+        apiGroupCode.clear();
+        return ResponseVO.ok(ocpApiRequirementVos);
+    }
+
+    @Override
+    public ResponseVO<List<OcpApiRequirementVo>> getOcpTenantApiList(OcpApiRequirementVo ocpApiRequirementVo) {
+        List<OcpApiRequirementVo> ocpApiRequirementVos = ocpApiReqMapper.getOcpTenantApiList(ocpApiRequirementVo);
+        return ResponseVO.ok(ocpApiRequirementVos);
+    }
+}

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

+package com.pms.ocp.service.impl;
+
+
+import cn.afterturn.easypoi.cache.manager.IFileLoader;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.graphbuilder.struc.LinkedList;
+import com.pms.ocp.mapper.*;
+import com.pms.ocp.model.dto.PageRequest;
+import com.pms.ocp.model.dto.PhotoDto;
+import com.pms.ocp.model.dto.PhotoListDto;
+import com.pms.ocp.model.entity.*;
+import com.pms.ocp.model.vo.ResponseVO;
+import com.pms.ocp.service.OcpApiRequirementApprovalService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.sql.Timestamp;
+import java.util.*;
+
+@Service
+public class OcpApiRequirementApprovalServiceImpl extends ServiceImpl<OcpApiRequirementApprovalMapper, OcpApiRequirementApproval> implements OcpApiRequirementApprovalService {
+
+
+    @Autowired
+    private OcpApiRequirementApprovalMapper ocpApiRequirementApprovalMapper;
+
+    @Autowired
+    private OcpApiRequirementMapper ocpApiRequirementMapper;
+
+    @Autowired
+    private OcpApiBaseMapper ocpApiBaseMapper;
+
+    @Autowired
+    private OcpBaseMapper ocpBaseMapper;
+
+    @Autowired
+    private OcpApiPMapper ocpApiPMapper;
+
+    @Autowired
+    private OcpApiModelRelMapper ocpApiModelRelMapper;
+
+    @Autowired
+    private ModelBaseMapper modelBaseMapper;
+
+    @Autowired
+    private ocpRequirementAcceptMapper ocpRequirementAcceptMapper;
+
+    @Autowired
+    private OcpApiAcceptMapper ocpApiAcceptMapper;
+
+
+    /**
+     * 服务需求审批--审核1
+     *
+     * @param ocpApiRequirementApproval
+     * @return
+     */
+    @Override
+    public ResponseVO inseterObj(OcpApiRequirementApproval ocpApiRequirementApproval) {
+
+        Timestamp timestamp = new Timestamp(System.currentTimeMillis());
+        //根据apiCode获取对象
+        List<OcpApiRequirementApproval> requirementApproval = ocpApiRequirementApprovalMapper.selectByCodes(ocpApiRequirementApproval.getApiCode());
+        if (org.springframework.util.StringUtils.isEmpty(requirementApproval)) {
+            ocpApiRequirementApproval.setApprovalStats((long) 0);
+            ocpApiRequirementApproval.setApprovalCtime(timestamp);
+            ocpApiRequirementApproval.setApprovalMtime(timestamp);
+            ocpApiRequirementApproval.setIsDelete((long) 0);
+            ocpApiRequirementApprovalMapper.insert(ocpApiRequirementApproval);
+        }
+
+        List<OcpApiRequirementApproval> requirementApprovals = null;
+        //根据apiCode和lastApprovalStats获取对象
+        if ("null".equals(ocpApiRequirementApproval.getLastApprovalStats())) {
+            requirementApprovals = ocpApiRequirementApprovalMapper.selectByLast(ocpApiRequirementApproval.getApiCode(), ocpApiRequirementApproval.getLastApprovalStats());
+        }
+
+
+        String objId = null;
+        for (OcpApiRequirementApproval apiRequirementApproval : requirementApproval) {
+            objId = apiRequirementApproval.getObjId();
+        }
+
+        ocpApiRequirementApproval.setApprovalMtime(timestamp);
+        ocpApiRequirementApproval.setApprovalCtime(timestamp);
+        String requirementCode = ocpApiRequirementApproval.getRequirementCode();
+        //根据rrequirementCode获取ocp_api_requirement表中requirement_type字段类型
+        OcpApiRequirement ocpApiRequirement = ocpApiRequirementMapper.selectbyCode(requirementCode);
+        Long requirementType = ocpApiRequirement.getRequirementType();
+
+        //根据apiCode查询服务对象
+
+
+        OcpApiBase ocpApiBase = ocpBaseMapper.selectCode(ocpApiRequirementApproval.getApiCode());
+
+//         判断是新增 迭代 还是 下线操作
+        if (StringUtils.isBlank(ocpApiRequirementApproval.getLev())) {
+            return ResponseVO.error("请先登录");
+        } else {
+            //         判断是否是新增
+            if (requirementType == 0) {
+                if (ocpApiRequirementApproval.getLev().equals("1")) {
+                    ocpApiRequirementApproval.setApprovalAudit((long) 0);
+                    ocpApiRequirementApprovalMapper.updateById(ocpApiRequirementApproval);
+                } else if (ocpApiRequirementApproval.getLev().equals("2")) {
+                    if (requirementApproval.size() < 3) {
+                        ocpApiRequirementApproval.setApprovalCompanyCode("000000000000001");
+                        ocpApiRequirementApproval.setApprovalDepartment("000000000000003");
+                        ocpApiRequirementApproval.setApprovalStats((long) 1);
+                        ocpApiRequirementApproval.setApprovalAudit((long) 1);
+                        ocpApiRequirementApproval.setIsDelete((long) 0);
+                        ocpApiRequirementApprovalMapper.insert(ocpApiRequirementApproval);
+                    } else {
+                        for (OcpApiRequirementApproval apiRequirement : requirementApproval) {
+                            ocpApiRequirementApproval.setApprovalStats((long) 1);
+                            ocpApiRequirementApproval.setApprovalAudit((long) 1);
+                            ocpApiRequirementApproval.setIsDelete((long) 0);
+                            ocpApiRequirementApprovalMapper.updateById(ocpApiRequirementApproval);
+                        }
+
+                    }
+
+
+                }
+
+                //判断是否是迭代
+            } else if (requirementType == 1) {
+                if (ocpApiRequirementApproval.getLev().equals("1")) {
+                    ocpApiRequirementApproval.setApprovalStats((long) 1);
+                    ocpApiRequirementApproval.setApprovalAudit((long) 0);
+                    ocpApiRequirementApprovalMapper.updateById(ocpApiRequirementApproval);
+
+                } else if (ocpApiRequirementApproval.getLev().equals("2")) {
+                    //判断是否验收成功，确定是否删除迭代
+                    if (ocpApiRequirementApproval.getLastApprovalStats() == 1) {
+                        if (requirementApproval.size() <= 0) {
+                            ocpApiRequirementApproval.setApprovalStats((long) 0);
+                            ocpApiRequirementApproval.setApprovalAudit((long) 1);
+                            ocpApiRequirementApproval.setIsDelete((long) 1);
+                            ocpApiRequirementApprovalMapper.insert(ocpApiRequirementApproval);
+                        } else {
+                            ocpApiRequirementApproval.setApprovalAudit((long) 1);
+                            ocpApiRequirementApproval.setIsDelete((long) 1);
+                            ocpApiRequirementApprovalMapper.updateById(ocpApiRequirementApproval);
+                        }
+                    }
+
+                }
+                //判断是否是下线
+            } else if (requirementType == 2) {
+                for (OcpApiRequirementApproval apiReq : requirementApproval) {
+                    if (ocpApiRequirementApproval.getLev().equals("1")) {
+                        apiReq.setApprovalAudit((long) 0);
+                        ocpApiRequirementApprovalMapper.updateById(apiReq);
+                    } else if (ocpApiRequirementApproval.getLev().equals("2")) {
+                        apiReq.setLastApprovalStats(ocpApiRequirementApproval.getLastApprovalStats());
+                        apiReq.setApprovalAudit((long) 2);
+                        apiReq.setApprovalStats((long) 1);
+                        //判断是否审核通过下线
+                        ocpApiRequirementApprovalMapper.updateById(apiReq);
+                        if (ocpApiRequirementApproval.getLastApprovalStats() == 1) {
+                            OcpApiBase ocpApiBase1 = ocpBaseMapper.selectCode(ocpApiRequirementApproval.getApiCode());
+                            ocpBaseMapper.deleteById(ocpApiBase1.getObjId());
+                        }
+                    }
+                }
+            }
+
+
+        }
+        return ResponseVO.ok();
+    }
+
+    //服务需求审批-- 拓展图PhotoDto
+    @Override
+    public ResponseVO selectPhotos(String apiCode) {
+//        ocp_api_model_rel
+        PhotoListDto photoListDto = new PhotoListDto();
+        List<PhotoDto> photoDto1 = new ArrayList<>();
+
+
+        //获取modeCode和ModelName
+        List<OcpApiParam> listParam = ocpApiPMapper.selectByList(apiCode);
+        for (OcpApiParam ocpApiParam : listParam) {
+            //出参
+            List<String> list = new ArrayList<>();
+            //入参
+            List<String> lists = new ArrayList<>();
+
+            PhotoDto photoDto = new PhotoDto();
+            photoDto.setTitle(ocpApiParam.getModelName());
+            String modelCode = ocpApiParam.getModelCode();
+            //根据modelcode查询出入参
+            List<OcpApiParam> list1 = ocpApiPMapper.selectsByModelCode(ocpApiParam.getModelCode());
+            for (OcpApiParam apiParam : list1) {
+                if (apiParam.getApiParamClassification().equals("out")) {
+                    list.add(apiParam.getApiParamName());
+                } else if (apiParam.getApiParamClassification().equals("in")) {
+                    lists.add(apiParam.getApiParamName());
+                }
+//                Model model =  modelBaseMapper.selectByModelCode(apiParam.getModelCode());
+//                photoDto.setModelTable(model.getModelTable());
+            }
+            photoDto.setOutPutList(list);
+            photoDto.setInPutList(lists);
+            photoDto1.add(photoDto);
+
+
+        }
+        photoListDto.setList(photoDto1);
+
+        return ResponseVO.ok(photoListDto);
+    }
+
+    @Override
+    public ResponseVO inseterGroupObj(OcpApiRequirementAccept ocpApiRequirementAccept) {
+
+        String apiCode = ocpApiRequirementAccept.getApiCode();
+        //根据apiCode查询验收表
+     OcpApiRequirementAccept ocpApiRequirementAccept1 = ocpApiAcceptMapper.selectByCodeList(apiCode);
+        if (!(org.springframework.util.StringUtils.isEmpty(ocpApiRequirementAccept1))){
+            return ResponseVO.error("服务已提交！");
+        }else {
+
+
+            Timestamp timestamp = new Timestamp(System.currentTimeMillis());
+//        OcpApiRequirementAccept ocpApiRequirementAccept = new OcpApiRequirementAccept();
+            ocpApiRequirementAccept.setAcceptStats((long) 0);
+            ocpApiRequirementAccept.setAcceptCtime(timestamp);
+            ocpApiRequirementAccept.setAcceptCompanyCode("0");
+            ocpApiRequirementAccept.setAcceptCompanyCode("0");
+            ocpApiRequirementAccept.setAcceptMtime(timestamp);
+            ocpApiRequirementAccept.setAcceptUserId("0");
+            ocpApiRequirementAccept.setAcceptUserName("0");
+            ocpApiRequirementAccept.setAcceptDepartment("0");
+            ocpApiRequirementAccept.setIsDelete((long) 0);
+            ocpRequirementAcceptMapper.insert(ocpApiRequirementAccept);
+            return ResponseVO.ok();
+        }
+    }
+}

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

+package com.pms.ocp.service.impl;
+
+import cn.afterturn.easypoi.cache.manager.IFileLoader;
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.pms.ocp.mapper.*;
+import com.pms.ocp.model.dto.ApiRequirementDto;
+import com.pms.ocp.model.dto.GroupDto;
+import com.pms.ocp.model.dto.OcpApiRequirementDto;
+import com.pms.ocp.model.dto.TenantApiDto;
+import com.pms.ocp.model.entity.*;
+import com.pms.ocp.model.vo.ResponseVO;
+import com.pms.ocp.service.OcpApiRequirementApprovalService;
+import com.pms.ocp.service.OcpApiRequirementService;
+import com.pms.ocp.service.ParamService;
+import com.pms.ocp.service.TenantBasicManagementService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.sql.Timestamp;
+import java.time.LocalDateTime;
+import java.util.*;
+
+@Service
+public class OcpApiRequirementServiceImpl extends ServiceImpl<OcpApiRequirementMapper, OcpApiRequirement> implements OcpApiRequirementService {
+
+    @Autowired
+    private ApiBasicManagementMapper apiBasicManagementMapper;
+    @Autowired
+    private OcpApiRequirementMapper ocpApiRequirementMapper;
+
+    @Autowired
+    private OcpApiModelRelMapper ocpApiModelRelMapper;
+    @Autowired
+    private OcpApiTenantRelMapper ocpApiTenantRelMapper;
+    @Autowired
+    private OcpTenantGroupMapper ocpTenantGroupMapper;
+    @Autowired
+    private OcpTenantBaseMapper ocpTenantBaseMapper;
+    @Autowired
+    private OcpApiRequirementApprovalService ocpApiRequirementApprovalService;
+    @Autowired
+    private OcpApiRequirementApprovalMapper ocpApiRequirementApprovalMapper;
+
+    @Autowired
+    private ParamService paramService;
+
+    @Autowired
+    private ParamMapper paramMapper;
+    @Autowired
+    private OcpApiPMapper ocpApiPMapper;
+    @Autowired
+    private OcpApiExtentMapper ocpApiExtentMapper;
+    @Autowired
+    private OcpBaseMapper ocpBaseMapper;
+    @Autowired
+    private OcptenantRelMapper ocptenantRelMapper;
+    @Autowired
+    private OcpModelGroupMapper ocpModelGroupMapper;
+
+    @Autowired
+    private OcpApiBaseMapper ocpApiBaseMapper;
+
+    @Autowired
+    private OcpApiGroupMapper ocpApiGroupMapper;
+    @Autowired
+    private TenantBasicManagementService tenantBasicManagementService;
+
+    /**
+     * 关联表字段
+     *
+     * @param ocpApiRequirementDto
+     * @return
+     * @Author:郭凡凡
+     */
+    @Override
+    public ResponseVO correlationTableField(OcpApiRequirementDto ocpApiRequirementDto) {
+        if (StringUtils.isEmpty(ocpApiRequirementDto.getApiCode())) {
+            return ResponseVO.error("服务编码为空");
+        }
+        //先删除 在添加
+        LambdaQueryWrapper<ApiParam> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(StringUtils.isNotEmpty(ocpApiRequirementDto.getApiCode()), ApiParam::getApiCode, ocpApiRequirementDto.getApiCode());
+        paramService.remove(wrapper);
+        List<ApiParam> reqList = ocpApiRequirementDto.getReqList();
+        List<ApiParam> respList = ocpApiRequirementDto.getRespList();
+        bulkAddAndChildList(reqList, respList);
+        ocpApiRequirementDto.setAddStatus("3");
+        return ResponseVO.ok(ocpApiRequirementDto.getAddStatus());
+
+    }
+
+    /**
+     * 批量添加包含子集
+     *
+     * @param
+     */
+    public void bulkAddAndChildList(List<ApiParam> reqList, List<ApiParam> respList) {
+        reqList.stream().forEach(req -> {
+            req.setProp("0");
+            paramMapper.insert(req);
+        });
+        respList.stream().forEach(resp -> {
+            resp.setProp("1");
+            paramMapper.insert(resp);
+        });
+        for (ApiParam apiParam : reqList) {
+            apiParam.setProp("0");
+            bulkAddChild(apiParam);
+        }
+        for (ApiParam apiParam : respList) {
+            apiParam.setProp("1");
+            bulkAddChild(apiParam);
+        }
+    }
+
+    /**
+     * 递归添加子集
+     *
+     * @param apiParam
+     */
+    private void bulkAddChild(ApiParam apiParam) {
+        String id = apiParam.getObjId();
+        List<ApiParam> childList = apiParam.getChildrenList();
+        if (childList != null) {
+            childList.stream().forEach(apiParam1 -> {
+                apiParam1.setPid(id);
+                apiParam1.setProp(apiParam.getProp());
+            });
+            childList.stream().forEach(child -> paramMapper.insert(child));
+            for (ApiParam childApiParam : childList) {
+                bulkAddChild(childApiParam);
+            }
+        }
+    }
+
+    /**
+     * @param ocpApiRequirementDto
+     * @return
+     * @Author:郭凡凡
+     */
+    @Override
+    @Transactional
+    public ResponseVO addDemand(OcpApiRequirementDto ocpApiRequirementDto) {
+        if (StringUtils.isEmpty(ocpApiRequirementDto.getApiGroupCode())) {
+            return ResponseVO.error("服务组编码不能为空");
+        }
+        if (StringUtils.isEmpty(ocpApiRequirementDto.getRequirementCode())) {
+            return ResponseVO.error("需求编码不能为空");
+        }
+        if (ocpApiRequirementDto.getRequirementType() == null) {
+            return ResponseVO.error("需求类型不能为空");
+        }
+        if (StringUtils.isEmpty(ocpApiRequirementDto.getApiName())) {
+            return ResponseVO.error("服务名称不能为空");
+        }
+        if (StringUtils.isEmpty(ocpApiRequirementDto.getRequirementComments())) {
+            return ResponseVO.error("需求简述不能为空");
+        }
+        if (StringUtils.isEmpty(ocpApiRequirementDto.getApiVersion())) {
+            return ResponseVO.error("服务版本号不能为空");
+        }
+        if (StringUtils.isEmpty(ocpApiRequirementDto.getApiCode())) {
+            return ResponseVO.error("服务编码不能为空");
+        }
+        //先删除  在添加
+        //服务需求表
+
+        LambdaQueryWrapper<OcpApiRequirement> wrapper1 = new LambdaQueryWrapper<>();
+        wrapper1.eq(OcpApiRequirement::getApiCode, ocpApiRequirementDto.getApiCode());
+        ocpApiRequirementMapper.delete(wrapper1);
+        //服务基础表
+        LambdaQueryWrapper<OcpApiBase> queryWrapper2 = new LambdaQueryWrapper<>();
+        queryWrapper2.eq(OcpApiBase::getApiCode, ocpApiRequirementDto.getApiCode());
+        apiBasicManagementMapper.delete(queryWrapper2);
+        //服务扩展表
+        LambdaQueryWrapper<OcpApiExtent> wrapper2 = new LambdaQueryWrapper<>();
+        wrapper2.eq(OcpApiExtent::getApiCode, ocpApiRequirementDto.getApiCode());
+        ocpApiExtentMapper.delete(wrapper2);
+
+        //基础表
+        OcpApiBase ocpApiBase = new OcpApiBase();
+        ocpApiBase.setIsDelete(0);
+        ocpApiBase.setApiCtime(Timestamp.valueOf(LocalDateTime.now()));
+        ocpApiBase.setApiMtime(Timestamp.valueOf(LocalDateTime.now()));
+        ocpApiBase.setApiCode(ocpApiRequirementDto.getApiCode());
+        ocpApiBase.setApiName(ocpApiRequirementDto.getApiName());
+
+        ocpApiBase.setApiGroupCode(ocpApiRequirementDto.getApiGroupCode());
+        if (ocpApiRequirementDto.getApiPromotion() != null) {
+            ocpApiBase.setApiPromotion(ocpApiRequirementDto.getApiPromotion());
+        }
+        if (StringUtils.isNotEmpty(ocpApiRequirementDto.getApiUnit())) {
+            ocpApiBase.setApiUnit(ocpApiRequirementDto.getApiUnit());
+        } else {
+            ocpApiBase.setApiUnit("总部");
+        }
+        if (StringUtils.isNotEmpty(ocpApiRequirementDto.getApiUrl())) {
+            ocpApiBase.setApiUrl(ocpApiRequirementDto.getApiUrl());
+        } else {
+            ocpApiBase.setApiUrl("/api-control/service");
+        }
+
+        //需求表
+        OcpApiRequirement ocpApiRequirement = new OcpApiRequirement();
+        ocpApiRequirement.setRequirementCode(ocpApiRequirementDto.getRequirementCode());
+        ocpApiRequirement.setRequirementType(ocpApiRequirementDto.getRequirementType());
+        ocpApiRequirement.setApiGroupCode(ocpApiRequirementDto.getApiGroupCode());
+        ocpApiRequirement.setRequirementComments(ocpApiRequirementDto.getRequirementComments());
+        ocpApiRequirement.setApiCode(ocpApiRequirementDto.getApiCode());
+        ocpApiRequirement.setApiName(ocpApiRequirementDto.getApiName());
+        ocpApiRequirement.setApiUnit(ocpApiRequirementDto.getApiUnit());
+        ocpApiRequirement.setRequirementUserDepg(ocpApiRequirementDto.getRequirementUserDepg());
+        if (ocpApiRequirementDto.getApiPromotion() != null) {
+            ocpApiRequirement.setApiPromotion(ocpApiRequirementDto.getApiPromotion());
+        }
+        if (StringUtils.isNotEmpty(ocpApiRequirementDto.getApiVersion())) {
+            ocpApiRequirement.setApiVersion(ocpApiRequirementDto.getApiVersion());
+        }
+        if (StringUtils.isNotEmpty(ocpApiRequirementDto.getApiUrl())) {
+            ocpApiRequirement.setApiUrl(ocpApiRequirementDto.getApiUrl());
+        } else {
+            ocpApiRequirement.setApiUrl("/api-control/service");
+        }
+        if (StringUtils.isNotEmpty(ocpApiRequirementDto.getRequirementUserId())) {
+            ocpApiRequirement.setRequirementUserName(ocpApiRequirementDto.getRequirementUserId());
+        } else {
+            ocpApiRequirement.setRequirementUserId("0");
+        }
+        if (StringUtils.isNotEmpty(ocpApiRequirementDto.getRequirementUserName())) {
+            ocpApiRequirement.setRequirementUserName(ocpApiRequirementDto.getRequirementUserName());
+        } else {
+            ocpApiRequirement.setRequirementUserName("创建者");
+        }
+        ocpApiRequirement.setRequirementCtime(Timestamp.valueOf(LocalDateTime.now()));
+        ocpApiRequirement.setRequirementMtime(Timestamp.valueOf(LocalDateTime.now()));
+        ocpApiRequirement.setIsDelete((long) 0);
+
+
+        //获取服务编码，名称 重复校验
+        LambdaQueryWrapper<OcpApiBase> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(StringUtils.isNotEmpty(ocpApiRequirementDto.getApiName()), OcpApiBase::getApiName, ocpApiRequirementDto.getApiName());
+        queryWrapper.eq(OcpApiBase::getIsDelete, 0);
+        List<OcpApiBase> ocpApiBases = apiBasicManagementMapper.selectList(queryWrapper);
+        if (ocpApiBases.size() != 0) {
+            return ResponseVO.error("服务名称已存在");
+        }
+
+        LambdaQueryWrapper<OcpApiBase> queryWrapper1 = new LambdaQueryWrapper<>();
+        queryWrapper1.eq(StringUtils.isNotEmpty(ocpApiRequirementDto.getApiCode()), OcpApiBase::getApiCode, ocpApiRequirementDto.getApiCode());
+        queryWrapper1.eq(OcpApiBase::getIsDelete, 0);
+        List<OcpApiBase> ocpApiBases1 = apiBasicManagementMapper.selectList(queryWrapper1);
+        if (ocpApiBases1.size() != 0) {
+            return ResponseVO.error("服务编码已存在");
+        }
+
+
+        //也是重复校验 //需求表
+        LambdaQueryWrapper<OcpApiRequirement> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(StringUtils.isNotEmpty(ocpApiRequirementDto.getRequirementCode()), OcpApiRequirement::getRequirementCode, ocpApiRequirementDto.getRequirementCode());
+        List<OcpApiRequirement> ocpApiRequirements = ocpApiRequirementMapper.selectList(wrapper);
+        if (ocpApiRequirements.size() != 0) {
+            return ResponseVO.error("需求编码重复");
+        }
+
+        //添加到服务需求表 和 服务基础信息表 中
+        //添加到服务扩展表中
+        OcpApiExtent ocpApiExtent = new OcpApiExtent();
+        ocpApiExtent.setApiCode(ocpApiRequirementDto.getApiCode());
+        ocpApiExtent.setIsDelete(0);
+        ocpApiExtent.setApiCtime(Timestamp.valueOf(LocalDateTime.now()));
+        ocpApiExtent.setApiMtime(Timestamp.valueOf(LocalDateTime.now()));
+        if (StringUtils.isNotEmpty(ocpApiRequirementDto.getClusterName())) {
+            ocpApiExtent.setClusterName(ocpApiRequirementDto.getClusterName());
+        } else {
+            ocpApiExtent.setClusterName("测试集群");
+        }
+        if (StringUtils.isNotEmpty(ocpApiRequirementDto.getSpaceName())) {
+            ocpApiExtent.setSpaceName(ocpApiRequirementDto.getSpaceName());
+        } else {
+            ocpApiExtent.setSpaceName("开发者");
+        }
+        int insert1 = ocpApiExtentMapper.insert(ocpApiExtent);
+
+        int insert = apiBasicManagementMapper.insert(ocpApiBase);
+        int insert2 = ocpApiRequirementMapper.insert(ocpApiRequirement);
+        if ((insert2 > 0) && (insert > 0) && (insert1 > 0)) {
+            ocpApiRequirementDto.setAddStatus("1");
+            return ResponseVO.ok(ocpApiRequirementDto.getAddStatus());
+        }
+        return ResponseVO.error("添加失败");
+    }
+
+    /**
+     * @param ocpApiRequirementDto
+     * @return
+     * @Author:郭凡凡 新增-关联模型
+     */
+    @Override
+    public ResponseVO
+    correlationModel(OcpApiRequirementDto ocpApiRequirementDto) {
+        if (StringUtils.isEmpty(ocpApiRequirementDto.getApiCode())) {
+            return ResponseVO.error("服务编码为空");
+        }
+        if (ocpApiRequirementDto.getModelCodes() == null) {
+            return ResponseVO.error("请选择你要关联的模型");
+        }
+        List<String> list = Arrays.asList(ocpApiRequirementDto.getModelCodes());
+        //先删除和其关联的模型
+        LambdaQueryWrapper<OcpApiModelRel> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(StringUtils.isNotEmpty(ocpApiRequirementDto.getApiCode()), OcpApiModelRel::getApiCode, ocpApiRequirementDto.getApiCode());
+        ocpApiModelRelMapper.delete(wrapper);
+
+
+        //删除模型入参出参
+        LambdaQueryWrapper<OcpApiParam> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(StringUtils.isNotEmpty(ocpApiRequirementDto.getApiCode()), OcpApiParam::getApiCode, ocpApiRequirementDto.getApiCode());
+        ocpApiPMapper.delete(queryWrapper);
+
+
+        //然后添加关联关系
+
+        for (String s : list) {
+            OcpApiModelRel ocpApiModelRel = new OcpApiModelRel();
+            ocpApiModelRel.setApiCode(ocpApiRequirementDto.getApiCode());
+            ocpApiModelRel.setModelCode(s);
+            ocpApiModelRel.setIsDelete(0);
+            ocpApiModelRel.setRelationCtime(Timestamp.valueOf(LocalDateTime.now()));
+            ocpApiModelRelMapper.insert(ocpApiModelRel);
+        }
+        List<OcpApiParam> ocpApiParamList = ocpApiRequirementDto.getOcpApiParamList();
+        if (ocpApiParamList == null) {
+            ocpApiRequirementDto.setAddStatus("2");
+            return ResponseVO.ok(ocpApiRequirementDto.getAddStatus());
+        }
+        for (OcpApiParam ocpApiParam : ocpApiParamList) {
+            if (StringUtils.isEmpty(ocpApiParam.getApiParamVersion())) {
+                return ResponseVO.error("版本号为空");
+            }
+            ocpApiParam.setApiCode(ocpApiRequirementDto.getApiCode());
+            ocpApiParam.setIsDelete(0);
+            ocpApiPMapper.insert(ocpApiParam);
+        }
+        ocpApiRequirementDto.setAddStatus("2");
+        return ResponseVO.ok(ocpApiRequirementDto.getAddStatus());
+    }
+
+    /**
+     * 新增-关联应用
+     *
+     * @param ocpApiRequirementDto
+     * @return
+     * @Author:郭凡凡
+     */
+    @Override
+    public ResponseVO correlationTenant(OcpApiRequirementDto ocpApiRequirementDto) {
+        if (StringUtils.isEmpty(ocpApiRequirementDto.getApiCode())) {
+            return ResponseVO.error("服务编码不能为空");
+        }
+        if (StringUtils.isEmpty(ocpApiRequirementDto.getApiTenantDescription())) {
+            return ResponseVO.error("描述不能为空");
+        }
+        if (ocpApiRequirementDto.getTenantCodes() == null) {
+            return ResponseVO.error("请选择你要关联的应用");
+        }
+
+        String[] tenantCodes = ocpApiRequirementDto.getTenantCodes();
+        List<String> list = Arrays.asList(tenantCodes);
+        //先删除和其关联的应用
+        LambdaQueryWrapper<OcpApiTenantRel> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(StringUtils.isNotEmpty(ocpApiRequirementDto.getApiCode()), OcpApiTenantRel::getApiCode, ocpApiRequirementDto.getApiCode());
+        ocpApiTenantRelMapper.delete(wrapper);
+        //然后添加关系
+        for (String s : list) {
+            OcpApiTenantRel ocpApiTenantRel = new OcpApiTenantRel();
+            ocpApiTenantRel.setApiCode(ocpApiRequirementDto.getApiCode());
+            ocpApiTenantRel.setTenantCode(s);
+
+            ocpApiTenantRel.setApiTenantDescription(ocpApiRequirementDto.getApiTenantDescription());
+            ocpApiTenantRel.setApiTenantRelCtime(Timestamp.valueOf(LocalDateTime.now()));
+            ocpApiTenantRel.setApiTenantRelMtime(Timestamp.valueOf(LocalDateTime.now()));
+            ocpApiTenantRelMapper.insert(ocpApiTenantRel);
+        }
+        ocpApiRequirementDto.setAddStatus("4");
+        return ResponseVO.ok(ocpApiRequirementDto.getAddStatus());
+
+
+    }
+
+    /**
+     * 新增-关联应用-左侧树
+     *
+     * @param tenantGroupCompanyCode
+     * @param tenantGroupCode
+     * @return
+     * @Author:郭凡凡
+     */
+    @Override
+    public List<GroupDto> correlationTenantTree(String tenantGroupCompanyCode, String tenantGroupCode) {
+        List<GroupDto> list = new ArrayList<>();
+        if (StringUtils.isBlank(tenantGroupCode)) {
+            List<GroupDto> ocpTenantGroups = ocpTenantGroupMapper.correlationTenantTree(tenantGroupCompanyCode, tenantGroupCode);
+            for (GroupDto ocpTenantGroup : ocpTenantGroups) {
+                if (StringUtils.isNotBlank(ocpTenantGroup.getTenantGroupCode()) && StringUtils.isNotBlank(ocpTenantGroup.getTenantGroupName())) {
+                    list.add(ocpTenantGroup);
+                }
+            }
+            return list;
+        }
+        List<GroupDto> baseList = ocpTenantBaseMapper.correlationTenantTree(tenantGroupCompanyCode, tenantGroupCode);
+        return baseList;
+    }
+
+    /**
+     * @param apiCode
+     * @return
+     * @Author:zhaochengming 查询回显--111
+     */
+    @Override
+    public ApiRequirementDto getSelects(String apiCode) {
+
+        //出参
+        List<OcpApiParam> list = new ArrayList<>();
+        //入参
+        List<OcpApiParam> lists = new ArrayList<>();
+        //应用描述
+        List<String> listTenant = new ArrayList<>();
+        //影响应用
+        List<String> list1Tenat = new ArrayList<>();
+        //影响模型
+        List<Model> listModel = new ArrayList<>();
+        //影响描述
+        List<String> list1Model = new ArrayList<>();
+
+        //返回值对象
+        ApiRequirementDto apiRequirementDto = new ApiRequirementDto();
+        //查询服务审批详情
+        OcpApiBase ocpApiBase = ocpBaseMapper.selectCode(apiCode);
+//        OcpApiBase ocpApiBase = ocpApiBaseMapper.selectById(objId);
+        OcpApiRequirement ocpApiRequirement = ocpApiRequirementMapper.selectByCodes(ocpApiBase.getApiCode());
+
+        //据apicode查询模型关系表
+        List<OcpApiModelRel> model = ocpApiModelRelMapper.selectApiGroupds(ocpApiRequirement.getApiCode());
+        //根据modelCode查询模型名称
+        for (OcpApiModelRel ocpApiModelRel : model) {
+            if (StringUtils.isNotEmpty(ocpApiModelRel.getModelCode())) {
+                List<Model> ocpModelBase = ocpBaseMapper.selectModelBase(ocpApiModelRel.getModelCode());
+                if (ocpModelBase.size() >= 1) {
+                    for (Model model1 : ocpModelBase) {
+                        listModel.add(model1);
+
+                        list1Model.add(model1.getApiUnit());
+                    }
+                    apiRequirementDto.setApiModelNames(listModel);
+                    apiRequirementDto.setModelDescription(list1Model);
+                }
+            }
+        }
+
+
+        //根据apicode查询应用关系表
+        List<OcpApiTenantRel> ocpApiTenantRelList = ocptenantRelMapper.selectTenant(ocpApiRequirement.getApiCode());
+        for (OcpApiTenantRel ocpApiTenantRel : ocpApiTenantRelList) {
+            //根据tenant_code查询每个应用名称
+            OcpTenantBase ocpTenantBase = ocpTenantBaseMapper.selectTenants(ocpApiTenantRel.getTenantCode());
+            listTenant.add(ocpTenantBase.getTenantDescription());
+            list1Tenat.add(ocpTenantBase.getTenantName());
+        }
+        apiRequirementDto.setTenantDescription(listTenant);
+        apiRequirementDto.setApiTenantGroupNames(list1Tenat);
+
+        //查询服务详情的出入参数
+        List<OcpApiParam> selects = ocpApiPMapper.selects(ocpApiRequirement.getApiCode());
+        BeanUtils.copyProperties(ocpApiRequirement, apiRequirementDto);
+        for (OcpApiParam select : selects) {
+            if (select.getApiParamClassification().equals("out")) {
+                list.add(select);
+
+            } else if (select.getApiParamClassification().equals("in")) {
+                lists.add(select);
+            }
+
+        }
+        apiRequirementDto.setOutList(list);
+        apiRequirementDto.setInList(lists);
+
+        return apiRequirementDto;
+    }
+
+
+    /**
+     * 服务下线
+     * 1
+     *
+     * @param apiCode
+     */
+    @Override
+    public void updateTables(String apiCode) {
+        OcpApiRequirement ocpApiRequirement = ocpApiRequirementMapper.selectByCodes(apiCode);
+        List<OcpApiRequirementApproval> requirementApprovals = ocpApiRequirementApprovalMapper.selectByCodes(apiCode);
+        if (!(org.springframework.util.StringUtils.isEmpty(ocpApiRequirement))) {
+            ocpApiRequirement.setRequirementType((long) 2);
+            ocpApiRequirementMapper.updateById(ocpApiRequirement);
+//            if (org.springframework.util.StringUtils.isEmpty(requirementApprovals)) {
+            for (OcpApiRequirementApproval requirementApproval : requirementApprovals) {
+                requirementApproval.setApprovalStats((long) 0);
+                requirementApproval.setLastApprovalStats((long) 0);
+                ocpApiRequirementApprovalMapper.updateById(requirementApproval);
+//            }
+            }
+        } else {
+            ocpApiRequirement.setRequirementType((long) 2);
+            ocpApiRequirementMapper.insert(ocpApiRequirement);
+            if (org.springframework.util.StringUtils.isEmpty(requirementApprovals)) {
+                for (OcpApiRequirementApproval requirementApproval : requirementApprovals) {
+                    requirementApproval.setApprovalStats((long) 0);
+                    requirementApproval.setLastApprovalStats((long) 0);
+                    ocpApiRequirementApprovalMapper.insert(requirementApproval);
+                }
+            }
+        }
+
+    }
+
+
+    /**
+     * 迭代-模型回显
+     *
+     * @param apiCode
+     * @return
+     * @Author:郭凡凡
+     */
+    @Override
+    public ResponseVO<List<OcpApiModelRel>> echoModel(String apiCode) {
+        LambdaQueryWrapper<OcpApiModelRel> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(StringUtils.isNotEmpty(apiCode), OcpApiModelRel::getApiCode, apiCode);
+        List<OcpApiModelRel> list = ocpApiModelRelMapper.selectList(queryWrapper);
+        return ResponseVO.ok(list);
+    }
+
+    /**
+     * @param apiCode
+     * @return
+     * @Author:郭凡凡 迭代-表字段回显
+     */
+    @Override
+    public ResponseVO<Map<String, List<ApiParam>>> echoTableField(String apiCode) {
+        if (StringUtils.isEmpty(apiCode)) {
+            return ResponseVO.error("服务编码不能为空");
+        }
+        Map<String, List<ApiParam>> map = new HashMap<>();
+        LambdaQueryWrapper<ApiParam> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(StringUtils.isNotEmpty(apiCode), ApiParam::getApiCode, apiCode);
+        wrapper.eq(ApiParam::getProp, "0");
+        List<ApiParam> apiParams = paramMapper.selectList(wrapper);
+        LambdaQueryWrapper<ApiParam> wrapper1 = new LambdaQueryWrapper<>();
+        wrapper1.eq(StringUtils.isNotEmpty(apiCode), ApiParam::getApiCode, apiCode);
+        wrapper1.eq(ApiParam::getProp, "1");
+        List<ApiParam> apiParam = paramMapper.selectList(wrapper1);
+        List<ApiParam> build1 = this.build(apiParam);
+        List<ApiParam> build = this.build(apiParams);
+        map.put("0", build);
+        map.put("1", build1);
+        return ResponseVO.ok(map);
+    }
+
+    /**
+     * 迭代-应用回显
+     *
+     * @param apiCode
+     * @return
+     * @Author:郭凡凡
+     */
+    @Override
+    public ResponseVO<List<TenantApiDto>> echoTenant(String apiCode) {
+        if (StringUtils.isEmpty(apiCode)) {
+            return ResponseVO.error("服务编码不能为空");
+        }
+        List<TenantApiDto> list = new ArrayList<>();
+        LambdaQueryWrapper<OcpApiBase> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(StringUtils.isNotEmpty(apiCode), OcpApiBase::getApiCode, apiCode);
+        OcpApiBase ocpApiBase = apiBasicManagementMapper.selectOne(queryWrapper);
+        if (ocpApiBase != null) {
+            String apiGroupCode = ocpApiBase.getApiGroupCode();
+            LambdaQueryWrapper<OcpApiGroup> objectLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            objectLambdaQueryWrapper.eq(StringUtils.isNotEmpty(apiGroupCode), OcpApiGroup::getApiGroupCode, apiGroupCode);
+            OcpApiGroup ocpApiGroup = ocpApiGroupMapper.selectOne(objectLambdaQueryWrapper);
+            String apiGroupName = ocpApiGroup.getApiGroupName();
+            String apiGroupPname = ocpApiGroup.getApiGroupPname();
+            LambdaQueryWrapper<OcpApiTenantRel> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(OcpApiTenantRel::getApiCode, apiCode);
+            List<OcpApiTenantRel> ocpApiTenantRels = ocpApiTenantRelMapper.selectList(wrapper);
+            if (CollectionUtil.isNotEmpty(ocpApiTenantRels)) {
+                for (OcpApiTenantRel ocpApiTenantRel : ocpApiTenantRels) {
+                    String tenantCode = ocpApiTenantRel.getTenantCode();
+                    LambdaQueryWrapper<OcpTenantBase> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+                    lambdaQueryWrapper.eq(OcpTenantBase::getTenantCode, tenantCode);
+                    OcpTenantBase one = tenantBasicManagementService.getOne(lambdaQueryWrapper);
+                    String tenantName = one.getTenantName();
+                    Short tenantZone = one.getTenantZone();
+                    TenantApiDto tenantApiDto = new TenantApiDto();
+                    tenantApiDto.setApiGroupName(apiGroupName);
+                    tenantApiDto.setApiGroupPname(apiGroupPname);
+                    tenantApiDto.setTenantCode(tenantCode);
+                    tenantApiDto.setTenantName(tenantName);
+                    tenantApiDto.setApiTenantDescription(ocpApiTenantRel.getApiTenantDescription());
+                    tenantApiDto.setTenantZone(tenantZone);
+                    list.add(tenantApiDto);
+                }
+            }
+        }
+        return ResponseVO.ok(list);
+    }
+
+    /**
+     * 迭代-服务信息填写
+     *
+     * @param ocpApiRequirementDto
+     * @return
+     * @Author:郭凡凡
+     */
+    @Override
+    @Transactional
+    public ResponseVO
+    updateDemand(OcpApiRequirementDto ocpApiRequirementDto) {
+
+        if (StringUtils.isEmpty(ocpApiRequirementDto.getApiGroupCode())) {
+            return ResponseVO.error("服务组编码不能为空");
+        }
+        if (StringUtils.isEmpty(ocpApiRequirementDto.getApiName())) {
+            return ResponseVO.error("服务名称不能为空");
+        }
+        if (StringUtils.isEmpty(ocpApiRequirementDto.getRequirementComments())) {
+            return ResponseVO.error("需求简述不能为空");
+        }
+        if (StringUtils.isEmpty(ocpApiRequirementDto.getApiVersion())) {
+            return ResponseVO.error("服务版本号不能为空");
+        }
+        if (StringUtils.isEmpty(ocpApiRequirementDto.getApiCode())) {
+            return ResponseVO.error("服务编码不能为空");
+        }
+        if (ocpApiRequirementDto.getRequirementType() == null) {
+            return ResponseVO.error("需求类型不能为空");
+        }
+
+
+        //先删除  在添加
+        //服务需求表
+        LambdaQueryWrapper<OcpApiRequirement> wrapper1 = new LambdaQueryWrapper<>();
+        wrapper1.eq(OcpApiRequirement::getApiCode, ocpApiRequirementDto.getApiCode());
+        ocpApiRequirementMapper.delete(wrapper1);
+        //服务基础表
+        LambdaQueryWrapper<OcpApiBase> queryWrapper1 = new LambdaQueryWrapper<>();
+        queryWrapper1.eq(OcpApiBase::getApiCode, ocpApiRequirementDto.getApiCode());
+        OcpApiBase ocpApiBase1 = apiBasicManagementMapper.selectOne(queryWrapper1);
+        Timestamp apiCtime = ocpApiBase1.getApiCtime();
+        apiBasicManagementMapper.delete(queryWrapper1);
+        //服务扩展表
+        LambdaQueryWrapper<OcpApiExtent> wrapper2 = new LambdaQueryWrapper<>();
+        wrapper2.eq(OcpApiExtent::getApiCode, ocpApiRequirementDto.getApiCode());
+        ocpApiExtentMapper.delete(wrapper2);
+
+        //基础表
+        OcpApiBase ocpApiBase = new OcpApiBase();
+        ocpApiBase.setIsDelete(0);
+        ocpApiBase.setApiCtime(apiCtime);
+        ocpApiBase.setApiMtime(Timestamp.valueOf(LocalDateTime.now()));
+        ocpApiBase.setApiCode(ocpApiRequirementDto.getApiCode());
+        ocpApiBase.setApiName(ocpApiRequirementDto.getApiName());
+        ocpApiBase.setApiGroupCode(ocpApiRequirementDto.getApiGroupCode());
+        if (ocpApiRequirementDto.getApiPromotion() != null) {
+            ocpApiBase.setApiPromotion(ocpApiRequirementDto.getApiPromotion());
+        }
+        if (StringUtils.isNotEmpty(ocpApiRequirementDto.getApiUnit())) {
+            ocpApiBase.setApiUnit(ocpApiRequirementDto.getApiUnit());
+        }
+        if (StringUtils.isNotEmpty(ocpApiRequirementDto.getApiUrl())) {
+            ocpApiBase.setApiUrl(ocpApiRequirementDto.getApiUrl());
+        } else {
+            ocpApiBase.setApiUrl("/api-control/service");
+        }
+
+        //需求表
+        OcpApiRequirement ocpApiRequirement = new OcpApiRequirement();
+        ocpApiRequirement.setRequirementCode(ocpApiRequirementDto.getRequirementCode());
+        ocpApiRequirement.setRequirementType(ocpApiRequirementDto.getRequirementType());
+        ocpApiRequirement.setApiGroupCode(ocpApiRequirementDto.getApiGroupCode());
+        ocpApiRequirement.setRequirementComments(ocpApiRequirementDto.getRequirementComments());
+        ocpApiRequirement.setApiCode(ocpApiRequirementDto.getApiCode());
+        ocpApiRequirement.setApiName(ocpApiRequirementDto.getApiName());
+        ocpApiRequirement.setApiUnit(ocpApiRequirementDto.getApiUnit());
+        ocpApiRequirement.setRequirementUserDepg(ocpApiRequirementDto.getRequirementUserDepg());
+        if (ocpApiRequirementDto.getApiPromotion() != null) {
+            ocpApiRequirement.setApiPromotion(ocpApiRequirementDto.getApiPromotion());
+        }
+        if (StringUtils.isNotEmpty(ocpApiRequirementDto.getApiVersion())) {
+            ocpApiRequirement.setApiVersion(ocpApiRequirementDto.getApiVersion());
+        }
+        if (StringUtils.isNotEmpty(ocpApiRequirementDto.getApiUrl())) {
+            ocpApiRequirement.setApiUrl(ocpApiRequirementDto.getApiUrl());
+        } else {
+            ocpApiRequirement.setApiUrl("/api-control/service");
+        }
+        if (StringUtils.isNotEmpty(ocpApiRequirementDto.getRequirementUserId())) {
+            ocpApiRequirement.setRequirementUserName(ocpApiRequirementDto.getRequirementUserId());
+        } else {
+            ocpApiRequirement.setRequirementUserId("0");
+        }
+        if (StringUtils.isNotEmpty(ocpApiRequirementDto.getRequirementUserName())) {
+            ocpApiRequirement.setRequirementUserName(ocpApiRequirementDto.getRequirementUserName());
+        } else {
+            ocpApiRequirement.setRequirementUserName("创建者");
+        }
+        ocpApiRequirement.setRequirementCtime(apiCtime);
+        ocpApiRequirement.setRequirementMtime(Timestamp.valueOf(LocalDateTime.now()));
+        ocpApiRequirement.setIsDelete((long) 0);
+
+
+        //获取服务编码，名称 重复校验
+        LambdaQueryWrapper<OcpApiBase> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(StringUtils.isNotEmpty(ocpApiRequirementDto.getApiName()), OcpApiBase::getApiName, ocpApiRequirementDto.getApiName());
+        queryWrapper.eq(OcpApiBase::getIsDelete, 0);
+        List<OcpApiBase> ocpApiBases = apiBasicManagementMapper.selectList(queryWrapper);
+        if (ocpApiBases.size() != 0) {
+            return ResponseVO.error("服务名称已存在");
+        }
+
+        LambdaQueryWrapper<OcpApiBase> queryWrapper3 = new LambdaQueryWrapper<>();
+        queryWrapper3.eq(StringUtils.isNotEmpty(ocpApiRequirementDto.getApiCode()), OcpApiBase::getApiCode, ocpApiRequirementDto.getApiCode());
+        queryWrapper3.eq(OcpApiBase::getIsDelete, 0);
+        List<OcpApiBase> ocpApiBases1 = apiBasicManagementMapper.selectList(queryWrapper3);
+        if (ocpApiBases1.size() != 0) {
+            return ResponseVO.error("服务编码已存在");
+        }
+
+
+        //也是重复校验 //需求表
+        LambdaQueryWrapper<OcpApiRequirement> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(StringUtils.isNotEmpty(ocpApiRequirementDto.getRequirementCode()), OcpApiRequirement::getRequirementCode, ocpApiRequirementDto.getRequirementCode());
+        List<OcpApiRequirement> ocpApiRequirements = ocpApiRequirementMapper.selectList(wrapper);
+        if (ocpApiRequirements.size() != 0) {
+            return ResponseVO.error("需求编码重复");
+        }
+
+        //添加到服务需求表 和 服务基础信息表 中
+        //添加到服务扩展表中
+        OcpApiExtent ocpApiExtent = new OcpApiExtent();
+        ocpApiExtent.setApiCode(ocpApiRequirementDto.getApiCode());
+        ocpApiExtent.setIsDelete(0);
+        ocpApiExtent.setApiCtime(apiCtime);
+        ocpApiExtent.setApiMtime(Timestamp.valueOf(LocalDateTime.now()));
+        if (StringUtils.isNotEmpty(ocpApiRequirementDto.getClusterName())) {
+            ocpApiExtent.setClusterName(ocpApiRequirementDto.getClusterName());
+        } else {
+            ocpApiExtent.setClusterName("测试集群");
+        }
+        if (StringUtils.isNotEmpty(ocpApiRequirementDto.getSpaceName())) {
+            ocpApiExtent.setSpaceName(ocpApiRequirementDto.getSpaceName());
+        } else {
+            ocpApiExtent.setSpaceName("开发者");
+        }
+
+        int insert1 = ocpApiExtentMapper.insert(ocpApiExtent);
+        int insert = apiBasicManagementMapper.insert(ocpApiBase);
+        int insert2 = ocpApiRequirementMapper.insert(ocpApiRequirement);
+        if ((insert2 > 0) && (insert > 0) && (insert1 > 0)) {
+            return ResponseVO.ok();
+        }
+        return ResponseVO.error("添加失败");
+    }
+
+
+    /**
+     * 迭代-模型入参出参回显
+     *
+     * @param apiCode
+     * @return
+     * @Author:郭凡凡
+     */
+    @Override
+    public ResponseVO<List<OcpApiParam>> echoModelParameter(String apiCode) {
+        LambdaQueryWrapper<OcpApiParam> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(StringUtils.isNotEmpty(apiCode), OcpApiParam::getApiCode, apiCode);
+        List<OcpApiParam> list = ocpApiPMapper.selectList(wrapper);
+        return ResponseVO.ok(list);
+    }
+
+    /**
+     * 审核状态
+     *
+     * @param apiCode
+     * @return
+     * @Author:郭凡凡
+     */
+    @Override
+    public ResponseVO selectAuditStatus(String apiCode) {
+        LambdaQueryWrapper<OcpApiRequirementApproval> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(StringUtils.isNotEmpty(apiCode), OcpApiRequirementApproval::getApiCode, apiCode);
+
+        List<OcpApiRequirementApproval> list = ocpApiRequirementApprovalMapper.selectList(wrapper);
+        for (OcpApiRequirementApproval approval : list) {
+            if (approval.getApprovalStats() == 0) {
+                return ResponseVO.error("未审核,请审核后在迭代");
+            }
+            if (approval.getApprovalStats() == 2) {
+                return ResponseVO.error("审核拒绝");
+            }
+        }
+        return ResponseVO.ok();
+    }
+
+
+    //build
+    private List<ApiParam> build(List<ApiParam> treeNodes) {
+        List<ApiParam> result = new ArrayList<>();
+        //list转map =>将每个对象的id作为key,自己作为value.
+        Map<String, ApiParam> nodeMap = new LinkedHashMap<>(treeNodes.size());
+        for (ApiParam treeNode : treeNodes) {
+            nodeMap.put(treeNode.getObjId(), treeNode);
+        }
+        for (ApiParam node : nodeMap.values()) {
+            //得到自己的父类
+            ApiParam parent = nodeMap.get(node.getPid());
+            if (parent != null && (node.getPid().equals(parent.getObjId()))
+                    && (!"".equals(node.getPid()) || !"".equals(parent.getObjId()))
+                    && !parent.getObjId().equals(node.getObjId())) {
+                //防止每次都new list或者只是使用该对象就new对象浪费内存或者覆盖上一次记录
+                if (parent.getChildrenList() == null) {
+                    parent.setChildrenList(new LinkedList<>());
+                }
+                //设置上级父类名称
+                parent.getChildrenList().add(node);
+                continue;
+            }
+            result.add(node);
+        }
+        return result;
+    }
+
+}
+
+

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

@@ -2,17 +2,23 @@ package com.pms.ocp.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.github.pagehelper.util.StringUtil;
 import com.pms.ocp.common.utils.RandomStringUtils;
 import com.pms.ocp.mapper.OcpApiBaseMapper;
+import com.pms.ocp.mapper.OcpApiGroupMapper;
 import com.pms.ocp.mapper.OcpApiTreeMapper;
 import com.pms.ocp.model.QueryResponseResult;
 import com.pms.ocp.model.dto.*;
 import com.pms.ocp.model.entity.OcpApiGroup;
 
 import com.pms.ocp.model.entity.OcpTenantGroup;
+import com.pms.ocp.model.vo.OcpApiBaseVo;
 import com.pms.ocp.service.OcpApiTreeService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -25,6 +31,7 @@ import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 
@@ -42,8 +49,10 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper, OcpApiG
 
     @Autowired
     private OcpApiBaseMapper ocpApiBaseMapper;
+    @Autowired
+    private OcpApiGroupMapper ocpApiGroupMapper;
 
-
+    List<String> apiGroupCode = new ArrayList<>();
 
     /**
      * 服务树分类
@@ -58,8 +67,8 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper, OcpApiG
             List<OcpApiGroup> ocpApiGroups = mapper.selectTwoApiGroups(apiGroupPromotionType);
             List<OcpApiGroup> ocpApiGrouplist = new ArrayList<>();
             for (OcpApiGroup ocpApiGroup : ocpApiGroups) {
-               if (StringUtils.isBlank(ocpApiGroup.getApiGroupPcode())){
-                   ocpApiGrouplist.add(ocpApiGroup);
+                if (StringUtils.isBlank(ocpApiGroup.getApiGroupPcode())) {
+                    ocpApiGrouplist.add(ocpApiGroup);
                 }
             }
             return ocpApiGrouplist;
@@ -173,45 +182,50 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper, OcpApiG
      * @param pageGroupDto
      * @return
      */
+
     @Override
     public Page<OcpApiGroup> getOnePages(PageGroupDto pageGroupDto) {
         Page<OcpApiGroup> pageInfo = new Page(pageGroupDto.getCurrentPage(), pageGroupDto.getPageSize());
-        LambdaQueryWrapper<OcpApiGroup> qw = new LambdaQueryWrapper<>();
-        if (StringUtils.isBlank(pageGroupDto.getKeyword())) {
-            if (StringUtils.isBlank(pageGroupDto.getApiGroupCode())) {
-                qw.eq(OcpApiGroup::getApiGroupPromotionType, pageGroupDto.getApiGroupPromotionType()).orderByDesc(OcpApiGroup::getApiGroupMtime);
-
-                mapper.selectPage(pageInfo, qw);
-
-            } else if (!(StringUtils.isNotBlank(pageGroupDto.getApiGroupPcode()))) {
-                List<OcpApiGroup> ocpApiGroups = mapper.selectLists(pageGroupDto.getApiGroupPromotionType(), pageGroupDto.getApiGroupCode());
-                qw.eq(OcpApiGroup::getApiGroupPromotionType, pageGroupDto.getApiGroupPromotionType()).and(c -> c.eq(OcpApiGroup::getApiGroupPcode, pageGroupDto.getApiGroupCode())).orderByDesc(OcpApiGroup::getApiGroupMtime);
-                pageInfo.setRecords(ocpApiGroups);
-                mapper.selectPage(pageInfo, qw);
-                List<OcpApiGroup> records = pageInfo.getRecords();
-                for (OcpApiGroup record : records) {
-                    OcpApiGroup ocpApiGroup = mapper.selectCode(record.getApiGroupPcode());
-                    record.setClassIfy(ocpApiGroup.getApiGroupName());
-                }
+        apiGroupCode.add(pageGroupDto.getApiGroupCode());
+        setGroupIdValue(null, pageGroupDto.getApiGroupCode(), null);
+        pageGroupDto.setApiGroupCodeList(apiGroupCode);
+        LambdaQueryWrapper<OcpApiGroup> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.in(OcpApiGroup::getApiGroupPcode, pageGroupDto.getApiGroupCodeList());
+        if (null != pageGroupDto.getKeyword() && !"".equals(pageGroupDto.getKeyword())) {
+            queryWrapper.like(OcpApiGroup::getApiGroupName, pageGroupDto.getKeyword());
+        }
 
+        mapper.selectPage(pageInfo, queryWrapper);
+        apiGroupCode.clear();
+        //ocpApiGroups
+        return pageInfo;
+    }
 
+    private void setGroupIdValue(String apiGroupCompanyCode, String code, Integer apiGroupPromotionType) {
+        List<String> codes = getIdsByPIdPub(apiGroupCompanyCode, code, apiGroupPromotionType);
+        if (codes.size() > 0) {
+            for (String cod : codes) {
+                setGroupIdValue(apiGroupCompanyCode, cod, apiGroupPromotionType);
+                apiGroupCode.add(cod);
             }
-        } else if (StringUtils.isNotBlank(pageGroupDto.getKeyword())) {
-            if (StringUtils.isBlank(pageGroupDto.getApiGroupCode())){
-                LambdaQueryWrapper<OcpApiGroup> ocpTenantGroupLambdaQueryWrapper = qw.and(c -> c.like(OcpApiGroup::getApiGroupName, pageGroupDto.getKeyword()))
-                        .and(c->c.eq(OcpApiGroup::getApiGroupPromotionType,pageGroupDto.getApiGroupPromotionType())).orderByDesc(OcpApiGroup::getApiGroupMtime);
-                mapper.selectPage(pageInfo, ocpTenantGroupLambdaQueryWrapper);
-
-            }else if (StringUtils.isNotBlank(pageGroupDto.getApiGroupCode())) {
-                LambdaQueryWrapper<OcpApiGroup> ocpTenantGroupLambdaQueryWrapper = qw.and(c -> c.like(OcpApiGroup::getApiGroupName, pageGroupDto.getKeyword()))
-                        .and(c -> c.eq(OcpApiGroup::getApiGroupPcode, pageGroupDto.getApiGroupCode())).orderByDesc(OcpApiGroup::getApiGroupMtime);
-                mapper.selectPage(pageInfo, ocpTenantGroupLambdaQueryWrapper);
-            }
+            ;
         }
+    }
 
-
-        return pageInfo;
+    public List<String> getIdsByPIdPub(String apiGroupCompanyCode, String code, Integer apiGroupPromotionType) {
+        List<OcpApiGroup> ocpApiGroups = ocpApiGroupMapper.apiBaseTreeOther(apiGroupCompanyCode, code, apiGroupPromotionType);
+        return ocpApiGroups.stream().map(OcpApiGroup::getApiGroupCode).collect(Collectors.toList());
     }
+    /**
+     * 递归查询子集菜单
+     */
+//    private List<GroupVO> getChildList(String pId, List<GroupVO> allList) {
+//        List<GroupVO> childList = allList.stream().filter(groupVO -> pId.equals(groupVO.getpId())).collect(Collectors.toList());
+//        for (GroupVO groupVO : childList) {
+//            groupVO.setChildList(getChildList(groupVO.getGroupId(), allList));
+//        }
+//        return childList;
+//    }
 }
 
 

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

+package com.pms.ocp.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.pms.ocp.mapper.ParamMapper;
+import com.pms.ocp.model.entity.ApiParam;
+import com.pms.ocp.service.ParamService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ParamServiceImpl extends ServiceImpl<ParamMapper, ApiParam> implements ParamService {
+}

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

@@ -39,6 +39,8 @@ public class PmsApiManagementServiceImpl extends ServiceImpl<PmsApiManagementMap
 
     @Autowired
     private OcpApiGroupVoMapper ocpApiGroupVoMapper;
+    @Autowired
+    private OcpTenantIocnMapper ocpTenantIocnMapper;
 
 
 
@@ -67,6 +69,12 @@ public class PmsApiManagementServiceImpl extends ServiceImpl<PmsApiManagementMap
         pmsApiMangageApi.setObjId(randomString);
 //        pmsApiMangageApi.setApiCtime(pmsApiMangageApi.getApiMtime());
         pmsApiManagementMapper.addPamm(pmsApiMangageApi);
+        OcpTenantIocn  ocpTenantIocn  = new OcpTenantIocn();
+        ocpTenantIocn.setCodeNo(pmsApiMangageApi.getApiCode());
+//        TODO
+        ocpTenantIocn.setIocn((byte[]) pmsApiMangageApi.getIocn());
+        ocpTenantIocn.setIocnType("api");
+        ocpTenantIocnMapper.insert(ocpTenantIocn);
         return pmsApiMangageApi;
     }
 
@@ -78,6 +86,7 @@ public class PmsApiManagementServiceImpl extends ServiceImpl<PmsApiManagementMap
         int apiTenantCount  = pmsApiManagementMapper.getApitenant(pmsApiMangageApi.getApiCode());
         if(apiModelCount==0 && apiTenantCount==0){
             pmsApiManagementMapper.deleteApi(pmsApiMangageApi);
+            ocpTenantIocnMapper.deleteIconCodes(pmsApiMangageApi);
             return ResponseResult.SUCCESS(true);
         }
        return ResponseResult.SUCCESS(false);

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

 package com.pms.ocp.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.pms.ocp.mapper.*;
 import com.pms.ocp.model.dto.GroupDto;
-
 import com.pms.ocp.model.dto.OcpBaseTiocnDto;
 import com.pms.ocp.model.dto.OcpTenantBaseDto;
 import com.pms.ocp.model.dto.TenantDto;
 import com.pms.ocp.model.entity.*;
 import com.pms.ocp.model.vo.ResponseVO;
-import com.pms.ocp.model.vo.TenantGroupVo;
 import com.pms.ocp.service.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -21,7 +18,6 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
 
 import java.sql.Timestamp;
 import java.time.LocalDateTime;
@@ -264,7 +260,7 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
         List<GroupDto> ocpTenantGroups = ocpTenantGroupMapper.tenantBaseTreeOther(tenantGroupCode, tenantGroupCompanyCode);
         List<GroupDto> list = new ArrayList<>();
         for (GroupDto ocpTenantGroup : ocpTenantGroups) {
-            if (StringUtils.isNotBlank(ocpTenantGroup.getTenantGroupCode())&&StringUtils.isNotBlank(ocpTenantGroup.getTenantGroupName())){
+            if (StringUtils.isNotBlank(ocpTenantGroup.getTenantGroupCode()) && StringUtils.isNotBlank(ocpTenantGroup.getTenantGroupName())) {
                 list.add(ocpTenantGroup);
             }
         }
@@ -276,7 +272,7 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
             } else {
                 List<GroupDto> groupDtos = ocpTenantGroupMapper.selectBase(tenantGroupCode, tenantGroupCompanyCode);
                 if (groupDtos.size() != 0) {
-                     return groupDtos;
+                    return groupDtos;
                 }
                 return Collections.EMPTY_LIST;
             }
@@ -416,28 +412,27 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
         String tenantCode = ocpBaseTiocnDto.getTenantCode();
         LambdaQueryWrapper<OcpTenantBase> lambdaQueryWrapper2 = new LambdaQueryWrapper<>();
         lambdaQueryWrapper2.eq(OcpTenantBase::getTenantCode, tenantCode);
+        lambdaQueryWrapper2.eq(OcpTenantBase::getIsDelete, 0);
         OcpTenantBase one = this.getOne(lambdaQueryWrapper2);
         OcpTenantBase ocpTenantBase = new OcpTenantBase();
         BeanUtils.copyProperties(ocpBaseTiocnDto, ocpTenantBase);
         ocpTenantBase.setIsDelete((short) 0);
-        if (StringUtils.isEmpty(objId)){
-            if (one!=null){
+        if (StringUtils.isEmpty(objId)) {
+            if (one != null) {
                 return ResponseVO.error("应用编码不能重复");
-            }else {
+            } else {
                 ocpTenantBase.setTenantCtime(new Timestamp(System.currentTimeMillis()));
                 ocpTenantBase.setTenantMtime(new Timestamp(System.currentTimeMillis()));
                 this.save(ocpTenantBase);
             }
-        }else {
+        } else {
             ocpTenantBase.setTenantMtime(new Timestamp(System.currentTimeMillis()));
             LambdaQueryWrapper<OcpTenantBase> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-            lambdaQueryWrapper.eq(OcpTenantBase::getObjId,ocpTenantBase.getObjId());
-            this.update(ocpTenantBase,lambdaQueryWrapper);
+            lambdaQueryWrapper.eq(OcpTenantBase::getObjId, ocpTenantBase.getObjId());
+            this.update(ocpTenantBase, lambdaQueryWrapper);
         }
 
 
-
-
 //        boolean flag = this.update(ocpTenantBase, lambdaQueryWrapper2);
 //        if (flag) {
 //            log.info("应用基础表修改成功");
@@ -455,13 +450,12 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
 //        boolean save1 = this.save(ocpTenantBase);
 
 
-
         OcpTenantExtent ocpTenantExtent = new OcpTenantExtent();
         ocpTenantExtent.setTenantCode(tenantCode);
         ocpTenantExtent.setTenantState((short) 0);
         ocpTenantExtent.setIsDelete((short) 0);
         LambdaQueryWrapper<OcpTenantExtent> lambdaQueryWrapper1 = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper1.eq(StringUtils.isNotEmpty(tenantCode),OcpTenantExtent::getTenantCode,tenantCode);
+        lambdaQueryWrapper1.eq(StringUtils.isNotEmpty(tenantCode), OcpTenantExtent::getTenantCode, tenantCode);
         int delete1 = ocpTenantExtentMapper.delete(lambdaQueryWrapper1);
         if (delete1 == 0) {
             log.info("增加");
@@ -485,7 +479,7 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
         ocpTenantIocn.setIocn(ocpBaseTiocnDto.getIocn());
         ocpTenantIocn.setCompanyCode(ownerCompanyCode);
         boolean save = ocpTenantIocnService.save(ocpTenantIocn);
-        if ( save) {
+        if (save) {
             return ResponseVO.ok("添加成功");
         }
         return ResponseVO.error("未知错误");

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

@@ -40,7 +40,7 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, OcpTenantGroup>
 
     /**
      * 应用树分类管理
-     *
+     *11
      * @return
      */
     @Override
@@ -48,11 +48,11 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, OcpTenantGroup>
         List<OcpTenantGroup> ocpTenantGroupList = null;
         if (StringUtils.isBlank(level)) {
             //顶级目录
-            ocpTenantGroupList = tenantMapper.oneTenantGroup();
-        } else if (StringUtils.isNotBlank(level) && "1".equals(level)) {
-            //二级目录
-            ocpTenantGroupList = tenantMapper.selectGroups(tenantGroupCompanyCode);
-        } else if (StringUtils.isNotBlank(level) && "2".equals(level) || "3".equals(level)) {
+            ocpTenantGroupList = tenantMapper.twoTenantGroups();
+//        } else if (StringUtils.isNotBlank(level) && "1".equals(level)) {
+//            //二级目录
+//            ocpTenantGroupList = tenantMapper.selectGroups(tenantGroupCompanyCode);
+        } else if (StringUtils.isNotBlank(level) && "2".equals(level) || "3".equals(level) || "1".equals(level)) {
             //三级目录
             ocpTenantGroupList = tenantMapper.selectTenantGroups(tenantGroupCode, tenantGroupCompanyCode);
 
@@ -63,7 +63,7 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, OcpTenantGroup>
 
     /**
      * 应用新增
-     *
+     *1
      * @param
      * @return
      */
@@ -203,7 +203,8 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, OcpTenantGroup>
 
         if (StringUtils.isBlank(keyword)) {
             if (StringUtils.isBlank(lev) || "1".equals(lev)) {
-                LambdaQueryWrapper<OcpTenantGroup> eq = qw.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode).orderByDesc(OcpTenantGroup::getTenantGroupMtime);
+                LambdaQueryWrapper<OcpTenantGroup> eq = qw.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode)
+                        .and(c->c.eq(OcpTenantGroup::getTenantGroupPcode,tenantGroupCode)).orderByDesc(OcpTenantGroup::getTenantGroupMtime);
                 tenantMapper.selectPage(page, eq);
             } else if ("2".equals(lev) || "3".equals(lev)) {
                 LambdaQueryWrapper<OcpTenantGroup> eq = qw.or(wq -> wq.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode))
@@ -211,10 +212,10 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, OcpTenantGroup>
                 tenantMapper.selectPage(page, eq);
             }
         } else if (!(StringUtils.isBlank(keyword))) {
-            LambdaQueryWrapper<OcpTenantGroup> ocpTenantGroupLambdaQueryWrapper = qw.and(c -> c.like(OcpTenantGroup::getTenantGroupCompanyCode, keyword))
-                    .or().like(OcpTenantGroup::getTenantGroupName, keyword)
+            LambdaQueryWrapper<OcpTenantGroup> ocpTenantGroupLambdaQueryWrapper = qw.and(c -> c.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode))
+                    .eq(OcpTenantGroup::getTenantGroupPcode, tenantGroupCode)
+                    .and(c->c.like(OcpTenantGroup::getTenantGroupName, keyword))
                     .orderByDesc(OcpTenantGroup::getTenantGroupMtime);
-
             tenantMapper.selectPage(page, ocpTenantGroupLambdaQueryWrapper);
 //            OcpTenantGroup ocpTenantGroup1 = new OcpTenantGroup();
 //            ocpTenantGroup1.setKeyword(keyword);

src/main/resources/mapper/AcceptInfoMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.pms.ocp.mapper.AcceptInfoMapper">
+
+    <select id="getAllApiAndModel" resultType="com.pms.ocp.model.vo.ApiAndModelVO">
+        with i as (
+            SELECT is_delete,
+                   api_code,
+                   array_to_string(array_agg(model_name), ',')     as model_name,
+                   array_to_string(array_agg(api_param_name), ',') as param1
+            FROM ocp_api_param
+            WHERE api_param_classification = 'in'
+            GROUP BY api_code, is_delete
+        ),
+             o as (
+                 SELECT is_delete,
+                        api_code,
+                        array_to_string(array_agg(model_name), ',')     as model_name,
+                        array_to_string(array_agg(api_param_name), ',') as param2
+                 FROM ocp_api_param
+                 WHERE api_param_classification = 'out'
+                 GROUP BY api_code, is_delete
+             )
+        SELECT i.api_code apiCode, i.model_name iString, o.model_name oString, i.param1, o.param2
+        FROM i
+                 LEFT JOIN o ON i.api_code = o.api_code
+
+        WHERE i.is_delete = '0'
+    </select>
+
+    <update id="updateRatioByApiCode">
+        update ocp_api_param
+        set ratio = #{ratio}
+        where api_code = #{apiCode}
+    </update>
+
+    <select id="getFinalRatio" resultType="com.pms.ocp.model.vo.ApiAndModelVO">
+        with i as (
+            SELECT is_delete,
+                   api_code,
+                   array_to_string(array_agg(model_name), ',')     as model_name,
+                   array_to_string(array_agg(api_param_name), ',') as param1,
+                   ratio,
+                   ratio_param                                        ratio2
+            FROM ocp_api_param
+            WHERE api_param_classification = 'in'
+            GROUP BY api_code, ratio, is_delete, ratio_param
+        ),
+             o as (
+                 SELECT is_delete,
+                        api_code,
+                        array_to_string(array_agg(model_name), ',')     as model_name,
+                        array_to_string(array_agg(api_param_name), ',') as param2,
+                        ratio,
+                        ratio_param                                        ratio2
+                 FROM ocp_api_param
+
+
+                 WHERE api_param_classification = 'out'
+                 GROUP BY api_code, ratio, is_delete,
+                          ratio_param
+             )
+        SELECT ocp_api_base.api_name apiName,
+               i.api_code            apiCode,
+               i.model_name          iString,
+               o.model_name          oString,
+               i.param1,
+               o.param2,
+               i.ratio,
+               i.ratio2
+        FROM i
+                 LEFT JOIN o ON i.api_code = o.api_code
+                 LEFT JOIN ocp_api_base ON i.api_code = ocp_api_base.api_code
+        WHERE i.is_delete = '0'
+        ORDER BY ratio DESC, ratio2 DESC
+        LIMIT 5
+    </select>
+
+    <update id="updateDel">
+        update ocp_api_param
+        set is_delete = '1'
+        where api_code = #{apiCode}
+    </update>
+
+    <select id="getRatioByApiCode" resultType="com.pms.ocp.model.vo.ApiAndModelVO">
+        with i as (
+            SELECT api_code,
+                   array_to_string(array_agg(model_name), ',')     as model_name,
+                   array_to_string(array_agg(api_param_name), ',') as param1
+            FROM ocp_api_param
+            WHERE api_param_classification = 'in'
+            GROUP BY api_code
+        ),
+             o as (
+                 SELECT api_code,
+                        array_to_string(array_agg(model_name), ',')     as model_name,
+                        array_to_string(array_agg(api_param_name), ',') as param2
+                 FROM ocp_api_param
+                 WHERE api_param_classification = 'out'
+                 GROUP BY api_code
+             )
+        SELECT i.api_code apiCode, i.model_name iString, o.model_name oString, i.param1, o.param2
+        FROM i
+                 LEFT JOIN o ON i.api_code = o.api_code
+        WHERE i.api_code = #{apiCode}
+    </select>
+
+    <update id="updateRatioParamByApiCode">
+        update ocp_api_param
+        set ratio_param = #{ratio2}
+        where api_code = #{apiCode}
+    </update>
+
+    <update id="returnDel">
+        update ocp_api_param
+        set is_delete = '0'
+        where api_code = #{apiCode}
+    </update>
+
+    <select id="getNowApiCode" resultType="int">
+        select count(0)
+        from ocp_api_param
+        where api_code = #{apiCode}
+    </select>
+
+    <select id="getAcceptPeopleInfo" resultType="com.pms.ocp.model.entity.OcpApiRequirementApproval">
+        select approval_stats,
+               last_approval_stats,
+               approval_department,
+               approval_user_name,
+               approval_ctime,
+               approval_audit
+        from ocp_api_requirement_approval
+        where requirement_code = #{requirementCode}
+    </select>
+
+
+</mapper>
\ No newline at end of file

src/main/resources/mapper/Acceptmapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.pms.ocp.mapper.OcpApiAcceptMapper">
+    <select id="selectByCodeList" resultType="com.pms.ocp.model.entity.OcpApiRequirementAccept">
+        select  * from  ocp_api_requirement_accept  where api_code = #{apiCode}
+    </select>
+
+</mapper>
\ No newline at end of file

src/main/resources/mapper/ModelAcceptMapper.xml

@@ -14,7 +14,7 @@
         on
         omv.requirement_code = omra.requirement_code
         where
-        omra.accept_status = 0
+        omra.accept_stats = 0
     </select>
 
     <select id="modelAuditDetail" parameterType="string" resultType="com.pms.ocp.model.vo.ModelAcceptVo">
@@ -29,9 +29,10 @@
         omv.model_layer as modelLayer,
         omv.model_version as modelVersion,
         omv.professional_kind as professionalKind,
+        omv.model_promotion as modelPromotion,
         omr.requirement_desc as requirementDesc,
         omr.company_code as ownerCompanyCode,
-        omra.approval_status as auditState,
+        omra.approval_stats as auditState,
         omra.approval_comment as auditOpinion,
         omra.approval_user_name as auditUserName,
         omra.requirement_code as requirementCode,
@@ -121,7 +122,7 @@
         update
         ocp_model_requirement_accept
         set
-        accept_status = 1
+        accept_stats = 1
         where
         requirement_code = #{requirementCode}
     </update>
@@ -133,4 +134,12 @@
         where
         relation_mode_code = #{modelCode}
     </delete>
+
+    <insert id="insertPropList" keyProperty="objId" useGeneratedKeys="true">
+        insert into ocp_model_prop(obj_id,model_code, column_name, prop_code, column_comments, data_type, data_length, data_scale, is_pk, is_required, prop_order_no, prop_user_id, prop_user_name, prop_ctime, prop_mtime)
+        values
+        <foreach collection="entities" item="entity" separator=",">
+            (#{entity.objId},#{entity.modelCode}, #{entity.propName}, #{entity.propCode}, #{entity.columnComments}, #{entity.propType}, #{entity.propLength}, #{entity.dataScale}, #{entity.isPk}, #{entity.isRequired}, #{entity.propOrderNo}, #{entity.propUserId}, #{entity.propUserName}, #{entity.propCtime}, #{entity.propMtime})
+        </foreach>
+    </insert>
 </mapper>
\ No newline at end of file

src/main/resources/mapper/ModelBaseMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.pms.ocp.mapper.ModelBaseMapper">
+
+    <select id="selectByModelCode" resultType="com.pms.ocp.model.entity.Model">
+        select * from ocp_model_base  where  model_code  = #{modelC ode}
+    </select>
+
+</mapper>
\ No newline at end of file

src/main/resources/mapper/ModelCheckMapper.xml

@@ -8,10 +8,21 @@
         <result property="modelTable" column="model_table"/>
         <collection property="propList" javaType="list" ofType="com.pms.ocp.model.entity.PropInfo">
             <result property="propName" column="column_name"/>
+            <result property="modelCode" column="model_code"/>
             <result property="propType" column="data_type"/>
             <result property="propLength" column="data_length"/>
             <result property="columnComments" column="column_comments"/>
             <result property="isPk" column="is_pk"/>
+            <result property="modelVersion" column="model_version"/>
+            <result property="propCode" column="prop_code"/>
+            <result property="dataScale" column="data_scale"/>
+            <result property="isRequired" column="is_required"/>
+            <result property="propOrderNo" column="prop_order_no"/>
+            <result property="propUserId" column="prop_user_id"/>
+            <result property="propUserName" column="prop_user_name"/>
+            <result property="propCtime" column="prop_ctime"/>
+            <result property="propMtime" column="prop_mtime"/>
+            <result property="propPromotion" column="prop_promotion"/>
         </collection>
     </resultMap>
     <select id="modelAuditList" parameterType="string" resultType="com.pms.ocp.model.vo.ModelCheckVo">
@@ -22,11 +33,12 @@
         omv.model_table AS tableName,
         omr.requirement_type AS flowState,
         omr.company_code AS proposerCompanyCode,
-        omra.approval_status AS demandAuditState,
+        omra.approval_stats AS demandAuditState,
         omra.approval_comment AS auditOpinion,
         omra.approval_user_name AS auditName,
         omra.requirement_code AS requirementCode,
-        omra.approval_ctime AS auditTime
+        omra.approval_ctime AS auditTime,
+        oor.org_name AS proposerCompanyName
         from
          ocp_model_version as omv
          left join
@@ -37,6 +49,9 @@
          ocp_model_requirement_approval as omra
          on
          omra.requirement_code = omr.requirement_code
+        left join ocp_organization as oor
+        on
+        omr.company_code = oor.org_code
         <if test="searchCondition != null and searchCondition != '' ">
             where
             model_name like concat('%',#{searchCondition}::text ,'%')
@@ -55,18 +70,33 @@
         update ocp_model_requirement_approval
         <set>
             <if test="auditState != null">
-                approval_status = #{auditState},
+                approval_stats = #{auditState},
             </if>
             <if test="checkOpinion != null and checkOpinion != ''">
                 approval_comment = #{checkOpinion},
             </if>
+            <if test="approvalCompanyCode != null and approvalCompanyCode != ''">
+                approval_company_code = #{approvalCompanyCode},
+            </if>
+            <if test="approvalUserId != null and approvalUserId != ''">
+                approval_user_id = #{approvalUserId},
+            </if>
+            <if test="approvalUserName != null and approvalUserName != ''">
+                approval_user_name = #{approvalUserName},
+            </if>
+
+            <if test="approvalCtime != null ">
+                approval_ctime = #{approvalCtime},
+            </if>
         </set>
         where requirement_code = #{requirementCode}
     </update>
 
     <insert id="saveAccept" parameterType="com.pms.ocp.model.dto.OcpModelRequirementAcceptDto">
-        insert into ocp_model_requirement_accept(obj_id,requirement_code, api_code,accept_status, accept_company_code, accept_department, accept_user_id, accept_user_name, accept_ctime, accept_mtime, is_delete)
-        values (#{objId},#{requirementCode}, #{apiCode}, #{acceptStats}, #{acceptCompanyCode}, #{acceptDepartment}, #{acceptUserId}, #{acceptUserName}, #{acceptCtime}, #{acceptMtime}, #{isDelete})
+        insert into ocp_model_requirement_accept(obj_id,requirement_code, api_code, accept_stats,
+        accept_company_code, accept_department, accept_user_id, accept_user_name, accept_ctime, accept_mtime, is_delete)
+        values (#{objId},#{requirementCode}, #{apiCode}, #{acceptStats}, #{acceptCompanyCode},
+        #{acceptDepartment}, #{acceptUserId}, #{acceptUserName}, #{acceptCtime}, #{acceptMtime}, #{isDelete})
     </insert>
 
     <select id="selectModelOwnerProp" resultMap="modelBelongProp">
@@ -78,13 +108,21 @@
         ompv.data_length,
         ompv.column_comments,
         ompv.is_pk,
-        ompv.data_type
+        ompv.data_type,
+        ompv.model_version,
+        ompv.prop_code,
+        ompv.data_scale,
+        ompv.is_required,
+        ompv.prop_order_no,
+        ompv.prop_user_id,
+        ompv.prop_ctime,
+        ompv.prop_promotion
         from
         ocp_model_version as omv
         left join ocp_model_prop_version as ompv on omv.model_code = ompv.model_code
         <if test="modelCode != null and modelCode != '' ">
             where
-            omv.model_code= #{modelCode}
+            trim(omv.model_code)= #{modelCode}
         </if>
     </select>
 
@@ -106,4 +144,14 @@
         where
         requirement_code = #{requirementCode}
     </delete>
+
+    <select id="selectModelByRequirementCode" resultType="java.lang.Integer" parameterType="com.pms.ocp.model.dto.ModelAuditDto">
+        select
+        count(1)
+        from
+        ocp_model_requirement_accept
+        where
+        requirement_code = #{requirementCode}
+    </select>
+
 </mapper>
\ No newline at end of file

src/main/resources/mapper/OcpApiGroupMapper.xml

@@ -77,9 +77,11 @@
         oab.api_version
         from ocp_api_base oab
         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_api_requirement_accept  oara on oab.api_code=oara.api_code
+<!--        LEFT JOIN ocp_tenant_iocn oci on  oab.api_code = oci.code_no-->
         LEFT JOIN ocp_api_group oag on  oab.api_group_code = oag.api_group_code
         <where>
+            oara.accept_stats=1
             <if test="apiGroupCodeList !=null ">
                 and oab.api_group_code in
                 <foreach item="apiGroupCode" collection="apiGroupCodeList" open="(" separator=","
@@ -87,12 +89,15 @@
                     #{apiGroupCode}
                 </foreach>
             </if>
+
             <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>
@@ -100,22 +105,27 @@
             <if test="apiPromotion !=null ">
                 and oab.api_promotion = #{apiPromotion}
             </if>
+
             <if test="startCTime !=null  and startCTime!= ''">
                 <![CDATA[
                 and oab.api_ctime >= #{startCTime}
                 ]]>
             </if>
+
             <if test="endCTime !=null  and endCTime!= '' ">
                 <![CDATA[
             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}
@@ -135,8 +145,14 @@
 
 
     <select id="selectBase" resultType="com.pms.ocp.model.dto.OcpGroupBaseDto">
-        select obj_id,api_code,api_name,api_group_code from ocp_api_base
+        select oab.obj_id,
+               oab.api_code,
+               oab.api_name,
+               oab.api_group_code from
+                ocp_api_base oab
+        left join  ocp_api_requirement_accept  oara on oab.api_code=oara.api_code
         <where>
+            oara.accept_stats=1
             <if test="apiGroupPcode!=null and apiGroupPcode!=''">
                 and api_group_code = #{apiGroupPcode}
             </if>

src/main/resources/mapper/OcpApiGroupVoMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.pms.ocp.mapper.OcpApiGroupVoMapper">
+
+
+
+
+
+</mapper>
\ No newline at end of file

src/main/resources/mapper/OcpApiModelRelMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.pms.ocp.mapper.OcpApiModelRelMapper">
+
+<!--    根据apiCode查询模型-->
+    <select id="selectApiGroupds" resultType="com.pms.ocp.model.entity.OcpApiModelRel">
+    select  * from ocp_api_model_rel where api_code = #{apiCode}
+    </select>
+
+</mapper>
\ No newline at end of file

src/main/resources/mapper/OcpApiPMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.pms.ocp.mapper.OcpApiPMapper">
+    <!--    根据服务编码查询服务出参入参-->
+    <select id="selects" resultType="com.pms.ocp.model.entity.OcpApiParam">
+        select * from ocp_api_param where api_code = #{apiCode}
+    </select>
+
+
+    <select id="selectByList" resultType="com.pms.ocp.model.entity.OcpApiParam">
+        select  model_code, model_name  FROM ocp_api_param WHERE api_code = #{apiCode} GROUP BY model_name,model_code;
+    </select>
+
+
+    <select id="selectsByModelCode" resultType="com.pms.ocp.model.entity.OcpApiParam">
+        SELECT * FROM ocp_api_param WHERE model_code = #{modelCode};
+    </select>
+</mapper>
\ No newline at end of file

src/main/resources/mapper/OcpApiReqMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.pms.ocp.mapper.OcpApiReqMapper">
+    <select id="OcpApiReq" resultType="com.pms.ocp.model.vo.OcpApiRequirementVo">
+		SELECT	DISTINCT
+		oart.requirement_code,
+		oart.requirement_type,
+		oart.requirement_comments,
+		oart.api_code,
+		oart.api_name,
+		oart.api_group_code,
+		oart.api_url,
+		oart.api_version,
+		oart.requirement_user_name,
+		oart.requirement_ctime,
+		oart.api_unit,
+		oab.api_promotion,
+		oab.obj_id
+<!--		oaral.last_approval_stats-->
+		FROM
+		ocp_api_requirement oart
+		LEFT JOIN ocp_api_base oab ON oart.api_code = oab.api_code
+<!--		LEFT JOIN ocp_api_requirement_approval oaral  on oart.requirement_code = oaral.requirement_code-->
+		<where>
+
+<!--			<if test="apiGroupCodeList !=null ">-->
+<!--				and oart.api_group_code in-->
+<!--				<foreach item="apiGroupCode" collection="apiGroupCodeList" open="(" separator=","-->
+<!--						 close=")">-->
+<!--					#{apiGroupCode}-->
+<!--				</foreach>-->
+<!--			</if>-->
+<!--			<if test="apiUnit !=null and apiUnit!=''">-->
+<!--				and oart.api_unit = #{apiUnit}-->
+<!--			</if>-->
+<!--			<if test="requirementType !=null ">-->
+<!--				and oart.requirement_type = #{requirementType}-->
+<!--			</if>-->
+<!--			<if test="requirementUserName !=null and requirementUserName!=''">-->
+<!--				and oart.requirement_user_name like CONCAT('%', #{requirementUserName}::text,'%')-->
+<!--			</if>-->
+
+<!--			<if test="apiCode!=null and apiCode!=''">-->
+<!--				and  oart.api_code = #{apiCode}-->
+<!--			</if>-->
+
+			<if test="apiGroupCode !=null and apiGroupCode!=''">
+				and oart.api_group_code = #{apiGroupCode}
+			</if>
+
+			<if test="apiName !=null and apiName != '' ">
+				and oart.api_name like CONCAT('%', #{apiName}::text,'%')
+			</if>
+
+<!--			<if test="lastApprovalStats == true ">-->
+<!--&lt;!&ndash;				and oaral.last_approval_stats != 0&ndash;&gt;-->
+<!--			</if>-->
+
+			<if test="requirementCode!=null and requirementCode!=''">
+				and oart.requirement_code like CONCAT('%', #{requirementCode}::text,'%')
+			</if>
+				<if test="requirementType !=null and requirementType!=''">
+				and oart.requirement_type = #{requirementType}
+			</if>
+
+			<if test="apiPromotion !=null and apiPromotion!=''">
+				and oab.api_promotion = #{apiPromotion}
+			</if>
+
+			<if test="startCTime !=null and startCTime!= '' ">
+				<![CDATA[
+                and oart.requirement_ctime >= #{startCTime}
+                ]]>
+			</if>
+			<if test="endCTime !=null  and endCTime!= '' ">
+				<![CDATA[
+            and oart.requirement_ctime <= #{endCTime}
+            ]]>
+			</if>
+
+			<if test="ownerCompanyCode !=null and ownerCompanyCode!=''">
+				and oart.owner_company_code like CONCAT('%', #{ownerCompanyCode}::text,'%')
+			</if>
+		</where>
+		order by oart.requirement_ctime desc
+    </select>
+
+
+	<select id="selectOarcList" resultType="com.pms.ocp.model.vo.OcpApiRequirementVo">
+		SELECT
+		omb.model_name,
+		oamr.api_code,
+		oamr.model_code,
+		aprt.api_url,
+		oab.obj_id,
+		aprt.requirement_code,
+		aprt.requirement_type,
+		aprt.requirement_comments,
+		aprt.requirement_ctime,
+		aprt.api_name,
+		aprt.requirement_user_name,
+		aprt.api_version
+		FROM
+		ocp_api_model_rel oamr
+		LEFT JOIN ocp_model_base omb ON oamr.model_code = omb.model_code
+		LEFT JOIN ocp_api_base oab ON oamr.api_code = oab.api_code
+		INNER JOIN ocp_api_requirement aprt ON oamr.api_code = aprt.api_code
+		<where>
+			<if test="apiCode!=null and apiCode!=''">
+				and  oamr.api_code = #{apiCode}
+			</if>
+		</where>
+	</select>
+
+	<select id="OcpApiReqAcc" resultType="com.pms.ocp.model.vo.OcpApiRequirementVo">
+		select
+		oart.obj_id,
+		oart.requirement_code,
+		oart.requirement_type,
+		oart.requirement_comments,
+		oart.api_code,
+		oart.api_name,
+		oart.api_group_code,
+		oart.api_url,
+		oart.api_version,
+		oart.requirement_user_name,
+		oart.requirement_ctime,
+		oart.api_unit,
+		oarat.accept_stats
+		from ocp_api_requirement oart
+		LEFT JOIN ocp_api_requirement_accept oarat on oarat.requirement_code = oart.requirement_code
+		LEFT JOIN ocp_api_base oab on oab.api_code = oart.api_code
+		<where>
+			oarat.accept_stats is not null
+			<if test="apiGroupCode !=null and apiGroupCode!=''">
+				and oart.api_group_code = #{apiGroupCode}
+			</if>
+
+			<if test="acceptStats !=null and acceptStats!='' ">
+				and oarat.accept_stats = #{acceptStats}
+
+			</if>
+
+			<if test="apiUnit !=null and apiUnit!=''">
+				and oart.api_unit = #{apiUnit}
+			</if>
+			<if test="requirementUserName !=null and requirementUserName!=''">
+				and oart.requirement_user_name like CONCAT('%', #{requirementUserName}::text,'%')
+			</if>
+
+			<!--			<if test="apiPromotion !=null ">-->
+			<!--				and oab.api_promotion = #{apiPromotion}-->
+			<!--			</if>-->
+
+			<if test="apiName !=null and apiName != '' ">
+				and oart.api_name like CONCAT('%', #{apiName}::text,'%')
+			</if>
+
+			<!--			<if test="apiGroupName !=null and apiGroupName!=''">-->
+			<!--				and oag.api_group_name = #{apiGroupName}-->
+			<!--			</if>-->
+
+			<if test="requirementCode!=null and requirementCode!=''">
+				and oart.requirement_code like CONCAT('%', #{requirementCode}::text,'%')
+			</if>
+
+			<if test="apiCode!=null and apiCode!=''">
+				and  oart.api_code = #{apiCode}
+			</if>
+
+			<if test="requirementType !=null and requirementType!=''">
+				and oart.requirement_type = #{requirementType}
+			</if>
+
+			<if test="startCTime !=null and startCTime!= '' ">
+				<![CDATA[
+                and oart.requirement_ctime >= #{startCTime}
+                ]]>
+			</if>
+			<if test="endCTime !=null  and endCTime!= '' ">
+				<![CDATA[
+            and oart.requirement_ctime <= #{endCTime}
+            ]]>
+			</if>
+
+			<if test="ownerCompanyCode !=null and ownerCompanyCode!=''">
+				and oart.owner_company_code like CONCAT('%', #{ownerCompanyCode}::text,'%')
+			</if>
+		</where>
+		order by oart.requirement_ctime desc
+	</select>
+
+	<select id="selectOcpApiReq" resultType="com.pms.ocp.model.vo.OcpApiRequirementVo">
+		SELECT
+		omb.model_name,
+		oab.obj_id,
+		oamr.api_code,
+		oamr.model_code,
+		aprt.requirement_code,
+		aprt.requirement_type,
+		aprt.requirement_comments,
+		aprt.requirement_ctime,
+		aprt.api_name,
+		aprt.requirement_user_name,
+		aprt.api_version
+		FROM
+		ocp_api_model_rel oamr
+		LEFT JOIN ocp_model_base omb ON oamr.model_code = omb.model_code
+		LEFT JOIN ocp_api_base oab ON oamr.api_code = oab.api_code
+		INNER JOIN ocp_api_requirement aprt ON oamr.api_code = aprt.api_code
+		<where>
+			<if test="apiCode!=null and apiCode!=''">
+				and  oamr.api_code = #{apiCode}
+			</if>
+		</where>
+	</select>
+
+
+	<select id="OcpApiCheck" resultType="com.pms.ocp.model.vo.OcpApiRequirementVo">
+		SELECT
+		oar.requirement_user_name,
+		oar.requirement_ctime,
+		oaral.last_approval_stats,
+		oaral.approval_user_name,
+		oaral.approval_department,
+		oaral.approval_company_code,
+		oaral.approval_ctime,
+		oarat.accept_stats,
+		oarat.accept_user_name,
+		oarat.accept_department,
+		oarat.accept_company_code,
+		oarat.accept_ctime,
+		oarat.accept_stats
+		FROM
+		ocp_api_requirement oar
+		LEFT JOIN ocp_api_requirement_approval oaral ON oar.requirement_code = oaral.requirement_code
+		LEFT JOIN ocp_api_requirement_accept oarat ON oar.requirement_code = oarat.requirement_code
+		<where>
+			<if test="requirementCode!=null and requirementCode!=''">
+				and  oar.requirement_code = #{requirementCode}
+			</if>
+		</where>
+	</select>
+
+	<select id="OarcCheck" resultType="com.pms.ocp.model.vo.OcpApiRequirementVo">
+		SELECT
+		oart.requirement_code,
+		oara.approval_company_code,
+		oara.approval_department,
+		oara.approval_user_name,
+		oara.approval_ctime,
+		oara.approval_comment,
+		oara.approval_stats
+		FROM
+		ocp_api_requirement oart
+		LEFT JOIN ocp_api_requirement_approval oara ON oart.requirement_code = oara.requirement_code
+		<where>
+			<if test="requirementCode!=null and requirementCode!=''">
+				and  oart.requirement_code = #{requirementCode}
+			</if>
+		</where>
+	</select>
+
+	<select id="selectOcpAg" resultType="com.pms.ocp.model.vo.OcpApiRequirementVo" >
+		select DISTINCT
+		oab.api_code,
+		oab.obj_id,
+		oab.api_name,
+		oab.api_group_code,
+		oab.api_promotion,
+		oarat.accept_stats,
+		oar.requirement_type,
+		oar.requirement_code,
+		oar.requirement_comments
+<!--		oaral.last_approval_stats,-->
+<!--		oaral.approval_audit-->
+		from ocp_api_base oab
+		LEFT JOIN ocp_api_requirement_accept oarat on oarat.api_code = oab.api_code
+		LEFT JOIN ocp_api_requirement oar on oar.api_code = oab.api_code
+<!--		LEFT JOIN ocp_api_requirement_approval oaral on oaral.api_code = oab.api_code-->
+		<where>
+			oarat.accept_stats = 1
+			<if test="apiGroupCode !=null and apiGroupCode!=''">
+				and oab.api_group_code = #{apiGroupCode}
+			</if>
+			<if test="acceptStats !='null' and acceptStats !=''  ">
+				and  oarat.accept_stats is not null
+			</if>
+<!--			oarat.accept_stats = #{acceptStats} and-->
+
+			<if test="requirementCode !=null and requirementCode!=''">
+				and oar.requirement_code = #{requirementCode}
+			</if>
+
+			<if test="requirementType !=null and requirementType!=''">
+				and oar.oar.requirement_type = #{requirementType}
+			</if>
+
+			<if test="apiPromotion !=null and apiPromotion!=''">
+				and oab.api_promotion = #{apiPromotion}
+			</if>
+		</where>
+	</select>
+
+
+	<select id="getOcpTree" resultType="com.pms.ocp.model.vo.OcpApiRequirementVo">
+        select
+        oag.api_group_name,
+        oag.api_group_promotion_type,
+		oag.api_group_code,
+		oag.api_group_level
+        from ocp_api_group oag
+        <where>
+			<if test="apiGroupPromotionType !=null and apiGroupPromotionType!=''">
+				and oag.api_group_promotion_type = #{apiGroupPromotionType}
+			</if>
+
+			<if test="apiGroupLevel !=null and apiGroupLevel!=''">
+				and oag.api_group_level = #{apiGroupLevel}
+			</if>
+		</where>
+    </select>
+
+	<select id="OacrTreeCenter" resultType="com.pms.ocp.model.vo.OcpApiRequirementVo">
+		select
+		oag.api_group_name,
+		oag.api_group_promotion_type,
+		oag.api_group_pcode,
+		oag.api_group_code,
+		oag.is_delete,
+		oag.api_group_level,
+		oag.api_group_pname
+		from ocp_api_group oag
+		<where>
+			<if test="apiGroupLevel !=null and apiGroupLevel!=''">
+				and oag.api_group_level = #{apiGroupLevel}
+			</if>
+
+			<if test="apiGroupPromotionType !=null and apiGroupPromotionType!=''">
+				and oag.api_group_promotion_type = #{apiGroupPromotionType}
+			</if>
+
+			<if test="apiGroupPCode !=null and apiGroupPCode!=''">
+				and oag.api_group_pcode = #{apiGroupPCode}
+			</if>
+
+			<if test="apiGroupCode !=null and apiGroupCode!=''">
+				and oag.api_group_code = #{apiGroupCode}
+			</if>
+		</where>
+	</select>
+
+	<select id="getOcpTenantApiList" resultType="com.pms.ocp.model.vo.OcpApiRequirementVo">
+		SELECT
+		oatr.tenant_code,
+		oatr.obj_id,
+		oatr.api_code,
+		oab.api_name,
+		otb.tenant_name,
+		otb.tenant_code,
+		otb.tenant_zone,
+		otb.tenant_layer,
+		otb.tenant_version,
+		otac.api_call_count,
+		otac.api_avg_cost
+		FROM
+		ocp_api_tenant_rel oatr
+		LEFT join ocp_api_base oab ON oatr.api_code = oab.api_code
+		LEFT join ocp_tenant_base otb ON oatr.tenant_code = otb.tenant_code
+		LEFT join ocp_tenant_api_call otac on oatr.api_code = otac.api_code
+		<where>
+			<if test="apiCode!=null and apiCode!=''">
+				and  oatr.api_code = #{apiCode}
+			</if>
+		</where>
+	</select>
+
+</mapper>
\ No newline at end of file

src/main/resources/mapper/OcpApiRequirementApprovalMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.pms.ocp.mapper.OcpApiRequirementApprovalMapper">
+
+<!--    根基code获取对象id-->
+    <select id="selectByCodes" resultType="com.pms.ocp.model.entity.OcpApiRequirementApproval">
+    select * from ocp_api_requirement_approval where api_code = #{apiCode}
+    </select>
+
+<!--   根据apiCode和lastApprovalStats获取对象-->
+    <select id=" selectByLast" resultType="com.pms.ocp.model.entity.OcpApiRequirementApproval">
+    select * from ocp_api_requirement_approval where api_code = #{apiCode} and   last_approval_stats = #{lastApprovalStats}
+    </select>
+
+
+
+    <select id="selectByReqCodes" resultType="com.pms.ocp.model.entity.OcpApiRequirementApproval">
+
+    select approval_stats,last_approval_stats from ocp_api_requirement_approval a,(select requirement_code,max(approval_ctime) approval_ctime from ocp_api_requirement_approval GROUP BY requirement_code)c
+    where  a.approval_ctime = c.approval_ctime and  c.requirement_code=a.requirement_code and a.requirement_code = #{requirementCode}
+    </select>
+
+</mapper>
\ No newline at end of file

src/main/resources/mapper/OcpApiRequirementMapper.xml

+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.pms.ocp.mapper.OcpApiRequirementMapper">
+
+    <select id="selectbyCode" resultType="com.pms.ocp.model.entity.OcpApiRequirement">
+        SELECT * from ocp_api_requirement where requirement_code = #{requirementCode}
+    </select>
+<!--    //根据apiCode获取OcpApiRequirement对象-->
+    <select id="selectByCodes" resultType="com.pms.ocp.model.entity.OcpApiRequirement">
+        SELECT * from ocp_api_requirement where api_code = #{apiCode}
+    </select>
+
+</mapper>
\ No newline at end of file

src/main/resources/mapper/OcpApiTenantRelMapper.xml

@@ -18,4 +18,25 @@
           ocp_tenant_base ot on ot.tenant_code =
            oa.tenant_code where oa.tenant_code = #{tenantCode}
     </select>
+    <select id="echoTenant" resultType="com.pms.ocp.model.dto.TenantApiDto">
+        select oag.api_group_name,
+               oag.api_group_pname,
+
+
+    </select>
 </mapper>
+<!--        @ApiModelProperty("分类名称")-->
+<!--        private String apiGroupName;-->
+<!--        @ApiModelProperty("上级分类名称")-->
+<!--        private String apiGroupPname;-->
+
+<!--        @ApiModelProperty("服务应用描述")-->
+<!--        private String apiTenantDescription;-->
+
+<!--        @ApiModelProperty("应用编码")-->
+<!--        private String tenantCode;-->
+<!--        @ApiModelProperty("应用名称")-->
+<!--        private String tenantName;-->
+
+<!--        public String getApiGroupName() {-->
+<!--        return apiGroupName;-->
\ No newline at end of file

src/main/resources/mapper/OcpBaseMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.pms.ocp.mapper.OcpBaseMapper">
+<!--根据modeCode查询模型-->
+    <select id="selectModelBase" resultType="com.pms.ocp.model.entity.Model">
+    select  * from ocp_model_base where model_code = #{modelCode}
+    </select>
+
+    <!--根据apiCode查询服务-->
+    <select id="selectCode" resultType="com.pms.ocp.model.entity.OcpApiBase">
+    select  * from ocp_api_base where api_code = #{apiCode}
+    </select>
+
+</mapper>
\ No newline at end of file

src/main/resources/mapper/OcpGroup.xml

@@ -91,5 +91,16 @@
 
 
     </select>
+    <select id="correlationTenantTree" resultType="com.pms.ocp.model.dto.GroupDto">
+        select
+        tenant_group_code,tenant_group_name from ocp_tenant_group
+        where is_delete = 0
+        <if test="tenantGroupCode == null ">
+            and tenant_group_pcode = '' or tenant_group_pcode is null
+        </if>
+        <if test="tenantGroupCompanyCode !=null and tenantGroupCompanyCode !=''">
+            and tenant_group_company_code=#{tenantGroupCompanyCode}
+        </if>
+    </select>
 
 </mapper>

src/main/resources/mapper/OcpTenantBaseMapper.xml

@@ -36,8 +36,22 @@
         from ocp_tenant_base
         where tenant_group_code = #{tenantGroupCode}
     </select>
+    <select id="correlationTenantTree" resultType="com.pms.ocp.model.dto.GroupDto">
+        select obj_id,tenant_name,tenant_code ,tenant_group_code,tenant_zone from ocp_tenant_base
+        where is_delete=0
+        <if test="tenantGroupCode !=null and tenantGroupCode!=''">
+            and tenant_group_code=#{tenantGroupCode}
+        </if>
+        <if test="tenantGroupCompanyCode !=null and tenantGroupCompanyCode !=''">
+            and owner_company_code=#{tenantGroupCompanyCode}
+        </if>
+
+    </select>
 
 
+    <select id="selectTenants" resultType="com.pms.ocp.model.entity.OcpTenantBase">
+    select  * from ocp_tenant_base where tenant_code = #{tenantCode}
+    </select>
 
 
 </mapper>
\ No newline at end of file

src/main/resources/mapper/OcpTenantGroup.xml

@@ -8,7 +8,7 @@
     </select>
 <!--   二级目录树-->
     <select id="twoTenantGroups" resultType="com.pms.ocp.model.entity.OcpTenantGroup">
-      SELECT * FROM ocp_tenant_group WHERE  tenant_group_company_code = #{tenantGroupCompanyCode};
+      SELECT * FROM ocp_tenant_group WHERE   tenant_group_pcode = '' or tenant_group_pcode is null;
     </select>
 
 <!--三级目录-->

src/main/resources/mapper/OcptenantRelMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.pms.ocp.mapper.OcptenantRelMapper">
+    <!--根据modeCode查询模型-->
+    <select id="selectTenant" resultType="com.pms.ocp.model.entity.OcpApiTenantRel">
+    select  * from ocp_api_tenant_rel where api_code = #{apiCode}
+    </select>
+</mapper>
\ No newline at end of file