Skip to content

O
operation-control-platform
Commit b8522998 authored by 胡秀武's avatar 胡秀武
Browse files
Options

胡秀武:模型列表树导航树

parent 2f4be4ef
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1299 additions and 2435 deletions
src/main/java/com/pms/ocp/common/aspectj/OperLogAspect.java
View file @ b8522998
......@@ -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) {
......
src/main/java/com/pms/ocp/common/constants/ExportUtils.java
View file @ b8522998
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);
}
}
}
src/main/java/com/pms/ocp/common/constants/ResultCode.java → src/main/java/com/pms/ocp/common/constants/ResultCodee.java
View file @ b8522998
......@@ -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;
}
......
src/main/java/com/pms/ocp/common/constants/ServiceException.java 0 → 100644
View file @ b8522998
package com.pms.ocp.common.constants;
public class ServiceException extends RuntimeException {
private static final long serialVersionUID = -6914996666319154848L;
/**
* 状态编码
*/
public final int statusCode;
/**
* message信息
*/
public final String msg;
/**
* 数据对象
*/
public Object data;
public ServiceException(String message, ResultCodee resultCode) {
super(message);
this.statusCode = resultCode.statusCode;
this.msg = message;
}
public ServiceException(String message, ResultCodee resultCode, Object data) {
this(message, resultCode);
this.data = data;
}
public ServiceException(ResultCodee resultCode) {
this(resultCode.msg, resultCode);
}
public ServiceException(ResultCodee resultCode, Object data) {
this(resultCode.msg, resultCode, data);
}
}
src/main/java/com/pms/ocp/common/exception/ServiceException.java deleted 100644 → 0
View file @ 2f4be4ef
package com.pms.ocp.common.exception;
import com.pms.ocp.common.constants.ResultCode;
/**
* @Auther: wangjian
* @Date: 2022/3/11 16:31
* @Description:
*/
public class ServiceException extends RuntimeException {
/**
* 自定义异常枚举类
*/
private ResultCode resultCode;
/**
* 错误码
*/
private int code;
/**
* 错误信息
*/
private String errorMsg;
public ServiceException() {
super();
}
public ServiceException(ResultCode resultCode) {
super("{code:" + resultCode.getStatusCode() + ",errorMsg:" + resultCode.getMessage() + "}");
this.resultCode = resultCode;
this.code = resultCode.getStatusCode();
this.errorMsg = resultCode.getMessage();
}
public ServiceException(int code, String errorMsg) {
super("{code:" + code + ",errorMsg:" + errorMsg + "}");
this.code = code;
this.errorMsg = errorMsg;
}
public ResultCode getErrorEnum() {
return resultCode;
}
public String getErrorMsg() {
return errorMsg;
}
public void setErrorMsg(String errorMsg) {
this.errorMsg = errorMsg;
}
public int getCode() {
return code;
}
public void setCode(int code) {
this.code = code;
}
}
src/main/java/com/pms/ocp/common/utils/DataStructureHandleUtils.java deleted 100644 → 0
View file @ 2f4be4ef
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<Map<String, Object>> 到 List<T> 数据转换
*/
public static <T> List<T> setList(final List<Map<String, Object>> srcList, Class<T> clazz) {
List<T> 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> T convert(Object obj, Class<T> 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;
}
}
src/main/java/com/pms/ocp/common/utils/ExcelUtils.java
View file @ b8522998
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 <T>
* @return
*/
public static <T> List<T> importExcel(String filePath, Integer titleRows, Integer headerRows, Class<T> pojoClass)
throws IOException {
if (StringUtils.isBlank(filePath)) {
return null;
}
ImportParams params = new ImportParams();
params.setTitleRows(titleRows);
params.setHeadRows(headerRows);
params.setNeedSave(true);
params.setSaveUrl("/excel/");
try {
return ExcelImportUtil.importExcel(new File(filePath), pojoClass, params);
} catch (NoSuchElementException e) {
throw new IOException("模板不能为空");
} catch (Exception e) {
throw new IOException(e.getMessage());
}
}
/**
* excel 导入
*
* @param file excel文件
* @param pojoClass pojo类型
* @param <T>
* @return
*/
public static <T> List<T> importExcel(MultipartFile file, Class<T> pojoClass)
throws IOException {
return importExcel(file, 0, 1, pojoClass);
}
/**
* excel 导入
*
* @param file excel文件
* @param titleRows 标题行
* @param headerRows 表头行
* @param pojoClass pojo类型
* @param <T>
* @return
*/
public static <T> List<T> importExcel(MultipartFile file, Integer titleRows, Integer headerRows, Class<T> pojoClass)
throws IOException {
return importExcel(file, titleRows, headerRows, false, pojoClass);
}
/**
* excel 导入
*
* @param file 上传的文件
* @param titleRows 标题行
* @param headerRows 表头行
* @param needVerfiy 是否检验excel内容
* @param pojoClass pojo类型
* @param <T>
* @return
*/
public static <T> List<T> importExcel(MultipartFile file, Integer titleRows, Integer headerRows, boolean needVerfiy, Class<T> pojoClass)
throws IOException {
if (file == null) {
return null;
}
try {
return importExcel(file.getInputStream(), titleRows, headerRows, needVerfiy, pojoClass);
} catch (Exception e) {
throw new IOException(e.getMessage());
}
}
/**
* excel 导入
*
* @param inputStream 文件输入流
* @param titleRows 标题行
* @param headerRows 表头行
* @param needVerfiy 是否检验excel内容
* @param pojoClass pojo类型
* @param <T>
* @return
*/
public static <T> List<T> importExcel(InputStream inputStream, Integer titleRows, Integer headerRows, boolean needVerfiy, Class<T> pojoClass)
throws IOException {
if (inputStream == null) {
return null;
}
ImportParams params = new ImportParams();
params.setTitleRows(titleRows);
params.setHeadRows(headerRows);
params.setSaveUrl("/excel/");
params.setNeedSave(true);
params.setNeedVerify(needVerfiy);
try {
return ExcelImportUtil.importExcel(inputStream, pojoClass, params);
} catch (NoSuchElementException e) {
throw new IOException("excel文件不能为空");
} catch (Exception e) {
throw new IOException(e.getMessage());
}
}
/**
* 检查文件
*
* @param file
*/
public static void checkFile(MultipartFile file) {
if (file == null) {
throw new ServiceException(ResultCode.FILE_NOT_EXISTS);
}
String fileName = file.getOriginalFilename();
assert fileName != null;
if (!fileName.endsWith(XLS) && !fileName.endsWith(XLS_X)) {
throw new ServiceException(ResultCode.FILE_NOT_EXISTS);
}
}
/**
* Excel 类型枚举
*/
enum ExcelTypeEnum {
XLS("xls"), XLSX("xlsx");
private String value;
ExcelTypeEnum(String value) {
this.value = value;
}
public String getValue() {
return value;
}
public void setValue(String value) {
this.value = value;
}
}
}
src/main/java/com/pms/ocp/common/utils/MapUtils.java 0 → 100644
View file @ b8522998
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 <T> Map<Date, List<T>> treeMapDesc(Map<Date, List<T>> map) {
Map<Date, List<T>> treeMapDesc = new TreeMap<>(new Comparator<Date>() {
@Override
public int compare(Date o1, Date o2) {
return o2.compareTo(o1);
}
});
for (Map.Entry<Date, List<T>> e : map.entrySet()) {
treeMapDesc.put(e.getKey(), e.getValue());
}
return treeMapDesc;
}
}
src/main/java/com/pms/ocp/common/utils/PageRequest.java
View file @ b8522998
......@@ -10,7 +10,7 @@ import lombok.Data;
* @author admin
*/
@Data
@ApiModel(value = "分页工具类", description = "分页工具类")
@ApiModel(value = "分页工具类",description = "分页工具类")
public class PageRequest<T> {
private static final long serialVersionUID = 8167917284229912157L;
......
src/main/java/com/pms/ocp/common/utils/RandomStringUtils.java → src/main/java/com/pms/ocp/common/utils/RandomStringUtil.java
View file @ b8522998
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 字符串长度
......
src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java
View file @ b8522998
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<PageInfo<OcpApiBaseVo>> apiListQuery(HttpServletRequest request, ApiBaseDto ApiBaseReq) {
return apiBasicManagementService.getBaseByGroupCode(ApiBaseReq);
}
@ApiOperation("服务树一级")
@GetMapping("/apiBaseTree")
public ResponseVO<List<OcpApiGroup>> apiBaseTree(String apiGroupCompanyCode, Integer apiGroupPromotionType) {
List<OcpApiGroup> apiTreeGroupDtos = apiBasicManagementService.apiBaseTreeOther(apiGroupCompanyCode,null,apiGroupPromotionType);
return ResponseVO.ok(apiTreeGroupDtos);
}
@ApiOperation("服务树层级")
@GetMapping("/apiBaseTreeOther")
public ResponseVO<List<OcpApiGroup>> apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupCode, Integer apiGroupPromotionType) {
List<OcpApiGroup> apiTreeGroupDtos = apiBasicManagementService.apiBaseTreeOther(apiGroupCompanyCode,apiGroupCode,apiGroupPromotionType);
return ResponseVO.ok(apiTreeGroupDtos);
}
}
src/main/java/com/pms/ocp/controller/OcpTenantController.java
View file @ b8522998
......@@ -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<List<OcpTenantGroup>> tenantUse(@RequestBody PageOcpTenantDto ocpTenantDto){
List<OcpTenantGroup> onePages = tenantService.getsUse(ocpTenantDto);
return ResponseVO.ok(onePages);
}
@PostMapping("tenantcase")
@ApiOperation("应用分类--应用服务分页查")
public ResponseVO<Page<OcpTenantGroup>> tenantCase(@RequestBody PageOcpTenantDto pageOcpTenantDto){
Page<OcpTenantGroup> pages= tenantService.getOnePages(pageOcpTenantDto);
return ResponseVO.ok(pages);
@PostMapping("tenantone")
@ApiOperation("应用分类--分级数据")
public ResponseVO<Page<OcpApiGroup>> tenantOne(@RequestBody PageGroupDto pageGroupDto){
// Page<OcpApiGroup> onePages = tenantService.getOnePages(pageGroupDto);
return ResponseVO.ok();
}
......
src/main/java/com/pms/ocp/mapper/ModelSubscribeMapper.java → src/main/java/com/pms/ocp/mapper/ModelIssueMapper.java
View file @ b8522998
......@@ -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<ModelIssue> {
List<TreeNode> selectOrganData();
List<TreeNode> selectModelAndModelGroup(@Param("searchCondition") String searchCondition);
public interface ModelSubscribeMapper extends BaseMapper<ModelSubscribe> {
}
src/main/java/com/pms/ocp/mapper/ModelMapper.java
View file @ b8522998
......@@ -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<Model> {
boolean insertBatchModel(@Param("modelList") List<Model> modelList);
}
src/main/java/com/pms/ocp/mapper/ModelAuditMapper.java → src/main/java/com/pms/ocp/mapper/ModelNoteMapper.java
View file @ b8522998
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<ModelAudit> {
public interface ModelNoteMapper extends BaseMapper<ModelNote> {
}
src/main/java/com/pms/ocp/mapper/OcpApiGroupMapper.java deleted 100644 → 0
View file @ 2f4be4ef
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<OcpApiGroup> {
List<OcpApiGroup> selectTreeList(String apiGroupCompanyCode);
List<OcpApiGroup> apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupPcode,Integer apiGroupPromotionType);
List<OcpApiBase> selectByPcode(String code);
List<OcpApiBaseVo> selectPageLists(ApiBaseDto apiBaseReq);
}
src/main/java/com/pms/ocp/model/Response.java
View file @ b8522998
......@@ -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;
}
src/main/java/com/pms/ocp/model/dto/ApiBaseDto.java
View file @ b8522998
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;
}
}
src/main/java/com/pms/ocp/model/dto/ModelDTO.java deleted 100644 → 0
View file @ 2f4be4ef
package com.pms.ocp.model.dto;
import cn.afterturn.easypoi.excel.annotation.Excel;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
/**
* @Auther: wangjian
* @Date: 2022/2/22 16:56
* @Description:
*/
@Data
@NoArgsConstructor
//@AllArgsConstructor
@ApiModel(value = "中台运营管控_模型表", description = "中台运营管控_模型表")
public class ModelDTO {
/**
* 模型编号
* 主键
*/
@Excel(name = "模型编号")
@ApiModelProperty(value = "模型编号")
private String objId;
/**
* 模型名称
*/
@Excel(name = "模型名称")
@ApiModelProperty(value = "模型名称")
private String modelName;
/**
* 模型编码
*/
@Excel(name = "模型编码")
@ApiModelProperty(value = "模型编码")
private String modelCode;
/**
* 设备类型
*/
@Excel(name = "设备类型")
@ApiModelProperty(value = "设备类型")
private String equipType;
/**
* 所属专业 ts:输电,t:变电, dc:直流，ds:配电，tc:技术，pl:计划 im:综合
*/
@Excel(name = "所属专业", replace = {"输电_ts", "变电_t", "直流_ds", "配电_ds", "技术_tc", "计划_pl", "综合_im"})
@ApiModelProperty(value = "所属专业 ts:输电,t:变电, dc:直流，ds:配电，tc:技术，pl:计划 im:综合")
private String professional_kind;
/**
* 模型分类编码
*/
@Excel(name = "模型分类编码")
@ApiModelProperty(value = "模型分类编码")
private String model_group_code;
/**
* 模型表名称
*/
@Excel(name = "模型表名称")
@ApiModelProperty(value = "模型表名称")
private String model_table;
/**
* 是否启用 0:未启用,1：启用
*/
@Excel(name = "是否启用", replace = {"未启用_0", "启用_1"})
@ApiModelProperty(value = "是否启用")
private Integer boolUse;
/**
* 推广类型 0:统推,1：自建
*/
@Excel(name = "推广类型", replace = {"统推_0", "自建_1"})
@ApiModelProperty(value = "推广类型")
private Integer modelPromotion;
/**
* 公司编码
*/
@Excel(name = "公司编码")
@ApiModelProperty(value = "公司编码")
private String ownerCompanyCode;
/**
* 排列顺序
*/
@Excel(name = "排列顺序")
@ApiModelProperty(value = "排列顺序")
private Integer modelOrderNo;
/**
* 提交人编号
*/
@Excel(name = "提交人编号")
@ApiModelProperty(value = "提交人编号")
private String modelUserId;
/**
* 提交人姓名
*/
@Excel(name = "提交人姓名")
@ApiModelProperty(value = "提交人姓名")
private String modelUserName;
/**
* 模型创建时间
*/
@Excel(name = "创建时间")
@ApiModelProperty(value = "创建时间")
@TableField(value = "model_ctime")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime modelCtime;
/**
* 模型修改时间
*/
@Excel(name = "修改时间")
@ApiModelProperty(value = "修改时间")
@TableField(value = "model_mtime")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime modelMtime;
/**
* 是否删除 0:未删除 1:已删除
*/
@Excel(name = "是否删除", replace = {"未删除_1", "已删除_2"})
@ApiModelProperty(value = "是否删除")
private Integer boolDelete;
/**
* 所属区域 1:生成控制大区 2:信息关联大区 3:互联网大区
*/
@Excel(name = "所属区域", replace = {"生成控制大区_1", "信息关联大区_2", "互联网大区_3"})
@ApiModelProperty(value = "所属区域")
private Integer modelZone;
/**
* 所属层级 1:应用层 2:平台层 3:网络层 4:感知层
*/
@Excel(name = "方机构类型", replace = {"应用层_1", "平台层_2", "网络层_3", "感知层_4"})
@ApiModelProperty(value = "所属层级 1:应用层 2:平台层3:网络层 4:感知层")
private Integer modelLayer;
/**
* 模型版本（最新版本）
*/
@Excel(name = "模型版本")
@ApiModelProperty(value = "模型版本")
private String modelVersion;
/**
* 建设厂商
*/
@Excel(name = "建设厂商")
@ApiModelProperty(value = "建设厂商")
private String apiUnit;
}
src/main/java/com/pms/ocp/model/dto/ModelSubscribeDTO.java → src/main/java/com/pms/ocp/model/dto/ModelIssueDTO.java
View file @ b8522998
......@@ -16,7 +16,7 @@ import java.time.LocalDateTime;
@ApiModel(value = "模型订阅DTO对象")
@Data
public class ModelSubscribeDTO {
public class ModelIssueDTO {
/**
* 模型属性编号
......
src/main/java/com/pms/ocp/model/dto/PageOcpTenantDto.java deleted 100644 → 0
View file @ 2f4be4ef
package com.pms.ocp.model.dto;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.pms.ocp.common.config.PageParam;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.sql.Timestamp;
/**
* 分级查询dto
*/
@ApiModel("分级查询dto")
public class PageOcpTenantDto {
/**
* 主键
*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty("主键")
private String objId;
private int pageNum;
private int pageSize;
public int getPageNum() {
return pageNum;
}
public void setPageNum(int pageNum) {
this.pageNum = pageNum;
}
public int getPageSize() {
return pageSize;
}
public void setPageSize(int pageSize) {
this.pageSize = pageSize;
}
/**
* 应用分类编码
*/
@ApiModelProperty("应用分类编码")
private String tenantGroupCode;
/**
* 应用分类名称
*/
@ApiModelProperty("应用分类名称")
private String tenantGroupName;
/**
* 分类创建公司
*/
@ApiModelProperty("分类创建公司")
private String tenantGroupCompanyCode;
/**
* 上级code
*/
@ApiModelProperty("上级code")
private String tenantGroupPcode;
/**
* 应用类别设备级、生态级等
*/
@ApiModelProperty("应用类别设备级、生态级等")
private String tenantType;
/**
* 分类版本
*/
@ApiModelProperty("分类版本")
private String tenantGroupVersion;
/**
* 显示顺序
*/
@ApiModelProperty("显示顺序")
private Integer tenantGroupOrderNo;
/**
* 提交人id
*/
@ApiModelProperty("提交人id")
private String tenantGroupUserId;
/**
* 提交人姓名
*/
@ApiModelProperty("提交人姓名")
private String tenantGroupUserName;
/**
* 创建时间
*/
@ApiModelProperty("创建时间")
private Timestamp tenantGroupCtime;
/**
* 修改时间
*/
@ApiModelProperty("修改时间")
private Timestamp tenantGroupMtime;
/**
* 是否删除
*/
@ApiModelProperty("是否删除")
private Short isDelete;
/**
* 应用树层级 1:应用分组层 2:应用层
*/
@ApiModelProperty("应用树层级 1:应用分组层 2:应用层")
private Short tenantGroupLevel;
public String getObjId() {
return objId;
}
public void setObjId(String objId) {
this.objId = objId;
}
public String getTenantType() {
return tenantType;
}
public void setTenantType(String tenantType) {
this.tenantType = tenantType;
}
public String getTenantGroupVersion() {
return tenantGroupVersion;
}
public void setTenantGroupVersion(String tenantGroupVersion) {
this.tenantGroupVersion = tenantGroupVersion;
}
public Integer getTenantGroupOrderNo() {
return tenantGroupOrderNo;
}
public void setTenantGroupOrderNo(Integer tenantGroupOrderNo) {
this.tenantGroupOrderNo = tenantGroupOrderNo;
}
public String getTenantGroupUserId() {
return tenantGroupUserId;
}
public void setTenantGroupUserId(String tenantGroupUserId) {
this.tenantGroupUserId = tenantGroupUserId;
}
public String getTenantGroupUserName() {
return tenantGroupUserName;
}
public void setTenantGroupUserName(String tenantGroupUserName) {
this.tenantGroupUserName = tenantGroupUserName;
}
public Timestamp getTenantGroupCtime() {
return tenantGroupCtime;
}
public void setTenantGroupCtime(Timestamp tenantGroupCtime) {
this.tenantGroupCtime = tenantGroupCtime;
}
public Timestamp getTenantGroupMtime() {
return tenantGroupMtime;
}
public void setTenantGroupMtime(Timestamp tenantGroupMtime) {
this.tenantGroupMtime = tenantGroupMtime;
}
public Short getIsDelete() {
return isDelete;
}
public void setIsDelete(Short isDelete) {
this.isDelete = isDelete;
}
public String getTenantGroupCode() {
return tenantGroupCode;
}
public void setTenantGroupCode(String tenantGroupCode) {
this.tenantGroupCode = tenantGroupCode;
}
public String getTenantGroupName() {
return tenantGroupName;
}
public void setTenantGroupName(String tenantGroupName) {
this.tenantGroupName = tenantGroupName;
}
public String getTenantGroupCompanyCode() {
return tenantGroupCompanyCode;
}
public void setTenantGroupCompanyCode(String tenantGroupCompanyCode) {
this.tenantGroupCompanyCode = tenantGroupCompanyCode;
}
public String getTenantGroupPcode() {
return tenantGroupPcode;
}
public void setTenantGroupPcode(String tenantGroupPcode) {
this.tenantGroupPcode = tenantGroupPcode;
}
public Short getTenantGroupLevel() {
return tenantGroupLevel;
}
public void setTenantGroupLevel(Short tenantGroupLevel) {
this.tenantGroupLevel = tenantGroupLevel;
}
}
src/main/java/com/pms/ocp/model/entity/Model.java
View file @ b8522998
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) 是
src/main/java/com/pms/ocp/model/entity/ModelClassify.java
View file @ b8522998
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;
/**
......
src/main/java/com/pms/ocp/model/entity/ModelSubscribe.java → src/main/java/com/pms/ocp/model/entity/ModelIssue.java
View file @ b8522998
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;
}
......
src/main/java/com/pms/ocp/model/entity/ModelAudit.java → src/main/java/com/pms/ocp/model/entity/ModelNote.java
View file @ b8522998
......@@ -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;
......
src/main/java/com/pms/ocp/model/entity/ModelProperty.java
View file @ b8522998
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;
/**
......
src/main/java/com/pms/ocp/model/entity/ModelRelation.java
View file @ b8522998
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;
/**
......
src/main/java/com/pms/ocp/model/entity/OcpApiModelRel.java
View file @ b8522998
......@@ -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;
}
}
src/main/java/com/pms/ocp/model/entity/OcpApiSubs.java
View file @ b8522998
......@@ -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;
}
......
src/main/java/com/pms/ocp/model/entity/OcpApiTenantRel.java
View file @ b8522998
......@@ -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;
}
}
src/main/java/com/pms/ocp/model/entity/OcpTenantSubs.java
View file @ b8522998
......@@ -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) {
......
src/main/java/com/pms/ocp/model/entity/TreeNode.java
View file @ b8522998
......@@ -37,9 +37,6 @@ public class TreeNode implements Serializable {
@ApiModelProperty("子类")
private List<TreeNode> children;
@ApiModelProperty("子类")
private int belongLevel;
public String getCode() {
return code == null ? "":code;
}
......
src/main/java/com/pms/ocp/model/vo/ModelAuditVO.java deleted 100644 → 0
View file @ 2f4be4ef
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 '提交人姓名';
src/main/java/com/pms/ocp/model/vo/ModelVO.java
View file @ b8522998
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;
}
src/main/java/com/pms/ocp/model/vo/OcpModelGroupVO.java
View file @ b8522998
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;
/**
* 模型分类名称
......
src/main/java/com/pms/ocp/service/ApiBasicManagementService.java
View file @ b8522998
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<OcpApiBase> {
* 条件查询
* @param apiCode
* @param keyword
* @param apiUnit
* @param startTime
* @param endTime
* @return
......@@ -59,33 +56,5 @@ public interface ApiBasicManagementService extends IService<OcpApiBase> {
*/
ResponseVO apiIssue(String apiCodes);
/**
* 获取顶级服务树
* @param apiGroupCompanyCode
* @return
*/
List<OcpApiGroup> apiBaseTree(String apiGroupCompanyCode);
/**
* 获取次级服务树
* @param apiGroupCompanyCode
* @param apiGroupPcode
* @return
*/
List<OcpApiGroup> apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupPcode,Integer apiGroupPromotionType);
/**
* 根据分组code获取列表
* @param ApiBaseReq
* @return
*/
ResponseVO<PageInfo<OcpApiBaseVo>> getBaseByGroupCode(ApiBaseDto ApiBaseReq);
/**
* 服务分类暴露服务列表
* @param apiGroupCompanyCode
* @param apiGroupPcode
* @return
*/
List<OcpApiBase> apiBaseTreeApiList(String apiGroupCompanyCode, String apiGroupPcode);
}
src/main/java/com/pms/ocp/service/ModelSubscribeService.java → src/main/java/com/pms/ocp/service/ModelIssueService.java
View file @ b8522998
......@@ -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<String> ids);
Integer deletePatchModelIssue(List<String> ids);
/**
* 更新模型订阅
*
* @param modelSubscribe
* @param modelIssue
* @return
*/
Integer updateModelIssue(ModelSubscribe modelSubscribe);
Integer updateModelIssue(ModelIssue modelIssue);
/**
* 获取模型订阅
......@@ -53,7 +51,7 @@ public interface ModelSubscribeService {
* @param
* @return
*/
List<ModelSubscribe> getModelIssueList(String objId, String modelCode, String subsCompanyCode);
List<ModelIssue> 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);
......
src/main/java/com/pms/ocp/service/ModelAuditService.java → src/main/java/com/pms/ocp/service/ModelNoteService.java
View file @ b8522998
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<ModelAudit> getModelNoteList(String modelCode);
List<ModelNote> 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);
}
src/main/java/com/pms/ocp/service/ModelPropertyService.java
View file @ b8522998
......@@ -35,7 +35,7 @@ public interface ModelPropertyService {
* @param ids
* @return
*/
Integer deleteBatchModelProperty(List<String> ids);
Integer deletePatchModelProperty(List<String> ids);
/**
* 更新模型属性
......
src/main/java/com/pms/ocp/service/ModelRelationService.java
View file @ b8522998
......@@ -37,7 +37,7 @@ public interface ModelRelationService {
* @param ids
* @return
*/
Integer deleteBatchModelRelation(List<String> ids);
Integer deletePatchModelRelation(List<String> ids);
/**
* 更新模型关系
......
src/main/java/com/pms/ocp/service/ModelService.java
View file @ b8522998
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<Model> getModelList(String objId, String modelCode);
ResponseVO getModelList();
/**
* 获取模型列表
......
src/main/java/com/pms/ocp/service/OcpApiAuditService.java
View file @ b8522998
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<OcpApiAudit> {
public interface OcpApiAuditService {
ResponseVO getOcpApiAuditList(OcpApiAudit ocpApiAudit);
ResponseVO getOcpApiDetails(String objId);
......
src/main/java/com/pms/ocp/service/OcpApiModelRelService.java
View file @ b8522998
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<OcpApiModelRel> {
public interface OcpApiModelRelService {
ResponseVO getOamrList(OcpApiModelRel ocpApiModelRel);
}
src/main/java/com/pms/ocp/service/OcpApiSubsService.java
View file @ b8522998
......@@ -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<OcpApiSubs> {
public interface OcpApiSubsService {
ResponseVO getOcpApiSubsList(OcpApiSubs ocpApiSubs);
}
src/main/java/com/pms/ocp/service/OcpApiTenantRelService.java
View file @ b8522998
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<OcpApiTenantRel> {
public interface OcpApiTenantRelService {
ResponseVO getOatrList(OcpApiTenantRel ocpApiTenantRel);
ResponseVO getTenantApiList(OcpApiTenantRel ocpApiTenantRel);
......
src/main/java/com/pms/ocp/service/OcpTenantAuditService.java
View file @ b8522998
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<OcpTenantAudit> {
public interface OcpTenantAuditService {
ResponseVO getOtaList(OcpTenantAudit ocpTenantAudit);
ResponseVO getOtaListById(OcpTenantAudit ocpTenantAudit);
......
src/main/java/com/pms/ocp/service/OcpTenantBaseService.java
View file @ b8522998
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<OcpTenantBase> {
public interface OcpTenantBaseService {
ResponseVO getOtbList(OcpTenantBase ocpTenantBase);
}
src/main/java/com/pms/ocp/service/TenantService.java
View file @ b8522998
......@@ -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<OcpTenantGroup> {
boolean gettenantDelete(OcpTenantGroup ocpTenantGroup);
/**
* 应用分类--应用管理
* @param ocpTenantDto
* @return
*/
List<OcpTenantGroup> getsUse(PageOcpTenantDto ocpTenantDto);
/**
* 应用分类--应用服务分页查
* @param pageOcpTenantDto
* @return
*/
Page<OcpTenantGroup> getOnePages(PageOcpTenantDto pageOcpTenantDto);
}
src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java
View file @ b8522998
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<ApiBasicManagementMapper, OcpApiBase>
......@@ -52,10 +35,7 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl<ApiBasicManagemen
private OcpApiExtentService ocpApiExtentService;
@Autowired
private OcpApiExtentMapper ocpApiExtentMapper;
@Autowired
private OcpApiGroupMapper ocpApiGroupMapper;
List<String> apiGroupCode = new ArrayList<>();
/**
* 导出查询
*
......@@ -177,70 +157,4 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl<ApiBasicManagemen
return ResponseVO.ok();
}
@Override
public List<OcpApiGroup> apiBaseTree(String apiGroupCompanyCode) {
List<OcpApiGroup> ocpApiGroups = ocpApiGroupMapper.selectTreeList(apiGroupCompanyCode);
return ocpApiGroups;
}
@Override
public List<OcpApiGroup> apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupPcode,Integer apiGroupPromotionType) {
List<OcpApiGroup> ocpApiGroups = ocpApiGroupMapper.apiBaseTreeOther(apiGroupCompanyCode,apiGroupPcode,apiGroupPromotionType);
return ocpApiGroups;
}
@Override
public ResponseVO<PageInfo<OcpApiBaseVo>> 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<OcpApiBaseVo> ocpApiBaseVos = ocpApiGroupMapper.selectPageLists(apiBaseReq);
apiGroupCode.clear();
PageInfo<OcpApiBaseVo> pageInfo = new PageInfo<>(ocpApiBaseVos);
return ResponseVO.ok(pageInfo);
}
@Override
public List<OcpApiBase> 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<String> 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<String> getIdsByPIdPub(String apiGroupCompanyCode,String code,Integer apiGroupPromotionType) {
List<OcpApiGroup> ocpApiGroups = ocpApiGroupMapper.apiBaseTreeOther(apiGroupCompanyCode, code,apiGroupPromotionType);
return ocpApiGroups.stream().map(OcpApiGroup::getApiGroupCode).collect(Collectors.toList());
}
}
src/main/java/com/pms/ocp/service/impl/ModelClassifyServiceImpl.java
View file @ b8522998
......@@ -138,6 +138,7 @@ public class ModelClassifyServiceImpl implements ModelClassifyService {
return childList;
}
/**
* 构建树节点
* @author huxiuwu
......
src/main/java/com/pms/ocp/service/impl/ModelAuditServiceImpl.java → src/main/java/com/pms/ocp/service/impl/ModelNoteServiceImpl.java
View file @ b8522998
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 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;
......@@ -16,14 +16,14 @@ import java.util.List;
*/
@Service
public class ModelAuditServiceImpl implements ModelAuditService {
public class ModelNoteServiceImpl implements ModelNoteService {
@Autowired
private ModelAuditMapper modelAuditMapper;
private ModelNoteMapper modelNoteMapper;
@Override
public Integer createModelNote(ModelAudit modelAudit) {
return modelAuditMapper.insert(modelAudit);
public Integer createModelNote(ModelNote modelNote) {
return modelNoteMapper.insert(modelNote);
}
@Override
......@@ -32,29 +32,20 @@ public class ModelAuditServiceImpl implements ModelAuditService {
}
@Override
public Integer updateModelNote(ModelAudit modelAudit) {
public Integer updateModelNote(ModelNote modelNote) {
return null;
}
@Override
public List<ModelAudit> getModelNoteList(String modelCode) {
public List<ModelNote> getModelNoteList(String modelCode) {
QueryWrapper<ModelAudit> wrapper = new QueryWrapper<>();
wrapper.lambda().eq(ModelAudit::getModelCode, modelCode);
return modelAuditMapper.selectList(wrapper);
QueryWrapper<ModelNote> wrapper = new QueryWrapper<>();
wrapper.lambda().eq(ModelNote::getModelCode, modelCode);
return modelNoteMapper.selectList(wrapper);
}
@Override
public ModelAudit getModelNote(String modelId) {
public ModelNote getModelNote(String modelId) {
return null;
}
// @Override
// public Boolean exportModelNote(String modelCode) {
// List<ModelNote> modelNoteList = getModelNoteList(modelCode);
//
// ExcelUtils.exportExcel(modelNoteList, "导出事记", "导出事记", ModelNote.class, "测试user.xls", re
//
// return true;
// }
}
src/main/java/com/pms/ocp/service/impl/ModelPropertyServiceImpl.java
View file @ b8522998
......@@ -54,7 +54,7 @@ public class ModelPropertyServiceImpl implements ModelPropertyService {
}
@Override
public Integer deleteBatchModelProperty(List<String> ids) {
public Integer deletePatchModelProperty(List<String> ids) {
return modelPropertyMapper.deleteBatchIds(ids);
}
......
src/main/java/com/pms/ocp/service/impl/ModelRelationServiceImpl.java
View file @ b8522998
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<String> ids) {
public Integer deletePatchModelRelation(List<String> ids) {
return modelRelationMapper.deleteBatchIds(ids);
}
......
src/main/java/com/pms/ocp/service/impl/ModelServiceImpl.java
View file @ b8522998
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<ModelMapper, Model> 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<Model> 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<Model> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("obj_id", modelId);
int result = modelMapper.delete(queryWrapper);
if (result > 0) {
return ResponseVO.ok(CodeEnum.SUCCESS);
} else {
return ResponseVO.error(CodeEnum.UNKNOWN);
}
return modelMapper.delete(queryWrapper);
}
/**
* 更新模型
*
* @param modelDTO
* @return
*/
@Override
public Integer updateModel(ModelDTO modelDTO) {
Model model = new Model();
BeanUtils.copyProperties(modelDTO, model);
model.setModelMtime(LocalDateTime.now());
UpdateWrapper<Model> updateWrapper = new UpdateWrapper<>();
updateWrapper.lambda().eq(Model::getObjId, model.getObjId());
return modelMapper.update(model, updateWrapper);
}
/**
* 导入模型
*
* @param file
* @param model
* @return
*/
@Override
public Boolean importModel(MultipartFile file) throws IOException {
//校验Excel文件
ExcelUtils.checkFile(file);
List<ModelVO> modelVOList = ExcelUtils.importExcel(file, ModelVO.class);
List<Model> modelList = new ArrayList<>(modelVOList.size());
if (!modelVOList.isEmpty()) {
for (ModelVO modelVO : modelVOList) {
Model model = new Model();
BeanUtils.copyProperties(modelVO, model);
model.setModelCtime(LocalDateTime.now());
modelList.add(model);
}
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<ModelMapper, Model> implements
* @return
*/
@Override
public List<Model> getModelList(String objId, String modelCode) {
QueryWrapper<Model> queryWrapper = new QueryWrapper();
if (StringUtils.isNotEmpty(objId)) {
queryWrapper.lambda().eq(Model::getObjId, objId);
}
if (StringUtils.isNotEmpty(modelCode)) {
queryWrapper.lambda().eq(Model::getModelCode, modelCode);
public ResponseVO getModelList() {
List<Model> modelList = modelMapper.selectList(null);
if (CollectionUtils.isEmpty(modelList)) {
return ResponseVO.ok("查询列表为空");
}
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<Model> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(Model::getObjId, objId);
queryWrapper.eq("model_id", modelId);
return modelMapper.selectOne(queryWrapper);
}
}
src/main/java/com/pms/ocp/service/impl/ModelSubscribeServiceImpl.java deleted 100644 → 0
View file @ 2f4be4ef
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<String> ids) {
return modelSubscribeMapper.deleteBatchIds(ids);
}
@Override
public Integer updateModelIssue(ModelSubscribe modelSubscribe) {
return null;
}
@Override
public List<ModelSubscribe> getModelIssueList(String objId, String modelCode, String subsCompanyCode) {
QueryWrapper<ModelSubscribe> 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;
}
}
src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java
View file @ b8522998
......@@ -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<OcpApiTreeMapper,OcpApiGr
@Override
public boolean insertTree(OcpApiGroupDtos ocpApiGroupDtos) {
Timestamp timestamp = new Timestamp(System.currentTimeMillis());
String code = RandomStringUtils.getRandomString(6);
String code = RandomStringUtil.getRandomString(6);
boolean flag = true;
List<OcpApiGroup> ocpApiGroups = mapper.selectList(null);
for (OcpApiGroup ocpApiGroup : ocpApiGroups) {
......@@ -170,13 +173,24 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper,OcpApiGr
}
if (flag == true) {
OcpApiBase ocpApiBase = new OcpApiBase();
ocpApiBase.setApiCode(ocpApiGroupDtos.getApiGroupCode());
BeanUtils.copyProperties(ocpApiGroupDtos, ocpApiBase);
ocpApiBase.setApiGroupCode(code);
ocpApiBase.setApiName("新增服务分类");
Timestamp timestamp = new Timestamp(System.currentTimeMillis());
ocpApiBase.setApiMtime(timestamp);
ocpApiBase.setApiCtime(timestamp);
ocpApiBase.setApiUserId(ocpApiGroupDtos.getApiGroupUserId());
ocpApiBase.setObjId("");
OcpApiGroup ocpApiGroup1 = new OcpApiGroup();
ocpApiGroup1.setObjId("");
ocpApiGroup1.setApiGroupMtime(timestamp);
ocpApiGroup1.setApiGroupCtime(timestamp);
ocpApiBase.setApiMtime(timestamp);
BeanUtils.copyProperties(ocpApiGroupDtos, ocpApiGroup1);
ocpApiGroup1.setApiGroupCode(code);
ocpApiBaseMapper.insert(ocpApiBase);
mapper.insert(ocpApiGroup1);
}
return flag;
......@@ -261,7 +275,7 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper,OcpApiGr
}else if (pageGroupDto.getApiGroupLevel() == 2){
List<OcpApiGroup> ocpApiGroups = mapper.selectList(null);
for (OcpApiGroup ocpApiGroup : ocpApiGroups) {
if (pageGroupDto.getApiGroupCode().equals(ocpApiGroup.getApiGroupCode())){
if (pageGroupDto.getApiGroupCode() == ocpApiGroup.getApiGroupCode()){
LambdaQueryWrapper<OcpApiGroup> queryWrapper = new LambdaQueryWrapper();
queryWrapper.eq(OcpApiGroup::getApiGroupLevel, pageGroupDto.getApiGroupLevel());
mapper.selectPage(pageInfo,queryWrapper);
......
src/main/java/com/pms/ocp/service/impl/OcpTenantAuditServiceImpl.java
View file @ b8522998
......@@ -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<OcpTenantAuditMapper,
@Autowired
private OcpTenantAuditMapper ocpTenantAuditMapper;
@Autowired
private OcpApiTenantRelMapper ocpApiTenantRelMapper;
@Override
public ResponseVO getOtaList(OcpTenantAudit ocpTenantAudit) {
List<OcpTenantAudit> otaList = ocpTenantAuditMapper.getOtaList(ocpTenantAudit);
......@@ -49,7 +44,7 @@ public class OcpTenantAuditServiceImpl extends ServiceImpl<OcpTenantAuditMapper,
@Override
public ResponseVO OtaById(OcpTenantAudit ocpTenantAudit) {
List<OcpTenantAudit> oatrList = ocpTenantAuditMapper.OtaById(ocpTenantAudit);
return ResponseVO.ok(oatrList);
List<OcpTenantAudit> otaById = ocpTenantAuditMapper.OtaById(ocpTenantAudit);
return ResponseVO.ok(otaById);
}
}
src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java
View file @ b8522998
......@@ -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<TenantMapper, OcpTenantGroup>
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<TenantMapper, OcpTenantGroup>
return flag;
}
/**
* 应用分类--应用管理
*
* @param ocpTenantDto
* @return
*/
@Override
public List<OcpTenantGroup> getsUse(PageOcpTenantDto ocpTenantDto) {
LambdaQueryWrapper<OcpTenantGroup> qw = new LambdaQueryWrapper<>();
qw.eq(OcpTenantGroup::getTenantGroupCompanyCode,ocpTenantDto.getTenantGroupCompanyCode());
List<OcpTenantGroup> 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<OcpTenantGroup> getOnePages(PageOcpTenantDto pageOcpTenantDto) {
Page<OcpTenantGroup> pageInfo;
int pageSize = pageOcpTenantDto.getPageSize();
int pageNum = pageOcpTenantDto.getPageNum();
if (pageSize != 0 && pageNum != 0){
pageInfo = new Page<>(pageSize,pageNum);
List<OcpTenantGroup> ocpTenantGroupList = tenantMapper.selectList(null);
for (OcpTenantGroup ocpTenantGroup : ocpTenantGroupList) {
if ("".equals(ocpTenantGroup.getTenantGroupPcode())){
continue;
}
if (pageOcpTenantDto.getTenantGroupCode().equals(ocpTenantGroup.getTenantGroupPcode())){
LambdaQueryWrapper<OcpTenantGroup> 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<OcpTenantGroup> ocpTenantGroupList = tenantMapper.selectList(null);
for (OcpTenantGroup ocpTenantGroup : ocpTenantGroupList) {
if (ocpTenantGroup.getTenantGroupPcode().equals(pageOcpTenantDto.getTenantGroupCode())){
LambdaQueryWrapper<OcpTenantGroup> queryWrapper = new LambdaQueryWrapper();
queryWrapper.eq(OcpTenantGroup::getTenantGroupLevel,2);
tenantMapper.selectPage(pageInfo,queryWrapper);
}
}
}
return pageInfo;
}
}
src/main/resources/mapper/ModelMapper.xml
View file @ b8522998
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.pms.ocp.mapper.ModelMapper">
<!--
collection：表示遍历的数组或者集合，填写对应 key 的值
item：集合中被遍历的元素名，自己随意起的名字
separator：每次遍历元素后用于拼接字符串
open：遍历开始拼接的字符串
close：遍历结束拼接字符串
index：遍历索引
例如本条 SQL 语句,拼接后的结果为：
insert into user(username, password) values (?, ?), (?, ?), ...
-->
<insert id="insertBatchModel" useGeneratedKeys="true" keyProperty="id">
insert into ocp_model_base(username, password)
values
<foreach collection="users" item="user" separator=",">
(#{user.username}, #{user.password})
</foreach>
</insert>
<!-- &lt;!&ndash;<select id="getPlatformServiceSortVo" resultType="com.beagle.base.model.vo.PlatformServiceSortVo">&ndash;&gt;-->
<!-- &lt;!&ndash;SELECT&ndash;&gt;-->
<!-- &lt;!&ndash;*&ndash;&gt;-->
<!-- &lt;!&ndash;FROM&ndash;&gt;-->
<!-- &lt;!&ndash;( SELECT COUNT ( api_code ) AS total, api_code AS apiCode, api_name AS apiName FROM pms_zy_api GROUP BY api_code, api_name ) T&ndash;&gt;-->
<!-- &lt;!&ndash;where T.total > 0&ndash;&gt;-->
<!-- &lt;!&ndash;ORDER BY&ndash;&gt;-->
<!-- &lt;!&ndash;total DESC&ndash;&gt;-->
<!-- &lt;!&ndash;</select>&ndash;&gt;-->
<!-- <select id="getPlatformServiceNotSortVo" resultType="com.beagle.base.model.vo.PlatformServiceSortVo">-->
<!-- SELECT COUNT ( api_code ) AS total, api_code AS apiCode, api_name AS apiName FROM pms_zy_api GROUP BY api_code, api_name-->
<!-- </select>-->
<!-- <select id="getCountCompanyCodeIsNull" resultType="int">-->
<!-- SELECT COUNT( * ) FROM pms_zy_api WHERE company_code is null-->
<!-- </select>-->
<!-- <select id="selectApiInfoList" resultType="com.beagle.base.model.dto.AcceptApiInfoDto"-->
<!-- parameterType="java.util.Map">-->
<!-- select-->
<!-- api.api_id as apiId,-->
<!-- api.api_code as api_code,-->
<!-- api.api_name as apiName,-->
<!-- api.api_url as apiUrl,-->
<!-- api.api_ctime as apiCtime,-->
<!-- gro.group_name as groupName,-->
<!-- api.company_code as companyCode,-->
<!-- api.company_name as companyName-->
<!-- from pms_zy_api api-->
<!-- left join pms_zy_api_group gro-->
<!-- on api.group_id = gro.group_id-->
<!-- <where>-->
<!-- api.company_code = #{companyCode}-->
<!-- <if test="apiName !=null and apiName != '' ">-->
<!-- and api.api_name like CONCAT('%', #{apiName}::text,'%')-->
<!-- </if>-->
<!-- <if test="groupName != null and groupName != '' ">-->
<!-- and gro.group_name = #{groupName}-->
<!-- </if>-->
<!-- <if test="isBind != null and isBind == 0">-->
<!-- and api.api_id not in-->
<!-- <foreach collection="apiIds" separator="," item="item" open="(" close=")" index="index" >-->
<!-- #{item}-->
<!-- </foreach>-->
<!-- </if>-->
<!-- <if test="isBind != null and isBind == 1">-->
<!-- and api.api_id in-->
<!-- <foreach collection="apiIds" separator="," item="item" open="(" close=")" index="index" >-->
<!-- #{item}-->
<!-- </foreach>-->
<!-- </if>-->
<!-- </where>-->
<!-- order by api.api_ctime desc-->
<!-- </select>-->
<!-- <select id="selectPlanInvokeApiList" resultType="com.beagle.base.model.dto.PlanInvokeApiCountDTO">-->
<!-- select pc2.company_code, pc2.company_name,pc2.company_short_name, eee.tenant_code, eee.tenant_name , eee.api_plan_invoke_count from pms_company pc2-->
<!-- left join (select pc.company_code, pc.company_name, pzt.tenant_id, pzt.tenant_code, pzt.tenant_name , count(pztar.api_id) as api_plan_invoke_count-->
<!-- from pms_company pc-->
<!-- left join pms_zy_tenant pzt on pc.company_code = pzt.company_code-->
<!-- join pms_zy_tenant_api_rel pztar on pzt.tenant_id = pztar.tenant_id-->
<!-- group by pzt.tenant_id ,pc.company_code, pc.company_name,pzt.tenant_name,pzt.tenant_code) as eee on pc2.company_code = eee.company_code-->
<!-- <where>-->
<!-- <if test="tenantCode != null and tenantCode != '' ">-->
<!-- and tenant_code = #{tenantCode}-->
<!-- </if>-->
<!-- </where>-->
<!-- </select>-->
<!-- <select id="selectGroupApiQuantity" resultType="com.beagle.base.model.dto.GroupInvokeApiSituationDTO">-->
<!-- select pzag.group_id, pzag.group_name, pza.api_code, pza.api_name-->
<!-- from pms_zy_api_group pzag-->
<!-- left join pms_zy_api pza on pzag.group_id = pza.group_id-->
<!-- <where>-->
<!-- <if test="groupLvl != null and groupLvl != '' ">-->
<!-- and pzag.group_lvl = #{groupLvl}-->
<!-- </if>-->
<!-- <if test="groupNamePre != null and groupNamePre != '' ">-->
<!-- and pzag.group_name like CONCAT('%', #{groupNamePre}::text,'%')-->
<!-- </if>-->
<!-- </where>-->
<!-- </select>-->
</mapper>
src/main/resources/mapper/OcpApiGroupMapper.xml deleted 100644 → 0
View file @ 2f4be4ef
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.pms.ocp.mapper.OcpApiGroupMapper">
<resultMap id="oabMap" type="com.pms.ocp.model.entity.OcpApiGroup">
<result property="objId" column="obj_id"/>
<result property="apiGroupCode" column="api_group_code"/>
<result property="apiGroupName" column="api_group_name"/>
<result property="apiGroupPromotionType" column="api_group_promotion_type"/>
<result property="apiGroupCompanyCode" column="api_group_company_code"/>
<result property="apiGroupVersion" column="api_group_version"/>
<result property="apiGroupOrderNo" column="api_group_order_no"/>
<result property="apiGroupUserId" column="api_group_user_id"/>
<result property="apiGroupUserName" column="api_group_user_name"/>
<result property="apiGroupCtime" column="api_group_ctime"/>
<result property="apiGroupMtime" column="api_group_mtime"/>
<result property="apiGroupPcode" column="api_group_pcode"/>
<result property="isDelete" column="is_delete"/>
<result property="apiGroupLevel" column="api_group_level"/>
</resultMap>
<select id="selectTreeList" resultType="com.pms.ocp.model.entity.OcpApiGroup">
select api_group_code,api_group_name,api_group_pcode,api_group_level from ocp_api_group where is_delete = 0
<if test="apiGroupPcode == null">
and api_group_pcode is null
</if>
<if test="apiGroupPcode!=null and apiGroupPcode!=''">
and api_group_pcode = #{apiGroupPcode}
</if>
<if test="apiGroupCompanyCode!=null and apiGroupCompanyCode!=''">
and api_group_company_code =#{apiGroupCompanyCode}
</if>
</select>
<select id="apiBaseTreeOther" resultType="com.pms.ocp.model.entity.OcpApiGroup">
select api_group_code,api_group_name,api_group_pcode,api_group_level from ocp_api_group where is_delete = 0
<if test="apiGroupPcode == null">
and api_group_pcode is null
</if>
<if test="apiGroupPcode!=null and apiGroupPcode!=''">
and api_group_pcode = #{apiGroupPcode}
</if>
<if test="apiGroupCompanyCode!=null and apiGroupCompanyCode!=''">
and api_group_company_code =#{apiGroupCompanyCode}
</if>
<if test="apiGroupPromotionType!=null and apiGroupPromotionType!=''">
and api_group_promotion_type =#{apiGroupPromotionType}
</if>
</select>
<select id="selectPageLists" resultType="com.pms.ocp.model.vo.OcpApiBaseVo">
select
oab.obj_id,oab.api_code,oae.api_code,oab.api_name,oae.cluster_name,
oae.space_name,oab.api_url,oae.api_state ,oab.api_unit ,oab.api_ctime from ocp_api_base oab
LEFT JOIN ocp_api_extent oae
on oab.api_code = oae.api_code
where oab.is_delete = 0
<if test="apiGroupCode !=null and apiGroupCode!=''">
and oab.api_group_code = #{apiGroupCode}
</if>
<if test="apiUnit !=null and apiUnit!=''">
and oab.api_unit = #{apiUnit}
</if>
<if test="apiPromotion !=null and apiPromotion!=''">
and oab.api_promotion = #{apiPromotion}
</if>
<if test="startTime !=null ">
<![CDATA[
and oab.api_ctime >= #{startCTime}
]]>
</if>
<if test="endTime !=null ">
<![CDATA[
and oab.api_ctime <= #{endCTime}
]]>
</if>
<if test="keyword !=null and keyword != '' ">
and oab.api_name like CONCAT('%', #{keyword}::text,'%')
</if>
</select>
</mapper>
\ No newline at end of file
src/main/resources/mapper/OcpApiModelRelMapper.xml
View file @ b8522998
......@@ -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}
</select>
</mapper>
\ No newline at end of file
src/main/resources/mapper/OcpApiTenantRelMapper.xml
View file @ b8522998
......@@ -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}
</select>
......
src/main/resources/mapper/OcpTenantAuditMapper.xml
View file @ b8522998
......@@ -10,11 +10,9 @@
</select>
<select id="OtaById" resultType="com.pms.ocp.model.entity.OcpTenantAudit">
SELECT * from ocp_api_tenant_rel oatr
LEFT JOIN ocp_tenant_audit ota
on oatr.tenant_code = ota.tenant_code
INNER JOIN ocp_api_base oab
on oatr.api_code = oab.api_code
where oatr.tenant_code = #{tenantCode}
select * from ocp_tenant_audit ota
LEFT JOIN ocp_tenant_base otb
on ota.tenant_code = otb.tenant_code
where ota.obj_id = #{objId}
</select>
</mapper>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment