|
@@ -38,8 +38,10 @@ public class CmBehaviorRecordService extends CrudService<CmBehaviorRecordDao, Cm
|
|
|
|
|
|
|
|
|
public Page<CmBehaviorRecord> findPageList(Page<CmBehaviorRecord> page, CmBehaviorRecord cmBehaviorRecord) {
|
|
|
- cmBehaviorRecord.setPage(page);
|
|
|
- List<CmBehaviorRecord> list = behaviorList(cmBehaviorRecord);
|
|
|
+ return super.findPage(page,cmBehaviorRecord);
|
|
|
+ //cmBehaviorRecord.setPage(page);
|
|
|
+ //List<CmBehaviorRecord> list = cmBehaviorRecordDao.findList(cmBehaviorRecord);
|
|
|
+ /*List<CmBehaviorRecord> list = behaviorList(cmBehaviorRecord);
|
|
|
int pageNo = page.getPageNo();
|
|
|
int pageSize = page.getPageSize();
|
|
|
int number = 0;
|
|
@@ -54,9 +56,9 @@ public class CmBehaviorRecordService extends CrudService<CmBehaviorRecordDao, Cm
|
|
|
behaviorList.add(list.get(i));
|
|
|
}
|
|
|
}
|
|
|
- page.setCount(list.size());
|
|
|
- page.setList(behaviorList);
|
|
|
- return page;
|
|
|
+ page.setCount(list.size());*/
|
|
|
+ //page.setList(list);
|
|
|
+ //return page;
|
|
|
}
|
|
|
|
|
|
public List<CmBehaviorRecord> behaviorList(CmBehaviorRecord cmBehaviorRecord) {
|
|
@@ -110,7 +112,7 @@ public class CmBehaviorRecordService extends CrudService<CmBehaviorRecordDao, Cm
|
|
|
*/
|
|
|
public Page<CmBehaviorRecord> recordPage(Page<CmBehaviorRecord> page, CmBehaviorRecord cmBehaviorRecord){
|
|
|
cmBehaviorRecord.setPage(page);
|
|
|
- Integer userID = cmBehaviorRecord.getUserID();
|
|
|
+ /*Integer userID = cmBehaviorRecord.getUserID();
|
|
|
// 每天访问用户数
|
|
|
CmBehaviorRecord cmRecord = new CmBehaviorRecord();
|
|
|
cmRecord.setIP(cmBehaviorRecord.getIP());
|
|
@@ -128,10 +130,10 @@ public class CmBehaviorRecordService extends CrudService<CmBehaviorRecordDao, Cm
|
|
|
if (!cmBehaviorRecord.getAccessDate().equals(format)) {
|
|
|
cmBehaviorRecord.setUserID(null);
|
|
|
}
|
|
|
- }
|
|
|
+ }*/
|
|
|
// 用户行为详情
|
|
|
List<CmBehaviorRecord> cmBehaviorRecordList = cmBehaviorRecordDao.recordList(cmBehaviorRecord);
|
|
|
- cmBehaviorRecord.setUserID(userID);
|
|
|
+ //cmBehaviorRecord.setUserID(userID);
|
|
|
for(CmBehaviorRecord record: cmBehaviorRecordList) {
|
|
|
record.setProductImage(AppUtils.getImageURL("product", record.getProductImage(), 0, ""));
|
|
|
String time = calculationTime(record.getAccessDuration());
|