Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Z
zhny
Project
Project
Details
Activity
Releases
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
王夏晖
zhny
Commits
61ccebf8
Commit
61ccebf8
authored
May 10, 2018
by
王夏晖
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改返回前台数据,为null的列不过滤
parent
9d94f300
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
BusDeviceTpController.java
...oft/business/manage/controller/BusDeviceTpController.java
+5
-2
application-dev.yml
src/main/resources/application-dev.yml
+1
-1
No files found.
src/main/java/org/rcisoft/business/manage/controller/BusDeviceTpController.java
View file @
61ccebf8
...
@@ -2,6 +2,9 @@ package org.rcisoft.business.manage.controller;
...
@@ -2,6 +2,9 @@ package org.rcisoft.business.manage.controller;
/*固定导入*/
/*固定导入*/
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSONObject
;
import
com.alibaba.fastjson.serializer.SerializerFeature
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiOperation
;
import
org.rcisoft.business.manage.entity.BusDeviceTp
;
import
org.rcisoft.business.manage.entity.BusDeviceTp
;
import
org.rcisoft.business.manage.service.BusDeviceTpService
;
import
org.rcisoft.business.manage.service.BusDeviceTpService
;
...
@@ -61,8 +64,8 @@ public class BusDeviceTpController extends PaginationController<BusDeviceTp> {
...
@@ -61,8 +64,8 @@ public class BusDeviceTpController extends PaginationController<BusDeviceTp> {
@ApiOperation
(
value
=
"设备类型列表"
,
notes
=
"设备类型列表"
)
@ApiOperation
(
value
=
"设备类型列表"
,
notes
=
"设备类型列表"
)
@GetMapping
(
value
=
"/queryBusDeviceTpList"
)
@GetMapping
(
value
=
"/queryBusDeviceTpList"
)
public
List
<
Map
<
String
,
Object
>>
queryBusDeviceTpList
(
@RequestParam
String
proId
)
{
public
String
queryBusDeviceTpList
(
@RequestParam
String
proId
)
{
return
busDeviceTpServiceImpl
.
queryBusDeviceTpList
(
proId
);
return
JSON
.
toJSONString
(
busDeviceTpServiceImpl
.
queryBusDeviceTpList
(
proId
),
SerializerFeature
.
WriteMapNullValue
);
}
}
@RequestMapping
(
"/upload"
)
@RequestMapping
(
"/upload"
)
...
...
src/main/resources/application-dev.yml
View file @
61ccebf8
...
@@ -39,7 +39,7 @@ pagehelper:
...
@@ -39,7 +39,7 @@ pagehelper:
spring
:
spring
:
jackson
:
jackson
:
default-property-inclusion
:
non_null
#http:
#http:
# encoding:
# encoding:
# force: true
# force: true
...
...
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