From b85229987312b92dea2fae42299ef93de88f579e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=83=A1=E7=A7=80=E6=AD=A6?= <18621965254@yeah.net> Date: Sat, 12 Mar 2022 17:37:27 +0800 Subject: [PATCH] =?UTF-8?q?=E8=83=A1=E7=A7=80=E6=AD=A6:=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=A0=91=E5=AF=BC=E8=88=AA=E6=A0=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pms/ocp/common/aspectj/OperLogAspect.java | 23 +- .../pms/ocp/common/constants/ExportUtils.java | 13 +- .../{ResultCode.java => ResultCodee.java} | 4 +- .../common/constants/ServiceException.java | 36 ++ .../common/exception/ServiceException.java | 64 --- .../utils/DataStructureHandleUtils.java | 79 --- .../com/pms/ocp/common/utils/ExcelUtils.java | 186 +------- .../com/pms/ocp/common/utils/MapUtils.java | 32 ++ .../com/pms/ocp/common/utils/PageRequest.java | 2 +- ...StringUtils.java => RandomStringUtil.java} | 5 +- .../ApiBasicManagementController.java | 26 - .../ocp/controller/ModelBaseController.java | 162 +++---- .../ocp/controller/OcpTenantController.java | 21 +- ...cribeMapper.java => ModelIssueMapper.java} | 5 +- .../java/com/pms/ocp/mapper/ModelMapper.java | 6 - ...lAuditMapper.java => ModelNoteMapper.java} | 5 +- .../com/pms/ocp/mapper/OcpApiGroupMapper.java | 22 - src/main/java/com/pms/ocp/model/Response.java | 4 +- .../com/pms/ocp/model/dto/ApiBaseDto.java | 138 +----- .../java/com/pms/ocp/model/dto/ModelDTO.java | 174 ------- ...elSubscribeDTO.java => ModelIssueDTO.java} | 2 +- .../pms/ocp/model/dto/PageOcpTenantDto.java | 237 --------- .../java/com/pms/ocp/model/entity/Model.java | 141 ++---- .../pms/ocp/model/entity/ModelClassify.java | 3 +- .../{ModelSubscribe.java => ModelIssue.java} | 9 +- .../{ModelAudit.java => ModelNote.java} | 2 +- .../pms/ocp/model/entity/ModelProperty.java | 3 +- .../pms/ocp/model/entity/ModelRelation.java | 3 +- .../pms/ocp/model/entity/OcpApiModelRel.java | 320 ++++++++++++- .../com/pms/ocp/model/entity/OcpApiSubs.java | 9 +- .../pms/ocp/model/entity/OcpApiTenantRel.java | 326 +++++++++++++ .../pms/ocp/model/entity/OcpTenantAudit.java | 451 +++++------------- .../pms/ocp/model/entity/OcpTenantSubs.java | 126 +---- .../com/pms/ocp/model/entity/TreeNode.java | 3 - .../com/pms/ocp/model/vo/ModelAuditVO.java | 131 ----- .../java/com/pms/ocp/model/vo/ModelVO.java | 159 +----- .../com/pms/ocp/model/vo/OcpModelGroupVO.java | 4 - .../service/ApiBasicManagementService.java | 33 +- ...ibeService.java => ModelIssueService.java} | 17 +- ...uditService.java => ModelNoteService.java} | 24 +- .../pms/ocp/service/ModelPropertyService.java | 2 +- .../pms/ocp/service/ModelRelationService.java | 2 +- .../com/pms/ocp/service/ModelService.java | 29 +- .../pms/ocp/service/OcpApiAuditService.java | 3 +- .../ocp/service/OcpApiModelRelService.java | 3 +- .../pms/ocp/service/OcpApiSubsService.java | 2 +- .../ocp/service/OcpApiTenantRelService.java | 3 +- .../ocp/service/OcpTenantAuditService.java | 4 +- .../pms/ocp/service/OcpTenantBaseService.java | 3 +- .../com/pms/ocp/service/TenantService.java | 15 - .../impl/ApiBasicManagementServiceImpl.java | 86 ---- .../service/impl/ModelAuditServiceImpl.java | 60 --- .../impl/ModelClassifyServiceImpl.java | 1 + .../service/impl/ModelNoteServiceImpl.java | 51 ++ .../impl/ModelPropertyServiceImpl.java | 2 +- .../impl/ModelRelationServiceImpl.java | 4 +- .../ocp/service/impl/ModelServiceImpl.java | 123 ++--- .../impl/ModelSubscribeServiceImpl.java | 84 ---- .../service/impl/OcpApiTreeServiceImpl.java | 26 +- .../impl/OcpTenantAuditServiceImpl.java | 9 +- .../ocp/service/impl/TenantServiceImpl.java | 69 +-- src/main/resources/mapper/ModelMapper.xml | 107 ++++- .../resources/mapper/OcpApiGroupMapper.xml | 82 ---- .../resources/mapper/OcpApiModelRelMapper.xml | 2 +- .../mapper/OcpApiTenantRelMapper.xml | 2 +- .../resources/mapper/OcpTenantAuditMapper.xml | 10 +- 66 files changed, 1299 insertions(+), 2495 deletions(-) rename src/main/java/com/pms/ocp/common/constants/{ResultCode.java => ResultCodee.java} (98%) create mode 100644 src/main/java/com/pms/ocp/common/constants/ServiceException.java delete mode 100644 src/main/java/com/pms/ocp/common/exception/ServiceException.java delete mode 100644 src/main/java/com/pms/ocp/common/utils/DataStructureHandleUtils.java create mode 100644 src/main/java/com/pms/ocp/common/utils/MapUtils.java rename src/main/java/com/pms/ocp/common/utils/{RandomStringUtils.java => RandomStringUtil.java} (87%) rename src/main/java/com/pms/ocp/mapper/{ModelSubscribeMapper.java => ModelIssueMapper.java} (81%) rename src/main/java/com/pms/ocp/mapper/{ModelAuditMapper.java => ModelNoteMapper.java} (62%) delete mode 100644 src/main/java/com/pms/ocp/mapper/OcpApiGroupMapper.java delete mode 100644 src/main/java/com/pms/ocp/model/dto/ModelDTO.java rename src/main/java/com/pms/ocp/model/dto/{ModelSubscribeDTO.java => ModelIssueDTO.java} (98%) delete mode 100644 src/main/java/com/pms/ocp/model/dto/PageOcpTenantDto.java rename src/main/java/com/pms/ocp/model/entity/{ModelSubscribe.java => ModelIssue.java} (88%) rename src/main/java/com/pms/ocp/model/entity/{ModelAudit.java => ModelNote.java} (99%) delete mode 100644 src/main/java/com/pms/ocp/model/vo/ModelAuditVO.java rename src/main/java/com/pms/ocp/service/{ModelSubscribeService.java => ModelIssueService.java} (63%) rename src/main/java/com/pms/ocp/service/{ModelAuditService.java => ModelNoteService.java} (55%) delete mode 100644 src/main/java/com/pms/ocp/service/impl/ModelAuditServiceImpl.java create mode 100644 src/main/java/com/pms/ocp/service/impl/ModelNoteServiceImpl.java delete mode 100644 src/main/java/com/pms/ocp/service/impl/ModelSubscribeServiceImpl.java delete mode 100644 src/main/resources/mapper/OcpApiGroupMapper.xml diff --git a/src/main/java/com/pms/ocp/common/aspectj/OperLogAspect.java b/src/main/java/com/pms/ocp/common/aspectj/OperLogAspect.java index 8caf2b7..2fab759 100644 --- a/src/main/java/com/pms/ocp/common/aspectj/OperLogAspect.java +++ b/src/main/java/com/pms/ocp/common/aspectj/OperLogAspect.java @@ -2,8 +2,9 @@ package com.pms.ocp.common.aspectj; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.serializer.PropertyFilter; -import com.pms.ocp.model.entity.ModelAudit; -import com.pms.ocp.service.ModelAuditService; +import com.pms.ocp.model.entity.ModelNote; +import com.pms.ocp.service.ModelNoteService; +import com.sun.xml.internal.bind.v2.TODO; import org.apache.commons.lang3.StringUtils; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.ProceedingJoinPoint; @@ -38,7 +39,7 @@ import java.time.LocalDateTime; public class OperLogAspect { @Autowired - private ModelAuditService modelAuditService; + private ModelNoteService modelNoteService; private static Logger logger = LoggerFactory.getLogger(OperLogAspect.class); @@ -64,25 +65,25 @@ public class OperLogAspect { private void saveSysLog(ProceedingJoinPoint point, long time, Object obj) { MethodSignature signature = (MethodSignature) point.getSignature(); Method method = signature.getMethod(); - ModelAudit modelAudit = new ModelAudit(); + ModelNote modelNote = new ModelNote(); OperLog operLog = method.getAnnotation(OperLog.class); if (operLog != null) { String content = operLog.value(); - modelAudit.setAuditType(operLog.auditType()); - modelAudit.setAuditMessageJson(content); + modelNote.setAuditType(operLog.auditType()); + modelNote.setAuditMessageJson(content); } //请求的方法名 // String className = point.getTarget().getClass().getName(); String methodName = signature.getName(); // dto.setMethod(className + "." + methodName + "()"); //设置操作类型 - if (modelAudit.getAuditType() == 3) { - modelAudit.setOperStatus(getOperateType(methodName, operLog.operStatus())); + if (modelNote.getAuditType() == 3) { + modelNote.setOperStatus(getOperateType(methodName, operLog.operStatus())); } //获取request HttpServletRequest request = getHttpServletRequest(); //请求的参数 - modelAudit.setAuditMessageJson(getRequestParams(request, point)); + modelNote.setAuditMessageJson(getRequestParams(request, point)); // //设置ip地址 // dto.setIp(getIpAddr(request)); //获取用户登录信息 @@ -93,9 +94,9 @@ public class OperLogAspect { // modelNote.setUsername(user.getPassWord()); // } // modelNote.setCostTime(time); - modelAudit.setAuditCtime(LocalDateTime.now()); + modelNote.setAuditCtime(LocalDateTime.now()); - modelAuditService.createModelNote(modelAudit); + modelNoteService.createModelNote(modelNote); } private int getOperateType(String methodName, int operateType) { diff --git a/src/main/java/com/pms/ocp/common/constants/ExportUtils.java b/src/main/java/com/pms/ocp/common/constants/ExportUtils.java index c938e56..8893138 100644 --- a/src/main/java/com/pms/ocp/common/constants/ExportUtils.java +++ b/src/main/java/com/pms/ocp/common/constants/ExportUtils.java @@ -1,7 +1,6 @@ package com.pms.ocp.common.constants; -import com.pms.ocp.common.exception.ServiceException; import org.apache.poi.ss.usermodel.Workbook; import javax.servlet.ServletOutputStream; @@ -17,12 +16,11 @@ 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]"; @@ -57,9 +55,9 @@ public class ExportUtils { out.flush(); } catch (IOException e) { e.printStackTrace(); - throw new ServiceException(ResultCode.INTERNAL_SERVER_ERROR); + throw new ServiceException(com.pms.ocp.common.constants.ResultCodee.INTERNAL_SERVER_ERROR); } finally { - if (out != null) { + if (out != null){ try { out.close(); } catch (IOException e) { @@ -80,7 +78,6 @@ public class ExportUtils { /** * Workbook导出浏览器 * 文件导出添加跨域 Access-Control-Allow-Origin - * * @param response * @param fileName * @param workbook @@ -97,7 +94,7 @@ public class ExportUtils { workbook.write(outputStream); } catch (IOException e) { e.printStackTrace(); - throw new ServiceException(ResultCode.INTERNAL_SERVER_ERROR); + throw new ServiceException(com.pms.ocp.common.constants.ResultCodee.INTERNAL_SERVER_ERROR); } } @@ -145,7 +142,7 @@ public class ExportUtils { } } catch (IOException e) { e.printStackTrace(); - throw new ServiceException(ResultCode.INTERNAL_SERVER_ERROR); + throw new ServiceException(ResultCodee.INTERNAL_SERVER_ERROR); } } } diff --git a/src/main/java/com/pms/ocp/common/constants/ResultCode.java b/src/main/java/com/pms/ocp/common/constants/ResultCodee.java similarity index 98% rename from src/main/java/com/pms/ocp/common/constants/ResultCode.java rename to src/main/java/com/pms/ocp/common/constants/ResultCodee.java index cf05925..605dec1 100644 --- a/src/main/java/com/pms/ocp/common/constants/ResultCode.java +++ b/src/main/java/com/pms/ocp/common/constants/ResultCodee.java @@ -3,7 +3,7 @@ package com.pms.ocp.common.constants; /** * 异常枚举类 */ -public enum ResultCode { +public enum ResultCodee { /* ============================ 通用错误码 ========================== **/ /** * 禁止访问 303 @@ -154,7 +154,7 @@ public enum ResultCode { public final int statusCode; public String msg; - ResultCode(int statusCode, String msg) { + ResultCodee(int statusCode, String msg) { this.statusCode = statusCode; this.msg = msg; } diff --git a/src/main/java/com/pms/ocp/common/constants/ServiceException.java b/src/main/java/com/pms/ocp/common/constants/ServiceException.java new file mode 100644 index 0000000..febd9a2 --- /dev/null +++ b/src/main/java/com/pms/ocp/common/constants/ServiceException.java @@ -0,0 +1,36 @@ +package com.pms.ocp.common.constants; + +public class ServiceException extends RuntimeException { + private static final long serialVersionUID = -6914996666319154848L; + /** + * 状态编码 + */ + public final int statusCode; + /** + * message信息 + */ + public final String msg; + /** + * 数据对象 + */ + public Object data; + + public ServiceException(String message, ResultCodee resultCode) { + super(message); + this.statusCode = resultCode.statusCode; + this.msg = message; + } + + public ServiceException(String message, ResultCodee resultCode, Object data) { + this(message, resultCode); + this.data = data; + } + + public ServiceException(ResultCodee resultCode) { + this(resultCode.msg, resultCode); + } + + public ServiceException(ResultCodee resultCode, Object data) { + this(resultCode.msg, resultCode, data); + } +} diff --git a/src/main/java/com/pms/ocp/common/exception/ServiceException.java b/src/main/java/com/pms/ocp/common/exception/ServiceException.java deleted file mode 100644 index 3751714..0000000 --- a/src/main/java/com/pms/ocp/common/exception/ServiceException.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.pms.ocp.common.exception; - -import com.pms.ocp.common.constants.ResultCode; - -/** - * @Auther: wangjian - * @Date: 2022/3/11 16:31 - * @Description: - */ -public class ServiceException extends RuntimeException { - - /** - * 自定义异常枚举类 - */ - private ResultCode resultCode; - - /** - * 错误码 - */ - private int code; - - /** - * 错误信息 - */ - private String errorMsg; - - - public ServiceException() { - super(); - } - - public ServiceException(ResultCode resultCode) { - super("{code:" + resultCode.getStatusCode() + ",errorMsg:" + resultCode.getMessage() + "}"); - this.resultCode = resultCode; - this.code = resultCode.getStatusCode(); - this.errorMsg = resultCode.getMessage(); - } - - public ServiceException(int code, String errorMsg) { - super("{code:" + code + ",errorMsg:" + errorMsg + "}"); - this.code = code; - this.errorMsg = errorMsg; - } - - public ResultCode getErrorEnum() { - return resultCode; - } - - public String getErrorMsg() { - return errorMsg; - } - - public void setErrorMsg(String errorMsg) { - this.errorMsg = errorMsg; - } - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } -} diff --git a/src/main/java/com/pms/ocp/common/utils/DataStructureHandleUtils.java b/src/main/java/com/pms/ocp/common/utils/DataStructureHandleUtils.java deleted file mode 100644 index d23dd3b..0000000 --- a/src/main/java/com/pms/ocp/common/utils/DataStructureHandleUtils.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.pms.ocp.common.utils; - -import org.apache.commons.lang3.StringUtils; - -import java.lang.reflect.Field; -import java.math.BigDecimal; -import java.sql.Date; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -/** - * @Auther: wangjian - * @Date: 2022/3/12 13:29 - * @Description:数据结构处理工具类 - */ -public class DataStructureHandleUtils { - /** - * List> 到 List 数据转换 - */ - public static List setList(final List> srcList, Class clazz) { - List list = new ArrayList<>(); - for (int i = 0; i < srcList.size(); i++) { - try { - T t = clazz.newInstance(); - Field[] fields = t.getClass().getDeclaredFields(); - for (Field field : fields) { - if (!"serialVersionUID".equals(field.getName())) { - //设置对象的访问权限，保证对private的属性的访问 - field.setAccessible(true); - //读取配置转换字段名，并从map中取出数据 - Object v = srcList.get(i).get(field.getName()); - field.set(t, convert(v, field.getType())); - } - } - list.add(t); - } catch (Exception ex) { - ex.toString(); - } - - } - ; - return list; - } - - /** - * 字段类型转换 - */ - private static T convert(Object obj, Class type) throws ParseException { - if (obj != null && StringUtils.isNotBlank(obj.toString())) { - if (type.equals(String.class)) { - return (T) obj.toString(); - } else if (type.equals(BigDecimal.class)) { - return (T) new BigDecimal(obj.toString()); - } else if (type.equals(Double.class)) { - return (T) Double.valueOf(obj.toString()); - } else if (type.equals(Integer.class)) { - return (T) Integer.valueOf(obj.toString()); - } else if (type.equals(Date.class)) { - if (obj != null) { - String timeStr = String.valueOf(obj); - String s[] = timeStr.split("T"); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - return (T) sdf.parse(s[0] + " " + s[1]); - } else { - return null; - } - } else { - //其他类型转换 - return (T) obj.toString(); - } - - } - return null; - } - -} diff --git a/src/main/java/com/pms/ocp/common/utils/ExcelUtils.java b/src/main/java/com/pms/ocp/common/utils/ExcelUtils.java index 40027df..1e1c066 100644 --- a/src/main/java/com/pms/ocp/common/utils/ExcelUtils.java +++ b/src/main/java/com/pms/ocp/common/utils/ExcelUtils.java @@ -1,26 +1,21 @@ 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.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Date; +import java.util.List; /** * @author huxiuwu @@ -29,12 +24,6 @@ import java.util.*; */ public class ExcelUtils { - //xls 后缀 - private static final String XLS = ".xls"; - //xlsx 后缀 - private static final String XLS_X = ".xlsx"; - - /** * 导出excel通用方法 * @@ -140,171 +129,4 @@ public class ExcelUtils { out.flush(); } - /** - * 下载 - * - * @param fileName 文件名称 - * @param response - * @param workbook excel数据 - */ - private static void downLoadExcel(String fileName, HttpServletResponse response, Workbook workbook) - throws IOException { - try { - response.setCharacterEncoding("UTF-8"); - response.setHeader("content-Type", "application/vnd.ms-excel"); - response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName + "." + ExcelTypeEnum.XLSX.getValue(), "UTF-8")); - workbook.write(response.getOutputStream()); - } catch (Exception e) { - throw new IOException(e.getMessage()); - } - } - - /** - * excel 导入 - * - * @param filePath excel文件路径 - * @param titleRows 标题行 - * @param headerRows 表头行 - * @param pojoClass pojo类型 - * @param - * @return - */ - public static List importExcel(String filePath, Integer titleRows, Integer headerRows, Class pojoClass) - throws IOException { - if (StringUtils.isBlank(filePath)) { - return null; - } - ImportParams params = new ImportParams(); - params.setTitleRows(titleRows); - params.setHeadRows(headerRows); - params.setNeedSave(true); - params.setSaveUrl("/excel/"); - try { - return ExcelImportUtil.importExcel(new File(filePath), pojoClass, params); - } catch (NoSuchElementException e) { - throw new IOException("模板不能为空"); - } catch (Exception e) { - throw new IOException(e.getMessage()); - } - } - - /** - * excel 导入 - * - * @param file excel文件 - * @param pojoClass pojo类型 - * @param - * @return - */ - public static List importExcel(MultipartFile file, Class pojoClass) - throws IOException { - return importExcel(file, 0, 1, pojoClass); - } - - /** - * excel 导入 - * - * @param file excel文件 - * @param titleRows 标题行 - * @param headerRows 表头行 - * @param pojoClass pojo类型 - * @param - * @return - */ - public static List importExcel(MultipartFile file, Integer titleRows, Integer headerRows, Class pojoClass) - throws IOException { - return importExcel(file, titleRows, headerRows, false, pojoClass); - } - - /** - * excel 导入 - * - * @param file 上传的文件 - * @param titleRows 标题行 - * @param headerRows 表头行 - * @param needVerfiy 是否检验excel内容 - * @param pojoClass pojo类型 - * @param - * @return - */ - public static List importExcel(MultipartFile file, Integer titleRows, Integer headerRows, boolean needVerfiy, Class pojoClass) - throws IOException { - if (file == null) { - return null; - } - try { - return importExcel(file.getInputStream(), titleRows, headerRows, needVerfiy, pojoClass); - } catch (Exception e) { - throw new IOException(e.getMessage()); - } - } - - /** - * excel 导入 - * - * @param inputStream 文件输入流 - * @param titleRows 标题行 - * @param headerRows 表头行 - * @param needVerfiy 是否检验excel内容 - * @param pojoClass pojo类型 - * @param - * @return - */ - public static List importExcel(InputStream inputStream, Integer titleRows, Integer headerRows, boolean needVerfiy, Class pojoClass) - throws IOException { - if (inputStream == null) { - return null; - } - ImportParams params = new ImportParams(); - params.setTitleRows(titleRows); - params.setHeadRows(headerRows); - params.setSaveUrl("/excel/"); - params.setNeedSave(true); - params.setNeedVerify(needVerfiy); - try { - return ExcelImportUtil.importExcel(inputStream, pojoClass, params); - } catch (NoSuchElementException e) { - throw new IOException("excel文件不能为空"); - } catch (Exception e) { - throw new IOException(e.getMessage()); - } - } - - /** - * 检查文件 - * - * @param file - */ - public static void checkFile(MultipartFile file) { - if (file == null) { - throw new ServiceException(ResultCode.FILE_NOT_EXISTS); - } - - String fileName = file.getOriginalFilename(); - assert fileName != null; - if (!fileName.endsWith(XLS) && !fileName.endsWith(XLS_X)) { - throw new ServiceException(ResultCode.FILE_NOT_EXISTS); - } - } - - /** - * Excel 类型枚举 - */ - enum ExcelTypeEnum { - XLS("xls"), XLSX("xlsx"); - private String value; - - ExcelTypeEnum(String value) { - this.value = value; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - } - } diff --git a/src/main/java/com/pms/ocp/common/utils/MapUtils.java b/src/main/java/com/pms/ocp/common/utils/MapUtils.java new file mode 100644 index 0000000..26dc69c --- /dev/null +++ b/src/main/java/com/pms/ocp/common/utils/MapUtils.java @@ -0,0 +1,32 @@ +package com.pms.ocp.common.utils; + +import java.util.*; + +/** + * @Author: admin + * @Description: + * @Date: 2021/12/8 9:31 + * @Version: V1.0 + */ +public class MapUtils { + + /** + * Map 排序 + * + * @param map + * @return Map + */ + public static Map> treeMapDesc(Map> map) { + Map> treeMapDesc = new TreeMap<>(new Comparator() { + + @Override + public int compare(Date o1, Date o2) { + return o2.compareTo(o1); + } + }); + for (Map.Entry> e : map.entrySet()) { + treeMapDesc.put(e.getKey(), e.getValue()); + } + return treeMapDesc; + } +} diff --git a/src/main/java/com/pms/ocp/common/utils/PageRequest.java b/src/main/java/com/pms/ocp/common/utils/PageRequest.java index 3c6b581..ad0c4bd 100644 --- a/src/main/java/com/pms/ocp/common/utils/PageRequest.java +++ b/src/main/java/com/pms/ocp/common/utils/PageRequest.java @@ -10,7 +10,7 @@ import lombok.Data; * @author admin */ @Data -@ApiModel(value = "分页工具类", description = "分页工具类") +@ApiModel(value = "分页工具类",description = "分页工具类") public class PageRequest { private static final long serialVersionUID = 8167917284229912157L; diff --git a/src/main/java/com/pms/ocp/common/utils/RandomStringUtils.java b/src/main/java/com/pms/ocp/common/utils/RandomStringUtil.java similarity index 87% rename from src/main/java/com/pms/ocp/common/utils/RandomStringUtils.java rename to src/main/java/com/pms/ocp/common/utils/RandomStringUtil.java index 40c89cd..c90e3e4 100644 --- a/src/main/java/com/pms/ocp/common/utils/RandomStringUtils.java +++ b/src/main/java/com/pms/ocp/common/utils/RandomStringUtil.java @@ -1,12 +1,15 @@ package com.pms.ocp.common.utils; + +import org.apache.commons.lang3.RandomStringUtils; + import java.util.Random; /** * @author zhaochengming * 随机生成字符串 */ -public class RandomStringUtils { +public class RandomStringUtil { /** * length 字符串长度 diff --git a/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java b/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java index 986cb71..a88244c 100644 --- a/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java +++ b/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java @@ -1,16 +1,11 @@ package com.pms.ocp.controller; -import com.github.pagehelper.PageInfo; 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.QueryResponseResult; -import com.pms.ocp.model.dto.ApiBaseDto; -import com.pms.ocp.model.dto.ApiTreeGroupDto; import com.pms.ocp.model.dto.OcpApiBaseDto; import com.pms.ocp.model.entity.OcpApiBase; -import com.pms.ocp.model.entity.OcpApiGroup; import com.pms.ocp.model.vo.OcpApiBaseVo; import com.pms.ocp.model.vo.ResponseVO; @@ -20,7 +15,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.omg.PortableInterceptor.Interceptor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -188,24 +182,4 @@ public class ApiBasicManagementController { } - @ApiOperation("服务列表") - @GetMapping("/apiListQuery") - public ResponseVO> apiListQuery(HttpServletRequest request, ApiBaseDto ApiBaseReq) { - - return apiBasicManagementService.getBaseByGroupCode(ApiBaseReq); - } - @ApiOperation("服务树一级") - @GetMapping("/apiBaseTree") - public ResponseVO> apiBaseTree(String apiGroupCompanyCode, Integer apiGroupPromotionType) { - List apiTreeGroupDtos = apiBasicManagementService.apiBaseTreeOther(apiGroupCompanyCode,null,apiGroupPromotionType); - return ResponseVO.ok(apiTreeGroupDtos); - } - - @ApiOperation("服务树层级") - @GetMapping("/apiBaseTreeOther") - public ResponseVO> apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupCode, Integer apiGroupPromotionType) { - List apiTreeGroupDtos = apiBasicManagementService.apiBaseTreeOther(apiGroupCompanyCode,apiGroupCode,apiGroupPromotionType); - return ResponseVO.ok(apiTreeGroupDtos); - } - } diff --git a/src/main/java/com/pms/ocp/controller/ModelBaseController.java b/src/main/java/com/pms/ocp/controller/ModelBaseController.java index b7a1f11..df0846e 100644 --- a/src/main/java/com/pms/ocp/controller/ModelBaseController.java +++ b/src/main/java/com/pms/ocp/controller/ModelBaseController.java @@ -1,31 +1,23 @@ package com.pms.ocp.controller; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.pms.ocp.common.utils.ExcelUtils; -import com.pms.ocp.model.dto.ModelDTO; -import com.pms.ocp.model.dto.ModelSubscribeDTO; +import com.pms.ocp.model.dto.ModelIssueDTO; import com.pms.ocp.model.dto.ModelPropertyDTO; import com.pms.ocp.model.dto.ModelRelationDTO; import com.pms.ocp.model.entity.Model; -import com.pms.ocp.model.entity.ModelSubscribe; -import com.pms.ocp.model.entity.ModelAudit; -import com.pms.ocp.model.vo.ModelAuditVO; +import com.pms.ocp.model.entity.ModelNote; import com.pms.ocp.model.vo.ResponseVO; import com.pms.ocp.service.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.BeanUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; import java.util.List; -import java.util.stream.Collectors; + +import static com.pms.ocp.common.constants.CodeEnum.REQUIRED_PARAMETER_EMPTY; /** * @Auther: wangjian @@ -46,25 +38,61 @@ public class ModelBaseController { private ModelPropertyService modelPropertyService; @Autowired - private ModelAuditService modelAuditService; + private ModelNoteService modelNoteService; @Autowired - private ModelSubscribeService modelSubscribeService; + private ModelIssueService modelIssueService; @Autowired private ModelRelationService modelRelationService; + /** + * 模型分类-查询 + * + * @return + */ +// @ApiOperation("模型分类-查询") +// @GetMapping("/get/model/type") +// public ResponseVO getModelType() { +// return modelGroupService.getModelType(); +// } /** - * 模型-增加 + * 模型分类-增加 * * @return */ - @ApiOperation("模型-增加") - @PostMapping("/create/model") - public ResponseVO createModel(@RequestBody ModelDTO modelDTO) { +// @ApiOperation("模型分类-增加") +// @PostMapping("/create/model/type") +// public ResponseVO createModelType(ModelType modelType) { +// return modelGroupService.createModelType(modelType); +// } - return ResponseVO.ok(modelService.createModel(modelDTO)); - } + /** + * 模型分类-删除 + * + * @return + */ +// @ApiOperation("模型分类-删除") +// @PostMapping("/delete/model/type") +// public ResponseVO deleteModelType(ModelType modelType) { +// String modelTypeId = modelType.getObjId(); +// if (StringUtils.isNotBlank(modelTypeId)) { +// return modelGroupService.deleteModelType(modelTypeId); +// } else { +// return ResponseVO.error(CodeEnum.REQUIRED_PARAMETER_EMPTY); +// } +// } + + /** + * 模型分类-修改 + * + * @return + */ +// @ApiOperation("模型分类-修改") +// @PostMapping("/update/model/type") +// public ResponseVO updateModelType(ModelType modelType) { +// return modelGroupService.updateModelType(modelType); +// } /** * 模型-查询 @@ -73,16 +101,19 @@ public class ModelBaseController { */ @ApiOperation("模型-查询") @GetMapping("/get/model") - public ResponseVO getModel(@ApiParam(value = "模型订阅编号") @RequestParam(value = "objId", required = false) String objId, - @ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode, - @ApiParam(value = "当前页") @RequestParam(value = "currentPage", required = false) Integer currentPage, - @ApiParam(value = "每页数量") @RequestParam(value = "pageSize", required = false) Integer pageSize) { - - PageHelper.startPage(currentPage, pageSize); - List modelList = modelService.getModelList(objId, modelCode); - PageInfo pageInfo = new PageInfo<>(modelList); + public ResponseVO getModel() { + return modelService.getModelList(); + } - return ResponseVO.ok(pageInfo); + /** + * 模型-增加 + * + * @return + */ + @ApiOperation("模型-增加") + @PostMapping("/create/model") + public ResponseVO createModel(@RequestBody Model model) { + return modelService.createModel(model); } /** @@ -92,9 +123,13 @@ public class ModelBaseController { */ @ApiOperation("模型-删除") @PostMapping("/delete/model") - public ResponseVO deleteModel(@ApiParam(value = "模型订阅编号") @RequestParam(value = "objId", required = false) String objId, - @ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode) { - return ResponseVO.ok(modelService.deleteModel(objId, modelCode)); + public ResponseVO deleteModel(@RequestBody Model model) { + String modelId = model.getObjId(); + if (StringUtils.isNotBlank(modelId)) { + return modelService.deleteModel(modelId); + } else { + return ResponseVO.error(REQUIRED_PARAMETER_EMPTY); + } } /** @@ -104,19 +139,8 @@ public class ModelBaseController { */ @ApiOperation("模型-修改") @PostMapping("/update/model") - public ResponseVO updateModel(@RequestBody ModelDTO modelDTO) { - return ResponseVO.ok(modelService.updateModel(modelDTO)); - } - - /** - * 模型-导入 - * - * @return - */ - @ApiOperation("模型-导入") - @PostMapping("/import/model") - public ResponseVO importModel(@RequestParam("file") MultipartFile file) throws IOException { - return ResponseVO.ok(modelService.importModel(file)); + public ResponseVO updateModel(@RequestBody Model model) { + return modelService.updateModel(model); } /** @@ -149,8 +173,8 @@ public class ModelBaseController { */ @ApiOperation("模型订阅-增加") @PostMapping("/create/model/subscribe") - public ResponseVO createModelSubscribe(@RequestBody ModelSubscribeDTO modelSubscribeDTO) { - return ResponseVO.ok(modelSubscribeService.createModelIssue(modelSubscribeDTO)); + public ResponseVO createModelSubscribe(@RequestBody ModelIssueDTO modelIssueDTO) { + return ResponseVO.ok(modelIssueService.createModelIssue(modelIssueDTO)); } /** @@ -161,7 +185,7 @@ public class ModelBaseController { @ApiOperation("模型订阅-删除/批量删除") @PostMapping("/delete/model/subscribe") public ResponseVO deleteModelSubscribe(@ApiParam(value = "订阅编号集合") @RequestBody List ids) { - return ResponseVO.ok(modelSubscribeService.deleteBatchModelIssue(ids)); + return ResponseVO.ok(modelIssueService.deletePatchModelIssue(ids)); } /** @@ -173,15 +197,8 @@ public class ModelBaseController { @GetMapping("/get/model/subscribe") public ResponseVO getModelSubscribe(@ApiParam(value = "模型订阅编号") @RequestParam(value = "objId", required = false) String objId, @ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode, - @ApiParam(value = "订阅公司编码") @RequestParam(value = "subsCompanyCode", required = false) String subsCompanyCode, - @ApiParam(value = "当前页") @RequestParam(value = "currentPage", required = false) Integer currentPage, - @ApiParam(value = "每页数量") @RequestParam(value = "pageSize", required = false) Integer pageSize) { - - PageHelper.startPage(currentPage, pageSize); - List modelSubscribeList = modelSubscribeService.getModelIssueList(objId, modelCode, subsCompanyCode); - PageInfo pageInfo = new PageInfo<>(modelSubscribeList); - - return ResponseVO.ok(pageInfo); + @ApiParam(value = "订阅公司编码") @RequestParam(value = "subsCompanyCode", required = false) String subsCompanyCode) { + return ResponseVO.ok(modelIssueService.getModelIssueList(objId, modelCode, subsCompanyCode)); } /** @@ -193,9 +210,9 @@ public class ModelBaseController { @GetMapping("/get/model/note") public ResponseVO getModelNote(@RequestParam(value = "modelCode") String modelCode) { - List modelAuditList = modelAuditService.getModelNoteList(modelCode); + List modelNoteList = modelNoteService.getModelNoteList(modelCode); - return ResponseVO.ok(modelAuditList); + return ResponseVO.ok(modelNoteList); } /** @@ -209,29 +226,6 @@ public class ModelBaseController { return ResponseVO.ok(); } - /** - * 模型事记-导出 - * - * @return - */ - @ApiOperation("模型事记-导出") - @PostMapping("export/model/note") - public ResponseVO exportModelNote(HttpServletResponse response, - @ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode) throws IOException { - // 查询要导出的数据 - List modelAuditList = modelAuditService.getModelNoteList(modelCode); - - //users集合转成export集合 - List exportVOList = modelAuditList.stream().map(modelNote -> { - ModelAuditVO vo = new ModelAuditVO(); - BeanUtils.copyProperties(modelNote, vo); - return vo; - }).collect(Collectors.toList()); - - ExcelUtils.exportExcel(response, "测试导出模型事记", "测试导出模型事记", "测试导出模型事记.xlsx", exportVOList, ModelAuditVO.class); - - return ResponseVO.ok(); - } /** * 模型属性-增加 @@ -279,7 +273,7 @@ public class ModelBaseController { @ApiOperation("模型属性-删除/批量删除") @PostMapping("/delete/model/property") public ResponseVO deleteModelProperty(@ApiParam(value = "属性ID集合") @RequestBody List ids) { - return ResponseVO.ok(modelPropertyService.deleteBatchModelProperty(ids)); + return ResponseVO.ok(modelPropertyService.deletePatchModelProperty(ids)); } /** diff --git a/src/main/java/com/pms/ocp/controller/OcpTenantController.java b/src/main/java/com/pms/ocp/controller/OcpTenantController.java index 3f8cb3d..c8970bc 100644 --- a/src/main/java/com/pms/ocp/controller/OcpTenantController.java +++ b/src/main/java/com/pms/ocp/controller/OcpTenantController.java @@ -2,10 +2,11 @@ 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.PageGroupDto; import com.pms.ocp.model.dto.TenanBaseDto; import com.pms.ocp.model.entity.OcpApiGroup; +import com.pms.ocp.model.entity.OcpTenantBase; import com.pms.ocp.model.entity.OcpTenantGroup; import com.pms.ocp.model.vo.ResponseVO; import com.pms.ocp.service.TenantService; @@ -70,19 +71,11 @@ public class OcpTenantController { } - @PostMapping("tenantuse") - @ApiOperation("应用分类--应用管理") - public ResponseVO> tenantUse(@RequestBody PageOcpTenantDto ocpTenantDto){ - List onePages = tenantService.getsUse(ocpTenantDto); - return ResponseVO.ok(onePages); - } - - @PostMapping("tenantcase") - @ApiOperation("应用分类--应用服务分页查") - public ResponseVO> tenantCase(@RequestBody PageOcpTenantDto pageOcpTenantDto){ - Page pages= tenantService.getOnePages(pageOcpTenantDto); - - return ResponseVO.ok(pages); + @PostMapping("tenantone") + @ApiOperation("应用分类--分级数据") + public ResponseVO> tenantOne(@RequestBody PageGroupDto pageGroupDto){ +// Page onePages = tenantService.getOnePages(pageGroupDto); + return ResponseVO.ok(); } diff --git a/src/main/java/com/pms/ocp/mapper/ModelSubscribeMapper.java b/src/main/java/com/pms/ocp/mapper/ModelIssueMapper.java similarity index 81% rename from src/main/java/com/pms/ocp/mapper/ModelSubscribeMapper.java rename to src/main/java/com/pms/ocp/mapper/ModelIssueMapper.java index 2d6c8d4..9b49b66 100644 --- a/src/main/java/com/pms/ocp/mapper/ModelSubscribeMapper.java +++ b/src/main/java/com/pms/ocp/mapper/ModelIssueMapper.java @@ -3,8 +3,10 @@ package com.pms.ocp.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.pms.ocp.model.entity.ModelIssue; import com.pms.ocp.model.entity.TreeNode; -import com.pms.ocp.model.entity.ModelSubscribe; import org.apache.ibatis.annotations.Mapper; +import org.springframework.data.repository.query.Param; + +import java.util.List; /** * @Auther: wangjian @@ -17,5 +19,4 @@ public interface ModelIssueMapper extends BaseMapper { List selectOrganData(); List selectModelAndModelGroup(@Param("searchCondition") String searchCondition); -public interface ModelSubscribeMapper extends BaseMapper { } diff --git a/src/main/java/com/pms/ocp/mapper/ModelMapper.java b/src/main/java/com/pms/ocp/mapper/ModelMapper.java index 7bc10e9..97657cb 100644 --- a/src/main/java/com/pms/ocp/mapper/ModelMapper.java +++ b/src/main/java/com/pms/ocp/mapper/ModelMapper.java @@ -3,9 +3,6 @@ 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 @@ -15,7 +12,4 @@ import java.util.List; @Mapper public interface ModelMapper extends BaseMapper { - - boolean insertBatchModel(@Param("modelList") List modelList); - } diff --git a/src/main/java/com/pms/ocp/mapper/ModelAuditMapper.java b/src/main/java/com/pms/ocp/mapper/ModelNoteMapper.java similarity index 62% rename from src/main/java/com/pms/ocp/mapper/ModelAuditMapper.java rename to src/main/java/com/pms/ocp/mapper/ModelNoteMapper.java index 735ae37..b0d7d9d 100644 --- a/src/main/java/com/pms/ocp/mapper/ModelAuditMapper.java +++ b/src/main/java/com/pms/ocp/mapper/ModelNoteMapper.java @@ -1,7 +1,8 @@ package com.pms.ocp.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pms.ocp.model.entity.ModelAudit; +import com.pms.ocp.model.entity.Model; +import com.pms.ocp.model.entity.ModelNote; import org.apache.ibatis.annotations.Mapper; /** @@ -11,5 +12,5 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper -public interface ModelAuditMapper extends BaseMapper { +public interface ModelNoteMapper extends BaseMapper { } diff --git a/src/main/java/com/pms/ocp/mapper/OcpApiGroupMapper.java b/src/main/java/com/pms/ocp/mapper/OcpApiGroupMapper.java deleted file mode 100644 index 5225c4d..0000000 --- a/src/main/java/com/pms/ocp/mapper/OcpApiGroupMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.pms.ocp.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pms.ocp.model.dto.ApiBaseDto; -import com.pms.ocp.model.entity.OcpApiBase; -import com.pms.ocp.model.entity.OcpApiGroup; -import com.pms.ocp.model.vo.OcpApiBaseVo; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -@Mapper -public interface OcpApiGroupMapper extends BaseMapper { - - List selectTreeList(String apiGroupCompanyCode); - - List apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupPcode,Integer apiGroupPromotionType); - - List selectByPcode(String code); - - List selectPageLists(ApiBaseDto apiBaseReq); -} diff --git a/src/main/java/com/pms/ocp/model/Response.java b/src/main/java/com/pms/ocp/model/Response.java index f0adc07..cb6cdd9 100644 --- a/src/main/java/com/pms/ocp/model/Response.java +++ b/src/main/java/com/pms/ocp/model/Response.java @@ -2,7 +2,7 @@ package com.pms.ocp.model; public interface Response { - boolean SUCCESS = true; - int SUCCESS_CODE = 0; + public static final boolean SUCCESS = true; + public static final int SUCCESS_CODE = 0; } diff --git a/src/main/java/com/pms/ocp/model/dto/ApiBaseDto.java b/src/main/java/com/pms/ocp/model/dto/ApiBaseDto.java index a26de17..0334243 100644 --- a/src/main/java/com/pms/ocp/model/dto/ApiBaseDto.java +++ b/src/main/java/com/pms/ocp/model/dto/ApiBaseDto.java @@ -1,8 +1,6 @@ package com.pms.ocp.model.dto; import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -14,131 +12,29 @@ import java.sql.Timestamp; @Data @AllArgsConstructor @NoArgsConstructor -@ApiModel("应用列表查询参数") public class ApiBaseDto implements Serializable { - - @ApiModelProperty("服务编码") - private String apiCode; - - @ApiModelProperty("服务分类编码") - private String apiGroupCode; - - @ApiModelProperty("服务分类公司(建设单位)") - private String apiGroupCompanyCode; - - @ApiModelProperty("推广类型0:统建；1:自建") - private Integer apiPromotion; - - @ApiModelProperty("注册时段-开始") + /** + * 服务编码 + */ + 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; - - @ApiModelProperty("注册时段-结束") + /** + * 注册时段-结束 + */ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Timestamp endTime; - - @ApiModelProperty("注册开始") - private String startCTime; - - @ApiModelProperty("注册结束") - private String endCTime; - - @ApiModelProperty("关键字") + /** + * 关键字 + */ private String keyword; - - @ApiModelProperty("当前页") - private Integer pageNum; - - @ApiModelProperty("每页条数") - private Integer pageSize; - - public Integer getApiPromotion() { - return apiPromotion; - } - - public void setApiPromotion(Integer apiPromotion) { - this.apiPromotion = apiPromotion; - } - - public String getApiCode() { - return apiCode; - } - - public void setApiCode(String apiCode) { - this.apiCode = apiCode; - } - - public String getApiGroupCode() { - return apiGroupCode; - } - - public void setApiGroupCode(String apiGroupCode) { - this.apiGroupCode = apiGroupCode; - } - - public Timestamp getStartTime() { - return startTime; - } - - public void setStartTime(Timestamp startTime) { - this.startTime = startTime; - } - - public Timestamp getEndTime() { - return endTime; - } - - public void setEndTime(Timestamp endTime) { - this.endTime = endTime; - } - - public String getStartCTime() { - return startCTime; - } - - public void setStartCTime(String startCTime) { - this.startCTime = startCTime; - } - - public String getEndCTime() { - return endCTime; - } - - public void setEndCTime(String endCTime) { - this.endCTime = endCTime; - } - - public String getKeyword() { - return keyword; - } - - public void setKeyword(String keyword) { - this.keyword = keyword; - } - - public Integer getPageNum() { - return pageNum; - } - - public void setPageNum(Integer pageNum) { - this.pageNum = pageNum; - } - - public Integer getPageSize() { - return pageSize; - } - - public void setPageSize(Integer pageSize) { - this.pageSize = pageSize; - } - - public String getApiGroupCompanyCode() { - return apiGroupCompanyCode; - } - - public void setApiGroupCompanyCode(String apiGroupCompanyCode) { - this.apiGroupCompanyCode = apiGroupCompanyCode; - } } diff --git a/src/main/java/com/pms/ocp/model/dto/ModelDTO.java b/src/main/java/com/pms/ocp/model/dto/ModelDTO.java deleted file mode 100644 index d1de7f7..0000000 --- a/src/main/java/com/pms/ocp/model/dto/ModelDTO.java +++ /dev/null @@ -1,174 +0,0 @@ -package com.pms.ocp.model.dto; - -import cn.afterturn.easypoi.excel.annotation.Excel; -import com.baomidou.mybatisplus.annotation.TableField; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.NoArgsConstructor; -import org.springframework.format.annotation.DateTimeFormat; - -import java.time.LocalDateTime; - -/** - * @Auther: wangjian - * @Date: 2022/2/22 16:56 - * @Description: - */ - -@Data -@NoArgsConstructor -//@AllArgsConstructor -@ApiModel(value = "中台运营管控_模型表", description = "中台运营管控_模型表") -public class ModelDTO { - - /** - * 模型编号 - * 主键 - */ - @Excel(name = "模型编号") - @ApiModelProperty(value = "模型编号") - private String objId; - - /** - * 模型名称 - */ - @Excel(name = "模型名称") - @ApiModelProperty(value = "模型名称") - private String modelName; - - /** - * 模型编码 - */ - @Excel(name = "模型编码") - @ApiModelProperty(value = "模型编码") - private String modelCode; - - /** - * 设备类型 - */ - @Excel(name = "设备类型") - @ApiModelProperty(value = "设备类型") - private String equipType; - - /** - * 所属专业 ts:输电,t:变电, dc:直流，ds:配电，tc:技术，pl:计划 im:综合 - */ - @Excel(name = "所属专业", replace = {"输电_ts", "变电_t", "直流_ds", "配电_ds", "技术_tc", "计划_pl", "综合_im"}) - @ApiModelProperty(value = "所属专业 ts:输电,t:变电, dc:直流，ds:配电，tc:技术，pl:计划 im:综合") - private String professional_kind; - - /** - * 模型分类编码 - */ - @Excel(name = "模型分类编码") - @ApiModelProperty(value = "模型分类编码") - private String model_group_code; - - /** - * 模型表名称 - */ - @Excel(name = "模型表名称") - @ApiModelProperty(value = "模型表名称") - private String model_table; - - /** - * 是否启用 0:未启用,1：启用 - */ - @Excel(name = "是否启用", replace = {"未启用_0", "启用_1"}) - @ApiModelProperty(value = "是否启用") - private Integer boolUse; - - - /** - * 推广类型 0:统推,1：自建 - */ - @Excel(name = "推广类型", replace = {"统推_0", "自建_1"}) - @ApiModelProperty(value = "推广类型") - private Integer modelPromotion; - - /** - * 公司编码 - */ - @Excel(name = "公司编码") - @ApiModelProperty(value = "公司编码") - private String ownerCompanyCode; - - /** - * 排列顺序 - */ - @Excel(name = "排列顺序") - @ApiModelProperty(value = "排列顺序") - private Integer modelOrderNo; - - /** - * 提交人编号 - */ - @Excel(name = "提交人编号") - @ApiModelProperty(value = "提交人编号") - private String modelUserId; - - - /** - * 提交人姓名 - */ - @Excel(name = "提交人姓名") - @ApiModelProperty(value = "提交人姓名") - private String modelUserName; - - /** - * 模型创建时间 - */ - @Excel(name = "创建时间") - @ApiModelProperty(value = "创建时间") - @TableField(value = "model_ctime") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private LocalDateTime modelCtime; - - /** - * 模型修改时间 - */ - @Excel(name = "修改时间") - @ApiModelProperty(value = "修改时间") - @TableField(value = "model_mtime") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private LocalDateTime modelMtime; - - /** - * 是否删除 0:未删除 1:已删除 - */ - @Excel(name = "是否删除", replace = {"未删除_1", "已删除_2"}) - @ApiModelProperty(value = "是否删除") - private Integer boolDelete; - - /** - * 所属区域 1:生成控制大区 2:信息关联大区 3:互联网大区 - */ - @Excel(name = "所属区域", replace = {"生成控制大区_1", "信息关联大区_2", "互联网大区_3"}) - @ApiModelProperty(value = "所属区域") - private Integer modelZone; - - /** - * 所属层级 1:应用层 2:平台层 3:网络层 4:感知层 - */ - @Excel(name = "方机构类型", replace = {"应用层_1", "平台层_2", "网络层_3", "感知层_4"}) - @ApiModelProperty(value = "所属层级 1:应用层 2:平台层3:网络层 4:感知层") - private Integer modelLayer; - - /** - * 模型版本（最新版本） - */ - @Excel(name = "模型版本") - @ApiModelProperty(value = "模型版本") - private String modelVersion; - - /** - * 建设厂商 - */ - @Excel(name = "建设厂商") - @ApiModelProperty(value = "建设厂商") - private String apiUnit; -} diff --git a/src/main/java/com/pms/ocp/model/dto/ModelSubscribeDTO.java b/src/main/java/com/pms/ocp/model/dto/ModelIssueDTO.java similarity index 98% rename from src/main/java/com/pms/ocp/model/dto/ModelSubscribeDTO.java rename to src/main/java/com/pms/ocp/model/dto/ModelIssueDTO.java index 9b75540..3e50e51 100644 --- a/src/main/java/com/pms/ocp/model/dto/ModelSubscribeDTO.java +++ b/src/main/java/com/pms/ocp/model/dto/ModelIssueDTO.java @@ -16,7 +16,7 @@ import java.time.LocalDateTime; @ApiModel(value = "模型订阅DTO对象") @Data -public class ModelSubscribeDTO { +public class ModelIssueDTO { /** * 模型属性编号 diff --git a/src/main/java/com/pms/ocp/model/dto/PageOcpTenantDto.java b/src/main/java/com/pms/ocp/model/dto/PageOcpTenantDto.java deleted file mode 100644 index f944df1..0000000 --- a/src/main/java/com/pms/ocp/model/dto/PageOcpTenantDto.java +++ /dev/null @@ -1,237 +0,0 @@ -package com.pms.ocp.model.dto; - - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.pms.ocp.common.config.PageParam; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; - -import java.sql.Timestamp; - -/** - * 分级查询dto - */ -@ApiModel("分级查询dto") -public class PageOcpTenantDto { - /** - * 主键 - */ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty("主键") - private String objId; - - - private int pageNum; - - private int pageSize; - - - public int getPageNum() { - return pageNum; - } - - - public void setPageNum(int pageNum) { - this.pageNum = pageNum; - } - - - public int getPageSize() { - return pageSize; - } - - public void setPageSize(int pageSize) { - this.pageSize = pageSize; - } - - /** - * 应用分类编码 - */ - @ApiModelProperty("应用分类编码") - private String tenantGroupCode; - - /** - * 应用分类名称 - */ - @ApiModelProperty("应用分类名称") - private String tenantGroupName; - - /** - * 分类创建公司 - */ - @ApiModelProperty("分类创建公司") - private String tenantGroupCompanyCode; - - /** - * 上级code - */ - @ApiModelProperty("上级code") - private String tenantGroupPcode; - - /** - * 应用类别设备级、生态级等 - */ - @ApiModelProperty("应用类别设备级、生态级等") - private String tenantType; - - /** - * 分类版本 - */ - @ApiModelProperty("分类版本") - private String tenantGroupVersion; - - /** - * 显示顺序 - */ - @ApiModelProperty("显示顺序") - private Integer tenantGroupOrderNo; - - /** - * 提交人id - */ - @ApiModelProperty("提交人id") - private String tenantGroupUserId; - - /** - * 提交人姓名 - */ - @ApiModelProperty("提交人姓名") - private String tenantGroupUserName; - - /** - * 创建时间 - */ - @ApiModelProperty("创建时间") - private Timestamp tenantGroupCtime; - - /** - * 修改时间 - */ - @ApiModelProperty("修改时间") - private Timestamp tenantGroupMtime; - - /** - * 是否删除 - */ - @ApiModelProperty("是否删除") - private Short isDelete; - - /** - * 应用树层级 1:应用分组层 2:应用层 - */ - @ApiModelProperty("应用树层级 1:应用分组层 2:应用层") - private Short tenantGroupLevel; - - public String getObjId() { - return objId; - } - - public void setObjId(String objId) { - this.objId = objId; - } - - public String getTenantType() { - return tenantType; - } - - public void setTenantType(String tenantType) { - this.tenantType = tenantType; - } - - public String getTenantGroupVersion() { - return tenantGroupVersion; - } - - public void setTenantGroupVersion(String tenantGroupVersion) { - this.tenantGroupVersion = tenantGroupVersion; - } - - public Integer getTenantGroupOrderNo() { - return tenantGroupOrderNo; - } - - public void setTenantGroupOrderNo(Integer tenantGroupOrderNo) { - this.tenantGroupOrderNo = tenantGroupOrderNo; - } - - public String getTenantGroupUserId() { - return tenantGroupUserId; - } - - public void setTenantGroupUserId(String tenantGroupUserId) { - this.tenantGroupUserId = tenantGroupUserId; - } - - public String getTenantGroupUserName() { - return tenantGroupUserName; - } - - public void setTenantGroupUserName(String tenantGroupUserName) { - this.tenantGroupUserName = tenantGroupUserName; - } - - public Timestamp getTenantGroupCtime() { - return tenantGroupCtime; - } - - public void setTenantGroupCtime(Timestamp tenantGroupCtime) { - this.tenantGroupCtime = tenantGroupCtime; - } - - public Timestamp getTenantGroupMtime() { - return tenantGroupMtime; - } - - public void setTenantGroupMtime(Timestamp tenantGroupMtime) { - this.tenantGroupMtime = tenantGroupMtime; - } - - public Short getIsDelete() { - return isDelete; - } - - public void setIsDelete(Short isDelete) { - this.isDelete = isDelete; - } - - public String getTenantGroupCode() { - return tenantGroupCode; - } - - public void setTenantGroupCode(String tenantGroupCode) { - this.tenantGroupCode = tenantGroupCode; - } - - public String getTenantGroupName() { - return tenantGroupName; - } - - public void setTenantGroupName(String tenantGroupName) { - this.tenantGroupName = tenantGroupName; - } - - public String getTenantGroupCompanyCode() { - return tenantGroupCompanyCode; - } - - public void setTenantGroupCompanyCode(String tenantGroupCompanyCode) { - this.tenantGroupCompanyCode = tenantGroupCompanyCode; - } - - public String getTenantGroupPcode() { - return tenantGroupPcode; - } - - public void setTenantGroupPcode(String tenantGroupPcode) { - this.tenantGroupPcode = tenantGroupPcode; - } - - public Short getTenantGroupLevel() { - return tenantGroupLevel; - } - - public void setTenantGroupLevel(Short tenantGroupLevel) { - this.tenantGroupLevel = tenantGroupLevel; - } -} diff --git a/src/main/java/com/pms/ocp/model/entity/Model.java b/src/main/java/com/pms/ocp/model/entity/Model.java index e797933..39cd7e3 100644 --- a/src/main/java/com/pms/ocp/model/entity/Model.java +++ b/src/main/java/com/pms/ocp/model/entity/Model.java @@ -1,6 +1,5 @@ package com.pms.ocp.model.entity; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -10,6 +9,7 @@ import lombok.experimental.Accessors; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; +import java.util.Date; /** * @Auther: wangjian @@ -23,10 +23,9 @@ import java.time.LocalDateTime; public class Model { /** - * 模型关系编号 - * 主键 + * 模型编号 */ - @TableId(value = "obj_id", type = IdType.ASSIGN_ID) + @TableId private String objId; /** @@ -45,41 +44,47 @@ public class Model { private String equipType; /** - * 所属专业ts:输电,t:变电, dc:直流，ds配电，tc:技术，pl计划 im综合 + * 所属专业 */ - private String professional_kind; + private String professionalKind; /** * 模型分类编码 */ - private String model_group_code; + private String modelGroupCode; /** - * 模型表名称 + * 模型表 */ - private String model_table; + private String modelTable; /** - * 是否启用 0:未启用,1：启用 + * 是否启用 */ - @TableField(value = "is_use") - private Integer boolUse; + private String isUse; /** - * 模型推广类型 0:统推,1：自建 + * 模型推广类型 + * 0:统推,1：自建 */ - private Integer modelPromotion; + private String modelPromotion; + /** - * 公司编码 + * 公司code */ private String ownerCompanyCode; + /** + * 公司名称 + */ + private String ownerCompanyName; + /** * 排列顺序 */ - private Integer modelOrderNo; + private String modelOrderNo; /** * 提交人id @@ -95,90 +100,36 @@ 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 LocalDateTime modelCtime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private Date modelCreateTime; /** * 模型修改时间 */ + @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:已删除 - */ - - @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; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private Date modelUpdateTime; } -// 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 '建设厂商'; +// 字段名称 字段描述 字段类型 允许为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) 是 diff --git a/src/main/java/com/pms/ocp/model/entity/ModelClassify.java b/src/main/java/com/pms/ocp/model/entity/ModelClassify.java index e6046f3..e9b374c 100644 --- a/src/main/java/com/pms/ocp/model/entity/ModelClassify.java +++ b/src/main/java/com/pms/ocp/model/entity/ModelClassify.java @@ -1,6 +1,5 @@ package com.pms.ocp.model.entity; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -28,7 +27,7 @@ public class ModelClassify { /** * 模型分类编号 */ - @TableId(value = "obj_id", type = IdType.ASSIGN_ID) + @TableId private String objId; /** diff --git a/src/main/java/com/pms/ocp/model/entity/ModelSubscribe.java b/src/main/java/com/pms/ocp/model/entity/ModelIssue.java similarity index 88% rename from src/main/java/com/pms/ocp/model/entity/ModelSubscribe.java rename to src/main/java/com/pms/ocp/model/entity/ModelIssue.java index c10d84a..a0d865d 100644 --- a/src/main/java/com/pms/ocp/model/entity/ModelSubscribe.java +++ b/src/main/java/com/pms/ocp/model/entity/ModelIssue.java @@ -1,6 +1,5 @@ package com.pms.ocp.model.entity; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; @@ -20,12 +19,12 @@ import java.util.Date; @Data @Accessors(chain = true) @TableName("ocp_model_subs") -public class ModelSubscribe { +public class ModelIssue { /** * 模型订阅编号 */ - @TableId(value = "obj_id", type = IdType.ASSIGN_ID) + @TableId(value = "obj_id") private String objId; /** @@ -57,14 +56,14 @@ public class ModelSubscribe { * 订阅时间 */ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @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") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") private LocalDateTime subsMtime; } diff --git a/src/main/java/com/pms/ocp/model/entity/ModelAudit.java b/src/main/java/com/pms/ocp/model/entity/ModelNote.java similarity index 99% rename from src/main/java/com/pms/ocp/model/entity/ModelAudit.java rename to src/main/java/com/pms/ocp/model/entity/ModelNote.java index 0ba1f14..f1233f0 100644 --- a/src/main/java/com/pms/ocp/model/entity/ModelAudit.java +++ b/src/main/java/com/pms/ocp/model/entity/ModelNote.java @@ -15,7 +15,7 @@ import java.time.LocalDateTime; @Data @TableName("ocp_model_audit") -public class ModelAudit { +public class ModelNote { @TableId(value = "obj_id", type = IdType.ASSIGN_ID) private String objId; diff --git a/src/main/java/com/pms/ocp/model/entity/ModelProperty.java b/src/main/java/com/pms/ocp/model/entity/ModelProperty.java index 07d6833..5934482 100644 --- a/src/main/java/com/pms/ocp/model/entity/ModelProperty.java +++ b/src/main/java/com/pms/ocp/model/entity/ModelProperty.java @@ -1,6 +1,5 @@ package com.pms.ocp.model.entity; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -28,7 +27,7 @@ public class ModelProperty{ /** * 模型属性编号 */ - @TableId(value = "obj_id", type = IdType.ASSIGN_ID) + @TableId private String objId; /** diff --git a/src/main/java/com/pms/ocp/model/entity/ModelRelation.java b/src/main/java/com/pms/ocp/model/entity/ModelRelation.java index 66fb959..cd074c0 100644 --- a/src/main/java/com/pms/ocp/model/entity/ModelRelation.java +++ b/src/main/java/com/pms/ocp/model/entity/ModelRelation.java @@ -1,6 +1,5 @@ package com.pms.ocp.model.entity; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -26,7 +25,7 @@ public class ModelRelation { * 模型关系编号 * 主键 */ - @TableId(value = "obj_id", type = IdType.ASSIGN_ID) + @TableId(value = "obj_id") private String objId; /** diff --git a/src/main/java/com/pms/ocp/model/entity/OcpApiModelRel.java b/src/main/java/com/pms/ocp/model/entity/OcpApiModelRel.java index 97b94f9..ae99dee 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpApiModelRel.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpApiModelRel.java @@ -121,8 +121,6 @@ public class OcpApiModelRel { @ApiModelProperty("应用状态0设计 1运行态") private String tenantState; - @ApiModelProperty("模型名称") - private String modelName; @ApiModelProperty("建设单位") private String tenantUnit; @@ -139,5 +137,323 @@ public class OcpApiModelRel { @ApiModelProperty("应用版本（当前版本）") private String tenanttVersion; + public String getObjId() { + return objId; + } + public void setObjId(String objId) { + this.objId = objId; + } + + public String getModelCode() { + return modelCode; + } + + public void setModelCode(String modelCode) { + this.modelCode = modelCode; + } + + public String getModelDepCompanyCode() { + return modelDepCompanyCode; + } + + public void setModelDepCompanyCode(String modelDepCompanyCode) { + this.modelDepCompanyCode = modelDepCompanyCode; + } + + public String getApiCode() { + return apiCode; + } + + public void setApiCode(String apiCode) { + this.apiCode = apiCode; + } + + public String getApiDepCompanyCode() { + return apiDepCompanyCode; + } + + public void setApiDepCompanyCode(String apiDepCompanyCode) { + this.apiDepCompanyCode = apiDepCompanyCode; + } + + public Timestamp getRelationCtime() { + return relationCtime; + } + + public void setRelationCtime(Timestamp relationCtime) { + this.relationCtime = relationCtime; + } + + public long getIsDelete() { + return isDelete; + } + + public void setIsDelete(long isDelete) { + this.isDelete = isDelete; + } + + public String getApiName() { + return apiName; + } + + public void setApiName(String apiName) { + this.apiName = apiName; + } + + public String getApiGroupCode() { + return apiGroupCode; + } + + public void setApiGroupCode(String apiGroupCode) { + this.apiGroupCode = apiGroupCode; + } + + public long getApiPromotion() { + return apiPromotion; + } + + public void setApiPromotion(long apiPromotion) { + this.apiPromotion = apiPromotion; + } + + public String getApiReq() { + return apiReq; + } + + public void setApiReq(String apiReq) { + this.apiReq = apiReq; + } + + public String getApiResp() { + return apiResp; + } + + public void setApiResp(String apiResp) { + this.apiResp = apiResp; + } + + public String getApiUrl() { + return apiUrl; + } + + public void setApiUrl(String apiUrl) { + this.apiUrl = apiUrl; + } + + public Timestamp getApiCtime() { + return apiCtime; + } + + public void setApiCtime(Timestamp apiCtime) { + this.apiCtime = apiCtime; + } + + public Timestamp getApiMtime() { + return apiMtime; + } + + public void setApiMtime(Timestamp apiMtime) { + this.apiMtime = apiMtime; + } + + public String getApiUserId() { + return apiUserId; + } + + public void setApiUserId(String apiUserId) { + this.apiUserId = apiUserId; + } + + public String getApiUnit() { + return apiUnit; + } + + public void setApiUnit(String apiUnit) { + this.apiUnit = apiUnit; + } + + public String getOwnerCompanyCode() { + return ownerCompanyCode; + } + + public void setOwnerCompanyCode(String ownerCompanyCode) { + this.ownerCompanyCode = ownerCompanyCode; + } + + public String getOwnerCompanyName() { + return ownerCompanyName; + } + + public void setOwnerCompanyName(String ownerCompanyName) { + this.ownerCompanyName = ownerCompanyName; + } + + public long getApiZone() { + return apiZone; + } + + public void setApiZone(long apiZone) { + this.apiZone = apiZone; + } + + public long getApiLayer() { + return apiLayer; + } + + public void setApiLayer(long apiLayer) { + this.apiLayer = apiLayer; + } + + public long getApiVersion() { + return apiVersion; + } + + public void setApiVersion(long apiVersion) { + this.apiVersion = apiVersion; + } + + 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; + } } diff --git a/src/main/java/com/pms/ocp/model/entity/OcpApiSubs.java b/src/main/java/com/pms/ocp/model/entity/OcpApiSubs.java index ade5755..576a73a 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpApiSubs.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpApiSubs.java @@ -87,7 +87,6 @@ public class OcpApiSubs { @ApiModelProperty("服务版本（最新版本）") private long apiVersion; - public String getObjId() { return objId; } @@ -144,6 +143,14 @@ public class OcpApiSubs { this.subsCompanyCode = subsCompanyCode; } + public long getIsDelete() { + return isDelete; + } + + public void setIsDelete(long isDelete) { + this.isDelete = isDelete; + } + public String getApiName() { return apiName; } diff --git a/src/main/java/com/pms/ocp/model/entity/OcpApiTenantRel.java b/src/main/java/com/pms/ocp/model/entity/OcpApiTenantRel.java index 92550c1..0455acc 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpApiTenantRel.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpApiTenantRel.java @@ -139,5 +139,331 @@ public class OcpApiTenantRel { @ApiModelProperty("应用版本（当前版本）") private String tenantVersion; + public String getObjId() { + return objId; + } + public void setObjId(String objId) { + this.objId = objId; + } + + public String getTenantCode() { + return tenantCode; + } + + public void setTenantCode(String tenantCode) { + this.tenantCode = tenantCode; + } + + public String getApiCode() { + return apiCode; + } + + public void setApiCode(String apiCode) { + this.apiCode = apiCode; + } + + public String getApiDepCompanyCode() { + return apiDepCompanyCode; + } + + public void setApiDepCompanyCode(String apiDepCompanyCode) { + this.apiDepCompanyCode = apiDepCompanyCode; + } + + public String getTenantDepCompanyCode() { + return tenantDepCompanyCode; + } + + public void setTenantDepCompanyCode(String tenantDepCompanyCode) { + this.tenantDepCompanyCode = tenantDepCompanyCode; + } + + public Timestamp getApiTenantRelCtime() { + return apiTenantRelCtime; + } + + public void setApiTenantRelCtime(Timestamp apiTenantRelCtime) { + this.apiTenantRelCtime = apiTenantRelCtime; + } + + public Timestamp getApiTenantRelMtime() { + return apiTenantRelMtime; + } + + public void setApiTenantRelMtime(Timestamp apiTenantRelMtime) { + this.apiTenantRelMtime = apiTenantRelMtime; + } + + public String getApiTenantRelUserId() { + return apiTenantRelUserId; + } + + public void setApiTenantRelUserId(String apiTenantRelUserId) { + this.apiTenantRelUserId = apiTenantRelUserId; + } + + public String getApiTenantRelUserName() { + return apiTenantRelUserName; + } + + public void setApiTenantRelUserName(String apiTenantRelUserName) { + this.apiTenantRelUserName = apiTenantRelUserName; + } + + public long getIsDelete() { + return isDelete; + } + + public void setIsDelete(long isDelete) { + this.isDelete = isDelete; + } + + public String getApiName() { + return apiName; + } + + public void setApiName(String apiName) { + this.apiName = apiName; + } + + public String getApiGroupCode() { + return apiGroupCode; + } + + public void setApiGroupCode(String apiGroupCode) { + this.apiGroupCode = apiGroupCode; + } + + public long getApiPromotion() { + return apiPromotion; + } + + public void setApiPromotion(long apiPromotion) { + this.apiPromotion = apiPromotion; + } + + public String getApiReq() { + return apiReq; + } + + public void setApiReq(String apiReq) { + this.apiReq = apiReq; + } + + public String getApiResp() { + return apiResp; + } + + public void setApiResp(String apiResp) { + this.apiResp = apiResp; + } + + public String getApiUrl() { + return apiUrl; + } + + public void setApiUrl(String apiUrl) { + this.apiUrl = apiUrl; + } + + public Timestamp getApiCtime() { + return apiCtime; + } + + public void setApiCtime(Timestamp apiCtime) { + this.apiCtime = apiCtime; + } + + public Timestamp getApiMtime() { + return apiMtime; + } + + public void setApiMtime(Timestamp apiMtime) { + this.apiMtime = apiMtime; + } + + public String getApiUserId() { + return apiUserId; + } + + public void setApiUserId(String apiUserId) { + this.apiUserId = apiUserId; + } + + public String getApiUnit() { + return apiUnit; + } + + public void setApiUnit(String apiUnit) { + this.apiUnit = apiUnit; + } + + public String getOwnerCompanyCode() { + return ownerCompanyCode; + } + + public void setOwnerCompanyCode(String ownerCompanyCode) { + this.ownerCompanyCode = ownerCompanyCode; + } + + public String getOwnerCompanyName() { + return ownerCompanyName; + } + + public void setOwnerCompanyName(String ownerCompanyName) { + this.ownerCompanyName = ownerCompanyName; + } + + public long getApiZone() { + return apiZone; + } + + public void setApiZone(long apiZone) { + this.apiZone = apiZone; + } + + public long getApiLayer() { + return apiLayer; + } + + public void setApiLayer(long apiLayer) { + this.apiLayer = apiLayer; + } + + public long getApiVersion() { + return apiVersion; + } + + public void setApiVersion(long apiVersion) { + this.apiVersion = apiVersion; + } + + 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; + } } diff --git a/src/main/java/com/pms/ocp/model/entity/OcpTenantAudit.java b/src/main/java/com/pms/ocp/model/entity/OcpTenantAudit.java index 7918098..93271a2 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpTenantAudit.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpTenantAudit.java @@ -10,7 +10,6 @@ import lombok.Data; import lombok.experimental.Accessors; import java.io.Serializable; -import java.sql.Timestamp; import java.util.Date; /** @@ -19,6 +18,7 @@ import java.util.Date; */ @Data @Accessors(chain = true) +@TableName("ocp_tenant_audit") @ApiModel("应用事记表1") public class OcpTenantAudit implements Serializable { /** @@ -101,413 +101,222 @@ public class OcpTenantAudit implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty("服务编码") - private String apiCode; - - @ApiModelProperty("服务部署公司") - private String apiDepCompanyCode; - - @ApiModelProperty("应用所属公司") - private String tenantDepCompanyCode; - - @ApiModelProperty("关系创建时间") - private Timestamp apiTenantRelCtime; - - @ApiModelProperty("关系创建时间") - private Timestamp apiTenantRelMtime; - - @ApiModelProperty("关系创建用户ID") - private String apiTenantRelUserId; - - @ApiModelProperty("关系创建用户") - private String apiTenantRelUserName; - - @ApiModelProperty("是否已删除0未删除，1已删除") - private long isDelete; - - @ApiModelProperty("服务接口中文名称") - private String apiName; - - @ApiModelProperty("服务分类代码") - private String apiGroupCode; - - @ApiModelProperty("推广类型0:统建；1:自建") - private long apiPromotion; - - @ApiModelProperty("服务请求体") - private String apiReq; - - @ApiModelProperty("服务返回体") - private String apiResp; - - @ApiModelProperty("服务地址") - private String apiUrl; - - @ApiModelProperty("服务创建时间") - private Timestamp apiCtime; - - @ApiModelProperty("服务修改时间") - private Timestamp apiMtime; - - @ApiModelProperty("创建者用户ID") - private String apiUserId; - - @ApiModelProperty("建设单位") - private String apiUnit; - - @ApiModelProperty("服务所属公司") - private String ownerCompanyCode; - - @ApiModelProperty("服务所属公司") - private String ownerCompanyName; - - @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区") - private long apiZone; - - @ApiModelProperty("'所属层级 1:应用层;2:平台层;3:网络层;4:感知层;") - private long apiLayer; - - @ApiModelProperty("服务版本（最新版本）") - private long apiVersion; - + /** + * 主键 + */ public String getObjId() { return objId; } + /** + * 主键 + */ public void setObjId(String objId) { this.objId = objId; } + /** + * 应用code + */ public String getTenantCode() { return tenantCode; } + /** + * 应用code + */ public void setTenantCode(String tenantCode) { this.tenantCode = tenantCode; } + /** + * 操作状态0:新增,1:迭代；2，下线 + */ public Short getOperStatus() { return operStatus; } + /** + * 操作状态0:新增,1:迭代；2，下线 + */ public void setOperStatus(Short operStatus) { this.operStatus = operStatus; } + /** + * 类型0:人工操作,1:流程管控,3:总部下发 + */ public Short getAuditType() { return auditType; } + /** + * 类型0:人工操作,1:流程管控,3:总部下发 + */ public void setAuditType(Short auditType) { this.auditType = auditType; } + /** + * 备注简述 + */ public String getAuditMessage() { return auditMessage; } + /** + * 备注简述 + */ public void setAuditMessage(String auditMessage) { this.auditMessage = auditMessage; } + /** + * 应用事记内容 + */ public String getAuditJson() { return auditJson; } + /** + * 应用事记内容 + */ public void setAuditJson(String auditJson) { this.auditJson = auditJson; } + /** + * 提交人id + */ public String getAuditUserId() { return auditUserId; } + /** + * 提交人id + */ public void setAuditUserId(String auditUserId) { this.auditUserId = auditUserId; } + /** + * 提交人姓名 + */ public String getAuditUserName() { return auditUserName; } + /** + * 提交人姓名 + */ public void setAuditUserName(String auditUserName) { this.auditUserName = auditUserName; } + /** + * 创建时间 + */ public Date getAuditCtime() { return auditCtime; } + /** + * 创建时间 + */ public void setAuditCtime(Date auditCtime) { this.auditCtime = auditCtime; } + /** + * 应用版本(当前版本) + */ public String getApplyVersion() { return applyVersion; } + /** + * 应用版本(当前版本) + */ public void setApplyVersion(String applyVersion) { this.applyVersion = applyVersion; } + /** + * 上一版本 + */ public String getPerTenantVersion() { return perTenantVersion; } + /** + * 上一版本 + */ public void setPerTenantVersion(String perTenantVersion) { this.perTenantVersion = perTenantVersion; } - public static long getSerialVersionUID() { - return serialVersionUID; - } - - public String getApiCode() { - return apiCode; + @Override + public boolean equals(Object that) { + if (this == that) { + return true; + } + if (that == null) { + return false; + } + if (getClass() != that.getClass()) { + return false; + } + OcpTenantAudit other = (OcpTenantAudit) that; + return (this.getObjId() == null ? other.getObjId() == null : this.getObjId().equals(other.getObjId())) + && (this.getTenantCode() == null ? other.getTenantCode() == null : this.getTenantCode().equals(other.getTenantCode())) + && (this.getOperStatus() == null ? other.getOperStatus() == null : this.getOperStatus().equals(other.getOperStatus())) + && (this.getAuditType() == null ? other.getAuditType() == null : this.getAuditType().equals(other.getAuditType())) + && (this.getAuditMessage() == null ? other.getAuditMessage() == null : this.getAuditMessage().equals(other.getAuditMessage())) + && (this.getAuditJson() == null ? other.getAuditJson() == null : this.getAuditJson().equals(other.getAuditJson())) + && (this.getAuditUserId() == null ? other.getAuditUserId() == null : this.getAuditUserId().equals(other.getAuditUserId())) + && (this.getAuditUserName() == null ? other.getAuditUserName() == null : this.getAuditUserName().equals(other.getAuditUserName())) + && (this.getAuditCtime() == null ? other.getAuditCtime() == null : this.getAuditCtime().equals(other.getAuditCtime())) + && (this.getApplyVersion() == null ? other.getApplyVersion() == null : this.getApplyVersion().equals(other.getApplyVersion())) + && (this.getPerTenantVersion() == null ? other.getPerTenantVersion() == null : this.getPerTenantVersion().equals(other.getPerTenantVersion())); + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((getObjId() == null) ? 0 : getObjId().hashCode()); + result = prime * result + ((getTenantCode() == null) ? 0 : getTenantCode().hashCode()); + result = prime * result + ((getOperStatus() == null) ? 0 : getOperStatus().hashCode()); + result = prime * result + ((getAuditType() == null) ? 0 : getAuditType().hashCode()); + result = prime * result + ((getAuditMessage() == null) ? 0 : getAuditMessage().hashCode()); + result = prime * result + ((getAuditJson() == null) ? 0 : getAuditJson().hashCode()); + result = prime * result + ((getAuditUserId() == null) ? 0 : getAuditUserId().hashCode()); + result = prime * result + ((getAuditUserName() == null) ? 0 : getAuditUserName().hashCode()); + result = prime * result + ((getAuditCtime() == null) ? 0 : getAuditCtime().hashCode()); + result = prime * result + ((getApplyVersion() == null) ? 0 : getApplyVersion().hashCode()); + result = prime * result + ((getPerTenantVersion() == null) ? 0 : getPerTenantVersion().hashCode()); + return result; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", objId=").append(objId); + sb.append(", tenantCode=").append(tenantCode); + sb.append(", operStatus=").append(operStatus); + sb.append(", auditType=").append(auditType); + sb.append(", auditMessage=").append(auditMessage); + sb.append(", auditJson=").append(auditJson); + sb.append(", auditUserId=").append(auditUserId); + sb.append(", auditUserName=").append(auditUserName); + sb.append(", auditCtime=").append(auditCtime); + sb.append(", applyVersion=").append(applyVersion); + sb.append(", perTenantVersion=").append(perTenantVersion); + sb.append(", serialVersionUID=").append(serialVersionUID); + sb.append("]"); + return sb.toString(); } - - public void setApiCode(String apiCode) { - this.apiCode = apiCode; - } - - public String getApiDepCompanyCode() { - return apiDepCompanyCode; - } - - public void setApiDepCompanyCode(String apiDepCompanyCode) { - this.apiDepCompanyCode = apiDepCompanyCode; - } - - public String getTenantDepCompanyCode() { - return tenantDepCompanyCode; - } - - public void setTenantDepCompanyCode(String tenantDepCompanyCode) { - this.tenantDepCompanyCode = tenantDepCompanyCode; - } - - public Timestamp getApiTenantRelCtime() { - return apiTenantRelCtime; - } - - public void setApiTenantRelCtime(Timestamp apiTenantRelCtime) { - this.apiTenantRelCtime = apiTenantRelCtime; - } - - public Timestamp getApiTenantRelMtime() { - return apiTenantRelMtime; - } - - public void setApiTenantRelMtime(Timestamp apiTenantRelMtime) { - this.apiTenantRelMtime = apiTenantRelMtime; - } - - public String getApiTenantRelUserId() { - return apiTenantRelUserId; - } - - public void setApiTenantRelUserId(String apiTenantRelUserId) { - this.apiTenantRelUserId = apiTenantRelUserId; - } - - public String getApiTenantRelUserName() { - return apiTenantRelUserName; - } - - public void setApiTenantRelUserName(String apiTenantRelUserName) { - this.apiTenantRelUserName = apiTenantRelUserName; - } - - public long getIsDelete() { - return isDelete; - } - - public void setIsDelete(long isDelete) { - this.isDelete = isDelete; - } - - public String getApiName() { - return apiName; - } - - public void setApiName(String apiName) { - this.apiName = apiName; - } - - public String getApiGroupCode() { - return apiGroupCode; - } - - public void setApiGroupCode(String apiGroupCode) { - this.apiGroupCode = apiGroupCode; - } - - public long getApiPromotion() { - return apiPromotion; - } - - public void setApiPromotion(long apiPromotion) { - this.apiPromotion = apiPromotion; - } - - public String getApiReq() { - return apiReq; - } - - public void setApiReq(String apiReq) { - this.apiReq = apiReq; - } - - public String getApiResp() { - return apiResp; - } - - public void setApiResp(String apiResp) { - this.apiResp = apiResp; - } - - public String getApiUrl() { - return apiUrl; - } - - public void setApiUrl(String apiUrl) { - this.apiUrl = apiUrl; - } - - public Timestamp getApiCtime() { - return apiCtime; - } - - public void setApiCtime(Timestamp apiCtime) { - this.apiCtime = apiCtime; - } - - public Timestamp getApiMtime() { - return apiMtime; - } - - public void setApiMtime(Timestamp apiMtime) { - this.apiMtime = apiMtime; - } - - public String getApiUserId() { - return apiUserId; - } - - public void setApiUserId(String apiUserId) { - this.apiUserId = apiUserId; - } - - public String getApiUnit() { - return apiUnit; - } - - public void setApiUnit(String apiUnit) { - this.apiUnit = apiUnit; - } - - public String getOwnerCompanyCode() { - return ownerCompanyCode; - } - - public void setOwnerCompanyCode(String ownerCompanyCode) { - this.ownerCompanyCode = ownerCompanyCode; - } - - public String getOwnerCompanyName() { - return ownerCompanyName; - } - - public void setOwnerCompanyName(String ownerCompanyName) { - this.ownerCompanyName = ownerCompanyName; - } - - public long getApiZone() { - return apiZone; - } - - public void setApiZone(long apiZone) { - this.apiZone = apiZone; - } - - public long getApiLayer() { - return apiLayer; - } - - public void setApiLayer(long apiLayer) { - this.apiLayer = apiLayer; - } - - public long getApiVersion() { - return apiVersion; - } - - public void setApiVersion(long apiVersion) { - this.apiVersion = apiVersion; - } - -// @Override -// public boolean equals(Object that) { -// if (this == that) { -// return true; -// } -// if (that == null) { -// return false; -// } -// if (getClass() != that.getClass()) { -// return false; -// } -// OcpTenantAudit other = (OcpTenantAudit) that; -// return (this.getObjId() == null ? other.getObjId() == null : this.getObjId().equals(other.getObjId())) -// && (this.getTenantCode() == null ? other.getTenantCode() == null : this.getTenantCode().equals(other.getTenantCode())) -// && (this.getOperStatus() == null ? other.getOperStatus() == null : this.getOperStatus().equals(other.getOperStatus())) -// && (this.getAuditType() == null ? other.getAuditType() == null : this.getAuditType().equals(other.getAuditType())) -// && (this.getAuditMessage() == null ? other.getAuditMessage() == null : this.getAuditMessage().equals(other.getAuditMessage())) -// && (this.getAuditJson() == null ? other.getAuditJson() == null : this.getAuditJson().equals(other.getAuditJson())) -// && (this.getAuditUserId() == null ? other.getAuditUserId() == null : this.getAuditUserId().equals(other.getAuditUserId())) -// && (this.getAuditUserName() == null ? other.getAuditUserName() == null : this.getAuditUserName().equals(other.getAuditUserName())) -// && (this.getAuditCtime() == null ? other.getAuditCtime() == null : this.getAuditCtime().equals(other.getAuditCtime())) -// && (this.getApplyVersion() == null ? other.getApplyVersion() == null : this.getApplyVersion().equals(other.getApplyVersion())) -// && (this.getPerTenantVersion() == null ? other.getPerTenantVersion() == null : this.getPerTenantVersion().equals(other.getPerTenantVersion())); -// } -// -// @Override -// public int hashCode() { -// final int prime = 31; -// int result = 1; -// result = prime * result + ((getObjId() == null) ? 0 : getObjId().hashCode()); -// result = prime * result + ((getTenantCode() == null) ? 0 : getTenantCode().hashCode()); -// result = prime * result + ((getOperStatus() == null) ? 0 : getOperStatus().hashCode()); -// result = prime * result + ((getAuditType() == null) ? 0 : getAuditType().hashCode()); -// result = prime * result + ((getAuditMessage() == null) ? 0 : getAuditMessage().hashCode()); -// result = prime * result + ((getAuditJson() == null) ? 0 : getAuditJson().hashCode()); -// result = prime * result + ((getAuditUserId() == null) ? 0 : getAuditUserId().hashCode()); -// result = prime * result + ((getAuditUserName() == null) ? 0 : getAuditUserName().hashCode()); -// result = prime * result + ((getAuditCtime() == null) ? 0 : getAuditCtime().hashCode()); -// result = prime * result + ((getApplyVersion() == null) ? 0 : getApplyVersion().hashCode()); -// result = prime * result + ((getPerTenantVersion() == null) ? 0 : getPerTenantVersion().hashCode()); -// return result; -// } -// -// @Override -// public String toString() { -// StringBuilder sb = new StringBuilder(); -// sb.append(getClass().getSimpleName()); -// sb.append(" ["); -// sb.append("Hash = ").append(hashCode()); -// sb.append(", objId=").append(objId); -// sb.append(", tenantCode=").append(tenantCode); -// sb.append(", operStatus=").append(operStatus); -// sb.append(", auditType=").append(auditType); -// sb.append(", auditMessage=").append(auditMessage); -// sb.append(", auditJson=").append(auditJson); -// sb.append(", auditUserId=").append(auditUserId); -// sb.append(", auditUserName=").append(auditUserName); -// sb.append(", auditCtime=").append(auditCtime); -// sb.append(", applyVersion=").append(applyVersion); -// sb.append(", perTenantVersion=").append(perTenantVersion); -// sb.append(", serialVersionUID=").append(serialVersionUID); -// sb.append("]"); -// return sb.toString(); -// } } \ No newline at end of file diff --git a/src/main/java/com/pms/ocp/model/entity/OcpTenantSubs.java b/src/main/java/com/pms/ocp/model/entity/OcpTenantSubs.java index b0451de..7a3b263 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpTenantSubs.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpTenantSubs.java @@ -70,120 +70,6 @@ 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; /** @@ -284,7 +170,19 @@ public class OcpTenantSubs implements Serializable { this.subsLogTenantAtime = subsLogTenantAtime; } + /** + * 是否删除0-否，1-是 + */ + public Short getIsDelete() { + return isDelete; + } + /** + * 是否删除0-否，1-是 + */ + public void setIsDelete(Short isDelete) { + this.isDelete = isDelete; + } @Override public boolean equals(Object that) { diff --git a/src/main/java/com/pms/ocp/model/entity/TreeNode.java b/src/main/java/com/pms/ocp/model/entity/TreeNode.java index a1b1cdb..2835e3a 100644 --- a/src/main/java/com/pms/ocp/model/entity/TreeNode.java +++ b/src/main/java/com/pms/ocp/model/entity/TreeNode.java @@ -37,9 +37,6 @@ public class TreeNode implements Serializable { @ApiModelProperty("子类") private List children; - @ApiModelProperty("子类") - private int belongLevel; - public String getCode() { return code == null ? "":code; } diff --git a/src/main/java/com/pms/ocp/model/vo/ModelAuditVO.java b/src/main/java/com/pms/ocp/model/vo/ModelAuditVO.java deleted file mode 100644 index 8b1c4c9..0000000 --- a/src/main/java/com/pms/ocp/model/vo/ModelAuditVO.java +++ /dev/null @@ -1,131 +0,0 @@ -package com.pms.ocp.model.vo; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.time.LocalDateTime; - -/** - * @Auther: wangjian - * @Date: 2022/2/22 16:52 - * @Description:模型事记记录对象VO - */ - -@ApiModel(value = "模型事记VO对象") -@Data -public class ModelAuditVO { - - /** - * 模型事记编号 - */ - @ApiModelProperty(value = "模型事记编号") - @TableId(value = "obj_id", type = IdType.ASSIGN_ID) - private String objId; - - /** - * 模型编码 - */ - @ApiModelProperty(value = "模型事记编号") - private int modelCode; - - /** - * 属性编码 - */ - @ApiModelProperty(value = "属性代码") - private int propCode; - - /** - * 事记类型 0:人工操作,1:流程管控,3:总部下发 - */ - @ApiModelProperty(value = "事记类型 0:人工操作,1:流程管控,3:总部下发") - private int auditType; - - /** - * 模型异动详情 - */ - @ApiModelProperty(value = "模型异动详情") - private String auditMessageJson; - - /** - * 异动类型 0:新增,1:迭代 - */ - @ApiModelProperty(value = "异动类型 0:新增,1:迭代") - private int operStatus; - - /** - * 异动申请人编号 - */ - @ApiModelProperty(value = "异动申请人编号") - private String applyUserId; - - /** - * 异动申请人姓名 - */ - @ApiModelProperty(value = "异动申请人姓名") - private String applyUserName; - - /** - * 异动时间 - */ - @ApiModelProperty(value = "异动时间") - private long applyTime; - - /** - * 版本 - */ - @ApiModelProperty(value = "版本") - private String applyVersion; - - /** - * 新增时间 - */ - @ApiModelProperty(value = "新增时间") - private LocalDateTime auditCtime; - - /** - * 异动公司编码 - */ - @ApiModelProperty(value = "异动公司编码") - private String auditCompanyCode; - - /** - * 提交人编号 - */ - @ApiModelProperty(value = "提交人编号") - private String auditUserId; - - /** - * 提交人姓名 - */ - @ApiModelProperty(value = "提交人姓名") - private String auditUserName; - - /** - * 修改时间 - */ - @ApiModelProperty(value = "模型事记修改时间") - private LocalDateTime auditMtime; - -} - -// -// COMMENT ON COLUMN public.ocp_model_audit.obj_id IS '主键是'; -// COMMENT ON COLUMN public.ocp_model_audit.model_code IS '模型代码是'; -// COMMENT ON COLUMN public.ocp_model_audit.prop_code IS '属性代码'; -// COMMENT ON COLUMN public.ocp_model_audit.oper_status IS '异动类型0:新增,1:迭代'; -// COMMENT ON COLUMN public.ocp_model_audit.oper_target IS '操作对象0:表，1:属性'; -// COMMENT ON COLUMN public.ocp_model_audit.audit_type IS '事记类型0:人工操作,1:流程管控,3:总部下发'; -// COMMENT ON COLUMN public.ocp_model_audit.audit_message_json IS '模型异动详情'; -// COMMENT ON COLUMN public.ocp_model_audit.apply_user_id IS '异动申请人id'; -// COMMENT ON COLUMN public.ocp_model_audit.apply_user_name IS '异动申请人'; -// COMMENT ON COLUMN public.ocp_model_audit.apply_time IS '异动时间'; -// COMMENT ON COLUMN public.ocp_model_audit.audit_ctime IS '申请时间'; -// COMMENT ON COLUMN public.ocp_model_audit.audit_mtime IS '修改时间'; -// COMMENT ON COLUMN public.ocp_model_audit.apply_version IS '版本'; -// COMMENT ON COLUMN public.ocp_model_audit.audit_company_code IS '异动公司code'; -// COMMENT ON COLUMN public.ocp_model_audit.audit_user_id IS '提交人id'; -// COMMENT ON COLUMN public.ocp_model_audit.audit_user_name IS '提交人姓名'; diff --git a/src/main/java/com/pms/ocp/model/vo/ModelVO.java b/src/main/java/com/pms/ocp/model/vo/ModelVO.java index f9c7d34..455dc6b 100644 --- a/src/main/java/com/pms/ocp/model/vo/ModelVO.java +++ b/src/main/java/com/pms/ocp/model/vo/ModelVO.java @@ -1,15 +1,9 @@ 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 io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.springframework.format.annotation.DateTimeFormat; - -import java.time.LocalDateTime; /** * @Auther: wangjian @@ -20,155 +14,6 @@ import java.time.LocalDateTime; @Data @NoArgsConstructor //@AllArgsConstructor -@ApiModel(value = "中台运营管控_模型表", description = "中台运营管控_模型表") +@ApiModel(value = "中台服务运营看板_网省切换数据_服务表", description = "中台服务运营看板_网省切换数据_服务表") public class ModelVO { - - /** - * 模型编号 - * 主键 - */ - @Excel(name = "模型编号") - @ApiModelProperty(value = "模型编号") - private String objId; - - /** - * 模型名称 - */ - @Excel(name = "模型名称") - @ApiModelProperty(value = "模型名称") - private String modelName; - - /** - * 模型编码 - */ - @Excel(name = "模型编码") - @ApiModelProperty(value = "模型编码") - private String modelCode; - - /** - * 设备类型 - */ - @Excel(name = "设备类型") - @ApiModelProperty(value = "设备类型") - private String equipType; - - /** - * 所属专业 ts:输电,t:变电, dc:直流，ds:配电，tc:技术，pl:计划 im:综合 - */ - @Excel(name = "所属专业", replace = {"输电_ts", "变电_t", "直流_ds", "配电_ds", "技术_tc", "计划_pl", "综合_im"}) - @ApiModelProperty(value = "所属专业 ts:输电,t:变电, dc:直流，ds:配电，tc:技术，pl:计划 im:综合") - private String professional_kind; - - /** - * 模型分类编码 - */ - @Excel(name = "模型分类编码") - @ApiModelProperty(value = "模型分类编码") - private String model_group_code; - - /** - * 模型表名称 - */ - @Excel(name = "模型表名称") - @ApiModelProperty(value = "模型表名称") - private String model_table; - - /** - * 是否启用 0:未启用,1：启用 - */ - @Excel(name = "是否启用", replace = {"未启用_0", "启用_1"}) - @ApiModelProperty(value = "是否启用") - private Integer boolUse; - - - /** - * 推广类型 0:统推,1：自建 - */ - @Excel(name = "推广类型", replace = {"统推_0", "自建_1"}) - @ApiModelProperty(value = "推广类型") - private Integer modelPromotion; - - /** - * 公司编码 - */ - @Excel(name = "公司编码") - @ApiModelProperty(value = "公司编码") - private String ownerCompanyCode; - - /** - * 排列顺序 - */ - @Excel(name = "排列顺序") - @ApiModelProperty(value = "排列顺序") - private Integer modelOrderNo; - - /** - * 提交人编号 - */ - @Excel(name = "提交人编号") - @ApiModelProperty(value = "提交人编号") - private String modelUserId; - - - /** - * 提交人姓名 - */ - @Excel(name = "提交人姓名") - @ApiModelProperty(value = "提交人姓名") - private String modelUserName; - - /** - * 模型创建时间 - */ - @Excel(name = "创建时间") - @ApiModelProperty(value = "创建时间") - @TableField(value = "model_ctime") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private LocalDateTime modelCtime; - - /** - * 模型修改时间 - */ - @Excel(name = "修改时间") - @ApiModelProperty(value = "修改时间") - @TableField(value = "model_mtime") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private LocalDateTime modelMtime; - - /** - * 是否删除 0:未删除 1:已删除 - */ - @Excel(name = "是否删除", replace = {"未删除_1", "已删除_2"}) - @ApiModelProperty(value = "是否删除") - private Integer boolDelete; - - /** - * 所属区域 1:生成控制大区 2:信息关联大区 3:互联网大区 - */ - @Excel(name = "所属区域", replace = {"生成控制大区_1", "信息关联大区_2", "互联网大区_3"}) - @ApiModelProperty(value = "所属区域") - private Integer modelZone; - - /** - * 所属层级 1:应用层 2:平台层 3:网络层 4:感知层 - */ - @Excel(name = "方机构类型", replace = {"应用层_1", "平台层_2", "网络层_3", "感知层_4"}) - @ApiModelProperty(value = "所属层级 1:应用层 2:平台层3:网络层 4:感知层") - private Integer modelLayer; - - /** - * 模型版本（最新版本） - */ - @Excel(name = "模型版本") - @ApiModelProperty(value = "模型版本") - private String modelVersion; - - /** - * 建设厂商 - */ - @Excel(name = "建设厂商") - @ApiModelProperty(value = "建设厂商") - private String apiUnit; } diff --git a/src/main/java/com/pms/ocp/model/vo/OcpModelGroupVO.java b/src/main/java/com/pms/ocp/model/vo/OcpModelGroupVO.java index 47d0886..84f5af3 100644 --- a/src/main/java/com/pms/ocp/model/vo/OcpModelGroupVO.java +++ b/src/main/java/com/pms/ocp/model/vo/OcpModelGroupVO.java @@ -1,8 +1,6 @@ package com.pms.ocp.model.vo; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; @@ -10,7 +8,6 @@ import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; -import java.lang.reflect.Type; import java.util.Date; import java.util.List; @@ -29,7 +26,6 @@ public class OcpModelGroupVO implements Serializable { * 主键 */ @ApiModelProperty(value = "主键") - @TableId(value = "obj_id", type = IdType.ASSIGN_ID) private String objId; /** * 模型分类名称 diff --git a/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java b/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java index 8112c2e..5a8b2ca 100644 --- a/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java +++ b/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java @@ -1,14 +1,10 @@ package com.pms.ocp.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.github.pagehelper.PageInfo; -import com.pms.ocp.model.QueryResponseResult; import com.pms.ocp.model.dto.ApiBaseDto; -import com.pms.ocp.model.dto.ApiTreeGroupDto; 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.vo.OcpApiBaseVo; import com.pms.ocp.model.vo.ResponseVO; @@ -41,6 +37,7 @@ public interface ApiBasicManagementService extends IService { * 条件查询 * @param apiCode * @param keyword + * @param apiUnit * @param startTime * @param endTime * @return @@ -59,33 +56,5 @@ public interface ApiBasicManagementService extends IService { */ ResponseVO apiIssue(String apiCodes); - /** - * 获取顶级服务树 - * @param apiGroupCompanyCode - * @return - */ - List apiBaseTree(String apiGroupCompanyCode); - - /** - * 获取次级服务树 - * @param apiGroupCompanyCode - * @param apiGroupPcode - * @return - */ - List apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupPcode,Integer apiGroupPromotionType); - /** - * 根据分组code获取列表 - * @param ApiBaseReq - * @return - */ - ResponseVO> getBaseByGroupCode(ApiBaseDto ApiBaseReq); - - /** - * 服务分类暴露服务列表 - * @param apiGroupCompanyCode - * @param apiGroupPcode - * @return - */ - List apiBaseTreeApiList(String apiGroupCompanyCode, String apiGroupPcode); } diff --git a/src/main/java/com/pms/ocp/service/ModelSubscribeService.java b/src/main/java/com/pms/ocp/service/ModelIssueService.java similarity index 63% rename from src/main/java/com/pms/ocp/service/ModelSubscribeService.java rename to src/main/java/com/pms/ocp/service/ModelIssueService.java index 5ee11de..0b484af 100644 --- a/src/main/java/com/pms/ocp/service/ModelSubscribeService.java +++ b/src/main/java/com/pms/ocp/service/ModelIssueService.java @@ -3,8 +3,6 @@ package com.pms.ocp.service; import com.pms.ocp.model.dto.ModelIssueDTO; import com.pms.ocp.model.entity.ModelIssue; import com.pms.ocp.model.vo.ResponseVO; -import com.pms.ocp.model.dto.ModelSubscribeDTO; -import com.pms.ocp.model.entity.ModelSubscribe; import java.util.List; @@ -13,15 +11,15 @@ import java.util.List; * @Date: 2022/2/22 16:07 * @Description:模型订阅业务层接口 */ -public interface ModelSubscribeService { +public interface ModelIssueService { /** * 创建模型订阅 * - * @param modelSubscribeDTO + * @param modelIssueDTO * @return */ - Integer createModelIssue(ModelSubscribeDTO modelSubscribeDTO); + Integer createModelIssue(ModelIssueDTO modelIssueDTO); /** * 删除模型订阅 @@ -37,15 +35,15 @@ public interface ModelSubscribeService { * @param ids * @return */ - Integer deleteBatchModelIssue(List ids); + Integer deletePatchModelIssue(List ids); /** * 更新模型订阅 * - * @param modelSubscribe + * @param modelIssue * @return */ - Integer updateModelIssue(ModelSubscribe modelSubscribe); + Integer updateModelIssue(ModelIssue modelIssue); /** * 获取模型订阅 @@ -53,7 +51,7 @@ public interface ModelSubscribeService { * @param * @return */ - List getModelIssueList(String objId, String modelCode, String subsCompanyCode); + List getModelIssueList(String objId, String modelCode, String subsCompanyCode); /** * 获取模型订阅列表 @@ -61,7 +59,6 @@ public interface ModelSubscribeService { * @param modelId * @return */ - ModelSubscribeDTO getModelIssue(String modelId); ModelIssueDTO getModelIssue(String modelId); ResponseVO modelListNavigation(String searchCondition); diff --git a/src/main/java/com/pms/ocp/service/ModelAuditService.java b/src/main/java/com/pms/ocp/service/ModelNoteService.java similarity index 55% rename from src/main/java/com/pms/ocp/service/ModelAuditService.java rename to src/main/java/com/pms/ocp/service/ModelNoteService.java index cfd13e3..a83e0ad 100644 --- a/src/main/java/com/pms/ocp/service/ModelAuditService.java +++ b/src/main/java/com/pms/ocp/service/ModelNoteService.java @@ -1,6 +1,6 @@ package com.pms.ocp.service; -import com.pms.ocp.model.entity.ModelAudit; +import com.pms.ocp.model.entity.ModelNote; import java.util.List; @@ -10,15 +10,15 @@ import java.util.List; * @Description:模型事记业务层接口 */ -public interface ModelAuditService { +public interface ModelNoteService { /** * 创建模型事记 * - * @param modelAudit + * @param modelNote * @return */ - Integer createModelNote(ModelAudit modelAudit); + Integer createModelNote(ModelNote modelNote); /** * 删除模型事记 @@ -31,10 +31,10 @@ public interface ModelAuditService { /** * 更新模型事记 * - * @param modelAudit + * @param modelNote * @return */ - Integer updateModelNote(ModelAudit modelAudit); + Integer updateModelNote(ModelNote modelNote); /** * 获取模型事记 @@ -42,7 +42,7 @@ public interface ModelAuditService { * @param * @return */ - List getModelNoteList(String modelCode); + List getModelNoteList(String modelCode); /** * 获取模型事记列表 @@ -50,13 +50,5 @@ public interface ModelAuditService { * @param modelId * @return */ - ModelAudit getModelNote(String modelId); - -// /** -// * 获取模型事记 -// * -// * @param -// * @return -// */ -// Boolean exportModelNote(String modelCode); + ModelNote getModelNote(String modelId); } diff --git a/src/main/java/com/pms/ocp/service/ModelPropertyService.java b/src/main/java/com/pms/ocp/service/ModelPropertyService.java index 74bb632..5e5779a 100644 --- a/src/main/java/com/pms/ocp/service/ModelPropertyService.java +++ b/src/main/java/com/pms/ocp/service/ModelPropertyService.java @@ -35,7 +35,7 @@ public interface ModelPropertyService { * @param ids * @return */ - Integer deleteBatchModelProperty(List ids); + Integer deletePatchModelProperty(List ids); /** * 更新模型属性 diff --git a/src/main/java/com/pms/ocp/service/ModelRelationService.java b/src/main/java/com/pms/ocp/service/ModelRelationService.java index c69adcf..850a539 100644 --- a/src/main/java/com/pms/ocp/service/ModelRelationService.java +++ b/src/main/java/com/pms/ocp/service/ModelRelationService.java @@ -37,7 +37,7 @@ public interface ModelRelationService { * @param ids * @return */ - Integer deleteBatchModelRelation(List ids); + Integer deletePatchModelRelation(List ids); /** * 更新模型关系 diff --git a/src/main/java/com/pms/ocp/service/ModelService.java b/src/main/java/com/pms/ocp/service/ModelService.java index 64c84b9..6eab59f 100644 --- a/src/main/java/com/pms/ocp/service/ModelService.java +++ b/src/main/java/com/pms/ocp/service/ModelService.java @@ -1,11 +1,7 @@ package com.pms.ocp.service; -import com.pms.ocp.model.dto.ModelDTO; import com.pms.ocp.model.entity.Model; -import org.springframework.web.multipart.MultipartFile; - -import java.io.IOException; -import java.util.List; +import com.pms.ocp.model.vo.ResponseVO; /** * @Auther: wangjian @@ -17,35 +13,26 @@ public interface ModelService { /** * 创建模型 * - * @param modelDTO + * @param model * @return */ - Integer createModel(ModelDTO modelDTO); + ResponseVO createModel(Model model); /** * 删除模型 * - * @param objId - * @param modelCode + * @param modelId * @return */ - Integer deleteModel(String objId, String modelCode); + ResponseVO deleteModel(String modelId); /** * 更新模型 * - * @param modelDTO - * @return - */ - Integer updateModel(ModelDTO modelDTO); - - /** - * 导入模型 - * - * @param file + * @param model * @return */ - Boolean importModel(MultipartFile file) throws IOException; + ResponseVO updateModel(Model model); /** * 获取模型 @@ -53,7 +40,7 @@ public interface ModelService { * @param * @return */ - List getModelList(String objId, String modelCode); + ResponseVO getModelList(); /** * 获取模型列表 diff --git a/src/main/java/com/pms/ocp/service/OcpApiAuditService.java b/src/main/java/com/pms/ocp/service/OcpApiAuditService.java index bd4b2ef..3478281 100644 --- a/src/main/java/com/pms/ocp/service/OcpApiAuditService.java +++ b/src/main/java/com/pms/ocp/service/OcpApiAuditService.java @@ -1,6 +1,5 @@ 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; @@ -8,7 +7,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -public interface OcpApiAuditService extends IService { +public interface OcpApiAuditService { ResponseVO getOcpApiAuditList(OcpApiAudit ocpApiAudit); ResponseVO getOcpApiDetails(String objId); diff --git a/src/main/java/com/pms/ocp/service/OcpApiModelRelService.java b/src/main/java/com/pms/ocp/service/OcpApiModelRelService.java index 67338a9..f79330a 100644 --- a/src/main/java/com/pms/ocp/service/OcpApiModelRelService.java +++ b/src/main/java/com/pms/ocp/service/OcpApiModelRelService.java @@ -1,10 +1,9 @@ package com.pms.ocp.service; -import com.baomidou.mybatisplus.extension.service.IService; import com.pms.ocp.model.entity.OcpApiModelRel; import com.pms.ocp.model.vo.ResponseVO; -public interface OcpApiModelRelService extends IService { +public interface OcpApiModelRelService { ResponseVO getOamrList(OcpApiModelRel ocpApiModelRel); } diff --git a/src/main/java/com/pms/ocp/service/OcpApiSubsService.java b/src/main/java/com/pms/ocp/service/OcpApiSubsService.java index a21229a..72d9e1e 100644 --- a/src/main/java/com/pms/ocp/service/OcpApiSubsService.java +++ b/src/main/java/com/pms/ocp/service/OcpApiSubsService.java @@ -4,6 +4,6 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.pms.ocp.model.entity.OcpApiSubs; import com.pms.ocp.model.vo.ResponseVO; -public interface OcpApiSubsService extends IService { +public interface OcpApiSubsService { ResponseVO getOcpApiSubsList(OcpApiSubs ocpApiSubs); } diff --git a/src/main/java/com/pms/ocp/service/OcpApiTenantRelService.java b/src/main/java/com/pms/ocp/service/OcpApiTenantRelService.java index 9bbeeab..c55e8a0 100644 --- a/src/main/java/com/pms/ocp/service/OcpApiTenantRelService.java +++ b/src/main/java/com/pms/ocp/service/OcpApiTenantRelService.java @@ -1,11 +1,10 @@ package com.pms.ocp.service; -import com.baomidou.mybatisplus.extension.service.IService; import com.pms.ocp.model.entity.OcpApiTenantRel; import com.pms.ocp.model.vo.ResponseVO; -public interface OcpApiTenantRelService extends IService { +public interface OcpApiTenantRelService { ResponseVO getOatrList(OcpApiTenantRel ocpApiTenantRel); ResponseVO getTenantApiList(OcpApiTenantRel ocpApiTenantRel); diff --git a/src/main/java/com/pms/ocp/service/OcpTenantAuditService.java b/src/main/java/com/pms/ocp/service/OcpTenantAuditService.java index a058722..b777505 100644 --- a/src/main/java/com/pms/ocp/service/OcpTenantAuditService.java +++ b/src/main/java/com/pms/ocp/service/OcpTenantAuditService.java @@ -1,14 +1,12 @@ package com.pms.ocp.service; -import com.baomidou.mybatisplus.extension.service.IService; -import com.pms.ocp.model.entity.OcpApiTenantRel; import com.pms.ocp.model.entity.OcpTenantAudit; import com.pms.ocp.model.vo.ResponseVO; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -public interface OcpTenantAuditService extends IService { +public interface OcpTenantAuditService { ResponseVO getOtaList(OcpTenantAudit ocpTenantAudit); ResponseVO getOtaListById(OcpTenantAudit ocpTenantAudit); diff --git a/src/main/java/com/pms/ocp/service/OcpTenantBaseService.java b/src/main/java/com/pms/ocp/service/OcpTenantBaseService.java index 0cd5d24..c82f777 100644 --- a/src/main/java/com/pms/ocp/service/OcpTenantBaseService.java +++ b/src/main/java/com/pms/ocp/service/OcpTenantBaseService.java @@ -1,9 +1,8 @@ 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 extends IService { +public interface OcpTenantBaseService { ResponseVO getOtbList(OcpTenantBase ocpTenantBase); } diff --git a/src/main/java/com/pms/ocp/service/TenantService.java b/src/main/java/com/pms/ocp/service/TenantService.java index de1ac0e..bdaa986 100644 --- a/src/main/java/com/pms/ocp/service/TenantService.java +++ b/src/main/java/com/pms/ocp/service/TenantService.java @@ -5,11 +5,9 @@ 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; @@ -46,17 +44,4 @@ public interface TenantService extends IService { boolean gettenantDelete(OcpTenantGroup ocpTenantGroup); - /** - * 应用分类--应用管理 - * @param ocpTenantDto - * @return - */ - List getsUse(PageOcpTenantDto ocpTenantDto); - - /** - * 应用分类--应用服务分页查 - * @param pageOcpTenantDto - * @return - */ - Page getOnePages(PageOcpTenantDto pageOcpTenantDto); } diff --git a/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java index 2e0643c..d5170bf 100644 --- a/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java @@ -1,29 +1,14 @@ 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.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.pms.ocp.common.constants.StringUtils; -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.mapper.OcpApiSubsMapper; -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.OcpModelGroupVO; import com.pms.ocp.model.vo.ResponseVO; import com.pms.ocp.service.ApiBasicManagementService; import com.pms.ocp.service.OcpApiExtentService; @@ -35,11 +20,9 @@ import org.springframework.stereotype.Service; import java.sql.Timestamp; import java.time.LocalDateTime; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.stream.Collectors; @Service public class ApiBasicManagementServiceImpl extends ServiceImpl @@ -52,10 +35,7 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl apiGroupCode = new ArrayList<>(); /** * 导出查询 * @@ -177,70 +157,4 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl apiBaseTree(String apiGroupCompanyCode) { - List ocpApiGroups = ocpApiGroupMapper.selectTreeList(apiGroupCompanyCode); - return ocpApiGroups; - } - - @Override - public List apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupPcode,Integer apiGroupPromotionType) { - List ocpApiGroups = ocpApiGroupMapper.apiBaseTreeOther(apiGroupCompanyCode,apiGroupPcode,apiGroupPromotionType); - return ocpApiGroups; - } - - @Override - public ResponseVO> getBaseByGroupCode(ApiBaseDto apiBaseReq) { - if (apiBaseReq.getPageNum() == null || apiBaseReq.getPageSize() == null) { - ResponseVO.error("分页参数不能为空"); - } - apiGroupCode.add(apiBaseReq.getApiGroupCode()); - setGroupIdValue(apiBaseReq.getApiGroupCompanyCode() ,apiBaseReq.getApiGroupCode(),apiBaseReq.getApiPromotion()); - PageHelper.startPage(apiBaseReq.getPageNum(),apiBaseReq.getPageSize()); - List ocpApiBaseVos = ocpApiGroupMapper.selectPageLists(apiBaseReq); - apiGroupCode.clear(); - PageInfo pageInfo = new PageInfo<>(ocpApiBaseVos); - return ResponseVO.ok(pageInfo); - } - - @Override - public List apiBaseTreeApiList(String apiGroupCompanyCode, String apiGroupPcode) { - QueryWrapper qw = new QueryWrapper(); - if (!StringUtils.isEmpty(apiGroupPcode)) { - qw.eq("api_group_code", apiGroupPcode); - } - if (!StringUtils.isEmpty(apiGroupCompanyCode)) { - qw.eq("owner_company_code", apiGroupCompanyCode); - } - - return apiBasicManagementMapper.selectList(qw); - } - - /** - * 分组权限分组使用in查询 - * - * @param - * @param - */ - private void setGroupIdValue(String apiGroupCompanyCode ,String code,Integer apiGroupPromotionType) { - List codes = getIdsByPIdPub(apiGroupCompanyCode,code,apiGroupPromotionType); - if(codes.size()>0){ - for (String cod : codes ){ - setGroupIdValue(apiGroupCompanyCode,cod,apiGroupPromotionType); - apiGroupCode.add(cod); - }; - } - } - - /** - * pcode服务分组 - * @param apiGroupCompanyCode - * @param code - * @return - */ - public List getIdsByPIdPub(String apiGroupCompanyCode,String code,Integer apiGroupPromotionType) { - List ocpApiGroups = ocpApiGroupMapper.apiBaseTreeOther(apiGroupCompanyCode, code,apiGroupPromotionType); - return ocpApiGroups.stream().map(OcpApiGroup::getApiGroupCode).collect(Collectors.toList()); - } - } diff --git a/src/main/java/com/pms/ocp/service/impl/ModelAuditServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ModelAuditServiceImpl.java deleted file mode 100644 index 4ff3e4e..0000000 --- a/src/main/java/com/pms/ocp/service/impl/ModelAuditServiceImpl.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.pms.ocp.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.pms.ocp.mapper.ModelAuditMapper; -import com.pms.ocp.model.entity.ModelAudit; -import com.pms.ocp.service.ModelAuditService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * @Auther: wangjian - * @Date: 2022/2/22 16:21 - * @Description:模型事记业务层实现 - */ - -@Service -public class ModelAuditServiceImpl implements ModelAuditService { - - @Autowired - private ModelAuditMapper modelAuditMapper; - - @Override - public Integer createModelNote(ModelAudit modelAudit) { - return modelAuditMapper.insert(modelAudit); - } - - @Override - public Integer deleteModelNote(String modelId) { - return null; - } - - @Override - public Integer updateModelNote(ModelAudit modelAudit) { - return null; - } - - @Override - public List getModelNoteList(String modelCode) { - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.lambda().eq(ModelAudit::getModelCode, modelCode); - return modelAuditMapper.selectList(wrapper); - } - - @Override - public ModelAudit getModelNote(String modelId) { - return null; - } - -// @Override -// public Boolean exportModelNote(String modelCode) { -// List modelNoteList = getModelNoteList(modelCode); -// -// ExcelUtils.exportExcel(modelNoteList, "导出事记", "导出事记", ModelNote.class, "测试user.xls", re -// -// return true; -// } -} diff --git a/src/main/java/com/pms/ocp/service/impl/ModelClassifyServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ModelClassifyServiceImpl.java index a167d6a..7a8b476 100644 --- a/src/main/java/com/pms/ocp/service/impl/ModelClassifyServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ModelClassifyServiceImpl.java @@ -138,6 +138,7 @@ public class ModelClassifyServiceImpl implements ModelClassifyService { return childList; } + /** * 构建树节点 * @author huxiuwu diff --git a/src/main/java/com/pms/ocp/service/impl/ModelNoteServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ModelNoteServiceImpl.java new file mode 100644 index 0000000..bbb542d --- /dev/null +++ b/src/main/java/com/pms/ocp/service/impl/ModelNoteServiceImpl.java @@ -0,0 +1,51 @@ +package com.pms.ocp.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.pms.ocp.mapper.ModelNoteMapper; +import com.pms.ocp.model.entity.ModelNote; +import com.pms.ocp.service.ModelNoteService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @Auther: wangjian + * @Date: 2022/2/22 16:21 + * @Description:模型事记业务层实现 + */ + +@Service +public class ModelNoteServiceImpl implements ModelNoteService { + + @Autowired + private ModelNoteMapper modelNoteMapper; + + @Override + public Integer createModelNote(ModelNote modelNote) { + return modelNoteMapper.insert(modelNote); + } + + @Override + public Integer deleteModelNote(String modelId) { + return null; + } + + @Override + public Integer updateModelNote(ModelNote modelNote) { + return null; + } + + @Override + public List getModelNoteList(String modelCode) { + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.lambda().eq(ModelNote::getModelCode, modelCode); + return modelNoteMapper.selectList(wrapper); + } + + @Override + public ModelNote getModelNote(String modelId) { + return null; + } +} diff --git a/src/main/java/com/pms/ocp/service/impl/ModelPropertyServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ModelPropertyServiceImpl.java index 62a9b7e..0c4403f 100644 --- a/src/main/java/com/pms/ocp/service/impl/ModelPropertyServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ModelPropertyServiceImpl.java @@ -54,7 +54,7 @@ public class ModelPropertyServiceImpl implements ModelPropertyService { } @Override - public Integer deleteBatchModelProperty(List ids) { + public Integer deletePatchModelProperty(List ids) { return modelPropertyMapper.deleteBatchIds(ids); } diff --git a/src/main/java/com/pms/ocp/service/impl/ModelRelationServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ModelRelationServiceImpl.java index 5cf3b86..936eb1d 100644 --- a/src/main/java/com/pms/ocp/service/impl/ModelRelationServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ModelRelationServiceImpl.java @@ -1,8 +1,10 @@ package com.pms.ocp.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.pms.ocp.mapper.ModelRelationMapper; import com.pms.ocp.model.dto.ModelRelationDTO; +import com.pms.ocp.model.entity.ModelIssue; import com.pms.ocp.model.entity.ModelRelation; import com.pms.ocp.model.vo.ModelRelationVO; import com.pms.ocp.service.ModelRelationService; @@ -55,7 +57,7 @@ public class ModelRelationServiceImpl implements ModelRelationService { } @Override - public Integer deleteBatchModelRelation(List ids) { + public Integer deletePatchModelRelation(List ids) { return modelRelationMapper.deleteBatchIds(ids); } diff --git a/src/main/java/com/pms/ocp/service/impl/ModelServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ModelServiceImpl.java index 6fc3c03..4ef894c 100644 --- a/src/main/java/com/pms/ocp/service/impl/ModelServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ModelServiceImpl.java @@ -1,27 +1,15 @@ 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.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.io.IOException; -import java.time.LocalDateTime; -import java.util.ArrayList; import java.util.List; /** @@ -31,99 +19,58 @@ import java.util.List; */ @Service -public class ModelServiceImpl extends ServiceImpl implements ModelService { - +public class ModelServiceImpl implements ModelService { @Autowired private ModelMapper modelMapper; /** * 创建模型 * - * @param modelDTO + * @param model * @return */ @Override - public Integer createModel(ModelDTO modelDTO) { - - Model model = new Model(); - - BeanUtils.copyProperties(modelDTO, model); - - model.setModelCtime(LocalDateTime.now()); + public ResponseVO createModel(Model model) { int result = modelMapper.insert(model); - return result; + if (result > 0) { + return ResponseVO.ok(CodeEnum.SUCCESS); + } else { + return ResponseVO.error(CodeEnum.INSERT_FAIL); + } } /** * 删除模型 * - * @param objId + * @param modelId * @return */ @Override - public Integer deleteModel(String objId, String modelCode) { - QueryWrapper queryWrapper = new QueryWrapper(); - - if (StringUtils.isNotEmpty(objId)) { - queryWrapper.lambda().eq(Model::getObjId, objId); - } - - if (StringUtils.isNotEmpty(modelCode)) { - queryWrapper.lambda().eq(Model::getModelCode, modelCode); + public ResponseVO deleteModel(String modelId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("obj_id", modelId); + int result = modelMapper.delete(queryWrapper); + if (result > 0) { + return ResponseVO.ok(CodeEnum.SUCCESS); + } else { + return ResponseVO.error(CodeEnum.UNKNOWN); } - - return modelMapper.delete(queryWrapper); - } /** * 更新模型 * - * @param modelDTO + * @param model * @return */ @Override - public Integer updateModel(ModelDTO modelDTO) { - Model model = new Model(); - - BeanUtils.copyProperties(modelDTO, model); - - model.setModelMtime(LocalDateTime.now()); - - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - - updateWrapper.lambda().eq(Model::getObjId, model.getObjId()); - - return modelMapper.update(model, updateWrapper); - } - - /** - * 导入模型 - * - * @param file - * @return - */ - @Override - public Boolean importModel(MultipartFile file) throws IOException { - - //校验Excel文件 - ExcelUtils.checkFile(file); - List modelVOList = ExcelUtils.importExcel(file, ModelVO.class); - List modelList = new ArrayList<>(modelVOList.size()); - - if (!modelVOList.isEmpty()) { - for (ModelVO modelVO : modelVOList) { - Model model = new Model(); - BeanUtils.copyProperties(modelVO, model); - model.setModelCtime(LocalDateTime.now()); - modelList.add(model); - } + 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); } - - //校验Excel数据 -// checkData(excelCps); - return modelMapper.insertBatchModel(modelList); - } /** @@ -133,30 +80,24 @@ public class ModelServiceImpl extends ServiceImpl implements * @return */ @Override - public List getModelList(String objId, String modelCode) { - QueryWrapper queryWrapper = new QueryWrapper(); - - if (StringUtils.isNotEmpty(objId)) { - queryWrapper.lambda().eq(Model::getObjId, objId); + public ResponseVO getModelList() { + List modelList = modelMapper.selectList(null); + if (CollectionUtils.isEmpty(modelList)) { + return ResponseVO.ok("查询列表为空"); } - - if (StringUtils.isNotEmpty(modelCode)) { - queryWrapper.lambda().eq(Model::getModelCode, modelCode); - } - - return modelMapper.selectList(queryWrapper); + return ResponseVO.ok(modelList); } /** * 获取模型 * - * @param objId + * @param modelId * @return */ @Override - public Model getModel(String objId) { + public Model getModel(String modelId) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda().eq(Model::getObjId, objId); + queryWrapper.eq("model_id", modelId); return modelMapper.selectOne(queryWrapper); } } diff --git a/src/main/java/com/pms/ocp/service/impl/ModelSubscribeServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ModelSubscribeServiceImpl.java deleted file mode 100644 index 478a8eb..0000000 --- a/src/main/java/com/pms/ocp/service/impl/ModelSubscribeServiceImpl.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.pms.ocp.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.pms.ocp.mapper.ModelSubscribeMapper; -import com.pms.ocp.model.dto.ModelSubscribeDTO; -import com.pms.ocp.model.entity.ModelSubscribe; -import com.pms.ocp.service.ModelSubscribeService; -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/2/22 16:22 - * @Description:模型订阅业务层实现 - */ - -@Service -public class ModelSubscribeServiceImpl implements ModelSubscribeService { - - @Autowired - private ModelSubscribeMapper modelSubscribeMapper; - - @Override - public Integer createModelIssue(ModelSubscribeDTO modelSubscribeDTO) { - - ModelSubscribe modelSubscribe = new ModelSubscribe(); - - BeanUtils.copyProperties(modelSubscribeDTO, modelSubscribe); - - modelSubscribe.setSubsCtime(LocalDateTime.now()); - - return modelSubscribeMapper.insert(modelSubscribe); - } - - @Override - public Integer deleteModelIssue(String modelId) { - return null; - } - - /** - * 批量删除模型订阅 - * - * @param ids - * @return - */ - @Override - public Integer deleteBatchModelIssue(List ids) { - return modelSubscribeMapper.deleteBatchIds(ids); - } - - @Override - public Integer updateModelIssue(ModelSubscribe modelSubscribe) { - return null; - } - - @Override - public List getModelIssueList(String objId, String modelCode, String subsCompanyCode) { - QueryWrapper queryWrapper = new QueryWrapper(); - - if (StringUtils.isNotEmpty(objId)) { - queryWrapper.lambda().eq(ModelSubscribe::getObjId, objId); - } - - if (StringUtils.isNotEmpty(modelCode)) { - queryWrapper.lambda().eq(ModelSubscribe::getModelCode, modelCode); - } - - if (StringUtils.isNotEmpty(subsCompanyCode)) { - queryWrapper.lambda().eq(ModelSubscribe::getSubsCompanyCode, subsCompanyCode); - } - - return modelSubscribeMapper.selectList(queryWrapper); - } - - @Override - public ModelSubscribeDTO getModelIssue(String modelId) { - return null; - } -} diff --git a/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java index e2b12a5..fb73034 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java @@ -5,10 +5,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pms.ocp.common.utils.RandomStringUtils; +import com.pms.ocp.common.utils.RandomStringUtil; import com.pms.ocp.mapper.OcpApiBaseMapper; import com.pms.ocp.mapper.OcpApiTreeMapper; import com.pms.ocp.model.dto.*; +import com.pms.ocp.model.entity.OcpApiBase; import com.pms.ocp.model.entity.OcpApiGroup; import com.pms.ocp.service.OcpApiTreeService; @@ -18,9 +19,11 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.sql.Date; import java.sql.Timestamp; import java.util.ArrayList; import java.util.List; +import java.util.function.Consumer; @Service @@ -158,8 +161,8 @@ public class OcpApiTreeServiceImpl extends ServiceImpl ocpApiGroups = mapper.selectList(null); for (OcpApiGroup ocpApiGroup : ocpApiGroups) { @@ -170,13 +173,24 @@ public class OcpApiTreeServiceImpl extends ServiceImpl ocpApiGroups = mapper.selectList(null); for (OcpApiGroup ocpApiGroup : ocpApiGroups) { - if (pageGroupDto.getApiGroupCode().equals(ocpApiGroup.getApiGroupCode())){ + if (pageGroupDto.getApiGroupCode() == ocpApiGroup.getApiGroupCode()){ LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); queryWrapper.eq(OcpApiGroup::getApiGroupLevel, pageGroupDto.getApiGroupLevel()); mapper.selectPage(pageInfo,queryWrapper); diff --git a/src/main/java/com/pms/ocp/service/impl/OcpTenantAuditServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpTenantAuditServiceImpl.java index f592bbe..c3016fa 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpTenantAuditServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpTenantAuditServiceImpl.java @@ -5,9 +5,7 @@ import cn.afterturn.easypoi.excel.entity.ExportParams; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pms.ocp.common.constants.AnalysisConstant; import com.pms.ocp.common.constants.ExportUtils; -import com.pms.ocp.mapper.OcpApiTenantRelMapper; import com.pms.ocp.mapper.OcpTenantAuditMapper; -import com.pms.ocp.model.entity.OcpApiTenantRel; import com.pms.ocp.model.entity.OcpTenantAudit; import com.pms.ocp.model.vo.ResponseVO; import com.pms.ocp.service.OcpTenantAuditService; @@ -24,9 +22,6 @@ public class OcpTenantAuditServiceImpl extends ServiceImpl otaList = ocpTenantAuditMapper.getOtaList(ocpTenantAudit); @@ -49,7 +44,7 @@ public class OcpTenantAuditServiceImpl extends ServiceImpl oatrList = ocpTenantAuditMapper.OtaById(ocpTenantAudit); - return ResponseVO.ok(oatrList); + List otaById = ocpTenantAuditMapper.OtaById(ocpTenantAudit); + return ResponseVO.ok(otaById); } } diff --git a/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java index 84f6119..6b86361 100644 --- a/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java @@ -2,13 +2,13 @@ package com.pms.ocp.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pms.ocp.common.utils.RandomStringUtils; +import com.pms.ocp.common.utils.RandomStringUtil; import com.pms.ocp.mapper.TenantBasicManagementMapper; import com.pms.ocp.mapper.TenantMapper; import com.pms.ocp.model.dto.*; +import com.pms.ocp.model.entity.OcpApiGroup; +import com.pms.ocp.model.entity.OcpTenantAudit; import com.pms.ocp.model.entity.OcpTenantBase; import com.pms.ocp.model.entity.OcpTenantGroup; import com.pms.ocp.service.TenantService; @@ -115,7 +115,7 @@ public class TenantServiceImpl extends ServiceImpl break; } } - String randomString = RandomStringUtils.getRandomString(6); + String randomString = RandomStringUtil.getRandomString(6); Timestamp timestamp = new Timestamp(System.currentTimeMillis()); OcpTenantGroup ocpTenantGroup = new OcpTenantGroup(); BeanUtils.copyProperties(tenanBaseDto,ocpTenantGroup); @@ -187,65 +187,4 @@ public class TenantServiceImpl extends ServiceImpl return flag; } - /** - * 应用分类--应用管理 - * - * @param ocpTenantDto - * @return - */ - @Override - public List getsUse(PageOcpTenantDto ocpTenantDto) { - - LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); - qw.eq(OcpTenantGroup::getTenantGroupCompanyCode,ocpTenantDto.getTenantGroupCompanyCode()); - List ocpTenantGroupList = tenantMapper.selectList(qw); - /*for (OcpTenantGroup ocpTenantGroup : ocpTenantGroupList) { - if ("".equals(ocpTenantGroup.getTenantGroupPcode()) && ocpTenantDto.getTenantGroupCompanyCode().equals(ocpTenantGroup.getTenantGroupCompanyCode()) - && ocpTenantGroup.getTenantGroupLevel() == 1){ - ocpTenantGroups.add(ocpTenantGroup); - } - }*/ - return ocpTenantGroupList; - } - - /** - * 应用分类--应用服务分页查 - * @param pageOcpTenantDto - * @return - */ - @Override - public Page getOnePages(PageOcpTenantDto pageOcpTenantDto) { - Page pageInfo; - int pageSize = pageOcpTenantDto.getPageSize(); - int pageNum = pageOcpTenantDto.getPageNum(); - if (pageSize != 0 && pageNum != 0){ - pageInfo = new Page<>(pageSize,pageNum); - List ocpTenantGroupList = tenantMapper.selectList(null); - for (OcpTenantGroup ocpTenantGroup : ocpTenantGroupList) { - if ("".equals(ocpTenantGroup.getTenantGroupPcode())){ - continue; - } - if (pageOcpTenantDto.getTenantGroupCode().equals(ocpTenantGroup.getTenantGroupPcode())){ - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); - queryWrapper.eq(OcpTenantGroup::getTenantGroupLevel,2); - queryWrapper.eq(OcpTenantGroup::getTenantGroupCompanyCode,ocpTenantGroup.getTenantGroupCompanyCode()); - tenantMapper.selectPage(pageInfo,queryWrapper); - } - } - }else { - pageSize = 1; - pageNum = 5; - pageInfo = new Page<>(pageSize,pageNum); - List ocpTenantGroupList = tenantMapper.selectList(null); - for (OcpTenantGroup ocpTenantGroup : ocpTenantGroupList) { - if (ocpTenantGroup.getTenantGroupPcode().equals(pageOcpTenantDto.getTenantGroupCode())){ - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); - queryWrapper.eq(OcpTenantGroup::getTenantGroupLevel,2); - tenantMapper.selectPage(pageInfo,queryWrapper); - } - } - } - return pageInfo; - } - } diff --git a/src/main/resources/mapper/ModelMapper.xml b/src/main/resources/mapper/ModelMapper.xml index feadf59..94b9a50 100644 --- a/src/main/resources/mapper/ModelMapper.xml +++ b/src/main/resources/mapper/ModelMapper.xml @@ -1,22 +1,95 @@ - - - insert into ocp_model_base(username, password) - values - - (#{user.username}, #{user.password}) - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/mapper/OcpApiGroupMapper.xml b/src/main/resources/mapper/OcpApiGroupMapper.xml deleted file mode 100644 index f848409..0000000 --- a/src/main/resources/mapper/OcpApiGroupMapper.xml +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/mapper/OcpApiModelRelMapper.xml b/src/main/resources/mapper/OcpApiModelRelMapper.xml index ca9046b..d8343b4 100644 --- a/src/main/resources/mapper/OcpApiModelRelMapper.xml +++ b/src/main/resources/mapper/OcpApiModelRelMapper.xml @@ -8,6 +8,6 @@ on oamr.model_code = omb.model_code INNER JOIN ocp_api_base oab on oamr.api_code = oab.api_code - where oamr.api_code = #{apiCode} + where oamr.obj_id = #{objId} \ No newline at end of file diff --git a/src/main/resources/mapper/OcpApiTenantRelMapper.xml b/src/main/resources/mapper/OcpApiTenantRelMapper.xml index 92b0155..c7b4e4b 100644 --- a/src/main/resources/mapper/OcpApiTenantRelMapper.xml +++ b/src/main/resources/mapper/OcpApiTenantRelMapper.xml @@ -7,7 +7,7 @@ oa LEFT JOIN ocp_api_base ab on oa.api_code = ab.api_code INNER JOIN ocp_tenant_base ot on ot.tenant_code = - oa.tenant_code where oa.api_code = #{apiCode} + oa.tenant_code where oa.obj_id = #{objId} diff --git a/src/main/resources/mapper/OcpTenantAuditMapper.xml b/src/main/resources/mapper/OcpTenantAuditMapper.xml index b0a4ef3..41aa367 100644 --- a/src/main/resources/mapper/OcpTenantAuditMapper.xml +++ b/src/main/resources/mapper/OcpTenantAuditMapper.xml @@ -10,11 +10,9 @@ \ No newline at end of file -- 2.26.0