Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
operation-control-platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
王锦盛
operation-control-platform
Commits
e5406bf6
Commit
e5406bf6
authored
Mar 28, 2022
by
diaoruifeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
合并代码
parent
7095ee7f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
32 additions
and
64 deletions
+32
-64
src/main/java/com/pms/ocp/controller/ApiProvinceController.java
...in/java/com/pms/ocp/controller/ApiProvinceController.java
+32
-1
src/main/java/com/pms/ocp/controller/ApiProvinceTreeController.java
...ava/com/pms/ocp/controller/ApiProvinceTreeController.java
+0
-63
No files found.
src/main/java/com/pms/ocp/controller/ApiProvinceController.java
View file @
e5406bf6
...
@@ -2,10 +2,14 @@ package com.pms.ocp.controller;
...
@@ -2,10 +2,14 @@ package com.pms.ocp.controller;
import
com.pms.ocp.model.dto.OcpGroupBaseDto
;
import
com.pms.ocp.model.entity.OcpApiBase
;
import
com.pms.ocp.model.vo.ApiProvinceVo
;
import
com.pms.ocp.model.vo.ApiProvinceVo
;
import
com.pms.ocp.model.vo.OcpApiBaseVo
;
import
com.pms.ocp.model.vo.OcpApiBaseVo
;
import
com.pms.ocp.model.vo.ResponseVO
;
import
com.pms.ocp.model.vo.ResponseVO
;
import
com.pms.ocp.service.ApiBasicManagementService
;
import
com.pms.ocp.service.ApiDetailsService
;
import
com.pms.ocp.service.ApiProvinceService
;
import
com.pms.ocp.service.ApiProvinceService
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiOperation
;
...
@@ -13,13 +17,19 @@ import lombok.extern.slf4j.Slf4j;
...
@@ -13,13 +17,19 @@ import lombok.extern.slf4j.Slf4j;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
import
java.util.List
;
@Slf4j
@Slf4j
@RequestMapping
(
"/apiProvince"
)
@RequestMapping
(
"/apiProvince"
)
@RestController
@RestController
@Api
(
tags
=
"服务省侧接口"
)
@Api
(
tags
=
"服务省侧
服务列表
接口"
)
public
class
ApiProvinceController
{
public
class
ApiProvinceController
{
@Autowired
@Autowired
private
ApiProvinceService
apiProvinceService
;
private
ApiProvinceService
apiProvinceService
;
@Autowired
private
ApiDetailsService
apiDetailsService
;
@Autowired
private
ApiBasicManagementService
apiBasicManagementService
;
@ApiOperation
(
"服务省侧-添加"
)
@ApiOperation
(
"服务省侧-添加"
)
@PostMapping
(
"/create"
)
@PostMapping
(
"/create"
)
...
@@ -32,4 +42,25 @@ public class ApiProvinceController {
...
@@ -32,4 +42,25 @@ public class ApiProvinceController {
}
}
}
}
@ApiOperation
(
"服务分类层级"
)
@GetMapping
(
"/apiBaseTreeOther"
)
public
ResponseVO
<
List
<
OcpGroupBaseDto
>>
apiBaseTreeOther
(
String
apiGroupCompanyCode
,
String
apiGroupCode
,
Integer
apiGroupPromotionType
,
String
apiCode
)
{
List
<
OcpGroupBaseDto
>
apiTreeGroupDtos
=
apiBasicManagementService
.
apiBaseTreeOther
(
apiGroupCompanyCode
,
apiGroupCode
,
apiGroupPromotionType
,
apiCode
);
return
ResponseVO
.
ok
(
apiTreeGroupDtos
);
}
@ApiOperation
(
"服务树列表"
)
@GetMapping
(
"/apiBaseTreeList"
)
public
ResponseVO
<
List
<
OcpApiBase
>>
apiBaseTreeList
(
String
apiGroupCompanyCode
,
String
apiGroupCode
)
{
List
<
OcpApiBase
>
apiBaseList
=
apiBasicManagementService
.
apiBaseTreeApiList
(
apiGroupCompanyCode
,
apiGroupCode
);
return
ResponseVO
.
ok
(
apiBaseList
);
}
@ApiOperation
(
"服务库服务详情-查询"
)
@GetMapping
(
"/query"
)
public
ResponseVO
<
OcpApiBaseVo
>
getApiDetails
(
String
apiCode
)
{
return
apiDetailsService
.
getApiDetails
(
apiCode
);
}
}
}
src/main/java/com/pms/ocp/controller/ApiProvinceTreeController.java
deleted
100644 → 0
View file @
7095ee7f
package
com.pms.ocp.controller
;
import
com.github.pagehelper.PageInfo
;
import
com.pms.ocp.common.utils.ExcelUtils
;
import
com.pms.ocp.common.utils.FileExport
;
import
com.pms.ocp.common.utils.FileUtil
;
import
com.pms.ocp.model.dto.ApiBaseDto
;
import
com.pms.ocp.model.dto.OcpGroupBaseDto
;
import
com.pms.ocp.model.entity.OcpApiBase
;
import
com.pms.ocp.model.vo.OcpApiBaseVo
;
import
com.pms.ocp.model.vo.ResponseVO
;
import
com.pms.ocp.service.ApiBasicManagementService
;
import
com.pms.ocp.service.ApiDetailsService
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.multipart.MultipartFile
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletResponse
;
import
java.sql.Timestamp
;
import
java.time.LocalDate
;
import
java.util.ArrayList
;
import
java.util.List
;
/**
* @author guofanfan
*/
@Slf4j
@RequestMapping
(
"/api/province"
)
@RestController
@Api
(
tags
=
"服务库省侧管理接口"
)
public
class
ApiProvinceTreeController
{
@Autowired
private
ApiDetailsService
apiDetailsService
;
@Autowired
private
ApiBasicManagementService
apiBasicManagementService
;
@ApiOperation
(
"服务分类层级"
)
@GetMapping
(
"/apiBaseTreeOther"
)
public
ResponseVO
<
List
<
OcpGroupBaseDto
>>
apiBaseTreeOther
(
String
apiGroupCompanyCode
,
String
apiGroupCode
,
Integer
apiGroupPromotionType
,
String
apiCode
)
{
List
<
OcpGroupBaseDto
>
apiTreeGroupDtos
=
apiBasicManagementService
.
apiBaseTreeOther
(
apiGroupCompanyCode
,
apiGroupCode
,
apiGroupPromotionType
,
apiCode
);
return
ResponseVO
.
ok
(
apiTreeGroupDtos
);
}
@ApiOperation
(
"服务树列表"
)
@GetMapping
(
"/apiBaseTreeList"
)
public
ResponseVO
<
List
<
OcpApiBase
>>
apiBaseTreeList
(
String
apiGroupCompanyCode
,
String
apiGroupCode
)
{
List
<
OcpApiBase
>
apiBaseList
=
apiBasicManagementService
.
apiBaseTreeApiList
(
apiGroupCompanyCode
,
apiGroupCode
);
return
ResponseVO
.
ok
(
apiBaseList
);
}
@ApiOperation
(
"服务库服务详情-查询"
)
@GetMapping
(
"/query"
)
public
ResponseVO
<
OcpApiBaseVo
>
getApiDetails
(
String
apiCode
)
{
return
apiDetailsService
.
getApiDetails
(
apiCode
);
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment