Merge remote-tracking branch 'origin/master'

operation-control-platform.iml

 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="CheckStyle-IDEA-Module">
+    <option name="configuration">
+      <map />
+    </option>
+  </component>
   <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
     <facet type="web" name="Web">
       <configuration>
         <webroots />
       </configuration>
     </facet>
-    <facet type="Spring" name="Spring">
-      <configuration />
-    </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <output url="file://D:/.m2/org/springframework/boot/spring-boot-starter-parent/2.4.2/target/classes" />
+    <output-test url="file://D:/.m2/org/springframework/boot/spring-boot-starter-parent/2.4.2/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />

pom.xml

@@ -77,6 +77,10 @@
             <version>1.2.62</version>
         </dependency>
 
+
+
+
+
 <!--        <dependency>-->
 <!--            <groupId>io.jsonwebtoken</groupId>-->
 <!--            <artifactId>jjwt</artifactId>-->

src/main/java/com/pms/ocp/OcpApplication.java

@@ -20,11 +20,11 @@ import java.util.TimeZone;
 
 @SpringBootApplication
 @MapperScan(basePackages = {"com.pms.ocp.mapper"})
-//@ConfigurationPropertiesScan
-//@EnableOpenApi
+@ConfigurationPropertiesScan
+@EnableOpenApi
 public class OcpApplication {
     public static void main(String[] args) {
-//        TimeZone.setDefault(TimeZone.getTimeZone("GMT+8"));
+        TimeZone.setDefault(TimeZone.getTimeZone("GMT+8"));
         SpringApplication.run(OcpApplication.class, args);
     }
 

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

+package com.pms.ocp.common.constants;
+
+public interface AnalysisConstant {
+    interface exportOcpApiAuditName{
+    final String OCP_API_AUDIT= "服务大事记导出数据";
+    }
+}

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

+package com.pms.ocp.common.constants;
+
+
+import org.apache.poi.ss.usermodel.Workbook;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URLEncoder;
+import java.util.Locale;
+import java.util.regex.Pattern;
+
+public class ExportUtils {
+
+    /**
+     * 校验Header Manipulation
+     * @param header 参数
+     * @return 数据
+     */
+    public static String headerManipulation(String header) {
+        if(StringUtils.isNullOrEmpty(header)){
+            return header;
+        }
+        String regex = "[`~!@#$%^&*()\\+\\=\\{}|:\"?><【】\\/r\\/n]";
+        Pattern pattern = Pattern.compile(regex);
+        pattern.matcher(header).replaceAll("").trim();
+        return header;
+    }
+
+    /**
+     * 流导出文件至浏览器
+     *
+     * @param response
+     * @param in
+     * @param fileName
+     */
+    public static void exportWorld(HttpServletResponse response, InputStream in, String fileName) {
+        OutputStream out = null;
+        try {
+            response.reset();
+            String fileHeaderName = URLEncoder.encode(fileName, Constant.Character.UTF8);
+            response.setHeader("Content-Disposition", "attachment;filename=" + headerManipulation(fileHeaderName));
+            response.setContentType("application/msword;charset=UTF-8");
+            response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
+            response.setHeader("Access-Control-Allow-Origin", "*");
+            out = response.getOutputStream();
+            //定义缓存
+            byte[] buffer = new byte[1024];
+            int i;
+            while ((i = in.read(buffer)) != Constant.Number.MINUS_ZERO) {
+                out.write(buffer, Constant.Number.ZERO, i);
+            }
+            out.flush();
+        } catch (IOException e) {
+            e.printStackTrace();
+            throw new ServiceException(com.pms.ocp.common.constants.ResultCodee.INTERNAL_SERVER_ERROR);
+        } finally {
+            if (out != null){
+                try {
+                    out.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+                ;
+            }
+            if (in != null) {
+                try {
+                    in.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+    /**
+     * Workbook导出浏览器
+     * 文件导出添加跨域 Access-Control-Allow-Origin
+     * @param response
+     * @param fileName
+     * @param workbook
+     */
+    public static void exportExcel(HttpServletResponse response, String fileName, Workbook workbook) {
+        try {
+            response.reset();
+            String fileHeaderName = URLEncoder.encode(fileName, Constant.Character.UTF8);
+            response.setHeader("Content-Disposition", "attachment;filename=" + headerManipulation(fileHeaderName));
+            response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
+            response.setHeader("Access-Control-Allow-Origin", "*");
+            response.setContentType("application/vnd.ms-excel;charset=UTF-8");
+            ServletOutputStream outputStream = response.getOutputStream();
+            workbook.write(outputStream);
+        } catch (IOException e) {
+            e.printStackTrace();
+            throw new ServiceException(com.pms.ocp.common.constants.ResultCodee.INTERNAL_SERVER_ERROR);
+        }
+    }
+
+    /**
+     * 图片导出
+     *
+     * @param response
+     * @param in
+     * @param fileName
+     */
+    public static void exportPic(HttpServletResponse response, InputStream in, String fileName) {
+        try {
+            if (in != null) {
+                response.reset();
+                String fileHeaderName = URLEncoder.encode(fileName, Constant.Character.UTF8);
+                String fileExtensionName = fileName.substring(fileName.lastIndexOf(".") + 1).toUpperCase(Locale.ENGLISH);
+                switch (fileExtensionName) {
+                    case "JEPG":
+                    case "JPG":
+                        response.setContentType("image/jepg;charset=UTF-8");
+                        break;
+                    case "PNG":
+                        response.setContentType("image/png;charset=UTF-8");
+                        break;
+                    case "BMP":
+                        response.setContentType("application/x-bmp;charset=UTF-8");
+                        break;
+                    default:
+                        response.setContentType("application/octet-stream;charset=UTF-8");
+                        break;
+
+                }
+                response.setHeader("Content-Disposition", "attachment;filename=" + headerManipulation(fileHeaderName));
+                response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
+                response.setHeader("Access-Control-Allow-Origin", "*");
+                byte[] buffer = new byte[1024];
+                OutputStream out = response.getOutputStream();
+                int i;
+                while ((i = in.read(buffer)) != -1) {
+                    out.write(buffer, 0, i);
+                }
+                out.flush();
+                out.close();
+                in.close();
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+            throw new ServiceException(ResultCodee.INTERNAL_SERVER_ERROR);
+        }
+    }
+}

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

+package com.pms.ocp.common.constants;
+
+/**
+ * 异常枚举类
+ */
+public enum ResultCodee {
+	/* ============================ 通用错误码 ========================== **/
+	/**
+	 * 禁止访问 303
+	 **/
+	PARAMS_NOT(303, "缺少参数"),
+
+	/**
+	 * 存在错误参数 304
+	 */
+	PARAMS_NOT_RIGHT(304, "存在错误参数"),
+
+	/**
+	 * 存在错误测试数据 305
+	 */
+	DATA_ERROR(305, "存在错误测试数据"),
+
+	/**
+	 * 存在错误测试数据 305
+	 */
+	SERVER_ERROR(306, "服务异常"),
+	/**
+	 * 校验失败 307
+	 **/
+	VERIFICATION_FAIL(307, "校验失败"),
+
+	/**
+	 * 错误请求 400
+	 **/
+	BAD_REQUEST(400, "错误请求"),
+
+	/**
+	 * 未经授权 401
+	 **/
+	UNAUTHORIZED(401, "未经授权"),
+
+	/**
+	 * 禁止访问 403
+	 **/
+	FORBIDDEN(403, "禁止访问"),
+	/**
+	 * 连接超时
+	 **/
+	TIME_OUT(408, "连接超时"),
+	/**
+	 * Feign连接错误
+	 **/
+	FEIGN_CONNECT_ERROR(409, "feignClient 连接错误：%s"),
+	/**
+	* Feign连接错误
+	 **/
+	BAD_REQUEST_METHOD(410, "不合法的请求方式"),
+	/**
+	 * 操作异常 500
+	 **/
+	INTERNAL_SERVER_ERROR(500, "操作异常"),
+	/**
+	 * SQL异常
+	 **/
+	SQL_ERROR_EXCEPTION(501, "SQL执行异常!"),
+	/**
+	 * 操作失败
+	 **/
+	OPERATION_FAILURE(507, "操作失败"),
+	/**
+	 * 日期格式处理异常
+	 **/
+	DATE_FORMAT_EXCEPTION(508, "日期格式处理异常"),
+	/**
+	 * 项目启动文件异常
+	 */
+	SYSTEM_PROFILE_EXCEPTION(509, "错误的项目启动文件"),
+
+	/* ============================ 业务/错误码 start========================== **/
+	/* ===========================后台系统======================== **/
+	RECORD_NOT_EXIST(10001, "相关记录不存在!"),
+	SYS_USER_INVALID(10002, "用户登录已过期!"),
+	PERMISSION_NOT(10003, "无访问权限!"),
+	ACCOUNT_NOT(10004, "账号异常!"),
+	SHIRO_ERROR(10005, "鉴权/授权过程出错!"),
+	MENU_EXIST(10006, "菜单定义已存在！"),
+	ROLE_EXIST(10007, "角色定义已存在！"),
+	CODE_EXIST(10008, "编码已存在！"),
+	NAME_EXIST(10009, "名称已存在!"),
+	USER_ORGANIZATION_LEVEL_ERROR(10023, "用户组织机构关联层级有误！"),
+	USER_ORGANIZATION_INFO_ERROR(10024,"用户组织机构信息有误！"),
+	TOKEN_INVALID(9997, "登录失效，请重新登录！"),
+	/* ============================ 文件处理 错误码 ========================== **/
+	FILE_NOT_EXISTS(21001, "文件不存在"),
+	FILE_MUST_IS_EXCEL(21002, "文件类型必须是excel"),
+	UPLOAD_EXCEPTION(21003, "上传过程出现异常"),
+	EXCEL_RULE_NOT_EXISTS(21004, "excel校验规则不存在"),
+	EXCEL_TEMPLATE_NOT_EXISTS(21005, "excel模板不存在"),
+	EXCEL_TEMPLATE_NOT_CORRECT(21009, "excel模板不对，请重新下载"),
+	EXCEL_DATA_NOT_EXISTS(21006, "excle数据不存在"),
+	EXCEL_NOT_CORRECT(21007, "excel不正确"),
+	EXCEL_PARSE_CORRECT(21010,"excel解析错误"),
+	CURRENT_MONTH_NOT_EXISTS(21008, "当前年月数据不存在"),
+	BATCH_NOT_NEED(21009, "无需批量操作！"),
+	CELL_IS_NULL(21010, "值不能为空"),
+	CELL_FORMAT_ERROR(21011, "值格式不正确"),
+	CELL_MIN_LENGTH_ERROR(21012, "值小于最小长度"),
+	CELL_MAX_LENGTH_ERROR(21013, "值大于最大长度"),
+	CELL_REGULAR_ERROR(21014, "值正则验证不通过"),
+	CELL_OPTION_ERROR(21015, "值不在选项集范围内"),
+	ROW_DUPLICATE_ERROR(21016, "行重复性校验未通过"),
+	CELL_DATE_FORMAT_ERROR(21017,"日期范围格式不正确"),
+
+	DATA_MISSING_UNITS(21018, "数据缺少单位级别编码"),
+	PICTURE_NAME_ILLEGAL(21019, "图片名称不合法,请重新上传"),
+	FILE_MUST_IS_PIC(21020, "图片格式不合法,请重新上传!"),
+	NAME_CONFLICT(21021, "该组织机构下名称重复,请修改名称!"),
+	ENCRYPT_ERROR_CODE(21022, "解密失败"),
+
+	/* ===========================JoyhrError======================== **/
+	SIGN_ERROR(80001,"签名验证错误!"),
+	METHOD_ERROR(80002,"方法不存在!"),
+	/* ===========================CrmHookError======================== **/
+	CRM_MEMBER_FOUND_ERROR(81001,"会员信息已存在"),
+	CRM_MEMBER_NOT_FOUND_ERROR(81002,"会员信息不存在"),
+
+	/* =============主系统更改Error ================= **/
+    MASTER_DATA_RELY_ERROR(90001,"切换系统与中台数据存在数据不匹配"),
+
+    RELY_DATA_NOT_MATCH_BASE(90002,"切换系统依赖数据与中台数据存在不匹配数据"),
+
+    BUS_DATA_NOT_MATCH_BASE(90003,"切换系统业务数据与中台数据存在不匹配数据"),
+
+    DATA_MAPPING_NOT_MATCH_BASE(90004,"切换系统数据映射中数据与中台数据存在不匹配数据"),
+
+	/* =============中台大平台系统 ================= **/
+	LOGIN_TIME_OUT(130001,"登录失效或未登录，请重新登录"),
+	VERFICATION_CODE_ERROR(130002,"验证码不正确"),
+	NO_USER(130003,"用户不存在"),
+	PASSWORD_ERROR(130004,"密码不正确"),
+	MOBILE_USED(130005,"该手机号码已被注册"),
+	BANK_ACCOUNT_USED(130006,"该银行账号已被使用"),
+	OPEN_GOODS_FAIL(130009,"开通失败，请重新开通或联系相关人员"),
+	PROBATION_GOODS_FAIL(130010,"试用失败，请重新试用或联系相关人员"),
+	END_GOODS_FAIL(130011,"停用失败，请重新停用或联系相关人员"),
+	FIND_ORDER_LIST_FAIL(130012,"查询订单列表失败，请重新查询或联系相关人员"),
+	FIND_BILL_FAIL(130013,"查询账单列表失败，请重新查询或联系相关人员"),
+	FIND_SIX_MONTH_BILL(130014,"查询近6个月消费失败"),
+	FIND_MONTH_GOODS(130015,"查询该月份消费情况失败"),
+	/* =============数据维护 ================= **/
+	TOTAL_SYNC_RECORD_EXITS(110001,"已执行过全量同步！"),
+	TOTAL_SYNC_RECORD_NOT_EXITS(110002,"还没执行全量同步！");
+
+	public final int statusCode;
+	public String msg;
+
+	ResultCodee(int statusCode, String msg) {
+		this.statusCode = statusCode;
+		this.msg = msg;
+	}
+
+	public int getStatusCode() {
+		return statusCode;
+	}
+
+	public String getMessage() {
+		return msg;
+	}
+
+	public void setMessage(String msg) {
+		this.msg = msg;
+	}
+}

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/utils/ExcelUtils.java

@@ -76,9 +76,11 @@ public class ExcelUtils {
             //当前日期
             SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
             fileName = df.format(new Date());
+
         }
         Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(fileName, fileName, ExcelType.XSSF), pojoClass, list);
         response.setCharacterEncoding("UTF-8");
+
         response.setHeader("content-Type", "application/vnd.ms-excel");
         response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName, "UTF-8") + ".xls");
         ServletOutputStream out = response.getOutputStream();
@@ -104,7 +106,6 @@ public class ExcelUtils {
         exportExcel(response, fileName, targetList, targetClass);
     }
 
-
     /**
      * Excel导出----设置title---sheetName---要求Collection<?> list是Class<?> pojoClass类型的
      *
@@ -128,5 +129,4 @@ public class ExcelUtils {
         out.flush();
     }
 
-
 }

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

+package com.pms.ocp.common.utils;
+
+import org.apache.poi.hssf.usermodel.HSSFCell;
+import org.apache.poi.hssf.usermodel.HSSFCellStyle;
+import org.apache.poi.hssf.usermodel.HSSFRow;
+import org.apache.poi.hssf.usermodel.HSSFSheet;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+
+import org.apache.poi.ss.formula.functions.T;
+import org.apache.poi.ss.usermodel.BorderStyle;
+import org.apache.poi.ss.usermodel.Font;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 文件导出工具
+ * @author abc
+ * @date 2019/01/08
+ */
+public class FileExport {
+	
+	private static final Logger logger = LoggerFactory.getLogger(FileExport.class);
+
+    /** CSV文件列分隔符 */
+    private static final String CSV_COLUMN_SEPARATOR = ",";
+
+    private static final String CSV_COLUM_TABLE = "\t";
+
+    /** CSV文件列分隔符 */
+    private static final String CSV_RN = "\r\n";
+
+	/**
+	 * 导出Excel文件
+	 * 
+	 * @param excelHeader
+	 *            导出文件中表格头
+	 * @param list
+	 *            导出的内容
+	 * @param response
+	 *            HttpServletResponse对象，用来获得输出流向客户端写导出的文件
+	 * @param sheetName
+	 *            Excel的sheet名称，加上时间戳作为导出文件的名称
+	 */
+    public static void exportExcel(String [] excelHeader, List<Object> list, String sheetName, HttpServletResponse response, HttpServletRequest request) {
+		HSSFWorkbook wb = new HSSFWorkbook();
+		HSSFSheet sheet = wb.createSheet(sheetName);
+		HSSFRow row = sheet.createRow((int) 0);
+        /******设置单元格是否显示网格线******/
+		sheet.setDisplayGridlines(true);
+		
+		/******设置头单元格样式******/
+		HSSFCellStyle style = wb.createCellStyle();
+		style.setAlignment(HorizontalAlignment.CENTER);
+		Font fontHeader = wb.createFont();
+		fontHeader.setBold(true);
+		fontHeader.setFontHeight((short) 240);
+		style.setFont(fontHeader);
+		style.setBorderBottom(BorderStyle.THIN);
+		style.setBorderLeft(BorderStyle.THIN);
+		style.setBorderRight(BorderStyle.THIN);
+		style.setBorderTop(BorderStyle.THIN);
+		
+		/******设置头内容******/
+		for (int i = 0; i < excelHeader.length; i++) {
+			HSSFCell cell = row.createCell(i);
+			cell.setCellValue("  " +excelHeader[i] + "  ");
+			cell.setCellStyle(style);			
+		}   
+        
+		/******设置内容单元格样式******/
+		HSSFCellStyle styleCell = wb.createCellStyle();
+		Font fontCell = wb.createFont();
+//		fontCell.setColor(HSSFColor.BLACK.index);
+//		fontCell.setColor(HSSFColor.B);
+		styleCell.setAlignment(HorizontalAlignment.CENTER);
+		styleCell.setFont(fontCell);
+		styleCell.setBorderBottom(BorderStyle.THIN);
+		styleCell.setBorderLeft(BorderStyle.THIN);
+		styleCell.setBorderRight(BorderStyle.THIN);
+		styleCell.setBorderTop(BorderStyle.THIN);
+        /******设置单元格内容******/
+		for (int i = 0; i < list.size(); i++) {
+			row = sheet.createRow(i + 1);
+			/******设置行高******/
+			row.setHeightInPoints(20);
+			Object[] obj = (Object[]) list.get(i);			
+			for (int j = 0; j < excelHeader.length; j++) {
+				styleCell.setWrapText(false);
+            	HSSFCell cell = row.createCell(j);
+				if (obj[j] != null){
+					 cell.setCellValue(obj[j].toString());
+				}else{
+					cell.setCellValue(""); 
+				}			
+//				if(obj[j].toString().length()>20)
+//					styleCell.setWrapText(true);
+				cell.setCellStyle(styleCell);
+				sheet.autoSizeColumn(j);
+            }   
+        } 
+		
+		OutputStream ouputStream = null;
+		try {
+			
+			String encoding = "UTF-8";
+			/** 获取浏览器相关的信息 */
+			String userAgent = request.getHeader("user-agent");
+			/** 判断是否为msie浏览器 */
+			if (userAgent.toLowerCase().indexOf("msie") != -1){
+				 encoding = "gbk";
+			}
+
+            response.setCharacterEncoding(encoding);
+	        response.setContentType("application/vnd.ms-excel"); 
+	        String fileName = sheetName;
+	        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHMMSS");
+	        fileName += (dateFormat.format(new Date())).toString()+".xls";
+	        response.setHeader("Content-disposition", "attachment;filename=" + URLEncoder.encode(fileName, encoding));
+	        ouputStream = response.getOutputStream();   
+	        wb.write(ouputStream);     
+	        ouputStream.flush();  
+		} catch (Exception e) {
+			e.printStackTrace();
+		} finally {
+        	try {
+        		if(ouputStream!=null) {
+					ouputStream.close();
+				}
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+        }
+    }
+
+    /**
+     * 导出CSV文件
+     * @param dataList 集合数据
+     * @param colNames 表头部数据
+     * @param mapKey 查找的对应数据
+     */
+    public static boolean doExport(List<Map<String, Object>> dataList, String colNames, String mapKey, OutputStream os) {
+        try {
+            StringBuffer buf = new StringBuffer();
+
+            String[] colNamesArr = null;
+            String[] mapKeyArr = null;
+
+            colNamesArr = colNames.split(",");
+            mapKeyArr = mapKey.split(",");
+
+            /******完成数据csv文件的封装******/
+            /******输出列头******/
+            for (int i = 0; i < colNamesArr.length; i++) {
+                buf.append(colNamesArr[i]).append(CSV_COLUMN_SEPARATOR);
+            }
+            buf.append(CSV_RN);
+
+            if (null != dataList) {
+            	/******输出数据******/
+                for (int i = 0; i < dataList.size(); i++) {
+                    for (int j = 0; j < mapKeyArr.length; j++) {
+                        buf.append(dataList.get(i).get(mapKeyArr[j])).append(CSV_COLUM_TABLE).append(CSV_COLUMN_SEPARATOR);
+                    }
+                    buf.append(CSV_RN);
+                }
+            }
+            /******写出响应******/
+            os.write(buf.toString().getBytes("GBK"));
+            os.flush();
+            return true;
+        } catch (Exception e) {
+            logger.error("doExport错误...", e);
+        }
+        return false;
+    }
+    
+    /**
+     * 设置响应格式
+     * @param fileName
+     * @param response
+     * @throws UnsupportedEncodingException
+     */
+    public static void responseSetProperties(String fileName, HttpServletResponse response) throws UnsupportedEncodingException {
+        /******设置文件后缀******/
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
+        String fn = fileName + sdf.format(new Date()).toString() + ".csv";
+        /******读取字符编码******/
+        String utf = "UTF-8";
+
+        /******设置响应******/
+        response.setContentType("application/ms-txt.numberformat:@");
+        response.setCharacterEncoding(utf);
+        response.setHeader("Pragma", "public");
+        response.setHeader("Cache-Control", "max-age=30");
+        response.setHeader("Content-Disposition", "attachment; filename=" + URLEncoder.encode(fn, utf));
+    }
+}

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

+package com.pms.ocp.common.utils;
+
+import cn.afterturn.easypoi.excel.ExcelImportUtil;
+import cn.afterturn.easypoi.excel.entity.ImportParams;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+import java.util.NoSuchElementException;
+
+/**
+ * 导入工具类
+ */
+public class FileUtil {
+    public static <T> List<T> importExcel(MultipartFile file, Integer titleRows, Integer headerRows, Class<T> pojoClass)
+            throws Exception {
+        if (file == null) {
+            return null;
+        }
+        ImportParams params = new ImportParams();
+        params.setTitleRows(titleRows);
+        params.setHeadRows(headerRows);
+        List<T> list = null;
+        try {
+            list = ExcelImportUtil.importExcel(file.getInputStream(), pojoClass, params);
+        } catch (NoSuchElementException e) {
+            throw new Exception("excel文件不能为空");
+        } catch (Exception e) {
+            throw new Exception(e.getMessage());
+        }
+        return list;
+    }
+
+
+}

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;
+
+import com.pms.ocp.model.dto.OcpApiBaseDto;
+import com.pms.ocp.model.entity.OcpApiBase;
+import com.pms.ocp.model.vo.OcpApiBaseVo;
+import com.pms.ocp.model.vo.ResponseVO;
+
+import com.pms.ocp.service.ApiBasicManagementService;
+import com.pms.ocp.service.ApiDetailsService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+
+import org.apache.commons.lang3.StringUtils;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.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
+@RequestMapping("/api/basic")
+@RestController
+@Api(tags = "服务库服务基础管理接口")
+public class ApiBasicManagementController {
+    @Autowired
+    private ApiDetailsService apiDetailsService;
+    @Autowired
+    private ApiBasicManagementService apiBasicManagementService;
+
+    @ApiOperation("条件查询")
+    @GetMapping("/queryOcpApiBaseDto")
+    public ResponseVO queryOcpApiBaseDto(@RequestParam(required = false) String apiCode,
+                                         @RequestParam(required = false) String keyword,
+                                         @RequestParam(required = false) String apiUnits,
+                                         @RequestParam(required = false) Timestamp startTime,
+                                         @RequestParam(required = false) Timestamp endTime,
+                                         @RequestParam(required = false) int pageSize,
+                                         @RequestParam(required = false) int pageNum
+    ) {
+       List<OcpApiBaseVo> list=apiBasicManagementService.queryOcpApiBaseDto(apiCode, keyword, apiUnits, startTime, endTime, pageSize
+                , pageNum);
+        return ResponseVO.ok(list);
+    }
+
+    @ApiOperation("导入功能")
+    @PostMapping("/import")
+    public ResponseVO ApiImport(@RequestParam(required = false) MultipartFile file,
+                                HttpServletRequest request) throws Exception {
+        if (file == null) {
+            return ResponseVO.ok("导入数据不能为空");
+        }
+        System.out.println(file);//用来检查前端是否把文件传过来
+        //解析excel，
+        List<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();
+    }
+
+    @ApiOperation("导出功能")
+    @GetMapping("/export")
+    public ResponseVO ApiExport(HttpServletResponse response,
+                                @RequestParam(required = false) String apiCodes,
+                                @RequestParam(required = false) String excelFileName) throws Exception {
+        if (StringUtils.isEmpty(apiCodes)) {
+            return ResponseVO.ok("请选择你要导出的数据");
+        }
+        List<OcpApiBaseVo> ocpApiBaseVoList = apiBasicManagementService.selectApiExport(apiCodes);
+
+        if (StringUtils.isEmpty(excelFileName)) {
+            excelFileName = "服务列表-";
+        }
+
+        //导出excel
+        ExcelUtils.exportExcel(response, excelFileName + LocalDate.now(), ocpApiBaseVoList, OcpApiBaseVo.class);
+
+
+
+        return ResponseVO.ok();
+    }
+
+//        @ApiOperation("下载模板")
+////    @GetMapping("/download")
+//    @GetMapping(value = "/download", produces = "text/plain;charset=UTF-8")
+//    public void ApiDownload(HttpServletResponse response) throws IOException {
+//        String filePate = getClass().getResource("/template/233.xls").getPath();
+//        InputStream bis = new BufferedInputStream(new FileInputStream(new File(filePate)));
+//        //假如以中文名下载的话,设置下载文件名称
+//        String filename = "导入模板.xls";
+//        //转码,免得文件中文名中文乱码
+//        filename = URLEncoder.encode(filename, "UTF-8");
+//        //设置文件下载头
+//        response.addHeader("Content-Disposition", "attachment;filename=" + filename);
+////        response.setHeader("Content-Length",bis.available()+"");
+//        //1.设置文件ContentType类型,这样设置.会自动判断下载文件类型
+//        response.setContentType("multipart/form-data");
+//        response.setCharacterEncoding("UTF-8");
+////        response.setContentType("application/x-download");
+//        BufferedOutputStream out = new BufferedOutputStream(response.getOutputStream());
+//        int len = 0;
+//        byte[] bytes = new byte[65536];
+////        bytes=bytes.toString().getBytes("GBK");
+//        while ((len = bis.read(bytes)) != -1) {
+//            out.write(bytes,0,len);
+//            out.flush();
+//        }
+//        out.close();
+//
+//    }
+//@GetMapping("/downloadExcel")
+//public void downloadExcel(HttpServletResponse response,HttpServletRequest request){
+//        try {
+//            String filename="233.xls";
+//            String encoding = "UTF-8";
+//            /** 获取浏览器相关的信息 */
+//            String userAgent = request.getHeader("user-agent");
+//            /** 判断是否为msie浏览器 */
+//            if (userAgent.toLowerCase().indexOf("msie") != -1){
+//                encoding = "gbk";
+//            }
+//            response.setHeader("Content-disposition", "attachment;filename=" + filename);
+//            response.setContentType("application/vnd.ms-excel;charset=UTF-8");
+//            String filePath = getClass().getResource("/template/" + filename).getPath();
+//            FileInputStream input = new FileInputStream(filePath);
+//            OutputStream outputStream = response.getOutputStream();
+//            byte[] b = new byte[2048];
+//            int len;
+//            while ((len=input.read(b))!=-1){
+//                outputStream.write(b,0,len);
+//            }
+//            response.setHeader("Content-Length",String.valueOf(input.getChannel().size()));
+//            input.close();
+//        }catch (Exception ex){
+//            log.error("xx:",ex);
+//        }
+//}
+    @ApiOperation("下载模块")
+    @GetMapping("/downloadExcel")
+    public void downloadExcel(HttpServletResponse response, HttpServletRequest request) {
+
+        String[] excelHeader = {"序号", "服务编码", "服务中文名称", "所属集群", "所属命名空间", "接口URL", "状态", "注册时间", "建设单位"};
+        List<Object> list = new ArrayList<>();
+        FileExport.exportExcel(excelHeader, list, "XXX模板", response, request);
+    }
+
+    @ApiOperation("服务注册")
+    @PostMapping("/add")
+    public ResponseVO addOcpApiBase(@RequestBody OcpApiBase ocpApiBase) {
+        apiBasicManagementService.addOcpApiBase(ocpApiBase);
+        return ResponseVO.ok();
+    }
+
+    @ApiOperation("服务订阅")
+    @PostMapping("/login")
+    public ResponseVO ApiLogin(@RequestParam(required = false) String apiPromotion,
+                               @RequestParam(required = false) String apiCodes) {
+        if (StringUtils.isEmpty(apiPromotion) || apiPromotion.equals("0")) {
+            return ResponseVO.error("统招");
+        } else {
+            apiBasicManagementService.apiLogin(apiCodes);
+            return ResponseVO.ok();
+        }
+
+    }
+
+    @ApiOperation("服务发布")
+    @PostMapping("/issue")
+    public ResponseVO ApiIssue(@RequestParam(required = false) String apiPromotion,
+                               @RequestParam(required = false) String apiCodes) {
+        if (StringUtils.isEmpty(apiPromotion) || apiPromotion.equals("0")) {
+            return ResponseVO.error("统招");
+        } else {
+            apiBasicManagementService.apiIssue(apiCodes);
+            return ResponseVO.ok();
+        }
+
+    }
+
+}

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

@@ -14,9 +14,9 @@ import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @className: AppArrangeController
- * @Description:应用分类管理接口
- * @atuthor: pei-chenxi
- * @DateTime: 2022/3/9 14:15
+ * @Dscription:应用分类管理接口
+ *  * @atuthor: pei-chenxi
+ *  * @DateTime: 2022/3/9 14:15e
  */
 @Slf4j
 @RestController

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

+package com.pms.ocp.controller;
+
+
+import com.pms.ocp.model.entity.*;
+import com.pms.ocp.model.vo.ResponseVO;
+import com.pms.ocp.service.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+
+@Slf4j
+@RequestMapping("/api")
+@RestController
+@Api(tags = "服务接口")
+public class OcpApiDetailsController {
+
+    @Autowired
+    private OcpApiSubsService ocpApiSubsService;
+
+    @Autowired
+    private OcpApiAuditService ocpApiAuditService;
+
+    @Autowired
+    private OcpApiTenantRelService ocpApiTenantRelService;
+
+    @Autowired
+    private OcpApiModelRelService ocpApiModelRelService;
+
+
+    @ApiOperation("服务订阅记录-查询")
+    @PostMapping("/getocpapisublist")
+    public ResponseVO getOcpApiSubsList(OcpApiSubs ocpApiSubs) {
+        return ocpApiSubsService.getOcpApiSubsList(ocpApiSubs);
+    }
+
+    @ApiOperation("服务大事记-查询")
+    @PostMapping("/getocpapiauditlist")
+    public ResponseVO getOcpApiAuditList(OcpApiAudit ocpApiAudit) {
+        return ocpApiAuditService.getOcpApiAuditList(ocpApiAudit);
+    }
+
+    @ApiOperation("服务大事记-查询详情")
+    @PostMapping("/getocpapidetails")
+    public ResponseVO getOcpApiDetails(@RequestBody OcpApiAudit ocpApiAudit){
+        return ocpApiAuditService.sById(ocpApiAudit);
+    }
+
+    @ApiOperation("服务大事记-查询详情")
+    @PostMapping("/getocpapi")
+    public ResponseVO getOcpApi(@RequestBody OcpApiAudit ocpApiAudit){
+        return ocpApiAuditService.OaaById(ocpApiAudit);
+    }
+
+    @ApiOperation("服务与应用拓扑图-查询")
+    @PostMapping("/getoatrlist")
+    public ResponseVO getOatrList(@RequestBody OcpApiTenantRel ocpApiTenantRel) {
+        return ocpApiTenantRelService.getOatrList(ocpApiTenantRel);
+    }
+
+    @ApiOperation("服务与模型拓扑图-查询")
+    @PostMapping("/getoamrlist")
+    public ResponseVO getOamrList(OcpApiModelRel ocpApiModelRel) {
+        return ocpApiModelRelService.getOamrList(ocpApiModelRel);
+    }
+
+    @ApiOperation("服务与模型拓扑图-关联查询详情")
+    @PostMapping("/getoaabyid")
+    public ResponseVO OaaById(@RequestBody OcpApiAudit ocpApiAudit) {
+        return ocpApiAuditService.OaaById(ocpApiAudit);
+    }
+
+    @ApiOperation("服务大事记-导出")
+    @GetMapping("/export")
+    public void exportExcel(@RequestBody OcpApiAudit ocpApiAudit, HttpServletRequest request, HttpServletResponse response) {
+        ocpApiAuditService.exportExcel(ocpApiAudit,request,response);
+    }
+
+
+
+}

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

+package com.pms.ocp.controller;
+
+import com.pms.ocp.model.entity.OcpTenantBase;
+import com.pms.ocp.model.vo.ResponseVO;
+import com.pms.ocp.service.OcpTenantBaseService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Slf4j
+@RequestMapping("/tenant")
+@RestController
+@Api(tags = "应用接口")
+public class OcpTenantDetailsController {
+
+    @Autowired
+    private OcpTenantBaseService ocpTenantBaseService;
+    @ApiOperation("应用基础信息-查询")
+    @PostMapping("/getotbList")
+    public ResponseVO getOtbList(@RequestBody OcpTenantBase ocpTenantBase){
+        return ocpTenantBaseService.getOtbList(ocpTenantBase);
+    }
+}

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

+package com.pms.ocp.controller;
+
+import com.pms.ocp.model.dto.OcpApiBaseDto;
+import com.pms.ocp.model.dto.OcpTenantBaseDto;
+import com.pms.ocp.model.vo.ResponseVO;
+import com.pms.ocp.service.TenantBasicManagementService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.sql.Timestamp;
+
+@Slf4j
+@RequestMapping("/tenant/basic")
+@RestController
+@Api(tags = "应用库服务基础管理接口")
+public class TenantBasicManagementController {
+    @Autowired
+    private TenantBasicManagementService tenantBasicManagementService;
+    @ApiOperation("条件查询")
+    @GetMapping("/queryOcpTenantBaseDto")
+    public ResponseVO queryOcpTenantBaseDto(
+                                         @RequestParam(required = false) String keyword,
+                                         @RequestParam(required = false) String tenantUnits,
+                                         @RequestParam(required = false) Timestamp startTime,
+                                         @RequestParam(required = false) Timestamp endTime,
+                                         @RequestParam(required = false) int pageSize,
+                                         @RequestParam(required = false) int pageNum
+    ) {
+        OcpTenantBaseDto ocpTenantBaseDto = tenantBasicManagementService.queryOcpTenantBaseDto( keyword, tenantUnits, startTime, endTime, pageSize
+                , pageNum);
+        return ResponseVO.ok(ocpTenantBaseDto);
+    }
+}

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

+package com.pms.ocp.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.pms.ocp.model.dto.OcpApiBaseDto;
+import com.pms.ocp.model.entity.OcpApiBase;
+import com.pms.ocp.model.vo.OcpApiBaseVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.sql.Timestamp;
+import java.util.List;
+
+@Mapper
+public interface ApiBasicManagementMapper extends BaseMapper<OcpApiBase> {
+    List<OcpApiBaseVo> selectApiExport(List<String> list);
+
+    List<OcpApiBaseVo> queryOcpApiBaseDto(@Param("keyword") String keyword,@Param("apiUnit") String apiUnit, @Param("startTime") Timestamp startTime, @Param("endTime") Timestamp endTime, @Param("apiCode") String apiCode, @Param("pageSize") int pageSize, @Param("pageNum") int pageNum);
+}

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

@@ -2,9 +2,15 @@ package com.pms.ocp.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.pms.ocp.model.entity.OcpApiBase;
+import com.pms.ocp.model.vo.OcpApiBaseVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 @Mapper
 public interface ApiDetailsMapper extends BaseMapper<OcpApiBase> {
 
+
+
 }

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

+package com.pms.ocp.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.pms.ocp.model.entity.OcpApiAudit;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * @Auther: liukai
+ * @Date: 2022/3/7
+ * @Description:服务大事记接口
+ */
+@Mapper
+public interface OcpApiAuditMapper extends BaseMapper<OcpApiAudit> {
+
+    List<OcpApiAudit> OaaById(OcpApiAudit ocpApiAudit);
+
+    List<String> getOcpApiSubsList(OcpApiAudit ocpApiAudit);
+
+    List<String> sById(OcpApiAudit ocpApiAudit);
+
+}

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

+package com.pms.ocp.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.pms.ocp.model.entity.OcpApiExtent;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface OcpApiExtentMapper extends BaseMapper<OcpApiExtent> {
+}

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

+package com.pms.ocp.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.pms.ocp.model.entity.OcpApiModelRel;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface OcpApiModelRelMapper extends BaseMapper<OcpApiModelRel> {
+    List<String> getOamrList(OcpApiModelRel ocpApiModelRel);
+
+
+}

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

+package com.pms.ocp.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.pms.ocp.model.entity.OcpApiSubs;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface OcpApiSubsMapper extends BaseMapper<OcpApiSubs> {
+    List<String> getOcpApisList(OcpApiSubs ocpApiSubs);
+}

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

+package com.pms.ocp.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.pms.ocp.model.entity.OcpApiTenantRel;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface OcpApiTenantRelMapper extends BaseMapper<OcpApiTenantRel> {
+
+    List<String> getOatrList(OcpApiTenantRel ocpApiTenantRel);
+}

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

+package com.pms.ocp.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.pms.ocp.model.entity.OcpTenantBase;
+
+import java.util.List;
+
+public interface OcpTenantBaseMapper extends BaseMapper<OcpTenantBase> {
+    List<OcpTenantBase> getOtbList(OcpTenantBase ocpTenantBase);
+}

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

+package com.pms.ocp.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.pms.ocp.model.dto.OcpTenantBaseDto;
+import com.pms.ocp.model.entity.OcpTenantBase;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.sql.Timestamp;
+import java.util.List;
+
+@Mapper
+public interface TenantBasicManagementMapper extends BaseMapper<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);
+}

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

+package com.pms.ocp.model.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.sql.Timestamp;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ApiBaseDto implements Serializable {
+    /**
+     * 服务编码
+     */
+    private String ApiCode;
+    /**
+     * 建设单位
+     */
+    private String apiUnit;
+    /**
+     * 注册时段-开始
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Timestamp startTime;
+    /**
+     * 注册时段-结束
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Timestamp endTime;
+    /**
+     * 关键字
+     */
+    private String keyword;
+}

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

+package com.pms.ocp.model.dto;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.pms.ocp.model.entity.OcpApiBase;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "服务基础信息表dto")
+public class OcpApiBaseDto extends OcpApiBase implements Serializable {
+    @ApiModelProperty("所属集群")
+    private String clusterName;
+    @ApiModelProperty("所属命名空间")
+    private String spaceName;
+    @ApiModelProperty( "状态")
+    private String apiState;
+}

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

+package com.pms.ocp.model.dto;
+
+import com.pms.ocp.model.entity.OcpTenantBase;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "应用信息表dto")
+public class OcpTenantBaseDto extends OcpTenantBase implements Serializable {
+    @ApiModelProperty("应用分类名称")
+    private String tenantGroupName;
+    @ApiModelProperty("集群名称")
+    private String clusterName;
+    @ApiModelProperty("命名空间")
+    private String spaceName;
+    @ApiModelProperty("部署名称")
+    private String deploymentName;
+}

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

@@ -3,7 +3,9 @@ package com.pms.ocp.model.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /**
  * @Auther: wangjian

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

 package com.pms.ocp.model.entity;
 
+import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -16,166 +17,103 @@ public class OcpApiAudit {
 
   @TableId(type = IdType.ASSIGN_ID)
   @ApiModelProperty("主键ID")
+  @Excel(name = "主键ID",orderNum = "1")
   private String objId;
 
   @ApiModelProperty("服务编码")
+  @Excel(name = "服务编码",orderNum = "2")
   private String apiCode;
 
   @ApiModelProperty("操作状态0:新增,1:迭代；2，下线")
+  @Excel(name = "操作状态",orderNum = "3")
   private long operStatus;
 
   @ApiModelProperty("操作对象0:服务，1:入参，2:出参")
+  @Excel(name = "操作对象",orderNum = "4")
   private long operTarget;
 
   @ApiModelProperty("类型0:人工操作,1:流程管控,3:总部下发")
+  @Excel(name = "操作对象",orderNum = "4")
   private long auditType;
 
   @ApiModelProperty("备注简述")
+  @Excel(name = "备注简述",orderNum = "5")
   private String auditMessage;
 
   @ApiModelProperty("事记内容")
+  @Excel(name = "事记内容",orderNum = "6")
   private String auditJson;
 
   @ApiModelProperty("提交人id")
+  @Excel(name = "提交人id",orderNum = "7")
   private String auditUserId;
 
   @ApiModelProperty("提交人姓名")
+  @Excel(name = "提交人姓名",orderNum = "8")
   private String auditUserName;
 
   @ApiModelProperty("创建时间")
+  @Excel(name = "创建时间",orderNum = "9")
   private Timestamp auditCtime;
 
   @ApiModelProperty("修改时间")
+  @Excel(name = "修改时间",orderNum = "10")
   private Timestamp auditMtime;
 
   @ApiModelProperty("是否删除0-否1-是")
+  @Excel(name = "是否删除",orderNum = "11")
   private long isDelete;
   @ApiModelProperty("当前版本")
+  @Excel(name = "当前版本",orderNum = "12")
   private long applyVersion;
   @ApiModelProperty("上一版本")
-  private long preApplyVersion;
+  @Excel(name = "上一版本",orderNum = "13")
+  private long preApiVersion;
 
-  public long getApplyVersion() {
-    return applyVersion;
-  }
+  @ApiModelProperty("服务接口中文名称")
+  private String apiName;
 
-  public void setApplyVersion(long applyVersion) {
-    this.applyVersion = applyVersion;
-  }
+  @ApiModelProperty("服务分类代码")
+  private String apiGroupCode;
 
-  public long getPreApplyVersion() {
-    return preApplyVersion;
-  }
+  @ApiModelProperty("推广类型0:统建；1:自建")
+  private long apiPromotion;
 
-  public void setPreApplyVersion(long preApplyVersion) {
-    this.preApplyVersion = preApplyVersion;
-  }
+  @ApiModelProperty("服务请求体")
+  private String apiReq;
 
-  public String getObjId() {
-    return objId;
-  }
+  @ApiModelProperty("服务返回体")
+  private String apiResp;
 
-  public void setObjId(String objId) {
-    this.objId = objId;
-  }
+  @ApiModelProperty("服务地址")
+  private String apiUrl;
 
+  @ApiModelProperty("服务创建时间")
+  private Timestamp apiCtime;
 
-  public String getApiCode() {
-    return apiCode;
-  }
+  @ApiModelProperty("服务修改时间")
+  private Timestamp apiMtime;
 
-  public void setApiCode(String apiCode) {
-    this.apiCode = apiCode;
-  }
+  @ApiModelProperty("创建者用户ID")
+  private String apiUserId;
 
+  @ApiModelProperty("建设单位")
+  private String apiUnit;
 
-  public long getOperStatus() {
-    return operStatus;
-  }
+  @ApiModelProperty("服务所属公司")
+  private String ownerCompanyCode;
 
-  public void setOperStatus(long operStatus) {
-    this.operStatus = operStatus;
-  }
+  @ApiModelProperty("服务所属公司")
+  private String ownerCompanyName;
 
+  @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区")
+  private long apiZone;
 
-  public long getOperTarget() {
-    return operTarget;
-  }
+  @ApiModelProperty("'所属层级 1:应用层;2:平台层;3:网络层;4:感知层;")
+  private long apiLayer;
 
-  public void setOperTarget(long operTarget) {
-    this.operTarget = operTarget;
-  }
+  @ApiModelProperty("服务版本（最新版本）")
+  private long apiVersion;
 
 
-  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;
-  }
-
 }

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

@@ -24,7 +24,7 @@ public class OcpApiBase {
   private String apiCode;
 
   @ApiModelProperty("服务接口中文名称")
-  private String apiName;
+      private String apiName;
 
   @ApiModelProperty("服务分类代码")
   private String apiGroupCode;

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

@@ -37,6 +37,105 @@ public class OcpApiModelRel {
   @ApiModelProperty("是否已删除 0-否1-是")
   private long isDelete;
 
+  @ApiModelProperty("服务接口中文名称")
+  private String apiName;
+
+  @ApiModelProperty("服务分类代码")
+  private String apiGroupCode;
+
+  @ApiModelProperty("推广类型0:统建；1:自建")
+  private long apiPromotion;
+
+  @ApiModelProperty("服务请求体")
+  private String apiReq;
+
+  @ApiModelProperty("服务返回体")
+  private String apiResp;
+
+  @ApiModelProperty("服务地址")
+  private String apiUrl;
+
+  @ApiModelProperty("服务创建时间")
+  private Timestamp apiCtime;
+
+  @ApiModelProperty("服务修改时间")
+  private Timestamp apiMtime;
+
+  @ApiModelProperty("创建者用户ID")
+  private String apiUserId;
+
+  @ApiModelProperty("建设单位")
+  private String apiUnit;
+
+  @ApiModelProperty("服务所属公司")
+  private String ownerCompanyCode;
+
+  @ApiModelProperty("服务所属公司")
+  private String ownerCompanyName;
+
+  @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区")
+  private long apiZone;
+
+  @ApiModelProperty("'所属层级 1:应用层;2:平台层;3:网络层;4:感知层;")
+  private long apiLayer;
+
+  @ApiModelProperty("服务版本（最新版本）")
+  private long apiVersion;
+
+  @ApiModelProperty("应用编码")
+  private String tenantCode;
+
+  @ApiModelProperty("应用名称")
+  private String tenantName;
+
+  @ApiModelProperty("应用分类代码")
+  private String tenantGroupCode;
+
+  @ApiModelProperty("应用IP")
+  private String tenantIp;
+
+  @ApiModelProperty("应用url")
+  private String tenantUrl;
+
+  @ApiModelProperty("所属专业")
+  private String professionalKind;
+
+  @ApiModelProperty("创建者用户ID")
+  private String tenantUserId;
+
+  @ApiModelProperty("排序")
+  private String tenantOrderNo;
+
+  @ApiModelProperty("创建时间")
+  private String tenantCtime;
+
+  @ApiModelProperty("最后更新时间")
+  private String tenantMtime;
+
+  @ApiModelProperty("部署名称")
+  private String deploymentName;
+
+  @ApiModelProperty("描述")
+  private String tenantDescription;
+
+  @ApiModelProperty("应用状态0设计 1运行态")
+  private String tenantState;
+
+
+  @ApiModelProperty("建设单位")
+  private String tenantUnit;
+
+  @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区")
+  private String tenantZone;
+
+  @ApiModelProperty("所属层级 1:应用层;2:平台层;3:网络层;4:感知层")
+  private String tenantLayer;
+
+  @ApiModelProperty("应用版本（当前版本）")
+  private String tenantVersion;
+
+  @ApiModelProperty("应用版本（当前版本）")
+  private String tenanttVersion;
 
   public String getObjId() {
     return objId;
@@ -46,7 +145,6 @@ public class OcpApiModelRel {
     this.objId = objId;
   }
 
-
   public String getModelCode() {
     return modelCode;
   }
@@ -55,7 +153,6 @@ public class OcpApiModelRel {
     this.modelCode = modelCode;
   }
 
-
   public String getModelDepCompanyCode() {
     return modelDepCompanyCode;
   }
@@ -64,7 +161,6 @@ public class OcpApiModelRel {
     this.modelDepCompanyCode = modelDepCompanyCode;
   }
 
-
   public String getApiCode() {
     return apiCode;
   }
@@ -73,7 +169,6 @@ public class OcpApiModelRel {
     this.apiCode = apiCode;
   }
 
-
   public String getApiDepCompanyCode() {
     return apiDepCompanyCode;
   }
@@ -82,7 +177,6 @@ public class OcpApiModelRel {
     this.apiDepCompanyCode = apiDepCompanyCode;
   }
 
-
   public Timestamp getRelationCtime() {
     return relationCtime;
   }
@@ -91,7 +185,6 @@ public class OcpApiModelRel {
     this.relationCtime = relationCtime;
   }
 
-
   public long getIsDelete() {
     return isDelete;
   }
@@ -100,4 +193,267 @@ public class OcpApiModelRel {
     this.isDelete = isDelete;
   }
 
+  public String getApiName() {
+    return apiName;
+  }
+
+  public void setApiName(String apiName) {
+    this.apiName = apiName;
+  }
+
+  public String getApiGroupCode() {
+    return apiGroupCode;
+  }
+
+  public void setApiGroupCode(String apiGroupCode) {
+    this.apiGroupCode = apiGroupCode;
+  }
+
+  public long getApiPromotion() {
+    return apiPromotion;
+  }
+
+  public void setApiPromotion(long apiPromotion) {
+    this.apiPromotion = apiPromotion;
+  }
+
+  public String getApiReq() {
+    return apiReq;
+  }
+
+  public void setApiReq(String apiReq) {
+    this.apiReq = apiReq;
+  }
+
+  public String getApiResp() {
+    return apiResp;
+  }
+
+  public void setApiResp(String apiResp) {
+    this.apiResp = apiResp;
+  }
+
+  public String getApiUrl() {
+    return apiUrl;
+  }
+
+  public void setApiUrl(String apiUrl) {
+    this.apiUrl = apiUrl;
+  }
+
+  public Timestamp getApiCtime() {
+    return apiCtime;
+  }
+
+  public void setApiCtime(Timestamp apiCtime) {
+    this.apiCtime = apiCtime;
+  }
+
+  public Timestamp getApiMtime() {
+    return apiMtime;
+  }
+
+  public void setApiMtime(Timestamp apiMtime) {
+    this.apiMtime = apiMtime;
+  }
+
+  public String getApiUserId() {
+    return apiUserId;
+  }
+
+  public void setApiUserId(String apiUserId) {
+    this.apiUserId = apiUserId;
+  }
+
+  public String getApiUnit() {
+    return apiUnit;
+  }
+
+  public void setApiUnit(String apiUnit) {
+    this.apiUnit = apiUnit;
+  }
+
+  public String getOwnerCompanyCode() {
+    return ownerCompanyCode;
+  }
+
+  public void setOwnerCompanyCode(String ownerCompanyCode) {
+    this.ownerCompanyCode = ownerCompanyCode;
+  }
+
+  public String getOwnerCompanyName() {
+    return ownerCompanyName;
+  }
+
+  public void setOwnerCompanyName(String ownerCompanyName) {
+    this.ownerCompanyName = ownerCompanyName;
+  }
+
+  public long getApiZone() {
+    return apiZone;
+  }
+
+  public void setApiZone(long apiZone) {
+    this.apiZone = apiZone;
+  }
+
+  public long getApiLayer() {
+    return apiLayer;
+  }
+
+  public void setApiLayer(long apiLayer) {
+    this.apiLayer = apiLayer;
+  }
+
+  public long getApiVersion() {
+    return apiVersion;
+  }
+
+  public void setApiVersion(long apiVersion) {
+    this.apiVersion = apiVersion;
+  }
+
+  public String getTenantCode() {
+    return tenantCode;
+  }
+
+  public void setTenantCode(String tenantCode) {
+    this.tenantCode = tenantCode;
+  }
+
+  public String getTenantName() {
+    return tenantName;
+  }
+
+  public void setTenantName(String tenantName) {
+    this.tenantName = tenantName;
+  }
+
+  public String getTenantGroupCode() {
+    return tenantGroupCode;
+  }
+
+  public void setTenantGroupCode(String tenantGroupCode) {
+    this.tenantGroupCode = tenantGroupCode;
+  }
+
+  public String getTenantIp() {
+    return tenantIp;
+  }
+
+  public void setTenantIp(String tenantIp) {
+    this.tenantIp = tenantIp;
+  }
+
+  public String getTenantUrl() {
+    return tenantUrl;
+  }
+
+  public void setTenantUrl(String tenantUrl) {
+    this.tenantUrl = tenantUrl;
+  }
+
+  public String getProfessionalKind() {
+    return professionalKind;
+  }
+
+  public void setProfessionalKind(String professionalKind) {
+    this.professionalKind = professionalKind;
+  }
+
+  public String getTenantUserId() {
+    return tenantUserId;
+  }
+
+  public void setTenantUserId(String tenantUserId) {
+    this.tenantUserId = tenantUserId;
+  }
+
+  public String getTenantOrderNo() {
+    return tenantOrderNo;
+  }
+
+  public void setTenantOrderNo(String tenantOrderNo) {
+    this.tenantOrderNo = tenantOrderNo;
+  }
+
+  public String getTenantCtime() {
+    return tenantCtime;
+  }
+
+  public void setTenantCtime(String tenantCtime) {
+    this.tenantCtime = tenantCtime;
+  }
+
+  public String getTenantMtime() {
+    return tenantMtime;
+  }
+
+  public void setTenantMtime(String tenantMtime) {
+    this.tenantMtime = tenantMtime;
+  }
+
+  public String getDeploymentName() {
+    return deploymentName;
+  }
+
+  public void setDeploymentName(String deploymentName) {
+    this.deploymentName = deploymentName;
+  }
+
+  public String getTenantDescription() {
+    return tenantDescription;
+  }
+
+  public void setTenantDescription(String tenantDescription) {
+    this.tenantDescription = tenantDescription;
+  }
+
+  public String getTenantState() {
+    return tenantState;
+  }
+
+  public void setTenantState(String tenantState) {
+    this.tenantState = tenantState;
+  }
+
+  public String getTenantUnit() {
+    return tenantUnit;
+  }
+
+  public void setTenantUnit(String tenantUnit) {
+    this.tenantUnit = tenantUnit;
+  }
+
+  public String getTenantZone() {
+    return tenantZone;
+  }
+
+  public void setTenantZone(String tenantZone) {
+    this.tenantZone = tenantZone;
+  }
+
+  public String getTenantLayer() {
+    return tenantLayer;
+  }
+
+  public void setTenantLayer(String tenantLayer) {
+    this.tenantLayer = tenantLayer;
+  }
+
+  public String getTenantVersion() {
+    return tenantVersion;
+  }
+
+  public void setTenantVersion(String tenantVersion) {
+    this.tenantVersion = tenantVersion;
+  }
+
+  public String getTenanttVersion() {
+    return tenanttVersion;
+  }
+
+  public void setTenanttVersion(String tenanttVersion) {
+    this.tenanttVersion = tenanttVersion;
+  }
 }

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

@@ -40,7 +40,6 @@ public class OcpApiSubs {
   @ApiModelProperty("是否删除0-否，1-是")
   private long isDelete;
 
-
   public String getObjId() {
     return objId;
   }
@@ -49,7 +48,6 @@ public class OcpApiSubs {
     this.objId = objId;
   }
 
-
   public String getApiCode() {
     return apiCode;
   }
@@ -58,7 +56,6 @@ public class OcpApiSubs {
     this.apiCode = apiCode;
   }
 
-
   public Timestamp getSubsLogApiCtime() {
     return subsLogApiCtime;
   }
@@ -67,7 +64,6 @@ public class OcpApiSubs {
     this.subsLogApiCtime = subsLogApiCtime;
   }
 
-
   public Timestamp getSubsLogApiMtime() {
     return subsLogApiMtime;
   }
@@ -76,7 +72,6 @@ public class OcpApiSubs {
     this.subsLogApiMtime = subsLogApiMtime;
   }
 
-
   public String getSubsLogApiUserId() {
     return subsLogApiUserId;
   }
@@ -85,7 +80,6 @@ public class OcpApiSubs {
     this.subsLogApiUserId = subsLogApiUserId;
   }
 
-
   public Timestamp getSubsLogApiAtime() {
     return subsLogApiAtime;
   }
@@ -94,7 +88,6 @@ public class OcpApiSubs {
     this.subsLogApiAtime = subsLogApiAtime;
   }
 
-
   public String getSubsCompanyCode() {
     return subsCompanyCode;
   }
@@ -103,11 +96,6 @@ public class OcpApiSubs {
     this.subsCompanyCode = subsCompanyCode;
   }
 
-
-  public long getIsDelete() {
-    return isDelete;
-  }
-
   public void setIsDelete(long isDelete) {
     this.isDelete = isDelete;
   }

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

@@ -46,6 +46,98 @@ public class OcpApiTenantRel {
   @ApiModelProperty("是否已删除0未删除，1已删除")
   private long isDelete;
 
+  @ApiModelProperty("服务接口中文名称")
+  private String apiName;
+
+  @ApiModelProperty("服务分类代码")
+  private String apiGroupCode;
+
+  @ApiModelProperty("推广类型0:统建；1:自建")
+  private long apiPromotion;
+
+  @ApiModelProperty("服务请求体")
+  private String apiReq;
+
+  @ApiModelProperty("服务返回体")
+  private String apiResp;
+
+  @ApiModelProperty("服务地址")
+  private String apiUrl;
+
+  @ApiModelProperty("服务创建时间")
+  private Timestamp apiCtime;
+
+  @ApiModelProperty("服务修改时间")
+  private Timestamp apiMtime;
+
+  @ApiModelProperty("创建者用户ID")
+  private String apiUserId;
+
+  @ApiModelProperty("建设单位")
+  private String apiUnit;
+
+  @ApiModelProperty("服务所属公司")
+  private String ownerCompanyCode;
+
+  @ApiModelProperty("服务所属公司")
+  private String ownerCompanyName;
+
+  @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区")
+  private long apiZone;
+
+  @ApiModelProperty("'所属层级 1:应用层;2:平台层;3:网络层;4:感知层;")
+  private long apiLayer;
+
+  @ApiModelProperty("服务版本（最新版本）")
+  private long apiVersion;
+
+  @ApiModelProperty("应用名称")
+  private String tenantName;
+
+  @ApiModelProperty("应用分类代码")
+  private String tenantGroupCode;
+
+  @ApiModelProperty("应用IP")
+  private String tenantIp;
+
+  @ApiModelProperty("应用url")
+  private String tenantUrl;
+
+  @ApiModelProperty("所属专业")
+  private String professionalKind;
+
+  @ApiModelProperty("创建者用户ID")
+  private String tenantUserId;
+
+  @ApiModelProperty("排序")
+  private String tenantOrderNo;
+
+  @ApiModelProperty("创建时间")
+  private String tenantCtime;
+
+  @ApiModelProperty("最后更新时间")
+  private String tenantMtime;
+
+  @ApiModelProperty("部署名称")
+  private String deploymentName;
+
+  @ApiModelProperty("描述")
+  private String tenantDescription;
+
+  @ApiModelProperty("应用状态0设计 1运行态")
+  private String tenantState;
+
+  @ApiModelProperty("建设单位")
+  private String tenantUnit;
+
+  @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区")
+  private String tenantZone;
+
+  @ApiModelProperty("所属层级 1:应用层;2:平台层;3:网络层;4:感知层")
+  private String tenantLayer;
+
+  @ApiModelProperty("应用版本（当前版本）")
+  private String tenantVersion;
 
   public String getObjId() {
     return objId;
@@ -55,7 +147,6 @@ public class OcpApiTenantRel {
     this.objId = objId;
   }
 
-
   public String getTenantCode() {
     return tenantCode;
   }
@@ -64,7 +155,6 @@ public class OcpApiTenantRel {
     this.tenantCode = tenantCode;
   }
 
-
   public String getApiCode() {
     return apiCode;
   }
@@ -73,7 +163,6 @@ public class OcpApiTenantRel {
     this.apiCode = apiCode;
   }
 
-
   public String getApiDepCompanyCode() {
     return apiDepCompanyCode;
   }
@@ -82,7 +171,6 @@ public class OcpApiTenantRel {
     this.apiDepCompanyCode = apiDepCompanyCode;
   }
 
-
   public String getTenantDepCompanyCode() {
     return tenantDepCompanyCode;
   }
@@ -91,7 +179,6 @@ public class OcpApiTenantRel {
     this.tenantDepCompanyCode = tenantDepCompanyCode;
   }
 
-
   public Timestamp getApiTenantRelCtime() {
     return apiTenantRelCtime;
   }
@@ -100,7 +187,6 @@ public class OcpApiTenantRel {
     this.apiTenantRelCtime = apiTenantRelCtime;
   }
 
-
   public Timestamp getApiTenantRelMtime() {
     return apiTenantRelMtime;
   }
@@ -109,7 +195,6 @@ public class OcpApiTenantRel {
     this.apiTenantRelMtime = apiTenantRelMtime;
   }
 
-
   public String getApiTenantRelUserId() {
     return apiTenantRelUserId;
   }
@@ -118,7 +203,6 @@ public class OcpApiTenantRel {
     this.apiTenantRelUserId = apiTenantRelUserId;
   }
 
-
   public String getApiTenantRelUserName() {
     return apiTenantRelUserName;
   }
@@ -127,7 +211,6 @@ public class OcpApiTenantRel {
     this.apiTenantRelUserName = apiTenantRelUserName;
   }
 
-
   public long getIsDelete() {
     return isDelete;
   }
@@ -136,4 +219,251 @@ public class OcpApiTenantRel {
     this.isDelete = isDelete;
   }
 
+  public String getApiName() {
+    return apiName;
+  }
+
+  public void setApiName(String apiName) {
+    this.apiName = apiName;
+  }
+
+  public String getApiGroupCode() {
+    return apiGroupCode;
+  }
+
+  public void setApiGroupCode(String apiGroupCode) {
+    this.apiGroupCode = apiGroupCode;
+  }
+
+  public long getApiPromotion() {
+    return apiPromotion;
+  }
+
+  public void setApiPromotion(long apiPromotion) {
+    this.apiPromotion = apiPromotion;
+  }
+
+  public String getApiReq() {
+    return apiReq;
+  }
+
+  public void setApiReq(String apiReq) {
+    this.apiReq = apiReq;
+  }
+
+  public String getApiResp() {
+    return apiResp;
+  }
+
+  public void setApiResp(String apiResp) {
+    this.apiResp = apiResp;
+  }
+
+  public String getApiUrl() {
+    return apiUrl;
+  }
+
+  public void setApiUrl(String apiUrl) {
+    this.apiUrl = apiUrl;
+  }
+
+  public Timestamp getApiCtime() {
+    return apiCtime;
+  }
+
+  public void setApiCtime(Timestamp apiCtime) {
+    this.apiCtime = apiCtime;
+  }
+
+  public Timestamp getApiMtime() {
+    return apiMtime;
+  }
+
+  public void setApiMtime(Timestamp apiMtime) {
+    this.apiMtime = apiMtime;
+  }
+
+  public String getApiUserId() {
+    return apiUserId;
+  }
+
+  public void setApiUserId(String apiUserId) {
+    this.apiUserId = apiUserId;
+  }
+
+  public String getApiUnit() {
+    return apiUnit;
+  }
+
+  public void setApiUnit(String apiUnit) {
+    this.apiUnit = apiUnit;
+  }
+
+  public String getOwnerCompanyCode() {
+    return ownerCompanyCode;
+  }
+
+  public void setOwnerCompanyCode(String ownerCompanyCode) {
+    this.ownerCompanyCode = ownerCompanyCode;
+  }
+
+  public String getOwnerCompanyName() {
+    return ownerCompanyName;
+  }
+
+  public void setOwnerCompanyName(String ownerCompanyName) {
+    this.ownerCompanyName = ownerCompanyName;
+  }
+
+  public long getApiZone() {
+    return apiZone;
+  }
+
+  public void setApiZone(long apiZone) {
+    this.apiZone = apiZone;
+  }
+
+  public long getApiLayer() {
+    return apiLayer;
+  }
+
+  public void setApiLayer(long apiLayer) {
+    this.apiLayer = apiLayer;
+  }
+
+  public long getApiVersion() {
+    return apiVersion;
+  }
+
+  public void setApiVersion(long apiVersion) {
+    this.apiVersion = apiVersion;
+  }
+
+  public String getTenantName() {
+    return tenantName;
+  }
+
+  public void setTenantName(String tenantName) {
+    this.tenantName = tenantName;
+  }
+
+  public String getTenantGroupCode() {
+    return tenantGroupCode;
+  }
+
+  public void setTenantGroupCode(String tenantGroupCode) {
+    this.tenantGroupCode = tenantGroupCode;
+  }
+
+  public String getTenantIp() {
+    return tenantIp;
+  }
+
+  public void setTenantIp(String tenantIp) {
+    this.tenantIp = tenantIp;
+  }
+
+  public String getTenantUrl() {
+    return tenantUrl;
+  }
+
+  public void setTenantUrl(String tenantUrl) {
+    this.tenantUrl = tenantUrl;
+  }
+
+  public String getProfessionalKind() {
+    return professionalKind;
+  }
+
+  public void setProfessionalKind(String professionalKind) {
+    this.professionalKind = professionalKind;
+  }
+
+  public String getTenantUserId() {
+    return tenantUserId;
+  }
+
+  public void setTenantUserId(String tenantUserId) {
+    this.tenantUserId = tenantUserId;
+  }
+
+  public String getTenantOrderNo() {
+    return tenantOrderNo;
+  }
+
+  public void setTenantOrderNo(String tenantOrderNo) {
+    this.tenantOrderNo = tenantOrderNo;
+  }
+
+  public String getTenantCtime() {
+    return tenantCtime;
+  }
+
+  public void setTenantCtime(String tenantCtime) {
+    this.tenantCtime = tenantCtime;
+  }
+
+  public String getTenantMtime() {
+    return tenantMtime;
+  }
+
+  public void setTenantMtime(String tenantMtime) {
+    this.tenantMtime = tenantMtime;
+  }
+
+  public String getDeploymentName() {
+    return deploymentName;
+  }
+
+  public void setDeploymentName(String deploymentName) {
+    this.deploymentName = deploymentName;
+  }
+
+  public String getTenantDescription() {
+    return tenantDescription;
+  }
+
+  public void setTenantDescription(String tenantDescription) {
+    this.tenantDescription = tenantDescription;
+  }
+
+  public String getTenantState() {
+    return tenantState;
+  }
+
+  public void setTenantState(String tenantState) {
+    this.tenantState = tenantState;
+  }
+
+  public String getTenantUnit() {
+    return tenantUnit;
+  }
+
+  public void setTenantUnit(String tenantUnit) {
+    this.tenantUnit = tenantUnit;
+  }
+
+  public String getTenantZone() {
+    return tenantZone;
+  }
+
+  public void setTenantZone(String tenantZone) {
+    this.tenantZone = tenantZone;
+  }
+
+  public String getTenantLayer() {
+    return tenantLayer;
+  }
+
+  public void setTenantLayer(String tenantLayer) {
+    this.tenantLayer = tenantLayer;
+  }
+
+  public String getTenantVersion() {
+    return tenantVersion;
+  }
+
+  public void setTenantVersion(String tenantVersion) {
+    this.tenantVersion = tenantVersion;
+  }
 }

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

@@ -9,6 +9,7 @@ import lombok.Data;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.sql.Timestamp;
 import java.util.Date;
 
 /**
@@ -79,13 +80,13 @@ public class OcpTenantBase implements Serializable {
      * 创建时间
      */
     @ApiModelProperty("创建时间")
-    private Date tenantCtime;
+    private Timestamp tenantCtime;
 
     /**
      * 最后更新时间
      */
     @ApiModelProperty("最后更新时间")
-    private Date tenantMtime;
+    private Timestamp tenantMtime;
 
     /**
      * 部署名称
@@ -285,7 +286,7 @@ public class OcpTenantBase implements Serializable {
     /**
      * 创建时间
      */
-    public void setTenantCtime(Date tenantCtime) {
+    public void setTenantCtime(Timestamp tenantCtime) {
         this.tenantCtime = tenantCtime;
     }
 
@@ -299,7 +300,7 @@ public class OcpTenantBase implements Serializable {
     /**
      * 最后更新时间
      */
-    public void setTenantMtime(Date tenantMtime) {
+    public void setTenantMtime(Timestamp tenantMtime) {
         this.tenantMtime = tenantMtime;
     }
 

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

@@ -9,6 +9,7 @@ import lombok.Data;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.sql.Timestamp;
 import java.util.Date;
 
 /**
@@ -43,13 +44,13 @@ public class OcpTenantSubs implements Serializable {
      * 服务订阅创建时间
      */
     @ApiModelProperty("服务订阅创建时间")
-    private Date subsLogTenantCtime;
+    private Timestamp subsLogTenantCtime;
 
     /**
      * 服务订阅修改时间
      */
     @ApiModelProperty("服务订阅修改时间")
-    private Date subsLogTenantMtime;
+    private Timestamp subsLogTenantMtime;
 
     /**
      * 服务订阅创建用户ID
@@ -61,7 +62,7 @@ public class OcpTenantSubs implements Serializable {
      * 服务订阅添加时间
      */
     @ApiModelProperty("服务订阅添加时间")
-    private Date subsLogTenantAtime;
+    private Timestamp subsLogTenantAtime;
 
     /**
      * 是否删除0-否，1-是
@@ -123,7 +124,7 @@ public class OcpTenantSubs implements Serializable {
     /**
      * 服务订阅创建时间
      */
-    public void setSubsLogTenantCtime(Date subsLogTenantCtime) {
+    public void setSubsLogTenantCtime(Timestamp subsLogTenantCtime) {
         this.subsLogTenantCtime = subsLogTenantCtime;
     }
 
@@ -137,7 +138,7 @@ public class OcpTenantSubs implements Serializable {
     /**
      * 服务订阅修改时间
      */
-    public void setSubsLogTenantMtime(Date subsLogTenantMtime) {
+    public void setSubsLogTenantMtime(Timestamp subsLogTenantMtime) {
         this.subsLogTenantMtime = subsLogTenantMtime;
     }
 
@@ -165,7 +166,7 @@ public class OcpTenantSubs implements Serializable {
     /**
      * 服务订阅添加时间
      */
-    public void setSubsLogTenantAtime(Date subsLogTenantAtime) {
+    public void setSubsLogTenantAtime(Timestamp subsLogTenantAtime) {
         this.subsLogTenantAtime = subsLogTenantAtime;
     }
 

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

+package com.pms.ocp.model.vo;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
+
+import java.io.Serializable;
+import java.sql.Timestamp;
+import java.time.LocalDateTime;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "服务列表信息vo")
+public class OcpApiBaseVo implements Serializable {
+    @ApiModelProperty(value = "序号")
+    @Excel(name = "序号")
+    private String objId;
+    @ApiModelProperty(value = "服务编码")
+    @Excel(name = "服务编码")
+    private String apiCode;
+    @ApiModelProperty(value = "服务中文名称")
+    @Excel(name = "服务中文名称")
+    private String apiName;
+    @ApiModelProperty(value = "所属集群")
+    @Excel(name = "所属集群")
+    private String clusterName;
+    @ApiModelProperty(value = "所属命名空间")
+    @Excel(name = "所属命名空间")
+    private String spaceName;
+    @ApiModelProperty(value = "接口URL")
+    @Excel(name = "接口URL")
+    private String apiUrl;
+    @ApiModelProperty(value = "状态")
+    @Excel(name = "状态")
+    private String apiState;
+    @ApiModelProperty(value = "注册时间")
+    @Excel(name = "注册时间")
+    private Timestamp apiCtime;
+    @ApiModelProperty(value = "建设单位")
+    @Excel(name = "建设单位")
+    private String apiUnit;
+
+}
+

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

+package com.pms.ocp.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+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.vo.OcpApiBaseVo;
+
+import java.sql.Timestamp;
+import java.util.List;
+
+public interface ApiBasicManagementService extends IService<OcpApiBase> {
+    /**
+     * 导出的查询
+     * @param apiCode
+     * @return
+     */
+    List<OcpApiBaseVo> selectApiExport(String apiCodes);
+
+
+
+    /**
+     * 服务注册
+     * @param ocpApiBase
+     */
+    void addOcpApiBase(OcpApiBase ocpApiBase);
+
+    /**
+     * 服务订阅
+     * @param apiCodes
+     */
+    void apiLogin(String apiCodes);
+
+    /**
+     * 条件查询
+     * @param apiCode
+     * @param keyword
+     * @param apiUnit
+     * @param startTime
+     * @param endTime
+     * @return
+     */
+//    OcpApiBaseDto queryOcpApiBaseDto(ApiBaseDto apiBaseDto);
+    List<OcpApiBaseVo> queryOcpApiBaseDto(String apiCode, String keyword, String apiUnits, Timestamp startTime, Timestamp endTime, int pageSize, int pageNum);
+    /**
+     * 导入的添加到数据库
+     * @param personList
+     */
+    void apiImport(List<OcpApiBaseVo> personList);
+
+    /**
+     * 服务发布
+     * @param apiCodes
+     */
+    void apiIssue(String apiCodes);
+
+
+}

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

 package com.pms.ocp.service;
 
 
+import com.pms.ocp.model.entity.OcpApiBase;
+import com.pms.ocp.model.vo.OcpApiBaseVo;
 import com.pms.ocp.model.vo.ResponseVO;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.util.List;
 
 public interface ApiDetailsService{
     /**
@@ -10,4 +16,6 @@ public interface ApiDetailsService{
      * @return
      */
     ResponseVO getApiDetails(String objId);
+
+
 }

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

+package com.pms.ocp.service;
+
+import com.pms.ocp.model.entity.OcpApiAudit;
+import com.pms.ocp.model.vo.ResponseVO;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+
+public interface OcpApiAuditService {
+    ResponseVO getOcpApiAuditList(OcpApiAudit ocpApiAudit);
+
+    ResponseVO getOcpApiDetails(String objId);
+
+//    ResponseVO getOcpApiList(Oaa oaa);
+
+    ResponseVO OaaById(OcpApiAudit ocpApiAudit);
+
+    ResponseVO sById(OcpApiAudit ocpApiAudit);
+
+    void exportExcel(OcpApiAudit ocpApiAudit, HttpServletRequest request, HttpServletResponse response);
+}

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

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

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

+package com.pms.ocp.service;
+
+
+import com.pms.ocp.model.entity.OcpApiModelRel;
+import com.pms.ocp.model.vo.ResponseVO;
+
+public interface OcpApiModelRelService {
+    ResponseVO getOamrList(OcpApiModelRel ocpApiModelRel);
+}

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

+package com.pms.ocp.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.pms.ocp.model.entity.OcpApiSubs;
+import com.pms.ocp.model.vo.ResponseVO;
+
+public interface OcpApiSubsService {
+    ResponseVO getOcpApiSubsList(OcpApiSubs ocpApiSubs);
+}

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

+package com.pms.ocp.service;
+
+import com.pms.ocp.model.entity.OcpApiTenantRel;
+import com.pms.ocp.model.vo.ResponseVO;
+
+
+public interface OcpApiTenantRelService {
+   ResponseVO getOatrList(OcpApiTenantRel ocpApiTenantRel);
+}

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

+package com.pms.ocp.service;
+
+import com.pms.ocp.model.entity.OcpTenantBase;
+import com.pms.ocp.model.vo.ResponseVO;
+
+public interface OcpTenantBaseService {
+    ResponseVO getOtbList(OcpTenantBase ocpTenantBase);
+}

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

+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 java.sql.Timestamp;
+
+public interface TenantBasicManagementService extends IService<OcpTenantBase> {
+    /**
+     * 应用条件查询
+     * @param keyword
+     * @param tenantUnits
+     * @param startTime
+     * @param endTime
+     * @param pageSize
+     * @param pageNum
+     * @return
+     */
+    OcpTenantBaseDto queryOcpTenantBaseDto(String keyword, String tenantUnits, Timestamp startTime, Timestamp endTime, int pageSize, int pageNum);
+}

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.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.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.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.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.sql.Timestamp;
+import java.time.LocalDateTime;
+
+import java.util.Arrays;
+
+import java.util.List;
+
+@Service
+public class ApiBasicManagementServiceImpl extends ServiceImpl<ApiBasicManagementMapper, OcpApiBase>
+        implements ApiBasicManagementService {
+    @Autowired
+    private ApiBasicManagementMapper apiBasicManagementMapper;
+    @Autowired
+    private OcpApiSubsService ocpApiSubsService;
+    @Autowired
+    private OcpApiExtentService ocpApiExtentService;
+    @Autowired
+    private OcpApiExtentMapper ocpApiExtentMapper;
+
+    /**
+     * 导出查询
+     *
+     * @param apiCodes
+     * @return
+     */
+    public List<OcpApiBaseVo> selectApiExport(String apiCodes) {
+        String[] split = apiCodes.split(",");
+        List<String> list = Arrays.asList(split);
+        return apiBasicManagementMapper.selectApiExport(list);
+
+    }
+
+    /**
+     * 服务注册
+     *
+     * @param ocpApiBase
+     */
+    public void addOcpApiBase(OcpApiBase ocpApiBase) {
+        apiBasicManagementMapper.insert(ocpApiBase);
+    }
+
+    /**
+     * 服务订阅
+     *
+     * @param apiCodes
+     */
+    public void apiLogin(String apiCodes) {
+        String[] split = apiCodes.split(",");
+        List<String> apiCode = Arrays.asList(split);
+        for (String s : apiCode) {
+            OcpApiSubs ocpApiSubs = new OcpApiSubs();
+            ocpApiSubs.setApiCode(s);
+            ocpApiSubs.setSubsLogApiCtime(Timestamp.valueOf(LocalDateTime.now()));
+            ocpApiSubs.setSubsLogApiMtime(Timestamp.valueOf(LocalDateTime.now()));
+            ocpApiSubs.setSubsLogApiUserId(null);
+            ocpApiSubs.setSubsLogApiAtime(Timestamp.valueOf(LocalDateTime.now()));
+            ocpApiSubs.setSubsCompanyCode(null);
+           // ocpApiSubsService.save(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 startTime
+     * @param endTime
+     * @return
+     */
+//    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);
+//        pageSize = (pageSize - 1) * pageNum;
+//        OcpApiBaseDto ocpApiBaseDto = apiBasicManagementMapper.queryOcpApiBaseDto(keyword, apiUnits, startTime, endTime, apiCode, pageSize, pageNum);
+//        return ocpApiBaseDto;
+//    }
+
+    /**
+     * 导入添加到数据库
+     *
+     * @param personList
+     */
+    public void apiImport(List<OcpApiBaseVo> personList) {
+        for (OcpApiBaseVo ocpApiBaseVo : personList) {
+            String apiCode = ocpApiBaseVo.getApiCode();
+            Timestamp apiCtime = ocpApiBaseVo.getApiCtime();
+            String apiName = ocpApiBaseVo.getApiName();
+            String apiUnit = ocpApiBaseVo.getApiUnit();
+            String apiUrl = ocpApiBaseVo.getApiUrl();
+            String apiState = ocpApiBaseVo.getApiState();
+            String spaceName = ocpApiBaseVo.getSpaceName();
+            String clusterName = ocpApiBaseVo.getClusterName();
+            OcpApiBase ocpApiBase = new OcpApiBase();
+            ocpApiBase.setApiCode(apiCode);
+            ocpApiBase.setApiGroupCode("1");
+            ocpApiBase.setApiCtime(apiCtime);
+            ocpApiBase.setApiName(apiName);
+            ocpApiBase.setApiUnit(apiUnit);
+            ocpApiBase.setApiUrl(apiUrl);
+            this.save(ocpApiBase);
+            OcpApiExtent ocpApiExtent = new OcpApiExtent();
+            ocpApiExtent.setApiCode(apiCode);
+            ocpApiExtent.setApiState(apiState);
+            ocpApiExtent.setSpaceName(spaceName);
+            ocpApiExtent.setClusterName(clusterName);
+            ocpApiExtentService.save(ocpApiExtent);
+
+        }
+    }
+
+    /**
+     * 服务发布
+     *
+     * @param apiCodes
+     */
+    public void apiIssue(String apiCodes) {
+        String[] split = apiCodes.split(",");
+        List<String> list = Arrays.asList(split);
+        LambdaQueryWrapper<OcpApiExtent> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.in(OcpApiExtent::getApiCode, list);
+        List<OcpApiExtent> ocpApiExtents = ocpApiExtentMapper.selectList(lambdaQueryWrapper);
+        for (OcpApiExtent ocpApiExtent : ocpApiExtents) {
+            if (ocpApiExtent.getApiState().equals("1")) {
+                throw new BeagleException("已发布");
+            } else {
+                ocpApiExtent.setApiState("1");
+                ocpApiExtentMapper.updateById(ocpApiExtent);
+            }
+        }
+
+    }
+
+}

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

 package com.pms.ocp.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.pms.ocp.mapper.ApiDetailsMapper;
 import com.pms.ocp.model.entity.OcpApiBase;
+import com.pms.ocp.model.entity.OcpApiExtent;
+import com.pms.ocp.model.entity.OcpApiSubs;
+import com.pms.ocp.model.vo.OcpApiBaseVo;
 import com.pms.ocp.model.vo.ResponseVO;
 import com.pms.ocp.service.ApiDetailsService;
+import com.pms.ocp.service.OcpApiExtentService;
+import com.pms.ocp.service.OcpApiSubsService;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.xssf.usermodel.XSSFRow;
+import org.apache.poi.xssf.usermodel.XSSFSheet;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.sql.Timestamp;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 @Service
 public class ApiDetailsServiceImpl implements ApiDetailsService {
+
+
     @Autowired
     private ApiDetailsMapper apiDetailsMapper;
+
+
     @Override
     public ResponseVO getApiDetails(String objId) {
         OcpApiBase ocpApiBase = apiDetailsMapper.selectById(objId);
         return ResponseVO.ok(ocpApiBase);
     }
+
+
 }