diff --git a/src/main/java/com/zcloud/controller/map/MapController.java b/src/main/java/com/zcloud/controller/map/MapController.java index 4fd206c1..a7a1c064 100644 --- a/src/main/java/com/zcloud/controller/map/MapController.java +++ b/src/main/java/com/zcloud/controller/map/MapController.java @@ -7,10 +7,7 @@ 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.AlarmGet; -import com.zcloud.service.dw.dto.MapGet; -import com.zcloud.service.dw.dto.MapInfo; -import com.zcloud.service.dw.dto.TraceGet; +import com.zcloud.service.dw.dto.*; import com.zcloud.service.keyProjects.VideoManagerService; import com.zcloud.service.map.*; import com.zcloud.service.map.util.ReturnMap; @@ -924,7 +921,7 @@ public class MapController extends BaseController { @RequestMapping(value = "/getAllDwMessage") @ResponseBody - public Object getAlarmList() throws Exception { + public Object getAllDwMessage() throws Exception { Map map = new HashMap(); PageData pd = this.getPageData(); // TODO 判断是否是公司人员定位 @@ -946,6 +943,28 @@ public class MapController extends BaseController { } } + /** + * 获取最新状态 + * @return + * @throws Exception + */ + @RequestMapping(value = "/getLastProp") + @ResponseBody + public Object getLastProp() throws Exception { + Map map = new HashMap(); + PageData pd = this.getPageData(); + // TODO 判断是否是公司人员定位 + if (pd.get("corpId") != null && "035958e685cf4850bc40151c5e0617a6".equals(pd.getString("corpId"))) { + GetLastPropDto dto = new GetLastPropDto(); + dto.setDeviceCode(pd.getString("CARDNO")); + return dwService.getLastProp(dto); + }else { + // TODO 其他系统有待开发 + return null; + } + } + + /**