Commit 931894db authored by itcast's avatar itcast

Merge remote-tracking branch 'origin/master'

parents b7212555 cf58fa31
...@@ -77,23 +77,12 @@ ...@@ -77,23 +77,12 @@
<version>1.2.62</version> <version>1.2.62</version>
</dependency> </dependency>
<!-- <dependency>-->
<!-- <groupId>io.jsonwebtoken</groupId>-->
<!-- <artifactId>jjwt</artifactId>-->
<!-- <version>0.9.0</version>-->
<!-- </dependency>-->
<dependency> <dependency>
<groupId>org.postgresql</groupId> <groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId> <artifactId>postgresql</artifactId>
<version>9.4.1212.jre7</version> <version>9.4.1212</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
......
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);
}
}
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
package com.pms.ocp.controller; package com.pms.ocp.controller;
import com.pms.ocp.model.entity.OcpApiBase;
import com.pms.ocp.model.vo.ResponseVO; import com.pms.ocp.model.vo.ResponseVO;
import com.pms.ocp.service.ApiDetailsService; import com.pms.ocp.service.ApiDetailsService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
...@@ -11,6 +12,8 @@ import org.springframework.web.bind.annotation.GetMapping; ...@@ -11,6 +12,8 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@Slf4j @Slf4j
@RequestMapping("/api-base/v1") @RequestMapping("/api-base/v1")
@RestController @RestController
...@@ -21,7 +24,7 @@ public class ApiDetailsController { ...@@ -21,7 +24,7 @@ public class ApiDetailsController {
@ApiOperation("服务库服务详情-查询") @ApiOperation("服务库服务详情-查询")
@GetMapping("/query") @GetMapping("/query")
public ResponseVO getApiDetails(String objId) { public ResponseVO<OcpApiBase> getApiDetails(String objId) {
return apiDetailsService.getApiDetails(objId); return apiDetailsService.getApiDetails(objId);
} }
......
package com.pms.ocp.controller; package com.pms.ocp.controller;
import com.pms.ocp.common.constants.CodeEnum; import com.pms.ocp.model.dto.ModelIssueDTO;
import com.pms.ocp.model.dto.ModelPropertyDTO;
import com.pms.ocp.model.dto.ModelRelationDTO;
import com.pms.ocp.model.entity.Model; import com.pms.ocp.model.entity.Model;
import com.pms.ocp.model.entity.ModelNote; import com.pms.ocp.model.entity.ModelNote;
import com.pms.ocp.model.entity.ModelType;
import com.pms.ocp.model.vo.ResponseVO; import com.pms.ocp.model.vo.ResponseVO;
import com.pms.ocp.service.ModelGroupService; import com.pms.ocp.service.*;
import com.pms.ocp.service.ModelNoteService;
import com.pms.ocp.service.ModelPropertyService;
import com.pms.ocp.service.ModelService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -35,63 +34,65 @@ public class ModelBaseController { ...@@ -35,63 +34,65 @@ public class ModelBaseController {
@Autowired @Autowired
private ModelService modelService; private ModelService modelService;
@Autowired
private ModelGroupService modelGroupService;
@Autowired @Autowired
private ModelPropertyService modelPropertyService; private ModelPropertyService modelPropertyService;
@Autowired @Autowired
private ModelNoteService modelNoteService; private ModelNoteService modelNoteService;
@Autowired
private ModelIssueService modelIssueService;
@Autowired
private ModelRelationService modelRelationService;
/** /**
* 模型分类-查询 * 模型分类-查询
* *
* @return * @return
*/ */
@ApiOperation("模型分类-查询") // @ApiOperation("模型分类-查询")
@GetMapping("/get/model/type") // @GetMapping("/get/model/type")
public ResponseVO getModelType() { // public ResponseVO getModelType() {
return modelGroupService.getModelType(); // return modelGroupService.getModelType();
} // }
/** /**
* 模型分类-增加 * 模型分类-增加
* *
* @return * @return
*/ */
@ApiOperation("模型分类-增加") // @ApiOperation("模型分类-增加")
@PostMapping("/create/model/type") // @PostMapping("/create/model/type")
public ResponseVO createModelType(ModelType modelType) { // public ResponseVO createModelType(ModelType modelType) {
return modelGroupService.createModelType(modelType); // return modelGroupService.createModelType(modelType);
} // }
/** /**
* 模型分类-删除 * 模型分类-删除
* *
* @return * @return
*/ */
@ApiOperation("模型分类-删除") // @ApiOperation("模型分类-删除")
@PostMapping("/delete/model/type") // @PostMapping("/delete/model/type")
public ResponseVO deleteModelType(ModelType modelType) { // public ResponseVO deleteModelType(ModelType modelType) {
String modelTypeId = modelType.getObjId(); // String modelTypeId = modelType.getObjId();
if (StringUtils.isNotBlank(modelTypeId)) { // if (StringUtils.isNotBlank(modelTypeId)) {
return modelGroupService.deleteModelType(modelTypeId); // return modelGroupService.deleteModelType(modelTypeId);
} else { // } else {
return ResponseVO.error(CodeEnum.REQUIRED_PARAMETER_EMPTY); // return ResponseVO.error(CodeEnum.REQUIRED_PARAMETER_EMPTY);
} // }
} // }
/** /**
* 模型分类-修改 * 模型分类-修改
* *
* @return * @return
*/ */
@ApiOperation("模型分类-修改") // @ApiOperation("模型分类-修改")
@PostMapping("/update/model/type") // @PostMapping("/update/model/type")
public ResponseVO updateModelType(ModelType modelType) { // public ResponseVO updateModelType(ModelType modelType) {
return modelGroupService.updateModelType(modelType); // return modelGroupService.updateModelType(modelType);
} // }
/** /**
* 模型-查询 * 模型-查询
...@@ -172,8 +173,19 @@ public class ModelBaseController { ...@@ -172,8 +173,19 @@ public class ModelBaseController {
*/ */
@ApiOperation("模型订阅-增加") @ApiOperation("模型订阅-增加")
@PostMapping("/create/model/subscribe") @PostMapping("/create/model/subscribe")
public ResponseVO createModelSubscribe() { public ResponseVO createModelSubscribe(@RequestBody ModelIssueDTO modelIssueDTO) {
return ResponseVO.ok(); return ResponseVO.ok(modelIssueService.createModelIssue(modelIssueDTO));
}
/**
* 模型属性-删除/批量删除
*
* @return
*/
@ApiOperation("模型订阅-删除/批量删除")
@PostMapping("/delete/model/subscribe")
public ResponseVO deleteModelSubscribe(@ApiParam(value = "订阅编号集合") @RequestBody List<String> ids) {
return ResponseVO.ok(modelIssueService.deletePatchModelIssue(ids));
} }
/** /**
...@@ -183,8 +195,10 @@ public class ModelBaseController { ...@@ -183,8 +195,10 @@ public class ModelBaseController {
*/ */
@ApiOperation("模型订阅-查询") @ApiOperation("模型订阅-查询")
@GetMapping("/get/model/subscribe") @GetMapping("/get/model/subscribe")
public ResponseVO getModelSubscribe() { public ResponseVO getModelSubscribe(@ApiParam(value = "模型订阅编号") @RequestParam(value = "objId", required = false) String objId,
return ResponseVO.ok(); @ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode,
@ApiParam(value = "订阅公司编码") @RequestParam(value = "subsCompanyCode", required = false) String subsCompanyCode) {
return ResponseVO.ok(modelIssueService.getModelIssueList(objId, modelCode, subsCompanyCode));
} }
/** /**
...@@ -212,6 +226,7 @@ public class ModelBaseController { ...@@ -212,6 +226,7 @@ public class ModelBaseController {
return ResponseVO.ok(); return ResponseVO.ok();
} }
/** /**
* 模型属性-增加 * 模型属性-增加
* *
...@@ -219,8 +234,10 @@ public class ModelBaseController { ...@@ -219,8 +234,10 @@ public class ModelBaseController {
*/ */
@ApiOperation("模型属性-增加") @ApiOperation("模型属性-增加")
@PostMapping("create/model/property") @PostMapping("create/model/property")
public ResponseVO createModelProperty() { public ResponseVO createModelProperty(@RequestBody ModelPropertyDTO modelPropertyDTO) {
return ResponseVO.ok();
Integer i = modelPropertyService.createModelProperty(modelPropertyDTO);
return ResponseVO.ok(i);
} }
/** /**
...@@ -230,8 +247,10 @@ public class ModelBaseController { ...@@ -230,8 +247,10 @@ public class ModelBaseController {
*/ */
@ApiOperation("模型属性-查询") @ApiOperation("模型属性-查询")
@GetMapping("get/model/property") @GetMapping("get/model/property")
public ResponseVO getModelProperty() { public ResponseVO getModelProperty(@ApiParam(value = "模型属性编号") @RequestParam(value = "objId", required = false) String objId,
return ResponseVO.ok(modelPropertyService.getModelProperty()); @ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode,
@ApiParam(value = "订阅公司编码") @RequestParam(value = "subsCompanyCode", required = false) String subsCompanyCode) {
return ResponseVO.ok(modelPropertyService.listModelProperty(objId, modelCode, subsCompanyCode));
} }
/** /**
...@@ -241,19 +260,33 @@ public class ModelBaseController { ...@@ -241,19 +260,33 @@ public class ModelBaseController {
*/ */
@ApiOperation("模型属性-修改") @ApiOperation("模型属性-修改")
@PostMapping("/update/model/property") @PostMapping("/update/model/property")
public ResponseVO updateModelProperty() { public ResponseVO updateModelProperty(@RequestBody ModelPropertyDTO modelPropertyDTO) {
return ResponseVO.ok();
return ResponseVO.ok(modelPropertyService.updateModelProperty(modelPropertyDTO));
} }
/** /**
* 模型属性-删除 * 模型属性-删除/批量删除
* *
* @return * @return
*/ */
@ApiOperation("模型属性-删除") @ApiOperation("模型属性-删除/批量删除")
@PostMapping("/delete/model/property") @PostMapping("/delete/model/property")
public ResponseVO deleteModelProperty() { public ResponseVO deleteModelProperty(@ApiParam(value = "属性ID集合") @RequestBody List<String> ids) {
return ResponseVO.ok(); return ResponseVO.ok(modelPropertyService.deletePatchModelProperty(ids));
}
/**
* 模型拓扑关系-增加
*
* @return
*/
@ApiOperation("模型拓扑关系-增加")
@PostMapping("create/model/topology")
public ResponseVO createModelTopology(@RequestBody ModelRelationDTO modelRelationDTO) {
Integer i = modelRelationService.createModelRelation(modelRelationDTO);
return ResponseVO.ok(i);
} }
/** /**
...@@ -263,8 +296,21 @@ public class ModelBaseController { ...@@ -263,8 +296,21 @@ public class ModelBaseController {
*/ */
@ApiOperation("模型拓扑关系-查询") @ApiOperation("模型拓扑关系-查询")
@GetMapping("/get/model/topology") @GetMapping("/get/model/topology")
public ResponseVO getModelTopology() { public ResponseVO getModelTopology(@ApiParam(value = "模型拓扑关系编号") @RequestParam(value = "objId", required = false) String objId,
return ResponseVO.ok(); @ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode) {
return ResponseVO.ok(modelRelationService.getModelRelationList(objId, modelCode));
}
/**
* 模型拓扑关系-删除
*
* @return
*/
@ApiOperation("模型拓扑关系-删除")
@PostMapping("/delete/model/topology")
public ResponseVO deleteModelTopology(@ApiParam(value = "模型拓扑关系编号") @RequestParam(value = "objId", required = false) String objId,
@ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode) {
return ResponseVO.ok(modelRelationService.deleteModelRelation(objId, modelCode));
} }
} }
package com.pms.ocp.controller; package com.pms.ocp.controller;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.pms.ocp.model.entity.ModelType; import com.pms.ocp.model.entity.ModelClassify;
import com.pms.ocp.model.vo.OcpModelGroupVO; import com.pms.ocp.model.vo.OcpModelGroupVO;
import com.pms.ocp.model.vo.ResponseVO; import com.pms.ocp.model.vo.ResponseVO;
import com.pms.ocp.service.ModelClassifyService; import com.pms.ocp.service.ModelClassifyService;
...@@ -37,8 +37,8 @@ public class ModelClassifyController { ...@@ -37,8 +37,8 @@ public class ModelClassifyController {
**/ **/
@ApiOperation("模型分类导航") @ApiOperation("模型分类导航")
@GetMapping("/navigation") @GetMapping("/navigation")
public ResponseVO<List<OcpModelGroupVO>> getModelNavigation(String searchCondition) { public ResponseVO<List<OcpModelGroupVO>> getModelNavigation() {
return modelClassifyService.getModelNavigation(searchCondition); return modelClassifyService.getModelNavigation();
} }
/** /**
...@@ -50,12 +50,12 @@ public class ModelClassifyController { ...@@ -50,12 +50,12 @@ public class ModelClassifyController {
**/ **/
@ApiOperation("右侧子类详情列表") @ApiOperation("右侧子类详情列表")
@GetMapping("/subclassDetailsList") @GetMapping("/subclassDetailsList")
public ResponseVO<PageInfo<OcpModelGroupVO>> subclassDetailsList(@RequestParam(required = false) int pageSize, public ResponseVO<PageInfo<OcpModelGroupVO>> subclassDetailsList(@RequestParam int currentPage,
@RequestParam(required = false) int pageNum, @RequestParam int pageSize,
@RequestParam(required = false,defaultValue = "") String parentGroupCode, @RequestParam(required = false,defaultValue = "") String parentGroupCode,
@RequestParam(required = false) String subclassGroupName @RequestParam(required = false,defaultValue = "") String subclassGroupName
) { ) {
return modelClassifyService.subclassDetailsList(pageSize, pageNum, parentGroupCode, subclassGroupName); return modelClassifyService.subclassDetailsList(currentPage, pageSize, parentGroupCode, subclassGroupName);
} }
/** /**
...@@ -68,7 +68,7 @@ public class ModelClassifyController { ...@@ -68,7 +68,7 @@ public class ModelClassifyController {
**/ **/
@ApiOperation("新增") @ApiOperation("新增")
@PostMapping("/insert") @PostMapping("/insert")
public ResponseVO insert(@RequestBody List<ModelType> list) { public ResponseVO insert(@RequestBody List<ModelClassify> list) {
return modelClassifyService.insert(list); return modelClassifyService.insert(list);
} }
...@@ -82,7 +82,7 @@ public class ModelClassifyController { ...@@ -82,7 +82,7 @@ public class ModelClassifyController {
**/ **/
@ApiOperation("修改") @ApiOperation("修改")
@PostMapping("/update") @PostMapping("/update")
public ResponseVO update(@RequestBody List<ModelType> list) { public ResponseVO update(@RequestBody List<ModelClassify> list) {
return modelClassifyService.update(list); return modelClassifyService.update(list);
} }
} }
package com.pms.ocp.controller; package com.pms.ocp.controller;
import com.pms.ocp.model.entity.OcpApiAudit; import com.pms.ocp.model.entity.*;
import com.pms.ocp.model.entity.OcpApiModelRel;
import com.pms.ocp.model.entity.OcpApiSubs;
import com.pms.ocp.model.entity.OcpApiTenantRel;
import com.pms.ocp.model.vo.ResponseVO; import com.pms.ocp.model.vo.ResponseVO;
import com.pms.ocp.service.OcpApiAuditService; import com.pms.ocp.service.*;
import com.pms.ocp.service.OcpApiModelRelService;
import com.pms.ocp.service.OcpApiSubsService;
import com.pms.ocp.service.OcpApiTenantRelService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.List;
@Slf4j @Slf4j
@RequestMapping("/tenant") @RequestMapping("/api")
@RestController @RestController
@Api(tags = "应用接口") @Api(tags = "服务接口")
public class OcpDetailsController { public class OcpApiDetailsController {
@Autowired @Autowired
private OcpApiSubsService ocpApiSubsService; private OcpApiSubsService ocpApiSubsService;
...@@ -42,55 +36,46 @@ public class OcpDetailsController { ...@@ -42,55 +36,46 @@ public class OcpDetailsController {
@ApiOperation("服务订阅记录-查询") @ApiOperation("服务订阅记录-查询")
@PostMapping("/getocpapisublist") @PostMapping("/getocpapisublist")
public ResponseVO getOcpApiSubsList(OcpApiSubs ocpApiSubs) { public ResponseVO<List<OcpApiSubs>> getOcpApiSubsList(OcpApiSubs ocpApiSubs) {
return ocpApiSubsService.getOcpApiSubsList(ocpApiSubs); return ocpApiSubsService.getOcpApiSubsList(ocpApiSubs);
} }
@ApiOperation("服务大事记-查询") @ApiOperation("服务大事记-查询")
@PostMapping("/getocpapiauditlist") @PostMapping("/getocpapiauditlist")
public ResponseVO getOcpApiAuditList(OcpApiAudit ocpApiAudit) { public ResponseVO<List<OcpApiAudit>> getOcpApiAuditList(OcpApiAudit ocpApiAudit) {
return ocpApiAuditService.getOcpApiAuditList(ocpApiAudit); return ocpApiAuditService.getOcpApiAuditList(ocpApiAudit);
} }
@ApiOperation("服务大事记-查询详情") @ApiOperation("服务大事记-查询详情")
@PostMapping("/getocpapidetails") @PostMapping("/getocpapidetails")
public ResponseVO getOcpApiDetails(OcpApiAudit ocpApiAudit){ public ResponseVO<List<OcpApiAudit>> getOcpApiDetails(@RequestBody OcpApiAudit ocpApiAudit){
return ocpApiAuditService.sById(ocpApiAudit); return ocpApiAuditService.sById(ocpApiAudit);
} }
@ApiOperation("服务大事记-查询详情") @ApiOperation("服务大事记-查询详情-变更内容")
@PostMapping("/getocpapi") @PostMapping("/getocpapi")
public ResponseVO getOcpApi(OcpApiAudit ocpApiAudit){ public ResponseVO<List<OcpApiAudit>> getOcpApi(@RequestBody OcpApiAudit ocpApiAudit){
return ocpApiAuditService.OaaById(ocpApiAudit); return ocpApiAuditService.OaaById(ocpApiAudit);
} }
@ApiOperation("服务与应用拓扑图-查询") @ApiOperation("服务与应用拓扑图-查询")
@PostMapping("/getoatrlist") @PostMapping("/getoatrlist")
public ResponseVO getOatrList(OcpApiTenantRel ocpApiTenantRel) { public ResponseVO<List<OcpApiTenantRel>> getOatrList(@RequestBody OcpApiTenantRel ocpApiTenantRel) {
return ocpApiTenantRelService.getOatrList(ocpApiTenantRel); return ocpApiTenantRelService.getOatrList(ocpApiTenantRel);
} }
@ApiOperation("服务与模型拓扑图-查询") @ApiOperation("服务与模型拓扑图-查询")
@PostMapping("/getoamrlist") @PostMapping("/getoamrlist")
public ResponseVO getOamrList(OcpApiModelRel ocpApiModelRel) { public ResponseVO<List<OcpApiModelRel>> getOamrList(@RequestBody OcpApiModelRel ocpApiModelRel) {
return ocpApiModelRelService.getOamrList(ocpApiModelRel); return ocpApiModelRelService.getOamrList(ocpApiModelRel);
} }
@ApiOperation("服务与模型拓扑图-关联查询详情") @ApiOperation("服务大事记-导出")
@PostMapping("/getoaabyid") @RequestMapping("/export")
public ResponseVO OaaById(OcpApiAudit ocpApiAudit) { public void exportExcel(@RequestBody(required = false) OcpApiAudit ocpApiAudit, HttpServletRequest request, HttpServletResponse response) {
return ocpApiAuditService.OaaById(ocpApiAudit); ocpApiAuditService.exportExcel(ocpApiAudit,request,response);
} }
// @ApiOperation("服务大事记-导出")
// @RequestMapping("/export")
// public void exportExcel(OcpApiAudit ocpApiAudit, HttpServletRequest request, HttpServletResponse response) {
// ocpApiAuditService.exportExcel(ocpApiAudit,request,response);
// }
// @ApiOperation("服务大事记-导出")
// @RequestMapping("/export")
// public void exportExcel(Oaa oaa, HttpServletRequest request, HttpServletResponse response) {
// oaaService.exportExcel(oaa, request, response);
// }
} }
...@@ -34,9 +34,9 @@ public class OcpApiTreeController { ...@@ -34,9 +34,9 @@ public class OcpApiTreeController {
*/ */
@GetMapping("/getTree") @GetMapping("/getTree")
@ApiOperation("服务树分类") @ApiOperation("服务树分类")
public ApiTreeGroupDto getTree(){ public ResponseVO<ApiTreeGroupDto> getTree(){
ApiTreeGroupDto byGroup = service.getByGroup(); ApiTreeGroupDto byGroup = service.getByGroup();
return byGroup; return ResponseVO.ok(byGroup);
} }
...@@ -51,17 +51,11 @@ public class OcpApiTreeController { ...@@ -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") @PostMapping("/getone")
@ApiOperation("服务树分类--分级数据") @ApiOperation("服务树分类--分级数据")
public Page<OcpApiGroup> getOne(@RequestBody PageGroupDto pageGroupDto){ public ResponseVO<Page<OcpApiGroup>> getOne(@RequestBody PageGroupDto pageGroupDto){
Page<OcpApiGroup> onePages = service.getOnePages(pageGroupDto); Page<OcpApiGroup> onePages = service.getOnePages(pageGroupDto);
return onePages; return ResponseVO.ok(onePages);
} }
......
package com.pms.ocp.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
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 TenanBaseDto TenanBaseDto){
boolean falg = tenantService.getTenanInster(TenanBaseDto);
if (falg){
return ResponseVO.ok("新建成功!");
}
return ResponseVO.error("应用code已经存在!");
}
@PostMapping("/tenantupdata")
@ApiModelProperty("修改应用")
public ResponseVO tenantUpdata(@RequestBody OcpTenantGroup ocpTenantGroup){
boolean falg = tenantService.getTenantUpdata(ocpTenantGroup);
if (falg){
return ResponseVO.ok("修改成功!");
}
return ResponseVO.error("应用code已经存在!");
}
@PostMapping("/tenantdelete")
@ApiModelProperty("删除服务")
public ResponseVO tenantDelete(@RequestBody OcpTenantGroup ocpTenantGroup){
boolean falg = tenantService.gettenantDelete(ocpTenantGroup);
if (falg){
return ResponseVO.ok("删除成功!");
}
return ResponseVO.error("应用下存在服务,请先删除下级应该!");
}
@PostMapping("tenantone")
@ApiOperation("应用分类--分级数据")
public ResponseVO<Page<OcpApiGroup>> tenantOne(@RequestBody PageGroupDto pageGroupDto){
// Page<OcpApiGroup> onePages = tenantService.getOnePages(pageGroupDto);
return ResponseVO.ok();
}
}
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;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@Slf4j
@RequestMapping("/tenant")
@RestController
@Api(tags = "应用接口")
public class OcpTenantDetailsController {
@Autowired
private OcpTenantBaseService ocpTenantBaseService;
@Autowired
private OcpTenantAuditService ocpTenantAuditService;
@ApiOperation("应用基础信息-查询")
@PostMapping("/getotbList")
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);
}
}
package com.pms.ocp.mapper; package com.pms.ocp.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.pms.ocp.model.entity.Model; import com.pms.ocp.model.entity.ModelIssue;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
/** /**
...@@ -11,5 +11,5 @@ import org.apache.ibatis.annotations.Mapper; ...@@ -11,5 +11,5 @@ import org.apache.ibatis.annotations.Mapper;
*/ */
@Mapper @Mapper
public interface ModelIssueMapper extends BaseMapper<Model> { public interface ModelIssueMapper extends BaseMapper<ModelIssue> {
} }
...@@ -12,5 +12,5 @@ import org.apache.ibatis.annotations.Mapper; ...@@ -12,5 +12,5 @@ import org.apache.ibatis.annotations.Mapper;
*/ */
@Mapper @Mapper
public interface ModelPropertyMapper extends BaseMapper<Model> { public interface ModelPropertyMapper extends BaseMapper<ModelProperty> {
} }
package com.pms.ocp.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.pms.ocp.model.entity.ModelRelation;
import org.apache.ibatis.annotations.Mapper;
/**
* @Auther: wangjian
* @Date: 2022/2/22 16:25
* @Description:模型关系数据层接口
*/
@Mapper
public interface ModelRelationMapper extends BaseMapper<ModelRelation> {
}
package com.pms.ocp.mapper; package com.pms.ocp.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.pms.ocp.model.entity.Model; import com.pms.ocp.model.entity.ModelClassify;
import com.pms.ocp.model.entity.ModelType;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
/** /**
...@@ -12,5 +11,5 @@ import org.apache.ibatis.annotations.Mapper; ...@@ -12,5 +11,5 @@ import org.apache.ibatis.annotations.Mapper;
*/ */
@Mapper @Mapper
public interface ModelTypeMapper extends BaseMapper<ModelType> { public interface ModelTypeMapper extends BaseMapper<ModelClassify> {
} }
...@@ -14,10 +14,10 @@ import java.util.List; ...@@ -14,10 +14,10 @@ import java.util.List;
@Mapper @Mapper
public interface OcpApiAuditMapper extends BaseMapper<OcpApiAudit> { public interface OcpApiAuditMapper extends BaseMapper<OcpApiAudit> {
List<String> OaaById(OcpApiAudit 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);
} }
...@@ -8,7 +8,7 @@ import java.util.List; ...@@ -8,7 +8,7 @@ import java.util.List;
@Mapper @Mapper
public interface OcpApiModelRelMapper extends BaseMapper<OcpApiModelRel> { public interface OcpApiModelRelMapper extends BaseMapper<OcpApiModelRel> {
List<String> getOamrList(OcpApiModelRel ocpApiModelRel); List<OcpApiModelRel> getOamrList(OcpApiModelRel ocpApiModelRel);
} }
...@@ -8,5 +8,5 @@ import java.util.List; ...@@ -8,5 +8,5 @@ import java.util.List;
@Mapper @Mapper
public interface OcpApiSubsMapper extends BaseMapper<OcpApiSubs> { public interface OcpApiSubsMapper extends BaseMapper<OcpApiSubs> {
List<String> getOcpApisList(OcpApiSubs ocpApiSubs); List<OcpApiSubs> getOcpApisList(OcpApiSubs ocpApiSubs);
} }
...@@ -9,5 +9,5 @@ import java.util.List; ...@@ -9,5 +9,5 @@ import java.util.List;
@Mapper @Mapper
public interface OcpApiTenantRelMapper extends BaseMapper<OcpApiTenantRel> { public interface OcpApiTenantRelMapper extends BaseMapper<OcpApiTenantRel> {
List<String> getOatrList(OcpApiTenantRel ocpApiTenantRel); List<OcpApiTenantRel> getOatrList(OcpApiTenantRel ocpApiTenantRel);
} }
package com.pms.ocp.mapper; package com.pms.ocp.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.pms.ocp.model.entity.ModelType; import com.pms.ocp.model.entity.ModelClassify;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
/** /**
...@@ -10,5 +10,5 @@ import org.apache.ibatis.annotations.Mapper; ...@@ -10,5 +10,5 @@ import org.apache.ibatis.annotations.Mapper;
* @date 2022/3/9 9:47 * @date 2022/3/9 9:47
*/ */
@Mapper @Mapper
public interface OcpModelGroupMapper extends BaseMapper<ModelType> { public interface OcpModelGroupMapper extends BaseMapper<ModelClassify> {
} }
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);
}
package com.pms.ocp.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.pms.ocp.model.entity.OcpTenantBase;
import java.util.List;
public interface OcpTenantBaseMapper extends BaseMapper<OcpTenantBase> {
List<OcpTenantBase> getOtbList(OcpTenantBase ocpTenantBase);
}
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);
}
package com.pms.ocp.model.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
/**
* @Auther: wangjian
* @Date: 2022/3/10 16:35
* @Description:模型订阅DTO对象
*/
@ApiModel(value = "模型订阅DTO对象")
@Data
public class ModelIssueDTO {
/**
* 模型属性编号
*/
@ApiModelProperty(value = "模型属性编号")
private String objId;
/**
* 模型编号
*/
@ApiModelProperty(value = "模型编号")
private String modelCode;
/**
* 订阅状态 0:订阅, 1:取消订阅
*/
@ApiModelProperty(value = "订阅状态 0:订阅, 1:取消订阅")
private String subsStatus;
/**
* 订阅公司编码
*/
@ApiModelProperty(value = "订阅公司编码")
private String subsCompanyCode;
/**
* 订阅人员编号
*/
@ApiModelProperty(value = "订阅人员编号")
private String subsUserId;
/**
* 订阅人名称
*/
@ApiModelProperty(value = "订阅人名称")
private String subsUserName;
/**
* 创建时间
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(value = "创建时间")
private LocalDateTime subsCtime;
/**
* 修改时间
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(value = "修改时间")
private LocalDateTime subsMtime;
}
package com.pms.ocp.model.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.sql.Date;
/**
* @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 String 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) 否
package com.pms.ocp.model.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
/**
* @Auther: wangjian
* @Date: 2022/3/10 19:24
* @Description:模型关系DTO对象
*/
@ApiModel(value = "模型关系DTO对象")
@Data
public class ModelRelationDTO {
/**
* 模型关系编号
* 主键
*/
@ApiModelProperty(value = "模型关系编号")
private String objId;
/**
* 模型编码
*/
@ApiModelProperty(value = "模型编码")
private String modelCode;
/**
* 模型属性编码
*/
@ApiModelProperty(value = "模型属性编码")
private String modelPropCode;
/**
* 关联模型编码
*/
@ApiModelProperty(value = "关联模型编码")
private String relationModeCode;
/**
* 关联模型属性编码
*/
@ApiModelProperty(value = "关联模型属性编码")
private String relationModePropCode;
/**
* 提交人id
*/
@ApiModelProperty(value = "提交人编号")
private String modelUserId;
/**
* 提交人姓名
*/
@ApiModelProperty(value = "提交人姓名")
private String modelUserName;
/**
* 订阅时间
*/
@ApiModelProperty(value = "订阅时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime modelCtime;
/**
* 修改时间
*/
@ApiModelProperty(value = "修改时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime modelMtime;
/**
* 是否已删除 0:未删除 1:已删除
*/
@ApiModelProperty(value = "是否已删除")
private String boolDelete;
}
...@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel; ...@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.sql.Date;
import java.sql.Timestamp; import java.sql.Timestamp;
...@@ -101,6 +102,55 @@ public class OcpApiGroupDtos { ...@@ -101,6 +102,55 @@ public class OcpApiGroupDtos {
@ApiModelProperty("服务版本(最新版本)") @ApiModelProperty("服务版本(最新版本)")
private long apiVersion; 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() { public String getApiGroupCode() {
return apiGroupCode; return apiGroupCode;
} }
...@@ -165,21 +215,7 @@ public class OcpApiGroupDtos { ...@@ -165,21 +215,7 @@ public class OcpApiGroupDtos {
this.apiGroupUserName = apiGroupUserName; 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() { public String getApiGroupPcode() {
return apiGroupPcode; return apiGroupPcode;
...@@ -253,21 +289,6 @@ public class OcpApiGroupDtos { ...@@ -253,21 +289,6 @@ public class OcpApiGroupDtos {
this.apiUrl = 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() { public String getApiUserId() {
return apiUserId; return apiUserId;
......
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;
}
}
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;
}
}
package com.pms.ocp.model.dto;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.pms.ocp.model.entity.OcpTenantGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.sql.Timestamp;
/**
* 新增应用封装对象
*/
@ApiModel(value = "新增应用封装对象")
@Data
public class TenanBaseDto extends OcpTenantGroup {
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty("主键ID")
private String objId;
/**
* 应用名称
*/
@ApiModelProperty("应用名称")
private String tenantName;
/**
* 应用代码
*/
@ApiModelProperty("应用代码")
private String tenantCode;
/**
* 应用分类代码
*/
@ApiModelProperty("应用分类代码")
private String tenantGroupCode;
/**
* 应用ip
*/
@ApiModelProperty("应用ip")
private String tenantIp;
/**
* 应用url
*/
@ApiModelProperty("应用url")
private String tenantUrl;
/**
* 所属专业
*/
@ApiModelProperty("所属专业")
private String professionalKind;
/**
* 创建者用户ID
*/
@ApiModelProperty("创建者用户ID")
private String tenantUserId;
/**
* 排序
*/
@ApiModelProperty("排序")
private Integer tenantOrderNo;
/**
* 创建时间
*/
@ApiModelProperty("创建时间")
private Timestamp tenantCtime;
/**
* 最后更新时间
*/
@ApiModelProperty("最后更新时间")
private Timestamp tenantMtime;
/**
* 部署名称
*/
@ApiModelProperty("部署名称")
private String deploymentName;
/**
* 描述
*/
@ApiModelProperty("描述")
private String tenantDescription;
/**
* 应用状态0:设计态;1:运行态
*/
@ApiModelProperty("应用状态0:设计态;1:运行态")
private Short tenantState;
/**
* 建设单位
*/
@ApiModelProperty("建设单位")
private String tenantUnit;
/**
* 所属公司编码
*/
@ApiModelProperty("所属公司编码")
private String ownerCompanyCode;
/**
* 所属公司名称
*/
@ApiModelProperty("所属公司名称")
private String ownerCompanyName;
/**
* 是否删除0:否;1:是
*/
@ApiModelProperty("是否删除0:否;1:是")
private Short isDelete;
/**
* 所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区
*/
@ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区")
private Short tenantZone;
/**
* 所属层级 1:应用层;2:平台层;3:网络层;4:感知层;
*/
@ApiModelProperty("所属层级 1:应用层;2:平台层;3:网络层;4:感知层;")
private Short tenantLayer;
/**
* 应用版本(当前版本)
*/
@ApiModelProperty("应用版本(当前版本)")
private String tenantVersion;
}
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;
}
}
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;
}
}
...@@ -18,7 +18,7 @@ import java.util.Date; ...@@ -18,7 +18,7 @@ import java.util.Date;
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@TableName("ocp_model_group") @TableName("ocp_model_group")
public class ModelType { public class ModelClassify {
/** /**
* 模型分类编号 * 模型分类编号
......
package com.pms.ocp.model.entity; package com.pms.ocp.model.entity;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import java.util.Date;
/** /**
* @Auther: wangjian * @Auther: wangjian
...@@ -9,5 +17,78 @@ import lombok.Data; ...@@ -9,5 +17,78 @@ import lombok.Data;
*/ */
@Data @Data
@Accessors(chain = true)
@TableName("ocp_model_subs")
public class ModelIssue { public class ModelIssue {
/**
* 模型订阅编号
*/
@TableId(value = "obj_id")
private String objId;
/**
* 模型编码
*/
private String modelCode;
/**
* 订阅状态 0:订阅, 1:取消订阅
*/
private int subsStatus;
/**
* 订阅公司编码
*/
private String subsCompanyCode;
/**
* 订阅人员编号
*/
private String subsUserId;
/**
* 订阅人名称
*/
private String subsUserName;
/**
* 订阅时间
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private LocalDateTime subsCtime;
/**
* 修改时间
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private LocalDateTime subsMtime;
} }
// create table ocp_model_subs
// (
// obj_id varchar(42) not null
// constraint ocp_model_subs_pkey
// primary key,
// model_code varchar(42) not null,
// subs_status smallint,
// subs_company_code varchar(42) not null,
// subs_user_id varchar(42),
// subs_user_name varchar(64),
// subs_ctime timestamp(6),
// subs_mtime timestamp(6)
// );
//
// comment on table ocp_model_subs is '模型订阅表';
// comment on column ocp_model_subs.obj_id is '主键是';
// comment on column ocp_model_subs.model_code is '模型code是';
// comment on column ocp_model_subs.subs_status is '订阅状态0:订阅,1:取消订阅';
// comment on column ocp_model_subs.subs_company_code is '订阅公司code';
// comment on column ocp_model_subs.subs_user_id is '订阅人员id';
// comment on column ocp_model_subs.subs_user_name is '订阅人';
// comment on column ocp_model_subs.subs_ctime is '订阅时间';
// comment on column ocp_model_subs.subs_mtime is '修改时间';
// alter table ocp_model_subs
// owner to postgres;
\ No newline at end of file
...@@ -3,9 +3,16 @@ package com.pms.ocp.model.entity; ...@@ -3,9 +3,16 @@ package com.pms.ocp.model.entity;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; 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.Data;
import lombok.NoArgsConstructor; import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
/** /**
* @Auther: wangjian * @Auther: wangjian
...@@ -13,6 +20,7 @@ import lombok.NoArgsConstructor; ...@@ -13,6 +20,7 @@ import lombok.NoArgsConstructor;
* @Description:模型属性对象 * @Description:模型属性对象
*/ */
@Data @Data
@Accessors(chain = true)
@TableName("ocp_model_prop") @TableName("ocp_model_prop")
public class ModelProperty{ public class ModelProperty{
...@@ -50,36 +58,34 @@ public class ModelProperty{ ...@@ -50,36 +58,34 @@ public class ModelProperty{
/** /**
* 数据长度 * 数据长度
*/ */
private String dataLength; private Integer dataLength;
/** /**
* 数据精度 * 数据精度
*/ */
private String dataScale; private Integer dataScale;
/** /**
* 是否主键 * 是否主键
*/ */
@TableField(value = "is_pk") @TableField(value = "is_pk")
private String boolPrimaryKey; private Integer boolPrimaryKey;
/** /**
* 是否必填 * 是否必填
*/ */
@TableField(value = "is_required") @TableField(value = "is_required")
private String boolRequired; private Integer boolRequired;
/** /**
* 推广类型 * 推广类型
*/ */
private String propPromotion; // private String propPromotion;
/** /**
* 显示顺序 * 显示顺序
*/ */
private String propOrderNo; private Integer propOrderNo;
/** /**
* 提交人id * 提交人id
...@@ -94,14 +100,21 @@ public class ModelProperty{ ...@@ -94,14 +100,21 @@ public class ModelProperty{
/** /**
* 创建时间 * 创建时间
*/ */
@TableField(value = "prop_ctime") @JsonDeserialize(using = LocalDateTimeDeserializer.class)
private String prop_ctime; @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") // @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private String prop_mtime; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
// @TableField(typeHandler = TimestampTypeHandler.class)
private LocalDateTime propMtime;
} }
// 字段名称 字段描述 字段类型 允许为NULL 备注 // 字段名称 字段描述 字段类型 允许为NULL 备注
...@@ -115,7 +128,6 @@ public class ModelProperty{ ...@@ -115,7 +128,6 @@ public class ModelProperty{
// data_scale 数据精度 int4 是 // data_scale 数据精度 int4 是
// is_pk 是否主键 int4 否 0:否,1:是 // is_pk 是否主键 int4 否 0:否,1:是
// is_required 是否必填 int4 是 0:否,1:是 // is_required 是否必填 int4 是 0:否,1:是
// prop_promotion 推广类型 int4 是 0:统推,1:自建
// company_id 省公司ID varchar(42) 是 // company_id 省公司ID varchar(42) 是
// company_name 省公司名称 varchar(50) 是 // company_name 省公司名称 varchar(50) 是
// prop _dispidx 显示顺序 int4 否 // prop _dispidx 显示顺序 int4 否
......
package com.pms.ocp.model.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
/**
* @Auther: wangjian
* @Date: 2022/3/10 19:16
* @Description:模型关系对象
*/
@Data
@Accessors(chain = true)
@TableName("ocp_model_rel")
public class ModelRelation {
/**
* 模型关系编号
* 主键
*/
@TableId(value = "obj_id")
private String objId;
/**
* 模型编码
*/
private String modelCode;
/**
* 模型属性编码
*/
private String modelPropCode;
/**
* 关联模型编码
*/
private String relationModeCode;
/**
* 关联模型属性编码
*/
private String relationModePropCode;
/**
* 提交人编号
*/
private String modelUserId;
/**
* 提交人姓名
*/
private String modelUserName;
/**
* 订阅时间
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime modelCtime;
/**
* 修改时间
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime modelMtime;
/**
* 是否已删除 0:未删除 1:已删除
*/
@TableField("is_delete")
private String boolDelete;
}
// create table ocp_model_rel
// (
// obj_id varchar(42) constraint ocp_model_rel_pkey primary key,
// model_code varchar(42) default ''::character varying not null,
// model_prop_code varchar(42) default ''::character varying not null,
// relation_mode_code varchar(42) default ''::character varying not null,
// relation_mode_prop_code varchar(43) default ''::character varying not null,
// model_user_id varchar(42) default ''::character varying,
// model_user_name varchar(64) default ''::character varying,
// model_ctime timestamp(6) default '2000-01-01 00:00:00'::timestamp(0) without time zone,
// model_mtime timestamp(6) default '2000-01-01 00:00:00'::timestamp(0) without time zone,
// is_delete smallint default '-1'::integer
// );
//
// comment on table ocp_model_rel is '模型关系表';
// comment on column ocp_model_rel.obj_id is '主键';
// comment on column ocp_model_rel.model_code is '模型编码';
// comment on column ocp_model_rel.model_prop_code is '模型属性编码';
// comment on column ocp_model_rel.relation_mode_code is '关联模型编码';
// comment on column ocp_model_rel.relation_mode_prop_code is '关联模型属性编码';
// comment on column ocp_model_rel.model_user_id is '提交人id';
// comment on column ocp_model_rel.model_user_name is '提交人姓名';
// comment on column ocp_model_rel.model_ctime is '创建时间';
// comment on column ocp_model_rel.model_mtime is '修改时间';
// comment on column ocp_model_rel.is_delete is '是否已删除0:未删除 1:已删除';
\ No newline at end of file
...@@ -7,6 +7,8 @@ import io.swagger.annotations.ApiModel; ...@@ -7,6 +7,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.sql.Date;
import java.sql.Timestamp; import java.sql.Timestamp;
@Data @Data
...@@ -175,7 +177,6 @@ public class OcpApiBase { ...@@ -175,7 +177,6 @@ public class OcpApiBase {
this.apiCtime = apiCtime; this.apiCtime = apiCtime;
} }
public Timestamp getApiMtime() { public Timestamp getApiMtime() {
return apiMtime; return apiMtime;
} }
...@@ -184,7 +185,6 @@ public class OcpApiBase { ...@@ -184,7 +185,6 @@ public class OcpApiBase {
this.apiMtime = apiMtime; this.apiMtime = apiMtime;
} }
public String getApiUserId() { public String getApiUserId() {
return apiUserId; return apiUserId;
} }
......
package com.pms.ocp.model.entity; package com.pms.ocp.model.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
...@@ -8,10 +9,11 @@ import io.swagger.annotations.ApiModelProperty; ...@@ -8,10 +9,11 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.List;
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@TableName("ocp_api_Group") @TableName("ocp_api_group")
@ApiModel("服务分类表") @ApiModel("服务分类表")
public class OcpApiGroup { public class OcpApiGroup {
@TableId(type = IdType.ASSIGN_ID) @TableId(type = IdType.ASSIGN_ID)
...@@ -58,6 +60,7 @@ public class OcpApiGroup { ...@@ -58,6 +60,7 @@ public class OcpApiGroup {
private long apiGroupLevel; private long apiGroupLevel;
public long getApiGroupLevel() { public long getApiGroupLevel() {
return apiGroupLevel; return apiGroupLevel;
} }
......
...@@ -40,6 +40,50 @@ public class OcpApiSubs { ...@@ -40,6 +40,50 @@ public class OcpApiSubs {
@ApiModelProperty("是否删除0-否,1-是") @ApiModelProperty("是否删除0-否,1-是")
private long isDelete; 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() { public String getObjId() {
return objId; return objId;
...@@ -49,7 +93,6 @@ public class OcpApiSubs { ...@@ -49,7 +93,6 @@ public class OcpApiSubs {
this.objId = objId; this.objId = objId;
} }
public String getApiCode() { public String getApiCode() {
return apiCode; return apiCode;
} }
...@@ -58,7 +101,6 @@ public class OcpApiSubs { ...@@ -58,7 +101,6 @@ public class OcpApiSubs {
this.apiCode = apiCode; this.apiCode = apiCode;
} }
public Timestamp getSubsLogApiCtime() { public Timestamp getSubsLogApiCtime() {
return subsLogApiCtime; return subsLogApiCtime;
} }
...@@ -67,7 +109,6 @@ public class OcpApiSubs { ...@@ -67,7 +109,6 @@ public class OcpApiSubs {
this.subsLogApiCtime = subsLogApiCtime; this.subsLogApiCtime = subsLogApiCtime;
} }
public Timestamp getSubsLogApiMtime() { public Timestamp getSubsLogApiMtime() {
return subsLogApiMtime; return subsLogApiMtime;
} }
...@@ -76,7 +117,6 @@ public class OcpApiSubs { ...@@ -76,7 +117,6 @@ public class OcpApiSubs {
this.subsLogApiMtime = subsLogApiMtime; this.subsLogApiMtime = subsLogApiMtime;
} }
public String getSubsLogApiUserId() { public String getSubsLogApiUserId() {
return subsLogApiUserId; return subsLogApiUserId;
} }
...@@ -85,7 +125,6 @@ public class OcpApiSubs { ...@@ -85,7 +125,6 @@ public class OcpApiSubs {
this.subsLogApiUserId = subsLogApiUserId; this.subsLogApiUserId = subsLogApiUserId;
} }
public Timestamp getSubsLogApiAtime() { public Timestamp getSubsLogApiAtime() {
return subsLogApiAtime; return subsLogApiAtime;
} }
...@@ -94,7 +133,6 @@ public class OcpApiSubs { ...@@ -94,7 +133,6 @@ public class OcpApiSubs {
this.subsLogApiAtime = subsLogApiAtime; this.subsLogApiAtime = subsLogApiAtime;
} }
public String getSubsCompanyCode() { public String getSubsCompanyCode() {
return subsCompanyCode; return subsCompanyCode;
} }
...@@ -103,7 +141,6 @@ public class OcpApiSubs { ...@@ -103,7 +141,6 @@ public class OcpApiSubs {
this.subsCompanyCode = subsCompanyCode; this.subsCompanyCode = subsCompanyCode;
} }
public long getIsDelete() { public long getIsDelete() {
return isDelete; return isDelete;
} }
...@@ -112,4 +149,123 @@ public class OcpApiSubs { ...@@ -112,4 +149,123 @@ public class OcpApiSubs {
this.isDelete = 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;
}
} }
...@@ -11,7 +11,7 @@ import java.sql.Timestamp; ...@@ -11,7 +11,7 @@ import java.sql.Timestamp;
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@TableName("ocp_api_Tenant_rel")
@ApiModel("服务应用关系表") @ApiModel("服务应用关系表")
public class OcpApiTenantRel { public class OcpApiTenantRel {
......
package com.pms.ocp.model.entity; package com.pms.ocp.model.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
...@@ -9,7 +10,9 @@ import lombok.Data; ...@@ -9,7 +10,9 @@ import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.io.Serializable; import java.io.Serializable;
import java.sql.Timestamp;
import java.util.Date; import java.util.Date;
import java.util.List;
/** /**
* 应用分类表 * 应用分类表
...@@ -85,13 +88,13 @@ public class OcpTenantGroup implements Serializable { ...@@ -85,13 +88,13 @@ public class OcpTenantGroup implements Serializable {
* 创建时间 * 创建时间
*/ */
@ApiModelProperty("创建时间") @ApiModelProperty("创建时间")
private Date tenantGroupCtime; private Timestamp tenantGroupCtime;
/** /**
* 修改时间 * 修改时间
*/ */
@ApiModelProperty("修改时间") @ApiModelProperty("修改时间")
private Date tenantGroupMtime; private Timestamp tenantGroupMtime;
/** /**
* 是否删除 * 是否删除
...@@ -105,6 +108,12 @@ public class OcpTenantGroup implements Serializable { ...@@ -105,6 +108,12 @@ public class OcpTenantGroup implements Serializable {
@ApiModelProperty("应用树层级 1:应用分组层 2:应用层") @ApiModelProperty("应用树层级 1:应用分组层 2:应用层")
private Short tenantGroupLevel; private Short tenantGroupLevel;
public static long getSerialVersionUID() {
return serialVersionUID;
}
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
...@@ -257,7 +266,7 @@ public class OcpTenantGroup implements Serializable { ...@@ -257,7 +266,7 @@ public class OcpTenantGroup implements Serializable {
/** /**
* 创建时间 * 创建时间
*/ */
public void setTenantGroupCtime(Date tenantGroupCtime) { public void setTenantGroupCtime(Timestamp tenantGroupCtime) {
this.tenantGroupCtime = tenantGroupCtime; this.tenantGroupCtime = tenantGroupCtime;
} }
...@@ -271,7 +280,7 @@ public class OcpTenantGroup implements Serializable { ...@@ -271,7 +280,7 @@ public class OcpTenantGroup implements Serializable {
/** /**
* 修改时间 * 修改时间
*/ */
public void setTenantGroupMtime(Date tenantGroupMtime) { public void setTenantGroupMtime(Timestamp tenantGroupMtime) {
this.tenantGroupMtime = tenantGroupMtime; this.tenantGroupMtime = tenantGroupMtime;
} }
......
package com.pms.ocp.model.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
/**
* @Auther: wangjian
* @Date: 2022/3/10 19:24
* @Description:模型关系VO对象
*/
@ApiModel(value = "模型关系VO对象")
@Data
public class ModelRelationVO {
/**
* 模型关系编号
* 主键
*/
@ApiModelProperty(value = "模型关系编号")
private String objId;
/**
* 模型编码
*/
@ApiModelProperty(value = "模型编码")
private String modelCode;
/**
* 模型属性编码
*/
@ApiModelProperty(value = "模型属性编码")
private String modelPropCode;
/**
* 关联模型编码
*/
@ApiModelProperty(value = "关联模型编码")
private String relationModeCode;
/**
* 关联模型属性编码
*/
@ApiModelProperty(value = "关联模型属性编码")
private String relationModePropCode;
/**
* 提交人id
*/
@ApiModelProperty(value = "提交人编号")
private String modelUserId;
/**
* 提交人姓名
*/
@ApiModelProperty(value = "提交人姓名")
private String modelUserName;
/**
* 订阅时间
*/
@ApiModelProperty(value = "订阅时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime modelCtime;
/**
* 修改时间
*/
@ApiModelProperty(value = "修改时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime modelMtime;
/**
* 是否已删除 0:未删除 1:已删除
*/
@ApiModelProperty(value = "是否已删除")
private String boolDelete;
}
...@@ -2,8 +2,10 @@ package com.pms.ocp.model.vo; ...@@ -2,8 +2,10 @@ package com.pms.ocp.model.vo;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
...@@ -75,11 +77,15 @@ public class OcpModelGroupVO implements Serializable { ...@@ -75,11 +77,15 @@ public class OcpModelGroupVO implements Serializable {
/** /**
* 创建时间 * 创建时间
*/ */
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
private Date groupCtime; private Date groupCtime;
/** /**
* 修改时间 * 修改时间
*/ */
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "修改时间") @ApiModelProperty(value = "修改时间")
private Date groupMtime; private Date groupMtime;
/** /**
...@@ -88,13 +94,23 @@ public class OcpModelGroupVO implements Serializable { ...@@ -88,13 +94,23 @@ public class OcpModelGroupVO implements Serializable {
@ApiModelProperty(value = "是否已删除0未删除 1未删除") @ApiModelProperty(value = "是否已删除0未删除 1未删除")
private Integer isDelete; private Integer isDelete;
@TableField(exist = false)
@ApiModelProperty(value = "层级")
private int level;
/** /**
* 子类集合 * 子类集合
*/ */
@TableField(exist = false) @TableField(exist = false)
@ApiModelProperty(value = "子类集合") @ApiModelProperty(value = "子类集合")
List<OcpModelGroupVO> childrenList; private List<OcpModelGroupVO> childrenList;
public String getModelGroupCode() {
return modelGroupCode == null ? "" : modelGroupCode;
}
public String getModelGroupPcode() {
return modelGroupPcode == null ? "" : modelGroupPcode;
}
} }
......
package com.pms.ocp.service; package com.pms.ocp.service;
import com.pms.ocp.model.entity.ModelType; import com.pms.ocp.model.entity.ModelClassify;
import com.pms.ocp.model.vo.OcpModelGroupVO; import com.pms.ocp.model.vo.OcpModelGroupVO;
import com.pms.ocp.model.vo.ResponseVO; import com.pms.ocp.model.vo.ResponseVO;
...@@ -12,11 +12,11 @@ import java.util.List; ...@@ -12,11 +12,11 @@ import java.util.List;
* @date 2022/3/8 15:19 * @date 2022/3/8 15:19
*/ */
public interface ModelClassifyService { public interface ModelClassifyService {
ResponseVO<List<OcpModelGroupVO>> getModelNavigation(String searchCondition); ResponseVO<List<OcpModelGroupVO>> getModelNavigation();
ResponseVO insert(List<ModelType> list); ResponseVO insert(List<ModelClassify> list);
ResponseVO subclassDetailsList(int pageSize,int pageNum,String parentGroupCode,String subclassGroupName); ResponseVO subclassDetailsList(int currentPage,int pageSize,String parentGroupCode,String subclassGroupName);
ResponseVO update(List<ModelType> list); ResponseVO update(List<ModelClassify> list);
} }
package com.pms.ocp.service; package com.pms.ocp.service;
import com.pms.ocp.model.entity.ModelType; import com.pms.ocp.model.entity.ModelClassify;
import com.pms.ocp.model.vo.ResponseVO; import com.pms.ocp.model.vo.ResponseVO;
public interface ModelGroupService { public interface ModelGroupService {
ResponseVO getModelType(); ResponseVO getModelType();
ResponseVO createModelType(ModelType modelType); ResponseVO createModelType(ModelClassify modelClassify);
ResponseVO deleteModelType(String modelTypeId); ResponseVO deleteModelType(String modelTypeId);
ResponseVO updateModelType(ModelType modelType); ResponseVO updateModelType(ModelClassify modelClassify);
} }
package com.pms.ocp.service; package com.pms.ocp.service;
import com.pms.ocp.model.dto.ModelIssueDTO;
import com.pms.ocp.model.entity.ModelIssue; import com.pms.ocp.model.entity.ModelIssue;
import com.pms.ocp.model.entity.ModelType;
import java.util.List; import java.util.List;
...@@ -15,10 +15,10 @@ public interface ModelIssueService { ...@@ -15,10 +15,10 @@ public interface ModelIssueService {
/** /**
* 创建模型订阅 * 创建模型订阅
* *
* @param modelIssueo * @param modelIssueDTO
* @return * @return
*/ */
Integer createModelIssue(ModelIssue modelIssueo); Integer createModelIssue(ModelIssueDTO modelIssueDTO);
/** /**
* 删除模型订阅 * 删除模型订阅
...@@ -28,13 +28,21 @@ public interface ModelIssueService { ...@@ -28,13 +28,21 @@ public interface ModelIssueService {
*/ */
Integer deleteModelIssue(String modelId); Integer deleteModelIssue(String modelId);
/**
* 批量删除模型订阅
*
* @param ids
* @return
*/
Integer deletePatchModelIssue(List<String> ids);
/** /**
* 更新模型订阅 * 更新模型订阅
* *
* @param modelIssueo * @param modelIssue
* @return * @return
*/ */
Integer updateModelIssue(ModelIssue modelIssueo); Integer updateModelIssue(ModelIssue modelIssue);
/** /**
* 获取模型订阅 * 获取模型订阅
...@@ -42,7 +50,7 @@ public interface ModelIssueService { ...@@ -42,7 +50,7 @@ public interface ModelIssueService {
* @param * @param
* @return * @return
*/ */
List<ModelType> getModelIssueList(); List<ModelIssue> getModelIssueList(String objId, String modelCode, String subsCompanyCode);
/** /**
* 获取模型订阅列表 * 获取模型订阅列表
...@@ -50,5 +58,5 @@ public interface ModelIssueService { ...@@ -50,5 +58,5 @@ public interface ModelIssueService {
* @param modelId * @param modelId
* @return * @return
*/ */
ModelType getModelIssue(String modelId); ModelIssueDTO getModelIssue(String modelId);
} }
package com.pms.ocp.service; package com.pms.ocp.service;
import com.pms.ocp.model.dto.ModelPropertyDTO;
import com.pms.ocp.model.entity.ModelProperty; import com.pms.ocp.model.entity.ModelProperty;
import io.swagger.models.auth.In;
import java.util.List; import java.util.List;
...@@ -14,40 +16,48 @@ public interface ModelPropertyService { ...@@ -14,40 +16,48 @@ public interface ModelPropertyService {
/** /**
* 创建模型属性 * 创建模型属性
* *
* @param modelProperty * @param modelPropertyDTO
* @return * @return
*/ */
Integer createModelProperty(ModelProperty modelProperty); Integer createModelProperty(ModelPropertyDTO modelPropertyDTO);
/** /**
* 删除模型属性 * 删除模型属性
* *
* @param modelId * @param modelCode
* @return * @return
*/ */
Integer deleteModelProperty(String modelId); Integer deleteModelProperty(String modelCode, String propCode);
/**
* 批量删除模型属性
*
* @param ids
* @return
*/
Integer deletePatchModelProperty(List<String> ids);
/** /**
* 更新模型属性 * 更新模型属性
* *
* @param modelProperty * @param modelPropertyDTO
* @return * @return
*/ */
Integer updateModelProperty(ModelProperty modelProperty); Integer updateModelProperty(ModelPropertyDTO modelPropertyDTO);
/** /**
* 获取模型属性 * 获取模型属性列表
* *
* @param * @param
* @return * @return
*/ */
List<ModelProperty> getModelPropertyList(); List<ModelProperty> listModelProperty(String objId, String modelCode, String propCode);
/** /**
* 获取模型属性列表 * 获取模型属性
* *
* @param * @param
* @return * @return
*/ */
List<ModelProperty> getModelProperty(); ModelPropertyDTO getModelProperty();
} }
package com.pms.ocp.service;
import com.pms.ocp.model.dto.ModelRelationDTO;
import com.pms.ocp.model.entity.ModelRelation;
import com.pms.ocp.model.vo.ModelRelationVO;
import java.util.List;
/**
* @Auther: wangjian
* @Date: 2022/2/22 16:07
* @Description:模型关系业务层接口
*/
public interface ModelRelationService {
/**
* 创建模型关系
*
* @param modelRelationDTO
* @return
*/
Integer createModelRelation(ModelRelationDTO modelRelationDTO);
/**
* 删除模型关系
*
* @param objId
* @param modelCode
* @return
*/
Integer deleteModelRelation(String objId, String modelCode);
/**
* 批量删除模型关系
*
* @param ids
* @return
*/
Integer deletePatchModelRelation(List<String> ids);
/**
* 更新模型关系
*
* @param modelRelation
* @return
*/
Integer updateModelRelation(ModelRelation modelRelation);
/**
* 获取模型关系
*
* @param
* @return
*/
List<ModelRelation> getModelRelationList(String objId, String modelCode);
/**
* 获取模型关系列表
*
* @param modelId
* @return
*/
ModelRelationVO getModelRelation(String modelId);
}
package com.pms.ocp.service; package com.pms.ocp.service;
import com.pms.ocp.common.constants.CodeEnum;
import com.pms.ocp.model.entity.Model; import com.pms.ocp.model.entity.Model;
import com.pms.ocp.model.entity.ModelType;
import com.pms.ocp.model.vo.ResponseVO; import com.pms.ocp.model.vo.ResponseVO;
import java.util.List;
/** /**
* @Auther: wangjian * @Auther: wangjian
* @Date: 2022/2/22 16:03 * @Date: 2022/2/22 16:03
......
package com.pms.ocp.service; package com.pms.ocp.service;
import com.pms.ocp.model.entity.ModelType; import com.pms.ocp.model.entity.ModelClassify;
import java.util.List; import java.util.List;
...@@ -14,10 +14,10 @@ public interface ModelTypeService { ...@@ -14,10 +14,10 @@ public interface ModelTypeService {
/** /**
* 创建模型分类 * 创建模型分类
* *
* @param modelType * @param modelClassify
* @return * @return
*/ */
Integer createModelType(ModelType modelType); Integer createModelType(ModelClassify modelClassify);
/** /**
* 删除模型分类 * 删除模型分类
...@@ -30,10 +30,10 @@ public interface ModelTypeService { ...@@ -30,10 +30,10 @@ public interface ModelTypeService {
/** /**
* 更新模型分类 * 更新模型分类
* *
* @param modelType * @param modelClassify
* @return * @return
*/ */
Integer updateModelType(ModelType modelType); Integer updateModelType(ModelClassify modelClassify);
/** /**
* 获取模型分类 * 获取模型分类
...@@ -41,7 +41,7 @@ public interface ModelTypeService { ...@@ -41,7 +41,7 @@ public interface ModelTypeService {
* @param * @param
* @return * @return
*/ */
List<ModelType> getModelTypeList(); List<ModelClassify> getModelTypeList();
/** /**
* 获取模型分类列表 * 获取模型分类列表
...@@ -49,5 +49,5 @@ public interface ModelTypeService { ...@@ -49,5 +49,5 @@ public interface ModelTypeService {
* @param modelId * @param modelId
* @return * @return
*/ */
ModelType getModelType(String modelId); ModelClassify getModelType(String modelId);
} }
...@@ -3,17 +3,18 @@ package com.pms.ocp.service; ...@@ -3,17 +3,18 @@ package com.pms.ocp.service;
import com.pms.ocp.model.entity.OcpApiAudit; import com.pms.ocp.model.entity.OcpApiAudit;
import com.pms.ocp.model.vo.ResponseVO; import com.pms.ocp.model.vo.ResponseVO;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
public interface OcpApiAuditService { public interface OcpApiAuditService {
ResponseVO getOcpApiAuditList(OcpApiAudit ocpApiAudit); ResponseVO getOcpApiAuditList(OcpApiAudit ocpApiAudit);
ResponseVO getOcpApiDetails(String objId); ResponseVO getOcpApiDetails(String objId);
// ResponseVO getOcpApiList(Oaa oaa);
ResponseVO OaaById(OcpApiAudit ocpApiAudit); ResponseVO OaaById(OcpApiAudit ocpApiAudit);
ResponseVO sById(OcpApiAudit ocpApiAudit); ResponseVO sById(OcpApiAudit ocpApiAudit);
// void exportExcel(Oaa oaa, HttpServletRequest request, HttpServletResponse response); void exportExcel(OcpApiAudit ocpApiAudit, HttpServletRequest request, HttpServletResponse response);
} }
package com.pms.ocp.service; package com.pms.ocp.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.pms.ocp.model.entity.ModelType; import com.pms.ocp.model.entity.ModelClassify;
/** /**
* @author huxiuwu * @author huxiuwu
* @version 1.0 * @version 1.0
* @date 2022/3/9 9:44 * @date 2022/3/9 9:44
*/ */
public interface OcpModelGroupService extends IService<ModelType> { public interface OcpModelGroupService extends IService<ModelClassify> {
} }
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);
}
package com.pms.ocp.service;
import com.pms.ocp.model.entity.OcpTenantBase;
import com.pms.ocp.model.vo.ResponseVO;
public interface OcpTenantBaseService {
ResponseVO getOtbList(OcpTenantBase ocpTenantBase);
}
package com.pms.ocp.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.pms.ocp.model.dto.OcpTenantGroupDto;
import com.pms.ocp.model.dto.PageGroupDto;
import com.pms.ocp.model.dto.TenanBaseDto;
import com.pms.ocp.model.entity.OcpApiGroup;
import com.pms.ocp.model.entity.OcpTenantGroup;
import java.util.List;
public interface TenantService extends IService<OcpTenantGroup> {
/**
* 应用树分类管理
* @return
*/
OcpTenantGroupDto getTree();
/**
* 应用新增
* @param
* @return
*/
boolean getTenanInster(TenanBaseDto TenanBaseDto);
/**
* 修改应用
* @param ocpTenantGroup
* @return
*/
boolean getTenantUpdata(OcpTenantGroup ocpTenantGroup);
/**
* 删除服务
* @param ocpTenantGroup
* @return
*/
boolean gettenantDelete(OcpTenantGroup ocpTenantGroup);
}
...@@ -6,7 +6,7 @@ import com.github.pagehelper.PageHelper; ...@@ -6,7 +6,7 @@ import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.pms.ocp.common.constants.CodeEnum; import com.pms.ocp.common.constants.CodeEnum;
import com.pms.ocp.mapper.ModelClassifyMapper; import com.pms.ocp.mapper.ModelClassifyMapper;
import com.pms.ocp.model.entity.ModelType; import com.pms.ocp.model.entity.ModelClassify;
import com.pms.ocp.model.vo.OcpModelGroupVO; import com.pms.ocp.model.vo.OcpModelGroupVO;
import com.pms.ocp.model.vo.ResponseVO; import com.pms.ocp.model.vo.ResponseVO;
import com.pms.ocp.service.ModelClassifyService; import com.pms.ocp.service.ModelClassifyService;
...@@ -34,17 +34,17 @@ public class ModelClassifyServiceImpl implements ModelClassifyService { ...@@ -34,17 +34,17 @@ public class ModelClassifyServiceImpl implements ModelClassifyService {
private OcpModelGroupService ocpService; private OcpModelGroupService ocpService;
/** /**
* currentPage pageSize
* 模型分类-导航树 * 模型分类-导航树
* *
* @param searchCondition 搜索条件
* @return List<com.pms.ocp.model.vo.OcpModelGroupVO> * @return List<com.pms.ocp.model.vo.OcpModelGroupVO>
* @author huxiuwu * @author huxiuwu
* @date 2022/3/8 * @date 2022/3/8
**/ **/
@Override @Override
public ResponseVO<List<OcpModelGroupVO>> getModelNavigation(String searchCondition) { public ResponseVO<List<OcpModelGroupVO>> getModelNavigation() {
//根据是否传入搜索条件创建构造器进行查询 //根据是否传入搜索条件创建构造器进行查询
List<OcpModelGroupVO> modelTypeList = this.selectByCondition(searchCondition, null); List<OcpModelGroupVO> modelTypeList = this.selectByCondition(null, null);
if (CollectionUtil.isEmpty(modelTypeList)) { if (CollectionUtil.isEmpty(modelTypeList)) {
return ResponseVO.error(CodeEnum.NO_DATA); return ResponseVO.error(CodeEnum.NO_DATA);
} }
...@@ -55,18 +55,26 @@ public class ModelClassifyServiceImpl implements ModelClassifyService { ...@@ -55,18 +55,26 @@ public class ModelClassifyServiceImpl implements ModelClassifyService {
/** /**
* 右侧子类详情列表 * 右侧子类详情列表
* * 这边是右侧详情页,需求是点击右侧导航树上的分类显示该分类的所有子集,
* 所以第一次查询查询到所有并将其转换为key为其分类编码,value为其本身
* 的map.第二次是根据搜素框的值进行模糊查询
* @return pms.ocp.model.vo.ResponseVO * @return pms.ocp.model.vo.ResponseVO
* @author huxiuwu * @author huxiuwu
* @date 2022/3/9 * @date 2022/3/9
**/ **/
@Override @Override
public ResponseVO<PageInfo<OcpModelGroupVO>> subclassDetailsList(int pageSize,int pageNum,String parentGroupCode,String subclassGroupName) { public ResponseVO<PageInfo<OcpModelGroupVO>> subclassDetailsList(int currentPage,int pageSize,String parentGroupCode,String subclassGroupName) {
PageHelper.startPage(pageSize,pageNum); //查询所有
List<OcpModelGroupVO> ocpModelGroupVOList = this.selectByCondition(null,subclassGroupName); List<OcpModelGroupVO> ocpModelGroupVOList = this.selectByCondition(null,null);
//将查询到所有数据的list转换为key为分类code,value为本身的map
Map<String, OcpModelGroupVO> groupByCode = ocpModelGroupVOList.stream().collect(Collectors.toMap(OcpModelGroupVO::getModelGroupCode, Function.identity(), (key1, key2) -> key2)); Map<String, OcpModelGroupVO> groupByCode = ocpModelGroupVOList.stream().collect(Collectors.toMap(OcpModelGroupVO::getModelGroupCode, Function.identity(), (key1, key2) -> key2));
//根据key获取前端传入code的对象
OcpModelGroupVO ocpModelGroupVO = groupByCode.get(parentGroupCode); OcpModelGroupVO ocpModelGroupVO = groupByCode.get(parentGroupCode);
List<OcpModelGroupVO> childrenList = findChildren(ocpModelGroupVOList, ocpModelGroupVO, new LinkedList<>()); //模糊查询
PageHelper.startPage(currentPage,pageSize);
List<OcpModelGroupVO> dimConditionList = this.selectByCondition(null,subclassGroupName);
//递归获取模糊查询后属于parentGroupCode子集
List<OcpModelGroupVO> childrenList = findChildren(dimConditionList, ocpModelGroupVO, new LinkedList<>());
PageInfo<OcpModelGroupVO> pageInfo = new PageInfo<>(childrenList); PageInfo<OcpModelGroupVO> pageInfo = new PageInfo<>(childrenList);
return ResponseVO.ok(pageInfo); return ResponseVO.ok(pageInfo);
} }
...@@ -80,7 +88,7 @@ public class ModelClassifyServiceImpl implements ModelClassifyService { ...@@ -80,7 +88,7 @@ public class ModelClassifyServiceImpl implements ModelClassifyService {
* @date 2022/3/9 * @date 2022/3/9
**/ **/
@Override @Override
public ResponseVO update(List<ModelType> list) { public ResponseVO update(List<ModelClassify> list) {
boolean isUpdateSucceed = ocpService.saveOrUpdateBatch(list); boolean isUpdateSucceed = ocpService.saveOrUpdateBatch(list);
if (!isUpdateSucceed) { if (!isUpdateSucceed) {
ResponseVO.error(CodeEnum.UP_DATA_FAIL); ResponseVO.error(CodeEnum.UP_DATA_FAIL);
...@@ -97,7 +105,7 @@ public class ModelClassifyServiceImpl implements ModelClassifyService { ...@@ -97,7 +105,7 @@ public class ModelClassifyServiceImpl implements ModelClassifyService {
* @date 2022/3/9 * @date 2022/3/9
**/ **/
@Override @Override
public ResponseVO insert(List<ModelType> list) { public ResponseVO insert(List<ModelClassify> list) {
boolean result = ocpService.saveBatch(list); boolean result = ocpService.saveBatch(list);
if (!result) { if (!result) {
return ResponseVO.error(CodeEnum.INSERT_FAIL); return ResponseVO.error(CodeEnum.INSERT_FAIL);
...@@ -109,27 +117,33 @@ public class ModelClassifyServiceImpl implements ModelClassifyService { ...@@ -109,27 +117,33 @@ public class ModelClassifyServiceImpl implements ModelClassifyService {
* 获取父节点下的所有子节点放入list中 * 获取父节点下的所有子节点放入list中
* @author huxiuwu * @author huxiuwu
* @date 2022/3/9 * @date 2022/3/9
* @param menuList * @param groupList
* @param childMenu * @param childList
* @return void * @return void
**/ **/
private List<OcpModelGroupVO> findChildren(List<OcpModelGroupVO> menuList, OcpModelGroupVO parent,List<OcpModelGroupVO> childMenu) { private List<OcpModelGroupVO> findChildren(List<OcpModelGroupVO> groupList, OcpModelGroupVO parent,List<OcpModelGroupVO> childList) {
for (OcpModelGroupVO vo : menuList) { for (OcpModelGroupVO vo : groupList) {
//遍历出父id等于参数的id,add进子节点集合 //遍历出父id等于参数的id,add进子节点集合
if (parent.getModelGroupCode() != null && parent.getModelGroupCode().equals(vo.getModelGroupPcode())) { if (parent!= null
&& parent.getModelGroupCode()
.equals(vo.getModelGroupPcode())) {
//递归遍历下一级 //递归遍历下一级
vo.setModelGroupPName(parent.getModelGroupName()); vo.setModelGroupPName(parent.getModelGroupName());
childMenu.add(vo); childList.add(vo);
childMenu = findChildren(menuList, vo, childMenu); childList = findChildren(groupList,vo,childList);
} }
} }
return childMenu; return childList;
} }
/** /**
* 构建树节点 * 构建树节点
*/ * @author huxiuwu
* @date 2022/3/10
* @param treeNodes 需要构建的list
* @return List<com.pms.ocp.model.vo.OcpModelGroupVO>
**/
private List<OcpModelGroupVO> build(List<OcpModelGroupVO> treeNodes) { private List<OcpModelGroupVO> build(List<OcpModelGroupVO> treeNodes) {
List<OcpModelGroupVO> result = new ArrayList<>(); List<OcpModelGroupVO> result = new ArrayList<>();
//list转map =>将每个对象的id作为key,自己作为value. //list转map =>将每个对象的id作为key,自己作为value.
...@@ -140,10 +154,16 @@ public class ModelClassifyServiceImpl implements ModelClassifyService { ...@@ -140,10 +154,16 @@ public class ModelClassifyServiceImpl implements ModelClassifyService {
for (OcpModelGroupVO node : nodeMap.values()) { for (OcpModelGroupVO node : nodeMap.values()) {
//得到自己的父类 //得到自己的父类
OcpModelGroupVO parent = nodeMap.get(node.getModelGroupPcode()); OcpModelGroupVO parent = nodeMap.get(node.getModelGroupPcode());
if (parent != null && !(node.getModelGroupCode().equals(parent.getModelGroupCode()))) { if (parent != null && (node.getModelGroupPcode().equals(parent.getModelGroupCode()))
&& (!"".equals(node.getModelGroupPcode())|| !"".equals(parent.getModelGroupCode()))) {
//防止每次都new list或者只是使用该对象就new对象浪费内存或者覆盖上一次记录
if (parent.getChildrenList() == null) { if (parent.getChildrenList() == null) {
parent.setChildrenList(new LinkedList<>()); parent.setChildrenList(new LinkedList<>());
} }
//设置上级父类名称
node.setModelGroupPName(parent.getModelGroupName());
//说明他有父类其下子类都需要加一级
addLevel(node,treeNodes);
parent.getChildrenList().add(node); parent.getChildrenList().add(node);
continue; continue;
} }
...@@ -151,12 +171,34 @@ public class ModelClassifyServiceImpl implements ModelClassifyService { ...@@ -151,12 +171,34 @@ public class ModelClassifyServiceImpl implements ModelClassifyService {
} }
return result; return result;
} }
/**
*
* @author huxiuwu
* @date 2022/3/10
* @param parent 父类
* @param treeNodes 需要遍历list
**/
private void addLevel(OcpModelGroupVO parent, List<OcpModelGroupVO> treeNodes) {
int level = parent.getLevel();
parent.setLevel(level++);
for (OcpModelGroupVO treeNode : treeNodes) {
if (treeNode != null && parent.getModelGroupCode().equals(treeNode.getModelGroupPcode())){
addLevel(treeNode,treeNodes);
}
}
}
/**
* 生成构造器
* @author huxiuwu
* @date 2022/3/10
* @param searchCondition
* @return List<com.pms.ocp.model.vo.OcpModelGroupVO>
**/
private List<OcpModelGroupVO> selectByCondition(String... searchCondition) { private List<OcpModelGroupVO> selectByCondition(String... searchCondition) {
QueryWrapper<OcpModelGroupVO> queryWrapper = new QueryWrapper<>(); QueryWrapper<OcpModelGroupVO> queryWrapper = new QueryWrapper<>();
//根据是否传入搜索条件创建构造器进行查询 //根据是否传入搜索条件创建构造器进行查询
queryWrapper.eq(StringUtils.isNotEmpty(searchCondition[0]), "model_group_pcode", searchCondition[1]) queryWrapper.eq(StringUtils.isNotEmpty(searchCondition[0]), "model_group_pcode", searchCondition[0])
.like(StringUtils.isNotEmpty(searchCondition[1]), "model_group_name", searchCondition[0]); .like(StringUtils.isNotEmpty(searchCondition[1]),"model_group_name", searchCondition[1]).orderBy(false,false,"group_ctime");
return classifyMapper.selectList(queryWrapper); return classifyMapper.selectList(queryWrapper);
} }
} }
...@@ -3,7 +3,7 @@ package com.pms.ocp.service.impl; ...@@ -3,7 +3,7 @@ package com.pms.ocp.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.pms.ocp.common.constants.CodeEnum; import com.pms.ocp.common.constants.CodeEnum;
import com.pms.ocp.mapper.ModelTypeMapper; import com.pms.ocp.mapper.ModelTypeMapper;
import com.pms.ocp.model.entity.ModelType; import com.pms.ocp.model.entity.ModelClassify;
import com.pms.ocp.model.vo.ResponseVO; import com.pms.ocp.model.vo.ResponseVO;
import com.pms.ocp.service.ModelGroupService; import com.pms.ocp.service.ModelGroupService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -24,18 +24,18 @@ public class ModelGroupServiceImpl implements ModelGroupService { ...@@ -24,18 +24,18 @@ public class ModelGroupServiceImpl implements ModelGroupService {
*/ */
@Override @Override
public ResponseVO getModelType() { public ResponseVO getModelType() {
QueryWrapper<ModelType> wrapper = new QueryWrapper<>(); QueryWrapper<ModelClassify> wrapper = new QueryWrapper<>();
List<ModelType> modelTypeList = modelTypeMapper.selectList(wrapper); List<ModelClassify> modelClassifyList = modelTypeMapper.selectList(wrapper);
if(CollectionUtils.isEmpty(modelTypeList)){ if(CollectionUtils.isEmpty(modelClassifyList)){
return ResponseVO.error("查询列表为空"); return ResponseVO.error("查询列表为空");
}else{ }else{
return ResponseVO.ok(modelTypeList); return ResponseVO.ok(modelClassifyList);
} }
} }
@Override @Override
public ResponseVO createModelType(ModelType modelType) { public ResponseVO createModelType(ModelClassify modelClassify) {
int result = modelTypeMapper.insert(modelType); int result = modelTypeMapper.insert(modelClassify);
if(result>0){ if(result>0){
return ResponseVO.error(CodeEnum.SUCCESS); return ResponseVO.error(CodeEnum.SUCCESS);
}else{ }else{
...@@ -54,8 +54,8 @@ public class ModelGroupServiceImpl implements ModelGroupService { ...@@ -54,8 +54,8 @@ public class ModelGroupServiceImpl implements ModelGroupService {
} }
@Override @Override
public ResponseVO updateModelType(ModelType modelType) { public ResponseVO updateModelType(ModelClassify modelClassify) {
int result = modelTypeMapper.updateById(modelType); int result = modelTypeMapper.updateById(modelClassify);
if (result > 0) { if (result > 0) {
return ResponseVO.error(CodeEnum.SUCCESS); return ResponseVO.error(CodeEnum.SUCCESS);
} else { } else {
......
package com.pms.ocp.service.impl; package com.pms.ocp.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.pms.ocp.mapper.ModelIssueMapper;
import com.pms.ocp.model.dto.ModelIssueDTO;
import com.pms.ocp.model.entity.ModelIssue; import com.pms.ocp.model.entity.ModelIssue;
import com.pms.ocp.model.entity.ModelType;
import com.pms.ocp.service.ModelIssueService; import com.pms.ocp.service.ModelIssueService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
import java.util.List; import java.util.List;
/** /**
...@@ -15,9 +21,20 @@ import java.util.List; ...@@ -15,9 +21,20 @@ import java.util.List;
@Service @Service
public class ModelIssueServiceImpl implements ModelIssueService { public class ModelIssueServiceImpl implements ModelIssueService {
@Autowired
private ModelIssueMapper modelIssueMapper;
@Override @Override
public Integer createModelIssue(ModelIssue modelIssueo) { public Integer createModelIssue(ModelIssueDTO modelIssueDTO) {
return null;
ModelIssue modelIssue = new ModelIssue();
BeanUtils.copyProperties(modelIssueDTO, modelIssue);
modelIssue.setSubsCtime(LocalDateTime.now());
return modelIssueMapper.insert(modelIssue);
} }
@Override @Override
...@@ -25,18 +42,43 @@ public class ModelIssueServiceImpl implements ModelIssueService { ...@@ -25,18 +42,43 @@ public class ModelIssueServiceImpl implements ModelIssueService {
return null; return null;
} }
/**
* 批量删除模型订阅
*
* @param ids
* @return
*/
@Override @Override
public Integer updateModelIssue(ModelIssue modelIssueo) { public Integer deletePatchModelIssue(List<String> ids) {
return null; return modelIssueMapper.deleteBatchIds(ids);
} }
@Override @Override
public List<ModelType> getModelIssueList() { public Integer updateModelIssue(ModelIssue modelIssue) {
return null; return null;
} }
@Override @Override
public ModelType getModelIssue(String modelId) { public List<ModelIssue> getModelIssueList(String objId, String modelCode, String subsCompanyCode) {
QueryWrapper<ModelIssue> queryWrapper = new QueryWrapper();
if (StringUtils.isNotEmpty(objId)) {
queryWrapper.lambda().eq(ModelIssue::getObjId, objId);
}
if (StringUtils.isNotEmpty(modelCode)) {
queryWrapper.lambda().eq(ModelIssue::getModelCode, modelCode);
}
if (StringUtils.isNotEmpty(subsCompanyCode)) {
queryWrapper.lambda().eq(ModelIssue::getSubsCompanyCode, subsCompanyCode);
}
return modelIssueMapper.selectList(queryWrapper);
}
@Override
public ModelIssueDTO getModelIssue(String modelId) {
return null; return null;
} }
} }
package com.pms.ocp.service.impl; package com.pms.ocp.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.model.entity.ModelProperty;
import com.pms.ocp.service.ModelPropertyService; 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 org.springframework.stereotype.Service;
import java.sql.Date;
import java.time.LocalDateTime;
import java.util.List; import java.util.List;
/** /**
...@@ -16,26 +25,73 @@ import java.util.List; ...@@ -16,26 +25,73 @@ import java.util.List;
@Service @Service
public class ModelPropertyServiceImpl implements ModelPropertyService { public class ModelPropertyServiceImpl implements ModelPropertyService {
// @Autowired @Autowired
private ModelPropertyMapper modelPropertyMapper;
@Override @Override
public Integer createModelProperty(ModelProperty modelProperty) { public Integer createModelProperty(ModelPropertyDTO modelPropertyDTO) {
return null;
ModelProperty modelProperty = new ModelProperty();
BeanUtils.copyProperties(modelPropertyDTO, modelProperty);
modelProperty.setPropCtime(LocalDateTime.now());
return modelPropertyMapper.insert(modelProperty);
} }
@Override @Override
public Integer deleteModelProperty(String modelId) { public Integer deleteModelProperty(String modelCode, String propCode) {
return null; 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 @Override
public Integer updateModelProperty(ModelProperty modelProperty) { public Integer deletePatchModelProperty(List<String> ids) {
return null; return modelPropertyMapper.deleteBatchIds(ids);
} }
@Override @Override
public List<ModelProperty> getModelPropertyList() { public Integer updateModelProperty(ModelPropertyDTO modelPropertyDTO) {
return null;
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 { ...@@ -44,7 +100,7 @@ public class ModelPropertyServiceImpl implements ModelPropertyService {
* @return * @return
*/ */
@Override @Override
public List<ModelProperty> getModelProperty() { public ModelPropertyDTO getModelProperty() {
QueryWrapper<ModelProperty> wrapper = new QueryWrapper<>(); QueryWrapper<ModelProperty> wrapper = new QueryWrapper<>();
return null; return null;
} }
......
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;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
import java.util.List;
/**
* @Auther: wangjian
* @Date: 2022/3/10 19:34
* @Description:
*/
@Service
public class ModelRelationServiceImpl implements ModelRelationService {
@Autowired
private ModelRelationMapper modelRelationMapper;
@Override
public Integer createModelRelation(ModelRelationDTO modelRelationDTO) {
ModelRelation modelRelation = new ModelRelation();
BeanUtils.copyProperties(modelRelationDTO, modelRelation);
modelRelation.setModelCtime(LocalDateTime.now());
return modelRelationMapper.insert(modelRelation);
}
@Override
public Integer deleteModelRelation(String objId, String modelCode) {
QueryWrapper<ModelRelation> queryWrapper = new QueryWrapper();
if (StringUtils.isNotEmpty(objId)) {
queryWrapper.lambda().eq(ModelRelation::getObjId, objId);
}
if (StringUtils.isNotEmpty(modelCode)) {
queryWrapper.lambda().eq(ModelRelation::getModelCode, modelCode);
}
return modelRelationMapper.delete(queryWrapper);
}
@Override
public Integer deletePatchModelRelation(List<String> ids) {
return modelRelationMapper.deleteBatchIds(ids);
}
@Override
public Integer updateModelRelation(ModelRelation modelRelation) {
return null;
}
@Override
public List<ModelRelation> getModelRelationList(String objId, String modelCode) {
QueryWrapper<ModelRelation> queryWrapper = new QueryWrapper();
if (StringUtils.isNotEmpty(objId)) {
queryWrapper.lambda().eq(ModelRelation::getObjId, objId);
}
if (StringUtils.isNotEmpty(modelCode)) {
queryWrapper.lambda().eq(ModelRelation::getModelCode, modelCode);
}
return modelRelationMapper.selectList(queryWrapper);
}
@Override
public ModelRelationVO getModelRelation(String modelId) {
return null;
}
}
...@@ -4,18 +4,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; ...@@ -4,18 +4,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.pms.ocp.common.constants.CodeEnum; import com.pms.ocp.common.constants.CodeEnum;
import com.pms.ocp.mapper.ModelMapper; import com.pms.ocp.mapper.ModelMapper;
import com.pms.ocp.model.entity.Model; import com.pms.ocp.model.entity.Model;
import com.pms.ocp.model.entity.ModelType;
import com.pms.ocp.model.vo.ResponseVO; import com.pms.ocp.model.vo.ResponseVO;
import com.pms.ocp.service.ModelService; import com.pms.ocp.service.ModelService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
import static com.pms.ocp.common.constants.CodeEnum.NO_DATA;
/** /**
* @Auther: wangjian * @Auther: wangjian
......
package com.pms.ocp.service.impl; package com.pms.ocp.service.impl;
import com.pms.ocp.model.entity.ModelType; import com.pms.ocp.model.entity.ModelClassify;
import com.pms.ocp.service.ModelTypeService; import com.pms.ocp.service.ModelTypeService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -16,7 +16,7 @@ import java.util.List; ...@@ -16,7 +16,7 @@ import java.util.List;
public class ModelTypeServiceImpl implements ModelTypeService { public class ModelTypeServiceImpl implements ModelTypeService {
@Override @Override
public Integer createModelType(ModelType modelType) { public Integer createModelType(ModelClassify modelClassify) {
return null; return null;
} }
...@@ -26,17 +26,17 @@ public class ModelTypeServiceImpl implements ModelTypeService { ...@@ -26,17 +26,17 @@ public class ModelTypeServiceImpl implements ModelTypeService {
} }
@Override @Override
public Integer updateModelType(ModelType modelType) { public Integer updateModelType(ModelClassify modelClassify) {
return null; return null;
} }
@Override @Override
public List<ModelType> getModelTypeList() { public List<ModelClassify> getModelTypeList() {
return null; return null;
} }
@Override @Override
public ModelType getModelType(String modelId) { public ModelClassify getModelType(String modelId) {
return null; return null;
} }
} }
package com.pms.ocp.service.impl; 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; import com.pms.ocp.mapper.OcpApiAuditMapper;
import com.pms.ocp.model.entity.OcpApiAudit; import com.pms.ocp.model.entity.OcpApiAudit;
import com.pms.ocp.model.vo.ResponseVO; import com.pms.ocp.model.vo.ResponseVO;
import com.pms.ocp.service.OcpApiAuditService; import com.pms.ocp.service.OcpApiAuditService;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.List; import java.util.List;
@Service @Service
public class OcpApiAuditServiceImpl implements OcpApiAuditService { public class OcpApiAuditServiceImpl extends ServiceImpl<OcpApiAuditMapper,OcpApiAudit> implements OcpApiAuditService {
@Autowired @Autowired
private OcpApiAuditMapper ocpApiAuditMapper; private OcpApiAuditMapper ocpApiAuditMapper;
@Override @Override
public ResponseVO getOcpApiAuditList(OcpApiAudit ocpApiAudit) { public ResponseVO getOcpApiAuditList(OcpApiAudit ocpApiAudit) {
List<String> ocpApiAuditList = ocpApiAuditMapper.getOcpApiSubsList(ocpApiAudit); List<OcpApiAudit> ocpApiAuditList = ocpApiAuditMapper.getOcpApiSubsList(ocpApiAudit);
if(CollectionUtils.isEmpty(ocpApiAuditList)){
return ResponseVO.error("查询列表为空");
}else{
return ResponseVO.ok(ocpApiAuditList); return ResponseVO.ok(ocpApiAuditList);
} }
}
// @Override
// public ResponseVO getOcpApiList(Oaa oaa) {
// List<OcpApiAudit> list = ocpApiAuditMapper.getOcpApiSubsList(oaa);
// return ResponseVO.ok(list);
// }
@Override @Override
public ResponseVO getOcpApiDetails(String objId) { public ResponseVO getOcpApiDetails(String objId) {
...@@ -41,23 +40,23 @@ public class OcpApiAuditServiceImpl implements OcpApiAuditService { ...@@ -41,23 +40,23 @@ public class OcpApiAuditServiceImpl implements OcpApiAuditService {
@Override @Override
public ResponseVO OaaById(OcpApiAudit ocpApiAudit) { public ResponseVO OaaById(OcpApiAudit ocpApiAudit) {
List<String> oaaById = ocpApiAuditMapper.OaaById(ocpApiAudit); List<OcpApiAudit> oaaById = ocpApiAuditMapper.OaaById(ocpApiAudit);
return ResponseVO.ok(oaaById); return ResponseVO.ok(oaaById);
} }
@Override @Override
public ResponseVO sById(OcpApiAudit ocpApiAudit) { public ResponseVO sById(OcpApiAudit ocpApiAudit) {
List<String> oaaById = ocpApiAuditMapper.sById(ocpApiAudit); List<OcpApiAudit> oaaById = ocpApiAuditMapper.sById(ocpApiAudit);
return ResponseVO.ok(oaaById); return ResponseVO.ok(oaaById);
} }
// @Override @Override
// public void exportExcel(Oaa oaa, HttpServletRequest request, HttpServletResponse response) { public void exportExcel(OcpApiAudit ocpApiAudit, HttpServletRequest request, HttpServletResponse response) {
// List<OcpApiAudit> list = ocpApiAuditMapper.selectList(oaa); List<OcpApiAudit> oaaById = ocpApiAuditMapper.OaaById(ocpApiAudit);
// ExportParams param = new ExportParams(AnalysisConstant.exportOcpApiAuditName.OCP_API_AUDIT,AnalysisConstant.exportOcpApiAuditName.OCP_API_AUDIT); ExportParams param = new ExportParams(AnalysisConstant.exportOcpApiAuditName.OCP_API_AUDIT,AnalysisConstant.exportOcpApiAuditName.OCP_API_AUDIT);
// Workbook workbook = ExcelExportUtil.exportExcel(param,OcpApiAudit.class,list); Workbook workbook = ExcelExportUtil.exportExcel(param,OcpApiAudit.class,oaaById);
// ExportUtils.exportExcel(response, AnalysisConstant.exportOcpApiAuditName.OCP_API_AUDIT,workbook); ExportUtils.exportExcel(response, AnalysisConstant.exportOcpApiAuditName.OCP_API_AUDIT,workbook);
// } }
} }
package com.pms.ocp.service.impl; package com.pms.ocp.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.pms.ocp.mapper.OcpApiModelRelMapper; import com.pms.ocp.mapper.OcpApiModelRelMapper;
import com.pms.ocp.model.entity.OcpApiModelRel; import com.pms.ocp.model.entity.OcpApiModelRel;
import com.pms.ocp.model.vo.ResponseVO; import com.pms.ocp.model.vo.ResponseVO;
...@@ -10,12 +11,12 @@ import org.springframework.stereotype.Service; ...@@ -10,12 +11,12 @@ import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
@Service @Service
public class OcpApiModelRelServiceImpl implements OcpApiModelRelService { public class OcpApiModelRelServiceImpl extends ServiceImpl<OcpApiModelRelMapper,OcpApiModelRel> implements OcpApiModelRelService {
@Autowired @Autowired
private OcpApiModelRelMapper ocpApiModelRelMapper; private OcpApiModelRelMapper ocpApiModelRelMapper;
@Override @Override
public ResponseVO getOamrList(OcpApiModelRel ocpApiModelRel) { public ResponseVO getOamrList(OcpApiModelRel ocpApiModelRel) {
List<String> ocpApiModelRelList = ocpApiModelRelMapper.getOamrList(ocpApiModelRel); List<OcpApiModelRel> ocpApiModelRelList = ocpApiModelRelMapper.getOamrList(ocpApiModelRel);
return ResponseVO.ok(ocpApiModelRelList); return ResponseVO.ok(ocpApiModelRelList);
} }
} }
package com.pms.ocp.service.impl; package com.pms.ocp.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.pms.ocp.mapper.OcpApiSubsMapper; import com.pms.ocp.mapper.OcpApiSubsMapper;
import com.pms.ocp.model.entity.OcpApiSubs; import com.pms.ocp.model.entity.OcpApiSubs;
import com.pms.ocp.model.vo.ResponseVO; import com.pms.ocp.model.vo.ResponseVO;
import com.pms.ocp.service.OcpApiSubsService; import com.pms.ocp.service.OcpApiSubsService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
...@@ -12,17 +14,13 @@ import org.springframework.util.CollectionUtils; ...@@ -12,17 +14,13 @@ import org.springframework.util.CollectionUtils;
import java.util.List; import java.util.List;
@Service @Service
public class OcpApiSubsServiceImpl implements OcpApiSubsService { public class OcpApiSubsServiceImpl extends ServiceImpl<OcpApiSubsMapper,OcpApiSubs> implements OcpApiSubsService {
@Autowired @Autowired
private OcpApiSubsMapper ocpApiSubsMapper; private OcpApiSubsMapper ocpApiSubsMapper;
@Override @Override
public ResponseVO getOcpApiSubsList(OcpApiSubs ocpApiSubs) { public ResponseVO getOcpApiSubsList(OcpApiSubs ocpApiSubs) {
List<String> ocpApiSubsList = ocpApiSubsMapper.getOcpApisList(ocpApiSubs); List<OcpApiSubs> ocpApiSubsList = ocpApiSubsMapper.getOcpApisList(ocpApiSubs);
if(CollectionUtils.isEmpty(ocpApiSubsList)){
return ResponseVO.error("查询列表为空");
}else{
return ResponseVO.ok(ocpApiSubsList); return ResponseVO.ok(ocpApiSubsList);
} }
}
} }
package com.pms.ocp.service.impl; package com.pms.ocp.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.pms.ocp.mapper.OcpApiTenantRelMapper; import com.pms.ocp.mapper.OcpApiTenantRelMapper;
import com.pms.ocp.model.entity.OcpApiTenantRel; import com.pms.ocp.model.entity.OcpApiTenantRel;
import com.pms.ocp.model.vo.ResponseVO; import com.pms.ocp.model.vo.ResponseVO;
...@@ -11,14 +12,14 @@ import java.util.List; ...@@ -11,14 +12,14 @@ import java.util.List;
@Service @Service
public class OcpApiTenantRelServiceImpl implements OcpApiTenantRelService { public class OcpApiTenantRelServiceImpl extends ServiceImpl<OcpApiTenantRelMapper,OcpApiTenantRel> implements OcpApiTenantRelService {
@Autowired @Autowired
private OcpApiTenantRelMapper ocpApiTenantRelMapper; private OcpApiTenantRelMapper ocpApiTenantRelMapper;
@Override @Override
public ResponseVO getOatrList(OcpApiTenantRel ocpApiTenantRel) { public ResponseVO getOatrList(OcpApiTenantRel ocpApiTenantRel) {
List<String> oatrList = ocpApiTenantRelMapper.getOatrList(ocpApiTenantRel); List<OcpApiTenantRel> oatrList = ocpApiTenantRelMapper.getOatrList(ocpApiTenantRel);
return ResponseVO.ok(oatrList); return ResponseVO.ok(oatrList);
} }
} }
package com.pms.ocp.service.impl; package com.pms.ocp.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 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.common.utils.RandomStringUtil;
import com.pms.ocp.mapper.OcpApiBaseMapper; import com.pms.ocp.mapper.OcpApiBaseMapper;
import com.pms.ocp.mapper.OcpApiTreeMapper; import com.pms.ocp.mapper.OcpApiTreeMapper;
import com.pms.ocp.model.dto.*; import com.pms.ocp.model.dto.*;
import com.pms.ocp.model.entity.OcpApiBase; import com.pms.ocp.model.entity.OcpApiBase;
import com.pms.ocp.model.entity.OcpApiGroup; import com.pms.ocp.model.entity.OcpApiGroup;
import com.pms.ocp.model.vo.ResponseVO;
import com.pms.ocp.service.OcpApiTreeService; import com.pms.ocp.service.OcpApiTreeService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.sql.Date;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -172,6 +171,7 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper,OcpApiGr ...@@ -172,6 +171,7 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper,OcpApiGr
break; break;
} }
} }
if (flag == true) { if (flag == true) {
OcpApiBase ocpApiBase = new OcpApiBase(); OcpApiBase ocpApiBase = new OcpApiBase();
ocpApiBase.setApiCode(ocpApiGroupDtos.getApiGroupCode()); ocpApiBase.setApiCode(ocpApiGroupDtos.getApiGroupCode());
...@@ -180,11 +180,12 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper,OcpApiGr ...@@ -180,11 +180,12 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper,OcpApiGr
ocpApiBase.setApiName("新增服务分类"); ocpApiBase.setApiName("新增服务分类");
Timestamp timestamp = new Timestamp(System.currentTimeMillis()); Timestamp timestamp = new Timestamp(System.currentTimeMillis());
ocpApiBase.setApiMtime(timestamp); ocpApiBase.setApiMtime(timestamp);
ocpApiBase.setApiCtime(ocpApiGroupDtos.getApiGroupCtime()); ocpApiBase.setApiCtime(timestamp);
ocpApiBase.setApiUserId(ocpApiGroupDtos.getApiGroupUserId()); ocpApiBase.setApiUserId(ocpApiGroupDtos.getApiGroupUserId());
ocpApiBase.setObjId(""); ocpApiBase.setObjId("");
OcpApiGroup ocpApiGroup1 = new OcpApiGroup(); OcpApiGroup ocpApiGroup1 = new OcpApiGroup();
ocpApiGroup1.setObjId(""); ocpApiGroup1.setObjId("");
ocpApiBase.setApiMtime(timestamp);
BeanUtils.copyProperties(ocpApiGroupDtos, ocpApiGroup1); BeanUtils.copyProperties(ocpApiGroupDtos, ocpApiGroup1);
ocpApiGroup1.setApiGroupCode(code); ocpApiGroup1.setApiGroupCode(code);
ocpApiBaseMapper.insert(ocpApiBase); ocpApiBaseMapper.insert(ocpApiBase);
...@@ -224,14 +225,21 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper,OcpApiGr ...@@ -224,14 +225,21 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper,OcpApiGr
*/ */
@Override @Override
public boolean deleteOcpTree(OcpApiGroup ocpApiGroup) { public boolean deleteOcpTree(OcpApiGroup ocpApiGroup) {
boolean flag = true;
String objId = ocpApiGroup.getObjId(); String objId = ocpApiGroup.getObjId();
OcpApiGroup ocpApiGroup1 = mapper.selectById(objId); OcpApiGroup ocpApiGroup1 = mapper.selectById(objId);
List<OcpApiGroup> ocpApiGroups = mapper.selectList(null);
if (StringUtils.isBlank(ocpApiGroup1.getApiGroupPcode())) { if (StringUtils.isBlank(ocpApiGroup1.getApiGroupPcode())) {
mapper.deleteById(objId); for (OcpApiGroup apiGroup : ocpApiGroups) {
return true; if ((ocpApiGroup1.getApiGroupCode()).equals(apiGroup.getApiGroupPcode())){
} else { flag = false;
return false; break;
}
} }
}
mapper.deleteById(objId);
return flag;
} }
......
...@@ -2,7 +2,7 @@ package com.pms.ocp.service.impl; ...@@ -2,7 +2,7 @@ package com.pms.ocp.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.pms.ocp.mapper.OcpModelGroupMapper; import com.pms.ocp.mapper.OcpModelGroupMapper;
import com.pms.ocp.model.entity.ModelType; import com.pms.ocp.model.entity.ModelClassify;
import com.pms.ocp.service.OcpModelGroupService; import com.pms.ocp.service.OcpModelGroupService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -12,5 +12,5 @@ import org.springframework.stereotype.Service; ...@@ -12,5 +12,5 @@ import org.springframework.stereotype.Service;
* @date 2022/3/9 9:45 * @date 2022/3/9 9:45
*/ */
@Service @Service
public class OcpModelGroupServiceImpl extends ServiceImpl<OcpModelGroupMapper,ModelType>implements OcpModelGroupService { public class OcpModelGroupServiceImpl extends ServiceImpl<OcpModelGroupMapper, ModelClassify>implements OcpModelGroupService {
} }
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);
}
}
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;
import com.pms.ocp.service.OcpTenantBaseService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@Service
public class OcpTenantBaseServiceImpl extends ServiceImpl<OcpTenantBaseMapper,OcpTenantBase> implements OcpTenantBaseService {
@Autowired
private OcpTenantBaseMapper ocpTenantBaseMapper;
@Override
public ResponseVO getOtbList(OcpTenantBase ocpTenantBase) {
List<OcpTenantBase> otbList = ocpTenantBaseMapper.getOtbList(ocpTenantBase);
return ResponseVO.ok(otbList);
}
}
package com.pms.ocp.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
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;
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.Timestamp;
import java.util.*;
@Service
public class TenantServiceImpl extends ServiceImpl<TenantMapper, OcpTenantGroup> implements TenantService {
@Autowired
private TenantMapper tenantMapper;
@Autowired
private TenantBasicManagementMapper tenantBasicMapper;
/**
* 应用树分类管理
*
* @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
* @return
*/
@Override
public boolean getTenanInster(TenanBaseDto tenanBaseDto) {
boolean falg = true;
OcpTenantGroup group = new OcpTenantGroup();
String tenantGroupCode = tenanBaseDto.getTenantGroupCode();
List<OcpTenantGroup> ocpTenantGroups = tenantMapper.selectList(null);
for (OcpTenantGroup tenantGroup : ocpTenantGroups) {
if (tenantGroup.getTenantGroupCode().equals(tenantGroupCode)){
falg = false;
break;
}
}
String randomString = RandomStringUtil.getRandomString(6);
Timestamp timestamp = new Timestamp(System.currentTimeMillis());
OcpTenantGroup ocpTenantGroup = new OcpTenantGroup();
BeanUtils.copyProperties(tenanBaseDto,ocpTenantGroup);
if ("null".equals(tenanBaseDto.getOwnerCompanyCode())){
ocpTenantGroup.setTenantGroupCode(randomString);
}
ocpTenantGroup.setTenantGroupCtime(timestamp);
ocpTenantGroup.setTenantGroupMtime(timestamp);
if ("".equals(tenanBaseDto.getTenantVersion())){
ocpTenantGroup.setTenantGroupVersion("1.0");
}
OcpTenantBase ocpTenantBase = new OcpTenantBase();
BeanUtils.copyProperties(tenanBaseDto,ocpTenantBase);
if ("null".equals(tenanBaseDto.getTenantGroupCode())){
group.setTenantGroupCode(randomString);
}
tenantMapper.insert(tenanBaseDto);
tenantBasicMapper.insert(ocpTenantBase);
return falg;
}
/**
* 修改应用
*
* @param ocpTenantGroup
* @return
*/
@Override
public boolean getTenantUpdata(OcpTenantGroup ocpTenantGroup) {
boolean falg = true;
List<OcpTenantGroup> ocpTenantGroupList = tenantMapper.selectList(null);
for (OcpTenantGroup ocpApiGroup : ocpTenantGroupList) {
String code = ocpTenantGroup.getTenantGroupCode();
if (code == ocpApiGroup.getTenantGroupCode()) {
falg = false;
break;
}
}
tenantMapper.updateById(ocpTenantGroup);
return falg;
}
/**
* 删除服务
*
* @param ocpTenantGroup
* @return
*/
@Override
public boolean gettenantDelete(OcpTenantGroup ocpTenantGroup) {
String objId = ocpTenantGroup.getObjId();
OcpTenantGroup ocpTenantGroup1 = tenantMapper.selectById(objId);
boolean flag = true;
List<OcpTenantGroup> ocpTenantGroupList = tenantMapper.selectList(null);
if (StringUtils.isBlank(ocpTenantGroup1.getTenantGroupPcode())) {
for (OcpTenantGroup tenantGroup : ocpTenantGroupList) {
String tenantGroupPcode = tenantGroup.getTenantGroupPcode();
if ((ocpTenantGroup.getTenantGroupCode().equals(tenantGroupPcode))){
flag = false;
break;
}
}
}
tenantMapper.deleteById(objId);
return flag;
}
}
...@@ -2,11 +2,11 @@ spring: ...@@ -2,11 +2,11 @@ spring:
datasource: datasource:
driver-class-name: org.postgresql.Driver driver-class-name: org.postgresql.Driver
username: postgres username: postgres
password: root password: 1234
type: com.zaxxer.hikari.HikariDataSource type: com.zaxxer.hikari.HikariDataSource
# jdbc-url: jdbc:postgresql://192.168.43.20:33072/pms3?currentSchema=public&stringtype=unspecified&TimeZone=Asia/Shanghai&useAffectedRows=true # jdbc-url: jdbc:postgresql://192.168.43.20:33072/pms3?currentSchema=public&stringtype=unspecified&TimeZone=Asia/Shanghai&useAffectedRows=true
# jdbc-url: jdbc:postgresql://172.20.10.9:33072/pms3?currentSchema=public&stringtype=unspecified&TimeZone=Asia/Shanghai&useAffectedRows=true # jdbc-url: jdbc:postgresql://172.20.10.9:33072/pms3?currentSchema=public&stringtype=unspecified&TimeZone=Asia/Shanghai&useAffectedRows=true
url: jdbc:postgresql://localhost:5432/server?currentSchema=operating_platform&stringtype=unspecified&TimeZone=Asia/Shanghai&useAffectedRows=true url: jdbc:postgresql://localhost:5432/postgres?currentSchema=operating_platform&stringtype=unspecified&TimeZone=Asia/Shanghai&useAffectedRows=true
knife4j: knife4j:
enable: true enable: true
......
...@@ -13,13 +13,20 @@ knife4j: ...@@ -13,13 +13,20 @@ knife4j:
enable: true enable: true
mybatis-plus: mybatis-plus:
global-config:
#字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
field-strategy: 0
mapper-locations: classpath:/mapper/*.xml mapper-locations: classpath:/mapper/*.xml
configuration: configuration:
# log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
# 是否开启自动驼峰命名规则 # 是否开启自动驼峰命名规则
map-underscore-to-camel-case: true map-underscore-to-camel-case: true
#指定自定义 Handler 所在的包位置
type-handlers-package: com.pms.ocp.common.handler
logging: logging:
level: level:
com.pms.ocp.mapper: debug com.pms.ocp.mapper: debug
......
...@@ -2,18 +2,18 @@ ...@@ -2,18 +2,18 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.pms.ocp.mapper.OcpApiAuditMapper"> <mapper namespace="com.pms.ocp.mapper.OcpApiAuditMapper">
<select id="OaaById" resultType="java.lang.String"> <select id="OaaById" resultType="com.pms.ocp.model.entity.OcpApiAudit">
select * from ocp_api_audit oaa select * from ocp_api_audit oaa
LEFT JOIN ocp_api_base oab LEFT JOIN ocp_api_base oab
on oaa.api_code = oab.api_code on oaa.api_code = oab.api_code
where oaa.obj_id = #{objId} where oaa.obj_id = #{objId}
</select> </select>
<select id="getOcpApiSubsList" resultType="java.lang.String"> <select id="getOcpApiSubsList" resultType="com.pms.ocp.model.entity.OcpApiAudit">
select * from ocp_api_audit select * from ocp_api_audit
</select> </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 * from ocp_api_audit where obj_id = #{objId}
</select> </select>
</mapper> </mapper>
\ No newline at end of file
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > <!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"> <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 select * from ocp_api_model_rel oamr
LEFT JOIN ocp_model_base omb LEFT JOIN ocp_model_base omb
on oamr.model_code = omb.model_code on oamr.model_code = omb.model_code
......
...@@ -4,7 +4,7 @@ ...@@ -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 SELECT * from ocp_api_subs oas
left JOIN ocp_api_base oab on left JOIN ocp_api_base oab on
oas.api_code = oab.api_code oas.api_code = oab.api_code
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!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"> <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 SELECT * from ocp_api_tenant_rel
oa LEFT JOIN ocp_api_base ab on oa LEFT JOIN ocp_api_base ab on
oa.api_code = ab.api_code INNER JOIN oa.api_code = ab.api_code INNER JOIN
......
<?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
<?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.OcpTenantBaseMapper" >
<select id="getOtbList" resultType="com.pms.ocp.model.entity.OcpTenantBase">
select * from ocp_tenant_base otb
LEFT JOIN ocp_tenant_extent ote
on otb.tenant_code = ote.tenant_code
where otb.obj_id = #{objId}
</select>
</mapper>
\ No newline at end of file
<?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.TenantMapper">
<select id="oneTenantGroup" resultType="com.pms.ocp.model.entity.OcpTenantGroup">
SELECT * FROM ocp_tenant_group WHERE tenant_group_code = #{tenant_group_company_pcode};
</select>
<select id="twoTenantGroups" resultType="com.pms.ocp.model.entity.OcpTenantGroup">
SELECT * FROM ocp_tenant_group WHERE ocp_tenant_group.tenant_group_code = '{tenant_group_company_pcode};
</select>
</mapper>
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