diff --git a/src/main/java/com/zcloud/controller/map/MapController.java b/src/main/java/com/zcloud/controller/map/MapController.java index 6f7d7e38..dfea6a2b 100644 --- a/src/main/java/com/zcloud/controller/map/MapController.java +++ b/src/main/java/com/zcloud/controller/map/MapController.java @@ -516,6 +516,17 @@ public class MapController extends BaseController { varList = usersService.findEightsByUserId(pd); map.put("info",byCardNo); map.put("varList", varList); + }else { + String result = HttpUtil.get("https://60.2.110.85:7812/mapi/v1/queryWorkCardLocation?deviceNo="+pd.getString("cardNo")); + Map resultMap = (Map) JSON.parse(result); + String data = resultMap.get("data").toString(); + List dataList = JSONArray.parseArray(data,PageData.class); + PageData pageData = new PageData(); + pageData.put("id",dataList.get(0).getString("devidno")); + pageData.put("DEPARTMENT_NAME",dataList.get(0).getString("deptId")); + pageData.put("NAME",dataList.get(0).getString("fullName")); + pageData.put("POST_NAME",dataList.get(0).getString("workType")); + map.put("info",pageData); } map.put("result", errInfo); return map;