diff --git a/src/main/java/com/pms/ocp/common/constants/AnalysisConstant.java b/src/main/java/com/pms/ocp/common/constants/AnalysisConstant.java index e9352fd727294902aac49c9baf08a19cbe0108aa..12fe554d84445f9a331cd41f4eedbadbb834bbec 100644 --- a/src/main/java/com/pms/ocp/common/constants/AnalysisConstant.java +++ b/src/main/java/com/pms/ocp/common/constants/AnalysisConstant.java @@ -4,4 +4,8 @@ public interface AnalysisConstant { interface exportOcpApiAuditName{ final String OCP_API_AUDIT= "服务大事记导出数据"; } + + interface exportOcpTenantApiName{ + final String OCP_TENANT_API = "应用大事记导出数据"; + } } diff --git a/src/main/java/com/pms/ocp/common/constants/ExportUtils.java b/src/main/java/com/pms/ocp/common/constants/ExportUtils.java index 88931382a7a4e23e93d575657e187d07fe8ab7c8..c938e562f6395027a5d937f7145975cd1a840d20 100644 --- a/src/main/java/com/pms/ocp/common/constants/ExportUtils.java +++ b/src/main/java/com/pms/ocp/common/constants/ExportUtils.java @@ -1,6 +1,7 @@ package com.pms.ocp.common.constants; +import com.pms.ocp.common.exception.ServiceException; import org.apache.poi.ss.usermodel.Workbook; import javax.servlet.ServletOutputStream; @@ -16,11 +17,12 @@ public class ExportUtils { /** * 校验Header Manipulation + * * @param header 参数 * @return 数据 */ public static String headerManipulation(String header) { - if(StringUtils.isNullOrEmpty(header)){ + if (StringUtils.isNullOrEmpty(header)) { return header; } String regex = "[`~!@#$%^&*()\\+\\=\\{}|:\"?><【】\\/r\\/n]"; @@ -55,9 +57,9 @@ public class ExportUtils { out.flush(); } catch (IOException e) { e.printStackTrace(); - throw new ServiceException(com.pms.ocp.common.constants.ResultCodee.INTERNAL_SERVER_ERROR); + throw new ServiceException(ResultCode.INTERNAL_SERVER_ERROR); } finally { - if (out != null){ + if (out != null) { try { out.close(); } catch (IOException e) { @@ -78,6 +80,7 @@ public class ExportUtils { /** * Workbook导出浏览器 * 文件导出添加跨域 Access-Control-Allow-Origin + * * @param response * @param fileName * @param workbook @@ -94,7 +97,7 @@ public class ExportUtils { workbook.write(outputStream); } catch (IOException e) { e.printStackTrace(); - throw new ServiceException(com.pms.ocp.common.constants.ResultCodee.INTERNAL_SERVER_ERROR); + throw new ServiceException(ResultCode.INTERNAL_SERVER_ERROR); } } @@ -142,7 +145,7 @@ public class ExportUtils { } } catch (IOException e) { e.printStackTrace(); - throw new ServiceException(ResultCodee.INTERNAL_SERVER_ERROR); + throw new ServiceException(ResultCode.INTERNAL_SERVER_ERROR); } } } diff --git a/src/main/java/com/pms/ocp/common/constants/ResultCodee.java b/src/main/java/com/pms/ocp/common/constants/ResultCode.java similarity index 98% rename from src/main/java/com/pms/ocp/common/constants/ResultCodee.java rename to src/main/java/com/pms/ocp/common/constants/ResultCode.java index 605dec1e541a73ffcfb28051f1846c8a775ccbd6..cf05925d81b1436dec374fc3e5e6d5781b4062f2 100644 --- a/src/main/java/com/pms/ocp/common/constants/ResultCodee.java +++ b/src/main/java/com/pms/ocp/common/constants/ResultCode.java @@ -3,7 +3,7 @@ package com.pms.ocp.common.constants; /** * 异常枚举类 */ -public enum ResultCodee { +public enum ResultCode { /* ============================ 通用错误码 ========================== **/ /** * 禁止访问 303 @@ -154,7 +154,7 @@ public enum ResultCodee { public final int statusCode; public String msg; - ResultCodee(int statusCode, String msg) { + ResultCode(int statusCode, String msg) { this.statusCode = statusCode; this.msg = msg; } diff --git a/src/main/java/com/pms/ocp/common/constants/ServiceException.java b/src/main/java/com/pms/ocp/common/constants/ServiceException.java deleted file mode 100644 index febd9a2cee0c5fe0e7a90f5adbd6005d13671c23..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/common/constants/ServiceException.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.pms.ocp.common.constants; - -public class ServiceException extends RuntimeException { - private static final long serialVersionUID = -6914996666319154848L; - /** - * 状态编码 - */ - public final int statusCode; - /** - * message信息 - */ - public final String msg; - /** - * 数据对象 - */ - public Object data; - - public ServiceException(String message, ResultCodee resultCode) { - super(message); - this.statusCode = resultCode.statusCode; - this.msg = message; - } - - public ServiceException(String message, ResultCodee resultCode, Object data) { - this(message, resultCode); - this.data = data; - } - - public ServiceException(ResultCodee resultCode) { - this(resultCode.msg, resultCode); - } - - public ServiceException(ResultCodee resultCode, Object data) { - this(resultCode.msg, resultCode, data); - } -} diff --git a/src/main/java/com/pms/ocp/common/exception/ServiceException.java b/src/main/java/com/pms/ocp/common/exception/ServiceException.java new file mode 100644 index 0000000000000000000000000000000000000000..375171444021480282fb0da692953b93082fc853 --- /dev/null +++ b/src/main/java/com/pms/ocp/common/exception/ServiceException.java @@ -0,0 +1,64 @@ +package com.pms.ocp.common.exception; + +import com.pms.ocp.common.constants.ResultCode; + +/** + * @Auther: wangjian + * @Date: 2022/3/11 16:31 + * @Description: + */ +public class ServiceException extends RuntimeException { + + /** + * 自定义异常枚举类 + */ + private ResultCode resultCode; + + /** + * 错误码 + */ + private int code; + + /** + * 错误信息 + */ + private String errorMsg; + + + public ServiceException() { + super(); + } + + public ServiceException(ResultCode resultCode) { + super("{code:" + resultCode.getStatusCode() + ",errorMsg:" + resultCode.getMessage() + "}"); + this.resultCode = resultCode; + this.code = resultCode.getStatusCode(); + this.errorMsg = resultCode.getMessage(); + } + + public ServiceException(int code, String errorMsg) { + super("{code:" + code + ",errorMsg:" + errorMsg + "}"); + this.code = code; + this.errorMsg = errorMsg; + } + + public ResultCode getErrorEnum() { + return resultCode; + } + + public String getErrorMsg() { + return errorMsg; + } + + public void setErrorMsg(String errorMsg) { + this.errorMsg = errorMsg; + } + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } +} diff --git a/src/main/java/com/pms/ocp/common/utils/ExcelUtils.java b/src/main/java/com/pms/ocp/common/utils/ExcelUtils.java index 1e1c0663af0a330aec3e39da0f10698768580787..40027dfb2f2a6f692f6f2f46ac75a307dd764b40 100644 --- a/src/main/java/com/pms/ocp/common/utils/ExcelUtils.java +++ b/src/main/java/com/pms/ocp/common/utils/ExcelUtils.java @@ -1,21 +1,26 @@ package com.pms.ocp.common.utils; import cn.afterturn.easypoi.excel.ExcelExportUtil; +import cn.afterturn.easypoi.excel.ExcelImportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; +import cn.afterturn.easypoi.excel.entity.ImportParams; import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; +import com.pms.ocp.common.constants.ResultCode; +import com.pms.ocp.common.exception.BeagleException; +import com.pms.ocp.common.exception.ServiceException; import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.Workbook; import org.springframework.beans.BeanUtils; +import org.springframework.web.multipart.MultipartFile; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.io.IOException; +import java.io.InputStream; import java.net.URLEncoder; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Date; -import java.util.List; +import java.util.*; /** * @author huxiuwu @@ -24,6 +29,12 @@ import java.util.List; */ public class ExcelUtils { + //xls 后缀 + private static final String XLS = ".xls"; + //xlsx 后缀 + private static final String XLS_X = ".xlsx"; + + /** * 导出excel通用方法 * @@ -129,4 +140,171 @@ public class ExcelUtils { out.flush(); } + /** + * 下载 + * + * @param fileName 文件名称 + * @param response + * @param workbook excel数据 + */ + private static void downLoadExcel(String fileName, HttpServletResponse response, Workbook workbook) + throws IOException { + try { + response.setCharacterEncoding("UTF-8"); + response.setHeader("content-Type", "application/vnd.ms-excel"); + response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName + "." + ExcelTypeEnum.XLSX.getValue(), "UTF-8")); + workbook.write(response.getOutputStream()); + } catch (Exception e) { + throw new IOException(e.getMessage()); + } + } + + /** + * excel 导入 + * + * @param filePath excel文件路径 + * @param titleRows 标题行 + * @param headerRows 表头行 + * @param pojoClass pojo类型 + * @param + * @return + */ + public static List importExcel(String filePath, Integer titleRows, Integer headerRows, Class pojoClass) + throws IOException { + if (StringUtils.isBlank(filePath)) { + return null; + } + ImportParams params = new ImportParams(); + params.setTitleRows(titleRows); + params.setHeadRows(headerRows); + params.setNeedSave(true); + params.setSaveUrl("/excel/"); + try { + return ExcelImportUtil.importExcel(new File(filePath), pojoClass, params); + } catch (NoSuchElementException e) { + throw new IOException("模板不能为空"); + } catch (Exception e) { + throw new IOException(e.getMessage()); + } + } + + /** + * excel 导入 + * + * @param file excel文件 + * @param pojoClass pojo类型 + * @param + * @return + */ + public static List importExcel(MultipartFile file, Class pojoClass) + throws IOException { + return importExcel(file, 0, 1, pojoClass); + } + + /** + * excel 导入 + * + * @param file excel文件 + * @param titleRows 标题行 + * @param headerRows 表头行 + * @param pojoClass pojo类型 + * @param + * @return + */ + public static List importExcel(MultipartFile file, Integer titleRows, Integer headerRows, Class pojoClass) + throws IOException { + return importExcel(file, titleRows, headerRows, false, pojoClass); + } + + /** + * excel 导入 + * + * @param file 上传的文件 + * @param titleRows 标题行 + * @param headerRows 表头行 + * @param needVerfiy 是否检验excel内容 + * @param pojoClass pojo类型 + * @param + * @return + */ + public static List importExcel(MultipartFile file, Integer titleRows, Integer headerRows, boolean needVerfiy, Class pojoClass) + throws IOException { + if (file == null) { + return null; + } + try { + return importExcel(file.getInputStream(), titleRows, headerRows, needVerfiy, pojoClass); + } catch (Exception e) { + throw new IOException(e.getMessage()); + } + } + + /** + * excel 导入 + * + * @param inputStream 文件输入流 + * @param titleRows 标题行 + * @param headerRows 表头行 + * @param needVerfiy 是否检验excel内容 + * @param pojoClass pojo类型 + * @param + * @return + */ + public static List importExcel(InputStream inputStream, Integer titleRows, Integer headerRows, boolean needVerfiy, Class pojoClass) + throws IOException { + if (inputStream == null) { + return null; + } + ImportParams params = new ImportParams(); + params.setTitleRows(titleRows); + params.setHeadRows(headerRows); + params.setSaveUrl("/excel/"); + params.setNeedSave(true); + params.setNeedVerify(needVerfiy); + try { + return ExcelImportUtil.importExcel(inputStream, pojoClass, params); + } catch (NoSuchElementException e) { + throw new IOException("excel文件不能为空"); + } catch (Exception e) { + throw new IOException(e.getMessage()); + } + } + + /** + * 检查文件 + * + * @param file + */ + public static void checkFile(MultipartFile file) { + if (file == null) { + throw new ServiceException(ResultCode.FILE_NOT_EXISTS); + } + + String fileName = file.getOriginalFilename(); + assert fileName != null; + if (!fileName.endsWith(XLS) && !fileName.endsWith(XLS_X)) { + throw new ServiceException(ResultCode.FILE_NOT_EXISTS); + } + } + + /** + * Excel 类型枚举 + */ + enum ExcelTypeEnum { + XLS("xls"), XLSX("xlsx"); + private String value; + + ExcelTypeEnum(String value) { + this.value = value; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } + } diff --git a/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java b/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java index 1cbf9bf1477fa3e3a9862145b8756b5346ed7c97..534b18d855acafbbe4182d6684bc1a792d04922c 100644 --- a/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java +++ b/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java @@ -1,6 +1,5 @@ package com.pms.ocp.controller; - import com.pms.ocp.common.utils.ExcelUtils; import com.pms.ocp.common.utils.FileExport; import com.pms.ocp.common.utils.FileUtil; @@ -19,22 +18,15 @@ import com.pms.ocp.service.ApiDetailsService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; - import org.apache.commons.lang3.StringUtils; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; - - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.*; -import java.net.URLEncoder; import java.sql.Timestamp; import java.time.LocalDate; import java.util.ArrayList; -import java.util.Collections; import java.util.List; @Slf4j @@ -49,15 +41,15 @@ public class ApiBasicManagementController { @ApiOperation("条件查询") @GetMapping("/queryOcpApiBaseDto") - public ResponseVO queryOcpApiBaseDto(@RequestParam(required = false) String apiCode, + public ResponseVO> queryOcpApiBaseDto(@RequestParam(required = false) String apiCode, @RequestParam(required = false) String keyword, @RequestParam(required = false) String apiUnits, @RequestParam(required = false) Timestamp startTime, @RequestParam(required = false) Timestamp endTime, - @RequestParam(required = false) int pageSize, - @RequestParam(required = false) int pageNum + @RequestParam(required = false) Integer pageSize, + @RequestParam(required = false) Integer pageNum ) { - List list=apiBasicManagementService.queryOcpApiBaseDto(apiCode, keyword, apiUnits, startTime, endTime, pageSize + List list = apiBasicManagementService.queryOcpApiBaseDto(apiCode, keyword, apiUnits, startTime, endTime, pageSize , pageNum); return ResponseVO.ok(list); } @@ -72,7 +64,6 @@ public class ApiBasicManagementController { System.out.println(file);//用来检查前端是否把文件传过来 //解析excel， List personList = FileUtil.importExcel(file, 0, 1, OcpApiBaseVo.class); - //也可以使用FileUtil.importExcel(filePath,1,1,FileEntity.class) 导入 System.out.println("导入数据一共【" + personList.size() + "】行"); apiBasicManagementService.apiImport(personList); return ResponseVO.ok(); @@ -95,12 +86,10 @@ public class ApiBasicManagementController { //导出excel ExcelUtils.exportExcel(response, excelFileName + LocalDate.now(), ocpApiBaseVoList, OcpApiBaseVo.class); - - return ResponseVO.ok(); } -// @ApiOperation("下载模板") + // @ApiOperation("下载模板") //// @GetMapping("/download") // @GetMapping(value = "/download", produces = "text/plain;charset=UTF-8") // public void ApiDownload(HttpServletResponse response) throws IOException { @@ -191,8 +180,8 @@ public class ApiBasicManagementController { if (StringUtils.isEmpty(apiPromotion) || apiPromotion.equals("0")) { return ResponseVO.error("统招"); } else { - apiBasicManagementService.apiIssue(apiCodes); - return ResponseVO.ok(); + return apiBasicManagementService.apiIssue(apiCodes); + } } diff --git a/src/main/java/com/pms/ocp/controller/ModelBaseController.java b/src/main/java/com/pms/ocp/controller/ModelBaseController.java index d6ef10b2876b50300a0a3a8ed9ccd0f65f5072f2..61c4932598ad1e5a49387891e12c5982fed9f9b6 100644 --- a/src/main/java/com/pms/ocp/controller/ModelBaseController.java +++ b/src/main/java/com/pms/ocp/controller/ModelBaseController.java @@ -1,23 +1,25 @@ package com.pms.ocp.controller; -import com.pms.ocp.common.constants.CodeEnum; +import com.pms.ocp.common.utils.ExcelUtils; +import com.pms.ocp.model.dto.ModelDTO; +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.ModelProperty; -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; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.util.List; import static com.pms.ocp.common.constants.CodeEnum.REQUIRED_PARAMETER_EMPTY; @@ -37,9 +39,6 @@ public class ModelBaseController { @Autowired private ModelService modelService; - @Autowired - private ModelGroupService modelGroupService; - @Autowired private ModelPropertyService modelPropertyService; @@ -47,55 +46,21 @@ public class ModelBaseController { private ModelNoteService modelNoteService; @Autowired - private ModelPropertyService propertyService; + private ModelIssueService modelIssueService; - /** - * 模型分类-查询 - * - * @return - */ - @ApiOperation("模型分类-查询") - @GetMapping("/get/model/type") - public ResponseVO getModelType() { - return modelGroupService.getModelType(); - } + @Autowired + private ModelRelationService modelRelationService; /** - * 模型分类-增加 + * 模型-增加 * * @return */ - @ApiOperation("模型分类-增加") - @PostMapping("/create/model/type") - public ResponseVO createModelType(ModelType modelType) { - return modelGroupService.createModelType(modelType); - } + @ApiOperation("模型-增加") + @PostMapping("/create/model") + public ResponseVO createModel(@RequestBody ModelDTO modelDTO) { - /** - * 模型分类-删除 - * - * @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); - } - } - - /** - * 模型分类-修改 - * - * @return - */ - @ApiOperation("模型分类-修改") - @PostMapping("/update/model/type") - public ResponseVO updateModelType(ModelType modelType) { - return modelGroupService.updateModelType(modelType); + return ResponseVO.ok(modelService.createModel(modelDTO)); } /** @@ -105,19 +70,9 @@ public class ModelBaseController { */ @ApiOperation("模型-查询") @GetMapping("/get/model") - public ResponseVO getModel() { - return modelService.getModelList(); - } - - /** - * 模型-增加 - * - * @return - */ - @ApiOperation("模型-增加") - @PostMapping("/create/model") - public ResponseVO createModel(@RequestBody Model model) { - return modelService.createModel(model); + public ResponseVO getModel(@ApiParam(value = "模型订阅编号") @RequestParam(value = "objId", required = false) String objId, + @ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode) { + return ResponseVO.ok(modelService.getModelList(objId, modelCode)); } /** @@ -127,13 +82,9 @@ public class ModelBaseController { */ @ApiOperation("模型-删除") @PostMapping("/delete/model") - public ResponseVO deleteModel(@RequestBody Model model) { - String modelId = model.getObjId(); - if (StringUtils.isNotBlank(modelId)) { - return modelService.deleteModel(modelId); - } else { - return ResponseVO.error(REQUIRED_PARAMETER_EMPTY); - } + public ResponseVO deleteModel(@ApiParam(value = "模型订阅编号") @RequestParam(value = "objId", required = false) String objId, + @ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode) { + return ResponseVO.ok(modelService.deleteModel(objId, modelCode)); } /** @@ -143,8 +94,19 @@ public class ModelBaseController { */ @ApiOperation("模型-修改") @PostMapping("/update/model") - public ResponseVO updateModel(@RequestBody Model model) { - return modelService.updateModel(model); + public ResponseVO updateModel(@RequestBody ModelDTO modelDTO) { + return ResponseVO.ok(modelService.updateModel(modelDTO)); + } + + /** + * 模型-导入 + * + * @return + */ + @ApiOperation("模型-导入") + @PostMapping("/import/model") + public ResponseVO importModel(@RequestParam("file") MultipartFile file) throws IOException { + return ResponseVO.ok(modelService.importModel(file)); } /** @@ -177,8 +139,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.deleteBatchModelIssue(ids)); } /** @@ -188,8 +161,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)); } /** @@ -217,6 +192,22 @@ public class ModelBaseController { return ResponseVO.ok(); } + /** + * 模型事记-导出 + * + * @return + */ + @ApiOperation("模型事记-导出") + @PostMapping("export/model/note") + public ResponseVO exportModelNote(HttpServletResponse response, + @ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode) throws IOException { +// 查询要导出的数据 + List modelNoteList = modelNoteService.getModelNoteList(modelCode); + ExcelUtils.exportExcel(response, "测试导出模型事记", "测试导出模型事记", "测试导出模型事记.xlsx", modelNoteList, ModelNote.class); + + return ResponseVO.ok(); + } + /** * 模型属性-增加 * @@ -237,9 +228,10 @@ public class ModelBaseController { */ @ApiOperation("模型属性-查询") @GetMapping("get/model/property") - public ResponseVO getModelProperty(@RequestParam(value = "modelCode", required = false) String modelCode, - @RequestParam(value = "propCode", required = false) String propCode) { - return ResponseVO.ok(modelPropertyService.listModelProperty(modelCode, propCode)); + 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)); } /** @@ -261,8 +253,21 @@ public class ModelBaseController { */ @ApiOperation("模型属性-删除/批量删除") @PostMapping("/delete/model/property") - public ResponseVO deleteModelProperty(@RequestBody List ids) { - return ResponseVO.ok(modelPropertyService.deletePatchModelProperty(ids)); + public ResponseVO deleteModelProperty(@ApiParam(value = "属性ID集合") @RequestBody List ids) { + return ResponseVO.ok(modelPropertyService.deleteBatchModelProperty(ids)); + } + + /** + * 模型拓扑关系-增加 + * + * @return + */ + @ApiOperation("模型拓扑关系-增加") + @PostMapping("create/model/topology") + public ResponseVO createModelTopology(@RequestBody ModelRelationDTO modelRelationDTO) { + + Integer i = modelRelationService.createModelRelation(modelRelationDTO); + return ResponseVO.ok(i); } /** @@ -272,8 +277,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 126c214bf804c48b0749ea876b9cd1af6b5c1dbe..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; @@ -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 index c65a3a50d57239c33a6fd925d81f5ced7ddb88e0..880f34de8f2c548b4c7ace19ba8fd7d10719bf9c 100644 --- a/src/main/java/com/pms/ocp/controller/OcpApiDetailsController.java +++ b/src/main/java/com/pms/ocp/controller/OcpApiDetailsController.java @@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.util.List; @Slf4j @@ -35,43 +36,43 @@ public class OcpApiDetailsController { @ApiOperation("服务订阅记录-查询") @PostMapping("/getocpapisublist") - public ResponseVO getOcpApiSubsList(OcpApiSubs ocpApiSubs) { + public ResponseVO> getOcpApiSubsList(OcpApiSubs ocpApiSubs) { return ocpApiSubsService.getOcpApiSubsList(ocpApiSubs); } @ApiOperation("服务大事记-查询") @PostMapping("/getocpapiauditlist") - public ResponseVO getOcpApiAuditList(OcpApiAudit ocpApiAudit) { + public ResponseVO> getOcpApiAuditList(OcpApiAudit ocpApiAudit) { return ocpApiAuditService.getOcpApiAuditList(ocpApiAudit); } @ApiOperation("服务大事记-查询详情") @PostMapping("/getocpapidetails") - public ResponseVO getOcpApiDetails(@RequestBody OcpApiAudit ocpApiAudit){ + public ResponseVO> getOcpApiDetails(@RequestBody OcpApiAudit ocpApiAudit){ return ocpApiAuditService.sById(ocpApiAudit); } @ApiOperation("服务大事记-查询详情-变更内容") @PostMapping("/getocpapi") - public ResponseVO getOcpApi(@RequestBody OcpApiAudit ocpApiAudit){ + public ResponseVO> getOcpApi(@RequestBody OcpApiAudit ocpApiAudit){ return ocpApiAuditService.OaaById(ocpApiAudit); } @ApiOperation("服务与应用拓扑图-查询") @PostMapping("/getoatrlist") - public ResponseVO getOatrList(@RequestBody OcpApiTenantRel ocpApiTenantRel) { + public ResponseVO> getOatrList(@RequestBody OcpApiTenantRel ocpApiTenantRel) { return ocpApiTenantRelService.getOatrList(ocpApiTenantRel); } @ApiOperation("服务与模型拓扑图-查询") @PostMapping("/getoamrlist") - public ResponseVO getOamrList(@RequestBody OcpApiModelRel ocpApiModelRel) { + public ResponseVO> getOamrList(@RequestBody OcpApiModelRel ocpApiModelRel) { return ocpApiModelRelService.getOamrList(ocpApiModelRel); } @ApiOperation("服务大事记-导出") - @GetMapping("/export") - public void exportExcel(@RequestBody OcpApiAudit ocpApiAudit, HttpServletRequest request, HttpServletResponse response) { + @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/OcpTenantController.java b/src/main/java/com/pms/ocp/controller/OcpTenantController.java index 6e5456a95a545746fed2ea1974a0109ede773192..3f8cb3d7090051d1132d6c13e24edce8aaa728a4 100644 --- a/src/main/java/com/pms/ocp/controller/OcpTenantController.java +++ b/src/main/java/com/pms/ocp/controller/OcpTenantController.java @@ -1,12 +1,17 @@ package com.pms.ocp.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.pms.ocp.model.dto.PageOcpTenantDto; import com.pms.ocp.model.dto.OcpTenantGroupDto; +import com.pms.ocp.model.dto.TenanBaseDto; +import com.pms.ocp.model.entity.OcpApiGroup; import com.pms.ocp.model.entity.OcpTenantGroup; import com.pms.ocp.model.vo.ResponseVO; import com.pms.ocp.service.TenantService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -37,12 +42,51 @@ public class OcpTenantController { @PostMapping("/tenantinster") @ApiModelProperty("新增应用") - public ResponseVO tenantInster(@RequestBody OcpTenantGroup ocpTenantGroup){ - boolean falg = tenantService.getTenanInster(ocpTenantGroup); + 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("tenantuse") + @ApiOperation("应用分类--应用管理") + public ResponseVO> tenantUse(@RequestBody PageOcpTenantDto ocpTenantDto){ + List onePages = tenantService.getsUse(ocpTenantDto); + return ResponseVO.ok(onePages); + } + + @PostMapping("tenantcase") + @ApiOperation("应用分类--应用服务分页查") + public ResponseVO> tenantCase(@RequestBody PageOcpTenantDto pageOcpTenantDto){ + Page pages= tenantService.getOnePages(pageOcpTenantDto); + + return ResponseVO.ok(pages); + } + + + + + } diff --git a/src/main/java/com/pms/ocp/controller/OcpTenantDetailsController.java b/src/main/java/com/pms/ocp/controller/OcpTenantDetailsController.java index 798c1d3d800f871c06161dcee314404896623283..89b08a2d50b03cd7ba210fbd54ac3bc6d56a6528 100644 --- a/src/main/java/com/pms/ocp/controller/OcpTenantDetailsController.java +++ b/src/main/java/com/pms/ocp/controller/OcpTenantDetailsController.java @@ -1,11 +1,11 @@ package com.pms.ocp.controller; -import com.pms.ocp.model.entity.OcpTenantAudit; -import com.pms.ocp.model.entity.OcpTenantBase; +import com.pms.ocp.model.entity.*; import com.pms.ocp.model.vo.ResponseVO; -import com.pms.ocp.service.OcpApiAuditService; +import com.pms.ocp.service.OcpApiTenantRelService; import com.pms.ocp.service.OcpTenantAuditService; import com.pms.ocp.service.OcpTenantBaseService; +import com.pms.ocp.service.OcpTenantSubsService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -15,6 +15,10 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.List; + @Slf4j @RequestMapping("/tenant") @RestController @@ -27,15 +31,51 @@ public class OcpTenantDetailsController { @Autowired private OcpTenantAuditService ocpTenantAuditService; + @Autowired + private OcpTenantSubsService ocpTenantSubsService; + + @Autowired + private OcpApiTenantRelService ocpApiTenantRelService; + + @ApiOperation("应用基础信息-查询") @PostMapping("/getotbList") - public ResponseVO getOtbList(@RequestBody OcpTenantBase ocpTenantBase){ + public ResponseVO> getOtbList(@RequestBody OcpTenantBase ocpTenantBase){ return ocpTenantBaseService.getOtbList(ocpTenantBase); } @ApiOperation("应用大事记-查询") @PostMapping("/getotaList") - public ResponseVO getOtaList(OcpTenantAudit ocpTenantAudit) { + public ResponseVO> getOtaList(OcpTenantAudit ocpTenantAudit) { return ocpTenantAuditService.getOtaList(ocpTenantAudit); } + + @ApiOperation("应用大事记-查询详情") + @PostMapping("/getotaListById") + public ResponseVO> getOtaListById(@RequestBody OcpTenantAudit ocpTenantAudit) { + return ocpTenantAuditService.getOtaListById(ocpTenantAudit); + } + + @ApiOperation("应用订阅记录-查询") + @PostMapping("/getOcpTenantList") + public ResponseVO> getOcpTenantList(OcpTenantSubs ocpTenantSubs) { + return ocpTenantSubsService.getOcpTenantList(ocpTenantSubs); + } + + @ApiOperation("应用与服务拓扑图-查询") + @PostMapping("/getOcpTenantApiList") + public ResponseVO> getOcpTenantApiList(@RequestBody OcpApiTenantRel ocpApiTenantRel) { + return ocpApiTenantRelService.getTenantApiList(ocpApiTenantRel); + } + + @ApiOperation("应用大事记-导出") + @RequestMapping("/export") + public void exportExcel(@RequestBody(required = false)OcpTenantAudit ocpTenantAudit, HttpServletRequest request, HttpServletResponse response) { + ocpTenantAuditService.exportExcel(ocpTenantAudit,request,response); + } + @ApiOperation("应用大事记-查询详情-变更内容") + @PostMapping("/getocpTent") + public ResponseVO> getOcpTenant(@RequestBody OcpTenantAudit ocpTenantAudit){ + return ocpTenantAuditService.OtaById(ocpTenantAudit); + } } diff --git a/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java b/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java index a5b6713f903a45d8b74f8f1d955b744b2d9dbcf1..1c7cd5ea8018903f62cd82d9fea67e4c4a38a4a5 100644 --- a/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java +++ b/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java @@ -7,13 +7,12 @@ import com.pms.ocp.service.TenantBasicManagementService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.sql.Timestamp; +import java.util.List; @Slf4j @RequestMapping("/tenant/basic") @@ -22,18 +21,59 @@ import java.sql.Timestamp; public class TenantBasicManagementController { @Autowired private TenantBasicManagementService tenantBasicManagementService; + @ApiOperation("条件查询") @GetMapping("/queryOcpTenantBaseDto") - public ResponseVO queryOcpTenantBaseDto( - @RequestParam(required = false) String keyword, - @RequestParam(required = false) String tenantUnits, - @RequestParam(required = false) Timestamp startTime, - @RequestParam(required = false) Timestamp endTime, - @RequestParam(required = false) int pageSize, - @RequestParam(required = false) int pageNum + public ResponseVO> queryOcpTenantBaseDto( + @RequestParam(required = false) String tenantCode, + @RequestParam(required = false) String keyword, + @RequestParam(required = false) String tenantUnit, + @RequestParam(required = false) Timestamp startTime, + @RequestParam(required = false) Timestamp endTime, + @RequestParam(required = false) Integer pageSize, + @RequestParam(required = false) Integer pageNum ) { - OcpTenantBaseDto ocpTenantBaseDto = tenantBasicManagementService.queryOcpTenantBaseDto( keyword, tenantUnits, startTime, endTime, pageSize + List ocpTenantBaseDto = tenantBasicManagementService.queryOcpTenantBaseDto(tenantCode, keyword, tenantUnit, startTime, endTime, pageSize , pageNum); return ResponseVO.ok(ocpTenantBaseDto); } + + @ApiOperation("应用发布") + @PostMapping("/issue") + public ResponseVO TenantIssue(@RequestParam(required = false) String tenantPromotion, + @RequestParam(required = false) String tenantCodes) { + if (StringUtils.isEmpty(tenantPromotion) || tenantPromotion.equals("0")) { + return ResponseVO.error("统招"); + } else { + return tenantBasicManagementService.tenantIssue(tenantCodes); + } + } + + @ApiOperation("应用订阅") + @PostMapping("/login") + public ResponseVO TenantLogin(@RequestParam(required = false) String tenantPromotion, + @RequestParam(required = false) String tenantCodes) { + if (StringUtils.isEmpty(tenantPromotion) || tenantPromotion.equals("0")) { + return ResponseVO.error("统招"); + } else { + tenantBasicManagementService.tenantLogin(tenantCodes); + return ResponseVO.ok(); + } + + } + + @ApiOperation("应用下线") + @PostMapping("/cancel") + public ResponseVO TenantCancel( + @RequestParam(required = false) String tenantCodes) { + return tenantBasicManagementService.tenantCancel(tenantCodes); + + } + @ApiOperation("应用注册") + @PostMapping("/apply/register") + public ResponseVO TenantRegister(@RequestBody(required = false) OcpTenantBaseDto ocpTenantBaseDto){ + + return ResponseVO.ok(); + } + } 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/ModelMapper.java b/src/main/java/com/pms/ocp/mapper/ModelMapper.java index 97657cbec38acade32ba9ccc4d01d6a2abbc9e71..7bc10e94f5c5463e0ac5c6a1dee3a30eeb9307f2 100644 --- a/src/main/java/com/pms/ocp/mapper/ModelMapper.java +++ b/src/main/java/com/pms/ocp/mapper/ModelMapper.java @@ -3,6 +3,9 @@ package com.pms.ocp.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.pms.ocp.model.entity.Model; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * @Auther: wangjian @@ -12,4 +15,7 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface ModelMapper extends BaseMapper { + + boolean insertBatchModel(@Param("modelList") List modelList); + } 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 e9a61f24f66f915eedf8c62ce30f78171d577e2f..7bbd2f7a0e8216ac088cf09dbd386fd7688990a7 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpApiAuditMapper.java +++ b/src/main/java/com/pms/ocp/mapper/OcpApiAuditMapper.java @@ -16,8 +16,8 @@ public interface OcpApiAuditMapper extends BaseMapper { 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..f9ac8710c0f159955e634b0cb23b682d9d5d3566 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpApiTenantRelMapper.java +++ b/src/main/java/com/pms/ocp/mapper/OcpApiTenantRelMapper.java @@ -9,5 +9,7 @@ import java.util.List; @Mapper public interface OcpApiTenantRelMapper extends BaseMapper { - List getOatrList(OcpApiTenantRel ocpApiTenantRel); + List getOatrList(OcpApiTenantRel ocpApiTenantRel); + + List getTenantApiList(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 index 30c4c13780cbec55eb8c66dead8abe0237b5f2b0..87f777be215ccc755467f0293ff80f85c20bcc79 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpTenantAuditMapper.java +++ b/src/main/java/com/pms/ocp/mapper/OcpTenantAuditMapper.java @@ -7,4 +7,8 @@ import java.util.List; public interface OcpTenantAuditMapper extends BaseMapper { List getOtaList(OcpTenantAudit ocpTenantAudit); + + List getOtaListById(OcpTenantAudit ocpTenantAudit); + + List OtaById(OcpTenantAudit ocpTenantAudit); } diff --git a/src/main/java/com/pms/ocp/mapper/OcpTenantExtentMapper.java b/src/main/java/com/pms/ocp/mapper/OcpTenantExtentMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..e2dfbde0c9da4458fd7e07e8f1e3535c2c933b4a --- /dev/null +++ b/src/main/java/com/pms/ocp/mapper/OcpTenantExtentMapper.java @@ -0,0 +1,9 @@ +package com.pms.ocp.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.pms.ocp.model.entity.OcpTenantExtent; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface OcpTenantExtentMapper extends BaseMapper{ +} diff --git a/src/main/java/com/pms/ocp/mapper/OcpTenantSubsMapper.java b/src/main/java/com/pms/ocp/mapper/OcpTenantSubsMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..8ac1a7fe92847c70a6c03ae89ff2735fc5c6cbb7 --- /dev/null +++ b/src/main/java/com/pms/ocp/mapper/OcpTenantSubsMapper.java @@ -0,0 +1,12 @@ +package com.pms.ocp.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.pms.ocp.model.entity.OcpTenantSubs; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface OcpTenantSubsMapper extends BaseMapper { + List getOcpTenantList(OcpTenantSubs ocpTenantSubs); +} diff --git a/src/main/java/com/pms/ocp/mapper/TenantBasicManagementMapper.java b/src/main/java/com/pms/ocp/mapper/TenantBasicManagementMapper.java index 068ea21df813ecea777b81cc671575a5fd3baa70..719d841362fff49afab9ff47a4ed0c875b502c29 100644 --- a/src/main/java/com/pms/ocp/mapper/TenantBasicManagementMapper.java +++ b/src/main/java/com/pms/ocp/mapper/TenantBasicManagementMapper.java @@ -11,5 +11,7 @@ import java.util.List; @Mapper public interface TenantBasicManagementMapper extends BaseMapper { - OcpTenantBaseDto queryOcpApiBaseDto(@Param("keyword") String keyword, @Param("list") List list, @Param("startTime") Timestamp startTime, @Param("endTime") Timestamp endTime, @Param("pageSize") int pageSize, @Param("pageNum") int pageNum); + + + List queryOcpTenantBaseDto(@Param("keyword") String keyword, @Param("tenantUnit") String tenantUnit, @Param("startTime") Timestamp startTime, @Param("endTime") Timestamp endTime, @Param("tenantCode") String tenantCode, @Param("pageSize") int pageSize, @Param("pageNum") int pageNum); } diff --git a/src/main/java/com/pms/ocp/model/Response.java b/src/main/java/com/pms/ocp/model/Response.java index cb6cdd98f832c9a794a25c9fe0750a83ef81e147..f0adc07852170810a13246916ced977a202226e3 100644 --- a/src/main/java/com/pms/ocp/model/Response.java +++ b/src/main/java/com/pms/ocp/model/Response.java @@ -2,7 +2,7 @@ package com.pms.ocp.model; public interface Response { - public static final boolean SUCCESS = true; - public static final int SUCCESS_CODE = 0; + boolean SUCCESS = true; + int SUCCESS_CODE = 0; } diff --git a/src/main/java/com/pms/ocp/model/dto/ModelDTO.java b/src/main/java/com/pms/ocp/model/dto/ModelDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..d1de7f7df0fd72e17ca4d8844b9d3f03607a980a --- /dev/null +++ b/src/main/java/com/pms/ocp/model/dto/ModelDTO.java @@ -0,0 +1,174 @@ +package com.pms.ocp.model.dto; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; + +/** + * @Auther: wangjian + * @Date: 2022/2/22 16:56 + * @Description: + */ + +@Data +@NoArgsConstructor +//@AllArgsConstructor +@ApiModel(value = "中台运营管控_模型表", description = "中台运营管控_模型表") +public class ModelDTO { + + /** + * 模型编号 + * 主键 + */ + @Excel(name = "模型编号") + @ApiModelProperty(value = "模型编号") + private String objId; + + /** + * 模型名称 + */ + @Excel(name = "模型名称") + @ApiModelProperty(value = "模型名称") + private String modelName; + + /** + * 模型编码 + */ + @Excel(name = "模型编码") + @ApiModelProperty(value = "模型编码") + private String modelCode; + + /** + * 设备类型 + */ + @Excel(name = "设备类型") + @ApiModelProperty(value = "设备类型") + private String equipType; + + /** + * 所属专业 ts:输电,t:变电, dc:直流，ds:配电，tc:技术，pl:计划 im:综合 + */ + @Excel(name = "所属专业", replace = {"输电_ts", "变电_t", "直流_ds", "配电_ds", "技术_tc", "计划_pl", "综合_im"}) + @ApiModelProperty(value = "所属专业 ts:输电,t:变电, dc:直流，ds:配电，tc:技术，pl:计划 im:综合") + private String professional_kind; + + /** + * 模型分类编码 + */ + @Excel(name = "模型分类编码") + @ApiModelProperty(value = "模型分类编码") + private String model_group_code; + + /** + * 模型表名称 + */ + @Excel(name = "模型表名称") + @ApiModelProperty(value = "模型表名称") + private String model_table; + + /** + * 是否启用 0:未启用,1：启用 + */ + @Excel(name = "是否启用", replace = {"未启用_0", "启用_1"}) + @ApiModelProperty(value = "是否启用") + private Integer boolUse; + + + /** + * 推广类型 0:统推,1：自建 + */ + @Excel(name = "推广类型", replace = {"统推_0", "自建_1"}) + @ApiModelProperty(value = "推广类型") + private Integer modelPromotion; + + /** + * 公司编码 + */ + @Excel(name = "公司编码") + @ApiModelProperty(value = "公司编码") + private String ownerCompanyCode; + + /** + * 排列顺序 + */ + @Excel(name = "排列顺序") + @ApiModelProperty(value = "排列顺序") + private Integer modelOrderNo; + + /** + * 提交人编号 + */ + @Excel(name = "提交人编号") + @ApiModelProperty(value = "提交人编号") + private String modelUserId; + + + /** + * 提交人姓名 + */ + @Excel(name = "提交人姓名") + @ApiModelProperty(value = "提交人姓名") + private String modelUserName; + + /** + * 模型创建时间 + */ + @Excel(name = "创建时间") + @ApiModelProperty(value = "创建时间") + @TableField(value = "model_ctime") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private LocalDateTime modelCtime; + + /** + * 模型修改时间 + */ + @Excel(name = "修改时间") + @ApiModelProperty(value = "修改时间") + @TableField(value = "model_mtime") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private LocalDateTime modelMtime; + + /** + * 是否删除 0:未删除 1:已删除 + */ + @Excel(name = "是否删除", replace = {"未删除_1", "已删除_2"}) + @ApiModelProperty(value = "是否删除") + private Integer boolDelete; + + /** + * 所属区域 1:生成控制大区 2:信息关联大区 3:互联网大区 + */ + @Excel(name = "所属区域", replace = {"生成控制大区_1", "信息关联大区_2", "互联网大区_3"}) + @ApiModelProperty(value = "所属区域") + private Integer modelZone; + + /** + * 所属层级 1:应用层 2:平台层 3:网络层 4:感知层 + */ + @Excel(name = "方机构类型", replace = {"应用层_1", "平台层_2", "网络层_3", "感知层_4"}) + @ApiModelProperty(value = "所属层级 1:应用层 2:平台层3:网络层 4:感知层") + private Integer modelLayer; + + /** + * 模型版本（最新版本） + */ + @Excel(name = "模型版本") + @ApiModelProperty(value = "模型版本") + private String modelVersion; + + /** + * 建设厂商 + */ + @Excel(name = "建设厂商") + @ApiModelProperty(value = "建设厂商") + private String apiUnit; +} 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 index b01ac9d33cb9845f8f8425c368729e128cafbf58..1ba3f5a6a2167f4522a236327b447c7c45e48106 100644 --- a/src/main/java/com/pms/ocp/model/dto/ModelPropertyDTO.java +++ b/src/main/java/com/pms/ocp/model/dto/ModelPropertyDTO.java @@ -1,6 +1,5 @@ package com.pms.ocp.model.dto; -import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -8,7 +7,6 @@ import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; import java.sql.Date; -import java.time.LocalDateTime; /** * @Auther: wangjian @@ -54,7 +52,7 @@ public class ModelPropertyDTO { * 数据类型 */ @ApiModelProperty(value = "数据类型") - private Integer dataType; + private String dataType; /** * 数据长度 @@ -83,8 +81,8 @@ public class ModelPropertyDTO { /** * 推广类型 0:统推,1：自建 */ - @ApiModelProperty(value = "推广类型 0:统推,1：自建") - private String propPromotion; +// @ApiModelProperty(value = "推广类型 0:统推,1：自建") +// private String propPromotion; /** * 显示顺序 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/OcpTenantBaseDto.java b/src/main/java/com/pms/ocp/model/dto/OcpTenantBaseDto.java index d7434b973090341f5bc2bc129866b7b64ef1bfb9..8ff963838c0f9eb6594b290a997f0c56181ac0fe 100644 --- a/src/main/java/com/pms/ocp/model/dto/OcpTenantBaseDto.java +++ b/src/main/java/com/pms/ocp/model/dto/OcpTenantBaseDto.java @@ -14,12 +14,14 @@ import java.io.Serializable; @NoArgsConstructor @ApiModel(value = "应用信息表dto") public class OcpTenantBaseDto extends OcpTenantBase implements Serializable { + @ApiModelProperty("应用分类名称") private String tenantGroupName; @ApiModelProperty("集群名称") private String clusterName; @ApiModelProperty("命名空间") private String spaceName; - @ApiModelProperty("部署名称") - private String deploymentName; + @ApiModelProperty("服务编码字符串") + private String apiCodes; + } diff --git a/src/main/java/com/pms/ocp/model/dto/PageOcpTenantDto.java b/src/main/java/com/pms/ocp/model/dto/PageOcpTenantDto.java new file mode 100644 index 0000000000000000000000000000000000000000..f944df1e6140c00a4ea8f4d834eaf283aba0ef33 --- /dev/null +++ b/src/main/java/com/pms/ocp/model/dto/PageOcpTenantDto.java @@ -0,0 +1,237 @@ +package com.pms.ocp.model.dto; + + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.pms.ocp.common.config.PageParam; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +import java.sql.Timestamp; + +/** + * 分级查询dto + */ +@ApiModel("分级查询dto") +public class PageOcpTenantDto { + /** + * 主键 + */ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty("主键") + private String objId; + + + private int pageNum; + + private int pageSize; + + + public int getPageNum() { + return pageNum; + } + + + public void setPageNum(int pageNum) { + this.pageNum = pageNum; + } + + + public int getPageSize() { + return pageSize; + } + + public void setPageSize(int pageSize) { + this.pageSize = pageSize; + } + + /** + * 应用分类编码 + */ + @ApiModelProperty("应用分类编码") + private String tenantGroupCode; + + /** + * 应用分类名称 + */ + @ApiModelProperty("应用分类名称") + private String tenantGroupName; + + /** + * 分类创建公司 + */ + @ApiModelProperty("分类创建公司") + private String tenantGroupCompanyCode; + + /** + * 上级code + */ + @ApiModelProperty("上级code") + private String tenantGroupPcode; + + /** + * 应用类别设备级、生态级等 + */ + @ApiModelProperty("应用类别设备级、生态级等") + private String tenantType; + + /** + * 分类版本 + */ + @ApiModelProperty("分类版本") + private String tenantGroupVersion; + + /** + * 显示顺序 + */ + @ApiModelProperty("显示顺序") + private Integer tenantGroupOrderNo; + + /** + * 提交人id + */ + @ApiModelProperty("提交人id") + private String tenantGroupUserId; + + /** + * 提交人姓名 + */ + @ApiModelProperty("提交人姓名") + private String tenantGroupUserName; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private Timestamp tenantGroupCtime; + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private Timestamp tenantGroupMtime; + + /** + * 是否删除 + */ + @ApiModelProperty("是否删除") + private Short isDelete; + + /** + * 应用树层级 1:应用分组层 2:应用层 + */ + @ApiModelProperty("应用树层级 1:应用分组层 2:应用层") + private Short tenantGroupLevel; + + public String getObjId() { + return objId; + } + + public void setObjId(String objId) { + this.objId = objId; + } + + public String getTenantType() { + return tenantType; + } + + public void setTenantType(String tenantType) { + this.tenantType = tenantType; + } + + public String getTenantGroupVersion() { + return tenantGroupVersion; + } + + public void setTenantGroupVersion(String tenantGroupVersion) { + this.tenantGroupVersion = tenantGroupVersion; + } + + public Integer getTenantGroupOrderNo() { + return tenantGroupOrderNo; + } + + public void setTenantGroupOrderNo(Integer tenantGroupOrderNo) { + this.tenantGroupOrderNo = tenantGroupOrderNo; + } + + public String getTenantGroupUserId() { + return tenantGroupUserId; + } + + public void setTenantGroupUserId(String tenantGroupUserId) { + this.tenantGroupUserId = tenantGroupUserId; + } + + public String getTenantGroupUserName() { + return tenantGroupUserName; + } + + public void setTenantGroupUserName(String tenantGroupUserName) { + this.tenantGroupUserName = tenantGroupUserName; + } + + public Timestamp getTenantGroupCtime() { + return tenantGroupCtime; + } + + public void setTenantGroupCtime(Timestamp tenantGroupCtime) { + this.tenantGroupCtime = tenantGroupCtime; + } + + public Timestamp getTenantGroupMtime() { + return tenantGroupMtime; + } + + public void setTenantGroupMtime(Timestamp tenantGroupMtime) { + this.tenantGroupMtime = tenantGroupMtime; + } + + public Short getIsDelete() { + return isDelete; + } + + public void setIsDelete(Short isDelete) { + this.isDelete = isDelete; + } + + public String getTenantGroupCode() { + return tenantGroupCode; + } + + public void setTenantGroupCode(String tenantGroupCode) { + this.tenantGroupCode = tenantGroupCode; + } + + public String getTenantGroupName() { + return tenantGroupName; + } + + public void setTenantGroupName(String tenantGroupName) { + this.tenantGroupName = tenantGroupName; + } + + public String getTenantGroupCompanyCode() { + return tenantGroupCompanyCode; + } + + public void setTenantGroupCompanyCode(String tenantGroupCompanyCode) { + this.tenantGroupCompanyCode = tenantGroupCompanyCode; + } + + public String getTenantGroupPcode() { + return tenantGroupPcode; + } + + public void setTenantGroupPcode(String tenantGroupPcode) { + this.tenantGroupPcode = tenantGroupPcode; + } + + public Short getTenantGroupLevel() { + return tenantGroupLevel; + } + + public void setTenantGroupLevel(Short tenantGroupLevel) { + this.tenantGroupLevel = tenantGroupLevel; + } +} diff --git a/src/main/java/com/pms/ocp/model/dto/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/entity/Model.java b/src/main/java/com/pms/ocp/model/entity/Model.java index 39cd7e37b97ad21973e0dacf825ee183d6a33002..152c3dd7c39b4893191dadb5ae02d2f3527ae624 100644 --- a/src/main/java/com/pms/ocp/model/entity/Model.java +++ b/src/main/java/com/pms/ocp/model/entity/Model.java @@ -1,7 +1,6 @@ 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; @@ -9,7 +8,6 @@ import lombok.experimental.Accessors; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; -import java.util.Date; /** * @Auther: wangjian @@ -23,9 +21,10 @@ import java.util.Date; public class Model { /** - * 模型编号 + * 模型关系编号 + * 主键 */ - @TableId + @TableField("obj_id") private String objId; /** @@ -44,47 +43,41 @@ public class Model { private String equipType; /** - * 所属专业 + * 所属专业ts:输电,t:变电, dc:直流，ds配电，tc:技术，pl计划 im综合 */ - private String professionalKind; + private String professional_kind; /** * 模型分类编码 */ - private String modelGroupCode; + private String model_group_code; /** - * 模型表 + * 模型表名称 */ - private String modelTable; + private String model_table; /** - * 是否启用 + * 是否启用 0:未启用,1：启用 */ - private String isUse; + @TableField(value = "is_use") + private Integer boolUse; /** - * 模型推广类型 - * 0:统推,1：自建 + * 模型推广类型 0:统推,1：自建 */ - private String modelPromotion; - + private Integer modelPromotion; /** - * 公司code + * 公司编码 */ private String ownerCompanyCode; - /** - * 公司名称 - */ - private String ownerCompanyName; - /** * 排列顺序 */ - private String modelOrderNo; + private Integer modelOrderNo; /** * 提交人id @@ -100,36 +93,90 @@ public class Model { /** * 模型创建时间 */ - @TableField(value = "model_ctime") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - private Date modelCreateTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private LocalDateTime modelCtime; /** * 模型修改时间 */ - @TableField(value = "model_mtime") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - private Date modelUpdateTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private LocalDateTime modelMtime; + + /** + * 是否已删除0:未删除 1:已删除 + */ + + @TableField(value = "is_delete") + private Integer boolDelete; + + /** + * 所属区域1:生成控制大区 2:信息关联大区3:互联网大区 + */ + private Integer modelZone; + + /** + * 所属层级1:应用层 2:平台层3:网络层 4:感知层 + */ + private Integer modelLayer; + + /** + * 模型版本模型版本（最新版本） + */ + private String modelVersion; + + /** + * 建设厂商 + */ + private String apiUnit; } -// 字段名称 字段描述 字段类型 允许为NULL 备注 -// model_id 主键 varchar(40) 否 -// model_name 模型名称 varchar(50) 否 -// model_code 模型编码 varchar(42) 否 -// equip_type 设备类型 varchar(42) 是 -// domain_type 所属专业 int4 是 0:输电,1:变电,2:配电,3:直流,4:计划,5:技术 -// model_group_id 模型分类id varchar(42) 否 -// model_group_name 模型分类名称 varchar(50) 否 -// model_table 模型表 varchar(50) 否 -// model_relation 模型关联关系 text 是 存储模型之间的关系json格式；例如[{ model_group_id : t_public_manage_model_group.group_id}] -// Is_use 是否启用 int4 否 0:不启用,1：启用 -// model_promotion 推广类型 int4 否 0:统推,1：自建 -// company_id 省公司ID varchar(42) 是 -// company_name 省公司名称 varchar(50) 是 -// model_dispidx 显示顺序 int4 是 -// model_user_id 提交人id varchar(42) 是 -// model_user_name 提交人姓名 varchar(64) 是 -// model_ctime 创建时间 timestamp(6) 是 -// model_mtime 修改时间 timestamp(6) 是 +// create table ocp_model_base +// ( +// obj_id varchar(42) not null +// constraint ocp_model_base_pkey +// primary key, +// model_name varchar(50) default ''::character varying not null, +// model_code varchar(42) default ''::character varying not null, +// equip_type varchar(42) default ''::character varying, +// professional_kind varchar(10) default ''::character varying, +// model_group_code varchar(42) default ''::character varying, +// model_table varchar(50) default ''::character varying, +// is_use smallint default '-1'::integer, +// model_promotion smallint default '-1'::integer, +// owner_company_code varchar(42) default ''::character varying not null, +// model_order_no integer default '-1'::integer, +// 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, +// model_zone smallint default '-1'::integer, +// model_layer smallint default '-1'::integer, +// model_version varchar(10) default ''::character varying, +// api_unit varchar(50) default ''::character varying +// ); +// +// comment on table ocp_model_base is '模型基础信息表'; + +// comment on column ocp_model_base.obj_id is '主键'; +// comment on column ocp_model_base.model_name is '模型名称'; +// comment on column ocp_model_base.model_code is '模型编码'; +// comment on column ocp_model_base.equip_type is '设备类型'; +// comment on column ocp_model_base.professional_kind is '所属专业ts:输电,t:变电, dc:直流，ds配电，tc:技术，pl计划 im综合'; +// comment on column ocp_model_base.model_group_code is '模型分类编码'; +// comment on column ocp_model_base.model_table is '模型表(表的英文名称)表的英文名称'; +// comment on column ocp_model_base.is_use is '是否启用0:未启用,1：启用'; +// comment on column ocp_model_base.model_promotion is '推广类型0:统推 1自建'; +// comment on column ocp_model_base.owner_company_code is '公司code'; +// comment on column ocp_model_base.model_order_no is '排列顺序'; +// comment on column ocp_model_base.model_user_id is '提交人id'; +// comment on column ocp_model_base.model_user_name is '提交人姓名'; +// comment on column ocp_model_base.model_ctime is '创建时间'; +// comment on column ocp_model_base.model_mtime is '修改时间'; +// comment on column ocp_model_base.is_delete is '是否已删除0:未删除 1:已删除'; +// comment on column ocp_model_base.model_zone is '所属区域1:生成控制大区 2:信息关联大区3:互联网大区'; +// comment on column ocp_model_base.model_layer is '所属层级1:应用层 2:平台层3:网络层 4:感知层'; +// comment on column ocp_model_base.model_version is '模型版本模型版本（最新版本）'; +// comment on column ocp_model_base.api_unit is '建设厂商'; 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 afcef546c2e8e72f1426e9048592ca3b9c8c0574..5934482ae4e5bca1ab6fcd07fda1cb7cda65d485 100644 --- a/src/main/java/com/pms/ocp/model/entity/ModelProperty.java +++ b/src/main/java/com/pms/ocp/model/entity/ModelProperty.java @@ -53,7 +53,7 @@ public class ModelProperty{ /** * 数据类型 */ - private Integer dataType; + private String dataType; /** * 数据长度 @@ -80,7 +80,7 @@ public class ModelProperty{ /** * 推广类型 */ - private String propPromotion; +// private String propPromotion; /** * 显示顺序 @@ -128,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/OcpApiAudit.java b/src/main/java/com/pms/ocp/model/entity/OcpApiAudit.java index 0b36e8271f7c3e810b1f5ffc6ff1c629f5d38909..e5e4a20270aecec0a641143f2153be8cd5933696 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpApiAudit.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpApiAudit.java @@ -115,5 +115,235 @@ public class OcpApiAudit { @ApiModelProperty("服务版本（最新版本）") private long apiVersion; + public String getObjId() { + return objId; + } + public void setObjId(String objId) { + this.objId = objId; + } + + public String getApiCode() { + return apiCode; + } + + public void setApiCode(String apiCode) { + this.apiCode = apiCode; + } + + public long getOperStatus() { + return operStatus; + } + + public void setOperStatus(long operStatus) { + this.operStatus = operStatus; + } + + public long getOperTarget() { + return operTarget; + } + + public void setOperTarget(long operTarget) { + this.operTarget = operTarget; + } + + public long getAuditType() { + return auditType; + } + + public void setAuditType(long auditType) { + this.auditType = auditType; + } + + public String getAuditMessage() { + return auditMessage; + } + + public void setAuditMessage(String auditMessage) { + this.auditMessage = auditMessage; + } + + public String getAuditJson() { + return auditJson; + } + + public void setAuditJson(String auditJson) { + this.auditJson = auditJson; + } + + public String getAuditUserId() { + return auditUserId; + } + + public void setAuditUserId(String auditUserId) { + this.auditUserId = auditUserId; + } + + public String getAuditUserName() { + return auditUserName; + } + + public void setAuditUserName(String auditUserName) { + this.auditUserName = auditUserName; + } + + public Timestamp getAuditCtime() { + return auditCtime; + } + + public void setAuditCtime(Timestamp auditCtime) { + this.auditCtime = auditCtime; + } + + public Timestamp getAuditMtime() { + return auditMtime; + } + + public void setAuditMtime(Timestamp auditMtime) { + this.auditMtime = auditMtime; + } + + public long getIsDelete() { + return isDelete; + } + + public void setIsDelete(long isDelete) { + this.isDelete = isDelete; + } + + public long getApplyVersion() { + return applyVersion; + } + + public void setApplyVersion(long applyVersion) { + this.applyVersion = applyVersion; + } + + public long getPreApiVersion() { + return preApiVersion; + } + + public void setPreApiVersion(long preApiVersion) { + this.preApiVersion = preApiVersion; + } + + 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/OcpApiSubs.java b/src/main/java/com/pms/ocp/model/entity/OcpApiSubs.java index 3e4d512c54712fbd67cea5dcb45aee41bb9fa131..ad530a078d37af2f95fc3ee7413c8a3543c80914 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpApiSubs.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpApiSubs.java @@ -85,6 +85,7 @@ public class OcpApiSubs { @ApiModelProperty("服务版本（最新版本）") private long apiVersion; + public String getObjId() { return objId; } @@ -141,14 +142,6 @@ public class OcpApiSubs { this.subsCompanyCode = subsCompanyCode; } - public long getIsDelete() { - return isDelete; - } - - public void setIsDelete(long isDelete) { - this.isDelete = isDelete; - } - public String getApiName() { return apiName; } 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/OcpTenantAudit.java b/src/main/java/com/pms/ocp/model/entity/OcpTenantAudit.java index c199c95f54c9419b17be7d0a47bba6f8a5b7b607..7918098858a7d5c9101b230e65cf4b9f249d6d2c 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpTenantAudit.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpTenantAudit.java @@ -1,5 +1,6 @@ package com.pms.ocp.model.entity; +import cn.afterturn.easypoi.excel.annotation.Excel; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -9,6 +10,7 @@ import lombok.Data; import lombok.experimental.Accessors; import java.io.Serializable; +import java.sql.Timestamp; import java.util.Date; /** @@ -17,7 +19,6 @@ import java.util.Date; */ @Data @Accessors(chain = true) -@TableName("ocp_tenant_audit") @ApiModel("应用事记表1") public class OcpTenantAudit implements Serializable { /** @@ -25,286 +26,488 @@ public class OcpTenantAudit implements Serializable { */ @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty("主键ID") + @Excel(name = "主键ID",orderNum = "1") private String objId; /** * 应用code */ @ApiModelProperty("应用code") + @Excel(name = "应用code",orderNum = "2") private String tenantCode; /** * 操作状态0:新增,1:迭代；2，下线 */ @ApiModelProperty("操作状态0:新增,1:迭代；2，下线") + @Excel(name = "操作状态0:新增,1:迭代；2，下线",orderNum = "3") private Short operStatus; /** * 类型0:人工操作,1:流程管控,3:总部下发 */ @ApiModelProperty("类型0:人工操作,1:流程管控,3:总部下发") + @Excel(name = "类型0:人工操作,1:流程管控,3:总部下发",orderNum = "4") private Short auditType; /** * 备注简述 */ @ApiModelProperty("备注简述") + @Excel(name = "备注简述",orderNum = "5") private String auditMessage; /** * 应用事记内容 */ @ApiModelProperty("应用事记内容") + @Excel(name = "应用事记内容",orderNum = "6") private String auditJson; /** * 提交人id */ @ApiModelProperty("提交人id") + @Excel(name = "提交人id",orderNum = "7") private String auditUserId; /** * 提交人姓名 */ @ApiModelProperty("提交人姓名") + @Excel(name = "提交人姓名",orderNum = "8") private String auditUserName; /** * 创建时间 */ @ApiModelProperty("创建时间") + @Excel(name = "创建时间",orderNum = "9") private Date auditCtime; /** * 应用版本(当前版本) */ @ApiModelProperty(" 应用版本(当前版本") + @Excel(name = " 应用版本(当前版本",orderNum = "10") private String applyVersion; /** * 上一版本 */ @ApiModelProperty("上一版本") + @Excel(name = " 上一版本",orderNum = "11") private String perTenantVersion; private static final long serialVersionUID = 1L; - /** - * 主键 - */ + @ApiModelProperty("服务编码") + private String apiCode; + + @ApiModelProperty("服务部署公司") + private String apiDepCompanyCode; + + @ApiModelProperty("应用所属公司") + private String tenantDepCompanyCode; + + @ApiModelProperty("关系创建时间") + private Timestamp apiTenantRelCtime; + + @ApiModelProperty("关系创建时间") + private Timestamp apiTenantRelMtime; + + @ApiModelProperty("关系创建用户ID") + private String apiTenantRelUserId; + + @ApiModelProperty("关系创建用户") + private String apiTenantRelUserName; + + @ApiModelProperty("是否已删除0未删除，1已删除") + private long isDelete; + + @ApiModelProperty("服务接口中文名称") + private String apiName; + + @ApiModelProperty("服务分类代码") + private String apiGroupCode; + + @ApiModelProperty("推广类型0:统建；1:自建") + private long apiPromotion; + + @ApiModelProperty("服务请求体") + private String apiReq; + + @ApiModelProperty("服务返回体") + private String apiResp; + + @ApiModelProperty("服务地址") + private String apiUrl; + + @ApiModelProperty("服务创建时间") + private Timestamp apiCtime; + + @ApiModelProperty("服务修改时间") + private Timestamp apiMtime; + + @ApiModelProperty("创建者用户ID") + private String apiUserId; + + @ApiModelProperty("建设单位") + private String apiUnit; + + @ApiModelProperty("服务所属公司") + private String ownerCompanyCode; + + @ApiModelProperty("服务所属公司") + private String ownerCompanyName; + + @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区") + private long apiZone; + + @ApiModelProperty("'所属层级 1:应用层;2:平台层;3:网络层;4:感知层;") + private long apiLayer; + + @ApiModelProperty("服务版本（最新版本）") + private long apiVersion; + public String getObjId() { return objId; } - /** - * 主键 - */ public void setObjId(String objId) { this.objId = objId; } - /** - * 应用code - */ public String getTenantCode() { return tenantCode; } - /** - * 应用code - */ public void setTenantCode(String tenantCode) { this.tenantCode = tenantCode; } - /** - * 操作状态0:新增,1:迭代；2，下线 - */ public Short getOperStatus() { return operStatus; } - /** - * 操作状态0:新增,1:迭代；2，下线 - */ public void setOperStatus(Short operStatus) { this.operStatus = operStatus; } - /** - * 类型0:人工操作,1:流程管控,3:总部下发 - */ public Short getAuditType() { return auditType; } - /** - * 类型0:人工操作,1:流程管控,3:总部下发 - */ public void setAuditType(Short auditType) { this.auditType = auditType; } - /** - * 备注简述 - */ public String getAuditMessage() { return auditMessage; } - /** - * 备注简述 - */ public void setAuditMessage(String auditMessage) { this.auditMessage = auditMessage; } - /** - * 应用事记内容 - */ public String getAuditJson() { return auditJson; } - /** - * 应用事记内容 - */ public void setAuditJson(String auditJson) { this.auditJson = auditJson; } - /** - * 提交人id - */ public String getAuditUserId() { return auditUserId; } - /** - * 提交人id - */ public void setAuditUserId(String auditUserId) { this.auditUserId = auditUserId; } - /** - * 提交人姓名 - */ public String getAuditUserName() { return auditUserName; } - /** - * 提交人姓名 - */ public void setAuditUserName(String auditUserName) { this.auditUserName = auditUserName; } - /** - * 创建时间 - */ public Date getAuditCtime() { return auditCtime; } - /** - * 创建时间 - */ public void setAuditCtime(Date auditCtime) { this.auditCtime = auditCtime; } - /** - * 应用版本(当前版本) - */ public String getApplyVersion() { return applyVersion; } - /** - * 应用版本(当前版本) - */ public void setApplyVersion(String applyVersion) { this.applyVersion = applyVersion; } - /** - * 上一版本 - */ public String getPerTenantVersion() { return perTenantVersion; } - /** - * 上一版本 - */ public void setPerTenantVersion(String perTenantVersion) { this.perTenantVersion = perTenantVersion; } - @Override - public boolean equals(Object that) { - if (this == that) { - return true; - } - if (that == null) { - return false; - } - if (getClass() != that.getClass()) { - return false; - } - OcpTenantAudit other = (OcpTenantAudit) that; - return (this.getObjId() == null ? other.getObjId() == null : this.getObjId().equals(other.getObjId())) - && (this.getTenantCode() == null ? other.getTenantCode() == null : this.getTenantCode().equals(other.getTenantCode())) - && (this.getOperStatus() == null ? other.getOperStatus() == null : this.getOperStatus().equals(other.getOperStatus())) - && (this.getAuditType() == null ? other.getAuditType() == null : this.getAuditType().equals(other.getAuditType())) - && (this.getAuditMessage() == null ? other.getAuditMessage() == null : this.getAuditMessage().equals(other.getAuditMessage())) - && (this.getAuditJson() == null ? other.getAuditJson() == null : this.getAuditJson().equals(other.getAuditJson())) - && (this.getAuditUserId() == null ? other.getAuditUserId() == null : this.getAuditUserId().equals(other.getAuditUserId())) - && (this.getAuditUserName() == null ? other.getAuditUserName() == null : this.getAuditUserName().equals(other.getAuditUserName())) - && (this.getAuditCtime() == null ? other.getAuditCtime() == null : this.getAuditCtime().equals(other.getAuditCtime())) - && (this.getApplyVersion() == null ? other.getApplyVersion() == null : this.getApplyVersion().equals(other.getApplyVersion())) - && (this.getPerTenantVersion() == null ? other.getPerTenantVersion() == null : this.getPerTenantVersion().equals(other.getPerTenantVersion())); - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((getObjId() == null) ? 0 : getObjId().hashCode()); - result = prime * result + ((getTenantCode() == null) ? 0 : getTenantCode().hashCode()); - result = prime * result + ((getOperStatus() == null) ? 0 : getOperStatus().hashCode()); - result = prime * result + ((getAuditType() == null) ? 0 : getAuditType().hashCode()); - result = prime * result + ((getAuditMessage() == null) ? 0 : getAuditMessage().hashCode()); - result = prime * result + ((getAuditJson() == null) ? 0 : getAuditJson().hashCode()); - result = prime * result + ((getAuditUserId() == null) ? 0 : getAuditUserId().hashCode()); - result = prime * result + ((getAuditUserName() == null) ? 0 : getAuditUserName().hashCode()); - result = prime * result + ((getAuditCtime() == null) ? 0 : getAuditCtime().hashCode()); - result = prime * result + ((getApplyVersion() == null) ? 0 : getApplyVersion().hashCode()); - result = prime * result + ((getPerTenantVersion() == null) ? 0 : getPerTenantVersion().hashCode()); - return result; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(getClass().getSimpleName()); - sb.append(" ["); - sb.append("Hash = ").append(hashCode()); - sb.append(", objId=").append(objId); - sb.append(", tenantCode=").append(tenantCode); - sb.append(", operStatus=").append(operStatus); - sb.append(", auditType=").append(auditType); - sb.append(", auditMessage=").append(auditMessage); - sb.append(", auditJson=").append(auditJson); - sb.append(", auditUserId=").append(auditUserId); - sb.append(", auditUserName=").append(auditUserName); - sb.append(", auditCtime=").append(auditCtime); - sb.append(", applyVersion=").append(applyVersion); - sb.append(", perTenantVersion=").append(perTenantVersion); - sb.append(", serialVersionUID=").append(serialVersionUID); - sb.append("]"); - return sb.toString(); + public static long getSerialVersionUID() { + return serialVersionUID; + } + + public String getApiCode() { + return apiCode; } + + public void setApiCode(String apiCode) { + this.apiCode = apiCode; + } + + public String getApiDepCompanyCode() { + return apiDepCompanyCode; + } + + public void setApiDepCompanyCode(String apiDepCompanyCode) { + this.apiDepCompanyCode = apiDepCompanyCode; + } + + public String getTenantDepCompanyCode() { + return tenantDepCompanyCode; + } + + public void setTenantDepCompanyCode(String tenantDepCompanyCode) { + this.tenantDepCompanyCode = tenantDepCompanyCode; + } + + public Timestamp getApiTenantRelCtime() { + return apiTenantRelCtime; + } + + public void setApiTenantRelCtime(Timestamp apiTenantRelCtime) { + this.apiTenantRelCtime = apiTenantRelCtime; + } + + public Timestamp getApiTenantRelMtime() { + return apiTenantRelMtime; + } + + public void setApiTenantRelMtime(Timestamp apiTenantRelMtime) { + this.apiTenantRelMtime = apiTenantRelMtime; + } + + public String getApiTenantRelUserId() { + return apiTenantRelUserId; + } + + public void setApiTenantRelUserId(String apiTenantRelUserId) { + this.apiTenantRelUserId = apiTenantRelUserId; + } + + public String getApiTenantRelUserName() { + return apiTenantRelUserName; + } + + public void setApiTenantRelUserName(String apiTenantRelUserName) { + this.apiTenantRelUserName = apiTenantRelUserName; + } + + public long getIsDelete() { + return isDelete; + } + + public void setIsDelete(long isDelete) { + this.isDelete = isDelete; + } + + public String getApiName() { + return apiName; + } + + public void setApiName(String apiName) { + this.apiName = apiName; + } + + public String getApiGroupCode() { + return apiGroupCode; + } + + public void setApiGroupCode(String apiGroupCode) { + this.apiGroupCode = apiGroupCode; + } + + public long getApiPromotion() { + return apiPromotion; + } + + public void setApiPromotion(long apiPromotion) { + this.apiPromotion = apiPromotion; + } + + public String getApiReq() { + return apiReq; + } + + public void setApiReq(String apiReq) { + this.apiReq = apiReq; + } + + public String getApiResp() { + return apiResp; + } + + public void setApiResp(String apiResp) { + this.apiResp = apiResp; + } + + public String getApiUrl() { + return apiUrl; + } + + public void setApiUrl(String apiUrl) { + this.apiUrl = apiUrl; + } + + public Timestamp getApiCtime() { + return apiCtime; + } + + public void setApiCtime(Timestamp apiCtime) { + this.apiCtime = apiCtime; + } + + public Timestamp getApiMtime() { + return apiMtime; + } + + public void setApiMtime(Timestamp apiMtime) { + this.apiMtime = apiMtime; + } + + public String getApiUserId() { + return apiUserId; + } + + public void setApiUserId(String apiUserId) { + this.apiUserId = apiUserId; + } + + public String getApiUnit() { + return apiUnit; + } + + public void setApiUnit(String apiUnit) { + this.apiUnit = apiUnit; + } + + public String getOwnerCompanyCode() { + return ownerCompanyCode; + } + + public void setOwnerCompanyCode(String ownerCompanyCode) { + this.ownerCompanyCode = ownerCompanyCode; + } + + public String getOwnerCompanyName() { + return ownerCompanyName; + } + + public void setOwnerCompanyName(String ownerCompanyName) { + this.ownerCompanyName = ownerCompanyName; + } + + public long getApiZone() { + return apiZone; + } + + public void setApiZone(long apiZone) { + this.apiZone = apiZone; + } + + public long getApiLayer() { + return apiLayer; + } + + public void setApiLayer(long apiLayer) { + this.apiLayer = apiLayer; + } + + public long getApiVersion() { + return apiVersion; + } + + public void setApiVersion(long apiVersion) { + this.apiVersion = apiVersion; + } + +// @Override +// public boolean equals(Object that) { +// if (this == that) { +// return true; +// } +// if (that == null) { +// return false; +// } +// if (getClass() != that.getClass()) { +// return false; +// } +// OcpTenantAudit other = (OcpTenantAudit) that; +// return (this.getObjId() == null ? other.getObjId() == null : this.getObjId().equals(other.getObjId())) +// && (this.getTenantCode() == null ? other.getTenantCode() == null : this.getTenantCode().equals(other.getTenantCode())) +// && (this.getOperStatus() == null ? other.getOperStatus() == null : this.getOperStatus().equals(other.getOperStatus())) +// && (this.getAuditType() == null ? other.getAuditType() == null : this.getAuditType().equals(other.getAuditType())) +// && (this.getAuditMessage() == null ? other.getAuditMessage() == null : this.getAuditMessage().equals(other.getAuditMessage())) +// && (this.getAuditJson() == null ? other.getAuditJson() == null : this.getAuditJson().equals(other.getAuditJson())) +// && (this.getAuditUserId() == null ? other.getAuditUserId() == null : this.getAuditUserId().equals(other.getAuditUserId())) +// && (this.getAuditUserName() == null ? other.getAuditUserName() == null : this.getAuditUserName().equals(other.getAuditUserName())) +// && (this.getAuditCtime() == null ? other.getAuditCtime() == null : this.getAuditCtime().equals(other.getAuditCtime())) +// && (this.getApplyVersion() == null ? other.getApplyVersion() == null : this.getApplyVersion().equals(other.getApplyVersion())) +// && (this.getPerTenantVersion() == null ? other.getPerTenantVersion() == null : this.getPerTenantVersion().equals(other.getPerTenantVersion())); +// } +// +// @Override +// public int hashCode() { +// final int prime = 31; +// int result = 1; +// result = prime * result + ((getObjId() == null) ? 0 : getObjId().hashCode()); +// result = prime * result + ((getTenantCode() == null) ? 0 : getTenantCode().hashCode()); +// result = prime * result + ((getOperStatus() == null) ? 0 : getOperStatus().hashCode()); +// result = prime * result + ((getAuditType() == null) ? 0 : getAuditType().hashCode()); +// result = prime * result + ((getAuditMessage() == null) ? 0 : getAuditMessage().hashCode()); +// result = prime * result + ((getAuditJson() == null) ? 0 : getAuditJson().hashCode()); +// result = prime * result + ((getAuditUserId() == null) ? 0 : getAuditUserId().hashCode()); +// result = prime * result + ((getAuditUserName() == null) ? 0 : getAuditUserName().hashCode()); +// result = prime * result + ((getAuditCtime() == null) ? 0 : getAuditCtime().hashCode()); +// result = prime * result + ((getApplyVersion() == null) ? 0 : getApplyVersion().hashCode()); +// result = prime * result + ((getPerTenantVersion() == null) ? 0 : getPerTenantVersion().hashCode()); +// return result; +// } +// +// @Override +// public String toString() { +// StringBuilder sb = new StringBuilder(); +// sb.append(getClass().getSimpleName()); +// sb.append(" ["); +// sb.append("Hash = ").append(hashCode()); +// sb.append(", objId=").append(objId); +// sb.append(", tenantCode=").append(tenantCode); +// sb.append(", operStatus=").append(operStatus); +// sb.append(", auditType=").append(auditType); +// sb.append(", auditMessage=").append(auditMessage); +// sb.append(", auditJson=").append(auditJson); +// sb.append(", auditUserId=").append(auditUserId); +// sb.append(", auditUserName=").append(auditUserName); +// sb.append(", auditCtime=").append(auditCtime); +// sb.append(", applyVersion=").append(applyVersion); +// sb.append(", perTenantVersion=").append(perTenantVersion); +// sb.append(", serialVersionUID=").append(serialVersionUID); +// sb.append("]"); +// return sb.toString(); +// } } \ No newline at end of file diff --git a/src/main/java/com/pms/ocp/model/entity/OcpTenantBase.java b/src/main/java/com/pms/ocp/model/entity/OcpTenantBase.java index 747ab9f3460cdd667c3d673fa369bf7080b2d54b..0f2c871d1266b8e86866d58978e433f42a67fc54 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpTenantBase.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpTenantBase.java @@ -105,7 +105,11 @@ public class OcpTenantBase implements Serializable { */ @ApiModelProperty("应用状态0:设计态；1:运行态") private Short tenantState; - + /** + * 推广类型0:统建；1:自建 + */ + @ApiModelProperty("推广类型0:统建；1:自建") + private long tenantPromotion; /** * 建设单位 */ diff --git a/src/main/java/com/pms/ocp/model/entity/OcpTenantExtent.java b/src/main/java/com/pms/ocp/model/entity/OcpTenantExtent.java index cff2fca5bf7fa9536e5338d0bee6c336114c887f..6b8499c37131c16300ceeec12a69fff17fb538c7 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpTenantExtent.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpTenantExtent.java @@ -78,7 +78,7 @@ public class OcpTenantExtent implements Serializable { /** * 应用状态 0:已发布 1:未发布 */ - @ApiModelProperty("应用状态 0:已发布 1:未发布") + @ApiModelProperty("应用状态 0:已发布 1:未发布 2:已下线") private Short tenantState; /** 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 67257e9e03f602f49f34ce028a5e0dca54ed8394..5b06141bc08746dd5c0f96508665ea9ab7aa8867 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpTenantGroup.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpTenantGroup.java @@ -10,6 +10,7 @@ import lombok.Data; import lombok.experimental.Accessors; import java.io.Serializable; +import java.sql.Timestamp; import java.util.Date; import java.util.List; @@ -87,13 +88,13 @@ public class OcpTenantGroup implements Serializable { * 创建时间 */ @ApiModelProperty("创建时间") - private Date tenantGroupCtime; + private Timestamp tenantGroupCtime; /** * 修改时间 */ @ApiModelProperty("修改时间") - private Date tenantGroupMtime; + private Timestamp tenantGroupMtime; /** * 是否删除 @@ -265,7 +266,7 @@ public class OcpTenantGroup implements Serializable { /** * 创建时间 */ - public void setTenantGroupCtime(Date tenantGroupCtime) { + public void setTenantGroupCtime(Timestamp tenantGroupCtime) { this.tenantGroupCtime = tenantGroupCtime; } @@ -279,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/entity/OcpTenantSubs.java b/src/main/java/com/pms/ocp/model/entity/OcpTenantSubs.java index 7a3b263e9ddac8ad2da3ee3b2ad35c2bedfcec0a..b0451de8b225c28258fc324b1af581e75378e2c2 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpTenantSubs.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpTenantSubs.java @@ -70,6 +70,120 @@ public class OcpTenantSubs implements Serializable { @ApiModelProperty("是否删除0-否，1-是") private Short isDelete; + + /** + * 应用名称 + */ + @ApiModelProperty("应用名称") + private String tenantName; + + + /** + * 应用分类代码 + */ + @ApiModelProperty("应用分类代码") + private String tenantGroupCode; + + /** + * 应用ip + */ + @ApiModelProperty("应用ip") + private String tenantIp; + + /** + * 应用url + */ + @ApiModelProperty("应用url") + private String tenantUrl; + + /** + * 所属专业 + */ + @ApiModelProperty("所属专业") + private String professionalKind; + + /** + * 创建者用户ID + */ + @ApiModelProperty("创建者用户ID") + private String tenantUserId; + + /** + * 排序 + */ + @ApiModelProperty("排序") + private Integer tenantOrderNo; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private Timestamp tenantCtime; + + /** + * 最后更新时间 + */ + @ApiModelProperty("最后更新时间") + private Timestamp tenantMtime; + + /** + * 部署名称 + */ + @ApiModelProperty("部署名称") + private String deploymentName; + + /** + * 描述 + */ + @ApiModelProperty("描述") + private String tenantDescription; + + /** + * 应用状态0:设计态；1:运行态 + */ + @ApiModelProperty("应用状态0:设计态；1:运行态") + private Short tenantState; + /** + * 推广类型0:统建；1:自建 + */ + @ApiModelProperty("推广类型0:统建；1:自建") + private long tenantPromotion; + /** + * 建设单位 + */ + @ApiModelProperty("建设单位") + private String tenantUnit; + + /** + * 所属公司编码 + */ + @ApiModelProperty("所属公司编码") + private String ownerCompanyCode; + + /** + * 所属公司名称 + */ + @ApiModelProperty("所属公司名称") + private String ownerCompanyName; + + /** + * 所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区 + */ + @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区") + private Short tenantZone; + + /** + * 所属层级 1:应用层;2:平台层;3:网络层;4:感知层; + */ + @ApiModelProperty("所属层级 1:应用层;2:平台层;3:网络层;4:感知层;") + private Short tenantLayer; + + /** + * 应用版本（当前版本） + */ + @ApiModelProperty("应用版本（当前版本）") + private String tenantVersion; + private static final long serialVersionUID = 1L; /** @@ -170,19 +284,7 @@ public class OcpTenantSubs implements Serializable { this.subsLogTenantAtime = subsLogTenantAtime; } - /** - * 是否删除0-否，1-是 - */ - public Short getIsDelete() { - return isDelete; - } - /** - * 是否删除0-否，1-是 - */ - public void setIsDelete(Short isDelete) { - this.isDelete = isDelete; - } @Override public boolean equals(Object that) { 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/ModelVO.java b/src/main/java/com/pms/ocp/model/vo/ModelVO.java index 455dc6bc82c232d598e229a794c82737f9405174..f9c7d34e63ba8683ef6cfdcdbcd4f1b463faa428 100644 --- a/src/main/java/com/pms/ocp/model/vo/ModelVO.java +++ b/src/main/java/com/pms/ocp/model/vo/ModelVO.java @@ -1,9 +1,15 @@ package com.pms.ocp.model.vo; +import cn.afterturn.easypoi.excel.annotation.Excel; +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; -import lombok.AllArgsConstructor; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; /** * @Auther: wangjian @@ -14,6 +20,155 @@ import lombok.NoArgsConstructor; @Data @NoArgsConstructor //@AllArgsConstructor -@ApiModel(value = "中台服务运营看板_网省切换数据_服务表", description = "中台服务运营看板_网省切换数据_服务表") +@ApiModel(value = "中台运营管控_模型表", description = "中台运营管控_模型表") public class ModelVO { + + /** + * 模型编号 + * 主键 + */ + @Excel(name = "模型编号") + @ApiModelProperty(value = "模型编号") + private String objId; + + /** + * 模型名称 + */ + @Excel(name = "模型名称") + @ApiModelProperty(value = "模型名称") + private String modelName; + + /** + * 模型编码 + */ + @Excel(name = "模型编码") + @ApiModelProperty(value = "模型编码") + private String modelCode; + + /** + * 设备类型 + */ + @Excel(name = "设备类型") + @ApiModelProperty(value = "设备类型") + private String equipType; + + /** + * 所属专业 ts:输电,t:变电, dc:直流，ds:配电，tc:技术，pl:计划 im:综合 + */ + @Excel(name = "所属专业", replace = {"输电_ts", "变电_t", "直流_ds", "配电_ds", "技术_tc", "计划_pl", "综合_im"}) + @ApiModelProperty(value = "所属专业 ts:输电,t:变电, dc:直流，ds:配电，tc:技术，pl:计划 im:综合") + private String professional_kind; + + /** + * 模型分类编码 + */ + @Excel(name = "模型分类编码") + @ApiModelProperty(value = "模型分类编码") + private String model_group_code; + + /** + * 模型表名称 + */ + @Excel(name = "模型表名称") + @ApiModelProperty(value = "模型表名称") + private String model_table; + + /** + * 是否启用 0:未启用,1：启用 + */ + @Excel(name = "是否启用", replace = {"未启用_0", "启用_1"}) + @ApiModelProperty(value = "是否启用") + private Integer boolUse; + + + /** + * 推广类型 0:统推,1：自建 + */ + @Excel(name = "推广类型", replace = {"统推_0", "自建_1"}) + @ApiModelProperty(value = "推广类型") + private Integer modelPromotion; + + /** + * 公司编码 + */ + @Excel(name = "公司编码") + @ApiModelProperty(value = "公司编码") + private String ownerCompanyCode; + + /** + * 排列顺序 + */ + @Excel(name = "排列顺序") + @ApiModelProperty(value = "排列顺序") + private Integer modelOrderNo; + + /** + * 提交人编号 + */ + @Excel(name = "提交人编号") + @ApiModelProperty(value = "提交人编号") + private String modelUserId; + + + /** + * 提交人姓名 + */ + @Excel(name = "提交人姓名") + @ApiModelProperty(value = "提交人姓名") + private String modelUserName; + + /** + * 模型创建时间 + */ + @Excel(name = "创建时间") + @ApiModelProperty(value = "创建时间") + @TableField(value = "model_ctime") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private LocalDateTime modelCtime; + + /** + * 模型修改时间 + */ + @Excel(name = "修改时间") + @ApiModelProperty(value = "修改时间") + @TableField(value = "model_mtime") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private LocalDateTime modelMtime; + + /** + * 是否删除 0:未删除 1:已删除 + */ + @Excel(name = "是否删除", replace = {"未删除_1", "已删除_2"}) + @ApiModelProperty(value = "是否删除") + private Integer boolDelete; + + /** + * 所属区域 1:生成控制大区 2:信息关联大区 3:互联网大区 + */ + @Excel(name = "所属区域", replace = {"生成控制大区_1", "信息关联大区_2", "互联网大区_3"}) + @ApiModelProperty(value = "所属区域") + private Integer modelZone; + + /** + * 所属层级 1:应用层 2:平台层 3:网络层 4:感知层 + */ + @Excel(name = "方机构类型", replace = {"应用层_1", "平台层_2", "网络层_3", "感知层_4"}) + @ApiModelProperty(value = "所属层级 1:应用层 2:平台层3:网络层 4:感知层") + private Integer modelLayer; + + /** + * 模型版本（最新版本） + */ + @Excel(name = "模型版本") + @ApiModelProperty(value = "模型版本") + private String modelVersion; + + /** + * 建设厂商 + */ + @Excel(name = "建设厂商") + @ApiModelProperty(value = "建设厂商") + private String apiUnit; } 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 1cfaaa2e03c42f64c61a6f13f45329da659d937b..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; /** diff --git a/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java b/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java index 0932bd1b50423e68455a50d9ea6fdab9a686b700..39bd0e04584fe5a569486a26616b3500ab56bdad 100644 --- a/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java +++ b/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java @@ -9,6 +9,7 @@ import com.pms.ocp.model.entity.OcpApiBase; import com.pms.ocp.model.entity.OcpApiExtent; import com.pms.ocp.model.entity.OcpApiGroup; import com.pms.ocp.model.vo.OcpApiBaseVo; +import com.pms.ocp.model.vo.ResponseVO; import java.sql.Timestamp; import java.util.List; @@ -55,7 +56,7 @@ public interface ApiBasicManagementService extends IService { * 服务发布 * @param apiCodes */ - void apiIssue(String apiCodes); + ResponseVO apiIssue(String apiCodes); /** * 获取顶级服务树 diff --git a/src/main/java/com/pms/ocp/service/ModelClassifyService.java b/src/main/java/com/pms/ocp/service/ModelClassifyService.java index e895d0b79fceddcad2fae988fdf98c172490b9ee..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; @@ -14,9 +14,9 @@ import java.util.List; public interface ModelClassifyService { ResponseVO> getModelNavigation(); - ResponseVO insert(List list); + ResponseVO insert(List list); 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..5bc4f985a5ef3be8d77da6e4e0daf6b2ae8f80ad 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 deleteBatchModelIssue(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/ModelNoteService.java b/src/main/java/com/pms/ocp/service/ModelNoteService.java index a83e0ad92567db37ef95b45cb5cda88b906133cd..fe8489d72091d43b55cb57377c3a05fd1671594b 100644 --- a/src/main/java/com/pms/ocp/service/ModelNoteService.java +++ b/src/main/java/com/pms/ocp/service/ModelNoteService.java @@ -51,4 +51,12 @@ public interface ModelNoteService { * @return */ ModelNote getModelNote(String modelId); + +// /** +// * 获取模型事记 +// * +// * @param +// * @return +// */ +// Boolean exportModelNote(String modelCode); } diff --git a/src/main/java/com/pms/ocp/service/ModelPropertyService.java b/src/main/java/com/pms/ocp/service/ModelPropertyService.java index 5fede0949932fdb1f0a152d395f7caab0e242306..74bb63244f92646f51cfadea3a4ad77aaf19828c 100644 --- a/src/main/java/com/pms/ocp/service/ModelPropertyService.java +++ b/src/main/java/com/pms/ocp/service/ModelPropertyService.java @@ -35,7 +35,7 @@ public interface ModelPropertyService { * @param ids * @return */ - Integer deletePatchModelProperty(List ids); + Integer deleteBatchModelProperty(List ids); /** * 更新模型属性 @@ -46,15 +46,15 @@ public interface ModelPropertyService { Integer updateModelProperty(ModelPropertyDTO modelPropertyDTO); /** - * 获取模型属性 + * 获取模型属性列表 * * @param * @return */ - List listModelProperty(String modelCode, String propCode); + List listModelProperty(String objId, String modelCode, String propCode); /** - * 获取模型属性列表 + * 获取模型属性 * * @param * @return 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..c69adcf76dc1b00c3e72525c2d849e67f36ed9a8 --- /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 deleteBatchModelRelation(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..64c84b95c9a2924dbfa393136073c6d9775a8e53 100644 --- a/src/main/java/com/pms/ocp/service/ModelService.java +++ b/src/main/java/com/pms/ocp/service/ModelService.java @@ -1,10 +1,10 @@ package com.pms.ocp.service; -import com.pms.ocp.common.constants.CodeEnum; +import com.pms.ocp.model.dto.ModelDTO; import com.pms.ocp.model.entity.Model; -import com.pms.ocp.model.entity.ModelType; -import com.pms.ocp.model.vo.ResponseVO; +import org.springframework.web.multipart.MultipartFile; +import java.io.IOException; import java.util.List; /** @@ -17,26 +17,35 @@ public interface ModelService { /** * 创建模型 * - * @param model + * @param modelDTO * @return */ - ResponseVO createModel(Model model); + Integer createModel(ModelDTO modelDTO); /** * 删除模型 * - * @param modelId + * @param objId + * @param modelCode * @return */ - ResponseVO deleteModel(String modelId); + Integer deleteModel(String objId, String modelCode); /** * 更新模型 * - * @param model + * @param modelDTO + * @return + */ + Integer updateModel(ModelDTO modelDTO); + + /** + * 导入模型 + * + * @param file * @return */ - ResponseVO updateModel(Model model); + Boolean importModel(MultipartFile file) throws IOException; /** * 获取模型 @@ -44,7 +53,7 @@ public interface ModelService { * @param * @return */ - ResponseVO getModelList(); + List getModelList(String objId, String modelCode); /** * 获取模型列表 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 8983669b032b556d805c86b0c18f90c5c8515b63..bd4b2ef27b621cb90fbe23dfbae2e6502c3581bf 100644 --- a/src/main/java/com/pms/ocp/service/OcpApiAuditService.java +++ b/src/main/java/com/pms/ocp/service/OcpApiAuditService.java @@ -1,5 +1,6 @@ package com.pms.ocp.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.pms.ocp.model.entity.OcpApiAudit; import com.pms.ocp.model.vo.ResponseVO; @@ -7,13 +8,11 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -public interface OcpApiAuditService { +public interface OcpApiAuditService extends IService { ResponseVO getOcpApiAuditList(OcpApiAudit ocpApiAudit); ResponseVO getOcpApiDetails(String objId); -// ResponseVO getOcpApiList(Oaa oaa); - ResponseVO OaaById(OcpApiAudit ocpApiAudit); ResponseVO sById(OcpApiAudit ocpApiAudit); diff --git a/src/main/java/com/pms/ocp/service/OcpApiModelRelService.java b/src/main/java/com/pms/ocp/service/OcpApiModelRelService.java index f79330a0de5e23a978b50aaf68ab86c08d78b482..67338a97f3d1ede872f9da7f9a70a77f03a22469 100644 --- a/src/main/java/com/pms/ocp/service/OcpApiModelRelService.java +++ b/src/main/java/com/pms/ocp/service/OcpApiModelRelService.java @@ -1,9 +1,10 @@ package com.pms.ocp.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.pms.ocp.model.entity.OcpApiModelRel; import com.pms.ocp.model.vo.ResponseVO; -public interface OcpApiModelRelService { +public interface OcpApiModelRelService extends IService { ResponseVO getOamrList(OcpApiModelRel ocpApiModelRel); } diff --git a/src/main/java/com/pms/ocp/service/OcpApiSubsService.java b/src/main/java/com/pms/ocp/service/OcpApiSubsService.java index 72d9e1efba95e68c5fe3eb87bcc51cfadf0e4d7c..a21229a481b04fbaacc827b163f45074a101fab9 100644 --- a/src/main/java/com/pms/ocp/service/OcpApiSubsService.java +++ b/src/main/java/com/pms/ocp/service/OcpApiSubsService.java @@ -4,6 +4,6 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.pms.ocp.model.entity.OcpApiSubs; import com.pms.ocp.model.vo.ResponseVO; -public interface OcpApiSubsService { +public interface OcpApiSubsService extends IService { ResponseVO getOcpApiSubsList(OcpApiSubs ocpApiSubs); } diff --git a/src/main/java/com/pms/ocp/service/OcpApiTenantRelService.java b/src/main/java/com/pms/ocp/service/OcpApiTenantRelService.java index 54e24cbfe36e00e7db834e0f7d711cc5b242c1ab..9bbeeab8ec7c8fcf73d3e4bde3d6817d990d8db1 100644 --- a/src/main/java/com/pms/ocp/service/OcpApiTenantRelService.java +++ b/src/main/java/com/pms/ocp/service/OcpApiTenantRelService.java @@ -1,9 +1,12 @@ package com.pms.ocp.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.pms.ocp.model.entity.OcpApiTenantRel; import com.pms.ocp.model.vo.ResponseVO; -public interface OcpApiTenantRelService { +public interface OcpApiTenantRelService extends IService { ResponseVO getOatrList(OcpApiTenantRel ocpApiTenantRel); + + ResponseVO getTenantApiList(OcpApiTenantRel ocpApiTenantRel); } 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 index 9b67b168d29d4856561db4a010351b2119c12c40..a058722730ea289222a0ffba50ba66c867e5a84d 100644 --- a/src/main/java/com/pms/ocp/service/OcpTenantAuditService.java +++ b/src/main/java/com/pms/ocp/service/OcpTenantAuditService.java @@ -1,8 +1,19 @@ package com.pms.ocp.service; +import com.baomidou.mybatisplus.extension.service.IService; +import com.pms.ocp.model.entity.OcpApiTenantRel; import com.pms.ocp.model.entity.OcpTenantAudit; import com.pms.ocp.model.vo.ResponseVO; -public interface OcpTenantAuditService { +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +public interface OcpTenantAuditService extends IService { ResponseVO getOtaList(OcpTenantAudit ocpTenantAudit); + + ResponseVO getOtaListById(OcpTenantAudit ocpTenantAudit); + + void exportExcel(OcpTenantAudit ocpTenantAudit, HttpServletRequest request, HttpServletResponse response); + + ResponseVO OtaById(OcpTenantAudit ocpTenantAudit); } diff --git a/src/main/java/com/pms/ocp/service/OcpTenantBaseService.java b/src/main/java/com/pms/ocp/service/OcpTenantBaseService.java index c82f777df1d6deda563058b9ad11acbefd707706..0cd5d24d378be3073701535f26664917988429e2 100644 --- a/src/main/java/com/pms/ocp/service/OcpTenantBaseService.java +++ b/src/main/java/com/pms/ocp/service/OcpTenantBaseService.java @@ -1,8 +1,9 @@ package com.pms.ocp.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.pms.ocp.model.entity.OcpTenantBase; import com.pms.ocp.model.vo.ResponseVO; -public interface OcpTenantBaseService { +public interface OcpTenantBaseService extends IService { ResponseVO getOtbList(OcpTenantBase ocpTenantBase); } diff --git a/src/main/java/com/pms/ocp/service/OcpTenantExtentService.java b/src/main/java/com/pms/ocp/service/OcpTenantExtentService.java new file mode 100644 index 0000000000000000000000000000000000000000..a7839ea07337c1ab2a277653c6ae5261f6f6cd92 --- /dev/null +++ b/src/main/java/com/pms/ocp/service/OcpTenantExtentService.java @@ -0,0 +1,7 @@ +package com.pms.ocp.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.pms.ocp.model.entity.OcpTenantExtent; + +public interface OcpTenantExtentService extends IService { +} diff --git a/src/main/java/com/pms/ocp/service/OcpTenantSubsService.java b/src/main/java/com/pms/ocp/service/OcpTenantSubsService.java new file mode 100644 index 0000000000000000000000000000000000000000..a8d30b51362334a6da59da26290505cd33e011a1 --- /dev/null +++ b/src/main/java/com/pms/ocp/service/OcpTenantSubsService.java @@ -0,0 +1,9 @@ +package com.pms.ocp.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.pms.ocp.model.entity.OcpTenantSubs; +import com.pms.ocp.model.vo.ResponseVO; + +public interface OcpTenantSubsService extends IService { + ResponseVO getOcpTenantList(OcpTenantSubs ocpTenantSubs); +} diff --git a/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java b/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java index 4572903222a3ae7f12aefec17907de3a3212de04..e145f52a77313fdc3af8084efdb0ca601ab95f33 100644 --- a/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java +++ b/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java @@ -3,19 +3,41 @@ package com.pms.ocp.service; import com.baomidou.mybatisplus.extension.service.IService; import com.pms.ocp.model.dto.OcpTenantBaseDto; import com.pms.ocp.model.entity.OcpTenantBase; +import com.pms.ocp.model.vo.ResponseVO; import java.sql.Timestamp; +import java.util.List; public interface TenantBasicManagementService extends IService { /** - * 应用条件查询 + * 条件查询 + * @param tenantCode * @param keyword - * @param tenantUnits + * @param tenantUnit * @param startTime * @param endTime * @param pageSize * @param pageNum * @return */ - OcpTenantBaseDto queryOcpTenantBaseDto(String keyword, String tenantUnits, Timestamp startTime, Timestamp endTime, int pageSize, int pageNum); + List queryOcpTenantBaseDto(String tenantCode, String keyword, String tenantUnit, Timestamp startTime, Timestamp endTime, int pageSize, int pageNum); + + /** + * 应用发布 改变其应用状态 + * @param tenantCodes 应用代码 + * @return + */ + ResponseVO tenantIssue(String tenantCodes); + + /** + * 应用订阅 + * @param tenantCodes + */ + void tenantLogin(String tenantCodes); + + /** + * 应用下线 + * @param tenantCodes + */ + ResponseVO tenantCancel(String tenantCodes); } diff --git a/src/main/java/com/pms/ocp/service/TenantService.java b/src/main/java/com/pms/ocp/service/TenantService.java index 73a52d2b3a7450b88676df281870c2c6ba9e2e37..de1ac0edd0020f45e295f0a1db6b87edcd146df2 100644 --- a/src/main/java/com/pms/ocp/service/TenantService.java +++ b/src/main/java/com/pms/ocp/service/TenantService.java @@ -1,9 +1,15 @@ 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.PageOcpTenantDto; +import com.pms.ocp.model.dto.TenanBaseDto; +import com.pms.ocp.model.entity.OcpApiGroup; import com.pms.ocp.model.entity.OcpTenantGroup; +import com.pms.ocp.model.vo.ResponseVO; import java.util.List; @@ -20,10 +26,37 @@ public interface TenantService extends IService { /** * 应用新增 + * @param + * @return + */ + boolean getTenanInster(TenanBaseDto TenanBaseDto); + + /** + * 修改应用 + * @param ocpTenantGroup + * @return + */ + boolean getTenantUpdata(OcpTenantGroup ocpTenantGroup); + + /** + * 删除服务 * @param ocpTenantGroup * @return */ - boolean getTenanInster(OcpTenantGroup ocpTenantGroup); + boolean gettenantDelete(OcpTenantGroup ocpTenantGroup); + + /** + * 应用分类--应用管理 + * @param ocpTenantDto + * @return + */ + List getsUse(PageOcpTenantDto ocpTenantDto); + /** + * 应用分类--应用服务分页查 + * @param pageOcpTenantDto + * @return + */ + Page getOnePages(PageOcpTenantDto pageOcpTenantDto); } diff --git a/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java index 5c665afffde3628f91462419120f8edec883190e..70ba003d0292211e636480b98edc2379a774b80c 100644 --- a/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java @@ -1,27 +1,22 @@ package com.pms.ocp.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pms.ocp.common.exception.BeagleException; import com.pms.ocp.mapper.ApiBasicManagementMapper; import com.pms.ocp.mapper.OcpApiExtentMapper; -import com.pms.ocp.mapper.OcpApiGroupMapper; -import com.pms.ocp.model.CommonCode; -import com.pms.ocp.model.QueryResponseResult; import com.pms.ocp.model.dto.ApiBaseDto; +import com.pms.ocp.model.dto.OcpApiBaseDto; import com.pms.ocp.model.entity.OcpApiBase; import com.pms.ocp.model.entity.OcpApiExtent; -import com.pms.ocp.model.entity.OcpApiGroup; import com.pms.ocp.model.entity.OcpApiSubs; import com.pms.ocp.model.vo.OcpApiBaseVo; +import com.pms.ocp.model.vo.ResponseVO; import com.pms.ocp.service.ApiBasicManagementService; import com.pms.ocp.service.OcpApiExtentService; import com.pms.ocp.service.OcpApiSubsService; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -40,7 +35,7 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl queryOcpApiBaseDto(String apiCode, String keyword, String apiUnit, Timestamp startTime, Timestamp endTime, int pageSize, int pageNum) { - pageSize = (pageSize - 1) * pageNum; - return apiBasicManagementMapper.queryOcpApiBaseDto(keyword, apiUnit, startTime, endTime, apiCode, pageSize, pageNum); - } - /** * 条件查询 * * @param apiCode * @param keyword - * @param apiUnits + * @param apiUnit * @param startTime * @param endTime * @return */ + @Override + public List queryOcpApiBaseDto(String apiCode, String keyword, String apiUnit, Timestamp startTime, Timestamp endTime, int pageSize, int pageNum) { + pageSize = (pageSize - 1) * pageNum; + return apiBasicManagementMapper.queryOcpApiBaseDto(keyword, apiUnit, startTime, endTime, apiCode, pageSize, pageNum); + } + + // public OcpApiBaseDto queryOcpApiBaseDto(String apiCode, String keyword, String apiUnits, Timestamp startTime, Timestamp endTime, int pageSize, int pageNum) { // //String[] split = apiUnits.split(","); //// List list = Arrays.asList(split); @@ -153,7 +148,7 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl list = Arrays.asList(split); LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); @@ -161,13 +156,13 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl ocpApiExtents = ocpApiExtentMapper.selectList(lambdaQueryWrapper); for (OcpApiExtent ocpApiExtent : ocpApiExtents) { if (ocpApiExtent.getApiState().equals("1")) { - throw new BeagleException("已发布"); + return ResponseVO.error("已发布"); } else { ocpApiExtent.setApiState("1"); ocpApiExtentMapper.updateById(ocpApiExtent); } } - + return ResponseVO.ok(); } @Override 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 f8f7dda6c689dd6c844cbbab8d8351e907d899aa..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; @@ -88,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); @@ -105,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); @@ -154,11 +154,14 @@ 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); @@ -176,14 +179,21 @@ public class ModelClassifyServiceImpl implements ModelClassifyService { * @param treeNodes 需要遍历list **/ private void addLevel(OcpModelGroupVO parent, List treeNodes) { - parent.setLevel(parent.getLevel()+1); + 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<>(); //根据是否传入搜索条件创建构造器进行查询 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..09593cf56f6d60158380e603b9291716f8ac823d 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 deleteBatchModelIssue(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/ModelNoteServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ModelNoteServiceImpl.java index bbb542de86f922c7914a679d2c9fb417d8489a32..b3c355cd06b0fc84a1f5f64fb54e0284206e84cb 100644 --- a/src/main/java/com/pms/ocp/service/impl/ModelNoteServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ModelNoteServiceImpl.java @@ -1,6 +1,7 @@ package com.pms.ocp.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.pms.ocp.common.utils.ExcelUtils; import com.pms.ocp.mapper.ModelNoteMapper; import com.pms.ocp.model.entity.ModelNote; import com.pms.ocp.service.ModelNoteService; @@ -48,4 +49,13 @@ public class ModelNoteServiceImpl implements ModelNoteService { public ModelNote getModelNote(String modelId) { return null; } + +// @Override +// public Boolean exportModelNote(String modelCode) { +// List modelNoteList = getModelNoteList(modelCode); +// +// ExcelUtils.exportExcel(modelNoteList, "导出事记", "导出事记", ModelNote.class, "测试user.xls", re +// +// return true; +// } } 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 0bcbfc46842716d81367ab4b30afaa2e91888d7e..62a9b7e6b48ffbfb306b03794266bb14263a46cf 100644 --- a/src/main/java/com/pms/ocp/service/impl/ModelPropertyServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ModelPropertyServiceImpl.java @@ -54,7 +54,7 @@ public class ModelPropertyServiceImpl implements ModelPropertyService { } @Override - public Integer deletePatchModelProperty(List ids) { + public Integer deleteBatchModelProperty(List ids) { return modelPropertyMapper.deleteBatchIds(ids); } @@ -75,10 +75,14 @@ public class ModelPropertyServiceImpl implements ModelPropertyService { } @Override - public List listModelProperty(String modelCode, String propCode) { + 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); } 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..5cf3b8625ea1ff218356db02190254944734cf42 --- /dev/null +++ b/src/main/java/com/pms/ocp/service/impl/ModelRelationServiceImpl.java @@ -0,0 +1,86 @@ +package com.pms.ocp.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.pms.ocp.mapper.ModelRelationMapper; +import com.pms.ocp.model.dto.ModelRelationDTO; +import com.pms.ocp.model.entity.ModelRelation; +import com.pms.ocp.model.vo.ModelRelationVO; +import com.pms.ocp.service.ModelRelationService; +import 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 deleteBatchModelRelation(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..6fc3c03536b1fb97621ab18508c7b04d9cc847de 100644 --- a/src/main/java/com/pms/ocp/service/impl/ModelServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ModelServiceImpl.java @@ -1,21 +1,28 @@ package com.pms.ocp.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pms.ocp.common.constants.CodeEnum; +import com.pms.ocp.common.utils.ExcelUtils; import com.pms.ocp.mapper.ModelMapper; +import com.pms.ocp.model.dto.ModelDTO; import com.pms.ocp.model.entity.Model; -import com.pms.ocp.model.entity.ModelType; +import com.pms.ocp.model.entity.ModelProperty; +import com.pms.ocp.model.vo.ModelVO; import com.pms.ocp.model.vo.ResponseVO; import com.pms.ocp.service.ModelService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; +import org.springframework.web.multipart.MultipartFile; -import java.util.Collections; +import java.io.IOException; +import java.time.LocalDateTime; +import java.util.ArrayList; import java.util.List; -import java.util.stream.Collectors; - -import static com.pms.ocp.common.constants.CodeEnum.NO_DATA; /** * @Auther: wangjian @@ -24,58 +31,99 @@ import static com.pms.ocp.common.constants.CodeEnum.NO_DATA; */ @Service -public class ModelServiceImpl implements ModelService { +public class ModelServiceImpl extends ServiceImpl implements ModelService { + @Autowired private ModelMapper modelMapper; /** * 创建模型 * - * @param model + * @param modelDTO * @return */ @Override - public ResponseVO createModel(Model model) { + public Integer createModel(ModelDTO modelDTO) { + + Model model = new Model(); + + BeanUtils.copyProperties(modelDTO, model); + + model.setModelCtime(LocalDateTime.now()); int result = modelMapper.insert(model); - if (result > 0) { - return ResponseVO.ok(CodeEnum.SUCCESS); - } else { - return ResponseVO.error(CodeEnum.INSERT_FAIL); - } + return result; } /** * 删除模型 * - * @param modelId + * @param objId * @return */ @Override - public ResponseVO deleteModel(String modelId) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("obj_id", modelId); - int result = modelMapper.delete(queryWrapper); - if (result > 0) { - return ResponseVO.ok(CodeEnum.SUCCESS); - } else { - return ResponseVO.error(CodeEnum.UNKNOWN); + public Integer deleteModel(String objId, String modelCode) { + QueryWrapper queryWrapper = new QueryWrapper(); + + if (StringUtils.isNotEmpty(objId)) { + queryWrapper.lambda().eq(Model::getObjId, objId); } + + if (StringUtils.isNotEmpty(modelCode)) { + queryWrapper.lambda().eq(Model::getModelCode, modelCode); + } + + return modelMapper.delete(queryWrapper); + } /** * 更新模型 * - * @param model + * @param modelDTO + * @return + */ + @Override + public Integer updateModel(ModelDTO modelDTO) { + Model model = new Model(); + + BeanUtils.copyProperties(modelDTO, model); + + model.setModelMtime(LocalDateTime.now()); + + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + + updateWrapper.lambda().eq(Model::getObjId, model.getObjId()); + + return modelMapper.update(model, updateWrapper); + } + + /** + * 导入模型 + * + * @param file * @return */ @Override - public ResponseVO updateModel(Model model) { - int result = modelMapper.updateById(model); - if (result > 0) { - return ResponseVO.ok(CodeEnum.SUCCESS); - } else { - return ResponseVO.error(CodeEnum.UP_DATA_FAIL); + public Boolean importModel(MultipartFile file) throws IOException { + + //校验Excel文件 + ExcelUtils.checkFile(file); + List modelVOList = ExcelUtils.importExcel(file, ModelVO.class); + List modelList = new ArrayList<>(modelVOList.size()); + + if (!modelVOList.isEmpty()) { + for (ModelVO modelVO : modelVOList) { + Model model = new Model(); + BeanUtils.copyProperties(modelVO, model); + model.setModelCtime(LocalDateTime.now()); + modelList.add(model); + } } + + //校验Excel数据 +// checkData(excelCps); + return modelMapper.insertBatchModel(modelList); + } /** @@ -85,24 +133,30 @@ public class ModelServiceImpl implements ModelService { * @return */ @Override - public ResponseVO getModelList() { - List modelList = modelMapper.selectList(null); - if (CollectionUtils.isEmpty(modelList)) { - return ResponseVO.ok("查询列表为空"); + public List getModelList(String objId, String modelCode) { + QueryWrapper queryWrapper = new QueryWrapper(); + + if (StringUtils.isNotEmpty(objId)) { + queryWrapper.lambda().eq(Model::getObjId, objId); + } + + if (StringUtils.isNotEmpty(modelCode)) { + queryWrapper.lambda().eq(Model::getModelCode, modelCode); } - return ResponseVO.ok(modelList); + + return modelMapper.selectList(queryWrapper); } /** * 获取模型 * - * @param modelId + * @param objId * @return */ @Override - public Model getModel(String modelId) { + public Model getModel(String objId) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("model_id", modelId); + queryWrapper.lambda().eq(Model::getObjId, objId); return modelMapper.selectOne(queryWrapper); } } 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 522a9286cd49a4f9787ae9b80012d319d56f8af3..654b83db166ca058a0b4ad928a772e8fee3f0f9f 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiAuditServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpApiAuditServiceImpl.java @@ -27,12 +27,8 @@ public class OcpApiAuditServiceImpl extends ServiceImpl 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); } @@ -50,7 +46,7 @@ public class OcpApiAuditServiceImpl extends ServiceImpl oaaById = ocpApiAuditMapper.sById(ocpApiAudit); + List oaaById = ocpApiAuditMapper.sById(ocpApiAudit); return ResponseVO.ok(oaaById); } 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 48afb597e931c76437f416c6198e0223d1b357ff..118a294d3bab2f977c134a8d14d2329c13ee4599 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiModelRelServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpApiModelRelServiceImpl.java @@ -16,7 +16,7 @@ public class OcpApiModelRelServiceImpl extends ServiceImpl 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 4796e1a9472ac037bf9598618cd4c96fe42a6be1..e6b4f4d8376f7afc3781cd2dbd54d12619e09900 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiSubsServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpApiSubsServiceImpl.java @@ -20,11 +20,7 @@ public class OcpApiSubsServiceImpl extends ServiceImpl 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 f79c75a5d6fef2987250a6afaecc69b7bd543e79..6bb40f300b2c33197501e0a46044e53c28218cc8 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiTenantRelServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpApiTenantRelServiceImpl.java @@ -19,7 +19,13 @@ public class OcpApiTenantRelServiceImpl extends ServiceImpl oatrList = ocpApiTenantRelMapper.getOatrList(ocpApiTenantRel); + List oatrList = ocpApiTenantRelMapper.getOatrList(ocpApiTenantRel); + return ResponseVO.ok(oatrList); + } + + @Override + public ResponseVO getTenantApiList(OcpApiTenantRel ocpApiTenantRel) { + List oatrList = ocpApiTenantRelMapper.getTenantApiList(ocpApiTenantRel); return ResponseVO.ok(oatrList); } } 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 f74bcf60cb537fadc7cbeb27009549b7b137bac8..cdb045d581621843fcc3156cc6863636344112df 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java @@ -161,7 +161,7 @@ public class OcpApiTreeServiceImpl extends ServiceImpl ocpApiGroups = mapper.selectList(null); @@ -173,24 +173,13 @@ 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; } @@ -268,7 +264,7 @@ public class OcpApiTreeServiceImpl extends ServiceImpl ocpApiGroups = mapper.selectList(null); for (OcpApiGroup ocpApiGroup : ocpApiGroups) { - if (pageGroupDto.getApiGroupCode() == ocpApiGroup.getApiGroupCode()){ + if (pageGroupDto.getApiGroupCode().equals(ocpApiGroup.getApiGroupCode())){ LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); queryWrapper.eq(OcpApiGroup::getApiGroupLevel, pageGroupDto.getApiGroupLevel()); mapper.selectPage(pageInfo,queryWrapper); 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 index 1fa49582a96474e87dafb3b68f89e835ae0d861e..f592bbed5dcafe2af6885cbf7376825a14147b35 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpTenantAuditServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpTenantAuditServiceImpl.java @@ -1,13 +1,22 @@ package com.pms.ocp.service.impl; +import cn.afterturn.easypoi.excel.ExcelExportUtil; +import cn.afterturn.easypoi.excel.entity.ExportParams; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.pms.ocp.common.constants.AnalysisConstant; +import com.pms.ocp.common.constants.ExportUtils; +import com.pms.ocp.mapper.OcpApiTenantRelMapper; import com.pms.ocp.mapper.OcpTenantAuditMapper; +import com.pms.ocp.model.entity.OcpApiTenantRel; import com.pms.ocp.model.entity.OcpTenantAudit; import com.pms.ocp.model.vo.ResponseVO; import com.pms.ocp.service.OcpTenantAuditService; +import org.apache.poi.ss.usermodel.Workbook; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.util.List; @Service @@ -15,9 +24,32 @@ public class OcpTenantAuditServiceImpl extends ServiceImpl otaList = ocpTenantAuditMapper.getOtaList(ocpTenantAudit); return ResponseVO.ok(otaList); } + + @Override + public ResponseVO getOtaListById(OcpTenantAudit ocpTenantAudit) { + List otaListById = ocpTenantAuditMapper.getOtaListById(ocpTenantAudit); + return ResponseVO.ok(otaListById); + } + + @Override + public void exportExcel(OcpTenantAudit ocpTenantAudit, HttpServletRequest request, HttpServletResponse response) { + List otaListById = ocpTenantAuditMapper.getOtaListById(ocpTenantAudit); + ExportParams param = new ExportParams(AnalysisConstant.exportOcpTenantApiName.OCP_TENANT_API,AnalysisConstant.exportOcpTenantApiName.OCP_TENANT_API); + Workbook workbook = ExcelExportUtil.exportExcel(param, OcpTenantAudit.class,otaListById); + ExportUtils.exportExcel(response, AnalysisConstant.exportOcpTenantApiName.OCP_TENANT_API,workbook); + } + + @Override + public ResponseVO OtaById(OcpTenantAudit ocpTenantAudit) { + List oatrList = ocpTenantAuditMapper.OtaById(ocpTenantAudit); + return ResponseVO.ok(oatrList); + } } diff --git a/src/main/java/com/pms/ocp/service/impl/OcpTenantExtentServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpTenantExtentServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..d9d0f0d4e1017eb9cdbe8638b47df232be40485d --- /dev/null +++ b/src/main/java/com/pms/ocp/service/impl/OcpTenantExtentServiceImpl.java @@ -0,0 +1,12 @@ +package com.pms.ocp.service.impl; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.pms.ocp.mapper.OcpTenantExtentMapper; +import com.pms.ocp.model.entity.OcpTenantExtent; +import com.pms.ocp.service.OcpTenantExtentService; +import org.springframework.stereotype.Service; + +@Service +public class OcpTenantExtentServiceImpl extends ServiceImpl implements OcpTenantExtentService { +} diff --git a/src/main/java/com/pms/ocp/service/impl/OcpTenantSubsServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpTenantSubsServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..6651e1bad603b8285c2bc48c333026e1784210e1 --- /dev/null +++ b/src/main/java/com/pms/ocp/service/impl/OcpTenantSubsServiceImpl.java @@ -0,0 +1,24 @@ +package com.pms.ocp.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.pms.ocp.mapper.OcpTenantSubsMapper; +import com.pms.ocp.model.entity.OcpTenantSubs; +import com.pms.ocp.model.vo.ResponseVO; +import com.pms.ocp.service.OcpTenantExtentService; +import com.pms.ocp.service.OcpTenantSubsService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class OcpTenantSubsServiceImpl extends ServiceImpl implements OcpTenantSubsService { + @Autowired + private OcpTenantSubsMapper ocpTenantSubsMapper; + + @Override + public ResponseVO getOcpTenantList(OcpTenantSubs ocpTenantSubs) { + List ocpTenantList = ocpTenantSubsMapper.getOcpTenantList(ocpTenantSubs); + return ResponseVO.ok(ocpTenantList); + } +} \ No newline at end of file diff --git a/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java index 3dfee5427140eea9ec233bea0e223accd6c37958..bc0f3c8e64b68afa69060222f1caf6d991cb72cd 100644 --- a/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java @@ -1,16 +1,25 @@ package com.pms.ocp.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.pms.ocp.mapper.OcpTenantExtentMapper; import com.pms.ocp.mapper.TenantBasicManagementMapper; import com.pms.ocp.model.dto.OcpApiBaseDto; import com.pms.ocp.model.dto.OcpTenantBaseDto; +import com.pms.ocp.model.entity.OcpApiExtent; import com.pms.ocp.model.entity.OcpTenantBase; +import com.pms.ocp.model.entity.OcpTenantExtent; +import com.pms.ocp.model.entity.OcpTenantSubs; +import com.pms.ocp.model.vo.ResponseVO; +import com.pms.ocp.service.OcpTenantExtentService; +import com.pms.ocp.service.OcpTenantSubsService; import com.pms.ocp.service.TenantBasicManagementService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.sql.Timestamp; +import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; @@ -18,10 +27,17 @@ import java.util.List; public class TenantBasicManagementServiceImpl extends ServiceImpl implements TenantBasicManagementService { @Autowired private TenantBasicManagementMapper tenantBasicManagementMapper; + @Autowired + private OcpTenantExtentMapper ocpTenantExtentMapper; + @Autowired + private OcpTenantSubsService ocpTenantSubsService; + /** - * 应用条件查询 + * 条件查询 + * + * @param tenantCode * @param keyword - * @param tenantUnits + * @param tenantUnit * @param startTime * @param endTime * @param pageSize @@ -29,11 +45,76 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl list = Arrays.asList(split); + public List queryOcpTenantBaseDto(String tenantCode, String keyword, String tenantUnit, Timestamp startTime, Timestamp endTime, int pageSize, int pageNum) { pageSize = (pageSize - 1) * pageNum; - OcpTenantBaseDto ocpTenantBaseDto = tenantBasicManagementMapper.queryOcpApiBaseDto(keyword, list, startTime, endTime, pageSize, pageNum); - return ocpTenantBaseDto; + return tenantBasicManagementMapper.queryOcpTenantBaseDto(keyword, tenantUnit, startTime, endTime, tenantCode, pageSize, pageNum); + } + + /** + * 应用发布 改变其应用状态 + * + * @param tenantCodes 应用代码 + * @return + */ + @Override + public ResponseVO tenantIssue(String tenantCodes) { + String[] split = tenantCodes.split(","); + List list = Arrays.asList(split); + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.in(OcpTenantExtent::getTenantCode, list); + List ocpTenantExtents = ocpTenantExtentMapper.selectList(lambdaQueryWrapper); + for (OcpTenantExtent ocpTenantExtent : ocpTenantExtents) { + if (ocpTenantExtent.getTenantState() == 1) { + return ResponseVO.error("已发布"); + } else { + ocpTenantExtent.setTenantState((short) 1); + ocpTenantExtentMapper.updateById(ocpTenantExtent); + } + } + return ResponseVO.ok(); } + + /** + * 应用订阅 + * + * @param tenantCodes + */ + @Override + public void tenantLogin(String tenantCodes) { + String[] split = tenantCodes.split(","); + List tenantCode = Arrays.asList(split); + for (String s : tenantCode) { + OcpTenantSubs ocpTenantSubs = new OcpTenantSubs(); + ocpTenantSubs.setTenantCode(s); + ocpTenantSubs.setSubsCompanyCode(null); + ocpTenantSubs.setSubsLogTenantAtime(Timestamp.valueOf(LocalDateTime.now())); + ocpTenantSubs.setSubsLogTenantCtime(Timestamp.valueOf(LocalDateTime.now())); + ocpTenantSubs.setSubsLogTenantMtime(Timestamp.valueOf(LocalDateTime.now())); + ocpTenantSubsService.save(ocpTenantSubs); + } + } + + /** + * 应用下线 + * + * @param tenantCodes + */ + @Override + public ResponseVO tenantCancel(String tenantCodes) { + String[] split = tenantCodes.split(","); + List list = Arrays.asList(split); + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.in(OcpTenantExtent::getTenantCode, list); + List ocpTenantExtents = ocpTenantExtentMapper.selectList(lambdaQueryWrapper); + for (OcpTenantExtent ocpTenantExtent : ocpTenantExtents) { + if (ocpTenantExtent.getTenantState() == 2) { + return ResponseVO.error("已下线"); + } else { + ocpTenantExtent.setTenantState((short) 2); + ocpTenantExtentMapper.updateById(ocpTenantExtent); + } + } + return ResponseVO.ok(); + } + } diff --git a/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java index 4c18d3f944479d941a533f15944b427ddae169ca..1ecc1c1188ed04788646f9ab42d7bab11ad959ab 100644 --- a/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java @@ -1,23 +1,27 @@ package com.pms.ocp.service.impl; -import cn.hutool.core.util.ObjectUtil; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pms.ocp.common.utils.RandomStringUtil; +import com.pms.ocp.mapper.TenantBasicManagementMapper; import com.pms.ocp.mapper.TenantMapper; -import com.pms.ocp.model.dto.OcpTenantGroupDto; -import com.pms.ocp.model.dto.OneTenanList; -import com.pms.ocp.model.dto.ThreeTenanList; -import com.pms.ocp.model.dto.TwoTenanList; +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.context.annotation.Bean; import org.springframework.stereotype.Service; - +import java.sql.Timestamp; import java.util.*; -import java.util.stream.Collectors; + @Service public class TenantServiceImpl extends ServiceImpl implements TenantService { @@ -25,6 +29,8 @@ public class TenantServiceImpl extends ServiceImpl @Autowired private TenantMapper tenantMapper; + @Autowired + private TenantBasicManagementMapper tenantBasicMapper; /** * 应用树分类管理 @@ -96,15 +102,15 @@ public class TenantServiceImpl extends ServiceImpl /** * 应用新增 * - * @param ocpTenantGroup + * @param * @return */ @Override - public boolean getTenanInster(OcpTenantGroup ocpTenantGroup) { + public boolean getTenanInster(TenanBaseDto tenanBaseDto) { boolean falg = true; OcpTenantGroup group = new OcpTenantGroup(); - String tenantGroupCode = ocpTenantGroup.getTenantGroupCode(); + String tenantGroupCode = tenanBaseDto.getTenantGroupCode(); List ocpTenantGroups = tenantMapper.selectList(null); for (OcpTenantGroup tenantGroup : ocpTenantGroups) { if (tenantGroup.getTenantGroupCode().equals(tenantGroupCode)){ @@ -112,9 +118,137 @@ public class TenantServiceImpl extends ServiceImpl break; } } - group.setTenantGroupCode(RandomStringUtil.getRandomString(6)); - tenantMapper.insert(ocpTenantGroup); + 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; + } + + /** + * 应用分类--应用管理 + * + * @param ocpTenantDto + * @return + */ + @Override + public List getsUse(PageOcpTenantDto ocpTenantDto) { + + LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); + qw.eq(OcpTenantGroup::getTenantGroupCompanyCode,ocpTenantDto.getTenantGroupCompanyCode()); + List ocpTenantGroupList = tenantMapper.selectList(qw); + /*for (OcpTenantGroup ocpTenantGroup : ocpTenantGroupList) { + if ("".equals(ocpTenantGroup.getTenantGroupPcode()) && ocpTenantDto.getTenantGroupCompanyCode().equals(ocpTenantGroup.getTenantGroupCompanyCode()) + && ocpTenantGroup.getTenantGroupLevel() == 1){ + ocpTenantGroups.add(ocpTenantGroup); + } + }*/ + return ocpTenantGroupList; + } + + /** + * 应用分类--应用服务分页查 + * @param pageOcpTenantDto + * @return + */ + @Override + public Page getOnePages(PageOcpTenantDto pageOcpTenantDto) { + Page pageInfo; + int pageSize = pageOcpTenantDto.getPageSize(); + int pageNum = pageOcpTenantDto.getPageNum(); + if (pageSize != 0 && pageNum != 0){ + pageInfo = new Page<>(pageSize,pageNum); + List ocpTenantGroupList = tenantMapper.selectList(null); + for (OcpTenantGroup ocpTenantGroup : ocpTenantGroupList) { + if ("".equals(ocpTenantGroup.getTenantGroupPcode())){ + continue; + } + if (pageOcpTenantDto.getTenantGroupCode().equals(ocpTenantGroup.getTenantGroupPcode())){ + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); + queryWrapper.eq(OcpTenantGroup::getTenantGroupLevel,2); + queryWrapper.eq(OcpTenantGroup::getTenantGroupCompanyCode,ocpTenantGroup.getTenantGroupCompanyCode()); + tenantMapper.selectPage(pageInfo,queryWrapper); + } + } + }else { + pageSize = 1; + pageNum = 5; + pageInfo = new Page<>(pageSize,pageNum); + List ocpTenantGroupList = tenantMapper.selectList(null); + for (OcpTenantGroup ocpTenantGroup : ocpTenantGroupList) { + if (ocpTenantGroup.getTenantGroupPcode().equals(pageOcpTenantDto.getTenantGroupCode())){ + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); + queryWrapper.eq(OcpTenantGroup::getTenantGroupLevel,2); + tenantMapper.selectPage(pageInfo,queryWrapper); + } + } + } + return pageInfo; + } + } 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/mapper/ModelMapper.xml b/src/main/resources/mapper/ModelMapper.xml index 94b9a50cf3dc793f2caf82e4688e0baa0e928d7c..feadf59839a019457d72e9a94a8c4295f68997ea 100644 --- a/src/main/resources/mapper/ModelMapper.xml +++ b/src/main/resources/mapper/ModelMapper.xml @@ -1,95 +1,22 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + insert into ocp_model_base(username, password) + values + + (#{user.username}, #{user.password}) + + diff --git a/src/main/resources/mapper/OcpApiAuditMapper.xml b/src/main/resources/mapper/OcpApiAuditMapper.xml index abec0d961820861f2ea5265ce94c3adf7314c8fb..2d9c4e6179461b7ab95a92b8321a25745eb52227 100644 --- a/src/main/resources/mapper/OcpApiAuditMapper.xml +++ b/src/main/resources/mapper/OcpApiAuditMapper.xml @@ -9,11 +9,11 @@ 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..c7b4e4b883381d288e94ce331b6877a8b0be0532 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 @@ -10,4 +10,12 @@ oa.tenant_code where oa.obj_id = #{objId} + + diff --git a/src/main/resources/mapper/OcpTenantAuditMapper.xml b/src/main/resources/mapper/OcpTenantAuditMapper.xml index 6da0b3a32f8fe5a789991a2b42ca825bb6f19342..b0a4ef30eb4dd732eaa94d9427eaa686344e9b34 100644 --- a/src/main/resources/mapper/OcpTenantAuditMapper.xml +++ b/src/main/resources/mapper/OcpTenantAuditMapper.xml @@ -4,4 +4,17 @@ + + + + \ 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 @@ + + + + + + + + + + + diff --git a/src/main/resources/mapper/OcpTenantSubsMapper.xml b/src/main/resources/mapper/OcpTenantSubsMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..5c8ad6f9a53671cf0165a93c1343e8f0a04ff8a0 --- /dev/null +++ b/src/main/resources/mapper/OcpTenantSubsMapper.xml @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/TenantBasicManagementMapper.xml b/src/main/resources/mapper/TenantBasicManagementMapper.xml index 39551cf4094a173c3079fee5239f59127a77758d..7285d022762bd14d8db3c3994cdaaf14bc5bf5ee 100644 --- a/src/main/resources/mapper/TenantBasicManagementMapper.xml +++ b/src/main/resources/mapper/TenantBasicManagementMapper.xml @@ -1,14 +1,34 @@ + + + + + + + + + + + + + - + select + otb.obj_id,otb.tenant_code,otb.tenant_name,otg.tenant_group_name,otb.tenant_url,ote.cluster_name,ote.space_name, ote.deployment_name,otb.tenant_zone,otb.tenant_ctime,otb.tenant_unit from ocp_tenant_base otb join ocp_tenant_extent ote on otb.tenant_code=ote.tenant_code join ocp_tenant_group otg on otb.tenant_group_code =otg.tenant_group_code + + and otb.tenant_code=#{tenantCode} + + + and ote.tenant_code=#{tenantCode} + = #{startTime} @@ -19,20 +39,17 @@ and otb.tenant_ctime <= #{endTime} ]]> - - and otb.tenant_code like CONCAT('%', #{keyword}::text,'%') - + + + and ote.tenant_code like CONCAT('%', #{keyword}::text,'%') and otb.tenant_name like CONCAT('%', #{keyword}::text,'%') - - and otb.tenant_unit in - - #{tenantUnit} - + + and otb.tenant_unit =#{tenantUnit} limit #{pageNum} offset #{pageSize}