Merge remote-tracking branch 'origin/master'

src/main/java/com/pms/ocp/common/aspectj/WebLog.java

+package com.pms.ocp.common.aspectj;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author Administrator
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.METHOD})
+@Documented
+public @interface WebLog {
+    String description() default "";
+}

src/main/java/com/pms/ocp/common/aspectj/WebLogAspect.java

+package com.pms.ocp.common.aspectj;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.pms.ocp.common.utils.StringBusinessUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.*;
+import org.springframework.context.annotation.Profile;
+import org.springframework.stereotype.Component;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+
+@Aspect
+@Component
+@Slf4j
+/**
+ * 根据配置可在不同环境中生效
+ * @Profile({"dev", "test"})
+ */
+//@Profile({"dev", "test"})
+public class WebLogAspect {
+
+    private static final String LINE_SEPARATOR = System.lineSeparator();
+
+    @Pointcut("@annotation(com.pms.ocp.common.aspectj.WebLog)")
+    public void webLog() {
+    }
+
+    /**
+     * 环绕
+     *
+     * @param proceedingJoinPoint
+     * @return
+     * @throws Throwable
+     */
+    @Around("webLog()")
+    public Object doAround(ProceedingJoinPoint proceedingJoinPoint) throws Throwable {
+        long startTime = System.currentTimeMillis();
+        Object result = proceedingJoinPoint.proceed();
+        // 打印出参
+        log.info("Response Args  : {}", JSONObject.toJSONString(result));
+        // 打印耗时
+        log.info("Time-Consuming : {} ms", System.currentTimeMillis() - startTime);
+        return result;
+    }
+
+    /**
+     * 在切点前切入
+     *
+     * @param joinPoint
+     * @throws Throwable
+     */
+    @Before("webLog()")
+    public void doBefore(JoinPoint joinPoint) throws Throwable {
+        ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        HttpServletRequest request = attributes.getRequest();
+        // 获取 @WebLog 注解的描述信息
+        String methodDescription = getAspectLogDescription(joinPoint);
+        // 处理入参
+        Object[] args = joinPoint.getArgs();
+        Map<String, Object> map = new HashMap<>();
+        for (Object arg : args) {
+            if (StringBusinessUtil.isNullOrEmpty(arg)) {
+                continue;
+            }
+            if (arg instanceof BindingResult) {
+                continue;
+            }
+            if (arg instanceof HttpSession) {
+                continue;
+            }
+            if (arg instanceof HttpServletRequest) {
+                continue;
+            }
+            if (arg instanceof HttpServletResponse) {
+                continue;
+            }
+            if (arg instanceof MultipartFile) {
+                MultipartFile file = (MultipartFile) arg;
+                map.put("file", getFileParam(file));
+            } else if (arg instanceof MultipartFile[]) {
+                MultipartFile[] files = (MultipartFile[]) arg;
+                Map<String, Object> t = new HashMap<>();
+                for (MultipartFile file : files) {
+                    t.put("file", getFileParam(file));
+                }
+                map.put("files", t);
+            } else {
+                try {
+                    map.put(arg.getClass().getSimpleName(), arg);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        // 打印请求相关参数
+        log.info("============================================ 接口开始执行 ==================================================");
+        try {
+            // 打印请求 url
+            log.info("URL           : {}", request.getRequestURL().toString());
+            // 打印描述信息
+            log.info("Description   : {}", methodDescription);
+            // 打印 Http method
+            log.info("HTTP Method   : {}", request.getMethod());
+            // 打印调用 controller 的全路径以及执行方法
+            log.info("Class Method  : {}.{}", joinPoint.getSignature().getDeclaringTypeName(), joinPoint.getSignature().getName());
+            // 打印请求的IP
+            log.info("IP            : {}", request.getRemoteAddr());
+            //log.info("Request Args  : {}", new Gson().toJson(joinPoint.getArgs()));
+            // 打印请求的入参
+            log.info("Request Args  : {}", JSON.toJSONString(map));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 处理文件，获取文件基本信息
+     *
+     * @param file
+     * @return
+     */
+    private Map<String, Object> getFileParam(MultipartFile file) {
+        Map<String, Object> map = null;
+        try {
+            map = new HashMap<>();
+            map.put("文件名:", file.getOriginalFilename());
+            map.put("文件类型:", file.getContentType());
+            map.put("文件大小:", file.getSize());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return map;
+    }
+
+    /**
+     * 在切点后切入
+     *
+     * @throws Throwable
+     */
+    @After("webLog()")
+    public void doAfter() throws Throwable {
+        log.info("============================================ 接口执行结束 ===================================================" + LINE_SEPARATOR);
+    }
+
+    /**
+     * 获取切面注解的描述
+     */
+    private String getAspectLogDescription(JoinPoint joinPoint) throws ClassNotFoundException {
+        String targetName = joinPoint.getTarget().getClass().getName();
+        String methodName = joinPoint.getSignature().getName();
+        Object[] arguments = joinPoint.getArgs();
+        Class targetClass = Class.forName(targetName);
+        Method[] methods = targetClass.getMethods();
+        StringBuilder description = new StringBuilder("");
+        for (Method method : methods) {
+            if (method.getName().equals(methodName)) {
+                Class[] calzzs = method.getParameterTypes();
+                if (calzzs.length == arguments.length) {
+                    description.append(method.getAnnotation(WebLog.class).description());
+                    break;
+                }
+            }
+        }
+        return description.toString();
+    }
+}

src/main/java/com/pms/ocp/common/config/CreateGroups.java

+package com.pms.ocp.common.config;
+
+import javax.validation.groups.Default;
+
+/**
+ * 新增校验
+ *
+ * @author Administrator
+ */
+public interface CreateGroups extends Default {
+}

src/main/java/com/pms/ocp/common/config/UpdateGroups.java

+package com.pms.ocp.common.config;
+
+import javax.validation.groups.Default;
+
+/**
+ * 更新校验
+ *
+ * @author Administrator
+ */
+public interface UpdateGroups extends Default {
+}

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

+package com.pms.ocp.common.utils;
+
+public class GUIDGenerator {
+    private static final UUIDHexLengthGenerator GENERATOR = new UUIDHexLengthGenerator();
+
+    public GUIDGenerator() {
+    }
+
+    private static String generate(int length, boolean toLowerCase) {
+        setLength(length);
+        return toLowerCase ? GENERATOR.generate().toString().toLowerCase() : GENERATOR.generate().toString().toUpperCase();
+    }
+
+    private static void setLength(int length) {
+        GENERATOR.setLength(length);
+    }
+
+    public static String generate32(boolean toLowerCase) {
+        return generate(32, toLowerCase);
+    }
+
+    public static String generate42(boolean toLowerCase) {
+        return generate(42, toLowerCase);
+    }
+}

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

+package com.pms.ocp.common.utils;
+
+import com.pms.ocp.model.vo.ResponseVO;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.ObjectError;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 工具类
+ *
+ * @author Administrator
+ */
+public class StringBusinessUtil {
+    /**
+     * 判断对象或数组中每一个对象是否为空
+     * 判断对象是否为null
+     * 判断字符串长度是否为0,集合类是否为empty
+     *
+     * @param obj
+     * @return
+     */
+    public static boolean isNullOrEmpty(Object obj) {
+
+        if (obj == null) {
+            return true;
+        }
+
+        if (obj instanceof CharSequence) {
+            return ((CharSequence) obj).length() == 0 || "null".equalsIgnoreCase(obj.toString());
+        }
+
+        if (obj instanceof Collection) {
+            return ((Collection<?>) obj).isEmpty();
+        }
+
+        if (obj instanceof Map) {
+            return ((Map<?, ?>) obj).isEmpty();
+        }
+
+        if (obj instanceof Object[]) {
+
+            Object[] object = (Object[]) obj;
+            if (object.length == 0) {
+                return true;
+            }
+
+            boolean empty = true;
+            for (int i = 0; i < object.length; i++) {
+                if (!isNullOrEmpty(object[i])) {
+                    empty = false;
+                    break;
+                }
+            }
+            return empty;
+        }
+        return false;
+    }
+
+    /**
+     * 入参校验
+     *
+     * @param bindingResult
+     * @return
+     */
+    public static ResponseVO verifyDispose(BindingResult bindingResult) {
+        StringBuilder stringBuilder = new StringBuilder();
+        List<ObjectError> allErrors = bindingResult.getAllErrors();
+        for (ObjectError e : allErrors) {
+            String defaultMessage = e.getDefaultMessage();
+            if (!StringBusinessUtil.isNullOrEmpty(e.getDefaultMessage())) {
+                stringBuilder.append(defaultMessage);
+                stringBuilder.append(",");
+            }
+        }
+        return ResponseVO.error(stringBuilder.toString().substring(0, stringBuilder.toString().length() - 1));
+    }
+}

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

+package com.pms.ocp.common.utils;
+
+import java.io.Serializable;
+import java.net.InetAddress;
+
+public abstract class UUIDGenerator {
+    private static final int IP;
+    private String separator = "";
+    private static short counter = 0;
+    private static final int JVM = (int) (System.currentTimeMillis() >>> 8);
+
+    public UUIDGenerator() {
+    }
+
+    public String getSeparator() {
+        return this.separator;
+    }
+
+    public void setSeparator(String separator) {
+        this.separator = separator;
+    }
+
+    protected int getJVM() {
+        return JVM;
+    }
+
+    protected short getCount() {
+        Class var1 = UUIDGenerator.class;
+        synchronized (UUIDGenerator.class) {
+            if (counter < 0) {
+                counter = 0;
+            }
+
+            short var10000 = counter;
+            counter = (short) (var10000 + 1);
+            return var10000;
+        }
+    }
+
+    protected int getIP() {
+        return IP;
+    }
+
+    protected short getHiTime() {
+        return (short) ((int) (System.currentTimeMillis() >>> 32));
+    }
+
+    protected int getLoTime() {
+        return (int) System.currentTimeMillis();
+    }
+
+    private static int toInt(byte[] bytes) {
+        int result = 0;
+
+        for (int i = 0; i < 4; ++i) {
+            result = (result << 8) - -128 + bytes[i];
+        }
+
+        return result;
+    }
+
+    public abstract Serializable generate();
+
+    static {
+        int ipadd;
+        try {
+            ipadd = toInt(InetAddress.getLocalHost().getAddress());
+        } catch (Exception var2) {
+            ipadd = 0;
+        }
+
+        IP = ipadd;
+    }
+}

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

+package com.pms.ocp.common.utils;
+
+import java.io.Serializable;
+
+public class UUIDHexLengthGenerator extends UUIDGenerator {
+    private int length = 32;
+    private static int mycount = 0;
+
+    public UUIDHexLengthGenerator() {
+    }
+
+    public int getLength() {
+        return this.length;
+    }
+
+    public void setLength(int length) {
+        this.length = length;
+    }
+
+    protected String format(int intval) {
+        String formatted = Integer.toHexString(intval);
+        StringBuffer buf = new StringBuffer("00000000");
+        buf.replace(8 - formatted.length(), 8, formatted);
+        return buf.toString();
+    }
+
+    protected String format(short shortval) {
+        String formatted = Integer.toHexString(shortval);
+        StringBuffer buf = new StringBuffer("0000");
+        buf.replace(4 - formatted.length(), 4, formatted);
+        return buf.toString();
+    }
+
+    protected String random(int offset) {
+        long curr = System.currentTimeMillis();
+        String formatted = Long.toHexString((long) mycount + curr);
+        StringBuffer buf = new StringBuffer();
+
+        for (int i = offset; i < 0; ++i) {
+            buf.append("0");
+        }
+
+        if (-offset < 8) {
+            buf.replace(0, -offset, formatted.substring(formatted.length() + offset));
+        } else if (-offset > 16) {
+            buf.replace(0, 8, formatted.substring(formatted.length() - 8));
+            formatted = Long.toHexString(curr + (long) mycount + (long) this.getCount());
+            buf.replace(8, 16, formatted.substring(formatted.length() - 8));
+        } else {
+            buf.replace(0, 8, formatted.substring(formatted.length() - 8));
+            formatted = Long.toHexString(curr + (long) mycount + (long) this.getCount() + curr / 10000L);
+            buf.replace(8, -offset, formatted.substring(formatted.length() + offset + 8));
+        }
+
+        return buf.toString();
+    }
+
+    public Serializable generate() {
+        ++mycount;
+        StringBuffer sb = new StringBuffer(36);
+        sb.append(this.format(this.getIP())).append(this.getSeparator()).append(this.format(this.getJVM())).append(this.getSeparator()).append(this.format(this.getHiTime())).append(this.getSeparator()).append(this.format(this.getLoTime())).append(this.getSeparator()).append(this.format(this.getCount())).toString();
+        return this.processLength(sb);
+    }
+
+    private String processLength(StringBuffer sb) {
+        if (this.getLength() != 32) {
+            int offset = 32 - this.getLength();
+            if (offset > 0) {
+                sb.delete(0, offset);
+            } else {
+                sb.insert(0, this.getSeparator());
+                sb.insert(0, this.random(offset));
+            }
+        }
+
+        return sb.toString();
+    }
+}

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

@@ -43,20 +43,7 @@ public class ApiBasicManagementController {
     @Autowired
     private ApiBasicManagementService apiBasicManagementService;
 
-    @ApiOperation("条件查询")
-    @GetMapping("/queryOcpApiBaseDto")
-    public ResponseVO<List<OcpApiBaseVo>> queryOcpApiBaseDto(@RequestParam(required = false) String apiCode,
-                                                             @RequestParam(required = false) String keyword,
-                                                             @RequestParam(required = false) String apiUnits,
-                                                             @RequestParam(required = false) Timestamp startTime,
-                                                             @RequestParam(required = false) Timestamp endTime,
-                                                             @RequestParam(required = false) Integer pageSize,
-                                                             @RequestParam(required = false) Integer pageNum
-    ) {
-        List<OcpApiBaseVo> list = apiBasicManagementService.queryOcpApiBaseDto(apiCode, keyword, apiUnits, startTime, endTime, pageSize
-                , pageNum);
-        return ResponseVO.ok(list);
-    }
+
 
     @ApiOperation("导入功能")
     @PostMapping("/import")
@@ -210,8 +197,8 @@ public class ApiBasicManagementController {
 
     @ApiOperation("服务分类层级")
     @GetMapping("/apiBaseTreeOther")
-    public ResponseVO<List<OcpGroupBaseDto>> apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupCode, Integer apiGroupPromotionType,String apiCode,String apiPromotion) {
-        List<OcpGroupBaseDto> apiTreeGroupDtos = apiBasicManagementService.apiBaseTreeOther(apiGroupCompanyCode, apiGroupCode, apiGroupPromotionType,apiCode,apiPromotion);
+    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);
     }
 
@@ -222,4 +209,16 @@ public class ApiBasicManagementController {
         return ResponseVO.ok(apiBaseList);
     }
 
+    @ApiOperation("个人信息编辑中的模糊查询")
+    @GetMapping("/selectByCondition")
+    public ResponseVO <PageInfo<OcpApiBase>>selectByCondition(@RequestParam(required = false) String apiCode,
+                                                          @RequestParam(required = false) String apiName,
+                                                          @RequestParam(required = false) String apiCenterCode,
+                                                          @RequestParam(required = false) Integer pageNum,
+                                                          @RequestParam(required = false) Integer pageSize){
+        return apiBasicManagementService.selectByCondition(apiCode,apiName,apiCenterCode,pageNum,pageSize);
+
+    }
+
+
 }

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

+package com.pms.ocp.controller;
+
+
+
+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.ApiProvinceService;
+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.*;
+
+@Slf4j
+@RequestMapping("/apiProvince")
+@RestController
+@Api(tags = "服务省侧接口")
+public class ApiProvinceController {
+    @Autowired
+    private ApiProvinceService apiProvinceService;
+
+    @ApiOperation("服务省侧-添加")
+    @PostMapping("/create")
+    public ResponseVO createApiBase(@RequestBody ApiProvinceVo apiProvinceVo) {
+        boolean isSuccess =  apiProvinceService.updateOrCreate(apiProvinceVo);
+        if(isSuccess){
+            return ResponseVO.ok();
+        }else {
+            return ResponseVO.error("添加失败");
+        }
+    }
+
+}

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/AppRegisterController.java

+package com.pms.ocp.controller;
+
+import com.pms.ocp.common.config.CreateGroups;
+import com.pms.ocp.common.utils.StringBusinessUtil;
+import com.pms.ocp.model.dto.AppRegisterDTO;
+import com.pms.ocp.model.dto.ImgDTO;
+import com.pms.ocp.model.dto.QueryAppDTO;
+import com.pms.ocp.model.vo.ResponseVO;
+import com.pms.ocp.service.AppRegisterService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 应用注册接口
+ *
+ * @author Administrator
+ */
+@RestController
+@RequestMapping("appRegister")
+@Api(tags = "应用注册接口")
+public class AppRegisterController {
+
+    @Autowired
+    private AppRegisterService appRegisterService;
+
+    @ApiOperation("新增应用注册")
+    @PostMapping("addApp")
+    public ResponseVO addApp(@RequestBody @Validated(CreateGroups.class) AppRegisterDTO appRegisterDTO,
+                             BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return StringBusinessUtil.verifyDispose(bindingResult);
+        }
+        ResponseVO responseVO = appRegisterService.addApp(appRegisterDTO);
+        return responseVO;
+    }
+
+    @ApiOperation("查询应用目录")
+    @PostMapping("getAppInfo")
+    public ResponseVO getAppInfo(@RequestBody @Validated QueryAppDTO queryAppDTO, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return StringBusinessUtil.verifyDispose(bindingResult);
+        }
+        ResponseVO responseVO = appRegisterService.getAppInfo(queryAppDTO);
+        return responseVO;
+    }
+
+    @ApiOperation("应用预览图")
+    @PostMapping("addAppImgUrl")
+    public ResponseVO addAppImgUrl(@RequestBody @Validated(CreateGroups.class) List<ImgDTO> imgDTO,
+                                   BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return StringBusinessUtil.verifyDispose(bindingResult);
+        }
+        ResponseVO responseVO = appRegisterService.addAppImgUrl(imgDTO);
+        return responseVO;
+    }
+
+}

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

@@ -94,7 +94,7 @@ public class ModelBaseController {
      */
     @ApiOperation("模型-查询列表")
     @GetMapping("/get/model/getModeBaselList")
-    public ResponseVO getModeBaselList(@ApiParam(value = "所属级别") @RequestParam(value = "belongLevel", required = false) 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,

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

@@ -12,6 +12,7 @@ import com.pms.ocp.service.OcpApiTreeService;
 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.*;
 
@@ -48,7 +49,11 @@ public class OcpApiTreeController {
     @ApiOperation("服务树分类--新增")
     public ResponseVO inseter(@RequestBody OcpApiGroup ocpApiGroup){
         OcpApiGroup ocpApiGroup1 = service.insertTree(ocpApiGroup);
+        if (StringUtils.isBlank(ocpApiGroup1.getApiGroupName())){
+            return ResponseVO.error("服务名称已经存在");
+        }else {
             return ResponseVO.ok(ocpApiGroup1);
+        }
 
     }
 

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

+package com.pms.ocp.controller;
+
+
+import com.pms.ocp.model.dto.OcpTenantGroupIocnDto;
+import com.pms.ocp.model.entity.OcpTenantBase;
+import com.pms.ocp.model.vo.ResponseVO;
+import com.pms.ocp.service.OcpTenantBaseService;
+import com.pms.ocp.service.OcpTenantIocnService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@Slf4j
+@RequestMapping("/tenant-group/v1")
+@RestController
+@Api(tags = "我的应用-服务列表")
+public class OcpTenantGroupIocnController {
+
+
+    @Autowired
+    private OcpTenantIocnService ocpTenantIocnService;
+
+    @Autowired
+    private OcpTenantBaseService ocpTenantBaseService;
+
+
+
+    /**
+     * 我的应用--服务列表
+     * @return
+     */
+    @GetMapping("/applyuser")
+    @ApiModelProperty("我的应用--服务列表")
+    private ResponseVO<List<OcpTenantGroupIocnDto>> getApplyUser() {
+        List<OcpTenantGroupIocnDto> ocpgroup = ocpTenantIocnService.getApplyUserList();
+        return ResponseVO.ok(ocpgroup);
+    }
+
+    /**
+     * 我的应用--应用删除
+     * @return
+     */
+    @GetMapping("/delectapplyuser")
+    @ApiModelProperty("我的应用--应用删除")
+    private ResponseVO delectApplyUser(String objId) {
+        boolean falg = ocpTenantBaseService.delectApply(objId);
+        return ResponseVO.ok(falg);
+    }
+
+
+}

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

@@ -3,6 +3,8 @@ package com.pms.ocp.controller;
 import com.github.pagehelper.PageInfo;
 import com.pms.ocp.model.dto.*;
 
+import com.pms.ocp.model.entity.OcpApiBase;
+import com.pms.ocp.model.entity.OcpApiTenantRel;
 import com.pms.ocp.model.entity.OcpTenantBase;
 import com.pms.ocp.model.entity.OcpTenantGroup;
 import com.pms.ocp.model.vo.ResponseVO;
@@ -121,10 +123,16 @@ public class TenantBasicManagementController {
         return tenantBasicManagementService.getBaseByGroupCode(tenantDto);
     }
 
-    @ApiOperation("注册查询信息")
-    @GetMapping("/select/register")
-    public ResponseVO<OcpTenantGroup> selectRegister(@RequestParam(required = false) String tenantGroupCode, @RequestParam(required = false) String tenantGroupCompanyCode) {
-        OcpTenantGroup ocpTenantGroup = tenantBasicManagementService.selectRegister(tenantGroupCode, tenantGroupCompanyCode);
-        return ResponseVO.ok(ocpTenantGroup);
+
+
+    @ApiOperation("个人信息中-编辑")
+    @PostMapping("/update")
+   public ResponseVO update(@RequestBody OcpBaseTiocnDto ocpBaseTiocnDto){
+      return  tenantBasicManagementService.updateByCondition(ocpBaseTiocnDto);
+    }
+    @ApiOperation("个人信息中-查询和应用关联的服务")
+    @PostMapping("/selectOcpByApi")
+    public ResponseVO<List<OcpApiBase>> selectOcpByApi(@RequestParam(required = false) String tenantCode){
+        return  tenantBasicManagementService.selectOcpByApi(tenantCode);
     }
 }

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

@@ -16,5 +16,7 @@ import java.util.List;
 public interface ApiBasicManagementMapper extends BaseMapper<OcpApiBase> {
     List<OcpApiBaseVo> selectApiExport(List<String> list);
 
-    List<OcpApiBaseVo> queryOcpApiBaseDto(@Param("keyword") String keyword,@Param("apiUnit") String apiUnit, @Param("startTime") Timestamp startTime, @Param("endTime") Timestamp endTime, @Param("apiCode") String apiCode, @Param("pageSize") int pageSize, @Param("pageNum") int pageNum);
+
+
+    List<OcpApiBase> selectByCondition(@Param("apiCode") String apiCode, @Param("apiName") String apiName, @Param("apiCenterCode") String apiCenterCode);
 }

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

+package com.pms.ocp.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.pms.ocp.model.entity.OcpApiParam;
+import com.pms.ocp.model.vo.ApiProvinceVo;
+
+public interface ApiParamMapper extends BaseMapper<OcpApiParam> {
+
+}

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

+package com.pms.ocp.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.pms.ocp.model.vo.ApiProvinceVo;
+import com.pms.ocp.model.vo.OcpApiBaseVo;
+
+public interface ApiProvinceMapper  extends BaseMapper<ApiProvinceVo> {
+
+}

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

+package com.pms.ocp.mapper;
+
+
+import com.pms.ocp.model.dto.QueryAppDTO;
+import com.pms.ocp.model.entity.OcpTenantIocn;
+import com.pms.ocp.model.vo.QueryAppInfoVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 应用注册数据查询接口
+ *
+ * @author Administrator
+ */
+@Mapper
+public interface AppRegisterMapper {
+
+    /**
+     * 分页查询应用目录
+     *
+     * @param queryAppDTO
+     * @return
+     */
+    List<QueryAppInfoVO> getAppInfo(@Param("dto") QueryAppDTO queryAppDTO);
+
+    /**
+     * 批量插入应用预览图
+     *
+     * @param list
+     * @return
+     */
+    int batchInsert(@Param("list") List<OcpTenantIocn> list);
+}

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

@@ -22,9 +22,9 @@ public interface OcpApiGroupMapper extends BaseMapper<OcpApiGroup> {
 
     List<OcpApiBaseVo> selectPageLists(ApiBaseDto apiBaseReq);
 
-    List<OcpGroupBaseDto> apiTree(String apiGroupCompanyCode, String apiGroupPcode, Integer apiGroupPromotionType,String apiPromotion);
+    List<OcpGroupBaseDto> apiTree(String apiGroupCompanyCode, String apiGroupPcode, Integer apiGroupPromotionType);
 
-    List<OcpGroupBaseDto> selectBase(String apiGroupCompanyCode, String apiGroupPcode,String apiPromotion);
+    List<OcpGroupBaseDto> selectBase(String apiGroupCompanyCode, String apiGroupPcode,Integer apiGroupPromotionType);
 
 //    List<WholeLinkTreeVo> queryApiTreeData1();
 }

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

@@ -24,7 +24,7 @@ public interface OcpApiTreeMapper extends BaseMapper<OcpApiGroup> {
     /**
      * 二级树
      * @param apiGroupPromotionType
-     * @return
+     *  /.  * @return
      */
     List<OcpApiGroup>  selectTwoApiGroups(Long apiGroupPromotionType);
 
@@ -40,6 +40,10 @@ public interface OcpApiTreeMapper extends BaseMapper<OcpApiGroup> {
   //根据code查询整条数据
   OcpApiGroup selectCode(String code);
 
-  //根据code查询是否=含有下级服务
-    List<OcpApiGroup> selectGroupPcode();
+  //根据code查询是否含有下级服务
+    List<OcpApiGroup> selectGroupPcode(String apiGroupCode);
+
+
+//groupName重复问题
+ List<OcpApiGroup> selectGroupName(String apiGroupName);
 }

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

@@ -7,4 +7,8 @@ import java.util.List;
 
 public interface OcpTenantBaseMapper extends BaseMapper<OcpTenantBase> {
 
+
+
+    OcpTenantBase updataIsDelect(String objId,Short isDelete);
+
 }

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

@@ -19,7 +19,7 @@ public interface OcpTenantGroupMapper extends BaseMapper<OcpTenantGroup> {
 
     List<OcpTenantBaseDto> selectPageLists(TenantDto tenantDto);
 
-   OcpTenantGroup selectRegister(@Param("tenantGroupCode") String tenantGroupCode, @Param("tenantGroupCompanyCode") String tenantGroupCompanyCode);
+
 
     List<GroupDto> selectBase(@Param("tenantGroupCode") String tenantGroupCode, String tenantGroupCompanyCode);
 }

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

+package com.pms.ocp.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.pms.ocp.model.entity.OcpTenantIocn;
+
+/**
+ * @author Administrator
+ */
+public interface OcpTenantIocnMapper extends BaseMapper<OcpTenantIocn> {
+}

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

@@ -3,8 +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.entity.OcpApiBase;
 import com.pms.ocp.model.entity.OcpTenantBase;
 import com.pms.ocp.model.vo.CompanyVo;
+import com.pms.ocp.model.vo.ResponseVO;
 import com.pms.ocp.model.vo.TenantGroupVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

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

+package com.pms.ocp.model.dto;
+
+import com.pms.ocp.common.config.CreateGroups;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Date;
+
+/**
+ * 应用注册入参实体
+ *
+ * @author Administrator
+ */
+@ApiModel(value = "应用注册入参实体")
+@Data
+public class AppRegisterDTO {
+
+    @ApiModelProperty("用户id")
+    @NotBlank(message = "用户id不能为空", groups = CreateGroups.class)
+    private String userId;
+
+    @ApiModelProperty("用户名称")
+    @NotBlank(message = "用户名称不能为空", groups = CreateGroups.class)
+    private String userName;
+
+
+    @ApiModelProperty("应用图标")
+    @NotBlank(message = "应用图标不能为空", groups = CreateGroups.class)
+    private String imgUrl;
+
+    @ApiModelProperty("应用名称")
+    @NotBlank(message = "应用名称不能为空", groups = CreateGroups.class)
+    private String appName;
+
+    @ApiModelProperty("应用编码")
+    @NotBlank(message = "应用编码不能为空", groups = CreateGroups.class)
+    private String appCode;
+
+    @ApiModelProperty("所属专业——ts:输电,t:变电,dc:直流,ds配电,tc:技术,pl计划,im综合")
+    @NotBlank(message = "所属专业不能为空", groups = CreateGroups.class)
+    private String kind;
+
+
+//    @ApiModelProperty("所属中心")
+//    @NotBlank(message = "所属中心不能为空", groups = CreateGroups.class)
+//    private String center;
+
+    @ApiModelProperty("所属类别——基础管理,分析决策,作业管理,设备管理")
+    @NotBlank(message = "所属类别不能为空", groups = CreateGroups.class)
+    private String type;
+
+    @ApiModelProperty("应用描述")
+    @NotBlank(message = "应用描述不能为空", groups = CreateGroups.class)
+    private String desc;
+
+    @ApiModelProperty("开发厂商")
+    @NotBlank(message = "开发厂商不能为空", groups = CreateGroups.class)
+    private String manufacturer;
+
+    @ApiModelProperty("当前版本")
+    @NotBlank(message = "当前版本不能为空", groups = CreateGroups.class)
+    private String version;
+
+    @ApiModelProperty("所属集群")
+    @NotBlank(message = "所属集群不能为空", groups = CreateGroups.class)
+    private String group;
+
+    @ApiModelProperty("部署名称")
+    @NotBlank(message = "部署名称不能为空", groups = CreateGroups.class)
+    private String deploymentName;
+
+    @ApiModelProperty("注册时间")
+    private Date time;
+
+    @ApiModelProperty("url")
+    private String url;
+
+    public String getAppName() {
+        return appName;
+    }
+
+    public void setAppName(String appName) {
+        this.appName = appName;
+    }
+
+    public String getAppCode() {
+        return appCode;
+    }
+
+    public void setAppCode(String appCode) {
+        this.appCode = appCode;
+    }
+
+    public String getKind() {
+        return kind;
+    }
+
+    public void setKind(String kind) {
+        this.kind = kind;
+    }
+
+//    public String getCenter() {
+//        return center;
+//    }
+//
+//    public void setCenter(String center) {
+//        this.center = center;
+//    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+
+    public String getManufacturer() {
+        return manufacturer;
+    }
+
+    public void setManufacturer(String manufacturer) {
+        this.manufacturer = manufacturer;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public void setVersion(String version) {
+        this.version = version;
+    }
+
+    public String getGroup() {
+        return group;
+    }
+
+    public void setGroup(String group) {
+        this.group = group;
+    }
+
+    public String getDeploymentName() {
+        return deploymentName;
+    }
+
+    public void setDeploymentName(String deploymentName) {
+        this.deploymentName = deploymentName;
+    }
+
+    public Date getTime() {
+        return time;
+    }
+
+    public void setTime(Date time) {
+        this.time = time;
+    }
+
+    public String getImgUrl() {
+        return imgUrl;
+    }
+
+    public void setImgUrl(String imgUrl) {
+        this.imgUrl = imgUrl;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+
+}

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

+package com.pms.ocp.model.dto;
+
+import com.pms.ocp.common.config.CreateGroups;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 应用预览图入参
+ *
+ * @author Administrator
+ */
+@Data
+public class ImgDTO {
+
+    @ApiModelProperty(value = "应用编码")
+    @NotBlank(message = "应用编码值不能为空", groups = CreateGroups.class)
+    private String codeNo;
+
+    @ApiModelProperty(value = "应用预览url")
+    @NotBlank(message = "应用预览url不能为空", groups = CreateGroups.class)
+    private String img;
+
+    public String getCodeNo() {
+        return codeNo;
+    }
+
+    public void setCodeNo(String codeNo) {
+        this.codeNo = codeNo;
+    }
+
+    public String getImg() {
+        return img;
+    }
+
+    public void setImg(String img) {
+        this.img = img;
+    }
+}
+

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

+package com.pms.ocp.model.dto;
+
+import com.pms.ocp.model.entity.OcpTenantBase;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "应用信息图标储存表dto")
+public class OcpBaseTiocnDto extends OcpTenantBase implements Serializable {
+
+    /**
+     * 图标种类tenant:应用图标api:服务图标
+     */
+    @ApiModelProperty(value = "图标种类——tenant:应用图标,api:服务图标")
+    private String iocnType;
+
+//    /**
+//     * 编码值
+//     */
+//    @ApiModelProperty(value = "编码值")
+//    private String codeNo;
+
+    /**
+     * 应用调用的服务数量图标数据
+     */
+    @ApiModelProperty(value = "应用调用的服务数量图标数据")
+    private Object iocn;
+
+
+
+    @ApiModelProperty(value = "服务编码字符串")
+    private String apiCodes;
+
+    public String getIocnType() {
+        return iocnType;
+    }
+
+    public void setIocnType(String iocnType) {
+        this.iocnType = iocnType;
+    }
+
+    public Object getIocn() {
+        return iocn;
+    }
+
+    public void setIocn(Object iocn) {
+        this.iocn = iocn;
+    }
+
+
+
+    public String getApiCodes() {
+        return apiCodes;
+    }
+
+    public void setApiCodes(String apiCodes) {
+        this.apiCodes = apiCodes;
+    }
+}

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

+package com.pms.ocp.model.dto;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.sql.Timestamp;
+
+@ApiModel(value = "我的应用-服务详情Dto")
+@Data
+public class OcpTenantGroupIocnDto {
+
+    @ApiModelProperty("应用名称")
+    private String tenantName;
+
+    /**
+     * 应用代码
+     */
+    @ApiModelProperty("应用代码")
+    private String tenantCode;
+
+    /**
+     * 应用分类代码
+     */
+    @ApiModelProperty("应用分类代码")
+    private String tenantGroupCode;
+
+    /**
+     * 应用ip
+     */
+    @ApiModelProperty("应用ip")
+    private String tenantIp;
+
+    /**
+     * 应用url
+     */
+    @ApiModelProperty("应用url")
+    private String tenantUrl;
+
+    /**
+     * 所属专业
+     */
+    @ApiModelProperty("所属专业")
+    private String professionalKind;
+
+    /**
+     * 创建者用户ID
+     */
+    @ApiModelProperty("创建者用户ID")
+    private String tenantUserId;
+
+    /**
+     * 排序
+     */
+    @ApiModelProperty("排序")
+    private Integer tenantOrderNo;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    private Timestamp tenantCtime;
+
+    /**
+     * 最后更新时间
+     */
+    @ApiModelProperty("最后更新时间")
+    private Timestamp tenantMtime;
+
+    /**
+     * 部署名称
+     */
+//    @ApiModelProperty("部署名称")
+//    private String deploymentName;
+
+    /**
+     * 描述
+     */
+    @ApiModelProperty("描述")
+    private String tenantDescription;
+//
+//    /**
+//     * 应用状态0:设计态；1:运行态
+//     */
+//    @ApiModelProperty("应用状态0:设计态；1:运行态")
+//    private Short tenantState;
+//    /**
+//     * 推广类型0:统建；1:自建
+//     */
+//    @ApiModelProperty("推广类型0:统建；1:自建")
+//    private long tenantPromotion;
+    /**
+     * 建设单位
+     */
+    @ApiModelProperty("建设单位")
+    private String tenantUnit;
+
+    /**
+     * 所属公司编码
+     */
+    @ApiModelProperty("所属公司编码")
+    private String ownerCompanyCode;
+
+//    /**
+//     * 所属公司名称
+//     */
+//    @ApiModelProperty("所属公司名称")
+//    private String ownerCompanyName;
+
+    /**
+     * 是否删除0:否;1:是
+     */
+    @ApiModelProperty("是否删除0:否;1:是")
+    private Short isDelete;
+
+    /**
+     * 所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区
+     */
+    @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区")
+    private Short tenantZone;
+
+    /**
+     * 所属层级 1:应用层;2:平台层;3:网络层;4:感知层;
+     */
+    @ApiModelProperty("所属层级 1:应用层;2:平台层;3:网络层;4:感知层;")
+    private Short tenantLayer;
+
+    /**
+     * 应用版本（当前版本）
+     */
+    @ApiModelProperty("应用版本（当前版本）")
+    private String tenantVersion;
+
+
+    @ApiModelProperty("推广类型")
+    private Short tenantPromotion;
+
+
+    @ApiModelProperty("应用路径")
+    private String tenantFullPath;
+
+
+    /**
+     * 所属公司可能会根据公司分区
+     */
+    @ApiModelProperty(value = "所属公司可能会根据公司分区")
+    private String companyCode;
+
+    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 String getTenantGroupCode() {
+        return tenantGroupCode;
+    }
+
+    public void setTenantGroupCode(String tenantGroupCode) {
+        this.tenantGroupCode = tenantGroupCode;
+    }
+
+    public String getTenantIp() {
+        return tenantIp;
+    }
+
+    public void setTenantIp(String tenantIp) {
+        this.tenantIp = tenantIp;
+    }
+
+    public String getTenantUrl() {
+        return tenantUrl;
+    }
+
+    public void setTenantUrl(String tenantUrl) {
+        this.tenantUrl = tenantUrl;
+    }
+
+    public String getProfessionalKind() {
+        return professionalKind;
+    }
+
+    public void setProfessionalKind(String professionalKind) {
+        this.professionalKind = professionalKind;
+    }
+
+    public String getTenantUserId() {
+        return tenantUserId;
+    }
+
+    public void setTenantUserId(String tenantUserId) {
+        this.tenantUserId = tenantUserId;
+    }
+
+    public Integer getTenantOrderNo() {
+        return tenantOrderNo;
+    }
+
+    public void setTenantOrderNo(Integer tenantOrderNo) {
+        this.tenantOrderNo = tenantOrderNo;
+    }
+
+    public Timestamp getTenantCtime() {
+        return tenantCtime;
+    }
+
+    public void setTenantCtime(Timestamp tenantCtime) {
+        this.tenantCtime = tenantCtime;
+    }
+
+    public Timestamp getTenantMtime() {
+        return tenantMtime;
+    }
+
+    public void setTenantMtime(Timestamp tenantMtime) {
+        this.tenantMtime = tenantMtime;
+    }
+
+    public String getTenantDescription() {
+        return tenantDescription;
+    }
+
+    public void setTenantDescription(String tenantDescription) {
+        this.tenantDescription = tenantDescription;
+    }
+
+    public String getTenantUnit() {
+        return tenantUnit;
+    }
+
+    public void setTenantUnit(String tenantUnit) {
+        this.tenantUnit = tenantUnit;
+    }
+
+    public String getOwnerCompanyCode() {
+        return ownerCompanyCode;
+    }
+
+    public void setOwnerCompanyCode(String ownerCompanyCode) {
+        this.ownerCompanyCode = ownerCompanyCode;
+    }
+
+    public Short getIsDelete() {
+        return isDelete;
+    }
+
+    public void setIsDelete(Short isDelete) {
+        this.isDelete = isDelete;
+    }
+
+    public Short getTenantZone() {
+        return tenantZone;
+    }
+
+    public void setTenantZone(Short tenantZone) {
+        this.tenantZone = tenantZone;
+    }
+
+    public Short getTenantLayer() {
+        return tenantLayer;
+    }
+
+    public void setTenantLayer(Short tenantLayer) {
+        this.tenantLayer = tenantLayer;
+    }
+
+    public String getTenantVersion() {
+        return tenantVersion;
+    }
+
+    public void setTenantVersion(String tenantVersion) {
+        this.tenantVersion = tenantVersion;
+    }
+
+    public Short getTenantPromotion() {
+        return tenantPromotion;
+    }
+
+    public void setTenantPromotion(Short tenantPromotion) {
+        this.tenantPromotion = tenantPromotion;
+    }
+
+    public String getTenantFullPath() {
+        return tenantFullPath;
+    }
+
+    public void setTenantFullPath(String tenantFullPath) {
+        this.tenantFullPath = tenantFullPath;
+    }
+
+
+    public String getCompanyCode() {
+        return companyCode;
+    }
+
+    public void setCompanyCode(String companyCode) {
+        this.companyCode = companyCode;
+    }
+}

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

+package com.pms.ocp.model.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+/**
+ * 应用目录条件查询入参实体
+ *
+ * @author Administrator
+ */
+@ApiModel(value = "应用目录条件查询入参实体")
+public class QueryAppDTO {
+
+    @ApiModelProperty("当前页码")
+    @NotNull(message = "当前页码不能为空")
+    private Integer currentPage;
+
+    @ApiModelProperty("页数目")
+    @NotNull(message = "页数目不能为空")
+    private Integer pageSize;
+
+    @ApiModelProperty("所属专业")
+    private String kind;
+
+//    @ApiModelProperty("所属中心")
+//    private String center;
+
+    @ApiModelProperty("所属类别")
+    private String type;
+
+    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 getKind() {
+        return kind;
+    }
+
+    public void setKind(String kind) {
+        this.kind = kind;
+    }
+
+//    public String getCenter() {
+//        return center;
+//    }
+//
+//    public void setCenter(String center) {
+//        this.center = center;
+//    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+
+}

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

+package com.pms.ocp.model.dto;
+
+import com.pms.ocp.model.entity.OcpApiGroup;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.sql.Timestamp;
+import java.util.List;
+
+@ApiModel(value = "应用与服务的传输参数")
+@Data
+public class TreeListDto {
+    @ApiModelProperty("主键ID")
+    private String objId;
+
+    @ApiModelProperty("分类编码")
+    private String apiGroupCode;
+
+    @ApiModelProperty("分类名称")
+    private String apiGroupName;
+
+    @ApiModelProperty("上级code")
+    private String apiGroupPcode;
+
+
+    @ApiModelProperty("分层树层级 1中台层 2中心层 3 服务组层 4服务层 ")
+    private long apiGroupLevel;
+
+    @ApiModelProperty("分层树子级 ")
+    private List<OcpApiGroup> apiChildrenGroup;
+}

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

@@ -40,7 +40,7 @@ public class OcpApiExtent {
 
     @ApiModelProperty("部署信息")
     private String deployment;
-
+//'0: ''待审核'',1: ''已审核'',2: ''未通过'', 3: ''未提交'',4:''建设中'',5:''下架'',6:''发布'''7.未发布
     @ApiModelProperty("服务状态0未发布1已发布")
     private String apiState;
 

src/main/java/com/pms/ocp/model/entity/OcpApiParam.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.io.Serializable;
+import java.sql.Timestamp;
+
+@Data
+@Accessors(chain = true)
+@TableName("ocp_apiParam")
+@ApiModel("服务参数表")
+public class OcpApiParam   implements Serializable {
+
+
+ @TableId(type = IdType.ASSIGN_ID)
+  @ApiModelProperty("主键ID")
+  private String objId;
+
+  @ApiModelProperty("服务编码")
+  private String apiCode;
+
+  @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("是否删除0:未删除 1已删除")
+  private Integer isDelete;
+
+
+    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 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 Integer getIsDelete() {
+        return isDelete;
+    }
+
+    public void setIsDelete(Integer isDelete) {
+        this.isDelete = isDelete;
+    }
+}

src/main/java/com/pms/ocp/model/entity/OcpTenantIocn.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 java.io.Serializable;
+
+import lombok.Data;
+
+/**
+ * @author Administrator
+ */
+@ApiModel(value = "com-pms-ocp-model-entity-OcpTenantIocn")
+@Data
+@TableName("ocp_tenant_iocn")
+public class OcpTenantIocn implements Serializable {
+    /**
+     * 主键
+     */
+    @ApiModelProperty(value = "主键")
+    @TableId(type = IdType.ASSIGN_ID)
+    private String objId;
+
+    /**
+     * 图标种类tenant:应用图标api:服务图标
+     */
+    @ApiModelProperty(value = "图标种类——tenant:应用图标,api:服务图标")
+    private String iocnType;
+
+    /**
+     * 编码值
+     */
+    @ApiModelProperty(value = "编码值")
+    private String codeNo;
+
+    /**
+     * 应用调用的服务数量图标数据
+     */
+    @ApiModelProperty(value = "应用调用的服务数量图标数据")
+    private Object iocn;
+
+    /**
+     * 所属公司可能会根据公司分区
+     */
+    @ApiModelProperty(value = "所属公司可能会根据公司分区")
+    private String companyCode;
+
+    private static final long serialVersionUID = 1L;
+
+    public String getObjId() {
+        return objId;
+    }
+
+    public void setObjId(String objId) {
+        this.objId = objId;
+    }
+
+    public String getIocnType() {
+        return iocnType;
+    }
+
+    public void setIocnType(String iocnType) {
+        this.iocnType = iocnType;
+    }
+
+    public String getCodeNo() {
+        return codeNo;
+    }
+
+    public void setCodeNo(String codeNo) {
+        this.codeNo = codeNo;
+    }
+
+    public Object getIocn() {
+        return iocn;
+    }
+
+    public void setIocn(Object iocn) {
+        this.iocn = iocn;
+    }
+
+    public String getCompanyCode() {
+        return companyCode;
+    }
+
+    public void setCompanyCode(String companyCode) {
+        this.companyCode = companyCode;
+    }
+}
+

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

+package com.pms.ocp.model.vo;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+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;
+
+/**
+ * @author guofanfan
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "服务列表信息vo")
+public class ApiProvinceVo implements Serializable {
+    @ApiModelProperty(value = "序号")
+    @Excel(name = "序号")
+    private String objId;
+    @ApiModelProperty(value = "服务编码")
+    @Excel(name = "服务编码")
+    private String apiCode;
+    @ApiModelProperty(value = "服务中文名称")
+    @Excel(name = "服务中文名称")
+    private String apiName;
+    @ApiModelProperty(value = "所属集群")
+    @Excel(name = "所属集群")
+    private String clusterName;
+    @ApiModelProperty(value = "所属命名空间")
+    @Excel(name = "所属命名空间")
+    private String spaceName;
+    @ApiModelProperty(value = "接口URL")
+    @Excel(name = "接口URL")
+    private String apiUrl;
+    @ApiModelProperty(value = "状态")
+    @Excel(name = "状态")
+    private String apiState;
+    @ApiModelProperty(value = "注册时间")
+    @Excel(name = "注册时间")
+    private Timestamp apiCtime;
+    @ApiModelProperty(value = "建设单位")
+    @Excel(name = "建设单位")
+    private String apiUnit;
+    /**
+     * 请求参数列表
+     */
+    private List<OcpApiParam> apiParams;
+}
+

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

 package com.pms.ocp.model.vo;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.pms.ocp.model.entity.OcpApiParam;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -11,6 +12,8 @@ import org.springframework.beans.factory.annotation.Value;
 import java.io.Serializable;
 import java.sql.Timestamp;
 import java.time.LocalDateTime;
+import java.util.List;
+
 /**
  * @author guofanfan
  */
@@ -46,6 +49,88 @@ public class OcpApiBaseVo implements Serializable {
     @ApiModelProperty(value = "建设单位")
     @Excel(name = "建设单位")
     private String apiUnit;
+    @ApiModelProperty(value = "出参入参")
+    @Excel(name = "建设单位")
+    private List<OcpApiParam> apiParams;
+
+    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 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 String getApiUrl() {
+        return apiUrl;
+    }
+
+    public void setApiUrl(String apiUrl) {
+        this.apiUrl = apiUrl;
+    }
+
+    public String getApiState() {
+        return apiState;
+    }
+
+    public void setApiState(String apiState) {
+        this.apiState = apiState;
+    }
+
+    public Timestamp getApiCtime() {
+        return apiCtime;
+    }
+
+    public void setApiCtime(Timestamp apiCtime) {
+        this.apiCtime = apiCtime;
+    }
+
+    public String getApiUnit() {
+        return apiUnit;
+    }
+
+    public void setApiUnit(String apiUnit) {
+        this.apiUnit = apiUnit;
+    }
+
+    public List<OcpApiParam> getApiParams() {
+        return apiParams;
+    }
 
+    public void setApiParams(List<OcpApiParam> apiParams) {
+        this.apiParams = apiParams;
+    }
 }
 

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

+package com.pms.ocp.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 应用目录查询返回实体
+ *
+ * @author Administrator
+ */
+@ApiModel(value = "应用目录查询返回实体")
+@Data
+public class QueryAppInfoVO {
+
+    @ApiModelProperty("应用图标")
+    private String icon;
+
+    @ApiModelProperty("应用名称")
+    private String appName;
+
+
+    @ApiModelProperty("版本号")
+    private String version;
+
+    @ApiModelProperty("开发商")
+    private String unit;
+
+    @ApiModelProperty("应用状态")
+    private String state;
+
+}

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

@@ -37,16 +37,7 @@ public interface ApiBasicManagementService extends IService<OcpApiBase> {
      */
     void apiLogin(String apiCodes);
 
-    /**
-     * 条件查询
-     * @param apiCode
-     * @param keyword
-     * @param startTime
-     * @param endTime
-     * @return
-     */
-//    OcpApiBaseDto queryOcpApiBaseDto(ApiBaseDto apiBaseDto);
-    List<OcpApiBaseVo> queryOcpApiBaseDto(String apiCode, String keyword, String apiUnits, Timestamp startTime, Timestamp endTime, int pageSize, int pageNum);
+
     /**
      * 导入的添加到数据库
      * @param personList
@@ -72,7 +63,7 @@ public interface ApiBasicManagementService extends IService<OcpApiBase> {
      * @param apiGroupPcode
      * @return
      */
-    List<OcpGroupBaseDto> apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupPcode, Integer apiGroupPromotionType, String apiCode,String apiPromotion);
+    List<OcpGroupBaseDto> apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupPcode, Integer apiGroupPromotionType, String apiCode);
 
     /**
      * 根据分组code获取列表
@@ -89,6 +80,16 @@ public interface ApiBasicManagementService extends IService<OcpApiBase> {
      */
     List<OcpApiBase> apiBaseTreeApiList(String apiGroupCompanyCode, String apiGroupPcode);
 
+
+    /**
+     * 编辑中的模糊查询
+     * @param apiCode
+     * @param apiName
+     * @param apiCenterCode
+     * @return
+     */
+    ResponseVO<PageInfo<OcpApiBase>> selectByCondition(String apiCode, String apiName, String apiCenterCode,Integer pageNum,Integer pageSize);
+
 //    /**
 //     * 服务列表2
 //     * @param wholeLinkParamDto

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

+package com.pms.ocp.service;
+
+
+import com.pms.ocp.model.vo.ApiProvinceVo;
+import com.pms.ocp.model.vo.OcpApiBaseVo;
+import com.pms.ocp.model.vo.ResponseVO;
+
+public interface ApiProvinceService {
+
+
+    boolean updateOrCreate(ApiProvinceVo apiProvinceVo);
+}

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

+package com.pms.ocp.service;
+
+import com.pms.ocp.model.dto.AppRegisterDTO;
+import com.pms.ocp.model.dto.ImgDTO;
+import com.pms.ocp.model.dto.QueryAppDTO;
+import com.pms.ocp.model.vo.ResponseVO;
+
+import java.util.List;
+
+/**
+ * 应用注册业务接口
+ *
+ * @author Administrator
+ */
+public interface AppRegisterService {
+    /**
+     * 新增应用注册
+     *
+     * @param appRegisterDTO
+     * @return
+     */
+    ResponseVO addApp(AppRegisterDTO appRegisterDTO);
+
+    /**
+     * 查询应用目录
+     *
+     * @param queryAppDTO
+     * @return
+     */
+    ResponseVO getAppInfo(QueryAppDTO queryAppDTO);
+
+    /**
+     * 应用预览图
+     *
+     * @param imgDTO
+     * @return
+     */
+    ResponseVO addAppImgUrl(List<ImgDTO> imgDTO);
+}

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

@@ -2,11 +2,14 @@ package com.pms.ocp.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.pms.ocp.model.entity.OcpTenantBase;
-import com.pms.ocp.model.vo.ResponseVO;
 
 public interface OcpTenantBaseService extends IService<OcpTenantBase> {
 
 
-
-
+    /**
+     * 我的应用 -- 应用删除
+     * @param objId
+     * @return
+     */
+    boolean delectApply(String objId);
 }

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

+package com.pms.ocp.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.pms.ocp.model.dto.OcpTenantGroupIocnDto;
+import com.pms.ocp.model.entity.OcpTenantIocn;
+
+import java.util.List;
+
+public interface OcpTenantIocnService extends IService<OcpTenantIocn> {
+
+
+    /**
+     * 我的应用--服务列表
+     * @return
+     */
+    List<OcpTenantGroupIocnDto> getApplyUserList();
+}

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

@@ -3,9 +3,7 @@ package com.pms.ocp.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.github.pagehelper.PageInfo;
 import com.pms.ocp.model.dto.*;
-import com.pms.ocp.model.entity.OcpApiGroup;
-import com.pms.ocp.model.entity.OcpTenantBase;
-import com.pms.ocp.model.entity.OcpTenantGroup;
+import com.pms.ocp.model.entity.*;
 import com.pms.ocp.model.vo.OcpApiBaseVo;
 import com.pms.ocp.model.vo.ResponseVO;
 
@@ -80,21 +78,29 @@ public interface TenantBasicManagementService extends IService<OcpTenantBase> {
      */
     List<OcpTenantBase> tenantBaseTree(String tenantGroupCode, String tenantGroupCompanyCode);
 
+
+
     /**
-     * 应用注册查询
+     * 查询基础表
      * @param tenantGroupCode
      * @param tenantGroupCompanyCode
      * @return
      */
-    OcpTenantGroup selectRegister(String tenantGroupCode, String tenantGroupCompanyCode);
+    List<GroupDto> selectBase(String tenantGroupCode, String tenantGroupCompanyCode);
 
     /**
-     * 查询基础表
-     * @param tenantGroupCode
-     * @param tenantGroupCompanyCode
+     * 个人信息中编辑
+     * @param ocpBaseTiocnDto
      * @return
      */
-    List<GroupDto> selectBase(String tenantGroupCode, String tenantGroupCompanyCode);
+    ResponseVO updateByCondition(OcpBaseTiocnDto ocpBaseTiocnDto);
+
+    /**
+     * 个人信息中-查询和应用关联的服务
+     * @param tenantCode
+     * @return
+     */
+    ResponseVO <List<OcpApiBase>>selectOcpByApi(String tenantCode);
 
     /**
      * 应用树

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

@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 
-
 import com.pms.ocp.mapper.ApiBasicManagementMapper;
 import com.pms.ocp.mapper.OcpApiExtentMapper;
 import com.pms.ocp.mapper.OcpApiGroupMapper;
@@ -98,21 +97,7 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl<ApiBasicManagemen
         }
     }
 
-    /**
-     * 条件查询
-     *
-     * @param apiCode
-     * @param keyword
-     * @param apiUnit
-     * @param startTime
-     * @param endTime
-     * @return
-     */
-    @Override
-    public List<OcpApiBaseVo> queryOcpApiBaseDto(String apiCode, String keyword, String apiUnit, Timestamp startTime, Timestamp endTime, int pageSize, int pageNum) {
-        pageSize = (pageSize - 1) * pageNum;
-        return apiBasicManagementMapper.queryOcpApiBaseDto(keyword, apiUnit, startTime, endTime, apiCode, pageSize, pageNum);
-    }
+
 
     /**
      * 导入添加到数据库
@@ -176,15 +161,15 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl<ApiBasicManagemen
     }
 
     @Override
-    public List<OcpGroupBaseDto> apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupPcode, Integer apiGroupPromotionType, String apiCode, String apiPromotion) {
-        List<OcpGroupBaseDto> ocpApiGroups = ocpApiGroupMapper.apiTree(apiGroupCompanyCode, apiGroupPcode, apiGroupPromotionType, apiPromotion);
+    public List<OcpGroupBaseDto> apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupPcode, Integer apiGroupPromotionType, String apiCode) {
+        List<OcpGroupBaseDto> ocpApiGroups = ocpApiGroupMapper.apiTree(apiGroupCompanyCode, apiGroupPcode, apiGroupPromotionType);
         if (ocpApiGroups.size() != 0) {
             return ocpApiGroups;
         } else {
             if (StringUtils.isNotEmpty(apiCode)) {
                 return Collections.EMPTY_LIST;
             } else {
-                List<OcpGroupBaseDto> ocpGroupBaseDto = ocpApiGroupMapper.selectBase(apiGroupCompanyCode, apiGroupPcode, apiPromotion);
+                List<OcpGroupBaseDto> ocpGroupBaseDto = ocpApiGroupMapper.selectBase(apiGroupCompanyCode, apiGroupPcode, apiGroupPromotionType);
                 if (ocpGroupBaseDto.size() != 0) {
                     return ocpGroupBaseDto;
                 }
@@ -273,4 +258,23 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl<ApiBasicManagemen
         return ocpApiGroups.stream().map(OcpApiGroup::getApiGroupCode).collect(Collectors.toList());
     }
 
+    /**
+     * 编辑中的模糊查询
+     *
+     * @param apiCode
+     * @param apiName
+     * @param apiCenterCode
+     * @return
+     */
+    @Override
+    public ResponseVO<PageInfo<OcpApiBase>> selectByCondition(String apiCode, String apiName, String apiCenterCode, Integer pageNum, Integer pageSize) {
+        if (pageNum == null || pageSize == null) {
+            return ResponseVO.error("分页参数不能为空");
+        }
+
+        PageHelper.startPage(pageNum, pageSize);
+        List<OcpApiBase> list = apiBasicManagementMapper.selectByCondition(apiCode, apiName, apiCenterCode);
+        PageInfo<OcpApiBase> pageInfo = new PageInfo<>(list);
+        return ResponseVO.ok(pageInfo);
+    }
 }

src/main/java/com/pms/ocp/service/impl/ApiDetailsServiceImpl.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.mapper.ApiDetailsMapper;
+import com.pms.ocp.mapper.ApiParamMapper;
 import com.pms.ocp.model.dto.ApiBaseDto;
-import com.pms.ocp.model.entity.OcpApiBase;
-import com.pms.ocp.model.entity.OcpApiExtent;
-import com.pms.ocp.model.entity.OcpApiSubs;
+import com.pms.ocp.model.entity.*;
 import com.pms.ocp.model.vo.OcpApiBaseVo;
 import com.pms.ocp.model.vo.ResponseVO;
 import com.pms.ocp.service.ApiDetailsService;
@@ -36,11 +36,16 @@ public class ApiDetailsServiceImpl implements ApiDetailsService {
 
     @Autowired
     private ApiDetailsMapper apiDetailsMapper;
-
+    @Autowired
+    private ApiParamMapper apiParamMapper;
 
     @Override
     public ResponseVO<OcpApiBaseVo> getApiDetails(String apiCode) {
         OcpApiBaseVo ocpApiBase = apiDetailsMapper.selectByCode(apiCode);
+        QueryWrapper<OcpApiParam> wrapper = new QueryWrapper<>();
+        wrapper.lambda().eq(OcpApiParam::getApiCode, apiCode);
+        List<OcpApiParam> ocpApiParams = apiParamMapper.selectList(wrapper);
+        ocpApiBase.setApiParams(ocpApiParams);
         return ResponseVO.ok(ocpApiBase);
     }
 

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

+package com.pms.ocp.service.impl;
+
+import com.github.pagehelper.util.StringUtil;
+import com.pms.ocp.common.utils.RandomStringUtils;
+import com.pms.ocp.mapper.ApiDetailsMapper;
+import com.pms.ocp.mapper.ApiParamMapper;
+import com.pms.ocp.mapper.ApiProvinceMapper;
+import com.pms.ocp.model.entity.OcpApiParam;
+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.ApiDetailsService;
+import com.pms.ocp.service.ApiProvinceService;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class ApiProvinceServiceImpl implements ApiProvinceService {
+
+    @Autowired
+    private ApiProvinceMapper apiProvinceMapper;
+    @Autowired
+    private ApiParamMapper apiParamDao;
+
+    @Override
+    public boolean updateOrCreate(ApiProvinceVo apiProvinceVo) {
+        String code = RandomStringUtils.getRandomString(32);
+        apiProvinceVo.setApiCode(code);
+        apiProvinceMapper.insert(apiProvinceVo);
+        List<OcpApiParam> apiParams = apiProvinceVo.getApiParams();
+        if (CollectionUtils.isNotEmpty(apiParams)) {
+            //清除原有数据
+            apiParams.forEach(apiParam -> {
+                apiParamDao.insert(apiParam);
+                apiParam.setApiCode(apiProvinceVo.getApiCode());
+            });
+        }
+        return true;
+    }
+}

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

+package com.pms.ocp.service.impl;
+
+import com.pms.ocp.common.utils.GUIDGenerator;
+import com.pms.ocp.common.utils.PageUtil;
+import com.pms.ocp.mapper.*;
+import com.pms.ocp.model.dto.AppRegisterDTO;
+import com.pms.ocp.model.dto.ImgDTO;
+import com.pms.ocp.model.dto.QueryAppDTO;
+import com.pms.ocp.model.entity.OcpTenantBase;
+import com.pms.ocp.model.entity.OcpTenantExtent;
+import com.pms.ocp.model.entity.OcpTenantGroup;
+import com.pms.ocp.model.entity.OcpTenantIocn;
+import com.pms.ocp.model.vo.QueryAppInfoVO;
+import com.pms.ocp.model.vo.ResponseVO;
+import com.pms.ocp.service.AppRegisterService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * 应用注册业务接口实现
+ *
+ * @author Administrator
+ */
+@Service
+public class AppRegisterServiceImpl implements AppRegisterService {
+    @Autowired
+    private AppRegisterMapper appRegisterMapper;
+
+    @Autowired
+    private OcpTenantIocnMapper ocpTenantIocnMapper;
+
+    @Autowired
+    private OcpTenantBaseMapper ocpTenantBaseMapper;
+
+    @Autowired
+    private OcpTenantExtentMapper ocpTenantExtentMapper;
+
+    @Autowired
+    private OcpTenantGroupMapper ocpTenantGroupMapper;
+
+    @Override
+    public ResponseVO addApp(AppRegisterDTO appRegisterDTO) {
+
+        OcpTenantIocn ocpTenantIocn = new OcpTenantIocn();
+        ocpTenantIocn.setIocnType("tenant");
+        ocpTenantIocn.setCodeNo(appRegisterDTO.getAppCode());
+        ocpTenantIocn.setIocn(appRegisterDTO.getImgUrl());
+        // 加字段
+
+        int n = ocpTenantIocnMapper.insert(ocpTenantIocn);
+
+
+        OcpTenantExtent ocpTenantExtent = new OcpTenantExtent();
+        ocpTenantExtent.setTenantCtime(new Date());
+        ocpTenantExtent.setTenantCode(appRegisterDTO.getAppCode());
+        ocpTenantExtent.setClusterName(appRegisterDTO.getGroup());
+        ocpTenantExtent.setDeploymentName(appRegisterDTO.getDeploymentName());
+        int j = ocpTenantExtentMapper.insert(ocpTenantExtent);
+
+
+        OcpTenantGroup ocpTenantGroup = new OcpTenantGroup();
+        ocpTenantGroup.setTenantGroupUserId(appRegisterDTO.getUserId());
+        ocpTenantGroup.setTenantGroupUserName(appRegisterDTO.getUserName());
+        ocpTenantGroup.setTenantGroupCtime(new Timestamp(System.currentTimeMillis()));
+        ocpTenantGroup.setTenantGroupCode(GUIDGenerator.generate32(true));
+        ocpTenantGroup.setTenantGroupName(appRegisterDTO.getType());
+        int m = ocpTenantGroupMapper.insert(ocpTenantGroup);
+
+
+        OcpTenantBase ocpTenantBase = new OcpTenantBase();
+        ocpTenantBase.setTenantUserId(appRegisterDTO.getUserId());
+        ocpTenantBase.setTenantName(appRegisterDTO.getAppName());
+        ocpTenantBase.setTenantCode(appRegisterDTO.getAppCode());
+        ocpTenantBase.setProfessionalKind(appRegisterDTO.getKind());
+        ocpTenantBase.setTenantUrl(appRegisterDTO.getUrl());
+        ocpTenantBase.setTenantDescription(appRegisterDTO.getDesc());
+        ocpTenantBase.setTenantUnit(appRegisterDTO.getManufacturer());
+        ocpTenantBase.setTenantVersion(appRegisterDTO.getVersion());
+        ocpTenantBase.setTenantCtime(new Timestamp(System.currentTimeMillis()));
+        ocpTenantBase.setTenantGroupCode(ocpTenantGroup.getTenantGroupCode());
+        int i = ocpTenantBaseMapper.insert(ocpTenantBase);
+
+
+        if (n > 0 && i > 0 && j > 0 && m > 0) {
+            return ResponseVO.ok();
+        }
+        return ResponseVO.error("新增应用注册失败");
+    }
+
+    @Override
+    public ResponseVO getAppInfo(QueryAppDTO queryAppDTO) {
+        List<QueryAppInfoVO> list = appRegisterMapper.getAppInfo(queryAppDTO);
+        PageUtil<QueryAppInfoVO> pageUtil = new PageUtil<>();
+        pageUtil.startPage(queryAppDTO.getCurrentPage(), queryAppDTO.getPageSize(), list);
+        return ResponseVO.ok(pageUtil);
+    }
+
+    @Override
+    public ResponseVO addAppImgUrl(List<ImgDTO> imgDTO) {
+        List<OcpTenantIocn> list = new ArrayList<>();
+
+        for (ImgDTO item : imgDTO) {
+            OcpTenantIocn ocpTenantIocn = new OcpTenantIocn();
+            ocpTenantIocn.setIocnType("tenant");
+            ocpTenantIocn.setCodeNo(item.getCodeNo());
+            ocpTenantIocn.setIocn(item.getImg());
+            list.add(ocpTenantIocn);
+        }
+        int count = appRegisterMapper.batchInsert(list);
+        if (count > 0) {
+            return ResponseVO.ok();
+        }
+        return ResponseVO.error("应用预览图插入失败");
+    }
+}

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

@@ -119,13 +119,18 @@ public class ModelSubscribeServiceImpl implements ModelSubscribeService {
         return ResponseVO.ok(result);
     }
 
+    /**
+     * 合并list设置子类
+     * @param modelGroupList
+     * @param organList
+     * @param function
+     * @return
+     */
     private List<TreeNode> setChildren(List<TreeNode> modelGroupList, List<TreeNode> organList, BiFunction<TreeNode,TreeNode,Boolean> function) {
-        organList.forEach(org
-                ->{
-            modelGroupList.forEach(group->{
-                //org.getCompanyCode().equals(group.getCompanyCode()
-                if (function.apply(org,group)){
-                    if(org.getChildren() == null){
+        organList.forEach(org -> {
+            modelGroupList.forEach(group -> {
+                if (function.apply(org, group)) {
+                    if (org.getChildren() == null) {
                         org.setChildren(new LinkedList<>());
                     }
                     org.getChildren().add(group);

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

@@ -21,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.sql.Timestamp;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Stream;
 
@@ -51,7 +52,13 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper, OcpApiG
 
         if (!("".equals(apiGroupPromotionType)) && StringUtils.isBlank(apiGroupCode)) {
             List<OcpApiGroup> ocpApiGroups = mapper.selectTwoApiGroups(apiGroupPromotionType);
-            return ocpApiGroups;
+            List<OcpApiGroup> ocpApiGrouplist = new ArrayList<>();
+            for (OcpApiGroup ocpApiGroup : ocpApiGroups) {
+               if (StringUtils.isBlank(ocpApiGroup.getApiGroupPcode())){
+                   ocpApiGrouplist.add(ocpApiGroup);
+                }
+            }
+            return ocpApiGrouplist;
         } else if (!("".equals(apiGroupPromotionType)) && !(StringUtils.isBlank(apiGroupCode))) {
             List<OcpApiGroup> ocpApiGroups = mapper.selectThreeApiGroupsList(apiGroupPromotionType, apiGroupCode);
             return ocpApiGroups;
@@ -71,11 +78,13 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper, OcpApiG
         Timestamp timestamp = new Timestamp(System.currentTimeMillis());
         String code = RandomStringUtils.getRandomString(6);
         boolean flag = true;
-        List<OcpApiGroup> ocpApiGroups = mapper.selectList(null);
-        Stream<OcpApiGroup> ocpApiGroupStream = ocpApiGroups.stream().filter(item -> item.getApiGroupCode().equals(ocpApiGroup.getApiGroupPcode()));
-        Stream<OcpApiGroup> apiGroupStream1 = ocpApiGroupStream.filter(ocp -> ocp.getApiGroupName().equals(ocpApiGroup.getApiGroupName()));
+//        List<OcpApiGroup> ocpApiGroups = mapper.selectList(null);
+//        Stream<OcpApiGroup> ocpApiGroupStream = ocpApiGroups.stream().filter(item -> item.getApiGroupCode().equals(ocpApiGroup.getApiGroupPcode()));
+//        Stream<OcpApiGroup> apiGroupStream1 = ocpApiGroupStream.filter(ocp -> ocp.getApiGroupName().equals(ocpApiGroup.getApiGroupName()));
+        List<OcpApiGroup> ocpApiGroups1 = mapper.selectGroupName(ocpApiGroup.getApiGroupName());
         OcpApiGroup ocpApi = new OcpApiGroup();
-        if (!(StringUtils.isBlank(apiGroupStream1.toString()))) {
+
+        if (ocpApiGroups1.size() == 0) {
 
             ocpApi.setApiGroupPromotionType(ocpApiGroup.getApiGroupPromotionType());
             BeanUtils.copyProperties(ocpApiGroup, ocpApi);
@@ -138,7 +147,7 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper, OcpApiG
         queryWrapper.eq(OcpApiGroup::getApiGroupPcode, ocpApiGroup.getApiGroupCode());
         String objId = ocpApiGroup.getObjId();
 
-        List<OcpApiGroup> list = mapper.selectGroupPcode();
+        List<OcpApiGroup> list = mapper.selectGroupPcode(ocpApiGroup.getApiGroupCode());
         if (list.size() >= 1) {
             flag = false;
         }
@@ -178,10 +187,17 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper, OcpApiG
 
             }
         } 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()));
+                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()));
                 mapper.selectPage(pageInfo, ocpTenantGroupLambdaQueryWrapper);
             }
+        }
 
 
         return pageInfo;

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

 package com.pms.ocp.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.pms.ocp.common.constants.*;
-import com.pms.ocp.common.exception.ServiceException;
 import com.pms.ocp.mapper.OcpTenantBaseMapper;
 import com.pms.ocp.model.entity.OcpTenantBase;
-import com.pms.ocp.model.vo.ResponseVO;
 import com.pms.ocp.service.OcpTenantBaseService;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 
-import java.util.LinkedList;
-import java.util.List;
-
-
 @Service
-public class OcpTenantBaseServiceImpl extends ServiceImpl<OcpTenantBaseMapper,OcpTenantBase> implements OcpTenantBaseService {
-
-
-
-
-
-
-
-
-
+public class OcpTenantBaseServiceImpl extends ServiceImpl<OcpTenantBaseMapper, OcpTenantBase> implements OcpTenantBaseService {
+
+    @Autowired
+    private OcpTenantBaseMapper ocpTenantBaseMapper;
+
+    /**
+     * 我的应用 -- 应用删除
+     *
+     * @param objId
+     * @return
+     */
+    @Override
+    public boolean delectApply(String objId) {
+        OcpTenantBase ocpTenantBase = ocpTenantBaseMapper.selectById(objId);
+        ocpTenantBase.setIsDelete((short) 1);
+        ocpTenantBaseMapper.updateById(ocpTenantBase);
+
+        return true;
+    }
 }

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

+package com.pms.ocp.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.pms.ocp.mapper.OcpTenantBaseMapper;
+import com.pms.ocp.mapper.OcpTenantIocnMapper;
+import com.pms.ocp.model.dto.OcpTenantGroupIocnDto;
+import com.pms.ocp.model.entity.OcpTenantBase;
+import com.pms.ocp.model.entity.OcpTenantIocn;
+import com.pms.ocp.service.OcpTenantIocnService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+@Service
+public class OcpTenantIocnServiceImpl extends ServiceImpl<OcpTenantIocnMapper, OcpTenantIocn> implements OcpTenantIocnService {
+
+
+    @Autowired
+    private OcpTenantBaseMapper ocpTenantBaseMapper;
+
+    @Autowired
+    private OcpTenantIocnMapper ocpTenantIocnMapper;
+
+    /**
+     * 我的应用--服务列表
+     *
+     * @return
+     */
+    @Override
+    public List<OcpTenantGroupIocnDto> getApplyUserList() {
+        List<OcpTenantGroupIocnDto> groupIocnDtos = new ArrayList<>();
+        List<OcpTenantBase> ocpTenantBases = ocpTenantBaseMapper.selectList(null);
+        List<OcpTenantIocn> ocpTenantIocns = ocpTenantIocnMapper.selectList(null);
+        List<String> companyCodes = new ArrayList<>();
+        for (OcpTenantBase ocpTenantBase : ocpTenantBases) {
+            OcpTenantGroupIocnDto ocpTenantGroupIocnDto = new OcpTenantGroupIocnDto();
+            if (ocpTenantBase.getIsDelete() == 0) {
+                BeanUtils.copyProperties(ocpTenantBase, ocpTenantGroupIocnDto);
+                String ownerCompanyCode = ocpTenantBase.getOwnerCompanyCode();
+                ocpTenantGroupIocnDto.setCompanyCode(ownerCompanyCode);
+                groupIocnDtos.add(ocpTenantGroupIocnDto);
+                for (OcpTenantIocn ocpTenantIocn : ocpTenantIocns) {
+                    if (ocpTenantIocn.getCompanyCode().equals(ocpTenantBase.getOwnerCompanyCode())){
+                        BeanUtils.copyProperties(ocpTenantIocn, ocpTenantGroupIocnDto);
+                    }
+                }
+            }
+        }
+        return groupIocnDtos;
+    }
+
+
+}

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

@@ -5,18 +5,17 @@ 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.OcpTenantAuditMapper;
-import com.pms.ocp.mapper.OcpTenantExtentMapper;
-import com.pms.ocp.mapper.OcpTenantGroupMapper;
-import com.pms.ocp.mapper.TenantBasicManagementMapper;
+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;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,7 +31,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 @Service
-
+@Slf4j
 public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicManagementMapper, OcpTenantBase> implements TenantBasicManagementService {
     @Autowired
     private TenantBasicManagementMapper tenantBasicManagementMapper;
@@ -43,12 +42,17 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
     @Autowired
     private OcpApiTenantRelService ocpApiTenantRelService;
     @Autowired
+    private OcpApiTenantRelMapper ocpApiTenantRelMapper;
+    @Autowired
     private OcpTenantGroupService ocpTenantGroupService;
     @Autowired
     private OcpTenantGroupMapper ocpTenantGroupMapper;
     @Autowired
     private OcpTenantAuditMapper ocpTenantAuditMapper;
-
+    @Autowired
+    private OcpTenantIocnService ocpTenantIocnService;
+    @Autowired
+    private ApiBasicManagementMapper apiBasicManagementMapper;
     List<String> tenantGroup = new ArrayList<>();
 
     /**
@@ -314,28 +318,110 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
     }
 
     /**
-     * 应用注册查询
+     * 应用树底层
      *
      * @param tenantGroupCode
      * @param tenantGroupCompanyCode
      * @return
      */
+    public List<GroupDto> selectBase(String tenantGroupCode, String tenantGroupCompanyCode) {
+        List<GroupDto> groupDto = ocpTenantGroupMapper.selectBase(tenantGroupCode, tenantGroupCompanyCode);
+        return groupDto;
+    }
+
+    /**
+     * 个人信息-编辑
+     *
+     * @param ocpBaseTiocnDto
+     * @return
+     */
     @Override
-    public OcpTenantGroup selectRegister(String tenantGroupCode, String tenantGroupCompanyCode) {
-        OcpTenantGroup ocpTenantGroup = ocpTenantGroupMapper.selectRegister(tenantGroupCode, tenantGroupCompanyCode);
-        return ocpTenantGroup;
+    public ResponseVO updateByCondition(OcpBaseTiocnDto ocpBaseTiocnDto) {
+        String tenantCode = ocpBaseTiocnDto.getTenantCode();
+        OcpTenantBase ocpTenantBase = new OcpTenantBase();
+        BeanUtils.copyProperties(ocpBaseTiocnDto, ocpTenantBase);
+        LambdaQueryWrapper<OcpTenantBase> lambdaQueryWrapper2 = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper2.eq(OcpTenantBase::getTenantCode, tenantCode);
+        boolean flag = this.update(ocpTenantBase, lambdaQueryWrapper2);
+        if (flag) {
+            log.info("应用基础表修改成功");
+            System.out.println("应用基础表修改成功");
+        }
+        LambdaQueryWrapper<OcpTenantIocn> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(OcpTenantIocn::getCodeNo, tenantCode);
+        boolean remove = ocpTenantIocnService.remove(lambdaQueryWrapper);
+        if (remove) {
+            log.info("图标表删除成功");
+            System.out.println("图标表删除成功");
+        }
+
+        //添加新的数据到图标表
+        OcpTenantIocn ocpTenantIocn = new OcpTenantIocn();
+        Object iocn = ocpBaseTiocnDto.getIocn();
+        String ownerCompanyCode = ocpBaseTiocnDto.getOwnerCompanyCode();
+        ocpTenantIocn.setCodeNo(tenantCode);
+        ocpTenantIocn.setIocnType("tenant");
+        ocpTenantIocn.setIocn(iocn);
+        ocpTenantIocn.setCompanyCode(ownerCompanyCode);
+        boolean save = ocpTenantIocnService.save(ocpTenantIocn);
+        if (save) {
+            log.info("添加图标表成功");
+            System.out.println("添加图标表成功");
+        }
+        //先删除应用服务关联
+        LambdaQueryWrapper<OcpApiTenantRel> lambdaQueryWrapper1 = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper1.eq(OcpApiTenantRel::getTenantCode, tenantCode);
+        boolean remove1 = ocpApiTenantRelService.remove(lambdaQueryWrapper1);
+        if (remove1) {
+            log.info("要是有关联先删除,删除成功");
+        }
+        String apiCodes = ocpBaseTiocnDto.getApiCodes();
+        if (StringUtils.isEmpty(apiCodes)) {
+            return ResponseVO.error("请选择你要关联的服务");
+        }
+        String[] split = apiCodes.split(",");
+        List<String> apiCode = Arrays.asList(split);
+        for (String s : apiCode) {
+            OcpApiTenantRel ocpApiTenantRel = new OcpApiTenantRel();
+            ocpApiTenantRel.setTenantCode(tenantCode);
+            ocpApiTenantRel.setApiCode(s);
+            ocpApiTenantRel.setApiDepCompanyCode(ownerCompanyCode);
+            ocpApiTenantRel.setTenantDepCompanyCode(ownerCompanyCode);
+            ocpApiTenantRel.setApiTenantRelCtime(Timestamp.valueOf(LocalDateTime.now()));
+            ocpApiTenantRel.setApiTenantRelMtime(Timestamp.valueOf(LocalDateTime.now()));
+            boolean save1 = ocpApiTenantRelService.save(ocpApiTenantRel);
+            if (save1) {
+                log.info("添加关联表成功");
+            }
+        }
+        return ResponseVO.ok();
     }
 
     /**
-     * 应用树底层
+     * 个人信息中-查询和应用关联的服务
      *
-     * @param tenantGroupCode
-     * @param tenantGroupCompanyCode
+     * @param tenantCode
      * @return
      */
-    public List<GroupDto> selectBase(String tenantGroupCode, String tenantGroupCompanyCode) {
-        List<GroupDto> groupDto = ocpTenantGroupMapper.selectBase(tenantGroupCode, tenantGroupCompanyCode);
-        return groupDto;
+    @Override
+    public ResponseVO<List<OcpApiBase>> selectOcpByApi(String tenantCode) {
+        LambdaQueryWrapper<OcpApiTenantRel> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(StringUtils.isNotEmpty(tenantCode), OcpApiTenantRel::getTenantCode, tenantCode);
+        List<OcpApiTenantRel> ocpApiTenantRel = ocpApiTenantRelMapper.selectList(lambdaQueryWrapper);
+
+        if (ocpApiTenantRel.size() == 0) {
+            return ResponseVO.ok(Collections.EMPTY_LIST);
+        } else {
+            for (OcpApiTenantRel apiTenantRel : ocpApiTenantRel) {
+                LambdaQueryWrapper<OcpApiBase> queryWrapper = new LambdaQueryWrapper<>();
+                String apiCode = apiTenantRel.getApiCode();
+                queryWrapper.eq(StringUtils.isNotEmpty(apiCode), OcpApiBase::getApiCode, apiCode);
+                List<OcpApiBase> list = apiBasicManagementMapper.selectList(queryWrapper);
+                return ResponseVO.ok(list);
+            }
+
+        }
+        return ResponseVO.ok();
     }
 
     /**

src/main/resources/mapper/ApiBasicManagementMapper.xml

@@ -27,45 +27,63 @@
 
 
     </select>
-    <select id="queryOcpApiBaseDto" resultMap="oabMap">
-        select
-        oab.obj_id,
-        oab.api_code,oae.api_code,oab.api_name,oae.cluster_name,
-        oae.space_name,oab.api_url,oae.api_state ,oab.api_unit ,oab.api_ctime from ocp_api_base oab
-        join ocp_api_extent oae ON oae.api_code = oab.api_code
+<!--    <select id="queryOcpApiBaseDto" resultMap="oabMap">-->
+<!--        select-->
+<!--        oab.obj_id,-->
+<!--        oab.api_code,oae.api_code,oab.api_name,oae.cluster_name,-->
+<!--        oae.space_name,oab.api_url,oae.api_state ,oab.api_unit ,oab.api_ctime from ocp_api_base oab-->
+<!--        join ocp_api_extent oae ON oae.api_code = oab.api_code-->
+<!--        <where>-->
+<!--            <if test="apiCode!=null and apiCode!=''">-->
+<!--                and oab.api_code=#{apiCode}-->
+<!--            </if>-->
+<!--            <if test="apiCode!=null and apiCode!=''">-->
+<!--                and oae.api_code=#{apiCode}-->
+<!--            </if>-->
+<!--            <if test="startTime !=null  ">-->
+<!--                <![CDATA[-->
+<!--                and oab.api_ctime >= #{startTime}-->
+<!--                ]]>-->
+<!--            </if>-->
+<!--            <if test="endTime !=null  ">-->
+<!--                <![CDATA[-->
+<!--            and oab.api_ctime <= #{endTime}-->
+<!--            ]]>-->
+<!--            </if>-->
+<!--            <if test="keyword !=null and keyword != '' ">-->
+<!--                and oab.api_code like CONCAT('%', #{keyword}::text,'%')-->
+<!--            </if>-->
+<!--            <if test="keyword !=null and keyword != '' ">-->
+<!--                and oab.api_name like CONCAT('%', #{keyword}::text,'%')-->
+<!--            </if>-->
+<!--            <if test="apiUnit !=null and apiUnit!=''">-->
+<!--                and oab.api_unit =#{apiUnit}-->
+<!--            </if>-->
+<!--            &lt;!&ndash;            <if test="list!=null">&ndash;&gt;-->
+<!--            &lt;!&ndash;                and oab.api_unit in&ndash;&gt;-->
+<!--            &lt;!&ndash;                <foreach collection="list" index="index" item="apiUnit" open="(" separator="," close=")">&ndash;&gt;-->
+<!--            &lt;!&ndash;                    #{apiUnit}&ndash;&gt;-->
+<!--            &lt;!&ndash;                </foreach>&ndash;&gt;-->
+<!--            &lt;!&ndash;            </if>&ndash;&gt;-->
+<!--        </where>-->
+<!--        limit #{pageNum} offset #{pageSize}-->
+<!--    </select>-->
+
+
+    <select id="selectByCondition" resultType="com.pms.ocp.model.entity.OcpApiBase">
+        select api_name,api_code,api_version,owner_company_code,api_description ,api_center_code from ocp_api_base
         <where>
             <if test="apiCode!=null and apiCode!=''">
-                and oab.api_code=#{apiCode}
-            </if>
-            <if test="apiCode!=null and apiCode!=''">
-                and oae.api_code=#{apiCode}
-            </if>
-            <if test="startTime !=null  ">
-                <![CDATA[
-                and oab.api_ctime >= #{startTime}
-                ]]>
+                and api_code=#{apiCode}
             </if>
-            <if test="endTime !=null  ">
-                <![CDATA[
-            and oab.api_ctime <= #{endTime}
-            ]]>
+            <if test="apiName!=null and apiName!=''">
+                and api_name=#{apiName}
             </if>
-            <if test="keyword !=null and keyword != '' ">
-                and oab.api_code like CONCAT('%', #{keyword}::text,'%')
+            <if test="apiCenterCode!=null and apiCenterCode!=''">
+                and api_center_code=#{apiCenterCode}
             </if>
-            <if test="keyword !=null and keyword != '' ">
-                and oab.api_name like CONCAT('%', #{keyword}::text,'%')
-            </if>
-            <if test="apiUnit !=null and apiUnit!=''">
-                and oab.api_unit =#{apiUnit}
-            </if>
-            <!--            <if test="list!=null">-->
-            <!--                and oab.api_unit in-->
-            <!--                <foreach collection="list" index="index" item="apiUnit" open="(" separator="," close=")">-->
-            <!--                    #{apiUnit}-->
-            <!--                </foreach>-->
-            <!--            </if>-->
         </where>
-        limit #{pageNum} offset #{pageSize}
+
+
     </select>
 </mapper>
\ No newline at end of file

src/main/resources/mapper/AppRegisterMapper.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.AppRegisterMapper">
+
+
+    <select id="getAppInfo" resultType="com.pms.ocp.model.vo.QueryAppInfoVO">
+        select
+        icon.iocn AS icon,
+        base.tenant_name AS appName,
+        base.tenant_version AS version,
+        base.tenant_unit AS unit,
+        extent.tenant_state AS state
+        from ocp_tenant_base base
+        INNER JOIN ocp_tenant_iocn icon ON base.tenant_code = icon.code_no
+        INNER JOIN ocp_tenant_extent extent ON extent.tenant_code = base.tenant_code
+        INNER JOIN ocp_tenant_group g ON g.tenant_group_code = base.tenant_group_code
+        <where>
+            <if test="dto.kind != null and dto.kind != ''">
+                base.professional_kind like CONCAT('%', #{dto.kind}, '%')
+            </if>
+            <if test="dto.type != null and dto.type != ''">
+                and g.tenant_group_name like CONCAT('%', #{dto.type}, '%')
+            </if>
+        </where>
+    </select>
+
+    <insert id="batchInsert">
+        insert into ocp_tenant_iocn(obj_id, iocn_type, code_no, iocn, company_code)
+        values
+        <foreach collection="list" item="item" separator=",">
+            (#{item.objId,jdbcType=VARCHAR},
+            #{item.iocnType,jdbcType=VARCHAR},
+            #{item.codeNo},#{item.iocn},#{item.companyCode,jdbcType=VARCHAR})
+        </foreach>
+    </insert>
+</mapper>
\ No newline at end of file

src/main/resources/mapper/OcpApiGroupMapper.xml

@@ -54,7 +54,7 @@
         select api_group_code,api_group_name,api_group_pcode,api_group_level from ocp_api_group where is_delete = 0
 
         <if test="apiGroupPcode == null">
-            and api_group_pcode is null
+            and api_group_pcode is null or api_group_pcode =''
         </if>
         <if test="apiGroupPcode!=null and apiGroupPcode!=''">
             and api_group_pcode = #{apiGroupPcode}
@@ -65,9 +65,7 @@
         <if test="apiGroupPromotionType!=null and apiGroupPromotionType!=''">
             and api_group_promotion_type =#{apiGroupPromotionType}
         </if>
-        <if test="test=apiPromotion!=null and apiPromotion!=''">
-            and api_group_promotion_type=#{apiPromotion}
-        </if>
+
     </select>
 
 
@@ -77,7 +75,7 @@
         oae.space_name,oab.api_url,oae.api_state ,oab.api_unit ,oab.api_ctime from ocp_api_base oab
         LEFT JOIN ocp_api_extent oae
         on oab.api_code = oae.api_code
-        where oab.is_delete = 0
+        <where>
             <if test="apiGroupCodeList !=null ">
                 and oab.api_group_code in
                 <foreach item="apiGroupCode" collection="apiGroupCodeList" open="(" separator=","
@@ -91,12 +89,12 @@
             <if test="apiPromotion !=null and apiPromotion!=''">
                 and oab.api_promotion = #{apiPromotion}
             </if>
-        <if test="startTime !=null  ">
+            <if test="startCTime !=null  ">
                 <![CDATA[
                 and oab.api_ctime >= #{startCTime}
                 ]]>
             </if>
-        <if test="endTime !=null  ">
+            <if test="endCTime !=null  ">
                 <![CDATA[
             and oab.api_ctime <= #{endCTime}
             ]]>
@@ -104,6 +102,7 @@
             <if test="keyword !=null and keyword != '' ">
                 and oab.api_name like CONCAT('%', #{keyword}::text,'%')
             </if>
+        </where>
     </select>
 
 
@@ -116,8 +115,8 @@
             <if test="apiGroupCompanyCode!=null and apiGroupCompanyCode!=''">
                 and owner_company_code =#{apiGroupCompanyCode}
             </if>
-            <if test="test=apiPromotion!=null and apiPromotion!=''">
-                and api_promotion=#{apiPromotion}
+            <if test="test=apiGroupPromotionType!=null and apiGroupPromotionType!=''">
+                and api_promotion=#{apiGroupPromotionType}
             </if>
         </where>
 

src/main/resources/mapper/OcpApiTreeMapper.xml

@@ -35,4 +35,10 @@
      SELECT * FROM ocp_api_group where api_group_pcode = #{apiGroupCode};
     </select>
 
+
+<!--    根据名称查询名称是否重复-->
+    <select id="selectGroupName" resultType="com.pms.ocp.model.entity.OcpApiGroup">
+     SELECT * FROM ocp_api_group where api_group_name = #{apiGroupName};
+    </select>
+
 </mapper>
\ No newline at end of file

src/main/resources/mapper/OcpGroup.xml

@@ -21,7 +21,7 @@
         tenant_group_code,tenant_group_name,tenant_group_pcode ,tenant_group_level from ocp_tenant_group
         where is_delete = 0
         <if test="tenantGroupCode == null">
-            and tenant_group_pcode = ''
+            and tenant_group_pcode = '' or tenant_group_pcode is null
         </if>
         <if test="tenantGroupCompanyCode !=null and tenantGroupCompanyCode !=''">
             and tenant_group_company_code=#{tenantGroupCompanyCode}
@@ -68,17 +68,7 @@
         <!--            and otb.tenant_code like CONCAT('%', #{keyword}::text,'%')-->
         <!--        </if>-->
     </select>
-    <select id="selectRegister" resultType="com.pms.ocp.model.entity.OcpTenantGroup">
-        select * from ocp_tenant_group where is_delete = 0
-        <if test="tenantGroupCode !=null and tenantGroupCode!=''">
-            and tenant_group_code=#{tenantGroupCode}
-        </if>
-        <if test="tenantGroupCompanyCode !=null and tenantGroupCompanyCode !=''">
-            and tenant_group_company_code=#{tenantGroupCompanyCode}
-        </if>
 
-
-    </select>
     <select id="selectBase" resultType="com.pms.ocp.model.dto.GroupDto">
         select obj_id,tenant_name,tenant_code ,tenant_group_code from ocp_tenant_base
         <where>

src/main/resources/mapper/OcpTenantBaseMapper.xml

@@ -7,4 +7,11 @@
         on otb.tenant_code = ote.tenant_code
         where otb.obj_id = #{objId}
     </select>
+
+    <select id="updataIsDelect" resultType="com.pms.ocp.model.entity.OcpTenantBase">
+        UPDATE ocp_tenant_base SET is_delete = #{isDelete} WHERE obj_id = #{objId};
+    </select>
+
+
+
 </mapper>
\ No newline at end of file