接口调整

house365-hgs-ws/src/main/java/com/house365/ws/interfaces/rest/GetOnlineLogImpl.java

@@ -19,10 +19,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 查询人员上下线信息
@@ -97,19 +94,15 @@ public class GetOnlineLogImpl implements IGetOnlineLog {
                                     }
                                 }
                             } else {
-                                for (int i = 0; i <= size1; i++) {
-                                    if (2 * (i + 1) <= size) {
-                                        builder.append(startTime).append("---").append(DateTimeUtils.getDateString(logList.get(2 * i).getCreateTime(), patten)).append(",");
-                                    } else {
+                                builder.append(startTime).append("---").append(DateTimeUtils.getDateString(logList.get(0).getCreateTime(), patten)).append(",");
+                                for (int i = 1; i <= size1; i++) {
                                     String timeEnd;
                                     if (2 * i == size) {
                                         timeEnd = endTime;
                                     } else {
                                         timeEnd = DateTimeUtils.getDateString(logList.get(2 * i).getCreateTime(), patten);
                                     }
-                                        builder.append(DateTimeUtils.getDateString(logList.get(2 * i - 1).getCreateTime(), patten)).append("-").append(timeEnd);
-
-                                    }
+                                    builder.append(DateTimeUtils.getDateString(logList.get(2 * i - 1).getCreateTime(), patten)).append("---").append(timeEnd).append(",");
                                 }
                             }
                             dataMap.put("time", builder.toString());
@@ -135,7 +128,27 @@ public class GetOnlineLogImpl implements IGetOnlineLog {
                             dataMap.put("time", timePeriod);
                             list.add(dataMap);
                         } else {
-                            //往前推一个月查询
+                            //处于下线状态时，往前推一个月查询是否有在线记录
+                            Date date = DateTimeUtils.getDateByString(startTime, patten);
+                            date = DateTimeUtils.getDaysAgo(date, 30);
+                            String startTimeNew = DateTimeUtils.getDateString(date, patten);
+                            searchMap.put("startTime", startTimeNew);
+                            searchMap.put("endTime", endTime);
+                            searchMap.put("userId", u.getId());
+                            searchMap.put("order", 1);
+                            searchMap.put("newStatus", 1);
+                            List<OnlineLogEntity> logListNew = logMapper.queryByConditions(searchMap);
+                            if (CollectionUtils.isNotEmpty(logListNew)) {
+                                searchMap.put("newStatus", 0);
+                                List<OnlineLogEntity> logListUnder = logMapper.queryByConditions(searchMap);
+                                if (CollectionUtils.isNotEmpty(logListUnder)) {
+                                    dataMap.put("userId", u.getId());
+                                    dataMap.put("accId", u.getAccId());
+                                    String timePeriod = DateTimeUtils.getDateString(logListNew.get(0).getCreateTime(), patten) + "---" + DateTimeUtils.getDateString(logListUnder.get(0).getCreateTime(), patten);
+                                    dataMap.put("time", timePeriod);
+                                    list.add(dataMap);
+                                }
+                            }
                         }
                     }
                 });