diff --git a/pom.xml b/pom.xml index 94fd1e34217acc864e5422c883a904609695b795..0b1aef01970aa1f670d499daa7a3260417dd8498 100644 --- a/pom.xml +++ b/pom.xml @@ -77,23 +77,12 @@ 1.2.62 - - - - - - - - - - org.postgresql postgresql - 9.4.1212.jre7 + 9.4.1212 - org.projectlombok lombok diff --git a/src/main/java/com/pms/ocp/common/handler/MYLocalDateTimeTypeHandler.java b/src/main/java/com/pms/ocp/common/handler/MYLocalDateTimeTypeHandler.java new file mode 100644 index 0000000000000000000000000000000000000000..8efbd9f9b6502b81d390793eb80696cfb93f59d0 --- /dev/null +++ b/src/main/java/com/pms/ocp/common/handler/MYLocalDateTimeTypeHandler.java @@ -0,0 +1,54 @@ +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); + } + + +} diff --git a/src/main/java/com/pms/ocp/common/handler/TimestampTypeHandler.java b/src/main/java/com/pms/ocp/common/handler/TimestampTypeHandler.java new file mode 100644 index 0000000000000000000000000000000000000000..dab5ce2a0827d17d63cadc6d2391c55fea2c3b3d --- /dev/null +++ b/src/main/java/com/pms/ocp/common/handler/TimestampTypeHandler.java @@ -0,0 +1,66 @@ +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 useColumnLabel is false + * @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 diff --git a/src/main/java/com/pms/ocp/controller/ApiDetailsController.java b/src/main/java/com/pms/ocp/controller/ApiDetailsController.java index 89bc6fb1a728b58d3a51b7131656956d07b74ff9..927cfe41b68596cf55bea5822b12e4e5cd28462b 100644 --- a/src/main/java/com/pms/ocp/controller/ApiDetailsController.java +++ b/src/main/java/com/pms/ocp/controller/ApiDetailsController.java @@ -1,6 +1,7 @@ package com.pms.ocp.controller; +import com.pms.ocp.model.entity.OcpApiBase; import com.pms.ocp.model.vo.ResponseVO; import com.pms.ocp.service.ApiDetailsService; import io.swagger.annotations.Api; @@ -11,6 +12,8 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + @Slf4j @RequestMapping("/api-base/v1") @RestController @@ -21,7 +24,7 @@ public class ApiDetailsController { @ApiOperation("服务库服务详情-查询") @GetMapping("/query") - public ResponseVO getApiDetails(String objId) { + public ResponseVO getApiDetails(String objId) { return apiDetailsService.getApiDetails(objId); } diff --git a/src/main/java/com/pms/ocp/controller/ModelBaseController.java b/src/main/java/com/pms/ocp/controller/ModelBaseController.java index 5e9f1caa2c2adf0b43bea0619b8da85857203241..0a69a7b6ee71243997e835c6bebb0b0addc2b43f 100644 --- a/src/main/java/com/pms/ocp/controller/ModelBaseController.java +++ b/src/main/java/com/pms/ocp/controller/ModelBaseController.java @@ -1,8 +1,10 @@ package com.pms.ocp.controller; import com.pms.ocp.common.constants.CodeEnum; +import com.pms.ocp.model.dto.ModelPropertyDTO; import com.pms.ocp.model.entity.Model; import com.pms.ocp.model.entity.ModelNote; +import com.pms.ocp.model.entity.ModelProperty; import com.pms.ocp.model.entity.ModelType; import com.pms.ocp.model.vo.ResponseVO; import com.pms.ocp.service.ModelGroupService; @@ -11,6 +13,7 @@ import com.pms.ocp.service.ModelPropertyService; import com.pms.ocp.service.ModelService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -44,6 +47,9 @@ public class ModelBaseController { @Autowired private ModelNoteService modelNoteService; + @Autowired + private ModelPropertyService propertyService; + /** * 模型分类-查询 * @@ -219,8 +225,10 @@ public class ModelBaseController { */ @ApiOperation("模型属性-增加") @PostMapping("create/model/property") - public ResponseVO createModelProperty() { - return ResponseVO.ok(); + public ResponseVO createModelProperty(@RequestBody ModelPropertyDTO modelPropertyDTO) { + + Integer i = modelPropertyService.createModelProperty(modelPropertyDTO); + return ResponseVO.ok(i); } /** @@ -230,8 +238,10 @@ public class ModelBaseController { */ @ApiOperation("模型属性-查询") @GetMapping("get/model/property") - public ResponseVO getModelProperty() { - return ResponseVO.ok(modelPropertyService.getModelProperty()); + public ResponseVO getModelProperty(@ApiParam(value = "模型属性编号") @RequestParam(value = "objId", required = false) String objId, + @ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode, + @ApiParam(value = "属性编码") @RequestParam(value = "propCode", required = false) String propCode) { + return ResponseVO.ok(modelPropertyService.listModelProperty(objId, modelCode, propCode)); } /** @@ -241,19 +251,20 @@ public class ModelBaseController { */ @ApiOperation("模型属性-修改") @PostMapping("/update/model/property") - public ResponseVO updateModelProperty() { - return ResponseVO.ok(); + public ResponseVO updateModelProperty(@RequestBody ModelPropertyDTO modelPropertyDTO) { + + return ResponseVO.ok(modelPropertyService.updateModelProperty(modelPropertyDTO)); } /** - * 模型属性-删除 + * 模型属性-删除/批量删除 * * @return */ - @ApiOperation("模型属性-删除") + @ApiOperation("模型属性-删除/批量删除") @PostMapping("/delete/model/property") - public ResponseVO deleteModelProperty() { - return ResponseVO.ok(); + public ResponseVO deleteModelProperty(@ApiParam(value = "属性ID集合") @RequestBody List ids) { + return ResponseVO.ok(modelPropertyService.deletePatchModelProperty(ids)); } /** diff --git a/src/main/java/com/pms/ocp/controller/OcpApiDetailsController.java b/src/main/java/com/pms/ocp/controller/OcpApiDetailsController.java index c082f963e44ddb3a3aa79037b8ef1d1b080e1493..880f34de8f2c548b4c7ace19ba8fd7d10719bf9c 100644 --- a/src/main/java/com/pms/ocp/controller/OcpApiDetailsController.java +++ b/src/main/java/com/pms/ocp/controller/OcpApiDetailsController.java @@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.util.List; @Slf4j @@ -35,49 +36,43 @@ public class OcpApiDetailsController { @ApiOperation("服务订阅记录-查询") @PostMapping("/getocpapisublist") - public ResponseVO getOcpApiSubsList(OcpApiSubs ocpApiSubs) { + public ResponseVO> getOcpApiSubsList(OcpApiSubs ocpApiSubs) { return ocpApiSubsService.getOcpApiSubsList(ocpApiSubs); } @ApiOperation("服务大事记-查询") @PostMapping("/getocpapiauditlist") - public ResponseVO getOcpApiAuditList(OcpApiAudit ocpApiAudit) { + public ResponseVO> getOcpApiAuditList(OcpApiAudit ocpApiAudit) { return ocpApiAuditService.getOcpApiAuditList(ocpApiAudit); } @ApiOperation("服务大事记-查询详情") @PostMapping("/getocpapidetails") - public ResponseVO getOcpApiDetails(@RequestBody OcpApiAudit ocpApiAudit){ + public ResponseVO> getOcpApiDetails(@RequestBody OcpApiAudit ocpApiAudit){ return ocpApiAuditService.sById(ocpApiAudit); } - @ApiOperation("服务大事记-查询详情") + @ApiOperation("服务大事记-查询详情-变更内容") @PostMapping("/getocpapi") - public ResponseVO getOcpApi(@RequestBody OcpApiAudit ocpApiAudit){ + public ResponseVO> getOcpApi(@RequestBody OcpApiAudit ocpApiAudit){ return ocpApiAuditService.OaaById(ocpApiAudit); } @ApiOperation("服务与应用拓扑图-查询") @PostMapping("/getoatrlist") - public ResponseVO getOatrList(@RequestBody OcpApiTenantRel ocpApiTenantRel) { + public ResponseVO> getOatrList(@RequestBody OcpApiTenantRel ocpApiTenantRel) { return ocpApiTenantRelService.getOatrList(ocpApiTenantRel); } @ApiOperation("服务与模型拓扑图-查询") @PostMapping("/getoamrlist") - public ResponseVO getOamrList(OcpApiModelRel ocpApiModelRel) { + public ResponseVO> getOamrList(@RequestBody OcpApiModelRel ocpApiModelRel) { return ocpApiModelRelService.getOamrList(ocpApiModelRel); } - @ApiOperation("服务与模型拓扑图-关联查询详情") - @PostMapping("/getoaabyid") - public ResponseVO OaaById(@RequestBody OcpApiAudit ocpApiAudit) { - return ocpApiAuditService.OaaById(ocpApiAudit); - } - @ApiOperation("服务大事记-导出") - @GetMapping("/export") - public void exportExcel(@RequestBody OcpApiAudit ocpApiAudit, HttpServletRequest request, HttpServletResponse response) { + @RequestMapping("/export") + public void exportExcel(@RequestBody(required = false) OcpApiAudit ocpApiAudit, HttpServletRequest request, HttpServletResponse response) { ocpApiAuditService.exportExcel(ocpApiAudit,request,response); } diff --git a/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java b/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java index ea8a4ce0948e9390c893f0ff790699c7b1f2c85d..632f0d13cdf9f094e482c479c0064cd9958a2aa1 100644 --- a/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java +++ b/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java @@ -34,9 +34,9 @@ public class OcpApiTreeController { */ @GetMapping("/getTree") @ApiOperation("服务树分类") - public ApiTreeGroupDto getTree(){ + public ResponseVO getTree(){ ApiTreeGroupDto byGroup = service.getByGroup(); - return byGroup; + return ResponseVO.ok(byGroup); } @@ -51,17 +51,11 @@ public class OcpApiTreeController { } - /*@GetMapping("/getone") - @ApiOperation("服务树分类--分级数据") - public List getOne(int pageSize,int pageNum,int apiGroupLevel){ - List onePage = service.getOnePage(pageSize, pageNum, apiGroupLevel); - return onePage; - }*/ @PostMapping("/getone") @ApiOperation("服务树分类--分级数据") - public Page getOne(@RequestBody PageGroupDto pageGroupDto){ + public ResponseVO> getOne(@RequestBody PageGroupDto pageGroupDto){ Page onePages = service.getOnePages(pageGroupDto); - return onePages; + return ResponseVO.ok(onePages); } diff --git a/src/main/java/com/pms/ocp/controller/OcpTenantController.java b/src/main/java/com/pms/ocp/controller/OcpTenantController.java new file mode 100644 index 0000000000000000000000000000000000000000..6e5456a95a545746fed2ea1974a0109ede773192 --- /dev/null +++ b/src/main/java/com/pms/ocp/controller/OcpTenantController.java @@ -0,0 +1,48 @@ +package com.pms.ocp.controller; + + +import com.pms.ocp.model.dto.OcpTenantGroupDto; +import com.pms.ocp.model.entity.OcpTenantGroup; +import com.pms.ocp.model.vo.ResponseVO; +import com.pms.ocp.service.TenantService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModelProperty; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + + +@Slf4j +@RequestMapping("/api-tenant/v1") +@RestController +@Api(tags = "应用树管理接口") +public class OcpTenantController { + + + @Autowired + private TenantService tenantService; + /** + * 应用树分类 + */ + + @GetMapping("/tenanttree") + @ApiModelProperty("应用树分类") + private OcpTenantGroupDto getTenantTree(){ + OcpTenantGroupDto tree = tenantService.getTree(); + return tree; + } + + @PostMapping("/tenantinster") + @ApiModelProperty("新增应用") + + public ResponseVO tenantInster(@RequestBody OcpTenantGroup ocpTenantGroup){ + boolean falg = tenantService.getTenanInster(ocpTenantGroup); + if (falg){ + return ResponseVO.ok("新建成功！"); + } + return ResponseVO.error("应用code已经存在！"); + + } +} diff --git a/src/main/java/com/pms/ocp/controller/OcpTenantDetailsController.java b/src/main/java/com/pms/ocp/controller/OcpTenantDetailsController.java index d7c81c9cb29019746b01573df5684896940c4d24..c4c287773ce9781fe662b4bb0639d162d52bbf06 100644 --- a/src/main/java/com/pms/ocp/controller/OcpTenantDetailsController.java +++ b/src/main/java/com/pms/ocp/controller/OcpTenantDetailsController.java @@ -1,7 +1,11 @@ package com.pms.ocp.controller; +import com.pms.ocp.model.entity.OcpApiAudit; +import com.pms.ocp.model.entity.OcpTenantAudit; import com.pms.ocp.model.entity.OcpTenantBase; import com.pms.ocp.model.vo.ResponseVO; +import com.pms.ocp.service.OcpApiAuditService; +import com.pms.ocp.service.OcpTenantAuditService; import com.pms.ocp.service.OcpTenantBaseService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -12,6 +16,8 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + @Slf4j @RequestMapping("/tenant") @RestController @@ -20,9 +26,25 @@ public class OcpTenantDetailsController { @Autowired private OcpTenantBaseService ocpTenantBaseService; + + @Autowired + private OcpTenantAuditService ocpTenantAuditService; + @ApiOperation("应用基础信息-查询") @PostMapping("/getotbList") - public ResponseVO getOtbList(@RequestBody OcpTenantBase ocpTenantBase){ + public ResponseVO> getOtbList(@RequestBody OcpTenantBase ocpTenantBase){ return ocpTenantBaseService.getOtbList(ocpTenantBase); } + + @ApiOperation("应用大事记-查询") + @PostMapping("/getotaList") + public ResponseVO> getOtaList(OcpTenantAudit ocpTenantAudit) { + return ocpTenantAuditService.getOtaList(ocpTenantAudit); + } + + @ApiOperation("应用大事记-查询详情") + @PostMapping("/getotaListById") + public ResponseVO> getOtaListById(@RequestBody OcpTenantAudit ocpTenantAudit) { + return ocpTenantAuditService.getOtaListById(ocpTenantAudit); + } } diff --git a/src/main/java/com/pms/ocp/mapper/ModelPropertyMapper.java b/src/main/java/com/pms/ocp/mapper/ModelPropertyMapper.java index 52de9394071b5be5ee8ae7f34585616007a19d67..fcb91b2cfaf4d2acd4263d514584138712fd5eaa 100644 --- a/src/main/java/com/pms/ocp/mapper/ModelPropertyMapper.java +++ b/src/main/java/com/pms/ocp/mapper/ModelPropertyMapper.java @@ -12,5 +12,5 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper -public interface ModelPropertyMapper extends BaseMapper { +public interface ModelPropertyMapper extends BaseMapper { } diff --git a/src/main/java/com/pms/ocp/mapper/OcpApiAuditMapper.java b/src/main/java/com/pms/ocp/mapper/OcpApiAuditMapper.java index e9a61f24f66f915eedf8c62ce30f78171d577e2f..7bbd2f7a0e8216ac088cf09dbd386fd7688990a7 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpApiAuditMapper.java +++ b/src/main/java/com/pms/ocp/mapper/OcpApiAuditMapper.java @@ -16,8 +16,8 @@ public interface OcpApiAuditMapper extends BaseMapper { List OaaById(OcpApiAudit ocpApiAudit); - List getOcpApiSubsList(OcpApiAudit ocpApiAudit); + List getOcpApiSubsList(OcpApiAudit ocpApiAudit); - List sById(OcpApiAudit ocpApiAudit); + List sById(OcpApiAudit ocpApiAudit); } diff --git a/src/main/java/com/pms/ocp/mapper/OcpApiModelRelMapper.java b/src/main/java/com/pms/ocp/mapper/OcpApiModelRelMapper.java index 87dbd0476eaa5cd014d3c64e049e98df234fa104..daf14a218b3aef804b9492240569c4599d834800 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpApiModelRelMapper.java +++ b/src/main/java/com/pms/ocp/mapper/OcpApiModelRelMapper.java @@ -8,7 +8,7 @@ import java.util.List; @Mapper public interface OcpApiModelRelMapper extends BaseMapper { - List getOamrList(OcpApiModelRel ocpApiModelRel); + List getOamrList(OcpApiModelRel ocpApiModelRel); } diff --git a/src/main/java/com/pms/ocp/mapper/OcpApiSubsMapper.java b/src/main/java/com/pms/ocp/mapper/OcpApiSubsMapper.java index 11a06cac9ef0c5e1af64984e5cb920c6a2f39b19..2bc170ce7da007693fc5300e1a38556987421677 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpApiSubsMapper.java +++ b/src/main/java/com/pms/ocp/mapper/OcpApiSubsMapper.java @@ -8,5 +8,5 @@ import java.util.List; @Mapper public interface OcpApiSubsMapper extends BaseMapper { - List getOcpApisList(OcpApiSubs ocpApiSubs); + List getOcpApisList(OcpApiSubs ocpApiSubs); } diff --git a/src/main/java/com/pms/ocp/mapper/OcpApiTenantRelMapper.java b/src/main/java/com/pms/ocp/mapper/OcpApiTenantRelMapper.java index 6e4e47a38727df7f85795d84a32f12a5fb7b516b..84831befea37da51a0ccf93369c5bdea7de4964b 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpApiTenantRelMapper.java +++ b/src/main/java/com/pms/ocp/mapper/OcpApiTenantRelMapper.java @@ -9,5 +9,5 @@ import java.util.List; @Mapper public interface OcpApiTenantRelMapper extends BaseMapper { - List getOatrList(OcpApiTenantRel ocpApiTenantRel); + List getOatrList(OcpApiTenantRel ocpApiTenantRel); } diff --git a/src/main/java/com/pms/ocp/mapper/OcpTenantAuditMapper.java b/src/main/java/com/pms/ocp/mapper/OcpTenantAuditMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..ac2160595d131d97cd8a6981d1bbec503a7349af --- /dev/null +++ b/src/main/java/com/pms/ocp/mapper/OcpTenantAuditMapper.java @@ -0,0 +1,12 @@ +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 { + List getOtaList(OcpTenantAudit ocpTenantAudit); + + List getOtaListById(OcpTenantAudit ocpTenantAudit); +} diff --git a/src/main/java/com/pms/ocp/mapper/TenantMapper.java b/src/main/java/com/pms/ocp/mapper/TenantMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..c043a2ee0fd89874920374187c12e1671997513d --- /dev/null +++ b/src/main/java/com/pms/ocp/mapper/TenantMapper.java @@ -0,0 +1,22 @@ +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 { + + + /** + * + * @param tenantGroupCompanyCode + * @return + */ + OcpTenantGroup oneTenantGroup(String tenantGroupCompanyCode); + + + List twoTenantGroups(String tenantGroupCompanyPCode); +} diff --git a/src/main/java/com/pms/ocp/model/dto/ModelPropertyDTO.java b/src/main/java/com/pms/ocp/model/dto/ModelPropertyDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..b01ac9d33cb9845f8f8425c368729e128cafbf58 --- /dev/null +++ b/src/main/java/com/pms/ocp/model/dto/ModelPropertyDTO.java @@ -0,0 +1,143 @@ +package com.pms.ocp.model.dto; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.sql.Date; +import java.time.LocalDateTime; + +/** + * @Auther: wangjian + * @Date: 2022/2/22 16:40 + * @Description:模型属性DTO对象 + */ + +@ApiModel(value = "模型属性DTO对象") +@Data +public class ModelPropertyDTO { + + /** + * 模型属性编号 + */ + @ApiModelProperty(value = "模型属性编号") + private String objId; + + /** + * 模型编号 + */ + @ApiModelProperty(value = "模型编号") + private String modelCode; + + /** + * 属性名称 + */ + @ApiModelProperty(value = "属性名称") + private String columnName; + + /** + * 属性编码 + */ + @ApiModelProperty(value = "属性编码") + private String propCode; + + /** + * 属性描述 + */ + @ApiModelProperty(value = "属性描述") + private String columnComments; + + /** + * 数据类型 + */ + @ApiModelProperty(value = "数据类型") + private Integer dataType; + + /** + * 数据长度 + */ + @ApiModelProperty(value = "数据长度") + private Integer dataLength; + + /** + * 数据精度 + */ + @ApiModelProperty(value = "数据精度") + private Integer dataScale; + + /** + * 是否主键 0:否,1:是 + */ + @ApiModelProperty(value = "是否主键 0:否,1:是") + private Integer boolPrimaryKey; + + /** + * 是否必填 0:否,1:是 + */ + @ApiModelProperty(value = "是否必填 0:否,1:是") + private Integer boolRequired; + + /** + * 推广类型 0:统推,1：自建 + */ + @ApiModelProperty(value = "推广类型 0:统推,1：自建") + private String propPromotion; + + /** + * 显示顺序 + */ + @ApiModelProperty(value = "显示顺序") + private Integer propOrderNo; + + /** + * 提交人编号 + */ + @ApiModelProperty(value = "提交人编号") + private String propUserId; + + /** + * 提交人姓名 + */ + @ApiModelProperty(value = "提交人姓名") + private String propUserName; + + /** + * 创建时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiModelProperty(value = "创建时间") + private Date propCtime; + + /** + * 修改时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiModelProperty(value = "修改时间") + private Date propMtime; + +} + +// 字段名称 字段描述 字段类型 允许为NULL 备注 +// prop_id 主键 varchar(42) 否 +// model_id 模型id varchar(42) 否 +// column_name 属性名称 varchar(50) 否 +// column_code 属性编码 varchar(42) 否 +// column_comments 属性描述 varchar(50) 否 +// data_type 数据类型 int4 否 +// data_length 数据长度 int4 是 +// data_scale 数据精度 int4 是 +// is_pk 是否主键 int4 否 0:否,1:是 +// is_required 是否必填 int4 是 0:否,1:是 +// prop_promotion 推广类型 int4 是 0:统推,1：自建 +// company_id 省公司ID varchar(42) 是 +// company_name 省公司名称 varchar(50) 是 +// prop _dispidx 显示顺序 int4 否 +// prop_user_id 提交人id varchar(42) 否 +// prop_user_name 提交人姓名 varchar(64) 否 +// prop_ctime 创建时间 timestamp(6) 否 +// prop_mtime 修改时间 timestamp(6) 否 diff --git a/src/main/java/com/pms/ocp/model/dto/OcpApiGroupDtos.java b/src/main/java/com/pms/ocp/model/dto/OcpApiGroupDtos.java index b18dfaaae98d70d10ecb53141493bafabc7d9e97..84f3f1c70db31b93b96525c18e4f8f24e9d2de62 100644 --- a/src/main/java/com/pms/ocp/model/dto/OcpApiGroupDtos.java +++ b/src/main/java/com/pms/ocp/model/dto/OcpApiGroupDtos.java @@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.sql.Date; import java.sql.Timestamp; @@ -101,6 +102,55 @@ public class OcpApiGroupDtos { @ApiModelProperty("服务版本（最新版本）") private long apiVersion; + + public int getPageSize() { + return pageSize; + } + + public void setPageSize(int pageSize) { + this.pageSize = pageSize; + } + + public int getPageNum() { + return pageNum; + } + + public void setPageNum(int pageNum) { + this.pageNum = pageNum; + } + + public Timestamp getApiGroupCtime() { + return apiGroupCtime; + } + + public void setApiGroupCtime(Timestamp apiGroupCtime) { + this.apiGroupCtime = apiGroupCtime; + } + + public Timestamp getApiGroupMtime() { + return apiGroupMtime; + } + + public void setApiGroupMtime(Timestamp apiGroupMtime) { + this.apiGroupMtime = apiGroupMtime; + } + + public Timestamp getApiCtime() { + return apiCtime; + } + + public void setApiCtime(Timestamp apiCtime) { + this.apiCtime = apiCtime; + } + + public Timestamp getApiMtime() { + return apiMtime; + } + + public void setApiMtime(Timestamp apiMtime) { + this.apiMtime = apiMtime; + } + public String getApiGroupCode() { return apiGroupCode; } @@ -165,21 +215,7 @@ public class OcpApiGroupDtos { this.apiGroupUserName = apiGroupUserName; } - public Timestamp getApiGroupCtime() { - return apiGroupCtime; - } - - public void setApiGroupCtime(Timestamp apiGroupCtime) { - this.apiGroupCtime = apiGroupCtime; - } - public Timestamp getApiGroupMtime() { - return apiGroupMtime; - } - - public void setApiGroupMtime(Timestamp apiGroupMtime) { - this.apiGroupMtime = apiGroupMtime; - } public String getApiGroupPcode() { return apiGroupPcode; @@ -253,21 +289,6 @@ public class OcpApiGroupDtos { this.apiUrl = apiUrl; } - public Timestamp getApiCtime() { - return apiCtime; - } - - public void setApiCtime(Timestamp apiCtime) { - this.apiCtime = apiCtime; - } - - public Timestamp getApiMtime() { - return apiMtime; - } - - public void setApiMtime(Timestamp apiMtime) { - this.apiMtime = apiMtime; - } public String getApiUserId() { return apiUserId; diff --git a/src/main/java/com/pms/ocp/model/dto/OcpTenantGroupDto.java b/src/main/java/com/pms/ocp/model/dto/OcpTenantGroupDto.java new file mode 100644 index 0000000000000000000000000000000000000000..4e1e17c13d2340cd0d5b89ab0ca197d1521bc140 --- /dev/null +++ b/src/main/java/com/pms/ocp/model/dto/OcpTenantGroupDto.java @@ -0,0 +1,48 @@ +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 oneList; + + + @ApiModelProperty("应用管理") + private List twoList; + + @ApiModelProperty("应用层") + private List ThreeList; + + public Set getOneList() { + return oneList; + } + + public void setOneList(Set oneList) { + this.oneList = oneList; + } + + public List getTwoList() { + return twoList; + } + + public void setTwoList(List twoList) { + this.twoList = twoList; + } + + public List getThreeList() { + return ThreeList; + } + + public void setThreeList(List threeList) { + ThreeList = threeList; + } +} diff --git a/src/main/java/com/pms/ocp/model/dto/OneTenanList.java b/src/main/java/com/pms/ocp/model/dto/OneTenanList.java new file mode 100644 index 0000000000000000000000000000000000000000..ed518e521e20723a33fcab235959feef9dd7a5c6 --- /dev/null +++ b/src/main/java/com/pms/ocp/model/dto/OneTenanList.java @@ -0,0 +1,213 @@ +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; + } +} diff --git a/src/main/java/com/pms/ocp/model/dto/ThreeTenanList.java b/src/main/java/com/pms/ocp/model/dto/ThreeTenanList.java new file mode 100644 index 0000000000000000000000000000000000000000..23fbc8f34256fd5deabd702ff24119904edaf649 --- /dev/null +++ b/src/main/java/com/pms/ocp/model/dto/ThreeTenanList.java @@ -0,0 +1,215 @@ +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; + } +} diff --git a/src/main/java/com/pms/ocp/model/dto/TwoTenanList.java b/src/main/java/com/pms/ocp/model/dto/TwoTenanList.java new file mode 100644 index 0000000000000000000000000000000000000000..235991619863c4546561bb9a9d4a6963a47915af --- /dev/null +++ b/src/main/java/com/pms/ocp/model/dto/TwoTenanList.java @@ -0,0 +1,216 @@ +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; + } +} diff --git a/src/main/java/com/pms/ocp/model/entity/ModelProperty.java b/src/main/java/com/pms/ocp/model/entity/ModelProperty.java index ff930b3aaa19fbcbbc26d14abcf8570fd14740b9..afcef546c2e8e72f1426e9048592ca3b9c8c0574 100644 --- a/src/main/java/com/pms/ocp/model/entity/ModelProperty.java +++ b/src/main/java/com/pms/ocp/model/entity/ModelProperty.java @@ -3,9 +3,16 @@ package com.pms.ocp.model.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.AllArgsConstructor; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; +import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; import lombok.Data; -import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; /** * @Auther: wangjian @@ -13,6 +20,7 @@ import lombok.NoArgsConstructor; * @Description:模型属性对象 */ @Data +@Accessors(chain = true) @TableName("ocp_model_prop") public class ModelProperty{ @@ -45,41 +53,39 @@ public class ModelProperty{ /** * 数据类型 */ - private String dataType; + private Integer dataType; /** * 数据长度 */ - private String dataLength; + private Integer dataLength; /** * 数据精度 */ - private String dataScale; + private Integer dataScale; /** * 是否主键 */ @TableField(value = "is_pk") - private String boolPrimaryKey; + private Integer boolPrimaryKey; /** * 是否必填 */ @TableField(value = "is_required") - private String boolRequired; + private Integer boolRequired; /** * 推广类型 */ private String propPromotion; - - /** * 显示顺序 */ - private String propOrderNo; + private Integer propOrderNo; /** * 提交人id @@ -94,14 +100,21 @@ public class ModelProperty{ /** * 创建时间 */ - @TableField(value = "prop_ctime") - private String prop_ctime; + @JsonDeserialize(using = LocalDateTimeDeserializer.class) + @JsonSerialize(using = LocalDateTimeSerializer.class) + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") +// @TableField() +// @TableField(typeHandler = TimestampTypeHandler.class) + private LocalDateTime propCtime; /** * 修改时间 */ - @TableField(value = "prop_mtime") - private String prop_mtime; +// @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") +// @TableField(typeHandler = TimestampTypeHandler.class) + private LocalDateTime propMtime; } // 字段名称 字段描述 字段类型 允许为NULL 备注 diff --git a/src/main/java/com/pms/ocp/model/entity/OcpApiAudit.java b/src/main/java/com/pms/ocp/model/entity/OcpApiAudit.java index 0b36e8271f7c3e810b1f5ffc6ff1c629f5d38909..e5e4a20270aecec0a641143f2153be8cd5933696 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpApiAudit.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpApiAudit.java @@ -115,5 +115,235 @@ public class OcpApiAudit { @ApiModelProperty("服务版本（最新版本）") private long apiVersion; + public String getObjId() { + return objId; + } + public void setObjId(String objId) { + this.objId = objId; + } + + public String getApiCode() { + return apiCode; + } + + public void setApiCode(String apiCode) { + this.apiCode = apiCode; + } + + public long getOperStatus() { + return operStatus; + } + + public void setOperStatus(long operStatus) { + this.operStatus = operStatus; + } + + public long getOperTarget() { + return operTarget; + } + + public void setOperTarget(long operTarget) { + this.operTarget = operTarget; + } + + public long getAuditType() { + return auditType; + } + + public void setAuditType(long auditType) { + this.auditType = auditType; + } + + public String getAuditMessage() { + return auditMessage; + } + + public void setAuditMessage(String auditMessage) { + this.auditMessage = auditMessage; + } + + public String getAuditJson() { + return auditJson; + } + + public void setAuditJson(String auditJson) { + this.auditJson = auditJson; + } + + public String getAuditUserId() { + return auditUserId; + } + + public void setAuditUserId(String auditUserId) { + this.auditUserId = auditUserId; + } + + public String getAuditUserName() { + return auditUserName; + } + + public void setAuditUserName(String auditUserName) { + this.auditUserName = auditUserName; + } + + public Timestamp getAuditCtime() { + return auditCtime; + } + + public void setAuditCtime(Timestamp auditCtime) { + this.auditCtime = auditCtime; + } + + public Timestamp getAuditMtime() { + return auditMtime; + } + + public void setAuditMtime(Timestamp auditMtime) { + this.auditMtime = auditMtime; + } + + public long getIsDelete() { + return isDelete; + } + + public void setIsDelete(long isDelete) { + this.isDelete = isDelete; + } + + public long getApplyVersion() { + return applyVersion; + } + + public void setApplyVersion(long applyVersion) { + this.applyVersion = applyVersion; + } + + public long getPreApiVersion() { + return preApiVersion; + } + + public void setPreApiVersion(long preApiVersion) { + this.preApiVersion = preApiVersion; + } + + public String getApiName() { + return apiName; + } + + public void setApiName(String apiName) { + this.apiName = apiName; + } + + public String getApiGroupCode() { + return apiGroupCode; + } + + public void setApiGroupCode(String apiGroupCode) { + this.apiGroupCode = apiGroupCode; + } + + public long getApiPromotion() { + return apiPromotion; + } + + public void setApiPromotion(long apiPromotion) { + this.apiPromotion = apiPromotion; + } + + public String getApiReq() { + return apiReq; + } + + public void setApiReq(String apiReq) { + this.apiReq = apiReq; + } + + public String getApiResp() { + return apiResp; + } + + public void setApiResp(String apiResp) { + this.apiResp = apiResp; + } + + public String getApiUrl() { + return apiUrl; + } + + public void setApiUrl(String apiUrl) { + this.apiUrl = apiUrl; + } + + public Timestamp getApiCtime() { + return apiCtime; + } + + public void setApiCtime(Timestamp apiCtime) { + this.apiCtime = apiCtime; + } + + public Timestamp getApiMtime() { + return apiMtime; + } + + public void setApiMtime(Timestamp apiMtime) { + this.apiMtime = apiMtime; + } + + public String getApiUserId() { + return apiUserId; + } + + public void setApiUserId(String apiUserId) { + this.apiUserId = apiUserId; + } + + public String getApiUnit() { + return apiUnit; + } + + public void setApiUnit(String apiUnit) { + this.apiUnit = apiUnit; + } + + public String getOwnerCompanyCode() { + return ownerCompanyCode; + } + + public void setOwnerCompanyCode(String ownerCompanyCode) { + this.ownerCompanyCode = ownerCompanyCode; + } + + public String getOwnerCompanyName() { + return ownerCompanyName; + } + + public void setOwnerCompanyName(String ownerCompanyName) { + this.ownerCompanyName = ownerCompanyName; + } + + public long getApiZone() { + return apiZone; + } + + public void setApiZone(long apiZone) { + this.apiZone = apiZone; + } + + public long getApiLayer() { + return apiLayer; + } + + public void setApiLayer(long apiLayer) { + this.apiLayer = apiLayer; + } + + public long getApiVersion() { + return apiVersion; + } + + public void setApiVersion(long apiVersion) { + this.apiVersion = apiVersion; + } } diff --git a/src/main/java/com/pms/ocp/model/entity/OcpApiBase.java b/src/main/java/com/pms/ocp/model/entity/OcpApiBase.java index 0daacadfe6edb5d57e01acb7611b17ca8bf50b08..753f1458ab086447617ec5e31b1b56324b5f66e4 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpApiBase.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpApiBase.java @@ -7,6 +7,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; + +import java.sql.Date; import java.sql.Timestamp; @Data @@ -167,25 +169,23 @@ public class OcpApiBase { } - public Timestamp getApiCtime() { - return apiCtime; - } - - public void setApiCtime(Timestamp apiCtime) { - this.apiCtime = apiCtime; - } - + public Timestamp getApiCtime() { + return apiCtime; + } - public Timestamp getApiMtime() { - return apiMtime; - } + public void setApiCtime(Timestamp apiCtime) { + this.apiCtime = apiCtime; + } - public void setApiMtime(Timestamp apiMtime) { - this.apiMtime = apiMtime; - } + public Timestamp getApiMtime() { + return apiMtime; + } + public void setApiMtime(Timestamp apiMtime) { + this.apiMtime = apiMtime; + } - public String getApiUserId() { + public String getApiUserId() { return apiUserId; } diff --git a/src/main/java/com/pms/ocp/model/entity/OcpApiGroup.java b/src/main/java/com/pms/ocp/model/entity/OcpApiGroup.java index b1579629d6d32245d394ec13f5eecf092592ec67..205eb47aaf0e6f6503677d2b30a76c5a0fb0d565 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpApiGroup.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpApiGroup.java @@ -1,6 +1,7 @@ package com.pms.ocp.model.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; @@ -8,10 +9,11 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; import java.sql.Timestamp; +import java.util.List; @Data @Accessors(chain = true) -@TableName("ocp_api_Group") +@TableName("ocp_api_group") @ApiModel("服务分类表") public class OcpApiGroup { @TableId(type = IdType.ASSIGN_ID) @@ -58,6 +60,7 @@ public class OcpApiGroup { private long apiGroupLevel; + public long getApiGroupLevel() { return apiGroupLevel; } diff --git a/src/main/java/com/pms/ocp/model/entity/OcpApiSubs.java b/src/main/java/com/pms/ocp/model/entity/OcpApiSubs.java index 0685a195fa39a38955d336f22923744426a65077..3e4d512c54712fbd67cea5dcb45aee41bb9fa131 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpApiSubs.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpApiSubs.java @@ -40,6 +40,51 @@ public class OcpApiSubs { @ApiModelProperty("是否删除0-否，1-是") private long isDelete; + @ApiModelProperty("服务接口中文名称") + private String apiName; + + @ApiModelProperty("服务分类代码") + private String apiGroupCode; + + @ApiModelProperty("推广类型0:统建；1:自建") + private long apiPromotion; + + @ApiModelProperty("服务请求体") + private String apiReq; + + @ApiModelProperty("服务返回体") + private String apiResp; + + @ApiModelProperty("服务地址") + private String apiUrl; + + @ApiModelProperty("服务创建时间") + private Timestamp apiCtime; + + @ApiModelProperty("服务修改时间") + private Timestamp apiMtime; + + @ApiModelProperty("创建者用户ID") + private String apiUserId; + + @ApiModelProperty("建设单位") + private String apiUnit; + + @ApiModelProperty("服务所属公司") + private String ownerCompanyCode; + + @ApiModelProperty("服务所属公司") + private String ownerCompanyName; + + @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区") + private long apiZone; + + @ApiModelProperty("'所属层级 1:应用层;2:平台层;3:网络层;4:感知层;") + private long apiLayer; + + @ApiModelProperty("服务版本（最新版本）") + private long apiVersion; + public String getObjId() { return objId; } @@ -96,8 +141,131 @@ public class OcpApiSubs { this.subsCompanyCode = subsCompanyCode; } + public long getIsDelete() { + return isDelete; + } + public void setIsDelete(long isDelete) { this.isDelete = isDelete; } + public String getApiName() { + return apiName; + } + + public void setApiName(String apiName) { + this.apiName = apiName; + } + + public String getApiGroupCode() { + return apiGroupCode; + } + + public void setApiGroupCode(String apiGroupCode) { + this.apiGroupCode = apiGroupCode; + } + + public long getApiPromotion() { + return apiPromotion; + } + + public void setApiPromotion(long apiPromotion) { + this.apiPromotion = apiPromotion; + } + + public String getApiReq() { + return apiReq; + } + + public void setApiReq(String apiReq) { + this.apiReq = apiReq; + } + + public String getApiResp() { + return apiResp; + } + + public void setApiResp(String apiResp) { + this.apiResp = apiResp; + } + + public String getApiUrl() { + return apiUrl; + } + + public void setApiUrl(String apiUrl) { + this.apiUrl = apiUrl; + } + + public Timestamp getApiCtime() { + return apiCtime; + } + + public void setApiCtime(Timestamp apiCtime) { + this.apiCtime = apiCtime; + } + + public Timestamp getApiMtime() { + return apiMtime; + } + + public void setApiMtime(Timestamp apiMtime) { + this.apiMtime = apiMtime; + } + + public String getApiUserId() { + return apiUserId; + } + + public void setApiUserId(String apiUserId) { + this.apiUserId = apiUserId; + } + + public String getApiUnit() { + return apiUnit; + } + + public void setApiUnit(String apiUnit) { + this.apiUnit = apiUnit; + } + + public String getOwnerCompanyCode() { + return ownerCompanyCode; + } + + public void setOwnerCompanyCode(String ownerCompanyCode) { + this.ownerCompanyCode = ownerCompanyCode; + } + + public String getOwnerCompanyName() { + return ownerCompanyName; + } + + public void setOwnerCompanyName(String ownerCompanyName) { + this.ownerCompanyName = ownerCompanyName; + } + + public long getApiZone() { + return apiZone; + } + + public void setApiZone(long apiZone) { + this.apiZone = apiZone; + } + + public long getApiLayer() { + return apiLayer; + } + + public void setApiLayer(long apiLayer) { + this.apiLayer = apiLayer; + } + + public long getApiVersion() { + return apiVersion; + } + + public void setApiVersion(long apiVersion) { + this.apiVersion = apiVersion; + } } diff --git a/src/main/java/com/pms/ocp/model/entity/OcpApiTenantRel.java b/src/main/java/com/pms/ocp/model/entity/OcpApiTenantRel.java index 072478dd110a0c1d74be47f4f395f18629522bb1..0455acc9afb840b74f85816dd2031ac0ec1d20d7 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpApiTenantRel.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpApiTenantRel.java @@ -11,7 +11,7 @@ import java.sql.Timestamp; @Data @Accessors(chain = true) -@TableName("ocp_api_Tenant_rel") + @ApiModel("服务应用关系表") public class OcpApiTenantRel { diff --git a/src/main/java/com/pms/ocp/model/entity/OcpTenantGroup.java b/src/main/java/com/pms/ocp/model/entity/OcpTenantGroup.java index 7d3cde1b0c73d379aa933fd28a07250ae0eeb780..67257e9e03f602f49f34ce028a5e0dca54ed8394 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpTenantGroup.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpTenantGroup.java @@ -1,6 +1,7 @@ package com.pms.ocp.model.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; @@ -10,6 +11,7 @@ import lombok.experimental.Accessors; import java.io.Serializable; import java.util.Date; +import java.util.List; /** * 应用分类表 @@ -105,6 +107,12 @@ public class OcpTenantGroup implements Serializable { @ApiModelProperty("应用树层级 1:应用分组层 2:应用层") private Short tenantGroupLevel; + + + public static long getSerialVersionUID() { + return serialVersionUID; + } + private static final long serialVersionUID = 1L; /** diff --git a/src/main/java/com/pms/ocp/service/ModelPropertyService.java b/src/main/java/com/pms/ocp/service/ModelPropertyService.java index df9e737230d9fbe29f2b02a81d457ada6a36e0c5..c82dd3e63c52644d206f582507801b478f7007e7 100644 --- a/src/main/java/com/pms/ocp/service/ModelPropertyService.java +++ b/src/main/java/com/pms/ocp/service/ModelPropertyService.java @@ -1,6 +1,8 @@ package com.pms.ocp.service; +import com.pms.ocp.model.dto.ModelPropertyDTO; import com.pms.ocp.model.entity.ModelProperty; +import io.swagger.models.auth.In; import java.util.List; @@ -14,26 +16,34 @@ public interface ModelPropertyService { /** * 创建模型属性 * - * @param modelProperty + * @param modelPropertyDTO * @return */ - Integer createModelProperty(ModelProperty modelProperty); + Integer createModelProperty(ModelPropertyDTO modelPropertyDTO); /** * 删除模型属性 * - * @param modelId + * @param modelCode * @return */ - Integer deleteModelProperty(String modelId); + Integer deleteModelProperty(String modelCode, String propCode); + + /** + * 批量删除模型属性 + * + * @param ids + * @return + */ + Integer deletePatchModelProperty(List ids); /** * 更新模型属性 * - * @param modelProperty + * @param modelPropertyDTO * @return */ - Integer updateModelProperty(ModelProperty modelProperty); + Integer updateModelProperty(ModelPropertyDTO modelPropertyDTO); /** * 获取模型属性 @@ -41,7 +51,7 @@ public interface ModelPropertyService { * @param * @return */ - List getModelPropertyList(); + List listModelProperty(String objId, String modelCode, String propCode); /** * 获取模型属性列表 @@ -49,5 +59,5 @@ public interface ModelPropertyService { * @param * @return */ - List getModelProperty(); + ModelPropertyDTO getModelProperty(); } diff --git a/src/main/java/com/pms/ocp/service/OcpApiAuditService.java b/src/main/java/com/pms/ocp/service/OcpApiAuditService.java index 8983669b032b556d805c86b0c18f90c5c8515b63..34782816d2d1452c4e0ce232952fe6ccd301d00d 100644 --- a/src/main/java/com/pms/ocp/service/OcpApiAuditService.java +++ b/src/main/java/com/pms/ocp/service/OcpApiAuditService.java @@ -12,8 +12,6 @@ public interface OcpApiAuditService { ResponseVO getOcpApiDetails(String objId); -// ResponseVO getOcpApiList(Oaa oaa); - ResponseVO OaaById(OcpApiAudit ocpApiAudit); ResponseVO sById(OcpApiAudit ocpApiAudit); diff --git a/src/main/java/com/pms/ocp/service/OcpTenantAuditService.java b/src/main/java/com/pms/ocp/service/OcpTenantAuditService.java new file mode 100644 index 0000000000000000000000000000000000000000..8ecc26762f1e8bf303737946311b0fbf73f8912c --- /dev/null +++ b/src/main/java/com/pms/ocp/service/OcpTenantAuditService.java @@ -0,0 +1,10 @@ +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); +} diff --git a/src/main/java/com/pms/ocp/service/TenantService.java b/src/main/java/com/pms/ocp/service/TenantService.java new file mode 100644 index 0000000000000000000000000000000000000000..73a52d2b3a7450b88676df281870c2c6ba9e2e37 --- /dev/null +++ b/src/main/java/com/pms/ocp/service/TenantService.java @@ -0,0 +1,29 @@ +package com.pms.ocp.service; + +import com.baomidou.mybatisplus.extension.service.IService; + +import com.pms.ocp.model.dto.OcpTenantGroupDto; +import com.pms.ocp.model.entity.OcpTenantGroup; + +import java.util.List; + +public interface TenantService extends IService { + /** + * 应用树分类管理 + * @return + */ + + + + + OcpTenantGroupDto getTree(); + + /** + * 应用新增 + * @param ocpTenantGroup + * @return + */ + boolean getTenanInster(OcpTenantGroup ocpTenantGroup); + + +} diff --git a/src/main/java/com/pms/ocp/service/impl/ModelPropertyServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ModelPropertyServiceImpl.java index 1b85388bfb757bc01a88ee793c6d5397749555ee..0c4403f0814462051e12d64dd911d022e7e83781 100644 --- a/src/main/java/com/pms/ocp/service/impl/ModelPropertyServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ModelPropertyServiceImpl.java @@ -1,10 +1,19 @@ package com.pms.ocp.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.pms.ocp.mapper.ModelPropertyMapper; +import com.pms.ocp.model.dto.ModelPropertyDTO; import com.pms.ocp.model.entity.ModelProperty; import com.pms.ocp.service.ModelPropertyService; +import io.swagger.models.auth.In; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.sql.Date; +import java.time.LocalDateTime; import java.util.List; /** @@ -16,26 +25,73 @@ import java.util.List; @Service public class ModelPropertyServiceImpl implements ModelPropertyService { -// @Autowired + @Autowired + private ModelPropertyMapper modelPropertyMapper; @Override - public Integer createModelProperty(ModelProperty modelProperty) { - return null; + public Integer createModelProperty(ModelPropertyDTO modelPropertyDTO) { + + ModelProperty modelProperty = new ModelProperty(); + + BeanUtils.copyProperties(modelPropertyDTO, modelProperty); + + modelProperty.setPropCtime(LocalDateTime.now()); + return modelPropertyMapper.insert(modelProperty); } @Override - public Integer deleteModelProperty(String modelId) { - return null; + public Integer deleteModelProperty(String modelCode, String propCode) { + QueryWrapper queryWrapper = new QueryWrapper(); + + if (StringUtils.isNotEmpty(modelCode)) { + queryWrapper.lambda().eq(ModelProperty::getModelCode, modelCode); + } + + if (StringUtils.isNotEmpty(propCode)) { + queryWrapper.lambda().eq(ModelProperty::getPropCode, propCode); + } + return modelPropertyMapper.delete(queryWrapper); } @Override - public Integer updateModelProperty(ModelProperty modelProperty) { - return null; + public Integer deletePatchModelProperty(List ids) { + return modelPropertyMapper.deleteBatchIds(ids); } @Override - public List getModelPropertyList() { - return null; + public Integer updateModelProperty(ModelPropertyDTO modelPropertyDTO) { + + ModelProperty modelProperty = new ModelProperty(); + + BeanUtils.copyProperties(modelPropertyDTO, modelProperty); + + modelProperty.setPropMtime(LocalDateTime.now()); + + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + + updateWrapper.lambda().eq(ModelProperty::getObjId, modelProperty.getObjId()); + + return modelPropertyMapper.update(modelProperty, updateWrapper); + } + + @Override + public List listModelProperty(String objId, String modelCode, String propCode) { + + QueryWrapper queryWrapper = new QueryWrapper(); + + if (StringUtils.isNotEmpty(objId)) { + queryWrapper.lambda().eq(ModelProperty::getObjId, objId); + } + + if (StringUtils.isNotEmpty(modelCode)) { + queryWrapper.lambda().eq(ModelProperty::getModelCode, modelCode); + } + + if (StringUtils.isNotEmpty(propCode)) { + queryWrapper.lambda().eq(ModelProperty::getPropCode, propCode); + } + + return modelPropertyMapper.selectList(queryWrapper); } /** @@ -44,7 +100,7 @@ public class ModelPropertyServiceImpl implements ModelPropertyService { * @return */ @Override - public List getModelProperty() { + public ModelPropertyDTO getModelProperty() { QueryWrapper wrapper = new QueryWrapper<>(); return null; } diff --git a/src/main/java/com/pms/ocp/service/impl/OcpApiAuditServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpApiAuditServiceImpl.java index a070965ac532a0af51a932b284ec212bb348ddf8..654b83db166ca058a0b4ad928a772e8fee3f0f9f 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiAuditServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpApiAuditServiceImpl.java @@ -3,6 +3,7 @@ package com.pms.ocp.service.impl; import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pms.ocp.common.constants.AnalysisConstant; import com.pms.ocp.common.constants.ExportUtils; import com.pms.ocp.mapper.OcpApiAuditMapper; @@ -19,19 +20,15 @@ import javax.servlet.http.HttpServletResponse; import java.util.List; @Service -public class OcpApiAuditServiceImpl implements OcpApiAuditService { +public class OcpApiAuditServiceImpl extends ServiceImpl implements OcpApiAuditService { @Autowired private OcpApiAuditMapper ocpApiAuditMapper; @Override public ResponseVO getOcpApiAuditList(OcpApiAudit ocpApiAudit) { - List ocpApiAuditList = ocpApiAuditMapper.getOcpApiSubsList(ocpApiAudit); - if(CollectionUtils.isEmpty(ocpApiAuditList)){ - return ResponseVO.error("查询列表为空"); - }else{ - return ResponseVO.ok(ocpApiAuditList); - } + List ocpApiAuditList = ocpApiAuditMapper.getOcpApiSubsList(ocpApiAudit); + return ResponseVO.ok(ocpApiAuditList); } @@ -49,7 +46,7 @@ public class OcpApiAuditServiceImpl implements OcpApiAuditService { @Override public ResponseVO sById(OcpApiAudit ocpApiAudit) { - List oaaById = ocpApiAuditMapper.sById(ocpApiAudit); + List oaaById = ocpApiAuditMapper.sById(ocpApiAudit); return ResponseVO.ok(oaaById); } diff --git a/src/main/java/com/pms/ocp/service/impl/OcpApiModelRelServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpApiModelRelServiceImpl.java index 0faa367c6e7e5dacdc56544201d15d22353a5db8..118a294d3bab2f977c134a8d14d2329c13ee4599 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiModelRelServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpApiModelRelServiceImpl.java @@ -1,5 +1,6 @@ package com.pms.ocp.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pms.ocp.mapper.OcpApiModelRelMapper; import com.pms.ocp.model.entity.OcpApiModelRel; import com.pms.ocp.model.vo.ResponseVO; @@ -10,12 +11,12 @@ import org.springframework.stereotype.Service; import java.util.List; @Service -public class OcpApiModelRelServiceImpl implements OcpApiModelRelService { +public class OcpApiModelRelServiceImpl extends ServiceImpl implements OcpApiModelRelService { @Autowired private OcpApiModelRelMapper ocpApiModelRelMapper; @Override public ResponseVO getOamrList(OcpApiModelRel ocpApiModelRel) { - List ocpApiModelRelList = ocpApiModelRelMapper.getOamrList(ocpApiModelRel); + List ocpApiModelRelList = ocpApiModelRelMapper.getOamrList(ocpApiModelRel); return ResponseVO.ok(ocpApiModelRelList); } } diff --git a/src/main/java/com/pms/ocp/service/impl/OcpApiSubsServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpApiSubsServiceImpl.java index 8b37950c62f7e4718e29772ee36fd2be04a7fecc..e6b4f4d8376f7afc3781cd2dbd54d12619e09900 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiSubsServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpApiSubsServiceImpl.java @@ -14,18 +14,13 @@ import org.springframework.util.CollectionUtils; import java.util.List; @Service -public class OcpApiSubsServiceImpl implements OcpApiSubsService { +public class OcpApiSubsServiceImpl extends ServiceImpl implements OcpApiSubsService { @Autowired private OcpApiSubsMapper ocpApiSubsMapper; @Override public ResponseVO getOcpApiSubsList(OcpApiSubs ocpApiSubs) { - List ocpApiSubsList = ocpApiSubsMapper.getOcpApisList(ocpApiSubs); - QueryWrapper qw = new QueryWrapper(); - if(CollectionUtils.isEmpty(ocpApiSubsList)){ - return ResponseVO.error("查询列表为空"); - }else{ - return ResponseVO.ok(ocpApiSubsList); - } + List ocpApiSubsList = ocpApiSubsMapper.getOcpApisList(ocpApiSubs); + return ResponseVO.ok(ocpApiSubsList); } } diff --git a/src/main/java/com/pms/ocp/service/impl/OcpApiTenantRelServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpApiTenantRelServiceImpl.java index ac4edbdc81dea28917b153a0eca6ffce55d934a4..0e5b9a9d92fe338cd79f2542294ce9333060ea99 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiTenantRelServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpApiTenantRelServiceImpl.java @@ -1,5 +1,6 @@ package com.pms.ocp.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pms.ocp.mapper.OcpApiTenantRelMapper; import com.pms.ocp.model.entity.OcpApiTenantRel; import com.pms.ocp.model.vo.ResponseVO; @@ -11,14 +12,14 @@ import java.util.List; @Service -public class OcpApiTenantRelServiceImpl implements OcpApiTenantRelService { +public class OcpApiTenantRelServiceImpl extends ServiceImpl implements OcpApiTenantRelService { @Autowired private OcpApiTenantRelMapper ocpApiTenantRelMapper; @Override public ResponseVO getOatrList(OcpApiTenantRel ocpApiTenantRel) { - List oatrList = ocpApiTenantRelMapper.getOatrList(ocpApiTenantRel); + List oatrList = ocpApiTenantRelMapper.getOatrList(ocpApiTenantRel); return ResponseVO.ok(oatrList); } } diff --git a/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java index f7ffe16c3a9e30652c2331e76f09dd9f76af7563..f74bcf60cb537fadc7cbeb27009549b7b137bac8 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java @@ -1,26 +1,25 @@ package com.pms.ocp.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.api.R; + import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pms.ocp.common.config.PageParam; + import com.pms.ocp.common.utils.RandomStringUtil; import com.pms.ocp.mapper.OcpApiBaseMapper; import com.pms.ocp.mapper.OcpApiTreeMapper; import com.pms.ocp.model.dto.*; import com.pms.ocp.model.entity.OcpApiBase; import com.pms.ocp.model.entity.OcpApiGroup; -import com.pms.ocp.model.vo.ResponseVO; + import com.pms.ocp.service.OcpApiTreeService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.sql.Date; import java.sql.Timestamp; import java.util.ArrayList; import java.util.List; @@ -172,6 +171,7 @@ public class OcpApiTreeServiceImpl extends ServiceImpl implements OcpTenantAuditService { + @Autowired + private OcpTenantAuditMapper ocpTenantAuditMapper; + + @Override + public ResponseVO getOtaList(OcpTenantAudit ocpTenantAudit) { + List otaList = ocpTenantAuditMapper.getOtaList(ocpTenantAudit); + return ResponseVO.ok(otaList); + } + + @Override + public ResponseVO getOtaListById(OcpTenantAudit ocpTenantAudit) { + List otaListById = ocpTenantAuditMapper.getOtaListById(ocpTenantAudit); + return ResponseVO.ok(otaListById); + } +} diff --git a/src/main/java/com/pms/ocp/service/impl/OcpTenantBaseServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpTenantBaseServiceImpl.java index d9520d63ab4ca6c70f2c5d9eac0dc8d247e003bc..ad52d3a7d50ccfd906225e1fffba2e5a064bb3f4 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpTenantBaseServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpTenantBaseServiceImpl.java @@ -1,5 +1,6 @@ package com.pms.ocp.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pms.ocp.mapper.OcpTenantBaseMapper; import com.pms.ocp.model.entity.OcpTenantBase; import com.pms.ocp.model.vo.ResponseVO; @@ -10,7 +11,7 @@ import org.springframework.stereotype.Service; import java.util.List; @Service -public class OcpTenantBaseServiceImpl implements OcpTenantBaseService { +public class OcpTenantBaseServiceImpl extends ServiceImpl implements OcpTenantBaseService { @Autowired private OcpTenantBaseMapper ocpTenantBaseMapper; @Override diff --git a/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..4c18d3f944479d941a533f15944b427ddae169ca --- /dev/null +++ b/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java @@ -0,0 +1,120 @@ +package com.pms.ocp.service.impl; + + +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.pms.ocp.common.utils.RandomStringUtil; +import com.pms.ocp.mapper.TenantMapper; +import com.pms.ocp.model.dto.OcpTenantGroupDto; +import com.pms.ocp.model.dto.OneTenanList; +import com.pms.ocp.model.dto.ThreeTenanList; +import com.pms.ocp.model.dto.TwoTenanList; +import com.pms.ocp.model.entity.OcpTenantGroup; +import com.pms.ocp.service.TenantService; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.stereotype.Service; + +import java.util.*; +import java.util.stream.Collectors; + +@Service +public class TenantServiceImpl extends ServiceImpl implements TenantService { + + + @Autowired + private TenantMapper tenantMapper; + + /** + * 应用树分类管理 + * + * @return + */ + @Override + public OcpTenantGroupDto getTree() { + List ocpTenantGroups = tenantMapper.selectList(null); + + //返回参数集合 + OcpTenantGroupDto ocpTenantGroupDto = new OcpTenantGroupDto(); + //顶级目录 + Set stringSet = new HashSet<>(); + + for (OcpTenantGroup ocpTenantGroup : ocpTenantGroups) { + String tenantGroupCompanyCode = ocpTenantGroup.getTenantGroupCompanyCode(); + stringSet.add(tenantGroupCompanyCode); + } + + List tenanLists = twoTenanTree(ocpTenantGroups,stringSet); + List threeTenanLists = ThreeTenanTree(ocpTenantGroups,tenanLists); + ocpTenantGroupDto.setOneList(stringSet); + ocpTenantGroupDto.setTwoList(tenanLists); + ocpTenantGroupDto.setThreeList(threeTenanLists); + + + return ocpTenantGroupDto; + } + + private List ThreeTenanTree(List ocpTenantGroups, List tenanLists) { + //三级应用详情 + List 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 twoTenanTree(List ocpTenantGroups, Set stringSet) { + //一级数据集合 + List twoTenanLists = new ArrayList<>(); + for (String code : stringSet) { + for (OcpTenantGroup ocpTenantGroup : ocpTenantGroups) { + TwoTenanList twoTenanList = new TwoTenanList(); + if (code.equals(ocpTenantGroup.getTenantGroupCompanyCode()) &&ocpTenantGroup.getTenantGroupLevel() == 1){ + BeanUtils.copyProperties(ocpTenantGroup,twoTenanList); + twoTenanLists.add(twoTenanList); + } + } + } + return twoTenanLists; + } + + + /** + * 应用新增 + * + * @param ocpTenantGroup + * @return + */ + @Override + public boolean getTenanInster(OcpTenantGroup ocpTenantGroup) { + boolean falg = true; + + OcpTenantGroup group = new OcpTenantGroup(); + String tenantGroupCode = ocpTenantGroup.getTenantGroupCode(); + List ocpTenantGroups = tenantMapper.selectList(null); + for (OcpTenantGroup tenantGroup : ocpTenantGroups) { + if (tenantGroup.getTenantGroupCode().equals(tenantGroupCode)){ + falg = false; + break; + } + } + group.setTenantGroupCode(RandomStringUtil.getRandomString(6)); + tenantMapper.insert(ocpTenantGroup); + return falg; + } + +} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 7809dcba1700fa2789dccdfd1029112512af641f..9a47390d9617aabc3e54bfc2a15aa9f3adfa1936 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -13,13 +13,20 @@ knife4j: enable: true mybatis-plus: + global-config: + #字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断" + field-strategy: 0 mapper-locations: classpath:/mapper/*.xml configuration: - # log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl + # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 是否开启自动驼峰命名规则 map-underscore-to-camel-case: true + #指定自定义 Handler 所在的包位置 + type-handlers-package: com.pms.ocp.common.handler + + logging: level: com.pms.ocp.mapper: debug diff --git a/src/main/resources/mapper/OcpApiAuditMapper.xml b/src/main/resources/mapper/OcpApiAuditMapper.xml index 2685ce3498a5b6fed1019e84ce5acf6162ea7345..2d9c4e6179461b7ab95a92b8321a25745eb52227 100644 --- a/src/main/resources/mapper/OcpApiAuditMapper.xml +++ b/src/main/resources/mapper/OcpApiAuditMapper.xml @@ -6,14 +6,14 @@ select * from ocp_api_audit oaa LEFT JOIN ocp_api_base oab on oaa.api_code = oab.api_code - where oaa.obj_id = '1' + where oaa.obj_id = #{objId} - select * from ocp_api_audit - select * from ocp_api_audit where obj_id = #{objId} \ No newline at end of file diff --git a/src/main/resources/mapper/OcpApiModelRelMapper.xml b/src/main/resources/mapper/OcpApiModelRelMapper.xml index b843637fdc5832d74beb1023435cfe876ceda7bd..d8343b4dbc5851f279f660ac4ab4c1ce94c54bd9 100644 --- a/src/main/resources/mapper/OcpApiModelRelMapper.xml +++ b/src/main/resources/mapper/OcpApiModelRelMapper.xml @@ -2,7 +2,7 @@ - select * from ocp_api_model_rel oamr LEFT JOIN ocp_model_base omb on oamr.model_code = omb.model_code diff --git a/src/main/resources/mapper/OcpApiSubsMapper.xml b/src/main/resources/mapper/OcpApiSubsMapper.xml index d3895ae6b4d42b9cb03c1ff94b65b014a6b9aa13..07da0a99f50b80215f5c3f8ff93dd19b64b58047 100644 --- a/src/main/resources/mapper/OcpApiSubsMapper.xml +++ b/src/main/resources/mapper/OcpApiSubsMapper.xml @@ -4,7 +4,7 @@ - SELECT * from ocp_api_subs oas left JOIN ocp_api_base oab on oas.api_code = oab.api_code diff --git a/src/main/resources/mapper/OcpApiTenantRelMapper.xml b/src/main/resources/mapper/OcpApiTenantRelMapper.xml index 927727a05c7e6763dbb847b10a30d0ec257313d9..d74e7c047b638259e122d81aeb21c9c485be2847 100644 --- a/src/main/resources/mapper/OcpApiTenantRelMapper.xml +++ b/src/main/resources/mapper/OcpApiTenantRelMapper.xml @@ -2,7 +2,7 @@ - SELECT * from ocp_api_tenant_rel oa LEFT JOIN ocp_api_base ab on oa.api_code = ab.api_code INNER JOIN diff --git a/src/main/resources/mapper/OcpTenantAuditMapper.xml b/src/main/resources/mapper/OcpTenantAuditMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..010d6c60b85de4a7a2d66198593c4a92a32bf655 --- /dev/null +++ b/src/main/resources/mapper/OcpTenantAuditMapper.xml @@ -0,0 +1,11 @@ + + + + + + + \ No newline at end of file