Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
saasio
Project
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
reyun
saasio
Commits
5d8c4110
Commit
5d8c4110
authored
Mar 22, 2018
by
carrieyzzhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
decode
parent
60bbba95
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
0 deletions
+20
-0
EventController.java
src/main/java/com/reyun/controller/EventController.java
+10
-0
IntelligentPathController.java
.../java/com/reyun/controller/IntelligentPathController.java
+10
-0
No files found.
src/main/java/com/reyun/controller/EventController.java
View file @
5d8c4110
...
...
@@ -7,11 +7,14 @@ import com.reyun.security.annotation.CurrentAccount;
import
com.reyun.service.EventService
;
import
com.reyun.service.VirtualEventService
;
import
com.reyun.util.ResultModel
;
import
com.reyun.util.StringUtil
;
import
org.json.JSONException
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.web.bind.annotation.*
;
import
java.io.UnsupportedEncodingException
;
import
java.net.URLDecoder
;
import
java.util.List
;
/**
...
...
@@ -29,6 +32,13 @@ public class EventController {
@RequestMapping
(
value
=
"find/param"
,
method
=
RequestMethod
.
GET
)
@ResponseBody
public
ResultModel
findAll
(
@PathVariable
Long
app
,
@RequestParam
String
names
,
@RequestParam
(
required
=
false
)
String
params
)
throws
JSONException
{
if
(!
StringUtil
.
isEmpty
(
params
))
{
try
{
params
=
URLDecoder
.
decode
(
params
,
"UTF-8"
);
}
catch
(
UnsupportedEncodingException
e
)
{
}
}
return
ResultModel
.
OK
(
eventService
.
listAllNew
(
app
,
names
,
params
));
}
...
...
src/main/java/com/reyun/controller/IntelligentPathController.java
View file @
5d8c4110
...
...
@@ -6,6 +6,7 @@ import com.reyun.security.annotation.CurrentAccount;
import
com.reyun.service.IntelligentPathService
;
import
com.reyun.util.ResultModel
;
import
com.reyun.util.ResultStatus
;
import
com.reyun.util.StringUtil
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.util.StringUtils
;
...
...
@@ -15,6 +16,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
import
org.springframework.web.bind.annotation.ResponseBody
;
import
javax.servlet.http.HttpServletRequest
;
import
java.io.UnsupportedEncodingException
;
import
java.net.URLDecoder
;
/**
* Created by sunhao on 17/7/18.
...
...
@@ -56,6 +59,13 @@ public class IntelligentPathController {
return
ResultModel
.
ERROR
(
ResultStatus
.
PARAM_INVALID
);
}
if
(!
StringUtil
.
isEmpty
(
eventCondition
))
{
try
{
eventCondition
=
URLDecoder
.
decode
(
eventCondition
,
"UTF-8"
);
}
catch
(
UnsupportedEncodingException
e
)
{
}
}
IntelligentPath
intelligentPath
=
new
IntelligentPath
(
appId
,
events
,
startOrEnd
,
targetEvent
,
Long
.
parseLong
(
session
),
Long
.
parseLong
(
sessionUnit
),
eventCondition
,
startDate
,
endDate
);
...
...
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