Skip to content

H
Hgs
Commit 4aabef57 authored by jay's avatar jay
Browse files
Options

接口调整

parent 4f512d78
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 6 deletions
house365-hgs-ws/src/main/java/com/house365/ws/interfaces/rest/GetOnlineLogImpl.java
View file @ 4aabef57
...@@ -84,21 +84,22 @@ public class GetOnlineLogImpl implements IGetOnlineLog { ...@@ -84,21 +84,22 @@ public class GetOnlineLogImpl implements IGetOnlineLog {
int size1 = size / 2; int size1 = size / 2;
if (size1 >= 1) { if (size1 >= 1) {
dataMap.put("userId", u.getId()); dataMap.put("userId", u.getId());
dataMap.put("accId", u.getAccId());
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
if (logList.get(0).getNewStatus() == 1) { if (logList.get(0).getNewStatus() == 1) {
for (int i = 0; i <= size1; i++) { for (int i = 0; i <= size1; i++) {
if (2 * (i + 1) <= size) { if (2 * (i + 1) <= size) {
builder.append(DateTimeUtils.getDateString(logList.get(2 * i).getCreateTime(), patten)).append("-").append(DateTimeUtils.getDateString(logList.get(2 * i + 1).getCreateTime(), patten)).append(","); builder.append(DateTimeUtils.getDateString(logList.get(2 * i).getCreateTime(), patten)).append("---").append(DateTimeUtils.getDateString(logList.get(2 * i + 1).getCreateTime(), patten)).append(",");
} else { } else {
if (2 * i != size) { if (2 * i != size) {
builder.append(DateTimeUtils.getDateString(logList.get(2 * i).getCreateTime(), patten)).append("-").append(endTime); builder.append(DateTimeUtils.getDateString(logList.get(2 * i).getCreateTime(), patten)).append("---").append(endTime);
} }
} }
} }
} else { } else {
for (int i = 0; i <= size1; i++) { for (int i = 0; i <= size1; i++) {
if (2 * (i + 1) <= size) { if (2 * (i + 1) <= size) {
builder.append(startTime).append("-").append(DateTimeUtils.getDateString(logList.get(2 * i).getCreateTime(), patten)).append(","); builder.append(startTime).append("---").append(DateTimeUtils.getDateString(logList.get(2 * i).getCreateTime(), patten)).append(",");
} else { } else {
String timeEnd; String timeEnd;
if (2 * i == size) { if (2 * i == size) {
...@@ -115,11 +116,12 @@ public class GetOnlineLogImpl implements IGetOnlineLog { ...@@ -115,11 +116,12 @@ public class GetOnlineLogImpl implements IGetOnlineLog {
list.add(dataMap); list.add(dataMap);
} else { } else {
dataMap.put("userId", u.getId()); dataMap.put("userId", u.getId());
dataMap.put("accId", u.getAccId());
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
if (logList.get(0).getNewStatus() == 1) { if (logList.get(0).getNewStatus() == 1) {
builder.append(DateTimeUtils.getDateString(logList.get(0).getCreateTime(), patten)).append("-").append(endTime); builder.append(DateTimeUtils.getDateString(logList.get(0).getCreateTime(), patten)).append("---").append(endTime);
} else { } else {
builder.append(startTime).append("-").append(DateTimeUtils.getDateString(logList.get(0).getCreateTime(), patten)); builder.append(startTime).append("---").append(DateTimeUtils.getDateString(logList.get(0).getCreateTime(), patten));
} }
dataMap.put("time", builder.toString()); dataMap.put("time", builder.toString());
list.add(dataMap); list.add(dataMap);
...@@ -128,7 +130,8 @@ public class GetOnlineLogImpl implements IGetOnlineLog { ...@@ -128,7 +130,8 @@ public class GetOnlineLogImpl implements IGetOnlineLog {
//判断用户在线 //判断用户在线
if (u.getOnlineStatus() == 1) { if (u.getOnlineStatus() == 1) {
dataMap.put("userId", u.getId()); dataMap.put("userId", u.getId());
String timePeriod = startTime + "-" + endTime; dataMap.put("accId", u.getAccId());
String timePeriod = startTime + "---" + endTime;
dataMap.put("time", timePeriod); dataMap.put("time", timePeriod);
list.add(dataMap); list.add(dataMap);
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment