From 1da764000c6ba32ccd361fdad2a92e60897557aa Mon Sep 17 00:00:00 2001 From: liujun Date: Tue, 16 Apr 2024 17:22:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E5=85=AC=E5=8F=B8=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E5=AE=9A=E4=BD=8D=E5=9C=B0=E5=9B=BE=E5=8A=9F=E8=83=BD=E5=AE=8C?= =?UTF-8?q?=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcloud/controller/map/MapController.java | 41 +++++++++++++++++-- .../java/com/zcloud/service/dw/DwService.java | 1 + .../com/zcloud/service/dw/dto/MapGet.java | 3 +- .../zcloud/service/dw/dto/MapRequired.java | 1 - .../com/zcloud/service/dw/dto/TraceGet.java | 1 + .../zcloud/service/dw/impl/DwServiceImpl.java | 4 ++ 6 files changed, 45 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/zcloud/controller/map/MapController.java b/src/main/java/com/zcloud/controller/map/MapController.java index 24459ab8..c6369ffd 100644 --- a/src/main/java/com/zcloud/controller/map/MapController.java +++ b/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 map = new HashMap(); PageData pd = this.getPageData(); - PageData value = usersService.getPersonByCardNo(pd); - map.put("result", "success"); - map.put("pd", value); - return map; + // TODO 判断是否是公司人员定位 + if (true){ + MapGet mapInfo = new MapGet(); + 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 map = new HashMap(); + 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; + } + } + + + /** * 获取摄像头播放路径(曹妃甸使用） * diff --git a/src/main/java/com/zcloud/service/dw/DwService.java b/src/main/java/com/zcloud/service/dw/DwService.java index fde31036..ca17590f 100644 --- a/src/main/java/com/zcloud/service/dw/DwService.java +++ b/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; diff --git a/src/main/java/com/zcloud/service/dw/dto/MapGet.java b/src/main/java/com/zcloud/service/dw/dto/MapGet.java index af7c1213..3a5293fe 100644 --- a/src/main/java/com/zcloud/service/dw/dto/MapGet.java +++ b/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; } diff --git a/src/main/java/com/zcloud/service/dw/dto/MapRequired.java b/src/main/java/com/zcloud/service/dw/dto/MapRequired.java index cb8332af..7a9ed604 100644 --- a/src/main/java/com/zcloud/service/dw/dto/MapRequired.java +++ b/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; diff --git a/src/main/java/com/zcloud/service/dw/dto/TraceGet.java b/src/main/java/com/zcloud/service/dw/dto/TraceGet.java index e3215fb3..acf50478 100644 --- a/src/main/java/com/zcloud/service/dw/dto/TraceGet.java +++ b/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; } diff --git a/src/main/java/com/zcloud/service/dw/impl/DwServiceImpl.java b/src/main/java/com/zcloud/service/dw/impl/DwServiceImpl.java index 3b1ba7a3..edf9433c 100644 --- a/src/main/java/com/zcloud/service/dw/impl/DwServiceImpl.java +++ b/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 {