diff --git a/pom.xml b/pom.xml index 94fd1e34217acc864e5422c883a904609695b795..0b1aef01970aa1f670d499daa7a3260417dd8498 100644 --- a/pom.xml +++ b/pom.xml @@ -77,23 +77,12 @@ 1.2.62 - - - - - - - - - - org.postgresql postgresql - 9.4.1212.jre7 + 9.4.1212 - org.projectlombok lombok diff --git a/src/main/java/com/pms/ocp/common/handler/MYLocalDateTimeTypeHandler.java b/src/main/java/com/pms/ocp/common/handler/MYLocalDateTimeTypeHandler.java new file mode 100644 index 0000000000000000000000000000000000000000..8efbd9f9b6502b81d390793eb80696cfb93f59d0 --- /dev/null +++ b/src/main/java/com/pms/ocp/common/handler/MYLocalDateTimeTypeHandler.java @@ -0,0 +1,54 @@ +package com.pms.ocp.common.handler; + +import org.apache.ibatis.type.LocalDateTimeTypeHandler; + +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Timestamp; +import java.time.LocalDateTime; +import java.time.ZoneOffset; + +/** + * @Auther: wangjian + * @Date: 2022/3/10 10:10 + * @Description:时间类型处理器 + */ +public class MYLocalDateTimeTypeHandler extends LocalDateTimeTypeHandler { +// @Override +// public LocalDateTime getNullableResult(ResultSet rs, String columnName) throws SQLException { +// Timestamp timestamp = rs.getTimestamp(columnName); +// Long remindTime = timestamp.getTime(); +// return LocalDateTime.ofEpochSecond(remindTime,0, ZoneOffset.ofHours(8)); +// } + + +// @Override +// public LocalDateTime getResult(ResultSet rs, String columnName) throws SQLException { +// Object object = rs.getObject(columnName); +// System.out.println(object); +// if (object instanceof java.sql.Timestamp) {//在这里强行转换，将sql的时间转换为LocalDateTime +// //可以根据自己的需要进行转化 +// return LocalDateTime.ofInstant(((Timestamp) object).toInstant(), ZoneOffset.ofHours(0)); +// } +// return super.getResult(rs, columnName); +// } + + @Override + public LocalDateTime getResult(ResultSet rs, String columnName) throws SQLException { + Object object = rs.getObject(columnName); + if (object == null) { + return null; + } + +// System.out.println(object); + // 如有需要 在这里强行转换，将sql的时间转换为LocalDateTime + if (object instanceof java.sql.Timestamp) { + //可以根据自己的需要进行转化 + return LocalDateTime.ofInstant(((Timestamp) object).toInstant(), ZoneOffset.ofHours(8)); + } + + return super.getResult(rs, columnName); + } + + +} diff --git a/src/main/java/com/pms/ocp/common/handler/TimestampTypeHandler.java b/src/main/java/com/pms/ocp/common/handler/TimestampTypeHandler.java new file mode 100644 index 0000000000000000000000000000000000000000..dab5ce2a0827d17d63cadc6d2391c55fea2c3b3d --- /dev/null +++ b/src/main/java/com/pms/ocp/common/handler/TimestampTypeHandler.java @@ -0,0 +1,66 @@ +package com.pms.ocp.common.handler; + +import org.apache.ibatis.type.BaseTypeHandler; +import org.apache.ibatis.type.JdbcType; +import org.apache.ibatis.type.MappedJdbcTypes; +import org.apache.ibatis.type.MappedTypes; +import org.postgresql.util.PGTimestamp; + +import java.sql.*; +import java.time.LocalDateTime; + +/** + * @Auther: wangjian + * @Date: 2022/3/10 09:43 + * @Description: + */ +@MappedTypes({LocalDateTime.class}) +@MappedJdbcTypes({JdbcType.OTHER}) +public class TimestampTypeHandler extends BaseTypeHandler { + @Override + public void setNonNullParameter(PreparedStatement ps, int i, Object parameter, JdbcType jdbcType) throws SQLException { + Timestamp p = null; + if (parameter != null) { + if (parameter instanceof LocalDateTime) { + PGTimestamp.valueOf(LocalDateTime.now()); + p = PGTimestamp.valueOf((LocalDateTime) parameter); + } + ps.setObject(i, p); + } + } + + /** + * Gets the nullable result. + * + * @param rs the rs + * @param columnName Colunm name, when configuration useColumnLabel is false + * @return the nullable result + * @throws SQLException the SQL exception + */ + @Override + public Object getNullableResult(ResultSet rs, String columnName) throws SQLException { + return toFill(rs.getObject(columnName)); + } + + @Override + public Object getNullableResult(ResultSet rs, int columnIndex) throws SQLException { + return toFill(rs.getObject(columnIndex)); + } + + @Override + public Object getNullableResult(CallableStatement cs, int columnIndex) throws SQLException { + return toFill(cs.getObject(columnIndex)); + } + + private Object toFill(Object v) { + if (v != null) { + if (v instanceof PGTimestamp) { + PGTimestamp p = (PGTimestamp) v; + return p.toLocalDateTime(); + } else if (v instanceof Timestamp) { + return ((Timestamp) v).toLocalDateTime(); + } + } + return v; + } +} \ No newline at end of file diff --git a/src/main/java/com/pms/ocp/controller/ApiDetailsController.java b/src/main/java/com/pms/ocp/controller/ApiDetailsController.java index 89bc6fb1a728b58d3a51b7131656956d07b74ff9..927cfe41b68596cf55bea5822b12e4e5cd28462b 100644 --- a/src/main/java/com/pms/ocp/controller/ApiDetailsController.java +++ b/src/main/java/com/pms/ocp/controller/ApiDetailsController.java @@ -1,6 +1,7 @@ package com.pms.ocp.controller; +import com.pms.ocp.model.entity.OcpApiBase; import com.pms.ocp.model.vo.ResponseVO; import com.pms.ocp.service.ApiDetailsService; import io.swagger.annotations.Api; @@ -11,6 +12,8 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + @Slf4j @RequestMapping("/api-base/v1") @RestController @@ -21,7 +24,7 @@ public class ApiDetailsController { @ApiOperation("服务库服务详情-查询") @GetMapping("/query") - public ResponseVO getApiDetails(String objId) { + public ResponseVO getApiDetails(String objId) { return apiDetailsService.getApiDetails(objId); } diff --git a/src/main/java/com/pms/ocp/controller/ModelBaseController.java b/src/main/java/com/pms/ocp/controller/ModelBaseController.java index 5e9f1caa2c2adf0b43bea0619b8da85857203241..d987eb737e6bf3a67cccb24d641b8aa8c926874f 100644 --- a/src/main/java/com/pms/ocp/controller/ModelBaseController.java +++ b/src/main/java/com/pms/ocp/controller/ModelBaseController.java @@ -1,16 +1,15 @@ package com.pms.ocp.controller; -import com.pms.ocp.common.constants.CodeEnum; +import com.pms.ocp.model.dto.ModelIssueDTO; +import com.pms.ocp.model.dto.ModelPropertyDTO; +import com.pms.ocp.model.dto.ModelRelationDTO; import com.pms.ocp.model.entity.Model; import com.pms.ocp.model.entity.ModelNote; -import com.pms.ocp.model.entity.ModelType; import com.pms.ocp.model.vo.ResponseVO; -import com.pms.ocp.service.ModelGroupService; -import com.pms.ocp.service.ModelNoteService; -import com.pms.ocp.service.ModelPropertyService; -import com.pms.ocp.service.ModelService; +import com.pms.ocp.service.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -35,63 +34,65 @@ public class ModelBaseController { @Autowired private ModelService modelService; - @Autowired - private ModelGroupService modelGroupService; - @Autowired private ModelPropertyService modelPropertyService; @Autowired private ModelNoteService modelNoteService; + @Autowired + private ModelIssueService modelIssueService; + + @Autowired + private ModelRelationService modelRelationService; /** * 模型分类-查询 * * @return */ - @ApiOperation("模型分类-查询") - @GetMapping("/get/model/type") - public ResponseVO getModelType() { - return modelGroupService.getModelType(); - } +// @ApiOperation("模型分类-查询") +// @GetMapping("/get/model/type") +// public ResponseVO getModelType() { +// return modelGroupService.getModelType(); +// } /** * 模型分类-增加 * * @return */ - @ApiOperation("模型分类-增加") - @PostMapping("/create/model/type") - public ResponseVO createModelType(ModelType modelType) { - return modelGroupService.createModelType(modelType); - } +// @ApiOperation("模型分类-增加") +// @PostMapping("/create/model/type") +// public ResponseVO createModelType(ModelType modelType) { +// return modelGroupService.createModelType(modelType); +// } /** * 模型分类-删除 * * @return */ - @ApiOperation("模型分类-删除") - @PostMapping("/delete/model/type") - public ResponseVO deleteModelType(ModelType modelType) { - String modelTypeId = modelType.getObjId(); - if (StringUtils.isNotBlank(modelTypeId)) { - return modelGroupService.deleteModelType(modelTypeId); - } else { - return ResponseVO.error(CodeEnum.REQUIRED_PARAMETER_EMPTY); - } - } +// @ApiOperation("模型分类-删除") +// @PostMapping("/delete/model/type") +// public ResponseVO deleteModelType(ModelType modelType) { +// String modelTypeId = modelType.getObjId(); +// if (StringUtils.isNotBlank(modelTypeId)) { +// return modelGroupService.deleteModelType(modelTypeId); +// } else { +// return ResponseVO.error(CodeEnum.REQUIRED_PARAMETER_EMPTY); +// } +// } /** * 模型分类-修改 * * @return */ - @ApiOperation("模型分类-修改") - @PostMapping("/update/model/type") - public ResponseVO updateModelType(ModelType modelType) { - return modelGroupService.updateModelType(modelType); - } +// @ApiOperation("模型分类-修改") +// @PostMapping("/update/model/type") +// public ResponseVO updateModelType(ModelType modelType) { +// return modelGroupService.updateModelType(modelType); +// } /** * 模型-查询 @@ -172,8 +173,19 @@ public class ModelBaseController { */ @ApiOperation("模型订阅-增加") @PostMapping("/create/model/subscribe") - public ResponseVO createModelSubscribe() { - return ResponseVO.ok(); + public ResponseVO createModelSubscribe(@RequestBody ModelIssueDTO modelIssueDTO) { + return ResponseVO.ok(modelIssueService.createModelIssue(modelIssueDTO)); + } + + /** + * 模型属性-删除/批量删除 + * + * @return + */ + @ApiOperation("模型订阅-删除/批量删除") + @PostMapping("/delete/model/subscribe") + public ResponseVO deleteModelSubscribe(@ApiParam(value = "订阅编号集合") @RequestBody List ids) { + return ResponseVO.ok(modelIssueService.deletePatchModelIssue(ids)); } /** @@ -183,8 +195,10 @@ public class ModelBaseController { */ @ApiOperation("模型订阅-查询") @GetMapping("/get/model/subscribe") - public ResponseVO getModelSubscribe() { - return ResponseVO.ok(); + public ResponseVO getModelSubscribe(@ApiParam(value = "模型订阅编号") @RequestParam(value = "objId", required = false) String objId, + @ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode, + @ApiParam(value = "订阅公司编码") @RequestParam(value = "subsCompanyCode", required = false) String subsCompanyCode) { + return ResponseVO.ok(modelIssueService.getModelIssueList(objId, modelCode, subsCompanyCode)); } /** @@ -212,6 +226,7 @@ public class ModelBaseController { return ResponseVO.ok(); } + /** * 模型属性-增加 * @@ -219,8 +234,10 @@ public class ModelBaseController { */ @ApiOperation("模型属性-增加") @PostMapping("create/model/property") - public ResponseVO createModelProperty() { - return ResponseVO.ok(); + public ResponseVO createModelProperty(@RequestBody ModelPropertyDTO modelPropertyDTO) { + + Integer i = modelPropertyService.createModelProperty(modelPropertyDTO); + return ResponseVO.ok(i); } /** @@ -230,8 +247,10 @@ public class ModelBaseController { */ @ApiOperation("模型属性-查询") @GetMapping("get/model/property") - public ResponseVO getModelProperty() { - return ResponseVO.ok(modelPropertyService.getModelProperty()); + public ResponseVO getModelProperty(@ApiParam(value = "模型属性编号") @RequestParam(value = "objId", required = false) String objId, + @ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode, + @ApiParam(value = "订阅公司编码") @RequestParam(value = "subsCompanyCode", required = false) String subsCompanyCode) { + return ResponseVO.ok(modelPropertyService.listModelProperty(objId, modelCode, subsCompanyCode)); } /** @@ -241,19 +260,33 @@ public class ModelBaseController { */ @ApiOperation("模型属性-修改") @PostMapping("/update/model/property") - public ResponseVO updateModelProperty() { - return ResponseVO.ok(); + public ResponseVO updateModelProperty(@RequestBody ModelPropertyDTO modelPropertyDTO) { + + return ResponseVO.ok(modelPropertyService.updateModelProperty(modelPropertyDTO)); } /** - * 模型属性-删除 + * 模型属性-删除/批量删除 * * @return */ - @ApiOperation("模型属性-删除") + @ApiOperation("模型属性-删除/批量删除") @PostMapping("/delete/model/property") - public ResponseVO deleteModelProperty() { - return ResponseVO.ok(); + public ResponseVO deleteModelProperty(@ApiParam(value = "属性ID集合") @RequestBody List ids) { + return ResponseVO.ok(modelPropertyService.deletePatchModelProperty(ids)); + } + + /** + * 模型拓扑关系-增加 + * + * @return + */ + @ApiOperation("模型拓扑关系-增加") + @PostMapping("create/model/topology") + public ResponseVO createModelTopology(@RequestBody ModelRelationDTO modelRelationDTO) { + + Integer i = modelRelationService.createModelRelation(modelRelationDTO); + return ResponseVO.ok(i); } /** @@ -263,8 +296,21 @@ public class ModelBaseController { */ @ApiOperation("模型拓扑关系-查询") @GetMapping("/get/model/topology") - public ResponseVO getModelTopology() { - return ResponseVO.ok(); + public ResponseVO getModelTopology(@ApiParam(value = "模型拓扑关系编号") @RequestParam(value = "objId", required = false) String objId, + @ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode) { + return ResponseVO.ok(modelRelationService.getModelRelationList(objId, modelCode)); + } + + /** + * 模型拓扑关系-删除 + * + * @return + */ + @ApiOperation("模型拓扑关系-删除") + @PostMapping("/delete/model/topology") + public ResponseVO deleteModelTopology(@ApiParam(value = "模型拓扑关系编号") @RequestParam(value = "objId", required = false) String objId, + @ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode) { + return ResponseVO.ok(modelRelationService.deleteModelRelation(objId, modelCode)); } } diff --git a/src/main/java/com/pms/ocp/controller/ModelClassifyController.java b/src/main/java/com/pms/ocp/controller/ModelClassifyController.java index 921492c8c23d618da70894fdbaa3d5b80587c112..1eec46e212f84d539152e1bced5b249b2849527b 100644 --- a/src/main/java/com/pms/ocp/controller/ModelClassifyController.java +++ b/src/main/java/com/pms/ocp/controller/ModelClassifyController.java @@ -1,7 +1,7 @@ package com.pms.ocp.controller; import com.github.pagehelper.PageInfo; -import com.pms.ocp.model.entity.ModelType; +import com.pms.ocp.model.entity.ModelClassify; import com.pms.ocp.model.vo.OcpModelGroupVO; import com.pms.ocp.model.vo.ResponseVO; import com.pms.ocp.service.ModelClassifyService; @@ -37,8 +37,8 @@ public class ModelClassifyController { **/ @ApiOperation("模型分类导航") @GetMapping("/navigation") - public ResponseVO> getModelNavigation(String searchCondition) { - return modelClassifyService.getModelNavigation(searchCondition); + public ResponseVO> getModelNavigation() { + return modelClassifyService.getModelNavigation(); } /** @@ -50,12 +50,12 @@ public class ModelClassifyController { **/ @ApiOperation("右侧子类详情列表") @GetMapping("/subclassDetailsList") - public ResponseVO> subclassDetailsList(@RequestParam(required = false) int pageSize, - @RequestParam(required = false) int pageNum, + public ResponseVO> subclassDetailsList(@RequestParam int currentPage, + @RequestParam int pageSize, @RequestParam(required = false,defaultValue = "") String parentGroupCode, - @RequestParam(required = false) String subclassGroupName + @RequestParam(required = false,defaultValue = "") String subclassGroupName ) { - return modelClassifyService.subclassDetailsList(pageSize, pageNum, parentGroupCode, subclassGroupName); + return modelClassifyService.subclassDetailsList(currentPage, pageSize, parentGroupCode, subclassGroupName); } /** @@ -68,7 +68,7 @@ public class ModelClassifyController { **/ @ApiOperation("新增") @PostMapping("/insert") - public ResponseVO insert(@RequestBody List list) { + public ResponseVO insert(@RequestBody List list) { return modelClassifyService.insert(list); } @@ -82,7 +82,7 @@ public class ModelClassifyController { **/ @ApiOperation("修改") @PostMapping("/update") - public ResponseVO update(@RequestBody List list) { + public ResponseVO update(@RequestBody List list) { return modelClassifyService.update(list); } } diff --git a/src/main/java/com/pms/ocp/controller/OcpApiDetailsController.java b/src/main/java/com/pms/ocp/controller/OcpApiDetailsController.java new file mode 100644 index 0000000000000000000000000000000000000000..880f34de8f2c548b4c7ace19ba8fd7d10719bf9c --- /dev/null +++ b/src/main/java/com/pms/ocp/controller/OcpApiDetailsController.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 javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.List; + + +@Slf4j +@RequestMapping("/api") +@RestController +@Api(tags = "服务接口") +public class OcpApiDetailsController { + + @Autowired + private OcpApiSubsService ocpApiSubsService; + + @Autowired + private OcpApiAuditService ocpApiAuditService; + + @Autowired + private OcpApiTenantRelService ocpApiTenantRelService; + + @Autowired + private OcpApiModelRelService ocpApiModelRelService; + + + @ApiOperation("服务订阅记录-查询") + @PostMapping("/getocpapisublist") + public ResponseVO> getOcpApiSubsList(OcpApiSubs ocpApiSubs) { + return ocpApiSubsService.getOcpApiSubsList(ocpApiSubs); + } + + @ApiOperation("服务大事记-查询") + @PostMapping("/getocpapiauditlist") + public ResponseVO> getOcpApiAuditList(OcpApiAudit ocpApiAudit) { + return ocpApiAuditService.getOcpApiAuditList(ocpApiAudit); + } + + @ApiOperation("服务大事记-查询详情") + @PostMapping("/getocpapidetails") + public ResponseVO> getOcpApiDetails(@RequestBody OcpApiAudit ocpApiAudit){ + return ocpApiAuditService.sById(ocpApiAudit); + } + + @ApiOperation("服务大事记-查询详情-变更内容") + @PostMapping("/getocpapi") + public ResponseVO> getOcpApi(@RequestBody OcpApiAudit ocpApiAudit){ + return ocpApiAuditService.OaaById(ocpApiAudit); + } + + @ApiOperation("服务与应用拓扑图-查询") + @PostMapping("/getoatrlist") + public ResponseVO> getOatrList(@RequestBody OcpApiTenantRel ocpApiTenantRel) { + return ocpApiTenantRelService.getOatrList(ocpApiTenantRel); + } + + @ApiOperation("服务与模型拓扑图-查询") + @PostMapping("/getoamrlist") + public ResponseVO> getOamrList(@RequestBody OcpApiModelRel ocpApiModelRel) { + return ocpApiModelRelService.getOamrList(ocpApiModelRel); + } + + @ApiOperation("服务大事记-导出") + @RequestMapping("/export") + public void exportExcel(@RequestBody(required = false) OcpApiAudit ocpApiAudit, HttpServletRequest request, HttpServletResponse response) { + ocpApiAuditService.exportExcel(ocpApiAudit,request,response); + } + + + +} diff --git a/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java b/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java index ea8a4ce0948e9390c893f0ff790699c7b1f2c85d..632f0d13cdf9f094e482c479c0064cd9958a2aa1 100644 --- a/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java +++ b/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java @@ -34,9 +34,9 @@ public class OcpApiTreeController { */ @GetMapping("/getTree") @ApiOperation("服务树分类") - public ApiTreeGroupDto getTree(){ + public ResponseVO getTree(){ ApiTreeGroupDto byGroup = service.getByGroup(); - return byGroup; + return ResponseVO.ok(byGroup); } @@ -51,17 +51,11 @@ public class OcpApiTreeController { } - /*@GetMapping("/getone") - @ApiOperation("服务树分类--分级数据") - public List getOne(int pageSize,int pageNum,int apiGroupLevel){ - List onePage = service.getOnePage(pageSize, pageNum, apiGroupLevel); - return onePage; - }*/ @PostMapping("/getone") @ApiOperation("服务树分类--分级数据") - public Page getOne(@RequestBody PageGroupDto pageGroupDto){ + public ResponseVO> getOne(@RequestBody PageGroupDto pageGroupDto){ Page onePages = service.getOnePages(pageGroupDto); - return onePages; + return ResponseVO.ok(onePages); } diff --git a/src/main/java/com/pms/ocp/controller/OcpDetailsController.java b/src/main/java/com/pms/ocp/controller/OcpDetailsController.java deleted file mode 100644 index 903208dbfc8520239a0e1b9d121e68b0145f740f..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/controller/OcpDetailsController.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.pms.ocp.controller; - - -import com.pms.ocp.model.entity.OcpApiAudit; -import com.pms.ocp.model.entity.OcpApiModelRel; -import com.pms.ocp.model.entity.OcpApiSubs; -import com.pms.ocp.model.entity.OcpApiTenantRel; -import com.pms.ocp.model.vo.ResponseVO; -import com.pms.ocp.service.OcpApiAuditService; -import com.pms.ocp.service.OcpApiModelRelService; -import com.pms.ocp.service.OcpApiSubsService; -import com.pms.ocp.service.OcpApiTenantRelService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -@Slf4j -@RequestMapping("/tenant") -@RestController -@Api(tags = "应用接口") -public class OcpDetailsController { - - @Autowired - private OcpApiSubsService ocpApiSubsService; - - @Autowired - private OcpApiAuditService ocpApiAuditService; - - @Autowired - private OcpApiTenantRelService ocpApiTenantRelService; - - @Autowired - private OcpApiModelRelService ocpApiModelRelService; - - - @ApiOperation("服务订阅记录-查询") - @PostMapping("/getocpapisublist") - public ResponseVO getOcpApiSubsList(OcpApiSubs ocpApiSubs) { - return ocpApiSubsService.getOcpApiSubsList(ocpApiSubs); - } - - @ApiOperation("服务大事记-查询") - @PostMapping("/getocpapiauditlist") - public ResponseVO getOcpApiAuditList(OcpApiAudit ocpApiAudit) { - return ocpApiAuditService.getOcpApiAuditList(ocpApiAudit); - } - - @ApiOperation("服务大事记-查询详情") - @PostMapping("/getocpapidetails") - public ResponseVO getOcpApiDetails(OcpApiAudit ocpApiAudit){ - return ocpApiAuditService.sById(ocpApiAudit); - } - - @ApiOperation("服务大事记-查询详情") - @PostMapping("/getocpapi") - public ResponseVO getOcpApi(OcpApiAudit ocpApiAudit){ - return ocpApiAuditService.OaaById(ocpApiAudit); - } - - @ApiOperation("服务与应用拓扑图-查询") - @PostMapping("/getoatrlist") - public ResponseVO getOatrList(OcpApiTenantRel ocpApiTenantRel) { - return ocpApiTenantRelService.getOatrList(ocpApiTenantRel); - } - - @ApiOperation("服务与模型拓扑图-查询") - @PostMapping("/getoamrlist") - public ResponseVO getOamrList(OcpApiModelRel ocpApiModelRel) { - return ocpApiModelRelService.getOamrList(ocpApiModelRel); - } - - @ApiOperation("服务与模型拓扑图-关联查询详情") - @PostMapping("/getoaabyid") - public ResponseVO OaaById(OcpApiAudit ocpApiAudit) { - return ocpApiAuditService.OaaById(ocpApiAudit); - } - -// @ApiOperation("服务大事记-导出") -// @RequestMapping("/export") -// public void exportExcel(OcpApiAudit ocpApiAudit, HttpServletRequest request, HttpServletResponse response) { -// ocpApiAuditService.exportExcel(ocpApiAudit,request,response); -// } - -// @ApiOperation("服务大事记-导出") -// @RequestMapping("/export") -// public void exportExcel(Oaa oaa, HttpServletRequest request, HttpServletResponse response) { -// oaaService.exportExcel(oaa, request, response); -// } -} diff --git a/src/main/java/com/pms/ocp/controller/OcpTenantController.java b/src/main/java/com/pms/ocp/controller/OcpTenantController.java new file mode 100644 index 0000000000000000000000000000000000000000..c8970bceac853cbc268841fef9a8584889113e02 --- /dev/null +++ b/src/main/java/com/pms/ocp/controller/OcpTenantController.java @@ -0,0 +1,85 @@ +package com.pms.ocp.controller; + + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.pms.ocp.model.dto.OcpTenantGroupDto; +import com.pms.ocp.model.dto.PageGroupDto; +import com.pms.ocp.model.dto.TenanBaseDto; +import com.pms.ocp.model.entity.OcpApiGroup; +import com.pms.ocp.model.entity.OcpTenantBase; +import com.pms.ocp.model.entity.OcpTenantGroup; +import com.pms.ocp.model.vo.ResponseVO; +import com.pms.ocp.service.TenantService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + + +@Slf4j +@RequestMapping("/api-tenant/v1") +@RestController +@Api(tags = "应用树管理接口") +public class OcpTenantController { + + + @Autowired + private TenantService tenantService; + /** + * 应用树分类 + */ + + @GetMapping("/tenanttree") + @ApiModelProperty("应用树分类") + private OcpTenantGroupDto getTenantTree(){ + OcpTenantGroupDto tree = tenantService.getTree(); + return tree; + } + + @PostMapping("/tenantinster") + @ApiModelProperty("新增应用") + + public ResponseVO tenantInster(@RequestBody TenanBaseDto TenanBaseDto){ + boolean falg = tenantService.getTenanInster(TenanBaseDto); + if (falg){ + return ResponseVO.ok("新建成功！"); + } + return ResponseVO.error("应用code已经存在！"); + } + + @PostMapping("/tenantupdata") + @ApiModelProperty("修改应用") + public ResponseVO tenantUpdata(@RequestBody OcpTenantGroup ocpTenantGroup){ + boolean falg = tenantService.getTenantUpdata(ocpTenantGroup); + if (falg){ + return ResponseVO.ok("修改成功！"); + } + return ResponseVO.error("应用code已经存在！"); + } + @PostMapping("/tenantdelete") + @ApiModelProperty("删除服务") + public ResponseVO tenantDelete(@RequestBody OcpTenantGroup ocpTenantGroup){ + boolean falg = tenantService.gettenantDelete(ocpTenantGroup); + if (falg){ + return ResponseVO.ok("删除成功！"); + } + return ResponseVO.error("应用下存在服务，请先删除下级应该！"); + } + + + @PostMapping("tenantone") + @ApiOperation("应用分类--分级数据") + public ResponseVO> tenantOne(@RequestBody PageGroupDto pageGroupDto){ +// Page onePages = tenantService.getOnePages(pageGroupDto); + return ResponseVO.ok(); + } + + + + + +} diff --git a/src/main/java/com/pms/ocp/controller/OcpTenantDetailsController.java b/src/main/java/com/pms/ocp/controller/OcpTenantDetailsController.java new file mode 100644 index 0000000000000000000000000000000000000000..c4c287773ce9781fe662b4bb0639d162d52bbf06 --- /dev/null +++ b/src/main/java/com/pms/ocp/controller/OcpTenantDetailsController.java @@ -0,0 +1,50 @@ +package com.pms.ocp.controller; + +import com.pms.ocp.model.entity.OcpApiAudit; +import com.pms.ocp.model.entity.OcpTenantAudit; +import com.pms.ocp.model.entity.OcpTenantBase; +import com.pms.ocp.model.vo.ResponseVO; +import com.pms.ocp.service.OcpApiAuditService; +import com.pms.ocp.service.OcpTenantAuditService; +import com.pms.ocp.service.OcpTenantBaseService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@Slf4j +@RequestMapping("/tenant") +@RestController +@Api(tags = "应用接口") +public class OcpTenantDetailsController { + + @Autowired + private OcpTenantBaseService ocpTenantBaseService; + + @Autowired + private OcpTenantAuditService ocpTenantAuditService; + + @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("/getotaListById") + public ResponseVO> getOtaListById(@RequestBody OcpTenantAudit ocpTenantAudit) { + return ocpTenantAuditService.getOtaListById(ocpTenantAudit); + } +} diff --git a/src/main/java/com/pms/ocp/mapper/ModelIssueMapper.java b/src/main/java/com/pms/ocp/mapper/ModelIssueMapper.java index c48501bb9588767b4fe9f7d467b63c704bfecb6c..4d5f32d3277eb56f2633344bfa64a00c10bb984d 100644 --- a/src/main/java/com/pms/ocp/mapper/ModelIssueMapper.java +++ b/src/main/java/com/pms/ocp/mapper/ModelIssueMapper.java @@ -1,7 +1,7 @@ package com.pms.ocp.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pms.ocp.model.entity.Model; +import com.pms.ocp.model.entity.ModelIssue; import org.apache.ibatis.annotations.Mapper; /** @@ -11,5 +11,5 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper -public interface ModelIssueMapper extends BaseMapper { +public interface ModelIssueMapper extends BaseMapper { } diff --git a/src/main/java/com/pms/ocp/mapper/ModelPropertyMapper.java b/src/main/java/com/pms/ocp/mapper/ModelPropertyMapper.java index 52de9394071b5be5ee8ae7f34585616007a19d67..fcb91b2cfaf4d2acd4263d514584138712fd5eaa 100644 --- a/src/main/java/com/pms/ocp/mapper/ModelPropertyMapper.java +++ b/src/main/java/com/pms/ocp/mapper/ModelPropertyMapper.java @@ -12,5 +12,5 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper -public interface ModelPropertyMapper extends BaseMapper { +public interface ModelPropertyMapper extends BaseMapper { } diff --git a/src/main/java/com/pms/ocp/mapper/ModelRelationMapper.java b/src/main/java/com/pms/ocp/mapper/ModelRelationMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..39f1942f332fcac0dff14162ca8d6ef30738b179 --- /dev/null +++ b/src/main/java/com/pms/ocp/mapper/ModelRelationMapper.java @@ -0,0 +1,15 @@ +package com.pms.ocp.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.pms.ocp.model.entity.ModelRelation; +import org.apache.ibatis.annotations.Mapper; + +/** + * @Auther: wangjian + * @Date: 2022/2/22 16:25 + * @Description:模型关系数据层接口 + */ + +@Mapper +public interface ModelRelationMapper extends BaseMapper { +} diff --git a/src/main/java/com/pms/ocp/mapper/ModelTypeMapper.java b/src/main/java/com/pms/ocp/mapper/ModelTypeMapper.java index b7ea2b07eb2fdcf1ec5b142802c75a48a5911a03..6d16d81194f84aed95cd78173270ecfd3977f2a8 100644 --- a/src/main/java/com/pms/ocp/mapper/ModelTypeMapper.java +++ b/src/main/java/com/pms/ocp/mapper/ModelTypeMapper.java @@ -1,8 +1,7 @@ package com.pms.ocp.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pms.ocp.model.entity.Model; -import com.pms.ocp.model.entity.ModelType; +import com.pms.ocp.model.entity.ModelClassify; import org.apache.ibatis.annotations.Mapper; /** @@ -12,5 +11,5 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper -public interface ModelTypeMapper extends BaseMapper { +public interface ModelTypeMapper extends BaseMapper { } diff --git a/src/main/java/com/pms/ocp/mapper/OcpApiAuditMapper.java b/src/main/java/com/pms/ocp/mapper/OcpApiAuditMapper.java index 34ace9a9218d7119a766d17e7d91142220dd43a8..7bbd2f7a0e8216ac088cf09dbd386fd7688990a7 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpApiAuditMapper.java +++ b/src/main/java/com/pms/ocp/mapper/OcpApiAuditMapper.java @@ -14,10 +14,10 @@ import java.util.List; @Mapper public interface OcpApiAuditMapper extends BaseMapper { - List OaaById(OcpApiAudit ocpApiAudit); + List OaaById(OcpApiAudit ocpApiAudit); - List getOcpApiSubsList(OcpApiAudit ocpApiAudit); + List getOcpApiSubsList(OcpApiAudit ocpApiAudit); - List sById(OcpApiAudit ocpApiAudit); + List sById(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 87dbd0476eaa5cd014d3c64e049e98df234fa104..daf14a218b3aef804b9492240569c4599d834800 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); + 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 11a06cac9ef0c5e1af64984e5cb920c6a2f39b19..2bc170ce7da007693fc5300e1a38556987421677 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpApiSubsMapper.java +++ b/src/main/java/com/pms/ocp/mapper/OcpApiSubsMapper.java @@ -8,5 +8,5 @@ import java.util.List; @Mapper public interface OcpApiSubsMapper extends BaseMapper { - List getOcpApisList(OcpApiSubs ocpApiSubs); + 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 6e4e47a38727df7f85795d84a32f12a5fb7b516b..84831befea37da51a0ccf93369c5bdea7de4964b 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpApiTenantRelMapper.java +++ b/src/main/java/com/pms/ocp/mapper/OcpApiTenantRelMapper.java @@ -9,5 +9,5 @@ import java.util.List; @Mapper public interface OcpApiTenantRelMapper extends BaseMapper { - List getOatrList(OcpApiTenantRel ocpApiTenantRel); + List getOatrList(OcpApiTenantRel ocpApiTenantRel); } diff --git a/src/main/java/com/pms/ocp/mapper/OcpModelGroupMapper.java b/src/main/java/com/pms/ocp/mapper/OcpModelGroupMapper.java index 8cb94989d8da046134b0897e93b74d88c4ddf3cc..b73521d48321c1055968014eafd2c35d5c2c4656 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpModelGroupMapper.java +++ b/src/main/java/com/pms/ocp/mapper/OcpModelGroupMapper.java @@ -1,7 +1,7 @@ package com.pms.ocp.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pms.ocp.model.entity.ModelType; +import com.pms.ocp.model.entity.ModelClassify; import org.apache.ibatis.annotations.Mapper; /** @@ -10,5 +10,5 @@ import org.apache.ibatis.annotations.Mapper; * @date 2022/3/9 9:47 */ @Mapper -public interface OcpModelGroupMapper extends BaseMapper { +public interface OcpModelGroupMapper extends BaseMapper { } diff --git a/src/main/java/com/pms/ocp/mapper/OcpTenantAuditMapper.java b/src/main/java/com/pms/ocp/mapper/OcpTenantAuditMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..ac2160595d131d97cd8a6981d1bbec503a7349af --- /dev/null +++ b/src/main/java/com/pms/ocp/mapper/OcpTenantAuditMapper.java @@ -0,0 +1,12 @@ +package com.pms.ocp.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.pms.ocp.model.entity.OcpTenantAudit; + +import java.util.List; + +public interface OcpTenantAuditMapper extends BaseMapper { + List getOtaList(OcpTenantAudit ocpTenantAudit); + + List getOtaListById(OcpTenantAudit ocpTenantAudit); +} diff --git a/src/main/java/com/pms/ocp/mapper/OcpTenantBaseMapper.java b/src/main/java/com/pms/ocp/mapper/OcpTenantBaseMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..074842d6dd7437ab245a127c50bc5b71e445b3aa --- /dev/null +++ b/src/main/java/com/pms/ocp/mapper/OcpTenantBaseMapper.java @@ -0,0 +1,10 @@ +package com.pms.ocp.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.pms.ocp.model.entity.OcpTenantBase; + +import java.util.List; + +public interface OcpTenantBaseMapper extends BaseMapper { + List getOtbList(OcpTenantBase ocpTenantBase); +} diff --git a/src/main/java/com/pms/ocp/mapper/TenantMapper.java b/src/main/java/com/pms/ocp/mapper/TenantMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..c043a2ee0fd89874920374187c12e1671997513d --- /dev/null +++ b/src/main/java/com/pms/ocp/mapper/TenantMapper.java @@ -0,0 +1,22 @@ +package com.pms.ocp.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.pms.ocp.model.entity.OcpTenantGroup; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface TenantMapper extends BaseMapper { + + + /** + * + * @param tenantGroupCompanyCode + * @return + */ + OcpTenantGroup oneTenantGroup(String tenantGroupCompanyCode); + + + List twoTenantGroups(String tenantGroupCompanyPCode); +} diff --git a/src/main/java/com/pms/ocp/model/dto/ModelIssueDTO.java b/src/main/java/com/pms/ocp/model/dto/ModelIssueDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..3e50e510d7ae5191ca7bb0a2ad98f8595d4b9608 --- /dev/null +++ b/src/main/java/com/pms/ocp/model/dto/ModelIssueDTO.java @@ -0,0 +1,73 @@ +package com.pms.ocp.model.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; + +/** + * @Auther: wangjian + * @Date: 2022/3/10 16:35 + * @Description:模型订阅DTO对象 + */ + +@ApiModel(value = "模型订阅DTO对象") +@Data +public class ModelIssueDTO { + + /** + * 模型属性编号 + */ + @ApiModelProperty(value = "模型属性编号") + private String objId; + + /** + * 模型编号 + */ + @ApiModelProperty(value = "模型编号") + private String modelCode; + + /** + * 订阅状态 0:订阅, 1:取消订阅 + */ + @ApiModelProperty(value = "订阅状态 0:订阅, 1:取消订阅") + private String subsStatus; + + /** + * 订阅公司编码 + */ + @ApiModelProperty(value = "订阅公司编码") + private String subsCompanyCode; + + /** + * 订阅人员编号 + */ + @ApiModelProperty(value = "订阅人员编号") + private String subsUserId; + + /** + * 订阅人名称 + */ + @ApiModelProperty(value = "订阅人名称") + private String subsUserName; + + /** + * 创建时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiModelProperty(value = "创建时间") + private LocalDateTime subsCtime; + + /** + * 修改时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiModelProperty(value = "修改时间") + private LocalDateTime subsMtime; + +} diff --git a/src/main/java/com/pms/ocp/model/dto/ModelPropertyDTO.java b/src/main/java/com/pms/ocp/model/dto/ModelPropertyDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..1ba3f5a6a2167f4522a236327b447c7c45e48106 --- /dev/null +++ b/src/main/java/com/pms/ocp/model/dto/ModelPropertyDTO.java @@ -0,0 +1,141 @@ +package com.pms.ocp.model.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.sql.Date; + +/** + * @Auther: wangjian + * @Date: 2022/2/22 16:40 + * @Description:模型属性DTO对象 + */ + +@ApiModel(value = "模型属性DTO对象") +@Data +public class ModelPropertyDTO { + + /** + * 模型属性编号 + */ + @ApiModelProperty(value = "模型属性编号") + private String objId; + + /** + * 模型编号 + */ + @ApiModelProperty(value = "模型编号") + private String modelCode; + + /** + * 属性名称 + */ + @ApiModelProperty(value = "属性名称") + private String columnName; + + /** + * 属性编码 + */ + @ApiModelProperty(value = "属性编码") + private String propCode; + + /** + * 属性描述 + */ + @ApiModelProperty(value = "属性描述") + private String columnComments; + + /** + * 数据类型 + */ + @ApiModelProperty(value = "数据类型") + private String dataType; + + /** + * 数据长度 + */ + @ApiModelProperty(value = "数据长度") + private Integer dataLength; + + /** + * 数据精度 + */ + @ApiModelProperty(value = "数据精度") + private Integer dataScale; + + /** + * 是否主键 0:否,1:是 + */ + @ApiModelProperty(value = "是否主键 0:否,1:是") + private Integer boolPrimaryKey; + + /** + * 是否必填 0:否,1:是 + */ + @ApiModelProperty(value = "是否必填 0:否,1:是") + private Integer boolRequired; + + /** + * 推广类型 0:统推,1：自建 + */ +// @ApiModelProperty(value = "推广类型 0:统推,1：自建") +// private String propPromotion; + + /** + * 显示顺序 + */ + @ApiModelProperty(value = "显示顺序") + private Integer propOrderNo; + + /** + * 提交人编号 + */ + @ApiModelProperty(value = "提交人编号") + private String propUserId; + + /** + * 提交人姓名 + */ + @ApiModelProperty(value = "提交人姓名") + private String propUserName; + + /** + * 创建时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiModelProperty(value = "创建时间") + private Date propCtime; + + /** + * 修改时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiModelProperty(value = "修改时间") + private Date propMtime; + +} + +// 字段名称 字段描述 字段类型 允许为NULL 备注 +// prop_id 主键 varchar(42) 否 +// model_id 模型id varchar(42) 否 +// column_name 属性名称 varchar(50) 否 +// column_code 属性编码 varchar(42) 否 +// column_comments 属性描述 varchar(50) 否 +// data_type 数据类型 int4 否 +// data_length 数据长度 int4 是 +// data_scale 数据精度 int4 是 +// is_pk 是否主键 int4 否 0:否,1:是 +// is_required 是否必填 int4 是 0:否,1:是 +// prop_promotion 推广类型 int4 是 0:统推,1：自建 +// company_id 省公司ID varchar(42) 是 +// company_name 省公司名称 varchar(50) 是 +// prop _dispidx 显示顺序 int4 否 +// prop_user_id 提交人id varchar(42) 否 +// prop_user_name 提交人姓名 varchar(64) 否 +// prop_ctime 创建时间 timestamp(6) 否 +// prop_mtime 修改时间 timestamp(6) 否 diff --git a/src/main/java/com/pms/ocp/model/dto/ModelRelationDTO.java b/src/main/java/com/pms/ocp/model/dto/ModelRelationDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..4d98fb75aa958a52e7f5cf0ac53a693175c50a2d --- /dev/null +++ b/src/main/java/com/pms/ocp/model/dto/ModelRelationDTO.java @@ -0,0 +1,86 @@ +package com.pms.ocp.model.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; + +/** + * @Auther: wangjian + * @Date: 2022/3/10 19:24 + * @Description:模型关系DTO对象 + */ + +@ApiModel(value = "模型关系DTO对象") +@Data +public class ModelRelationDTO { + + /** + * 模型关系编号 + * 主键 + */ + @ApiModelProperty(value = "模型关系编号") + private String objId; + + /** + * 模型编码 + */ + @ApiModelProperty(value = "模型编码") + private String modelCode; + + /** + * 模型属性编码 + */ + @ApiModelProperty(value = "模型属性编码") + private String modelPropCode; + + /** + * 关联模型编码 + */ + @ApiModelProperty(value = "关联模型编码") + private String relationModeCode; + + /** + * 关联模型属性编码 + */ + @ApiModelProperty(value = "关联模型属性编码") + private String relationModePropCode; + + /** + * 提交人id + */ + @ApiModelProperty(value = "提交人编号") + private String modelUserId; + + + /** + * 提交人姓名 + */ + @ApiModelProperty(value = "提交人姓名") + private String modelUserName; + + /** + * 订阅时间 + */ + @ApiModelProperty(value = "订阅时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private LocalDateTime modelCtime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private LocalDateTime modelMtime; + + /** + * 是否已删除 0:未删除 1:已删除 + */ + @ApiModelProperty(value = "是否已删除") + private String boolDelete; +} diff --git a/src/main/java/com/pms/ocp/model/dto/OcpApiGroupDtos.java b/src/main/java/com/pms/ocp/model/dto/OcpApiGroupDtos.java index b18dfaaae98d70d10ecb53141493bafabc7d9e97..84f3f1c70db31b93b96525c18e4f8f24e9d2de62 100644 --- a/src/main/java/com/pms/ocp/model/dto/OcpApiGroupDtos.java +++ b/src/main/java/com/pms/ocp/model/dto/OcpApiGroupDtos.java @@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.sql.Date; import java.sql.Timestamp; @@ -101,6 +102,55 @@ public class OcpApiGroupDtos { @ApiModelProperty("服务版本（最新版本）") private long apiVersion; + + public int getPageSize() { + return pageSize; + } + + public void setPageSize(int pageSize) { + this.pageSize = pageSize; + } + + public int getPageNum() { + return pageNum; + } + + public void setPageNum(int pageNum) { + this.pageNum = pageNum; + } + + public Timestamp getApiGroupCtime() { + return apiGroupCtime; + } + + public void setApiGroupCtime(Timestamp apiGroupCtime) { + this.apiGroupCtime = apiGroupCtime; + } + + public Timestamp getApiGroupMtime() { + return apiGroupMtime; + } + + public void setApiGroupMtime(Timestamp apiGroupMtime) { + this.apiGroupMtime = apiGroupMtime; + } + + public Timestamp getApiCtime() { + return apiCtime; + } + + public void setApiCtime(Timestamp apiCtime) { + this.apiCtime = apiCtime; + } + + public Timestamp getApiMtime() { + return apiMtime; + } + + public void setApiMtime(Timestamp apiMtime) { + this.apiMtime = apiMtime; + } + public String getApiGroupCode() { return apiGroupCode; } @@ -165,21 +215,7 @@ public class OcpApiGroupDtos { this.apiGroupUserName = apiGroupUserName; } - public Timestamp getApiGroupCtime() { - return apiGroupCtime; - } - - public void setApiGroupCtime(Timestamp apiGroupCtime) { - this.apiGroupCtime = apiGroupCtime; - } - public Timestamp getApiGroupMtime() { - return apiGroupMtime; - } - - public void setApiGroupMtime(Timestamp apiGroupMtime) { - this.apiGroupMtime = apiGroupMtime; - } public String getApiGroupPcode() { return apiGroupPcode; @@ -253,21 +289,6 @@ public class OcpApiGroupDtos { 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; diff --git a/src/main/java/com/pms/ocp/model/dto/OcpTenantGroupDto.java b/src/main/java/com/pms/ocp/model/dto/OcpTenantGroupDto.java new file mode 100644 index 0000000000000000000000000000000000000000..4e1e17c13d2340cd0d5b89ab0ca197d1521bc140 --- /dev/null +++ b/src/main/java/com/pms/ocp/model/dto/OcpTenantGroupDto.java @@ -0,0 +1,48 @@ +package com.pms.ocp.model.dto; + + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; +import java.util.Set; + +@ApiModel(value = "应用返回参数") +@Data +public class OcpTenantGroupDto { + + @ApiModelProperty("创建公司") + private Set oneList; + + + @ApiModelProperty("应用管理") + private List twoList; + + @ApiModelProperty("应用层") + private List ThreeList; + + public Set getOneList() { + return oneList; + } + + public void setOneList(Set oneList) { + this.oneList = oneList; + } + + public List getTwoList() { + return twoList; + } + + public void setTwoList(List twoList) { + this.twoList = twoList; + } + + public List getThreeList() { + return ThreeList; + } + + public void setThreeList(List threeList) { + ThreeList = threeList; + } +} diff --git a/src/main/java/com/pms/ocp/model/dto/OneTenanList.java b/src/main/java/com/pms/ocp/model/dto/OneTenanList.java new file mode 100644 index 0000000000000000000000000000000000000000..ed518e521e20723a33fcab235959feef9dd7a5c6 --- /dev/null +++ b/src/main/java/com/pms/ocp/model/dto/OneTenanList.java @@ -0,0 +1,213 @@ +package com.pms.ocp.model.dto; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +@EqualsAndHashCode(callSuper=false) +@ApiModel(value = "一级创建公司") +@Data +public class OneTenanList { + + /** + * 主键 + */ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty("主键") + private String objId; + + /** + * 应用分类编码 + */ + @ApiModelProperty("应用分类编码") + private String tenantGroupCode; + + /** + * 应用分类名称 + */ + @ApiModelProperty("应用分类名称") + private String tenantGroupName; + + /** + * 分类创建公司 + */ + @ApiModelProperty("分类创建公司") + private String tenantGroupCompanyCode; + + /** + * 上级code + */ + @ApiModelProperty("上级code") + private String tenantGroupPcode; + + /** + * 应用类别设备级、生态级等 + */ + @ApiModelProperty("应用类别设备级、生态级等") + private String tenantType; + + /** + * 分类版本 + */ + @ApiModelProperty("分类版本") + private String tenantGroupVersion; + + /** + * 显示顺序 + */ + @ApiModelProperty("显示顺序") + private Integer tenantGroupOrderNo; + + /** + * 提交人id + */ + @ApiModelProperty("提交人id") + private String tenantGroupUserId; + + /** + * 提交人姓名 + */ + @ApiModelProperty("提交人姓名") + private String tenantGroupUserName; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private Date tenantGroupCtime; + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private Date tenantGroupMtime; + + /** + * 是否删除 + */ + @ApiModelProperty("是否删除") + private Short isDelete; + + /** + * 应用树层级 1:应用分组层 2:应用层 + */ + @ApiModelProperty("应用树层级 1:应用分组层 2:应用层") + private Short tenantGroupLevel; + + public String getObjId() { + return objId; + } + + public void setObjId(String objId) { + this.objId = objId; + } + + public String getTenantGroupCode() { + return tenantGroupCode; + } + + public void setTenantGroupCode(String tenantGroupCode) { + this.tenantGroupCode = tenantGroupCode; + } + + public String getTenantGroupName() { + return tenantGroupName; + } + + public void setTenantGroupName(String tenantGroupName) { + this.tenantGroupName = tenantGroupName; + } + + public String getTenantGroupCompanyCode() { + return tenantGroupCompanyCode; + } + + public void setTenantGroupCompanyCode(String tenantGroupCompanyCode) { + this.tenantGroupCompanyCode = tenantGroupCompanyCode; + } + + public String getTenantGroupPcode() { + return tenantGroupPcode; + } + + public void setTenantGroupPcode(String tenantGroupPcode) { + this.tenantGroupPcode = tenantGroupPcode; + } + + public String getTenantType() { + return tenantType; + } + + public void setTenantType(String tenantType) { + this.tenantType = tenantType; + } + + public String getTenantGroupVersion() { + return tenantGroupVersion; + } + + public void setTenantGroupVersion(String tenantGroupVersion) { + this.tenantGroupVersion = tenantGroupVersion; + } + + public Integer getTenantGroupOrderNo() { + return tenantGroupOrderNo; + } + + public void setTenantGroupOrderNo(Integer tenantGroupOrderNo) { + this.tenantGroupOrderNo = tenantGroupOrderNo; + } + + public String getTenantGroupUserId() { + return tenantGroupUserId; + } + + public void setTenantGroupUserId(String tenantGroupUserId) { + this.tenantGroupUserId = tenantGroupUserId; + } + + public String getTenantGroupUserName() { + return tenantGroupUserName; + } + + public void setTenantGroupUserName(String tenantGroupUserName) { + this.tenantGroupUserName = tenantGroupUserName; + } + + public Date getTenantGroupCtime() { + return tenantGroupCtime; + } + + public void setTenantGroupCtime(Date tenantGroupCtime) { + this.tenantGroupCtime = tenantGroupCtime; + } + + public Date getTenantGroupMtime() { + return tenantGroupMtime; + } + + public void setTenantGroupMtime(Date tenantGroupMtime) { + this.tenantGroupMtime = tenantGroupMtime; + } + + public Short getIsDelete() { + return isDelete; + } + + public void setIsDelete(Short isDelete) { + this.isDelete = isDelete; + } + + public Short getTenantGroupLevel() { + return tenantGroupLevel; + } + + public void setTenantGroupLevel(Short tenantGroupLevel) { + this.tenantGroupLevel = tenantGroupLevel; + } +} diff --git a/src/main/java/com/pms/ocp/model/dto/TenanBaseDto.java b/src/main/java/com/pms/ocp/model/dto/TenanBaseDto.java new file mode 100644 index 0000000000000000000000000000000000000000..1f5b96169d74c646522f7565fa75415bae56221e --- /dev/null +++ b/src/main/java/com/pms/ocp/model/dto/TenanBaseDto.java @@ -0,0 +1,144 @@ +package com.pms.ocp.model.dto; + + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.pms.ocp.model.entity.OcpTenantGroup; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.sql.Timestamp; + +/** + * 新增应用封装对象 + */ +@ApiModel(value = "新增应用封装对象") +@Data +public class TenanBaseDto extends OcpTenantGroup { + + + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty("主键ID") + private String objId; + + /** + * 应用名称 + */ + @ApiModelProperty("应用名称") + private String tenantName; + + /** + * 应用代码 + */ + @ApiModelProperty("应用代码") + private String tenantCode; + + /** + * 应用分类代码 + */ + @ApiModelProperty("应用分类代码") + private String tenantGroupCode; + + /** + * 应用ip + */ + @ApiModelProperty("应用ip") + private String tenantIp; + + /** + * 应用url + */ + @ApiModelProperty("应用url") + private String tenantUrl; + + /** + * 所属专业 + */ + @ApiModelProperty("所属专业") + private String professionalKind; + + /** + * 创建者用户ID + */ + @ApiModelProperty("创建者用户ID") + private String tenantUserId; + + /** + * 排序 + */ + @ApiModelProperty("排序") + private Integer tenantOrderNo; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private Timestamp tenantCtime; + + /** + * 最后更新时间 + */ + @ApiModelProperty("最后更新时间") + private Timestamp tenantMtime; + + /** + * 部署名称 + */ + @ApiModelProperty("部署名称") + private String deploymentName; + + /** + * 描述 + */ + @ApiModelProperty("描述") + private String tenantDescription; + + /** + * 应用状态0:设计态；1:运行态 + */ + @ApiModelProperty("应用状态0:设计态；1:运行态") + private Short tenantState; + + /** + * 建设单位 + */ + @ApiModelProperty("建设单位") + private String tenantUnit; + + /** + * 所属公司编码 + */ + @ApiModelProperty("所属公司编码") + private String ownerCompanyCode; + + /** + * 所属公司名称 + */ + @ApiModelProperty("所属公司名称") + private String ownerCompanyName; + + /** + * 是否删除0:否;1:是 + */ + @ApiModelProperty("是否删除0:否;1:是") + private Short isDelete; + + /** + * 所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区 + */ + @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区") + private Short tenantZone; + + /** + * 所属层级 1:应用层;2:平台层;3:网络层;4:感知层; + */ + @ApiModelProperty("所属层级 1:应用层;2:平台层;3:网络层;4:感知层;") + private Short tenantLayer; + + /** + * 应用版本（当前版本） + */ + @ApiModelProperty("应用版本（当前版本）") + private String tenantVersion; +} diff --git a/src/main/java/com/pms/ocp/model/dto/ThreeTenanList.java b/src/main/java/com/pms/ocp/model/dto/ThreeTenanList.java new file mode 100644 index 0000000000000000000000000000000000000000..23fbc8f34256fd5deabd702ff24119904edaf649 --- /dev/null +++ b/src/main/java/com/pms/ocp/model/dto/ThreeTenanList.java @@ -0,0 +1,215 @@ +package com.pms.ocp.model.dto; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + + +@EqualsAndHashCode(callSuper=false) +@ApiModel(value = "三级应用") +@Data +public class ThreeTenanList { + + + /** + * 主键 + */ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty("主键") + private String objId; + + /** + * 应用分类编码 + */ + @ApiModelProperty("应用分类编码") + private String tenantGroupCode; + + /** + * 应用分类名称 + */ + @ApiModelProperty("应用分类名称") + private String tenantGroupName; + + /** + * 分类创建公司 + */ + @ApiModelProperty("分类创建公司") + private String tenantGroupCompanyCode; + + /** + * 上级code + */ + @ApiModelProperty("上级code") + private String tenantGroupPcode; + + /** + * 应用类别设备级、生态级等 + */ + @ApiModelProperty("应用类别设备级、生态级等") + private String tenantType; + + /** + * 分类版本 + */ + @ApiModelProperty("分类版本") + private String tenantGroupVersion; + + /** + * 显示顺序 + */ + @ApiModelProperty("显示顺序") + private Integer tenantGroupOrderNo; + + /** + * 提交人id + */ + @ApiModelProperty("提交人id") + private String tenantGroupUserId; + + /** + * 提交人姓名 + */ + @ApiModelProperty("提交人姓名") + private String tenantGroupUserName; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private Date tenantGroupCtime; + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private Date tenantGroupMtime; + + /** + * 是否删除 + */ + @ApiModelProperty("是否删除") + private Short isDelete; + + /** + * 应用树层级 1:应用分组层 2:应用层 + */ + @ApiModelProperty("应用树层级 1:应用分组层 2:应用层") + private Short tenantGroupLevel; + + public String getObjId() { + return objId; + } + + public void setObjId(String objId) { + this.objId = objId; + } + + public String getTenantGroupCode() { + return tenantGroupCode; + } + + public void setTenantGroupCode(String tenantGroupCode) { + this.tenantGroupCode = tenantGroupCode; + } + + public String getTenantGroupName() { + return tenantGroupName; + } + + public void setTenantGroupName(String tenantGroupName) { + this.tenantGroupName = tenantGroupName; + } + + public String getTenantGroupCompanyCode() { + return tenantGroupCompanyCode; + } + + public void setTenantGroupCompanyCode(String tenantGroupCompanyCode) { + this.tenantGroupCompanyCode = tenantGroupCompanyCode; + } + + public String getTenantGroupPcode() { + return tenantGroupPcode; + } + + public void setTenantGroupPcode(String tenantGroupPcode) { + this.tenantGroupPcode = tenantGroupPcode; + } + + public String getTenantType() { + return tenantType; + } + + public void setTenantType(String tenantType) { + this.tenantType = tenantType; + } + + public String getTenantGroupVersion() { + return tenantGroupVersion; + } + + public void setTenantGroupVersion(String tenantGroupVersion) { + this.tenantGroupVersion = tenantGroupVersion; + } + + public Integer getTenantGroupOrderNo() { + return tenantGroupOrderNo; + } + + public void setTenantGroupOrderNo(Integer tenantGroupOrderNo) { + this.tenantGroupOrderNo = tenantGroupOrderNo; + } + + public String getTenantGroupUserId() { + return tenantGroupUserId; + } + + public void setTenantGroupUserId(String tenantGroupUserId) { + this.tenantGroupUserId = tenantGroupUserId; + } + + public String getTenantGroupUserName() { + return tenantGroupUserName; + } + + public void setTenantGroupUserName(String tenantGroupUserName) { + this.tenantGroupUserName = tenantGroupUserName; + } + + public Date getTenantGroupCtime() { + return tenantGroupCtime; + } + + public void setTenantGroupCtime(Date tenantGroupCtime) { + this.tenantGroupCtime = tenantGroupCtime; + } + + public Date getTenantGroupMtime() { + return tenantGroupMtime; + } + + public void setTenantGroupMtime(Date tenantGroupMtime) { + this.tenantGroupMtime = tenantGroupMtime; + } + + public Short getIsDelete() { + return isDelete; + } + + public void setIsDelete(Short isDelete) { + this.isDelete = isDelete; + } + + public Short getTenantGroupLevel() { + return tenantGroupLevel; + } + + public void setTenantGroupLevel(Short tenantGroupLevel) { + this.tenantGroupLevel = tenantGroupLevel; + } +} diff --git a/src/main/java/com/pms/ocp/model/dto/TwoTenanList.java b/src/main/java/com/pms/ocp/model/dto/TwoTenanList.java new file mode 100644 index 0000000000000000000000000000000000000000..235991619863c4546561bb9a9d4a6963a47915af --- /dev/null +++ b/src/main/java/com/pms/ocp/model/dto/TwoTenanList.java @@ -0,0 +1,216 @@ +package com.pms.ocp.model.dto; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + + + +@EqualsAndHashCode(callSuper=false) +@ApiModel(value = "二级应用管理") +@Data +public class TwoTenanList { + + + /** + * 主键 + */ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty("主键") + private String objId; + + /** + * 应用分类编码 + */ + @ApiModelProperty("应用分类编码") + private String tenantGroupCode; + + /** + * 应用分类名称 + */ + @ApiModelProperty("应用分类名称") + private String tenantGroupName; + + /** + * 分类创建公司 + */ + @ApiModelProperty("分类创建公司") + private String tenantGroupCompanyCode; + + /** + * 上级code + */ + @ApiModelProperty("上级code") + private String tenantGroupPcode; + + /** + * 应用类别设备级、生态级等 + */ + @ApiModelProperty("应用类别设备级、生态级等") + private String tenantType; + + /** + * 分类版本 + */ + @ApiModelProperty("分类版本") + private String tenantGroupVersion; + + /** + * 显示顺序 + */ + @ApiModelProperty("显示顺序") + private Integer tenantGroupOrderNo; + + /** + * 提交人id + */ + @ApiModelProperty("提交人id") + private String tenantGroupUserId; + + /** + * 提交人姓名 + */ + @ApiModelProperty("提交人姓名") + private String tenantGroupUserName; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private Date tenantGroupCtime; + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private Date tenantGroupMtime; + + /** + * 是否删除 + */ + @ApiModelProperty("是否删除") + private Short isDelete; + + /** + * 应用树层级 1:应用分组层 2:应用层 + */ + @ApiModelProperty("应用树层级 1:应用分组层 2:应用层") + private Short tenantGroupLevel; + + public String getObjId() { + return objId; + } + + public void setObjId(String objId) { + this.objId = objId; + } + + public String getTenantGroupCode() { + return tenantGroupCode; + } + + public void setTenantGroupCode(String tenantGroupCode) { + this.tenantGroupCode = tenantGroupCode; + } + + public String getTenantGroupName() { + return tenantGroupName; + } + + public void setTenantGroupName(String tenantGroupName) { + this.tenantGroupName = tenantGroupName; + } + + public String getTenantGroupCompanyCode() { + return tenantGroupCompanyCode; + } + + public void setTenantGroupCompanyCode(String tenantGroupCompanyCode) { + this.tenantGroupCompanyCode = tenantGroupCompanyCode; + } + + public String getTenantGroupPcode() { + return tenantGroupPcode; + } + + public void setTenantGroupPcode(String tenantGroupPcode) { + this.tenantGroupPcode = tenantGroupPcode; + } + + public String getTenantType() { + return tenantType; + } + + public void setTenantType(String tenantType) { + this.tenantType = tenantType; + } + + public String getTenantGroupVersion() { + return tenantGroupVersion; + } + + public void setTenantGroupVersion(String tenantGroupVersion) { + this.tenantGroupVersion = tenantGroupVersion; + } + + public Integer getTenantGroupOrderNo() { + return tenantGroupOrderNo; + } + + public void setTenantGroupOrderNo(Integer tenantGroupOrderNo) { + this.tenantGroupOrderNo = tenantGroupOrderNo; + } + + public String getTenantGroupUserId() { + return tenantGroupUserId; + } + + public void setTenantGroupUserId(String tenantGroupUserId) { + this.tenantGroupUserId = tenantGroupUserId; + } + + public String getTenantGroupUserName() { + return tenantGroupUserName; + } + + public void setTenantGroupUserName(String tenantGroupUserName) { + this.tenantGroupUserName = tenantGroupUserName; + } + + public Date getTenantGroupCtime() { + return tenantGroupCtime; + } + + public void setTenantGroupCtime(Date tenantGroupCtime) { + this.tenantGroupCtime = tenantGroupCtime; + } + + public Date getTenantGroupMtime() { + return tenantGroupMtime; + } + + public void setTenantGroupMtime(Date tenantGroupMtime) { + this.tenantGroupMtime = tenantGroupMtime; + } + + public Short getIsDelete() { + return isDelete; + } + + public void setIsDelete(Short isDelete) { + this.isDelete = isDelete; + } + + public Short getTenantGroupLevel() { + return tenantGroupLevel; + } + + public void setTenantGroupLevel(Short tenantGroupLevel) { + this.tenantGroupLevel = tenantGroupLevel; + } +} diff --git a/src/main/java/com/pms/ocp/model/entity/ModelType.java b/src/main/java/com/pms/ocp/model/entity/ModelClassify.java similarity index 98% rename from src/main/java/com/pms/ocp/model/entity/ModelType.java rename to src/main/java/com/pms/ocp/model/entity/ModelClassify.java index 364f93b9eacebf357b15daadda240e3c49b3a518..888534cfd2abe5a38ad0825d3392232278be212d 100644 --- a/src/main/java/com/pms/ocp/model/entity/ModelType.java +++ b/src/main/java/com/pms/ocp/model/entity/ModelClassify.java @@ -18,7 +18,7 @@ import java.util.Date; @Data @Accessors(chain = true) @TableName("ocp_model_group") -public class ModelType { +public class ModelClassify { /** * 模型分类编号 diff --git a/src/main/java/com/pms/ocp/model/entity/ModelIssue.java b/src/main/java/com/pms/ocp/model/entity/ModelIssue.java index 2b693ab0b190a0ad40fffd8504a43aba78cfd056..a0d865d104b5a170c65edbdbd5d35e3dcf0bdb10 100644 --- a/src/main/java/com/pms/ocp/model/entity/ModelIssue.java +++ b/src/main/java/com/pms/ocp/model/entity/ModelIssue.java @@ -1,6 +1,14 @@ package com.pms.ocp.model.entity; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; +import java.util.Date; /** * @Auther: wangjian @@ -9,5 +17,78 @@ import lombok.Data; */ @Data +@Accessors(chain = true) +@TableName("ocp_model_subs") public class ModelIssue { + + /** + * 模型订阅编号 + */ + @TableId(value = "obj_id") + private String objId; + + /** + * 模型编码 + */ + private String modelCode; + + /** + * 订阅状态 0:订阅, 1:取消订阅 + */ + private int subsStatus; + + /** + * 订阅公司编码 + */ + private String subsCompanyCode; + + /** + * 订阅人员编号 + */ + private String subsUserId; + + /** + * 订阅人名称 + */ + private String subsUserName; + + /** + * 订阅时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private LocalDateTime subsCtime; + + /** + * 修改时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private LocalDateTime subsMtime; } + +// create table ocp_model_subs +// ( +// obj_id varchar(42) not null +// constraint ocp_model_subs_pkey +// primary key, +// model_code varchar(42) not null, +// subs_status smallint, +// subs_company_code varchar(42) not null, +// subs_user_id varchar(42), +// subs_user_name varchar(64), +// subs_ctime timestamp(6), +// subs_mtime timestamp(6) +// ); +// +// comment on table ocp_model_subs is '模型订阅表'; +// comment on column ocp_model_subs.obj_id is '主键是'; +// comment on column ocp_model_subs.model_code is '模型code是'; +// comment on column ocp_model_subs.subs_status is '订阅状态0:订阅,1:取消订阅'; +// comment on column ocp_model_subs.subs_company_code is '订阅公司code'; +// comment on column ocp_model_subs.subs_user_id is '订阅人员id'; +// comment on column ocp_model_subs.subs_user_name is '订阅人'; +// comment on column ocp_model_subs.subs_ctime is '订阅时间'; +// comment on column ocp_model_subs.subs_mtime is '修改时间'; +// alter table ocp_model_subs +// owner to postgres; \ No newline at end of file diff --git a/src/main/java/com/pms/ocp/model/entity/ModelProperty.java b/src/main/java/com/pms/ocp/model/entity/ModelProperty.java index ff930b3aaa19fbcbbc26d14abcf8570fd14740b9..5934482ae4e5bca1ab6fcd07fda1cb7cda65d485 100644 --- a/src/main/java/com/pms/ocp/model/entity/ModelProperty.java +++ b/src/main/java/com/pms/ocp/model/entity/ModelProperty.java @@ -3,9 +3,16 @@ package com.pms.ocp.model.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.AllArgsConstructor; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; +import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; import lombok.Data; -import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; /** * @Auther: wangjian @@ -13,6 +20,7 @@ import lombok.NoArgsConstructor; * @Description:模型属性对象 */ @Data +@Accessors(chain = true) @TableName("ocp_model_prop") public class ModelProperty{ @@ -50,36 +58,34 @@ public class ModelProperty{ /** * 数据长度 */ - private String dataLength; + private Integer dataLength; /** * 数据精度 */ - private String dataScale; + private Integer dataScale; /** * 是否主键 */ @TableField(value = "is_pk") - private String boolPrimaryKey; + private Integer boolPrimaryKey; /** * 是否必填 */ @TableField(value = "is_required") - private String boolRequired; + private Integer boolRequired; /** * 推广类型 */ - private String propPromotion; - - +// private String propPromotion; /** * 显示顺序 */ - private String propOrderNo; + private Integer propOrderNo; /** * 提交人id @@ -94,14 +100,21 @@ public class ModelProperty{ /** * 创建时间 */ - @TableField(value = "prop_ctime") - private String prop_ctime; + @JsonDeserialize(using = LocalDateTimeDeserializer.class) + @JsonSerialize(using = LocalDateTimeSerializer.class) + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") +// @TableField() +// @TableField(typeHandler = TimestampTypeHandler.class) + private LocalDateTime propCtime; /** * 修改时间 */ - @TableField(value = "prop_mtime") - private String prop_mtime; +// @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") +// @TableField(typeHandler = TimestampTypeHandler.class) + private LocalDateTime propMtime; } // 字段名称 字段描述 字段类型 允许为NULL 备注 @@ -115,7 +128,6 @@ public class ModelProperty{ // data_scale 数据精度 int4 是 // is_pk 是否主键 int4 否 0:否,1:是 // is_required 是否必填 int4 是 0:否,1:是 -// prop_promotion 推广类型 int4 是 0:统推,1：自建 // company_id 省公司ID varchar(42) 是 // company_name 省公司名称 varchar(50) 是 // prop _dispidx 显示顺序 int4 否 diff --git a/src/main/java/com/pms/ocp/model/entity/ModelRelation.java b/src/main/java/com/pms/ocp/model/entity/ModelRelation.java new file mode 100644 index 0000000000000000000000000000000000000000..cd074c00bef0ed539dfd0ea65a18ecf8a46c7e53 --- /dev/null +++ b/src/main/java/com/pms/ocp/model/entity/ModelRelation.java @@ -0,0 +1,109 @@ +package com.pms.ocp.model.entity; + +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 lombok.Data; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; + +/** + * @Auther: wangjian + * @Date: 2022/3/10 19:16 + * @Description:模型关系对象 + */ + +@Data +@Accessors(chain = true) +@TableName("ocp_model_rel") +public class ModelRelation { + + /** + * 模型关系编号 + * 主键 + */ + @TableId(value = "obj_id") + private String objId; + + /** + * 模型编码 + */ + private String modelCode; + + /** + * 模型属性编码 + */ + private String modelPropCode; + + /** + * 关联模型编码 + */ + private String relationModeCode; + + /** + * 关联模型属性编码 + */ + private String relationModePropCode; + + /** + * 提交人编号 + */ + private String modelUserId; + + + /** + * 提交人姓名 + */ + private String modelUserName; + + /** + * 订阅时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private LocalDateTime modelCtime; + + /** + * 修改时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private LocalDateTime modelMtime; + + /** + * 是否已删除 0:未删除 1:已删除 + */ + @TableField("is_delete") + private String boolDelete; + +} + + +// create table ocp_model_rel +// ( +// obj_id varchar(42) constraint ocp_model_rel_pkey primary key, +// model_code varchar(42) default ''::character varying not null, +// model_prop_code varchar(42) default ''::character varying not null, +// relation_mode_code varchar(42) default ''::character varying not null, +// relation_mode_prop_code varchar(43) default ''::character varying not null, +// model_user_id varchar(42) default ''::character varying, +// model_user_name varchar(64) default ''::character varying, +// model_ctime timestamp(6) default '2000-01-01 00:00:00'::timestamp(0) without time zone, +// model_mtime timestamp(6) default '2000-01-01 00:00:00'::timestamp(0) without time zone, +// is_delete smallint default '-1'::integer +// ); +// +// comment on table ocp_model_rel is '模型关系表'; +// comment on column ocp_model_rel.obj_id is '主键'; +// comment on column ocp_model_rel.model_code is '模型编码'; +// comment on column ocp_model_rel.model_prop_code is '模型属性编码'; +// comment on column ocp_model_rel.relation_mode_code is '关联模型编码'; +// comment on column ocp_model_rel.relation_mode_prop_code is '关联模型属性编码'; +// comment on column ocp_model_rel.model_user_id is '提交人id'; +// comment on column ocp_model_rel.model_user_name is '提交人姓名'; +// comment on column ocp_model_rel.model_ctime is '创建时间'; +// comment on column ocp_model_rel.model_mtime is '修改时间'; +// comment on column ocp_model_rel.is_delete is '是否已删除0:未删除 1:已删除'; \ No newline at end of file diff --git a/src/main/java/com/pms/ocp/model/entity/OcpApiBase.java b/src/main/java/com/pms/ocp/model/entity/OcpApiBase.java index 0daacadfe6edb5d57e01acb7611b17ca8bf50b08..753f1458ab086447617ec5e31b1b56324b5f66e4 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpApiBase.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpApiBase.java @@ -7,6 +7,8 @@ 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 @@ -167,25 +169,23 @@ public class OcpApiBase { } - public Timestamp getApiCtime() { - return apiCtime; - } - - public void setApiCtime(Timestamp apiCtime) { - this.apiCtime = apiCtime; - } - + public Timestamp getApiCtime() { + return apiCtime; + } - public Timestamp getApiMtime() { - return apiMtime; - } + public void setApiCtime(Timestamp apiCtime) { + this.apiCtime = apiCtime; + } - public void setApiMtime(Timestamp apiMtime) { - this.apiMtime = apiMtime; - } + public Timestamp getApiMtime() { + return apiMtime; + } + public void setApiMtime(Timestamp apiMtime) { + this.apiMtime = apiMtime; + } - public String getApiUserId() { + public String getApiUserId() { return apiUserId; } diff --git a/src/main/java/com/pms/ocp/model/entity/OcpApiGroup.java b/src/main/java/com/pms/ocp/model/entity/OcpApiGroup.java index b1579629d6d32245d394ec13f5eecf092592ec67..205eb47aaf0e6f6503677d2b30a76c5a0fb0d565 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpApiGroup.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpApiGroup.java @@ -1,6 +1,7 @@ package com.pms.ocp.model.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; @@ -8,10 +9,11 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; import java.sql.Timestamp; +import java.util.List; @Data @Accessors(chain = true) -@TableName("ocp_api_Group") +@TableName("ocp_api_group") @ApiModel("服务分类表") public class OcpApiGroup { @TableId(type = IdType.ASSIGN_ID) @@ -58,6 +60,7 @@ public class OcpApiGroup { private long apiGroupLevel; + public long getApiGroupLevel() { return apiGroupLevel; } diff --git a/src/main/java/com/pms/ocp/model/entity/OcpApiSubs.java b/src/main/java/com/pms/ocp/model/entity/OcpApiSubs.java index 252932f8fd9f73c686f7d9c44626b94045afc101..3e4d512c54712fbd67cea5dcb45aee41bb9fa131 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpApiSubs.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpApiSubs.java @@ -40,6 +40,50 @@ public class OcpApiSubs { @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 long apiVersion; public String getObjId() { return objId; @@ -49,7 +93,6 @@ public class OcpApiSubs { this.objId = objId; } - public String getApiCode() { return apiCode; } @@ -58,7 +101,6 @@ public class OcpApiSubs { this.apiCode = apiCode; } - public Timestamp getSubsLogApiCtime() { return subsLogApiCtime; } @@ -67,7 +109,6 @@ public class OcpApiSubs { this.subsLogApiCtime = subsLogApiCtime; } - public Timestamp getSubsLogApiMtime() { return subsLogApiMtime; } @@ -76,7 +117,6 @@ public class OcpApiSubs { this.subsLogApiMtime = subsLogApiMtime; } - public String getSubsLogApiUserId() { return subsLogApiUserId; } @@ -85,7 +125,6 @@ public class OcpApiSubs { this.subsLogApiUserId = subsLogApiUserId; } - public Timestamp getSubsLogApiAtime() { return subsLogApiAtime; } @@ -94,7 +133,6 @@ public class OcpApiSubs { this.subsLogApiAtime = subsLogApiAtime; } - public String getSubsCompanyCode() { return subsCompanyCode; } @@ -103,7 +141,6 @@ public class OcpApiSubs { this.subsCompanyCode = subsCompanyCode; } - public long getIsDelete() { return isDelete; } @@ -112,4 +149,123 @@ public class OcpApiSubs { 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; + } } diff --git a/src/main/java/com/pms/ocp/model/entity/OcpApiTenantRel.java b/src/main/java/com/pms/ocp/model/entity/OcpApiTenantRel.java index 072478dd110a0c1d74be47f4f395f18629522bb1..0455acc9afb840b74f85816dd2031ac0ec1d20d7 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpApiTenantRel.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpApiTenantRel.java @@ -11,7 +11,7 @@ import java.sql.Timestamp; @Data @Accessors(chain = true) -@TableName("ocp_api_Tenant_rel") + @ApiModel("服务应用关系表") public class OcpApiTenantRel { diff --git a/src/main/java/com/pms/ocp/model/entity/OcpTenantGroup.java b/src/main/java/com/pms/ocp/model/entity/OcpTenantGroup.java index 7d3cde1b0c73d379aa933fd28a07250ae0eeb780..5b06141bc08746dd5c0f96508665ea9ab7aa8867 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpTenantGroup.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpTenantGroup.java @@ -1,6 +1,7 @@ package com.pms.ocp.model.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; @@ -9,7 +10,9 @@ import lombok.Data; import lombok.experimental.Accessors; import java.io.Serializable; +import java.sql.Timestamp; import java.util.Date; +import java.util.List; /** * 应用分类表 @@ -85,13 +88,13 @@ public class OcpTenantGroup implements Serializable { * 创建时间 */ @ApiModelProperty("创建时间") - private Date tenantGroupCtime; + private Timestamp tenantGroupCtime; /** * 修改时间 */ @ApiModelProperty("修改时间") - private Date tenantGroupMtime; + private Timestamp tenantGroupMtime; /** * 是否删除 @@ -105,6 +108,12 @@ public class OcpTenantGroup implements Serializable { @ApiModelProperty("应用树层级 1:应用分组层 2:应用层") private Short tenantGroupLevel; + + + public static long getSerialVersionUID() { + return serialVersionUID; + } + private static final long serialVersionUID = 1L; /** @@ -257,7 +266,7 @@ public class OcpTenantGroup implements Serializable { /** * 创建时间 */ - public void setTenantGroupCtime(Date tenantGroupCtime) { + public void setTenantGroupCtime(Timestamp tenantGroupCtime) { this.tenantGroupCtime = tenantGroupCtime; } @@ -271,7 +280,7 @@ public class OcpTenantGroup implements Serializable { /** * 修改时间 */ - public void setTenantGroupMtime(Date tenantGroupMtime) { + public void setTenantGroupMtime(Timestamp tenantGroupMtime) { this.tenantGroupMtime = tenantGroupMtime; } diff --git a/src/main/java/com/pms/ocp/model/vo/ModelRelationVO.java b/src/main/java/com/pms/ocp/model/vo/ModelRelationVO.java new file mode 100644 index 0000000000000000000000000000000000000000..1aebf8dc839ff961087b3eddd8305274da36f23a --- /dev/null +++ b/src/main/java/com/pms/ocp/model/vo/ModelRelationVO.java @@ -0,0 +1,86 @@ +package com.pms.ocp.model.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; + +/** + * @Auther: wangjian + * @Date: 2022/3/10 19:24 + * @Description:模型关系VO对象 + */ + +@ApiModel(value = "模型关系VO对象") +@Data +public class ModelRelationVO { + + /** + * 模型关系编号 + * 主键 + */ + @ApiModelProperty(value = "模型关系编号") + private String objId; + + /** + * 模型编码 + */ + @ApiModelProperty(value = "模型编码") + private String modelCode; + + /** + * 模型属性编码 + */ + @ApiModelProperty(value = "模型属性编码") + private String modelPropCode; + + /** + * 关联模型编码 + */ + @ApiModelProperty(value = "关联模型编码") + private String relationModeCode; + + /** + * 关联模型属性编码 + */ + @ApiModelProperty(value = "关联模型属性编码") + private String relationModePropCode; + + /** + * 提交人id + */ + @ApiModelProperty(value = "提交人编号") + private String modelUserId; + + + /** + * 提交人姓名 + */ + @ApiModelProperty(value = "提交人姓名") + private String modelUserName; + + /** + * 订阅时间 + */ + @ApiModelProperty(value = "订阅时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private LocalDateTime modelCtime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private LocalDateTime modelMtime; + + /** + * 是否已删除 0:未删除 1:已删除 + */ + @ApiModelProperty(value = "是否已删除") + private String boolDelete; +} diff --git a/src/main/java/com/pms/ocp/model/vo/OcpModelGroupVO.java b/src/main/java/com/pms/ocp/model/vo/OcpModelGroupVO.java index fa5281796e36020139e53730f4a4c177676c5760..a213bfd614d103e2ee817df3948d48c989a39a76 100644 --- a/src/main/java/com/pms/ocp/model/vo/OcpModelGroupVO.java +++ b/src/main/java/com/pms/ocp/model/vo/OcpModelGroupVO.java @@ -2,8 +2,10 @@ package com.pms.ocp.model.vo; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; import java.util.Date; @@ -75,11 +77,15 @@ public class OcpModelGroupVO implements Serializable { /** * 创建时间 */ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建时间") private Date groupCtime; /** * 修改时间 */ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "修改时间") private Date groupMtime; /** @@ -88,13 +94,23 @@ public class OcpModelGroupVO implements Serializable { @ApiModelProperty(value = "是否已删除0未删除 1未删除") private Integer isDelete; + @TableField(exist = false) + @ApiModelProperty(value = "层级") + private int level; /** * 子类集合 */ @TableField(exist = false) @ApiModelProperty(value = "子类集合") - List childrenList; + private List childrenList; + + public String getModelGroupCode() { + return modelGroupCode == null ? "" : modelGroupCode; + } + public String getModelGroupPcode() { + return modelGroupPcode == null ? "" : modelGroupPcode; + } } diff --git a/src/main/java/com/pms/ocp/service/ModelClassifyService.java b/src/main/java/com/pms/ocp/service/ModelClassifyService.java index 7052d1de9ea0166ea77449fd3e4d4c3fde20c3aa..7975b41dc0a0ba419200c9faa4ed65554e7ebccf 100644 --- a/src/main/java/com/pms/ocp/service/ModelClassifyService.java +++ b/src/main/java/com/pms/ocp/service/ModelClassifyService.java @@ -1,6 +1,6 @@ package com.pms.ocp.service; -import com.pms.ocp.model.entity.ModelType; +import com.pms.ocp.model.entity.ModelClassify; import com.pms.ocp.model.vo.OcpModelGroupVO; import com.pms.ocp.model.vo.ResponseVO; @@ -12,11 +12,11 @@ import java.util.List; * @date 2022/3/8 15:19 */ public interface ModelClassifyService { - ResponseVO> getModelNavigation(String searchCondition); + ResponseVO> getModelNavigation(); - ResponseVO insert(List list); + ResponseVO insert(List list); - ResponseVO subclassDetailsList(int pageSize,int pageNum,String parentGroupCode,String subclassGroupName); + ResponseVO subclassDetailsList(int currentPage,int pageSize,String parentGroupCode,String subclassGroupName); - ResponseVO update(List list); + ResponseVO update(List list); } diff --git a/src/main/java/com/pms/ocp/service/ModelGroupService.java b/src/main/java/com/pms/ocp/service/ModelGroupService.java index e8b3acf050a3c71ab1669030bfdb5f237818672a..2f0ed05e48ba6f379d4316a04f86d0958e84231f 100644 --- a/src/main/java/com/pms/ocp/service/ModelGroupService.java +++ b/src/main/java/com/pms/ocp/service/ModelGroupService.java @@ -1,15 +1,15 @@ package com.pms.ocp.service; -import com.pms.ocp.model.entity.ModelType; +import com.pms.ocp.model.entity.ModelClassify; import com.pms.ocp.model.vo.ResponseVO; public interface ModelGroupService { ResponseVO getModelType(); - ResponseVO createModelType(ModelType modelType); + ResponseVO createModelType(ModelClassify modelClassify); ResponseVO deleteModelType(String modelTypeId); - ResponseVO updateModelType(ModelType modelType); + ResponseVO updateModelType(ModelClassify modelClassify); } diff --git a/src/main/java/com/pms/ocp/service/ModelIssueService.java b/src/main/java/com/pms/ocp/service/ModelIssueService.java index 67ef6173d8b7328c57d1c5e766b453d7104c1e6e..250f29fc08049195ad3a3898b4ddea6493fb79de 100644 --- a/src/main/java/com/pms/ocp/service/ModelIssueService.java +++ b/src/main/java/com/pms/ocp/service/ModelIssueService.java @@ -1,7 +1,7 @@ package com.pms.ocp.service; +import com.pms.ocp.model.dto.ModelIssueDTO; import com.pms.ocp.model.entity.ModelIssue; -import com.pms.ocp.model.entity.ModelType; import java.util.List; @@ -15,10 +15,10 @@ public interface ModelIssueService { /** * 创建模型订阅 * - * @param modelIssueo + * @param modelIssueDTO * @return */ - Integer createModelIssue(ModelIssue modelIssueo); + Integer createModelIssue(ModelIssueDTO modelIssueDTO); /** * 删除模型订阅 @@ -28,13 +28,21 @@ public interface ModelIssueService { */ Integer deleteModelIssue(String modelId); + /** + * 批量删除模型订阅 + * + * @param ids + * @return + */ + Integer deletePatchModelIssue(List ids); + /** * 更新模型订阅 * - * @param modelIssueo + * @param modelIssue * @return */ - Integer updateModelIssue(ModelIssue modelIssueo); + Integer updateModelIssue(ModelIssue modelIssue); /** * 获取模型订阅 @@ -42,7 +50,7 @@ public interface ModelIssueService { * @param * @return */ - List getModelIssueList(); + List getModelIssueList(String objId, String modelCode, String subsCompanyCode); /** * 获取模型订阅列表 @@ -50,5 +58,5 @@ public interface ModelIssueService { * @param modelId * @return */ - ModelType getModelIssue(String modelId); + ModelIssueDTO getModelIssue(String modelId); } diff --git a/src/main/java/com/pms/ocp/service/ModelPropertyService.java b/src/main/java/com/pms/ocp/service/ModelPropertyService.java index df9e737230d9fbe29f2b02a81d457ada6a36e0c5..5e5779a8abc7027eed4bb9b5f8f13e1d5a7a028c 100644 --- a/src/main/java/com/pms/ocp/service/ModelPropertyService.java +++ b/src/main/java/com/pms/ocp/service/ModelPropertyService.java @@ -1,6 +1,8 @@ package com.pms.ocp.service; +import com.pms.ocp.model.dto.ModelPropertyDTO; import com.pms.ocp.model.entity.ModelProperty; +import io.swagger.models.auth.In; import java.util.List; @@ -14,40 +16,48 @@ public interface ModelPropertyService { /** * 创建模型属性 * - * @param modelProperty + * @param modelPropertyDTO * @return */ - Integer createModelProperty(ModelProperty modelProperty); + Integer createModelProperty(ModelPropertyDTO modelPropertyDTO); /** * 删除模型属性 * - * @param modelId + * @param modelCode * @return */ - Integer deleteModelProperty(String modelId); + Integer deleteModelProperty(String modelCode, String propCode); + + /** + * 批量删除模型属性 + * + * @param ids + * @return + */ + Integer deletePatchModelProperty(List ids); /** * 更新模型属性 * - * @param modelProperty + * @param modelPropertyDTO * @return */ - Integer updateModelProperty(ModelProperty modelProperty); + Integer updateModelProperty(ModelPropertyDTO modelPropertyDTO); /** - * 获取模型属性 + * 获取模型属性列表 * * @param * @return */ - List getModelPropertyList(); + List listModelProperty(String objId, String modelCode, String propCode); /** - * 获取模型属性列表 + * 获取模型属性 * * @param * @return */ - List getModelProperty(); + ModelPropertyDTO getModelProperty(); } diff --git a/src/main/java/com/pms/ocp/service/ModelRelationService.java b/src/main/java/com/pms/ocp/service/ModelRelationService.java new file mode 100644 index 0000000000000000000000000000000000000000..850a539144712fb8851815b1dc5c8aac8dec53eb --- /dev/null +++ b/src/main/java/com/pms/ocp/service/ModelRelationService.java @@ -0,0 +1,65 @@ +package com.pms.ocp.service; + + +import com.pms.ocp.model.dto.ModelRelationDTO; +import com.pms.ocp.model.entity.ModelRelation; +import com.pms.ocp.model.vo.ModelRelationVO; + +import java.util.List; + +/** + * @Auther: wangjian + * @Date: 2022/2/22 16:07 + * @Description:模型关系业务层接口 + */ +public interface ModelRelationService { + + /** + * 创建模型关系 + * + * @param modelRelationDTO + * @return + */ + Integer createModelRelation(ModelRelationDTO modelRelationDTO); + + /** + * 删除模型关系 + * + * @param objId + * @param modelCode + * @return + */ + Integer deleteModelRelation(String objId, String modelCode); + + /** + * 批量删除模型关系 + * + * @param ids + * @return + */ + Integer deletePatchModelRelation(List ids); + + /** + * 更新模型关系 + * + * @param modelRelation + * @return + */ + Integer updateModelRelation(ModelRelation modelRelation); + + /** + * 获取模型关系 + * + * @param + * @return + */ + List getModelRelationList(String objId, String modelCode); + + /** + * 获取模型关系列表 + * + * @param modelId + * @return + */ + ModelRelationVO getModelRelation(String modelId); +} diff --git a/src/main/java/com/pms/ocp/service/ModelService.java b/src/main/java/com/pms/ocp/service/ModelService.java index 82ab6e636628ad4ad3cf6fd58d914233d8e18739..6eab59fdfc58a12e98e759214874313fcb6bec1e 100644 --- a/src/main/java/com/pms/ocp/service/ModelService.java +++ b/src/main/java/com/pms/ocp/service/ModelService.java @@ -1,12 +1,8 @@ package com.pms.ocp.service; -import com.pms.ocp.common.constants.CodeEnum; import com.pms.ocp.model.entity.Model; -import com.pms.ocp.model.entity.ModelType; import com.pms.ocp.model.vo.ResponseVO; -import java.util.List; - /** * @Auther: wangjian * @Date: 2022/2/22 16:03 diff --git a/src/main/java/com/pms/ocp/service/ModelTypeService.java b/src/main/java/com/pms/ocp/service/ModelTypeService.java index 1424e7188d3c53a03bcc93130740b68b94fc941f..26a59680f32b17c6feb454bb91fb6e047fc8a8fa 100644 --- a/src/main/java/com/pms/ocp/service/ModelTypeService.java +++ b/src/main/java/com/pms/ocp/service/ModelTypeService.java @@ -1,6 +1,6 @@ package com.pms.ocp.service; -import com.pms.ocp.model.entity.ModelType; +import com.pms.ocp.model.entity.ModelClassify; import java.util.List; @@ -14,10 +14,10 @@ public interface ModelTypeService { /** * 创建模型分类 * - * @param modelType + * @param modelClassify * @return */ - Integer createModelType(ModelType modelType); + Integer createModelType(ModelClassify modelClassify); /** * 删除模型分类 @@ -30,10 +30,10 @@ public interface ModelTypeService { /** * 更新模型分类 * - * @param modelType + * @param modelClassify * @return */ - Integer updateModelType(ModelType modelType); + Integer updateModelType(ModelClassify modelClassify); /** * 获取模型分类 @@ -41,7 +41,7 @@ public interface ModelTypeService { * @param * @return */ - List getModelTypeList(); + List getModelTypeList(); /** * 获取模型分类列表 @@ -49,5 +49,5 @@ public interface ModelTypeService { * @param modelId * @return */ - ModelType getModelType(String modelId); + ModelClassify getModelType(String modelId); } diff --git a/src/main/java/com/pms/ocp/service/OcpApiAuditService.java b/src/main/java/com/pms/ocp/service/OcpApiAuditService.java index 4ac0596fba9961abdea66a992eed060f2a1159a3..34782816d2d1452c4e0ce232952fe6ccd301d00d 100644 --- a/src/main/java/com/pms/ocp/service/OcpApiAuditService.java +++ b/src/main/java/com/pms/ocp/service/OcpApiAuditService.java @@ -3,17 +3,18 @@ package com.pms.ocp.service; 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 { ResponseVO getOcpApiAuditList(OcpApiAudit ocpApiAudit); ResponseVO getOcpApiDetails(String objId); -// ResponseVO getOcpApiList(Oaa oaa); - ResponseVO OaaById(OcpApiAudit ocpApiAudit); ResponseVO sById(OcpApiAudit ocpApiAudit); -// void exportExcel(Oaa oaa, HttpServletRequest request, HttpServletResponse response); + void exportExcel(OcpApiAudit ocpApiAudit, HttpServletRequest request, HttpServletResponse response); } diff --git a/src/main/java/com/pms/ocp/service/OcpModelGroupService.java b/src/main/java/com/pms/ocp/service/OcpModelGroupService.java index 8a8677ddcabe8a77c408ccd878583d993af5fc4f..05de174e2f7378da87f65a7785448bf43b9c6487 100644 --- a/src/main/java/com/pms/ocp/service/OcpModelGroupService.java +++ b/src/main/java/com/pms/ocp/service/OcpModelGroupService.java @@ -1,12 +1,12 @@ package com.pms.ocp.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.pms.ocp.model.entity.ModelType; +import com.pms.ocp.model.entity.ModelClassify; /** * @author huxiuwu * @version 1.0 * @date 2022/3/9 9:44 */ -public interface OcpModelGroupService extends IService { +public interface OcpModelGroupService extends IService { } diff --git a/src/main/java/com/pms/ocp/service/OcpTenantAuditService.java b/src/main/java/com/pms/ocp/service/OcpTenantAuditService.java new file mode 100644 index 0000000000000000000000000000000000000000..8ecc26762f1e8bf303737946311b0fbf73f8912c --- /dev/null +++ b/src/main/java/com/pms/ocp/service/OcpTenantAuditService.java @@ -0,0 +1,10 @@ +package com.pms.ocp.service; + +import com.pms.ocp.model.entity.OcpTenantAudit; +import com.pms.ocp.model.vo.ResponseVO; + +public interface OcpTenantAuditService { + ResponseVO getOtaList(OcpTenantAudit ocpTenantAudit); + + ResponseVO getOtaListById(OcpTenantAudit ocpTenantAudit); +} diff --git a/src/main/java/com/pms/ocp/service/OcpTenantBaseService.java b/src/main/java/com/pms/ocp/service/OcpTenantBaseService.java new file mode 100644 index 0000000000000000000000000000000000000000..c82f777df1d6deda563058b9ad11acbefd707706 --- /dev/null +++ b/src/main/java/com/pms/ocp/service/OcpTenantBaseService.java @@ -0,0 +1,8 @@ +package com.pms.ocp.service; + +import com.pms.ocp.model.entity.OcpTenantBase; +import com.pms.ocp.model.vo.ResponseVO; + +public interface OcpTenantBaseService { + ResponseVO getOtbList(OcpTenantBase ocpTenantBase); +} diff --git a/src/main/java/com/pms/ocp/service/TenantService.java b/src/main/java/com/pms/ocp/service/TenantService.java new file mode 100644 index 0000000000000000000000000000000000000000..bdaa9866ecdf3a0918a1dad0437a2e8e871462cd --- /dev/null +++ b/src/main/java/com/pms/ocp/service/TenantService.java @@ -0,0 +1,47 @@ +package com.pms.ocp.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; + +import com.pms.ocp.model.dto.OcpTenantGroupDto; +import com.pms.ocp.model.dto.PageGroupDto; +import com.pms.ocp.model.dto.TenanBaseDto; +import com.pms.ocp.model.entity.OcpApiGroup; +import com.pms.ocp.model.entity.OcpTenantGroup; + +import java.util.List; + +public interface TenantService extends IService { + /** + * 应用树分类管理 + * @return + */ + + + + + OcpTenantGroupDto getTree(); + + /** + * 应用新增 + * @param + * @return + */ + boolean getTenanInster(TenanBaseDto TenanBaseDto); + + /** + * 修改应用 + * @param ocpTenantGroup + * @return + */ + boolean getTenantUpdata(OcpTenantGroup ocpTenantGroup); + + /** + * 删除服务 + * @param ocpTenantGroup + * @return + */ + boolean gettenantDelete(OcpTenantGroup ocpTenantGroup); + + +} diff --git a/src/main/java/com/pms/ocp/service/impl/ModelClassifyServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ModelClassifyServiceImpl.java index 2bc92f48def4364c77b6a6061eac1bad674861d4..f4be2d57375c9c32aee0d20da95e063593bdb41a 100644 --- a/src/main/java/com/pms/ocp/service/impl/ModelClassifyServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ModelClassifyServiceImpl.java @@ -6,7 +6,7 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.pms.ocp.common.constants.CodeEnum; import com.pms.ocp.mapper.ModelClassifyMapper; -import com.pms.ocp.model.entity.ModelType; +import com.pms.ocp.model.entity.ModelClassify; import com.pms.ocp.model.vo.OcpModelGroupVO; import com.pms.ocp.model.vo.ResponseVO; import com.pms.ocp.service.ModelClassifyService; @@ -34,17 +34,17 @@ public class ModelClassifyServiceImpl implements ModelClassifyService { private OcpModelGroupService ocpService; /** + * currentPage pageSize * 模型分类-导航树 * - * @param searchCondition 搜索条件 * @return List * @author huxiuwu * @date 2022/3/8 **/ @Override - public ResponseVO> getModelNavigation(String searchCondition) { + public ResponseVO> getModelNavigation() { //根据是否传入搜索条件创建构造器进行查询 - List modelTypeList = this.selectByCondition(searchCondition, null); + List modelTypeList = this.selectByCondition(null, null); if (CollectionUtil.isEmpty(modelTypeList)) { return ResponseVO.error(CodeEnum.NO_DATA); } @@ -55,18 +55,26 @@ public class ModelClassifyServiceImpl implements ModelClassifyService { /** * 右侧子类详情列表 - * + * 这边是右侧详情页,需求是点击右侧导航树上的分类显示该分类的所有子集, + * 所以第一次查询查询到所有并将其转换为key为其分类编码,value为其本身 + * 的map.第二次是根据搜素框的值进行模糊查询 * @return pms.ocp.model.vo.ResponseVO * @author huxiuwu * @date 2022/3/9 **/ @Override - public ResponseVO> subclassDetailsList(int pageSize,int pageNum,String parentGroupCode,String subclassGroupName) { - PageHelper.startPage(pageSize,pageNum); - List ocpModelGroupVOList = this.selectByCondition(null,subclassGroupName); + public ResponseVO> subclassDetailsList(int currentPage,int pageSize,String parentGroupCode,String subclassGroupName) { + //查询所有 + List ocpModelGroupVOList = this.selectByCondition(null,null); + //将查询到所有数据的list转换为key为分类code,value为本身的map Map groupByCode = ocpModelGroupVOList.stream().collect(Collectors.toMap(OcpModelGroupVO::getModelGroupCode, Function.identity(), (key1, key2) -> key2)); + //根据key获取前端传入code的对象 OcpModelGroupVO ocpModelGroupVO = groupByCode.get(parentGroupCode); - List childrenList = findChildren(ocpModelGroupVOList, ocpModelGroupVO, new LinkedList<>()); + //模糊查询 + PageHelper.startPage(currentPage,pageSize); + List dimConditionList = this.selectByCondition(null,subclassGroupName); + //递归获取模糊查询后属于parentGroupCode子集 + List childrenList = findChildren(dimConditionList, ocpModelGroupVO, new LinkedList<>()); PageInfo pageInfo = new PageInfo<>(childrenList); return ResponseVO.ok(pageInfo); } @@ -80,7 +88,7 @@ public class ModelClassifyServiceImpl implements ModelClassifyService { * @date 2022/3/9 **/ @Override - public ResponseVO update(List list) { + public ResponseVO update(List list) { boolean isUpdateSucceed = ocpService.saveOrUpdateBatch(list); if (!isUpdateSucceed) { ResponseVO.error(CodeEnum.UP_DATA_FAIL); @@ -97,7 +105,7 @@ public class ModelClassifyServiceImpl implements ModelClassifyService { * @date 2022/3/9 **/ @Override - public ResponseVO insert(List list) { + public ResponseVO insert(List list) { boolean result = ocpService.saveBatch(list); if (!result) { return ResponseVO.error(CodeEnum.INSERT_FAIL); @@ -109,27 +117,33 @@ public class ModelClassifyServiceImpl implements ModelClassifyService { * 获取父节点下的所有子节点放入list中 * @author huxiuwu * @date 2022/3/9 - * @param menuList - * @param childMenu + * @param groupList + * @param childList * @return void **/ - private List findChildren(List menuList, OcpModelGroupVO parent,List childMenu) { - for (OcpModelGroupVO vo : menuList) { + private List findChildren(List groupList, OcpModelGroupVO parent,List childList) { + for (OcpModelGroupVO vo : groupList) { //遍历出父id等于参数的id，add进子节点集合 - if (parent.getModelGroupCode() != null && parent.getModelGroupCode().equals(vo.getModelGroupPcode())) { + if (parent!= null + && parent.getModelGroupCode() + .equals(vo.getModelGroupPcode())) { //递归遍历下一级 vo.setModelGroupPName(parent.getModelGroupName()); - childMenu.add(vo); - childMenu = findChildren(menuList, vo, childMenu); + childList.add(vo); + childList = findChildren(groupList,vo,childList); } } - return childMenu; + return childList; } /** * 构建树节点 - */ + * @author huxiuwu + * @date 2022/3/10 + * @param treeNodes 需要构建的list + * @return List + **/ private List build(List treeNodes) { List result = new ArrayList<>(); //list转map =>将每个对象的id作为key,自己作为value. @@ -140,10 +154,16 @@ public class ModelClassifyServiceImpl implements ModelClassifyService { for (OcpModelGroupVO node : nodeMap.values()) { //得到自己的父类 OcpModelGroupVO parent = nodeMap.get(node.getModelGroupPcode()); - if (parent != null && !(node.getModelGroupCode().equals(parent.getModelGroupCode()))) { + if (parent != null && (node.getModelGroupPcode().equals(parent.getModelGroupCode())) + && (!"".equals(node.getModelGroupPcode())|| !"".equals(parent.getModelGroupCode()))) { + //防止每次都new list或者只是使用该对象就new对象浪费内存或者覆盖上一次记录 if (parent.getChildrenList() == null) { parent.setChildrenList(new LinkedList<>()); } + //设置上级父类名称 + node.setModelGroupPName(parent.getModelGroupName()); + //说明他有父类其下子类都需要加一级 + addLevel(node,treeNodes); parent.getChildrenList().add(node); continue; } @@ -151,12 +171,34 @@ public class ModelClassifyServiceImpl implements ModelClassifyService { } return result; } - + /** + * + * @author huxiuwu + * @date 2022/3/10 + * @param parent 父类 + * @param treeNodes 需要遍历list + **/ + private void addLevel(OcpModelGroupVO parent, List treeNodes) { + int level = parent.getLevel(); + parent.setLevel(level++); + for (OcpModelGroupVO treeNode : treeNodes) { + if (treeNode != null && parent.getModelGroupCode().equals(treeNode.getModelGroupPcode())){ + addLevel(treeNode,treeNodes); + } + } + } + /** + * 生成构造器 + * @author huxiuwu + * @date 2022/3/10 + * @param searchCondition + * @return List + **/ private List selectByCondition(String... searchCondition) { QueryWrapper queryWrapper = new QueryWrapper<>(); //根据是否传入搜索条件创建构造器进行查询 - queryWrapper.eq(StringUtils.isNotEmpty(searchCondition[0]), "model_group_pcode", searchCondition[1]) - .like(StringUtils.isNotEmpty(searchCondition[1]), "model_group_name", searchCondition[0]); + queryWrapper.eq(StringUtils.isNotEmpty(searchCondition[0]), "model_group_pcode", searchCondition[0]) + .like(StringUtils.isNotEmpty(searchCondition[1]),"model_group_name", searchCondition[1]).orderBy(false,false,"group_ctime"); return classifyMapper.selectList(queryWrapper); } } diff --git a/src/main/java/com/pms/ocp/service/impl/ModelGroupServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ModelGroupServiceImpl.java index 8e2413d17b1dbe919bae3be3ac1a6f5048ef742f..030d8d32e00f6a583e9b0c130bbd85c743d3f497 100644 --- a/src/main/java/com/pms/ocp/service/impl/ModelGroupServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ModelGroupServiceImpl.java @@ -3,7 +3,7 @@ package com.pms.ocp.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.pms.ocp.common.constants.CodeEnum; import com.pms.ocp.mapper.ModelTypeMapper; -import com.pms.ocp.model.entity.ModelType; +import com.pms.ocp.model.entity.ModelClassify; import com.pms.ocp.model.vo.ResponseVO; import com.pms.ocp.service.ModelGroupService; import org.springframework.beans.factory.annotation.Autowired; @@ -24,18 +24,18 @@ public class ModelGroupServiceImpl implements ModelGroupService { */ @Override public ResponseVO getModelType() { - QueryWrapper wrapper = new QueryWrapper<>(); - List modelTypeList = modelTypeMapper.selectList(wrapper); - if(CollectionUtils.isEmpty(modelTypeList)){ + QueryWrapper wrapper = new QueryWrapper<>(); + List modelClassifyList = modelTypeMapper.selectList(wrapper); + if(CollectionUtils.isEmpty(modelClassifyList)){ return ResponseVO.error("查询列表为空"); }else{ - return ResponseVO.ok(modelTypeList); + return ResponseVO.ok(modelClassifyList); } } @Override - public ResponseVO createModelType(ModelType modelType) { - int result = modelTypeMapper.insert(modelType); + public ResponseVO createModelType(ModelClassify modelClassify) { + int result = modelTypeMapper.insert(modelClassify); if(result>0){ return ResponseVO.error(CodeEnum.SUCCESS); }else{ @@ -54,8 +54,8 @@ public class ModelGroupServiceImpl implements ModelGroupService { } @Override - public ResponseVO updateModelType(ModelType modelType) { - int result = modelTypeMapper.updateById(modelType); + public ResponseVO updateModelType(ModelClassify modelClassify) { + int result = modelTypeMapper.updateById(modelClassify); if (result > 0) { return ResponseVO.error(CodeEnum.SUCCESS); } else { diff --git a/src/main/java/com/pms/ocp/service/impl/ModelIssueServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ModelIssueServiceImpl.java index 8ae8c863e730313146ed117305ad8872a1405bc5..09f78f23f861acfc15c1cfc08de2e2dc58217cbe 100644 --- a/src/main/java/com/pms/ocp/service/impl/ModelIssueServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ModelIssueServiceImpl.java @@ -1,10 +1,16 @@ package com.pms.ocp.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.pms.ocp.mapper.ModelIssueMapper; +import com.pms.ocp.model.dto.ModelIssueDTO; import com.pms.ocp.model.entity.ModelIssue; -import com.pms.ocp.model.entity.ModelType; import com.pms.ocp.service.ModelIssueService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.time.LocalDateTime; import java.util.List; /** @@ -15,9 +21,20 @@ import java.util.List; @Service public class ModelIssueServiceImpl implements ModelIssueService { + + @Autowired + private ModelIssueMapper modelIssueMapper; + @Override - public Integer createModelIssue(ModelIssue modelIssueo) { - return null; + public Integer createModelIssue(ModelIssueDTO modelIssueDTO) { + + ModelIssue modelIssue = new ModelIssue(); + + BeanUtils.copyProperties(modelIssueDTO, modelIssue); + + modelIssue.setSubsCtime(LocalDateTime.now()); + + return modelIssueMapper.insert(modelIssue); } @Override @@ -25,18 +42,43 @@ public class ModelIssueServiceImpl implements ModelIssueService { return null; } + /** + * 批量删除模型订阅 + * + * @param ids + * @return + */ @Override - public Integer updateModelIssue(ModelIssue modelIssueo) { - return null; + public Integer deletePatchModelIssue(List ids) { + return modelIssueMapper.deleteBatchIds(ids); } @Override - public List getModelIssueList() { + public Integer updateModelIssue(ModelIssue modelIssue) { return null; } @Override - public ModelType getModelIssue(String modelId) { + public List getModelIssueList(String objId, String modelCode, String subsCompanyCode) { + QueryWrapper queryWrapper = new QueryWrapper(); + + if (StringUtils.isNotEmpty(objId)) { + queryWrapper.lambda().eq(ModelIssue::getObjId, objId); + } + + if (StringUtils.isNotEmpty(modelCode)) { + queryWrapper.lambda().eq(ModelIssue::getModelCode, modelCode); + } + + if (StringUtils.isNotEmpty(subsCompanyCode)) { + queryWrapper.lambda().eq(ModelIssue::getSubsCompanyCode, subsCompanyCode); + } + + return modelIssueMapper.selectList(queryWrapper); + } + + @Override + public ModelIssueDTO getModelIssue(String modelId) { return null; } } diff --git a/src/main/java/com/pms/ocp/service/impl/ModelPropertyServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ModelPropertyServiceImpl.java index 1b85388bfb757bc01a88ee793c6d5397749555ee..0c4403f0814462051e12d64dd911d022e7e83781 100644 --- a/src/main/java/com/pms/ocp/service/impl/ModelPropertyServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ModelPropertyServiceImpl.java @@ -1,10 +1,19 @@ package com.pms.ocp.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.pms.ocp.mapper.ModelPropertyMapper; +import com.pms.ocp.model.dto.ModelPropertyDTO; import com.pms.ocp.model.entity.ModelProperty; import com.pms.ocp.service.ModelPropertyService; +import io.swagger.models.auth.In; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.sql.Date; +import java.time.LocalDateTime; import java.util.List; /** @@ -16,26 +25,73 @@ import java.util.List; @Service public class ModelPropertyServiceImpl implements ModelPropertyService { -// @Autowired + @Autowired + private ModelPropertyMapper modelPropertyMapper; @Override - public Integer createModelProperty(ModelProperty modelProperty) { - return null; + public Integer createModelProperty(ModelPropertyDTO modelPropertyDTO) { + + ModelProperty modelProperty = new ModelProperty(); + + BeanUtils.copyProperties(modelPropertyDTO, modelProperty); + + modelProperty.setPropCtime(LocalDateTime.now()); + return modelPropertyMapper.insert(modelProperty); } @Override - public Integer deleteModelProperty(String modelId) { - return null; + public Integer deleteModelProperty(String modelCode, String propCode) { + QueryWrapper queryWrapper = new QueryWrapper(); + + if (StringUtils.isNotEmpty(modelCode)) { + queryWrapper.lambda().eq(ModelProperty::getModelCode, modelCode); + } + + if (StringUtils.isNotEmpty(propCode)) { + queryWrapper.lambda().eq(ModelProperty::getPropCode, propCode); + } + return modelPropertyMapper.delete(queryWrapper); } @Override - public Integer updateModelProperty(ModelProperty modelProperty) { - return null; + public Integer deletePatchModelProperty(List ids) { + return modelPropertyMapper.deleteBatchIds(ids); } @Override - public List getModelPropertyList() { - return null; + public Integer updateModelProperty(ModelPropertyDTO modelPropertyDTO) { + + ModelProperty modelProperty = new ModelProperty(); + + BeanUtils.copyProperties(modelPropertyDTO, modelProperty); + + modelProperty.setPropMtime(LocalDateTime.now()); + + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + + updateWrapper.lambda().eq(ModelProperty::getObjId, modelProperty.getObjId()); + + return modelPropertyMapper.update(modelProperty, updateWrapper); + } + + @Override + public List listModelProperty(String objId, String modelCode, String propCode) { + + QueryWrapper queryWrapper = new QueryWrapper(); + + if (StringUtils.isNotEmpty(objId)) { + queryWrapper.lambda().eq(ModelProperty::getObjId, objId); + } + + if (StringUtils.isNotEmpty(modelCode)) { + queryWrapper.lambda().eq(ModelProperty::getModelCode, modelCode); + } + + if (StringUtils.isNotEmpty(propCode)) { + queryWrapper.lambda().eq(ModelProperty::getPropCode, propCode); + } + + return modelPropertyMapper.selectList(queryWrapper); } /** @@ -44,7 +100,7 @@ public class ModelPropertyServiceImpl implements ModelPropertyService { * @return */ @Override - public List getModelProperty() { + public ModelPropertyDTO getModelProperty() { QueryWrapper wrapper = new QueryWrapper<>(); return null; } diff --git a/src/main/java/com/pms/ocp/service/impl/ModelRelationServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ModelRelationServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..936eb1dd1915a7ee508f489080d9e7f593cafd50 --- /dev/null +++ b/src/main/java/com/pms/ocp/service/impl/ModelRelationServiceImpl.java @@ -0,0 +1,88 @@ +package com.pms.ocp.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.pms.ocp.mapper.ModelRelationMapper; +import com.pms.ocp.model.dto.ModelRelationDTO; +import com.pms.ocp.model.entity.ModelIssue; +import com.pms.ocp.model.entity.ModelRelation; +import com.pms.ocp.model.vo.ModelRelationVO; +import com.pms.ocp.service.ModelRelationService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.time.LocalDateTime; +import java.util.List; + +/** + * @Auther: wangjian + * @Date: 2022/3/10 19:34 + * @Description: + */ + +@Service +public class ModelRelationServiceImpl implements ModelRelationService { + + @Autowired + private ModelRelationMapper modelRelationMapper; + + @Override + public Integer createModelRelation(ModelRelationDTO modelRelationDTO) { + + ModelRelation modelRelation = new ModelRelation(); + + BeanUtils.copyProperties(modelRelationDTO, modelRelation); + + modelRelation.setModelCtime(LocalDateTime.now()); + + return modelRelationMapper.insert(modelRelation); + } + + @Override + public Integer deleteModelRelation(String objId, String modelCode) { + + QueryWrapper queryWrapper = new QueryWrapper(); + + if (StringUtils.isNotEmpty(objId)) { + queryWrapper.lambda().eq(ModelRelation::getObjId, objId); + } + + if (StringUtils.isNotEmpty(modelCode)) { + queryWrapper.lambda().eq(ModelRelation::getModelCode, modelCode); + } + + return modelRelationMapper.delete(queryWrapper); + } + + @Override + public Integer deletePatchModelRelation(List ids) { + return modelRelationMapper.deleteBatchIds(ids); + } + + @Override + public Integer updateModelRelation(ModelRelation modelRelation) { + return null; + } + + @Override + public List getModelRelationList(String objId, String modelCode) { + QueryWrapper queryWrapper = new QueryWrapper(); + + if (StringUtils.isNotEmpty(objId)) { + queryWrapper.lambda().eq(ModelRelation::getObjId, objId); + } + + if (StringUtils.isNotEmpty(modelCode)) { + queryWrapper.lambda().eq(ModelRelation::getModelCode, modelCode); + } + + return modelRelationMapper.selectList(queryWrapper); + } + + @Override + public ModelRelationVO getModelRelation(String modelId) { + return null; + } +} 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 cb9b55118b7f426e63506d36b56a09c77e09c880..4ef894ce5b2b25989b424db7cf70e28ebd0ea48e 100644 --- a/src/main/java/com/pms/ocp/service/impl/ModelServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ModelServiceImpl.java @@ -4,18 +4,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.pms.ocp.common.constants.CodeEnum; import com.pms.ocp.mapper.ModelMapper; import com.pms.ocp.model.entity.Model; -import com.pms.ocp.model.entity.ModelType; import com.pms.ocp.model.vo.ResponseVO; import com.pms.ocp.service.ModelService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; -import java.util.Collections; import java.util.List; -import java.util.stream.Collectors; - -import static com.pms.ocp.common.constants.CodeEnum.NO_DATA; /** * @Auther: wangjian diff --git a/src/main/java/com/pms/ocp/service/impl/ModelTypeServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ModelTypeServiceImpl.java index 2ea908f30408439d66ef8ce475f987338a921ce9..7b82ed9d8024e74ba5e9b4210af78cfee505a2c5 100644 --- a/src/main/java/com/pms/ocp/service/impl/ModelTypeServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ModelTypeServiceImpl.java @@ -1,6 +1,6 @@ package com.pms.ocp.service.impl; -import com.pms.ocp.model.entity.ModelType; +import com.pms.ocp.model.entity.ModelClassify; import com.pms.ocp.service.ModelTypeService; import org.springframework.stereotype.Service; @@ -16,7 +16,7 @@ import java.util.List; public class ModelTypeServiceImpl implements ModelTypeService { @Override - public Integer createModelType(ModelType modelType) { + public Integer createModelType(ModelClassify modelClassify) { return null; } @@ -26,17 +26,17 @@ public class ModelTypeServiceImpl implements ModelTypeService { } @Override - public Integer updateModelType(ModelType modelType) { + public Integer updateModelType(ModelClassify modelClassify) { return null; } @Override - public List getModelTypeList() { + public List getModelTypeList() { return null; } @Override - public ModelType getModelType(String modelId) { + public ModelClassify getModelType(String modelId) { return null; } } diff --git a/src/main/java/com/pms/ocp/service/impl/OcpApiAuditServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpApiAuditServiceImpl.java index c0e254803610c1a43d0560d16639f984d002c4a5..654b83db166ca058a0b4ad928a772e8fee3f0f9f 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiAuditServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpApiAuditServiceImpl.java @@ -1,37 +1,36 @@ 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 implements OcpApiAuditService { +public class OcpApiAuditServiceImpl extends ServiceImpl implements OcpApiAuditService { @Autowired private OcpApiAuditMapper ocpApiAuditMapper; @Override public ResponseVO getOcpApiAuditList(OcpApiAudit ocpApiAudit) { - List ocpApiAuditList = ocpApiAuditMapper.getOcpApiSubsList(ocpApiAudit); - if(CollectionUtils.isEmpty(ocpApiAuditList)){ - return ResponseVO.error("查询列表为空"); - }else{ - return ResponseVO.ok(ocpApiAuditList); - } + List ocpApiAuditList = ocpApiAuditMapper.getOcpApiSubsList(ocpApiAudit); + return ResponseVO.ok(ocpApiAuditList); } -// @Override -// public ResponseVO getOcpApiList(Oaa oaa) { -// List list = ocpApiAuditMapper.getOcpApiSubsList(oaa); -// return ResponseVO.ok(list); -// } @Override public ResponseVO getOcpApiDetails(String objId) { @@ -41,23 +40,23 @@ public class OcpApiAuditServiceImpl implements OcpApiAuditService { @Override public ResponseVO OaaById(OcpApiAudit ocpApiAudit) { - List oaaById = ocpApiAuditMapper.OaaById(ocpApiAudit); + List oaaById = ocpApiAuditMapper.OaaById(ocpApiAudit); return ResponseVO.ok(oaaById); } @Override public ResponseVO sById(OcpApiAudit ocpApiAudit) { - List oaaById = ocpApiAuditMapper.sById(ocpApiAudit); + List oaaById = ocpApiAuditMapper.sById(ocpApiAudit); return ResponseVO.ok(oaaById); } -// @Override -// public void exportExcel(Oaa oaa, HttpServletRequest request, HttpServletResponse response) { -// List list = ocpApiAuditMapper.selectList(oaa); -// ExportParams param = new ExportParams(AnalysisConstant.exportOcpApiAuditName.OCP_API_AUDIT,AnalysisConstant.exportOcpApiAuditName.OCP_API_AUDIT); -// Workbook workbook = ExcelExportUtil.exportExcel(param,OcpApiAudit.class,list); -// ExportUtils.exportExcel(response, AnalysisConstant.exportOcpApiAuditName.OCP_API_AUDIT,workbook); -// } + @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); + } } diff --git a/src/main/java/com/pms/ocp/service/impl/OcpApiModelRelServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpApiModelRelServiceImpl.java index 0faa367c6e7e5dacdc56544201d15d22353a5db8..118a294d3bab2f977c134a8d14d2329c13ee4599 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiModelRelServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpApiModelRelServiceImpl.java @@ -1,5 +1,6 @@ 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; @@ -10,12 +11,12 @@ import org.springframework.stereotype.Service; import java.util.List; @Service -public class OcpApiModelRelServiceImpl implements OcpApiModelRelService { +public class OcpApiModelRelServiceImpl extends ServiceImpl implements OcpApiModelRelService { @Autowired private OcpApiModelRelMapper ocpApiModelRelMapper; @Override public ResponseVO getOamrList(OcpApiModelRel ocpApiModelRel) { - List ocpApiModelRelList = ocpApiModelRelMapper.getOamrList(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 baab60b5eb48f0c1956cd1e427d0cd3347814323..e6b4f4d8376f7afc3781cd2dbd54d12619e09900 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiSubsServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpApiSubsServiceImpl.java @@ -1,10 +1,12 @@ 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; @@ -12,17 +14,13 @@ import org.springframework.util.CollectionUtils; import java.util.List; @Service -public class OcpApiSubsServiceImpl implements OcpApiSubsService { +public class OcpApiSubsServiceImpl extends ServiceImpl implements OcpApiSubsService { @Autowired private OcpApiSubsMapper ocpApiSubsMapper; @Override public ResponseVO getOcpApiSubsList(OcpApiSubs ocpApiSubs) { - List ocpApiSubsList = ocpApiSubsMapper.getOcpApisList(ocpApiSubs); - if(CollectionUtils.isEmpty(ocpApiSubsList)){ - return ResponseVO.error("查询列表为空"); - }else{ - return ResponseVO.ok(ocpApiSubsList); - } + List ocpApiSubsList = ocpApiSubsMapper.getOcpApisList(ocpApiSubs); + return ResponseVO.ok(ocpApiSubsList); } } 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 ac4edbdc81dea28917b153a0eca6ffce55d934a4..0e5b9a9d92fe338cd79f2542294ce9333060ea99 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiTenantRelServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpApiTenantRelServiceImpl.java @@ -1,5 +1,6 @@ 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; @@ -11,14 +12,14 @@ import java.util.List; @Service -public class OcpApiTenantRelServiceImpl implements OcpApiTenantRelService { +public class OcpApiTenantRelServiceImpl extends ServiceImpl implements OcpApiTenantRelService { @Autowired private OcpApiTenantRelMapper ocpApiTenantRelMapper; @Override public ResponseVO getOatrList(OcpApiTenantRel ocpApiTenantRel) { - List oatrList = ocpApiTenantRelMapper.getOatrList(ocpApiTenantRel); + List oatrList = ocpApiTenantRelMapper.getOatrList(ocpApiTenantRel); return ResponseVO.ok(oatrList); } } diff --git a/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java index f7ffe16c3a9e30652c2331e76f09dd9f76af7563..fb73034bde724de68255f93bebd26fb42abc6f9c 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java @@ -1,26 +1,25 @@ package com.pms.ocp.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.api.R; + import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pms.ocp.common.config.PageParam; + import com.pms.ocp.common.utils.RandomStringUtil; import com.pms.ocp.mapper.OcpApiBaseMapper; import com.pms.ocp.mapper.OcpApiTreeMapper; import com.pms.ocp.model.dto.*; import com.pms.ocp.model.entity.OcpApiBase; import com.pms.ocp.model.entity.OcpApiGroup; -import com.pms.ocp.model.vo.ResponseVO; + import com.pms.ocp.service.OcpApiTreeService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.sql.Date; import java.sql.Timestamp; import java.util.ArrayList; import java.util.List; @@ -172,6 +171,7 @@ public class OcpApiTreeServiceImpl extends ServiceImpl ocpApiGroups = mapper.selectList(null); if (StringUtils.isBlank(ocpApiGroup1.getApiGroupPcode())) { - mapper.deleteById(objId); - return true; - } else { - return false; + for (OcpApiGroup apiGroup : ocpApiGroups) { + if ((ocpApiGroup1.getApiGroupCode()).equals(apiGroup.getApiGroupPcode())){ + flag = false; + break; + } + } + } + mapper.deleteById(objId); + return flag; } diff --git a/src/main/java/com/pms/ocp/service/impl/OcpModelGroupServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpModelGroupServiceImpl.java index 6f379f640275d285fc722f3d5548b0f4f0937315..4c71e2c5a76cdd27d182229cc7ef5587e64b79bb 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpModelGroupServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpModelGroupServiceImpl.java @@ -2,7 +2,7 @@ package com.pms.ocp.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pms.ocp.mapper.OcpModelGroupMapper; -import com.pms.ocp.model.entity.ModelType; +import com.pms.ocp.model.entity.ModelClassify; import com.pms.ocp.service.OcpModelGroupService; import org.springframework.stereotype.Service; @@ -12,5 +12,5 @@ import org.springframework.stereotype.Service; * @date 2022/3/9 9:45 */ @Service -public class OcpModelGroupServiceImpl extends ServiceImplimplements OcpModelGroupService { +public class OcpModelGroupServiceImpl extends ServiceImplimplements OcpModelGroupService { } diff --git a/src/main/java/com/pms/ocp/service/impl/OcpTenantAuditServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpTenantAuditServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..75aa9eee7c9cfe6ab20fe18d837cf59b16dcf85f --- /dev/null +++ b/src/main/java/com/pms/ocp/service/impl/OcpTenantAuditServiceImpl.java @@ -0,0 +1,29 @@ +package com.pms.ocp.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.pms.ocp.mapper.OcpTenantAuditMapper; +import com.pms.ocp.model.entity.OcpTenantAudit; +import com.pms.ocp.model.vo.ResponseVO; +import com.pms.ocp.service.OcpTenantAuditService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class OcpTenantAuditServiceImpl extends ServiceImpl implements OcpTenantAuditService { + @Autowired + private OcpTenantAuditMapper ocpTenantAuditMapper; + + @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); + } +} diff --git a/src/main/java/com/pms/ocp/service/impl/OcpTenantBaseServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpTenantBaseServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..ad52d3a7d50ccfd906225e1fffba2e5a064bb3f4 --- /dev/null +++ b/src/main/java/com/pms/ocp/service/impl/OcpTenantBaseServiceImpl.java @@ -0,0 +1,22 @@ +package com.pms.ocp.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.pms.ocp.mapper.OcpTenantBaseMapper; +import com.pms.ocp.model.entity.OcpTenantBase; +import com.pms.ocp.model.vo.ResponseVO; +import com.pms.ocp.service.OcpTenantBaseService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class OcpTenantBaseServiceImpl extends ServiceImpl implements OcpTenantBaseService { + @Autowired + private OcpTenantBaseMapper ocpTenantBaseMapper; + @Override + public ResponseVO getOtbList(OcpTenantBase ocpTenantBase) { + List otbList = ocpTenantBaseMapper.getOtbList(ocpTenantBase); + return ResponseVO.ok(otbList); + } +} diff --git a/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..6b863611d9f0abb3b05f531794a0f29f399fa1dd --- /dev/null +++ b/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java @@ -0,0 +1,190 @@ +package com.pms.ocp.service.impl; + + + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.pms.ocp.common.utils.RandomStringUtil; +import com.pms.ocp.mapper.TenantBasicManagementMapper; +import com.pms.ocp.mapper.TenantMapper; +import com.pms.ocp.model.dto.*; +import com.pms.ocp.model.entity.OcpApiGroup; +import com.pms.ocp.model.entity.OcpTenantAudit; +import com.pms.ocp.model.entity.OcpTenantBase; +import com.pms.ocp.model.entity.OcpTenantGroup; +import com.pms.ocp.service.TenantService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import java.sql.Timestamp; +import java.util.*; + + +@Service +public class TenantServiceImpl extends ServiceImpl implements TenantService { + + + @Autowired + private TenantMapper tenantMapper; + @Autowired + private TenantBasicManagementMapper tenantBasicMapper; + + /** + * 应用树分类管理 + * + * @return + */ + @Override + public OcpTenantGroupDto getTree() { + List ocpTenantGroups = tenantMapper.selectList(null); + + //返回参数集合 + OcpTenantGroupDto ocpTenantGroupDto = new OcpTenantGroupDto(); + //顶级目录 + Set stringSet = new HashSet<>(); + + for (OcpTenantGroup ocpTenantGroup : ocpTenantGroups) { + String tenantGroupCompanyCode = ocpTenantGroup.getTenantGroupCompanyCode(); + stringSet.add(tenantGroupCompanyCode); + } + + List tenanLists = twoTenanTree(ocpTenantGroups,stringSet); + List threeTenanLists = ThreeTenanTree(ocpTenantGroups,tenanLists); + ocpTenantGroupDto.setOneList(stringSet); + ocpTenantGroupDto.setTwoList(tenanLists); + ocpTenantGroupDto.setThreeList(threeTenanLists); + + + return ocpTenantGroupDto; + } + + private List ThreeTenanTree(List ocpTenantGroups, List tenanLists) { + //三级应用详情 + List threeTenanLists = new ArrayList<>(); + + for (TwoTenanList tenanList : tenanLists) { + for (OcpTenantGroup ocpTenantGroup : ocpTenantGroups) { + ThreeTenanList threeTenanList = new ThreeTenanList(); + if (tenanList.getTenantGroupCode().equals(ocpTenantGroup.getTenantGroupPcode()) && ocpTenantGroup.getTenantGroupLevel() == 2){ + BeanUtils.copyProperties(ocpTenantGroup,threeTenanList); + threeTenanLists.add(threeTenanList); + } + } + } + return threeTenanLists; + } + + /** + * 二级 应用管理 + * @param ocpTenantGroups + * @param stringSet + * @return + */ + private List twoTenanTree(List ocpTenantGroups, Set stringSet) { + //一级数据集合 + List twoTenanLists = new ArrayList<>(); + for (String code : stringSet) { + for (OcpTenantGroup ocpTenantGroup : ocpTenantGroups) { + TwoTenanList twoTenanList = new TwoTenanList(); + if (code.equals(ocpTenantGroup.getTenantGroupCompanyCode()) &&ocpTenantGroup.getTenantGroupLevel() == 1){ + BeanUtils.copyProperties(ocpTenantGroup,twoTenanList); + twoTenanLists.add(twoTenanList); + } + } + } + return twoTenanLists; + } + + + /** + * 应用新增 + * + * @param + * @return + */ + @Override + public boolean getTenanInster(TenanBaseDto tenanBaseDto) { + boolean falg = true; + + OcpTenantGroup group = new OcpTenantGroup(); + String tenantGroupCode = tenanBaseDto.getTenantGroupCode(); + List ocpTenantGroups = tenantMapper.selectList(null); + for (OcpTenantGroup tenantGroup : ocpTenantGroups) { + if (tenantGroup.getTenantGroupCode().equals(tenantGroupCode)){ + falg = false; + break; + } + } + String randomString = RandomStringUtil.getRandomString(6); + Timestamp timestamp = new Timestamp(System.currentTimeMillis()); + OcpTenantGroup ocpTenantGroup = new OcpTenantGroup(); + BeanUtils.copyProperties(tenanBaseDto,ocpTenantGroup); + if ("null".equals(tenanBaseDto.getOwnerCompanyCode())){ + ocpTenantGroup.setTenantGroupCode(randomString); + } + ocpTenantGroup.setTenantGroupCtime(timestamp); + ocpTenantGroup.setTenantGroupMtime(timestamp); + if ("".equals(tenanBaseDto.getTenantVersion())){ + ocpTenantGroup.setTenantGroupVersion("1.0"); + } + + OcpTenantBase ocpTenantBase = new OcpTenantBase(); + BeanUtils.copyProperties(tenanBaseDto,ocpTenantBase); + if ("null".equals(tenanBaseDto.getTenantGroupCode())){ + group.setTenantGroupCode(randomString); + } + tenantMapper.insert(tenanBaseDto); + tenantBasicMapper.insert(ocpTenantBase); + return falg; + } + + /** + * 修改应用 + * + * @param ocpTenantGroup + * @return + */ + @Override + public boolean getTenantUpdata(OcpTenantGroup ocpTenantGroup) { + boolean falg = true; + List ocpTenantGroupList = tenantMapper.selectList(null); + for (OcpTenantGroup ocpApiGroup : ocpTenantGroupList) { + String code = ocpTenantGroup.getTenantGroupCode(); + if (code == ocpApiGroup.getTenantGroupCode()) { + falg = false; + break; + } + } + tenantMapper.updateById(ocpTenantGroup); + + return falg; + } + + /** + * 删除服务 + * + * @param ocpTenantGroup + * @return + */ + @Override + public boolean gettenantDelete(OcpTenantGroup ocpTenantGroup) { + String objId = ocpTenantGroup.getObjId(); + OcpTenantGroup ocpTenantGroup1 = tenantMapper.selectById(objId); + boolean flag = true; + List ocpTenantGroupList = tenantMapper.selectList(null); + if (StringUtils.isBlank(ocpTenantGroup1.getTenantGroupPcode())) { + for (OcpTenantGroup tenantGroup : ocpTenantGroupList) { + String tenantGroupPcode = tenantGroup.getTenantGroupPcode(); + if ((ocpTenantGroup.getTenantGroupCode().equals(tenantGroupPcode))){ + flag = false; + break; + } + } + } + + tenantMapper.deleteById(objId); + + return flag; + } + +} diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index fff10d7dbee5ee57b730a440913d04d592966be9..0f73a771b24d9d846ed7b0ba83cb759e686069ba 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -2,11 +2,11 @@ spring: datasource: driver-class-name: org.postgresql.Driver username: postgres - password: root + password: 1234 type: com.zaxxer.hikari.HikariDataSource # jdbc-url: jdbc:postgresql://192.168.43.20:33072/pms3?currentSchema=public&stringtype=unspecified&TimeZone=Asia/Shanghai&useAffectedRows=true # jdbc-url: jdbc:postgresql://172.20.10.9:33072/pms3?currentSchema=public&stringtype=unspecified&TimeZone=Asia/Shanghai&useAffectedRows=true - url: jdbc:postgresql://localhost:5432/server?currentSchema=operating_platform&stringtype=unspecified&TimeZone=Asia/Shanghai&useAffectedRows=true + url: jdbc:postgresql://localhost:5432/postgres?currentSchema=operating_platform&stringtype=unspecified&TimeZone=Asia/Shanghai&useAffectedRows=true knife4j: enable: true diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 7809dcba1700fa2789dccdfd1029112512af641f..9a47390d9617aabc3e54bfc2a15aa9f3adfa1936 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -13,13 +13,20 @@ knife4j: enable: true mybatis-plus: + global-config: + #字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断" + field-strategy: 0 mapper-locations: classpath:/mapper/*.xml configuration: - # log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl + # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 是否开启自动驼峰命名规则 map-underscore-to-camel-case: true + #指定自定义 Handler 所在的包位置 + type-handlers-package: com.pms.ocp.common.handler + + logging: level: com.pms.ocp.mapper: debug diff --git a/src/main/resources/mapper/OcpApiAuditMapper.xml b/src/main/resources/mapper/OcpApiAuditMapper.xml index 115806b83215fc6eba4c887df1fcbc63133cb7da..2d9c4e6179461b7ab95a92b8321a25745eb52227 100644 --- a/src/main/resources/mapper/OcpApiAuditMapper.xml +++ b/src/main/resources/mapper/OcpApiAuditMapper.xml @@ -2,18 +2,18 @@ - select * from ocp_api_audit oaa LEFT JOIN ocp_api_base oab on oaa.api_code = oab.api_code where oaa.obj_id = #{objId} - select * from ocp_api_audit - select * from ocp_api_audit where obj_id = #{objId} \ No newline at end of file diff --git a/src/main/resources/mapper/OcpApiModelRelMapper.xml b/src/main/resources/mapper/OcpApiModelRelMapper.xml index b843637fdc5832d74beb1023435cfe876ceda7bd..d8343b4dbc5851f279f660ac4ab4c1ce94c54bd9 100644 --- a/src/main/resources/mapper/OcpApiModelRelMapper.xml +++ b/src/main/resources/mapper/OcpApiModelRelMapper.xml @@ -2,7 +2,7 @@ - select * from ocp_api_model_rel oamr LEFT JOIN ocp_model_base omb on oamr.model_code = omb.model_code diff --git a/src/main/resources/mapper/OcpApiSubsMapper.xml b/src/main/resources/mapper/OcpApiSubsMapper.xml index d3895ae6b4d42b9cb03c1ff94b65b014a6b9aa13..07da0a99f50b80215f5c3f8ff93dd19b64b58047 100644 --- a/src/main/resources/mapper/OcpApiSubsMapper.xml +++ b/src/main/resources/mapper/OcpApiSubsMapper.xml @@ -4,7 +4,7 @@ - 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/OcpApiTenantRelMapper.xml b/src/main/resources/mapper/OcpApiTenantRelMapper.xml index 927727a05c7e6763dbb847b10a30d0ec257313d9..d74e7c047b638259e122d81aeb21c9c485be2847 100644 --- a/src/main/resources/mapper/OcpApiTenantRelMapper.xml +++ b/src/main/resources/mapper/OcpApiTenantRelMapper.xml @@ -2,7 +2,7 @@ - SELECT * from ocp_api_tenant_rel oa LEFT JOIN ocp_api_base ab on oa.api_code = ab.api_code INNER JOIN diff --git a/src/main/resources/mapper/OcpTenantAuditMapper.xml b/src/main/resources/mapper/OcpTenantAuditMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..010d6c60b85de4a7a2d66198593c4a92a32bf655 --- /dev/null +++ b/src/main/resources/mapper/OcpTenantAuditMapper.xml @@ -0,0 +1,11 @@ + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/OcpTenantBaseMapper.xml b/src/main/resources/mapper/OcpTenantBaseMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..7784a8ee50809624d2779585ec47ae0635121c8c --- /dev/null +++ b/src/main/resources/mapper/OcpTenantBaseMapper.xml @@ -0,0 +1,10 @@ + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/OcpTenantGroup.xml b/src/main/resources/mapper/OcpTenantGroup.xml new file mode 100644 index 0000000000000000000000000000000000000000..4f38903c8bda00f8f1f0f5071fea72c920894b34 --- /dev/null +++ b/src/main/resources/mapper/OcpTenantGroup.xml @@ -0,0 +1,16 @@ + + + + + + + + + + +