Skip to content

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

Merge remote-tracking branch 'origin/master'

parents 54e0b520 1a75f827
Show whitespace changes
Inline Side-by-side
Showing with 1930 additions and 170 deletions
pom.xml
View file @ b54675ce
......@@ -77,23 +77,12 @@
<version>1.2.62</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>io.jsonwebtoken</groupId>-->
<!-- <artifactId>jjwt</artifactId>-->
<!-- <version>0.9.0</version>-->
<!-- </dependency>-->
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>9.4.1212.jre7</version>
<version>9.4.1212</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
......
src/main/java/com/pms/ocp/common/handler/MYLocalDateTimeTypeHandler.java 0 → 100644
View file @ b54675ce
package com.pms.ocp.common.handler;
import org.apache.ibatis.type.LocalDateTimeTypeHandler;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Timestamp;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
/**
* @Auther: wangjian
* @Date: 2022/3/10 10:10
* @Description:时间类型处理器
*/
public class MYLocalDateTimeTypeHandler extends LocalDateTimeTypeHandler {
// @Override
// public LocalDateTime getNullableResult(ResultSet rs, String columnName) throws SQLException {
// Timestamp timestamp = rs.getTimestamp(columnName);
// Long remindTime = timestamp.getTime();
// return LocalDateTime.ofEpochSecond(remindTime,0, ZoneOffset.ofHours(8));
// }
// @Override
// public LocalDateTime getResult(ResultSet rs, String columnName) throws SQLException {
// Object object = rs.getObject(columnName);
// System.out.println(object);
// if (object instanceof java.sql.Timestamp) {//在这里强行转换，将sql的时间转换为LocalDateTime
// //可以根据自己的需要进行转化
// return LocalDateTime.ofInstant(((Timestamp) object).toInstant(), ZoneOffset.ofHours(0));
// }
// return super.getResult(rs, columnName);
// }
@Override
public LocalDateTime getResult(ResultSet rs, String columnName) throws SQLException {
Object object = rs.getObject(columnName);
if (object == null) {
return null;
}
// System.out.println(object);
// 如有需要 在这里强行转换，将sql的时间转换为LocalDateTime
if (object instanceof java.sql.Timestamp) {
//可以根据自己的需要进行转化
return LocalDateTime.ofInstant(((Timestamp) object).toInstant(), ZoneOffset.ofHours(8));
}
return super.getResult(rs, columnName);
}
}
src/main/java/com/pms/ocp/common/handler/TimestampTypeHandler.java 0 → 100644
View file @ b54675ce
package com.pms.ocp.common.handler;
import org.apache.ibatis.type.BaseTypeHandler;
import org.apache.ibatis.type.JdbcType;
import org.apache.ibatis.type.MappedJdbcTypes;
import org.apache.ibatis.type.MappedTypes;
import org.postgresql.util.PGTimestamp;
import java.sql.*;
import java.time.LocalDateTime;
/**
* @Auther: wangjian
* @Date: 2022/3/10 09:43
* @Description:
*/
@MappedTypes({LocalDateTime.class})
@MappedJdbcTypes({JdbcType.OTHER})
public class TimestampTypeHandler extends BaseTypeHandler {
@Override
public void setNonNullParameter(PreparedStatement ps, int i, Object parameter, JdbcType jdbcType) throws SQLException {
Timestamp p = null;
if (parameter != null) {
if (parameter instanceof LocalDateTime) {
PGTimestamp.valueOf(LocalDateTime.now());
p = PGTimestamp.valueOf((LocalDateTime) parameter);
}
ps.setObject(i, p);
}
}
/**
* Gets the nullable result.
*
* @param rs the rs
* @param columnName Colunm name, when configuration <code>useColumnLabel</code> is <code>false</code>
* @return the nullable result
* @throws SQLException the SQL exception
*/
@Override
public Object getNullableResult(ResultSet rs, String columnName) throws SQLException {
return toFill(rs.getObject(columnName));
}
@Override
public Object getNullableResult(ResultSet rs, int columnIndex) throws SQLException {
return toFill(rs.getObject(columnIndex));
}
@Override
public Object getNullableResult(CallableStatement cs, int columnIndex) throws SQLException {
return toFill(cs.getObject(columnIndex));
}
private Object toFill(Object v) {
if (v != null) {
if (v instanceof PGTimestamp) {
PGTimestamp p = (PGTimestamp) v;
return p.toLocalDateTime();
} else if (v instanceof Timestamp) {
return ((Timestamp) v).toLocalDateTime();
}
}
return v;
}
}
\ No newline at end of file
src/main/java/com/pms/ocp/controller/ApiDetailsController.java
View file @ b54675ce
package com.pms.ocp.controller;
import com.pms.ocp.model.entity.OcpApiBase;
import com.pms.ocp.model.vo.ResponseVO;
import com.pms.ocp.service.ApiDetailsService;
import io.swagger.annotations.Api;
......@@ -11,6 +12,8 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@Slf4j
@RequestMapping("/api-base/v1")
@RestController
......@@ -21,7 +24,7 @@ public class ApiDetailsController {
@ApiOperation("服务库服务详情-查询")
@GetMapping("/query")
public ResponseVO getApiDetails(String objId) {
public ResponseVO<OcpApiBase> getApiDetails(String objId) {
return apiDetailsService.getApiDetails(objId);
}
......
src/main/java/com/pms/ocp/controller/ModelBaseController.java
View file @ b54675ce
package com.pms.ocp.controller;
import com.pms.ocp.common.constants.CodeEnum;
import com.pms.ocp.model.dto.ModelPropertyDTO;
import com.pms.ocp.model.entity.Model;
import com.pms.ocp.model.entity.ModelNote;
import com.pms.ocp.model.entity.ModelProperty;
import com.pms.ocp.model.entity.ModelType;
import com.pms.ocp.model.vo.ResponseVO;
import com.pms.ocp.service.ModelGroupService;
......@@ -11,6 +13,7 @@ import com.pms.ocp.service.ModelPropertyService;
import com.pms.ocp.service.ModelService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -44,6 +47,9 @@ public class ModelBaseController {
@Autowired
private ModelNoteService modelNoteService;
@Autowired
private ModelPropertyService propertyService;
/**
* 模型分类-查询
*
......@@ -219,8 +225,10 @@ public class ModelBaseController {
*/
@ApiOperation("模型属性-增加")
@PostMapping("create/model/property")
public ResponseVO createModelProperty() {
return ResponseVO.ok();
public ResponseVO createModelProperty(@RequestBody ModelPropertyDTO modelPropertyDTO) {
Integer i = modelPropertyService.createModelProperty(modelPropertyDTO);
return ResponseVO.ok(i);
}
/**
......@@ -230,8 +238,10 @@ public class ModelBaseController {
*/
@ApiOperation("模型属性-查询")
@GetMapping("get/model/property")
public ResponseVO getModelProperty() {
return ResponseVO.ok(modelPropertyService.getModelProperty());
public ResponseVO getModelProperty(@ApiParam(value = "模型属性编号") @RequestParam(value = "objId", required = false) String objId,
@ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode,
@ApiParam(value = "属性编码") @RequestParam(value = "propCode", required = false) String propCode) {
return ResponseVO.ok(modelPropertyService.listModelProperty(objId, modelCode, propCode));
}
/**
......@@ -241,19 +251,20 @@ public class ModelBaseController {
*/
@ApiOperation("模型属性-修改")
@PostMapping("/update/model/property")
public ResponseVO updateModelProperty() {
return ResponseVO.ok();
public ResponseVO updateModelProperty(@RequestBody ModelPropertyDTO modelPropertyDTO) {
return ResponseVO.ok(modelPropertyService.updateModelProperty(modelPropertyDTO));
}
/**
* 模型属性-删除
* 模型属性-删除/批量删除
*
* @return
*/
@ApiOperation("模型属性-删除")
@ApiOperation("模型属性-删除/批量删除")
@PostMapping("/delete/model/property")
public ResponseVO deleteModelProperty() {
return ResponseVO.ok();
public ResponseVO deleteModelProperty(@ApiParam(value = "属性ID集合") @RequestBody List<String> ids) {
return ResponseVO.ok(modelPropertyService.deletePatchModelProperty(ids));
}
/**
......
src/main/java/com/pms/ocp/controller/OcpApiDetailsController.java
View file @ b54675ce
......@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
@Slf4j
......@@ -35,49 +36,43 @@ public class OcpApiDetailsController {
@ApiOperation("服务订阅记录-查询")
@PostMapping("/getocpapisublist")
public ResponseVO getOcpApiSubsList(OcpApiSubs ocpApiSubs) {
public ResponseVO<List<OcpApiSubs>> getOcpApiSubsList(OcpApiSubs ocpApiSubs) {
return ocpApiSubsService.getOcpApiSubsList(ocpApiSubs);
}
@ApiOperation("服务大事记-查询")
@PostMapping("/getocpapiauditlist")
public ResponseVO getOcpApiAuditList(OcpApiAudit ocpApiAudit) {
public ResponseVO<List<OcpApiAudit>> getOcpApiAuditList(OcpApiAudit ocpApiAudit) {
return ocpApiAuditService.getOcpApiAuditList(ocpApiAudit);
}
@ApiOperation("服务大事记-查询详情")
@PostMapping("/getocpapidetails")
public ResponseVO getOcpApiDetails(@RequestBody OcpApiAudit ocpApiAudit){
public ResponseVO<List<OcpApiAudit>> getOcpApiDetails(@RequestBody OcpApiAudit ocpApiAudit){
return ocpApiAuditService.sById(ocpApiAudit);
}
@ApiOperation("服务大事记-查询详情")
@ApiOperation("服务大事记-查询详情-变更内容")
@PostMapping("/getocpapi")
public ResponseVO getOcpApi(@RequestBody OcpApiAudit ocpApiAudit){
public ResponseVO<List<OcpApiAudit>> getOcpApi(@RequestBody OcpApiAudit ocpApiAudit){
return ocpApiAuditService.OaaById(ocpApiAudit);
}
@ApiOperation("服务与应用拓扑图-查询")
@PostMapping("/getoatrlist")
public ResponseVO getOatrList(@RequestBody OcpApiTenantRel ocpApiTenantRel) {
public ResponseVO<List<OcpApiTenantRel>> getOatrList(@RequestBody OcpApiTenantRel ocpApiTenantRel) {
return ocpApiTenantRelService.getOatrList(ocpApiTenantRel);
}
@ApiOperation("服务与模型拓扑图-查询")
@PostMapping("/getoamrlist")
public ResponseVO getOamrList(OcpApiModelRel ocpApiModelRel) {
public ResponseVO<List<OcpApiModelRel>> getOamrList(@RequestBody OcpApiModelRel ocpApiModelRel) {
return ocpApiModelRelService.getOamrList(ocpApiModelRel);
}
@ApiOperation("服务与模型拓扑图-关联查询详情")
@PostMapping("/getoaabyid")
public ResponseVO OaaById(@RequestBody OcpApiAudit ocpApiAudit) {
return ocpApiAuditService.OaaById(ocpApiAudit);
}
@ApiOperation("服务大事记-导出")
@GetMapping("/export")
public void exportExcel(@RequestBody OcpApiAudit ocpApiAudit, HttpServletRequest request, HttpServletResponse response) {
@RequestMapping("/export")
public void exportExcel(@RequestBody(required = false) OcpApiAudit ocpApiAudit, HttpServletRequest request, HttpServletResponse response) {
ocpApiAuditService.exportExcel(ocpApiAudit,request,response);
}
......
src/main/java/com/pms/ocp/controller/OcpApiTreeController.java
View file @ b54675ce
......@@ -34,9 +34,9 @@ public class OcpApiTreeController {
*/
@GetMapping("/getTree")
@ApiOperation("服务树分类")
public ApiTreeGroupDto getTree(){
public ResponseVO<ApiTreeGroupDto> getTree(){
ApiTreeGroupDto byGroup = service.getByGroup();
return byGroup;
return ResponseVO.ok(byGroup);
}
......@@ -51,17 +51,11 @@ public class OcpApiTreeController {
}
/*@GetMapping("/getone")
@ApiOperation("服务树分类--分级数据")
public List<OcpApiGroup> getOne(int pageSize,int pageNum,int apiGroupLevel){
List<OcpApiGroup> onePage = service.getOnePage(pageSize, pageNum, apiGroupLevel);
return onePage;
}*/
@PostMapping("/getone")
@ApiOperation("服务树分类--分级数据")
public Page<OcpApiGroup> getOne(@RequestBody PageGroupDto pageGroupDto){
public ResponseVO<Page<OcpApiGroup>> getOne(@RequestBody PageGroupDto pageGroupDto){
Page<OcpApiGroup> onePages = service.getOnePages(pageGroupDto);
return onePages;
return ResponseVO.ok(onePages);
}
......
src/main/java/com/pms/ocp/controller/OcpTenantController.java 0 → 100644
View file @ b54675ce
package com.pms.ocp.controller;
import com.pms.ocp.model.dto.OcpTenantGroupDto;
import com.pms.ocp.model.entity.OcpTenantGroup;
import com.pms.ocp.model.vo.ResponseVO;
import com.pms.ocp.service.TenantService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@Slf4j
@RequestMapping("/api-tenant/v1")
@RestController
@Api(tags = "应用树管理接口")
public class OcpTenantController {
@Autowired
private TenantService tenantService;
/**
* 应用树分类
*/
@GetMapping("/tenanttree")
@ApiModelProperty("应用树分类")
private OcpTenantGroupDto getTenantTree(){
OcpTenantGroupDto tree = tenantService.getTree();
return tree;
}
@PostMapping("/tenantinster")
@ApiModelProperty("新增应用")
public ResponseVO tenantInster(@RequestBody OcpTenantGroup ocpTenantGroup){
boolean falg = tenantService.getTenanInster(ocpTenantGroup);
if (falg){
return ResponseVO.ok("新建成功！");
}
return ResponseVO.error("应用code已经存在！");
}
}
src/main/java/com/pms/ocp/controller/OcpTenantDetailsController.java
View file @ b54675ce
package com.pms.ocp.controller;
import com.pms.ocp.model.entity.OcpApiAudit;
import com.pms.ocp.model.entity.OcpTenantAudit;
import com.pms.ocp.model.entity.OcpTenantBase;
import com.pms.ocp.model.vo.ResponseVO;
import com.pms.ocp.service.OcpApiAuditService;
import com.pms.ocp.service.OcpTenantAuditService;
import com.pms.ocp.service.OcpTenantBaseService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -12,6 +16,8 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@Slf4j
@RequestMapping("/tenant")
@RestController
......@@ -20,9 +26,25 @@ public class OcpTenantDetailsController {
@Autowired
private OcpTenantBaseService ocpTenantBaseService;
@Autowired
private OcpTenantAuditService ocpTenantAuditService;
@ApiOperation("应用基础信息-查询")
@PostMapping("/getotbList")
public ResponseVO getOtbList(@RequestBody OcpTenantBase ocpTenantBase){
public ResponseVO<List<OcpTenantBase>> getOtbList(@RequestBody OcpTenantBase ocpTenantBase){
return ocpTenantBaseService.getOtbList(ocpTenantBase);
}
@ApiOperation("应用大事记-查询")
@PostMapping("/getotaList")
public ResponseVO<List<OcpApiAudit>> getOtaList(OcpTenantAudit ocpTenantAudit) {
return ocpTenantAuditService.getOtaList(ocpTenantAudit);
}
@ApiOperation("应用大事记-查询详情")
@PostMapping("/getotaListById")
public ResponseVO<List<OcpApiAudit>> getOtaListById(@RequestBody OcpTenantAudit ocpTenantAudit) {
return ocpTenantAuditService.getOtaListById(ocpTenantAudit);
}
}
src/main/java/com/pms/ocp/mapper/ModelPropertyMapper.java
View file @ b54675ce
......@@ -12,5 +12,5 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface ModelPropertyMapper extends BaseMapper<Model> {
public interface ModelPropertyMapper extends BaseMapper<ModelProperty> {
}
src/main/java/com/pms/ocp/mapper/OcpApiAuditMapper.java
View file @ b54675ce
......@@ -16,8 +16,8 @@ public interface OcpApiAuditMapper extends BaseMapper<OcpApiAudit> {
List<OcpApiAudit> OaaById(OcpApiAudit ocpApiAudit);
List<String> getOcpApiSubsList(OcpApiAudit ocpApiAudit);
List<OcpApiAudit> getOcpApiSubsList(OcpApiAudit ocpApiAudit);
List<String> sById(OcpApiAudit ocpApiAudit);
List<OcpApiAudit> sById(OcpApiAudit ocpApiAudit);
}
src/main/java/com/pms/ocp/mapper/OcpApiModelRelMapper.java
View file @ b54675ce
......@@ -8,7 +8,7 @@ import java.util.List;
@Mapper
public interface OcpApiModelRelMapper extends BaseMapper<OcpApiModelRel> {
List<String> getOamrList(OcpApiModelRel ocpApiModelRel);
List<OcpApiModelRel> getOamrList(OcpApiModelRel ocpApiModelRel);
}
src/main/java/com/pms/ocp/mapper/OcpApiSubsMapper.java
View file @ b54675ce
......@@ -8,5 +8,5 @@ import java.util.List;
@Mapper
public interface OcpApiSubsMapper extends BaseMapper<OcpApiSubs> {
List<String> getOcpApisList(OcpApiSubs ocpApiSubs);
List<OcpApiSubs> getOcpApisList(OcpApiSubs ocpApiSubs);
}
src/main/java/com/pms/ocp/mapper/OcpApiTenantRelMapper.java
View file @ b54675ce
......@@ -9,5 +9,5 @@ import java.util.List;
@Mapper
public interface OcpApiTenantRelMapper extends BaseMapper<OcpApiTenantRel> {
List<String> getOatrList(OcpApiTenantRel ocpApiTenantRel);
List<OcpApiTenantRel> getOatrList(OcpApiTenantRel ocpApiTenantRel);
}
src/main/java/com/pms/ocp/mapper/OcpTenantAuditMapper.java 0 → 100644
View file @ b54675ce
package com.pms.ocp.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.pms.ocp.model.entity.OcpTenantAudit;
import java.util.List;
public interface OcpTenantAuditMapper extends BaseMapper<OcpTenantAudit> {
List<OcpTenantAudit> getOtaList(OcpTenantAudit ocpTenantAudit);
List<OcpTenantAudit> getOtaListById(OcpTenantAudit ocpTenantAudit);
}
src/main/java/com/pms/ocp/mapper/TenantMapper.java 0 → 100644
View file @ b54675ce
package com.pms.ocp.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.pms.ocp.model.entity.OcpTenantGroup;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@Mapper
public interface TenantMapper extends BaseMapper<OcpTenantGroup> {
/**
*
* @param tenantGroupCompanyCode
* @return
*/
OcpTenantGroup oneTenantGroup(String tenantGroupCompanyCode);
List<OcpTenantGroup> twoTenantGroups(String tenantGroupCompanyPCode);
}
src/main/java/com/pms/ocp/model/dto/ModelPropertyDTO.java 0 → 100644
View file @ b54675ce
package com.pms.ocp.model.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.sql.Date;
import java.time.LocalDateTime;
/**
* @Auther: wangjian
* @Date: 2022/2/22 16:40
* @Description:模型属性DTO对象
*/
@ApiModel(value = "模型属性DTO对象")
@Data
public class ModelPropertyDTO {
/**
* 模型属性编号
*/
@ApiModelProperty(value = "模型属性编号")
private String objId;
/**
* 模型编号
*/
@ApiModelProperty(value = "模型编号")
private String modelCode;
/**
* 属性名称
*/
@ApiModelProperty(value = "属性名称")
private String columnName;
/**
* 属性编码
*/
@ApiModelProperty(value = "属性编码")
private String propCode;
/**
* 属性描述
*/
@ApiModelProperty(value = "属性描述")
private String columnComments;
/**
* 数据类型
*/
@ApiModelProperty(value = "数据类型")
private Integer dataType;
/**
* 数据长度
*/
@ApiModelProperty(value = "数据长度")
private Integer dataLength;
/**
* 数据精度
*/
@ApiModelProperty(value = "数据精度")
private Integer dataScale;
/**
* 是否主键 0:否,1:是
*/
@ApiModelProperty(value = "是否主键 0:否,1:是")
private Integer boolPrimaryKey;
/**
* 是否必填 0:否,1:是
*/
@ApiModelProperty(value = "是否必填 0:否,1:是")
private Integer boolRequired;
/**
* 推广类型 0:统推,1：自建
*/
@ApiModelProperty(value = "推广类型 0:统推,1：自建")
private String propPromotion;
/**
* 显示顺序
*/
@ApiModelProperty(value = "显示顺序")
private Integer propOrderNo;
/**
* 提交人编号
*/
@ApiModelProperty(value = "提交人编号")
private String propUserId;
/**
* 提交人姓名
*/
@ApiModelProperty(value = "提交人姓名")
private String propUserName;
/**
* 创建时间
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(value = "创建时间")
private Date propCtime;
/**
* 修改时间
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(value = "修改时间")
private Date propMtime;
}
// 字段名称 字段描述 字段类型 允许为NULL 备注
// prop_id 主键 varchar(42) 否
// model_id 模型id varchar(42) 否
// column_name 属性名称 varchar(50) 否
// column_code 属性编码 varchar(42) 否
// column_comments 属性描述 varchar(50) 否
// data_type 数据类型 int4 否
// data_length 数据长度 int4 是
// data_scale 数据精度 int4 是
// is_pk 是否主键 int4 否 0:否,1:是
// is_required 是否必填 int4 是 0:否,1:是
// prop_promotion 推广类型 int4 是 0:统推,1：自建
// company_id 省公司ID varchar(42) 是
// company_name 省公司名称 varchar(50) 是
// prop _dispidx 显示顺序 int4 否
// prop_user_id 提交人id varchar(42) 否
// prop_user_name 提交人姓名 varchar(64) 否
// prop_ctime 创建时间 timestamp(6) 否
// prop_mtime 修改时间 timestamp(6) 否
src/main/java/com/pms/ocp/model/dto/OcpApiGroupDtos.java
View file @ b54675ce
......@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.sql.Date;
import java.sql.Timestamp;
......@@ -101,6 +102,55 @@ public class OcpApiGroupDtos {
@ApiModelProperty("服务版本（最新版本）")
private long apiVersion;
public int getPageSize() {
return pageSize;
}
public void setPageSize(int pageSize) {
this.pageSize = pageSize;
}
public int getPageNum() {
return pageNum;
}
public void setPageNum(int pageNum) {
this.pageNum = pageNum;
}
public Timestamp getApiGroupCtime() {
return apiGroupCtime;
}
public void setApiGroupCtime(Timestamp apiGroupCtime) {
this.apiGroupCtime = apiGroupCtime;
}
public Timestamp getApiGroupMtime() {
return apiGroupMtime;
}
public void setApiGroupMtime(Timestamp apiGroupMtime) {
this.apiGroupMtime = apiGroupMtime;
}
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 getApiGroupCode() {
return apiGroupCode;
}
......@@ -165,21 +215,7 @@ public class OcpApiGroupDtos {
this.apiGroupUserName = apiGroupUserName;
}
public Timestamp getApiGroupCtime() {
return apiGroupCtime;
}
public void setApiGroupCtime(Timestamp apiGroupCtime) {
this.apiGroupCtime = apiGroupCtime;
}
public Timestamp getApiGroupMtime() {
return apiGroupMtime;
}
public void setApiGroupMtime(Timestamp apiGroupMtime) {
this.apiGroupMtime = apiGroupMtime;
}
public String getApiGroupPcode() {
return apiGroupPcode;
......@@ -253,21 +289,6 @@ public class OcpApiGroupDtos {
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;
......
src/main/java/com/pms/ocp/model/dto/OcpTenantGroupDto.java 0 → 100644
View file @ b54675ce
package com.pms.ocp.model.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
import java.util.Set;
@ApiModel(value = "应用返回参数")
@Data
public class OcpTenantGroupDto {
@ApiModelProperty("创建公司")
private Set<String> oneList;
@ApiModelProperty("应用管理")
private List<TwoTenanList> twoList;
@ApiModelProperty("应用层")
private List<ThreeTenanList> ThreeList;
public Set<String> getOneList() {
return oneList;
}
public void setOneList(Set<String> oneList) {
this.oneList = oneList;
}
public List<TwoTenanList> getTwoList() {
return twoList;
}
public void setTwoList(List<TwoTenanList> twoList) {
this.twoList = twoList;
}
public List<ThreeTenanList> getThreeList() {
return ThreeList;
}
public void setThreeList(List<ThreeTenanList> threeList) {
ThreeList = threeList;
}
}
src/main/java/com/pms/ocp/model/dto/OneTenanList.java 0 → 100644
View file @ b54675ce
package com.pms.ocp.model.dto;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
@EqualsAndHashCode(callSuper=false)
@ApiModel(value = "一级创建公司")
@Data
public class OneTenanList {
/**
* 主键
*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty("主键")
private String objId;
/**
* 应用分类编码
*/
@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 Date tenantGroupCtime;
/**
* 修改时间
*/
@ApiModelProperty("修改时间")
private Date 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 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 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 Date getTenantGroupCtime() {
return tenantGroupCtime;
}
public void setTenantGroupCtime(Date tenantGroupCtime) {
this.tenantGroupCtime = tenantGroupCtime;
}
public Date getTenantGroupMtime() {
return tenantGroupMtime;
}
public void setTenantGroupMtime(Date tenantGroupMtime) {
this.tenantGroupMtime = tenantGroupMtime;
}
public Short getIsDelete() {
return isDelete;
}
public void setIsDelete(Short isDelete) {
this.isDelete = isDelete;
}
public Short getTenantGroupLevel() {
return tenantGroupLevel;
}
public void setTenantGroupLevel(Short tenantGroupLevel) {
this.tenantGroupLevel = tenantGroupLevel;
}
}
src/main/java/com/pms/ocp/model/dto/ThreeTenanList.java 0 → 100644
View file @ b54675ce
package com.pms.ocp.model.dto;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
@EqualsAndHashCode(callSuper=false)
@ApiModel(value = "三级应用")
@Data
public class ThreeTenanList {
/**
* 主键
*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty("主键")
private String objId;
/**
* 应用分类编码
*/
@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 Date tenantGroupCtime;
/**
* 修改时间
*/
@ApiModelProperty("修改时间")
private Date 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 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 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 Date getTenantGroupCtime() {
return tenantGroupCtime;
}
public void setTenantGroupCtime(Date tenantGroupCtime) {
this.tenantGroupCtime = tenantGroupCtime;
}
public Date getTenantGroupMtime() {
return tenantGroupMtime;
}
public void setTenantGroupMtime(Date tenantGroupMtime) {
this.tenantGroupMtime = tenantGroupMtime;
}
public Short getIsDelete() {
return isDelete;
}
public void setIsDelete(Short isDelete) {
this.isDelete = isDelete;
}
public Short getTenantGroupLevel() {
return tenantGroupLevel;
}
public void setTenantGroupLevel(Short tenantGroupLevel) {
this.tenantGroupLevel = tenantGroupLevel;
}
}
src/main/java/com/pms/ocp/model/dto/TwoTenanList.java 0 → 100644
View file @ b54675ce
package com.pms.ocp.model.dto;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
@EqualsAndHashCode(callSuper=false)
@ApiModel(value = "二级应用管理")
@Data
public class TwoTenanList {
/**
* 主键
*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty("主键")
private String objId;
/**
* 应用分类编码
*/
@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 Date tenantGroupCtime;
/**
* 修改时间
*/
@ApiModelProperty("修改时间")
private Date 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 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 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 Date getTenantGroupCtime() {
return tenantGroupCtime;
}
public void setTenantGroupCtime(Date tenantGroupCtime) {
this.tenantGroupCtime = tenantGroupCtime;
}
public Date getTenantGroupMtime() {
return tenantGroupMtime;
}
public void setTenantGroupMtime(Date tenantGroupMtime) {
this.tenantGroupMtime = tenantGroupMtime;
}
public Short getIsDelete() {
return isDelete;
}
public void setIsDelete(Short isDelete) {
this.isDelete = isDelete;
}
public Short getTenantGroupLevel() {
return tenantGroupLevel;
}
public void setTenantGroupLevel(Short tenantGroupLevel) {
this.tenantGroupLevel = tenantGroupLevel;
}
}
src/main/java/com/pms/ocp/model/entity/ModelProperty.java
View file @ b54675ce
......@@ -3,9 +3,16 @@ package com.pms.ocp.model.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.AllArgsConstructor;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
/**
* @Auther: wangjian
......@@ -13,6 +20,7 @@ import lombok.NoArgsConstructor;
* @Description:模型属性对象
*/
@Data
@Accessors(chain = true)
@TableName("ocp_model_prop")
public class ModelProperty{
......@@ -45,41 +53,39 @@ public class ModelProperty{
/**
* 数据类型
*/
private String dataType;
private Integer dataType;
/**
* 数据长度
*/
private String dataLength;
private Integer dataLength;
/**
* 数据精度
*/
private String dataScale;
private Integer dataScale;
/**
* 是否主键
*/
@TableField(value = "is_pk")
private String boolPrimaryKey;
private Integer boolPrimaryKey;
/**
* 是否必填
*/
@TableField(value = "is_required")
private String boolRequired;
private Integer boolRequired;
/**
* 推广类型
*/
private String propPromotion;
/**
* 显示顺序
*/
private String propOrderNo;
private Integer propOrderNo;
/**
* 提交人id
......@@ -94,14 +100,21 @@ public class ModelProperty{
/**
* 创建时间
*/
@TableField(value = "prop_ctime")
private String prop_ctime;
@JsonDeserialize(using = LocalDateTimeDeserializer.class)
@JsonSerialize(using = LocalDateTimeSerializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
// @TableField()
// @TableField(typeHandler = TimestampTypeHandler.class)
private LocalDateTime propCtime;
/**
* 修改时间
*/
@TableField(value = "prop_mtime")
private String prop_mtime;
// @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
// @TableField(typeHandler = TimestampTypeHandler.class)
private LocalDateTime propMtime;
}
// 字段名称 字段描述 字段类型 允许为NULL 备注
......
src/main/java/com/pms/ocp/model/entity/OcpApiAudit.java
View file @ b54675ce
......@@ -115,5 +115,235 @@ public class OcpApiAudit {
@ApiModelProperty("服务版本（最新版本）")
private long apiVersion;
public String getObjId() {
return objId;
}
public void setObjId(String objId) {
this.objId = objId;
}
public String getApiCode() {
return apiCode;
}
public void setApiCode(String apiCode) {
this.apiCode = apiCode;
}
public long getOperStatus() {
return operStatus;
}
public void setOperStatus(long operStatus) {
this.operStatus = operStatus;
}
public long getOperTarget() {
return operTarget;
}
public void setOperTarget(long operTarget) {
this.operTarget = operTarget;
}
public long getAuditType() {
return auditType;
}
public void setAuditType(long auditType) {
this.auditType = auditType;
}
public String getAuditMessage() {
return auditMessage;
}
public void setAuditMessage(String auditMessage) {
this.auditMessage = auditMessage;
}
public String getAuditJson() {
return auditJson;
}
public void setAuditJson(String auditJson) {
this.auditJson = auditJson;
}
public String getAuditUserId() {
return auditUserId;
}
public void setAuditUserId(String auditUserId) {
this.auditUserId = auditUserId;
}
public String getAuditUserName() {
return auditUserName;
}
public void setAuditUserName(String auditUserName) {
this.auditUserName = auditUserName;
}
public Timestamp getAuditCtime() {
return auditCtime;
}
public void setAuditCtime(Timestamp auditCtime) {
this.auditCtime = auditCtime;
}
public Timestamp getAuditMtime() {
return auditMtime;
}
public void setAuditMtime(Timestamp auditMtime) {
this.auditMtime = auditMtime;
}
public long getIsDelete() {
return isDelete;
}
public void setIsDelete(long isDelete) {
this.isDelete = isDelete;
}
public long getApplyVersion() {
return applyVersion;
}
public void setApplyVersion(long applyVersion) {
this.applyVersion = applyVersion;
}
public long getPreApiVersion() {
return preApiVersion;
}
public void setPreApiVersion(long preApiVersion) {
this.preApiVersion = preApiVersion;
}
public String getApiName() {
return apiName;
}
public void setApiName(String apiName) {
this.apiName = apiName;
}
public String getApiGroupCode() {
return apiGroupCode;
}
public void setApiGroupCode(String apiGroupCode) {
this.apiGroupCode = apiGroupCode;
}
public long getApiPromotion() {
return apiPromotion;
}
public void setApiPromotion(long apiPromotion) {
this.apiPromotion = apiPromotion;
}
public String getApiReq() {
return apiReq;
}
public void setApiReq(String apiReq) {
this.apiReq = apiReq;
}
public String getApiResp() {
return apiResp;
}
public void setApiResp(String apiResp) {
this.apiResp = apiResp;
}
public String getApiUrl() {
return apiUrl;
}
public void setApiUrl(String apiUrl) {
this.apiUrl = apiUrl;
}
public Timestamp getApiCtime() {
return apiCtime;
}
public void setApiCtime(Timestamp apiCtime) {
this.apiCtime = apiCtime;
}
public Timestamp getApiMtime() {
return apiMtime;
}
public void setApiMtime(Timestamp apiMtime) {
this.apiMtime = apiMtime;
}
public String getApiUserId() {
return apiUserId;
}
public void setApiUserId(String apiUserId) {
this.apiUserId = apiUserId;
}
public String getApiUnit() {
return apiUnit;
}
public void setApiUnit(String apiUnit) {
this.apiUnit = apiUnit;
}
public String getOwnerCompanyCode() {
return ownerCompanyCode;
}
public void setOwnerCompanyCode(String ownerCompanyCode) {
this.ownerCompanyCode = ownerCompanyCode;
}
public String getOwnerCompanyName() {
return ownerCompanyName;
}
public void setOwnerCompanyName(String ownerCompanyName) {
this.ownerCompanyName = ownerCompanyName;
}
public long getApiZone() {
return apiZone;
}
public void setApiZone(long apiZone) {
this.apiZone = apiZone;
}
public long getApiLayer() {
return apiLayer;
}
public void setApiLayer(long apiLayer) {
this.apiLayer = apiLayer;
}
public long getApiVersion() {
return apiVersion;
}
public void setApiVersion(long apiVersion) {
this.apiVersion = apiVersion;
}
}
src/main/java/com/pms/ocp/model/entity/OcpApiBase.java
View file @ b54675ce
......@@ -7,6 +7,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import java.sql.Date;
import java.sql.Timestamp;
@Data
......@@ -175,7 +177,6 @@ public class OcpApiBase {
this.apiCtime = apiCtime;
}
public Timestamp getApiMtime() {
return apiMtime;
}
......@@ -184,7 +185,6 @@ public class OcpApiBase {
this.apiMtime = apiMtime;
}
public String getApiUserId() {
return apiUserId;
}
......
src/main/java/com/pms/ocp/model/entity/OcpApiGroup.java
View file @ b54675ce
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;
import io.swagger.annotations.ApiModel;
......@@ -8,10 +9,11 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import java.sql.Timestamp;
import java.util.List;
@Data
@Accessors(chain = true)
@TableName("ocp_api_Group")
@TableName("ocp_api_group")
@ApiModel("服务分类表")
public class OcpApiGroup {
@TableId(type = IdType.ASSIGN_ID)
......@@ -58,6 +60,7 @@ public class OcpApiGroup {
private long apiGroupLevel;
public long getApiGroupLevel() {
return apiGroupLevel;
}
......
src/main/java/com/pms/ocp/model/entity/OcpApiSubs.java
View file @ b54675ce
......@@ -40,6 +40,51 @@ public class OcpApiSubs {
@ApiModelProperty("是否删除0-否，1-是")
private long isDelete;
@ApiModelProperty("服务接口中文名称")
private String apiName;
@ApiModelProperty("服务分类代码")
private String apiGroupCode;
@ApiModelProperty("推广类型0:统建；1:自建")
private long apiPromotion;
@ApiModelProperty("服务请求体")
private String apiReq;
@ApiModelProperty("服务返回体")
private String apiResp;
@ApiModelProperty("服务地址")
private String apiUrl;
@ApiModelProperty("服务创建时间")
private Timestamp apiCtime;
@ApiModelProperty("服务修改时间")
private Timestamp apiMtime;
@ApiModelProperty("创建者用户ID")
private String apiUserId;
@ApiModelProperty("建设单位")
private String apiUnit;
@ApiModelProperty("服务所属公司")
private String ownerCompanyCode;
@ApiModelProperty("服务所属公司")
private String ownerCompanyName;
@ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区")
private long apiZone;
@ApiModelProperty("'所属层级 1:应用层;2:平台层;3:网络层;4:感知层;")
private long apiLayer;
@ApiModelProperty("服务版本（最新版本）")
private long apiVersion;
public String getObjId() {
return objId;
}
......@@ -96,8 +141,131 @@ public class OcpApiSubs {
this.subsCompanyCode = subsCompanyCode;
}
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;
}
}
src/main/java/com/pms/ocp/model/entity/OcpApiTenantRel.java
View file @ b54675ce
......@@ -11,7 +11,7 @@ import java.sql.Timestamp;
@Data
@Accessors(chain = true)
@TableName("ocp_api_Tenant_rel")
@ApiModel("服务应用关系表")
public class OcpApiTenantRel {
......
src/main/java/com/pms/ocp/model/entity/OcpTenantGroup.java
View file @ b54675ce
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;
import io.swagger.annotations.ApiModel;
......@@ -10,6 +11,7 @@ import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
* 应用分类表
......@@ -105,6 +107,12 @@ public class OcpTenantGroup implements Serializable {
@ApiModelProperty("应用树层级 1:应用分组层 2:应用层")
private Short tenantGroupLevel;
public static long getSerialVersionUID() {
return serialVersionUID;
}
private static final long serialVersionUID = 1L;
/**
......
src/main/java/com/pms/ocp/service/ModelPropertyService.java
View file @ b54675ce
package com.pms.ocp.service;
import com.pms.ocp.model.dto.ModelPropertyDTO;
import com.pms.ocp.model.entity.ModelProperty;
import io.swagger.models.auth.In;
import java.util.List;
......@@ -14,26 +16,34 @@ public interface ModelPropertyService {
/**
* 创建模型属性
*
* @param modelProperty
* @param modelPropertyDTO
* @return
*/
Integer createModelProperty(ModelProperty modelProperty);
Integer createModelProperty(ModelPropertyDTO modelPropertyDTO);
/**
* 删除模型属性
*
* @param modelId
* @param modelCode
* @return
*/
Integer deleteModelProperty(String modelId);
Integer deleteModelProperty(String modelCode, String propCode);
/**
* 批量删除模型属性
*
* @param ids
* @return
*/
Integer deletePatchModelProperty(List<String> ids);
/**
* 更新模型属性
*
* @param modelProperty
* @param modelPropertyDTO
* @return
*/
Integer updateModelProperty(ModelProperty modelProperty);
Integer updateModelProperty(ModelPropertyDTO modelPropertyDTO);
/**
* 获取模型属性
......@@ -41,7 +51,7 @@ public interface ModelPropertyService {
* @param
* @return
*/
List<ModelProperty> getModelPropertyList();
List<ModelProperty> listModelProperty(String objId, String modelCode, String propCode);
/**
* 获取模型属性列表
......@@ -49,5 +59,5 @@ public interface ModelPropertyService {
* @param
* @return
*/
List<ModelProperty> getModelProperty();
ModelPropertyDTO getModelProperty();
}
src/main/java/com/pms/ocp/service/OcpApiAuditService.java
View file @ b54675ce
......@@ -12,8 +12,6 @@ public interface OcpApiAuditService {
ResponseVO getOcpApiDetails(String objId);
// ResponseVO getOcpApiList(Oaa oaa);
ResponseVO OaaById(OcpApiAudit ocpApiAudit);
ResponseVO sById(OcpApiAudit ocpApiAudit);
......
src/main/java/com/pms/ocp/service/OcpTenantAuditService.java 0 → 100644
View file @ b54675ce
package com.pms.ocp.service;
import com.pms.ocp.model.entity.OcpTenantAudit;
import com.pms.ocp.model.vo.ResponseVO;
public interface OcpTenantAuditService {
ResponseVO getOtaList(OcpTenantAudit ocpTenantAudit);
ResponseVO getOtaListById(OcpTenantAudit ocpTenantAudit);
}
src/main/java/com/pms/ocp/service/TenantService.java 0 → 100644
View file @ b54675ce
package com.pms.ocp.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.pms.ocp.model.dto.OcpTenantGroupDto;
import com.pms.ocp.model.entity.OcpTenantGroup;
import java.util.List;
public interface TenantService extends IService<OcpTenantGroup> {
/**
* 应用树分类管理
* @return
*/
OcpTenantGroupDto getTree();
/**
* 应用新增
* @param ocpTenantGroup
* @return
*/
boolean getTenanInster(OcpTenantGroup ocpTenantGroup);
}
src/main/java/com/pms/ocp/service/impl/ModelPropertyServiceImpl.java
View file @ b54675ce
package com.pms.ocp.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.pms.ocp.mapper.ModelPropertyMapper;
import com.pms.ocp.model.dto.ModelPropertyDTO;
import com.pms.ocp.model.entity.ModelProperty;
import com.pms.ocp.service.ModelPropertyService;
import io.swagger.models.auth.In;
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.sql.Date;
import java.time.LocalDateTime;
import java.util.List;
/**
......@@ -16,26 +25,73 @@ import java.util.List;
@Service
public class ModelPropertyServiceImpl implements ModelPropertyService {
// @Autowired
@Autowired
private ModelPropertyMapper modelPropertyMapper;
@Override
public Integer createModelProperty(ModelProperty modelProperty) {
return null;
public Integer createModelProperty(ModelPropertyDTO modelPropertyDTO) {
ModelProperty modelProperty = new ModelProperty();
BeanUtils.copyProperties(modelPropertyDTO, modelProperty);
modelProperty.setPropCtime(LocalDateTime.now());
return modelPropertyMapper.insert(modelProperty);
}
@Override
public Integer deleteModelProperty(String modelId) {
return null;
public Integer deleteModelProperty(String modelCode, String propCode) {
QueryWrapper<ModelProperty> queryWrapper = new QueryWrapper();
if (StringUtils.isNotEmpty(modelCode)) {
queryWrapper.lambda().eq(ModelProperty::getModelCode, modelCode);
}
if (StringUtils.isNotEmpty(propCode)) {
queryWrapper.lambda().eq(ModelProperty::getPropCode, propCode);
}
return modelPropertyMapper.delete(queryWrapper);
}
@Override
public Integer updateModelProperty(ModelProperty modelProperty) {
return null;
public Integer deletePatchModelProperty(List<String> ids) {
return modelPropertyMapper.deleteBatchIds(ids);
}
@Override
public List<ModelProperty> getModelPropertyList() {
return null;
public Integer updateModelProperty(ModelPropertyDTO modelPropertyDTO) {
ModelProperty modelProperty = new ModelProperty();
BeanUtils.copyProperties(modelPropertyDTO, modelProperty);
modelProperty.setPropMtime(LocalDateTime.now());
UpdateWrapper<ModelProperty> updateWrapper = new UpdateWrapper<>();
updateWrapper.lambda().eq(ModelProperty::getObjId, modelProperty.getObjId());
return modelPropertyMapper.update(modelProperty, updateWrapper);
}
@Override
public List<ModelProperty> listModelProperty(String objId, String modelCode, String propCode) {
QueryWrapper<ModelProperty> queryWrapper = new QueryWrapper();
if (StringUtils.isNotEmpty(objId)) {
queryWrapper.lambda().eq(ModelProperty::getObjId, objId);
}
if (StringUtils.isNotEmpty(modelCode)) {
queryWrapper.lambda().eq(ModelProperty::getModelCode, modelCode);
}
if (StringUtils.isNotEmpty(propCode)) {
queryWrapper.lambda().eq(ModelProperty::getPropCode, propCode);
}
return modelPropertyMapper.selectList(queryWrapper);
}
/**
......@@ -44,7 +100,7 @@ public class ModelPropertyServiceImpl implements ModelPropertyService {
* @return
*/
@Override
public List<ModelProperty> getModelProperty() {
public ModelPropertyDTO getModelProperty() {
QueryWrapper<ModelProperty> wrapper = new QueryWrapper<>();
return null;
}
......
src/main/java/com/pms/ocp/service/impl/OcpApiAuditServiceImpl.java
View file @ b54675ce
......@@ -3,6 +3,7 @@ package com.pms.ocp.service.impl;
import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.pms.ocp.common.constants.AnalysisConstant;
import com.pms.ocp.common.constants.ExportUtils;
import com.pms.ocp.mapper.OcpApiAuditMapper;
......@@ -19,20 +20,16 @@ import javax.servlet.http.HttpServletResponse;
import java.util.List;
@Service
public class OcpApiAuditServiceImpl implements OcpApiAuditService {
public class OcpApiAuditServiceImpl extends ServiceImpl<OcpApiAuditMapper,OcpApiAudit> implements OcpApiAuditService {
@Autowired
private OcpApiAuditMapper ocpApiAuditMapper;
@Override
public ResponseVO getOcpApiAuditList(OcpApiAudit ocpApiAudit) {
List<String> ocpApiAuditList = ocpApiAuditMapper.getOcpApiSubsList(ocpApiAudit);
if(CollectionUtils.isEmpty(ocpApiAuditList)){
return ResponseVO.error("查询列表为空");
}else{
List<OcpApiAudit> ocpApiAuditList = ocpApiAuditMapper.getOcpApiSubsList(ocpApiAudit);
return ResponseVO.ok(ocpApiAuditList);
}
}
@Override
......@@ -49,7 +46,7 @@ public class OcpApiAuditServiceImpl implements OcpApiAuditService {
@Override
public ResponseVO sById(OcpApiAudit ocpApiAudit) {
List<String> oaaById = ocpApiAuditMapper.sById(ocpApiAudit);
List<OcpApiAudit> oaaById = ocpApiAuditMapper.sById(ocpApiAudit);
return ResponseVO.ok(oaaById);
}
......
src/main/java/com/pms/ocp/service/impl/OcpApiModelRelServiceImpl.java
View file @ b54675ce
package com.pms.ocp.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.pms.ocp.mapper.OcpApiModelRelMapper;
import com.pms.ocp.model.entity.OcpApiModelRel;
import com.pms.ocp.model.vo.ResponseVO;
......@@ -10,12 +11,12 @@ import org.springframework.stereotype.Service;
import java.util.List;
@Service
public class OcpApiModelRelServiceImpl implements OcpApiModelRelService {
public class OcpApiModelRelServiceImpl extends ServiceImpl<OcpApiModelRelMapper,OcpApiModelRel> implements OcpApiModelRelService {
@Autowired
private OcpApiModelRelMapper ocpApiModelRelMapper;
@Override
public ResponseVO getOamrList(OcpApiModelRel ocpApiModelRel) {
List<String> ocpApiModelRelList = ocpApiModelRelMapper.getOamrList(ocpApiModelRel);
List<OcpApiModelRel> ocpApiModelRelList = ocpApiModelRelMapper.getOamrList(ocpApiModelRel);
return ResponseVO.ok(ocpApiModelRelList);
}
}
src/main/java/com/pms/ocp/service/impl/OcpApiSubsServiceImpl.java
View file @ b54675ce
......@@ -14,18 +14,13 @@ import org.springframework.util.CollectionUtils;
import java.util.List;
@Service
public class OcpApiSubsServiceImpl implements OcpApiSubsService {
public class OcpApiSubsServiceImpl extends ServiceImpl<OcpApiSubsMapper,OcpApiSubs> implements OcpApiSubsService {
@Autowired
private OcpApiSubsMapper ocpApiSubsMapper;
@Override
public ResponseVO getOcpApiSubsList(OcpApiSubs ocpApiSubs) {
List<String> ocpApiSubsList = ocpApiSubsMapper.getOcpApisList(ocpApiSubs);
QueryWrapper qw = new QueryWrapper();
if(CollectionUtils.isEmpty(ocpApiSubsList)){
return ResponseVO.error("查询列表为空");
}else{
List<OcpApiSubs> ocpApiSubsList = ocpApiSubsMapper.getOcpApisList(ocpApiSubs);
return ResponseVO.ok(ocpApiSubsList);
}
}
}
src/main/java/com/pms/ocp/service/impl/OcpApiTenantRelServiceImpl.java
View file @ b54675ce
package com.pms.ocp.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.pms.ocp.mapper.OcpApiTenantRelMapper;
import com.pms.ocp.model.entity.OcpApiTenantRel;
import com.pms.ocp.model.vo.ResponseVO;
......@@ -11,14 +12,14 @@ import java.util.List;
@Service
public class OcpApiTenantRelServiceImpl implements OcpApiTenantRelService {
public class OcpApiTenantRelServiceImpl extends ServiceImpl<OcpApiTenantRelMapper,OcpApiTenantRel> implements OcpApiTenantRelService {
@Autowired
private OcpApiTenantRelMapper ocpApiTenantRelMapper;
@Override
public ResponseVO getOatrList(OcpApiTenantRel ocpApiTenantRel) {
List<String> oatrList = ocpApiTenantRelMapper.getOatrList(ocpApiTenantRel);
List<OcpApiTenantRel> oatrList = ocpApiTenantRelMapper.getOatrList(ocpApiTenantRel);
return ResponseVO.ok(oatrList);
}
}
src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java
View file @ b54675ce
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.extension.api.R;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.pms.ocp.common.config.PageParam;
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.model.vo.ResponseVO;
import com.pms.ocp.service.OcpApiTreeService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.formula.functions.T;
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;
......@@ -172,6 +171,7 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper,OcpApiGr
break;
}
}
if (flag == true) {
OcpApiBase ocpApiBase = new OcpApiBase();
ocpApiBase.setApiCode(ocpApiGroupDtos.getApiGroupCode());
......@@ -180,11 +180,12 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper,OcpApiGr
ocpApiBase.setApiName("新增服务分类");
Timestamp timestamp = new Timestamp(System.currentTimeMillis());
ocpApiBase.setApiMtime(timestamp);
ocpApiBase.setApiCtime(ocpApiGroupDtos.getApiGroupCtime());
ocpApiBase.setApiCtime(timestamp);
ocpApiBase.setApiUserId(ocpApiGroupDtos.getApiGroupUserId());
ocpApiBase.setObjId("");
OcpApiGroup ocpApiGroup1 = new OcpApiGroup();
ocpApiGroup1.setObjId("");
ocpApiBase.setApiMtime(timestamp);
BeanUtils.copyProperties(ocpApiGroupDtos, ocpApiGroup1);
ocpApiGroup1.setApiGroupCode(code);
ocpApiBaseMapper.insert(ocpApiBase);
......
src/main/java/com/pms/ocp/service/impl/OcpTenantAuditServiceImpl.java 0 → 100644
View file @ b54675ce
package com.pms.ocp.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.pms.ocp.mapper.OcpTenantAuditMapper;
import com.pms.ocp.model.entity.OcpTenantAudit;
import com.pms.ocp.model.vo.ResponseVO;
import com.pms.ocp.service.OcpTenantAuditService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@Service
public class OcpTenantAuditServiceImpl extends ServiceImpl<OcpTenantAuditMapper,OcpTenantAudit> implements OcpTenantAuditService {
@Autowired
private OcpTenantAuditMapper ocpTenantAuditMapper;
@Override
public ResponseVO getOtaList(OcpTenantAudit ocpTenantAudit) {
List<OcpTenantAudit> otaList = ocpTenantAuditMapper.getOtaList(ocpTenantAudit);
return ResponseVO.ok(otaList);
}
@Override
public ResponseVO getOtaListById(OcpTenantAudit ocpTenantAudit) {
List<OcpTenantAudit> otaListById = ocpTenantAuditMapper.getOtaListById(ocpTenantAudit);
return ResponseVO.ok(otaListById);
}
}
src/main/java/com/pms/ocp/service/impl/OcpTenantBaseServiceImpl.java
View file @ b54675ce
package com.pms.ocp.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.pms.ocp.mapper.OcpTenantBaseMapper;
import com.pms.ocp.model.entity.OcpTenantBase;
import com.pms.ocp.model.vo.ResponseVO;
......@@ -10,7 +11,7 @@ import org.springframework.stereotype.Service;
import java.util.List;
@Service
public class OcpTenantBaseServiceImpl implements OcpTenantBaseService {
public class OcpTenantBaseServiceImpl extends ServiceImpl<OcpTenantBaseMapper,OcpTenantBase> implements OcpTenantBaseService {
@Autowired
private OcpTenantBaseMapper ocpTenantBaseMapper;
@Override
......
src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java 0 → 100644
View file @ b54675ce
package com.pms.ocp.service.impl;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.pms.ocp.common.utils.RandomStringUtil;
import com.pms.ocp.mapper.TenantMapper;
import com.pms.ocp.model.dto.OcpTenantGroupDto;
import com.pms.ocp.model.dto.OneTenanList;
import com.pms.ocp.model.dto.ThreeTenanList;
import com.pms.ocp.model.dto.TwoTenanList;
import com.pms.ocp.model.entity.OcpTenantGroup;
import com.pms.ocp.service.TenantService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.stereotype.Service;
import java.util.*;
import java.util.stream.Collectors;
@Service
public class TenantServiceImpl extends ServiceImpl<TenantMapper, OcpTenantGroup> implements TenantService {
@Autowired
private TenantMapper tenantMapper;
/**
* 应用树分类管理
*
* @return
*/
@Override
public OcpTenantGroupDto getTree() {
List<OcpTenantGroup> ocpTenantGroups = tenantMapper.selectList(null);
//返回参数集合
OcpTenantGroupDto ocpTenantGroupDto = new OcpTenantGroupDto();
//顶级目录
Set<String> stringSet = new HashSet<>();
for (OcpTenantGroup ocpTenantGroup : ocpTenantGroups) {
String tenantGroupCompanyCode = ocpTenantGroup.getTenantGroupCompanyCode();
stringSet.add(tenantGroupCompanyCode);
}
List<TwoTenanList> tenanLists = twoTenanTree(ocpTenantGroups,stringSet);
List<ThreeTenanList> threeTenanLists = ThreeTenanTree(ocpTenantGroups,tenanLists);
ocpTenantGroupDto.setOneList(stringSet);
ocpTenantGroupDto.setTwoList(tenanLists);
ocpTenantGroupDto.setThreeList(threeTenanLists);
return ocpTenantGroupDto;
}
private List<ThreeTenanList> ThreeTenanTree(List<OcpTenantGroup> ocpTenantGroups, List<TwoTenanList> tenanLists) {
//三级应用详情
List<ThreeTenanList> threeTenanLists = new ArrayList<>();
for (TwoTenanList tenanList : tenanLists) {
for (OcpTenantGroup ocpTenantGroup : ocpTenantGroups) {
ThreeTenanList threeTenanList = new ThreeTenanList();
if (tenanList.getTenantGroupCode().equals(ocpTenantGroup.getTenantGroupPcode()) && ocpTenantGroup.getTenantGroupLevel() == 2){
BeanUtils.copyProperties(ocpTenantGroup,threeTenanList);
threeTenanLists.add(threeTenanList);
}
}
}
return threeTenanLists;
}
/**
* 二级 应用管理
* @param ocpTenantGroups
* @param stringSet
* @return
*/
private List<TwoTenanList> twoTenanTree(List<OcpTenantGroup> ocpTenantGroups, Set<String> stringSet) {
//一级数据集合
List<TwoTenanList> twoTenanLists = new ArrayList<>();
for (String code : stringSet) {
for (OcpTenantGroup ocpTenantGroup : ocpTenantGroups) {
TwoTenanList twoTenanList = new TwoTenanList();
if (code.equals(ocpTenantGroup.getTenantGroupCompanyCode()) &&ocpTenantGroup.getTenantGroupLevel() == 1){
BeanUtils.copyProperties(ocpTenantGroup,twoTenanList);
twoTenanLists.add(twoTenanList);
}
}
}
return twoTenanLists;
}
/**
* 应用新增
*
* @param ocpTenantGroup
* @return
*/
@Override
public boolean getTenanInster(OcpTenantGroup ocpTenantGroup) {
boolean falg = true;
OcpTenantGroup group = new OcpTenantGroup();
String tenantGroupCode = ocpTenantGroup.getTenantGroupCode();
List<OcpTenantGroup> ocpTenantGroups = tenantMapper.selectList(null);
for (OcpTenantGroup tenantGroup : ocpTenantGroups) {
if (tenantGroup.getTenantGroupCode().equals(tenantGroupCode)){
falg = false;
break;
}
}
group.setTenantGroupCode(RandomStringUtil.getRandomString(6));
tenantMapper.insert(ocpTenantGroup);
return falg;
}
}
src/main/resources/application.yml
View file @ b54675ce
......@@ -13,13 +13,20 @@ knife4j:
enable: true
mybatis-plus:
global-config:
#字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
field-strategy: 0
mapper-locations: classpath:/mapper/*.xml
configuration:
# log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl
# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
# 是否开启自动驼峰命名规则
map-underscore-to-camel-case: true
#指定自定义 Handler 所在的包位置
type-handlers-package: com.pms.ocp.common.handler
logging:
level:
com.pms.ocp.mapper: debug
......
src/main/resources/mapper/OcpApiAuditMapper.xml
View file @ b54675ce
......@@ -6,14 +6,14 @@
select * from ocp_api_audit oaa
LEFT JOIN ocp_api_base oab
on oaa.api_code = oab.api_code
where oaa.obj_id = '1'
where oaa.obj_id = #{objId}
</select>
<select id="getOcpApiSubsList" resultType="java.lang.String">
<select id="getOcpApiSubsList" resultType="com.pms.ocp.model.entity.OcpApiAudit">
select * from ocp_api_audit
</select>
<select id="sById" resultType="java.lang.String">
<select id="sById" resultType="com.pms.ocp.model.entity.OcpApiAudit">
select * from ocp_api_audit where obj_id = #{objId}
</select>
</mapper>
\ No newline at end of file
src/main/resources/mapper/OcpApiModelRelMapper.xml
View file @ b54675ce
......@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.pms.ocp.mapper.OcpApiModelRelMapper">
<select id="getOamrList" resultType="java.lang.String">
<select id="getOamrList" resultType="com.pms.ocp.model.entity.OcpApiModelRel">
select * from ocp_api_model_rel oamr
LEFT JOIN ocp_model_base omb
on oamr.model_code = omb.model_code
......
src/main/resources/mapper/OcpApiSubsMapper.xml
View file @ b54675ce
......@@ -4,7 +4,7 @@
<select id="getOcpApisList" resultType="java.lang.String">
<select id="getOcpApisList" resultType="com.pms.ocp.model.entity.OcpApiSubs">
SELECT * from ocp_api_subs oas
left JOIN ocp_api_base oab on
oas.api_code = oab.api_code
......
src/main/resources/mapper/OcpApiTenantRelMapper.xml
View file @ b54675ce
......@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.pms.ocp.mapper.OcpApiTenantRelMapper">
<select id="getOatrList" resultType="java.lang.String">
<select id="getOatrList" resultType="com.pms.ocp.model.entity.OcpApiTenantRel">
SELECT * from ocp_api_tenant_rel
oa LEFT JOIN ocp_api_base ab on
oa.api_code = ab.api_code INNER JOIN
......
src/main/resources/mapper/OcpTenantAuditMapper.xml 0 → 100644
View file @ b54675ce
<?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.OcpTenantAuditMapper">
<select id="getOtaList" resultType="com.pms.ocp.model.entity.OcpTenantAudit">
select * from ocp_tenant_audit
</select>
<select id="getOtaListById" resultType="com.pms.ocp.model.entity.OcpTenantAudit">
select * from ocp_tenant_audit where 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