人员定位信息接口BUG修改

@@ -108,29 +108,31 @@ public class YwLocationServiceImpl implements ILocationService {
         String post = HttpUtil.get(url+"open/information/getEmp.do",pmap);
         String post = HttpUtil.get(url+"open/information/getEmp.do",pmap);
         JSONObject json = JSONObject.parseObject(JSONObject.parseObject(post).get("data").toString());
         JSONObject json = JSONObject.parseObject(JSONObject.parseObject(post).get("data").toString());
         List<UserBaseInfoYwResult> userList = JSONObject.parseArray(json.get("rows").toString(), UserBaseInfoYwResult.class);
         List<UserBaseInfoYwResult> userList = JSONObject.parseArray(json.get("rows").toString(), UserBaseInfoYwResult.class);
-        List<Map> onlineList = getOnLineList();
+        Map<String,Object> onlineMap = getOnLineList();
+        map.put("onlineCount",onlineMap.size());
         for (UserBaseInfoYwResult userBaseInfoYwResult : userList) {
         for (UserBaseInfoYwResult userBaseInfoYwResult : userList) {
             UserBaseInfo userBaseInfo = new UserBaseInfo();
             UserBaseInfo userBaseInfo = new UserBaseInfo();
             userBaseInfo.setDeviceCode(userBaseInfoYwResult.getDeviceno());
             userBaseInfo.setDeviceCode(userBaseInfoYwResult.getDeviceno());
             userBaseInfo.setUserName(userBaseInfoYwResult.getEmpname());
             userBaseInfo.setUserName(userBaseInfoYwResult.getEmpname());
             userBaseInfo.setUserNo(userBaseInfoYwResult.getEmpno());
             userBaseInfo.setUserNo(userBaseInfoYwResult.getEmpno());
             userBaseInfo.setUserType("员工");
             userBaseInfo.setUserType("员工");
+            if(onlineMap.get(userBaseInfoYwResult.getDeviceno())!=null){
+                userBaseInfo.setUserStatus("1");
+            }else{
                 userBaseInfo.setUserStatus("0");
                 userBaseInfo.setUserStatus("0");
+            }
             list.add(userBaseInfo);
             list.add(userBaseInfo);
         }
         }
         map.put("list",list);
         map.put("list",list);
-        map.put("onlineCount",onlineList.size());
         return map;
         return map;
     }
     }
 
 
-    public List<Map> getOnLineList(){
-        List<Map> list = new ArrayList<>();
-        HashMap<String,Object> map = new HashMap<>();
-        map.put("username", username);
-        map.put("password", password);
-        String post = HttpUtil.get(url+"/open/information/getRealInformation.do",map);
-        JSONObject json = JSONObject.parseObject(JSONObject.parseObject(post).get("data").toString());
-        list = JSONObject.parseArray(json.get("list").toString(), Map.class);
-        return list;
+    public Map<String,Object> getOnLineList(){
+        Map<String,Object> map = new HashMap();
+        List<UserLocation>  list = getAllUserGPS();
+        for (UserLocation userLocation : list) {
+            map.put(userLocation.getDeviceCode(),"1");
+        }
+        return map;
     }
     }
 }
 }