|
@@ -4,9 +4,13 @@ package com.sooka.sponest.monitor.dahua.controller;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.alibaba.nacos.shaded.com.google.gson.Gson;
|
|
|
import com.ruoyi.common.core.domain.R;
|
|
|
+import com.ruoyi.common.core.web.domain.AjaxResult;
|
|
|
import com.ruoyi.common.log.annotation.Log;
|
|
|
import com.ruoyi.common.log.enums.BusinessType;
|
|
|
import com.sooka.sponest.monitor.camera.mapper.CentermonitorTCameraMapper;
|
|
|
+import com.sooka.sponest.monitor.dahua.domain.CentermonitorTMonitoringEquipmentPositionDO;
|
|
|
+import com.sooka.sponest.monitor.dahua.mapper.CentermonitorTMonitoringEquipmentPositionMapper;
|
|
|
+import com.sooka.sponest.monitor.dahua.service.DahuaService;
|
|
|
import com.sooka.sponest.monitor.dahua.utils.HttpEnum;
|
|
|
import com.sooka.sponest.monitor.dahua.utils.HttpTestUtils;
|
|
|
import com.sooka.sponest.monitor.remoteapi.service.lawenforcement.RemoteLawenforcementBaseService;
|
|
@@ -16,8 +20,7 @@ import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.collections4.CollectionUtils;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.stereotype.Component;
|
|
|
-import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
-import org.springframework.web.bind.annotation.RestController;
|
|
|
+import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
import java.util.Arrays;
|
|
@@ -40,7 +43,6 @@ import static org.springframework.web.bind.annotation.RequestMethod.GET;
|
|
|
@RequestMapping("/equipmentStatus/quartz")
|
|
|
public class EquipmentStatusTaskController {
|
|
|
|
|
|
-
|
|
|
@Resource
|
|
|
private CentermonitorTCameraMapper centermonitorTCameraMapper;
|
|
|
@Resource
|
|
@@ -53,16 +55,19 @@ public class EquipmentStatusTaskController {
|
|
|
private String userName;
|
|
|
@Value("${sooka.dahua_interface_server.userPwd}")
|
|
|
private String userPwd;
|
|
|
-// private String loginIp = "10.53.0.35";
|
|
|
+ // private String loginIp = "10.53.0.35";
|
|
|
// private String loginPort = "7901";
|
|
|
// private String userName = "system";
|
|
|
// private String userPwd = "Admin123";
|
|
|
//按组织获取设备详细信息
|
|
|
public static final String ACTION = "/videoService/devicesManager/devicesInfo";
|
|
|
private List<String> orgCodes = Arrays.asList("11033445593778368", "11248668755298496");
|
|
|
+ @Resource
|
|
|
+ DahuaService dahuaService;
|
|
|
+ @Resource
|
|
|
+ CentermonitorTMonitoringEquipmentPositionMapper centermonitorTMonitoringEquipmentPositionMapper;
|
|
|
|
|
|
-
|
|
|
-// @Scheduled(cron = "0/5 * * * * ?")
|
|
|
+ // @Scheduled(cron = "0/5 * * * * ?")
|
|
|
@Log(title = "对接大华根据组织获取执法记录仪、单兵设备在线状态定时任务", businessType = BusinessType.OTHER)
|
|
|
@ApiOperation(value = "对接大华根据组织获取执法记录仪、单兵设备在线状态定时任务", notes = "对接大华根据组织获取执法记录仪、单兵设备在线状态定时任务")
|
|
|
@RequestMapping(value = "/getLongPollingPositionMsg", method = GET)
|
|
@@ -151,4 +156,22 @@ public class EquipmentStatusTaskController {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ *获取记录仪位置数据
|
|
|
+ */
|
|
|
+ @PostMapping("putDahuaRecorderLocation")
|
|
|
+ @ResponseBody
|
|
|
+ public AjaxResult insertLocationListToday(@RequestBody CentermonitorTMonitoringEquipmentPositionDO centermonitorTMonitoringEquipmentPositionDO) {
|
|
|
+ try {
|
|
|
+ dahuaService.insertEquipmentPosition(centermonitorTMonitoringEquipmentPositionDO);
|
|
|
+ //更新执法记录仪经纬度
|
|
|
+ log.info("获取记录仪位置数据:{}",centermonitorTMonitoringEquipmentPositionDO);
|
|
|
+ centermonitorTMonitoringEquipmentPositionMapper.updateLongitudeAndLatitudeByCameraCode(centermonitorTMonitoringEquipmentPositionDO.getGpsX(),centermonitorTMonitoringEquipmentPositionDO.getGpsY(),centermonitorTMonitoringEquipmentPositionDO.getChannelCode());
|
|
|
+ return AjaxResult.success();
|
|
|
+ } catch (Exception e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ return AjaxResult.error(500, "内部服务器错误");
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
}
|