Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java

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 = "应用大事记导出数据";
+    }
 }

src/main/java/com/pms/ocp/common/constants/ExportUtils.java

 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);
         }
     }
 }

src/main/java/com/pms/ocp/common/constants/ResultCodee.java → 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;
 	}

src/main/java/com/pms/ocp/common/constants/ServiceException.java

-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);
-    }
-}

src/main/java/com/pms/ocp/common/exception/ServiceException.java

+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;
+    }
+}

src/main/java/com/pms/ocp/common/utils/ExcelUtils.java

 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 <T>
+     * @return
+     */
+    public static <T> List<T> importExcel(String filePath, Integer titleRows, Integer headerRows, Class<T> 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 <T>
+     * @return
+     */
+    public static <T> List<T> importExcel(MultipartFile file, Class<T> pojoClass)
+            throws IOException {
+        return importExcel(file, 0, 1, pojoClass);
+    }
+
+    /**
+     * excel 导入
+     *
+     * @param file       excel文件
+     * @param titleRows  标题行
+     * @param headerRows 表头行
+     * @param pojoClass  pojo类型
+     * @param <T>
+     * @return
+     */
+    public static <T> List<T> importExcel(MultipartFile file, Integer titleRows, Integer headerRows, Class<T> pojoClass)
+            throws IOException {
+        return importExcel(file, titleRows, headerRows, false, pojoClass);
+    }
+
+    /**
+     * excel 导入
+     *
+     * @param file       上传的文件
+     * @param titleRows  标题行
+     * @param headerRows 表头行
+     * @param needVerfiy 是否检验excel内容
+     * @param pojoClass  pojo类型
+     * @param <T>
+     * @return
+     */
+    public static <T> List<T> importExcel(MultipartFile file, Integer titleRows, Integer headerRows, boolean needVerfiy, Class<T> 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 <T>
+     * @return
+     */
+    public static <T> List<T> importExcel(InputStream inputStream, Integer titleRows, Integer headerRows, boolean needVerfiy, Class<T> 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;
+        }
+    }
+
 }

src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java

 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<List<OcpApiBaseVo>> 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<OcpApiBaseVo> list=apiBasicManagementService.queryOcpApiBaseDto(apiCode, keyword, apiUnits, startTime, endTime, pageSize
+        List<OcpApiBaseVo> 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<OcpApiBaseVo> 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);
+
         }
 
     }

