Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
T
traffic-front
Project
Project
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wangxiaoming
traffic-front
Commits
c50d8ab7
Commit
c50d8ab7
authored
Nov 12, 2018
by
neo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[DEV] test excption handler with response enttity
parent
7e1e0fa9
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
6 deletions
+7
-6
ReportController.java
...in/java/pwc/taxtech/atms/controller/ReportController.java
+7
-6
No files found.
atms-api/src/main/java/pwc/taxtech/atms/controller/ReportController.java
View file @
c50d8ab7
...
@@ -33,10 +33,11 @@ public class ReportController {
...
@@ -33,10 +33,11 @@ public class ReportController {
return
reportService
.
getReportTemplate
(
projectId
,
EnumServiceType
.
getEnumByCode
(
serviceType
),
period
);
return
reportService
.
getReportTemplate
(
projectId
,
EnumServiceType
.
getEnumByCode
(
serviceType
),
period
);
}
}
@RequestMapping
(
value
=
"generateByTotal/{projectId}/{mergeManual}/{period}"
,
method
=
RequestMethod
.
POST
,
produces
=
MediaType
.
APPLICATION_JSON_UTF8_VALUE
)
@RequestMapping
(
value
=
"generateByTotal/{projectId}/{mergeManual}/{period}"
,
method
=
RequestMethod
.
POST
,
public
OperationResultDto
generateAllData
(
@PathVariable
String
projectId
,
@PathVariable
Integer
period
,
@RequestParam
Optional
<
String
>
generator
,
produces
=
MediaType
.
APPLICATION_JSON_UTF8_VALUE
)
@PathVariable
Boolean
mergeManual
)
{
public
ResponseEntity
generateAllData
(
@PathVariable
String
projectId
,
@PathVariable
Integer
period
,
return
reportService
.
generateData
(
projectId
,
EnumServiceType
.
VAT
,
mergeManual
,
period
,
null
,
generator
);
@RequestParam
Optional
<
String
>
generator
,
@PathVariable
Boolean
mergeManual
)
{
return
ResponseEntity
.
ok
(
reportService
.
generateData
(
projectId
,
EnumServiceType
.
VAT
,
mergeManual
,
period
,
null
,
generator
));
}
}
@RequestMapping
(
value
=
"getRunningJob/{projectId}/{period}"
,
method
=
RequestMethod
.
GET
,
produces
=
MediaType
.
APPLICATION_JSON_UTF8_VALUE
)
@RequestMapping
(
value
=
"getRunningJob/{projectId}/{period}"
,
method
=
RequestMethod
.
GET
,
produces
=
MediaType
.
APPLICATION_JSON_UTF8_VALUE
)
...
@@ -105,12 +106,12 @@ public class ReportController {
...
@@ -105,12 +106,12 @@ public class ReportController {
}
}
@RequestMapping
(
value
=
"addCellManualData"
,
method
=
RequestMethod
.
POST
,
produces
=
MediaType
.
APPLICATION_JSON_UTF8_VALUE
)
@RequestMapping
(
value
=
"addCellManualData"
,
method
=
RequestMethod
.
POST
,
produces
=
MediaType
.
APPLICATION_JSON_UTF8_VALUE
)
public
OperationResultDto
addCellManualDataSource
(
@RequestBody
ManualDataSourceDto
data
,
@RequestHeader
String
from
)
{
public
ResponseEntity
addCellManualDataSource
(
@RequestBody
ManualDataSourceDto
data
,
@RequestHeader
String
from
)
{
String
projectId
=
StringUtils
.
EMPTY
;
String
projectId
=
StringUtils
.
EMPTY
;
if
(
StringUtils
.
isNotBlank
(
from
)
&&
from
.
split
(
"@"
).
length
>
0
)
{
if
(
StringUtils
.
isNotBlank
(
from
)
&&
from
.
split
(
"@"
).
length
>
0
)
{
projectId
=
from
.
split
(
"@"
)[
0
];
projectId
=
from
.
split
(
"@"
)[
0
];
}
}
return
reportService
.
addCellManualDataSource
(
data
,
from
);
return
ResponseEntity
.
ok
(
reportService
.
addCellManualDataSource
(
data
,
from
)
);
}
}
@RequestMapping
(
value
=
"addDataSource"
,
method
=
RequestMethod
.
POST
,
produces
=
MediaType
.
APPLICATION_JSON_UTF8_VALUE
)
@RequestMapping
(
value
=
"addDataSource"
,
method
=
RequestMethod
.
POST
,
produces
=
MediaType
.
APPLICATION_JSON_UTF8_VALUE
)
...
...
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