Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
map-parent
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
常超
map-parent
Commits
ba9d5ccf
Commit
ba9d5ccf
authored
Dec 15, 2022
by
宋珺琪
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
服务概述导出bug处理(重庆)
parent
116bd433
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
75 additions
and
28 deletions
+75
-28
common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/SkService.java
+4
-0
common/service_base/src/main/java/com/founder/servicebase/controller/SkServiceApplyController.java
+18
-18
common/service_base/src/main/java/com/founder/servicebase/controller/SkServiceController.java
+14
-3
common/service_base/src/main/java/com/founder/servicebase/logs/controller/SkSysLogController.java
+9
-4
service/publicapi/src/main/java/com/founder/publicapi/controller/SkDataOperation/SkServiceSqController.java
+30
-3
No files found.
common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/SkService.java
View file @
ba9d5ccf
...
...
@@ -2,6 +2,7 @@ package com.founder.commonutils.model.newPublicEntity;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.baomidou.mybatisplus.extension.activerecord.Model
;
...
...
@@ -92,6 +93,9 @@ public class SkService extends Model<SkService> {
@TableId
(
type
=
IdType
.
INPUT
)
/**信息主键编号(生成FW开头)*/
private
String
xxzjbh
;
@TableField
(
exist
=
false
)
private
String
byzd1
;
/**
* 获取主键值
*
...
...
common/service_base/src/main/java/com/founder/servicebase/controller/SkServiceApplyController.java
View file @
ba9d5ccf
...
...
@@ -188,27 +188,27 @@ public class SkServiceApplyController extends ApiController {
@ApiOperation
(
value
=
"服务授权列表信息导出"
)
@OperLog
(
message
=
"服务授权列表信息导出"
,
operation
=
OperationType
.
QUERY
)
public
void
export
(
HttpServletResponse
response
,
@RequestBody
SkServiceApplyParam
skRegionalsDetailParam
)
throws
Exception
{
QueryWrapper
queryWrapper
=
new
QueryWrapper
<>();
if
(
skRegionalsDetailParam
.
getServicename
()!=
null
&&
!
skRegionalsDetailParam
.
getServicename
().
equals
(
""
)){
queryWrapper
.
like
(
"servicename"
,
skRegionalsDetailParam
.
getServicename
());
}
if
(
skRegionalsDetailParam
.
getServicems
()!=
null
&&
!
skRegionalsDetailParam
.
getServicems
().
equals
(
""
)){
queryWrapper
.
like
(
"servicems"
,
skRegionalsDetailParam
.
getServicems
());
}
if
(
skRegionalsDetailParam
.
getApplygs
()!=
null
&&
!
skRegionalsDetailParam
.
getApplygs
().
equals
(
""
)){
queryWrapper
.
like
(
"applygs"
,
skRegionalsDetailParam
.
getApplygs
());
}
if
(
skRegionalsDetailParam
.
getApplyurl
()!=
null
&&
!
skRegionalsDetailParam
.
getApplyurl
().
equals
(
""
)){
queryWrapper
.
like
(
"applyurl"
,
skRegionalsDetailParam
.
getApplyurl
());
}
Map
<
String
,
Object
>
all
=
skServiceApplyService
.
findAll
(
skRegionalsDetailParam
);
Integer
count
=
(
Integer
)
all
.
get
(
"count"
);
List
<
SkServiceApplyVO
>
list
=
(
List
<
SkServiceApplyVO
>)
all
.
get
(
"list"
);
queryWrapper
.
orderByDesc
(
"sqsj"
);
for
(
SkServiceApplyVO
ls
:
list
)
{
List
list
=
skServiceApplyService
.
list
(
queryWrapper
);
ExportExcelUtil
<
SkService
>
exportExcelUtil
=
new
ExportExcelUtil
<>();
String
[]
headersName
=
{
"服务名称"
,
"服务描述"
,
"申请公司"
,
"申请ip"
,
"申请时效"
,
"token值"
,
"备注"
};
String
[]
headersField
=
{
"servicename"
,
"servicems"
,
"applygs"
,
"applyurl"
,
"time"
,
"token"
,
"content"
};
String
status
=
ls
.
getStatus
();
if
(
status
.
equals
(
"0"
)){
ls
.
setStatus
(
"未授权"
);
}
else
if
(
status
.
equals
(
"1"
)){
ls
.
setStatus
(
"已授权"
);
}
else
if
(
status
.
equals
(
"2"
)){
ls
.
setStatus
(
"撤销"
);
}
else
if
(
status
.
equals
(
"3"
)){
ls
.
setStatus
(
"失效"
);
}
}
ExportExcelUtil
<
SkServiceApplyVO
>
exportExcelUtil
=
new
ExportExcelUtil
<>();
String
[]
headersName
=
{
"服务名称"
,
"服务描述"
,
"申请公司"
,
"申请ip"
,
"申请时间"
,
"授权时间"
,
"用户鉴权"
,
"备注"
,
"授权状态"
};
String
[]
headersField
=
{
"servicename"
,
"servicems"
,
"applygs"
,
"applyurl"
,
"sqsj"
,
"ssqsj"
,
"token"
,
"content"
,
"status"
};
exportExcelUtil
.
exportExcel
(
"DataStatistics"
,
headersName
,
headersField
,
list
,
response
,
"服务授权列表信息"
);
}
...
...
common/service_base/src/main/java/com/founder/servicebase/controller/SkServiceController.java
View file @
ba9d5ccf
...
...
@@ -28,6 +28,7 @@ import org.springframework.web.multipart.MultipartFile;
import
javax.annotation.Resource
;
import
javax.servlet.http.HttpServletResponse
;
import
java.io.IOException
;
import
java.text.SimpleDateFormat
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.Map
;
...
...
@@ -237,10 +238,20 @@ public class SkServiceController extends ApiController {
queryWrapper
.
eq
(
"isDeleted"
,
"0"
);
queryWrapper
.
orderByDesc
(
"cjsj"
);
List
list
=
skServiceService
.
list
(
queryWrapper
);
List
<
SkService
>
list
=
skServiceService
.
list
(
queryWrapper
);
for
(
SkService
skService
:
list
)
{
if
(
skService
.
getCjsj
()!=
null
){
Date
djsj
=
skService
.
getCjsj
();
SimpleDateFormat
sdf
=
new
SimpleDateFormat
(
"yyyy年MM月dd日 HH:mm:ss"
);
String
format
=
sdf
.
format
(
djsj
);
System
.
out
.
println
(
sdf
.
format
(
djsj
));
skService
.
setByzd1
(
format
);
}
}
ExportExcelUtil
<
SkService
>
exportExcelUtil
=
new
ExportExcelUtil
<>();
String
[]
headersName
=
{
"服务
id"
,
"服务名称"
,
"服务地址"
,
"服务描述"
,
"请求方式"
,
"请求参数"
,
"返回类型"
,
"返回参数"
,
"创建时间"
,
"状态
"
};
String
[]
headersField
=
{
"
xxzjbh"
,
"servicename"
,
"serviceurl"
,
"servicems"
,
"type"
,
"params"
,
"contenttype"
,
"content"
,
"cjsj"
,
"flag
"
};
String
[]
headersName
=
{
"服务
名称"
,
"服务地址"
,
"服务描述"
,
"服务类型"
,
"服务来源"
,
"请求方式"
,
"请求参数"
,
"返回类型"
,
"返回参数"
,
"创建时间
"
};
String
[]
headersField
=
{
"
servicename"
,
"serviceurl"
,
"servicems"
,
"servicetypename"
,
"fwly"
,
"type"
,
"params"
,
"contenttype"
,
"content"
,
"byzd1
"
};
exportExcelUtil
.
exportExcel
(
"DataStatistics"
,
headersName
,
headersField
,
list
,
response
,
"服务列表信息"
);
}
...
...
common/service_base/src/main/java/com/founder/servicebase/logs/controller/SkSysLogController.java
View file @
ba9d5ccf
...
...
@@ -127,11 +127,16 @@ public class SkSysLogController {
}
queryWrapper
.
orderByDesc
(
"createDate"
);
List
list
=
service
.
list
(
queryWrapper
);
ExportExcelUtil
<
SkService
>
exportExcelUtil
=
new
ExportExcelUtil
<>();
List
<
SkSysLog
>
list
=
service
.
list
(
queryWrapper
);
List
<
SkSysLog
>
newList
=
new
ArrayList
<>();
for
(
SkSysLog
s
:
list
)
{
s
.
setContent
(
StringUtil
.
toUTF8
(
s
.
getContent
()));
newList
.
add
(
s
);
}
ExportExcelUtil
<
SkSysLog
>
exportExcelUtil
=
new
ExportExcelUtil
<>();
String
[]
headersName
=
{
"用户id"
,
"方法名"
,
"ip"
,
"请求url"
,
"传入参数"
,
"返回参数"
,
"响应时长"
,
"访问时间"
};
String
[]
headersField
=
{
"
id"
,
"method
"
,
"ip"
,
"url"
,
"params"
,
"content"
,
"totaltime"
,
"createdate"
};
exportExcelUtil
.
exportExcel
(
"DataStatistics"
,
headersName
,
headersField
,
l
ist
,
response
,
"日志列表信息"
);
String
[]
headersField
=
{
"
userid"
,
"message
"
,
"ip"
,
"url"
,
"params"
,
"content"
,
"totaltime"
,
"createdate"
};
exportExcelUtil
.
exportExcel
(
"DataStatistics"
,
headersName
,
headersField
,
newL
ist
,
response
,
"日志列表信息"
);
}
@ApiOperation
(
value
=
"统计"
)
@OperLog
(
message
=
"统计"
,
operation
=
OperationType
.
QUERY
)
...
...
service/publicapi/src/main/java/com/founder/publicapi/controller/SkDataOperation/SkServiceSqController.java
View file @
ba9d5ccf
...
...
@@ -21,6 +21,8 @@ import org.springframework.web.bind.annotation.RestController;
import
javax.annotation.Resource
;
import
javax.servlet.http.HttpServletResponse
;
import
java.text.SimpleDateFormat
;
import
java.util.Date
;
import
java.util.List
;
/**
...
...
@@ -60,6 +62,14 @@ public class SkServiceSqController {
if
(
skRegionalsDetailParam
.
getDes
()!=
null
&&
!
skRegionalsDetailParam
.
getDes
().
equals
(
""
)){
queryWrapper
.
like
(
"serviceMs"
,
skRegionalsDetailParam
.
getDes
());
}
//服务来源
if
(
skRegionalsDetailParam
.
getFwly
()!=
null
&&
!
skRegionalsDetailParam
.
getFwly
().
equals
(
""
)){
queryWrapper
.
like
(
"fwly"
,
skRegionalsDetailParam
.
getFwly
());
}
//服务类型
if
(
skRegionalsDetailParam
.
getServicetypename
()!=
null
&&
!
skRegionalsDetailParam
.
getServicetypename
().
equals
(
""
)){
queryWrapper
.
eq
(
"serviceTypeName"
,
skRegionalsDetailParam
.
getServicetypename
());
}
queryWrapper
.
eq
(
"isDeleted"
,
"0"
);
queryWrapper
.
eq
(
"flag"
,
"1"
);
...
...
@@ -86,15 +96,32 @@ public class SkServiceSqController {
if
(
skRegionalsDetailParam
.
getDes
()!=
null
&&
!
skRegionalsDetailParam
.
getDes
().
equals
(
""
)){
queryWrapper
.
like
(
"serviceMs"
,
skRegionalsDetailParam
.
getDes
());
}
//服务来源
if
(
skRegionalsDetailParam
.
getFwly
()!=
null
&&
!
skRegionalsDetailParam
.
getFwly
().
equals
(
""
)){
queryWrapper
.
like
(
"fwly"
,
skRegionalsDetailParam
.
getFwly
());
}
//服务类型
if
(
skRegionalsDetailParam
.
getServicetypename
()!=
null
&&
!
skRegionalsDetailParam
.
getServicetypename
().
equals
(
""
)){
queryWrapper
.
eq
(
"serviceTypeName"
,
skRegionalsDetailParam
.
getServicetypename
());
}
queryWrapper
.
eq
(
"isDeleted"
,
"0"
);
queryWrapper
.
eq
(
"flag"
,
"1"
);
queryWrapper
.
orderByDesc
(
"cjsj"
);
List
list
=
skServiceService
.
list
(
queryWrapper
);
List
<
SkService
>
list
=
skServiceService
.
list
(
queryWrapper
);
for
(
SkService
skService
:
list
)
{
if
(
skService
.
getCjsj
()!=
null
){
Date
djsj
=
skService
.
getCjsj
();
SimpleDateFormat
sdf
=
new
SimpleDateFormat
(
"yyyy年MM月dd日 HH:mm:ss"
);
String
format
=
sdf
.
format
(
djsj
);
System
.
out
.
println
(
sdf
.
format
(
djsj
));
skService
.
setByzd1
(
format
);
}
}
ExportExcelUtil
<
SkService
>
exportExcelUtil
=
new
ExportExcelUtil
<>();
String
[]
headersName
=
{
"服务
id"
,
"服务名称"
,
"服务地址"
,
"服务描述
"
,
"请求方式"
,
"请求参数"
,
"返回类型"
,
"返回参数"
,
"创建时间"
};
String
[]
headersField
=
{
"
xxzjbh"
,
"servicename"
,
"serviceurl"
,
"servicems"
,
"type"
,
"params"
,
"contenttype"
,
"content"
,
"cjsj
"
};
String
[]
headersName
=
{
"服务
名称"
,
"服务地址"
,
"服务描述"
,
"服务类型"
,
"服务来源
"
,
"请求方式"
,
"请求参数"
,
"返回类型"
,
"返回参数"
,
"创建时间"
};
String
[]
headersField
=
{
"
servicename"
,
"serviceurl"
,
"servicems"
,
"servicetypename"
,
"fwly"
,
"type"
,
"params"
,
"contenttype"
,
"content"
,
"byzd1
"
};
exportExcelUtil
.
exportExcel
(
"DataStatistics"
,
headersName
,
headersField
,
list
,
response
,
"服务申请列表信息"
);
}
...
...
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