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
4bf4f957
Commit
4bf4f957
authored
Apr 16, 2019
by
sam.x.wang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交sso问题
parent
c47bd1cc
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
36 additions
and
34 deletions
+36
-34
IndexController.java
...java/pwc/taxtech/atms/web/controller/IndexController.java
+5
-1
OrangeHeapController.java
...pwc/taxtech/atms/web/controller/OrangeHeapController.java
+31
-33
OrangeHeapService.java
.../java/pwc/taxtech/atms/web/service/OrangeHeapService.java
+0
-0
No files found.
atms-web/src/main/java/pwc/taxtech/atms/web/controller/IndexController.java
View file @
4bf4f957
...
...
@@ -116,6 +116,10 @@ public class IndexController {
try
{
logger
.
info
(
"jumpto="
+
jumpto
+
"code="
+
code
);
String
ticketStr
=
getTicket
(
code
);
Cookie
ddTicket
=
new
Cookie
(
"ddTicket"
,
URLEncoder
.
encode
(
ticketStr
,
"UTF-8"
));
ddTicket
.
setPath
(
"/"
);
ddTicket
.
setMaxAge
(
18000
);
response
.
addCookie
(
ddTicket
);
response
.
sendRedirect
(
jumpto
+
"?code="
+
code
+
"&ticketStr="
+
ticketStr
);
}
catch
(
Exception
e
)
{
logger
.
error
(
"ddSSOCallback error"
,
e
);
...
...
@@ -212,7 +216,7 @@ public class IndexController {
public
String
getCookie
(
HttpServletRequest
request
,
HttpServletResponse
response
)
{
orangeHeapService
.
getDDTicketByCookie
();
orangeHeapService
.
getDDTicketByCookie
(
request
);
return
null
;
}
...
...
atms-web/src/main/java/pwc/taxtech/atms/web/controller/OrangeHeapController.java
View file @
4bf4f957
...
...
@@ -4,8 +4,6 @@ package pwc.taxtech.atms.web.controller;
import
org.apache.commons.lang3.StringUtils
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.ResponseBody
;
...
...
@@ -14,7 +12,7 @@ import pwc.taxtech.atms.dto.ApiResultDto;
import
pwc.taxtech.atms.web.service.OrangeHeapService
;
import
javax.annotation.Resource
;
import
java
.util.Optional
;
import
java
x.servlet.http.HttpServletRequest
;
@RestController
@RequestMapping
(
"/OrangeHeap"
)
...
...
@@ -36,94 +34,94 @@ public class OrangeHeapController {
@ResponseBody
@GetMapping
(
"getTableauTaxCategoryUnreturnedTax"
)
public
ApiResultDto
getTableauTaxCategoryUnreturnedTax
()
{
public
ApiResultDto
getTableauTaxCategoryUnreturnedTax
(
HttpServletRequest
request
)
{
logger
.
info
(
"进入税种未返还税金分析=~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
);
return
ApiResultDto
.
success
(
tableauService
.
getTableauTaxCategoryUnreturnedTax
().
orElse
(
StringUtils
.
EMPTY
));
return
ApiResultDto
.
success
(
tableauService
.
getTableauTaxCategoryUnreturnedTax
(
request
).
orElse
(
StringUtils
.
EMPTY
));
}
@ResponseBody
@GetMapping
(
"getTableauDistrictUnreturnedTax"
)
public
ApiResultDto
getTableauDistrictUnreturnedTax
()
{
public
ApiResultDto
getTableauDistrictUnreturnedTax
(
HttpServletRequest
request
)
{
logger
.
info
(
"地区未返还税金分析=~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
);
return
ApiResultDto
.
success
(
tableauService
.
getTableauDistrictUnreturnedTax
().
orElse
(
StringUtils
.
EMPTY
));
return
ApiResultDto
.
success
(
tableauService
.
getTableauDistrictUnreturnedTax
(
request
).
orElse
(
StringUtils
.
EMPTY
));
}
@ResponseBody
@GetMapping
(
"getTableauUnreturnedAndReturnedTax"
)
public
ApiResultDto
getTableauUnreturnedAndReturnedTax
()
{
return
ApiResultDto
.
success
(
tableauService
.
getTableauUnreturnedAndReturnedTax
().
orElse
(
StringUtils
.
EMPTY
));
public
ApiResultDto
getTableauUnreturnedAndReturnedTax
(
HttpServletRequest
request
)
{
return
ApiResultDto
.
success
(
tableauService
.
getTableauUnreturnedAndReturnedTax
(
request
).
orElse
(
StringUtils
.
EMPTY
));
}
@ResponseBody
@GetMapping
(
"getTableauCostAnalysis"
)
public
ApiResultDto
getTableauCostAnalysis
()
{
return
ApiResultDto
.
success
(
tableauService
.
getTableauCostAnalysis
().
orElse
(
StringUtils
.
EMPTY
));
public
ApiResultDto
getTableauCostAnalysis
(
HttpServletRequest
request
)
{
return
ApiResultDto
.
success
(
tableauService
.
getTableauCostAnalysis
(
request
).
orElse
(
StringUtils
.
EMPTY
));
}
@ResponseBody
@GetMapping
(
"getTableauDistrictProfitAndLoss"
)
public
ApiResultDto
getTableauDistrictProfitAndLoss
()
{
return
ApiResultDto
.
success
(
tableauService
.
getTableauDistrictProfitAndLoss
().
orElse
(
StringUtils
.
EMPTY
));
public
ApiResultDto
getTableauDistrictProfitAndLoss
(
HttpServletRequest
request
)
{
return
ApiResultDto
.
success
(
tableauService
.
getTableauDistrictProfitAndLoss
(
request
).
orElse
(
StringUtils
.
EMPTY
));
}
@ResponseBody
@GetMapping
(
"getTableauCompanyProfitAndLoss"
)
public
ApiResultDto
getTableauCompanyProfitAndLoss
()
{
return
ApiResultDto
.
success
(
tableauService
.
getTableauCompanyProfitAndLoss
().
orElse
(
StringUtils
.
EMPTY
));
public
ApiResultDto
getTableauCompanyProfitAndLoss
(
HttpServletRequest
request
)
{
return
ApiResultDto
.
success
(
tableauService
.
getTableauCompanyProfitAndLoss
(
request
).
orElse
(
StringUtils
.
EMPTY
));
}
@ResponseBody
@GetMapping
(
"getTableauDriverAndEmployee"
)
public
ApiResultDto
getTableauDriverAndEmployee
()
{
return
ApiResultDto
.
success
(
tableauService
.
getTableauDriverAndEmployee
().
orElse
(
StringUtils
.
EMPTY
));
public
ApiResultDto
getTableauDriverAndEmployee
(
HttpServletRequest
request
)
{
return
ApiResultDto
.
success
(
tableauService
.
getTableauDriverAndEmployee
(
request
).
orElse
(
StringUtils
.
EMPTY
));
}
@ResponseBody
@GetMapping
(
"getTableauGmvAndSubsidy"
)
public
ApiResultDto
getTableauGmvAndSubsidy
()
{
return
ApiResultDto
.
success
(
tableauService
.
getTableauGmvAndSubsidy
().
orElse
(
StringUtils
.
EMPTY
));
public
ApiResultDto
getTableauGmvAndSubsidy
(
HttpServletRequest
request
)
{
return
ApiResultDto
.
success
(
tableauService
.
getTableauGmvAndSubsidy
(
request
).
orElse
(
StringUtils
.
EMPTY
));
}
@ResponseBody
@GetMapping
(
"getTableauFileArrangement"
)
public
ApiResultDto
getTableauFileArrangement
()
{
return
ApiResultDto
.
success
(
tableauService
.
getTableauFileArrangement
().
orElse
(
StringUtils
.
EMPTY
));
public
ApiResultDto
getTableauFileArrangement
(
HttpServletRequest
request
)
{
return
ApiResultDto
.
success
(
tableauService
.
getTableauFileArrangement
(
request
).
orElse
(
StringUtils
.
EMPTY
));
}
@ResponseBody
@GetMapping
(
"getTableauGlobalOverview"
)
public
ApiResultDto
getTableauGlobalOverview
()
{
return
ApiResultDto
.
success
(
tableauService
.
getTableauGlobalOverview
().
orElse
(
StringUtils
.
EMPTY
));
public
ApiResultDto
getTableauGlobalOverview
(
HttpServletRequest
request
)
{
return
ApiResultDto
.
success
(
tableauService
.
getTableauGlobalOverview
(
request
).
orElse
(
StringUtils
.
EMPTY
));
}
@ResponseBody
@GetMapping
(
"getTableauGlobalBusiness"
)
public
ApiResultDto
getTableauGlobalBusiness
()
{
return
ApiResultDto
.
success
(
tableauService
.
getTableauGlobalBusiness
().
orElse
(
StringUtils
.
EMPTY
));
public
ApiResultDto
getTableauGlobalBusiness
(
HttpServletRequest
request
)
{
return
ApiResultDto
.
success
(
tableauService
.
getTableauGlobalBusiness
(
request
).
orElse
(
StringUtils
.
EMPTY
));
}
@ResponseBody
@GetMapping
(
"getTableauMexicanTax"
)
public
ApiResultDto
getTableauMexicanTax
()
{
return
ApiResultDto
.
success
(
tableauService
.
getTableauMexicanTax
().
orElse
(
StringUtils
.
EMPTY
));
public
ApiResultDto
getTableauMexicanTax
(
HttpServletRequest
request
)
{
return
ApiResultDto
.
success
(
tableauService
.
getTableauMexicanTax
(
request
).
orElse
(
StringUtils
.
EMPTY
));
}
@ResponseBody
@GetMapping
(
"getTableauAustralianTax"
)
public
ApiResultDto
getTableauAustralianTax
()
{
return
ApiResultDto
.
success
(
tableauService
.
getTableauAustralianTax
().
orElse
(
StringUtils
.
EMPTY
));
public
ApiResultDto
getTableauAustralianTax
(
HttpServletRequest
request
)
{
return
ApiResultDto
.
success
(
tableauService
.
getTableauAustralianTax
(
request
).
orElse
(
StringUtils
.
EMPTY
));
}
@ResponseBody
@GetMapping
(
"getTableauBrazilianTax"
)
public
ApiResultDto
getTableauBrazilianTax
()
{
return
ApiResultDto
.
success
(
tableauService
.
getTableauBrazilianTax
().
orElse
(
StringUtils
.
EMPTY
));
public
ApiResultDto
getTableauBrazilianTax
(
HttpServletRequest
request
)
{
return
ApiResultDto
.
success
(
tableauService
.
getTableauBrazilianTax
(
request
).
orElse
(
StringUtils
.
EMPTY
));
}
@ResponseBody
@GetMapping
(
"getTableauOtherTaxAnalysis"
)
public
ApiResultDto
getTableauOtherTaxAnalysis
()
{
return
ApiResultDto
.
success
(
tableauService
.
getTableauOtherTaxAnalysis
().
orElse
(
StringUtils
.
EMPTY
));
public
ApiResultDto
getTableauOtherTaxAnalysis
(
HttpServletRequest
request
)
{
return
ApiResultDto
.
success
(
tableauService
.
getTableauOtherTaxAnalysis
(
request
).
orElse
(
StringUtils
.
EMPTY
));
}
}
atms-web/src/main/java/pwc/taxtech/atms/web/service/OrangeHeapService.java
View file @
4bf4f957
This diff is collapsed.
Click to expand it.
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