Merge branch 'master' of git.minrow.com:reyun/saasio

src/main/java/com/reyun/controller/RetentionController.java

@@ -21,6 +21,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;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -56,6 +58,14 @@ public class RetentionController {
         String isDeviceStr = request.getParameter("isdevice");
         String retentiontype = request.getParameter("retentiontype");
 
+        if (!StringUtil.isEmpty(eventInfo)) {
+            try {
+                eventInfo = URLDecoder.decode(eventInfo, "UTF-8");
+            } catch (UnsupportedEncodingException e) {
+
+            }
+        }
+
         String eventType = request.getParameter("eventType");
         boolean isProfile=false;
         if(!StringUtils.isEmpty(eventType) && "profile".equals(eventType)){
@@ -110,6 +120,13 @@ public class RetentionController {
         String endDate = this.getEndDateByReportView(end, reportView);
 
         String eventInfo = request.getParameter("eventinfo");
+        if (!StringUtil.isEmpty(eventInfo)) {
+            try {
+                eventInfo = URLDecoder.decode(eventInfo, "UTF-8");
+            } catch (UnsupportedEncodingException e) {
+
+            }
+        }
 
         String userGroupStr = request.getParameter("usergroupid");
         String dimensionStr = request.getParameter("dimention");