diff --git a/src/main/java/com/pms/ocp/OcpApplication.java b/src/main/java/com/pms/ocp/OcpApplication.java index 9884e645e18bb485697c2881e18ef8edd36cd483..d964a525d8f1d2a16d891d91a3cf0e2157d98be1 100644 --- a/src/main/java/com/pms/ocp/OcpApplication.java +++ b/src/main/java/com/pms/ocp/OcpApplication.java @@ -8,6 +8,7 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.context.properties.ConfigurationPropertiesScan; import org.springframework.context.annotation.Bean; +import springfox.documentation.oas.annotations.EnableOpenApi; import java.util.TimeZone; @@ -20,7 +21,7 @@ import java.util.TimeZone; @SpringBootApplication @MapperScan(basePackages = {"com.pms.ocp.mapper"}) @ConfigurationPropertiesScan -//@EnableScheduling +@EnableOpenApi public class OcpApplication { public static void main(String[] args) { TimeZone.setDefault(TimeZone.getTimeZone("GMT+8")); diff --git a/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java b/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java new file mode 100644 index 0000000000000000000000000000000000000000..e1103db6f25a1b217c65064a0e01ffbe36302978 --- /dev/null +++ b/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java @@ -0,0 +1,73 @@ +package com.pms.ocp.controller; + + +import com.pms.ocp.model.dto.ApiParamDTO; +import com.pms.ocp.model.dto.ApiTreeGroupDto; +import com.pms.ocp.model.dto.OcpApiGroupDtos; +import com.pms.ocp.model.entity.OcpApiGroup; +import com.pms.ocp.model.vo.ResponseVO; +import com.pms.ocp.service.OcpApiTreeService; +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-group/v1") +@RestController +@Api(tags = "服务树管理接口") +public class OcpApiTreeController { + + + @Autowired + private OcpApiTreeService service; + + /** + * 服务树分类 + * @return + */ + @GetMapping("/getTree") + @ApiOperation("服务树分类") + public ApiTreeGroupDto getTree(){ + ApiTreeGroupDto byGroup = service.getByGroup(); + return byGroup; + } + + + @PostMapping("/instertree") + @ApiOperation("服务树分类--新增") + public ResponseVO inseter(@RequestBody OcpApiGroupDtos ocpApiGroupDtos){ + service.insertTree(ocpApiGroupDtos); + return ResponseVO.ok(); + } + @PostMapping("/updatatree") + @ApiOperation("服务树分类--修改") + public ResponseVO updataTree(@RequestBody OcpApiGroup ocpApiGroup){ + service.updataOcpTree(ocpApiGroup); + return ResponseVO.ok(); + } + @PostMapping("/deletetree") + @ApiOperation("服务树分类--删除") + public ResponseVO deleteTree(@RequestBody OcpApiGroup ocpApiGroup){ + boolean tree = service.deleteOcpTree(ocpApiGroup); + if (tree){ + return ResponseVO.ok(); + }else { + return ResponseVO.error("请先删除下级目录"); + } + + } + + + + + + + + +} diff --git a/src/main/java/com/pms/ocp/mapper/OcpApiBaseMapper.java b/src/main/java/com/pms/ocp/mapper/OcpApiBaseMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..3eda789de85a02bc09c0aebb4a1eaa644c97db0b --- /dev/null +++ b/src/main/java/com/pms/ocp/mapper/OcpApiBaseMapper.java @@ -0,0 +1,9 @@ +package com.pms.ocp.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.pms.ocp.model.entity.OcpApiBase; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface OcpApiBaseMapper extends BaseMapper { +} diff --git a/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java b/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..1ae0c02458477b6d6eaff4e87cc75a86dff48f3f --- /dev/null +++ b/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java @@ -0,0 +1,17 @@ +package com.pms.ocp.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import com.pms.ocp.model.dto.ApiTreeGroupDto; +import com.pms.ocp.model.entity.OcpApiGroup; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + + +@Mapper +public interface OcpApiTreeMapper extends BaseMapper { + +} diff --git a/src/main/java/com/pms/ocp/model/dto/ApiTreeGroupDto.java b/src/main/java/com/pms/ocp/model/dto/ApiTreeGroupDto.java new file mode 100644 index 0000000000000000000000000000000000000000..9af0c883631a8848aa2bf59d47afdc4eb2c36612 --- /dev/null +++ b/src/main/java/com/pms/ocp/model/dto/ApiTreeGroupDto.java @@ -0,0 +1,46 @@ +package com.pms.ocp.model.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@ApiModel(value = "服务树返回参数") +@Data +public class ApiTreeGroupDto { + + @ApiModelProperty("一级") + private List oneupList; + + + @ApiModelProperty("二级") + private List twoList; + + @ApiModelProperty("三级") + private List ThreeList; + + public List getOneupList() { + return oneupList; + } + + public void setOneupList(List oneupList) { + this.oneupList = oneupList; + } + + 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/OcpApiGroupDtos.java b/src/main/java/com/pms/ocp/model/dto/OcpApiGroupDtos.java new file mode 100644 index 0000000000000000000000000000000000000000..3ffc15e17c477b8f7bd3309a3aad33ecf14e9b27 --- /dev/null +++ b/src/main/java/com/pms/ocp/model/dto/OcpApiGroupDtos.java @@ -0,0 +1,73 @@ +package com.pms.ocp.model.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.sql.Timestamp; + + + + +@ApiModel(value = "服务分类新增关系dto") +@Data +public class OcpApiGroupDtos { + + + @ApiModelProperty("主键ID") + private String objId; + + @ApiModelProperty("分类编码") + private String apiGroupCode; + + @ApiModelProperty("分类名称") + private String apiGroupName; + + @ApiModelProperty("推广类型0统推，1自建") + private long apiGroupPromotionType; + + @ApiModelProperty("提交人id") + private String apiGroupUserId; + + @ApiModelProperty("提交人姓名") + private String apiGroupUserName; + + @ApiModelProperty("创建时间") + private Timestamp apiGroupCtime; + + + @ApiModelProperty("修改时间") + private Timestamp apiGroupMtime; + @ApiModelProperty("分类版本") + private String apiGroupVersion; + + @ApiModelProperty("显示顺序") + private long apiGroupOrderNo; + + @ApiModelProperty("上级code") + private String apiGroupPcode; + @ApiModelProperty("服务请求体") + private String apiReq; + + @ApiModelProperty("服务返回体") + private String apiResp; + + @ApiModelProperty("服务地址") + private String apiUrl; + + @ApiModelProperty("建设单位") + private String apiUnit; + + @ApiModelProperty("服务所属公司") + private String ownerCompanyCode; + + @ApiModelProperty("服务所属公司") + private String ownerCompanyName; + + @ApiModelProperty("分类所属公司") + private String apiGroupCompanyCode; + + @ApiModelProperty("是否删除0-否1-是") + private long isDelete; + +} diff --git a/src/main/java/com/pms/ocp/model/dto/OneTreeUpList.java b/src/main/java/com/pms/ocp/model/dto/OneTreeUpList.java new file mode 100644 index 0000000000000000000000000000000000000000..731ed9b7f782fb4bd87dbe78cd60e15e73fb54ca --- /dev/null +++ b/src/main/java/com/pms/ocp/model/dto/OneTreeUpList.java @@ -0,0 +1,212 @@ +package com.pms.ocp.model.dto; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.pms.ocp.model.entity.OcpApiGroup; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.sql.Timestamp; +import java.util.List; + + +@EqualsAndHashCode(callSuper=false) +@ApiModel(value = "服务树一级目录") +@Data +public class OneTreeUpList{ + + + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty("主键ID") + private String objId; + + @ApiModelProperty("分类编码") + private String apiGroupCode; + + @ApiModelProperty("分类名称") + private String apiGroupName; + + @ApiModelProperty("推广类型0统推，1自建") + private long apiGroupPromotionType; + + @ApiModelProperty("分类所属公司") + private String apiGroupCompanyCode; + + @ApiModelProperty("分类版本") + private String apiGroupVersion; + + @ApiModelProperty("显示顺序") + private long apiGroupOrderNo; + + @ApiModelProperty("提交人id") + private String apiGroupUserId; + + @ApiModelProperty("提交人姓名") + private String apiGroupUserName; + + @ApiModelProperty("创建时间") + private Timestamp apiGroupCtime; + + @ApiModelProperty("修改时间") + private Timestamp apiGroupMtime; + + @ApiModelProperty("上级code") + private String apiGroupPcode; + + @ApiModelProperty("是否删除0-否1-是") + private long isDelete; + + + public String getObjId() { + return objId; + } + + public void setObjId(String objId) { + this.objId = objId; + } + + + public String getApiGroupCode() { + return apiGroupCode; + } + + public void setApiGroupCode(String apiGroupCode) { + this.apiGroupCode = apiGroupCode; + } + + + public String getApiGroupName() { + return apiGroupName; + } + + public void setApiGroupName(String apiGroupName) { + this.apiGroupName = apiGroupName; + } + + + public long getApiGroupPromotionType() { + return apiGroupPromotionType; + } + + public void setApiGroupPromotionType(long apiGroupPromotionType) { + this.apiGroupPromotionType = apiGroupPromotionType; + } + + + public String getApiGroupCompanyCode() { + return apiGroupCompanyCode; + } + + public void setApiGroupCompanyCode(String apiGroupCompanyCode) { + this.apiGroupCompanyCode = apiGroupCompanyCode; + } + + + public String getApiGroupVersion() { + return apiGroupVersion; + } + + public void setApiGroupVersion(String apiGroupVersion) { + this.apiGroupVersion = apiGroupVersion; + } + + + public long getApiGroupOrderNo() { + return apiGroupOrderNo; + } + + public void setApiGroupOrderNo(long apiGroupOrderNo) { + this.apiGroupOrderNo = apiGroupOrderNo; + } + + + public String getApiGroupUserId() { + return apiGroupUserId; + } + + public void setApiGroupUserId(String apiGroupUserId) { + this.apiGroupUserId = apiGroupUserId; + } + + + public String getApiGroupUserName() { + return apiGroupUserName; + } + + public void setApiGroupUserName(String 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() { + return apiGroupPcode; + } + + public void setApiGroupPcode(String apiGroupPcode) { + this.apiGroupPcode = apiGroupPcode; + } + + + public long getIsDelete() { + return isDelete; + } + + public void setIsDelete(long isDelete) { + this.isDelete = isDelete; + } + + + /*@ApiModelProperty("一级") + private OcpApiGroup upList; + @ApiModelProperty("分类编码") + private String code; + + @ApiModelProperty("分类名称") + private String pName; + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getpName() { + return pName; + } + + public void setpName(String pName) { + this.pName = pName; + } + + public OcpApiGroup getUpList() { + return upList; + } + + public void setUpList(OcpApiGroup upList) { + this.upList = upList; + } +*/ + +} diff --git a/src/main/java/com/pms/ocp/model/dto/ThreeTreeList.java b/src/main/java/com/pms/ocp/model/dto/ThreeTreeList.java new file mode 100644 index 0000000000000000000000000000000000000000..82f762cd811e3e16a172c5c9fafdfa53d5124138 --- /dev/null +++ b/src/main/java/com/pms/ocp/model/dto/ThreeTreeList.java @@ -0,0 +1,207 @@ +package com.pms.ocp.model.dto; + + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.pms.ocp.model.entity.OcpApiGroup; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.sql.Timestamp; + +@ApiModel(value = "服务树三级目录") +@Data +public class ThreeTreeList { + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty("主键ID") + private String objId; + + @ApiModelProperty("分类编码") + private String apiGroupCode; + + @ApiModelProperty("分类名称") + private String apiGroupName; + + @ApiModelProperty("推广类型0统推，1自建") + private long apiGroupPromotionType; + + @ApiModelProperty("分类所属公司") + private String apiGroupCompanyCode; + + @ApiModelProperty("分类版本") + private String apiGroupVersion; + + @ApiModelProperty("显示顺序") + private long apiGroupOrderNo; + + @ApiModelProperty("提交人id") + private String apiGroupUserId; + + @ApiModelProperty("提交人姓名") + private String apiGroupUserName; + + @ApiModelProperty("创建时间") + private Timestamp apiGroupCtime; + + @ApiModelProperty("修改时间") + private Timestamp apiGroupMtime; + + @ApiModelProperty("上级code") + private String apiGroupPcode; + + @ApiModelProperty("是否删除0-否1-是") + private long isDelete; + + + public String getObjId() { + return objId; + } + + public void setObjId(String objId) { + this.objId = objId; + } + + + public String getApiGroupCode() { + return apiGroupCode; + } + + public void setApiGroupCode(String apiGroupCode) { + this.apiGroupCode = apiGroupCode; + } + + + public String getApiGroupName() { + return apiGroupName; + } + + public void setApiGroupName(String apiGroupName) { + this.apiGroupName = apiGroupName; + } + + + public long getApiGroupPromotionType() { + return apiGroupPromotionType; + } + + public void setApiGroupPromotionType(long apiGroupPromotionType) { + this.apiGroupPromotionType = apiGroupPromotionType; + } + + + public String getApiGroupCompanyCode() { + return apiGroupCompanyCode; + } + + public void setApiGroupCompanyCode(String apiGroupCompanyCode) { + this.apiGroupCompanyCode = apiGroupCompanyCode; + } + + + public String getApiGroupVersion() { + return apiGroupVersion; + } + + public void setApiGroupVersion(String apiGroupVersion) { + this.apiGroupVersion = apiGroupVersion; + } + + + public long getApiGroupOrderNo() { + return apiGroupOrderNo; + } + + public void setApiGroupOrderNo(long apiGroupOrderNo) { + this.apiGroupOrderNo = apiGroupOrderNo; + } + + + public String getApiGroupUserId() { + return apiGroupUserId; + } + + public void setApiGroupUserId(String apiGroupUserId) { + this.apiGroupUserId = apiGroupUserId; + } + + + public String getApiGroupUserName() { + return apiGroupUserName; + } + + public void setApiGroupUserName(String 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() { + return apiGroupPcode; + } + + public void setApiGroupPcode(String apiGroupPcode) { + this.apiGroupPcode = apiGroupPcode; + } + + + public long getIsDelete() { + return isDelete; + } + + public void setIsDelete(long isDelete) { + this.isDelete = isDelete; + } + + + /*@ApiModelProperty("三级") + private OcpApiGroup ThreeList; + + @ApiModelProperty("分类编码") + private String code; + + @ApiModelProperty("分类名称") + private String pName; + + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getpName() { + return pName; + } + + public void setpName(String pName) { + this.pName = pName; + } + + public OcpApiGroup getThreeList() { + return ThreeList; + } + + public void setThreeList(OcpApiGroup threeList) { + ThreeList = threeList; + }*/ +} diff --git a/src/main/java/com/pms/ocp/model/dto/TwoDownList.java b/src/main/java/com/pms/ocp/model/dto/TwoDownList.java new file mode 100644 index 0000000000000000000000000000000000000000..799d1288db45354e76fc553333e7dfbd4f4a288d --- /dev/null +++ b/src/main/java/com/pms/ocp/model/dto/TwoDownList.java @@ -0,0 +1,209 @@ +package com.pms.ocp.model.dto; + + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.pms.ocp.model.entity.OcpApiGroup; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.sql.Timestamp; +import java.util.List; + +@ApiModel(value = "服务树二级目录") +@Data +public class TwoDownList { + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty("主键ID") + private String objId; + + @ApiModelProperty("分类编码") + private String apiGroupCode; + + @ApiModelProperty("分类名称") + private String apiGroupName; + + @ApiModelProperty("推广类型0统推，1自建") + private long apiGroupPromotionType; + + @ApiModelProperty("分类所属公司") + private String apiGroupCompanyCode; + + @ApiModelProperty("分类版本") + private String apiGroupVersion; + + @ApiModelProperty("显示顺序") + private long apiGroupOrderNo; + + @ApiModelProperty("提交人id") + private String apiGroupUserId; + + @ApiModelProperty("提交人姓名") + private String apiGroupUserName; + + @ApiModelProperty("创建时间") + private Timestamp apiGroupCtime; + + @ApiModelProperty("修改时间") + private Timestamp apiGroupMtime; + + @ApiModelProperty("上级code") + private String apiGroupPcode; + + @ApiModelProperty("是否删除0-否1-是") + private long isDelete; + + + public String getObjId() { + return objId; + } + + public void setObjId(String objId) { + this.objId = objId; + } + + + public String getApiGroupCode() { + return apiGroupCode; + } + + public void setApiGroupCode(String apiGroupCode) { + this.apiGroupCode = apiGroupCode; + } + + + public String getApiGroupName() { + return apiGroupName; + } + + public void setApiGroupName(String apiGroupName) { + this.apiGroupName = apiGroupName; + } + + + public long getApiGroupPromotionType() { + return apiGroupPromotionType; + } + + public void setApiGroupPromotionType(long apiGroupPromotionType) { + this.apiGroupPromotionType = apiGroupPromotionType; + } + + + public String getApiGroupCompanyCode() { + return apiGroupCompanyCode; + } + + public void setApiGroupCompanyCode(String apiGroupCompanyCode) { + this.apiGroupCompanyCode = apiGroupCompanyCode; + } + + + public String getApiGroupVersion() { + return apiGroupVersion; + } + + public void setApiGroupVersion(String apiGroupVersion) { + this.apiGroupVersion = apiGroupVersion; + } + + + public long getApiGroupOrderNo() { + return apiGroupOrderNo; + } + + public void setApiGroupOrderNo(long apiGroupOrderNo) { + this.apiGroupOrderNo = apiGroupOrderNo; + } + + + public String getApiGroupUserId() { + return apiGroupUserId; + } + + public void setApiGroupUserId(String apiGroupUserId) { + this.apiGroupUserId = apiGroupUserId; + } + + + public String getApiGroupUserName() { + return apiGroupUserName; + } + + public void setApiGroupUserName(String 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() { + return apiGroupPcode; + } + + public void setApiGroupPcode(String apiGroupPcode) { + this.apiGroupPcode = apiGroupPcode; + } + + + public long getIsDelete() { + return isDelete; + } + + public void setIsDelete(long isDelete) { + this.isDelete = isDelete; + } + + /* @ApiModelProperty("二级") + private OcpApiGroup downList; + + @ApiModelProperty("分类编码") + private String code; + + @ApiModelProperty("分类名称") + private String pName; + + public String getCode() { + return code; + } + + + public void setCode(String code) { + this.code = code; + } + + public String getpName() { + return pName; + } + + public void setpName(String pName) { + this.pName = pName; + } + + public OcpApiGroup getDownList() { + return downList; + } + + public void setDownList(OcpApiGroup downList) { + this.downList = downList; + } +*/ + +} 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 d37bdde096535fd77d57e10a62b7106961e12774..4865ed423ebfd0a522a9a791670071405bd9de26 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpApiAudit.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpApiAudit.java @@ -14,7 +14,7 @@ import java.sql.Timestamp; @ApiModel("服务事记表") public class OcpApiAudit { - @TableId(type = IdType.AUTO) + @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty("主键ID") private String objId; 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 f91b2468f6d26ef0ed6f359eeb0b4d7c166a931d..75f038bd66c3c9390cbe0bf255c20a8d1d3fc63d 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpApiBase.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpApiBase.java @@ -15,7 +15,8 @@ import java.sql.Timestamp; @ApiModel("服务基础信息表") public class OcpApiBase { - @TableId(type = IdType.AUTO) + + @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty("主键ID") private String objId; diff --git a/src/main/java/com/pms/ocp/model/entity/OcpApiDep.java b/src/main/java/com/pms/ocp/model/entity/OcpApiDep.java index ba238ffdc539c7cd665294fd65f6b69d8341f217..cce6461b25514847936e849c1dbbb3f01289e080 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpApiDep.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpApiDep.java @@ -14,7 +14,7 @@ import java.sql.Timestamp; @TableName("ocp_api_dep") @ApiModel("服务模型关系") public class OcpApiDep { - @TableId(type = IdType.AUTO) + @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty("主键ID") private String objId; diff --git a/src/main/java/com/pms/ocp/model/entity/OcpApiExtent.java b/src/main/java/com/pms/ocp/model/entity/OcpApiExtent.java index 04f100c88de41dce14431faa520edc1df7a43b91..5f927fc0734951610fdbb79a0c24f6d7eae3fa12 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpApiExtent.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpApiExtent.java @@ -14,7 +14,7 @@ import java.sql.Timestamp; @TableName("ocp_api_extent") @ApiModel("服务扩展信息表") public class OcpApiExtent { - @TableId(type = IdType.AUTO) + @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty("主键ID") private String objId; 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 9b5105f81d9f3489cfd7ca5e384d57688211edc8..9e968f7146aafb9867f79600b6e37894fde7621b 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpApiGroup.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpApiGroup.java @@ -14,7 +14,7 @@ import java.sql.Timestamp; @TableName("ocp_api_Group") @ApiModel("服务分类表") public class OcpApiGroup { - @TableId(type = IdType.AUTO) + @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty("主键ID") private String objId; diff --git a/src/main/java/com/pms/ocp/model/entity/OcpApiModelRel.java b/src/main/java/com/pms/ocp/model/entity/OcpApiModelRel.java index eb4e9d9262eb3ed7ad68d1edb2befa18dc18f39e..03a429134818234f678c08a9e50dcecbfb348a2d 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpApiModelRel.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpApiModelRel.java @@ -15,7 +15,7 @@ import java.sql.Timestamp; @ApiModel("服务模型关系") public class OcpApiModelRel { - @TableId(type = IdType.AUTO) + @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty("主键ID") private String objId; 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 9848af1a013ad29c987fff0bd7df32acd88ebfb6..252932f8fd9f73c686f7d9c44626b94045afc101 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpApiSubs.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpApiSubs.java @@ -15,7 +15,7 @@ import java.sql.Timestamp; @ApiModel("服务订阅记录表") public class OcpApiSubs { - @TableId(type = IdType.AUTO) + @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty("主键ID") private String objId; 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 4094f22fe4eb20671be512f815ee7bb270053f2e..b1b5ddaaa44d76ef22905026396842a544dbe60e 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpApiTenantRel.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpApiTenantRel.java @@ -15,7 +15,7 @@ import java.sql.Timestamp; @ApiModel("服务应用关系表") public class OcpApiTenantRel { - @TableId(type = IdType.AUTO) + @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty("主键ID") private String objId; diff --git a/src/main/java/com/pms/ocp/service/OcpApiBaseService.java b/src/main/java/com/pms/ocp/service/OcpApiBaseService.java new file mode 100644 index 0000000000000000000000000000000000000000..02d26930a2fc39e1752d6fb05d31c8901d562dbb --- /dev/null +++ b/src/main/java/com/pms/ocp/service/OcpApiBaseService.java @@ -0,0 +1,10 @@ +package com.pms.ocp.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.pms.ocp.model.entity.OcpApiBase; +import org.springframework.stereotype.Service; + +@Service +public interface OcpApiBaseService extends IService { +} diff --git a/src/main/java/com/pms/ocp/service/OcpApiTreeService.java b/src/main/java/com/pms/ocp/service/OcpApiTreeService.java new file mode 100644 index 0000000000000000000000000000000000000000..297b312009a708d33ae24d6227187c0e2d7fe58d --- /dev/null +++ b/src/main/java/com/pms/ocp/service/OcpApiTreeService.java @@ -0,0 +1,34 @@ +package com.pms.ocp.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.pms.ocp.model.dto.ApiTreeGroupDto; +import com.pms.ocp.model.dto.OcpApiGroupDtos; +import com.pms.ocp.model.entity.OcpApiGroup; + + +public interface OcpApiTreeService extends IService { + + /** + * 服务树分类 + */ + ApiTreeGroupDto getByGroup(); + + /** + * 新增服务分类 + */ + void insertTree(OcpApiGroupDtos ocpApiGroupDtos); + + + /* + 修改服务分类 + */ + + + void updataOcpTree(OcpApiGroup ocpApiGroup); + + /** + * 删除服务分类 + */ + boolean deleteOcpTree(OcpApiGroup ocpApiGroup); +} diff --git a/src/main/java/com/pms/ocp/service/impl/OcpApiBaseServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpApiBaseServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..f6913f3b4b8f88f449aeaae76a941c53fc54acea --- /dev/null +++ b/src/main/java/com/pms/ocp/service/impl/OcpApiBaseServiceImpl.java @@ -0,0 +1,13 @@ +package com.pms.ocp.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.pms.ocp.mapper.OcpApiBaseMapper; +import com.pms.ocp.model.entity.OcpApiBase; +import com.pms.ocp.service.OcpApiBaseService; +import com.pms.ocp.service.OcpApiTreeService; +import org.springframework.stereotype.Service; + +@Service +public class OcpApiBaseServiceImpl extends ServiceImpl implements OcpApiBaseService { + +} diff --git a/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..9ddf7611e6799592b3d1d8c396f3871639327ad8 --- /dev/null +++ b/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java @@ -0,0 +1,216 @@ +package com.pms.ocp.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.pms.ocp.common.utils.DateUtils; +import com.pms.ocp.mapper.OcpApiBaseMapper; +import com.pms.ocp.mapper.OcpApiTreeMapper; +import com.pms.ocp.model.dto.*; +import com.pms.ocp.model.entity.OcpApiBase; +import com.pms.ocp.model.entity.OcpApiGroup; +import com.pms.ocp.service.OcpApiTreeService; +import org.apache.commons.lang3.StringUtils; +import org.apache.poi.ss.formula.functions.T; +import org.apache.poi.util.StringUtil; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.xml.crypto.Data; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Date; +import java.util.List; + + +@Service +public class OcpApiTreeServiceImpl extends ServiceImpl implements OcpApiTreeService { + + + @Autowired + private OcpApiTreeMapper mapper; + + @Autowired + private OcpApiBaseMapper ocpApiBaseMapper; + + /** + * 服务树分类 + * @return + */ + + @Override + public ApiTreeGroupDto getByGroup() { + + //服务树全表数据 + List ocpApiGroups = mapper.selectList(null); + + //服务树分类对象 + ApiTreeGroupDto apiTreeGroupList = new ApiTreeGroupDto(); + //一级服务分类 + List oneTreeUpLists = new ArrayList<>(); + + + + for (OcpApiGroup ocpApiGroup : ocpApiGroups) { + //判断数据状态 + if (!(ocpApiGroup.getIsDelete() == 0)) { + //一级服务对象 + OneTreeUpList oneTreeUpList = new OneTreeUpList(); +// 判断数据是否有上级服务分类 + if ("".equals(ocpApiGroup.getApiGroupPcode())) { + BeanUtils.copyProperties(ocpApiGroup, oneTreeUpList); + oneTreeUpLists.add(oneTreeUpList); + + } + } + + + } + List twoDownLists = twoTreeLists(oneTreeUpLists, ocpApiGroups); + List threeTreeLists = threeTreeLists(twoDownLists, ocpApiGroups); + apiTreeGroupList.setOneupList(oneTreeUpLists); + apiTreeGroupList.setTwoList(twoDownLists); + apiTreeGroupList.setThreeList(threeTreeLists); + + return apiTreeGroupList; + } + + /** + * 二级目录 + * @param oneTreeUpLists + * @return + */ + public List twoTreeLists(List oneTreeUpLists,List ocpApiGroups){ + + List twoTreeLists = new ArrayList<>(); + + //服务树全表数据 + + for (OneTreeUpList oneTreeUpList : oneTreeUpLists) { + String code = oneTreeUpList.getApiGroupCode(); + for (OcpApiGroup ocpApiGroup : ocpApiGroups ) { + if (code.equals(ocpApiGroup.getApiGroupPcode())) { + TwoDownList twoDownList = new TwoDownList(); + BeanUtils.copyProperties(ocpApiGroup,twoDownList); + twoTreeLists.add(twoDownList); + + /* String apiGroupCode = ocpApiGroup.getApiGroupCode(); + String apiGroupName = ocpApiGroup.getApiGroupName(); + twoDownList.setCode(apiGroupCode); + twoDownList.setpName(apiGroupName); + twoDownList.setDownList(ocpApiGroup); + threeTreeLists.add(twoDownList);*/ + } + } + } + + return twoTreeLists; + + } + /** + * 三级目录 + * @param twoDownLists + * @return + */ + public List threeTreeLists(List twoDownLists,List ocpApiGroups){ + List threeTreeLists = new ArrayList<>(); + + + for (TwoDownList twoDownList : twoDownLists) { + for (OcpApiGroup ocpApiGroup : ocpApiGroups) { + String code = twoDownList.getApiGroupCode(); + if (code.equals(ocpApiGroup.getApiGroupPcode())){ + ThreeTreeList threeTreeList = new ThreeTreeList(); + BeanUtils.copyProperties(ocpApiGroup,threeTreeList); + threeTreeLists.add(threeTreeList); + /* threeTreeList.setThreeList(ocpApiGroup); + threeTreeLists.add(threeTreeList);*/ + } + } + + } + return threeTreeLists; + + } + + /** + * 新增服务分类 + * + * @param ocpApiGroupDtos + */ + @Override + public void insertTree(OcpApiGroupDtos ocpApiGroupDtos) { + + + OcpApiBase ocpApiBase = new OcpApiBase(); + ocpApiBase.setApiCode(ocpApiGroupDtos.getApiGroupCode()); +// ocpApiBase.setApiMtime(new Date("yyyy-MM-dd").getTime()); + + BeanUtils.copyProperties(ocpApiGroupDtos,ocpApiBase); + ocpApiBase.setApiName("新增服务分类"); + Timestamp timestamp = new Timestamp(System.currentTimeMillis()); + ocpApiBase.setApiMtime(timestamp); + ocpApiBase.setApiCtime(ocpApiGroupDtos.getApiGroupCtime()); + ocpApiBase.setApiUserId(ocpApiGroupDtos.getApiGroupUserId()); + + ocpApiBase.setObjId(""); + + /* ocpApiBase.setApiCode(ocpApiGroupDtos.getApiGroupCode()); + ocpApiBase.setApiName(ocpApiGroupDtos.getApiGroupName()); + ocpApiBase.setApiGroupCode(ocpApiGroupDtos.getApiGroupPcode()); + ocpApiBase.setApiPromotion(ocpApiGroupDtos.getApiGroupPromotionType()); + ocpApiBase.setApiReq(ocpApiGroupDtos.getApiReq()); + ocpApiBase.setApiResp(ocpApiGroupDtos.getApiResp()); + ocpApiBase.setApiUrl(ocpApiBase.getApiUrl()); + ocpApiBase.setApiCtime(ocpApiGroupDtos.getApiGroupCtime()); + ocpApiBase.setApiMtime(new Date("yyyy-MM-dd").getTime()); + ocpApiBase.setApiUserId(ocpApiGroupDtos.getApiGroupUserId()); + ocpApiBase.setApiUnit(ocpApiGroupDtos.getOwnerCompanyCode()); + ocpApiBase.setOwnerCompanyCode(ocpApiGroupDtos.getOwnerCompanyCode()); + ocpApiBase.setOwnerCompanyName(ocpApiGroupDtos.getOwnerCompanyCode()); + ocpApiBase.setIsDelete(ocpApiGroupDtos.getIsDelete());*/ + + OcpApiGroup ocpApiGroup = new OcpApiGroup(); + ocpApiGroup.setObjId(""); + BeanUtils.copyProperties(ocpApiGroupDtos,ocpApiGroup); + ocpApiBaseMapper.insert(ocpApiBase); + mapper.insert(ocpApiGroup); + + } + + + /** + * 修改服务分类 + * + * @param + */ + @Override + public void updataOcpTree(OcpApiGroup ocpApiGroup) { + mapper.updateById(ocpApiGroup); + } + + + + /** + * 删除服务分类 + * + * @param ocpApiGroup + */ + @Override + public boolean deleteOcpTree(OcpApiGroup ocpApiGroup) { + String objId = ocpApiGroup.getObjId(); + OcpApiGroup ocpApiGroup1 = mapper.selectById(objId); + + if(StringUtils.isBlank(ocpApiGroup1.getApiGroupPcode())){ + mapper.deleteById(objId); + return true; + }else { + return false; + } + + + } + + +} diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 31d564065d5e26947cd559567f9229b3f7902845..2ab89a73599e659b11a49902b565a8239198c98a 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -2,9 +2,11 @@ spring: datasource: driver-class-name: org.postgresql.Driver username: postgres - password: passwd123 + password: 1234 type: com.zaxxer.hikari.HikariDataSource - jdbc-url: jdbc:postgresql://cloud.wodcloud.com:33070/apaas4?stringtype=unspecified&TimeZone=Asia/Shanghai&useAffectedRows=true + #jdbc-url: jdbc:postgresql://cloud.wodcloud.com:33070/apaas4?stringtype=unspecified&TimeZone=Asia/Shanghai&useAffectedRows=true + jdbc-url: jdbc:postgresql://localhost:5432/postgres?currentSchema=public&stringtype=unspecified&TimeZone=Asia/Shanghai&useAffectedRows=true + redis: host: 117.187.130.178 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 0b6ff634aa83af4b9b527b029ed94f2d3e14b04b..35dc633916bc58e51c006c231c6963372fd08ce4 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -7,7 +7,7 @@ spring: application: name: dashboard profiles: - active: ${profiles-active:local} + active: ${profiles-active:dev} datasource: driver-class-name: org.postgresql.Driver username: ${username} diff --git a/src/main/resources/mapper/ModelMapper.xml b/src/main/resources/mapper/ModelMapper.xml index d8e46b63073867c5bec424190f2b31b2ce1a76a4..94b9a50cf3dc793f2caf82e4688e0baa0e928d7c 100644 --- a/src/main/resources/mapper/ModelMapper.xml +++ b/src/main/resources/mapper/ModelMapper.xml @@ -92,4 +92,4 @@ - \ No newline at end of file +