diff --git a/src/main/java/com/pms/ocp/common/constants/AnalysisConstant.java b/src/main/java/com/pms/ocp/common/constants/AnalysisConstant.java index 12fe554d84445f9a331cd41f4eedbadbb834bbec..241353cafab301b0a79b8268cbe6446216357c5e 100644 --- a/src/main/java/com/pms/ocp/common/constants/AnalysisConstant.java +++ b/src/main/java/com/pms/ocp/common/constants/AnalysisConstant.java @@ -2,10 +2,13 @@ package com.pms.ocp.common.constants; public interface AnalysisConstant { interface exportOcpApiAuditName{ - final String OCP_API_AUDIT= "服务大事记导出数据"; + String OCPAPIAUDIT = "服务大事记.xls"; + String OCPAPIAUDITNAME = "服务大事记导出数据"; + } interface exportOcpTenantApiName{ - final String OCP_TENANT_API = "应用大事记导出数据"; + String OCPTENANTAPI = "应用大事记.xls"; + String OCPTENANTAPINAME = "应用大事记导出数据"; } } diff --git a/src/main/java/com/pms/ocp/controller/OcpTenantDetailsController.java b/src/main/java/com/pms/ocp/controller/OcpTenantDetailsController.java deleted file mode 100644 index dcc8c8042f7d546e78c71c1c97da5817a4f53a78..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/controller/OcpTenantDetailsController.java +++ /dev/null @@ -1,83 +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.OcpApiTenantRelService; -import com.pms.ocp.service.OcpTenantAuditService; -import com.pms.ocp.service.OcpTenantBaseService; -import com.pms.ocp.service.OcpTenantSubsService; -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 OcpTenantDetailsController { - - @Autowired - private OcpTenantBaseService ocpTenantBaseService; - - @Autowired - private OcpTenantAuditService ocpTenantAuditService; - - @Autowired - private OcpTenantSubsService ocpTenantSubsService; - - @Autowired - private OcpApiTenantRelService ocpApiTenantRelService; - - - @ApiOperation("应用基础信息-查询") - @PostMapping("/getotbList") - public ResponseVO> getOtbList(@RequestBody OcpTenantBase ocpTenantBase){ - return ocpTenantBaseService.getOtbList(ocpTenantBase); - } - - @ApiOperation("应用大事记-查询") - @PostMapping("/getotaList") - public ResponseVO> getOtaList(OcpTenantAudit ocpTenantAudit) { - return ocpTenantAuditService.getOtaList(ocpTenantAudit); - } - - - @ApiOperation("应用订阅记录-查询") - @PostMapping("/getOcpTenantList") - public ResponseVO> getOcpTenantList(OcpTenantSubs ocpTenantSubs) { - return ocpTenantSubsService.getOcpTenantList(ocpTenantSubs); - } - - @ApiOperation("应用与服务拓扑图-查询") - @PostMapping("/getOcpTenantApiList") - public ResponseVO> getOcpTenantApiList(@RequestBody OcpApiTenantRel ocpApiTenantRel) { - return ocpApiTenantRelService.getTenantApiList(ocpApiTenantRel); - } - - @ApiOperation("应用大事记-导出") - @RequestMapping("/export") - public void exportExcel(@RequestBody(required = false)OcpTenantAudit ocpTenantAudit, HttpServletRequest request, HttpServletResponse response) { - ocpTenantAuditService.exportExcel(ocpTenantAudit,request,response); - } - @ApiOperation("应用大事记-查询详情-变更内容") - @PostMapping("/getocpTent") - public ResponseVO> getOcpTenant(@RequestBody OcpTenantAudit ocpTenantAudit){ - return ocpTenantAuditService.OtaById(ocpTenantAudit); - } - - @ApiOperation("应用大事记-查询详情-历史版本") - @PostMapping("/versionId") - public ResponseVO> versionId(@RequestBody OcpTenantAudit ocpTenantAudit){ - return ocpTenantAuditService.versionId(ocpTenantAudit); - } - - -} diff --git a/src/main/java/com/pms/ocp/controller/OcpApiDetailsController.java b/src/main/java/com/pms/ocp/controller/PmsApiDetailsController.java similarity index 51% rename from src/main/java/com/pms/ocp/controller/OcpApiDetailsController.java rename to src/main/java/com/pms/ocp/controller/PmsApiDetailsController.java index 4fc3e0e02eb30cfdad30f3411a14b16f1a467ee0..130f1edf4700974b5f46815cf4b009d9bcc77afb 100644 --- a/src/main/java/com/pms/ocp/controller/OcpApiDetailsController.java +++ b/src/main/java/com/pms/ocp/controller/PmsApiDetailsController.java @@ -19,31 +19,31 @@ import java.util.List; @RequestMapping("/api") @RestController @Api(tags = "服务接口") -public class OcpApiDetailsController { +public class PmsApiDetailsController { @Autowired - private OcpApiSubsService ocpApiSubsService; + private PmsApiSubsService pmsApiSubsService; @Autowired - private OcpApiAuditService ocpApiAuditService; + private PmsApiAuditService pmsApiAuditService; @Autowired - private OcpApiTenantRelService ocpApiTenantRelService; + private PmsApiTenantRelService pmsApiTenantRelService; @Autowired - private OcpApiModelRelService ocpApiModelRelService; + private PmsApiModelRelService pmsApiModelRelService; @ApiOperation("服务订阅记录-查询") @PostMapping("/getocpapisublist") - public ResponseVO> getOcpApiSubsList(OcpApiSubs ocpApiSubs) { - return ocpApiSubsService.getOcpApiSubsList(ocpApiSubs); + public ResponseVO> getOcpApiSubsList(PmsApiSubs pmsApiSubs) { + return pmsApiSubsService.getPmsApiSubsList(pmsApiSubs); } @ApiOperation("服务大事记-查询") @PostMapping("/getocpapiauditlist") - public ResponseVO> getOcpApiAuditList(OcpApiAudit ocpApiAudit) { - return ocpApiAuditService.getOcpApiAuditList(ocpApiAudit); + public ResponseVO> getPmsApiAuditList(PmsApiAudit pmsApiAudit) { + return pmsApiAuditService.getOcpApiAuditList(pmsApiAudit); } // @ApiOperation("服务大事记-查询详情") @@ -54,32 +54,32 @@ public class OcpApiDetailsController { @ApiOperation("服务大事记-查询详情-变更内容") @PostMapping("/getocpapi") - public ResponseVO> getOcpApi(@RequestBody OcpApiAudit ocpApiAudit){ - return ocpApiAuditService.OaaById(ocpApiAudit); + public ResponseVO> getOcpApi(@RequestBody PmsApiAudit pmsApiAudit){ + return pmsApiAuditService.OaaById(pmsApiAudit); } @ApiOperation("服务大事记-历史版本") @PostMapping("/versionid") - public ResponseVO> versionId(@RequestBody OcpApiAudit ocpApiAudit){ - return ocpApiAuditService.versionId(ocpApiAudit); + public ResponseVO> versionId(@RequestBody PmsApiAudit pmsApiAudit){ + return pmsApiAuditService.versionId(pmsApiAudit); } @ApiOperation("服务与应用拓扑图-查询") @PostMapping("/getoatrlist") - public ResponseVO> getOatrList(@RequestBody OcpApiTenantRel ocpApiTenantRel) { - return ocpApiTenantRelService.getOatrList(ocpApiTenantRel); + public ResponseVO> getOatrList(@RequestBody PmsApiTenantRel pmsApiTenantRel) { + return pmsApiTenantRelService.getOatrList(pmsApiTenantRel); } @ApiOperation("服务与模型拓扑图-查询") @PostMapping("/getoamrlist") - public ResponseVO> getOamrList(@RequestBody OcpApiModelRel ocpApiModelRel) { - return ocpApiModelRelService.getOamrList(ocpApiModelRel); + public ResponseVO> getOamrList(@RequestBody PmsApiModelRel pmsApiModelRel) { + return pmsApiModelRelService.getOamrList(pmsApiModelRel); } @ApiOperation("服务大事记-导出") - @RequestMapping("/export") - public void exportExcel(@RequestBody(required = false) OcpApiAudit ocpApiAudit, HttpServletRequest request, HttpServletResponse response) { - ocpApiAuditService.exportExcel(ocpApiAudit,request,response); + @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 new file mode 100644 index 0000000000000000000000000000000000000000..c2c60b53f9a1bd930aba3c3f3b2e5e5598e758f6 --- /dev/null +++ b/src/main/java/com/pms/ocp/controller/PmsTenantDetailsController.java @@ -0,0 +1,81 @@ +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/mapper/OcpApiAuditMapper.java b/src/main/java/com/pms/ocp/mapper/OcpApiAuditMapper.java index aa5936b489e08cbfcb8aa2d717a303b919b14ffa..c52a073429f92ea84df4ad75d99367ce93aa53bc 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpApiAuditMapper.java +++ b/src/main/java/com/pms/ocp/mapper/OcpApiAuditMapper.java @@ -6,20 +6,10 @@ import org.apache.ibatis.annotations.Mapper; import java.util.List; -/** - * @Auther: liukai - * @Date: 2022/3/7 - * @Description:服务大事记接口 - */ + @Mapper public interface OcpApiAuditMapper extends BaseMapper { - List OaaById(OcpApiAudit ocpApiAudit); - - List getOcpApiSubsList(OcpApiAudit ocpApiAudit); - - List sById(OcpApiAudit ocpApiAudit); - List versionId (OcpApiAudit ocpApiAudit); } diff --git a/src/main/java/com/pms/ocp/mapper/OcpApiModelRelMapper.java b/src/main/java/com/pms/ocp/mapper/OcpApiModelRelMapper.java index daf14a218b3aef804b9492240569c4599d834800..87c6803846c76df9d2d47c700c1feebaed345c2b 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpApiModelRelMapper.java +++ b/src/main/java/com/pms/ocp/mapper/OcpApiModelRelMapper.java @@ -8,7 +8,7 @@ import java.util.List; @Mapper public interface OcpApiModelRelMapper extends BaseMapper { - List getOamrList(OcpApiModelRel ocpApiModelRel); + } diff --git a/src/main/java/com/pms/ocp/mapper/OcpApiSubsMapper.java b/src/main/java/com/pms/ocp/mapper/OcpApiSubsMapper.java index 2bc170ce7da007693fc5300e1a38556987421677..8dcf85f35c4bf195e138a1d32ac1a84700efc6b5 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpApiSubsMapper.java +++ b/src/main/java/com/pms/ocp/mapper/OcpApiSubsMapper.java @@ -2,11 +2,12 @@ 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 OcpApiSubsMapper extends BaseMapper { - List getOcpApisList(OcpApiSubs ocpApiSubs); + } diff --git a/src/main/java/com/pms/ocp/mapper/OcpApiTenantRelMapper.java b/src/main/java/com/pms/ocp/mapper/OcpApiTenantRelMapper.java index f9ac8710c0f159955e634b0cb23b682d9d5d3566..59646b1cb6b2b4f31cdf403adf88fa81945f9887 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpApiTenantRelMapper.java +++ b/src/main/java/com/pms/ocp/mapper/OcpApiTenantRelMapper.java @@ -9,7 +9,5 @@ import java.util.List; @Mapper public interface OcpApiTenantRelMapper extends BaseMapper { - List getOatrList(OcpApiTenantRel ocpApiTenantRel); - List getTenantApiList(OcpApiTenantRel ocpApiTenantRel); } diff --git a/src/main/java/com/pms/ocp/mapper/OcpTenantAuditMapper.java b/src/main/java/com/pms/ocp/mapper/OcpTenantAuditMapper.java index 463d67761cca67cb502ea5ab43c7d2948a743409..8a509f45813b677929865d5e8e946037271f1114 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpTenantAuditMapper.java +++ b/src/main/java/com/pms/ocp/mapper/OcpTenantAuditMapper.java @@ -6,11 +6,5 @@ import com.pms.ocp.model.entity.OcpTenantAudit; import java.util.List; public interface OcpTenantAuditMapper extends BaseMapper { - List getOtaList(OcpTenantAudit ocpTenantAudit); - List getOtaListById(OcpTenantAudit ocpTenantAudit); - - List OtaById(OcpTenantAudit ocpTenantAudit); - - List versionId(OcpTenantAudit ocpTenantAudit); } diff --git a/src/main/java/com/pms/ocp/mapper/OcpTenantBaseMapper.java b/src/main/java/com/pms/ocp/mapper/OcpTenantBaseMapper.java index 074842d6dd7437ab245a127c50bc5b71e445b3aa..4b01b4ede96c2b74d947f31d50b60b6f57e551a8 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpTenantBaseMapper.java +++ b/src/main/java/com/pms/ocp/mapper/OcpTenantBaseMapper.java @@ -6,5 +6,5 @@ import com.pms.ocp.model.entity.OcpTenantBase; import java.util.List; public interface OcpTenantBaseMapper extends BaseMapper { - List getOtbList(OcpTenantBase ocpTenantBase); + } diff --git a/src/main/java/com/pms/ocp/mapper/OcpTenantSubsMapper.java b/src/main/java/com/pms/ocp/mapper/OcpTenantSubsMapper.java index 8ac1a7fe92847c70a6c03ae89ff2735fc5c6cbb7..1b53d2103699b700e1fb2c91e5b7575d4773f255 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpTenantSubsMapper.java +++ b/src/main/java/com/pms/ocp/mapper/OcpTenantSubsMapper.java @@ -8,5 +8,5 @@ import java.util.List; @Mapper public interface OcpTenantSubsMapper extends BaseMapper { - List getOcpTenantList(OcpTenantSubs ocpTenantSubs); + } diff --git a/src/main/java/com/pms/ocp/mapper/PmsApiAuditMapper.java b/src/main/java/com/pms/ocp/mapper/PmsApiAuditMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..84c95029b53422b1f49f77a30e77618bfdcfda3a --- /dev/null +++ b/src/main/java/com/pms/ocp/mapper/PmsApiAuditMapper.java @@ -0,0 +1,26 @@ +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 new file mode 100644 index 0000000000000000000000000000000000000000..ecbb915e617a711b51d001124dba9dc9ba65a643 --- /dev/null +++ b/src/main/java/com/pms/ocp/mapper/PmsApiModelRelMapper.java @@ -0,0 +1,14 @@ +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 new file mode 100644 index 0000000000000000000000000000000000000000..89baaa716be33e5fa55b170e8103d072a9283189 --- /dev/null +++ b/src/main/java/com/pms/ocp/mapper/PmsApiSubsMapper.java @@ -0,0 +1,13 @@ +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 new file mode 100644 index 0000000000000000000000000000000000000000..8775ed8821bc58e771d5beef42e8b643f7cf32a2 --- /dev/null +++ b/src/main/java/com/pms/ocp/mapper/PmsApiTenantRelMapper.java @@ -0,0 +1,13 @@ +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 new file mode 100644 index 0000000000000000000000000000000000000000..6f67263eed24bcad128ec21b923ace8f5fc54f6c --- /dev/null +++ b/src/main/java/com/pms/ocp/mapper/PmsTenantAuditMapper.java @@ -0,0 +1,17 @@ +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 new file mode 100644 index 0000000000000000000000000000000000000000..0ada5f225cc1cf3145fac5762b8c6d7508fc8a38 --- /dev/null +++ b/src/main/java/com/pms/ocp/mapper/PmsTenantBaseMapper.java @@ -0,0 +1,11 @@ +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 new file mode 100644 index 0000000000000000000000000000000000000000..daab53915c87b771fab557451f213d6983f2f9e3 --- /dev/null +++ b/src/main/java/com/pms/ocp/mapper/PmsTenantSubsMapper.java @@ -0,0 +1,13 @@ +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/model/entity/OcpTenantSubs.java b/src/main/java/com/pms/ocp/model/entity/OcpTenantSubs.java index c9ee8f2bfe22c45ff89df400d1d637c9531e486f..fabf917bb9479a62707ab753f692d55b73ee06cd 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpTenantSubs.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpTenantSubs.java @@ -21,52 +21,36 @@ import java.util.Date; @TableName("ocp_tenant_subs") @ApiModel("应用订阅记录表1") public class OcpTenantSubs implements Serializable { - /** - * 关系ID - */ + @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty("关系ID") private String objId; - /** - * 服务编码 - */ + @ApiModelProperty("服务编码") private String tenantCode; - /** - * 订阅公司编码 - */ + @ApiModelProperty("订阅公司编码") private String subsCompanyCode; - /** - * 服务订阅创建时间 - */ + @ApiModelProperty("服务订阅创建时间") private Timestamp subsLogTenantCtime; - /** - * 服务订阅修改时间 - */ + @ApiModelProperty("服务订阅修改时间") private Timestamp subsLogTenantMtime; - /** - * 服务订阅创建用户ID - */ + @ApiModelProperty("服务订阅创建用户ID") private String subsLogTenantUserId; - /** - * 服务订阅添加时间 - */ + @ApiModelProperty("服务订阅添加时间") private Timestamp subsLogTenantAtime; - /** - * 是否删除0-否，1-是 - */ + @ApiModelProperty("是否删除0-否，1-是") private Short isDelete; diff --git a/src/main/java/com/pms/ocp/model/entity/PmsApiAudit.java b/src/main/java/com/pms/ocp/model/entity/PmsApiAudit.java new file mode 100644 index 0000000000000000000000000000000000000000..d88457efdf5e4a5bd95987251e11178eccde7cec --- /dev/null +++ b/src/main/java/com/pms/ocp/model/entity/PmsApiAudit.java @@ -0,0 +1,121 @@ +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 new file mode 100644 index 0000000000000000000000000000000000000000..b71c895592a0b9efc58d45b2ecc40bbf39f4980f --- /dev/null +++ b/src/main/java/com/pms/ocp/model/entity/PmsApiBase.java @@ -0,0 +1,78 @@ +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 new file mode 100644 index 0000000000000000000000000000000000000000..10556af7c46fd1aec57943095c9b146885876cf7 --- /dev/null +++ b/src/main/java/com/pms/ocp/model/entity/PmsApiModelRel.java @@ -0,0 +1,173 @@ +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 new file mode 100644 index 0000000000000000000000000000000000000000..a2c8ab6d43ebad5a26a47d21e05b3a9d41a2f457 --- /dev/null +++ b/src/main/java/com/pms/ocp/model/entity/PmsApiSubs.java @@ -0,0 +1,103 @@ +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 new file mode 100644 index 0000000000000000000000000000000000000000..7603912b18b5f0ec42a050b1a4089289b9391d62 --- /dev/null +++ b/src/main/java/com/pms/ocp/model/entity/PmsApiTenantRel.java @@ -0,0 +1,186 @@ +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/PmsTenantAudit.java b/src/main/java/com/pms/ocp/model/entity/PmsTenantAudit.java new file mode 100644 index 0000000000000000000000000000000000000000..1693ff7c05798d87ade1314748126532ae37bf69 --- /dev/null +++ b/src/main/java/com/pms/ocp/model/entity/PmsTenantAudit.java @@ -0,0 +1,530 @@ +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 new file mode 100644 index 0000000000000000000000000000000000000000..4c14a700e101769bcb0e5a3a7cef9f9c403a370f --- /dev/null +++ b/src/main/java/com/pms/ocp/model/entity/PmsTenantBase.java @@ -0,0 +1,215 @@ +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 new file mode 100644 index 0000000000000000000000000000000000000000..9987c8c4d699bd44e64b47096ef908e1fa35ea66 --- /dev/null +++ b/src/main/java/com/pms/ocp/model/entity/PmsTenantSubs.java @@ -0,0 +1,353 @@ +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/service/OcpApiAuditService.java b/src/main/java/com/pms/ocp/service/OcpApiAuditService.java deleted file mode 100644 index 2928f16e929f39df2ef8cdb27d0955c7be18717e..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/service/OcpApiAuditService.java +++ /dev/null @@ -1,23 +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.vo.ResponseVO; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - - -public interface OcpApiAuditService extends IService { - ResponseVO getOcpApiAuditList(OcpApiAudit ocpApiAudit); - - ResponseVO getOcpApiDetails(String objId); - - ResponseVO OaaById(OcpApiAudit ocpApiAudit); - - ResponseVO sById(OcpApiAudit ocpApiAudit); - - void exportExcel(OcpApiAudit ocpApiAudit, HttpServletRequest request, HttpServletResponse response); - - ResponseVO versionId(OcpApiAudit ocpApiAudit); -} diff --git a/src/main/java/com/pms/ocp/service/OcpApiSubsService.java b/src/main/java/com/pms/ocp/service/OcpApiSubsService.java index a21229a481b04fbaacc827b163f45074a101fab9..3ba8f7fcd4d44df5266d06554997e8cf774340bc 100644 --- a/src/main/java/com/pms/ocp/service/OcpApiSubsService.java +++ b/src/main/java/com/pms/ocp/service/OcpApiSubsService.java @@ -2,8 +2,7 @@ package com.pms.ocp.service; import com.baomidou.mybatisplus.extension.service.IService; import com.pms.ocp.model.entity.OcpApiSubs; -import com.pms.ocp.model.vo.ResponseVO; + public interface OcpApiSubsService extends IService { - ResponseVO getOcpApiSubsList(OcpApiSubs ocpApiSubs); } diff --git a/src/main/java/com/pms/ocp/service/OcpApiTenantRelService.java b/src/main/java/com/pms/ocp/service/OcpApiTenantRelService.java index 9bbeeab8ec7c8fcf73d3e4bde3d6817d990d8db1..e95a0cb4d495e68a01a7b3cf856237e99bc63d6e 100644 --- a/src/main/java/com/pms/ocp/service/OcpApiTenantRelService.java +++ b/src/main/java/com/pms/ocp/service/OcpApiTenantRelService.java @@ -2,11 +2,6 @@ package com.pms.ocp.service; import com.baomidou.mybatisplus.extension.service.IService; import com.pms.ocp.model.entity.OcpApiTenantRel; -import com.pms.ocp.model.vo.ResponseVO; - public interface OcpApiTenantRelService extends IService { - ResponseVO getOatrList(OcpApiTenantRel ocpApiTenantRel); - - ResponseVO getTenantApiList(OcpApiTenantRel ocpApiTenantRel); } diff --git a/src/main/java/com/pms/ocp/service/OcpTenantAuditService.java b/src/main/java/com/pms/ocp/service/OcpTenantAuditService.java index 8862bd55e0435592ed908a874f590792a3cd2f1b..621ff39020bc8d761f81e1a3b8314cdf7c41f6d1 100644 --- a/src/main/java/com/pms/ocp/service/OcpTenantAuditService.java +++ b/src/main/java/com/pms/ocp/service/OcpTenantAuditService.java @@ -9,13 +9,5 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; public interface OcpTenantAuditService extends IService { - ResponseVO getOtaList(OcpTenantAudit ocpTenantAudit); - ResponseVO getOtaListById(OcpTenantAudit ocpTenantAudit); - - void exportExcel(OcpTenantAudit ocpTenantAudit, HttpServletRequest request, HttpServletResponse response); - - ResponseVO OtaById(OcpTenantAudit ocpTenantAudit); - - ResponseVO versionId(OcpTenantAudit ocpTenantAudit); } diff --git a/src/main/java/com/pms/ocp/service/OcpTenantBaseService.java b/src/main/java/com/pms/ocp/service/OcpTenantBaseService.java index 1ea2f62b502675b3b4b18dab536ee8df321d8691..9a4c11bc80d9ab02f58f2767c848b93f9cf48582 100644 --- a/src/main/java/com/pms/ocp/service/OcpTenantBaseService.java +++ b/src/main/java/com/pms/ocp/service/OcpTenantBaseService.java @@ -5,7 +5,7 @@ import com.pms.ocp.model.entity.OcpTenantBase; import com.pms.ocp.model.vo.ResponseVO; public interface OcpTenantBaseService extends IService { - ResponseVO getOtbList(OcpTenantBase ocpTenantBase); + diff --git a/src/main/java/com/pms/ocp/service/OcpTenantSubsService.java b/src/main/java/com/pms/ocp/service/OcpTenantSubsService.java index a8d30b51362334a6da59da26290505cd33e011a1..60c04c655d21c5d6a318911cee17c89a469ec22a 100644 --- a/src/main/java/com/pms/ocp/service/OcpTenantSubsService.java +++ b/src/main/java/com/pms/ocp/service/OcpTenantSubsService.java @@ -5,5 +5,5 @@ import com.pms.ocp.model.entity.OcpTenantSubs; import com.pms.ocp.model.vo.ResponseVO; public interface OcpTenantSubsService extends IService { - ResponseVO getOcpTenantList(OcpTenantSubs ocpTenantSubs); + } diff --git a/src/main/java/com/pms/ocp/service/PmsApiAuditService.java b/src/main/java/com/pms/ocp/service/PmsApiAuditService.java new file mode 100644 index 0000000000000000000000000000000000000000..223f2ab7e474567c74c576e38875da948876f130 --- /dev/null +++ b/src/main/java/com/pms/ocp/service/PmsApiAuditService.java @@ -0,0 +1,24 @@ +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/OcpApiBaseService.java b/src/main/java/com/pms/ocp/service/PmsApiBaseService.java similarity index 75% rename from src/main/java/com/pms/ocp/service/OcpApiBaseService.java rename to src/main/java/com/pms/ocp/service/PmsApiBaseService.java index 02d26930a2fc39e1752d6fb05d31c8901d562dbb..57925d2a4c31af4f4c38554e59631efd6f8c1958 100644 --- a/src/main/java/com/pms/ocp/service/OcpApiBaseService.java +++ b/src/main/java/com/pms/ocp/service/PmsApiBaseService.java @@ -6,5 +6,5 @@ import com.pms.ocp.model.entity.OcpApiBase; import org.springframework.stereotype.Service; @Service -public interface OcpApiBaseService extends IService { +public interface PmsApiBaseService extends IService { } diff --git a/src/main/java/com/pms/ocp/service/OcpApiModelRelService.java b/src/main/java/com/pms/ocp/service/PmsApiModelRelService.java similarity index 52% rename from src/main/java/com/pms/ocp/service/OcpApiModelRelService.java rename to src/main/java/com/pms/ocp/service/PmsApiModelRelService.java index 67338a97f3d1ede872f9da7f9a70a77f03a22469..88ed0004db4f917b329f9bd8e8bc5fad80e5b171 100644 --- a/src/main/java/com/pms/ocp/service/OcpApiModelRelService.java +++ b/src/main/java/com/pms/ocp/service/PmsApiModelRelService.java @@ -3,8 +3,9 @@ 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 OcpApiModelRelService extends IService { - ResponseVO getOamrList(OcpApiModelRel ocpApiModelRel); +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 new file mode 100644 index 0000000000000000000000000000000000000000..96390f17227a2cd9b5868dec3a05845c11826d7d --- /dev/null +++ b/src/main/java/com/pms/ocp/service/PmsApiSubsService.java @@ -0,0 +1,10 @@ +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 new file mode 100644 index 0000000000000000000000000000000000000000..9764beb63e3cd59433cee354cfcbd815de50cb6d --- /dev/null +++ b/src/main/java/com/pms/ocp/service/PmsApiTenantRelService.java @@ -0,0 +1,13 @@ +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 new file mode 100644 index 0000000000000000000000000000000000000000..bbd10851f0ab379809ce7e63b2e4f5de821d8c04 --- /dev/null +++ b/src/main/java/com/pms/ocp/service/PmsTenantAuditService.java @@ -0,0 +1,22 @@ +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 new file mode 100644 index 0000000000000000000000000000000000000000..07f7755befbd146e820b94aa91694fe168cb8ff1 --- /dev/null +++ b/src/main/java/com/pms/ocp/service/PmsTenantBaseService.java @@ -0,0 +1,13 @@ +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 new file mode 100644 index 0000000000000000000000000000000000000000..fff30107cb6e151bb3fa47d07594bb3c93ac6b52 --- /dev/null +++ b/src/main/java/com/pms/ocp/service/PmsTenantSubsService.java @@ -0,0 +1,11 @@ +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/impl/ModelServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ModelServiceImpl.java index 409bfa48aba2c414affd15c70d1928df2c0af78c..5f2d6e245ccf3df1ad1fee1e4d65bc9e480f66b7 100644 --- a/src/main/java/com/pms/ocp/service/impl/ModelServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ModelServiceImpl.java @@ -228,7 +228,7 @@ public class ModelServiceImpl extends ServiceImpl implements private ResponseVO getModelInfoList(String modelCode, Integer currentPage, Integer pageSize, String searchCondition) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("model_group_code", modelCode) - .like(StringUtils.isNotEmpty(searchCondition), "ocp_model_prop", searchCondition) + .like(StringUtils.isNotEmpty(searchCondition), "model_name", searchCondition) .orderByDesc("model_ctime"); List modelList = modelMapper.selectList(queryWrapper); PageUtil pageUtil = new PageUtil<>(); @@ -252,11 +252,11 @@ public class ModelServiceImpl extends ServiceImpl implements modelWrapper.eq("model_code",modelCode); List modelList = modelMapper.selectList(modelWrapper); proWrapper.eq("model_code", modelCode) - .like(StringUtils.isNotEmpty(searchCondition), "column_name", searchCondition) + .like(StringUtils.isNotEmpty(searchCondition), "column_comments", searchCondition) .orderByDesc("prop_ctime"); List modelPropertiesList = modelPropertyMapper.selectList(proWrapper); modelPropertiesList.forEach(pro -> - pro.setModelTable(modelList.get(0) == null ?"":modelList.get(0).getModelTable()) + pro.setModelTable(modelList.get(0) == null ? "":modelList.get(0).getModelTable()) ); PageUtil pageUtil = new PageUtil<>(); pageUtil.startPage(currentPage, pageSize, modelPropertiesList); diff --git a/src/main/java/com/pms/ocp/service/impl/OcpApiAuditServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpApiAuditServiceImpl.java deleted file mode 100644 index 81f7ff6c05e63e54154443d6b78283279dd82bac..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiAuditServiceImpl.java +++ /dev/null @@ -1,68 +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.model.entity.OcpApiAudit; -import com.pms.ocp.model.vo.ResponseVO; -import com.pms.ocp.service.OcpApiAuditService; -import org.apache.poi.ss.usermodel.Workbook; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.util.List; - -@Service -public class OcpApiAuditServiceImpl extends ServiceImpl implements OcpApiAuditService { - - @Autowired - private OcpApiAuditMapper ocpApiAuditMapper; - - @Override - public ResponseVO getOcpApiAuditList(OcpApiAudit ocpApiAudit) { - List ocpApiAuditList = ocpApiAuditMapper.getOcpApiSubsList(ocpApiAudit); - return ResponseVO.ok(ocpApiAuditList); - } - - - @Override - public ResponseVO getOcpApiDetails(String objId) { - OcpApiAudit ocpApiAudit = ocpApiAuditMapper.selectById(objId); - return ResponseVO.ok(ocpApiAudit); - } - - @Override - public ResponseVO OaaById(OcpApiAudit ocpApiAudit) { - List oaaById = ocpApiAuditMapper.OaaById(ocpApiAudit); - return ResponseVO.ok(oaaById); - } - - @Override - public ResponseVO sById(OcpApiAudit ocpApiAudit) { - List oaaById = ocpApiAuditMapper.sById(ocpApiAudit); - return ResponseVO.ok(oaaById); - } - - @Override - public void exportExcel(OcpApiAudit ocpApiAudit, HttpServletRequest request, HttpServletResponse response) { - List oaaById = ocpApiAuditMapper.OaaById(ocpApiAudit); - ExportParams param = new ExportParams(AnalysisConstant.exportOcpApiAuditName.OCP_API_AUDIT,AnalysisConstant.exportOcpApiAuditName.OCP_API_AUDIT); - Workbook workbook = ExcelExportUtil.exportExcel(param,OcpApiAudit.class,oaaById); - ExportUtils.exportExcel(response, AnalysisConstant.exportOcpApiAuditName.OCP_API_AUDIT,workbook); - } - - @Override - public ResponseVO versionId(OcpApiAudit ocpApiAudit) { - List ocpApiAuditList = ocpApiAuditMapper.versionId(ocpApiAudit); - return ResponseVO.ok(ocpApiAuditList); - } - - -} diff --git a/src/main/java/com/pms/ocp/service/impl/OcpApiModelRelServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpApiModelRelServiceImpl.java deleted file mode 100644 index 118a294d3bab2f977c134a8d14d2329c13ee4599..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiModelRelServiceImpl.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.pms.ocp.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pms.ocp.mapper.OcpApiModelRelMapper; -import com.pms.ocp.model.entity.OcpApiModelRel; -import com.pms.ocp.model.vo.ResponseVO; -import com.pms.ocp.service.OcpApiModelRelService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -public class OcpApiModelRelServiceImpl extends ServiceImpl implements OcpApiModelRelService { - @Autowired - private OcpApiModelRelMapper ocpApiModelRelMapper; - @Override - public ResponseVO getOamrList(OcpApiModelRel ocpApiModelRel) { - List ocpApiModelRelList = ocpApiModelRelMapper.getOamrList(ocpApiModelRel); - return ResponseVO.ok(ocpApiModelRelList); - } -} diff --git a/src/main/java/com/pms/ocp/service/impl/OcpApiSubsServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpApiSubsServiceImpl.java index e6b4f4d8376f7afc3781cd2dbd54d12619e09900..81cae1972afca55d88095e00b41380aae41e04f1 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiSubsServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpApiSubsServiceImpl.java @@ -1,26 +1,11 @@ package com.pms.ocp.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.model.vo.ResponseVO; import com.pms.ocp.service.OcpApiSubsService; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; - -import java.util.List; @Service -public class OcpApiSubsServiceImpl extends ServiceImpl implements OcpApiSubsService { - - @Autowired - private OcpApiSubsMapper ocpApiSubsMapper; - @Override - public ResponseVO getOcpApiSubsList(OcpApiSubs ocpApiSubs) { - List ocpApiSubsList = ocpApiSubsMapper.getOcpApisList(ocpApiSubs); - return ResponseVO.ok(ocpApiSubsList); - } +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 index 6bb40f300b2c33197501e0a46044e53c28218cc8..e022f8c57f9be3dbbf9254d0275cc3b2f7b64df4 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiTenantRelServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpApiTenantRelServiceImpl.java @@ -1,31 +1,12 @@ 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.model.vo.ResponseVO; import com.pms.ocp.service.OcpApiTenantRelService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.List; - - @Service -public class OcpApiTenantRelServiceImpl extends ServiceImpl implements OcpApiTenantRelService { - @Autowired - private OcpApiTenantRelMapper ocpApiTenantRelMapper; - - - @Override - public ResponseVO getOatrList(OcpApiTenantRel ocpApiTenantRel) { - List oatrList = ocpApiTenantRelMapper.getOatrList(ocpApiTenantRel); - return ResponseVO.ok(oatrList); - } - - @Override - public ResponseVO getTenantApiList(OcpApiTenantRel ocpApiTenantRel) { - List oatrList = ocpApiTenantRelMapper.getTenantApiList(ocpApiTenantRel); - return ResponseVO.ok(oatrList); - } +public class OcpApiTenantRelServiceImpl extends ServiceImpl implements OcpApiTenantRelService { } diff --git a/src/main/java/com/pms/ocp/service/impl/OcpTenantAuditServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpTenantAuditServiceImpl.java index 23bd11cd939a1f6aef11e61d30e636420a339efa..72e7bd81857a1caef07c25752868620cabf191c2 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpTenantAuditServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpTenantAuditServiceImpl.java @@ -21,43 +21,7 @@ import java.util.List; @Service public class OcpTenantAuditServiceImpl extends ServiceImpl implements OcpTenantAuditService { - @Autowired - private OcpTenantAuditMapper ocpTenantAuditMapper; - @Autowired - private OcpApiTenantRelMapper ocpApiTenantRelMapper; - - @Override - public ResponseVO getOtaList(OcpTenantAudit ocpTenantAudit) { - List otaList = ocpTenantAuditMapper.getOtaList(ocpTenantAudit); - return ResponseVO.ok(otaList); - } - - @Override - public ResponseVO getOtaListById(OcpTenantAudit ocpTenantAudit) { - List otaListById = ocpTenantAuditMapper.getOtaListById(ocpTenantAudit); - return ResponseVO.ok(otaListById); - } - - @Override - public void exportExcel(OcpTenantAudit ocpTenantAudit, HttpServletRequest request, HttpServletResponse response) { - List otaListById = ocpTenantAuditMapper.versionId(ocpTenantAudit); - ExportParams param = new ExportParams(AnalysisConstant.exportOcpTenantApiName.OCP_TENANT_API,AnalysisConstant.exportOcpTenantApiName.OCP_TENANT_API); - Workbook workbook = ExcelExportUtil.exportExcel(param, OcpTenantAudit.class,otaListById); - ExportUtils.exportExcel(response, AnalysisConstant.exportOcpTenantApiName.OCP_TENANT_API,workbook); - } - - @Override - public ResponseVO OtaById(OcpTenantAudit ocpTenantAudit) { - List oatrList = ocpTenantAuditMapper.OtaById(ocpTenantAudit); - return ResponseVO.ok(oatrList); - } - - @Override - public ResponseVO versionId(OcpTenantAudit ocpTenantAudit) { - List ocpTenantAudits = ocpTenantAuditMapper.versionId(ocpTenantAudit); - return ResponseVO.ok(ocpTenantAudits); - } } diff --git a/src/main/java/com/pms/ocp/service/impl/OcpTenantBaseServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpTenantBaseServiceImpl.java index 533e2304df52d7f707ba232eef12213abfcec81f..59beec8b98982671b9ef0724622767ac70e95c57 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpTenantBaseServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpTenantBaseServiceImpl.java @@ -20,13 +20,7 @@ public class OcpTenantBaseServiceImpl extends ServiceImpl otbList = ocpTenantBaseMapper.getOtbList(ocpTenantBase); - return ResponseVO.ok(otbList); - } + diff --git a/src/main/java/com/pms/ocp/service/impl/OcpTenantSubsServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpTenantSubsServiceImpl.java index 6651e1bad603b8285c2bc48c333026e1784210e1..0c31fb821180dcf639898a4d1129dc578c97a7d6 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpTenantSubsServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpTenantSubsServiceImpl.java @@ -4,7 +4,6 @@ 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.OcpTenantExtentService; import com.pms.ocp.service.OcpTenantSubsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -13,12 +12,5 @@ import java.util.List; @Service public class OcpTenantSubsServiceImpl extends ServiceImpl implements OcpTenantSubsService { - @Autowired - private OcpTenantSubsMapper ocpTenantSubsMapper; - @Override - public ResponseVO getOcpTenantList(OcpTenantSubs ocpTenantSubs) { - List ocpTenantList = ocpTenantSubsMapper.getOcpTenantList(ocpTenantSubs); - return ResponseVO.ok(ocpTenantList); - } } \ 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 new file mode 100644 index 0000000000000000000000000000000000000000..c50da11f824dd7eded76494ec5ef14c6ac63e30b --- /dev/null +++ b/src/main/java/com/pms/ocp/service/impl/PmsApiAuditServiceImpl.java @@ -0,0 +1,69 @@ +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/OcpApiBaseServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/PmsApiBaseServiceImpl.java similarity index 54% rename from src/main/java/com/pms/ocp/service/impl/OcpApiBaseServiceImpl.java rename to src/main/java/com/pms/ocp/service/impl/PmsApiBaseServiceImpl.java index f6913f3b4b8f88f449aeaae76a941c53fc54acea..db6b2a64cb0df8b6d65852783caf03af210d4bd2 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiBaseServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/PmsApiBaseServiceImpl.java @@ -3,11 +3,10 @@ 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.OcpApiBaseService; -import com.pms.ocp.service.OcpApiTreeService; +import com.pms.ocp.service.PmsApiBaseService; import org.springframework.stereotype.Service; @Service -public class OcpApiBaseServiceImpl extends ServiceImpl implements OcpApiBaseService { +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 new file mode 100644 index 0000000000000000000000000000000000000000..57519afe99d2e588b41b39f5974bccfc6fea821b --- /dev/null +++ b/src/main/java/com/pms/ocp/service/impl/PmsApiModelRelServiceImpl.java @@ -0,0 +1,23 @@ +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 new file mode 100644 index 0000000000000000000000000000000000000000..70a63800cec6943b1e47a071566f02ec4aed1075 --- /dev/null +++ b/src/main/java/com/pms/ocp/service/impl/PmsApiSubsServiceImpl.java @@ -0,0 +1,26 @@ +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 new file mode 100644 index 0000000000000000000000000000000000000000..52839282ab341231e49cf1bd29ca07c409294747 --- /dev/null +++ b/src/main/java/com/pms/ocp/service/impl/PmsApiTenantRelServiceImpl.java @@ -0,0 +1,33 @@ +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 new file mode 100644 index 0000000000000000000000000000000000000000..11b0a41f98b7a6b85c4d01aa90451c98444f581e --- /dev/null +++ b/src/main/java/com/pms/ocp/service/impl/PmsTenantAuditServiceImpl.java @@ -0,0 +1,67 @@ +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 new file mode 100644 index 0000000000000000000000000000000000000000..01239fb2ca69e0ad62a5f9258bd85b6698fb135a --- /dev/null +++ b/src/main/java/com/pms/ocp/service/impl/PmsTenantBaseServiceImpl.java @@ -0,0 +1,23 @@ +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 new file mode 100644 index 0000000000000000000000000000000000000000..cb66163d2a75450c18b34dc65797791c42302807 --- /dev/null +++ b/src/main/java/com/pms/ocp/service/impl/PmsTenantSubsServiceImpl.java @@ -0,0 +1,27 @@ +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/resources/mapper/OcpApiAuditMapper.xml b/src/main/resources/mapper/PmsApiAuditMapper.xml similarity index 55% rename from src/main/resources/mapper/OcpApiAuditMapper.xml rename to src/main/resources/mapper/PmsApiAuditMapper.xml index 488592567f7e59c2ccdaf797d7fcedf8a2ab7476..8a96c2bedf22c6827ee8cc5158e5ac62a0772503 100644 --- a/src/main/resources/mapper/OcpApiAuditMapper.xml +++ b/src/main/resources/mapper/PmsApiAuditMapper.xml @@ -1,23 +1,38 @@ - + - select * from ocp_api_audit oaa LEFT JOIN ocp_api_base oab on oaa.api_code = oab.api_code where oaa.api_code = #{apiCode} - + select + obj_id, + api_code, + oper_status, + oper_target, + audit_type, + audit_message, + audit_json, + audit_user_id, + audit_user_name, + audit_ctime, + audit_mtime, + is_delete, + apply_version, + pre_api_version + from ocp_api_audit - select * from ocp_api_audit where obj_id = #{objId} - select * from ocp_api_audit oaa LEFT JOIN ocp_api_base oab on oaa.api_code = oab.api_code diff --git a/src/main/resources/mapper/OcpApiModelRelMapper.xml b/src/main/resources/mapper/PmsApiModelRelMapper.xml similarity index 69% rename from src/main/resources/mapper/OcpApiModelRelMapper.xml rename to src/main/resources/mapper/PmsApiModelRelMapper.xml index d8343b4dbc5851f279f660ac4ab4c1ce94c54bd9..ce292e695cc7f7afb685d1e75e21158dd252c7a8 100644 --- a/src/main/resources/mapper/OcpApiModelRelMapper.xml +++ b/src/main/resources/mapper/PmsApiModelRelMapper.xml @@ -1,13 +1,13 @@ - + - + select * from ocp_api_model_rel oamr LEFT JOIN ocp_model_base omb on oamr.model_code = omb.model_code INNER JOIN ocp_api_base oab on oamr.api_code = oab.api_code - where oamr.obj_id = #{objId} + where oamr.api_code = #{apiCode} \ No newline at end of file diff --git a/src/main/resources/mapper/OcpApiSubsMapper.xml b/src/main/resources/mapper/PmsApiSubsMapper.xml similarity index 80% rename from src/main/resources/mapper/OcpApiSubsMapper.xml rename to src/main/resources/mapper/PmsApiSubsMapper.xml index 07da0a99f50b80215f5c3f8ff93dd19b64b58047..90a40c25ad05dea209d5d6fc5484d18403f28370 100644 --- a/src/main/resources/mapper/OcpApiSubsMapper.xml +++ b/src/main/resources/mapper/PmsApiSubsMapper.xml @@ -1,10 +1,10 @@ - + - SELECT * from ocp_api_subs oas left JOIN ocp_api_base oab on oas.api_code = oab.api_code diff --git a/src/main/resources/mapper/PmsApiTenantRelMapper.xml b/src/main/resources/mapper/PmsApiTenantRelMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..4160a6dee7d30aa8f88ca15e24c4d2b18d84fc43 --- /dev/null +++ b/src/main/resources/mapper/PmsApiTenantRelMapper.xml @@ -0,0 +1,21 @@ + + + + + + + + diff --git a/src/main/resources/mapper/OcpTenantAuditMapper.xml b/src/main/resources/mapper/PmsTenantAuditMapper.xml similarity index 80% rename from src/main/resources/mapper/OcpTenantAuditMapper.xml rename to src/main/resources/mapper/PmsTenantAuditMapper.xml index 1cb7be2a1fc6bc6c1d7c18903705da2d87859aa9..9cc4f2f2f5d0e07092cc1b7007a0b8e076e9663c 100644 --- a/src/main/resources/mapper/OcpTenantAuditMapper.xml +++ b/src/main/resources/mapper/PmsTenantAuditMapper.xml @@ -1,22 +1,22 @@ - - select * from ocp_tenant_audit - select * from ocp_tenant_audit where obj_id = #{objId} - select * from ocp_tenant_audit ota LEFT JOIN ocp_tenant_base otb on ota.tenant_code = otb.tenant_code where ota.tenant_code = #{tenantCode} - select * from ocp_tenant_audit ota LEFT JOIN ocp_tenant_base otb on ota.tenant_code = otb.tenant_code diff --git a/src/main/resources/mapper/PmsTenantBaseMapper.xml b/src/main/resources/mapper/PmsTenantBaseMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..75e3a7a8b38d92a7ff7e077f1b0c607abc1e86ae --- /dev/null +++ b/src/main/resources/mapper/PmsTenantBaseMapper.xml @@ -0,0 +1,10 @@ + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/OcpTenantSubsMapper.xml b/src/main/resources/mapper/PmsTenantSubsMapper.xml similarity index 79% rename from src/main/resources/mapper/OcpTenantSubsMapper.xml rename to src/main/resources/mapper/PmsTenantSubsMapper.xml index 5c8ad6f9a53671cf0165a93c1343e8f0a04ff8a0..db43a406b80885782bd0bc6858dcca2258dbaf45 100644 --- a/src/main/resources/mapper/OcpTenantSubsMapper.xml +++ b/src/main/resources/mapper/PmsTenantSubsMapper.xml @@ -1,8 +1,8 @@ - + - SELECT * from ocp_tenant_subs ots left JOIN ocp_tenant_base otb on ots.tenant_code = otb.tenant_code