src/main/java/com/pms/ocp/controller/ModelClassifyController.java

 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<ModelType> list) {
+    public ResponseVO insert(@RequestBody List<ModelClassify> list) {
         return modelClassifyService.insert(list);
     }
 
@@ -82,7 +82,7 @@ public class ModelClassifyController {
      **/
     @ApiOperation("修改")
     @PostMapping("/update")
-    public ResponseVO update(@RequestBody List<ModelType> list) {
+    public ResponseVO update(@RequestBody List<ModelClassify> list) {
         return modelClassifyService.update(list);
     }
 }

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<List<OcpApiSubs>> getOcpApiSubsList(OcpApiSubs ocpApiSubs) {
         return ocpApiSubsService.getOcpApiSubsList(ocpApiSubs);
     }
 
     @ApiOperation("服务大事记-查询")
     @PostMapping("/getocpapiauditlist")
-    public ResponseVO getOcpApiAuditList(OcpApiAudit ocpApiAudit) {
+    public ResponseVO<List<OcpApiAudit>> getOcpApiAuditList(OcpApiAudit ocpApiAudit) {
         return ocpApiAuditService.getOcpApiAuditList(ocpApiAudit);
     }
 
     @ApiOperation("服务大事记-查询详情")
     @PostMapping("/getocpapidetails")
-    public ResponseVO getOcpApiDetails(@RequestBody OcpApiAudit ocpApiAudit){
+    public ResponseVO<List<OcpApiAudit>> getOcpApiDetails(@RequestBody OcpApiAudit ocpApiAudit){
         return ocpApiAuditService.sById(ocpApiAudit);
     }
 
     @ApiOperation("服务大事记-查询详情-变更内容")
     @PostMapping("/getocpapi")
-    public ResponseVO getOcpApi(@RequestBody OcpApiAudit ocpApiAudit){
+    public ResponseVO<List<OcpApiAudit>> getOcpApi(@RequestBody OcpApiAudit ocpApiAudit){
         return ocpApiAuditService.OaaById(ocpApiAudit);
     }
 
     @ApiOperation("服务与应用拓扑图-查询")
     @PostMapping("/getoatrlist")
-    public ResponseVO getOatrList(@RequestBody OcpApiTenantRel ocpApiTenantRel) {
+    public ResponseVO<List<OcpApiTenantRel>> getOatrList(@RequestBody OcpApiTenantRel ocpApiTenantRel) {
         return ocpApiTenantRelService.getOatrList(ocpApiTenantRel);
     }
 
     @ApiOperation("服务与模型拓扑图-查询")
     @PostMapping("/getoamrlist")
-    public ResponseVO getOamrList(@RequestBody OcpApiModelRel ocpApiModelRel) {
+    public ResponseVO<List<OcpApiModelRel>> 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);
     }
 

src/main/java/com/pms/ocp/controller/OcpTenantController.java

 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<List<OcpTenantGroup>> tenantUse(@RequestBody PageOcpTenantDto ocpTenantDto){
+        List<OcpTenantGroup> onePages = tenantService.getsUse(ocpTenantDto);
+        return ResponseVO.ok(onePages);
     }
+
+    @PostMapping("tenantcase")
+    @ApiOperation("应用分类--应用服务分页查")
+    public ResponseVO<Page<OcpTenantGroup>> tenantCase(@RequestBody PageOcpTenantDto pageOcpTenantDto){
+        Page<OcpTenantGroup> pages= tenantService.getOnePages(pageOcpTenantDto);
+
+        return ResponseVO.ok(pages);
+    }
+
+
+
+
+
 }

src/main/java/com/pms/ocp/controller/OcpTenantDetailsController.java

 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<List<OcpTenantBase>> getOtbList(@RequestBody OcpTenantBase ocpTenantBase){
         return ocpTenantBaseService.getOtbList(ocpTenantBase);
     }
 
     @ApiOperation("应用大事记-查询")
     @PostMapping("/getotaList")
-    public ResponseVO getOtaList(OcpTenantAudit ocpTenantAudit) {
+    public ResponseVO<List<OcpApiAudit>> getOtaList(OcpTenantAudit ocpTenantAudit) {
         return ocpTenantAuditService.getOtaList(ocpTenantAudit);
     }
+
+    @ApiOperation("应用大事记-查询详情")
+    @PostMapping("/getotaListById")
+    public ResponseVO<List<OcpApiAudit>> getOtaListById(@RequestBody OcpTenantAudit ocpTenantAudit) {
+        return ocpTenantAuditService.getOtaListById(ocpTenantAudit);
+    }
+
+    @ApiOperation("应用订阅记录-查询")
+    @PostMapping("/getOcpTenantList")
+    public ResponseVO<List<OcpTenantSubs>> getOcpTenantList(OcpTenantSubs ocpTenantSubs) {
+        return ocpTenantSubsService.getOcpTenantList(ocpTenantSubs);
+    }
+
+    @ApiOperation("应用与服务拓扑图-查询")
+    @PostMapping("/getOcpTenantApiList")
+    public ResponseVO<List<OcpApiTenantRel>> 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<List<OcpTenantAudit>> getOcpTenant(@RequestBody OcpTenantAudit ocpTenantAudit){
+        return ocpTenantAuditService.OtaById(ocpTenantAudit);
+    }
 }

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(
+    public ResponseVO<List<OcpTenantBaseDto>> queryOcpTenantBaseDto(
+            @RequestParam(required = false) String tenantCode,
             @RequestParam(required = false) String keyword,
-                                         @RequestParam(required = false) String tenantUnits,
+            @RequestParam(required = false) String tenantUnit,
             @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
     ) {
-        OcpTenantBaseDto ocpTenantBaseDto = tenantBasicManagementService.queryOcpTenantBaseDto( keyword, tenantUnits, startTime, endTime, pageSize
+        List<OcpTenantBaseDto> 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();
+    }
+
 }

src/main/java/com/pms/ocp/mapper/ModelIssueMapper.java

 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<Model> {
+public interface ModelIssueMapper extends BaseMapper<ModelIssue> {
 }

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<Model> {
+
+    boolean insertBatchModel(@Param("modelList") List<Model> modelList);
+
 }

src/main/java/com/pms/ocp/mapper/ModelRelationMapper.java

+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<ModelRelation> {
+}

src/main/java/com/pms/ocp/mapper/ModelTypeMapper.java

 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<ModelType> {
+public interface ModelTypeMapper extends BaseMapper<ModelClassify> {
 }

src/main/java/com/pms/ocp/mapper/OcpApiAuditMapper.java

@@ -16,8 +16,8 @@ public interface OcpApiAuditMapper extends BaseMapper<OcpApiAudit> {
 
     List<OcpApiAudit> OaaById(OcpApiAudit ocpApiAudit);
 
-    List<String> getOcpApiSubsList(OcpApiAudit ocpApiAudit);
+    List<OcpApiAudit> getOcpApiSubsList(OcpApiAudit ocpApiAudit);
 
-    List<String> sById(OcpApiAudit ocpApiAudit);
+    List<OcpApiAudit> sById(OcpApiAudit ocpApiAudit);
 
 }

src/main/java/com/pms/ocp/mapper/OcpApiModelRelMapper.java

@@ -8,7 +8,7 @@ import java.util.List;
 
 @Mapper
 public interface OcpApiModelRelMapper extends BaseMapper<OcpApiModelRel> {
-    List<String> getOamrList(OcpApiModelRel ocpApiModelRel);
+    List<OcpApiModelRel> getOamrList(OcpApiModelRel ocpApiModelRel);
 
 
 }

src/main/java/com/pms/ocp/mapper/OcpApiSubsMapper.java

@@ -8,5 +8,5 @@ import java.util.List;
 
 @Mapper
 public interface OcpApiSubsMapper extends BaseMapper<OcpApiSubs> {
-    List<String> getOcpApisList(OcpApiSubs ocpApiSubs);
+    List<OcpApiSubs> getOcpApisList(OcpApiSubs ocpApiSubs);
 }

src/main/java/com/pms/ocp/mapper/OcpApiTenantRelMapper.java

@@ -9,5 +9,7 @@ import java.util.List;
 @Mapper
 public interface OcpApiTenantRelMapper extends BaseMapper<OcpApiTenantRel> {
 
-    List<String> getOatrList(OcpApiTenantRel ocpApiTenantRel);
+    List<OcpApiTenantRel> getOatrList(OcpApiTenantRel ocpApiTenantRel);
+
+    List<OcpApiTenantRel> getTenantApiList(OcpApiTenantRel ocpApiTenantRel);
 }

src/main/java/com/pms/ocp/mapper/OcpModelGroupMapper.java

 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<ModelType> {
+public interface OcpModelGroupMapper extends BaseMapper<ModelClassify> {
 }

src/main/java/com/pms/ocp/mapper/OcpTenantAuditMapper.java

@@ -7,4 +7,8 @@ import java.util.List;
 
 public interface OcpTenantAuditMapper extends BaseMapper<OcpTenantAudit> {
     List<OcpTenantAudit> getOtaList(OcpTenantAudit ocpTenantAudit);
+
+    List<OcpTenantAudit> getOtaListById(OcpTenantAudit ocpTenantAudit);
+
+    List<OcpTenantAudit> OtaById(OcpTenantAudit ocpTenantAudit);
 }

src/main/java/com/pms/ocp/mapper/OcpTenantExtentMapper.java

+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<OcpTenantExtent>{
+}

src/main/java/com/pms/ocp/mapper/OcpTenantSubsMapper.java

+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<OcpTenantSubs> {
+    List<OcpTenantSubs> getOcpTenantList(OcpTenantSubs ocpTenantSubs);
+}

src/main/java/com/pms/ocp/mapper/TenantBasicManagementMapper.java

@@ -11,5 +11,7 @@ import java.util.List;
 
 @Mapper
 public interface TenantBasicManagementMapper extends BaseMapper<OcpTenantBase> {
-    OcpTenantBaseDto queryOcpApiBaseDto(@Param("keyword") String keyword, @Param("list") List<String> list, @Param("startTime") Timestamp startTime, @Param("endTime") Timestamp endTime, @Param("pageSize") int pageSize, @Param("pageNum") int pageNum);
+
+
+   List<OcpTenantBaseDto> 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);
 }

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;
 
 }

src/main/java/com/pms/ocp/model/dto/ModelDTO.java

+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;
+}

src/main/java/com/pms/ocp/model/dto/ModelIssueDTO.java

+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;
+
+}

src/main/java/com/pms/ocp/model/dto/ModelPropertyDTO.java

 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;
 
     /**
      * 显示顺序

src/main/java/com/pms/ocp/model/dto/ModelRelationDTO.java

+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;
+}

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;
+
 }

src/main/java/com/pms/ocp/model/dto/PageOcpTenantDto.java

+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;
+    }
+}

src/main/java/com/pms/ocp/model/dto/TenanBaseDto.java

+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;
+}

src/main/java/com/pms/ocp/model/entity/Model.java

 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 '建设厂商';

src/main/java/com/pms/ocp/model/entity/ModelType.java → 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 {
 
     /**
      * 模型分类编号

src/main/java/com/pms/ocp/model/entity/ModelIssue.java

 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

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	否

src/main/java/com/pms/ocp/model/entity/ModelRelation.java

+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

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;
+  }
 }

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;
   }

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 {
 

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;
     /**
      * 建设单位
      */

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;
 
     /**

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;
     }
 

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) {

src/main/java/com/pms/ocp/model/vo/ModelRelationVO.java

+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;
+}

src/main/java/com/pms/ocp/model/vo/ModelVO.java

 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;
 }

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;
     /**

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<OcpApiBase> {
      * 服务发布
      * @param apiCodes
      */
-    void apiIssue(String apiCodes);
+    ResponseVO apiIssue(String apiCodes);
 
     /**
      *  获取顶级服务树

src/main/java/com/pms/ocp/service/ModelClassifyService.java

 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<List<OcpModelGroupVO>> getModelNavigation();
 
-    ResponseVO insert(List<ModelType> list);
+    ResponseVO insert(List<ModelClassify> list);
 
     ResponseVO subclassDetailsList(int currentPage,int pageSize,String parentGroupCode,String subclassGroupName);
 
-    ResponseVO update(List<ModelType> list);
+    ResponseVO update(List<ModelClassify> list);
 }

src/main/java/com/pms/ocp/service/ModelGroupService.java

 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);
 }

src/main/java/com/pms/ocp/service/ModelIssueService.java

 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<String> ids);
+
     /**
      * 更新模型订阅
      *
-     * @param modelIssueo
+     * @param modelIssue
      * @return
      */
-    Integer updateModelIssue(ModelIssue modelIssueo);
+    Integer updateModelIssue(ModelIssue modelIssue);
 
     /**
      * 获取模型订阅
@@ -42,7 +50,7 @@ public interface ModelIssueService {
      * @param
      * @return
      */
-    List<ModelType> getModelIssueList();
+    List<ModelIssue> 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);
 }

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);
 }

src/main/java/com/pms/ocp/service/ModelPropertyService.java

@@ -35,7 +35,7 @@ public interface ModelPropertyService {
      * @param ids
      * @return
      */
-    Integer deletePatchModelProperty(List<String> ids);
+    Integer deleteBatchModelProperty(List<String> ids);
 
     /**
      * 更新模型属性
@@ -46,15 +46,15 @@ public interface ModelPropertyService {
     Integer updateModelProperty(ModelPropertyDTO modelPropertyDTO);
 
     /**
-     * 获取模型属性
+     * 获取模型属性列表
      *
      * @param
      * @return
      */
-    List<ModelProperty> listModelProperty(String modelCode, String propCode);
+    List<ModelProperty> listModelProperty(String objId, String modelCode, String propCode);
 
     /**
-     * 获取模型属性列表
+     * 获取模型属性
      *
      * @param
      * @return

src/main/java/com/pms/ocp/service/ModelRelationService.java

+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<String> ids);
+
+    /**
+     * 更新模型关系
+     *
+     * @param modelRelation
+     * @return
+     */
+    Integer updateModelRelation(ModelRelation modelRelation);
+
+    /**
+     * 获取模型关系
+     *
+     * @param
+     * @return
+     */
+    List<ModelRelation> getModelRelationList(String objId, String modelCode);
+
+    /**
+     * 获取模型关系列表
+     *
+     * @param modelId
+     * @return
+     */
+    ModelRelationVO getModelRelation(String modelId);
+}

