Skip to content

O
operation-control-platform
Commit 8286c4a4 authored by huxiuwu's avatar huxiuwu
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 79dfca17 595edea5
Hide whitespace changes
Inline Side-by-side
Showing with 3382 additions and 118 deletions
operation-control-platform.iml 0 → 100644
View file @ 8286c4a4
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="web" name="Web">
<configuration>
<webroots />
</configuration>
</facet>
<facet type="Spring" name="Spring">
<configuration />
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.4.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.4.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.4.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.4.2" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.13.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
<orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
<orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.27" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.4.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.4.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.41" level="project" />
<orderEntry type="library" name="Maven: org.glassfish:jakarta.el:3.0.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.41" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-configuration-processor:2.4.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.4.2" level="project" />
<orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.3.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.4.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.3" level="project" />
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.6" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.1" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.1" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.1" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.1" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.4.2" level="project" />
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.2.12" level="project" />
<orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.0.1" level="project" />
<orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.0.1" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.1" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.1" level="project" />
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.2.12" level="project" />
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.10" level="project" />
<orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:2.0" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.62" level="project" />
<orderEntry type="library" name="Maven: org.postgresql:postgresql:9.4.1212.jre7" level="project" />
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.16" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.9" level="project" />
<orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-boot-starter:2.0.9" level="project" />
<orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-boot-autoconfigure:2.0.9" level="project" />
<orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring:2.0.9" level="project" />
<orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-annotations:2.0.9" level="project" />
<orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-core:2.0.9" level="project" />
<orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.22" level="project" />
<orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.4.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.4.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.4.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.3" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.18.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest:2.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter:5.7.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.7.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.1.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.7.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-params:5.7.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.7.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.7.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:3.6.28" level="project" />
<orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.19" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.19" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:3.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-junit-jupiter:3.6.28" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.3" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.3.3" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.7.0" level="project" />
<orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.7.16" level="project" />
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.6" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.1" level="project" />
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.19" level="project" />
<orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
<orderEntry type="library" name="Maven: cn.afterturn:easypoi-base:4.3.0" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:16.0.1" level="project" />
<orderEntry type="library" name="Maven: ognl:ognl:3.2.6" level="project" />
<orderEntry type="library" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
<orderEntry type="library" name="Maven: cn.afterturn:easypoi-web:4.3.0" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.3" level="project" />
<orderEntry type="library" name="Maven: cn.afterturn:easypoi-annotation:4.3.0" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-boot-starter:3.0.0" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-oas:3.0.0" level="project" />
<orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-annotations:2.1.2" level="project" />
<orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-models:2.1.2" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-spi:3.0.0" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-schema:3.0.0" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-core:3.0.0" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:3.0.0" level="project" />
<orderEntry type="library" name="Maven: io.github.classgraph:classgraph:4.8.83" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-spring-webmvc:3.0.0" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-spring-webflux:3.0.0" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:3.0.0" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.mapstruct:mapstruct:1.3.1.Final" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-data-rest:3.0.0" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-bean-validators:3.0.0" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:3.0.0" level="project" />
<orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.20" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:3.0.0" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:2.0.0.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-ui:2.0.8" level="project" />
</component>
</module>
\ No newline at end of file
src/main/java/com/pms/ocp/common/aspectj/OperLog.java 0 → 100644
View file @ 8286c4a4
package com.pms.ocp.common.aspectj;
import java.lang.annotation.*;
/**
* @Auther: wangjian
* @Date: 2022/3/8 17:17
* @Description:
*/
@Target(ElementType.METHOD) //target用于标识此注解能标记在方法上还是类上
@Retention(RetentionPolicy.RUNTIME) //retention用于决定此注解的生命周期
@Documented
public @interface OperLog {
/**
* 日志内容
*/
String value() default "";
/**
* 日志类型(1登录日志，2操作日志)
*/
int auditType() default 2;
/**
* 操作日志类型 1查询2添加3修改4删除
*/
int operStatus() default 0;
}
src/main/java/com/pms/ocp/common/aspectj/OperLogAspect.java 0 → 100644
View file @ 8286c4a4
package com.pms.ocp.common.aspectj;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.PropertyFilter;
import com.pms.ocp.model.entity.ModelNote;
import com.pms.ocp.service.ModelNoteService;
import com.sun.xml.internal.bind.v2.TODO;
import org.apache.commons.lang3.StringUtils;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Pointcut;
import org.aspectj.lang.reflect.MethodSignature;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.LocalVariableTableParameterNameDiscoverer;
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.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import java.lang.reflect.Method;
import java.time.LocalDateTime;
/**
* @Auther: wangjian
* @Date: 2022/3/8 17:21
* @Description:
*/
@Aspect
@Component
public class OperLogAspect {
@Autowired
private ModelNoteService modelNoteService;
private static Logger logger = LoggerFactory.getLogger(OperLogAspect.class);
@Pointcut("@annotation(com.pms.ocp.common.aspectj.OperLog)")
public void logPointCut() {
}
@Around("logPointCut()")
public Object around(ProceedingJoinPoint point) throws Throwable {
long beginTime = System.currentTimeMillis();
System.out.println("日志");
//执行方法
Object result = point.proceed();
//执行时长
long time = System.currentTimeMillis() - beginTime;
//保存日志
saveSysLog(point, time, result);
return result;
}
private void saveSysLog(ProceedingJoinPoint point, long time, Object obj) {
MethodSignature signature = (MethodSignature) point.getSignature();
Method method = signature.getMethod();
ModelNote modelNote = new ModelNote();
OperLog operLog = method.getAnnotation(OperLog.class);
if (operLog != null) {
String content = operLog.value();
modelNote.setAuditType(operLog.auditType());
modelNote.setAuditMessageJson(content);
}
//请求的方法名
// String className = point.getTarget().getClass().getName();
String methodName = signature.getName();
// dto.setMethod(className + "." + methodName + "()");
//设置操作类型
if (modelNote.getAuditType() == 3) {
modelNote.setOperStatus(getOperateType(methodName, operLog.operStatus()));
}
//获取request
HttpServletRequest request = getHttpServletRequest();
//请求的参数
modelNote.setAuditMessageJson(getRequestParams(request, point));
// //设置ip地址
// dto.setIp(getIpAddr(request));
//获取用户登录信息
// TODO
// TUser user = (TUser) SecurityUtils.getSubject().getPrincipal();
// if (user != null) {
// modelNote.setUserid(user.getUserName());
// modelNote.setUsername(user.getPassWord());
// }
// modelNote.setCostTime(time);
modelNote.setAuditCtime(LocalDateTime.now());
modelNoteService.createModelNote(modelNote);
}
private int getOperateType(String methodName, int operateType) {
if (operateType >= 0) {
return operateType;
}
if (methodName.startsWith("create")) {
return 1;
}
if (methodName.startsWith("update")) {
return 2;
}
return 2;
}
private HttpServletRequest getHttpServletRequest() {
return ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
}
private String getRequestParams(HttpServletRequest request, JoinPoint joinPoint) {
String httpMethod = request.getMethod();
String param = "";
if ("POST".equals(httpMethod) || "PUT".equals(httpMethod) || "PATCH".equals(httpMethod)) {
Object[] paramArray = joinPoint.getArgs();
Object[] arguments = new Object[paramArray.length];
for (int i = 0; i < paramArray.length; i++) {
if (paramArray[i] instanceof BindingResult || paramArray[i] instanceof ServletRequest || paramArray[i] instanceof ServletResponse || paramArray[i] instanceof MultipartFile) {
continue;
}
arguments[i] = paramArray[i];
}
PropertyFilter propertyFilter = new PropertyFilter() {
@Override
public boolean apply(Object object, String name, Object value) {
if (value != null && value.toString().length() > 500) {
return false;
}
return true;
}
};
param = JSONObject.toJSONString(arguments, propertyFilter);
} else {
MethodSignature signature = (MethodSignature) joinPoint.getSignature();
Method method = signature.getMethod();
//请求的方法参数值
Object[] args = joinPoint.getArgs();
//请求的方法名称
LocalVariableTableParameterNameDiscoverer u = new LocalVariableTableParameterNameDiscoverer();
String[] parameterNames = u.getParameterNames(method);
if (args != null && parameterNames != null) {
for (int i = 0; i < args.length; i++) {
param += " " + parameterNames[i] + ": " + args[i];
}
}
}
return param;
}
public String getIpAddr(HttpServletRequest request) {
String ip = null;
try {
ip = request.getHeader("x-forwarded-for");
if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) {
ip = request.getHeader("Proxy-Client-IP");
}
if (StringUtils.isEmpty(ip) || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
ip = request.getHeader("WL-Proxy-Client-IP");
}
if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) {
ip = request.getHeader("HTTP_CLIENT-IP");
}
if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) {
ip = request.getHeader("HTTP_X-FORWARDED-FOR");
}
if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) {
ip = request.getRemoteAddr();
}
} catch (Exception e) {
logger.error("IP error", e);
}
return ip;
}
}
src/main/java/com/pms/ocp/common/config/PageParam.java
View file @ 8286c4a4
...@@ -18,4 +18,36 @@ public class PageParam { ...@@ -18,4 +18,36 @@ public class PageParam {
private int pageNum; private int pageNum;
private int pageSize; private int pageSize;
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
public int getPageNum() {
return pageNum;
}
public void setPageNum(int pageNum) {
this.pageNum = pageNum;
}
public int getPageSize() {
return pageSize;
}
public void setPageSize(int pageSize) {
this.pageSize = pageSize;
}
} }
src/main/java/com/pms/ocp/common/config/SwaggerConfig.java
View file @ 8286c4a4
...@@ -38,7 +38,7 @@ public class SwaggerConfig { ...@@ -38,7 +38,7 @@ public class SwaggerConfig {
// 用来创建该API的基本信息，展示在文档的页面中（自定义展示的信息） // 用来创建该API的基本信息，展示在文档的页面中（自定义展示的信息）
.apiInfo(apiInfo()) .apiInfo(apiInfo())
//分组名称 //分组名称
.groupName("模型库管理1.0版本") .groupName("运营管控平台-模型应用服务库管理1.0版本")
// 设置哪些接口暴露给Swagger展示 // 设置哪些接口暴露给Swagger展示
.select() .select()
// 扫描所有有注解的api，用这种方式更灵活 // 扫描所有有注解的api，用这种方式更灵活
...@@ -57,9 +57,9 @@ public class SwaggerConfig { ...@@ -57,9 +57,9 @@ public class SwaggerConfig {
// 用ApiInfoBuilder进行定制 // 用ApiInfoBuilder进行定制
return new ApiInfoBuilder() return new ApiInfoBuilder()
// 设置标题 // 设置标题
.title("运营管控架构平台_接口文档") .title("运营管控平台_接口文档")
// 描述 // 描述
.description("运营管控架构平台_接口文档") .description("关于模型库、应用库、服务库各管理接口文档")
// 作者信息 // 作者信息
.contact(new Contact("", "", "")) .contact(new Contact("", "", ""))
// 版本 // 版本
......
src/main/java/com/pms/ocp/common/utils/RandomStringUtil.java 0 → 100644
View file @ 8286c4a4
package com.pms.ocp.common.utils;
import org.apache.commons.lang3.RandomStringUtils;
import java.util.Random;
/**
* @author zhaochengming
* 随机生成字符串
*/
public class RandomStringUtil {
/**
* length 字符串长度
* @param length
* @return
*/
public static String getRandomString(int length){
String str="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
Random random=new Random();
StringBuffer sb=new StringBuffer();
for(int i=0;i<length;i++){
int number=random.nextInt(62);
sb.append(str.charAt(number));
}
return sb.toString();
}
}
src/main/java/com/pms/ocp/controller/AppArrangeController.java 0 → 100644
View file @ 8286c4a4
package com.pms.ocp.controller;
import com.pms.ocp.model.entity.OcpTenantGroup;
import com.pms.ocp.model.vo.ResponseVO;
import com.pms.ocp.service.AppArrangeService;
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.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @className: AppArrangeController
* @Description:应用分类管理接口
* @atuthor: pei-chenxi
* @DateTime: 2022/3/9 14:15
*/
@Slf4j
@RestController
@RequestMapping("/app-arrange/vl")
@Api(tags = "应用分类管理接口")
public class AppArrangeController {
@Autowired
private AppArrangeService appArrangeService;
@PostMapping("/update/app")
@ApiOperation("应用分类修改")
public ResponseVO updateApp(@RequestBody OcpTenantGroup ocpTenantGroup){
boolean flag = appArrangeService.updateApp(ocpTenantGroup);
if (flag){
return ResponseVO.ok();
}
return ResponseVO.error("您输入的分类编码重复，请重新输入");
}
}
src/main/java/com/pms/ocp/controller/ModelBaseController.java
View file @ 8286c4a4
...@@ -2,9 +2,11 @@ package com.pms.ocp.controller; ...@@ -2,9 +2,11 @@ package com.pms.ocp.controller;
import com.pms.ocp.common.constants.CodeEnum; import com.pms.ocp.common.constants.CodeEnum;
import com.pms.ocp.model.entity.Model; import com.pms.ocp.model.entity.Model;
import com.pms.ocp.model.entity.ModelNote;
import com.pms.ocp.model.entity.ModelType; import com.pms.ocp.model.entity.ModelType;
import com.pms.ocp.model.vo.ResponseVO; import com.pms.ocp.model.vo.ResponseVO;
import com.pms.ocp.service.ModelGroupService; import com.pms.ocp.service.ModelGroupService;
import com.pms.ocp.service.ModelNoteService;
import com.pms.ocp.service.ModelPropertyService; import com.pms.ocp.service.ModelPropertyService;
import com.pms.ocp.service.ModelService; import com.pms.ocp.service.ModelService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
...@@ -37,6 +39,9 @@ public class ModelBaseController { ...@@ -37,6 +39,9 @@ public class ModelBaseController {
@Autowired @Autowired
private ModelPropertyService modelPropertyService; private ModelPropertyService modelPropertyService;
@Autowired
private ModelNoteService modelNoteService;
/** /**
* 模型分类-查询 * 模型分类-查询
* *
...@@ -187,8 +192,11 @@ public class ModelBaseController { ...@@ -187,8 +192,11 @@ public class ModelBaseController {
*/ */
@ApiOperation("模型事记-查询") @ApiOperation("模型事记-查询")
@GetMapping("/get/model/note") @GetMapping("/get/model/note")
public ResponseVO getModelNote() { public ResponseVO getModelNote(@RequestParam(value = "modelCode") String modelCode) {
return ResponseVO.ok();
List<ModelNote> modelNoteList = modelNoteService.getModelNoteList(modelCode);
return ResponseVO.ok(modelNoteList);
} }
/** /**
......
src/main/java/com/pms/ocp/controller/OcpApiTreeController.java
View file @ 8286c4a4
package com.pms.ocp.controller; package com.pms.ocp.controller;
import com.pms.ocp.model.dto.ApiParamDTO; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.pms.ocp.common.config.PageParam;
import com.pms.ocp.model.dto.ApiTreeGroupDto; import com.pms.ocp.model.dto.ApiTreeGroupDto;
import com.pms.ocp.model.dto.OcpApiGroupDtos; import com.pms.ocp.model.dto.OcpApiGroupDtos;
import com.pms.ocp.model.dto.PageGroupDto;
import com.pms.ocp.model.entity.OcpApiGroup; import com.pms.ocp.model.entity.OcpApiGroup;
import com.pms.ocp.model.vo.ResponseVO; import com.pms.ocp.model.vo.ResponseVO;
import com.pms.ocp.service.OcpApiTreeService; import com.pms.ocp.service.OcpApiTreeService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -49,11 +50,29 @@ public class OcpApiTreeController { ...@@ -49,11 +50,29 @@ public class OcpApiTreeController {
return ResponseVO.error("您的服务编码重复,请重新输入"); return ResponseVO.error("您的服务编码重复,请重新输入");
} }
/*@GetMapping("/getone")
@ApiOperation("服务树分类--分级数据")
public List<OcpApiGroup> getOne(int pageSize,int pageNum,int apiGroupLevel){
List<OcpApiGroup> onePage = service.getOnePage(pageSize, pageNum, apiGroupLevel);
return onePage;
}*/
@PostMapping("/getone")
@ApiOperation("服务树分类--分级数据")
public Page<OcpApiGroup> getOne(@RequestBody PageGroupDto pageGroupDto){
Page<OcpApiGroup> onePages = service.getOnePages(pageGroupDto);
return onePages;
}
@PostMapping("/updatatree") @PostMapping("/updatatree")
@ApiOperation("服务树分类--修改") @ApiOperation("服务树分类--修改")
public ResponseVO updataTree(@RequestBody OcpApiGroup ocpApiGroup){ public ResponseVO updataTree(@RequestBody OcpApiGroup ocpApiGroup){
service.updataOcpTree(ocpApiGroup); boolean flag = service.updataOcpTree(ocpApiGroup);
return ResponseVO.ok(); if (flag){
return ResponseVO.ok();
}
return ResponseVO.error("您输入的服务编码重复，请重新输入");
} }
@PostMapping("/deletetree") @PostMapping("/deletetree")
@ApiOperation("服务树分类--删除") @ApiOperation("服务树分类--删除")
......
src/main/java/com/pms/ocp/mapper/AppArrangeMapper.java 0 → 100644
View file @ 8286c4a4
package com.pms.ocp.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.pms.ocp.model.entity.OcpTenantGroup;
import org.apache.ibatis.annotations.Mapper;
/**
* @className: AppArrangeMapper
* @Description:应用分类数据层
* @atuthor: pei-chenxi
* @DateTime: 2022/3/9 14:18
*/
@Mapper
public interface AppArrangeMapper extends BaseMapper<OcpTenantGroup> {
}
src/main/java/com/pms/ocp/mapper/ModelNoteMapper.java
View file @ 8286c4a4
...@@ -2,6 +2,7 @@ package com.pms.ocp.mapper; ...@@ -2,6 +2,7 @@ package com.pms.ocp.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.pms.ocp.model.entity.Model; import com.pms.ocp.model.entity.Model;
import com.pms.ocp.model.entity.ModelNote;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
/** /**
...@@ -11,5 +12,5 @@ import org.apache.ibatis.annotations.Mapper; ...@@ -11,5 +12,5 @@ import org.apache.ibatis.annotations.Mapper;
*/ */
@Mapper @Mapper
public interface ModelNoteMapper extends BaseMapper<Model> { public interface ModelNoteMapper extends BaseMapper<ModelNote> {
} }
src/main/java/com/pms/ocp/mapper/ModelPropertyMapper.java
View file @ 8286c4a4
...@@ -2,6 +2,7 @@ package com.pms.ocp.mapper; ...@@ -2,6 +2,7 @@ package com.pms.ocp.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.pms.ocp.model.entity.Model; import com.pms.ocp.model.entity.Model;
import com.pms.ocp.model.entity.ModelProperty;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
/** /**
......
src/main/java/com/pms/ocp/model/dto/ApiTreeGroupDto.java
View file @ 8286c4a4
...@@ -10,22 +10,26 @@ import java.util.List; ...@@ -10,22 +10,26 @@ import java.util.List;
@Data @Data
public class ApiTreeGroupDto { public class ApiTreeGroupDto {
@ApiModelProperty("一级") @ApiModelProperty("1中台层")
private List<OneTreeUpList> oneList; private List<OneTreeUpList> oneList;
@ApiModelProperty("二级") @ApiModelProperty("2中心层")
private List<TwoDownList> twoList; private List<TwoDownList> twoList;
@ApiModelProperty("三级") @ApiModelProperty("3服务组层")
private List<ThreeTreeList> ThreeList; private List<ThreeTreeList> ThreeList;
public List<OneTreeUpList> getOneupList() { @ApiModelProperty("4服务层")
private List<FourTreeList> fourList;
public List<OneTreeUpList> getOneList() {
return oneList; return oneList;
} }
public void setOneupList(List<OneTreeUpList> oneupList) { public void setOneList(List<OneTreeUpList> oneList) {
this.oneList = oneupList; this.oneList = oneList;
} }
public List<TwoDownList> getTwoList() { public List<TwoDownList> getTwoList() {
...@@ -43,4 +47,12 @@ public class ApiTreeGroupDto { ...@@ -43,4 +47,12 @@ public class ApiTreeGroupDto {
public void setThreeList(List<ThreeTreeList> threeList) { public void setThreeList(List<ThreeTreeList> threeList) {
ThreeList = threeList; ThreeList = threeList;
} }
public List<FourTreeList> getFourList() {
return fourList;
}
public void setFourList(List<FourTreeList> fourList) {
this.fourList = fourList;
}
} }
src/main/java/com/pms/ocp/model/dto/FourTreeList.java 0 → 100644
View file @ 8286c4a4
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 = "4服务层")
@Data
public class FourTreeList {
@ApiModelProperty("主键ID")
private String objId;
@ApiModelProperty("分类编码")
private String apiGroupCode;
@ApiModelProperty("分类名称")
private String apiGroupName;
@ApiModelProperty("推广类型0统推，1自建")
private long apiGroupPromotionType;
@ApiModelProperty("分类所属公司")
private String apiGroupCompanyCode;
@ApiModelProperty("分类版本")
private String apiGroupVersion;
@ApiModelProperty("显示顺序")
private long apiGroupOrderNo;
@ApiModelProperty("提交人id")
private String apiGroupUserId;
@ApiModelProperty("提交人姓名")
private String apiGroupUserName;
@ApiModelProperty("创建时间")
private Timestamp apiGroupCtime;
@ApiModelProperty("修改时间")
private Timestamp apiGroupMtime;
@ApiModelProperty("上级code")
private String apiGroupPcode;
@ApiModelProperty("是否删除0-否1-是")
private long isDelete;
@ApiModelProperty("分层树层级 1中台层 2中心层 3 服务组层 4服务层 ")
private long apiGroupLevel;
public String getApiGroupPcode() {
return apiGroupPcode;
}
public void setApiGroupPcode(String apiGroupPcode) {
this.apiGroupPcode = apiGroupPcode;
}
public String getObjId() {
return objId;
}
public void setObjId(String objId) {
this.objId = objId;
}
public String getApiGroupCode() {
return apiGroupCode;
}
public void setApiGroupCode(String apiGroupCode) {
this.apiGroupCode = apiGroupCode;
}
public String getApiGroupName() {
return apiGroupName;
}
public void setApiGroupName(String apiGroupName) {
this.apiGroupName = apiGroupName;
}
public long getApiGroupPromotionType() {
return apiGroupPromotionType;
}
public void setApiGroupPromotionType(long apiGroupPromotionType) {
this.apiGroupPromotionType = apiGroupPromotionType;
}
public String getApiGroupUserId() {
return apiGroupUserId;
}
public void setApiGroupUserId(String apiGroupUserId) {
this.apiGroupUserId = apiGroupUserId;
}
public String getApiGroupUserName() {
return apiGroupUserName;
}
public void setApiGroupUserName(String apiGroupUserName) {
this.apiGroupUserName = apiGroupUserName;
}
public Timestamp getApiGroupCtime() {
return apiGroupCtime;
}
public void setApiGroupCtime(Timestamp apiGroupCtime) {
this.apiGroupCtime = apiGroupCtime;
}
public Timestamp getApiGroupMtime() {
return apiGroupMtime;
}
public void setApiGroupMtime(Timestamp apiGroupMtime) {
this.apiGroupMtime = apiGroupMtime;
}
public String getApiGroupVersion() {
return apiGroupVersion;
}
public void setApiGroupVersion(String apiGroupVersion) {
this.apiGroupVersion = apiGroupVersion;
}
public long getApiGroupOrderNo() {
return apiGroupOrderNo;
}
public void setApiGroupOrderNo(long apiGroupOrderNo) {
this.apiGroupOrderNo = apiGroupOrderNo;
}
public String getApiGroupCompanyCode() {
return apiGroupCompanyCode;
}
public void setApiGroupCompanyCode(String apiGroupCompanyCode) {
this.apiGroupCompanyCode = apiGroupCompanyCode;
}
public long getIsDelete() {
return isDelete;
}
public void setIsDelete(long isDelete) {
this.isDelete = isDelete;
}
public long getApiGroupLevel() {
return apiGroupLevel;
}
public void setApiGroupLevel(long apiGroupLevel) {
this.apiGroupLevel = apiGroupLevel;
}
}
src/main/java/com/pms/ocp/model/dto/OcpApiGroupDtos.java
View file @ 8286c4a4
...@@ -7,15 +7,15 @@ import lombok.Data; ...@@ -7,15 +7,15 @@ import lombok.Data;
import java.sql.Timestamp; import java.sql.Timestamp;
@ApiModel(value = "新增接收参数")
@ApiModel(value = "服务分类新增关系dto")
@Data @Data
public class OcpApiGroupDtos { public class OcpApiGroupDtos {
@ApiModelProperty("主键ID") @ApiModelProperty(value = "当前页码")
private String objId; private int pageSize;
@ApiModelProperty(value = "每页大小")
private int pageNum;
@ApiModelProperty("分类编码") @ApiModelProperty("分类编码")
private String apiGroupCode; private String apiGroupCode;
...@@ -26,6 +26,15 @@ public class OcpApiGroupDtos { ...@@ -26,6 +26,15 @@ public class OcpApiGroupDtos {
@ApiModelProperty("推广类型0统推，1自建") @ApiModelProperty("推广类型0统推，1自建")
private long apiGroupPromotionType; private long apiGroupPromotionType;
@ApiModelProperty("分类所属公司")
private String apiGroupCompanyCode;
@ApiModelProperty("分类版本")
private String apiGroupVersion;
@ApiModelProperty("显示顺序")
private long apiGroupOrderNo;
@ApiModelProperty("提交人id") @ApiModelProperty("提交人id")
private String apiGroupUserId; private String apiGroupUserId;
...@@ -35,17 +44,28 @@ public class OcpApiGroupDtos { ...@@ -35,17 +44,28 @@ public class OcpApiGroupDtos {
@ApiModelProperty("创建时间") @ApiModelProperty("创建时间")
private Timestamp apiGroupCtime; private Timestamp apiGroupCtime;
@ApiModelProperty("修改时间") @ApiModelProperty("修改时间")
private Timestamp apiGroupMtime; private Timestamp apiGroupMtime;
@ApiModelProperty("分类版本")
private String apiGroupVersion;
@ApiModelProperty("显示顺序")
private long apiGroupOrderNo;
@ApiModelProperty("上级code") @ApiModelProperty("上级code")
private String apiGroupPcode; private String apiGroupPcode;
@ApiModelProperty("是否删除0-否1-是")
private long isDelete;
@ApiModelProperty("分层树层级 1中台层 2中心层 3 服务组层 4服务层 ")
private long apiGroupLevel;
@ApiModelProperty("服务代码")
private String apiCode;
@ApiModelProperty("服务接口中文名称")
private String apiName;
@ApiModelProperty("推广类型0:统建；1:自建")
private long apiPromotion;
@ApiModelProperty("服务请求体") @ApiModelProperty("服务请求体")
private String apiReq; private String apiReq;
...@@ -55,6 +75,15 @@ public class OcpApiGroupDtos { ...@@ -55,6 +75,15 @@ public class OcpApiGroupDtos {
@ApiModelProperty("服务地址") @ApiModelProperty("服务地址")
private String apiUrl; private String apiUrl;
@ApiModelProperty("服务创建时间")
private Timestamp apiCtime;
@ApiModelProperty("服务修改时间")
private Timestamp apiMtime;
@ApiModelProperty("创建者用户ID")
private String apiUserId;
@ApiModelProperty("建设单位") @ApiModelProperty("建设单位")
private String apiUnit; private String apiUnit;
...@@ -64,10 +93,235 @@ public class OcpApiGroupDtos { ...@@ -64,10 +93,235 @@ public class OcpApiGroupDtos {
@ApiModelProperty("服务所属公司") @ApiModelProperty("服务所属公司")
private String ownerCompanyName; private String ownerCompanyName;
@ApiModelProperty("分类所属公司") @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区")
private String apiGroupCompanyCode; private long apiZone;
@ApiModelProperty("是否删除0-否1-是") @ApiModelProperty("'所属层级 1:应用层;2:平台层;3:网络层;4:感知层;")
private long isDelete; private long apiLayer;
@ApiModelProperty("服务版本（最新版本）")
private long apiVersion;
public String getApiGroupCode() {
return apiGroupCode;
}
public void setApiGroupCode(String apiGroupCode) {
this.apiGroupCode = apiGroupCode;
}
public String getApiGroupName() {
return apiGroupName;
}
public void setApiGroupName(String apiGroupName) {
this.apiGroupName = apiGroupName;
}
public long getApiGroupPromotionType() {
return apiGroupPromotionType;
}
public void setApiGroupPromotionType(long apiGroupPromotionType) {
this.apiGroupPromotionType = apiGroupPromotionType;
}
public String getApiGroupCompanyCode() {
return apiGroupCompanyCode;
}
public void setApiGroupCompanyCode(String apiGroupCompanyCode) {
this.apiGroupCompanyCode = apiGroupCompanyCode;
}
public String getApiGroupVersion() {
return apiGroupVersion;
}
public void setApiGroupVersion(String apiGroupVersion) {
this.apiGroupVersion = apiGroupVersion;
}
public long getApiGroupOrderNo() {
return apiGroupOrderNo;
}
public void setApiGroupOrderNo(long apiGroupOrderNo) {
this.apiGroupOrderNo = apiGroupOrderNo;
}
public String getApiGroupUserId() {
return apiGroupUserId;
}
public void setApiGroupUserId(String apiGroupUserId) {
this.apiGroupUserId = apiGroupUserId;
}
public String getApiGroupUserName() {
return apiGroupUserName;
}
public void setApiGroupUserName(String apiGroupUserName) {
this.apiGroupUserName = apiGroupUserName;
}
public Timestamp getApiGroupCtime() {
return apiGroupCtime;
}
public void setApiGroupCtime(Timestamp apiGroupCtime) {
this.apiGroupCtime = apiGroupCtime;
}
public Timestamp getApiGroupMtime() {
return apiGroupMtime;
}
public void setApiGroupMtime(Timestamp apiGroupMtime) {
this.apiGroupMtime = apiGroupMtime;
}
public String getApiGroupPcode() {
return apiGroupPcode;
}
public void setApiGroupPcode(String apiGroupPcode) {
this.apiGroupPcode = apiGroupPcode;
}
public long getIsDelete() {
return isDelete;
}
public void setIsDelete(long isDelete) {
this.isDelete = isDelete;
}
public long getApiGroupLevel() {
return apiGroupLevel;
}
public void setApiGroupLevel(long apiGroupLevel) {
this.apiGroupLevel = apiGroupLevel;
}
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 long getApiPromotion() {
return apiPromotion;
}
public void setApiPromotion(long apiPromotion) {
this.apiPromotion = apiPromotion;
}
public String getApiReq() {
return apiReq;
}
public void setApiReq(String apiReq) {
this.apiReq = apiReq;
}
public String getApiResp() {
return apiResp;
}
public void setApiResp(String apiResp) {
this.apiResp = apiResp;
}
public String getApiUrl() {
return apiUrl;
}
public void setApiUrl(String apiUrl) {
this.apiUrl = apiUrl;
}
public Timestamp getApiCtime() {
return apiCtime;
}
public void setApiCtime(Timestamp apiCtime) {
this.apiCtime = apiCtime;
}
public Timestamp getApiMtime() {
return apiMtime;
}
public void setApiMtime(Timestamp apiMtime) {
this.apiMtime = apiMtime;
}
public String getApiUserId() {
return apiUserId;
}
public void setApiUserId(String apiUserId) {
this.apiUserId = apiUserId;
}
public String getApiUnit() {
return apiUnit;
}
public void setApiUnit(String apiUnit) {
this.apiUnit = apiUnit;
}
public String getOwnerCompanyCode() {
return ownerCompanyCode;
}
public void setOwnerCompanyCode(String ownerCompanyCode) {
this.ownerCompanyCode = ownerCompanyCode;
}
public String getOwnerCompanyName() {
return ownerCompanyName;
}
public void setOwnerCompanyName(String ownerCompanyName) {
this.ownerCompanyName = ownerCompanyName;
}
public long getApiZone() {
return apiZone;
}
public void setApiZone(long apiZone) {
this.apiZone = apiZone;
}
public long getApiLayer() {
return apiLayer;
}
public void setApiLayer(long apiLayer) {
this.apiLayer = apiLayer;
}
public long getApiVersion() {
return apiVersion;
}
public void setApiVersion(long apiVersion) {
this.apiVersion = apiVersion;
}
} }
src/main/java/com/pms/ocp/model/dto/OneTreeUpList.java
View file @ 8286c4a4
...@@ -13,7 +13,7 @@ import java.util.List; ...@@ -13,7 +13,7 @@ import java.util.List;
@EqualsAndHashCode(callSuper=false) @EqualsAndHashCode(callSuper=false)
@ApiModel(value = "服务树一级目录") @ApiModel(value = "1中台层")
@Data @Data
public class OneTreeUpList{ public class OneTreeUpList{
...@@ -57,7 +57,16 @@ public class OneTreeUpList{ ...@@ -57,7 +57,16 @@ public class OneTreeUpList{
@ApiModelProperty("是否删除0-否1-是") @ApiModelProperty("是否删除0-否1-是")
private long isDelete; private long isDelete;
@ApiModelProperty("分层树层级 1中台层 2中心层 3 服务组层 4服务层 ")
private long apiGroupLevel;
public long getApiGroupLevel() {
return apiGroupLevel;
}
public void setApiGroupLevel(long apiGroupLevel) {
this.apiGroupLevel = apiGroupLevel;
}
public String getObjId() { public String getObjId() {
return objId; return objId;
......
src/main/java/com/pms/ocp/model/dto/PageGroupDto.java 0 → 100644
View file @ 8286c4a4
package com.pms.ocp.model.dto;
import com.pms.ocp.common.config.PageParam;
import io.swagger.annotations.ApiModelProperty;
import java.sql.Timestamp;
/**
* 分页查询dto
*/
public class PageGroupDto extends PageParam {
@ApiModelProperty("主键ID")
private String objId;
@ApiModelProperty("分类编码")
private String apiGroupCode;
@ApiModelProperty("分类名称")
private String apiGroupName;
@ApiModelProperty("推广类型0统推，1自建")
private long apiGroupPromotionType;
@ApiModelProperty("分类所属公司")
private String apiGroupCompanyCode;
@ApiModelProperty("分类版本")
private String apiGroupVersion;
@ApiModelProperty("显示顺序")
private long apiGroupOrderNo;
@ApiModelProperty("提交人id")
private String apiGroupUserId;
@ApiModelProperty("提交人姓名")
private String apiGroupUserName;
@ApiModelProperty("创建时间")
private Timestamp apiGroupCtime;
@ApiModelProperty("修改时间")
private Timestamp apiGroupMtime;
@ApiModelProperty("上级code")
private String apiGroupPcode;
@ApiModelProperty("是否删除0-否1-是")
private long isDelete;
@ApiModelProperty("分层树层级 1中台层 2中心层 3 服务组层 4服务层 ")
private long apiGroupLevel;
public String getObjId() {
return objId;
}
public void setObjId(String objId) {
this.objId = objId;
}
public String getApiGroupCode() {
return apiGroupCode;
}
public void setApiGroupCode(String apiGroupCode) {
this.apiGroupCode = apiGroupCode;
}
public String getApiGroupName() {
return apiGroupName;
}
public void setApiGroupName(String apiGroupName) {
this.apiGroupName = apiGroupName;
}
public long getApiGroupPromotionType() {
return apiGroupPromotionType;
}
public void setApiGroupPromotionType(long apiGroupPromotionType) {
this.apiGroupPromotionType = apiGroupPromotionType;
}
public String getApiGroupCompanyCode() {
return apiGroupCompanyCode;
}
public void setApiGroupCompanyCode(String apiGroupCompanyCode) {
this.apiGroupCompanyCode = apiGroupCompanyCode;
}
public String getApiGroupVersion() {
return apiGroupVersion;
}
public void setApiGroupVersion(String apiGroupVersion) {
this.apiGroupVersion = apiGroupVersion;
}
public long getApiGroupOrderNo() {
return apiGroupOrderNo;
}
public void setApiGroupOrderNo(long apiGroupOrderNo) {
this.apiGroupOrderNo = apiGroupOrderNo;
}
public String getApiGroupUserId() {
return apiGroupUserId;
}
public void setApiGroupUserId(String apiGroupUserId) {
this.apiGroupUserId = apiGroupUserId;
}
public String getApiGroupUserName() {
return apiGroupUserName;
}
public void setApiGroupUserName(String apiGroupUserName) {
this.apiGroupUserName = apiGroupUserName;
}
public Timestamp getApiGroupCtime() {
return apiGroupCtime;
}
public void setApiGroupCtime(Timestamp apiGroupCtime) {
this.apiGroupCtime = apiGroupCtime;
}
public Timestamp getApiGroupMtime() {
return apiGroupMtime;
}
public void setApiGroupMtime(Timestamp apiGroupMtime) {
this.apiGroupMtime = apiGroupMtime;
}
public String getApiGroupPcode() {
return apiGroupPcode;
}
public void setApiGroupPcode(String apiGroupPcode) {
this.apiGroupPcode = apiGroupPcode;
}
public long getIsDelete() {
return isDelete;
}
public void setIsDelete(long isDelete) {
this.isDelete = isDelete;
}
public long getApiGroupLevel() {
return apiGroupLevel;
}
public void setApiGroupLevel(long apiGroupLevel) {
this.apiGroupLevel = apiGroupLevel;
}
}
src/main/java/com/pms/ocp/model/dto/ThreeTreeList.java
View file @ 8286c4a4
...@@ -10,7 +10,7 @@ import lombok.Data; ...@@ -10,7 +10,7 @@ import lombok.Data;
import java.sql.Timestamp; import java.sql.Timestamp;
@ApiModel(value = "服务树三级目录") @ApiModel(value = "服务组层")
@Data @Data
public class ThreeTreeList { public class ThreeTreeList {
@TableId(type = IdType.ASSIGN_ID) @TableId(type = IdType.ASSIGN_ID)
...@@ -52,7 +52,16 @@ public class ThreeTreeList { ...@@ -52,7 +52,16 @@ public class ThreeTreeList {
@ApiModelProperty("是否删除0-否1-是") @ApiModelProperty("是否删除0-否1-是")
private long isDelete; private long isDelete;
@ApiModelProperty("分层树层级 1中台层 2中心层 3 服务组层 4服务层 ")
private long apiGroupLevel;
public long getApiGroupLevel() {
return apiGroupLevel;
}
public void setApiGroupLevel(long apiGroupLevel) {
this.apiGroupLevel = apiGroupLevel;
}
public String getObjId() { public String getObjId() {
return objId; return objId;
......
src/main/java/com/pms/ocp/model/dto/TwoDownList.java
View file @ 8286c4a4
...@@ -11,9 +11,10 @@ import lombok.Data; ...@@ -11,9 +11,10 @@ import lombok.Data;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.List; import java.util.List;
@ApiModel(value = "服务树二级目录") @ApiModel(value = "中心层")
@Data @Data
public class TwoDownList { public class TwoDownList {
@TableId(type = IdType.ASSIGN_ID) @TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty("主键ID") @ApiModelProperty("主键ID")
private String objId; private String objId;
...@@ -54,6 +55,17 @@ public class TwoDownList { ...@@ -54,6 +55,17 @@ public class TwoDownList {
@ApiModelProperty("是否删除0-否1-是") @ApiModelProperty("是否删除0-否1-是")
private long isDelete; private long isDelete;
@ApiModelProperty("分层树层级 1中台层 2中心层 3 服务组层 4服务层 ")
private long apiGroupLevel;
public long getApiGroupLevel() {
return apiGroupLevel;
}
public void setApiGroupLevel(long apiGroupLevel) {
this.apiGroupLevel = apiGroupLevel;
}
public String getObjId() { public String getObjId() {
return objId; return objId;
......
src/main/java/com/pms/ocp/model/entity/ModelNote.java
View file @ 8286c4a4
package com.pms.ocp.model.entity; 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 lombok.Data;
import java.time.LocalDateTime;
/** /**
* @Auther: wangjian * @Auther: wangjian
* @Date: 2022/2/22 16:52 * @Date: 2022/2/22 16:52
* @Description:模型事记对象 * @Description:模型事记记录对象
*/ */
@Data
@TableName("ocp_model_audit")
public class ModelNote { public class ModelNote {
@TableId(value = "obj_id", type = IdType.ASSIGN_ID)
private String objId;
/**
* 模型代码
*/
private int modelCode;
/**
* 属性代码
*/
private int propCode;
/**
* 事记类型 0:人工操作,1:流程管控,3:总部下发
*/
private int auditType;
/**
* 模型异动详情
*/
private String auditMessageJson;
/**
* 异动类型 0:新增,1:迭代
*/
private int operStatus;
/**
* 异动申请人id
*/
private String applyUserId;
/**
* 异动申请人姓名
*/
private String applyUserName;
/**
* 异动时间
*/
private long applyTime;
/**
* 版本
*/
private String applyVersion;
/**
* 新增时间
*/
private LocalDateTime auditCtime;
/**
* 异动公司编号
*/
private String auditCompanyCode;
/**
* 提交人id
*/
private String auditUserId;
/**
* 提交人姓名
*/
private String auditUserName;
/**
* 修改时间
*/
private LocalDateTime auditMtime;
} }
//
// COMMENT ON COLUMN public.ocp_model_audit.obj_id IS '主键是';
// COMMENT ON COLUMN public.ocp_model_audit.model_code IS '模型代码是';
// COMMENT ON COLUMN public.ocp_model_audit.prop_code IS '属性代码';
// COMMENT ON COLUMN public.ocp_model_audit.oper_status IS '异动类型0:新增,1:迭代';
// COMMENT ON COLUMN public.ocp_model_audit.oper_target IS '操作对象0:表，1:属性';
// COMMENT ON COLUMN public.ocp_model_audit.audit_type IS '事记类型0:人工操作,1:流程管控,3:总部下发';
// COMMENT ON COLUMN public.ocp_model_audit.audit_message_json IS '模型异动详情';
// COMMENT ON COLUMN public.ocp_model_audit.apply_user_id IS '异动申请人id';
// COMMENT ON COLUMN public.ocp_model_audit.apply_user_name IS '异动申请人';
// COMMENT ON COLUMN public.ocp_model_audit.apply_time IS '异动时间';
// COMMENT ON COLUMN public.ocp_model_audit.audit_ctime IS '申请时间';
// COMMENT ON COLUMN public.ocp_model_audit.audit_mtime IS '修改时间';
// COMMENT ON COLUMN public.ocp_model_audit.apply_version IS '版本';
// COMMENT ON COLUMN public.ocp_model_audit.audit_company_code IS '异动公司code';
// COMMENT ON COLUMN public.ocp_model_audit.audit_user_id IS '提交人id';
// COMMENT ON COLUMN public.ocp_model_audit.audit_user_name IS '提交人姓名';
src/main/java/com/pms/ocp/model/entity/OcpApiGroup.java
View file @ 8286c4a4
...@@ -58,7 +58,13 @@ public class OcpApiGroup { ...@@ -58,7 +58,13 @@ public class OcpApiGroup {
private long apiGroupLevel; private long apiGroupLevel;
public long getApiGroupLevel() {
return apiGroupLevel;
}
public void setApiGroupLevel(long apiGroupLevel) {
this.apiGroupLevel = apiGroupLevel;
}
public String getObjId() { public String getObjId() {
return objId; return objId;
...@@ -176,4 +182,5 @@ public class OcpApiGroup { ...@@ -176,4 +182,5 @@ public class OcpApiGroup {
this.isDelete = isDelete; this.isDelete = isDelete;
} }
} }
src/main/java/com/pms/ocp/model/entity/OcpTenantAudit.java 0 → 100644
View file @ 8286c4a4
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.util.Date;
/**
* 应用事记表
* @TableName ocp_tenant_audit
*/
@Data
@Accessors(chain = true)
@TableName("ocp_tenant_audit")
@ApiModel("应用事记表1")
public class OcpTenantAudit implements Serializable {
/**
* 主键
*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty("主键ID")
private String objId;
/**
* 应用code
*/
@ApiModelProperty("应用code")
private String tenantCode;
/**
* 操作状态0:新增,1:迭代；2，下线
*/
@ApiModelProperty("操作状态0:新增,1:迭代；2，下线")
private Short operStatus;
/**
* 类型0:人工操作,1:流程管控,3:总部下发
*/
@ApiModelProperty("类型0:人工操作,1:流程管控,3:总部下发")
private Short auditType;
/**
* 备注简述
*/
@ApiModelProperty("备注简述")
private String auditMessage;
/**
* 应用事记内容
*/
@ApiModelProperty("应用事记内容")
private String auditJson;
/**
* 提交人id
*/
@ApiModelProperty("提交人id")
private String auditUserId;
/**
* 提交人姓名
*/
@ApiModelProperty("提交人姓名")
private String auditUserName;
/**
* 创建时间
*/
@ApiModelProperty("创建时间")
private Date auditCtime;
/**
* 应用版本(当前版本)
*/
@ApiModelProperty(" 应用版本(当前版本")
private String applyVersion;
/**
* 上一版本
*/
@ApiModelProperty("上一版本")
private String perTenantVersion;
private static final long serialVersionUID = 1L;
/**
* 主键
*/
public String getObjId() {
return objId;
}
/**
* 主键
*/
public void setObjId(String objId) {
this.objId = objId;
}
/**
* 应用code
*/
public String getTenantCode() {
return tenantCode;
}
/**
* 应用code
*/
public void setTenantCode(String tenantCode) {
this.tenantCode = tenantCode;
}
/**
* 操作状态0:新增,1:迭代；2，下线
*/
public Short getOperStatus() {
return operStatus;
}
/**
* 操作状态0:新增,1:迭代；2，下线
*/
public void setOperStatus(Short operStatus) {
this.operStatus = operStatus;
}
/**
* 类型0:人工操作,1:流程管控,3:总部下发
*/
public Short getAuditType() {
return auditType;
}
/**
* 类型0:人工操作,1:流程管控,3:总部下发
*/
public void setAuditType(Short auditType) {
this.auditType = auditType;
}
/**
* 备注简述
*/
public String getAuditMessage() {
return auditMessage;
}
/**
* 备注简述
*/
public void setAuditMessage(String auditMessage) {
this.auditMessage = auditMessage;
}
/**
* 应用事记内容
*/
public String getAuditJson() {
return auditJson;
}
/**
* 应用事记内容
*/
public void setAuditJson(String auditJson) {
this.auditJson = auditJson;
}
/**
* 提交人id
*/
public String getAuditUserId() {
return auditUserId;
}
/**
* 提交人id
*/
public void setAuditUserId(String auditUserId) {
this.auditUserId = auditUserId;
}
/**
* 提交人姓名
*/
public String getAuditUserName() {
return auditUserName;
}
/**
* 提交人姓名
*/
public void setAuditUserName(String auditUserName) {
this.auditUserName = auditUserName;
}
/**
* 创建时间
*/
public Date getAuditCtime() {
return auditCtime;
}
/**
* 创建时间
*/
public void setAuditCtime(Date auditCtime) {
this.auditCtime = auditCtime;
}
/**
* 应用版本(当前版本)
*/
public String getApplyVersion() {
return applyVersion;
}
/**
* 应用版本(当前版本)
*/
public void setApplyVersion(String applyVersion) {
this.applyVersion = applyVersion;
}
/**
* 上一版本
*/
public String getPerTenantVersion() {
return perTenantVersion;
}
/**
* 上一版本
*/
public void setPerTenantVersion(String perTenantVersion) {
this.perTenantVersion = perTenantVersion;
}
@Override
public boolean equals(Object that) {
if (this == that) {
return true;
}
if (that == null) {
return false;
}
if (getClass() != that.getClass()) {
return false;
}
OcpTenantAudit other = (OcpTenantAudit) that;
return (this.getObjId() == null ? other.getObjId() == null : this.getObjId().equals(other.getObjId()))
&& (this.getTenantCode() == null ? other.getTenantCode() == null : this.getTenantCode().equals(other.getTenantCode()))
&& (this.getOperStatus() == null ? other.getOperStatus() == null : this.getOperStatus().equals(other.getOperStatus()))
&& (this.getAuditType() == null ? other.getAuditType() == null : this.getAuditType().equals(other.getAuditType()))
&& (this.getAuditMessage() == null ? other.getAuditMessage() == null : this.getAuditMessage().equals(other.getAuditMessage()))
&& (this.getAuditJson() == null ? other.getAuditJson() == null : this.getAuditJson().equals(other.getAuditJson()))
&& (this.getAuditUserId() == null ? other.getAuditUserId() == null : this.getAuditUserId().equals(other.getAuditUserId()))
&& (this.getAuditUserName() == null ? other.getAuditUserName() == null : this.getAuditUserName().equals(other.getAuditUserName()))
&& (this.getAuditCtime() == null ? other.getAuditCtime() == null : this.getAuditCtime().equals(other.getAuditCtime()))
&& (this.getApplyVersion() == null ? other.getApplyVersion() == null : this.getApplyVersion().equals(other.getApplyVersion()))
&& (this.getPerTenantVersion() == null ? other.getPerTenantVersion() == null : this.getPerTenantVersion().equals(other.getPerTenantVersion()));
}
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + ((getObjId() == null) ? 0 : getObjId().hashCode());
result = prime * result + ((getTenantCode() == null) ? 0 : getTenantCode().hashCode());
result = prime * result + ((getOperStatus() == null) ? 0 : getOperStatus().hashCode());
result = prime * result + ((getAuditType() == null) ? 0 : getAuditType().hashCode());
result = prime * result + ((getAuditMessage() == null) ? 0 : getAuditMessage().hashCode());
result = prime * result + ((getAuditJson() == null) ? 0 : getAuditJson().hashCode());
result = prime * result + ((getAuditUserId() == null) ? 0 : getAuditUserId().hashCode());
result = prime * result + ((getAuditUserName() == null) ? 0 : getAuditUserName().hashCode());
result = prime * result + ((getAuditCtime() == null) ? 0 : getAuditCtime().hashCode());
result = prime * result + ((getApplyVersion() == null) ? 0 : getApplyVersion().hashCode());
result = prime * result + ((getPerTenantVersion() == null) ? 0 : getPerTenantVersion().hashCode());
return result;
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName());
sb.append(" [");
sb.append("Hash = ").append(hashCode());
sb.append(", objId=").append(objId);
sb.append(", tenantCode=").append(tenantCode);
sb.append(", operStatus=").append(operStatus);
sb.append(", auditType=").append(auditType);
sb.append(", auditMessage=").append(auditMessage);
sb.append(", auditJson=").append(auditJson);
sb.append(", auditUserId=").append(auditUserId);
sb.append(", auditUserName=").append(auditUserName);
sb.append(", auditCtime=").append(auditCtime);
sb.append(", applyVersion=").append(applyVersion);
sb.append(", perTenantVersion=").append(perTenantVersion);
sb.append(", serialVersionUID=").append(serialVersionUID);
sb.append("]");
return sb.toString();
}
}
\ No newline at end of file
src/main/java/com/pms/ocp/model/entity/OcpTenantBase.java 0 → 100644
View file @ 8286c4a4
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.util.Date;
/**
* 应用信息表
* @TableName ocp_tenant_base
*/
@Data
@Accessors(chain = true)
@TableName("ocp_tenant_base")
@ApiModel("应用信息表1")
public class OcpTenantBase implements Serializable {
/**
* 应用ID
*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty("主键ID")
private String objId;
/**
* 应用名称
*/
@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 Date tenantCtime;
/**
* 最后更新时间
*/
@ApiModelProperty("最后更新时间")
private Date tenantMtime;
/**
* 部署名称
*/
@ApiModelProperty("部署名称")
private String deploymentName;
/**
* 描述
*/
@ApiModelProperty("描述")
private String tenantDescription;
/**
* 应用状态0:设计态；1:运行态
*/
@ApiModelProperty("应用状态0:设计态；1:运行态")
private Short tenantState;
/**
* 建设单位
*/
@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;
private static final long serialVersionUID = 1L;
/**
* 应用ID
*/
public String getObjId() {
return objId;
}
/**
* 应用ID
*/
public void setObjId(String objId) {
this.objId = objId;
}
/**
* 应用名称
*/
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;
}
/**
* 应用ip
*/
public String getTenantIp() {
return tenantIp;
}
/**
* 应用ip
*/
public void setTenantIp(String tenantIp) {
this.tenantIp = tenantIp;
}
/**
* 应用url
*/
public String getTenantUrl() {
return tenantUrl;
}
/**
* 应用url
*/
public void setTenantUrl(String tenantUrl) {
this.tenantUrl = tenantUrl;
}
/**
* 所属专业
*/
public String getProfessionalKind() {
return professionalKind;
}
/**
* 所属专业
*/
public void setProfessionalKind(String professionalKind) {
this.professionalKind = professionalKind;
}
/**
* 创建者用户ID
*/
public String getTenantUserId() {
return tenantUserId;
}
/**
* 创建者用户ID
*/
public void setTenantUserId(String tenantUserId) {
this.tenantUserId = tenantUserId;
}
/**
* 排序
*/
public Integer getTenantOrderNo() {
return tenantOrderNo;
}
/**
* 排序
*/
public void setTenantOrderNo(Integer tenantOrderNo) {
this.tenantOrderNo = tenantOrderNo;
}
/**
* 创建时间
*/
public Date getTenantCtime() {
return tenantCtime;
}
/**
* 创建时间
*/
public void setTenantCtime(Date tenantCtime) {
this.tenantCtime = tenantCtime;
}
/**
* 最后更新时间
*/
public Date getTenantMtime() {
return tenantMtime;
}
/**
* 最后更新时间
*/
public void setTenantMtime(Date tenantMtime) {
this.tenantMtime = tenantMtime;
}
/**
* 部署名称
*/
public String getDeploymentName() {
return deploymentName;
}
/**
* 部署名称
*/
public void setDeploymentName(String deploymentName) {
this.deploymentName = deploymentName;
}
/**
* 描述
*/
public String getTenantDescription() {
return tenantDescription;
}
/**
* 描述
*/
public void setTenantDescription(String tenantDescription) {
this.tenantDescription = tenantDescription;
}
/**
* 应用状态0:设计态；1:运行态
*/
public Short getTenantState() {
return tenantState;
}
/**
* 应用状态0:设计态；1:运行态
*/
public void setTenantState(Short tenantState) {
this.tenantState = tenantState;
}
/**
* 建设单位
*/
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 String getOwnerCompanyName() {
return ownerCompanyName;
}
/**
* 所属公司名称
*/
public void setOwnerCompanyName(String ownerCompanyName) {
this.ownerCompanyName = ownerCompanyName;
}
/**
* 是否删除0:否;1:是
*/
public Short getIsDelete() {
return isDelete;
}
/**
* 是否删除0:否;1:是
*/
public void setIsDelete(Short isDelete) {
this.isDelete = isDelete;
}
/**
* 所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区
*/
public Short getTenantZone() {
return tenantZone;
}
/**
* 所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区
*/
public void setTenantZone(Short tenantZone) {
this.tenantZone = tenantZone;
}
/**
* 所属层级 1:应用层;2:平台层;3:网络层;4:感知层;
*/
public Short getTenantLayer() {
return tenantLayer;
}
/**
* 所属层级 1:应用层;2:平台层;3:网络层;4:感知层;
*/
public void setTenantLayer(Short tenantLayer) {
this.tenantLayer = tenantLayer;
}
/**
* 应用版本（当前版本）
*/
public String getTenantVersion() {
return tenantVersion;
}
/**
* 应用版本（当前版本）
*/
public void setTenantVersion(String tenantVersion) {
this.tenantVersion = tenantVersion;
}
@Override
public boolean equals(Object that) {
if (this == that) {
return true;
}
if (that == null) {
return false;
}
if (getClass() != that.getClass()) {
return false;
}
OcpTenantBase other = (OcpTenantBase) that;
return (this.getObjId() == null ? other.getObjId() == null : this.getObjId().equals(other.getObjId()))
&& (this.getTenantName() == null ? other.getTenantName() == null : this.getTenantName().equals(other.getTenantName()))
&& (this.getTenantCode() == null ? other.getTenantCode() == null : this.getTenantCode().equals(other.getTenantCode()))
&& (this.getTenantGroupCode() == null ? other.getTenantGroupCode() == null : this.getTenantGroupCode().equals(other.getTenantGroupCode()))
&& (this.getTenantIp() == null ? other.getTenantIp() == null : this.getTenantIp().equals(other.getTenantIp()))
&& (this.getTenantUrl() == null ? other.getTenantUrl() == null : this.getTenantUrl().equals(other.getTenantUrl()))
&& (this.getProfessionalKind() == null ? other.getProfessionalKind() == null : this.getProfessionalKind().equals(other.getProfessionalKind()))
&& (this.getTenantUserId() == null ? other.getTenantUserId() == null : this.getTenantUserId().equals(other.getTenantUserId()))
&& (this.getTenantOrderNo() == null ? other.getTenantOrderNo() == null : this.getTenantOrderNo().equals(other.getTenantOrderNo()))
&& (this.getTenantCtime() == null ? other.getTenantCtime() == null : this.getTenantCtime().equals(other.getTenantCtime()))
&& (this.getTenantMtime() == null ? other.getTenantMtime() == null : this.getTenantMtime().equals(other.getTenantMtime()))
&& (this.getDeploymentName() == null ? other.getDeploymentName() == null : this.getDeploymentName().equals(other.getDeploymentName()))
&& (this.getTenantDescription() == null ? other.getTenantDescription() == null : this.getTenantDescription().equals(other.getTenantDescription()))
&& (this.getTenantState() == null ? other.getTenantState() == null : this.getTenantState().equals(other.getTenantState()))
&& (this.getTenantUnit() == null ? other.getTenantUnit() == null : this.getTenantUnit().equals(other.getTenantUnit()))
&& (this.getOwnerCompanyCode() == null ? other.getOwnerCompanyCode() == null : this.getOwnerCompanyCode().equals(other.getOwnerCompanyCode()))
&& (this.getOwnerCompanyName() == null ? other.getOwnerCompanyName() == null : this.getOwnerCompanyName().equals(other.getOwnerCompanyName()))
&& (this.getIsDelete() == null ? other.getIsDelete() == null : this.getIsDelete().equals(other.getIsDelete()))
&& (this.getTenantZone() == null ? other.getTenantZone() == null : this.getTenantZone().equals(other.getTenantZone()))
&& (this.getTenantLayer() == null ? other.getTenantLayer() == null : this.getTenantLayer().equals(other.getTenantLayer()))
&& (this.getTenantVersion() == null ? other.getTenantVersion() == null : this.getTenantVersion().equals(other.getTenantVersion()));
}
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + ((getObjId() == null) ? 0 : getObjId().hashCode());
result = prime * result + ((getTenantName() == null) ? 0 : getTenantName().hashCode());
result = prime * result + ((getTenantCode() == null) ? 0 : getTenantCode().hashCode());
result = prime * result + ((getTenantGroupCode() == null) ? 0 : getTenantGroupCode().hashCode());
result = prime * result + ((getTenantIp() == null) ? 0 : getTenantIp().hashCode());
result = prime * result + ((getTenantUrl() == null) ? 0 : getTenantUrl().hashCode());
result = prime * result + ((getProfessionalKind() == null) ? 0 : getProfessionalKind().hashCode());
result = prime * result + ((getTenantUserId() == null) ? 0 : getTenantUserId().hashCode());
result = prime * result + ((getTenantOrderNo() == null) ? 0 : getTenantOrderNo().hashCode());
result = prime * result + ((getTenantCtime() == null) ? 0 : getTenantCtime().hashCode());
result = prime * result + ((getTenantMtime() == null) ? 0 : getTenantMtime().hashCode());
result = prime * result + ((getDeploymentName() == null) ? 0 : getDeploymentName().hashCode());
result = prime * result + ((getTenantDescription() == null) ? 0 : getTenantDescription().hashCode());
result = prime * result + ((getTenantState() == null) ? 0 : getTenantState().hashCode());
result = prime * result + ((getTenantUnit() == null) ? 0 : getTenantUnit().hashCode());
result = prime * result + ((getOwnerCompanyCode() == null) ? 0 : getOwnerCompanyCode().hashCode());
result = prime * result + ((getOwnerCompanyName() == null) ? 0 : getOwnerCompanyName().hashCode());
result = prime * result + ((getIsDelete() == null) ? 0 : getIsDelete().hashCode());
result = prime * result + ((getTenantZone() == null) ? 0 : getTenantZone().hashCode());
result = prime * result + ((getTenantLayer() == null) ? 0 : getTenantLayer().hashCode());
result = prime * result + ((getTenantVersion() == null) ? 0 : getTenantVersion().hashCode());
return result;
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName());
sb.append(" [");
sb.append("Hash = ").append(hashCode());
sb.append(", objId=").append(objId);
sb.append(", tenantName=").append(tenantName);
sb.append(", tenantCode=").append(tenantCode);
sb.append(", tenantGroupCode=").append(tenantGroupCode);
sb.append(", tenantIp=").append(tenantIp);
sb.append(", tenantUrl=").append(tenantUrl);
sb.append(", professionalKind=").append(professionalKind);
sb.append(", tenantUserId=").append(tenantUserId);
sb.append(", tenantOrderNo=").append(tenantOrderNo);
sb.append(", tenantCtime=").append(tenantCtime);
sb.append(", tenantMtime=").append(tenantMtime);
sb.append(", deploymentName=").append(deploymentName);
sb.append(", tenantDescription=").append(tenantDescription);
sb.append(", tenantState=").append(tenantState);
sb.append(", tenantUnit=").append(tenantUnit);
sb.append(", ownerCompanyCode=").append(ownerCompanyCode);
sb.append(", ownerCompanyName=").append(ownerCompanyName);
sb.append(", isDelete=").append(isDelete);
sb.append(", tenantZone=").append(tenantZone);
sb.append(", tenantLayer=").append(tenantLayer);
sb.append(", tenantVersion=").append(tenantVersion);
sb.append(", serialVersionUID=").append(serialVersionUID);
sb.append("]");
return sb.toString();
}
}
\ No newline at end of file
src/main/java/com/pms/ocp/model/entity/OcpTenantExtent.java 0 → 100644
View file @ 8286c4a4
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.util.Date;
/**
* 应用扩展信息表
* @TableName ocp_tenant_extent
*/
@Data
@Accessors(chain = true)
@TableName("ocp_tenant_extent")
@ApiModel("应用扩展信息表1")
public class OcpTenantExtent implements Serializable {
/**
* 主键
*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty("主键ID")
private String objId;
/**
* 服务编码
*/
@ApiModelProperty("服务编码")
private String tenantCode;
/**
* 部署公司
*/
@ApiModelProperty("部署公司")
private String depCompanyCode;
/**
* 是否已删除
*/
@ApiModelProperty("是否已删除")
private Short isDelete;
/**
* 集群名称
*/
@ApiModelProperty("集群名称")
private String clusterName;
/**
* 命名空间
*/
@ApiModelProperty("命名空间")
private String spaceName;
/**
* db大小
*/
@ApiModelProperty("db大小")
private String dbSize;
/**
* 部署名称
*/
@ApiModelProperty("部署名称")
private String deploymentName;
/**
* 描述
*/
@ApiModelProperty("描述")
private String tenantDescription;
/**
* 应用状态 0:已发布 1:未发布
*/
@ApiModelProperty("应用状态 0:已发布 1:未发布")
private Short tenantState;
/**
* 添加时间
*/
@ApiModelProperty("添加时间")
private Date tenantCtime;
/**
* 修改时间
*/
@ApiModelProperty("修改时间")
private Date tenantMtime;
private static final long serialVersionUID = 1L;
/**
* 主键
*/
public String getObjId() {
return objId;
}
/**
* 主键
*/
public void setObjId(String objId) {
this.objId = objId;
}
/**
* 服务编码
*/
public String getTenantCode() {
return tenantCode;
}
/**
* 服务编码
*/
public void setTenantCode(String tenantCode) {
this.tenantCode = tenantCode;
}
/**
* 部署公司
*/
public String getDepCompanyCode() {
return depCompanyCode;
}
/**
* 部署公司
*/
public void setDepCompanyCode(String depCompanyCode) {
this.depCompanyCode = depCompanyCode;
}
/**
* 是否已删除
*/
public Short getIsDelete() {
return isDelete;
}
/**
* 是否已删除
*/
public void setIsDelete(Short isDelete) {
this.isDelete = isDelete;
}
/**
* 集群名称
*/
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;
}
/**
* db大小
*/
public String getDbSize() {
return dbSize;
}
/**
* db大小
*/
public void setDbSize(String dbSize) {
this.dbSize = dbSize;
}
/**
* 部署名称
*/
public String getDeploymentName() {
return deploymentName;
}
/**
* 部署名称
*/
public void setDeploymentName(String deploymentName) {
this.deploymentName = deploymentName;
}
/**
* 描述
*/
public String getTenantDescription() {
return tenantDescription;
}
/**
* 描述
*/
public void setTenantDescription(String tenantDescription) {
this.tenantDescription = tenantDescription;
}
/**
* 应用状态 0:已发布 1:未发布
*/
public Short getTenantState() {
return tenantState;
}
/**
* 应用状态 0:已发布 1:未发布
*/
public void setTenantState(Short tenantState) {
this.tenantState = tenantState;
}
/**
* 添加时间
*/
public Date getTenantCtime() {
return tenantCtime;
}
/**
* 添加时间
*/
public void setTenantCtime(Date tenantCtime) {
this.tenantCtime = tenantCtime;
}
/**
* 修改时间
*/
public Date getTenantMtime() {
return tenantMtime;
}
/**
* 修改时间
*/
public void setTenantMtime(Date tenantMtime) {
this.tenantMtime = tenantMtime;
}
@Override
public boolean equals(Object that) {
if (this == that) {
return true;
}
if (that == null) {
return false;
}
if (getClass() != that.getClass()) {
return false;
}
OcpTenantExtent other = (OcpTenantExtent) that;
return (this.getObjId() == null ? other.getObjId() == null : this.getObjId().equals(other.getObjId()))
&& (this.getTenantCode() == null ? other.getTenantCode() == null : this.getTenantCode().equals(other.getTenantCode()))
&& (this.getDepCompanyCode() == null ? other.getDepCompanyCode() == null : this.getDepCompanyCode().equals(other.getDepCompanyCode()))
&& (this.getIsDelete() == null ? other.getIsDelete() == null : this.getIsDelete().equals(other.getIsDelete()))
&& (this.getClusterName() == null ? other.getClusterName() == null : this.getClusterName().equals(other.getClusterName()))
&& (this.getSpaceName() == null ? other.getSpaceName() == null : this.getSpaceName().equals(other.getSpaceName()))
&& (this.getDbSize() == null ? other.getDbSize() == null : this.getDbSize().equals(other.getDbSize()))
&& (this.getDeploymentName() == null ? other.getDeploymentName() == null : this.getDeploymentName().equals(other.getDeploymentName()))
&& (this.getTenantDescription() == null ? other.getTenantDescription() == null : this.getTenantDescription().equals(other.getTenantDescription()))
&& (this.getTenantState() == null ? other.getTenantState() == null : this.getTenantState().equals(other.getTenantState()))
&& (this.getTenantCtime() == null ? other.getTenantCtime() == null : this.getTenantCtime().equals(other.getTenantCtime()))
&& (this.getTenantMtime() == null ? other.getTenantMtime() == null : this.getTenantMtime().equals(other.getTenantMtime()));
}
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + ((getObjId() == null) ? 0 : getObjId().hashCode());
result = prime * result + ((getTenantCode() == null) ? 0 : getTenantCode().hashCode());
result = prime * result + ((getDepCompanyCode() == null) ? 0 : getDepCompanyCode().hashCode());
result = prime * result + ((getIsDelete() == null) ? 0 : getIsDelete().hashCode());
result = prime * result + ((getClusterName() == null) ? 0 : getClusterName().hashCode());
result = prime * result + ((getSpaceName() == null) ? 0 : getSpaceName().hashCode());
result = prime * result + ((getDbSize() == null) ? 0 : getDbSize().hashCode());
result = prime * result + ((getDeploymentName() == null) ? 0 : getDeploymentName().hashCode());
result = prime * result + ((getTenantDescription() == null) ? 0 : getTenantDescription().hashCode());
result = prime * result + ((getTenantState() == null) ? 0 : getTenantState().hashCode());
result = prime * result + ((getTenantCtime() == null) ? 0 : getTenantCtime().hashCode());
result = prime * result + ((getTenantMtime() == null) ? 0 : getTenantMtime().hashCode());
return result;
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName());
sb.append(" [");
sb.append("Hash = ").append(hashCode());
sb.append(", objId=").append(objId);
sb.append(", tenantCode=").append(tenantCode);
sb.append(", depCompanyCode=").append(depCompanyCode);
sb.append(", isDelete=").append(isDelete);
sb.append(", clusterName=").append(clusterName);
sb.append(", spaceName=").append(spaceName);
sb.append(", dbSize=").append(dbSize);
sb.append(", deploymentName=").append(deploymentName);
sb.append(", tenantDescription=").append(tenantDescription);
sb.append(", tenantState=").append(tenantState);
sb.append(", tenantCtime=").append(tenantCtime);
sb.append(", tenantMtime=").append(tenantMtime);
sb.append(", serialVersionUID=").append(serialVersionUID);
sb.append("]");
return sb.toString();
}
}
\ No newline at end of file
src/main/java/com/pms/ocp/model/entity/OcpTenantGroup.java 0 → 100644
View file @ 8286c4a4
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.util.Date;
/**
* 应用分类表
* @TableName ocp_tenant_group
*/
@Data
@Accessors(chain = true)
@TableName("ocp_tenant_group")
@ApiModel("应用分类表1")
public class OcpTenantGroup implements Serializable {
/**
* 主键
*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty("主键")
private String objId;
/**
* 应用分类编码
*/
@ApiModelProperty("应用分类编码")
private String tenantGroupCode;
/**
* 应用分类名称
*/
@ApiModelProperty("应用分类名称")
private String tenantGroupName;
/**
* 分类创建公司
*/
@ApiModelProperty("分类创建公司")
private String tenantGroupCompanyCode;
/**
* 上级code
*/
@ApiModelProperty("上级code")
private String tenantGroupPcode;
/**
* 应用类别设备级、生态级等
*/
@ApiModelProperty("应用类别设备级、生态级等")
private String tenantType;
/**
* 分类版本
*/
@ApiModelProperty("分类版本")
private String tenantGroupVersion;
/**
* 显示顺序
*/
@ApiModelProperty("显示顺序")
private Integer tenantGroupOrderNo;
/**
* 提交人id
*/
@ApiModelProperty("提交人id")
private String tenantGroupUserId;
/**
* 提交人姓名
*/
@ApiModelProperty("提交人姓名")
private String tenantGroupUserName;
/**
* 创建时间
*/
@ApiModelProperty("创建时间")
private Date tenantGroupCtime;
/**
* 修改时间
*/
@ApiModelProperty("修改时间")
private Date tenantGroupMtime;
/**
* 是否删除
*/
@ApiModelProperty("是否删除")
private Short isDelete;
/**
* 应用树层级 1:应用分组层 2:应用层
*/
@ApiModelProperty("应用树层级 1:应用分组层 2:应用层")
private Short tenantGroupLevel;
private static final long serialVersionUID = 1L;
/**
* 主键
*/
public String getObjId() {
return objId;
}
/**
* 主键
*/
public void setObjId(String objId) {
this.objId = objId;
}
/**
* 应用分类编码
*/
public String getTenantGroupCode() {
return tenantGroupCode;
}
/**
* 应用分类编码
*/
public void setTenantGroupCode(String tenantGroupCode) {
this.tenantGroupCode = tenantGroupCode;
}
/**
* 应用分类名称
*/
public String getTenantGroupName() {
return tenantGroupName;
}
/**
* 应用分类名称
*/
public void setTenantGroupName(String tenantGroupName) {
this.tenantGroupName = tenantGroupName;
}
/**
* 分类创建公司
*/
public String getTenantGroupCompanyCode() {
return tenantGroupCompanyCode;
}
/**
* 分类创建公司
*/
public void setTenantGroupCompanyCode(String tenantGroupCompanyCode) {
this.tenantGroupCompanyCode = tenantGroupCompanyCode;
}
/**
* 上级code
*/
public String getTenantGroupPcode() {
return tenantGroupPcode;
}
/**
* 上级code
*/
public void setTenantGroupPcode(String tenantGroupPcode) {
this.tenantGroupPcode = tenantGroupPcode;
}
/**
* 应用类别设备级、生态级等
*/
public String getTenantType() {
return tenantType;
}
/**
* 应用类别设备级、生态级等
*/
public void setTenantType(String tenantType) {
this.tenantType = tenantType;
}
/**
* 分类版本
*/
public String getTenantGroupVersion() {
return tenantGroupVersion;
}
/**
* 分类版本
*/
public void setTenantGroupVersion(String tenantGroupVersion) {
this.tenantGroupVersion = tenantGroupVersion;
}
/**
* 显示顺序
*/
public Integer getTenantGroupOrderNo() {
return tenantGroupOrderNo;
}
/**
* 显示顺序
*/
public void setTenantGroupOrderNo(Integer tenantGroupOrderNo) {
this.tenantGroupOrderNo = tenantGroupOrderNo;
}
/**
* 提交人id
*/
public String getTenantGroupUserId() {
return tenantGroupUserId;
}
/**
* 提交人id
*/
public void setTenantGroupUserId(String tenantGroupUserId) {
this.tenantGroupUserId = tenantGroupUserId;
}
/**
* 提交人姓名
*/
public String getTenantGroupUserName() {
return tenantGroupUserName;
}
/**
* 提交人姓名
*/
public void setTenantGroupUserName(String tenantGroupUserName) {
this.tenantGroupUserName = tenantGroupUserName;
}
/**
* 创建时间
*/
public Date getTenantGroupCtime() {
return tenantGroupCtime;
}
/**
* 创建时间
*/
public void setTenantGroupCtime(Date tenantGroupCtime) {
this.tenantGroupCtime = tenantGroupCtime;
}
/**
* 修改时间
*/
public Date getTenantGroupMtime() {
return tenantGroupMtime;
}
/**
* 修改时间
*/
public void setTenantGroupMtime(Date tenantGroupMtime) {
this.tenantGroupMtime = tenantGroupMtime;
}
/**
* 是否删除
*/
public Short getIsDelete() {
return isDelete;
}
/**
* 是否删除
*/
public void setIsDelete(Short isDelete) {
this.isDelete = isDelete;
}
/**
* 应用树层级 1:应用分组层 2:应用层
*/
public Short getTenantGroupLevel() {
return tenantGroupLevel;
}
/**
* 应用树层级 1:应用分组层 2:应用层
*/
public void setTenantGroupLevel(Short tenantGroupLevel) {
this.tenantGroupLevel = tenantGroupLevel;
}
@Override
public boolean equals(Object that) {
if (this == that) {
return true;
}
if (that == null) {
return false;
}
if (getClass() != that.getClass()) {
return false;
}
OcpTenantGroup other = (OcpTenantGroup) that;
return (this.getObjId() == null ? other.getObjId() == null : this.getObjId().equals(other.getObjId()))
&& (this.getTenantGroupCode() == null ? other.getTenantGroupCode() == null : this.getTenantGroupCode().equals(other.getTenantGroupCode()))
&& (this.getTenantGroupName() == null ? other.getTenantGroupName() == null : this.getTenantGroupName().equals(other.getTenantGroupName()))
&& (this.getTenantGroupCompanyCode() == null ? other.getTenantGroupCompanyCode() == null : this.getTenantGroupCompanyCode().equals(other.getTenantGroupCompanyCode()))
&& (this.getTenantGroupPcode() == null ? other.getTenantGroupPcode() == null : this.getTenantGroupPcode().equals(other.getTenantGroupPcode()))
&& (this.getTenantType() == null ? other.getTenantType() == null : this.getTenantType().equals(other.getTenantType()))
&& (this.getTenantGroupVersion() == null ? other.getTenantGroupVersion() == null : this.getTenantGroupVersion().equals(other.getTenantGroupVersion()))
&& (this.getTenantGroupOrderNo() == null ? other.getTenantGroupOrderNo() == null : this.getTenantGroupOrderNo().equals(other.getTenantGroupOrderNo()))
&& (this.getTenantGroupUserId() == null ? other.getTenantGroupUserId() == null : this.getTenantGroupUserId().equals(other.getTenantGroupUserId()))
&& (this.getTenantGroupUserName() == null ? other.getTenantGroupUserName() == null : this.getTenantGroupUserName().equals(other.getTenantGroupUserName()))
&& (this.getTenantGroupCtime() == null ? other.getTenantGroupCtime() == null : this.getTenantGroupCtime().equals(other.getTenantGroupCtime()))
&& (this.getTenantGroupMtime() == null ? other.getTenantGroupMtime() == null : this.getTenantGroupMtime().equals(other.getTenantGroupMtime()))
&& (this.getIsDelete() == null ? other.getIsDelete() == null : this.getIsDelete().equals(other.getIsDelete()))
&& (this.getTenantGroupLevel() == null ? other.getTenantGroupLevel() == null : this.getTenantGroupLevel().equals(other.getTenantGroupLevel()));
}
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + ((getObjId() == null) ? 0 : getObjId().hashCode());
result = prime * result + ((getTenantGroupCode() == null) ? 0 : getTenantGroupCode().hashCode());
result = prime * result + ((getTenantGroupName() == null) ? 0 : getTenantGroupName().hashCode());
result = prime * result + ((getTenantGroupCompanyCode() == null) ? 0 : getTenantGroupCompanyCode().hashCode());
result = prime * result + ((getTenantGroupPcode() == null) ? 0 : getTenantGroupPcode().hashCode());
result = prime * result + ((getTenantType() == null) ? 0 : getTenantType().hashCode());
result = prime * result + ((getTenantGroupVersion() == null) ? 0 : getTenantGroupVersion().hashCode());
result = prime * result + ((getTenantGroupOrderNo() == null) ? 0 : getTenantGroupOrderNo().hashCode());
result = prime * result + ((getTenantGroupUserId() == null) ? 0 : getTenantGroupUserId().hashCode());
result = prime * result + ((getTenantGroupUserName() == null) ? 0 : getTenantGroupUserName().hashCode());
result = prime * result + ((getTenantGroupCtime() == null) ? 0 : getTenantGroupCtime().hashCode());
result = prime * result + ((getTenantGroupMtime() == null) ? 0 : getTenantGroupMtime().hashCode());
result = prime * result + ((getIsDelete() == null) ? 0 : getIsDelete().hashCode());
result = prime * result + ((getTenantGroupLevel() == null) ? 0 : getTenantGroupLevel().hashCode());
return result;
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName());
sb.append(" [");
sb.append("Hash = ").append(hashCode());
sb.append(", objId=").append(objId);
sb.append(", tenantGroupCode=").append(tenantGroupCode);
sb.append(", tenantGroupName=").append(tenantGroupName);
sb.append(", tenantGroupCompanyCode=").append(tenantGroupCompanyCode);
sb.append(", tenantGroupPcode=").append(tenantGroupPcode);
sb.append(", tenantType=").append(tenantType);
sb.append(", tenantGroupVersion=").append(tenantGroupVersion);
sb.append(", tenantGroupOrderNo=").append(tenantGroupOrderNo);
sb.append(", tenantGroupUserId=").append(tenantGroupUserId);
sb.append(", tenantGroupUserName=").append(tenantGroupUserName);
sb.append(", tenantGroupCtime=").append(tenantGroupCtime);
sb.append(", tenantGroupMtime=").append(tenantGroupMtime);
sb.append(", isDelete=").append(isDelete);
sb.append(", tenantGroupLevel=").append(tenantGroupLevel);
sb.append(", serialVersionUID=").append(serialVersionUID);
sb.append("]");
return sb.toString();
}
}
\ No newline at end of file
src/main/java/com/pms/ocp/model/entity/OcpTenantSubs.java 0 → 100644
View file @ 8286c4a4
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.util.Date;
/**
* 应用订阅记录表
* @TableName ocp_tenant_subs
*/
@Data
@Accessors(chain = true)
@TableName("ocp_tenant_subs")
@ApiModel("应用订阅记录表1")
public class OcpTenantSubs implements Serializable {
/**
* 关系ID
*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty("关系ID")
private String objId;
/**
* 服务编码
*/
@ApiModelProperty("服务编码")
private String tenantCode;
/**
* 订阅公司编码
*/
@ApiModelProperty("订阅公司编码")
private String subsCompanyCode;
/**
* 服务订阅创建时间
*/
@ApiModelProperty("服务订阅创建时间")
private Date subsLogTenantCtime;
/**
* 服务订阅修改时间
*/
@ApiModelProperty("服务订阅修改时间")
private Date subsLogTenantMtime;
/**
* 服务订阅创建用户ID
*/
@ApiModelProperty("服务订阅创建用户ID")
private String subsLogTenantUserId;
/**
* 服务订阅添加时间
*/
@ApiModelProperty("服务订阅添加时间")
private Date subsLogTenantAtime;
/**
* 是否删除0-否，1-是
*/
@ApiModelProperty("是否删除0-否，1-是")
private Short isDelete;
private static final long serialVersionUID = 1L;
/**
* 关系ID
*/
public String getObjId() {
return objId;
}
/**
* 关系ID
*/
public void setObjId(String objId) {
this.objId = objId;
}
/**
* 服务编码
*/
public String getTenantCode() {
return tenantCode;
}
/**
* 服务编码
*/
public void setTenantCode(String tenantCode) {
this.tenantCode = tenantCode;
}
/**
* 订阅公司编码
*/
public String getSubsCompanyCode() {
return subsCompanyCode;
}
/**
* 订阅公司编码
*/
public void setSubsCompanyCode(String subsCompanyCode) {
this.subsCompanyCode = subsCompanyCode;
}
/**
* 服务订阅创建时间
*/
public Date getSubsLogTenantCtime() {
return subsLogTenantCtime;
}
/**
* 服务订阅创建时间
*/
public void setSubsLogTenantCtime(Date subsLogTenantCtime) {
this.subsLogTenantCtime = subsLogTenantCtime;
}
/**
* 服务订阅修改时间
*/
public Date getSubsLogTenantMtime() {
return subsLogTenantMtime;
}
/**
* 服务订阅修改时间
*/
public void setSubsLogTenantMtime(Date subsLogTenantMtime) {
this.subsLogTenantMtime = subsLogTenantMtime;
}
/**
* 服务订阅创建用户ID
*/
public String getSubsLogTenantUserId() {
return subsLogTenantUserId;
}
/**
* 服务订阅创建用户ID
*/
public void setSubsLogTenantUserId(String subsLogTenantUserId) {
this.subsLogTenantUserId = subsLogTenantUserId;
}
/**
* 服务订阅添加时间
*/
public Date getSubsLogTenantAtime() {
return subsLogTenantAtime;
}
/**
* 服务订阅添加时间
*/
public void setSubsLogTenantAtime(Date subsLogTenantAtime) {
this.subsLogTenantAtime = subsLogTenantAtime;
}
/**
* 是否删除0-否，1-是
*/
public Short getIsDelete() {
return isDelete;
}
/**
* 是否删除0-否，1-是
*/
public void setIsDelete(Short isDelete) {
this.isDelete = isDelete;
}
@Override
public boolean equals(Object that) {
if (this == that) {
return true;
}
if (that == null) {
return false;
}
if (getClass() != that.getClass()) {
return false;
}
OcpTenantSubs other = (OcpTenantSubs) that;
return (this.getObjId() == null ? other.getObjId() == null : this.getObjId().equals(other.getObjId()))
&& (this.getTenantCode() == null ? other.getTenantCode() == null : this.getTenantCode().equals(other.getTenantCode()))
&& (this.getSubsCompanyCode() == null ? other.getSubsCompanyCode() == null : this.getSubsCompanyCode().equals(other.getSubsCompanyCode()))
&& (this.getSubsLogTenantCtime() == null ? other.getSubsLogTenantCtime() == null : this.getSubsLogTenantCtime().equals(other.getSubsLogTenantCtime()))
&& (this.getSubsLogTenantMtime() == null ? other.getSubsLogTenantMtime() == null : this.getSubsLogTenantMtime().equals(other.getSubsLogTenantMtime()))
&& (this.getSubsLogTenantUserId() == null ? other.getSubsLogTenantUserId() == null : this.getSubsLogTenantUserId().equals(other.getSubsLogTenantUserId()))
&& (this.getSubsLogTenantAtime() == null ? other.getSubsLogTenantAtime() == null : this.getSubsLogTenantAtime().equals(other.getSubsLogTenantAtime()))
&& (this.getIsDelete() == null ? other.getIsDelete() == null : this.getIsDelete().equals(other.getIsDelete()));
}
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + ((getObjId() == null) ? 0 : getObjId().hashCode());
result = prime * result + ((getTenantCode() == null) ? 0 : getTenantCode().hashCode());
result = prime * result + ((getSubsCompanyCode() == null) ? 0 : getSubsCompanyCode().hashCode());
result = prime * result + ((getSubsLogTenantCtime() == null) ? 0 : getSubsLogTenantCtime().hashCode());
result = prime * result + ((getSubsLogTenantMtime() == null) ? 0 : getSubsLogTenantMtime().hashCode());
result = prime * result + ((getSubsLogTenantUserId() == null) ? 0 : getSubsLogTenantUserId().hashCode());
result = prime * result + ((getSubsLogTenantAtime() == null) ? 0 : getSubsLogTenantAtime().hashCode());
result = prime * result + ((getIsDelete() == null) ? 0 : getIsDelete().hashCode());
return result;
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName());
sb.append(" [");
sb.append("Hash = ").append(hashCode());
sb.append(", objId=").append(objId);
sb.append(", tenantCode=").append(tenantCode);
sb.append(", subsCompanyCode=").append(subsCompanyCode);
sb.append(", subsLogTenantCtime=").append(subsLogTenantCtime);
sb.append(", subsLogTenantMtime=").append(subsLogTenantMtime);
sb.append(", subsLogTenantUserId=").append(subsLogTenantUserId);
sb.append(", subsLogTenantAtime=").append(subsLogTenantAtime);
sb.append(", isDelete=").append(isDelete);
sb.append(", serialVersionUID=").append(serialVersionUID);
sb.append("]");
return sb.toString();
}
}
\ No newline at end of file
src/main/java/com/pms/ocp/service/AppArrangeService.java 0 → 100644
View file @ 8286c4a4
package com.pms.ocp.service;
import com.pms.ocp.model.entity.OcpTenantGroup;
/**
* @className: AppArrangeService
* @Description:应用分类业务层接口
* @atuthor: pei-chenxi
* @DateTime: 2022/3/9 14:17
*/
public interface AppArrangeService {
/**
* @Description:应用分类修改
* @param ocpTenantGroup
* @return
*/
boolean updateApp(OcpTenantGroup ocpTenantGroup);
}
src/main/java/com/pms/ocp/service/ModelNoteService.java
View file @ 8286c4a4
...@@ -9,6 +9,7 @@ import java.util.List; ...@@ -9,6 +9,7 @@ import java.util.List;
* @Date: 2022/2/22 16:08 * @Date: 2022/2/22 16:08
* @Description:模型事记业务层接口 * @Description:模型事记业务层接口
*/ */
public interface ModelNoteService { public interface ModelNoteService {
/** /**
...@@ -41,7 +42,7 @@ public interface ModelNoteService { ...@@ -41,7 +42,7 @@ public interface ModelNoteService {
* @param * @param
* @return * @return
*/ */
List<ModelNote> getModelNoteList(); List<ModelNote> getModelNoteList(String modelCode);
/** /**
* 获取模型事记列表 * 获取模型事记列表
......
src/main/java/com/pms/ocp/service/ModelPropertyService.java
View file @ 8286c4a4
package com.pms.ocp.service; package com.pms.ocp.service;
import com.pms.ocp.model.entity.ModelProperty; import com.pms.ocp.model.entity.ModelProperty;
import com.pms.ocp.model.entity.ModelType;
import java.util.List; import java.util.List;
...@@ -47,7 +46,7 @@ public interface ModelPropertyService { ...@@ -47,7 +46,7 @@ public interface ModelPropertyService {
/** /**
* 获取模型属性列表 * 获取模型属性列表
* *
* @param modelId * @param
* @return * @return
*/ */
List<ModelProperty> getModelProperty(); List<ModelProperty> getModelProperty();
......
src/main/java/com/pms/ocp/service/OcpApiTreeService.java
View file @ 8286c4a4
package com.pms.ocp.service; package com.pms.ocp.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.pms.ocp.model.dto.ApiTreeGroupDto; import com.pms.ocp.model.dto.ApiTreeGroupDto;
import com.pms.ocp.model.dto.OcpApiGroupDtos; import com.pms.ocp.model.dto.OcpApiGroupDtos;
import com.pms.ocp.model.dto.PageGroupDto;
import com.pms.ocp.model.entity.OcpApiGroup; import com.pms.ocp.model.entity.OcpApiGroup;
public interface OcpApiTreeService extends IService<OcpApiGroup> { public interface OcpApiTreeService extends IService<OcpApiGroup> {
/** /**
...@@ -25,10 +29,25 @@ public interface OcpApiTreeService extends IService<OcpApiGroup> { ...@@ -25,10 +29,25 @@ public interface OcpApiTreeService extends IService<OcpApiGroup> {
*/ */
void updataOcpTree(OcpApiGroup ocpApiGroup); boolean updataOcpTree(OcpApiGroup ocpApiGroup);
/** /**
* 删除服务分类 * 删除服务分类
*/ */
boolean deleteOcpTree(OcpApiGroup ocpApiGroup); boolean deleteOcpTree(OcpApiGroup ocpApiGroup);
/* *//**
* 服务列表分级查询
* @param
*//*
List<OcpApiGroup> getOnePage(int pageSize, int pageNum, int apiGroupLevel);*/
/**
* 服务列表分级查询
* @param pageGroupDto
* @return
*/
Page<OcpApiGroup> getOnePages(PageGroupDto pageGroupDto);
} }
src/main/java/com/pms/ocp/service/impl/AppArrangeServiceImpl.java 0 → 100644
View file @ 8286c4a4
package com.pms.ocp.service.impl;
import com.pms.ocp.mapper.AppArrangeMapper;
import com.pms.ocp.model.entity.OcpApiGroup;
import com.pms.ocp.model.entity.OcpTenantGroup;
import com.pms.ocp.service.AppArrangeService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* @className: AppArrangeServiceImpl
* @Description:应用分类业务层
* @atuthor: pei-chenxi
* @DateTime: 2022/3/9 14:17
*/
@Service
@Slf4j
public class AppArrangeServiceImpl implements AppArrangeService {
@Autowired
private AppArrangeMapper appArrangeMapper;
/**
* @Description: 应用分类修改
* @param ocpTenantGroup
* @return falg
**/
@Override
public boolean updateApp(OcpTenantGroup ocpTenantGroup) {
boolean falg = true;
List<OcpTenantGroup> ocpTenantGroups = appArrangeMapper.selectList(null);
for (OcpTenantGroup tenantGroup : ocpTenantGroups) {
String code = tenantGroup.getTenantGroupCode();
if (code == ocpTenantGroup.getTenantGroupCode()) {
falg = false;
break;
}
}
appArrangeMapper.updateById(ocpTenantGroup);
return falg;
}
}
src/main/java/com/pms/ocp/service/impl/ModelNoteServiceImpl.java
View file @ 8286c4a4
package com.pms.ocp.service.impl; package com.pms.ocp.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.pms.ocp.mapper.ModelNoteMapper;
import com.pms.ocp.model.entity.ModelNote; import com.pms.ocp.model.entity.ModelNote;
import com.pms.ocp.service.ModelNoteService; import com.pms.ocp.service.ModelNoteService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
...@@ -14,9 +17,13 @@ import java.util.List; ...@@ -14,9 +17,13 @@ import java.util.List;
@Service @Service
public class ModelNoteServiceImpl implements ModelNoteService { public class ModelNoteServiceImpl implements ModelNoteService {
@Autowired
private ModelNoteMapper modelNoteMapper;
@Override @Override
public Integer createModelNote(ModelNote modelNote) { public Integer createModelNote(ModelNote modelNote) {
return null; return modelNoteMapper.insert(modelNote);
} }
@Override @Override
...@@ -30,8 +37,11 @@ public class ModelNoteServiceImpl implements ModelNoteService { ...@@ -30,8 +37,11 @@ public class ModelNoteServiceImpl implements ModelNoteService {
} }
@Override @Override
public List<ModelNote> getModelNoteList() { public List<ModelNote> getModelNoteList(String modelCode) {
return null;
QueryWrapper<ModelNote> wrapper = new QueryWrapper<>();
wrapper.lambda().eq(ModelNote::getModelCode, modelCode);
return modelNoteMapper.selectList(wrapper);
} }
@Override @Override
......
src/main/java/com/pms/ocp/service/impl/ModelPropertyServiceImpl.java
View file @ 8286c4a4
...@@ -3,7 +3,6 @@ package com.pms.ocp.service.impl; ...@@ -3,7 +3,6 @@ package com.pms.ocp.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.pms.ocp.model.entity.ModelProperty; import com.pms.ocp.model.entity.ModelProperty;
import com.pms.ocp.service.ModelPropertyService; import com.pms.ocp.service.ModelPropertyService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
...@@ -41,6 +40,7 @@ public class ModelPropertyServiceImpl implements ModelPropertyService { ...@@ -41,6 +40,7 @@ public class ModelPropertyServiceImpl implements ModelPropertyService {
/** /**
* TODO * TODO
*
* @return * @return
*/ */
@Override @Override
......
src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java
View file @ 8286c4a4
package com.pms.ocp.service.impl; package com.pms.ocp.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.api.R;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.pms.ocp.common.config.PageParam;
import com.pms.ocp.common.utils.RandomStringUtil;
import com.pms.ocp.mapper.OcpApiBaseMapper; import com.pms.ocp.mapper.OcpApiBaseMapper;
import com.pms.ocp.mapper.OcpApiTreeMapper; import com.pms.ocp.mapper.OcpApiTreeMapper;
import com.pms.ocp.model.dto.*; import com.pms.ocp.model.dto.*;
import com.pms.ocp.model.entity.OcpApiBase; import com.pms.ocp.model.entity.OcpApiBase;
import com.pms.ocp.model.entity.OcpApiGroup; import com.pms.ocp.model.entity.OcpApiGroup;
import com.pms.ocp.model.vo.ResponseVO;
import com.pms.ocp.service.OcpApiTreeService; import com.pms.ocp.service.OcpApiTreeService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -15,9 +24,11 @@ import org.springframework.stereotype.Service; ...@@ -15,9 +24,11 @@ import org.springframework.stereotype.Service;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.function.Consumer;
@Service @Service
@Slf4j
public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper,OcpApiGroup> implements OcpApiTreeService { public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper,OcpApiGroup> implements OcpApiTreeService {
...@@ -29,18 +40,20 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper,OcpApiGr ...@@ -29,18 +40,20 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper,OcpApiGr
/** /**
* 服务树分类 * 服务树分类
*
* @return * @return
*/ */
@Override @Override
public ApiTreeGroupDto getByGroup() { public ApiTreeGroupDto getByGroup() {
//服务树全表数据 //服务树全表数据
List<OcpApiGroup> ocpApiGroups = mapper.selectList(null); List<OcpApiGroup> ocpApiGroups = mapper.selectList(null);
//服务树分类对象 //服务树分类对象
ApiTreeGroupDto apiTreeGroupList = new ApiTreeGroupDto(); ApiTreeGroupDto apiTreeGroupList = new ApiTreeGroupDto();
//一级服务分类 //1中台层
List<OneTreeUpList> oneTreeUpLists = new ArrayList<>(); List<OneTreeUpList> oneTreeUpLists = new ArrayList<>();
for (OcpApiGroup ocpApiGroup : ocpApiGroups) { for (OcpApiGroup ocpApiGroup : ocpApiGroups) {
...@@ -49,69 +62,67 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper,OcpApiGr ...@@ -49,69 +62,67 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper,OcpApiGr
//一级服务对象 //一级服务对象
OneTreeUpList oneTreeUpList = new OneTreeUpList(); OneTreeUpList oneTreeUpList = new OneTreeUpList();
// 判断数据是否有上级服务分类 // 判断数据是否有上级服务分类
if ("".equals(ocpApiGroup.getApiGroupPcode())) { if (ocpApiGroup.getApiGroupLevel() == 1) {
BeanUtils.copyProperties(ocpApiGroup, oneTreeUpList); BeanUtils.copyProperties(ocpApiGroup, oneTreeUpList);
oneTreeUpLists.add(oneTreeUpList); oneTreeUpLists.add(oneTreeUpList);
} }
} }
} }
List<TwoDownList> twoDownLists = twoTreeLists(oneTreeUpLists, ocpApiGroups); List<TwoDownList> twoDownLists = twoTreeLists(oneTreeUpLists, ocpApiGroups);
List<ThreeTreeList> threeTreeLists = threeTreeLists(twoDownLists, ocpApiGroups); List<ThreeTreeList> threeTreeLists = threeTreeLists(twoDownLists, ocpApiGroups);
apiTreeGroupList.setOneupList(oneTreeUpLists); List<FourTreeList> fourTreeLists = fourTreeLists(threeTreeLists, ocpApiGroups);
apiTreeGroupList.setOneList(oneTreeUpLists);
apiTreeGroupList.setTwoList(twoDownLists); apiTreeGroupList.setTwoList(twoDownLists);
apiTreeGroupList.setThreeList(threeTreeLists); apiTreeGroupList.setThreeList(threeTreeLists);
apiTreeGroupList.setFourList(fourTreeLists);
return apiTreeGroupList; return apiTreeGroupList;
} }
/** /**
* 二级目录 * 2中心层
*
* @param oneTreeUpLists * @param oneTreeUpLists
* @return * @return
*/ */
public List<TwoDownList> twoTreeLists(List<OneTreeUpList> oneTreeUpLists,List<OcpApiGroup> ocpApiGroups){ public List<TwoDownList> twoTreeLists(List<OneTreeUpList> oneTreeUpLists, List<OcpApiGroup> ocpApiGroups) {
/* List<OcpApiGroup> groupList = new ArrayList<>();*/
List<TwoDownList> twoTreeLists = new ArrayList<>(); List<TwoDownList> twoTreeLists = new ArrayList<>();
for (OcpApiGroup ocpApiGroup : ocpApiGroups) {
//服务树全表数据 TwoDownList twoDownList = new TwoDownList();
if (!(ocpApiGroup.getIsDelete() == 0)) {
for (OneTreeUpList oneTreeUpList : oneTreeUpLists) { if (ocpApiGroup.getApiGroupLevel() == 2) {
String code = oneTreeUpList.getApiGroupCode(); BeanUtils.copyProperties(ocpApiGroup, twoDownList);
for (OcpApiGroup ocpApiGroup : ocpApiGroups ) { twoTreeLists.add(twoDownList);
if (code.equals(ocpApiGroup.getApiGroupPcode())) { } else {
TwoDownList twoDownList = new TwoDownList(); continue;
BeanUtils.copyProperties(ocpApiGroup,twoDownList); }
twoTreeLists.add(twoDownList);
}
} }
} }
return twoTreeLists; return twoTreeLists;
} }
/** /**
* 三级目录 * 3服务组层
*
* @param twoDownLists * @param twoDownLists
* @return * @return
*/ */
public List<ThreeTreeList> threeTreeLists(List<TwoDownList> twoDownLists,List<OcpApiGroup> ocpApiGroups){ public List<ThreeTreeList> threeTreeLists(List<TwoDownList> twoDownLists, List<OcpApiGroup> ocpApiGroups) {
List<ThreeTreeList> threeTreeLists = new ArrayList<>(); List<ThreeTreeList> threeTreeLists = new ArrayList<>();
for (OcpApiGroup ocpApiGroup : ocpApiGroups) {
ThreeTreeList threeTreeList = new ThreeTreeList();
for (TwoDownList twoDownList : twoDownLists) { if (!(ocpApiGroup.getIsDelete() == 0)) {
for (OcpApiGroup ocpApiGroup : ocpApiGroups) { if (ocpApiGroup.getApiGroupLevel() == 3) {
String code = twoDownList.getApiGroupCode(); BeanUtils.copyProperties(ocpApiGroup, threeTreeList);
if (code.equals(ocpApiGroup.getApiGroupPcode())){
ThreeTreeList threeTreeList = new ThreeTreeList();
BeanUtils.copyProperties(ocpApiGroup,threeTreeList);
threeTreeLists.add(threeTreeList); threeTreeLists.add(threeTreeList);
/* threeTreeList.setThreeList(ocpApiGroup);
threeTreeLists.add(threeTreeList);*/
} }
} else {
continue;
} }
} }
...@@ -119,43 +130,70 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper,OcpApiGr ...@@ -119,43 +130,70 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper,OcpApiGr
} }
/** /**
* 新增服务分类 * 4服务层
* *
* @param ocpApiGroupDtos * @param threeTreeLists
*/ * @return
@Override */
public boolean insertTree(OcpApiGroupDtos ocpApiGroupDtos) { public List<FourTreeList> fourTreeLists(List<ThreeTreeList> threeTreeLists, List<OcpApiGroup> ocpApiGroups) {
List<FourTreeList> foureTreeList = new ArrayList<>();
boolean flag = true; for (OcpApiGroup ocpApiGroup : ocpApiGroups) {
List<OcpApiGroup> ocpApiGroups = mapper.selectList(null); FourTreeList fourTreeList = new FourTreeList();
for (OcpApiGroup ocpApiGroup : ocpApiGroups) { if (!(ocpApiGroup.getIsDelete() == 0)) {
if (ocpApiGroup.getApiGroupCode().equals(ocpApiGroupDtos.getApiGroupCode())){ if (ocpApiGroup.getApiGroupLevel() == 4) {
flag = false; BeanUtils.copyProperties(fourTreeList, foureTreeList);
break; foureTreeList.add(fourTreeList);
} }
} else {
continue;
} }
if (flag == true) {
OcpApiBase ocpApiBase = new OcpApiBase();
ocpApiBase.setApiCode(ocpApiGroupDtos.getApiGroupCode());
BeanUtils.copyProperties(ocpApiGroupDtos, ocpApiBase);
ocpApiBase.setApiName("新增服务分类");
Timestamp timestamp = new Timestamp(System.currentTimeMillis());
ocpApiBase.setApiMtime(timestamp);
ocpApiBase.setApiCtime(ocpApiGroupDtos.getApiGroupCtime());
ocpApiBase.setApiUserId(ocpApiGroupDtos.getApiGroupUserId());
ocpApiBase.setObjId("");
OcpApiGroup ocpApiGroup1 = new OcpApiGroup();
ocpApiGroup1.setObjId("");
BeanUtils.copyProperties(ocpApiGroupDtos, ocpApiGroup1);
ocpApiBaseMapper.insert(ocpApiBase);
mapper.insert(ocpApiGroup1);
}
return foureTreeList;
}
/**
* 新增服务分类
*
* @param ocpApiGroupDtos
*/
@Override
public boolean insertTree(OcpApiGroupDtos ocpApiGroupDtos) {
String code = RandomStringUtil.getRandomString(6);
boolean flag = true;
List<OcpApiGroup> ocpApiGroups = mapper.selectList(null);
for (OcpApiGroup ocpApiGroup : ocpApiGroups) {
if (ocpApiGroup.getApiGroupCode().equals(ocpApiGroupDtos.getApiGroupCode())) {
flag = false;
break;
} }
return flag; }
if (flag == true) {
OcpApiBase ocpApiBase = new OcpApiBase();
ocpApiBase.setApiCode(ocpApiGroupDtos.getApiGroupCode());
BeanUtils.copyProperties(ocpApiGroupDtos, ocpApiBase);
ocpApiBase.setApiGroupCode(code);
ocpApiBase.setApiName("新增服务分类");
Timestamp timestamp = new Timestamp(System.currentTimeMillis());
ocpApiBase.setApiMtime(timestamp);
ocpApiBase.setApiCtime(ocpApiGroupDtos.getApiGroupCtime());
ocpApiBase.setApiUserId(ocpApiGroupDtos.getApiGroupUserId());
ocpApiBase.setObjId("");
OcpApiGroup ocpApiGroup1 = new OcpApiGroup();
ocpApiGroup1.setObjId("");
BeanUtils.copyProperties(ocpApiGroupDtos, ocpApiGroup1);
ocpApiGroup1.setApiGroupCode(code);
ocpApiBaseMapper.insert(ocpApiBase);
mapper.insert(ocpApiGroup1);
} }
return flag;
}
/** /**
...@@ -164,12 +202,21 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper,OcpApiGr ...@@ -164,12 +202,21 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper,OcpApiGr
* @param * @param
*/ */
@Override @Override
public void updataOcpTree(OcpApiGroup ocpApiGroup) { public boolean updataOcpTree(OcpApiGroup ocpApiGroup) {
boolean falg = true;
List<OcpApiGroup> ocpApiGroups = mapper.selectList(null);
for (OcpApiGroup apiGroup : ocpApiGroups) {
String code = apiGroup.getApiGroupCode();
if (code == ocpApiGroup.getApiGroupCode()) {
falg = false;
break;
}
}
mapper.updateById(ocpApiGroup); mapper.updateById(ocpApiGroup);
return falg;
} }
/** /**
* 删除服务分类 * 删除服务分类
* *
...@@ -179,16 +226,78 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper,OcpApiGr ...@@ -179,16 +226,78 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper,OcpApiGr
public boolean deleteOcpTree(OcpApiGroup ocpApiGroup) { public boolean deleteOcpTree(OcpApiGroup ocpApiGroup) {
String objId = ocpApiGroup.getObjId(); String objId = ocpApiGroup.getObjId();
OcpApiGroup ocpApiGroup1 = mapper.selectById(objId); OcpApiGroup ocpApiGroup1 = mapper.selectById(objId);
if (StringUtils.isBlank(ocpApiGroup1.getApiGroupPcode())) {
if(StringUtils.isBlank(ocpApiGroup1.getApiGroupPcode())){
mapper.deleteById(objId); mapper.deleteById(objId);
return true; return true;
}else { } else {
return false; return false;
} }
}
/* *//**
* 一级服务
*
* @param
*//*
@Override
public List<OcpApiGroup> getOnePage(int pageSize, int pageNum, int apiGroupLevel) {
Page pageInfo = new Page(pageSize,pageNum);
LambdaQueryWrapper<OcpApiGroup> queryWrapper = new LambdaQueryWrapper();
LambdaQueryWrapper<OcpApiGroup> eq = queryWrapper.eq(OcpApiGroup::getApiGroupLevel, apiGroupLevel);
List<OcpApiGroup> ocpApiGroups = mapper.selectList(eq);
return ocpApiGroups;
}*/
/**
* 服务列表分级查询
*
* @param pageGroupDto
* @return
*/
@Override
public Page<OcpApiGroup> getOnePages(PageGroupDto pageGroupDto) {
Page pageInfo = new Page(pageGroupDto.getPageSize(), pageGroupDto.getPageNum());
if (pageGroupDto.getApiGroupLevel() == 1 && "".equals(pageGroupDto.getApiGroupPcode())) {
LambdaQueryWrapper<OcpApiGroup> queryWrapper = new LambdaQueryWrapper();
queryWrapper.eq(OcpApiGroup::getApiGroupLevel, pageGroupDto.getApiGroupLevel());
mapper.selectPage(pageInfo,queryWrapper);
}else if (pageGroupDto.getApiGroupLevel() == 2){
List<OcpApiGroup> ocpApiGroups = mapper.selectList(null);
for (OcpApiGroup ocpApiGroup : ocpApiGroups) {
if (pageGroupDto.getApiGroupCode() == ocpApiGroup.getApiGroupCode()){
LambdaQueryWrapper<OcpApiGroup> queryWrapper = new LambdaQueryWrapper();
queryWrapper.eq(OcpApiGroup::getApiGroupLevel, pageGroupDto.getApiGroupLevel());
mapper.selectPage(pageInfo,queryWrapper);
}
}
}else if (pageGroupDto.getApiGroupLevel() == 3){
List<OcpApiGroup> ocpApiGroups = mapper.selectList(null);
for (OcpApiGroup ocpApiGroup : ocpApiGroups) {
if (pageGroupDto.getApiGroupCode() == ocpApiGroup.getApiGroupCode()) {
LambdaQueryWrapper<OcpApiGroup> queryWrapper = new LambdaQueryWrapper();
queryWrapper.eq(OcpApiGroup::getApiGroupLevel, pageGroupDto.getApiGroupLevel());
mapper.selectPage(pageInfo, queryWrapper);
}
}
}else {
List<OcpApiGroup> ocpApiGroups = mapper.selectList(null);
for (OcpApiGroup ocpApiGroup : ocpApiGroups) {
if (pageGroupDto.getApiGroupCode() == ocpApiGroup.getApiGroupCode()) {
LambdaQueryWrapper<OcpApiGroup> queryWrapper = new LambdaQueryWrapper();
queryWrapper.eq(OcpApiGroup::getApiGroupLevel, pageGroupDto.getApiGroupLevel());
mapper.selectPage(pageInfo, queryWrapper);
}
}
}
return pageInfo;
} }
} }
src/main/resources/application-prod.yml
View file @ 8286c4a4
...@@ -4,7 +4,7 @@ spring: ...@@ -4,7 +4,7 @@ spring:
username: ocp_user username: ocp_user
password: spaceIN511 password: spaceIN511
type: com.zaxxer.hikari.HikariDataSource type: com.zaxxer.hikari.HikariDataSource
jdbc-url: jdbc:postgresql://172.37.41.175:5432/pms3?currentSchema=operating_platform&stringtype=unspecified&TimeZone=Asia/Shanghai&useAffectedRows=true url: jdbc:postgresql://172.37.41.175:5432/pms3?currentSchema=operating_platform&stringtype=unspecified&TimeZone=Asia/Shanghai&useAffectedRows=true
knife4j: knife4j:
enable: true enable: true
......
src/main/resources/application.yml
View file @ 8286c4a4
...@@ -15,8 +15,10 @@ knife4j: ...@@ -15,8 +15,10 @@ knife4j:
mybatis-plus: mybatis-plus:
mapper-locations: classpath:/mapper/*.xml mapper-locations: classpath:/mapper/*.xml
configuration: configuration:
# log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl # log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
# 是否开启自动驼峰命名规则
map-underscore-to-camel-case: true
logging: logging:
level: level:
......
src/main/resources/logback.xml
View file @ 8286c4a4
...@@ -51,7 +51,8 @@ ...@@ -51,7 +51,8 @@
<logger name="org.springframework.boot.autoconfigure.logging" level="INFO"/> <logger name="org.springframework.boot.autoconfigure.logging" level="INFO"/>
<!--输出接口日志--> <!--输出接口日志-->
<logger name="com.pms.ocp.common.aspect.InterfaceLogAspect" level="INFO" additivity="false"> <!-- TODO-->
<logger name="com.pms.ocp.common.aspectj.OperLogAspect" level="INFO" additivity="false">
<appender-ref ref="INTERFACE_LOG"/> <appender-ref ref="INTERFACE_LOG"/>
</logger> </logger>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment