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
cc6c65be
Commit
cc6c65be
authored
Mar 23, 2022
by
郭凡凡
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
加上author
parent
6239780a
Changes
12
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
33 additions
and
12 deletions
+33
-12
src/main/java/com/pms/ocp/common/utils/FileExport.java
src/main/java/com/pms/ocp/common/utils/FileExport.java
+1
-1
src/main/java/com/pms/ocp/common/utils/FileUtil.java
src/main/java/com/pms/ocp/common/utils/FileUtil.java
+2
-0
src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java
.../com/pms/ocp/controller/ApiBasicManagementController.java
+6
-1
src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java
...m/pms/ocp/controller/TenantBasicManagementController.java
+3
-1
src/main/java/com/pms/ocp/mapper/ApiBasicManagementMapper.java
...ain/java/com/pms/ocp/mapper/ApiBasicManagementMapper.java
+3
-1
src/main/java/com/pms/ocp/model/dto/TenanBaseDto.java
src/main/java/com/pms/ocp/model/dto/TenanBaseDto.java
+4
-3
src/main/java/com/pms/ocp/model/dto/TenantDto.java
src/main/java/com/pms/ocp/model/dto/TenantDto.java
+1
-1
src/main/java/com/pms/ocp/model/vo/Menu.java
src/main/java/com/pms/ocp/model/vo/Menu.java
+3
-1
src/main/java/com/pms/ocp/model/vo/OcpApiBaseVo.java
src/main/java/com/pms/ocp/model/vo/OcpApiBaseVo.java
+3
-1
src/main/java/com/pms/ocp/service/ApiBasicManagementService.java
...n/java/com/pms/ocp/service/ApiBasicManagementService.java
+3
-1
src/main/java/com/pms/ocp/service/TenantBasicManagementService.java
...ava/com/pms/ocp/service/TenantBasicManagementService.java
+3
-0
src/main/resources/mapper/OcpGroup.xml
src/main/resources/mapper/OcpGroup.xml
+1
-1
No files found.
src/main/java/com/pms/ocp/common/utils/FileExport.java
View file @
cc6c65be
...
...
@@ -26,7 +26,7 @@ import java.util.Map;
/**
* 文件导出工具
* @author
abc
* @author
guofanfan
* @date 2019/01/08
*/
public
class
FileExport
{
...
...
src/main/java/com/pms/ocp/common/utils/FileUtil.java
View file @
cc6c65be
...
...
@@ -9,6 +9,8 @@ import java.util.NoSuchElementException;
/**
* 导入工具类
* @author guofanfan
*
*/
public
class
FileUtil
{
public
static
<
T
>
List
<
T
>
importExcel
(
MultipartFile
file
,
Integer
titleRows
,
Integer
headerRows
,
Class
<
T
>
pojoClass
)
...
...
src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java
View file @
cc6c65be
...
...
@@ -29,6 +29,9 @@ import java.util.Collections;
import
java.util.List
;
import
java.util.stream.Collectors
;
/**
* @author guofanfan
*/
@Slf4j
@RequestMapping
(
"/api/basic"
)
@RestController
...
...
@@ -144,6 +147,8 @@ public class ApiBasicManagementController {
// log.error("xx:",ex);
// }
//}
@ApiOperation
(
"下载模块"
)
@GetMapping
(
"/downloadExcel"
)
public
void
downloadExcel
(
HttpServletResponse
response
,
HttpServletRequest
request
)
{
...
...
@@ -182,7 +187,7 @@ public class ApiBasicManagementController {
return
ResponseVO
.
error
(
"不能为空"
);
}
else
if
(
apiPromotion
.
equals
(
"0"
))
{
return
ResponseVO
.
error
(
"统招"
);
}
else
{
}
else
{
return
apiBasicManagementService
.
apiIssue
(
apiCodes
);
}
...
...
src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java
View file @
cc6c65be
...
...
@@ -21,7 +21,9 @@ import org.springframework.web.bind.annotation.*;
import
javax.servlet.http.HttpServletRequest
;
import
java.sql.Timestamp
;
import
java.util.List
;
/**
* @author guofanfan
*/
@Slf4j
@RequestMapping
(
"/tenant/basic"
)
@RestController
...
...
src/main/java/com/pms/ocp/mapper/ApiBasicManagementMapper.java
View file @
cc6c65be
...
...
@@ -9,7 +9,9 @@ import org.apache.ibatis.annotations.Param;
import
java.sql.Timestamp
;
import
java.util.List
;
/**
* @author guofanfan
*/
@Mapper
public
interface
ApiBasicManagementMapper
extends
BaseMapper
<
OcpApiBase
>
{
List
<
OcpApiBaseVo
>
selectApiExport
(
List
<
String
>
list
);
...
...
src/main/java/com/pms/ocp/model/dto/TenanBaseDto.java
View file @
cc6c65be
...
...
@@ -228,7 +228,8 @@ public class TenanBaseDto extends OcpTenantGroup {
this
.
tenantGroupLevel
=
tenantGroupLevel
;
}
public
void
setClassIfy
(
String
classIfy
)
{
this
.
classIfy
=
classIfy
;
}
// public OcpTenantGroup setClassIfy(String classIfy) {
// this.classIfy = classIfy;
// return null;
// }
}
src/main/java/com/pms/ocp/model/dto/TenantDto.java
View file @
cc6c65be
src/main/java/com/pms/ocp/model/vo/Menu.java
View file @
cc6c65be
...
...
@@ -6,7 +6,9 @@ import lombok.Data;
import
java.io.Serializable
;
import
java.util.List
;
/**
* @author guofanfan
*/
@Data
@ApiModel
(
value
=
"菜单栏目Vo"
,
description
=
"菜单栏目Vo"
)
public
class
Menu
implements
Serializable
{
...
...
src/main/java/com/pms/ocp/model/vo/OcpApiBaseVo.java
View file @
cc6c65be
...
...
@@ -11,7 +11,9 @@ import org.springframework.beans.factory.annotation.Value;
import
java.io.Serializable
;
import
java.sql.Timestamp
;
import
java.time.LocalDateTime
;
/**
* @author guofanfan
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
...
...
src/main/java/com/pms/ocp/service/ApiBasicManagementService.java
View file @
cc6c65be
...
...
@@ -15,7 +15,9 @@ import com.pms.ocp.model.vo.ResponseVO;
import
java.sql.Timestamp
;
import
java.util.List
;
/**
* @author guofanfan
*/
public
interface
ApiBasicManagementService
extends
IService
<
OcpApiBase
>
{
/**
* 导出的查询
...
...
src/main/java/com/pms/ocp/service/TenantBasicManagementService.java
View file @
cc6c65be
...
...
@@ -15,6 +15,9 @@ import com.pms.ocp.model.vo.ResponseVO;
import
java.sql.Timestamp
;
import
java.util.List
;
/**
* @author guofanfan
*/
public
interface
TenantBasicManagementService
extends
IService
<
OcpTenantBase
>
{
/**
* 条件查询
...
...
src/main/resources/mapper/OcpGroup.xml
View file @
cc6c65be
...
...
@@ -9,7 +9,7 @@
<result
property=
"tenantUrl"
column=
"tenant_url"
/>
<result
property=
"clusterName"
column=
"cluster_name"
/>
<result
property=
"spaceName"
column=
"space_name"
/>
<result
property=
"deploymentName"
column=
"deployment_name"
/
>
<!-- <result property="deploymentName" column="deployment_name"/>--
>
<result
property=
"tenantZone"
column=
"tenant_zone"
/>
<result
property=
"tenantCtime"
column=
"tenant_ctime"
/>
<result
property=
"tenantUnit"
column=
"tenant_unit"
jdbcType=
"VARCHAR"
/>
...
...
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