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
843352e1
Commit
843352e1
authored
Mar 28, 2022
by
郭凡凡
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
查询组中所有中心-下拉框
模糊查询
parent
cd41d848
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
73 additions
and
31 deletions
+73
-31
src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java
.../com/pms/ocp/controller/ApiBasicManagementController.java
+15
-12
src/main/java/com/pms/ocp/mapper/ApiBasicManagementMapper.java
...ain/java/com/pms/ocp/mapper/ApiBasicManagementMapper.java
+1
-1
src/main/java/com/pms/ocp/mapper/OcpTenantGroupMapper.java
src/main/java/com/pms/ocp/mapper/OcpTenantGroupMapper.java
+3
-0
src/main/java/com/pms/ocp/service/ApiBasicManagementService.java
...n/java/com/pms/ocp/service/ApiBasicManagementService.java
+11
-2
src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java
...m/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java
+37
-16
src/main/resources/mapper/ApiBasicManagementMapper.xml
src/main/resources/mapper/ApiBasicManagementMapper.xml
+3
-0
src/main/resources/mapper/OcpGroup.xml
src/main/resources/mapper/OcpGroup.xml
+3
-0
No files found.
src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java
View file @
843352e1
...
@@ -8,6 +8,7 @@ import com.pms.ocp.model.dto.ApiBaseDto;
...
@@ -8,6 +8,7 @@ import com.pms.ocp.model.dto.ApiBaseDto;
import
com.pms.ocp.model.dto.OcpGroupBaseDto
;
import
com.pms.ocp.model.dto.OcpGroupBaseDto
;
import
com.pms.ocp.model.entity.OcpApiBase
;
import
com.pms.ocp.model.entity.OcpApiBase
;
import
com.pms.ocp.model.entity.OcpApiGroup
;
import
com.pms.ocp.model.entity.OcpApiGroup
;
import
com.pms.ocp.model.entity.OcpTenantGroup
;
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
;
...
@@ -43,8 +44,6 @@ public class ApiBasicManagementController {
...
@@ -43,8 +44,6 @@ public class ApiBasicManagementController {
@Autowired
@Autowired
private
ApiBasicManagementService
apiBasicManagementService
;
private
ApiBasicManagementService
apiBasicManagementService
;
@ApiOperation
(
"导入功能"
)
@ApiOperation
(
"导入功能"
)
@PostMapping
(
"/import"
)
@PostMapping
(
"/import"
)
public
ResponseVO
ApiImport
(
@RequestParam
(
required
=
false
)
MultipartFile
file
,
public
ResponseVO
ApiImport
(
@RequestParam
(
required
=
false
)
MultipartFile
file
,
...
@@ -136,7 +135,6 @@ public class ApiBasicManagementController {
...
@@ -136,7 +135,6 @@ public class ApiBasicManagementController {
// }
// }
//}
//}
@ApiOperation
(
"下载模块"
)
@ApiOperation
(
"下载模块"
)
@GetMapping
(
"/downloadExcel"
)
@GetMapping
(
"/downloadExcel"
)
public
void
downloadExcel
(
HttpServletResponse
response
,
HttpServletRequest
request
)
{
public
void
downloadExcel
(
HttpServletResponse
response
,
HttpServletRequest
request
)
{
...
@@ -197,8 +195,8 @@ public class ApiBasicManagementController {
...
@@ -197,8 +195,8 @@ public class ApiBasicManagementController {
@ApiOperation
(
"服务分类层级"
)
@ApiOperation
(
"服务分类层级"
)
@GetMapping
(
"/apiBaseTreeOther"
)
@GetMapping
(
"/apiBaseTreeOther"
)
public
ResponseVO
<
List
<
OcpGroupBaseDto
>>
apiBaseTreeOther
(
String
apiGroupCompanyCode
,
String
apiGroupCode
,
Integer
apiGroupPromotionType
,
String
apiCode
)
{
public
ResponseVO
<
List
<
OcpGroupBaseDto
>>
apiBaseTreeOther
(
String
apiGroupCompanyCode
,
String
apiGroupCode
,
Integer
apiGroupPromotionType
,
String
apiCode
)
{
List
<
OcpGroupBaseDto
>
apiTreeGroupDtos
=
apiBasicManagementService
.
apiBaseTreeOther
(
apiGroupCompanyCode
,
apiGroupCode
,
apiGroupPromotionType
,
apiCode
);
List
<
OcpGroupBaseDto
>
apiTreeGroupDtos
=
apiBasicManagementService
.
apiBaseTreeOther
(
apiGroupCompanyCode
,
apiGroupCode
,
apiGroupPromotionType
,
apiCode
);
return
ResponseVO
.
ok
(
apiTreeGroupDtos
);
return
ResponseVO
.
ok
(
apiTreeGroupDtos
);
}
}
...
@@ -211,15 +209,20 @@ public class ApiBasicManagementController {
...
@@ -211,15 +209,20 @@ public class ApiBasicManagementController {
@ApiOperation
(
"省侧-应用接入申请-的模糊查询"
)
@ApiOperation
(
"省侧-应用接入申请-的模糊查询"
)
@GetMapping
(
"/selectByCondition"
)
@GetMapping
(
"/selectByCondition"
)
public
ResponseVO
<
PageInfo
<
OcpApiBase
>>
selectByCondition
(
@RequestParam
(
required
=
false
)
String
apiCode
,
public
ResponseVO
<
PageInfo
<
OcpApiBase
>>
selectByCondition
(
@RequestParam
(
required
=
false
)
String
apiCode
,
@RequestParam
(
required
=
false
)
String
apiName
,
@RequestParam
(
required
=
false
)
String
apiName
,
@RequestParam
(
required
=
false
)
String
apiCenterCode
,
@RequestParam
(
required
=
false
)
String
apiCenterCode
,
@RequestParam
(
required
=
false
)
Integer
pageNum
,
@RequestParam
(
required
=
false
)
Integer
pageNum
,
@RequestParam
(
required
=
false
)
Integer
pageSize
){
@RequestParam
(
required
=
false
)
Integer
pageSize
,
return
apiBasicManagementService
.
selectByCondition
(
apiCode
,
apiName
,
apiCenterCode
,
pageNum
,
pageSize
);
@RequestParam
(
required
=
false
)
String
apiGroupCode
)
{
return
apiBasicManagementService
.
selectByCondition
(
apiCode
,
apiName
,
apiCenterCode
,
pageNum
,
pageSize
,
apiGroupCode
);
}
}
@ApiOperation
(
"省侧-应用接入申请-查询组中所有中心"
)
@GetMapping
(
"/selectCentre"
)
public
ResponseVO
<
List
<
OcpApiGroup
>>
selectCentre
()
{
return
apiBasicManagementService
.
selectCentre
();
}
}
}
src/main/java/com/pms/ocp/mapper/ApiBasicManagementMapper.java
View file @
843352e1
...
@@ -18,5 +18,5 @@ public interface ApiBasicManagementMapper extends BaseMapper<OcpApiBase> {
...
@@ -18,5 +18,5 @@ public interface ApiBasicManagementMapper extends BaseMapper<OcpApiBase> {
List
<
OcpApiBase
>
selectByCondition
(
@Param
(
"apiCode"
)
String
apiCode
,
@Param
(
"apiName"
)
String
apiName
,
@Param
(
"apiCenterCode"
)
String
apiCenterCode
);
List
<
OcpApiBase
>
selectByCondition
(
@Param
(
"apiCode"
)
String
apiCode
,
@Param
(
"apiName"
)
String
apiName
,
@Param
(
"apiCenterCode"
)
String
apiCenterCode
,
@Param
(
"apiGroupCode"
)
String
apiGroupCode
);
}
}
src/main/java/com/pms/ocp/mapper/OcpTenantGroupMapper.java
View file @
843352e1
...
@@ -6,6 +6,7 @@ import com.pms.ocp.model.dto.GroupDto;
...
@@ -6,6 +6,7 @@ import com.pms.ocp.model.dto.GroupDto;
import
com.pms.ocp.model.dto.OcpTenantBaseDto
;
import
com.pms.ocp.model.dto.OcpTenantBaseDto
;
import
com.pms.ocp.model.dto.TenantDto
;
import
com.pms.ocp.model.dto.TenantDto
;
import
com.pms.ocp.model.entity.OcpApiGroup
;
import
com.pms.ocp.model.entity.OcpTenantGroup
;
import
com.pms.ocp.model.entity.OcpTenantGroup
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Mapper
;
...
@@ -22,4 +23,6 @@ public interface OcpTenantGroupMapper extends BaseMapper<OcpTenantGroup> {
...
@@ -22,4 +23,6 @@ public interface OcpTenantGroupMapper extends BaseMapper<OcpTenantGroup> {
List
<
GroupDto
>
selectBase
(
@Param
(
"tenantGroupCode"
)
String
tenantGroupCode
,
String
tenantGroupCompanyCode
);
List
<
GroupDto
>
selectBase
(
@Param
(
"tenantGroupCode"
)
String
tenantGroupCode
,
String
tenantGroupCompanyCode
);
List
<
OcpApiGroup
>
selectCentre
();
}
}
src/main/java/com/pms/ocp/service/ApiBasicManagementService.java
View file @
843352e1
...
@@ -7,6 +7,7 @@ import com.pms.ocp.model.dto.*;
...
@@ -7,6 +7,7 @@ import com.pms.ocp.model.dto.*;
import
com.pms.ocp.model.entity.OcpApiBase
;
import
com.pms.ocp.model.entity.OcpApiBase
;
import
com.pms.ocp.model.entity.OcpApiExtent
;
import
com.pms.ocp.model.entity.OcpApiExtent
;
import
com.pms.ocp.model.entity.OcpApiGroup
;
import
com.pms.ocp.model.entity.OcpApiGroup
;
import
com.pms.ocp.model.entity.OcpTenantGroup
;
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
;
...
@@ -80,15 +81,23 @@ public interface ApiBasicManagementService extends IService<OcpApiBase> {
...
@@ -80,15 +81,23 @@ public interface ApiBasicManagementService extends IService<OcpApiBase> {
*/
*/
List
<
OcpApiBase
>
apiBaseTreeApiList
(
String
apiGroupCompanyCode
,
String
apiGroupPcode
);
List
<
OcpApiBase
>
apiBaseTreeApiList
(
String
apiGroupCompanyCode
,
String
apiGroupPcode
);
/**
/**
* 省侧-应用接入申请-的模糊查询
* 省侧-应用接入申请-的模糊查询
* @param apiCode
* @param apiCode
* @param apiName
* @param apiName
* @param apiCenterCode
* @param apiCenterCode
* @param pageNum
* @param pageSize
* @param apiGroupCode
* @return
*/
ResponseVO
<
PageInfo
<
OcpApiBase
>>
selectByCondition
(
String
apiCode
,
String
apiName
,
String
apiCenterCode
,
Integer
pageNum
,
Integer
pageSize
,
String
apiGroupCode
);
/**
* 省侧-应用接入申请-查询组中所有中心
* @return
* @return
*/
*/
ResponseVO
<
PageInfo
<
OcpApiBase
>>
selectByCondition
(
String
apiCode
,
String
apiName
,
String
apiCenterCode
,
Integer
pageNum
,
Integer
pageSize
);
ResponseVO
<
List
<
OcpApiGroup
>>
selectCentre
(
);
// /**
// /**
// * 服务列表2
// * 服务列表2
...
...
src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java
View file @
843352e1
...
@@ -7,24 +7,19 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
...
@@ -7,24 +7,19 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import
com.github.pagehelper.PageHelper
;
import
com.github.pagehelper.PageHelper
;
import
com.github.pagehelper.PageInfo
;
import
com.github.pagehelper.PageInfo
;
import
com.pms.ocp.mapper.ApiBasicManagementMapper
;
import
com.pms.ocp.mapper.*
;
import
com.pms.ocp.mapper.OcpApiExtentMapper
;
import
com.pms.ocp.mapper.OcpApiGroupMapper
;
import
com.pms.ocp.mapper.OcpApiSubsMapper
;
import
com.pms.ocp.model.dto.ApiBaseDto
;
import
com.pms.ocp.model.dto.ApiBaseDto
;
import
com.pms.ocp.model.dto.OcpGroupBaseDto
;
import
com.pms.ocp.model.dto.OcpGroupBaseDto
;
import
com.pms.ocp.model.entity.OcpApiBase
;
import
com.pms.ocp.model.entity.*
;
import
com.pms.ocp.model.entity.OcpApiExtent
;
import
com.pms.ocp.model.entity.OcpApiGroup
;
import
com.pms.ocp.model.entity.OcpApiSubs
;
import
com.pms.ocp.model.vo.*
;
import
com.pms.ocp.model.vo.*
;
import
com.pms.ocp.service.ApiBasicManagementService
;
import
com.pms.ocp.service.ApiBasicManagementService
;
import
com.pms.ocp.service.OcpApiExtentService
;
import
com.pms.ocp.service.OcpApiExtentService
;
import
com.pms.ocp.service.OcpTenantGroupService
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
...
@@ -52,7 +47,10 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl<ApiBasicManagemen
...
@@ -52,7 +47,10 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl<ApiBasicManagemen
private
OcpApiExtentMapper
ocpApiExtentMapper
;
private
OcpApiExtentMapper
ocpApiExtentMapper
;
@Autowired
@Autowired
private
OcpApiGroupMapper
ocpApiGroupMapper
;
private
OcpApiGroupMapper
ocpApiGroupMapper
;
@Autowired
private
OcpTenantGroupMapper
ocpTenantGroupMapper
;
@Autowired
private
OcpTenantGroupService
ocpTenantGroupService
;
List
<
String
>
apiGroupCode
=
new
ArrayList
<>();
List
<
String
>
apiGroupCode
=
new
ArrayList
<>();
/**
/**
...
@@ -97,8 +95,6 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl<ApiBasicManagemen
...
@@ -97,8 +95,6 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl<ApiBasicManagemen
}
}
}
}
/**
/**
* 导入添加到数据库
* 导入添加到数据库
*
*
...
@@ -207,6 +203,8 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl<ApiBasicManagemen
...
@@ -207,6 +203,8 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl<ApiBasicManagemen
return
apiBasicManagementMapper
.
selectList
(
qw
);
return
apiBasicManagementMapper
.
selectList
(
qw
);
}
}
// /**
// /**
// * 服务列表2
// * 服务列表2
// * @param wholeLinkParamDto
// * @param wholeLinkParamDto
...
@@ -259,22 +257,45 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl<ApiBasicManagemen
...
@@ -259,22 +257,45 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl<ApiBasicManagemen
}
}
/**
/**
* 省侧-应用接入申请-的模糊查询
* 省侧-应用接入申请-的模糊查询
*
* @param apiCode
* @param apiCode
* @param apiName
* @param apiName
* @param apiCenterCode
* @param apiCenterCode
* @param apiGroupCode
* @param pageNum
* @param pageSize
* @return
* @return
*/
*/
@Override
public
ResponseVO
<
PageInfo
<
OcpApiBase
>>
selectByCondition
(
String
apiCode
,
String
apiName
,
String
apiCenterCode
,
Integer
pageNum
,
Integer
pageSiz
e
)
{
public
ResponseVO
<
PageInfo
<
OcpApiBase
>>
selectByCondition
(
String
apiCode
,
String
apiName
,
String
apiCenterCode
,
Integer
pageNum
,
Integer
pageSize
,
String
apiGroupCod
e
)
{
if
(
pageNum
==
null
||
pageSize
==
null
)
{
if
(
pageNum
==
null
||
pageSize
==
null
)
{
return
ResponseVO
.
error
(
"分页参数不能为空"
);
return
ResponseVO
.
error
(
"分页参数不能为空"
);
}
}
PageHelper
.
startPage
(
pageNum
,
pageSize
);
PageHelper
.
startPage
(
pageNum
,
pageSize
);
List
<
OcpApiBase
>
list
=
apiBasicManagementMapper
.
selectByCondition
(
apiCode
,
apiName
,
apiCenterCode
);
List
<
OcpApiBase
>
list
=
apiBasicManagementMapper
.
selectByCondition
(
apiCode
,
apiName
,
apiCenterCode
,
apiGroupCode
);
PageInfo
<
OcpApiBase
>
pageInfo
=
new
PageInfo
<>(
list
);
PageInfo
<
OcpApiBase
>
pageInfo
=
new
PageInfo
<>(
list
);
return
ResponseVO
.
ok
(
pageInfo
);
return
ResponseVO
.
ok
(
pageInfo
);
}
}
/**
* 省侧-应用接入申请-查询组中所有中心
*
* @return
*/
@Override
public
ResponseVO
<
List
<
OcpApiGroup
>>
selectCentre
()
{
// LambdaQueryWrapper<OcpTenantGroup> lambdaQueryWrapper = new LambdaQueryWrapper<>();
// lambdaQueryWrapper.eq(OcpTenantGroup::getLevel, "sys_center");
// List<OcpTenantGroup> ocpTenantGroups = ocpTenantGroupMapper.selectList(lambdaQueryWrapper);
// return ResponseVO.ok(ocpTenantGroups);
List
<
OcpApiGroup
>
ocpApiGroups
=
ocpTenantGroupMapper
.
selectCentre
();
ArrayList
<
OcpApiGroup
>
objects
=
new
ArrayList
<>();
for
(
OcpApiGroup
ocpApiGroup
:
ocpApiGroups
)
{
if
(
ocpApiGroup
.
getApiGroupLevel
().
equals
(
"sys_center"
))
{
objects
.
add
(
ocpApiGroup
);
}
}
return
ResponseVO
.
ok
(
objects
);
}
}
}
src/main/resources/mapper/ApiBasicManagementMapper.xml
View file @
843352e1
...
@@ -82,6 +82,9 @@
...
@@ -82,6 +82,9 @@
<if
test=
"apiCenterCode!=null and apiCenterCode!=''"
>
<if
test=
"apiCenterCode!=null and apiCenterCode!=''"
>
and api_center_code=#{apiCenterCode}
and api_center_code=#{apiCenterCode}
</if>
</if>
<if
test=
"apiGroupCode!=null and apiGroupCode!=''"
>
and api_group_code=#{apiGroupCode}
</if>
</where>
</where>
...
...
src/main/resources/mapper/OcpGroup.xml
View file @
843352e1
...
@@ -80,5 +80,8 @@
...
@@ -80,5 +80,8 @@
</if>
</if>
</where>
</where>
</select>
</select>
<select
id=
"selectCentre"
resultType=
"com.pms.ocp.model.entity.OcpApiGroup"
>
select api_group_code,api_group_name,api_group_level from ocp_api_group
</select>
</mapper>
</mapper>
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