src/main/java/com/pms/ocp/service/ModelService.java

 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<Model> getModelList(String objId, String modelCode);
 
     /**
      * 获取模型列表

src/main/java/com/pms/ocp/service/ModelTypeService.java

 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<ModelType> getModelTypeList();
+    List<ModelClassify> getModelTypeList();
 
     /**
      * 获取模型分类列表
@@ -49,5 +49,5 @@ public interface ModelTypeService {
      * @param modelId
      * @return
      */
-    ModelType getModelType(String modelId);
+    ModelClassify getModelType(String modelId);
 }

src/main/java/com/pms/ocp/service/OcpApiAuditService.java

 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<OcpApiAudit> {
     ResponseVO getOcpApiAuditList(OcpApiAudit ocpApiAudit);
 
     ResponseVO getOcpApiDetails(String objId);
 
-//    ResponseVO getOcpApiList(Oaa oaa);
-
     ResponseVO OaaById(OcpApiAudit ocpApiAudit);
 
     ResponseVO sById(OcpApiAudit ocpApiAudit);

src/main/java/com/pms/ocp/service/OcpApiModelRelService.java

 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<OcpApiModelRel> {
     ResponseVO getOamrList(OcpApiModelRel ocpApiModelRel);
 }

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<OcpApiSubs> {
     ResponseVO getOcpApiSubsList(OcpApiSubs ocpApiSubs);
 }

src/main/java/com/pms/ocp/service/OcpApiTenantRelService.java

 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<OcpApiTenantRel> {
    ResponseVO getOatrList(OcpApiTenantRel ocpApiTenantRel);
+
+   ResponseVO getTenantApiList(OcpApiTenantRel ocpApiTenantRel);
 }

src/main/java/com/pms/ocp/service/OcpModelGroupService.java

 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<ModelType> {
+public interface OcpModelGroupService extends IService<ModelClassify> {
 }

src/main/java/com/pms/ocp/service/OcpTenantAuditService.java

 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<OcpTenantAudit> {
     ResponseVO getOtaList(OcpTenantAudit ocpTenantAudit);
+
+    ResponseVO getOtaListById(OcpTenantAudit ocpTenantAudit);
+
+    void exportExcel(OcpTenantAudit ocpTenantAudit, HttpServletRequest request, HttpServletResponse response);
+
+    ResponseVO OtaById(OcpTenantAudit ocpTenantAudit);
 }

src/main/java/com/pms/ocp/service/OcpTenantBaseService.java

 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<OcpTenantBase> {
     ResponseVO getOtbList(OcpTenantBase ocpTenantBase);
 }

src/main/java/com/pms/ocp/service/OcpTenantExtentService.java

+package com.pms.ocp.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.pms.ocp.model.entity.OcpTenantExtent;
+
+public interface OcpTenantExtentService extends IService<OcpTenantExtent> {
+}

src/main/java/com/pms/ocp/service/OcpTenantSubsService.java

+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<OcpTenantSubs> {
+    ResponseVO getOcpTenantList(OcpTenantSubs ocpTenantSubs);
+}

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<OcpTenantBase> {
     /**
-     * 应用条件查询
+     * 条件查询
+     * @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<OcpTenantBaseDto> 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);
 }

src/main/java/com/pms/ocp/service/TenantService.java

 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<OcpTenantGroup> {
 
     /**
      * 应用新增
+     * @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<OcpTenantGroup> getsUse(PageOcpTenantDto ocpTenantDto);
 
+    /**
+     * 应用分类--应用服务分页查
+     * @param pageOcpTenantDto
+     * @return
+     */
+    Page<OcpTenantGroup>  getOnePages(PageOcpTenantDto pageOcpTenantDto);
 }

src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java

 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<ApiBasicManagemen
     @Autowired
     private ApiBasicManagementMapper apiBasicManagementMapper;
     @Autowired
-    private OcpApiSubsService ocpApiSubsService;
+    private OcpApiSubsMapper ocpApiSubsMapper;
     @Autowired
     private OcpApiExtentService ocpApiExtentService;
     @Autowired
@@ -87,26 +82,26 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl<ApiBasicManagemen
             ocpApiSubs.setSubsLogApiUserId(null);
             ocpApiSubs.setSubsLogApiAtime(Timestamp.valueOf(LocalDateTime.now()));
             ocpApiSubs.setSubsCompanyCode(null);
-           // ocpApiSubsService.save(ocpApiSubs);
+            ocpApiSubsMapper.insert(ocpApiSubs);
         }
     }
-
-    @Override
-    public List<OcpApiBaseVo> 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<OcpApiBaseVo> 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<String> list = Arrays.asList(split);
@@ -153,7 +148,7 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl<ApiBasicManagemen
      *
      * @param apiCodes
      */
-    public void apiIssue(String apiCodes) {
+    public ResponseVO apiIssue(String apiCodes) {
         String[] split = apiCodes.split(",");
         List<String> list = Arrays.asList(split);
         LambdaQueryWrapper<OcpApiExtent> lambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -161,13 +156,13 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl<ApiBasicManagemen
         List<OcpApiExtent> 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

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<ModelType> list) {
+    public ResponseVO update(List<ModelClassify> 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<ModelType> list) {
+    public ResponseVO insert(List<ModelClassify> 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<OcpModelGroupVO> 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<com.pms.ocp.model.vo.OcpModelGroupVO>
+     **/
     private List<OcpModelGroupVO> selectByCondition(String... searchCondition) {
         QueryWrapper<OcpModelGroupVO> queryWrapper = new QueryWrapper<>();
         //根据是否传入搜索条件创建构造器进行查询

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<ModelType> wrapper = new QueryWrapper<>();
-        List<ModelType> modelTypeList = modelTypeMapper.selectList(wrapper);
-        if(CollectionUtils.isEmpty(modelTypeList)){
+        QueryWrapper<ModelClassify> wrapper = new QueryWrapper<>();
+        List<ModelClassify> 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 {

src/main/java/com/pms/ocp/service/impl/ModelIssueServiceImpl.java

 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<String> ids) {
+        return modelIssueMapper.deleteBatchIds(ids);
     }
 
     @Override
-    public List<ModelType> getModelIssueList() {
+    public Integer updateModelIssue(ModelIssue modelIssue) {
         return null;
     }
 
     @Override
-    public ModelType getModelIssue(String modelId) {
+    public List<ModelIssue> getModelIssueList(String objId, String modelCode, String subsCompanyCode) {
+        QueryWrapper<ModelIssue> 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;
     }
 }

src/main/java/com/pms/ocp/service/impl/ModelNoteServiceImpl.java

 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<ModelNote> modelNoteList = getModelNoteList(modelCode);
+//
+//        ExcelUtils.exportExcel(modelNoteList, "导出事记", "导出事记", ModelNote.class, "测试user.xls", re
+//
+//        return true;
+//    }
 }

src/main/java/com/pms/ocp/service/impl/ModelPropertyServiceImpl.java

@@ -54,7 +54,7 @@ public class ModelPropertyServiceImpl implements ModelPropertyService {
     }
 
     @Override
-    public Integer deletePatchModelProperty(List<String> ids) {
+    public Integer deleteBatchModelProperty(List<String> ids) {
         return modelPropertyMapper.deleteBatchIds(ids);
     }
 
@@ -75,10 +75,14 @@ public class ModelPropertyServiceImpl implements ModelPropertyService {
     }
 
     @Override
-    public List<ModelProperty> listModelProperty(String modelCode, String propCode) {
+    public List<ModelProperty> listModelProperty(String objId, String modelCode, String propCode) {
 
         QueryWrapper<ModelProperty> queryWrapper = new QueryWrapper();
 
+        if (StringUtils.isNotEmpty(objId)) {
+            queryWrapper.lambda().eq(ModelProperty::getObjId, objId);
+        }
+
         if (StringUtils.isNotEmpty(modelCode)) {
             queryWrapper.lambda().eq(ModelProperty::getModelCode, modelCode);
         }

src/main/java/com/pms/ocp/service/impl/ModelRelationServiceImpl.java

+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<ModelRelation> 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<String> ids) {
+        return modelRelationMapper.deleteBatchIds(ids);
+    }
+
+    @Override
+    public Integer updateModelRelation(ModelRelation modelRelation) {
+        return null;
+    }
+
+    @Override
+    public List<ModelRelation> getModelRelationList(String objId, String modelCode) {
+        QueryWrapper<ModelRelation> 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;
+    }
+}

src/main/java/com/pms/ocp/service/impl/ModelServiceImpl.java

 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<ModelMapper, Model> 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<Model> 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<Model> 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 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 Integer updateModel(ModelDTO modelDTO) {
+        Model model = new Model();
+
+        BeanUtils.copyProperties(modelDTO, model);
+
+        model.setModelMtime(LocalDateTime.now());
+
+        UpdateWrapper<Model> updateWrapper = new UpdateWrapper<>();
+
+        updateWrapper.lambda().eq(Model::getObjId, model.getObjId());
+
+        return modelMapper.update(model, updateWrapper);
     }
+
+    /**
+     * 导入模型
+     *
+     * @param file
+     * @return
+     */
+    @Override
+    public Boolean importModel(MultipartFile file) throws IOException {
+
+        //校验Excel文件
+        ExcelUtils.checkFile(file);
+        List<ModelVO> modelVOList = ExcelUtils.importExcel(file, ModelVO.class);
+        List<Model> 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<Model> modelList = modelMapper.selectList(null);
-        if (CollectionUtils.isEmpty(modelList)) {
-            return ResponseVO.ok("查询列表为空");
+    public List<Model> getModelList(String objId, String modelCode) {
+        QueryWrapper<Model> 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<Model> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("model_id", modelId);
+        queryWrapper.lambda().eq(Model::getObjId, objId);
         return modelMapper.selectOne(queryWrapper);
     }
 }

src/main/java/com/pms/ocp/service/impl/ModelTypeServiceImpl.java

 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<ModelType> getModelTypeList() {
+    public List<ModelClassify> getModelTypeList() {
         return null;
     }
 
     @Override
-    public ModelType getModelType(String modelId) {
+    public ModelClassify getModelType(String modelId) {
         return null;
     }
 }

src/main/java/com/pms/ocp/service/impl/OcpApiAuditServiceImpl.java

@@ -27,13 +27,9 @@ public class OcpApiAuditServiceImpl extends ServiceImpl<OcpApiAuditMapper,OcpApi
 
     @Override
     public ResponseVO getOcpApiAuditList(OcpApiAudit ocpApiAudit) {
-        List<String> ocpApiAuditList = ocpApiAuditMapper.getOcpApiSubsList(ocpApiAudit);
-        if(CollectionUtils.isEmpty(ocpApiAuditList)){
-            return ResponseVO.error("查询列表为空");
-        }else{
+        List<OcpApiAudit> ocpApiAuditList = ocpApiAuditMapper.getOcpApiSubsList(ocpApiAudit);
         return ResponseVO.ok(ocpApiAuditList);
     }
-    }
 
 
     @Override
@@ -50,7 +46,7 @@ public class OcpApiAuditServiceImpl extends ServiceImpl<OcpApiAuditMapper,OcpApi
 
     @Override
     public ResponseVO sById(OcpApiAudit ocpApiAudit) {
-        List<String> oaaById = ocpApiAuditMapper.sById(ocpApiAudit);
+        List<OcpApiAudit> oaaById = ocpApiAuditMapper.sById(ocpApiAudit);
         return ResponseVO.ok(oaaById);
     }
 

src/main/java/com/pms/ocp/service/impl/OcpApiModelRelServiceImpl.java

@@ -16,7 +16,7 @@ public class OcpApiModelRelServiceImpl extends ServiceImpl<OcpApiModelRelMapper,
     private OcpApiModelRelMapper ocpApiModelRelMapper;
     @Override
     public ResponseVO getOamrList(OcpApiModelRel ocpApiModelRel) {
-        List<String> ocpApiModelRelList = ocpApiModelRelMapper.getOamrList(ocpApiModelRel);
+        List<OcpApiModelRel> ocpApiModelRelList = ocpApiModelRelMapper.getOamrList(ocpApiModelRel);
         return ResponseVO.ok(ocpApiModelRelList);
     }
 }

src/main/java/com/pms/ocp/service/impl/OcpApiSubsServiceImpl.java

@@ -20,11 +20,7 @@ public class OcpApiSubsServiceImpl extends ServiceImpl<OcpApiSubsMapper,OcpApiSu
     private OcpApiSubsMapper ocpApiSubsMapper;
     @Override
     public ResponseVO getOcpApiSubsList(OcpApiSubs ocpApiSubs) {
-        List<String> ocpApiSubsList = ocpApiSubsMapper.getOcpApisList(ocpApiSubs);
-        if(CollectionUtils.isEmpty(ocpApiSubsList)){
-            return ResponseVO.error("查询列表为空");
-        }else{
+        List<OcpApiSubs> ocpApiSubsList = ocpApiSubsMapper.getOcpApisList(ocpApiSubs);
         return ResponseVO.ok(ocpApiSubsList);
     }
-    }
 }