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
eaf5476d
Commit
eaf5476d
authored
Mar 14, 2022
by
liukai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
问题修复
parent
668e68ee
Changes
13
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
173 additions
and
112 deletions
+173
-112
src/main/java/com/pms/ocp/controller/OcpApiDetailsController.java
.../java/com/pms/ocp/controller/OcpApiDetailsController.java
+11
-5
src/main/java/com/pms/ocp/controller/OcpTenantDetailsController.java
...va/com/pms/ocp/controller/OcpTenantDetailsController.java
+11
-9
src/main/java/com/pms/ocp/mapper/OcpApiAuditMapper.java
src/main/java/com/pms/ocp/mapper/OcpApiAuditMapper.java
+2
-0
src/main/java/com/pms/ocp/mapper/OcpTenantAuditMapper.java
src/main/java/com/pms/ocp/mapper/OcpTenantAuditMapper.java
+2
-0
src/main/java/com/pms/ocp/model/entity/OcpTenantBase.java
src/main/java/com/pms/ocp/model/entity/OcpTenantBase.java
+95
-95
src/main/java/com/pms/ocp/service/OcpApiAuditService.java
src/main/java/com/pms/ocp/service/OcpApiAuditService.java
+2
-0
src/main/java/com/pms/ocp/service/OcpTenantAuditService.java
src/main/java/com/pms/ocp/service/OcpTenantAuditService.java
+2
-0
src/main/java/com/pms/ocp/service/OcpTenantBaseService.java
src/main/java/com/pms/ocp/service/OcpTenantBaseService.java
+3
-0
src/main/java/com/pms/ocp/service/impl/OcpApiAuditServiceImpl.java
...java/com/pms/ocp/service/impl/OcpApiAuditServiceImpl.java
+6
-0
src/main/java/com/pms/ocp/service/impl/OcpTenantAuditServiceImpl.java
...a/com/pms/ocp/service/impl/OcpTenantAuditServiceImpl.java
+9
-1
src/main/java/com/pms/ocp/service/impl/OcpTenantBaseServiceImpl.java
...va/com/pms/ocp/service/impl/OcpTenantBaseServiceImpl.java
+13
-0
src/main/resources/mapper/OcpApiAuditMapper.xml
src/main/resources/mapper/OcpApiAuditMapper.xml
+9
-1
src/main/resources/mapper/OcpTenantAuditMapper.xml
src/main/resources/mapper/OcpTenantAuditMapper.xml
+8
-1
No files found.
src/main/java/com/pms/ocp/controller/OcpApiDetailsController.java
View file @
eaf5476d
...
...
@@ -46,11 +46,11 @@ public class OcpApiDetailsController {
return
ocpApiAuditService
.
getOcpApiAuditList
(
ocpApiAudit
);
}
@ApiOperation
(
"服务大事记-查询详情"
)
@PostMapping
(
"/getocpapidetails"
)
public
ResponseVO
<
List
<
OcpApiAudit
>>
getOcpApiDetails
(
@RequestBody
OcpApiAudit
ocpApiAudit
){
return
ocpApiAuditService
.
sById
(
ocpApiAudit
);
}
//
@ApiOperation("服务大事记-查询详情")
//
@PostMapping("/getocpapidetails")
//
public ResponseVO<List<OcpApiAudit>> getOcpApiDetails(@RequestBody OcpApiAudit ocpApiAudit){
//
return ocpApiAuditService.sById(ocpApiAudit);
//
}
@ApiOperation
(
"服务大事记-查询详情-变更内容"
)
@PostMapping
(
"/getocpapi"
)
...
...
@@ -58,6 +58,12 @@ public class OcpApiDetailsController {
return
ocpApiAuditService
.
OaaById
(
ocpApiAudit
);
}
@ApiOperation
(
"服务大事记-历史版本"
)
@PostMapping
(
"/versionid"
)
public
ResponseVO
<
List
<
OcpApiAudit
>>
versionId
(
@RequestBody
OcpApiAudit
ocpApiAudit
){
return
ocpApiAuditService
.
versionId
(
ocpApiAudit
);
}
@ApiOperation
(
"服务与应用拓扑图-查询"
)
@PostMapping
(
"/getoatrlist"
)
public
ResponseVO
<
List
<
OcpApiTenantRel
>>
getOatrList
(
@RequestBody
OcpApiTenantRel
ocpApiTenantRel
)
{
...
...
src/main/java/com/pms/ocp/controller/OcpTenantDetailsController.java
View file @
eaf5476d
...
...
@@ -10,13 +10,12 @@ import io.swagger.annotations.Api;
import
io.swagger.annotations.ApiOperation
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.multipart.MultipartFile
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletResponse
;
import
javax.xml.transform.Result
;
import
java.util.List
;
@Slf4j
...
...
@@ -50,11 +49,6 @@ public class OcpTenantDetailsController {
return
ocpTenantAuditService
.
getOtaList
(
ocpTenantAudit
);
}
@ApiOperation
(
"应用大事记-查询详情"
)
@PostMapping
(
"/getotaListById"
)
public
ResponseVO
<
List
<
OcpApiAudit
>>
getOtaListById
(
@RequestBody
OcpTenantAudit
ocpTenantAudit
)
{
return
ocpTenantAuditService
.
getOtaListById
(
ocpTenantAudit
);
}
@ApiOperation
(
"应用订阅记录-查询"
)
@PostMapping
(
"/getOcpTenantList"
)
...
...
@@ -78,4 +72,12 @@ public class OcpTenantDetailsController {
public
ResponseVO
<
List
<
OcpTenantAudit
>>
getOcpTenant
(
@RequestBody
OcpTenantAudit
ocpTenantAudit
){
return
ocpTenantAuditService
.
OtaById
(
ocpTenantAudit
);
}
@ApiOperation
(
"应用大事记-查询详情-历史版本"
)
@PostMapping
(
"/versionId"
)
public
ResponseVO
<
List
<
OcpTenantAudit
>>
versionId
(
@RequestBody
OcpTenantAudit
ocpTenantAudit
){
return
ocpTenantAuditService
.
versionId
(
ocpTenantAudit
);
}
}
src/main/java/com/pms/ocp/mapper/OcpApiAuditMapper.java
View file @
eaf5476d
...
...
@@ -20,4 +20,6 @@ public interface OcpApiAuditMapper extends BaseMapper<OcpApiAudit> {
List
<
OcpApiAudit
>
sById
(
OcpApiAudit
ocpApiAudit
);
List
<
OcpApiAudit
>
versionId
(
OcpApiAudit
ocpApiAudit
);
}
src/main/java/com/pms/ocp/mapper/OcpTenantAuditMapper.java
View file @
eaf5476d
...
...
@@ -11,4 +11,6 @@ public interface OcpTenantAuditMapper extends BaseMapper<OcpTenantAudit> {
List
<
OcpTenantAudit
>
getOtaListById
(
OcpTenantAudit
ocpTenantAudit
);
List
<
OcpTenantAudit
>
OtaById
(
OcpTenantAudit
ocpTenantAudit
);
List
<
OcpTenantAudit
>
versionId
(
OcpTenantAudit
ocpTenantAudit
);
}
src/main/java/com/pms/ocp/model/entity/OcpTenantBase.java
View file @
eaf5476d
This diff is collapsed.
Click to expand it.
src/main/java/com/pms/ocp/service/OcpApiAuditService.java
View file @
eaf5476d
...
...
@@ -18,4 +18,6 @@ public interface OcpApiAuditService extends IService<OcpApiAudit> {
ResponseVO
sById
(
OcpApiAudit
ocpApiAudit
);
void
exportExcel
(
OcpApiAudit
ocpApiAudit
,
HttpServletRequest
request
,
HttpServletResponse
response
);
ResponseVO
versionId
(
OcpApiAudit
ocpApiAudit
);
}
src/main/java/com/pms/ocp/service/OcpTenantAuditService.java
View file @
eaf5476d
...
...
@@ -16,4 +16,6 @@ public interface OcpTenantAuditService extends IService<OcpTenantAudit> {
void
exportExcel
(
OcpTenantAudit
ocpTenantAudit
,
HttpServletRequest
request
,
HttpServletResponse
response
);
ResponseVO
OtaById
(
OcpTenantAudit
ocpTenantAudit
);
ResponseVO
versionId
(
OcpTenantAudit
ocpTenantAudit
);
}
src/main/java/com/pms/ocp/service/OcpTenantBaseService.java
View file @
eaf5476d
...
...
@@ -6,4 +6,7 @@ import com.pms.ocp.model.vo.ResponseVO;
public
interface
OcpTenantBaseService
extends
IService
<
OcpTenantBase
>
{
ResponseVO
getOtbList
(
OcpTenantBase
ocpTenantBase
);
}
src/main/java/com/pms/ocp/service/impl/OcpApiAuditServiceImpl.java
View file @
eaf5476d
...
...
@@ -58,5 +58,11 @@ public class OcpApiAuditServiceImpl extends ServiceImpl<OcpApiAuditMapper,OcpApi
ExportUtils
.
exportExcel
(
response
,
AnalysisConstant
.
exportOcpApiAuditName
.
OCP_API_AUDIT
,
workbook
);
}
@Override
public
ResponseVO
versionId
(
OcpApiAudit
ocpApiAudit
)
{
List
<
OcpApiAudit
>
ocpApiAuditList
=
ocpApiAuditMapper
.
versionId
(
ocpApiAudit
);
return
ResponseVO
.
ok
(
ocpApiAuditList
);
}
}
src/main/java/com/pms/ocp/service/impl/OcpTenantAuditServiceImpl.java
View file @
eaf5476d
...
...
@@ -41,7 +41,7 @@ public class OcpTenantAuditServiceImpl extends ServiceImpl<OcpTenantAuditMapper,
@Override
public
void
exportExcel
(
OcpTenantAudit
ocpTenantAudit
,
HttpServletRequest
request
,
HttpServletResponse
response
)
{
List
<
OcpTenantAudit
>
otaListById
=
ocpTenantAuditMapper
.
getOtaListBy
Id
(
ocpTenantAudit
);
List
<
OcpTenantAudit
>
otaListById
=
ocpTenantAuditMapper
.
version
Id
(
ocpTenantAudit
);
ExportParams
param
=
new
ExportParams
(
AnalysisConstant
.
exportOcpTenantApiName
.
OCP_TENANT_API
,
AnalysisConstant
.
exportOcpTenantApiName
.
OCP_TENANT_API
);
Workbook
workbook
=
ExcelExportUtil
.
exportExcel
(
param
,
OcpTenantAudit
.
class
,
otaListById
);
ExportUtils
.
exportExcel
(
response
,
AnalysisConstant
.
exportOcpTenantApiName
.
OCP_TENANT_API
,
workbook
);
...
...
@@ -52,4 +52,12 @@ public class OcpTenantAuditServiceImpl extends ServiceImpl<OcpTenantAuditMapper,
List
<
OcpTenantAudit
>
oatrList
=
ocpTenantAuditMapper
.
OtaById
(
ocpTenantAudit
);
return
ResponseVO
.
ok
(
oatrList
);
}
@Override
public
ResponseVO
versionId
(
OcpTenantAudit
ocpTenantAudit
)
{
List
<
OcpTenantAudit
>
ocpTenantAudits
=
ocpTenantAuditMapper
.
versionId
(
ocpTenantAudit
);
return
ResponseVO
.
ok
(
ocpTenantAudits
);
}
}
src/main/java/com/pms/ocp/service/impl/OcpTenantBaseServiceImpl.java
View file @
eaf5476d
package
com.pms.ocp.service.impl
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.pms.ocp.common.constants.*
;
import
com.pms.ocp.common.exception.ServiceException
;
import
com.pms.ocp.mapper.OcpTenantBaseMapper
;
import
com.pms.ocp.model.entity.OcpTenantBase
;
import
com.pms.ocp.model.vo.ResponseVO
;
...
...
@@ -8,10 +10,16 @@ import com.pms.ocp.service.OcpTenantBaseService;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
java.util.LinkedList
;
import
java.util.List
;
@Service
public
class
OcpTenantBaseServiceImpl
extends
ServiceImpl
<
OcpTenantBaseMapper
,
OcpTenantBase
>
implements
OcpTenantBaseService
{
@Autowired
private
OcpTenantBaseMapper
ocpTenantBaseMapper
;
@Override
...
...
@@ -19,4 +27,9 @@ public class OcpTenantBaseServiceImpl extends ServiceImpl<OcpTenantBaseMapper,Oc
List
<
OcpTenantBase
>
otbList
=
ocpTenantBaseMapper
.
getOtbList
(
ocpTenantBase
);
return
ResponseVO
.
ok
(
otbList
);
}
}
src/main/resources/mapper/OcpApiAuditMapper.xml
View file @
eaf5476d
...
...
@@ -6,7 +6,7 @@
select * from ocp_api_audit oaa
LEFT JOIN ocp_api_base oab
on oaa.api_code = oab.api_code
where oaa.
obj_id = #{objId
}
where oaa.
api_code = #{apiCode
}
</select>
<select
id=
"getOcpApiSubsList"
resultType=
"com.pms.ocp.model.entity.OcpApiAudit"
>
...
...
@@ -16,4 +16,12 @@
<select
id=
"sById"
resultType=
"com.pms.ocp.model.entity.OcpApiAudit"
>
select * from ocp_api_audit where obj_id = #{objId}
</select>
<select
id=
"versionId"
resultType=
"com.pms.ocp.model.entity.OcpApiAudit"
>
select * from ocp_api_audit oaa
LEFT JOIN ocp_api_base oab
on oaa.api_code = oab.api_code
where oaa.api_code = #{apiCode}
</select>
</mapper>
\ No newline at end of file
src/main/resources/mapper/OcpTenantAuditMapper.xml
View file @
eaf5476d
...
...
@@ -13,6 +13,13 @@
select * from ocp_tenant_audit ota
LEFT JOIN ocp_tenant_base otb
on ota.tenant_code = otb.tenant_code
where ota.obj_id = #{objId}
where ota.tenant_code = #{tenantCode}
</select>
<select
id=
"versionId"
resultType=
"com.pms.ocp.model.entity.OcpTenantAudit"
>
select * from ocp_tenant_audit ota
LEFT JOIN ocp_tenant_base otb
on ota.tenant_code = otb.tenant_code
where ota.tenant_code = #{tenantCode}
</select>
</mapper>
\ No newline at end of file
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