一公司人员定位地图功能完善

src/main/java/com/zcloud/controller/map/MapController.java

@@ -4,6 +4,9 @@ import com.zcloud.controller.base.BaseController;
 import com.zcloud.entity.Page;
 import com.zcloud.entity.PageData;
 import com.zcloud.service.bus.CorpInfoService;
+import com.zcloud.service.dw.DwService;
+import com.zcloud.service.dw.dto.MapGet;
+import com.zcloud.service.dw.dto.TraceGet;
 import com.zcloud.service.keyProjects.VideoManagerService;
 import com.zcloud.service.map.*;
 import com.zcloud.service.map.util.ReturnMap;
@@ -24,6 +27,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.client.RestTemplate;
 
+import javax.annotation.Resource;
 import java.util.*;
 
 /**
@@ -73,6 +77,8 @@ public class MapController extends BaseController {
 
     @Autowired
     private WeatherUtil weatherUtil;
+    @Resource
+    private DwService dwService;
 
     @ResponseBody
     @RequestMapping("/getCorpInfo")
@@ -864,12 +870,39 @@ public class MapController extends BaseController {
     public Object getPersonByCardNo() throws Exception {
         Map<String, Object> map = new HashMap<String, Object>();
         PageData pd = this.getPageData();
-        PageData value = usersService.getPersonByCardNo(pd);
+        // TODO 判断是否是公司人员定位
-        map.put("result", "success");
+        if (true){
-        map.put("pd", value);
+            MapGet mapInfo = new MapGet();
-        return map;
+            mapInfo.setId(pd.getString("CARDNO"));
+            return dwService.getMapInfo(mapInfo);
+        }else {
+            PageData value = usersService.getPersonByCardNo(pd);
+            map.put("result", "success");
+            map.put("pd", value);
+            return map;
+        }
     }
 
+    @RequestMapping(value = "/getPersonTrace")
+    @ResponseBody
+    public Object getPersonTrace() throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        PageData pd = this.getPageData();
+        // TODO 判断是否是公司人员定位
+        if (true){
+            TraceGet mapInfo = new TraceGet();
+            mapInfo.setId(pd.getString("id"));
+            return dwService.getTrace(mapInfo);
+        }else {
+            PageData value = usersService.getPersonByCardNo(pd);
+            map.put("result", "success");
+            map.put("pd", value);
+            return map;
+        }
+    }
+
+
+
     /**
      * 获取摄像头播放路径(曹妃甸使用）
      *

src/main/java/com/zcloud/service/dw/DwService.java

@@ -4,6 +4,7 @@ import com.zcloud.service.dw.dto.*;
 
 public interface DwService {
 
+    Object getMapInfo(MapGet param) throws Exception;
     Object getMapList(MapGet param) throws Exception;
     Object saveOrUpdateMap(MapInfo param) throws Exception;
     Object getTrace(TraceGet param) throws Exception;

src/main/java/com/zcloud/service/dw/dto/MapGet.java

@@ -7,11 +7,12 @@ public class MapGet {
     private String departmentId;
     private String userId;
     private String userName;
-    private String userCardId;
     private String corpId;
+    private String userCardId;
     private String userPhone;
     private String deviceId;
     private String deviceName;
     private String type;
+    private String id;
     private Page page;
 }

src/main/java/com/zcloud/service/dw/dto/MapRequired.java

@@ -6,7 +6,6 @@ import lombok.Data;
 public class MapRequired {
     //映射类型（0-人员，1-设备）
     private String type;
-    // 设备名称
     private String typeName;
     //人员id
     private String userId;

src/main/java/com/zcloud/service/dw/dto/TraceGet.java

@@ -5,6 +5,7 @@ import lombok.Data;
 @Data
 public class TraceGet {
     private String user_id;
+    private String id;
     private String startTime;
     private String endTime;
 }

src/main/java/com/zcloud/service/dw/impl/DwServiceImpl.java

@@ -20,6 +20,10 @@ public class DwServiceImpl implements DwService {
     @Resource
     private CorpInfoService corpInfoService;
 
+    @Override
+    public Object getMapInfo(MapGet param) throws Exception {
+        return HttpUtil.post(url + "dw/getMapInfo", param);
+    }
 
     @Override
     public Object getMapList(MapGet param) throws Exception {