|
@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestParam;
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
import javax.naming.ldap.PagedResultsControl;
|
|
import javax.naming.ldap.PagedResultsControl;
|
|
|
|
+import javax.servlet.http.HttpServletRequest;
|
|
import java.sql.Time;
|
|
import java.sql.Time;
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
@@ -33,11 +34,11 @@ public class PageDataApiController {
|
|
@RequestParam(required = false) String cookieId,
|
|
@RequestParam(required = false) String cookieId,
|
|
@RequestParam(required = false) String isMiniApp,
|
|
@RequestParam(required = false) String isMiniApp,
|
|
@RequestParam(required = false) String whereUrl,
|
|
@RequestParam(required = false) String whereUrl,
|
|
- @RequestParam(required = false) Integer type) throws Exception {
|
|
|
|
|
|
+ @RequestParam(required = false) Integer type,
|
|
|
|
+ HttpServletRequest request) throws Exception {
|
|
LambdaQueryWrapper<PageData> wrapper = new LambdaQueryWrapper<>();
|
|
LambdaQueryWrapper<PageData> wrapper = new LambdaQueryWrapper<>();
|
|
wrapper.eq(PageData::getCdfCookieId,cookieId);
|
|
wrapper.eq(PageData::getCdfCookieId,cookieId);
|
|
wrapper.eq(PageData::getDay,DateUtil.getDay(new Date()));
|
|
wrapper.eq(PageData::getDay,DateUtil.getDay(new Date()));
|
|
- wrapper.isNull(PageData::getInPageTime);
|
|
|
|
|
|
|
|
List<PageData> list = pageDataService.list(wrapper);
|
|
List<PageData> list = pageDataService.list(wrapper);
|
|
PageData pageData;
|
|
PageData pageData;
|
|
@@ -48,15 +49,13 @@ public class PageDataApiController {
|
|
pageData.setCdfCookieId(cookieId);
|
|
pageData.setCdfCookieId(cookieId);
|
|
pageData.setIsMiniApp(isMiniApp);
|
|
pageData.setIsMiniApp(isMiniApp);
|
|
pageData.setDay(DateUtil.getDay(new Date()));
|
|
pageData.setDay(DateUtil.getDay(new Date()));
|
|
|
|
+ pageData.setInPageTime(DateUtil.getDateTime(new Date()));
|
|
pageData.setUrl(whereUrl);
|
|
pageData.setUrl(whereUrl);
|
|
}else {
|
|
}else {
|
|
pageData = list.get(0);
|
|
pageData = list.get(0);
|
|
}
|
|
}
|
|
pageData.setUrl(whereUrl);
|
|
pageData.setUrl(whereUrl);
|
|
switch (type){
|
|
switch (type){
|
|
- case 0:
|
|
|
|
- pageData.setInPageTime(DateUtil.getDateTime(new Date()));
|
|
|
|
- break;
|
|
|
|
case 1:
|
|
case 1:
|
|
pageData.setOutPageTime(DateUtil.getDateTime(new Date()));
|
|
pageData.setOutPageTime(DateUtil.getDateTime(new Date()));
|
|
long time = DateUtil.getDateTime(pageData.getInPageTime());
|
|
long time = DateUtil.getDateTime(pageData.getInPageTime());
|