diff --git a/pom.xml b/pom.xml index 047ea8015e7d2ca149b921d7fc0fa48ff1e33dc3..aa4fffce7c329640e1b83776ffe7976a3627dc7b 100644 --- a/pom.xml +++ b/pom.xml @@ -232,7 +232,7 @@ spring-boot-maven-plugin ${spring-boot.version} - com.pms.ocp.StartApp + com.nx.umms.UmmsApplication diff --git a/src/main/java/com/pms/ocp/OcpApplication.java b/src/main/java/com/nx/umms/UmmsApplication.java similarity index 87% rename from src/main/java/com/pms/ocp/OcpApplication.java rename to src/main/java/com/nx/umms/UmmsApplication.java index 67db413914f3b53a11f2d33df0a31380c3092cd5..4edb0b2b0f1adb0886bd53e30c32c3dbebb9c721 100644 --- a/src/main/java/com/pms/ocp/OcpApplication.java +++ b/src/main/java/com/nx/umms/UmmsApplication.java @@ -1,4 +1,4 @@ -package com.pms.ocp; +package com.nx.umms; import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; @@ -19,13 +19,13 @@ import java.util.TimeZone; */ @SpringBootApplication -@MapperScan(basePackages = {"com.pms.ocp.mapper"}) +@MapperScan(basePackages = {"com.nx.umms.mapper"}) @ConfigurationPropertiesScan @EnableOpenApi -public class OcpApplication { +public class UmmsApplication { public static void main(String[] args) { TimeZone.setDefault(TimeZone.getTimeZone("GMT+8")); - SpringApplication.run(OcpApplication.class, args); + SpringApplication.run(UmmsApplication.class, args); } /** diff --git a/src/main/java/com/pms/ocp/common/aspectj/OperLog.java b/src/main/java/com/nx/umms/common/aspectj/OperLog.java similarity index 94% rename from src/main/java/com/pms/ocp/common/aspectj/OperLog.java rename to src/main/java/com/nx/umms/common/aspectj/OperLog.java index fee4561dbafb30ea8cf4fba4e1e7fdcd38d4bf83..01a2ff6045675fc4c8a7f7465012adebf22247c9 100644 --- a/src/main/java/com/pms/ocp/common/aspectj/OperLog.java +++ b/src/main/java/com/nx/umms/common/aspectj/OperLog.java @@ -1,4 +1,4 @@ -package com.pms.ocp.common.aspectj; +package com.nx.umms.common.aspectj; import java.lang.annotation.*; diff --git a/src/main/java/com/pms/ocp/common/aspectj/OperLogAspect.java b/src/main/java/com/nx/umms/common/aspectj/OperLogAspect.java similarity index 97% rename from src/main/java/com/pms/ocp/common/aspectj/OperLogAspect.java rename to src/main/java/com/nx/umms/common/aspectj/OperLogAspect.java index 3e639d2d447ff5f5f9c6b1b501b211f6ea32402e..9bf1508102f937137da05bfac5c9ee0dc480eadb 100644 --- a/src/main/java/com/pms/ocp/common/aspectj/OperLogAspect.java +++ b/src/main/java/com/nx/umms/common/aspectj/OperLogAspect.java @@ -1,9 +1,9 @@ -package com.pms.ocp.common.aspectj; +package com.nx.umms.common.aspectj; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.serializer.PropertyFilter; -import com.pms.ocp.model.entity.ModelAudit; -import com.pms.ocp.service.ModelAuditService; +import com.nx.umms.model.entity.ModelAudit; +import com.nx.umms.service.ModelAuditService; import org.apache.commons.lang3.StringUtils; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.ProceedingJoinPoint; @@ -42,7 +42,7 @@ public class OperLogAspect { private static Logger logger = LoggerFactory.getLogger(OperLogAspect.class); - @Pointcut("@annotation(com.pms.ocp.common.aspectj.OperLog)") + @Pointcut("@annotation(com.nx.umms.common.aspectj.OperLog)") public void logPointCut() { } diff --git a/src/main/java/com/pms/ocp/common/component/ApplicationContextUtil.java b/src/main/java/com/nx/umms/common/component/ApplicationContextUtil.java similarity index 94% rename from src/main/java/com/pms/ocp/common/component/ApplicationContextUtil.java rename to src/main/java/com/nx/umms/common/component/ApplicationContextUtil.java index 05305c85b388f4f318f222a336e465bb1399a0eb..58aa71c9b408fa0aedeb69a7a89e32bfb640130f 100644 --- a/src/main/java/com/pms/ocp/common/component/ApplicationContextUtil.java +++ b/src/main/java/com/nx/umms/common/component/ApplicationContextUtil.java @@ -1,4 +1,4 @@ -package com.pms.ocp.common.component; +package com.nx.umms.common.component; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; diff --git a/src/main/java/com/pms/ocp/common/component/LogbackFilter.java b/src/main/java/com/nx/umms/common/component/LogbackFilter.java similarity index 97% rename from src/main/java/com/pms/ocp/common/component/LogbackFilter.java rename to src/main/java/com/nx/umms/common/component/LogbackFilter.java index 06d63d07e85b9bd2d06599036964130ebb91f768..fa6ab56359252d5e9cfd6a4cde92b47cb0b783dc 100644 --- a/src/main/java/com/pms/ocp/common/component/LogbackFilter.java +++ b/src/main/java/com/nx/umms/common/component/LogbackFilter.java @@ -1,4 +1,4 @@ -package com.pms.ocp.common.component; +package com.nx.umms.common.component; import java.io.IOException; import java.util.UUID; diff --git a/src/main/java/com/pms/ocp/common/config/FilterConfig.java b/src/main/java/com/nx/umms/common/config/FilterConfig.java similarity index 88% rename from src/main/java/com/pms/ocp/common/config/FilterConfig.java rename to src/main/java/com/nx/umms/common/config/FilterConfig.java index bfee5337c2b304196a4ce7cc4c07edfed2009b9e..57ac2977df49740e98191a140d8e93f3a5b87296 100644 --- a/src/main/java/com/pms/ocp/common/config/FilterConfig.java +++ b/src/main/java/com/nx/umms/common/config/FilterConfig.java @@ -1,6 +1,6 @@ -package com.pms.ocp.common.config; +package com.nx.umms.common.config; -import com.pms.ocp.common.component.LogbackFilter; +import com.nx.umms.common.component.LogbackFilter; import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/pms/ocp/common/config/PageParam.java b/src/main/java/com/nx/umms/common/config/PageParam.java similarity index 95% rename from src/main/java/com/pms/ocp/common/config/PageParam.java rename to src/main/java/com/nx/umms/common/config/PageParam.java index 3681cbf8f9d161a722588db04d1d9565b421473b..c8832f9a6f2e66d2b904d98f7731c64746e62e4b 100644 --- a/src/main/java/com/pms/ocp/common/config/PageParam.java +++ b/src/main/java/com/nx/umms/common/config/PageParam.java @@ -1,4 +1,4 @@ -package com.pms.ocp.common.config; +package com.nx.umms.common.config; import lombok.Data; diff --git a/src/main/java/com/pms/ocp/common/config/SwaggerConfig.java b/src/main/java/com/nx/umms/common/config/SwaggerConfig.java similarity index 85% rename from src/main/java/com/pms/ocp/common/config/SwaggerConfig.java rename to src/main/java/com/nx/umms/common/config/SwaggerConfig.java index b47e7a5da44ef3fd67c5a543b3a2c87eb3278b3e..89decbcb0f4e6253fc7010cb8abc0a72ce7c5129 100644 --- a/src/main/java/com/pms/ocp/common/config/SwaggerConfig.java +++ b/src/main/java/com/nx/umms/common/config/SwaggerConfig.java @@ -1,4 +1,4 @@ -package com.pms.ocp.common.config; +package com.nx.umms.common.config; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Value; @@ -38,13 +38,13 @@ public class SwaggerConfig { // 用来创建该API的基本信息，展示在文档的页面中（自定义展示的信息） .apiInfo(apiInfo()) //分组名称 - .groupName("运营管控平台-模型应用服务库管理1.0版本") + .groupName("宁夏统一模型管理系统") // 设置哪些接口暴露给Swagger展示 .select() // 扫描所有有注解的api，用这种方式更灵活 .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class)) // 扫描指定包中的swagger注解 - .apis(RequestHandlerSelectors.basePackage("com.pms.ocp")) + .apis(RequestHandlerSelectors.basePackage("com.nx.umms")) // 扫描所有 .apis(RequestHandlerSelectors.any()) .paths(PathSelectors.any()) .build(); @@ -57,9 +57,9 @@ public class SwaggerConfig { // 用ApiInfoBuilder进行定制 return new ApiInfoBuilder() // 设置标题 - .title("运营管控平台_接口文档") + .title("宁夏统一模型管理系统") // 描述 - .description("关于模型库、应用库、服务库各管理接口文档") + .description("关于宁夏统一模型管理系统接口文档") // 作者信息 .contact(new Contact("", "", "")) // 版本 diff --git a/src/main/java/com/pms/ocp/common/constants/AnalysisConstant.java b/src/main/java/com/nx/umms/common/constants/AnalysisConstant.java similarity index 90% rename from src/main/java/com/pms/ocp/common/constants/AnalysisConstant.java rename to src/main/java/com/nx/umms/common/constants/AnalysisConstant.java index 241353cafab301b0a79b8268cbe6446216357c5e..a47f8b728474165195a0df5d6afab1f9419c31ae 100644 --- a/src/main/java/com/pms/ocp/common/constants/AnalysisConstant.java +++ b/src/main/java/com/nx/umms/common/constants/AnalysisConstant.java @@ -1,4 +1,4 @@ -package com.pms.ocp.common.constants; +package com.nx.umms.common.constants; public interface AnalysisConstant { interface exportOcpApiAuditName{ diff --git a/src/main/java/com/pms/ocp/common/constants/ChooseDateType.java b/src/main/java/com/nx/umms/common/constants/ChooseDateType.java similarity index 94% rename from src/main/java/com/pms/ocp/common/constants/ChooseDateType.java rename to src/main/java/com/nx/umms/common/constants/ChooseDateType.java index a3a567f484e4cf39782b71da81d235f0b3ffe9d2..721e95e514ad220c3d1706ff2b54a681934ebe79 100644 --- a/src/main/java/com/pms/ocp/common/constants/ChooseDateType.java +++ b/src/main/java/com/nx/umms/common/constants/ChooseDateType.java @@ -1,4 +1,4 @@ -package com.pms.ocp.common.constants; +package com.nx.umms.common.constants; public enum ChooseDateType { ONE_WEEK(1, "最近一周"), diff --git a/src/main/java/com/pms/ocp/common/constants/Constant.java b/src/main/java/com/nx/umms/common/constants/Constant.java similarity index 99% rename from src/main/java/com/pms/ocp/common/constants/Constant.java rename to src/main/java/com/nx/umms/common/constants/Constant.java index bb7e04629bede871d1d8b321ff6c01818750f737..b7d57e3b1a6061ac88c8e853b8b81d8bc73bda77 100644 --- a/src/main/java/com/pms/ocp/common/constants/Constant.java +++ b/src/main/java/com/nx/umms/common/constants/Constant.java @@ -1,4 +1,4 @@ -package com.pms.ocp.common.constants; +package com.nx.umms.common.constants; import java.math.BigDecimal; diff --git a/src/main/java/com/pms/ocp/common/constants/StringUtils.java b/src/main/java/com/nx/umms/common/constants/StringUtils.java similarity index 99% rename from src/main/java/com/pms/ocp/common/constants/StringUtils.java rename to src/main/java/com/nx/umms/common/constants/StringUtils.java index e5bacea15e061ea2a28770f574b234fb2585eee8..54b97aed08b1c16fd8392535fd5e300c64d2b43c 100644 --- a/src/main/java/com/pms/ocp/common/constants/StringUtils.java +++ b/src/main/java/com/nx/umms/common/constants/StringUtils.java @@ -1,4 +1,4 @@ -package com.pms.ocp.common.constants; +package com.nx.umms.common.constants; import java.io.UnsupportedEncodingException; import java.util.*; diff --git a/src/main/java/com/pms/ocp/common/handler/MYLocalDateTimeTypeHandler.java b/src/main/java/com/nx/umms/common/handler/MYLocalDateTimeTypeHandler.java similarity index 98% rename from src/main/java/com/pms/ocp/common/handler/MYLocalDateTimeTypeHandler.java rename to src/main/java/com/nx/umms/common/handler/MYLocalDateTimeTypeHandler.java index 8efbd9f9b6502b81d390793eb80696cfb93f59d0..f9fe01d409e716ceb48c855fcde6b499b895ecdc 100644 --- a/src/main/java/com/pms/ocp/common/handler/MYLocalDateTimeTypeHandler.java +++ b/src/main/java/com/nx/umms/common/handler/MYLocalDateTimeTypeHandler.java @@ -1,4 +1,4 @@ -package com.pms.ocp.common.handler; +package com.nx.umms.common.handler; import org.apache.ibatis.type.LocalDateTimeTypeHandler; diff --git a/src/main/java/com/pms/ocp/common/handler/TimestampTypeHandler.java b/src/main/java/com/nx/umms/common/handler/TimestampTypeHandler.java similarity index 98% rename from src/main/java/com/pms/ocp/common/handler/TimestampTypeHandler.java rename to src/main/java/com/nx/umms/common/handler/TimestampTypeHandler.java index dab5ce2a0827d17d63cadc6d2391c55fea2c3b3d..1be7794ea1f573cb7d5961d415573d0ef027564d 100644 --- a/src/main/java/com/pms/ocp/common/handler/TimestampTypeHandler.java +++ b/src/main/java/com/nx/umms/common/handler/TimestampTypeHandler.java @@ -1,4 +1,4 @@ -package com.pms.ocp.common.handler; +package com.nx.umms.common.handler; import org.apache.ibatis.type.BaseTypeHandler; import org.apache.ibatis.type.JdbcType; diff --git a/src/main/java/com/pms/ocp/common/utils/BeagleStringUtils.java b/src/main/java/com/nx/umms/common/utils/BeagleStringUtils.java similarity index 93% rename from src/main/java/com/pms/ocp/common/utils/BeagleStringUtils.java rename to src/main/java/com/nx/umms/common/utils/BeagleStringUtils.java index 563349ce31a8b5fb5d42af1fc92c08fd1e5bdce1..98775487d536f71ca576a2ff043891118ca675e6 100644 --- a/src/main/java/com/pms/ocp/common/utils/BeagleStringUtils.java +++ b/src/main/java/com/nx/umms/common/utils/BeagleStringUtils.java @@ -1,4 +1,4 @@ -package com.pms.ocp.common.utils; +package com.nx.umms.common.utils; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/com/pms/ocp/common/utils/DataStructureHandleUtils.java b/src/main/java/com/nx/umms/common/utils/DataHandleUtils.java similarity index 69% rename from src/main/java/com/pms/ocp/common/utils/DataStructureHandleUtils.java rename to src/main/java/com/nx/umms/common/utils/DataHandleUtils.java index d23dd3b63140087cdda860643a923e950f070ac9..f0aa688bdea7073c08961d396e89c3eebe5faaf4 100644 --- a/src/main/java/com/pms/ocp/common/utils/DataStructureHandleUtils.java +++ b/src/main/java/com/nx/umms/common/utils/DataHandleUtils.java @@ -1,5 +1,6 @@ -package com.pms.ocp.common.utils; +package com.nx.umms.common.utils; +import com.alibaba.fastjson.JSON; import org.apache.commons.lang3.StringUtils; import java.lang.reflect.Field; @@ -16,7 +17,7 @@ import java.util.Map; * @Date: 2022/3/12 13:29 * @Description:数据结构处理工具类 */ -public class DataStructureHandleUtils { +public class DataHandleUtils { /** * List> 到 List 数据转换 */ @@ -76,4 +77,47 @@ public class DataStructureHandleUtils { return null; } + /** + * 从List copy到List + * + * @param sourceList 原List + * @param targetClazz 目标对象 + * @param + * @return + */ + public static List copy(List sourceList, Class targetClazz) { + String oldOb = JSON.toJSONString(sourceList); + return JSON.parseArray(oldOb, targetClazz); + } + + /** + * 从对象A copy到 对象B + * + * @param ob A + * @param clazz B.class + * @return B + */ + public static T copy(Object ob, Class clazz) { + String oldOb = JSON.toJSONString(ob); + return JSON.parseObject(oldOb, clazz); + } + + /** + * 判断对象是否为null + * @param object + * @return + */ + public static boolean isNullOrEmpty(Object object) { + if (object == null) { + return true; + } + if (object instanceof List) { + return ((List) object).size() == 0; + } + if (object instanceof String) { + return ((String) object).trim().equals(""); + } + return false; + } + } diff --git a/src/main/java/com/pms/ocp/common/utils/DateUtils.java b/src/main/java/com/nx/umms/common/utils/DateUtils.java similarity index 99% rename from src/main/java/com/pms/ocp/common/utils/DateUtils.java rename to src/main/java/com/nx/umms/common/utils/DateUtils.java index a135959860c9bf4089cb058b55097dbc401f1539..1d260f1c6011502c87aff1c6e0c03c49a8ca7b90 100644 --- a/src/main/java/com/pms/ocp/common/utils/DateUtils.java +++ b/src/main/java/com/nx/umms/common/utils/DateUtils.java @@ -1,4 +1,4 @@ -package com.pms.ocp.common.utils; +package com.nx.umms.common.utils; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; diff --git a/src/main/java/com/pms/ocp/common/utils/ExcelImportUtils.java b/src/main/java/com/nx/umms/common/utils/ExcelImportUtils.java similarity index 99% rename from src/main/java/com/pms/ocp/common/utils/ExcelImportUtils.java rename to src/main/java/com/nx/umms/common/utils/ExcelImportUtils.java index 3e6cc3aca98ac4a0448d55261e339163c2b319db..7c829a462448b6bff6154423a41c841580bd024f 100644 --- a/src/main/java/com/pms/ocp/common/utils/ExcelImportUtils.java +++ b/src/main/java/com/nx/umms/common/utils/ExcelImportUtils.java @@ -1,4 +1,4 @@ -package com.pms.ocp.common.utils; +package com.nx.umms.common.utils; import org.apache.poi.hssf.usermodel.HSSFCellStyle; import org.apache.poi.hssf.usermodel.HSSFFont; diff --git a/src/main/java/com/pms/ocp/common/utils/ExcelUtils.java b/src/main/java/com/nx/umms/common/utils/ExcelUtils.java similarity index 97% rename from src/main/java/com/pms/ocp/common/utils/ExcelUtils.java rename to src/main/java/com/nx/umms/common/utils/ExcelUtils.java index e42199917dcdc520ec3e9d82a96c5ed23dd297c5..c0174aaa41c3ee93bf1af48784cfaed2c334b239 100644 --- a/src/main/java/com/pms/ocp/common/utils/ExcelUtils.java +++ b/src/main/java/com/nx/umms/common/utils/ExcelUtils.java @@ -1,13 +1,12 @@ -package com.pms.ocp.common.utils; +package com.nx.umms.common.utils; import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.ExcelImportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.afterturn.easypoi.excel.entity.ImportParams; import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; -import com.pms.ocp.common.constants.ResultCode; -import com.pms.ocp.common.exception.BeagleException; -import com.pms.ocp.common.exception.ServiceException; +import com.nx.umms.common.utils.res.BusinessException; +import com.nx.umms.common.utils.res.ResultCodeEnum; import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.Workbook; import org.springframework.beans.BeanUtils; @@ -276,13 +275,13 @@ public class ExcelUtils { */ public static void checkFile(MultipartFile file) { if (file == null) { - throw new ServiceException(ResultCode.FILE_NOT_EXISTS); + throw new BusinessException(ResultCodeEnum.FILE_NOT_EXISTS); } String fileName = file.getOriginalFilename(); assert fileName != null; if (!fileName.endsWith(XLS) && !fileName.endsWith(XLS_X)) { - throw new ServiceException(ResultCode.FILE_NOT_EXISTS); + throw new BusinessException(ResultCodeEnum.FILE_MUST_IS_EXCEL); } } diff --git a/src/main/java/com/pms/ocp/common/utils/FileExport.java b/src/main/java/com/nx/umms/common/utils/FileExport.java similarity index 99% rename from src/main/java/com/pms/ocp/common/utils/FileExport.java rename to src/main/java/com/nx/umms/common/utils/FileExport.java index f4e2d9664f0d5c67c403c62bc25b71971c3a8680..390c35e03cb52eede7c5c676ec0e00ee29579b32 100644 --- a/src/main/java/com/pms/ocp/common/utils/FileExport.java +++ b/src/main/java/com/nx/umms/common/utils/FileExport.java @@ -1,4 +1,4 @@ -package com.pms.ocp.common.utils; +package com.nx.umms.common.utils; import org.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.hssf.usermodel.HSSFCellStyle; diff --git a/src/main/java/com/pms/ocp/common/utils/FileUtil.java b/src/main/java/com/nx/umms/common/utils/FileUtil.java similarity index 96% rename from src/main/java/com/pms/ocp/common/utils/FileUtil.java rename to src/main/java/com/nx/umms/common/utils/FileUtil.java index 5babdc3ef029ea403540837a9c768bf9ec56149f..975b8a1e4f62c9e335337935de145e520334507b 100644 --- a/src/main/java/com/pms/ocp/common/utils/FileUtil.java +++ b/src/main/java/com/nx/umms/common/utils/FileUtil.java @@ -1,4 +1,4 @@ -package com.pms.ocp.common.utils; +package com.nx.umms.common.utils; import cn.afterturn.easypoi.excel.ExcelImportUtil; import cn.afterturn.easypoi.excel.entity.ImportParams; diff --git a/src/main/java/com/pms/ocp/common/utils/PageRequest.java b/src/main/java/com/nx/umms/common/utils/PageRequest.java similarity index 93% rename from src/main/java/com/pms/ocp/common/utils/PageRequest.java rename to src/main/java/com/nx/umms/common/utils/PageRequest.java index 3c6b58167316abd87413c3902f4a850c2e5860a6..a1456604994cc2c53b186c5e8eb53c426086fca8 100644 --- a/src/main/java/com/pms/ocp/common/utils/PageRequest.java +++ b/src/main/java/com/nx/umms/common/utils/PageRequest.java @@ -1,4 +1,4 @@ -package com.pms.ocp.common.utils; +package com.nx.umms.common.utils; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/pms/ocp/common/utils/PageUtil.java b/src/main/java/com/nx/umms/common/utils/PageUtil.java similarity index 97% rename from src/main/java/com/pms/ocp/common/utils/PageUtil.java rename to src/main/java/com/nx/umms/common/utils/PageUtil.java index 58644e95146864ac9dbe6574d7b94d30fdb090fc..ace65390b292bed563d029114eb0e822e430c819 100644 --- a/src/main/java/com/pms/ocp/common/utils/PageUtil.java +++ b/src/main/java/com/nx/umms/common/utils/PageUtil.java @@ -1,4 +1,4 @@ -package com.pms.ocp.common.utils; +package com.nx.umms.common.utils; import lombok.Data; diff --git a/src/main/java/com/pms/ocp/common/utils/RandomStringUtils.java b/src/main/java/com/nx/umms/common/utils/RandomStringUtils.java similarity index 94% rename from src/main/java/com/pms/ocp/common/utils/RandomStringUtils.java rename to src/main/java/com/nx/umms/common/utils/RandomStringUtils.java index 40c89cd5db23af686181c8361bb62c3a0fd7a50a..6a4c4749a6cf464fc2794958ff11b92d4bb288da 100644 --- a/src/main/java/com/pms/ocp/common/utils/RandomStringUtils.java +++ b/src/main/java/com/nx/umms/common/utils/RandomStringUtils.java @@ -1,4 +1,4 @@ -package com.pms.ocp.common.utils; +package com.nx.umms.common.utils; import java.util.Random; diff --git a/src/main/java/com/pms/ocp/common/utils/TreeUtils.java b/src/main/java/com/nx/umms/common/utils/TreeUtils.java similarity index 95% rename from src/main/java/com/pms/ocp/common/utils/TreeUtils.java rename to src/main/java/com/nx/umms/common/utils/TreeUtils.java index 85a2d7bff65319e448518f68ab15fcec0f477ebf..8b2d5676a54972ceec834414e02cd5a6d4d57bc8 100644 --- a/src/main/java/com/pms/ocp/common/utils/TreeUtils.java +++ b/src/main/java/com/nx/umms/common/utils/TreeUtils.java @@ -1,6 +1,6 @@ -package com.pms.ocp.common.utils; +package com.nx.umms.common.utils; -import com.pms.ocp.model.entity.TreeNode; +import com.nx.umms.model.entity.TreeNode; import java.util.*; diff --git a/src/main/java/com/nx/umms/common/utils/res/BusinessException.java b/src/main/java/com/nx/umms/common/utils/res/BusinessException.java new file mode 100644 index 0000000000000000000000000000000000000000..1b4e6c6ea77376c2fa96a757686b9ee28f70d999 --- /dev/null +++ b/src/main/java/com/nx/umms/common/utils/res/BusinessException.java @@ -0,0 +1,51 @@ +package com.nx.umms.common.utils.res; + +import lombok.Data; + +/** + * @Auther: wangjian + * @Date: 2022/3/11 16:31 + * @Description: + */ + +@Data +public class BusinessException extends RuntimeException { + + /** + * 自定义异常枚举类 + */ + private ResultCodeEnum resultCodeEnum; + + /** + * 错误码 + */ + private Integer errorCode; + + /** + * 错误信息 + */ + private String errorMessage; + + + public BusinessException() { + super(); + } + + public BusinessException(ResultCodeEnum resultCodeEnum) { + super("{code:" + resultCodeEnum.getCode() + ",errorMsg:" + resultCodeEnum.getMessage() + "}"); + this.resultCodeEnum = resultCodeEnum; + this.errorCode = resultCodeEnum.getCode(); + this.errorMessage = resultCodeEnum.getMessage(); + } + + public BusinessException(ResultCodeEnum resultCodeEnum, Throwable cause) { + super(resultCodeEnum.getMessage(), cause); + } + + public BusinessException(int code, String errorMessage) { + super("{code:" + code + ",errorMsg:" + errorMessage + "}"); + this.errorCode = code; + this.errorMessage = errorMessage; + } + +} diff --git a/src/main/java/com/nx/umms/common/utils/res/OverallExceptionHandler.java b/src/main/java/com/nx/umms/common/utils/res/OverallExceptionHandler.java new file mode 100644 index 0000000000000000000000000000000000000000..b96738fbc13a5185b025d2ae53c52ba4dcbcb194 --- /dev/null +++ b/src/main/java/com/nx/umms/common/utils/res/OverallExceptionHandler.java @@ -0,0 +1,51 @@ +package com.nx.umms.common.utils.res; + +import com.nx.umms.common.utils.BeagleStringUtils; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.ResponseStatus; +import org.springframework.web.bind.annotation.RestControllerAdvice; + +/** + * @Auther: wangjian + * @Date: 2022/3/28 17:42 + * @Description:全局异常处理器 + */ +@Slf4j +@RestControllerAdvice +public class OverallExceptionHandler { + + /** + * 默认全局异常处理。 + * + * @param exception + * @return ResultData + */ + @ExceptionHandler(Exception.class) + @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR) + public ResultVO exception(Exception exception) { + log.error("全局异常信息 ex={}", exception.getMessage(), exception); + return ResultVO.fail(ResultCodeEnum.SYSTEM_ERROR, exception.getMessage()); + } + + /** + * 业务异常处理。 + * + * @param businessException + * @return ResultData + */ + @ExceptionHandler(value = BusinessException.class) + public ResultVO beagleExceptionHandler(BusinessException businessException) { + log.error("发生业务异常！原因是：{}", businessException.getErrorMessage()); + ResultVO resultVO = new ResultVO(); + if (BeagleStringUtils.isBlank(businessException.getErrorMessage())) { + resultVO.setResultCodeEnum(ResultCodeEnum.SYSTEM_ERROR); + } else { + resultVO.setCode(businessException.getErrorCode()); + resultVO.setMessage(businessException.getErrorMessage()); + } + return resultVO; + } + +} diff --git a/src/main/java/com/nx/umms/common/utils/res/ResultCodeEnum.java b/src/main/java/com/nx/umms/common/utils/res/ResultCodeEnum.java new file mode 100644 index 0000000000000000000000000000000000000000..c0a75f0da1d0eda181a91fedadc638074d32524f --- /dev/null +++ b/src/main/java/com/nx/umms/common/utils/res/ResultCodeEnum.java @@ -0,0 +1,185 @@ +package com.nx.umms.common.utils.res; + +/** + * @Auther: wangjian + * @Date: 2022/3/28 17:13 + * @Description:定义状态码枚举值 + */ +public enum ResultCodeEnum { + + /** + * 操作成功 + **/ + SUCCESS(200, "操作成功", true), + + /** + * 操作失败 + **/ + RC999(999, "操作失败", false), + + /** + * 服务限流 + **/ + RC200(200, "服务开启限流保护,请稍后再试!", false), + + /** + * 服务降级 + **/ + RC201(201, "服务开启降级保护,请稍后再试!", false), + + /** + * 热点参数限流 + **/ + RC202(202, "热点参数限流,请稍后再试!", false), + + /** + * 系统规则不满足 + **/ + RC203(203, "系统规则不满足要求,请稍后再试!", false), + + /** + * 授权规则不通过 + **/ + RC204(204, "授权规则不通过,请稍后再试!", false), + + /** + * access_denied + **/ + RC403(403, "无访问权限,请联系管理员授予权限", false), + + /** + * access_denied + **/ + RC401(401, "匿名用户访问无权限资源时的异常", false), + + /** + * 系统异常 + */ + SYSTEM_ERROR(500, "系统异常，请稍后重试", false), + + INVALID_TOKEN(2001, "访问令牌不合法", false), + ACCESS_DENIED(2003, "没有权限访问该资源", false), + CLIENT_AUTHENTICATION_FAILED(1001, "客户端认证失败", false), + USERNAME_OR_PASSWORD_ERROR(1002, "用户名或密码错误", false), + UNSUPPORTED_GRANT_TYPE(1003, "不支持的认证模式", false), + + /** + * 必填参数为空 + */ + REQUIRED_PARAMETER_EMPTY(0, "必填参数为空", false), + + /** + * 参数类型错误 + */ + PARAMETER_TYPE_ERROR(0, "Parameter type error", false), + + /** + * 未登录 + */ + NOT_LOGIN(401001, "用户未登录", false), + + /** + * 用户名或密码错误 + */ + LOGIN_FAIL(401002, "用户名或密码错误", false), + + /** + * 无权限访问 + */ + NO_PERMISSION(401003, "无权限访问", false), + + /** + * 系统异常 + */ + UNKNOWN(9999, "System abnormal", false), + + /** + * 数据异常 + */ + NO_DATA(200, "数据库无数据", false), + + UP_DATA_FAIL(401005, "更新失败", false), + + INSERT_FAIL(401006, "插入数据失败", false), + + DELETE_FAIL(401007, "修改失败", false), + + DATA_REPETITION(250, "分类编码或分类名称重复", false), + + + /* ============================ 文件处理 错误码 ========================== **/ + FILE_NOT_EXISTS(21001, "文件不存在", false), + FILE_MUST_IS_EXCEL(21002, "文件类型必须是excel", false), + UPLOAD_EXCEPTION(21003, "上传过程出现异常", false), + EXCEL_RULE_NOT_EXISTS(21004, "excel校验规则不存在", false), + EXCEL_TEMPLATE_NOT_EXISTS(21005, "excel模板不存在", false), + EXCEL_TEMPLATE_NOT_CORRECT(21009, "excel模板不对，请重新下载", false), + EXCEL_DATA_NOT_EXISTS(21006, "excle数据不存在", false), + EXCEL_NOT_CORRECT(21007, "excel不正确", false), + EXCEL_PARSE_CORRECT(21010, "excel解析错误", false), + CURRENT_MONTH_NOT_EXISTS(21008, "当前年月数据不存在", false), + BATCH_NOT_NEED(21009, "无需批量操作！", false), + CELL_IS_NULL(21010, "值不能为空", false), + CELL_FORMAT_ERROR(21011, "值格式不正确", false), + CELL_MIN_LENGTH_ERROR(21012, "值小于最小长度", false), + CELL_MAX_LENGTH_ERROR(21013, "值大于最大长度", false), + CELL_REGULAR_ERROR(21014, "值正则验证不通过", false), + CELL_OPTION_ERROR(21015, "值不在选项集范围内", false), + ROW_DUPLICATE_ERROR(21016, "行重复性校验未通过", false), + CELL_DATE_FORMAT_ERROR(21017, "日期范围格式不正确", false), + + DATA_MISSING_UNITS(21018, "数据缺少单位级别编码", false), + PICTURE_NAME_ILLEGAL(21019, "图片名称不合法,请重新上传", false), + FILE_MUST_IS_PIC(21020, "图片格式不合法,请重新上传!", false), + NAME_CONFLICT(21021, "该组织机构下名称重复,请修改名称!", false), + ENCRYPT_ERROR_CODE(21022, "解密失败", false), + + /* ===========================后台系统======================== **/ + RECORD_NOT_EXIST(10001, "相关记录不存在!", false), + SYS_USER_INVALID(10002, "用户登录已过期!", false), + PERMISSION_NOT(10003, "无访问权限!", false), + ACCOUNT_NOT(10004, "账号异常!", false), + SHIRO_ERROR(10005, "鉴权/授权过程出错!", false), + MENU_EXIST(10006, "菜单定义已存在！", false), + ROLE_EXIST(10007, "角色定义已存在！", false), + CODE_EXIST(10008, "编码已存在！", false), + NAME_EXIST(10009, "名称已存在!", false), + NO_DELETE(10010, "无法删除，有关联数据!", false), + NO_REQUEST_DATA(10011, "前端未传入分类编码!", false), + USER_ORGANIZATION_LEVEL_ERROR(10023, "用户组织机构关联层级有误！", false), + USER_ORGANIZATION_INFO_ERROR(10024, "用户组织机构信息有误！", false), + TOKEN_INVALID(9997, "登录失效，请重新登录！", false); + + /** + * 自定义状态码 + **/ + private final int code; + + /** + * 自定义描述 + **/ + private final Boolean status; + + /** + * 自定义描述 + **/ + private final String message; + + ResultCodeEnum(int code, String message, boolean status) { + this.code = code; + this.message = message; + this.status = status; + } + + public int getCode() { + return code; + } + + public String getMessage() { + return message; + } + + public Boolean getStatus() { + return status; + } +} diff --git a/src/main/java/com/nx/umms/common/utils/res/ResultVO.java b/src/main/java/com/nx/umms/common/utils/res/ResultVO.java new file mode 100644 index 0000000000000000000000000000000000000000..40e1eadb5358603fff1c4eea46fc9dd5476af0f1 --- /dev/null +++ b/src/main/java/com/nx/umms/common/utils/res/ResultVO.java @@ -0,0 +1,91 @@ +package com.nx.umms.common.utils.res; + +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @Auther: wangjian + * @Date: 2022/3/28 17:09 + * @Description:统一返回对象 + */ + +@ApiModel(value = "返回对象", description = "返回对象") +@Data +public class ResultVO { + +// code 状态值：由后端统一定义各种返回结果的状态码 +// message 描述：本次接口调用的结果描述 +// data 数据：本次返回的数据。 + + /** + * 结果状态 ,具体状态码参见ResultData.java + */ + private Integer code; + + /** + * 描述：本次接口调用的结果描述 + */ + private String message; + + private boolean status; + + /** + * 数据：本次返回的数据 + */ + private T data; + + /** + * 接口调用时间 + */ + private Long timestamp; + + + public ResultVO() { + this.timestamp = System.currentTimeMillis(); + } + + public ResultVO(ResultCodeEnum codeEnum) { + this.setCode(codeEnum.getCode()); + this.setMessage(codeEnum.getMessage()); + this.setStatus(codeEnum.getStatus()); + } + + public static ResultVO success() { + return new ResultVO<>(ResultCodeEnum.SUCCESS); + } + + public static ResultVO success(T data) { + ResultVO resultVO = new ResultVO<>(); + resultVO.setCode(ResultCodeEnum.SUCCESS.getCode()); + resultVO.setMessage(ResultCodeEnum.SUCCESS.getMessage()); + resultVO.setStatus(ResultCodeEnum.SUCCESS.getStatus()); + resultVO.setData(data); + return resultVO; + } + + public static ResultVO fail(int code, String message, boolean status) { + ResultVO resultVO = new ResultVO<>(); + resultVO.setCode(code); + resultVO.setMessage(message); + resultVO.setStatus(status); + return resultVO; + } + + public static ResultVO fail(ResultCodeEnum resultCodeEnum, String message) { + int code = resultCodeEnum.getCode(); + boolean status = resultCodeEnum.getStatus(); + return fail(code, message, status); + } + + public static ResultVO fail(ResultCodeEnum resultCodeEnum) { + return new ResultVO(resultCodeEnum); + } + + public void setResultCodeEnum(ResultCodeEnum resultCodeEnum) { + this.code = resultCodeEnum.getCode(); + this.message = resultCodeEnum.getMessage(); + this.status = resultCodeEnum.getStatus(); + } + +} + diff --git a/src/main/java/com/pms/ocp/controller/ModelBaseController.java b/src/main/java/com/nx/umms/controller/ModelBaseController.java similarity index 70% rename from src/main/java/com/pms/ocp/controller/ModelBaseController.java rename to src/main/java/com/nx/umms/controller/ModelBaseController.java index 02a0b8f6f4ea693b1659097472af8f9c7124de96..8c556bfadb24340747b7b33619396259cee66e5b 100644 --- a/src/main/java/com/pms/ocp/controller/ModelBaseController.java +++ b/src/main/java/com/nx/umms/controller/ModelBaseController.java @@ -1,19 +1,19 @@ -package com.pms.ocp.controller; +package com.nx.umms.controller; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.pms.ocp.common.utils.ExcelUtils; -import com.pms.ocp.model.dto.ModelDTO; -import com.pms.ocp.model.dto.ModelPropertyDTO; -import com.pms.ocp.model.dto.ModelRelationDTO; -import com.pms.ocp.model.dto.ModelSubscribeDTO; -import com.pms.ocp.model.entity.Model; -import com.pms.ocp.model.entity.ModelAudit; -import com.pms.ocp.model.entity.ModelSubscribe; -import com.pms.ocp.model.vo.ModelAuditVO; -import com.pms.ocp.model.vo.ModelPropertyVO; -import com.pms.ocp.model.vo.ResponseVO; -import com.pms.ocp.service.*; +import com.nx.umms.common.utils.ExcelUtils; +import com.nx.umms.common.utils.res.ResultVO; +import com.nx.umms.model.dto.ModelDTO; +import com.nx.umms.model.dto.ModelPropertyDTO; +import com.nx.umms.model.dto.ModelRelationDTO; +import com.nx.umms.model.dto.ModelSubscribeDTO; +import com.nx.umms.model.entity.Model; +import com.nx.umms.model.entity.ModelAudit; +import com.nx.umms.model.entity.ModelSubscribe; +import com.nx.umms.model.vo.ModelAuditVO; +import com.nx.umms.model.vo.ModelPropertyVO; +import com.nx.umms.service.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -62,9 +62,9 @@ public class ModelBaseController { */ @ApiOperation("模型-增加") @PostMapping("/create/model") - public ResponseVO createModel(@RequestBody ModelDTO modelDTO) { + public ResultVO createModel(@RequestBody ModelDTO modelDTO) { - return ResponseVO.ok(modelService.createModel(modelDTO)); + return ResultVO.success(modelService.createModel(modelDTO)); } /** @@ -74,7 +74,7 @@ public class ModelBaseController { */ //@ApiOperation("模型-查询列表") @GetMapping("/get/model/list") - public ResponseVO getModelList(@ApiParam(value = "模型订阅编号") @RequestParam(value = "objId", required = false) String objId, + public ResultVO getModelList(@ApiParam(value = "模型订阅编号") @RequestParam(value = "objId", required = false) String objId, @ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode, @ApiParam(value = "归属省编码数组EQ: ddas232, 2e1ssda, 3232") @RequestParam(value = "ownerCompanyCodes", required = false) List ownerCompanyCodes, @ApiParam(value = "归属分类编码数组") @RequestParam(value = "modelGroupCodes", required = false) List modelGroupCodes, @@ -84,7 +84,7 @@ public class ModelBaseController { PageHelper.startPage(currentPage, pageSize); List modelList = modelService.getModelList(objId, modelCode, ownerCompanyCodes, modelGroupCodes); PageInfo pageInfo = new PageInfo<>(modelList); - return ResponseVO.ok(pageInfo); + return ResultVO.success(pageInfo); } /** @@ -94,7 +94,7 @@ public class ModelBaseController { */ @ApiOperation("模型-查询列表") @GetMapping("/get/model/getModeBaselList") - public ResponseVO getModeBaselList(@ApiParam(value = "所属级别") @RequestParam(value = "belongLevel", required = false) String belongLevel, + public ResultVO getModeBaselList(@ApiParam(value = "所属级别") @RequestParam(value = "belongLevel", required = false) String belongLevel, @ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode, @ApiParam(value = "当前页") @RequestParam(value = "currentPage") Integer currentPage, @ApiParam(value = "每页数量") @RequestParam(value = "pageSize") Integer pageSize, @@ -110,9 +110,9 @@ public class ModelBaseController { */ @ApiOperation("模型-删除") @PostMapping("/delete/model") - public ResponseVO deleteModel(@ApiParam(value = "模型订阅编号") @RequestParam(value = "objId", required = false) String objId, + public ResultVO deleteModel(@ApiParam(value = "模型订阅编号") @RequestParam(value = "objId", required = false) String objId, @ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode) { - return ResponseVO.ok(modelService.deleteModel(objId, modelCode)); + return ResultVO.success(modelService.deleteModel(objId, modelCode)); } @@ -123,8 +123,8 @@ public class ModelBaseController { */ @ApiOperation("模型-修改") @PostMapping("/update/model") - public ResponseVO updateModel(@RequestBody ModelDTO modelDTO) { - return ResponseVO.ok(modelService.updateModel(modelDTO)); + public ResultVO updateModel(@RequestBody ModelDTO modelDTO) { + return ResultVO.success(modelService.updateModel(modelDTO)); } /** @@ -134,8 +134,8 @@ public class ModelBaseController { */ @ApiOperation("模型-导入") @PostMapping("/import/model") - public ResponseVO importModel(@RequestParam("file") MultipartFile file) throws IOException { - return ResponseVO.ok(modelService.importModel(file)); + public ResultVO importModel(@RequestParam("file") MultipartFile file) throws IOException { + return ResultVO.success(modelService.importModel(file)); } /** @@ -146,8 +146,8 @@ public class ModelBaseController { */ @ApiOperation("模型-下发|批量下发") @PostMapping("/issue/model") - public ResponseVO issueModel() { - return ResponseVO.ok(); + public ResultVO issueModel() { + return ResultVO.success(); } /** @@ -157,8 +157,8 @@ public class ModelBaseController { */ @ApiOperation("模型注册-上传") @PostMapping("/register/model") - public ResponseVO registerModel() { - return ResponseVO.ok(); + public ResultVO registerModel() { + return ResultVO.success(); } /** @@ -168,8 +168,8 @@ public class ModelBaseController { */ @ApiOperation("模型订阅-增加") @PostMapping("/create/model/subscribe") - public ResponseVO createModelSubscribe(@RequestBody ModelSubscribeDTO modelSubscribeDTO) { - return ResponseVO.ok(modelSubscribeService.createModelSubscribe(modelSubscribeDTO)); + public ResultVO createModelSubscribe(@RequestBody ModelSubscribeDTO modelSubscribeDTO) { + return ResultVO.success(modelSubscribeService.createModelSubscribe(modelSubscribeDTO)); } /** @@ -179,8 +179,8 @@ public class ModelBaseController { */ @ApiOperation("模型订阅-删除/批量删除") @PostMapping("/delete/model/subscribe") - public ResponseVO deleteModelSubscribe(@ApiParam(value = "订阅编号集合") @RequestBody List ids) { - return ResponseVO.ok(modelSubscribeService.deleteBatchModelSubscribe(ids)); + public ResultVO deleteModelSubscribe(@ApiParam(value = "订阅编号集合") @RequestBody List ids) { + return ResultVO.success(modelSubscribeService.deleteBatchModelSubscribe(ids)); } /** @@ -190,7 +190,7 @@ public class ModelBaseController { */ @ApiOperation("模型订阅-查询") @GetMapping("/get/model/subscribe") - public ResponseVO getModelSubscribe(@ApiParam(value = "模型订阅编号") @RequestParam(value = "objId", required = false) String objId, + public ResultVO getModelSubscribe(@ApiParam(value = "模型订阅编号") @RequestParam(value = "objId", required = false) String objId, @ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode, @ApiParam(value = "订阅公司编码") @RequestParam(value = "subsCompanyCode", required = false) String subsCompanyCode, @ApiParam(value = "当前页") @RequestParam(value = "currentPage", required = false) Integer currentPage, @@ -200,7 +200,7 @@ public class ModelBaseController { List modelSubscribeList = modelSubscribeService.getModelSubscribeList(objId, modelCode, subsCompanyCode); PageInfo pageInfo = new PageInfo<>(modelSubscribeList); - return ResponseVO.ok(pageInfo); + return ResultVO.success(pageInfo); } /** @@ -210,11 +210,11 @@ public class ModelBaseController { */ @ApiOperation("模型事记-查询") @GetMapping("/get/model/note") - public ResponseVO getModelNote(@RequestParam(value = "modelCode") String modelCode) { + public ResultVO getModelNote(@RequestParam(value = "modelCode") String modelCode) { List modelAuditList = modelAuditService.getModelAuditList(modelCode); - return ResponseVO.ok(modelAuditList); + return ResultVO.success(modelAuditList); } /** @@ -224,8 +224,8 @@ public class ModelBaseController { */ @ApiOperation("模型事记-增加") @PostMapping("create/model/note") - public ResponseVO createModelNote() { - return ResponseVO.ok(); + public ResultVO createModelNote() { + return ResultVO.success(); } /** @@ -235,7 +235,7 @@ public class ModelBaseController { */ @ApiOperation("模型事记-导出") @PostMapping("export/model/note") - public ResponseVO exportModelNote(HttpServletResponse response, + public ResultVO exportModelNote(HttpServletResponse response, @ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode) throws IOException { // 查询要导出的数据 List modelAuditList = modelAuditService.getModelAuditList(modelCode); @@ -249,7 +249,7 @@ public class ModelBaseController { ExcelUtils.exportExcel(response, "测试导出模型事记", "测试导出模型事记", "测试导出模型事记.xlsx", exportVOList, ModelAuditVO.class); - return ResponseVO.ok(); + return ResultVO.success(); } /** @@ -259,10 +259,10 @@ public class ModelBaseController { */ @ApiOperation("模型属性-增加") @PostMapping("create/model/property") - public ResponseVO createModelProperty(@RequestBody ModelPropertyDTO modelPropertyDTO) { + public ResultVO createModelProperty(@RequestBody ModelPropertyDTO modelPropertyDTO) { Integer i = modelPropertyService.createModelProperty(modelPropertyDTO); - return ResponseVO.ok(i); + return ResultVO.success(i); } /** @@ -272,7 +272,7 @@ public class ModelBaseController { */ @ApiOperation("模型属性-查询列表") @GetMapping("get/model/property/list") - public ResponseVO getModelPropertyList(@ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode, + public ResultVO getModelPropertyList(@ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode, @ApiParam(value = "模型所属类型编码") @RequestParam(value = "modelGroupCode", required = false) String modelGroupCode, @ApiParam(value = "公司编码") @RequestParam(value = "ownerCompanyCode", required = false) String ownerCompanyCode, @ApiParam(value = "当前页") @RequestParam(value = "currentPage", required = false) Integer currentPage, @@ -282,7 +282,7 @@ public class ModelBaseController { List pageInfo = modelPropertyService.listModelPropertyVO(currentPage, pageSize, modelCode, ownerCompanyCode, modelGroupCode); PageInfo pageInfo1 = new PageInfo<>(pageInfo); - return ResponseVO.ok(pageInfo1); + return ResultVO.success(pageInfo1); } /** @@ -292,9 +292,9 @@ public class ModelBaseController { */ @ApiOperation("模型属性-修改") @PostMapping("/update/model/property") - public ResponseVO updateModelProperty(@RequestBody ModelPropertyDTO modelPropertyDTO) { + public ResultVO updateModelProperty(@RequestBody ModelPropertyDTO modelPropertyDTO) { - return ResponseVO.ok(modelPropertyService.updateModelProperty(modelPropertyDTO)); + return ResultVO.success(modelPropertyService.updateModelProperty(modelPropertyDTO)); } /** @@ -304,8 +304,8 @@ public class ModelBaseController { */ @ApiOperation("模型属性-删除/批量删除") @PostMapping("/delete/model/property") - public ResponseVO deleteModelProperty(@ApiParam(value = "属性ID集合") @RequestBody List ids) { - return ResponseVO.ok(modelPropertyService.deleteBatchModelProperty(ids)); + public ResultVO deleteModelProperty(@ApiParam(value = "属性ID集合") @RequestBody List ids) { + return ResultVO.success(modelPropertyService.deleteBatchModelProperty(ids)); } /** @@ -315,10 +315,10 @@ public class ModelBaseController { */ @ApiOperation("模型拓扑关系-增加") @PostMapping("create/model/topology") - public ResponseVO createModelTopology(@RequestBody ModelRelationDTO modelRelationDTO) { + public ResultVO createModelTopology(@RequestBody ModelRelationDTO modelRelationDTO) { Integer i = modelRelationService.createModelRelation(modelRelationDTO); - return ResponseVO.ok(i); + return ResultVO.success(i); } /** @@ -328,10 +328,10 @@ public class ModelBaseController { */ @ApiOperation("模型拓扑关系-查询") @GetMapping("/get/model/topology") - public ResponseVO getModelTopology(@ApiParam(value = "模型拓扑关系编号") @RequestParam(value = "objId", required = false) String objId, + public ResultVO getModelTopology(@ApiParam(value = "模型拓扑关系编号") @RequestParam(value = "objId", required = false) String objId, @ApiParam(value = "模型归属分类编码") @RequestParam(value = "modelGroupCode", required = false) String modelGroupCode, @ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode) { - return ResponseVO.ok(modelRelationService.getModelRelationList(objId, modelGroupCode, modelCode)); + return ResultVO.success(modelRelationService.getModelRelationList(objId, modelGroupCode, modelCode)); } /** @@ -341,15 +341,15 @@ public class ModelBaseController { */ @ApiOperation("模型拓扑关系-删除") @PostMapping("/delete/model/topology") - public ResponseVO deleteModelTopology(@ApiParam(value = "模型拓扑关系编号") @RequestParam(value = "objId", required = false) String objId, + public ResultVO deleteModelTopology(@ApiParam(value = "模型拓扑关系编号") @RequestParam(value = "objId", required = false) String objId, @ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode) { - return ResponseVO.ok(modelRelationService.deleteModelRelation(objId, modelCode)); + return ResultVO.success(modelRelationService.deleteModelRelation(objId, modelCode)); } @ApiOperation("模型-导航树") @GetMapping("/delete/model/modelListNavigation") - public ResponseVO modelListNavigation(@RequestParam(required = false) String searchCondition) { + public ResultVO modelListNavigation(@RequestParam(required = false) String searchCondition) { return modelSubscribeService.modelListNavigation(searchCondition); } } diff --git a/src/main/java/com/pms/ocp/controller/ModelClassifyController.java b/src/main/java/com/nx/umms/controller/ModelClassifyController.java similarity index 70% rename from src/main/java/com/pms/ocp/controller/ModelClassifyController.java rename to src/main/java/com/nx/umms/controller/ModelClassifyController.java index c6687e56e80061988757507fbf1c54366483b719..1c6eaf298e2868caa7ea71f0cdab5444de8cec56 100644 --- a/src/main/java/com/pms/ocp/controller/ModelClassifyController.java +++ b/src/main/java/com/nx/umms/controller/ModelClassifyController.java @@ -1,10 +1,10 @@ -package com.pms.ocp.controller; +package com.nx.umms.controller; -import com.pms.ocp.common.constants.ResultCode; -import com.pms.ocp.model.entity.ModelClassify; -import com.pms.ocp.model.vo.OcpModelGroupVO; -import com.pms.ocp.model.vo.ResponseVO; -import com.pms.ocp.service.ModelClassifyService; +import com.nx.umms.common.utils.res.ResultCodeEnum; +import com.nx.umms.common.utils.res.ResultVO; +import com.nx.umms.model.entity.ModelClassify; +import com.nx.umms.model.vo.OcpModelGroupVO; +import com.nx.umms.service.ModelClassifyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -29,26 +29,26 @@ public class ModelClassifyController { /** * 模型分类导航 - * @return pms.ocp.model.vo.ResponseVO + * @return nx.umms.model.vo.ResponseVO * @author huxiuwu * @date 2022/3/9 **/ @ApiOperation("模型分类导航") @GetMapping("/navigation") - public ResponseVO> getModelNavigation() { + public ResultVO> getModelNavigation() { return modelClassifyService.getModelNavigation(); } /** * 右侧子类详情列表 * - * @return pms.ocp.model.vo.ResponseVO + * @return nx.umms.model.vo.ResponseVO * @author huxiuwu * @date 2022/3/9 **/ @ApiOperation("右侧子类详情列表") @GetMapping("/subclassDetailsList") - public ResponseVO subclassDetailsList(@RequestParam int currentPage, + public ResultVO subclassDetailsList(@RequestParam int currentPage, @RequestParam int pageSize, @RequestParam(required = false,defaultValue = "") String parentGroupCode, @RequestParam(required = false,defaultValue = "") String subclassGroupName @@ -60,13 +60,13 @@ public class ModelClassifyController { * 新增 * * @param list 新增分类列表 - * @return pms.ocp.model.vo.ResponseVO + * @return nx.umms.model.vo.ResponseVO * @author huxiuwu * @date 2022/3/9 **/ @ApiOperation("新增") @PostMapping("/insert") - public ResponseVO insert(@RequestBody List list) { + public ResultVO insert(@RequestBody List list) { return modelClassifyService.insert(list); } @@ -74,13 +74,13 @@ public class ModelClassifyController { * 修改 * * @param list 修改list - * @return pms.ocp.model.vo.ResponseVO + * @return nx.umms.model.vo.ResponseVO * @author huxiuwu * @date 2022/3/9 **/ @ApiOperation("修改") @PostMapping("/update") - public ResponseVO update(@RequestBody List list) { + public ResultVO update(@RequestBody List list) { return modelClassifyService.update(list); } @@ -89,27 +89,27 @@ public class ModelClassifyController { **/ @ApiOperation("删除模型分类") @PostMapping("/delete") - public ResponseVO delete(@RequestBody ModelClassify modelClassify) { + public ResultVO delete(@RequestBody ModelClassify modelClassify) { Integer integer = modelClassifyService.deleteModelClassify(modelClassify.getObjId(), modelClassify.getModelGroupCode(), modelClassify.getGroupCompanyCode()); if (integer.intValue() == -1) { - ResponseVO.ok(ResultCode.NO_DELETE); + ResultVO.success(ResultCodeEnum.NO_DELETE); }else if (integer.intValue() == 0){ - ResponseVO.error("前端未传入分类编码!!!"); + ResultVO.fail(ResultCodeEnum.NO_REQUEST_DATA); } - return ResponseVO.ok(integer); + return ResultVO.success(integer); } /** * 删除 * - * @return pms.ocp.model.vo.ResponseVO + * @return nx.umms.model.vo.ResponseVO * @author huxiuwu * @date 2022/3/9 **/ //@ApiOperation("删除") @GetMapping("/delete") - public ResponseVO delete(String modelGroupCode) { + public ResultVO delete(String modelGroupCode) { return modelClassifyService.delete(modelGroupCode); } } diff --git a/src/main/java/com/nx/umms/controller/ModelIssueManageController.java b/src/main/java/com/nx/umms/controller/ModelIssueManageController.java new file mode 100644 index 0000000000000000000000000000000000000000..2ce6c60305a254c5f13d7a50b44a22834b9bb32f --- /dev/null +++ b/src/main/java/com/nx/umms/controller/ModelIssueManageController.java @@ -0,0 +1,141 @@ +package com.nx.umms.controller; + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.nx.umms.common.utils.DataHandleUtils; +import com.nx.umms.common.utils.res.ResultCodeEnum; +import com.nx.umms.common.utils.res.ResultVO; +import com.nx.umms.model.dto.ModelVersionDTO; +import com.nx.umms.model.entity.ModelVersion; +import com.nx.umms.model.vo.ModelVersionVO; +import com.nx.umms.service.ModelVersionService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @Auther: wangjian + * @Date: 2022/3/25 15:25 + * @Description:模型发布管理接口 + */ + +@Slf4j +@RequestMapping("/model-issue/v1") +@RestController +@Api(tags = "模型发布管理接口") +public class ModelIssueManageController { + + @Autowired + private ModelVersionService modelVersionService; + + + /** + * 模型版本-增加 + * + * @return + */ + @ApiOperation("模型版本-增加") + @PostMapping("/create/modelVersion") + public ResultVO createModelVersion(@RequestBody ModelVersionDTO modelVersionDTO) { + + if (DataHandleUtils.isNullOrEmpty(modelVersionDTO)) { + ResultVO.fail(ResultCodeEnum.REQUIRED_PARAMETER_EMPTY); + } + + return ResultVO.success(modelVersionService.createModelVersion(modelVersionDTO)); + } + + /** + * 模型版本-查询列表 + * + * @return + */ + @ApiOperation("模型版本-查询列表") + @GetMapping("/get/modelVersion/list") + public ResultVO getModelVersionList(@ApiParam(value = "模型版本编号") @RequestParam(value = "mvId", required = false) String mvId, + @ApiParam(value = "模型版本编码") @RequestParam(value = "versionCode", required = false) String versionCode, + @ApiParam(value = "当前页") @RequestParam(value = "currentPage") Integer currentPage, + @ApiParam(value = "每页数量") @RequestParam(value = "pageSize") Integer pageSize) { + + PageHelper.startPage(currentPage, pageSize); + List modelVersionVOList = modelVersionService.getModelVersionList(mvId, versionCode); + PageInfo pageInfo = new PageInfo<>(modelVersionVOList); +// return ResultData(pageInfo); + return ResultVO.success(pageInfo); + } + + /** + * 模型版本-查询 + * + * @return + */ + @ApiOperation("模型版本-查询") + @GetMapping("/get/modelVersion") + public ResultVO getModelVersion(@ApiParam(value = "模型版本编号") @RequestParam(value = "mvId", required = false) String mvId, + @ApiParam(value = "模型版本号") @RequestParam(value = "versionNumber", required = false) String versionNumber) { + + ModelVersion modelVersion = modelVersionService.getModelVersion(mvId, versionNumber); + + if (modelVersion == null) { + return ResultVO.success(ResultCodeEnum.NO_DATA); + } + + ModelVersionVO modelVersionVO = new ModelVersionVO(); + BeanUtils.copyProperties(modelVersion, modelVersionVO); + return ResultVO.success(modelVersionVO); + } + + /** + * 模型版本-删除 + * + * @return + */ + @ApiOperation("模型版本-删除") + @PostMapping("/delete/modelVersion") + public ResultVO deleteModelVersion(@ApiParam(value = "模型版本编号") @RequestParam(value = "mvId", required = false) String mvId, + @ApiParam(value = "版本编码") @RequestParam(value = "versionCode", required = false) String versionCode) { + return ResultVO.success(modelVersionService.deleteModelVersion(mvId, versionCode)); + } + + /** + * 模型版本-修改 + * + * @return + */ + @ApiOperation("模型版本-修改") + @PostMapping("/update/modelVersion") + public ResultVO updateModel(@RequestBody ModelVersionDTO modelVersionDTO) { + if (DataHandleUtils.isNullOrEmpty(modelVersionDTO)) { + ResultVO.fail(ResultCodeEnum.ACCESS_DENIED.REQUIRED_PARAMETER_EMPTY); + } + return ResultVO.success(modelVersionService.updateModelVersion(modelVersionDTO)); + } + +// /** +// * 模型版本-查询列表 +// * +// * @return +// */ +// @ApiOperation("模型版本-查询") +// @GetMapping("/get/model/list") +// public ResultVO getModelList(@ApiParam(value = "模型订阅编号") @RequestParam(value = "objId", required = false) String objId, +// @ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode, +// @ApiParam(value = "归属省编码数组EQ: ddas232, 2e1ssda, 3232") @RequestParam(value = "ownerCompanyCodes", required = false) List ownerCompanyCodes, +// @ApiParam(value = "归属分类编码数组") @RequestParam(value = "modelGroupCodes", required = false) List modelGroupCodes, +// @ApiParam(value = "当前页") @RequestParam(value = "currentPage", required = false) Integer currentPage, +// @ApiParam(value = "每页数量") @RequestParam(value = "pageSize", required = false) Integer pageSize) { +// +// PageHelper.startPage(currentPage, pageSize); +// List modelList = modelService.getModelList(objId, modelCode, ownerCompanyCodes, modelGroupCodes); +// PageInfo pageInfo = new PageInfo<>(modelList); +// return ResultVO.ok(pageInfo); +// } + +} + diff --git a/src/main/java/com/pms/ocp/mapper/ModelAuditMapper.java b/src/main/java/com/nx/umms/mapper/ModelAuditMapper.java similarity index 79% rename from src/main/java/com/pms/ocp/mapper/ModelAuditMapper.java rename to src/main/java/com/nx/umms/mapper/ModelAuditMapper.java index 735ae37ed245e68fe08d8aa161697351d90e8a4c..b0e27e2e7d74a9ee128cc8a9aa347fac59a9b1b8 100644 --- a/src/main/java/com/pms/ocp/mapper/ModelAuditMapper.java +++ b/src/main/java/com/nx/umms/mapper/ModelAuditMapper.java @@ -1,7 +1,7 @@ -package com.pms.ocp.mapper; +package com.nx.umms.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pms.ocp.model.entity.ModelAudit; +import com.nx.umms.model.entity.ModelAudit; import org.apache.ibatis.annotations.Mapper; /** diff --git a/src/main/java/com/pms/ocp/mapper/ModelClassifyMapper.java b/src/main/java/com/nx/umms/mapper/ModelClassifyMapper.java similarity index 77% rename from src/main/java/com/pms/ocp/mapper/ModelClassifyMapper.java rename to src/main/java/com/nx/umms/mapper/ModelClassifyMapper.java index d5385ed287cffb739b54a7ecf8ddb258c6013c75..e297fbce0cb9a942dfe09a31e7793f0895ce091a 100644 --- a/src/main/java/com/pms/ocp/mapper/ModelClassifyMapper.java +++ b/src/main/java/com/nx/umms/mapper/ModelClassifyMapper.java @@ -1,7 +1,7 @@ -package com.pms.ocp.mapper; +package com.nx.umms.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pms.ocp.model.vo.OcpModelGroupVO; +import com.nx.umms.model.vo.OcpModelGroupVO; import org.apache.ibatis.annotations.Mapper; /** diff --git a/src/main/java/com/pms/ocp/mapper/ModelMapper.java b/src/main/java/com/nx/umms/mapper/ModelMapper.java similarity index 85% rename from src/main/java/com/pms/ocp/mapper/ModelMapper.java rename to src/main/java/com/nx/umms/mapper/ModelMapper.java index 7bc10e94f5c5463e0ac5c6a1dee3a30eeb9307f2..2f49037ac816f59230d6a8a55da9681a3a4e2b97 100644 --- a/src/main/java/com/pms/ocp/mapper/ModelMapper.java +++ b/src/main/java/com/nx/umms/mapper/ModelMapper.java @@ -1,7 +1,7 @@ -package com.pms.ocp.mapper; +package com.nx.umms.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pms.ocp.model.entity.Model; +import com.nx.umms.model.entity.Model; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/pms/ocp/mapper/ModelPropertyMapper.java b/src/main/java/com/nx/umms/mapper/ModelPropertyMapper.java similarity index 84% rename from src/main/java/com/pms/ocp/mapper/ModelPropertyMapper.java rename to src/main/java/com/nx/umms/mapper/ModelPropertyMapper.java index c7d1062c07a43ef4f72c856e652e5063adb123c8..6d1a7d51e640a5af553a4a2e1ddc79437f84f45c 100644 --- a/src/main/java/com/pms/ocp/mapper/ModelPropertyMapper.java +++ b/src/main/java/com/nx/umms/mapper/ModelPropertyMapper.java @@ -1,8 +1,8 @@ -package com.pms.ocp.mapper; +package com.nx.umms.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pms.ocp.model.entity.ModelProperty; -import com.pms.ocp.model.vo.ModelPropertyVO; +import com.nx.umms.model.entity.ModelProperty; +import com.nx.umms.model.vo.ModelPropertyVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/pms/ocp/mapper/ModelRelationMapper.java b/src/main/java/com/nx/umms/mapper/ModelRelationMapper.java similarity index 79% rename from src/main/java/com/pms/ocp/mapper/ModelRelationMapper.java rename to src/main/java/com/nx/umms/mapper/ModelRelationMapper.java index 39f1942f332fcac0dff14162ca8d6ef30738b179..10d35cbb82f7278253e4f6a6c9b2f0de06b4dd65 100644 --- a/src/main/java/com/pms/ocp/mapper/ModelRelationMapper.java +++ b/src/main/java/com/nx/umms/mapper/ModelRelationMapper.java @@ -1,7 +1,7 @@ -package com.pms.ocp.mapper; +package com.nx.umms.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pms.ocp.model.entity.ModelRelation; +import com.nx.umms.model.entity.ModelRelation; import org.apache.ibatis.annotations.Mapper; /** diff --git a/src/main/java/com/pms/ocp/mapper/ModelSubscribeMapper.java b/src/main/java/com/nx/umms/mapper/ModelSubscribeMapper.java similarity index 80% rename from src/main/java/com/pms/ocp/mapper/ModelSubscribeMapper.java rename to src/main/java/com/nx/umms/mapper/ModelSubscribeMapper.java index d879203064ae0381b3843f21f31093279dcc408e..0c41c143426ea829bf821d277f71ea50780c1ca6 100644 --- a/src/main/java/com/pms/ocp/mapper/ModelSubscribeMapper.java +++ b/src/main/java/com/nx/umms/mapper/ModelSubscribeMapper.java @@ -1,8 +1,8 @@ -package com.pms.ocp.mapper; +package com.nx.umms.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pms.ocp.model.entity.ModelSubscribe; -import com.pms.ocp.model.entity.TreeNode; +import com.nx.umms.model.entity.ModelSubscribe; +import com.nx.umms.model.entity.TreeNode; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/pms/ocp/mapper/ModelTypeMapper.java b/src/main/java/com/nx/umms/mapper/ModelTypeMapper.java similarity index 78% rename from src/main/java/com/pms/ocp/mapper/ModelTypeMapper.java rename to src/main/java/com/nx/umms/mapper/ModelTypeMapper.java index 6d16d81194f84aed95cd78173270ecfd3977f2a8..71cbaf1796e1644182c1eb9bcd1fd8f852ff8b5b 100644 --- a/src/main/java/com/pms/ocp/mapper/ModelTypeMapper.java +++ b/src/main/java/com/nx/umms/mapper/ModelTypeMapper.java @@ -1,7 +1,7 @@ -package com.pms.ocp.mapper; +package com.nx.umms.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pms.ocp.model.entity.ModelClassify; +import com.nx.umms.model.entity.ModelClassify; import org.apache.ibatis.annotations.Mapper; /** diff --git a/src/main/java/com/nx/umms/mapper/ModelVersionMapper.java b/src/main/java/com/nx/umms/mapper/ModelVersionMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..461c2d81050e2fb4cf1ad44a27c73a6f2489a15a --- /dev/null +++ b/src/main/java/com/nx/umms/mapper/ModelVersionMapper.java @@ -0,0 +1,15 @@ +package com.nx.umms.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nx.umms.model.entity.ModelVersion; +import org.apache.ibatis.annotations.Mapper; + +/** + * @Auther: wangjian + * @Date: 2022/3/25 17:29 + * @Description:模型版本数据层接口 + */ + +@Mapper +public interface ModelVersionMapper extends BaseMapper { +} diff --git a/src/main/java/com/pms/ocp/mapper/OcpModelGroupMapper.java b/src/main/java/com/nx/umms/mapper/OcpModelGroupMapper.java similarity index 77% rename from src/main/java/com/pms/ocp/mapper/OcpModelGroupMapper.java rename to src/main/java/com/nx/umms/mapper/OcpModelGroupMapper.java index b73521d48321c1055968014eafd2c35d5c2c4656..45144db599bf649e79c7b76f5482886347f119b4 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpModelGroupMapper.java +++ b/src/main/java/com/nx/umms/mapper/OcpModelGroupMapper.java @@ -1,7 +1,7 @@ -package com.pms.ocp.mapper; +package com.nx.umms.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pms.ocp.model.entity.ModelClassify; +import com.nx.umms.model.entity.ModelClassify; import org.apache.ibatis.annotations.Mapper; /** diff --git a/src/main/java/com/pms/ocp/model/dto/ModelClassifyDTO.java b/src/main/java/com/nx/umms/model/dto/ModelClassifyDTO.java similarity index 86% rename from src/main/java/com/pms/ocp/model/dto/ModelClassifyDTO.java rename to src/main/java/com/nx/umms/model/dto/ModelClassifyDTO.java index 8bb7560e29c0ebf676c4a49081a2f33548ca95b7..758a35d363bb662dc25239cc3607378cfe86fd23 100644 --- a/src/main/java/com/pms/ocp/model/dto/ModelClassifyDTO.java +++ b/src/main/java/com/nx/umms/model/dto/ModelClassifyDTO.java @@ -1,4 +1,4 @@ -package com.pms.ocp.model.dto; +package com.nx.umms.model.dto; import lombok.Data; diff --git a/src/main/java/com/pms/ocp/model/dto/ModelDTO.java b/src/main/java/com/nx/umms/model/dto/ModelDTO.java similarity index 99% rename from src/main/java/com/pms/ocp/model/dto/ModelDTO.java rename to src/main/java/com/nx/umms/model/dto/ModelDTO.java index 1b9cee81586982848df38e2c88497c647f1e0752..2ef5f1c1df0e3a27325f491c9c8b4e06635562b5 100644 --- a/src/main/java/com/pms/ocp/model/dto/ModelDTO.java +++ b/src/main/java/com/nx/umms/model/dto/ModelDTO.java @@ -1,4 +1,4 @@ -package com.pms.ocp.model.dto; +package com.nx.umms.model.dto; import cn.afterturn.easypoi.excel.annotation.Excel; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/src/main/java/com/pms/ocp/model/dto/ModelPropertyDTO.java b/src/main/java/com/nx/umms/model/dto/ModelPropertyDTO.java similarity index 99% rename from src/main/java/com/pms/ocp/model/dto/ModelPropertyDTO.java rename to src/main/java/com/nx/umms/model/dto/ModelPropertyDTO.java index 485520c7600068653a35063b60f2d200b9364800..e37d2034805377ca82dcec817ee3ab0d0c23469b 100644 --- a/src/main/java/com/pms/ocp/model/dto/ModelPropertyDTO.java +++ b/src/main/java/com/nx/umms/model/dto/ModelPropertyDTO.java @@ -1,4 +1,4 @@ -package com.pms.ocp.model.dto; +package com.nx.umms.model.dto; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; diff --git a/src/main/java/com/pms/ocp/model/dto/ModelRelationDTO.java b/src/main/java/com/nx/umms/model/dto/ModelRelationDTO.java similarity index 98% rename from src/main/java/com/pms/ocp/model/dto/ModelRelationDTO.java rename to src/main/java/com/nx/umms/model/dto/ModelRelationDTO.java index 4d98fb75aa958a52e7f5cf0ac53a693175c50a2d..eea6a5ade47a1098b88f0819f71b46725ea1f697 100644 --- a/src/main/java/com/pms/ocp/model/dto/ModelRelationDTO.java +++ b/src/main/java/com/nx/umms/model/dto/ModelRelationDTO.java @@ -1,4 +1,4 @@ -package com.pms.ocp.model.dto; +package com.nx.umms.model.dto; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; diff --git a/src/main/java/com/pms/ocp/model/dto/ModelSubscribeDTO.java b/src/main/java/com/nx/umms/model/dto/ModelSubscribeDTO.java similarity index 98% rename from src/main/java/com/pms/ocp/model/dto/ModelSubscribeDTO.java rename to src/main/java/com/nx/umms/model/dto/ModelSubscribeDTO.java index 9b7554024e6b53f69bc9c8cc47c5cbd83cbb06a9..956504d4203a843ffdef407b271854a325150344 100644 --- a/src/main/java/com/pms/ocp/model/dto/ModelSubscribeDTO.java +++ b/src/main/java/com/nx/umms/model/dto/ModelSubscribeDTO.java @@ -1,4 +1,4 @@ -package com.pms.ocp.model.dto; +package com.nx.umms.model.dto; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; diff --git a/src/main/java/com/nx/umms/model/dto/ModelVersionDTO.java b/src/main/java/com/nx/umms/model/dto/ModelVersionDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..14019f8e4ec494cb8ce07e8fadc197a2eb83fb9f --- /dev/null +++ b/src/main/java/com/nx/umms/model/dto/ModelVersionDTO.java @@ -0,0 +1,72 @@ +package com.nx.umms.model.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; + +/** + * @Auther: wangjian + * @Date: 2022/3/28 13:45 + * @Description: + */ + +@ApiModel("模型版本展示对象") +@Data +public class ModelVersionDTO { + + /** + * 版本编号 + */ + @ApiModelProperty("版本编号") + private String mvId; + + /** + * 版本编码 + */ + @ApiModelProperty("版本编码") + private String versionCode; + + /** + * 版本号 + */ + @ApiModelProperty("版本号") + private String versionNumber; + + /** + * 版本描述 + */ + @ApiModelProperty("版本描述") + private String versionDescription; + + /** + * 创建者 + */ + @ApiModelProperty("创建者") + private String createBy; + + /** + * 创建时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiModelProperty("创建时间") + private LocalDateTime createTime; + + /** + * 更新者 + */ + @ApiModelProperty("更新者") + private String updateBy; + + /** + * 更新时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiModelProperty("更新时间") + private LocalDateTime updateTime; +} diff --git a/src/main/java/com/pms/ocp/model/entity/Model.java b/src/main/java/com/nx/umms/model/entity/Model.java similarity index 99% rename from src/main/java/com/pms/ocp/model/entity/Model.java rename to src/main/java/com/nx/umms/model/entity/Model.java index 5296b63672605172368cfb312f9e18a34bc4b23e..86131a4c12ec27ab38966a7f7312bd6cf4980aa2 100644 --- a/src/main/java/com/pms/ocp/model/entity/Model.java +++ b/src/main/java/com/nx/umms/model/entity/Model.java @@ -1,4 +1,4 @@ -package com.pms.ocp.model.entity; +package com.nx.umms.model.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/src/main/java/com/pms/ocp/model/entity/ModelAudit.java b/src/main/java/com/nx/umms/model/entity/ModelAudit.java similarity index 98% rename from src/main/java/com/pms/ocp/model/entity/ModelAudit.java rename to src/main/java/com/nx/umms/model/entity/ModelAudit.java index 0ba1f14e871e5f3a125da42bb558e23fb43a9d81..4ace7c3e31ab4a19121db8e96b325d45167ded38 100644 --- a/src/main/java/com/pms/ocp/model/entity/ModelAudit.java +++ b/src/main/java/com/nx/umms/model/entity/ModelAudit.java @@ -1,4 +1,4 @@ -package com.pms.ocp.model.entity; +package com.nx.umms.model.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/src/main/java/com/pms/ocp/model/entity/ModelClassify.java b/src/main/java/com/nx/umms/model/entity/ModelClassify.java similarity index 98% rename from src/main/java/com/pms/ocp/model/entity/ModelClassify.java rename to src/main/java/com/nx/umms/model/entity/ModelClassify.java index 3be93a479590d314123bb21b1f2ada827fa69b84..a67a7cb9981f4562b88f7087c6cf384fb639c5f5 100644 --- a/src/main/java/com/pms/ocp/model/entity/ModelClassify.java +++ b/src/main/java/com/nx/umms/model/entity/ModelClassify.java @@ -1,4 +1,4 @@ -package com.pms.ocp.model.entity; +package com.nx.umms.model.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/src/main/java/com/pms/ocp/model/entity/ModelProperty.java b/src/main/java/com/nx/umms/model/entity/ModelProperty.java similarity index 98% rename from src/main/java/com/pms/ocp/model/entity/ModelProperty.java rename to src/main/java/com/nx/umms/model/entity/ModelProperty.java index 01955911b95bd56c81589ee67e01d1877947f053..de7dc7175333de76bfd8ed82e59f515a78f392a3 100644 --- a/src/main/java/com/pms/ocp/model/entity/ModelProperty.java +++ b/src/main/java/com/nx/umms/model/entity/ModelProperty.java @@ -1,4 +1,4 @@ -package com.pms.ocp.model.entity; +package com.nx.umms.model.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/src/main/java/com/pms/ocp/model/entity/ModelRelation.java b/src/main/java/com/nx/umms/model/entity/ModelRelation.java similarity index 98% rename from src/main/java/com/pms/ocp/model/entity/ModelRelation.java rename to src/main/java/com/nx/umms/model/entity/ModelRelation.java index 66fb95916ddc8440dc997e1f990fd41bef655fd3..b17ed450232b6e1087344dc1f1cb912a0b1e3eae 100644 --- a/src/main/java/com/pms/ocp/model/entity/ModelRelation.java +++ b/src/main/java/com/nx/umms/model/entity/ModelRelation.java @@ -1,4 +1,4 @@ -package com.pms.ocp.model.entity; +package com.nx.umms.model.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/src/main/java/com/pms/ocp/model/entity/ModelSubscribe.java b/src/main/java/com/nx/umms/model/entity/ModelSubscribe.java similarity index 97% rename from src/main/java/com/pms/ocp/model/entity/ModelSubscribe.java rename to src/main/java/com/nx/umms/model/entity/ModelSubscribe.java index c10d84aafdaa30ad0768198ee1ae506ddd922bf8..f82f9c57360824d529df5491d97d2d83a6eabd87 100644 --- a/src/main/java/com/pms/ocp/model/entity/ModelSubscribe.java +++ b/src/main/java/com/nx/umms/model/entity/ModelSubscribe.java @@ -1,4 +1,4 @@ -package com.pms.ocp.model.entity; +package com.nx.umms.model.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/src/main/java/com/nx/umms/model/entity/ModelVersion.java b/src/main/java/com/nx/umms/model/entity/ModelVersion.java new file mode 100644 index 0000000000000000000000000000000000000000..dd98844b4e07911049e70f346168226067e345c1 --- /dev/null +++ b/src/main/java/com/nx/umms/model/entity/ModelVersion.java @@ -0,0 +1,63 @@ +package com.nx.umms.model.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.time.LocalDateTime; + +/** + * @Auther: wangjian + * @Date: 2022/3/25 17:30 + * @Description:模型版本对象 + */ + +@Data +@Accessors(chain = true) +@TableName("ocp_model_version") +public class ModelVersion { + + /** + * 模型分类编号 + */ + @TableId(value = "mv_id", type = IdType.ASSIGN_ID) + private String mvId; + + /** + * 版本号 + */ + private String versionNumber; + + /** + * 版本编码 + */ + private String versionCode; + + /** + * 版本描述 + */ + private String versionDescription; + + /** + * 创建者 + */ + private String createBy; + + /** + * 创建时间 + */ + private LocalDateTime createTime; + + /** + * 更新者 + */ + private String updateBy; + + /** + * 更新时间 + */ + private LocalDateTime updateTime; + +} diff --git a/src/main/java/com/pms/ocp/model/entity/TreeNode.java b/src/main/java/com/nx/umms/model/entity/TreeNode.java similarity index 96% rename from src/main/java/com/pms/ocp/model/entity/TreeNode.java rename to src/main/java/com/nx/umms/model/entity/TreeNode.java index a4de34f89939b1f64df9e0325ed1008f9dc10241..c98b7c9e372383c2b0ff2c3dbf18c57c567893ca 100644 --- a/src/main/java/com/pms/ocp/model/entity/TreeNode.java +++ b/src/main/java/com/nx/umms/model/entity/TreeNode.java @@ -1,4 +1,4 @@ -package com.pms.ocp.model.entity; +package com.nx.umms.model.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/pms/ocp/model/vo/ModelAuditVO.java b/src/main/java/com/nx/umms/model/vo/ModelAuditVO.java similarity index 99% rename from src/main/java/com/pms/ocp/model/vo/ModelAuditVO.java rename to src/main/java/com/nx/umms/model/vo/ModelAuditVO.java index 8b1c4c938f3662fdcfc216a6447e1210cdc84054..f208621c5412f6d28768a083d91ce5ca9951daa5 100644 --- a/src/main/java/com/pms/ocp/model/vo/ModelAuditVO.java +++ b/src/main/java/com/nx/umms/model/vo/ModelAuditVO.java @@ -1,4 +1,4 @@ -package com.pms.ocp.model.vo; +package com.nx.umms.model.vo; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/src/main/java/com/pms/ocp/model/vo/ModelPropertyVO.java b/src/main/java/com/nx/umms/model/vo/ModelPropertyVO.java similarity index 98% rename from src/main/java/com/pms/ocp/model/vo/ModelPropertyVO.java rename to src/main/java/com/nx/umms/model/vo/ModelPropertyVO.java index 0deea2f4180274f4634d8186918203f4b7753c84..957dbd8ca5fa409ac00c1329eb6c0b83b68ef641 100644 --- a/src/main/java/com/pms/ocp/model/vo/ModelPropertyVO.java +++ b/src/main/java/com/nx/umms/model/vo/ModelPropertyVO.java @@ -1,4 +1,4 @@ -package com.pms.ocp.model.vo; +package com.nx.umms.model.vo; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/src/main/java/com/pms/ocp/model/vo/ModelRelationVO.java b/src/main/java/com/nx/umms/model/vo/ModelRelationVO.java similarity index 98% rename from src/main/java/com/pms/ocp/model/vo/ModelRelationVO.java rename to src/main/java/com/nx/umms/model/vo/ModelRelationVO.java index 1aebf8dc839ff961087b3eddd8305274da36f23a..d8d22dd1e01954d32cf319857128999e2ba2ccd3 100644 --- a/src/main/java/com/pms/ocp/model/vo/ModelRelationVO.java +++ b/src/main/java/com/nx/umms/model/vo/ModelRelationVO.java @@ -1,4 +1,4 @@ -package com.pms.ocp.model.vo; +package com.nx.umms.model.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; diff --git a/src/main/java/com/pms/ocp/model/vo/ModelVO.java b/src/main/java/com/nx/umms/model/vo/ModelVO.java similarity index 99% rename from src/main/java/com/pms/ocp/model/vo/ModelVO.java rename to src/main/java/com/nx/umms/model/vo/ModelVO.java index f9c7d34e63ba8683ef6cfdcdbcd4f1b463faa428..af853833186df48a036173f8c53bf5ed57e65855 100644 --- a/src/main/java/com/pms/ocp/model/vo/ModelVO.java +++ b/src/main/java/com/nx/umms/model/vo/ModelVO.java @@ -1,4 +1,4 @@ -package com.pms.ocp.model.vo; +package com.nx.umms.model.vo; import cn.afterturn.easypoi.excel.annotation.Excel; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/src/main/java/com/nx/umms/model/vo/ModelVersionVO.java b/src/main/java/com/nx/umms/model/vo/ModelVersionVO.java new file mode 100644 index 0000000000000000000000000000000000000000..b7de358ab65b7531ba7ef3dcbd4cb0b633c46589 --- /dev/null +++ b/src/main/java/com/nx/umms/model/vo/ModelVersionVO.java @@ -0,0 +1,73 @@ +package com.nx.umms.model.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; + +/** + * @Auther: wangjian + * @Date: 2022/3/25 17:20 + * @Description:模型版本展示对象 + */ + +@ApiModel("模型版本展示对象") +@Data +public class ModelVersionVO { + + /** + * 版本编号 + */ + @ApiModelProperty("版本编号") + private String mvId; + + /** + * 版本编码 + */ + @ApiModelProperty("版本编码") + private String versionCode; + + /** + * 版本号 + */ + @ApiModelProperty("版本号") + private String versionNumber; + + /** + * 版本描述 + */ + @ApiModelProperty("版本描述") + private String versionDescription; + + /** + * 创建者 + */ + @ApiModelProperty("创建者") + private String createBy; + + /** + * 创建时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiModelProperty("创建时间") + private LocalDateTime createTime; + + /** + * 更新者 + */ + @ApiModelProperty("更新者") + private String updateBy; + + /** + * 更新时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiModelProperty("更新时间") + private LocalDateTime updateTime; + +} diff --git a/src/main/java/com/pms/ocp/model/vo/OcpModelGroupVO.java b/src/main/java/com/nx/umms/model/vo/OcpModelGroupVO.java similarity index 99% rename from src/main/java/com/pms/ocp/model/vo/OcpModelGroupVO.java rename to src/main/java/com/nx/umms/model/vo/OcpModelGroupVO.java index 45bf59b468fd9ef66c449ac1469da8f8c57d794f..0f94d61c6cd3b15967bf8587af5b0812686eb946 100644 --- a/src/main/java/com/pms/ocp/model/vo/OcpModelGroupVO.java +++ b/src/main/java/com/nx/umms/model/vo/OcpModelGroupVO.java @@ -1,4 +1,4 @@ -package com.pms.ocp.model.vo; +package com.nx.umms.model.vo; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/src/main/java/com/pms/ocp/service/ModelAuditService.java b/src/main/java/com/nx/umms/service/ModelAuditService.java similarity index 92% rename from src/main/java/com/pms/ocp/service/ModelAuditService.java rename to src/main/java/com/nx/umms/service/ModelAuditService.java index b583341ac3a2fe21e1001e136e68fdd9cb79a3cf..873dcbc80ba30788c44461c6a73ca31e3e38e660 100644 --- a/src/main/java/com/pms/ocp/service/ModelAuditService.java +++ b/src/main/java/com/nx/umms/service/ModelAuditService.java @@ -1,6 +1,6 @@ -package com.pms.ocp.service; +package com.nx.umms.service; -import com.pms.ocp.model.entity.ModelAudit; +import com.nx.umms.model.entity.ModelAudit; import java.util.List; diff --git a/src/main/java/com/nx/umms/service/ModelClassifyService.java b/src/main/java/com/nx/umms/service/ModelClassifyService.java new file mode 100644 index 0000000000000000000000000000000000000000..ec92c6b1b11ea12985d50a0c0f24fdad8a679f9e --- /dev/null +++ b/src/main/java/com/nx/umms/service/ModelClassifyService.java @@ -0,0 +1,34 @@ +package com.nx.umms.service; + +import com.nx.umms.common.utils.res.ResultVO; +import com.nx.umms.model.entity.ModelClassify; +import com.nx.umms.model.vo.OcpModelGroupVO; + +import java.util.List; + +/** + * @author huxiuwu + * @version 1.0 + * @date 2022/3/8 15:19 + */ +public interface ModelClassifyService { + ResultVO> getModelNavigation(); + + ResultVO insert(List list); + + ResultVO subclassDetailsList(int currentPage,int pageSize,String parentGroupCode,String subclassGroupName); + + ResultVO update(List list); + + ResultVO delete(String modelGroupCode); + + /** + * 删除模型分类 + * + * @param objId + * @param modelCode + * @param groupCompanyCode + * @return + */ + Integer deleteModelClassify(String objId, String modelCode, String groupCompanyCode); +} diff --git a/src/main/java/com/nx/umms/service/ModelGroupService.java b/src/main/java/com/nx/umms/service/ModelGroupService.java new file mode 100644 index 0000000000000000000000000000000000000000..9a99237b099eff19936222bc08167c4980da6776 --- /dev/null +++ b/src/main/java/com/nx/umms/service/ModelGroupService.java @@ -0,0 +1,15 @@ +package com.nx.umms.service; + +import com.nx.umms.common.utils.res.ResultVO; +import com.nx.umms.model.entity.ModelClassify; + +public interface ModelGroupService { + + ResultVO getModelType(); + + ResultVO createModelType(ModelClassify modelClassify); + + ResultVO deleteModelType(String modelTypeId); + + ResultVO updateModelType(ModelClassify modelClassify); +} diff --git a/src/main/java/com/pms/ocp/service/ModelPropertyService.java b/src/main/java/com/nx/umms/service/ModelPropertyService.java similarity index 89% rename from src/main/java/com/pms/ocp/service/ModelPropertyService.java rename to src/main/java/com/nx/umms/service/ModelPropertyService.java index 84b3762ec9fcb170bf3fb46dde43a60a79a9b3c8..aea5028cd900cf1b947c86c2ed9b9e518da7e905 100644 --- a/src/main/java/com/pms/ocp/service/ModelPropertyService.java +++ b/src/main/java/com/nx/umms/service/ModelPropertyService.java @@ -1,9 +1,9 @@ -package com.pms.ocp.service; +package com.nx.umms.service; import com.github.pagehelper.PageInfo; -import com.pms.ocp.model.dto.ModelPropertyDTO; -import com.pms.ocp.model.entity.ModelProperty; -import com.pms.ocp.model.vo.ModelPropertyVO; +import com.nx.umms.model.dto.ModelPropertyDTO; +import com.nx.umms.model.entity.ModelProperty; +import com.nx.umms.model.vo.ModelPropertyVO; import java.util.List; diff --git a/src/main/java/com/pms/ocp/service/ModelRelationService.java b/src/main/java/com/nx/umms/service/ModelRelationService.java similarity index 87% rename from src/main/java/com/pms/ocp/service/ModelRelationService.java rename to src/main/java/com/nx/umms/service/ModelRelationService.java index 371f761a48ffbee93406e39539aadff0d98229bb..446862f400fdb36faedc882b3dcde0ac02682753 100644 --- a/src/main/java/com/pms/ocp/service/ModelRelationService.java +++ b/src/main/java/com/nx/umms/service/ModelRelationService.java @@ -1,9 +1,9 @@ -package com.pms.ocp.service; +package com.nx.umms.service; -import com.pms.ocp.model.dto.ModelRelationDTO; -import com.pms.ocp.model.entity.ModelRelation; -import com.pms.ocp.model.vo.ModelRelationVO; +import com.nx.umms.model.dto.ModelRelationDTO; +import com.nx.umms.model.entity.ModelRelation; +import com.nx.umms.model.vo.ModelRelationVO; import java.util.List; diff --git a/src/main/java/com/pms/ocp/service/ModelService.java b/src/main/java/com/nx/umms/service/ModelService.java similarity index 80% rename from src/main/java/com/pms/ocp/service/ModelService.java rename to src/main/java/com/nx/umms/service/ModelService.java index d526bfe88a350553491e9887ccf823c8f0bb38f7..789c054522f30b44f781c5e6c00de70dab0cfb8c 100644 --- a/src/main/java/com/pms/ocp/service/ModelService.java +++ b/src/main/java/com/nx/umms/service/ModelService.java @@ -1,8 +1,8 @@ -package com.pms.ocp.service; +package com.nx.umms.service; -import com.pms.ocp.model.dto.ModelDTO; -import com.pms.ocp.model.entity.Model; -import com.pms.ocp.model.vo.ResponseVO; +import com.nx.umms.common.utils.res.ResultVO; +import com.nx.umms.model.dto.ModelDTO; +import com.nx.umms.model.entity.Model; import org.springframework.web.multipart.MultipartFile; import java.io.IOException; @@ -65,5 +65,5 @@ public interface ModelService { */ Model getModel(String objId, String modelCode); - ResponseVO getModeBaselList(String belongLevel, String modelCode, Integer currentPage, Integer pageSize, String searchCondition); + ResultVO getModeBaselList(String belongLevel, String modelCode, Integer currentPage, Integer pageSize, String searchCondition); } diff --git a/src/main/java/com/pms/ocp/service/ModelSubscribeService.java b/src/main/java/com/nx/umms/service/ModelSubscribeService.java similarity index 82% rename from src/main/java/com/pms/ocp/service/ModelSubscribeService.java rename to src/main/java/com/nx/umms/service/ModelSubscribeService.java index a9140800b162fcb6de0082272533a8c2ad301158..4e6daf2a2f369c8de7ecae226b429e00f34fc0ee 100644 --- a/src/main/java/com/pms/ocp/service/ModelSubscribeService.java +++ b/src/main/java/com/nx/umms/service/ModelSubscribeService.java @@ -1,8 +1,8 @@ -package com.pms.ocp.service; +package com.nx.umms.service; -import com.pms.ocp.model.dto.ModelSubscribeDTO; -import com.pms.ocp.model.entity.ModelSubscribe; -import com.pms.ocp.model.vo.ResponseVO; +import com.nx.umms.common.utils.res.ResultVO; +import com.nx.umms.model.dto.ModelSubscribeDTO; +import com.nx.umms.model.entity.ModelSubscribe; import java.util.List; @@ -61,6 +61,6 @@ public interface ModelSubscribeService { */ ModelSubscribeDTO getModelSubscribe(String modelId); - ResponseVO modelListNavigation(String searchCondition); + ResultVO modelListNavigation(String searchCondition); } diff --git a/src/main/java/com/pms/ocp/service/ModelTypeService.java b/src/main/java/com/nx/umms/service/ModelTypeService.java similarity index 91% rename from src/main/java/com/pms/ocp/service/ModelTypeService.java rename to src/main/java/com/nx/umms/service/ModelTypeService.java index 26a59680f32b17c6feb454bb91fb6e047fc8a8fa..0ccc2bc006281aeee9615b9ea4063771f9f8ea5f 100644 --- a/src/main/java/com/pms/ocp/service/ModelTypeService.java +++ b/src/main/java/com/nx/umms/service/ModelTypeService.java @@ -1,6 +1,6 @@ -package com.pms.ocp.service; +package com.nx.umms.service; -import com.pms.ocp.model.entity.ModelClassify; +import com.nx.umms.model.entity.ModelClassify; import java.util.List; diff --git a/src/main/java/com/nx/umms/service/ModelVersionService.java b/src/main/java/com/nx/umms/service/ModelVersionService.java new file mode 100644 index 0000000000000000000000000000000000000000..cbcc0ea8b7054df14ead204f24944574e8255789 --- /dev/null +++ b/src/main/java/com/nx/umms/service/ModelVersionService.java @@ -0,0 +1,67 @@ +package com.nx.umms.service; + +import com.nx.umms.model.dto.ModelVersionDTO; +import com.nx.umms.model.entity.ModelVersion; +import com.nx.umms.model.vo.ModelVersionVO; + +import java.util.List; + +/** + * @Auther: wangjian + * @Date: 2022/3/28 09:39 + * @Description:模型版本业务层接口 + */ +public interface ModelVersionService { + + /** + * 创建模型版本 + * + * @param modelVersionDTO + * @return + */ + Integer createModelVersion(ModelVersionDTO modelVersionDTO); + + /** + * 删除模型版本 + * + * @param mvId + * @param versionCode + * @return + */ + Integer deleteModelVersion(String mvId, String versionCode); + + /** + * 批量删除模型版本 + * + * @param ids + * @return + */ + Integer deleteBatchModelVersion(List ids); + + /** + * 更新模型版本 + * + * @param modelVersionDTO + * @return + */ + Integer updateModelVersion(ModelVersionDTO modelVersionDTO); + + /** + * 获取模型版本 + * + * @param + * @return + */ + List getModelVersionList(String mvId, String versionNumber); + + /** + * 获取模型版本列表 + * + * @param mvId + * @param versionNumber + * @return + */ + ModelVersion getModelVersion(String mvId, String versionNumber); + + +} diff --git a/src/main/java/com/pms/ocp/service/OcpModelGroupService.java b/src/main/java/com/nx/umms/service/OcpModelGroupService.java similarity index 72% rename from src/main/java/com/pms/ocp/service/OcpModelGroupService.java rename to src/main/java/com/nx/umms/service/OcpModelGroupService.java index 05de174e2f7378da87f65a7785448bf43b9c6487..1f3baf697503b05da8ad0325771d9efdd8c25833 100644 --- a/src/main/java/com/pms/ocp/service/OcpModelGroupService.java +++ b/src/main/java/com/nx/umms/service/OcpModelGroupService.java @@ -1,7 +1,7 @@ -package com.pms.ocp.service; +package com.nx.umms.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.pms.ocp.model.entity.ModelClassify; +import com.nx.umms.model.entity.ModelClassify; /** * @author huxiuwu diff --git a/src/main/java/com/pms/ocp/service/impl/ModelAuditServiceImpl.java b/src/main/java/com/nx/umms/service/impl/ModelAuditServiceImpl.java similarity index 87% rename from src/main/java/com/pms/ocp/service/impl/ModelAuditServiceImpl.java rename to src/main/java/com/nx/umms/service/impl/ModelAuditServiceImpl.java index 89043cf017b8b9e468dc6ec05a71eea8a133fe94..926e2e86abcb7af4abf73f10bbcb6d007e1beb40 100644 --- a/src/main/java/com/pms/ocp/service/impl/ModelAuditServiceImpl.java +++ b/src/main/java/com/nx/umms/service/impl/ModelAuditServiceImpl.java @@ -1,9 +1,9 @@ -package com.pms.ocp.service.impl; +package com.nx.umms.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.pms.ocp.mapper.ModelAuditMapper; -import com.pms.ocp.model.entity.ModelAudit; -import com.pms.ocp.service.ModelAuditService; +import com.nx.umms.mapper.ModelAuditMapper; +import com.nx.umms.model.entity.ModelAudit; +import com.nx.umms.service.ModelAuditService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/pms/ocp/service/impl/ModelClassifyServiceImpl.java b/src/main/java/com/nx/umms/service/impl/ModelClassifyServiceImpl.java similarity index 83% rename from src/main/java/com/pms/ocp/service/impl/ModelClassifyServiceImpl.java rename to src/main/java/com/nx/umms/service/impl/ModelClassifyServiceImpl.java index cac009e53e4d4871eda963b61e553399074ea27a..5b459194b1a05a1ada6fc1c2f09685a7fcc0d76c 100644 --- a/src/main/java/com/pms/ocp/service/impl/ModelClassifyServiceImpl.java +++ b/src/main/java/com/nx/umms/service/impl/ModelClassifyServiceImpl.java @@ -1,16 +1,16 @@ -package com.pms.ocp.service.impl; +package com.nx.umms.service.impl; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.pms.ocp.common.constants.CodeEnum; -import com.pms.ocp.common.utils.PageUtil; -import com.pms.ocp.mapper.ModelClassifyMapper; -import com.pms.ocp.mapper.OcpModelGroupMapper; -import com.pms.ocp.model.entity.ModelClassify; -import com.pms.ocp.model.vo.OcpModelGroupVO; -import com.pms.ocp.model.vo.ResponseVO; -import com.pms.ocp.service.ModelClassifyService; -import com.pms.ocp.service.OcpModelGroupService; +import com.nx.umms.common.utils.PageUtil; +import com.nx.umms.common.utils.res.ResultCodeEnum; +import com.nx.umms.common.utils.res.ResultVO; +import com.nx.umms.mapper.ModelClassifyMapper; +import com.nx.umms.mapper.OcpModelGroupMapper; +import com.nx.umms.model.entity.ModelClassify; +import com.nx.umms.model.vo.OcpModelGroupVO; +import com.nx.umms.service.ModelClassifyService; +import com.nx.umms.service.OcpModelGroupService; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; @@ -41,20 +41,20 @@ public class ModelClassifyServiceImpl implements ModelClassifyService { * currentPage pageSize * 模型分类-导航树 * - * @return List + * @return List * @author huxiuwu * @date 2022/3/8 **/ @Override - public ResponseVO> getModelNavigation() { + public ResultVO> getModelNavigation() { //根据是否传入搜索条件创建构造器进行查询 List modelTypeList = this.selectByCondition(null, null); if (CollectionUtil.isEmpty(modelTypeList)) { - return ResponseVO.error(CodeEnum.NO_DATA); + return ResultVO.fail(ResultCodeEnum.NO_DATA); } //对模型分类信息进行处理 List resultList = this.build(modelTypeList); - return ResponseVO.ok(resultList); + return ResultVO.success(resultList); } /** @@ -63,12 +63,12 @@ public class ModelClassifyServiceImpl implements ModelClassifyService { * 所以第一次查询查询到所有并将其转换为key为其分类编码,value为其本身 * 的map.第二次是根据搜素框的值进行模糊查询 * - * @return pms.ocp.model.vo.ResponseVO + * @return nx.umms.model.vo.ResultVO * @author huxiuwu * @date 2022/3/9 > **/ @Override - public ResponseVO subclassDetailsList(int currentPage,int pageSize,String parentGroupCode,String subclassGroupName) { + public ResultVO subclassDetailsList(int currentPage,int pageSize,String parentGroupCode,String subclassGroupName) { //查询所有 List ocpModelGroupVOList = this.selectByCondition(null,null); //将查询到所有数据的list转换为key为分类code,value为本身的map @@ -82,27 +82,27 @@ public class ModelClassifyServiceImpl implements ModelClassifyService { List sortList = childrenList.stream().sorted(Comparator.comparing(OcpModelGroupVO::getGroupCtime).reversed()).collect(Collectors.toList()); PageUtil pageUtil = new PageUtil<>(); pageUtil.startPage(currentPage, pageSize, sortList); - return ResponseVO.ok(pageUtil); + return ResultVO.success(pageUtil); } /** * 修改 * * @param list 修改list - * @return pms.ocp.model.vo.ResponseVO + * @return nx.umms.model.vo.ResultVO * @author huxiuwu * @date 2022/3/9 **/ @Override - public ResponseVO update(List list) { + public ResultVO update(List list) { if (getModelClassify(list,()->new QueryWrapper().ne("obj_id",list.get(0).getObjId()))){ - return ResponseVO.error(CodeEnum.DATA_REPETITION); + return ResultVO.fail(ResultCodeEnum.DATA_REPETITION); } boolean isUpdateSucceed = ocpService.saveOrUpdateBatch(list); if (!isUpdateSucceed) { - ResponseVO.error(CodeEnum.UP_DATA_FAIL); + ResultVO.fail(ResultCodeEnum.UP_DATA_FAIL); } - return ResponseVO.ok(); + return ResultVO.success(); } private boolean getModelClassify(List list,Supplier> supplier) { @@ -118,36 +118,36 @@ public class ModelClassifyServiceImpl implements ModelClassifyService { /** * 删除 - * @return pms.ocp.model.vo.ResponseVO + * @return nx.umms.model.vo.ResultVO * @author huxiuwu * @date 2022/3/9 **/ @Override - public ResponseVO delete(String modelGroupCode) { + public ResultVO delete(String modelGroupCode) { if (!ocpService.removeById(modelGroupCode)) { - return ResponseVO.error(CodeEnum.DELETE_FAIL); + return ResultVO.fail(ResultCodeEnum.DELETE_FAIL); } - return ResponseVO.ok(); + return ResultVO.success(); } /** * 新增 * * @param list 新增分类列表 - * @return pms.ocp.model.vo.ResponseVO + * @return nx.umms.model.vo.ResultVO * @author huxiuwu * @date 2022/3/9 **/ @Override - public ResponseVO insert(List list) { + public ResultVO insert(List list) { if (getModelClassify(list,()->new QueryWrapper())){ - return ResponseVO.error(CodeEnum.DATA_REPETITION); + return ResultVO.fail(ResultCodeEnum.DATA_REPETITION); } boolean result = ocpService.saveBatch(list); if (!result) { - return ResponseVO.error(CodeEnum.INSERT_FAIL); + return ResultVO.fail(ResultCodeEnum.INSERT_FAIL); } - return ResponseVO.ok(list); + return ResultVO.success(list); } /** @@ -184,7 +184,7 @@ public class ModelClassifyServiceImpl implements ModelClassifyService { * 构建树节点 * * @param treeNodes 需要构建的list - * @return List + * @return List * @author huxiuwu * @date 2022/3/10 **/ @@ -221,7 +221,7 @@ public class ModelClassifyServiceImpl implements ModelClassifyService { * @author huxiuwu * @date 2022/3/10 * @param searchCondition - * @return List + * @return List * @author huxiuwu * @date 2022/3/10 **/ diff --git a/src/main/java/com/nx/umms/service/impl/ModelGroupServiceImpl.java b/src/main/java/com/nx/umms/service/impl/ModelGroupServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..cfdf44d7f40af19692cb39bb260bd1125ece5a84 --- /dev/null +++ b/src/main/java/com/nx/umms/service/impl/ModelGroupServiceImpl.java @@ -0,0 +1,66 @@ +package com.nx.umms.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.nx.umms.common.utils.res.ResultCodeEnum; +import com.nx.umms.common.utils.res.ResultVO; +import com.nx.umms.mapper.ModelTypeMapper; +import com.nx.umms.model.entity.ModelClassify; +import com.nx.umms.service.ModelGroupService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; + +import java.util.List; + +@Service +public class ModelGroupServiceImpl implements ModelGroupService { + + @Autowired + private ModelTypeMapper modelTypeMapper; + + /** + * 获取模型类型 + * + * @return + */ + @Override + public ResultVO getModelType() { + QueryWrapper wrapper = new QueryWrapper<>(); + List modelClassifyList = modelTypeMapper.selectList(wrapper); + if (CollectionUtils.isEmpty(modelClassifyList)) { + return ResultVO.fail(ResultCodeEnum.NO_DATA); + } else { + return ResultVO.success(modelClassifyList); + } + } + + @Override + public ResultVO createModelType(ModelClassify modelClassify) { + int result = modelTypeMapper.insert(modelClassify); + if (result > 0) { + return ResultVO.fail(ResultCodeEnum.SUCCESS); + } else { + return ResultVO.success(ResultCodeEnum.INSERT_FAIL); + } + } + + @Override + public ResultVO deleteModelType(String modelTypeId) { + int result = modelTypeMapper.deleteById(modelTypeId); + if (result > 0) { + return ResultVO.fail(ResultCodeEnum.ACCESS_DENIED.SUCCESS); + } else { + return ResultVO.success(ResultCodeEnum.UNKNOWN); + } + } + + @Override + public ResultVO updateModelType(ModelClassify modelClassify) { + int result = modelTypeMapper.updateById(modelClassify); + if (result > 0) { + return ResultVO.fail(ResultCodeEnum.SUCCESS); + } else { + return ResultVO.success(ResultCodeEnum.UP_DATA_FAIL); + } + } +} diff --git a/src/main/java/com/pms/ocp/service/impl/ModelPropertyServiceImpl.java b/src/main/java/com/nx/umms/service/impl/ModelPropertyServiceImpl.java similarity index 91% rename from src/main/java/com/pms/ocp/service/impl/ModelPropertyServiceImpl.java rename to src/main/java/com/nx/umms/service/impl/ModelPropertyServiceImpl.java index 8f340340fa84e77485de079692ed7c8976babb0b..5c825d12bba1cafe8f664fb8503c59f00abacf09 100644 --- a/src/main/java/com/pms/ocp/service/impl/ModelPropertyServiceImpl.java +++ b/src/main/java/com/nx/umms/service/impl/ModelPropertyServiceImpl.java @@ -1,25 +1,22 @@ -package com.pms.ocp.service.impl; +package com.nx.umms.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.pms.ocp.mapper.ModelPropertyMapper; -import com.pms.ocp.model.dto.ModelPropertyDTO; -import com.pms.ocp.model.entity.Model; -import com.pms.ocp.model.entity.ModelProperty; -import com.pms.ocp.model.vo.ModelPropertyVO; -import com.pms.ocp.service.ModelPropertyService; -import com.pms.ocp.service.ModelService; +import com.nx.umms.mapper.ModelPropertyMapper; +import com.nx.umms.model.dto.ModelPropertyDTO; +import com.nx.umms.model.entity.ModelProperty; +import com.nx.umms.model.vo.ModelPropertyVO; +import com.nx.umms.service.ModelPropertyService; +import com.nx.umms.service.ModelService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.time.LocalDateTime; -import java.util.ArrayList; import java.util.List; -import java.util.stream.Collectors; /** * @Auther: wangjian diff --git a/src/main/java/com/pms/ocp/service/impl/ModelRelationServiceImpl.java b/src/main/java/com/nx/umms/service/impl/ModelRelationServiceImpl.java similarity index 89% rename from src/main/java/com/pms/ocp/service/impl/ModelRelationServiceImpl.java rename to src/main/java/com/nx/umms/service/impl/ModelRelationServiceImpl.java index d350d827fdc5d33e76ae23e1983e37dbeea2db4e..f4edc2e1fb4030cd2abf9a807fba3c2e95cb36e9 100644 --- a/src/main/java/com/pms/ocp/service/impl/ModelRelationServiceImpl.java +++ b/src/main/java/com/nx/umms/service/impl/ModelRelationServiceImpl.java @@ -1,11 +1,11 @@ -package com.pms.ocp.service.impl; +package com.nx.umms.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.pms.ocp.mapper.ModelRelationMapper; -import com.pms.ocp.model.dto.ModelRelationDTO; -import com.pms.ocp.model.entity.ModelRelation; -import com.pms.ocp.model.vo.ModelRelationVO; -import com.pms.ocp.service.ModelRelationService; +import com.nx.umms.mapper.ModelRelationMapper; +import com.nx.umms.model.dto.ModelRelationDTO; +import com.nx.umms.model.entity.ModelRelation; +import com.nx.umms.model.vo.ModelRelationVO; +import com.nx.umms.service.ModelRelationService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/pms/ocp/service/impl/ModelServiceImpl.java b/src/main/java/com/nx/umms/service/impl/ModelServiceImpl.java similarity index 87% rename from src/main/java/com/pms/ocp/service/impl/ModelServiceImpl.java rename to src/main/java/com/nx/umms/service/impl/ModelServiceImpl.java index 86d0426044c6fde3b93b8c6277be3534aaba91a5..f569e5eec96b13f140d91e8d16f177a17d7db465 100644 --- a/src/main/java/com/pms/ocp/service/impl/ModelServiceImpl.java +++ b/src/main/java/com/nx/umms/service/impl/ModelServiceImpl.java @@ -1,19 +1,19 @@ -package com.pms.ocp.service.impl; +package com.nx.umms.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pms.ocp.common.constants.Constant; -import com.pms.ocp.common.utils.ExcelUtils; -import com.pms.ocp.common.utils.PageUtil; -import com.pms.ocp.mapper.ModelMapper; -import com.pms.ocp.mapper.ModelPropertyMapper; -import com.pms.ocp.model.dto.ModelDTO; -import com.pms.ocp.model.entity.Model; -import com.pms.ocp.model.entity.ModelProperty; -import com.pms.ocp.model.vo.ModelVO; -import com.pms.ocp.model.vo.ResponseVO; -import com.pms.ocp.service.ModelService; +import com.nx.umms.common.constants.Constant; +import com.nx.umms.common.utils.ExcelUtils; +import com.nx.umms.common.utils.PageUtil; +import com.nx.umms.common.utils.res.ResultVO; +import com.nx.umms.mapper.ModelMapper; +import com.nx.umms.mapper.ModelPropertyMapper; +import com.nx.umms.model.dto.ModelDTO; +import com.nx.umms.model.entity.Model; +import com.nx.umms.model.entity.ModelProperty; +import com.nx.umms.model.vo.ModelVO; +import com.nx.umms.service.ModelService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -209,11 +209,11 @@ public class ModelServiceImpl extends ServiceImpl implements * @param currentPage 当前页 * @param pageSize 每页数量 * @param searchCondition 搜索条件 - * @return pms.ocp.model.vo.ResponseVO + * @return nx.umms.model.vo.ResultVO **/ @Override - public ResponseVO getModeBaselList(String belongLevel, String modelCode, Integer currentPage, Integer pageSize, String searchCondition) { - ResponseVO result; + public ResultVO getModeBaselList(String belongLevel, String modelCode, Integer currentPage, Integer pageSize, String searchCondition) { + ResultVO result; switch (belongLevel) { case Constant.Character.STRINGTWO: result = this.getModelInfoList(modelCode, currentPage, pageSize, searchCondition); @@ -222,7 +222,7 @@ public class ModelServiceImpl extends ServiceImpl implements result = this.getPropertyList(modelCode, currentPage, pageSize, searchCondition); break; default: - return ResponseVO.ok(); + return ResultVO.success(); } return result; } @@ -232,11 +232,11 @@ public class ModelServiceImpl extends ServiceImpl implements * @param currentPage 当前页 * @param pageSize 每页数量 * @param searchCondition 搜索条件 - * @return pms.ocp.model.vo.ResponseVO + * @return nx.umms.model.vo.ResultVO * @author huxiuwu * @date 2022/3/17 **/ - private ResponseVO getModelInfoList(String modelCode, Integer currentPage, Integer pageSize, String searchCondition) { + private ResultVO getModelInfoList(String modelCode, Integer currentPage, Integer pageSize, String searchCondition) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("model_group_code", modelCode) .like(StringUtils.isNotEmpty(searchCondition), "model_name", searchCondition) @@ -244,7 +244,7 @@ public class ModelServiceImpl extends ServiceImpl implements List modelList = modelMapper.selectList(queryWrapper); PageUtil pageUtil = new PageUtil<>(); pageUtil.startPage(currentPage, pageSize, modelList); - return ResponseVO.ok(pageUtil); + return ResultVO.success(pageUtil); } /** @@ -252,11 +252,11 @@ public class ModelServiceImpl extends ServiceImpl implements * @param currentPage 当前页 * @param pageSize 每页数量 * @param searchCondition 搜索条件 - * @return pms.ocp.model.vo.ResponseVO + * @return nx.umms.model.vo.ResultVO * @author huxiuwu * @date 2022/3/17 **/ - private ResponseVO getPropertyList(String modelCode, Integer currentPage, Integer pageSize, String searchCondition) { + private ResultVO getPropertyList(String modelCode, Integer currentPage, Integer pageSize, String searchCondition) { QueryWrapper proWrapper = new QueryWrapper<>(); //查询模型名称 QueryWrapper modelWrapper = new QueryWrapper<>(); @@ -271,6 +271,6 @@ public class ModelServiceImpl extends ServiceImpl implements ); PageUtil pageUtil = new PageUtil<>(); pageUtil.startPage(currentPage, pageSize, modelPropertiesList); - return ResponseVO.ok(pageUtil); + return ResultVO.success(pageUtil); } } diff --git a/src/main/java/com/pms/ocp/service/impl/ModelSubscribeServiceImpl.java b/src/main/java/com/nx/umms/service/impl/ModelSubscribeServiceImpl.java similarity index 84% rename from src/main/java/com/pms/ocp/service/impl/ModelSubscribeServiceImpl.java rename to src/main/java/com/nx/umms/service/impl/ModelSubscribeServiceImpl.java index cecac406f731a986328e7ec3b7a7ce81e429cc44..c37a8a3f18ad9104581ec1ea5f53046293e38389 100644 --- a/src/main/java/com/pms/ocp/service/impl/ModelSubscribeServiceImpl.java +++ b/src/main/java/com/nx/umms/service/impl/ModelSubscribeServiceImpl.java @@ -1,15 +1,15 @@ -package com.pms.ocp.service.impl; +package com.nx.umms.service.impl; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.pms.ocp.common.constants.CodeEnum; -import com.pms.ocp.common.utils.TreeUtils; -import com.pms.ocp.mapper.ModelSubscribeMapper; -import com.pms.ocp.model.dto.ModelSubscribeDTO; -import com.pms.ocp.model.entity.ModelSubscribe; -import com.pms.ocp.model.entity.TreeNode; -import com.pms.ocp.model.vo.ResponseVO; -import com.pms.ocp.service.ModelSubscribeService; +import com.nx.umms.common.utils.TreeUtils; +import com.nx.umms.common.utils.res.ResultCodeEnum; +import com.nx.umms.common.utils.res.ResultVO; +import com.nx.umms.mapper.ModelSubscribeMapper; +import com.nx.umms.model.dto.ModelSubscribeDTO; +import com.nx.umms.model.entity.ModelSubscribe; +import com.nx.umms.model.entity.TreeNode; +import com.nx.umms.service.ModelSubscribeService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -94,14 +94,14 @@ public class ModelSubscribeServiceImpl implements ModelSubscribeService { * @author huxiuwu * @date 2022/3/11 * - * @return pms.ocp.model.vo.ResponseVO + * @return nx.umms.model.vo.ResponseVO **/ @Override - public ResponseVO modelListNavigation(String searchCondition) { + public ResultVO modelListNavigation(String searchCondition) { //查询模型和模型属性表列表 List modelProperList = modelSubscribeMapper.selectModelAndModelGroup(searchCondition); if (CollectionUtil.isEmpty(modelProperList)){ - return ResponseVO.error(CodeEnum.NO_DATA); + return ResultVO.fail(ResultCodeEnum.NO_DATA); } List modelGroupList = TreeUtils.build(modelProperList); //查询组织机构表 @@ -119,6 +119,6 @@ public class ModelSubscribeServiceImpl implements ModelSubscribeService { }); }); List result = TreeUtils.build(organList); - return ResponseVO.ok(result); + return ResultVO.success(result); } } diff --git a/src/main/java/com/pms/ocp/service/impl/ModelTypeServiceImpl.java b/src/main/java/com/nx/umms/service/impl/ModelTypeServiceImpl.java similarity index 85% rename from src/main/java/com/pms/ocp/service/impl/ModelTypeServiceImpl.java rename to src/main/java/com/nx/umms/service/impl/ModelTypeServiceImpl.java index 7b82ed9d8024e74ba5e9b4210af78cfee505a2c5..0a1e85fda18c26938d52e6f21d8c4b05a7dacbe7 100644 --- a/src/main/java/com/pms/ocp/service/impl/ModelTypeServiceImpl.java +++ b/src/main/java/com/nx/umms/service/impl/ModelTypeServiceImpl.java @@ -1,7 +1,7 @@ -package com.pms.ocp.service.impl; +package com.nx.umms.service.impl; -import com.pms.ocp.model.entity.ModelClassify; -import com.pms.ocp.service.ModelTypeService; +import com.nx.umms.model.entity.ModelClassify; +import com.nx.umms.service.ModelTypeService; import org.springframework.stereotype.Service; import java.util.List; diff --git a/src/main/java/com/nx/umms/service/impl/ModelVersionServiceImpl.java b/src/main/java/com/nx/umms/service/impl/ModelVersionServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..d80a6ae829b286e0889588b072cf5f9f1de52128 --- /dev/null +++ b/src/main/java/com/nx/umms/service/impl/ModelVersionServiceImpl.java @@ -0,0 +1,126 @@ +package com.nx.umms.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.nx.umms.common.utils.DataHandleUtils; +import com.nx.umms.mapper.ModelVersionMapper; +import com.nx.umms.model.dto.ModelVersionDTO; +import com.nx.umms.model.entity.ModelVersion; +import com.nx.umms.model.vo.ModelVersionVO; +import com.nx.umms.service.ModelVersionService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.time.LocalDateTime; +import java.util.List; +import java.util.stream.Collectors; + +/** + * @Auther: wangjian + * @Date: 2022/3/28 13:33 + * @Description: + */ + +@Service +public class ModelVersionServiceImpl implements ModelVersionService { + + @Autowired + private ModelVersionMapper modelVersionMapper; + + @Override + public Integer createModelVersion(ModelVersionDTO modelVersionDTO) { + + ModelVersion modelVersion = new ModelVersion(); + + BeanUtils.copyProperties(modelVersionDTO, modelVersion); + + modelVersion.setCreateTime(LocalDateTime.now()); + return modelVersionMapper.insert(modelVersion); + } + + @Override + public Integer deleteModelVersion(String mvId, String versionCode) { + QueryWrapper queryWrapper = new QueryWrapper(); + + if (StringUtils.isNotEmpty(mvId)) { + queryWrapper.lambda().eq(ModelVersion::getMvId, mvId); + } + if (StringUtils.isNotEmpty(versionCode)) { + queryWrapper.lambda().eq(ModelVersion::getVersionCode, versionCode); + } + + return modelVersionMapper.delete(queryWrapper); + } + + @Override + public Integer deleteBatchModelVersion(List ids) { + return modelVersionMapper.deleteBatchIds(ids); + } + + @Override + public Integer updateModelVersion(ModelVersionDTO modelVersionDTO) { + + ModelVersion modelVersion = new ModelVersion(); + + BeanUtils.copyProperties(modelVersionDTO, modelVersion); + + modelVersion.setUpdateTime(LocalDateTime.now()); + + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + + updateWrapper.lambda().eq(ModelVersion::getMvId, modelVersion.getMvId()); + + return modelVersionMapper.update(modelVersion, updateWrapper); + } + + @Override + public List getModelVersionList(String mvId, String versionNumber) { + + QueryWrapper queryWrapper = new QueryWrapper(); + + if (StringUtils.isNotEmpty(mvId)) { + queryWrapper.lambda().eq(ModelVersion::getMvId, mvId); + } + + if (StringUtils.isNotEmpty(versionNumber)) { + queryWrapper.lambda().eq(ModelVersion::getVersionNumber, versionNumber); + } + + List modelVersionList = modelVersionMapper.selectList(queryWrapper); + + List modelVersionVOList = modelVersionList.stream().map(t -> { + ModelVersionVO modelVersionVO = new ModelVersionVO(); + BeanUtils.copyProperties(t, modelVersionVO); + return modelVersionVO; + }).collect(Collectors.toList()); + + return modelVersionVOList; + } + + @Override + public ModelVersion getModelVersion(String mvId, String versionNumber) { + QueryWrapper queryWrapper = new QueryWrapper(); + + if (StringUtils.isNotEmpty(mvId)) { + queryWrapper.lambda().eq(ModelVersion::getMvId, mvId); + } + + if (StringUtils.isNotEmpty(versionNumber)) { + queryWrapper.lambda().eq(ModelVersion::getVersionNumber, versionNumber); + } + + ModelVersionVO modelVersionVO = new ModelVersionVO(); + + ModelVersion modelVersion = modelVersionMapper.selectOne(queryWrapper); + +// if (DataHandleUtils.isNullOrEmpty(modelVersion) && StringUtils.isEmpty(modelVersion.getVersionCode())){ +// +// } + +// BeanUtils.copyProperties(modelVersion, modelVersionVO); + + return modelVersion; + } +} diff --git a/src/main/java/com/pms/ocp/service/impl/OcpModelGroupServiceImpl.java b/src/main/java/com/nx/umms/service/impl/OcpModelGroupServiceImpl.java similarity index 64% rename from src/main/java/com/pms/ocp/service/impl/OcpModelGroupServiceImpl.java rename to src/main/java/com/nx/umms/service/impl/OcpModelGroupServiceImpl.java index 4c71e2c5a76cdd27d182229cc7ef5587e64b79bb..07c286890c81ae7f5e553e5946b6cad57788c192 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpModelGroupServiceImpl.java +++ b/src/main/java/com/nx/umms/service/impl/OcpModelGroupServiceImpl.java @@ -1,9 +1,9 @@ -package com.pms.ocp.service.impl; +package com.nx.umms.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pms.ocp.mapper.OcpModelGroupMapper; -import com.pms.ocp.model.entity.ModelClassify; -import com.pms.ocp.service.OcpModelGroupService; +import com.nx.umms.mapper.OcpModelGroupMapper; +import com.nx.umms.model.entity.ModelClassify; +import com.nx.umms.service.OcpModelGroupService; import org.springframework.stereotype.Service; /** diff --git a/src/main/java/com/pms/ocp/common/constants/CodeEnum.java b/src/main/java/com/pms/ocp/common/constants/CodeEnum.java deleted file mode 100644 index 0b4e57cbd50ba35c5339ad3e82bbf35a9927853f..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/common/constants/CodeEnum.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.pms.ocp.common.constants; - -import lombok.Getter; - -/** - * @author wuwanli - * @version 1.0 - * @date 2021/8/4 - */ -public enum CodeEnum { - /** - * 处理成功 - */ - SUCCESS("200", "处理成功", true), - /** - * 必填参数为空 - */ - REQUIRED_PARAMETER_EMPTY("0", "必填参数为空", false), - /** - * 参数类型错误 - */ - PARAMETER_TYPE_ERROR("0", "Parameter type error", false), - /** - * 未登录 - */ - NOT_LOGIN("401001", "用户未登录", false), - /** - * 用户名或密码错误 - */ - LOGIN_FAIL("401002", "用户名或密码错误", false), - /** - * 无权限访问 - */ - NO_PERMISSION("401003", "无权限访问", false), - /** - * 系统异常 - */ - UNKNOWN("9999", "System abnormal", false), - /** - * 数据异常 - */ - NO_DATA("200", "数据库无数据", false), - UP_DATA_FAIL("401005", "更新失败", false), - INSERT_FAIL("401006", "插入数据失败", false), - DELETE_FAIL("401007", "修改失败", false), - DATA_REPETITION("250", "分类编码或分类名称重复", false); - - /** - * 构造函数 - * - * @param code 响应码 - * @param desc 响应描述 - */ - CodeEnum(String code, String desc, boolean success) { - this.code = code; - this.desc = desc; - this.success = success; - } - - @Getter - private final String code; - - @Getter - private final String desc; - @Getter - private final boolean success; - -} \ No newline at end of file diff --git a/src/main/java/com/pms/ocp/common/constants/ExportUtils.java b/src/main/java/com/pms/ocp/common/constants/ExportUtils.java deleted file mode 100644 index c3a016d46cf84993ff5efff6a033d4c29daa6bcc..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/common/constants/ExportUtils.java +++ /dev/null @@ -1,149 +0,0 @@ -package com.pms.ocp.common.constants; - - -import com.pms.ocp.common.exception.ServiceException; -import org.apache.poi.ss.usermodel.Workbook; - -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.net.URLEncoder; -import java.util.Locale; -import java.util.regex.Pattern; - -public class ExportUtils { - - /** - * 校验Header Manipulation - * @param header 参数 - * @return 数据 - */ - public static String headerManipulation(String header) { - if(StringUtils.isNullOrEmpty(header)){ - return header; - } - String regex = "[`~!@#$%^&*()\\+\\=\\{}|:\"?><【】\\/r\\/n]"; - Pattern pattern = Pattern.compile(regex); - pattern.matcher(header).replaceAll("").trim(); - return header; - } - - /** - * 流导出文件至浏览器 - * - * @param response - * @param in - * @param fileName - */ - public static void exportWorld(HttpServletResponse response, InputStream in, String fileName) { - OutputStream out = null; - try { - response.reset(); - String fileHeaderName = URLEncoder.encode(fileName, Constant.Character.UTF8); - response.setHeader("Content-Disposition", "attachment;filename=" + headerManipulation(fileHeaderName)); - response.setContentType("application/msword;charset=UTF-8"); - response.setHeader("Access-Control-Expose-Headers", "Content-Disposition"); - response.setHeader("Access-Control-Allow-Origin", "*"); - out = response.getOutputStream(); - //定义缓存 - byte[] buffer = new byte[1024]; - int i; - while ((i = in.read(buffer)) != Constant.Number.MINUS_ZERO) { - out.write(buffer, Constant.Number.ZERO, i); - } - out.flush(); - } catch (IOException e) { - e.printStackTrace(); - throw new ServiceException(com.pms.ocp.common.constants.ResultCode.INTERNAL_SERVER_ERROR); - } finally { - if (out != null){ - try { - out.close(); - } catch (IOException e) { - e.printStackTrace(); - } - ; - } - if (in != null) { - try { - in.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - } - - /** - * Workbook导出浏览器 - * 文件导出添加跨域 Access-Control-Allow-Origin - * @param response - * @param fileName - * @param workbook - */ - public static void exportExcel(HttpServletResponse response, String fileName, Workbook workbook) { - try { - response.reset(); - String fileHeaderName = URLEncoder.encode(fileName, Constant.Character.UTF8); - response.setHeader("Content-Disposition", "attachment;filename=" + headerManipulation(fileHeaderName)); - response.setHeader("Access-Control-Expose-Headers", "Content-Disposition"); - response.setHeader("Access-Control-Allow-Origin", "*"); - response.setContentType("application/vnd.ms-excel;charset=UTF-8"); - ServletOutputStream outputStream = response.getOutputStream(); - workbook.write(outputStream); - } catch (IOException e) { - e.printStackTrace(); - throw new ServiceException(ResultCode.INTERNAL_SERVER_ERROR); - } - } - - /** - * 图片导出 - * - * @param response - * @param in - * @param fileName - */ - public static void exportPic(HttpServletResponse response, InputStream in, String fileName) { - try { - if (in != null) { - response.reset(); - String fileHeaderName = URLEncoder.encode(fileName, Constant.Character.UTF8); - String fileExtensionName = fileName.substring(fileName.lastIndexOf(".") + 1).toUpperCase(Locale.ENGLISH); - switch (fileExtensionName) { - case "JEPG": - case "JPG": - response.setContentType("image/jepg;charset=UTF-8"); - break; - case "PNG": - response.setContentType("image/png;charset=UTF-8"); - break; - case "BMP": - response.setContentType("application/x-bmp;charset=UTF-8"); - break; - default: - response.setContentType("application/octet-stream;charset=UTF-8"); - break; - - } - response.setHeader("Content-Disposition", "attachment;filename=" + headerManipulation(fileHeaderName)); - response.setHeader("Access-Control-Expose-Headers", "Content-Disposition"); - response.setHeader("Access-Control-Allow-Origin", "*"); - byte[] buffer = new byte[1024]; - OutputStream out = response.getOutputStream(); - int i; - while ((i = in.read(buffer)) != -1) { - out.write(buffer, 0, i); - } - out.flush(); - out.close(); - in.close(); - } - } catch (IOException e) { - e.printStackTrace(); - throw new ServiceException(ResultCode.INTERNAL_SERVER_ERROR); - } - } -} diff --git a/src/main/java/com/pms/ocp/common/constants/ResultCode.java b/src/main/java/com/pms/ocp/common/constants/ResultCode.java deleted file mode 100644 index a4e292fbd2f813ffee58450d76f22e700b54c688..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/common/constants/ResultCode.java +++ /dev/null @@ -1,174 +0,0 @@ -package com.pms.ocp.common.constants; - -/** - * 异常枚举类 - */ -public enum ResultCode { - /* ============================ 通用错误码 ========================== **/ - /** - * 禁止访问 303 - **/ - PARAMS_NOT(303, "缺少参数"), - - /** - * 存在错误参数 304 - */ - PARAMS_NOT_RIGHT(304, "存在错误参数"), - - /** - * 存在错误测试数据 305 - */ - DATA_ERROR(305, "存在错误测试数据"), - - /** - * 存在错误测试数据 305 - */ - SERVER_ERROR(306, "服务异常"), - /** - * 校验失败 307 - **/ - VERIFICATION_FAIL(307, "校验失败"), - - /** - * 错误请求 400 - **/ - BAD_REQUEST(400, "错误请求"), - - /** - * 未经授权 401 - **/ - UNAUTHORIZED(401, "未经授权"), - - /** - * 禁止访问 403 - **/ - FORBIDDEN(403, "禁止访问"), - /** - * 连接超时 - **/ - TIME_OUT(408, "连接超时"), - /** - * Feign连接错误 - **/ - FEIGN_CONNECT_ERROR(409, "feignClient 连接错误：%s"), - /** - * Feign连接错误 - **/ - BAD_REQUEST_METHOD(410, "不合法的请求方式"), - /** - * 操作异常 500 - **/ - INTERNAL_SERVER_ERROR(500, "操作异常"), - /** - * SQL异常 - **/ - SQL_ERROR_EXCEPTION(501, "SQL执行异常!"), - /** - * 操作失败 - **/ - OPERATION_FAILURE(507, "操作失败"), - /** - * 日期格式处理异常 - **/ - DATE_FORMAT_EXCEPTION(508, "日期格式处理异常"), - /** - * 项目启动文件异常 - */ - SYSTEM_PROFILE_EXCEPTION(509, "错误的项目启动文件"), - - /* ============================ 业务/错误码 start========================== **/ - /* ===========================后台系统======================== **/ - RECORD_NOT_EXIST(10001, "相关记录不存在!"), - SYS_USER_INVALID(10002, "用户登录已过期!"), - PERMISSION_NOT(10003, "无访问权限!"), - ACCOUNT_NOT(10004, "账号异常!"), - SHIRO_ERROR(10005, "鉴权/授权过程出错!"), - MENU_EXIST(10006, "菜单定义已存在！"), - ROLE_EXIST(10007, "角色定义已存在！"), - CODE_EXIST(10008, "编码已存在！"), - NAME_EXIST(10009, "名称已存在!"), - NO_DELETE(10010, "无法删除，有关联数据!"), - USER_ORGANIZATION_LEVEL_ERROR(10023, "用户组织机构关联层级有误！"), - USER_ORGANIZATION_INFO_ERROR(10024,"用户组织机构信息有误！"), - TOKEN_INVALID(9997, "登录失效，请重新登录！"), - /* ============================ 文件处理 错误码 ========================== **/ - FILE_NOT_EXISTS(21001, "文件不存在"), - FILE_MUST_IS_EXCEL(21002, "文件类型必须是excel"), - UPLOAD_EXCEPTION(21003, "上传过程出现异常"), - EXCEL_RULE_NOT_EXISTS(21004, "excel校验规则不存在"), - EXCEL_TEMPLATE_NOT_EXISTS(21005, "excel模板不存在"), - EXCEL_TEMPLATE_NOT_CORRECT(21009, "excel模板不对，请重新下载"), - EXCEL_DATA_NOT_EXISTS(21006, "excle数据不存在"), - EXCEL_NOT_CORRECT(21007, "excel不正确"), - EXCEL_PARSE_CORRECT(21010,"excel解析错误"), - CURRENT_MONTH_NOT_EXISTS(21008, "当前年月数据不存在"), - BATCH_NOT_NEED(21009, "无需批量操作！"), - CELL_IS_NULL(21010, "值不能为空"), - CELL_FORMAT_ERROR(21011, "值格式不正确"), - CELL_MIN_LENGTH_ERROR(21012, "值小于最小长度"), - CELL_MAX_LENGTH_ERROR(21013, "值大于最大长度"), - CELL_REGULAR_ERROR(21014, "值正则验证不通过"), - CELL_OPTION_ERROR(21015, "值不在选项集范围内"), - ROW_DUPLICATE_ERROR(21016, "行重复性校验未通过"), - CELL_DATE_FORMAT_ERROR(21017,"日期范围格式不正确"), - - DATA_MISSING_UNITS(21018, "数据缺少单位级别编码"), - PICTURE_NAME_ILLEGAL(21019, "图片名称不合法,请重新上传"), - FILE_MUST_IS_PIC(21020, "图片格式不合法,请重新上传!"), - NAME_CONFLICT(21021, "该组织机构下名称重复,请修改名称!"), - ENCRYPT_ERROR_CODE(21022, "解密失败"), - - /* ===========================JoyhrError======================== **/ - SIGN_ERROR(80001,"签名验证错误!"), - METHOD_ERROR(80002,"方法不存在!"), - /* ===========================CrmHookError======================== **/ - CRM_MEMBER_FOUND_ERROR(81001,"会员信息已存在"), - CRM_MEMBER_NOT_FOUND_ERROR(81002,"会员信息不存在"), - - /* =============主系统更改Error ================= **/ - MASTER_DATA_RELY_ERROR(90001,"切换系统与中台数据存在数据不匹配"), - - RELY_DATA_NOT_MATCH_BASE(90002,"切换系统依赖数据与中台数据存在不匹配数据"), - - BUS_DATA_NOT_MATCH_BASE(90003,"切换系统业务数据与中台数据存在不匹配数据"), - - DATA_MAPPING_NOT_MATCH_BASE(90004,"切换系统数据映射中数据与中台数据存在不匹配数据"), - - /* =============中台大平台系统 ================= **/ - LOGIN_TIME_OUT(130001,"登录失效或未登录，请重新登录"), - VERFICATION_CODE_ERROR(130002,"验证码不正确"), - NO_USER(130003,"用户不存在"), - PASSWORD_ERROR(130004,"密码不正确"), - MOBILE_USED(130005,"该手机号码已被注册"), - BANK_ACCOUNT_USED(130006,"该银行账号已被使用"), - OPEN_GOODS_FAIL(130009,"开通失败，请重新开通或联系相关人员"), - PROBATION_GOODS_FAIL(130010,"试用失败，请重新试用或联系相关人员"), - END_GOODS_FAIL(130011,"停用失败，请重新停用或联系相关人员"), - FIND_ORDER_LIST_FAIL(130012,"查询订单列表失败，请重新查询或联系相关人员"), - FIND_BILL_FAIL(130013,"查询账单列表失败，请重新查询或联系相关人员"), - FIND_SIX_MONTH_BILL(130014,"查询近6个月消费失败"), - FIND_MONTH_GOODS(130015,"查询该月份消费情况失败"), - /* =============数据维护 ================= **/ - TOTAL_SYNC_RECORD_EXITS(110001,"已执行过全量同步！"), - TOTAL_SYNC_RECORD_NOT_EXITS(110002,"还没执行全量同步！"); - - public final int statusCode; - public String msg; - - ResultCode(int statusCode, String msg) { - this.statusCode = statusCode; - this.msg = msg; - } - - public int getStatusCode() { - return statusCode; - } - - public String getMessage() { - return msg; - } - - public void setMessage(String msg) { - this.msg = msg; - } -} diff --git a/src/main/java/com/pms/ocp/common/exception/BeagleException.java b/src/main/java/com/pms/ocp/common/exception/BeagleException.java deleted file mode 100644 index 84d6f3f30b924bd0906c870003fdf993e057d8e1..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/common/exception/BeagleException.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.pms.ocp.common.exception; - -import lombok.Getter; - -/** - * @author wuwanli - * @date 2021/8/3 - */ -public class BeagleException extends RuntimeException { - /** - * 错误码 - */ - @Getter - protected String errorCode; - /** - * 错误信息 - */ - @Getter - protected String errorMsg; - - public BeagleException() { - super(); - } - - public BeagleException(String errorMsg) { - super(errorMsg); - this.errorMsg = errorMsg; - } - public BeagleException(String errorCode, String errorMsg) { - super(errorMsg); - this.errorCode = errorCode; - this.errorMsg = errorMsg; - } - - public BeagleException(String errorMsg, Throwable cause) { - super(errorMsg, cause); - } - - public BeagleException(String errorCode, String errorMsg, Throwable cause) { - super(errorCode, cause); - this.errorCode = errorCode; - this.errorMsg = errorMsg; - } -} diff --git a/src/main/java/com/pms/ocp/common/exception/GlobalExceptionHandler.java b/src/main/java/com/pms/ocp/common/exception/GlobalExceptionHandler.java deleted file mode 100644 index 5724c55a3ffff48430f8d359ca9845b88edb2929..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/common/exception/GlobalExceptionHandler.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.pms.ocp.common.exception; - -import com.pms.ocp.common.utils.BeagleStringUtils; -import com.pms.ocp.model.vo.BaseResponse; -import org.springframework.web.bind.annotation.ExceptionHandler; -import org.springframework.web.bind.annotation.RestControllerAdvice; - -import com.pms.ocp.common.constants.CodeEnum; - -import lombok.extern.slf4j.Slf4j; - -/** - * @author wuwanli - * @version 1.0 - * @date 2021/8/5 - */ -@Slf4j -@RestControllerAdvice -public class GlobalExceptionHandler { - - @ExceptionHandler(value = BeagleException.class) - public BaseResponse beagleExceptionHandler(BeagleException beagleException) { - log.error("GlobalExceptionHandler.beagleExceptionHandler", beagleException); - BaseResponse baseResponse = new BaseResponse(); - if (BeagleStringUtils.isBlank(beagleException.getErrorCode())) { - baseResponse.setResponseCode(CodeEnum.UNKNOWN); - } else { - baseResponse.setCode(beagleException.getErrorCode()); - baseResponse.setDesc(beagleException.getErrorMsg()); - } - return baseResponse; - } - - @ExceptionHandler(value = Exception.class) - public BaseResponse exceptionHandler(Exception exception) { - log.error("GlobalExceptionHandler.exceptionHandler", exception); - return new BaseResponse(CodeEnum.UNKNOWN); - } -} diff --git a/src/main/java/com/pms/ocp/common/exception/ServiceException.java b/src/main/java/com/pms/ocp/common/exception/ServiceException.java deleted file mode 100644 index 375171444021480282fb0da692953b93082fc853..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/common/exception/ServiceException.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.pms.ocp.common.exception; - -import com.pms.ocp.common.constants.ResultCode; - -/** - * @Auther: wangjian - * @Date: 2022/3/11 16:31 - * @Description: - */ -public class ServiceException extends RuntimeException { - - /** - * 自定义异常枚举类 - */ - private ResultCode resultCode; - - /** - * 错误码 - */ - private int code; - - /** - * 错误信息 - */ - private String errorMsg; - - - public ServiceException() { - super(); - } - - public ServiceException(ResultCode resultCode) { - super("{code:" + resultCode.getStatusCode() + ",errorMsg:" + resultCode.getMessage() + "}"); - this.resultCode = resultCode; - this.code = resultCode.getStatusCode(); - this.errorMsg = resultCode.getMessage(); - } - - public ServiceException(int code, String errorMsg) { - super("{code:" + code + ",errorMsg:" + errorMsg + "}"); - this.code = code; - this.errorMsg = errorMsg; - } - - public ResultCode getErrorEnum() { - return resultCode; - } - - public String getErrorMsg() { - return errorMsg; - } - - public void setErrorMsg(String errorMsg) { - this.errorMsg = errorMsg; - } - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } -} diff --git a/src/main/java/com/pms/ocp/common/utils/MenuTree.java b/src/main/java/com/pms/ocp/common/utils/MenuTree.java deleted file mode 100644 index 420ca6968566bff02a1cb0364c9f9a579b2f0946..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/common/utils/MenuTree.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.pms.ocp.common.utils; - -import com.pms.ocp.model.vo.Menu; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author guofanfan - * 树形 - */ -public class MenuTree { - private List menuList = new ArrayList(); - public MenuTree(List menuList) { - this.menuList=menuList; - } - - //建立树形结构 - public List builTree(){ - List treeMenus =new ArrayList(); - for(Menu menuNode : getRootNode()) { - menuNode=buildChilTree(menuNode); - treeMenus.add(menuNode); - } - return treeMenus; - } - - //递归，建立子树形结构 - private Menu buildChilTree(Menu pNode){ - List chilMenus =new ArrayList(); - for(Menu menuNode : menuList) { - if(menuNode.getParentId().equals(pNode.getId())) { - chilMenus.add(buildChilTree(menuNode)); - } - } - pNode.setChildren(chilMenus); - return pNode; - } - - //获取根节点 - private List getRootNode() { - List rootMenuLists =new ArrayList(); - for(Menu menuNode : menuList) { - if("0".equals(menuNode.getParentId())) { - rootMenuLists.add(menuNode); - } - } - return rootMenuLists; - } -} \ No newline at end of file diff --git a/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java b/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java deleted file mode 100644 index 6158f5b1fa6eb19eafe0a0a8a8993eb205f75d9c..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java +++ /dev/null @@ -1,224 +0,0 @@ -package com.pms.ocp.controller; - -import com.github.pagehelper.PageInfo; -import com.pms.ocp.common.utils.ExcelUtils; -import com.pms.ocp.common.utils.FileExport; -import com.pms.ocp.common.utils.FileUtil; -import com.pms.ocp.model.dto.ApiBaseDto; -import com.pms.ocp.model.entity.OcpApiBase; -import com.pms.ocp.model.entity.OcpApiGroup; -import com.pms.ocp.model.vo.OcpApiBaseVo; -import com.pms.ocp.model.vo.ResponseVO; - -import com.pms.ocp.service.ApiBasicManagementService; -import com.pms.ocp.service.ApiDetailsService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.sql.Timestamp; -import java.time.LocalDate; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.stream.Collectors; - -/** - * @author guofanfan - */ -@Slf4j -@RequestMapping("/api/basic") -@RestController -@Api(tags = "服务库服务基础管理接口") -public class ApiBasicManagementController { - @Autowired - private ApiDetailsService apiDetailsService; - @Autowired - private ApiBasicManagementService apiBasicManagementService; - - @ApiOperation("条件查询") - @GetMapping("/queryOcpApiBaseDto") - public ResponseVO> queryOcpApiBaseDto(@RequestParam(required = false) String apiCode, - @RequestParam(required = false) String keyword, - @RequestParam(required = false) String apiUnits, - @RequestParam(required = false) Timestamp startTime, - @RequestParam(required = false) Timestamp endTime, - @RequestParam(required = false) Integer pageSize, - @RequestParam(required = false) Integer pageNum - ) { - List list = apiBasicManagementService.queryOcpApiBaseDto(apiCode, keyword, apiUnits, startTime, endTime, pageSize - , pageNum); - return ResponseVO.ok(list); - } - - @ApiOperation("导入功能") - @PostMapping("/import") - public ResponseVO ApiImport(@RequestParam(required = false) MultipartFile file, - HttpServletRequest request) throws Exception { - if (file == null) { - return ResponseVO.ok("导入数据不能为空"); - } - System.out.println(file);//用来检查前端是否把文件传过来 - //解析excel， - List personList = FileUtil.importExcel(file, 0, 1, OcpApiBaseVo.class); - System.out.println("导入数据一共【" + personList.size() + "】行"); - apiBasicManagementService.apiImport(personList); - return ResponseVO.ok(); - } - - @ApiOperation("导出功能") - @GetMapping("/export") - public ResponseVO ApiExport(HttpServletResponse response, - @RequestParam(required = false) String apiCodes, - @RequestParam(required = false) String excelFileName) throws Exception { - if (StringUtils.isEmpty(apiCodes)) { - return ResponseVO.ok("请选择你要导出的数据"); - } - List ocpApiBaseVoList = apiBasicManagementService.selectApiExport(apiCodes); - - if (StringUtils.isEmpty(excelFileName)) { - excelFileName = "服务列表-"; - } - - //导出excel - ExcelUtils.exportExcel(response, excelFileName + LocalDate.now(), ocpApiBaseVoList, OcpApiBaseVo.class); - - return ResponseVO.ok(); - } - - // @ApiOperation("下载模板") -//// @GetMapping("/download") -// @GetMapping(value = "/download", produces = "text/plain;charset=UTF-8") -// public void ApiDownload(HttpServletResponse response) throws IOException { -// String filePate = getClass().getResource("/template/233.xls").getPath(); -// InputStream bis = new BufferedInputStream(new FileInputStream(new File(filePate))); -// //假如以中文名下载的话,设置下载文件名称 -// String filename = "导入模板.xls"; -// //转码,免得文件中文名中文乱码 -// filename = URLEncoder.encode(filename, "UTF-8"); -// //设置文件下载头 -// response.addHeader("Content-Disposition", "attachment;filename=" + filename); -//// response.setHeader("Content-Length",bis.available()+""); -// //1.设置文件ContentType类型,这样设置.会自动判断下载文件类型 -// response.setContentType("multipart/form-data"); -// response.setCharacterEncoding("UTF-8"); -//// response.setContentType("application/x-download"); -// BufferedOutputStream out = new BufferedOutputStream(response.getOutputStream()); -// int len = 0; -// byte[] bytes = new byte[65536]; -//// bytes=bytes.toString().getBytes("GBK"); -// while ((len = bis.read(bytes)) != -1) { -// out.write(bytes,0,len); -// out.flush(); -// } -// out.close(); -// -// } -//@GetMapping("/downloadExcel") -//public void downloadExcel(HttpServletResponse response,HttpServletRequest request){ -// try { -// String filename="233.xls"; -// String encoding = "UTF-8"; -// /** 获取浏览器相关的信息 */ -// String userAgent = request.getHeader("user-agent"); -// /** 判断是否为msie浏览器 */ -// if (userAgent.toLowerCase().indexOf("msie") != -1){ -// encoding = "gbk"; -// } -// response.setHeader("Content-disposition", "attachment;filename=" + filename); -// response.setContentType("application/vnd.ms-excel;charset=UTF-8"); -// String filePath = getClass().getResource("/template/" + filename).getPath(); -// FileInputStream input = new FileInputStream(filePath); -// OutputStream outputStream = response.getOutputStream(); -// byte[] b = new byte[2048]; -// int len; -// while ((len=input.read(b))!=-1){ -// outputStream.write(b,0,len); -// } -// response.setHeader("Content-Length",String.valueOf(input.getChannel().size())); -// input.close(); -// }catch (Exception ex){ -// log.error("xx:",ex); -// } -//} - - - @ApiOperation("下载模块") - @GetMapping("/downloadExcel") - public void downloadExcel(HttpServletResponse response, HttpServletRequest request) { - String[] excelHeader = {"序号", "服务编码", "服务中文名称", "所属集群", "所属命名空间", "接口URL", "状态", "注册时间", "建设单位"}; - List list = new ArrayList<>(); - FileExport.exportExcel(excelHeader, list, "XXX模板", response, request); - } - - @ApiOperation("服务注册") - @PostMapping("/add") - public ResponseVO addOcpApiBase(@RequestBody OcpApiBase ocpApiBase) { - apiBasicManagementService.addOcpApiBase(ocpApiBase); - return ResponseVO.ok(); - } - - @ApiOperation("服务订阅") - @GetMapping("/login") - public ResponseVO ApiLogin(@RequestParam(required = false) String apiPromotion, - @RequestParam(required = false) String apiCodes) { - if (StringUtils.isEmpty(apiPromotion)) { - return ResponseVO.error("不能为空"); - } else if (apiPromotion.equals("0")) { - return ResponseVO.error("统招"); - } else { - apiBasicManagementService.apiLogin(apiCodes); - return ResponseVO.ok(); - } - - } - - @ApiOperation("服务发布") - @GetMapping("/issue") - public ResponseVO ApiIssue(@RequestParam(required = false) String apiPromotion, - @RequestParam(required = false) String apiCodes) { - if (StringUtils.isEmpty(apiPromotion)) { - return ResponseVO.error("不能为空"); - } else if (apiPromotion.equals("0")) { - return ResponseVO.error("统招"); - } else { - return apiBasicManagementService.apiIssue(apiCodes); - - } - - } - - @ApiOperation("服务列表") - @GetMapping("/apiListQuery") - public ResponseVO> apiListQuery(HttpServletRequest request, ApiBaseDto ApiBaseReq) { - - return apiBasicManagementService.getBaseByGroupCode(ApiBaseReq); - } - /* @ApiOperation("服务树一级") - @GetMapping("/apiBaseTree") - public ResponseVO> apiBaseTree(String apiGroupCompanyCode, Integer apiGroupPromotionType) { - List apiTreeGroupDtos = apiBasicManagementService.apiBaseTreeOther(apiGroupCompanyCode,null,apiGroupPromotionType); - return ResponseVO.ok(apiTreeGroupDtos); - }*/ - - @ApiOperation("服务分类层级") - @GetMapping("/apiBaseTreeOther") - public ResponseVO> apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupCode, Integer apiGroupPromotionType) { - List apiTreeGroupDtos = apiBasicManagementService.apiBaseTreeOther(apiGroupCompanyCode, apiGroupCode, apiGroupPromotionType); - return ResponseVO.ok(apiTreeGroupDtos); - } - - @ApiOperation("服务树列表") - @GetMapping("/apiBaseTreeList") - public ResponseVO> apiBaseTreeList(String apiGroupCompanyCode, String apiGroupCode) { - List apiBaseList = apiBasicManagementService.apiBaseTreeApiList(apiGroupCompanyCode, apiGroupCode); - return ResponseVO.ok(apiBaseList); - } - -} diff --git a/src/main/java/com/pms/ocp/controller/ApiDetailsController.java b/src/main/java/com/pms/ocp/controller/ApiDetailsController.java deleted file mode 100644 index 1f68fb0eab24167718b98100d888b0a2898a561a..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/controller/ApiDetailsController.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.pms.ocp.controller; - - -import com.pms.ocp.model.dto.ApiBaseDto; -import com.pms.ocp.model.entity.OcpApiBase; -import com.pms.ocp.model.vo.OcpApiBaseVo; -import com.pms.ocp.model.vo.ResponseVO; -import com.pms.ocp.service.ApiDetailsService; -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.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -@Slf4j -@RequestMapping("/api-base/v1") -@RestController -@Api(tags = "服务库服务详情接口") -public class ApiDetailsController { - @Autowired - private ApiDetailsService apiDetailsService; - - @ApiOperation("服务库服务详情-查询") - @GetMapping("/query") - public ResponseVO getApiDetails(String apiCode) { - return apiDetailsService.getApiDetails(apiCode); - } - -} diff --git a/src/main/java/com/pms/ocp/controller/AppArrangeController.java b/src/main/java/com/pms/ocp/controller/AppArrangeController.java deleted file mode 100644 index 5a301434293f7741820988abb37a188e1ffe856f..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/controller/AppArrangeController.java +++ /dev/null @@ -1,40 +0,0 @@ -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 - * @Dscription:应用分类管理接口 - * * @atuthor: pei-chenxi - * * @DateTime: 2022/3/9 14:15e - */ -@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("您输入的分类编码重复，请重新输入"); - } -} diff --git a/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java b/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java deleted file mode 100644 index c309b06e3f3b654bbb1316825ab2733f37ee77ba..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.pms.ocp.controller; - - -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.OcpApiGroupDtos; -import com.pms.ocp.model.dto.PageGroupDto; -import com.pms.ocp.model.entity.OcpApiGroup; -import com.pms.ocp.model.vo.ResponseVO; -import com.pms.ocp.service.OcpApiTreeService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * @author zhaochengming - */ - - -@Slf4j -@RequestMapping("/api-group/v1") -@RestController -@Api(tags = "服务树管理接口") -public class OcpApiTreeController { - - - @Autowired - private OcpApiTreeService service; - - /** - * 服务树分类 - * @return - */ - @GetMapping("/getTree") - @ApiOperation("服务树分类") - public ResponseVO< List> getTree(OcpApiGroup ocpApiGroup){ - List byGroup = service.getByGroup(ocpApiGroup.getApiGroupPromotionType(), ocpApiGroup.getApiGroupCode()); - return ResponseVO.ok(byGroup); - } - - - @PostMapping("/instertree") - @ApiOperation("服务树分类--新增") - public ResponseVO inseter(@RequestBody OcpApiGroup ocpApiGroup){ - OcpApiGroup ocpApiGroup1 = service.insertTree(ocpApiGroup); - return ResponseVO.ok(ocpApiGroup1); - - } - - @GetMapping("/getone") - @ApiOperation("服务树分类--分级数据") - public ResponseVO> getOne(PageGroupDto pageGroupDto){ - Page onePages = service.getOnePages(pageGroupDto); - return ResponseVO.ok(onePages); - } - - @PostMapping("/updatatree") - @ApiOperation("服务树分类--修改") - public ResponseVO updataTree(@RequestBody OcpApiGroup ocpApiGroup){ - boolean flag = service.updataOcpTree(ocpApiGroup); - if (flag){ - return ResponseVO.ok(); - } - return ResponseVO.error("您输入的服务编码重复，请重新输入"); - } - @PostMapping("/deletetree") - @ApiOperation("服务树分类--删除") - public ResponseVO deleteTree(@RequestBody OcpApiGroup ocpApiGroup){ - boolean tree = service.deleteOcpTree(ocpApiGroup); - if (tree){ - return ResponseVO.ok("删除成功！"); - }else { - return ResponseVO.error("请先删除下级目录"); - } - - } - - -} diff --git a/src/main/java/com/pms/ocp/controller/OcpTenantController.java b/src/main/java/com/pms/ocp/controller/OcpTenantController.java deleted file mode 100644 index 5ffedba1b6d9e8743edba5e48ea171f230454b41..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/controller/OcpTenantController.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.pms.ocp.controller; - - -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.pms.ocp.model.dto.*; -import com.pms.ocp.model.entity.OcpApiGroup; -import com.pms.ocp.model.entity.OcpTenantGroup; -import com.pms.ocp.model.vo.ResponseVO; -import com.pms.ocp.service.TenantService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiModelProperty; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.apache.ibatis.annotations.Param; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.List; -import java.util.Set; - - -/** - * @author zhaochengming - */ -@Slf4j -@RequestMapping("/api-tenant/v1") -@RestController -@Api(tags = "应用树管理接口") -public class OcpTenantController { - - - @Autowired - private TenantService tenantService; - - /** - * 应用树分类 - * @return - */ - @GetMapping("/tenantOnetree") - @ApiModelProperty("应用树分类") - private List getTenantTree(OcpTenantGroup ocpTenantGroup) { - List tree= tenantService.getTree(ocpTenantGroup.getTenantGroupCompanyCode(),ocpTenantGroup.getTenantGroupCode(),ocpTenantGroup.getLevel()); - return tree; - } - @GetMapping("/tenantselect") - @ApiModelProperty("应用树分类--查询") - private ResponseVO> getselect(String tenantGroupCode,String tenantGroupCompanyCode,int currentPage,int pageSize,String keyword,String lev ){ - Page tree= tenantService.getselects(tenantGroupCode,tenantGroupCompanyCode,currentPage,pageSize,keyword,lev); - return ResponseVO.ok(tree); - } - - @PostMapping("/tenantinster") - @ApiModelProperty("新增应用") - public ResponseVO tenantInster(@RequestBody TenanBaseDto TenanBaseDto){ - OcpTenantGroup tenanInster = tenantService.getTenanInster(TenanBaseDto); - if ("1".equals(tenanInster.getNum())){ - return ResponseVO.error("1"); - } - return ResponseVO.ok(tenanInster); - - } - - @PostMapping("/tenantupdata") - @ApiModelProperty("修改应用") - public ResponseVO tenantUpdata(@RequestBody OcpTenantGroup ocpTenantGroup){ - boolean falg = tenantService.getTenantUpdata(ocpTenantGroup); - if (falg){ - return ResponseVO.ok("修改成功！"); - } - return ResponseVO.error("应用code已经存在！"); - } - @PostMapping("/tenantdelete") - @ApiModelProperty("删除服务") - public ResponseVO tenantDelete(@RequestBody OcpTenantGroup ocpTenantGroup){ - boolean falg = tenantService.gettenantDelete(ocpTenantGroup); - if (falg){ - return ResponseVO.ok("删除成功！"); - } - return ResponseVO.error("应用下存在服务，请先删除下级应该！"); - } - - - - - - - -} diff --git a/src/main/java/com/pms/ocp/controller/PmsApiDetailsController.java b/src/main/java/com/pms/ocp/controller/PmsApiDetailsController.java deleted file mode 100644 index 130f1edf4700974b5f46815cf4b009d9bcc77afb..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/controller/PmsApiDetailsController.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.pms.ocp.controller; - - -import com.pms.ocp.model.entity.*; -import com.pms.ocp.model.vo.ResponseVO; -import com.pms.ocp.service.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.util.List; - - -@Slf4j -@RequestMapping("/api") -@RestController -@Api(tags = "服务接口") -public class PmsApiDetailsController { - - @Autowired - private PmsApiSubsService pmsApiSubsService; - - @Autowired - private PmsApiAuditService pmsApiAuditService; - - @Autowired - private PmsApiTenantRelService pmsApiTenantRelService; - - @Autowired - private PmsApiModelRelService pmsApiModelRelService; - - - @ApiOperation("服务订阅记录-查询") - @PostMapping("/getocpapisublist") - public ResponseVO> getOcpApiSubsList(PmsApiSubs pmsApiSubs) { - return pmsApiSubsService.getPmsApiSubsList(pmsApiSubs); - } - - @ApiOperation("服务大事记-查询") - @PostMapping("/getocpapiauditlist") - public ResponseVO> getPmsApiAuditList(PmsApiAudit pmsApiAudit) { - return pmsApiAuditService.getOcpApiAuditList(pmsApiAudit); - } - -// @ApiOperation("服务大事记-查询详情") -// @PostMapping("/getocpapidetails") -// public ResponseVO> getOcpApiDetails(@RequestBody OcpApiAudit ocpApiAudit){ -// return ocpApiAuditService.sById(ocpApiAudit); -// } - - @ApiOperation("服务大事记-查询详情-变更内容") - @PostMapping("/getocpapi") - public ResponseVO> getOcpApi(@RequestBody PmsApiAudit pmsApiAudit){ - return pmsApiAuditService.OaaById(pmsApiAudit); - } - - @ApiOperation("服务大事记-历史版本") - @PostMapping("/versionid") - public ResponseVO> versionId(@RequestBody PmsApiAudit pmsApiAudit){ - return pmsApiAuditService.versionId(pmsApiAudit); - } - - @ApiOperation("服务与应用拓扑图-查询") - @PostMapping("/getoatrlist") - public ResponseVO> getOatrList(@RequestBody PmsApiTenantRel pmsApiTenantRel) { - return pmsApiTenantRelService.getOatrList(pmsApiTenantRel); - } - - @ApiOperation("服务与模型拓扑图-查询") - @PostMapping("/getoamrlist") - public ResponseVO> getOamrList(@RequestBody PmsApiModelRel pmsApiModelRel) { - return pmsApiModelRelService.getOamrList(pmsApiModelRel); - } - - @ApiOperation("服务大事记-导出") - @PostMapping("/export") - public void exportExcel(@RequestBody PmsApiAudit pmsApiAudit, HttpServletRequest request, HttpServletResponse response) { - pmsApiAuditService.exportExcel(pmsApiAudit,request,response); - } - - - -} diff --git a/src/main/java/com/pms/ocp/controller/PmsTenantDetailsController.java b/src/main/java/com/pms/ocp/controller/PmsTenantDetailsController.java deleted file mode 100644 index c2c60b53f9a1bd930aba3c3f3b2e5e5598e758f6..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/controller/PmsTenantDetailsController.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.pms.ocp.controller; - -import com.pms.ocp.model.entity.*; -import com.pms.ocp.model.vo.ResponseVO; -import com.pms.ocp.service.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.xml.transform.Result; -import java.util.List; - -@Slf4j -@RequestMapping("/tenant") -@RestController -@Api(tags = "应用接口") -public class PmsTenantDetailsController { - - @Autowired - private PmsTenantBaseService pmsTenantBaseService; - - @Autowired - private PmsTenantAuditService pmsTenantAuditService; - - @Autowired - private PmsTenantSubsService pmsTenantSubsService; - - @Autowired - private PmsApiTenantRelService pmsApiTenantRelService; - - - @ApiOperation("应用基础信息-查询") - @PostMapping("/getotbList") - public ResponseVO> getOtbList(@RequestBody PmsTenantBase pmsTenantBase){ - return pmsTenantBaseService.getOtbList(pmsTenantBase); - } - - @ApiOperation("应用大事记-查询") - @PostMapping("/getotaList") - public ResponseVO> getOtaList(PmsTenantAudit pmsTenantAudit) { - return pmsTenantAuditService.getOtaList(pmsTenantAudit); - } - - - @ApiOperation("应用订阅记录-查询") - @PostMapping("/getOcpTenantList") - public ResponseVO> getOcpTenantList(PmsTenantSubs pmsTenantSubs) { - return pmsTenantSubsService.getOcpTenantList(pmsTenantSubs); - } - - @ApiOperation("应用与服务拓扑图-查询") - @PostMapping("/getOcpTenantApiList") - public ResponseVO> getOcpTenantApiList(@RequestBody PmsApiTenantRel pmsApiTenantRel) { - return pmsApiTenantRelService.getTenantApiList(pmsApiTenantRel); - } - - @ApiOperation("应用大事记-导出") - @PostMapping("/export") - public void exportExcel(@RequestBody PmsTenantAudit pmsTenantAudit, HttpServletRequest request, HttpServletResponse response) { - pmsTenantAuditService.exportExcel(pmsTenantAudit,request,response); - } - - @ApiOperation("应用大事记-查询详情-变更内容") - @PostMapping("/getocpTent") - public ResponseVO> getOcpTenant(@RequestBody PmsTenantAudit pmsTenantAudit){ - return pmsTenantAuditService.OtaById(pmsTenantAudit); - } - - @ApiOperation("应用大事记-查询详情-历史版本") - @PostMapping("/versionId") - public ResponseVO> versionId(@RequestBody PmsTenantAudit pmsTenantAudit){ - return pmsTenantAuditService.versionId(pmsTenantAudit); - } - - -} diff --git a/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java b/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java deleted file mode 100644 index f7e5dadc95d81e49c949b7265c642ed9f910333e..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java +++ /dev/null @@ -1,118 +0,0 @@ -package com.pms.ocp.controller; - - -import com.github.pagehelper.PageInfo; -import com.pms.ocp.model.dto.*; - -import com.pms.ocp.model.entity.OcpTenantBase; -import com.pms.ocp.model.entity.OcpTenantGroup; -import com.pms.ocp.model.vo.ResponseVO; -import com.pms.ocp.service.TenantBasicManagementService; -import com.pms.ocp.service.TenantService; - -import io.swagger.annotations.Api; - -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletRequest; -import java.sql.Timestamp; -import java.util.List; -/** - * @author guofanfan - */ -@Slf4j -@RequestMapping("/tenant/basic") -@RestController -@Api(tags = "应用库服务基础管理接口") -public class TenantBasicManagementController { - @Autowired - private TenantBasicManagementService tenantBasicManagementService; - @Autowired - private TenantService tenantService; - - @ApiOperation("条件查询") - @GetMapping("/queryOcpTenantBaseDto") - public ResponseVO> queryOcpTenantBaseDto( - @RequestParam(required = false) String tenantGroupCode, - @RequestParam(required = false) String tenantCode, - @RequestParam(required = false) String keyword, - @RequestParam(required = false) String tenantUnit, - @RequestParam(required = false) Timestamp startTime, - @RequestParam(required = false) Timestamp endTime, - @RequestParam(required = false) Integer pageSize, - @RequestParam(required = false) Integer pageNum - ) { - - List ocpTenantBaseDto = tenantBasicManagementService.queryOcpTenantBaseDto(tenantGroupCode, tenantCode, keyword, tenantUnit, startTime, endTime, pageSize, pageNum); - return ResponseVO.ok(ocpTenantBaseDto); - } - - @ApiOperation("应用发布") - @GetMapping("/issue") - public ResponseVO TenantIssue( - @RequestParam(required = false) String tenantCodes) { - - return tenantBasicManagementService.tenantIssue(tenantCodes); - } - - @ApiOperation("应用订阅") - @GetMapping("/login") - public ResponseVO TenantLogin( - @RequestParam(required = false) String tenantCodes, - @RequestParam(required = false) String companyCode) { - - return tenantBasicManagementService.tenantLogin(tenantCodes, companyCode); - - } - - @ApiOperation("应用下线") - @GetMapping("/cancel") - public ResponseVO TenantCancel( - @RequestParam(required = false) String tenantCodes) { - return tenantBasicManagementService.tenantCancel(tenantCodes); - - } - - @ApiOperation("应用注册") - @PostMapping("/apply/register") - public ResponseVO TenantRegister(@RequestBody(required = false) OcpTenantBaseDto ocpTenantBaseDto) { - return tenantBasicManagementService.applyRegister(ocpTenantBaseDto); - - } - - @ApiOperation("应用树层级") - @GetMapping("/tenantBaseTreeOther") - public ResponseVO> tenantBaseTreeOther(@RequestParam(required = false) String tenantGroupCode, @RequestParam(required = false) String tenantGroupCompanyCode - ) { - List ocpApiGroups = tenantBasicManagementService.tenantBaseTreeOther(tenantGroupCode, tenantGroupCompanyCode); - return ResponseVO.ok(ocpApiGroups); - } - - @ApiOperation("应用树底层") - @GetMapping("/tenantBaseTree") - public ResponseVO> tenantBaseTree(@RequestParam(required = false) String tenantGroupCode, - @RequestParam(required = false) String tenantGroupCompanyCode) { - if (StringUtils.isEmpty(tenantGroupCode)) { - return ResponseVO.error("code为空"); - } - List ocpTenantBases = tenantBasicManagementService.tenantBaseTree(tenantGroupCode, tenantGroupCompanyCode); - return ResponseVO.ok(ocpTenantBases); - } - - @ApiOperation("应用列表") - @GetMapping("/tenantListQuery") - public ResponseVO> tenantListQuery(HttpServletRequest request, TenantDto tenantDto) { - return tenantBasicManagementService.getBaseByGroupCode(tenantDto); - } - - @ApiOperation("注册查询信息") - @GetMapping("/select/register") - public ResponseVO selectRegister(@RequestParam(required = false) String tenantGroupCode, @RequestParam(required = false) String tenantGroupCompanyCode) { - OcpTenantGroup ocpTenantGroup = tenantBasicManagementService.selectRegister(tenantGroupCode, tenantGroupCompanyCode); - return ResponseVO.ok(ocpTenantGroup); - } -} diff --git a/src/main/java/com/pms/ocp/mapper/ApiBasicManagementMapper.java b/src/main/java/com/pms/ocp/mapper/ApiBasicManagementMapper.java deleted file mode 100644 index 20f067d1cdf4fca66b2051026113b70d50ff3dcb..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/mapper/ApiBasicManagementMapper.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.pms.ocp.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pms.ocp.model.dto.OcpApiBaseDto; -import com.pms.ocp.model.entity.OcpApiBase; -import com.pms.ocp.model.vo.OcpApiBaseVo; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.sql.Timestamp; -import java.util.List; -/** - * @author guofanfan - */ -@Mapper -public interface ApiBasicManagementMapper extends BaseMapper { - List selectApiExport(List list); - - List queryOcpApiBaseDto(@Param("keyword") String keyword,@Param("apiUnit") String apiUnit, @Param("startTime") Timestamp startTime, @Param("endTime") Timestamp endTime, @Param("apiCode") String apiCode, @Param("pageSize") int pageSize, @Param("pageNum") int pageNum); -} diff --git a/src/main/java/com/pms/ocp/mapper/ApiDetailsMapper.java b/src/main/java/com/pms/ocp/mapper/ApiDetailsMapper.java deleted file mode 100644 index d335630288d3724a9d9f6b2bab7f57ce07dc481f..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/mapper/ApiDetailsMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.pms.ocp.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pms.ocp.model.entity.OcpApiBase; -import com.pms.ocp.model.vo.OcpApiBaseVo; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -@Mapper -public interface ApiDetailsMapper extends BaseMapper { - - OcpApiBaseVo selectByCode(@Param("apiCode") String apiCode); -} diff --git a/src/main/java/com/pms/ocp/mapper/AppArrangeMapper.java b/src/main/java/com/pms/ocp/mapper/AppArrangeMapper.java deleted file mode 100644 index 21b32e67a03723cf9984a2bd2b096a572ae2f478..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/mapper/AppArrangeMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -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 { - -} diff --git a/src/main/java/com/pms/ocp/mapper/OcpApiAuditMapper.java b/src/main/java/com/pms/ocp/mapper/OcpApiAuditMapper.java deleted file mode 100644 index c52a073429f92ea84df4ad75d99367ce93aa53bc..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/mapper/OcpApiAuditMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.pms.ocp.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pms.ocp.model.entity.OcpApiAudit; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - - -@Mapper -public interface OcpApiAuditMapper extends BaseMapper { - - - -} diff --git a/src/main/java/com/pms/ocp/mapper/OcpApiBaseMapper.java b/src/main/java/com/pms/ocp/mapper/OcpApiBaseMapper.java deleted file mode 100644 index 3eda789de85a02bc09c0aebb4a1eaa644c97db0b..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/mapper/OcpApiBaseMapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.pms.ocp.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pms.ocp.model.entity.OcpApiBase; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface OcpApiBaseMapper extends BaseMapper { -} diff --git a/src/main/java/com/pms/ocp/mapper/OcpApiExtentMapper.java b/src/main/java/com/pms/ocp/mapper/OcpApiExtentMapper.java deleted file mode 100644 index d523997546ee544422e2ffca2ac1a821add5268e..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/mapper/OcpApiExtentMapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.pms.ocp.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pms.ocp.model.entity.OcpApiExtent; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface OcpApiExtentMapper extends BaseMapper { -} diff --git a/src/main/java/com/pms/ocp/mapper/OcpApiGroupMapper.java b/src/main/java/com/pms/ocp/mapper/OcpApiGroupMapper.java deleted file mode 100644 index 7b68d58034435ddf8842817a40a7c8c5e1a8b5c1..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/mapper/OcpApiGroupMapper.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.pms.ocp.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pms.ocp.model.dto.ApiBaseDto; -import com.pms.ocp.model.entity.OcpApiBase; -import com.pms.ocp.model.entity.OcpApiGroup; -import com.pms.ocp.model.vo.OcpApiBaseVo; -import com.pms.ocp.model.vo.WholeLinkTreeVo; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -@Mapper -public interface OcpApiGroupMapper extends BaseMapper { - - List selectTreeList(String apiGroupCompanyCode); - - List apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupPcode,Integer apiGroupPromotionType); - - List selectByPcode(String code); - - List selectPageLists(ApiBaseDto apiBaseReq); - -// List queryApiTreeData1(); -} diff --git a/src/main/java/com/pms/ocp/mapper/OcpApiModelRelMapper.java b/src/main/java/com/pms/ocp/mapper/OcpApiModelRelMapper.java deleted file mode 100644 index 87c6803846c76df9d2d47c700c1feebaed345c2b..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/mapper/OcpApiModelRelMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.pms.ocp.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pms.ocp.model.entity.OcpApiModelRel; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -@Mapper -public interface OcpApiModelRelMapper extends BaseMapper { - - - -} diff --git a/src/main/java/com/pms/ocp/mapper/OcpApiSubsMapper.java b/src/main/java/com/pms/ocp/mapper/OcpApiSubsMapper.java deleted file mode 100644 index 8dcf85f35c4bf195e138a1d32ac1a84700efc6b5..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/mapper/OcpApiSubsMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.pms.ocp.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pms.ocp.model.entity.OcpApiSubs; -import com.pms.ocp.model.entity.PmsApiSubs; -import org.apache.ibatis.annotations.Mapper; - - - -@Mapper -public interface OcpApiSubsMapper extends BaseMapper { - -} diff --git a/src/main/java/com/pms/ocp/mapper/OcpApiTenantRelMapper.java b/src/main/java/com/pms/ocp/mapper/OcpApiTenantRelMapper.java deleted file mode 100644 index 59646b1cb6b2b4f31cdf403adf88fa81945f9887..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/mapper/OcpApiTenantRelMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.pms.ocp.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pms.ocp.model.entity.OcpApiTenantRel; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -@Mapper -public interface OcpApiTenantRelMapper extends BaseMapper { - - -} diff --git a/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java b/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java deleted file mode 100644 index 082d54642a9f18840a5e2ce5f53f9b3a16085d76..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.pms.ocp.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -import com.pms.ocp.model.dto.ApiTreeGroupDto; -import com.pms.ocp.model.entity.OcpApiGroup; - -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Select; - -import java.util.List; - - -@Mapper -public interface OcpApiTreeMapper extends BaseMapper { - - /** - * 一级树 - * @return - */ - List selectApiGroups(); - - - /** - * 二级树 - * @param apiGroupPromotionType - * @return - */ - List selectTwoApiGroups(Long apiGroupPromotionType); - - //三级数 - List selectThreeApiGroupsList(Long apiGroupPromotionType, String apiGroupCode); - - - List selectLists(Long apiGroupPromotionType, String apiGroupCode); - -//code重复问题 - List selectGroupCode(); - - //根据code查询整条数据 - OcpApiGroup selectCode(String code); -} diff --git a/src/main/java/com/pms/ocp/mapper/OcpTenantAuditMapper.java b/src/main/java/com/pms/ocp/mapper/OcpTenantAuditMapper.java deleted file mode 100644 index 8a509f45813b677929865d5e8e946037271f1114..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/mapper/OcpTenantAuditMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.pms.ocp.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pms.ocp.model.entity.OcpTenantAudit; - -import java.util.List; - -public interface OcpTenantAuditMapper extends BaseMapper { - -} diff --git a/src/main/java/com/pms/ocp/mapper/OcpTenantBaseMapper.java b/src/main/java/com/pms/ocp/mapper/OcpTenantBaseMapper.java deleted file mode 100644 index 4b01b4ede96c2b74d947f31d50b60b6f57e551a8..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/mapper/OcpTenantBaseMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.pms.ocp.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pms.ocp.model.entity.OcpTenantBase; - -import java.util.List; - -public interface OcpTenantBaseMapper extends BaseMapper { - -} diff --git a/src/main/java/com/pms/ocp/mapper/OcpTenantExtentMapper.java b/src/main/java/com/pms/ocp/mapper/OcpTenantExtentMapper.java deleted file mode 100644 index e2dfbde0c9da4458fd7e07e8f1e3535c2c933b4a..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/mapper/OcpTenantExtentMapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.pms.ocp.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pms.ocp.model.entity.OcpTenantExtent; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface OcpTenantExtentMapper extends BaseMapper{ -} diff --git a/src/main/java/com/pms/ocp/mapper/OcpTenantGroupMapper.java b/src/main/java/com/pms/ocp/mapper/OcpTenantGroupMapper.java deleted file mode 100644 index 70e6d44570f825314ec0bdaf884419863b0ede97..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/mapper/OcpTenantGroupMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.pms.ocp.mapper; - - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pms.ocp.model.dto.GroupDto; -import com.pms.ocp.model.dto.OcpTenantBaseDto; -import com.pms.ocp.model.dto.TenantDto; -import com.pms.ocp.model.entity.OcpTenantGroup; -import com.pms.ocp.model.vo.ResponseVO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -@Mapper -public interface OcpTenantGroupMapper extends BaseMapper { - List tenantBaseTreeOther(@Param("tenantGroupCode") String tenantGroupCode, @Param("tenantGroupCompanyCode") String tenantGroupCompanyCode); - - List selectPageLists(TenantDto tenantDto); - - OcpTenantGroup selectRegister(@Param("tenantGroupCode") String tenantGroupCode, @Param("tenantGroupCompanyCode") String tenantGroupCompanyCode); -} diff --git a/src/main/java/com/pms/ocp/mapper/OcpTenantSubsMapper.java b/src/main/java/com/pms/ocp/mapper/OcpTenantSubsMapper.java deleted file mode 100644 index 1b53d2103699b700e1fb2c91e5b7575d4773f255..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/mapper/OcpTenantSubsMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.pms.ocp.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pms.ocp.model.entity.OcpTenantSubs; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -@Mapper -public interface OcpTenantSubsMapper extends BaseMapper { - -} diff --git a/src/main/java/com/pms/ocp/mapper/PmsApiAuditMapper.java b/src/main/java/com/pms/ocp/mapper/PmsApiAuditMapper.java deleted file mode 100644 index 84c95029b53422b1f49f77a30e77618bfdcfda3a..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/mapper/PmsApiAuditMapper.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.pms.ocp.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pms.ocp.model.entity.OcpApiAudit; -import com.pms.ocp.model.entity.PmsApiAudit; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * @Auther: liukai - * @Date: 2022/3/7 - * @Description:服务大事记接口 - */ -@Mapper -public interface PmsApiAuditMapper extends BaseMapper { - - List OaaById(PmsApiAudit pmsApiAudit); - - List getOcpApiSubsList(PmsApiAudit pmsApiAudit); - - List sById(PmsApiAudit pmsApiAudit); - - List versionId (PmsApiAudit pmsApiAudit); - -} diff --git a/src/main/java/com/pms/ocp/mapper/PmsApiModelRelMapper.java b/src/main/java/com/pms/ocp/mapper/PmsApiModelRelMapper.java deleted file mode 100644 index ecbb915e617a711b51d001124dba9dc9ba65a643..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/mapper/PmsApiModelRelMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.pms.ocp.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pms.ocp.model.entity.PmsApiModelRel; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -@Mapper -public interface PmsApiModelRelMapper extends BaseMapper { - List getOamrList(PmsApiModelRel pmsApiModelRel); - - -} diff --git a/src/main/java/com/pms/ocp/mapper/PmsApiSubsMapper.java b/src/main/java/com/pms/ocp/mapper/PmsApiSubsMapper.java deleted file mode 100644 index 89baaa716be33e5fa55b170e8103d072a9283189..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/mapper/PmsApiSubsMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.pms.ocp.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pms.ocp.model.entity.OcpApiSubs; -import com.pms.ocp.model.entity.PmsApiSubs; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -@Mapper -public interface PmsApiSubsMapper extends BaseMapper { - List getOcpApisList(PmsApiSubs pmsApiSubs); -} diff --git a/src/main/java/com/pms/ocp/mapper/PmsApiTenantRelMapper.java b/src/main/java/com/pms/ocp/mapper/PmsApiTenantRelMapper.java deleted file mode 100644 index 8775ed8821bc58e771d5beef42e8b643f7cf32a2..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/mapper/PmsApiTenantRelMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.pms.ocp.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pms.ocp.model.entity.OcpApiTenantRel; -import com.pms.ocp.model.entity.PmsApiTenantRel; - -import java.util.List; - -public interface PmsApiTenantRelMapper extends BaseMapper { - List getOatrList(PmsApiTenantRel pmsApiTenantRel); - - List getTenantApiList(PmsApiTenantRel pmsApiTenantRel); -} diff --git a/src/main/java/com/pms/ocp/mapper/PmsTenantAuditMapper.java b/src/main/java/com/pms/ocp/mapper/PmsTenantAuditMapper.java deleted file mode 100644 index 6f67263eed24bcad128ec21b923ace8f5fc54f6c..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/mapper/PmsTenantAuditMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.pms.ocp.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pms.ocp.model.entity.OcpTenantAudit; -import com.pms.ocp.model.entity.PmsTenantAudit; - -import java.util.List; - -public interface PmsTenantAuditMapper extends BaseMapper { - List getOtaList(PmsTenantAudit pmsTenantAudit); - - List getOtaListById(PmsTenantAudit pmsTenantAudit); - - List OtaById(PmsTenantAudit pmsTenantAudit); - - List versionId(PmsTenantAudit pmsTenantAudit); -} diff --git a/src/main/java/com/pms/ocp/mapper/PmsTenantBaseMapper.java b/src/main/java/com/pms/ocp/mapper/PmsTenantBaseMapper.java deleted file mode 100644 index 0ada5f225cc1cf3145fac5762b8c6d7508fc8a38..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/mapper/PmsTenantBaseMapper.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.pms.ocp.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pms.ocp.model.entity.PmsTenantBase; -import com.pms.ocp.model.entity.PmsTenantSubs; - -import java.util.List; - -public interface PmsTenantBaseMapper extends BaseMapper { - List getOtbList(PmsTenantBase pmsTenantBase); -} diff --git a/src/main/java/com/pms/ocp/mapper/PmsTenantSubsMapper.java b/src/main/java/com/pms/ocp/mapper/PmsTenantSubsMapper.java deleted file mode 100644 index daab53915c87b771fab557451f213d6983f2f9e3..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/mapper/PmsTenantSubsMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.pms.ocp.mapper; - - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pms.ocp.model.entity.PmsTenantSubs; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -@Mapper -public interface PmsTenantSubsMapper extends BaseMapper { - List getOcpTenantList(PmsTenantSubs pmsTenantSubs); -} diff --git a/src/main/java/com/pms/ocp/mapper/TenantBasicManagementMapper.java b/src/main/java/com/pms/ocp/mapper/TenantBasicManagementMapper.java deleted file mode 100644 index 7bc60599fa8fcf18dfc39de24d1cb75bdeaa8509..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/mapper/TenantBasicManagementMapper.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.pms.ocp.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pms.ocp.model.dto.GroupDto; -import com.pms.ocp.model.dto.OcpTenantBaseDto; -import com.pms.ocp.model.entity.OcpTenantBase; -import com.pms.ocp.model.vo.CompanyVo; -import com.pms.ocp.model.vo.TenantGroupVo; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.sql.Timestamp; -import java.util.List; - -@Mapper -public interface TenantBasicManagementMapper extends BaseMapper { - - -// List queryOcpTenantBaseDto(@Param("keyword") String keyword,@Param("tenantGroupCode") String tenantGroupCode, @Param("tenantUnit") String tenantUnit, @Param("startTime") Timestamp startTime, @Param("endTime") Timestamp endTime, @Param("tenantCode") String tenantCode, @Param("pageSize") Integer pageSize, @Param("pageNum") Integer pageNum); - - List select(String tenantGroupCode); - - List queryOcpTenantBaseDto(String tenantGroupCode, String keyword, String tenantUnit, Timestamp startTime, Timestamp endTime, String tenantCode, Integer pageSize, Integer pageNum); - - -} diff --git a/src/main/java/com/pms/ocp/mapper/TenantMapper.java b/src/main/java/com/pms/ocp/mapper/TenantMapper.java deleted file mode 100644 index 4fe78eb686c326e737e9ed7d4fb9b46a56982589..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/mapper/TenantMapper.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.pms.ocp.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pms.ocp.model.dto.TenanBaseDto; -import com.pms.ocp.model.entity.OcpTenantGroup; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.springframework.web.bind.annotation.RequestParam; - -import java.util.List; - -@Mapper -public interface TenantMapper extends BaseMapper { - - - /** - *应用一级查询顶级服务 - * @param - * @return - */ - List oneTenantGroup(); - - - //二级目录树 - List twoTenantGroups(String tenantGroupCode,String tenantGroupCompanyCode); - - List selectTenantGroups(String tenantGroupCode,String tenantGroupCompanyCode); - - List selectTenantGroup(String tenantGroupCompanyCode); - - - List selectGroups(String tenantGroupCompanyCode); - - - //服务树--查询 - List selectTenantGroupsList(String tenantGroupCode,String tenantGroupCompanyCode); - - - List selectGroupsList(String tenantGroupCompanyCode,String tenantGroupName); - - /** - * 根据code查询这条数据 - */ - OcpTenantGroup selectGroupCode(String tenantGroupCode); - -} diff --git a/src/main/java/com/pms/ocp/model/CommonCode.java b/src/main/java/com/pms/ocp/model/CommonCode.java deleted file mode 100644 index 2ec9da77c97a1d5bcf0c8ddc486f6750e83aa506..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/model/CommonCode.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.pms.ocp.model; - -import lombok.ToString; - -@ToString -public enum CommonCode implements ResultCode { - - SUCCESS(true,0,"操作成功!"), - UNAUTHENTICATED(false,10001,"此操作需要登陆系统!"), - UNAUTHORISE(false,10002,"权限不足，无权操作!"), - INVALID_PARAM(false,10003,"非法参数!"), - PAGE_PARAMS_MISS(false,10004, "分页参数缺失!"), - RECORD_IS_NULL(false,10005, "数据不存在!"), - PARAMS_MISS(false,10007, "参数缺失!"), - FAIL(false,11111,"操作失败!"), - CHECK_SUCCESS(true,10006,"校验成功!"), - SERVER_ERROR(false,99999,"抱歉，系统繁忙，请稍后重试!"), - // private static ImmutableMap codes; - EXTIST(false,10007,"账号已存在!"); - - //操作是否成功 - boolean success; - - //操作代码 - int code; - - //提示信息 - String message; - - CommonCode(boolean success, int code, String message){ - this.success = success; - this.code = code; - this.message = message; - } - - @Override - public boolean success() { - return success; - } - - @Override - public int code() { - return code; - } - - @Override - public String message() { - return message; - } - -} diff --git a/src/main/java/com/pms/ocp/model/QueryResponseResult.java b/src/main/java/com/pms/ocp/model/QueryResponseResult.java deleted file mode 100644 index 3839d3a2a1ffb0d9d72b4707c2771afc328f2907..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/model/QueryResponseResult.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.pms.ocp.model; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import lombok.Data; -import lombok.ToString; - -@Data -@ToString -public class QueryResponseResult extends ResponseResult{ - - IPage data; - - public QueryResponseResult(ResultCode resultCode, IPage iPage){ - super(resultCode); - this.data = iPage; - } -} diff --git a/src/main/java/com/pms/ocp/model/Response.java b/src/main/java/com/pms/ocp/model/Response.java deleted file mode 100644 index cb6cdd98f832c9a794a25c9fe0750a83ef81e147..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/model/Response.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.pms.ocp.model; - -public interface Response { - - public static final boolean SUCCESS = true; - public static final int SUCCESS_CODE = 0; - -} diff --git a/src/main/java/com/pms/ocp/model/ResponseResult.java b/src/main/java/com/pms/ocp/model/ResponseResult.java deleted file mode 100644 index c7e7df6f2064a2c6637dcde5d27bcdc98d99c9f8..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/model/ResponseResult.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.pms.ocp.model; - -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.ToString; - -@Data -@ToString -@NoArgsConstructor -public class ResponseResult implements Response { - - //操作是否成功 - boolean success = SUCCESS; - - //操作代码 - int code = SUCCESS_CODE; - - //提示信息 - String message; - - public ResponseResult(ResultCode resultCode){ - this.success = resultCode.success(); - this.code = resultCode.code(); - this.message = resultCode.message(); - } - - public ResponseResult(boolean success, int code, String msg){ - this.success = success; - this.code = code; - this.message = msg; - } - - public static ResponseResult SUCCESS(){ - return new ResponseResult(CommonCode.SUCCESS); - } - - public static ResponseResult FAIL(){ - return new ResponseResult(CommonCode.FAIL); - } - public static ResponseResult EXTIST(){ - return new ResponseResult(CommonCode.EXTIST); - } - -} diff --git a/src/main/java/com/pms/ocp/model/ResultCode.java b/src/main/java/com/pms/ocp/model/ResultCode.java deleted file mode 100644 index bf0c9f35098de1d4f04dab8dbafcccd25b048ce1..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/model/ResultCode.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.pms.ocp.model; - -public interface ResultCode { - - //操作是否成功,true为成功，false操作失败 - boolean success(); - - //操作代码 - int code(); - - //提示信息 - String message(); - -} diff --git a/src/main/java/com/pms/ocp/model/dto/ApiBaseDto.java b/src/main/java/com/pms/ocp/model/dto/ApiBaseDto.java deleted file mode 100644 index 369e5a9b6c0a5f8c21af2f4b07c8ae4166b0e242..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/model/dto/ApiBaseDto.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.pms.ocp.model.dto; - -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import org.springframework.format.annotation.DateTimeFormat; - -import java.io.Serializable; -import java.sql.Timestamp; -import java.util.List; - -@Data -@AllArgsConstructor -@NoArgsConstructor -@ApiModel("服务列表查询参数") -public class ApiBaseDto implements Serializable { - - @ApiModelProperty("服务编码") - private String apiCode; - - @ApiModelProperty("服务分类编码") - private String apiGroupCode; - - @ApiModelProperty("服务分类公司()") - private String apiGroupCompanyCode; - - @ApiModelProperty("建设单位") - private String apiUnit; - - @ApiModelProperty("推广类型0:统建；1:自建") - private Integer apiPromotion; - - @ApiModelProperty("注册时段-开始") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Timestamp startTime; - - @ApiModelProperty("注册时段-结束") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Timestamp endTime; - - @ApiModelProperty("注册开始") - private String startCTime; - - @ApiModelProperty("注册结束") - private String endCTime; - - @ApiModelProperty("关键字") - private String keyword; - - @ApiModelProperty("当前页") - private Integer pageNum; - - @ApiModelProperty("每页条数") - private Integer pageSize; - - - private List apiGroupCodeList; - - public Integer getApiPromotion() { - return apiPromotion; - } - - public void setApiPromotion(Integer apiPromotion) { - this.apiPromotion = apiPromotion; - } - - public String getApiCode() { - return apiCode; - } - - public void setApiCode(String apiCode) { - this.apiCode = apiCode; - } - - public String getApiGroupCode() { - return apiGroupCode; - } - - public void setApiGroupCode(String apiGroupCode) { - this.apiGroupCode = apiGroupCode; - } - - public Timestamp getStartTime() { - return startTime; - } - - public void setStartTime(Timestamp startTime) { - this.startTime = startTime; - } - - public Timestamp getEndTime() { - return endTime; - } - - public void setEndTime(Timestamp endTime) { - this.endTime = endTime; - } - - public String getStartCTime() { - return startCTime; - } - - public void setStartCTime(String startCTime) { - this.startCTime = startCTime; - } - - public String getEndCTime() { - return endCTime; - } - - public void setEndCTime(String endCTime) { - this.endCTime = endCTime; - } - - public String getKeyword() { - return keyword; - } - - public void setKeyword(String keyword) { - this.keyword = keyword; - } - - public Integer getPageNum() { - return pageNum; - } - - public void setPageNum(Integer pageNum) { - this.pageNum = pageNum; - } - - public Integer getPageSize() { - return pageSize; - } - - public void setPageSize(Integer pageSize) { - this.pageSize = pageSize; - } - - public String getApiGroupCompanyCode() { - return apiGroupCompanyCode; - } - - public void setApiGroupCompanyCode(String apiGroupCompanyCode) { - this.apiGroupCompanyCode = apiGroupCompanyCode; - } - - public String getApiUnit() { - return apiUnit; - } - - public void setApiUnit(String apiUnit) { - this.apiUnit = apiUnit; - } - - public List getApiGroupCodeList() { - return apiGroupCodeList; - } - - public void setApiGroupCodeList(List apiGroupCodeList) { - this.apiGroupCodeList = apiGroupCodeList; - } -} diff --git a/src/main/java/com/pms/ocp/model/dto/ApiParamDTO.java b/src/main/java/com/pms/ocp/model/dto/ApiParamDTO.java deleted file mode 100644 index ae930a4d75f71393bb4039da076494388574773d..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/model/dto/ApiParamDTO.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.pms.ocp.model.dto; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @Auther: wangjian - * @Date: 2022/1/17 12:45 - * @Description:应用与服务的传输参数 - */ - -@ApiModel(value = "应用与服务的传输参数") -@Data -public class ApiParamDTO { - - @ApiModelProperty(value = "网省编码") - private String companyCode; - - @ApiModelProperty(value = "应用编码") - private String tenantCode; - - @ApiModelProperty(value = "服务编码") - private String apiCode; - - @ApiModelProperty(value = "分组编号") - private String groupId; - - @ApiModelProperty(value = "分组上级编号") - private String groupPid; - - @ApiModelProperty(value = "分组等级") - private String groupLvl; - - @ApiModelProperty(value = "应用名称") - private String tenantName; - - @ApiModelProperty(value = "时期类型") - private String periodCategory; -} diff --git a/src/main/java/com/pms/ocp/model/dto/ApiTreeGroupDto.java b/src/main/java/com/pms/ocp/model/dto/ApiTreeGroupDto.java deleted file mode 100644 index 02e28009d5ff578cd6ea372ef3eca76435f3ce5b..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/model/dto/ApiTreeGroupDto.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.pms.ocp.model.dto; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -@ApiModel(value = "服务树返回参数") -@Data -public class ApiTreeGroupDto { - - @ApiModelProperty("1中台层") - private List oneList; - - - @ApiModelProperty("2中心层") - private List twoList; - - @ApiModelProperty("3服务组层") - private List ThreeList; - - @ApiModelProperty("4服务层") - private List fourList; - - - public List getOneList() { - return oneList; - } - - public void setOneList(List oneList) { - this.oneList = oneList; - } - - public List getTwoList() { - return twoList; - } - - public void setTwoList(List twoList) { - this.twoList = twoList; - } - - public List getThreeList() { - return ThreeList; - } - - public void setThreeList(List threeList) { - ThreeList = threeList; - } - - public List getFourList() { - return fourList; - } - - public void setFourList(List fourList) { - this.fourList = fourList; - } -} diff --git a/src/main/java/com/pms/ocp/model/dto/FourTreeList.java b/src/main/java/com/pms/ocp/model/dto/FourTreeList.java deleted file mode 100644 index 6048e2e64224cf05efc438ba0b45a28640681bc2..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/model/dto/FourTreeList.java +++ /dev/null @@ -1,170 +0,0 @@ -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; - } -} diff --git a/src/main/java/com/pms/ocp/model/dto/GroupDto.java b/src/main/java/com/pms/ocp/model/dto/GroupDto.java deleted file mode 100644 index 827dc28b127d9c1d0244b86d8fdf191eac1372b3..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/model/dto/GroupDto.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.pms.ocp.model.dto; - -import com.pms.ocp.model.entity.OcpTenantBase; -import com.pms.ocp.model.entity.OcpTenantGroup; -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.util.List; - -@Data -@AllArgsConstructor -@NoArgsConstructor -public class GroupDto extends OcpTenantGroup implements Serializable { - @ApiModelProperty("应用名称") - private String tenantName; - - /** - * 应用代码 - */ - @ApiModelProperty("应用代码") - private String tenantCode; - - /** - * 应用分类代码 - */ - @ApiModelProperty("应用分类代码") - private String tenantGroupCode; - - 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; - } -} diff --git a/src/main/java/com/pms/ocp/model/dto/OcpApiBaseDto.java b/src/main/java/com/pms/ocp/model/dto/OcpApiBaseDto.java deleted file mode 100644 index 31e2a5ec79fe4ae805b43eaae859035c7b525f1e..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/model/dto/OcpApiBaseDto.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.pms.ocp.model.dto; - -import cn.afterturn.easypoi.excel.annotation.Excel; -import com.pms.ocp.model.entity.OcpApiBase; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; - -@Data -@AllArgsConstructor -@NoArgsConstructor -@ApiModel(value = "服务基础信息表dto") -public class OcpApiBaseDto extends OcpApiBase implements Serializable { - @ApiModelProperty("所属集群") - private String clusterName; - @ApiModelProperty("所属命名空间") - private String spaceName; - @ApiModelProperty( "状态") - private String apiState; -} diff --git a/src/main/java/com/pms/ocp/model/dto/OcpApiGroupDtos.java b/src/main/java/com/pms/ocp/model/dto/OcpApiGroupDtos.java deleted file mode 100644 index 84f3f1c70db31b93b96525c18e4f8f24e9d2de62..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/model/dto/OcpApiGroupDtos.java +++ /dev/null @@ -1,348 +0,0 @@ -package com.pms.ocp.model.dto; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.sql.Date; -import java.sql.Timestamp; - - -@ApiModel(value = "新增接收参数") -@Data -public class OcpApiGroupDtos { - - - @ApiModelProperty(value = "当前页码") - private int pageSize; - @ApiModelProperty(value = "每页大小") - private int pageNum; - - @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; - - @ApiModelProperty("服务代码") - private String apiCode; - - @ApiModelProperty("服务接口中文名称") - private String apiName; - - - @ApiModelProperty("推广类型0:统建；1:自建") - private long apiPromotion; - - @ApiModelProperty("服务请求体") - private String apiReq; - - @ApiModelProperty("服务返回体") - private String apiResp; - - @ApiModelProperty("服务地址") - private String apiUrl; - - @ApiModelProperty("服务创建时间") - private Timestamp apiCtime; - - @ApiModelProperty("服务修改时间") - private Timestamp apiMtime; - - @ApiModelProperty("创建者用户ID") - private String apiUserId; - - @ApiModelProperty("建设单位") - private String apiUnit; - - @ApiModelProperty("服务所属公司") - private String ownerCompanyCode; - - @ApiModelProperty("服务所属公司") - private String ownerCompanyName; - - @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区") - private long apiZone; - - @ApiModelProperty("'所属层级 1:应用层;2:平台层;3:网络层;4:感知层;") - private long apiLayer; - - @ApiModelProperty("服务版本（最新版本）") - private long apiVersion; - - public int getPageSize() { - return pageSize; - } - - public void setPageSize(int pageSize) { - this.pageSize = pageSize; - } - - public int getPageNum() { - return pageNum; - } - - public void setPageNum(int pageNum) { - this.pageNum = pageNum; - } - - 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 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 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 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 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; - } -} diff --git a/src/main/java/com/pms/ocp/model/dto/OcpTenantBaseDto.java b/src/main/java/com/pms/ocp/model/dto/OcpTenantBaseDto.java deleted file mode 100644 index 8ff963838c0f9eb6594b290a997f0c56181ac0fe..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/model/dto/OcpTenantBaseDto.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.pms.ocp.model.dto; - -import com.pms.ocp.model.entity.OcpTenantBase; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; - -@Data -@AllArgsConstructor -@NoArgsConstructor -@ApiModel(value = "应用信息表dto") -public class OcpTenantBaseDto extends OcpTenantBase implements Serializable { - - @ApiModelProperty("应用分类名称") - private String tenantGroupName; - @ApiModelProperty("集群名称") - private String clusterName; - @ApiModelProperty("命名空间") - private String spaceName; - @ApiModelProperty("服务编码字符串") - private String apiCodes; - -} diff --git a/src/main/java/com/pms/ocp/model/dto/OcpTenantGroupDto.java b/src/main/java/com/pms/ocp/model/dto/OcpTenantGroupDto.java deleted file mode 100644 index 796e7dfc469fb487d149162b14228411b675a982..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/model/dto/OcpTenantGroupDto.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.pms.ocp.model.dto; - - -import com.pms.ocp.model.entity.OcpTenantGroup; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; -import java.util.Set; - -@ApiModel(value = "应用返回参数") -@Data -public class OcpTenantGroupDto { - - @ApiModelProperty("创建公司") - private List List; - - public java.util.List getList() { - return List; - } - - public void setList(java.util.List list) { - List = list; - } -} diff --git a/src/main/java/com/pms/ocp/model/dto/OneTreeUpList.java b/src/main/java/com/pms/ocp/model/dto/OneTreeUpList.java deleted file mode 100644 index 9bc6843e0f87c0e51583d7bec2a7647b3a3fd89d..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/model/dto/OneTreeUpList.java +++ /dev/null @@ -1,221 +0,0 @@ -package com.pms.ocp.model.dto; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.pms.ocp.model.entity.OcpApiGroup; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.sql.Timestamp; -import java.util.List; - - -@EqualsAndHashCode(callSuper=false) -@ApiModel(value = "1中台层") -@Data -public class OneTreeUpList{ - - - @TableId(type = IdType.ASSIGN_ID) - @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 long getApiGroupLevel() { - return apiGroupLevel; - } - - public void setApiGroupLevel(long apiGroupLevel) { - this.apiGroupLevel = 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; - } - - - /*@ApiModelProperty("一级") - private OcpApiGroup upList; - @ApiModelProperty("分类编码") - private String code; - - @ApiModelProperty("分类名称") - private String pName; - - public String getCode() { - return code; - } - - public void setCode(String code) { - this.code = code; - } - - public String getpName() { - return pName; - } - - public void setpName(String pName) { - this.pName = pName; - } - - public OcpApiGroup getUpList() { - return upList; - } - - public void setUpList(OcpApiGroup upList) { - this.upList = upList; - } -*/ - -} diff --git a/src/main/java/com/pms/ocp/model/dto/PageGroupDto.java b/src/main/java/com/pms/ocp/model/dto/PageGroupDto.java deleted file mode 100644 index b48ed5f3ccd7d2846160183999a0495f48c0e606..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/model/dto/PageGroupDto.java +++ /dev/null @@ -1,179 +0,0 @@ -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 String apiGroupLevel; - - - @ApiModelProperty("模糊查询字段") - private String keyword; - - public String getKeyword() { - return keyword; - } - - public void setKeyword(String keyword) { - this.keyword = keyword; - } - - 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 String getApiGroupLevel() { - return apiGroupLevel; - } - - public void setApiGroupLevel(String apiGroupLevel) { - this.apiGroupLevel = apiGroupLevel; - } -} diff --git a/src/main/java/com/pms/ocp/model/dto/PageOcpTenantDto.java b/src/main/java/com/pms/ocp/model/dto/PageOcpTenantDto.java deleted file mode 100644 index f944df1e6140c00a4ea8f4d834eaf283aba0ef33..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/model/dto/PageOcpTenantDto.java +++ /dev/null @@ -1,237 +0,0 @@ -package com.pms.ocp.model.dto; - - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.pms.ocp.common.config.PageParam; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; - -import java.sql.Timestamp; - -/** - * 分级查询dto - */ -@ApiModel("分级查询dto") -public class PageOcpTenantDto { - /** - * 主键 - */ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty("主键") - private String objId; - - - private int pageNum; - - private int pageSize; - - - 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; - } - - /** - * 应用分类编码 - */ - @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 Timestamp tenantGroupCtime; - - /** - * 修改时间 - */ - @ApiModelProperty("修改时间") - private Timestamp tenantGroupMtime; - - /** - * 是否删除 - */ - @ApiModelProperty("是否删除") - private Short isDelete; - - /** - * 应用树层级 1:应用分组层 2:应用层 - */ - @ApiModelProperty("应用树层级 1:应用分组层 2:应用层") - private Short tenantGroupLevel; - - public String getObjId() { - return objId; - } - - public void setObjId(String objId) { - this.objId = objId; - } - - 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; - } - - public String getTenantGroupUserId() { - return tenantGroupUserId; - } - - public void setTenantGroupUserId(String tenantGroupUserId) { - this.tenantGroupUserId = tenantGroupUserId; - } - - public String getTenantGroupUserName() { - return tenantGroupUserName; - } - - public void setTenantGroupUserName(String tenantGroupUserName) { - this.tenantGroupUserName = tenantGroupUserName; - } - - public Timestamp getTenantGroupCtime() { - return tenantGroupCtime; - } - - public void setTenantGroupCtime(Timestamp tenantGroupCtime) { - this.tenantGroupCtime = tenantGroupCtime; - } - - public Timestamp getTenantGroupMtime() { - return tenantGroupMtime; - } - - public void setTenantGroupMtime(Timestamp tenantGroupMtime) { - this.tenantGroupMtime = tenantGroupMtime; - } - - public Short getIsDelete() { - return isDelete; - } - - public void setIsDelete(Short isDelete) { - this.isDelete = isDelete; - } - - 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; - } - - public String getTenantGroupPcode() { - return tenantGroupPcode; - } - - public void setTenantGroupPcode(String tenantGroupPcode) { - this.tenantGroupPcode = tenantGroupPcode; - } - - public Short getTenantGroupLevel() { - return tenantGroupLevel; - } - - public void setTenantGroupLevel(Short tenantGroupLevel) { - this.tenantGroupLevel = tenantGroupLevel; - } -} diff --git a/src/main/java/com/pms/ocp/model/dto/PageRequest.java b/src/main/java/com/pms/ocp/model/dto/PageRequest.java deleted file mode 100644 index 0058ee990b3746f69afb278b99fc13d736475c2d..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/model/dto/PageRequest.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.pms.ocp.model.dto; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - - -/** - * @param - * @author admin - */ -@Data -@ApiModel(value = "分页工具类",description = "分页工具类") -public class PageRequest { - - private static final long serialVersionUID = 8167917284229912157L; - - @ApiModelProperty(value = "当前页码") - private int pageSize; - @ApiModelProperty(value = "每页大小") - private int pageNum; - @ApiModelProperty(value = "其他查询条件") - private T query; - - public int getPageSize() { - return pageSize == 0 ? 10 : pageSize; - } - - public int getPageNum() { - return pageNum == 0 ? 1 : pageNum; - } -} \ No newline at end of file diff --git a/src/main/java/com/pms/ocp/model/dto/TenanBaseDto.java b/src/main/java/com/pms/ocp/model/dto/TenanBaseDto.java deleted file mode 100644 index 93327b7214e3d8fce077fc9a6c2b4dfd4214d122..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/model/dto/TenanBaseDto.java +++ /dev/null @@ -1,235 +0,0 @@ -package com.pms.ocp.model.dto; - - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.pms.ocp.common.constants.StringUtils; -import com.pms.ocp.model.entity.OcpTenantGroup; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.sql.Timestamp; - -/** - * 新增应用封装对象 - */ -@ApiModel(value = "新增应用封装对象") -@Data -@EqualsAndHashCode(callSuper=false) -public class TenanBaseDto extends OcpTenantGroup { - - - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty("主键ID") - 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 Timestamp tenantGroupCtime; - - /** - * 修改时间 - */ - @ApiModelProperty("修改时间") - private Timestamp tenantGroupMtime; - - /** - * 是否删除 - */ - @ApiModelProperty("是否删除") - private Short isDelete; - - /** - * 应用树层级 1:应用分组层 2:应用层 - */ - @ApiModelProperty("应用树层级 1:应用分组层 2:应用层") - private String tenantGroupLevel; - - - - //上级分类名称 - - @ApiModelProperty("上级分类名称") - @TableField(exist = false) - private String classIfy; - - 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 getClassIfy() { - return classIfy; - } - - 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; - } - - public String getTenantGroupPcode() { - return tenantGroupPcode; - } - - 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; - } - - public String getTenantGroupUserId() { - return tenantGroupUserId; - } - - public void setTenantGroupUserId(String tenantGroupUserId) { - this.tenantGroupUserId = tenantGroupUserId; - } - - public String getTenantGroupUserName() { - return tenantGroupUserName; - } - - public void setTenantGroupUserName(String tenantGroupUserName) { - this.tenantGroupUserName = tenantGroupUserName; - } - - public Timestamp getTenantGroupCtime() { - return tenantGroupCtime; - } - - public void setTenantGroupCtime(Timestamp tenantGroupCtime) { - this.tenantGroupCtime = tenantGroupCtime; - } - - public Timestamp getTenantGroupMtime() { - return tenantGroupMtime; - } - - public void setTenantGroupMtime(Timestamp tenantGroupMtime) { - this.tenantGroupMtime = tenantGroupMtime; - } - - public Short getIsDelete() { - return isDelete; - } - - public void setIsDelete(Short isDelete) { - this.isDelete = isDelete; - } - - public String getTenantGroupLevel() { - return tenantGroupLevel; - } - - public void setTenantGroupLevel(String tenantGroupLevel) { - this.tenantGroupLevel = tenantGroupLevel; - } - -// public OcpTenantGroup setClassIfy(String classIfy) { -// this.classIfy = classIfy; -// return null; -// } -} diff --git a/src/main/java/com/pms/ocp/model/dto/TenantDto.java b/src/main/java/com/pms/ocp/model/dto/TenantDto.java deleted file mode 100644 index 85123a461552bbe3b77877bd064780d04e8f92c0..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/model/dto/TenantDto.java +++ /dev/null @@ -1,168 +0,0 @@ -package com.pms.ocp.model.dto; - -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import org.springframework.format.annotation.DateTimeFormat; - -import java.io.Serializable; -import java.sql.Timestamp; -import java.util.List; - -@Data -@AllArgsConstructor -@NoArgsConstructor -@ApiModel("服务列表查询参数") -public class TenantDto implements Serializable { - - @ApiModelProperty("应用编码") - private String tenantCode; - - @ApiModelProperty("应用分类编码") - private String tenantGroupCode; - - @ApiModelProperty("应用分类名称") - private String tenantGroupName; - - @ApiModelProperty("应用分类公司") - private String tenantGroupCompanyCode; - - @ApiModelProperty("建设单位") - private String tenantUnit; - -// @ApiModelProperty("推广类型0:统建；1:自建") -// private Integer apiPromotion; - - @ApiModelProperty("注册时段-开始") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Timestamp startTime; - - @ApiModelProperty("注册时段-结束") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Timestamp endTime; - - @ApiModelProperty("注册开始") - private String startCTime; - - @ApiModelProperty("注册结束") - private String endCTime; - - @ApiModelProperty("关键字") - private String keyword; - - @ApiModelProperty("当前页") - private Integer currentPage; - - @ApiModelProperty("每页条数") - private Integer pageSize; - - private List apiGroupCodeList; -// public Integer getApiPromotion() { -// return apiPromotion; -// } -// -// public void setApiPromotion(Integer apiPromotion) { -// this.apiPromotion = apiPromotion; -// } - - public String getTenantCode() { - return tenantCode; - } - - public void setTenantCode(String tenantCode) { - this.tenantCode = tenantCode; - } - - public String getTenantGroupCode() { - return tenantGroupCode; - } - - public void setTenantGroupCode(String tenantGroupCode) { - this.tenantGroupCode = tenantGroupCode; - } - - public String getTenantGroupCompanyCode() { - return tenantGroupCompanyCode; - } - - public void setTenantGroupCompanyCode(String tenantGroupCompanyCode) { - this.tenantGroupCompanyCode = tenantGroupCompanyCode; - } - - public String getTenantUnit() { - return tenantUnit; - } - - public void setTenantUnit(String tenantUnit) { - this.tenantUnit = tenantUnit; - } - - public Timestamp getStartTime() { - return startTime; - } - - public void setStartTime(Timestamp startTime) { - this.startTime = startTime; - } - - public Timestamp getEndTime() { - return endTime; - } - - public void setEndTime(Timestamp endTime) { - this.endTime = endTime; - } - - public String getStartCTime() { - return startCTime; - } - - public void setStartCTime(String startCTime) { - this.startCTime = startCTime; - } - - public String getEndCTime() { - return endCTime; - } - - public void setEndCTime(String endCTime) { - this.endCTime = endCTime; - } - - public String getKeyword() { - return keyword; - } - - public void setKeyword(String keyword) { - this.keyword = keyword; - } - -// public Integer getPageNum() { -// return pageNum; -// } -// -// public void setPageNum(Integer pageNum) { -// this.pageNum = pageNum; -// } - - public Integer getPageSize() { - return pageSize; - } - - public void setPageSize(Integer pageSize) { - this.pageSize = pageSize; - } - - public Integer getCurrentPage() { - return currentPage; - } - - public void setCurrentPage(Integer currentPage) { - this.currentPage = currentPage; - } -} diff --git a/src/main/java/com/pms/ocp/model/dto/ThreeTenanList.java b/src/main/java/com/pms/ocp/model/dto/ThreeTenanList.java deleted file mode 100644 index 227d51bd51ac13c2e629e9797d0a7bbff9d3783a..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/model/dto/ThreeTenanList.java +++ /dev/null @@ -1,215 +0,0 @@ -package com.pms.ocp.model.dto; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; - - -@EqualsAndHashCode(callSuper=false) -@ApiModel(value = "三级应用") -@Data -public class ThreeTenanList { -//3 - - /** - * 主键 - */ - @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; - - 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; - } - - public String getTenantGroupPcode() { - return tenantGroupPcode; - } - - 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; - } - - public String getTenantGroupUserId() { - return tenantGroupUserId; - } - - 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; - } - - public Short getTenantGroupLevel() { - return tenantGroupLevel; - } - - public void setTenantGroupLevel(Short tenantGroupLevel) { - this.tenantGroupLevel = tenantGroupLevel; - } -} diff --git a/src/main/java/com/pms/ocp/model/dto/ThreeTreeList.java b/src/main/java/com/pms/ocp/model/dto/ThreeTreeList.java deleted file mode 100644 index 9c04f798ffee093dbffaf5627b330b618e9a2b71..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/model/dto/ThreeTreeList.java +++ /dev/null @@ -1,216 +0,0 @@ -package com.pms.ocp.model.dto; - - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.pms.ocp.model.entity.OcpApiGroup; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.sql.Timestamp; - -@ApiModel(value = "服务组层") -@Data -public class ThreeTreeList { - @TableId(type = IdType.ASSIGN_ID) - @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 long getApiGroupLevel() { - return apiGroupLevel; - } - - public void setApiGroupLevel(long apiGroupLevel) { - this.apiGroupLevel = 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; - } - - - /*@ApiModelProperty("三级") - private OcpApiGroup ThreeList; - - @ApiModelProperty("分类编码") - private String code; - - @ApiModelProperty("分类名称") - private String pName; - - - public String getCode() { - return code; - } - - public void setCode(String code) { - this.code = code; - } - - public String getpName() { - return pName; - } - - public void setpName(String pName) { - this.pName = pName; - } - - public OcpApiGroup getThreeList() { - return ThreeList; - } - - public void setThreeList(OcpApiGroup threeList) { - ThreeList = threeList; - }*/ -} diff --git a/src/main/java/com/pms/ocp/model/dto/TwoDownList.java b/src/main/java/com/pms/ocp/model/dto/TwoDownList.java deleted file mode 100644 index 29be13fc6aaa1e09485c21a249e9f0f3c1fb5912..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/model/dto/TwoDownList.java +++ /dev/null @@ -1,221 +0,0 @@ -package com.pms.ocp.model.dto; - - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.pms.ocp.model.entity.OcpApiGroup; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.sql.Timestamp; -import java.util.List; - -@ApiModel(value = "中心层") -@Data -public class TwoDownList { - - @TableId(type = IdType.ASSIGN_ID) - @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 long getApiGroupLevel() { - return apiGroupLevel; - } - - public void setApiGroupLevel(long apiGroupLevel) { - this.apiGroupLevel = 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; - } - - /* @ApiModelProperty("二级") - private OcpApiGroup downList; - - @ApiModelProperty("分类编码") - private String code; - - @ApiModelProperty("分类名称") - private String pName; - - public String getCode() { - return code; - } - - - public void setCode(String code) { - this.code = code; - } - - public String getpName() { - return pName; - } - - public void setpName(String pName) { - this.pName = pName; - } - - public OcpApiGroup getDownList() { - return downList; - } - - public void setDownList(OcpApiGroup downList) { - this.downList = downList; - } -*/ - -} diff --git a/src/main/java/com/pms/ocp/model/dto/TwoTenanList.java b/src/main/java/com/pms/ocp/model/dto/TwoTenanList.java deleted file mode 100644 index 2a81db8b55f048cf0996baf80c2a99861feb37f1..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/model/dto/TwoTenanList.java +++ /dev/null @@ -1,216 +0,0 @@ -package com.pms.ocp.model.dto; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; - - - -@EqualsAndHashCode(callSuper=false) -@ApiModel(value = "二级应用管理") -@Data -public class TwoTenanList { -//1 - - /** - * 主键 - */ - @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; - - 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; - } - - public String getTenantGroupPcode() { - return tenantGroupPcode; - } - - 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; - } - - public String getTenantGroupUserId() { - return tenantGroupUserId; - } - - 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; - } - - public Short getTenantGroupLevel() { - return tenantGroupLevel; - } - - public void setTenantGroupLevel(Short tenantGroupLevel) { - this.tenantGroupLevel = tenantGroupLevel; - } -} diff --git a/src/main/java/com/pms/ocp/model/dto/WholeLinkParamDto.java b/src/main/java/com/pms/ocp/model/dto/WholeLinkParamDto.java deleted file mode 100644 index 3b24fe0cbaa91598d80539f1f35ec72708efb31d..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/model/dto/WholeLinkParamDto.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.pms.ocp.model.dto; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@ApiModel(value = "全链路拓扑图传输参数") -@Data -public class WholeLinkParamDto implements Serializable { - @ApiModelProperty(value = "开始时间") - private String beginTime; - @ApiModelProperty(value = "结束时间") - private String endTime; - @ApiModelProperty(value = "服务code") - private String apiCode; - @ApiModelProperty(value = "应用code") - private String tenantCode; - @ApiModelProperty(value = "公司code") - private String companyCode; -} diff --git a/src/main/java/com/pms/ocp/model/entity/OcpApiAudit.java b/src/main/java/com/pms/ocp/model/entity/OcpApiAudit.java deleted file mode 100644 index 470d1b4d570a230cd7a86eef8caed9e557f29d80..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/model/entity/OcpApiAudit.java +++ /dev/null @@ -1,165 +0,0 @@ -package com.pms.ocp.model.entity; - -import cn.afterturn.easypoi.excel.annotation.Excel; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; -import java.sql.Timestamp; -@Data -@Accessors(chain = true) -@TableName("ocp_api_audit") -@ApiModel("服务事记表") -public class OcpApiAudit { - - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty("主键ID") - @Excel(name = "编号",orderNum = "1") - private String objId; - - @ApiModelProperty("服务编码") - private String apiCode; - - @ApiModelProperty("操作状态0:新增,1:迭代；2，下线") - @Excel(name = "类型",orderNum = "3") - private long operStatus; - - @ApiModelProperty("操作对象0:服务，1:入参，2:出参") - private long operTarget; - - @ApiModelProperty("类型0:人工操作,1:流程管控,3:总部下发") - private long auditType; - - @ApiModelProperty("备注简述") - private String auditMessage; - - @ApiModelProperty("事记内容") - @Excel(name = "变更内容",orderNum = "4") - private String auditJson; - - @ApiModelProperty("提交人id") - private String auditUserId; - - @ApiModelProperty("提交人姓名") - @Excel(name = "变更人",orderNum = "5") - private String auditUserName; - - @ApiModelProperty("创建时间") - @Excel(name = "创建时间",orderNum = "6") - private Timestamp auditCtime; - - @ApiModelProperty("修改时间") - private Timestamp auditMtime; - - @ApiModelProperty("是否删除0-否1-是") - private long isDelete; - @ApiModelProperty("当前版本") - private long applyVersion; - - public String getObjId() { - return objId; - } - - public void setObjId(String objId) { - this.objId = objId; - } - - public String getApiCode() { - return apiCode; - } - - public void setApiCode(String apiCode) { - this.apiCode = apiCode; - } - - public long getOperStatus() { - return operStatus; - } - - public void setOperStatus(long operStatus) { - this.operStatus = operStatus; - } - - public long getOperTarget() { - return operTarget; - } - - public void setOperTarget(long operTarget) { - this.operTarget = operTarget; - } - - public long getAuditType() { - return auditType; - } - - public void setAuditType(long 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; - } - - public String getAuditUserId() { - return auditUserId; - } - - public void setAuditUserId(String auditUserId) { - this.auditUserId = auditUserId; - } - - public String getAuditUserName() { - return auditUserName; - } - - public void setAuditUserName(String auditUserName) { - this.auditUserName = auditUserName; - } - - public Timestamp getAuditCtime() { - return auditCtime; - } - - public void setAuditCtime(Timestamp auditCtime) { - this.auditCtime = auditCtime; - } - - public Timestamp getAuditMtime() { - return auditMtime; - } - - public void setAuditMtime(Timestamp auditMtime) { - this.auditMtime = auditMtime; - } - - public long getIsDelete() { - return isDelete; - } - - public void setIsDelete(long isDelete) { - this.isDelete = isDelete; - } - - public long getApplyVersion() { - return applyVersion; - } - - public void setApplyVersion(long applyVersion) { - this.applyVersion = applyVersion; - } -} diff --git a/src/main/java/com/pms/ocp/model/entity/OcpApiBase.java b/src/main/java/com/pms/ocp/model/entity/OcpApiBase.java deleted file mode 100644 index 0c8b9c8f17c4d83b7b486ece52c00fa80ea86c2b..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/model/entity/OcpApiBase.java +++ /dev/null @@ -1,244 +0,0 @@ -package com.pms.ocp.model.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.sql.Date; -import java.sql.Timestamp; - -@Data -@Accessors(chain = true) -@TableName("ocp_api_base") -@ApiModel("服务基础信息表") -public class OcpApiBase { - - - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty("主键ID") - private String objId; - - @ApiModelProperty("服务代码") - private String apiCode; - - @ApiModelProperty("服务接口中文名称") - private String apiName; - - @ApiModelProperty("服务分类代码") - private String apiGroupCode; - - @ApiModelProperty("推广类型0:统建；1:自建") - private long apiPromotion; - - @ApiModelProperty("服务请求体") - private String apiReq; - - @ApiModelProperty("服务返回体") - private String apiResp; - - @ApiModelProperty("服务地址") - private String apiUrl; - - @ApiModelProperty("服务创建时间") - private Timestamp apiCtime; - - @ApiModelProperty("服务修改时间") - private Timestamp apiMtime; - - @ApiModelProperty("创建者用户ID") - private String apiUserId; - - @ApiModelProperty("建设单位") - private String apiUnit; - - @ApiModelProperty("服务所属公司") - private String ownerCompanyCode; - -// @ApiModelProperty("服务所属公司") -// private String ownerCompanyName; - - @ApiModelProperty("是否删除0-否1-是") - private long isDelete; - - @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区") - private long apiZone; - - @ApiModelProperty("'所属层级 1:应用层;2:平台层;3:网络层;4:感知层;") - private long apiLayer; - - @ApiModelProperty("服务版本（最新版本）") - private String apiVersion; - - @ApiModelProperty("服务所属中心编码所属中心") - private String apiCenterCode; - - @ApiModelProperty("服务简述") - private String apiDescription; - - @ApiModelProperty("创建者姓名") - private String apiUserName; - - public String getObjId() { - return objId; - } - - public void setObjId(String objId) { - this.objId = objId; - } - - public String getApiCode() { - return apiCode; - } - - public void setApiCode(String apiCode) { - this.apiCode = apiCode; - } - - public String getApiName() { - return apiName; - } - - public void setApiName(String apiName) { - this.apiName = apiName; - } - - public String getApiGroupCode() { - return apiGroupCode; - } - - public void setApiGroupCode(String apiGroupCode) { - this.apiGroupCode = apiGroupCode; - } - - 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 long getIsDelete() { - return isDelete; - } - - public void setIsDelete(long isDelete) { - this.isDelete = isDelete; - } - - public long getApiZone() { - return apiZone; - } - - public void setApiZone(long apiZone) { - this.apiZone = apiZone; - } - - public long getApiLayer() { - return apiLayer; - } - - public void setApiLayer(long apiLayer) { - this.apiLayer = apiLayer; - } - - public String getApiVersion() { - return apiVersion; - } - - public void setApiVersion(String apiVersion) { - this.apiVersion = apiVersion; - } - - public String getApiCenterCode() { - return apiCenterCode; - } - - public void setApiCenterCode(String apiCenterCode) { - this.apiCenterCode = apiCenterCode; - } - - public String getApiDescription() { - return apiDescription; - } - - public void setApiDescription(String apiDescription) { - this.apiDescription = apiDescription; - } - - public String getApiUserName() { - return apiUserName; - } - - public void setApiUserName(String apiUserName) { - this.apiUserName = apiUserName; - } -} diff --git a/src/main/java/com/pms/ocp/model/entity/OcpApiDep.java b/src/main/java/com/pms/ocp/model/entity/OcpApiDep.java deleted file mode 100644 index 6bc52cd36855006db8baf34df12e9c9a8ec322ab..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/model/entity/OcpApiDep.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.pms.ocp.model.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; -import java.sql.Timestamp; - -@Data -@Accessors(chain = true) -@TableName("ocp_api_moedel_rel") -@ApiModel("服务模型关系") -public class OcpApiDep { - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty("主键ID") - private String objId; - - @ApiModelProperty("模型编码") - private String modelCode; - - @ApiModelProperty("部署公司code") - private String modelDepCompanyCode; - @ApiModelProperty("服务编码") - private String apiCode; - - @ApiModelProperty("部署公司") - private String apiDepCompanyCode; - - - @ApiModelProperty("关系添加时间") - private Timestamp relationCtime; - - - @ApiModelProperty("是否删除0-否1-是") - private long isDelete; - - - - public String getModelCode() { - return modelCode; - } - - public void setModelCode(String modelCode) { - this.modelCode = modelCode; - } - - public String getModelDepCompanyCode() { - return modelDepCompanyCode; - } - - public void setModelDepCompanyCode(String modelDepCompanyCode) { - this.modelDepCompanyCode = modelDepCompanyCode; - } - - public String getApiDepCompanyCode() { - return apiDepCompanyCode; - } - - public void setApiDepCompanyCode(String apiDepCompanyCode) { - this.apiDepCompanyCode = apiDepCompanyCode; - } - - public Timestamp getRelationCtime() { - return relationCtime; - } - - public void setRelationCtime(Timestamp relationCtime) { - this.relationCtime = relationCtime; - } - - public String getObjId() { - return objId; - } - - public void setObjId(String objId) { - this.objId = objId; - } - - - public String getApiCode() { - return apiCode; - } - - public void setApiCode(String apiCode) { - this.apiCode = apiCode; - } - public long getIsDelete() { - return isDelete; - } - - public void setIsDelete(long isDelete) { - this.isDelete = isDelete; - } - -} diff --git a/src/main/java/com/pms/ocp/model/entity/OcpApiExtent.java b/src/main/java/com/pms/ocp/model/entity/OcpApiExtent.java deleted file mode 100644 index 4d817cd699a673f60b4fa4d09bd2b8f9f410f8da..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/model/entity/OcpApiExtent.java +++ /dev/null @@ -1,186 +0,0 @@ -package com.pms.ocp.model.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.sql.Timestamp; - -@Data -@Accessors(chain = true) -@TableName("ocp_api_extent") -@ApiModel("服务扩展信息表") -public class OcpApiExtent { - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty("主键ID") - private String objId; - - @ApiModelProperty("服务编码") - private String apiCode; - -// @ApiModelProperty("系统名称") -// private String sysName; - - // @ApiModelProperty("模块") -// private String partName; -// @ApiModelProperty("服务群") -// private String serviceGroup; - @ApiModelProperty("服务") - private String serviceName; - @ApiModelProperty("所属集群") - private String clusterName; - @ApiModelProperty("所属命名空间") - private String spaceName; -// @ApiModelProperty("服务描述") -// private String serviceDescription; - - @ApiModelProperty("部署信息") - private String deployment; - - @ApiModelProperty("服务状态0未发布1已发布") - private String apiState; - - @ApiModelProperty("属性添加时间") - private Timestamp apiCtime; - - @ApiModelProperty("属性修改时间") - private Timestamp apiMtime; - - @ApiModelProperty("部属公司") - private String depCompanyCode; - - @ApiModelProperty("是否已删除 0-否 1-是") - private long isDelete; - -// public String getSysName() { -// return sysName; -// } -// -// public void setSysName(String sysName) { -// this.sysName = sysName; -// } -// -// public String getPartName() { -// return partName; -// } -// -// public void setPartName(String partName) { -// this.partName = partName; -// } -// -// public String getServiceGroup() { -// return serviceGroup; -// } - -// public void setServiceGroup(String serviceGroup) { -// this.serviceGroup = serviceGroup; -// } - - public String getServiceName() { - return serviceName; - } - - public void setServiceName(String serviceName) { - this.serviceName = serviceName; - } - - public String getClusterName() { - return clusterName; - } - - public void setClusterName(String clusterName) { - this.clusterName = clusterName; - } - - public String getSpaceName() { - return spaceName; - } - - public void setSpaceName(String spaceName) { - this.spaceName = spaceName; - } - // public String get所属命名空间() { -// return spaceName; -// } -// -// public void set所属命名空间(String 所属命名空间) { -// this.spaceName = spaceName; -// } - -// public String getServiceDescription() { -// return serviceDescription; -// } - -// public void setServiceDescription(String serviceDescription) { -// this.serviceDescription = serviceDescription; -// } - - public String getDeployment() { - return deployment; - } - - public void setDeployment(String deployment) { - this.deployment = deployment; - } - - public String getApiState() { - return apiState; - } - - public void setApiState(String apiState) { - this.apiState = apiState; - } - - public Timestamp getApiCtime() { - return apiCtime; - } - - public void setApiCtime(Timestamp apiCtime) { - this.apiCtime = apiCtime; - } - - public Timestamp getApiMtime() { - return apiMtime; - } - - public void setApiMtime(Timestamp apiMtime) { - this.apiMtime = apiMtime; - } - - public String getDepCompanyCode() { - return depCompanyCode; - } - - public void setDepCompanyCode(String depCompanyCode) { - this.depCompanyCode = depCompanyCode; - } - - public String getObjId() { - return objId; - } - - public void setObjId(String objId) { - this.objId = objId; - } - - public String getApiCode() { - return apiCode; - } - - public void setApiCode(String apiCode) { - this.apiCode = apiCode; - } - - public long getIsDelete() { - return isDelete; - } - - public void setIsDelete(long isDelete) { - this.isDelete = isDelete; - } - -} diff --git a/src/main/java/com/pms/ocp/model/entity/OcpApiGroup.java b/src/main/java/com/pms/ocp/model/entity/OcpApiGroup.java deleted file mode 100644 index d306c59edf2ca21e768a394039a95237a87bfa01..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/model/entity/OcpApiGroup.java +++ /dev/null @@ -1,189 +0,0 @@ -package com.pms.ocp.model.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; -import java.sql.Timestamp; -import java.util.List; - -@Data -@Accessors(chain = true) -@TableName("ocp_api_group") -@ApiModel("服务分类表") -public class OcpApiGroup { - - @TableId(type = IdType.ASSIGN_ID) - @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 String apiGroupLevel; - - public String getApiGroupLevel() { - return apiGroupLevel; - } - - public void setApiGroupLevel(String apiGroupLevel) { - this.apiGroupLevel = 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; - } - - - -} diff --git a/src/main/java/com/pms/ocp/model/entity/OcpApiModelRel.java b/src/main/java/com/pms/ocp/model/entity/OcpApiModelRel.java deleted file mode 100644 index f0231de512f9f7ef0998b478fe6bfce1a47ec599..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/model/entity/OcpApiModelRel.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.pms.ocp.model.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; -import java.sql.Timestamp; - -@Data -@Accessors(chain = true) -@TableName("ocp_api_model_rel") -@ApiModel("服务模型关系") -public class OcpApiModelRel { - - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty("主键ID") - private String objId; - - @ApiModelProperty("模型编码") - private String modelCode; - - @ApiModelProperty("模型部署公司") - private String modelDepCompanyCode; - - @ApiModelProperty("服务编码") - private String apiCode; - - @ApiModelProperty("服务部署公司") - private String apiDepCompanyCode; - - @ApiModelProperty("关系添加时间") - private Timestamp relationCtime; - - @ApiModelProperty("是否已删除 0-否1-是") - private long isDelete; - - public String getObjId() { - return objId; - } - - public void setObjId(String objId) { - this.objId = objId; - } - - public String getModelCode() { - return modelCode; - } - - public void setModelCode(String modelCode) { - this.modelCode = modelCode; - } - - public String getModelDepCompanyCode() { - return modelDepCompanyCode; - } - - public void setModelDepCompanyCode(String modelDepCompanyCode) { - this.modelDepCompanyCode = modelDepCompanyCode; - } - - public String getApiCode() { - return apiCode; - } - - public void setApiCode(String apiCode) { - this.apiCode = apiCode; - } - - public String getApiDepCompanyCode() { - return apiDepCompanyCode; - } - - public void setApiDepCompanyCode(String apiDepCompanyCode) { - this.apiDepCompanyCode = apiDepCompanyCode; - } - - public Timestamp getRelationCtime() { - return relationCtime; - } - - public void setRelationCtime(Timestamp relationCtime) { - this.relationCtime = relationCtime; - } - - public long getIsDelete() { - return isDelete; - } - - public void setIsDelete(long isDelete) { - this.isDelete = isDelete; - } -} diff --git a/src/main/java/com/pms/ocp/model/entity/OcpApiSubs.java b/src/main/java/com/pms/ocp/model/entity/OcpApiSubs.java deleted file mode 100644 index 752744e5775e109c42fb55009497aa2fbd7d4907..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/model/entity/OcpApiSubs.java +++ /dev/null @@ -1,106 +0,0 @@ -package com.pms.ocp.model.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; -import java.sql.Timestamp; - -@Data -@Accessors(chain = true) -@TableName("ocp_api_subs") -@ApiModel("服务订阅记录表") -public class OcpApiSubs { - - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty("主键ID") - private String objId; - - @ApiModelProperty("服务编码") - private String apiCode; - - @ApiModelProperty("服务订阅创建时间") - private Timestamp subsLogApiCtime; - - @ApiModelProperty("服务订阅修改时间") - private Timestamp subsLogApiMtime; - - @ApiModelProperty("服务订阅创建用户ID") - private String subsLogApiUserId; - - @ApiModelProperty("服务订阅添加时间") - private Timestamp subsLogApiAtime; - - @ApiModelProperty("公司编码") - private String subsCompanyCode; - - @ApiModelProperty("是否删除0-否，1-是") - private long isDelete; - - public String getObjId() { - return objId; - } - - public void setObjId(String objId) { - this.objId = objId; - } - - public String getApiCode() { - return apiCode; - } - - public void setApiCode(String apiCode) { - this.apiCode = apiCode; - } - - public Timestamp getSubsLogApiCtime() { - return subsLogApiCtime; - } - - public void setSubsLogApiCtime(Timestamp subsLogApiCtime) { - this.subsLogApiCtime = subsLogApiCtime; - } - - public Timestamp getSubsLogApiMtime() { - return subsLogApiMtime; - } - - public void setSubsLogApiMtime(Timestamp subsLogApiMtime) { - this.subsLogApiMtime = subsLogApiMtime; - } - - public String getSubsLogApiUserId() { - return subsLogApiUserId; - } - - public void setSubsLogApiUserId(String subsLogApiUserId) { - this.subsLogApiUserId = subsLogApiUserId; - } - - public Timestamp getSubsLogApiAtime() { - return subsLogApiAtime; - } - - public void setSubsLogApiAtime(Timestamp subsLogApiAtime) { - this.subsLogApiAtime = subsLogApiAtime; - } - - public String getSubsCompanyCode() { - return subsCompanyCode; - } - - public void setSubsCompanyCode(String subsCompanyCode) { - this.subsCompanyCode = subsCompanyCode; - } - - public long getIsDelete() { - return isDelete; - } - - public void setIsDelete(long isDelete) { - this.isDelete = isDelete; - } -} diff --git a/src/main/java/com/pms/ocp/model/entity/OcpApiTenantRel.java b/src/main/java/com/pms/ocp/model/entity/OcpApiTenantRel.java deleted file mode 100644 index 4ae9f9864f91b7e72f8119c6419d76fee70f6004..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/model/entity/OcpApiTenantRel.java +++ /dev/null @@ -1,117 +0,0 @@ -package com.pms.ocp.model.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; -import java.sql.Timestamp; - -@Data -@Accessors(chain = true) - -@ApiModel("服务应用关系表") -public class OcpApiTenantRel { - - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty("主键ID") - private String objId; - - @ApiModelProperty("应用编码") - private String tenantCode; - - @ApiModelProperty("服务编码") - private String apiCode; - - @ApiModelProperty("服务部署公司") - private String apiDepCompanyCode; - - @ApiModelProperty("应用所属公司") - private String tenantDepCompanyCode; - - @ApiModelProperty("关系创建时间") - private Timestamp apiTenantRelCtime; - - @ApiModelProperty("关系创建时间") - private Timestamp apiTenantRelMtime; - - @ApiModelProperty("关系创建用户ID") - private String apiTenantRelUserId; - - @ApiModelProperty("关系创建用户") - private String apiTenantRelUserName; - - 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 getApiCode() { - return apiCode; - } - - public void setApiCode(String apiCode) { - this.apiCode = apiCode; - } - - public String getApiDepCompanyCode() { - return apiDepCompanyCode; - } - - public void setApiDepCompanyCode(String apiDepCompanyCode) { - this.apiDepCompanyCode = apiDepCompanyCode; - } - - public String getTenantDepCompanyCode() { - return tenantDepCompanyCode; - } - - public void setTenantDepCompanyCode(String tenantDepCompanyCode) { - this.tenantDepCompanyCode = tenantDepCompanyCode; - } - - public Timestamp getApiTenantRelCtime() { - return apiTenantRelCtime; - } - - public void setApiTenantRelCtime(Timestamp apiTenantRelCtime) { - this.apiTenantRelCtime = apiTenantRelCtime; - } - - public Timestamp getApiTenantRelMtime() { - return apiTenantRelMtime; - } - - public void setApiTenantRelMtime(Timestamp apiTenantRelMtime) { - this.apiTenantRelMtime = apiTenantRelMtime; - } - - public String getApiTenantRelUserId() { - return apiTenantRelUserId; - } - - public void setApiTenantRelUserId(String apiTenantRelUserId) { - this.apiTenantRelUserId = apiTenantRelUserId; - } - - public String getApiTenantRelUserName() { - return apiTenantRelUserName; - } - - public void setApiTenantRelUserName(String apiTenantRelUserName) { - this.apiTenantRelUserName = apiTenantRelUserName; - } -} diff --git a/src/main/java/com/pms/ocp/model/entity/OcpTenantAudit.java b/src/main/java/com/pms/ocp/model/entity/OcpTenantAudit.java deleted file mode 100644 index 1dce44272285b92ef752f820145cfb5f5eb8c88b..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/model/entity/OcpTenantAudit.java +++ /dev/null @@ -1,189 +0,0 @@ -package com.pms.ocp.model.entity; - -import cn.afterturn.easypoi.excel.annotation.Excel; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.sql.Timestamp; -import java.util.Date; - -/** - * 应用事记表 - * @TableName ocp_tenant_audit - */ -@Data -@Accessors(chain = true) -@ApiModel("应用事记表1") -public class OcpTenantAudit implements Serializable { - /** - * 主键 - */ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty("主键ID") - @Excel(name = "主键ID",orderNum = "1") - private String objId; - - /** - * 应用code - */ - @ApiModelProperty("应用code") - @Excel(name = "应用code",orderNum = "2") - private String tenantCode; - - /** - * 操作状态0:新增,1:迭代；2，下线 - */ - @ApiModelProperty("操作状态0:新增,1:迭代；2，下线") - @Excel(name = "操作状态0:新增,1:迭代；2，下线",orderNum = "3") - private Short operStatus; - - /** - * 类型0:人工操作,1:流程管控,3:总部下发 - */ - @ApiModelProperty("类型0:人工操作,1:流程管控,3:总部下发") - @Excel(name = "类型0:人工操作,1:流程管控,3:总部下发",orderNum = "4") - private Short auditType; - - /** - * 备注简述 - */ - @ApiModelProperty("备注简述") - @Excel(name = "备注简述",orderNum = "5") - private String auditMessage; - - /** - * 应用事记内容 - */ - @ApiModelProperty("应用事记内容") - @Excel(name = "应用事记内容",orderNum = "6") - private String auditJson; - - /** - * 提交人id - */ - @ApiModelProperty("提交人id") - @Excel(name = "提交人id",orderNum = "7") - private String auditUserId; - - /** - * 提交人姓名 - */ - @ApiModelProperty("提交人姓名") - @Excel(name = "提交人姓名",orderNum = "8") - private String auditUserName; - - /** - * 创建时间 - */ - @ApiModelProperty("创建时间") - @Excel(name = "创建时间",orderNum = "9") - private Timestamp auditCtime; - - /** - * 应用版本(当前版本) - */ - @ApiModelProperty(" 应用版本(当前版本") - @Excel(name = " 应用版本(当前版本",orderNum = "10") - private String applyVersion; - - /** - * 上一版本 - */ - @ApiModelProperty("上一版本") - @Excel(name = " 上一版本",orderNum = "11") - private String perTenantVersion; - - 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 Short getOperStatus() { - return operStatus; - } - - public void setOperStatus(Short operStatus) { - this.operStatus = operStatus; - } - - public Short getAuditType() { - return auditType; - } - - 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; - } - - public String getAuditUserId() { - return auditUserId; - } - - public void setAuditUserId(String auditUserId) { - this.auditUserId = auditUserId; - } - - public String getAuditUserName() { - return auditUserName; - } - - public void setAuditUserName(String auditUserName) { - this.auditUserName = auditUserName; - } - - public Timestamp getAuditCtime() { - return auditCtime; - } - - public void setAuditCtime(Timestamp 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; - } -} \ No newline at end of file diff --git a/src/main/java/com/pms/ocp/model/entity/OcpTenantBase.java b/src/main/java/com/pms/ocp/model/entity/OcpTenantBase.java deleted file mode 100644 index 94b1821bd764dfeedb1d9d4f4b07758c188e6285..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/model/entity/OcpTenantBase.java +++ /dev/null @@ -1,331 +0,0 @@ -package com.pms.ocp.model.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.sql.Timestamp; -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 Timestamp tenantCtime; - - /** - * 最后更新时间 - */ - @ApiModelProperty("最后更新时间") - private Timestamp tenantMtime; - - /** - * 部署名称 - */ -// @ApiModelProperty("部署名称") -// private String deploymentName; - - /** - * 描述 - */ - @ApiModelProperty("描述") - private String tenantDescription; -// -// /** -// * 应用状态0:设计态；1:运行态 -// */ -// @ApiModelProperty("应用状态0:设计态；1:运行态") -// private Short tenantState; -// /** -// * 推广类型0:统建；1:自建 -// */ -// @ApiModelProperty("推广类型0:统建；1:自建") -// private long tenantPromotion; - /** - * 建设单位 - */ - @ApiModelProperty("建设单位") - private String tenantUnit; - - /** - * 所属公司编码 - */ - @ApiModelProperty("所属公司编码") - private String ownerCompanyCode; - -// /** -// * 所属公司名称 -// */ -// @ApiModelProperty("所属公司名称") -// private String ownerCompanyName; - - /** - * 是否删除0:否;1:是 - */ - @ApiModelProperty("是否删除0:否;1:是") - private Short isDelete; - - /** - * 所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区 - */ - @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区") - private Short tenantZone; - - /** - * 所属层级 1:应用层;2:平台层;3:网络层;4:感知层; - */ - @ApiModelProperty("所属层级 1:应用层;2:平台层;3:网络层;4:感知层;") - private Short tenantLayer; - - /** - * 应用版本（当前版本） - */ - @ApiModelProperty("应用版本（当前版本）") - private String tenantVersion; - - - @ApiModelProperty("推广类型") - private Short tenantPromotion; - - - @ApiModelProperty("应用路径") - private String tenantFullPath; - - - public String getObjId() { - return objId; - } - - 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; - } - - public String getTenantIp() { - return tenantIp; - } - - public void setTenantIp(String tenantIp) { - this.tenantIp = tenantIp; - } - - public String getTenantUrl() { - return tenantUrl; - } - - public void setTenantUrl(String tenantUrl) { - this.tenantUrl = tenantUrl; - } - - public String getProfessionalKind() { - return professionalKind; - } - - public void setProfessionalKind(String professionalKind) { - this.professionalKind = professionalKind; - } - - public String getTenantUserId() { - return tenantUserId; - } - - public void setTenantUserId(String tenantUserId) { - this.tenantUserId = tenantUserId; - } - - public Integer getTenantOrderNo() { - return tenantOrderNo; - } - - public void setTenantOrderNo(Integer tenantOrderNo) { - this.tenantOrderNo = tenantOrderNo; - } - - public Timestamp getTenantCtime() { - return tenantCtime; - } - - public void setTenantCtime(Timestamp tenantCtime) { - this.tenantCtime = tenantCtime; - } - - public Timestamp getTenantMtime() { - return tenantMtime; - } - - public void setTenantMtime(Timestamp tenantMtime) { - this.tenantMtime = tenantMtime; - } - - public String getTenantDescription() { - return tenantDescription; - } - - public void setTenantDescription(String tenantDescription) { - this.tenantDescription = tenantDescription; - } - - public String getTenantUnit() { - return tenantUnit; - } - - public void setTenantUnit(String tenantUnit) { - this.tenantUnit = tenantUnit; - } - - public String getOwnerCompanyCode() { - return ownerCompanyCode; - } - - public void setOwnerCompanyCode(String ownerCompanyCode) { - this.ownerCompanyCode = ownerCompanyCode; - } - - public Short getIsDelete() { - return isDelete; - } - - public void setIsDelete(Short isDelete) { - this.isDelete = isDelete; - } - - public Short getTenantZone() { - return tenantZone; - } - - public void setTenantZone(Short tenantZone) { - this.tenantZone = tenantZone; - } - - public Short getTenantLayer() { - return tenantLayer; - } - - public void setTenantLayer(Short tenantLayer) { - this.tenantLayer = tenantLayer; - } - - public String getTenantVersion() { - return tenantVersion; - } - - public void setTenantVersion(String tenantVersion) { - this.tenantVersion = tenantVersion; - } - -// public String getTenantPromotion() { -// return tenantPromotion; -// } -// -// public void setTenantPromotion(String tenantPromotion) { -// this.tenantPromotion = tenantPromotion; -// } - - public Short getTenantPromotion() { - return tenantPromotion; - } - - public void setTenantPromotion(Short tenantPromotion) { - this.tenantPromotion = tenantPromotion; - } - - public String getTenantFullPath() { - return tenantFullPath; - } - - public void setTenantFullPath(String tenantFullPath) { - this.tenantFullPath = tenantFullPath; - } -} \ No newline at end of file diff --git a/src/main/java/com/pms/ocp/model/entity/OcpTenantExtent.java b/src/main/java/com/pms/ocp/model/entity/OcpTenantExtent.java deleted file mode 100644 index 6b8499c37131c16300ceeec12a69fff17fb538c7..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/model/entity/OcpTenantExtent.java +++ /dev/null @@ -1,333 +0,0 @@ -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:未发布 2:已下线") - 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 diff --git a/src/main/java/com/pms/ocp/model/entity/OcpTenantGroup.java b/src/main/java/com/pms/ocp/model/entity/OcpTenantGroup.java deleted file mode 100644 index 215d548e38cc3cf16f31eb65805ab7f52a6f01dd..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/model/entity/OcpTenantGroup.java +++ /dev/null @@ -1,442 +0,0 @@ -package com.pms.ocp.model.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; -import java.io.Serializable; -import java.sql.Timestamp; -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 Timestamp tenantGroupCtime; - - /** - * 修改时间 - */ - @ApiModelProperty("修改时间") - private Timestamp tenantGroupMtime; - - /** - * 是否删除 - */ - @ApiModelProperty("是否删除") - private Short isDelete; - - /** - * 应用树层级 1:应用分组层 2:应用层 - */ - @ApiModelProperty("应用树层级 1:应用分组层 2:应用层") - private String tenantGroupLevel; - - //上级分类名称 - - @ApiModelProperty("上级分类名称") - @TableField(exist = false) - private String classIfy; - - @ApiModelProperty("分类等级") - @TableField(exist = false) - private String level; - @ApiModelProperty("查询等级") - @TableField(exist = false) - private String lev; - - @ApiModelProperty("判断是否新增成功") - @TableField(exist = false) - private String num; - - public String getNum() { - return num; - } - - public void setNum(String num) { - this.num = num; - } - - public String getLevel() { - return level; - } - - public void setLevel(String level) { - this.level = level; - } - - public String getClassIfy() { - return classIfy; - } - - public void setClassIfy(String classIfy) { - this.classIfy = classIfy; - } - - public String getLev() { - return level; - } - - public void setLev(String lev) { - this.level = level; - } - - public static long getSerialVersionUID() { - return serialVersionUID; - } - - 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(Timestamp tenantGroupCtime) { - this.tenantGroupCtime = tenantGroupCtime; - } - - /** - * 修改时间 - */ - public Date getTenantGroupMtime() { - return tenantGroupMtime; - } - - /** - * 修改时间 - */ - public void setTenantGroupMtime(Timestamp 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; -// } - - public String getTenantGroupLevel() { - return tenantGroupLevel; - } - - public void setTenantGroupLevel(String 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 diff --git a/src/main/java/com/pms/ocp/model/entity/OcpTenantSubs.java b/src/main/java/com/pms/ocp/model/entity/OcpTenantSubs.java deleted file mode 100644 index fabf917bb9479a62707ab753f692d55b73ee06cd..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/model/entity/OcpTenantSubs.java +++ /dev/null @@ -1,176 +0,0 @@ -package com.pms.ocp.model.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.sql.Timestamp; -import java.util.Date; - -/** - * 应用订阅记录表 - * @TableName ocp_tenant_subs - */ -@Data -@Accessors(chain = true) -@TableName("ocp_tenant_subs") -@ApiModel("应用订阅记录表1") -public class OcpTenantSubs implements Serializable { - - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty("关系ID") - private String objId; - - - @ApiModelProperty("服务编码") - private String tenantCode; - - - @ApiModelProperty("订阅公司编码") - private String subsCompanyCode; - - - @ApiModelProperty("服务订阅创建时间") - private Timestamp subsLogTenantCtime; - - - @ApiModelProperty("服务订阅修改时间") - private Timestamp subsLogTenantMtime; - - - @ApiModelProperty("服务订阅创建用户ID") - private String subsLogTenantUserId; - - - @ApiModelProperty("服务订阅添加时间") - private Timestamp subsLogTenantAtime; - - - @ApiModelProperty("是否删除0-否，1-是") - private Short isDelete; - - - 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 getSubsCompanyCode() { - return subsCompanyCode; - } - - public void setSubsCompanyCode(String subsCompanyCode) { - this.subsCompanyCode = subsCompanyCode; - } - - public Timestamp getSubsLogTenantCtime() { - return subsLogTenantCtime; - } - - public void setSubsLogTenantCtime(Timestamp subsLogTenantCtime) { - this.subsLogTenantCtime = subsLogTenantCtime; - } - - public Timestamp getSubsLogTenantMtime() { - return subsLogTenantMtime; - } - - public void setSubsLogTenantMtime(Timestamp subsLogTenantMtime) { - this.subsLogTenantMtime = subsLogTenantMtime; - } - - public String getSubsLogTenantUserId() { - return subsLogTenantUserId; - } - - public void setSubsLogTenantUserId(String subsLogTenantUserId) { - this.subsLogTenantUserId = subsLogTenantUserId; - } - - public Timestamp getSubsLogTenantAtime() { - return subsLogTenantAtime; - } - - public void setSubsLogTenantAtime(Timestamp subsLogTenantAtime) { - this.subsLogTenantAtime = subsLogTenantAtime; - } - - public Short getIsDelete() { - return isDelete; - } - - 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("]"); - return sb.toString(); - } -} \ No newline at end of file diff --git a/src/main/java/com/pms/ocp/model/entity/PmsApiAudit.java b/src/main/java/com/pms/ocp/model/entity/PmsApiAudit.java deleted file mode 100644 index d88457efdf5e4a5bd95987251e11178eccde7cec..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/model/entity/PmsApiAudit.java +++ /dev/null @@ -1,121 +0,0 @@ -package com.pms.ocp.model.entity; - -import cn.afterturn.easypoi.excel.annotation.Excel; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; -import java.sql.Timestamp; -@Data -@Accessors(chain = true) -@ApiModel("服务事记表") -public class PmsApiAudit { - - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty("主键ID") - @Excel(name = "编号",orderNum = "1") - private String objId; - - @ApiModelProperty("服务编码") - private String apiCode; - - @ApiModelProperty("操作状态0:新增,1:迭代；2，下线") - @Excel(name = "类型",orderNum = "3") - private long operStatus; - - @ApiModelProperty("操作对象0:服务，1:入参，2:出参") - private long operTarget; - - @ApiModelProperty("类型0:人工操作,1:流程管控,3:总部下发") - private long auditType; - - @ApiModelProperty("备注简述") - private String auditMessage; - - @ApiModelProperty("事记内容") - @Excel(name = "变更内容",orderNum = "4") - private String auditJson; - - @ApiModelProperty("提交人id") - private String auditUserId; - - @ApiModelProperty("提交人姓名") - @Excel(name = "变更人",orderNum = "5") - private String auditUserName; - - @ApiModelProperty("创建时间") - @Excel(name = "创建时间",orderNum = "6") - private Timestamp auditCtime; - - @ApiModelProperty("修改时间") - private Timestamp auditMtime; - - @ApiModelProperty("是否删除0-否1-是") - private long isDelete; - @ApiModelProperty("当前版本") - private long applyVersion; - - @ApiModelProperty("上一版本") - @Excel(name = "上一版本",orderNum = "7") - private long preApiVersion; - - - - - @ApiModelProperty("服务接口中文名称") - @Excel(name = "服务名称",orderNum = "2") - private String apiName; - - @ApiModelProperty("服务分类代码") - private String apiGroupCode; - - @ApiModelProperty("推广类型0:统建；1:自建") - private long apiPromotion; - - @ApiModelProperty("服务请求体") - @Excel(name = "请求参数",orderNum = "8") - private String apiReq; - - @ApiModelProperty("服务返回体") - @Excel(name = "返回参数",orderNum = "9") - private String apiResp; - - @ApiModelProperty("服务地址") - private String apiUrl; - - @ApiModelProperty("服务创建时间") - private Timestamp apiCtime; - - @ApiModelProperty("服务修改时间") - private Timestamp apiMtime; - - @ApiModelProperty("创建者用户ID") - private String apiUserId; - - @ApiModelProperty("建设单位") - private String apiUnit; - - @ApiModelProperty("服务所属公司") - private String ownerCompanyCode; - - - - @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区") - private long apiZone; - - @ApiModelProperty("'所属层级 1:应用层;2:平台层;3:网络层;4:感知层;") - private long apiLayer; - - @ApiModelProperty("服务版本（最新版本）") - @Excel(name = "当前版本",orderNum = "6") - private String apiVersion; - - @ApiModelProperty("服务所属中心编码所属中心") - private long apiCenterCode; - - @ApiModelProperty("创建者姓名") - private long apiUserName; - -} diff --git a/src/main/java/com/pms/ocp/model/entity/PmsApiBase.java b/src/main/java/com/pms/ocp/model/entity/PmsApiBase.java deleted file mode 100644 index b71c895592a0b9efc58d45b2ecc40bbf39f4980f..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/model/entity/PmsApiBase.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.pms.ocp.model.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.sql.Date; -import java.sql.Timestamp; - -@Data -@Accessors(chain = true) -@TableName("ocp_api_base") -@ApiModel("服务基础信息表") -public class PmsApiBase { - - - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty("主键ID") - private String objId; - - @ApiModelProperty("服务代码") - private String apiCode; - - @ApiModelProperty("服务接口中文名称") - private String apiName; - - @ApiModelProperty("服务分类代码") - private String apiGroupCode; - - @ApiModelProperty("推广类型0:统建；1:自建") - private long apiPromotion; - - @ApiModelProperty("服务请求体") - private String apiReq; - - @ApiModelProperty("服务返回体") - private String apiResp; - - @ApiModelProperty("服务地址") - private String apiUrl; - - @ApiModelProperty("服务创建时间") - private Timestamp apiCtime; - - @ApiModelProperty("服务修改时间") - private Timestamp apiMtime; - - @ApiModelProperty("创建者用户ID") - private String apiUserId; - - @ApiModelProperty("建设单位") - private String apiUnit; - - @ApiModelProperty("服务所属公司") - private String ownerCompanyCode; - - @ApiModelProperty("服务所属公司") - private String ownerCompanyName; - - @ApiModelProperty("是否删除0-否1-是") - private long isDelete; - - @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区") - private long apiZone; - - @ApiModelProperty("'所属层级 1:应用层;2:平台层;3:网络层;4:感知层;") - private long apiLayer; - - @ApiModelProperty("服务版本（最新版本）") - private long apiVersion; - - - -} diff --git a/src/main/java/com/pms/ocp/model/entity/PmsApiModelRel.java b/src/main/java/com/pms/ocp/model/entity/PmsApiModelRel.java deleted file mode 100644 index 10556af7c46fd1aec57943095c9b146885876cf7..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/model/entity/PmsApiModelRel.java +++ /dev/null @@ -1,173 +0,0 @@ -package com.pms.ocp.model.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.sql.Timestamp; -import java.time.LocalDateTime; - -@Data -@Accessors(chain = true) -@TableName("ocp_api_model_rel") -@ApiModel("服务模型关系") -public class PmsApiModelRel { - - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty("主键ID") - private String objId; - - @ApiModelProperty("模型编码") - private String modelCode; - - @ApiModelProperty("模型部署公司") - private String modelDepCompanyCode; - - @ApiModelProperty("服务编码") - private String apiCode; - - @ApiModelProperty("服务部署公司") - private String apiDepCompanyCode; - - @ApiModelProperty("关系添加时间") - private Timestamp relationCtime; - - @ApiModelProperty("是否已删除 0-否1-是") - private long isDelete; - - - - - - @ApiModelProperty("服务接口中文名称") - private String apiName; - - @ApiModelProperty("服务分类代码") - private String apiGroupCode; - - @ApiModelProperty("推广类型0:统建；1:自建") - private long apiPromotion; - - @ApiModelProperty("服务请求体") - private String apiReq; - - @ApiModelProperty("服务返回体") - private String apiResp; - - @ApiModelProperty("服务地址") - private String apiUrl; - - @ApiModelProperty("服务创建时间") - private Timestamp apiCtime; - - @ApiModelProperty("服务修改时间") - private Timestamp apiMtime; - - @ApiModelProperty("创建者用户ID") - private String apiUserId; - - @ApiModelProperty("建设单位") - private String apiUnit; - - @ApiModelProperty("服务所属公司") - private String ownerCompanyCode; - - @ApiModelProperty("服务所属公司") - private String ownerCompanyName; - - @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区") - private long apiZone; - - @ApiModelProperty("'所属层级 1:应用层;2:平台层;3:网络层;4:感知层;") - private long apiLayer; - - @ApiModelProperty("服务版本（最新版本）") - private String apiVersion; - - @ApiModelProperty("服务所属中心编码所属中心") - private long apiCenterCode; - - @ApiModelProperty("服务简述") - private String apiDescription; - - @ApiModelProperty("创建者姓名") - private long apiUserName; - - - @ApiModelProperty("模型名称") - private String modelName; - - - @ApiModelProperty("设备类型") - private String equipType; - - - @ApiModelProperty("所属专业ts:输电,t:变电, dc:直流，ds配电，tc:技术，pl计划 im综合") - private String professionalKind; - - @ApiModelProperty("模型分类编码") - private String modelGroupCode; - - - @ApiModelProperty("模型表名称") - private String modelTable; - - - @ApiModelProperty("是否启用 0:未启用,1：启用") - @TableField(value = "is_use") - private Integer boolUse; - - - @ApiModelProperty("模型推广类型 0:统推,1：自建") - private Integer modelPromotion; - - - @ApiModelProperty("排列顺序") - private Integer modelOrderNo; - - - @ApiModelProperty("提交人id") - private String modelUserId; - - - @ApiModelProperty("提交人姓名") - private String modelUserName; - - - @ApiModelProperty("模型创建时间") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private LocalDateTime modelCtime; - - - @ApiModelProperty("模型修改时间") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private LocalDateTime modelMtime; - - - - @ApiModelProperty("是否已删除0:未删除 1:已删除") - @TableField(value = "is_delete") - private Integer boolDelete; - - - @ApiModelProperty("所属区域1:生成控制大区 2:信息关联大区3:互联网大区") - private Integer modelZone; - - - @ApiModelProperty("所属层级1:应用层 2:平台层3:网络层 4:感知层") - private Integer modelLayer; - - - @ApiModelProperty("模型版本模型版本（最新版本）") - private String modelVersion; - -} diff --git a/src/main/java/com/pms/ocp/model/entity/PmsApiSubs.java b/src/main/java/com/pms/ocp/model/entity/PmsApiSubs.java deleted file mode 100644 index a2c8ab6d43ebad5a26a47d21e05b3a9d41a2f457..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/model/entity/PmsApiSubs.java +++ /dev/null @@ -1,103 +0,0 @@ -package com.pms.ocp.model.entity; - -import cn.afterturn.easypoi.excel.annotation.Excel; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; -import java.sql.Timestamp; - -@Data -@Accessors(chain = true) -@ApiModel("服务订阅记录表") -public class PmsApiSubs { - - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty("主键ID") - private String objId; - - @ApiModelProperty("服务编码") - private String apiCode; - - @ApiModelProperty("服务订阅创建时间") - private Timestamp subsLogApiCtime; - - @ApiModelProperty("服务订阅修改时间") - private Timestamp subsLogApiMtime; - - @ApiModelProperty("服务订阅创建用户ID") - private String subsLogApiUserId; - - @ApiModelProperty("服务订阅添加时间") - private Timestamp subsLogApiAtime; - - @ApiModelProperty("公司编码") - private String subsCompanyCode; - - @ApiModelProperty("是否删除0-否，1-是") - private long isDelete; - - - - - @ApiModelProperty("服务接口中文名称") - private String apiName; - - @ApiModelProperty("服务分类代码") - private String apiGroupCode; - - @ApiModelProperty("推广类型0:统建；1:自建") - private long apiPromotion; - - @ApiModelProperty("服务请求体") - private String apiReq; - - @ApiModelProperty("服务返回体") - private String apiResp; - - @ApiModelProperty("服务地址") - private String apiUrl; - - @ApiModelProperty("服务创建时间") - private Timestamp apiCtime; - - @ApiModelProperty("服务修改时间") - private Timestamp apiMtime; - - @ApiModelProperty("创建者用户ID") - private String apiUserId; - - @ApiModelProperty("建设单位") - private String apiUnit; - - @ApiModelProperty("服务所属公司") - private String ownerCompanyCode; - - @ApiModelProperty("服务所属公司") - private String ownerCompanyName; - - @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区") - private long apiZone; - - @ApiModelProperty("'所属层级 1:应用层;2:平台层;3:网络层;4:感知层;") - private long apiLayer; - - @ApiModelProperty("服务版本（最新版本）") - private String apiVersion; - - @ApiModelProperty("服务所属中心编码所属中心") - private long apiCenterCode; - - - @ApiModelProperty("创建者姓名") - private long apiUserName; - - - - - - -} diff --git a/src/main/java/com/pms/ocp/model/entity/PmsApiTenantRel.java b/src/main/java/com/pms/ocp/model/entity/PmsApiTenantRel.java deleted file mode 100644 index 7603912b18b5f0ec42a050b1a4089289b9391d62..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/model/entity/PmsApiTenantRel.java +++ /dev/null @@ -1,186 +0,0 @@ -package com.pms.ocp.model.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; -import java.sql.Timestamp; - -@Data -@Accessors(chain = true) - -@ApiModel("服务应用关系表") -public class PmsApiTenantRel { - - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty("主键ID") - private String objId; - - @ApiModelProperty("应用编码") - private String tenantCode; - - @ApiModelProperty("服务编码") - private String apiCode; - - @ApiModelProperty("服务部署公司") - private String apiDepCompanyCode; - - @ApiModelProperty("应用所属公司") - private String tenantDepCompanyCode; - - @ApiModelProperty("关系创建时间") - private Timestamp apiTenantRelCtime; - - @ApiModelProperty("关系创建时间") - private Timestamp apiTenantRelMtime; - - @ApiModelProperty("关系创建用户ID") - private String apiTenantRelUserId; - - @ApiModelProperty("关系创建用户") - private String apiTenantRelUserName; - - @ApiModelProperty("是否已删除0未删除，1已删除") - private long isDelete; - - - - - - - @ApiModelProperty("服务接口中文名称") - private String apiName; - - @ApiModelProperty("服务分类代码") - private String apiGroupCode; - - @ApiModelProperty("推广类型0:统建；1:自建") - private long apiPromotion; - - @ApiModelProperty("服务请求体") - private String apiReq; - - @ApiModelProperty("服务返回体") - private String apiResp; - - @ApiModelProperty("服务地址") - private String apiUrl; - - @ApiModelProperty("服务创建时间") - private Timestamp apiCtime; - - @ApiModelProperty("服务修改时间") - private Timestamp apiMtime; - - @ApiModelProperty("创建者用户ID") - private String apiUserId; - - @ApiModelProperty("建设单位") - private String apiUnit; - - @ApiModelProperty("服务所属公司") - private String ownerCompanyCode; - - @ApiModelProperty("服务所属公司") - private String ownerCompanyName; - - - - @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区") - private long apiZone; - - @ApiModelProperty("'所属层级 1:应用层;2:平台层;3:网络层;4:感知层;") - private long apiLayer; - - @ApiModelProperty("服务版本（最新版本）") - private String apiVersion; - - @ApiModelProperty("服务所属中心编码所属中心") - private long apiCenterCode; - - @ApiModelProperty("服务简述") - private String apiDescription; - - @ApiModelProperty("创建者姓名") - private long apiUserName; - - - @ApiModelProperty("应用名称") - private String tenantName; - - - - @ApiModelProperty("应用分类代码") - private String tenantGroupCode; - - - @ApiModelProperty("应用ip") - private String tenantIp; - - - @ApiModelProperty("应用url") - private String tenantUrl; - - - @ApiModelProperty("所属专业") - private String professionalKind; - - - @ApiModelProperty("创建者用户ID") - private String tenantUserId; - - - @ApiModelProperty("排序") - private Integer tenantOrderNo; - - - @ApiModelProperty("创建时间") - private Timestamp tenantCtime; - - - @ApiModelProperty("最后更新时间") - private Timestamp tenantMtime; - - - @ApiModelProperty("建设单位") - private String tenantUnit; - - - - @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区") - private Short tenantZone; - - - @ApiModelProperty("所属层级 1:应用层;2:平台层;3:网络层;4:感知层;") - private Short tenantLayer; - - - @ApiModelProperty("应用版本（当前版本）") - private String tenantVersion; - - - - @ApiModelProperty("部署名称") - private String deploymentName; - - @ApiModelProperty("描述") - private String tenantDescription; - - @ApiModelProperty("应用状态0设计 1运行态") - private String tenantState; - - - @ApiModelProperty("推广类型0:统建；1:自建") - private long tenantPromotion; - - - @ApiModelProperty("应用路径") - private String tenantFullPath; - - - - -} diff --git a/src/main/java/com/pms/ocp/model/entity/PmsCompany.java b/src/main/java/com/pms/ocp/model/entity/PmsCompany.java deleted file mode 100644 index 6a288c1e84b3d14ccb31ff867fecb002d954d65a..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/model/entity/PmsCompany.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.pms.ocp.model.entity; - - -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.util.Date; - -/** - * 服务表(PmsZyApi)实体类 - * - * @author wangsufu - * @since 2022-01-04 20:46:09 - */ -@Data -@NoArgsConstructor -@AllArgsConstructor -@TableName("pms_company") -@ApiModel(value = "PMS网省公司表", description = "PMS网省公司表") -public class PmsCompany implements Serializable { - private static final long serialVersionUID = -79779908395545838L; - - @ApiModelProperty(value = "id") - private Integer id; - - @ApiModelProperty(value = "公司名称") - private String companyName; - - @ApiModelProperty(value = "公司代码") - private String companyCode; - - @ApiModelProperty(value = "创建时间") - private Date createTime; - - @ApiModelProperty(value = "公司名称简写") - private String companyShortName; - - @ApiModelProperty(value = "公司层级") - private String companyLevel; - - @ApiModelProperty(value = "公司排序") - private Integer companySort; - - -} - diff --git a/src/main/java/com/pms/ocp/model/entity/PmsTenantAudit.java b/src/main/java/com/pms/ocp/model/entity/PmsTenantAudit.java deleted file mode 100644 index 1693ff7c05798d87ade1314748126532ae37bf69..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/model/entity/PmsTenantAudit.java +++ /dev/null @@ -1,530 +0,0 @@ -package com.pms.ocp.model.entity; - -import cn.afterturn.easypoi.excel.annotation.Excel; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.sql.Timestamp; - -/** - * 应用事记表 - * @TableName ocp_tenant_audit - */ -@Data -@Accessors(chain = true) -@ApiModel("应用事记表1") -public class PmsTenantAudit implements Serializable { - /** - * 主键 - */ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty("主键ID") - @Excel(name = "主键ID",orderNum = "1") - private String objId; - - /** - * 应用code - */ - @ApiModelProperty("应用code") - @Excel(name = "应用code",orderNum = "2") - private String tenantCode; - - /** - * 操作状态0:新增,1:迭代；2，下线 - */ - @ApiModelProperty("操作状态0:新增,1:迭代；2，下线") - @Excel(name = "操作状态0:新增,1:迭代；2，下线",orderNum = "3") - private Short operStatus; - - /** - * 类型0:人工操作,1:流程管控,3:总部下发 - */ - @ApiModelProperty("类型0:人工操作,1:流程管控,3:总部下发") - @Excel(name = "类型0:人工操作,1:流程管控,3:总部下发",orderNum = "4") - private Short auditType; - - /** - * 备注简述 - */ - @ApiModelProperty("备注简述") - @Excel(name = "备注简述",orderNum = "5") - private String auditMessage; - - /** - * 应用事记内容 - */ - @ApiModelProperty("应用事记内容") - @Excel(name = "应用事记内容",orderNum = "6") - private String auditJson; - - /** - * 提交人id - */ - @ApiModelProperty("提交人id") - @Excel(name = "提交人id",orderNum = "7") - private String auditUserId; - - /** - * 提交人姓名 - */ - @ApiModelProperty("提交人姓名") - @Excel(name = "提交人姓名",orderNum = "8") - private String auditUserName; - - /** - * 创建时间 - */ - @ApiModelProperty("创建时间") - @Excel(name = "创建时间",orderNum = "9") - private Timestamp auditCtime; - - /** - * 应用版本(当前版本) - */ - @ApiModelProperty(" 应用版本(当前版本") - @Excel(name = " 应用版本(当前版本",orderNum = "10") - private String applyVersion; - - /** - * 上一版本 - */ - @ApiModelProperty("上一版本") - @Excel(name = " 上一版本",orderNum = "11") - private String perTenantVersion; - - private static final long serialVersionUID = 1L; - - - - - - - /** - * 应用名称 - */ - @ApiModelProperty("应用名称") - private String tenantName; - - - - - @ApiModelProperty("应用分类代码") - private String tenantGroupCode; - - - @ApiModelProperty("应用ip") - private String tenantIp; - - - @ApiModelProperty("应用url") - private String tenantUrl; - - - @ApiModelProperty("所属专业") - private String professionalKind; - - @ApiModelProperty("创建者用户ID") - private String tenantUserId; - - - @ApiModelProperty("排序") - private Integer tenantOrderNo; - - @ApiModelProperty("创建时间") - private Timestamp tenantCtime; - - - @ApiModelProperty("最后更新时间") - private Timestamp tenantMtime; - - - - @ApiModelProperty("部署名称") - private String deploymentName; - - - @ApiModelProperty("描述") - private String tenantDescription; - - - @ApiModelProperty("应用状态0:设计态；1:运行态") - private Short tenantState; - - @ApiModelProperty("推广类型0:统建；1:自建") - private long tenantPromotion; - - @ApiModelProperty("建设单位") - private String tenantUnit; - - - @ApiModelProperty("所属公司编码") - private String ownerCompanyCode; - - - @ApiModelProperty("所属公司名称") - private String ownerCompanyName; - - - @ApiModelProperty("应用路径") - private String tenantFullPath; - - - @ApiModelProperty("是否删除0:否;1:是") - private Short isDelete; - - - @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区") - private Short tenantZone; - - - @ApiModelProperty("所属层级 1:应用层;2:平台层;3:网络层;4:感知层;") - private Short tenantLayer; - - - @ApiModelProperty("应用版本（当前版本）") - private String tenantVersion; - - - -// 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 Short getOperStatus() { -// return operStatus; -// } -// -// public void setOperStatus(Short operStatus) { -// this.operStatus = operStatus; -// } -// -// public Short getAuditType() { -// return auditType; -// } -// -// 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; -// } -// -// public String getAuditUserId() { -// return auditUserId; -// } -// -// 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(Timestamp auditCtime) { -// this.auditCtime = auditCtime; -// } -// -// public void setApplyVersion(String applyVersion) { -// this.applyVersion = applyVersion; -// } -// -// public String getPerTenantVersion() { -// return perTenantVersion; -// } -// -// public void setPerTenantVersion(String perTenantVersion) { -// this.perTenantVersion = perTenantVersion; -// } -// -// public static long getSerialVersionUID() { -// return serialVersionUID; -// } -// -// public String getApiCode() { -// return apiCode; -// } -// -// public void setApiCode(String apiCode) { -// this.apiCode = apiCode; -// } -// -// public String getApiDepCompanyCode() { -// return apiDepCompanyCode; -// } -// -// public void setApiDepCompanyCode(String apiDepCompanyCode) { -// this.apiDepCompanyCode = apiDepCompanyCode; -// } -// -// public String getTenantDepCompanyCode() { -// return tenantDepCompanyCode; -// } -// -// public void setTenantDepCompanyCode(String tenantDepCompanyCode) { -// this.tenantDepCompanyCode = tenantDepCompanyCode; -// } -// -// public Timestamp getApiTenantRelCtime() { -// return apiTenantRelCtime; -// } -// -// public void setApiTenantRelCtime(Timestamp apiTenantRelCtime) { -// this.apiTenantRelCtime = apiTenantRelCtime; -// } -// -// public Timestamp getApiTenantRelMtime() { -// return apiTenantRelMtime; -// } -// -// public void setApiTenantRelMtime(Timestamp apiTenantRelMtime) { -// this.apiTenantRelMtime = apiTenantRelMtime; -// } -// -// public String getApiTenantRelUserId() { -// return apiTenantRelUserId; -// } -// -// public void setApiTenantRelUserId(String apiTenantRelUserId) { -// this.apiTenantRelUserId = apiTenantRelUserId; -// } -// -// public String getApiTenantRelUserName() { -// return apiTenantRelUserName; -// } -// -// public void setApiTenantRelUserName(String apiTenantRelUserName) { -// this.apiTenantRelUserName = apiTenantRelUserName; -// } -// -// public long getIsDelete() { -// return isDelete; -// } -// -// public void setIsDelete(long isDelete) { -// this.isDelete = isDelete; -// } -// -// public String getApiName() { -// return apiName; -// } -// -// public void setApiName(String apiName) { -// this.apiName = apiName; -// } -// -// public String getApiGroupCode() { -// return apiGroupCode; -// } -// -// public void setApiGroupCode(String apiGroupCode) { -// this.apiGroupCode = apiGroupCode; -// } -// -// public 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; -// } - -// @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 diff --git a/src/main/java/com/pms/ocp/model/entity/PmsTenantBase.java b/src/main/java/com/pms/ocp/model/entity/PmsTenantBase.java deleted file mode 100644 index 4c14a700e101769bcb0e5a3a7cef9f9c403a370f..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/model/entity/PmsTenantBase.java +++ /dev/null @@ -1,215 +0,0 @@ -package com.pms.ocp.model.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.sql.Timestamp; -import java.util.Date; - -/** - * 应用信息表 - * @TableName ocp_tenant_base - */ -@Data -@Accessors(chain = true) -@TableName("ocp_tenant_base") -@ApiModel("应用信息表1") -public class PmsTenantBase implements Serializable { - - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty("主键ID") - private String objId; - - - @ApiModelProperty("应用名称") - private String tenantName; - - - @ApiModelProperty("应用代码") - private String tenantCode; - - - @ApiModelProperty("应用分类代码") - private String tenantGroupCode; - - - @ApiModelProperty("应用ip") - private String tenantIp; - - - @ApiModelProperty("应用url") - private String tenantUrl; - - - - @ApiModelProperty("所属专业") - private String professionalKind; - - - @ApiModelProperty("创建者用户ID") - private String tenantUserId; - - - @ApiModelProperty("排序") - private Integer tenantOrderNo; - - - @ApiModelProperty("创建时间") - private Timestamp tenantCtime; - - - @ApiModelProperty("最后更新时间") - private Timestamp tenantMtime; - - - - @ApiModelProperty("部署名称") - private String deploymentName; - - - @ApiModelProperty("描述") - private String tenantDescription; - - - @ApiModelProperty("应用状态0:设计态；1:运行态") - private Short tenantState; - - @ApiModelProperty("推广类型0:统建；1:自建") - private long tenantPromotion; - - @ApiModelProperty("建设单位") - private String tenantUnit; - - - @ApiModelProperty("所属公司编码") - private String ownerCompanyCode; - - - @ApiModelProperty("所属公司名称") - private String ownerCompanyName; - - - @ApiModelProperty("应用路径") - private String tenantFullPath; - - - @ApiModelProperty("是否删除0:否;1:是") - private Short isDelete; - - - @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区") - private Short tenantZone; - - - @ApiModelProperty("所属层级 1:应用层;2:平台层;3:网络层;4:感知层;") - private Short tenantLayer; - - - @ApiModelProperty("应用版本（当前版本）") - private String tenantVersion; - - private static final long serialVersionUID = 1L; - - -// -// @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 diff --git a/src/main/java/com/pms/ocp/model/entity/PmsTenantSubs.java b/src/main/java/com/pms/ocp/model/entity/PmsTenantSubs.java deleted file mode 100644 index 9987c8c4d699bd44e64b47096ef908e1fa35ea66..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/model/entity/PmsTenantSubs.java +++ /dev/null @@ -1,353 +0,0 @@ -package com.pms.ocp.model.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.sql.Timestamp; -import java.util.Date; - -/** - * 应用订阅记录表 - * @TableName ocp_tenant_subs - */ -@Data -@Accessors(chain = true) -@TableName("ocp_tenant_subs") -@ApiModel("应用订阅记录表1") -public class PmsTenantSubs implements Serializable { - /** - * 关系ID - */ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty("关系ID") - private String objId; - - /** - * 服务编码 - */ - @ApiModelProperty("应用编码") - private String tenantCode; - - /** - * 订阅公司编码 - */ - @ApiModelProperty("订阅公司编码") - private String subsCompanyCode; - - /** - * 服务订阅创建时间 - */ - @ApiModelProperty("应用订阅创建时间") - private Timestamp subsLogTenantCtime; - - /** - * 服务订阅修改时间 - */ - @ApiModelProperty("应用订阅修改时间") - private Timestamp subsLogTenantMtime; - - /** - * 服务订阅创建用户ID - */ - @ApiModelProperty("应用订阅创建用户ID") - private String subsLogTenantUserId; - - /** - * 服务订阅添加时间 - */ - @ApiModelProperty("应用订阅添加时间") - private Timestamp subsLogTenantAtime; - - /** - * 是否删除0-否，1-是 - */ - @ApiModelProperty("是否删除0-否，1-是") - private Short isDelete; - - - - /** - * 应用名称 - */ - @ApiModelProperty("应用名称") - private String tenantName; - - - /** - * 应用分类代码 - */ - @ApiModelProperty("应用分类代码") - private String tenantGroupCode; - - /** - * 应用ip - */ - @ApiModelProperty("应用ip") - private String tenantIp; - - /** - * 应用url - */ - @ApiModelProperty("应用url") - private String tenantUrl; - - /** - * 所属专业 - */ - @ApiModelProperty("所属专业") - private String professionalKind; - - /** - * 创建者用户ID - */ - @ApiModelProperty("创建者用户ID") - private String tenantUserId; - - /** - * 排序 - */ - @ApiModelProperty("排序") - private Integer tenantOrderNo; - - /** - * 创建时间 - */ - @ApiModelProperty("创建时间") - private Timestamp tenantCtime; - - /** - * 最后更新时间 - */ - @ApiModelProperty("最后更新时间") - private Timestamp tenantMtime; - -// /** -// * 部署名称 -// */ -// @ApiModelProperty("部署名称") -// private String deploymentName; - -// /** -// * 描述 -// */ -// @ApiModelProperty("描述") -// private String tenantDescription; - - /** - * 应用状态0:设计态；1:运行态 - */ - @ApiModelProperty("应用状态0:设计态；1:运行态") - private Short tenantState; - - /** - * 推广类型0:统建；1:自建 - */ - @ApiModelProperty("推广类型0:统建；1:自建") - private long tenantPromotion; - /** - * 建设单位 - */ - @ApiModelProperty("建设单位") - private String tenantUnit; - - /** - * 所属公司编码 - */ - @ApiModelProperty("所属公司编码") - private String ownerCompanyCode; - -// /** -// * 所属公司名称 -// */ -// @ApiModelProperty("所属公司名称") -// private String ownerCompanyName; - - /** - * 所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区 - */ - @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区") - private Short tenantZone; - - /** - * 所属层级 1:应用层;2:平台层;3:网络层;4:感知层; - */ - @ApiModelProperty("所属层级 1:应用层;2:平台层;3:网络层;4:感知层;") - private Short tenantLayer; - - /** - * 应用版本（当前版本） - */ - @ApiModelProperty("应用版本（当前版本）") - private String tenantVersion; - - - /** - * 应用路径 - */ - @ApiModelProperty("应用路径") - private String tenantFullPath; - - 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(Timestamp subsLogTenantCtime) { - this.subsLogTenantCtime = subsLogTenantCtime; - } - - /** - * 服务订阅修改时间 - */ - public Date getSubsLogTenantMtime() { - return subsLogTenantMtime; - } - - /** - * 服务订阅修改时间 - */ - public void setSubsLogTenantMtime(Timestamp 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(Timestamp subsLogTenantAtime) { - this.subsLogTenantAtime = subsLogTenantAtime; - } - - - - @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 diff --git a/src/main/java/com/pms/ocp/model/vo/BaseResponse.java b/src/main/java/com/pms/ocp/model/vo/BaseResponse.java deleted file mode 100644 index 3322445e102d9593546d7b73aec718bf0ebeb346..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/model/vo/BaseResponse.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.pms.ocp.model.vo; - -import com.pms.ocp.common.constants.CodeEnum; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.ToString; - -import java.io.Serializable; - -/** - * @author wuwanli - * @version 1.0 - * @date 2021/8/5 - */ -@Data -@ToString -@ApiModel(value = "BaseResponse返回对象", description = "BaseResponse返回对象") -public class BaseResponse implements Serializable { - private static final long serialVersionUID = -3715259891657893705L; - /** - * 返回码 - */ - @ApiModelProperty(value = "返回码") - private String code; - /** - * 返回描述 - */ - @ApiModelProperty(value = "返回描述") - private String desc; - @ApiModelProperty(value = "是否成功") - private boolean success; - - public BaseResponse() { - super(); - } - - public BaseResponse(CodeEnum codeEnum) { - this.code = codeEnum.getCode(); - this.desc = codeEnum.getDesc(); - this.success = codeEnum.isSuccess(); - } - - public void setResponseCode(CodeEnum codeEnum) { - this.code = codeEnum.getCode(); - this.desc = codeEnum.getDesc(); - this.success = codeEnum.isSuccess(); - } -} diff --git a/src/main/java/com/pms/ocp/model/vo/CompanyTenantVo.java b/src/main/java/com/pms/ocp/model/vo/CompanyTenantVo.java deleted file mode 100644 index 6ecea36e4633700085b31dd299b9b7b8781c126b..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/model/vo/CompanyTenantVo.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.pms.ocp.model.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Builder; -import lombok.Data; - -@Data -@Builder -@ApiModel(value = "网省公司Vo", description = "网省公司Vo") -public class CompanyTenantVo { - @ApiModelProperty(value = "公司名称") - private String companyName; - @ApiModelProperty(value = "公司code") - private String companyCode; - @ApiModelProperty(value = "应用名称") - private String tenantName; - @ApiModelProperty(value = "应用code") - private String tenantCode; -} diff --git a/src/main/java/com/pms/ocp/model/vo/CompanyVo.java b/src/main/java/com/pms/ocp/model/vo/CompanyVo.java deleted file mode 100644 index 246b4084b1c9a79e716099e22b6611da48c750ec..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/model/vo/CompanyVo.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.pms.ocp.model.vo; - -import io.swagger.annotations.ApiModel; -import lombok.AllArgsConstructor; -import lombok.Data; - -import java.io.Serializable; - -@Data -@AllArgsConstructor -@ApiModel(value = "网省公司Vo", description = "网省公司Vo") -public class CompanyVo implements Serializable { - private String companyName; - private String companyCode; -} - diff --git a/src/main/java/com/pms/ocp/model/vo/Menu.java b/src/main/java/com/pms/ocp/model/vo/Menu.java deleted file mode 100644 index bf77c085c054625d826073fd82947c817feddd00..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/model/vo/Menu.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.pms.ocp.model.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; -/** - * @author guofanfan - */ -@Data -@ApiModel(value = "菜单栏目Vo", description = "菜单栏目Vo") -public class Menu implements Serializable { - @ApiModelProperty(value = "id") - private String id; - @ApiModelProperty(value = "parentId") - private String parentId; - @ApiModelProperty(value = "内容") - private String text; - @ApiModelProperty(value = "类型") - private String type; - @ApiModelProperty(value = "子集") - private List children; - public Menu() { - this.id=id; - this.parentId=parentId; - this.text=text; - this.type=type; - - } - -} \ No newline at end of file diff --git a/src/main/java/com/pms/ocp/model/vo/OcpApiBaseVo.java b/src/main/java/com/pms/ocp/model/vo/OcpApiBaseVo.java deleted file mode 100644 index 8ddf4a84aa4edb2814a14e029040514464949479..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/model/vo/OcpApiBaseVo.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.pms.ocp.model.vo; - -import cn.afterturn.easypoi.excel.annotation.Excel; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import org.springframework.beans.factory.annotation.Value; - -import java.io.Serializable; -import java.sql.Timestamp; -import java.time.LocalDateTime; -/** - * @author guofanfan - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@ApiModel(value = "服务列表信息vo") -public class OcpApiBaseVo implements Serializable { - @ApiModelProperty(value = "序号") - @Excel(name = "序号") - private String objId; - @ApiModelProperty(value = "服务编码") - @Excel(name = "服务编码") - private String apiCode; - @ApiModelProperty(value = "服务中文名称") - @Excel(name = "服务中文名称") - private String apiName; - @ApiModelProperty(value = "所属集群") - @Excel(name = "所属集群") - private String clusterName; - @ApiModelProperty(value = "所属命名空间") - @Excel(name = "所属命名空间") - private String spaceName; - @ApiModelProperty(value = "接口URL") - @Excel(name = "接口URL") - private String apiUrl; - @ApiModelProperty(value = "状态") - @Excel(name = "状态") - private String apiState; - @ApiModelProperty(value = "注册时间") - @Excel(name = "注册时间") - private Timestamp apiCtime; - @ApiModelProperty(value = "建设单位") - @Excel(name = "建设单位") - private String apiUnit; - -} - diff --git a/src/main/java/com/pms/ocp/model/vo/ResponseVO.java b/src/main/java/com/pms/ocp/model/vo/ResponseVO.java deleted file mode 100644 index ac92f9968600588a9c69a06a802e11041ab602e1..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/model/vo/ResponseVO.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.pms.ocp.model.vo; - -import com.pms.ocp.common.constants.CodeEnum; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; - -/** - * @author wuwanli - * @version 1.0 - * @date 2021/8/5 - */ - -@Data -@ToString(callSuper = true) -@EqualsAndHashCode(callSuper = true) -@ApiModel(value = "返回对象", description = "返回对象") -public class ResponseVO extends BaseResponse { - private static final long serialVersionUID = 2445069102311188334L; - /** - * 封装的返回对象 - */ - @ApiModelProperty(value = "封装的返回对象") - private T data; - - public ResponseVO() { - super(); - } - - public ResponseVO(CodeEnum codeEnum) { - this.setCode(codeEnum.getCode()); - this.setDesc(codeEnum.getDesc()); - this.setSuccess(codeEnum.isSuccess()); - } - - - public static ResponseVO ok() { - return new ResponseVO<>(CodeEnum.SUCCESS); - } - - public static ResponseVO ok(T data) { - ResponseVO r = new ResponseVO(CodeEnum.SUCCESS); - r.setData(data); - return r; - } - - public static ResponseVO error(CodeEnum codeEnum) { - return new ResponseVO(codeEnum); - } - - public static ResponseVO error(String msg) { - ResponseVO tResponseVO = new ResponseVO<>(); - tResponseVO.setCode("0"); - tResponseVO.setDesc(msg); - tResponseVO.setSuccess(false); - return tResponseVO; - } - -} \ No newline at end of file diff --git a/src/main/java/com/pms/ocp/model/vo/TenantGroupVo.java b/src/main/java/com/pms/ocp/model/vo/TenantGroupVo.java deleted file mode 100644 index f1d21d23d5b4882140bae5e7c829d96f34534bfd..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/model/vo/TenantGroupVo.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.pms.ocp.model.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -@ApiModel(value = "网省公司Vo", description = "网省公司Vo") -public class TenantGroupVo { - @ApiModelProperty(value = "应用组code") - private String tenantGroupCode; - @ApiModelProperty(value = "应用组名称") - private String tenantGroupName; - -} diff --git a/src/main/java/com/pms/ocp/model/vo/WholeLinkTreeVo.java b/src/main/java/com/pms/ocp/model/vo/WholeLinkTreeVo.java deleted file mode 100644 index da8dc6de23f451422979f19a62a704f32752fa72..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/model/vo/WholeLinkTreeVo.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.pms.ocp.model.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Data; - -import java.io.Serializable; - -@Data -@AllArgsConstructor -@ApiModel(value = "全链路拓扑图树信息", description = "全链路拓扑图树信息") -public class WholeLinkTreeVo implements Serializable { -// @ApiModelProperty(value = "推广类型(0-统建,1-自建)") -// private String apiPromotion; - - @ApiModelProperty(value = "服务分类code") - private String apiGroupCode; - - @ApiModelProperty(value = "服务分类名称") - private String apiGroupName; - - @ApiModelProperty(value = "服务分类父节点code") - private String apiGroupPcode; - - @ApiModelProperty(value = "推广类型") - private String apiGroupPromotionType; - - -} diff --git a/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java b/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java deleted file mode 100644 index 634d166088f020f52789cdb3baeacc52dfe0bbcb..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java +++ /dev/null @@ -1,101 +0,0 @@ -package com.pms.ocp.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.github.pagehelper.PageInfo; -import com.pms.ocp.model.QueryResponseResult; -import com.pms.ocp.model.dto.ApiBaseDto; -import com.pms.ocp.model.dto.ApiTreeGroupDto; -import com.pms.ocp.model.dto.OcpApiBaseDto; -import com.pms.ocp.model.dto.WholeLinkParamDto; -import com.pms.ocp.model.entity.OcpApiBase; -import com.pms.ocp.model.entity.OcpApiExtent; -import com.pms.ocp.model.entity.OcpApiGroup; -import com.pms.ocp.model.vo.OcpApiBaseVo; -import com.pms.ocp.model.vo.ResponseVO; - -import java.sql.Timestamp; -import java.util.List; -/** - * @author guofanfan - */ -public interface ApiBasicManagementService extends IService { - /** - * 导出的查询 - * @param apiCodes - * @return - */ - List selectApiExport(String apiCodes); - - - - /** - * 服务注册 - * @param ocpApiBase - */ - void addOcpApiBase(OcpApiBase ocpApiBase); - - /** - * 服务订阅 - * @param apiCodes - */ - void apiLogin(String apiCodes); - - /** - * 条件查询 - * @param apiCode - * @param keyword - * @param startTime - * @param endTime - * @return - */ -// OcpApiBaseDto queryOcpApiBaseDto(ApiBaseDto apiBaseDto); - List queryOcpApiBaseDto(String apiCode, String keyword, String apiUnits, Timestamp startTime, Timestamp endTime, int pageSize, int pageNum); - /** - * 导入的添加到数据库 - * @param personList - */ - void apiImport(List personList); - - /** - * 服务发布 - * @param apiCodes - */ - ResponseVO apiIssue(String apiCodes); - - /** - * 获取顶级服务树 - * @param apiGroupCompanyCode - * @return - */ - List apiBaseTree(String apiGroupCompanyCode); - - /** - * 获取次级服务树 - * @param apiGroupCompanyCode - * @param apiGroupPcode - * @return - */ - List apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupPcode,Integer apiGroupPromotionType); - - /** - * 根据分组code获取列表 - * @param ApiBaseReq - * @return - */ - ResponseVO> getBaseByGroupCode(ApiBaseDto ApiBaseReq); - - /** - * 服务分类暴露服务列表 - * @param apiGroupCompanyCode - * @param apiGroupPcode - * @return - */ - List apiBaseTreeApiList(String apiGroupCompanyCode, String apiGroupPcode); - -// /** -// * 服务列表2 -// * @param wholeLinkParamDto -// * @return -// */ -// ResponseVO queryApiTreeData(WholeLinkParamDto wholeLinkParamDto); -} diff --git a/src/main/java/com/pms/ocp/service/ApiDetailsService.java b/src/main/java/com/pms/ocp/service/ApiDetailsService.java deleted file mode 100644 index 70ab4b294ca98d1c0c4fd7b82bddb06bc4565d75..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/service/ApiDetailsService.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.pms.ocp.service; - - -import com.pms.ocp.model.dto.ApiBaseDto; -import com.pms.ocp.model.entity.OcpApiBase; -import com.pms.ocp.model.vo.OcpApiBaseVo; -import com.pms.ocp.model.vo.ResponseVO; -import org.springframework.web.multipart.MultipartFile; - -import java.io.IOException; -import java.util.List; - -public interface ApiDetailsService{ - /** - * - * @param apiCode - * @return - */ - ResponseVO getApiDetails(String apiCode); - - -} diff --git a/src/main/java/com/pms/ocp/service/AppArrangeService.java b/src/main/java/com/pms/ocp/service/AppArrangeService.java deleted file mode 100644 index 4d1ff0ab6932c926391c7262ac7e4d9e69195a28..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/service/AppArrangeService.java +++ /dev/null @@ -1,18 +0,0 @@ -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); -} diff --git a/src/main/java/com/pms/ocp/service/ModelClassifyService.java b/src/main/java/com/pms/ocp/service/ModelClassifyService.java deleted file mode 100644 index 06d6b41b5840d440ec55e27da6269fa10ea4fe75..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/service/ModelClassifyService.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.pms.ocp.service; - -import com.pms.ocp.model.entity.ModelClassify; -import com.pms.ocp.model.vo.OcpModelGroupVO; -import com.pms.ocp.model.vo.ResponseVO; - -import java.util.List; - -/** - * @author huxiuwu - * @version 1.0 - * @date 2022/3/8 15:19 - */ -public interface ModelClassifyService { - ResponseVO> getModelNavigation(); - - ResponseVO insert(List list); - - ResponseVO subclassDetailsList(int currentPage,int pageSize,String parentGroupCode,String subclassGroupName); - - ResponseVO update(List list); - - ResponseVO delete(String modelGroupCode); - - /** - * 删除模型分类 - * - * @param objId - * @param modelCode - * @param groupCompanyCode - * @return - */ - Integer deleteModelClassify(String objId, String modelCode, String groupCompanyCode); -} diff --git a/src/main/java/com/pms/ocp/service/ModelGroupService.java b/src/main/java/com/pms/ocp/service/ModelGroupService.java deleted file mode 100644 index 2f0ed05e48ba6f379d4316a04f86d0958e84231f..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/service/ModelGroupService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.pms.ocp.service; - -import com.pms.ocp.model.entity.ModelClassify; -import com.pms.ocp.model.vo.ResponseVO; - -public interface ModelGroupService { - - ResponseVO getModelType(); - - ResponseVO createModelType(ModelClassify modelClassify); - - ResponseVO deleteModelType(String modelTypeId); - - ResponseVO updateModelType(ModelClassify modelClassify); -} diff --git a/src/main/java/com/pms/ocp/service/OcpApiExtentService.java b/src/main/java/com/pms/ocp/service/OcpApiExtentService.java deleted file mode 100644 index 532dc2e6388651766264ed20e0ee5273af0e7228..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/service/OcpApiExtentService.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.pms.ocp.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.pms.ocp.model.entity.OcpApiExtent; - -public interface OcpApiExtentService extends IService { -} diff --git a/src/main/java/com/pms/ocp/service/OcpApiSubsService.java b/src/main/java/com/pms/ocp/service/OcpApiSubsService.java deleted file mode 100644 index 3ba8f7fcd4d44df5266d06554997e8cf774340bc..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/service/OcpApiSubsService.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.pms.ocp.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.pms.ocp.model.entity.OcpApiSubs; - - -public interface OcpApiSubsService extends IService { -} diff --git a/src/main/java/com/pms/ocp/service/OcpApiTenantRelService.java b/src/main/java/com/pms/ocp/service/OcpApiTenantRelService.java deleted file mode 100644 index e95a0cb4d495e68a01a7b3cf856237e99bc63d6e..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/service/OcpApiTenantRelService.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.pms.ocp.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.pms.ocp.model.entity.OcpApiTenantRel; - -public interface OcpApiTenantRelService extends IService { -} diff --git a/src/main/java/com/pms/ocp/service/OcpApiTreeService.java b/src/main/java/com/pms/ocp/service/OcpApiTreeService.java deleted file mode 100644 index 7fd9f90c708157929dfaca9ed9d0249b3f29fedc..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/service/OcpApiTreeService.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.pms.ocp.service; - - -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.IService; -import com.pms.ocp.model.dto.PageGroupDto; -import com.pms.ocp.model.entity.OcpApiGroup; - -import java.util.List; - - -public interface OcpApiTreeService extends IService { - - /** - * 服务树分类 - */ - List getByGroup(Long apiGroupPromotionType,String apiGroupCode); - - /** - * 新增服务分类 - */ - OcpApiGroup insertTree(OcpApiGroup ocpApiGroup); - - - /* - 修改服务分类 - */ - - - boolean updataOcpTree(OcpApiGroup ocpApiGroup); - - /** - * 删除服务分类 - */ - boolean deleteOcpTree(OcpApiGroup ocpApiGroup); - - /* *//** - * 服务列表分级查询 - * @param - *//* - List getOnePage(int pageSize, int pageNum, int apiGroupLevel);*/ - - - /** - * 服务列表分级查询 - * @param pageGroupDto - * @return - */ - Page getOnePages(PageGroupDto pageGroupDto); - -} diff --git a/src/main/java/com/pms/ocp/service/OcpTenantAuditService.java b/src/main/java/com/pms/ocp/service/OcpTenantAuditService.java deleted file mode 100644 index 621ff39020bc8d761f81e1a3b8314cdf7c41f6d1..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/service/OcpTenantAuditService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.pms.ocp.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.pms.ocp.model.entity.OcpApiTenantRel; -import com.pms.ocp.model.entity.OcpTenantAudit; -import com.pms.ocp.model.vo.ResponseVO; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -public interface OcpTenantAuditService extends IService { - -} diff --git a/src/main/java/com/pms/ocp/service/OcpTenantBaseService.java b/src/main/java/com/pms/ocp/service/OcpTenantBaseService.java deleted file mode 100644 index 9a4c11bc80d9ab02f58f2767c848b93f9cf48582..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/service/OcpTenantBaseService.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.pms.ocp.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.pms.ocp.model.entity.OcpTenantBase; -import com.pms.ocp.model.vo.ResponseVO; - -public interface OcpTenantBaseService extends IService { - - - - -} diff --git a/src/main/java/com/pms/ocp/service/OcpTenantExtentService.java b/src/main/java/com/pms/ocp/service/OcpTenantExtentService.java deleted file mode 100644 index a7839ea07337c1ab2a277653c6ae5261f6f6cd92..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/service/OcpTenantExtentService.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.pms.ocp.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.pms.ocp.model.entity.OcpTenantExtent; - -public interface OcpTenantExtentService extends IService { -} diff --git a/src/main/java/com/pms/ocp/service/OcpTenantGroupService.java b/src/main/java/com/pms/ocp/service/OcpTenantGroupService.java deleted file mode 100644 index de0e675d60303cc622c586e6da6bf58837246747..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/service/OcpTenantGroupService.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.pms.ocp.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.pms.ocp.model.entity.OcpTenantGroup; - -public interface OcpTenantGroupService extends IService { -} diff --git a/src/main/java/com/pms/ocp/service/OcpTenantSubsService.java b/src/main/java/com/pms/ocp/service/OcpTenantSubsService.java deleted file mode 100644 index 60c04c655d21c5d6a318911cee17c89a469ec22a..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/service/OcpTenantSubsService.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.pms.ocp.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.pms.ocp.model.entity.OcpTenantSubs; -import com.pms.ocp.model.vo.ResponseVO; - -public interface OcpTenantSubsService extends IService { - -} diff --git a/src/main/java/com/pms/ocp/service/PmsApiAuditService.java b/src/main/java/com/pms/ocp/service/PmsApiAuditService.java deleted file mode 100644 index 223f2ab7e474567c74c576e38875da948876f130..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/service/PmsApiAuditService.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.pms.ocp.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.pms.ocp.model.entity.OcpApiAudit; -import com.pms.ocp.model.entity.PmsApiAudit; -import com.pms.ocp.model.vo.ResponseVO; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - - -public interface PmsApiAuditService extends IService { - ResponseVO getOcpApiAuditList(PmsApiAudit pmsApiAudit); - - ResponseVO getOcpApiDetails(String objId); - - ResponseVO OaaById(PmsApiAudit pmsApiAudit); - - ResponseVO sById(PmsApiAudit pmsApiAudit); - - void exportExcel(PmsApiAudit pmsApiAudit, HttpServletRequest request, HttpServletResponse response); - - ResponseVO versionId(PmsApiAudit pmsApiAudit); -} diff --git a/src/main/java/com/pms/ocp/service/PmsApiBaseService.java b/src/main/java/com/pms/ocp/service/PmsApiBaseService.java deleted file mode 100644 index 57925d2a4c31af4f4c38554e59631efd6f8c1958..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/service/PmsApiBaseService.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.pms.ocp.service; - - -import com.baomidou.mybatisplus.extension.service.IService; -import com.pms.ocp.model.entity.OcpApiBase; -import org.springframework.stereotype.Service; - -@Service -public interface PmsApiBaseService extends IService { -} diff --git a/src/main/java/com/pms/ocp/service/PmsApiModelRelService.java b/src/main/java/com/pms/ocp/service/PmsApiModelRelService.java deleted file mode 100644 index 88ed0004db4f917b329f9bd8e8bc5fad80e5b171..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/service/PmsApiModelRelService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.pms.ocp.service; - - -import com.baomidou.mybatisplus.extension.service.IService; -import com.pms.ocp.model.entity.OcpApiModelRel; -import com.pms.ocp.model.entity.PmsApiModelRel; -import com.pms.ocp.model.vo.ResponseVO; - -public interface PmsApiModelRelService extends IService { - ResponseVO getOamrList(PmsApiModelRel pmsApiModelRel); -} diff --git a/src/main/java/com/pms/ocp/service/PmsApiSubsService.java b/src/main/java/com/pms/ocp/service/PmsApiSubsService.java deleted file mode 100644 index 96390f17227a2cd9b5868dec3a05845c11826d7d..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/service/PmsApiSubsService.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.pms.ocp.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.pms.ocp.model.entity.OcpApiSubs; -import com.pms.ocp.model.entity.PmsApiSubs; -import com.pms.ocp.model.vo.ResponseVO; - -public interface PmsApiSubsService extends IService { - ResponseVO getPmsApiSubsList(PmsApiSubs pmsApiSubs); -} diff --git a/src/main/java/com/pms/ocp/service/PmsApiTenantRelService.java b/src/main/java/com/pms/ocp/service/PmsApiTenantRelService.java deleted file mode 100644 index 9764beb63e3cd59433cee354cfcbd815de50cb6d..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/service/PmsApiTenantRelService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.pms.ocp.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.pms.ocp.model.entity.OcpApiTenantRel; -import com.pms.ocp.model.entity.PmsApiTenantRel; -import com.pms.ocp.model.vo.ResponseVO; - - -public interface PmsApiTenantRelService extends IService { - ResponseVO getOatrList(PmsApiTenantRel pmsApiTenantRel); - - ResponseVO getTenantApiList(PmsApiTenantRel pmsApiTenantRel); -} diff --git a/src/main/java/com/pms/ocp/service/PmsTenantAuditService.java b/src/main/java/com/pms/ocp/service/PmsTenantAuditService.java deleted file mode 100644 index bbd10851f0ab379809ce7e63b2e4f5de821d8c04..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/service/PmsTenantAuditService.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.pms.ocp.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.pms.ocp.model.entity.OcpApiTenantRel; -import com.pms.ocp.model.entity.OcpTenantAudit; -import com.pms.ocp.model.entity.PmsTenantAudit; -import com.pms.ocp.model.vo.ResponseVO; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -public interface PmsTenantAuditService extends IService { - ResponseVO getOtaList(PmsTenantAudit pmsTenantAudit); - - ResponseVO getOtaListById(PmsTenantAudit pmsTenantAudit); - - void exportExcel(PmsTenantAudit pmsTenantAudit, HttpServletRequest request, HttpServletResponse response); - - ResponseVO OtaById(PmsTenantAudit pmsTenantAudit); - - ResponseVO versionId(PmsTenantAudit pmsTenantAudit); -} diff --git a/src/main/java/com/pms/ocp/service/PmsTenantBaseService.java b/src/main/java/com/pms/ocp/service/PmsTenantBaseService.java deleted file mode 100644 index 07f7755befbd146e820b94aa91694fe168cb8ff1..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/service/PmsTenantBaseService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.pms.ocp.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.pms.ocp.model.entity.OcpTenantBase; -import com.pms.ocp.model.entity.PmsTenantBase; -import com.pms.ocp.model.vo.ResponseVO; - -public interface PmsTenantBaseService extends IService { - ResponseVO getOtbList(PmsTenantBase pmsTenantBase); - - - -} diff --git a/src/main/java/com/pms/ocp/service/PmsTenantSubsService.java b/src/main/java/com/pms/ocp/service/PmsTenantSubsService.java deleted file mode 100644 index fff30107cb6e151bb3fa47d07594bb3c93ac6b52..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/service/PmsTenantSubsService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.pms.ocp.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.pms.ocp.model.entity.PmsTenantSubs; -import com.pms.ocp.model.vo.ResponseVO; - - - -public interface PmsTenantSubsService extends IService { - ResponseVO getOcpTenantList(PmsTenantSubs pmsTenantSubs); -} diff --git a/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java b/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java deleted file mode 100644 index 3a35a3ab4b9b32cc3ba92f3966b5d4a3b187c668..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.pms.ocp.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.github.pagehelper.PageInfo; -import com.pms.ocp.model.dto.GroupDto; -import com.pms.ocp.model.dto.OcpTenantBaseDto; -import com.pms.ocp.model.dto.TenantDto; -import com.pms.ocp.model.dto.WholeLinkParamDto; -import com.pms.ocp.model.entity.OcpApiGroup; -import com.pms.ocp.model.entity.OcpTenantBase; -import com.pms.ocp.model.entity.OcpTenantGroup; -import com.pms.ocp.model.vo.OcpApiBaseVo; -import com.pms.ocp.model.vo.ResponseVO; - -import java.sql.Timestamp; -import java.util.List; - -/** - * @author guofanfan - */ -public interface TenantBasicManagementService extends IService { - /** - * 条件查询 - * @param tenantCode - * @param keyword - * @param tenantUnit - * @param startTime - * @param endTime - * @param pageSize - * @param pageNum - * @return - */ - List queryOcpTenantBaseDto(String tenantGroupCode,String tenantCode, String keyword, String tenantUnit, Timestamp startTime, Timestamp endTime, Integer pageSize, Integer pageNum); - - /** - * 应用发布 改变其应用状态 - * @param tenantCodes 应用代码 - * @return - */ - ResponseVO tenantIssue(String tenantCodes); - - /** - * 应用订阅 - * @param tenantCodes - */ - ResponseVO tenantLogin(String tenantCodes,String companyCode); - - /** - * 下线 - * @param tenantCodes - * @return - */ - ResponseVO tenantCancel(String tenantCodes); - - /** - * 应用注册 - * @param ocpTenantBaseDto - */ - ResponseVO applyRegister(OcpTenantBaseDto ocpTenantBaseDto); - - /** - * 应用树层级 - * @param tenantGroupCode - * @param tenantGroupCompanyCode - * @return - */ - List tenantBaseTreeOther(String tenantGroupCode, String tenantGroupCompanyCode); - - /** - * 应用列表 - * @param tenantDto - * @return - */ - ResponseVO> getBaseByGroupCode(TenantDto tenantDto); - - - - /** - * 应用树底层 - * @param tenantGroupCode - * @param tenantGroupCompanyCode - * @return - */ - List tenantBaseTree(String tenantGroupCode, String tenantGroupCompanyCode); - - /** - * 应用注册查询 - * @param tenantGroupCode - * @param tenantGroupCompanyCode - * @return - */ - OcpTenantGroup selectRegister(String tenantGroupCode, String tenantGroupCompanyCode); - - /** - * 应用树 - * @param tenantGroupCode - */ - -} diff --git a/src/main/java/com/pms/ocp/service/TenantService.java b/src/main/java/com/pms/ocp/service/TenantService.java deleted file mode 100644 index abd2e53bb19fce39147296b6c914b3dfea5325e1..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/service/TenantService.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.pms.ocp.service; - -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.IService; - -import com.pms.ocp.model.dto.*; -import com.pms.ocp.model.entity.OcpApiGroup; -import com.pms.ocp.model.entity.OcpTenantGroup; -import com.pms.ocp.model.vo.ResponseVO; - -import java.util.List; -import java.util.Set; - -public interface TenantService extends IService { - /** - * 应用树分类管理 - * @return - */ - List getTree(String tenantGroupCode,String tenantGroupCompanyCode,String level); - - /** - * 应用新增 - * @param - * @return - */ - OcpTenantGroup getTenanInster(TenanBaseDto TenanBaseDto); - - /** - * 修改应用 - * @param ocpTenantGroup - * @return - */ - boolean getTenantUpdata(OcpTenantGroup ocpTenantGroup); - - /** - * 删除服务 - * @param ocpTenantGroup - * @return - */ - boolean gettenantDelete(OcpTenantGroup ocpTenantGroup); - - - - - /** - * 应用--查询 - * @param tenantGroupCode - * @param tenantGroupCompanyCode - * @return - */ - Page getselects(String tenantGroupCode,String tenantGroupCompanyCode,int currentPage,int pageSize,String text,String lev); - - - -} diff --git a/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java deleted file mode 100644 index e00a23b9cae518feafc32bdf09bde67b91120bbb..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java +++ /dev/null @@ -1,262 +0,0 @@ -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.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.IService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.pms.ocp.common.constants.StringUtils; -import com.pms.ocp.common.exception.BeagleException; -import com.pms.ocp.common.utils.MenuTree; -import com.pms.ocp.mapper.ApiBasicManagementMapper; -import com.pms.ocp.mapper.OcpApiExtentMapper; -import com.pms.ocp.mapper.OcpApiGroupMapper; -import com.pms.ocp.mapper.OcpApiSubsMapper; -import com.pms.ocp.model.CommonCode; -import com.pms.ocp.model.QueryResponseResult; -import com.pms.ocp.model.dto.ApiBaseDto; -import com.pms.ocp.model.dto.OcpApiBaseDto; -import com.pms.ocp.model.dto.WholeLinkParamDto; -import com.pms.ocp.model.entity.OcpApiBase; -import com.pms.ocp.model.entity.OcpApiExtent; -import com.pms.ocp.model.entity.OcpApiGroup; -import com.pms.ocp.model.entity.OcpApiSubs; -import com.pms.ocp.model.vo.*; - -import com.pms.ocp.service.ApiBasicManagementService; -import com.pms.ocp.service.OcpApiExtentService; - - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.sql.Timestamp; -import java.time.LocalDateTime; - -import java.util.ArrayList; -import java.util.Arrays; - -import java.util.List; -import java.util.stream.Collectors; - -@Service -public class ApiBasicManagementServiceImpl extends ServiceImpl - implements ApiBasicManagementService { - @Autowired - private ApiBasicManagementMapper apiBasicManagementMapper; - @Autowired - private OcpApiSubsMapper ocpApiSubsMapper; - @Autowired - private OcpApiExtentService ocpApiExtentService; - @Autowired - private OcpApiExtentMapper ocpApiExtentMapper; - @Autowired - private OcpApiGroupMapper ocpApiGroupMapper; - - List apiGroupCode = new ArrayList<>(); - /** - * 导出查询 - * - * @param apiCodes - * @return - */ - public List selectApiExport(String apiCodes) { - String[] split = apiCodes.split(","); - List list = Arrays.asList(split); - return apiBasicManagementMapper.selectApiExport(list); - - } - - /** - * 服务注册 - * - * @param ocpApiBase - */ - public void addOcpApiBase(OcpApiBase ocpApiBase) { - apiBasicManagementMapper.insert(ocpApiBase); - } - - /** - * 服务订阅 - * - * @param apiCodes - */ - public void apiLogin(String apiCodes) { - String[] split = apiCodes.split(","); - List apiCode = Arrays.asList(split); - for (String s : apiCode) { - OcpApiSubs ocpApiSubs = new OcpApiSubs(); - ocpApiSubs.setApiCode(s); - ocpApiSubs.setSubsLogApiCtime(Timestamp.valueOf(LocalDateTime.now())); - ocpApiSubs.setSubsLogApiMtime(Timestamp.valueOf(LocalDateTime.now())); - ocpApiSubs.setSubsLogApiUserId(null); - ocpApiSubs.setSubsLogApiAtime(Timestamp.valueOf(LocalDateTime.now())); - ocpApiSubs.setSubsCompanyCode(null); - ocpApiSubsMapper.insert(ocpApiSubs); - } - } - /** - * 条件查询 - * - * @param apiCode - * @param keyword - * @param apiUnit - * @param startTime - * @param endTime - * @return - */ - @Override - public List queryOcpApiBaseDto(String apiCode, String keyword, String apiUnit, Timestamp startTime, Timestamp endTime, int pageSize, int pageNum) { - pageSize = (pageSize - 1) * pageNum; - return apiBasicManagementMapper.queryOcpApiBaseDto(keyword, apiUnit, startTime, endTime, apiCode, pageSize, pageNum); - } - - - /** - * 导入添加到数据库 - * - * @param personList - */ - public void apiImport(List personList) { - for (OcpApiBaseVo ocpApiBaseVo : personList) { - String apiCode = ocpApiBaseVo.getApiCode(); - Timestamp apiCtime = ocpApiBaseVo.getApiCtime(); - String apiName = ocpApiBaseVo.getApiName(); - String apiUnit = ocpApiBaseVo.getApiUnit(); - String apiUrl = ocpApiBaseVo.getApiUrl(); - String apiState = ocpApiBaseVo.getApiState(); - String spaceName = ocpApiBaseVo.getSpaceName(); - String clusterName = ocpApiBaseVo.getClusterName(); - OcpApiBase ocpApiBase = new OcpApiBase(); - ocpApiBase.setApiCode(apiCode); - ocpApiBase.setApiGroupCode("1"); - ocpApiBase.setApiCtime(apiCtime); - ocpApiBase.setApiName(apiName); - ocpApiBase.setApiUnit(apiUnit); - ocpApiBase.setApiUrl(apiUrl); - this.save(ocpApiBase); - OcpApiExtent ocpApiExtent = new OcpApiExtent(); - ocpApiExtent.setApiCode(apiCode); - ocpApiExtent.setApiState(apiState); - ocpApiExtent.setSpaceName(spaceName); - ocpApiExtent.setClusterName(clusterName); - ocpApiExtentService.save(ocpApiExtent); - - } - } - - /** - * 服务发布 - * - * @param apiCodes - */ - public ResponseVO apiIssue(String apiCodes) { - String[] split = apiCodes.split(","); - List list = Arrays.asList(split); - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.in(OcpApiExtent::getApiCode, list); - List ocpApiExtents = ocpApiExtentMapper.selectList(lambdaQueryWrapper); - for (OcpApiExtent ocpApiExtent : ocpApiExtents) { - if (ocpApiExtent.getApiState().equals("1")) { - return ResponseVO.error("已发布"); - } else { - ocpApiExtent.setApiState("1"); - ocpApiExtentMapper.updateById(ocpApiExtent); - } - } - return ResponseVO.ok(); - } - - @Override - public List apiBaseTree(String apiGroupCompanyCode) { - List ocpApiGroups = ocpApiGroupMapper.selectTreeList(apiGroupCompanyCode); - return ocpApiGroups; - } - - @Override - public List apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupPcode,Integer apiGroupPromotionType) { - List ocpApiGroups = ocpApiGroupMapper.apiBaseTreeOther(apiGroupCompanyCode,apiGroupPcode,apiGroupPromotionType); - return ocpApiGroups; - } - - @Override - public ResponseVO> getBaseByGroupCode(ApiBaseDto apiBaseReq) { - if (apiBaseReq.getPageNum() == null || apiBaseReq.getPageSize() == null) { - return ResponseVO.error("分页参数不能为空"); - } - apiGroupCode.add(apiBaseReq.getApiGroupCode()); - setGroupIdValue(apiBaseReq.getApiGroupCompanyCode() ,apiBaseReq.getApiGroupCode(),apiBaseReq.getApiPromotion()); - PageHelper.startPage(apiBaseReq.getPageNum(),apiBaseReq.getPageSize()); - apiBaseReq.setApiGroupCodeList(apiGroupCode); - List ocpApiBaseVos = ocpApiGroupMapper.selectPageLists(apiBaseReq); - apiGroupCode.clear(); - PageInfo pageInfo = new PageInfo<>(ocpApiBaseVos); - return ResponseVO.ok(pageInfo); - } - - @Override - public List apiBaseTreeApiList(String apiGroupCompanyCode, String apiGroupPcode) { - QueryWrapper qw = new QueryWrapper(); - if (!StringUtils.isEmpty(apiGroupPcode)) { - qw.eq("api_group_code", apiGroupPcode); - } - if (!StringUtils.isEmpty(apiGroupCompanyCode)) { - qw.eq("owner_company_code", apiGroupCompanyCode); - } - - return apiBasicManagementMapper.selectList(qw); - } - -// /** -// * 服务列表2 -// * @param wholeLinkParamDto -// * @return -// */ -// @Override -// public ResponseVO queryApiTreeData(WholeLinkParamDto wholeLinkParamDto) { -// List apiTreeDataList = ocpApiGroupMapper.queryApiTreeData1(); -// List list = new ArrayList<>(); -// for (WholeLinkTreeVo wholeLinkTreeVo : apiTreeDataList) { -// Menu menu = new Menu(); -// menu.setId(wholeLinkTreeVo.getApiGroupCode()); -// menu.setParentId(wholeLinkTreeVo.getApiGroupPcode()); -// menu.setText(wholeLinkTreeVo.getApiGroupName()); -// menu.setType(wholeLinkTreeVo.getApiGroupPromotionType()); -// list.add(menu); -// } -// MenuTree menuTree = new MenuTree(list); -// list = menuTree.builTree(); -// return ResponseVO.ok(list); -// } - - /** - * 分组权限分组使用in查询 - * - * @param - * @param - */ - private void setGroupIdValue(String apiGroupCompanyCode ,String code,Integer apiGroupPromotionType) { - List codes = getIdsByPIdPub(apiGroupCompanyCode,code,apiGroupPromotionType); - if(codes.size()>0){ - for (String cod : codes ){ - setGroupIdValue(apiGroupCompanyCode,cod,apiGroupPromotionType); - apiGroupCode.add(cod); - }; - } - } - - /** - * pcode服务分组 - * @param apiGroupCompanyCode - * @param code - * @return - */ - public List getIdsByPIdPub(String apiGroupCompanyCode,String code,Integer apiGroupPromotionType) { - List ocpApiGroups = ocpApiGroupMapper.apiBaseTreeOther(apiGroupCompanyCode, code,apiGroupPromotionType); - return ocpApiGroups.stream().map(OcpApiGroup::getApiGroupCode).collect(Collectors.toList()); - } - -} diff --git a/src/main/java/com/pms/ocp/service/impl/ApiDetailsServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ApiDetailsServiceImpl.java deleted file mode 100644 index bb200b47d1fc0c011a426749eacce35bbaa0865d..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/service/impl/ApiDetailsServiceImpl.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.pms.ocp.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.pms.ocp.mapper.ApiDetailsMapper; -import com.pms.ocp.model.dto.ApiBaseDto; -import com.pms.ocp.model.entity.OcpApiBase; -import com.pms.ocp.model.entity.OcpApiExtent; -import com.pms.ocp.model.entity.OcpApiSubs; -import com.pms.ocp.model.vo.OcpApiBaseVo; -import com.pms.ocp.model.vo.ResponseVO; -import com.pms.ocp.service.ApiDetailsService; -import com.pms.ocp.service.OcpApiExtentService; -import com.pms.ocp.service.OcpApiSubsService; -import org.apache.poi.ss.usermodel.Cell; -import org.apache.poi.ss.usermodel.Row; -import org.apache.poi.xssf.usermodel.XSSFRow; -import org.apache.poi.xssf.usermodel.XSSFSheet; -import org.apache.poi.xssf.usermodel.XSSFWorkbook; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.StringUtils; -import org.springframework.web.multipart.MultipartFile; - -import java.io.IOException; -import java.sql.Timestamp; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -@Service -public class ApiDetailsServiceImpl implements ApiDetailsService { - - - @Autowired - private ApiDetailsMapper apiDetailsMapper; - - - @Override - public ResponseVO getApiDetails(String apiCode) { - OcpApiBaseVo ocpApiBase = apiDetailsMapper.selectByCode(apiCode); - return ResponseVO.ok(ocpApiBase); - } - - -} diff --git a/src/main/java/com/pms/ocp/service/impl/AppArrangeServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/AppArrangeServiceImpl.java deleted file mode 100644 index 0da47c30b9814b0ed2ecdbb6d3e9e10fd5d486d9..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/service/impl/AppArrangeServiceImpl.java +++ /dev/null @@ -1,45 +0,0 @@ -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 ocpTenantGroups = appArrangeMapper.selectList(null); - for (OcpTenantGroup tenantGroup : ocpTenantGroups) { - String code = tenantGroup.getTenantGroupCode(); - if (code == ocpTenantGroup.getTenantGroupCode()) { - falg = false; - break; - } - } - appArrangeMapper.updateById(ocpTenantGroup); - return falg; - } -} diff --git a/src/main/java/com/pms/ocp/service/impl/ModelGroupServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ModelGroupServiceImpl.java deleted file mode 100644 index 030d8d32e00f6a583e9b0c130bbd85c743d3f497..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/service/impl/ModelGroupServiceImpl.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.pms.ocp.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.pms.ocp.common.constants.CodeEnum; -import com.pms.ocp.mapper.ModelTypeMapper; -import com.pms.ocp.model.entity.ModelClassify; -import com.pms.ocp.model.vo.ResponseVO; -import com.pms.ocp.service.ModelGroupService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; - -import java.util.List; - -@Service -public class ModelGroupServiceImpl implements ModelGroupService { - - @Autowired - private ModelTypeMapper modelTypeMapper; - - /** - * 获取模型类型 - * @return - */ - @Override - public ResponseVO getModelType() { - QueryWrapper wrapper = new QueryWrapper<>(); - List modelClassifyList = modelTypeMapper.selectList(wrapper); - if(CollectionUtils.isEmpty(modelClassifyList)){ - return ResponseVO.error("查询列表为空"); - }else{ - return ResponseVO.ok(modelClassifyList); - } - } - - @Override - public ResponseVO createModelType(ModelClassify modelClassify) { - int result = modelTypeMapper.insert(modelClassify); - if(result>0){ - return ResponseVO.error(CodeEnum.SUCCESS); - }else{ - return ResponseVO.ok(CodeEnum.INSERT_FAIL); - } - } - - @Override - public ResponseVO deleteModelType(String modelTypeId) { - int result = modelTypeMapper.deleteById(modelTypeId); - if (result > 0) { - return ResponseVO.error(CodeEnum.SUCCESS); - } else { - return ResponseVO.ok(CodeEnum.UNKNOWN); - } - } - - @Override - public ResponseVO updateModelType(ModelClassify modelClassify) { - int result = modelTypeMapper.updateById(modelClassify); - if (result > 0) { - return ResponseVO.error(CodeEnum.SUCCESS); - } else { - return ResponseVO.ok(CodeEnum.UP_DATA_FAIL); - } - } -} diff --git a/src/main/java/com/pms/ocp/service/impl/OcpApiExtentServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpApiExtentServiceImpl.java deleted file mode 100644 index de213848f3a92d0433fe77d345e8d3c1a33bd2b2..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiExtentServiceImpl.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.pms.ocp.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pms.ocp.mapper.OcpApiExtentMapper; -import com.pms.ocp.model.entity.OcpApiExtent; -import com.pms.ocp.service.OcpApiExtentService; -import org.springframework.stereotype.Service; - -@Service -public class OcpApiExtentServiceImpl extends ServiceImpl implements OcpApiExtentService { -} diff --git a/src/main/java/com/pms/ocp/service/impl/OcpApiSubsServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpApiSubsServiceImpl.java deleted file mode 100644 index 81cae1972afca55d88095e00b41380aae41e04f1..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiSubsServiceImpl.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.pms.ocp.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pms.ocp.mapper.OcpApiSubsMapper; -import com.pms.ocp.model.entity.OcpApiSubs; -import com.pms.ocp.service.OcpApiSubsService; -import org.springframework.stereotype.Service; - -@Service -public class OcpApiSubsServiceImpl extends ServiceImpl implements OcpApiSubsService { -} diff --git a/src/main/java/com/pms/ocp/service/impl/OcpApiTenantRelServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpApiTenantRelServiceImpl.java deleted file mode 100644 index e022f8c57f9be3dbbf9254d0275cc3b2f7b64df4..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiTenantRelServiceImpl.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.pms.ocp.service.impl; - - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pms.ocp.mapper.OcpApiTenantRelMapper; -import com.pms.ocp.model.entity.OcpApiTenantRel; -import com.pms.ocp.service.OcpApiTenantRelService; -import org.springframework.stereotype.Service; - -@Service -public class OcpApiTenantRelServiceImpl extends ServiceImpl implements OcpApiTenantRelService { -} diff --git a/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java deleted file mode 100644 index a989f17dcec37ad72fd29e318ff40da9d9ea5fb7..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java +++ /dev/null @@ -1,179 +0,0 @@ -package com.pms.ocp.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; - -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -import com.pms.ocp.common.utils.RandomStringUtils; -import com.pms.ocp.mapper.OcpApiBaseMapper; -import com.pms.ocp.mapper.OcpApiTreeMapper; -import com.pms.ocp.model.QueryResponseResult; -import com.pms.ocp.model.dto.*; -import com.pms.ocp.model.entity.OcpApiGroup; - -import com.pms.ocp.model.entity.OcpTenantGroup; -import com.pms.ocp.service.OcpApiTreeService; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.sql.Timestamp; -import java.util.List; -import java.util.stream.Stream; - - -@Service -@Slf4j -public class OcpApiTreeServiceImpl extends ServiceImpl implements OcpApiTreeService { - - - @Autowired - private OcpApiTreeMapper mapper; - - @Autowired - private OcpApiBaseMapper ocpApiBaseMapper; - - /** - * 服务树分类 - * - * @return - */ - - @Override - public List getByGroup(Long apiGroupPromotionType, String apiGroupCode) { - - if (!("".equals(apiGroupPromotionType)) && StringUtils.isBlank(apiGroupCode)) { - List ocpApiGroups = mapper.selectTwoApiGroups(apiGroupPromotionType); - return ocpApiGroups; - } else if (!("".equals(apiGroupPromotionType)) && !(StringUtils.isBlank(apiGroupCode))) { - List ocpApiGroups = mapper.selectThreeApiGroupsList(apiGroupPromotionType, apiGroupCode); - return ocpApiGroups; - } - - return null; - } - - - /** - * 新增服务分类 - * - * @param - */ - @Override - public OcpApiGroup insertTree(OcpApiGroup ocpApiGroup) { - Timestamp timestamp = new Timestamp(System.currentTimeMillis()); - String code = RandomStringUtils.getRandomString(6); - boolean flag = true; - List ocpApiGroups = mapper.selectList(null); - Stream ocpApiGroupStream = ocpApiGroups.stream().filter(item -> item.getApiGroupCode().equals(ocpApiGroup.getApiGroupPcode())); - Stream apiGroupStream1 = ocpApiGroupStream.filter(ocp -> ocp.getApiGroupName().equals(ocpApiGroup.getApiGroupName())); - OcpApiGroup ocpApi = new OcpApiGroup(); - if (!(StringUtils.isBlank(apiGroupStream1.toString()))) { - - ocpApi.setApiGroupPromotionType(ocpApiGroup.getApiGroupPromotionType()); - BeanUtils.copyProperties(ocpApiGroup, ocpApi); - ocpApi.setObjId(""); - ocpApi.setApiGroupMtime(timestamp); - ocpApi.setApiGroupCtime(timestamp); - ocpApi.setApiGroupPcode(ocpApiGroup.getApiGroupCode()); - ocpApi.setApiGroupCode(code); - ocpApi.setApiGroupPromotionType(ocpApiGroup.getApiGroupPromotionType()); - if ("Middleground".equals(ocpApiGroup.getApiGroupLevel())) { - ocpApiGroup.setApiGroupLevel("sys_center"); - } - if ("sys_center".equals(ocpApiGroup.getApiGroupLevel())) { - ocpApiGroup.setApiGroupLevel("api_group"); - } - mapper.insert(ocpApi); - } else { - return ocpApi; - } - return ocpApi; - - } - - - /** - * 修改服务分类提交 - * - * @param - */ - @Override - public boolean updataOcpTree(OcpApiGroup ocpApiGroup) { - Timestamp timestamp = new Timestamp(System.currentTimeMillis()); - boolean falg = true; - List ocpApiGroups = mapper.selectList(null); - for (OcpApiGroup apiGroup : ocpApiGroups) { - String code = apiGroup.getApiGroupCode(); - if (code == ocpApiGroup.getApiGroupCode()) { - falg = false; - break; - } - } - ocpApiGroup.setApiGroupMtime(timestamp); - mapper.updateById(ocpApiGroup); - return falg; - } - - - /** - * 删除服务分类 - * - * @param ocpApiGroup - */ - @Override - public boolean deleteOcpTree(OcpApiGroup ocpApiGroup) { - boolean flag = true; - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(OcpApiGroup::getApiGroupCode, ocpApiGroup.getApiGroupCode()); - String objId = ocpApiGroup.getObjId(); - if (StringUtils.isBlank(ocpApiGroup.getApiGroupCode())) { - flag = false; - } else { - - LambdaQueryWrapper eq = queryWrapper.eq(OcpApiGroup::getApiGroupPcode, ocpApiGroup.getApiGroupCode()); - if (StringUtils.isBlank(eq.toString())) { - flag = false; - } - } - if (flag) { - mapper.deleteById(objId); - } - return flag; - } - - - /** - * 服务列表分级查询 - * - * @param pageGroupDto - * @return - */ - @Override - public Page getOnePages(PageGroupDto pageGroupDto) { - Page pageInfo = new Page(pageGroupDto.getPageNum(), pageGroupDto.getPageSize()); - LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); - if (StringUtils.isBlank(pageGroupDto.getKeyword())) { - if (StringUtils.isBlank(pageGroupDto.getApiGroupCode())){ - qw.eq(OcpApiGroup::getApiGroupPromotionType, pageGroupDto.getApiGroupPromotionType()); - mapper.selectPage(pageInfo, qw); - - } else if(!(StringUtils.isNotBlank(pageGroupDto.getApiGroupPcode()))){ - List ocpApiGroups = mapper.selectLists(pageGroupDto.getApiGroupPromotionType(), pageGroupDto.getApiGroupCode()); - pageInfo.setRecords(ocpApiGroups); - pageInfo.setTotal(ocpApiGroups.size()); - } - } else { - LambdaQueryWrapper ocpTenantGroupLambdaQueryWrapper = qw.and(c -> c.like(OcpApiGroup::getApiGroupName, pageGroupDto.getKeyword())) - .or().like(OcpApiGroup::getApiGroupUserName, pageGroupDto.getKeyword()) - .or().like(OcpApiGroup::getApiGroupPcode, pageGroupDto.getKeyword()); - mapper.selectPage(pageInfo, ocpTenantGroupLambdaQueryWrapper); - } - return pageInfo; - } -} - - diff --git a/src/main/java/com/pms/ocp/service/impl/OcpTenantAuditServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpTenantAuditServiceImpl.java deleted file mode 100644 index 72e7bd81857a1caef07c25752868620cabf191c2..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/service/impl/OcpTenantAuditServiceImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.pms.ocp.service.impl; - -import cn.afterturn.easypoi.excel.ExcelExportUtil; -import cn.afterturn.easypoi.excel.entity.ExportParams; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pms.ocp.common.constants.AnalysisConstant; -import com.pms.ocp.common.constants.ExportUtils; -import com.pms.ocp.mapper.OcpApiTenantRelMapper; -import com.pms.ocp.mapper.OcpTenantAuditMapper; -import com.pms.ocp.model.entity.OcpApiTenantRel; -import com.pms.ocp.model.entity.OcpTenantAudit; -import com.pms.ocp.model.vo.ResponseVO; -import com.pms.ocp.service.OcpTenantAuditService; -import org.apache.poi.ss.usermodel.Workbook; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.util.List; - -@Service -public class OcpTenantAuditServiceImpl extends ServiceImpl implements OcpTenantAuditService { - - - -} diff --git a/src/main/java/com/pms/ocp/service/impl/OcpTenantBaseServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpTenantBaseServiceImpl.java deleted file mode 100644 index 59beec8b98982671b9ef0724622767ac70e95c57..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/service/impl/OcpTenantBaseServiceImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.pms.ocp.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pms.ocp.common.constants.*; -import com.pms.ocp.common.exception.ServiceException; -import com.pms.ocp.mapper.OcpTenantBaseMapper; -import com.pms.ocp.model.entity.OcpTenantBase; -import com.pms.ocp.model.vo.ResponseVO; -import com.pms.ocp.service.OcpTenantBaseService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - - -import java.util.LinkedList; -import java.util.List; - - -@Service -public class OcpTenantBaseServiceImpl extends ServiceImpl implements OcpTenantBaseService { - - - - - - - - - -} diff --git a/src/main/java/com/pms/ocp/service/impl/OcpTenantExtentServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpTenantExtentServiceImpl.java deleted file mode 100644 index d9d0f0d4e1017eb9cdbe8638b47df232be40485d..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/service/impl/OcpTenantExtentServiceImpl.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.pms.ocp.service.impl; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pms.ocp.mapper.OcpTenantExtentMapper; -import com.pms.ocp.model.entity.OcpTenantExtent; -import com.pms.ocp.service.OcpTenantExtentService; -import org.springframework.stereotype.Service; - -@Service -public class OcpTenantExtentServiceImpl extends ServiceImpl implements OcpTenantExtentService { -} diff --git a/src/main/java/com/pms/ocp/service/impl/OcpTenantGroupServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpTenantGroupServiceImpl.java deleted file mode 100644 index e32565742ed79e1dfbfc3d651826cfc889466f75..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/service/impl/OcpTenantGroupServiceImpl.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.pms.ocp.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pms.ocp.mapper.OcpTenantGroupMapper; -import com.pms.ocp.model.entity.OcpTenantGroup; -import com.pms.ocp.service.OcpTenantGroupService; -import org.springframework.stereotype.Service; - -@Service -public class OcpTenantGroupServiceImpl extends ServiceImpl implements OcpTenantGroupService { -} diff --git a/src/main/java/com/pms/ocp/service/impl/OcpTenantSubsServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpTenantSubsServiceImpl.java deleted file mode 100644 index 0c31fb821180dcf639898a4d1129dc578c97a7d6..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/service/impl/OcpTenantSubsServiceImpl.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.pms.ocp.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pms.ocp.mapper.OcpTenantSubsMapper; -import com.pms.ocp.model.entity.OcpTenantSubs; -import com.pms.ocp.model.vo.ResponseVO; -import com.pms.ocp.service.OcpTenantSubsService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -public class OcpTenantSubsServiceImpl extends ServiceImpl implements OcpTenantSubsService { - -} \ No newline at end of file diff --git a/src/main/java/com/pms/ocp/service/impl/PmsApiAuditServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/PmsApiAuditServiceImpl.java deleted file mode 100644 index c50da11f824dd7eded76494ec5ef14c6ac63e30b..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/service/impl/PmsApiAuditServiceImpl.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.pms.ocp.service.impl; - - -import cn.afterturn.easypoi.excel.ExcelExportUtil; -import cn.afterturn.easypoi.excel.entity.ExportParams; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pms.ocp.common.constants.AnalysisConstant; -import com.pms.ocp.common.constants.ExportUtils; -import com.pms.ocp.mapper.OcpApiAuditMapper; -import com.pms.ocp.mapper.PmsApiAuditMapper; -import com.pms.ocp.model.entity.OcpApiAudit; -import com.pms.ocp.model.entity.PmsApiAudit; -import com.pms.ocp.model.vo.ResponseVO; -import com.pms.ocp.service.PmsApiAuditService; -import org.apache.poi.ss.usermodel.Workbook; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.util.List; - -@Service -public class PmsApiAuditServiceImpl extends ServiceImpl implements PmsApiAuditService { - - @Autowired - private PmsApiAuditMapper pmsApiAuditMapper; - - @Override - public ResponseVO getOcpApiAuditList(PmsApiAudit pmsApiAudit) { - List pmsApiAuditList = pmsApiAuditMapper.getOcpApiSubsList(pmsApiAudit); - return ResponseVO.ok(pmsApiAuditList); - } - - - @Override - public ResponseVO getOcpApiDetails(String objId) { - PmsApiAudit pmsApiAudit = pmsApiAuditMapper.selectById(objId); - return ResponseVO.ok(pmsApiAudit); - } - - @Override - public ResponseVO OaaById(PmsApiAudit pmsApiAudit) { - List paam = pmsApiAuditMapper.OaaById(pmsApiAudit); - return ResponseVO.ok(paam); - } - - @Override - public ResponseVO sById(PmsApiAudit pmsApiAudit) { - List oaaById = pmsApiAuditMapper.sById(pmsApiAudit); - return ResponseVO.ok(oaaById); - } - - @Override - public void exportExcel(PmsApiAudit pmsApiAudit, HttpServletRequest request, HttpServletResponse response) { - List oaaById = pmsApiAuditMapper.OaaById(pmsApiAudit); - ExportParams param = new ExportParams(AnalysisConstant.exportOcpApiAuditName.OCPAPIAUDITNAME,AnalysisConstant.exportOcpApiAuditName.OCPAPIAUDITNAME); - Workbook workbook = ExcelExportUtil.exportExcel(param,PmsApiAudit.class,oaaById); - ExportUtils.exportExcel(response, AnalysisConstant.exportOcpApiAuditName.OCPAPIAUDIT,workbook); - } - - @Override - public ResponseVO versionId(PmsApiAudit pmsApiAudit) { - List pmsApiAuditList = pmsApiAuditMapper.versionId(pmsApiAudit); - return ResponseVO.ok(pmsApiAuditList); - } - - -} diff --git a/src/main/java/com/pms/ocp/service/impl/PmsApiBaseServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/PmsApiBaseServiceImpl.java deleted file mode 100644 index db6b2a64cb0df8b6d65852783caf03af210d4bd2..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/service/impl/PmsApiBaseServiceImpl.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.pms.ocp.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pms.ocp.mapper.OcpApiBaseMapper; -import com.pms.ocp.model.entity.OcpApiBase; -import com.pms.ocp.service.PmsApiBaseService; -import org.springframework.stereotype.Service; - -@Service -public class PmsApiBaseServiceImpl extends ServiceImpl implements PmsApiBaseService { - -} diff --git a/src/main/java/com/pms/ocp/service/impl/PmsApiModelRelServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/PmsApiModelRelServiceImpl.java deleted file mode 100644 index 57519afe99d2e588b41b39f5974bccfc6fea821b..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/service/impl/PmsApiModelRelServiceImpl.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.pms.ocp.service.impl; - - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pms.ocp.mapper.PmsApiModelRelMapper; -import com.pms.ocp.model.entity.PmsApiModelRel; -import com.pms.ocp.model.vo.ResponseVO; -import com.pms.ocp.service.PmsApiModelRelService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -public class PmsApiModelRelServiceImpl extends ServiceImpl implements PmsApiModelRelService { - @Autowired - private PmsApiModelRelMapper pmsApiModelRelMapper; - @Override - public ResponseVO getOamrList(PmsApiModelRel pmsApiModelRel) { - List pmsApiModelRelList = pmsApiModelRelMapper.getOamrList(pmsApiModelRel); - return ResponseVO.ok(pmsApiModelRelList); - } -} diff --git a/src/main/java/com/pms/ocp/service/impl/PmsApiSubsServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/PmsApiSubsServiceImpl.java deleted file mode 100644 index 70a63800cec6943b1e47a071566f02ec4aed1075..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/service/impl/PmsApiSubsServiceImpl.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.pms.ocp.service.impl; - - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pms.ocp.mapper.OcpApiSubsMapper; -import com.pms.ocp.mapper.PmsApiSubsMapper; -import com.pms.ocp.model.entity.OcpApiSubs; -import com.pms.ocp.model.entity.PmsApiSubs; -import com.pms.ocp.model.vo.ResponseVO; -import com.pms.ocp.service.PmsApiSubsService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -public class PmsApiSubsServiceImpl extends ServiceImpl implements PmsApiSubsService { - - @Autowired - private PmsApiSubsMapper pmsApiSubsMapper; - @Override - public ResponseVO getPmsApiSubsList(PmsApiSubs pmsApiSubs) { - List pmsApiSubsList = pmsApiSubsMapper.getOcpApisList(pmsApiSubs); - return ResponseVO.ok(pmsApiSubsList); - } -} diff --git a/src/main/java/com/pms/ocp/service/impl/PmsApiTenantRelServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/PmsApiTenantRelServiceImpl.java deleted file mode 100644 index 52839282ab341231e49cf1bd29ca07c409294747..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/service/impl/PmsApiTenantRelServiceImpl.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.pms.ocp.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pms.ocp.mapper.OcpApiTenantRelMapper; -import com.pms.ocp.mapper.PmsApiTenantRelMapper; -import com.pms.ocp.model.entity.OcpApiTenantRel; -import com.pms.ocp.model.entity.PmsApiTenantRel; -import com.pms.ocp.model.vo.ResponseVO; -import com.pms.ocp.service.PmsApiTenantRelService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - - -@Service -public class PmsApiTenantRelServiceImpl extends ServiceImpl implements PmsApiTenantRelService { - @Autowired - private PmsApiTenantRelMapper pmsApiTenantRelMapper; - - - @Override - public ResponseVO getOatrList(PmsApiTenantRel pmsApiTenantRel) { - List oatrList = pmsApiTenantRelMapper.getOatrList(pmsApiTenantRel); - return ResponseVO.ok(oatrList); - } - - @Override - public ResponseVO getTenantApiList(PmsApiTenantRel pmsApiTenantRel) { - List oatrList = pmsApiTenantRelMapper.getTenantApiList(pmsApiTenantRel); - return ResponseVO.ok(oatrList); - } -} diff --git a/src/main/java/com/pms/ocp/service/impl/PmsTenantAuditServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/PmsTenantAuditServiceImpl.java deleted file mode 100644 index 11b0a41f98b7a6b85c4d01aa90451c98444f581e..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/service/impl/PmsTenantAuditServiceImpl.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.pms.ocp.service.impl; - -import cn.afterturn.easypoi.excel.ExcelExportUtil; -import cn.afterturn.easypoi.excel.entity.ExportParams; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pms.ocp.common.constants.AnalysisConstant; -import com.pms.ocp.common.constants.ExportUtils; -import com.pms.ocp.mapper.OcpApiTenantRelMapper; -import com.pms.ocp.mapper.OcpTenantAuditMapper; -import com.pms.ocp.mapper.PmsApiTenantRelMapper; -import com.pms.ocp.mapper.PmsTenantAuditMapper; -import com.pms.ocp.model.entity.OcpApiTenantRel; -import com.pms.ocp.model.entity.OcpTenantAudit; -import com.pms.ocp.model.entity.PmsTenantAudit; -import com.pms.ocp.model.vo.ResponseVO; -import com.pms.ocp.service.OcpTenantAuditService; -import com.pms.ocp.service.PmsTenantAuditService; -import org.apache.poi.ss.usermodel.Workbook; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.util.List; - -@Service -public class PmsTenantAuditServiceImpl extends ServiceImpl implements PmsTenantAuditService { - @Autowired - private PmsTenantAuditMapper pmsTenantAuditMapper; - - @Autowired - private PmsApiTenantRelMapper pmsApiTenantRelMapper; - - @Override - public ResponseVO getOtaList(PmsTenantAudit pmsTenantAudit) { - List otaList = pmsTenantAuditMapper.getOtaList(pmsTenantAudit); - return ResponseVO.ok(otaList); - } - - @Override - public ResponseVO getOtaListById(PmsTenantAudit pmsTenantAudit) { - List otaListById = pmsTenantAuditMapper.getOtaListById(pmsTenantAudit); - return ResponseVO.ok(otaListById); - } - - @Override - public void exportExcel(PmsTenantAudit pmsTenantAudit, HttpServletRequest request, HttpServletResponse response) { - List otaListById = pmsTenantAuditMapper.versionId(pmsTenantAudit); - ExportParams param = new ExportParams(AnalysisConstant.exportOcpTenantApiName.OCPTENANTAPINAME,AnalysisConstant.exportOcpTenantApiName.OCPTENANTAPINAME); - Workbook workbook = ExcelExportUtil.exportExcel(param, PmsTenantAudit.class,otaListById); - ExportUtils.exportExcel(response, AnalysisConstant.exportOcpTenantApiName.OCPTENANTAPINAME,workbook); - } - - @Override - public ResponseVO OtaById(PmsTenantAudit pmsTenantAudit) { - List oatrList = pmsTenantAuditMapper.OtaById(pmsTenantAudit); - return ResponseVO.ok(oatrList); - } - - @Override - public ResponseVO versionId(PmsTenantAudit pmsTenantAudit) { - List ocpTenantAudits = pmsTenantAuditMapper.versionId(pmsTenantAudit); - return ResponseVO.ok(ocpTenantAudits); - } - - -} diff --git a/src/main/java/com/pms/ocp/service/impl/PmsTenantBaseServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/PmsTenantBaseServiceImpl.java deleted file mode 100644 index 01239fb2ca69e0ad62a5f9258bd85b6698fb135a..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/service/impl/PmsTenantBaseServiceImpl.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.pms.ocp.service.impl; - - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pms.ocp.mapper.PmsTenantBaseMapper; -import com.pms.ocp.model.entity.PmsTenantBase; -import com.pms.ocp.model.vo.ResponseVO; -import com.pms.ocp.service.PmsTenantBaseService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; -@Service -public class PmsTenantBaseServiceImpl extends ServiceImpl implements PmsTenantBaseService { - - @Autowired - private PmsTenantBaseMapper pmsTenantBaseMapper; - @Override - public ResponseVO getOtbList(PmsTenantBase pmsTenantBase) { - List otbList = pmsTenantBaseMapper.getOtbList(pmsTenantBase); - return ResponseVO.ok(otbList); - } -} diff --git a/src/main/java/com/pms/ocp/service/impl/PmsTenantSubsServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/PmsTenantSubsServiceImpl.java deleted file mode 100644 index cb66163d2a75450c18b34dc65797791c42302807..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/service/impl/PmsTenantSubsServiceImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.pms.ocp.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pms.ocp.mapper.OcpTenantSubsMapper; -import com.pms.ocp.mapper.PmsTenantSubsMapper; -import com.pms.ocp.model.entity.OcpTenantSubs; -import com.pms.ocp.model.entity.PmsTenantSubs; -import com.pms.ocp.model.vo.ResponseVO; -import com.pms.ocp.service.OcpTenantExtentService; -import com.pms.ocp.service.OcpTenantSubsService; -import com.pms.ocp.service.PmsTenantSubsService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -public class PmsTenantSubsServiceImpl extends ServiceImpl implements PmsTenantSubsService { - @Autowired - private PmsTenantSubsMapper pmsTenantSubsMapper; - - @Override - public ResponseVO getOcpTenantList(PmsTenantSubs pmsTenantSubs) { - List ocpTenantList = pmsTenantSubsMapper.getOcpTenantList(pmsTenantSubs); - return ResponseVO.ok(ocpTenantList); - } -} \ No newline at end of file diff --git a/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java deleted file mode 100644 index 82864993e6e4e3ef15271b94f5163d5f82fc5514..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.pms.ocp.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.pms.ocp.mapper.OcpTenantAuditMapper; -import com.pms.ocp.mapper.OcpTenantExtentMapper; -import com.pms.ocp.mapper.OcpTenantGroupMapper; -import com.pms.ocp.mapper.TenantBasicManagementMapper; -import com.pms.ocp.model.dto.GroupDto; -import com.pms.ocp.model.dto.OcpTenantBaseDto; -import com.pms.ocp.model.dto.TenantDto; -import com.pms.ocp.model.entity.*; -import com.pms.ocp.model.vo.ResponseVO; -import com.pms.ocp.model.vo.TenantGroupVo; -import com.pms.ocp.service.*; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import java.sql.Timestamp; -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; - -@Service - -public class TenantBasicManagementServiceImpl extends ServiceImpl implements TenantBasicManagementService { - @Autowired - private TenantBasicManagementMapper tenantBasicManagementMapper; - @Autowired - private OcpTenantExtentMapper ocpTenantExtentMapper; - @Autowired - private OcpTenantSubsService ocpTenantSubsService; - @Autowired - private OcpApiTenantRelService ocpApiTenantRelService; - @Autowired - private OcpTenantGroupService ocpTenantGroupService; - @Autowired - private OcpTenantGroupMapper ocpTenantGroupMapper; - @Autowired - private OcpTenantAuditMapper ocpTenantAuditMapper; - - List tenantGroup = new ArrayList<>(); - - /** - * 条件查询 - * - * @param tenantCode - * @param keyword - * @param tenantUnit - * @param startTime - * @param endTime - * @param pageSize - * @param pageNum - * @return - */ - @Override - public List queryOcpTenantBaseDto(String tenantGroupCode, String tenantCode, String keyword, String tenantUnit, Timestamp startTime, Timestamp endTime, Integer pageSize, Integer pageNum) { -// if (pageSize == 0 || pageNum == 0) { -// ResponseVO.error("分页参数不能为空"); -// } - pageSize = (pageSize - 1) * pageNum; - return tenantBasicManagementMapper.queryOcpTenantBaseDto(tenantGroupCode, keyword, tenantUnit, startTime, endTime, tenantCode, pageSize, pageNum); - } - - /** - * 应用发布 改变其应用状态 - * - * @param tenantCodes 应用代码 - * @return - */ - @Override - public ResponseVO tenantIssue(String tenantCodes) { - if (StringUtils.isEmpty(tenantCodes)) { - return ResponseVO.error("请选择要发布的应用"); - } - String[] split = tenantCodes.split(","); - List list = Arrays.asList(split); - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.in(OcpTenantExtent::getTenantCode, list); - List ocpTenantExtents = ocpTenantExtentMapper.selectList(lambdaQueryWrapper); - for (OcpTenantExtent ocpTenantExtent : ocpTenantExtents) { - String tenantCode = ocpTenantExtent.getTenantCode(); - if (ocpTenantExtent.getTenantState() == null) { - return ResponseVO.error("数据错误,状态为空"); - } else if (ocpTenantExtent.getTenantState() == 1) { - return ResponseVO.error(tenantCode + "已发布,请勿重复操作"); - } -// else if (ocpTenantExtent.getTenantState() == 2) { -// return ResponseVO.error(tenantCode + "已下线,无法发布"); -// } - else { - ocpTenantExtent.setTenantState((short) 1); - ocpTenantExtentMapper.updateById(ocpTenantExtent); - } - } - return ResponseVO.ok(); - } - - /** - * 应用订阅 - * - * @param tenantCodes - */ - @Override - public ResponseVO tenantLogin(String tenantCodes, String companyCode) { - if (StringUtils.isEmpty(tenantCodes)) { - return ResponseVO.error("请选择要订阅的应用"); - } -// if (StringUtils.isEmpty(companyCode)) { -// return ResponseVO.error("公司编码为空"); -// } - String[] split = tenantCodes.split(","); - List tenantCode = Arrays.asList(split); - for (String s : tenantCode) { - OcpTenantSubs ocpTenantSubs = new OcpTenantSubs(); - ocpTenantSubs.setTenantCode(s); - if (StringUtils.isNotEmpty(companyCode)) { - ocpTenantSubs.setSubsCompanyCode(companyCode); - } else { - ocpTenantSubs.setSubsCompanyCode("1"); - } - ocpTenantSubs.setSubsLogTenantAtime(Timestamp.valueOf(LocalDateTime.now())); - ocpTenantSubs.setSubsLogTenantCtime(Timestamp.valueOf(LocalDateTime.now())); - ocpTenantSubs.setSubsLogTenantMtime(Timestamp.valueOf(LocalDateTime.now())); - ocpTenantSubs.setIsDelete((short) 0); - ocpTenantSubsService.save(ocpTenantSubs); - } - return ResponseVO.ok("订阅成功"); - } - - /** - * 应用下线 - * - * @param tenantCodes - */ - @Override - public ResponseVO tenantCancel(String tenantCodes) { - if (StringUtils.isEmpty(tenantCodes)) { - return ResponseVO.error("请选择要下线的应用"); - } - - String[] split = tenantCodes.split(","); - List list = Arrays.asList(split); - -// LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); -// lambdaQueryWrapper.in(OcpTenantExtent::getTenantCode, list); -// List ocpTenantExtents = ocpTenantExtentMapper.selectList(lambdaQueryWrapper); - - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.in(OcpTenantAudit::getTenantCode, list); - List ocpTenantExtents = ocpTenantAuditMapper.selectList(lambdaQueryWrapper); - - if (ocpTenantExtents.size() == 0) { - return ResponseVO.error("系统错误,数据为空"); - } - for (OcpTenantAudit ocpTenantExtent : ocpTenantExtents) { - String tenantCode = ocpTenantExtent.getTenantCode(); - if (ocpTenantExtent.getOperStatus() == null) { - return ResponseVO.error("系统错误,状态为空"); - } else if (ocpTenantExtent.getOperStatus() == 2) { - - return ResponseVO.error(tenantCode + "已下线,请勿重复下线"); - } else { - ocpTenantExtent.setOperStatus((short) 2); - ocpTenantAuditMapper.updateById(ocpTenantExtent); - } - - } - return ResponseVO.ok("操作成功"); - } - - /** - * 应用注册 - * - * @param ocpTenantBaseDto - */ - @Override - public ResponseVO applyRegister(OcpTenantBaseDto ocpTenantBaseDto) { -// OcpTenantBase - String tenantGroupName = ocpTenantBaseDto.getTenantGroupName();//应用分类名称 - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(OcpTenantGroup::getTenantGroupName, tenantGroupName); - OcpTenantGroup one = ocpTenantGroupService.getOne(lambdaQueryWrapper); - if (one == null) { - return ResponseVO.error("该应用分类不存在"); - } -// - String tenantCode = ocpTenantBaseDto.getTenantCode(); -// LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); -// lambdaQueryWrapper.eq(OcpTenantBase::getTenantCode, tenantCode); -// List ocpTenantBases = tenantBasicManagementMapper.selectList(lambdaQueryWrapper); -// if (ocpTenantBases.size() != 1) { -// return ResponseVO.error("应用代码应该唯一"); -// } -// for (OcpTenantBase ocpTenantBase : ocpTenantBases) { -// System.out.println(ocpTenantBase); -// BeanUtils.copyProperties(ocpTenantBaseDto, ocpTenantBase); -// this.update(lambdaQueryWrapper); -// } - String apiCodes = ocpTenantBaseDto.getApiCodes(); - if (StringUtils.isEmpty(apiCodes)) { - return ResponseVO.error("服务编码为空"); - } -// //获取应用分类编码 - String tenantGroupCode = one.getTenantGroupCode(); - - OcpTenantBase ocpTenantBase = new OcpTenantBase(); - BeanUtils.copyProperties(ocpTenantBaseDto, ocpTenantBase); - ocpTenantBase.setTenantGroupCode(tenantGroupCode); - //OcpTenantBase - tenantBasicManagementMapper.insert(ocpTenantBase); - -// //ocp_tenant_extent - OcpTenantExtent ocpTenantExtent = new OcpTenantExtent(); - BeanUtils.copyProperties(ocpTenantBaseDto, ocpTenantExtent); - ocpTenantExtent.setDepCompanyCode(null); - ocpTenantExtentMapper.insert(ocpTenantExtent); - - //ocp_api_tenant_rel - - OcpApiTenantRel ocpApiTenantRel = new OcpApiTenantRel(); - String[] split = apiCodes.split(","); - List apiCode = Arrays.asList(split); - - for (String s : apiCode) { - ocpApiTenantRel.setApiCode(s); - ocpApiTenantRel.setTenantDepCompanyCode("078002018"); - ocpApiTenantRel.setApiDepCompanyCode("078002018"); - ocpApiTenantRel.setTenantCode(tenantCode); - ocpApiTenantRel.setApiTenantRelCtime(Timestamp.valueOf(LocalDateTime.now())); - ocpApiTenantRel.setApiTenantRelMtime(Timestamp.valueOf(LocalDateTime.now())); - //保存到数据库 - ocpApiTenantRelService.save(ocpApiTenantRel); - } - - return ResponseVO.ok(); - } - - /** - * 应用树层级 - * - * @param tenantGroupCode - * @param tenantGroupCompanyCode - * @return - */ - @Override - public List tenantBaseTreeOther(String tenantGroupCode, String tenantGroupCompanyCode) { - List ocpTenantGroups = ocpTenantGroupMapper.tenantBaseTreeOther(tenantGroupCode, tenantGroupCompanyCode); - - return ocpTenantGroups; - - } - - /** - * 应用列表 - * - * @param tenantDto - * @return - */ - @Override - public ResponseVO> getBaseByGroupCode(TenantDto tenantDto) { - if (tenantDto.getCurrentPage() == null || tenantDto.getPageSize() == null) { - return ResponseVO.error("分页参数不能为空"); - } - tenantGroup.add(tenantDto.getTenantGroupCode()); - setGroupIdValue(tenantDto.getTenantGroupCompanyCode(), tenantDto.getTenantGroupCode()); - PageHelper.startPage(tenantDto.getCurrentPage(), tenantDto.getPageSize()); - tenantDto.setApiGroupCodeList(tenantGroup); - List ocpTenantBaseDto = ocpTenantGroupMapper.selectPageLists(tenantDto); - tenantGroup.clear(); - PageInfo pageInfo = new PageInfo<>(ocpTenantBaseDto); - return ResponseVO.ok(pageInfo); - - } - - /** - * 应用树底层 - * - * @param tenantGroupCode - * @param tenantGroupCompanyCode - * @return - */ - @Override - public List tenantBaseTree(String tenantGroupCode, String tenantGroupCompanyCode) { - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(StringUtils.isNotEmpty(tenantGroupCompanyCode), OcpTenantBase::getOwnerCompanyCode, tenantGroupCompanyCode); - lambdaQueryWrapper.eq(StringUtils.isNotEmpty(tenantGroupCode), OcpTenantBase::getTenantGroupCode, tenantGroupCode); - - List ocpTenantBases = tenantBasicManagementMapper.selectList(lambdaQueryWrapper); - - return ocpTenantBases; - } - - /** - * 应用注册查询 - * - * @param tenantGroupCode - * @param tenantGroupCompanyCode - * @return - */ - @Override - public OcpTenantGroup selectRegister(String tenantGroupCode, String tenantGroupCompanyCode) { - OcpTenantGroup ocpTenantGroup = ocpTenantGroupMapper.selectRegister(tenantGroupCode, tenantGroupCompanyCode); - return ocpTenantGroup; - } - - /** - * 应用树2 - * - * @param tenantGroupCode - * @return - */ - - public void setGroupIdValue(String tenantGroupCompanyCode, String tenantGroupCode) { - List codes = getIdsByPIdPub(tenantGroupCompanyCode, tenantGroupCode); - if (codes.size() > 0) { - for (String cod : codes) { - setGroupIdValue(tenantGroupCompanyCode, cod); - tenantGroup.add(cod); - } - } - - } - - public List getIdsByPIdPub(String tenantGroupCompanyCode, String tenantGroupCode) { - List ocpTenantGroups = ocpTenantGroupMapper.tenantBaseTreeOther(tenantGroupCode, tenantGroupCompanyCode); - return ocpTenantGroups.stream().map(OcpTenantGroup::getTenantGroupCode).collect(Collectors.toList()); - } - -} diff --git a/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java deleted file mode 100644 index 5e7a3e202b70ba93f06b5ba77326097dcf35bbb9..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java +++ /dev/null @@ -1,202 +0,0 @@ -package com.pms.ocp.service.impl; - - -import cn.afterturn.easypoi.cache.manager.IFileLoader; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pms.ocp.common.utils.RandomStringUtils; -import com.pms.ocp.mapper.TenantBasicManagementMapper; -import com.pms.ocp.mapper.TenantMapper; -import com.pms.ocp.model.dto.*; -import com.pms.ocp.model.entity.ModelAudit; -import com.pms.ocp.model.entity.OcpApiGroup; -import com.pms.ocp.model.entity.OcpTenantGroup; -import com.pms.ocp.service.TenantService; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.NoUniqueBeanDefinitionException; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.sql.Timestamp; -import java.util.*; - - -@Service -public class TenantServiceImpl extends ServiceImpl implements TenantService { - - - @Autowired - private TenantMapper tenantMapper; - @Autowired - private TenantBasicManagementMapper tenantBasicMapper; - - /** - * 应用树分类管理 - * - * @return - */ - @Override - public List getTree(String tenantGroupCompanyCode, String tenantGroupCode,String level) { - List ocpTenantGroupList = null; - if(StringUtils.isBlank(level) ) { - //顶级目录 - ocpTenantGroupList = tenantMapper.oneTenantGroup(); - } else if(StringUtils.isNotBlank(level) && "1".equals(level)) { - //二级目录 - ocpTenantGroupList = tenantMapper.selectGroups(tenantGroupCompanyCode); - } else if (StringUtils.isNotBlank(level) && "2".equals(level) ||"3".equals(level)) { - //三级目录 - ocpTenantGroupList = tenantMapper.selectTenantGroups(tenantGroupCode, tenantGroupCompanyCode); - - - } - return ocpTenantGroupList; - } - - /** - * 应用新增 - * - * @param - * @return - */ - @Override - public OcpTenantGroup getTenanInster(TenanBaseDto tenanBaseDto) { - boolean falg = true; - - OcpTenantGroup group = new OcpTenantGroup(); - String randomString = RandomStringUtils.getRandomString(6); - Timestamp timestamp = new Timestamp(System.currentTimeMillis()); - BeanUtils.copyProperties(tenanBaseDto, group); - group.setTenantGroupPcode(tenanBaseDto.getTenantGroupCode()); - group.setTenantType("应用"); - group.setTenantGroupVersion("1.0"); - group.setTenantGroupCode(randomString); - group.setTenantGroupOrderNo(1); - group.setTenantGroupCtime(timestamp); - group.setTenantGroupMtime(timestamp); - group.setTenantGroupVersion("1.0"); - group.setTenantGroupCode(randomString); - - if ("Middleground".equals(tenanBaseDto.getTenantGroupLevel())){ - group.setTenantGroupLevel("sys_center"); - } else if ("sys_center".equals(tenanBaseDto.getTenantGroupLevel())){ - group.setTenantGroupLevel("api_group"); - }else { - group.setTenantGroupLevel("Middleground"); - } - group.setClassIfy(tenanBaseDto.getTenantGroupCompanyCode()); - - - String tenantGroupCompanyCode = tenanBaseDto.getTenantGroupName(); - //判断是否含有相同的分类名称 - List ocpTenantGroupList = tenantMapper.selectList(null); - for (OcpTenantGroup ocpTenantGroup : ocpTenantGroupList) { - String tenantGroupCompanyCode1 = ocpTenantGroup.getTenantGroupName(); - if (tenantGroupCompanyCode.equals(tenantGroupCompanyCode1)){ - falg = false; - group.setNum("1"); - } - } - - - if (falg) { - tenanBaseDto.setClassIfy(tenanBaseDto.getTenantGroupCode()); - tenantMapper.insert(group); - } - return group; - - } - - /** - * 修改应用 - * - * @param ocpTenantGroup - * @return - */ - @Override - public boolean getTenantUpdata(OcpTenantGroup ocpTenantGroup) { - Timestamp timestamp = new Timestamp(System.currentTimeMillis()); - boolean falg = true; - List ocpTenantGroupList = tenantMapper.selectList(null); - for (OcpTenantGroup ocpApiGroup : ocpTenantGroupList) { - String code = ocpTenantGroup.getTenantGroupCode(); - if (code == ocpApiGroup.getTenantGroupCode()) { - falg = false; - break; - } - } - OcpTenantGroup ocpTenantGroup1 = new OcpTenantGroup(); - ocpTenantGroup1.setTenantGroupMtime(timestamp); - tenantMapper.updateById(ocpTenantGroup); - - return falg; - } - - /** - * 删除服务 - * - * @param ocpTenantGroup - * @return - */ - @Override - public boolean gettenantDelete(OcpTenantGroup ocpTenantGroup) { - String objId = ocpTenantGroup.getObjId(); - OcpTenantGroup ocpTenantGroup1 = tenantMapper.selectById(objId); - boolean flag = true; - List group = new ArrayList<>(); - List ocpTenantGroupList = tenantMapper.selectList(null); - for (OcpTenantGroup tenantGroup : ocpTenantGroupList) { - if (tenantGroup.getTenantGroupPcode().equals(ocpTenantGroup1.getTenantGroupCode())){ - group.add(tenantGroup); - } - } - if (group.size() >= 1){ - flag = false; - }else { - tenantMapper.deleteById(objId); - } - return flag; - } - - /** - * 应用--查询 - * - * @param tenantGroupCode - * @param tenantGroupCompanyCode - * @return - */ - @Override - public Page getselects(String tenantGroupCode, String tenantGroupCompanyCode, int currentPage, int pageSize, String keyword,String lev) { - LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); - OcpTenantGroup ocpTenantGroup = tenantMapper.selectGroupCode(tenantGroupCode); - - Page page = new Page<>(currentPage, pageSize); - if (StringUtils.isBlank(keyword)) { - if("".equals(lev) || "1".equals(lev)) { - LambdaQueryWrapper eq = qw.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode); - tenantMapper.selectPage(page, eq); - }else if ("2".equals(lev) || "3".equals(lev)) { - LambdaQueryWrapper eq = qw.or(wq -> wq.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode)).eq(OcpTenantGroup::getTenantGroupPcode, tenantGroupCode); - - tenantMapper.selectPage(page, eq); - } - } else if (!(StringUtils.isBlank(keyword))) { - LambdaQueryWrapper ocpTenantGroupLambdaQueryWrapper = qw.and(c -> c.like(OcpTenantGroup::getTenantGroupCompanyCode, keyword)) - .or().like(OcpTenantGroup::getTenantGroupName, keyword) - .or().like(OcpTenantGroup::getTenantGroupPcode, keyword) - .or().like(OcpTenantGroup::getTenantGroupUserName, keyword); - tenantMapper.selectPage(page, ocpTenantGroupLambdaQueryWrapper); - } - - return page; - - } -} - - - - - diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index 0f73a771b24d9d846ed7b0ba83cb759e686069ba..f5b7e71a9a2bdcc97fa67d831a94ee73a18a33a6 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -6,7 +6,7 @@ spring: type: com.zaxxer.hikari.HikariDataSource # jdbc-url: jdbc:postgresql://192.168.43.20:33072/pms3?currentSchema=public&stringtype=unspecified&TimeZone=Asia/Shanghai&useAffectedRows=true # jdbc-url: jdbc:postgresql://172.20.10.9:33072/pms3?currentSchema=public&stringtype=unspecified&TimeZone=Asia/Shanghai&useAffectedRows=true - url: jdbc:postgresql://localhost:5432/postgres?currentSchema=operating_platform&stringtype=unspecified&TimeZone=Asia/Shanghai&useAffectedRows=true + url: jdbc:postgresql://localhost:5432/operatemonitordb?currentSchema=operating_platform&stringtype=unspecified&TimeZone=Asia/Shanghai&useAffectedRows=true knife4j: enable: true diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 9a47390d9617aabc3e54bfc2a15aa9f3adfa1936..46618ddd56c7255275ee884f96d1efb9525cbaee 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -24,12 +24,12 @@ mybatis-plus: map-underscore-to-camel-case: true #指定自定义 Handler 所在的包位置 - type-handlers-package: com.pms.ocp.common.handler + type-handlers-package: com.nx.umms.common.handler logging: level: - com.pms.ocp.mapper: debug + com.nx.umms.mapper: debug org.springframework: warn #system: diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index 164fc25ce055c78b27132777effccee4d28ba0f4..411aec69cbcd3ea4bd7f46fdcf9e8808b12fc767 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -52,12 +52,12 @@ - + - + diff --git a/src/main/resources/mapper/ApiBasicManagementMapper.xml b/src/main/resources/mapper/ApiBasicManagementMapper.xml deleted file mode 100644 index cb329adcda9816f9a896922dd71fa28eed774341..0000000000000000000000000000000000000000 --- a/src/main/resources/mapper/ApiBasicManagementMapper.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/mapper/ApiDetailsMapper.xml b/src/main/resources/mapper/ApiDetailsMapper.xml deleted file mode 100644 index 9a2119933f6a8d12e0d8dad3d9ed70cf5d396f38..0000000000000000000000000000000000000000 --- a/src/main/resources/mapper/ApiDetailsMapper.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - diff --git a/src/main/resources/mapper/ModelMapper.xml b/src/main/resources/mapper/ModelMapper.xml index feadf59839a019457d72e9a94a8c4295f68997ea..968ec1e20cc5764fd4f5668b1c89c5294a635535 100644 --- a/src/main/resources/mapper/ModelMapper.xml +++ b/src/main/resources/mapper/ModelMapper.xml @@ -1,6 +1,6 @@ - + - + diff --git a/src/main/resources/mapper/ModelSubscribeMapper.xml b/src/main/resources/mapper/ModelSubscribeMapper.xml index 8e7c417ce019c24e3a96095342f27a149449b6ac..b680eb388d2619619d30e41285456af7f65b7c81 100644 --- a/src/main/resources/mapper/ModelSubscribeMapper.xml +++ b/src/main/resources/mapper/ModelSubscribeMapper.xml @@ -1,13 +1,13 @@ - - + + - + @@ -34,7 +34,7 @@ - select 1 AS belongLevel, parent_id AS pCode, diff --git a/src/main/resources/mapper/OcpApiGroupMapper.xml b/src/main/resources/mapper/OcpApiGroupMapper.xml deleted file mode 100644 index fca2619f7db6e86543b655f8e8de7c851027d82a..0000000000000000000000000000000000000000 --- a/src/main/resources/mapper/OcpApiGroupMapper.xml +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/mapper/OcpApiTenantRelMapper.xml b/src/main/resources/mapper/OcpApiTenantRelMapper.xml deleted file mode 100644 index c7b4e4b883381d288e94ce331b6877a8b0be0532..0000000000000000000000000000000000000000 --- a/src/main/resources/mapper/OcpApiTenantRelMapper.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - diff --git a/src/main/resources/mapper/OcpApiTreeMapper.xml b/src/main/resources/mapper/OcpApiTreeMapper.xml deleted file mode 100644 index f634b451a490d31fa5cbaec93380c55bba587896..0000000000000000000000000000000000000000 --- a/src/main/resources/mapper/OcpApiTreeMapper.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/mapper/OcpGroup.xml b/src/main/resources/mapper/OcpGroup.xml deleted file mode 100644 index 0f6d413ccd11baebe9627bcb89be83e3cdad6c1b..0000000000000000000000000000000000000000 --- a/src/main/resources/mapper/OcpGroup.xml +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/mapper/OcpTenantBaseMapper.xml b/src/main/resources/mapper/OcpTenantBaseMapper.xml deleted file mode 100644 index 7784a8ee50809624d2779585ec47ae0635121c8c..0000000000000000000000000000000000000000 --- a/src/main/resources/mapper/OcpTenantBaseMapper.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/main/resources/mapper/OcpTenantGroup.xml b/src/main/resources/mapper/OcpTenantGroup.xml deleted file mode 100644 index ff70fd840b57684d0fe0600f91e0016c10c67454..0000000000000000000000000000000000000000 --- a/src/main/resources/mapper/OcpTenantGroup.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/mapper/PmsApiAuditMapper.xml b/src/main/resources/mapper/PmsApiAuditMapper.xml deleted file mode 100644 index 8a96c2bedf22c6827ee8cc5158e5ac62a0772503..0000000000000000000000000000000000000000 --- a/src/main/resources/mapper/PmsApiAuditMapper.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/mapper/PmsApiModelRelMapper.xml b/src/main/resources/mapper/PmsApiModelRelMapper.xml deleted file mode 100644 index ce292e695cc7f7afb685d1e75e21158dd252c7a8..0000000000000000000000000000000000000000 --- a/src/main/resources/mapper/PmsApiModelRelMapper.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/main/resources/mapper/PmsApiSubsMapper.xml b/src/main/resources/mapper/PmsApiSubsMapper.xml deleted file mode 100644 index 90a40c25ad05dea209d5d6fc5484d18403f28370..0000000000000000000000000000000000000000 --- a/src/main/resources/mapper/PmsApiSubsMapper.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/mapper/PmsApiTenantRelMapper.xml b/src/main/resources/mapper/PmsApiTenantRelMapper.xml deleted file mode 100644 index 4160a6dee7d30aa8f88ca15e24c4d2b18d84fc43..0000000000000000000000000000000000000000 --- a/src/main/resources/mapper/PmsApiTenantRelMapper.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - diff --git a/src/main/resources/mapper/PmsTenantAuditMapper.xml b/src/main/resources/mapper/PmsTenantAuditMapper.xml deleted file mode 100644 index 9cc4f2f2f5d0e07092cc1b7007a0b8e076e9663c..0000000000000000000000000000000000000000 --- a/src/main/resources/mapper/PmsTenantAuditMapper.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/mapper/PmsTenantBaseMapper.xml b/src/main/resources/mapper/PmsTenantBaseMapper.xml deleted file mode 100644 index 75e3a7a8b38d92a7ff7e077f1b0c607abc1e86ae..0000000000000000000000000000000000000000 --- a/src/main/resources/mapper/PmsTenantBaseMapper.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/main/resources/mapper/PmsTenantSubsMapper.xml b/src/main/resources/mapper/PmsTenantSubsMapper.xml deleted file mode 100644 index db43a406b80885782bd0bc6858dcca2258dbaf45..0000000000000000000000000000000000000000 --- a/src/main/resources/mapper/PmsTenantSubsMapper.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/mapper/TenantBasicManagementMapper.xml b/src/main/resources/mapper/TenantBasicManagementMapper.xml deleted file mode 100644 index 7ba85409a95c6a33f7a0e16a96e37317ba349b84..0000000000000000000000000000000000000000 --- a/src/main/resources/mapper/TenantBasicManagementMapper.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file