获取记录仪位置数据迁移

src/main/java/com/sooka/sponest/monitor/dahua/controller/DahuaController.java

@@ -1,6 +1,5 @@
 package com.sooka.sponest.monitor.dahua.controller;
 
-import com.dahuatech.hutool.json.JSONArray;
 import com.dahuatech.icc.exception.ClientException;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.web.domain.AjaxResult;
@@ -10,10 +9,7 @@ import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.api.domain.SysUser;
 import com.ruoyi.system.api.model.LoginUser;
 import com.sooka.sponest.monitor.dahua.domain.CenterdataTAttach;
-import com.sooka.sponest.monitor.dahua.domain.CentermonitorTMonitoringEquipmentPositionDO;
-import com.sooka.sponest.monitor.dahua.domain.PlayBackProperties;
 import com.sooka.sponest.monitor.dahua.service.DahuaService;
-import com.sooka.sponest.monitor.device.mapper.CentermonitorTMonitoringEquipmentPositionMapper;
 import com.sooka.sponest.monitor.remoteapi.service.center.system.RemoteService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -47,9 +43,6 @@ public class DahuaController {
     @Resource
     RemoteService remoteService;
 
-    @Resource
-    CentermonitorTMonitoringEquipmentPositionMapper centermonitorTMonitoringEquipmentPositionMapper;
-
     /**
      * 获取token方法
      * 调用此方法以获取token
@@ -120,7 +113,7 @@ public class DahuaController {
     public AjaxResult receiveEvents(HttpServletRequest request) {
         String blody = "";
         try {
-             blody = ReadAsChars(request);
+            blody = ReadAsChars(request);
             logger.info("接收报文----" + blody);
             return AjaxResult.success("接收报文成功",blody);
         } catch (Exception e) {
@@ -262,24 +255,6 @@ public class DahuaController {
         return dahuaService.operatePresetPoint(channelId,presetPointCode,presetPointName,operateType);
     }
 
-    /**
-     *获取记录仪位置数据
-     */
-    @PostMapping("putDahuaRecorderLocation")
-    @ResponseBody
-    public AjaxResult insertLocationListToday(@RequestBody CentermonitorTMonitoringEquipmentPositionDO centermonitorTMonitoringEquipmentPositionDO) {
-        try {
-            dahuaService.insertEquipmentPosition(centermonitorTMonitoringEquipmentPositionDO);
-            //更新执法记录仪经纬度
-            logger.info("获取记录仪位置数据:{}",centermonitorTMonitoringEquipmentPositionDO);
-            centermonitorTMonitoringEquipmentPositionMapper.updateLongitudeAndLatitudeByCameraCode(centermonitorTMonitoringEquipmentPositionDO.getGpsX(),centermonitorTMonitoringEquipmentPositionDO.getGpsY(),centermonitorTMonitoringEquipmentPositionDO.getChannelCode());
-            return AjaxResult.success();
-        } catch (Exception e) {
-            e.printStackTrace();
-            return AjaxResult.error(500, "内部服务器错误");
-        }
-    }
-
 
 
     public static String ReadAsChars(HttpServletRequest request) {

src/main/java/com/sooka/sponest/monitor/dahua/service/DahuaService.java

@@ -1,29 +1,25 @@
 package com.sooka.sponest.monitor.dahua.service;
 
 import com.dahuatech.hutool.http.Method;
-import com.dahuatech.hutool.json.JSONArray;
 import com.dahuatech.hutool.json.JSONObject;
 import com.dahuatech.icc.exception.ClientException;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.sooka.sponest.monitor.dahua.domain.CenterdataTAttach;
-import com.sooka.sponest.monitor.dahua.domain.CentermonitorTMonitoringEquipmentPositionDO;
-import com.sooka.sponest.monitor.dahua.domain.PlayBackProperties;
 
 import java.util.List;
-import java.util.Map;
 
 public interface DahuaService {
     /**
      * 获取大华账号ip等信息
      *
      */
-     AjaxResult getDahuaVideoServer();
+    AjaxResult getDahuaVideoServer();
 
     /**
      * 获取大华账号ip等信息（APP）
      *
      */
-     AjaxResult getDahuaVideoServerApp();
+    AjaxResult getDahuaVideoServerApp();
 
     /**
      * 获取大华ICC服务
@@ -35,7 +31,7 @@ public interface DahuaService {
      * 获取token方法
      * 调用此方法以获取token
      * */
-     String getToken();
+    String getToken();
 
     /**
      * 获取token方法
@@ -51,20 +47,20 @@ public interface DahuaService {
      * 设备低电压：alarm 225
      * new String[]{"forest.alarm"}
      * */
-     AjaxResult eventSubscribe(String name, String monitorUrl, String category, String[] type) throws ClientException;
+    AjaxResult eventSubscribe(String name, String monitorUrl, String category, String[] type) throws ClientException;
 
     /**
      * 取消事件订阅
      * monitorType 固定为 url
      * category state alarm ...
      * */
-     AjaxResult subscribeList(String monitorType, String category) throws ClientException;
+    AjaxResult subscribeList(String monitorType, String category) throws ClientException;
 
     /**
      * 取消事件订阅
      * name 为 ip_port
      * */
-     AjaxResult removeEventSubscribe(String name) throws ClientException;
+    AjaxResult removeEventSubscribe(String name) throws ClientException;
 
     /**
      * 火点摄像头联动接口
@@ -73,7 +69,7 @@ public interface DahuaService {
      * @param list
      * @return
      */
-     AjaxResult rotation(Double lng, Double lat, List<String> list);
+    AjaxResult rotation(Double lng, Double lat, List<String> list);
 
     /**
      * 摄像头获取回放
@@ -85,7 +81,7 @@ public interface DahuaService {
      * 同步摄像头离线状态
      * 调用此方法以将大华平台摄像头状态同步到一体化平台监控中心
      * */
-     AjaxResult synchronizeOfflineCamera();
+    AjaxResult synchronizeOfflineCamera();
 
     /**
      * 获取大华摄像头的预置点
@@ -98,15 +94,10 @@ public interface DahuaService {
     public AjaxResult operatePresetPoint(String channelId,String presetPointCode,String presetPointName,String operateType);
 
     /**
-     * 获取记录仪位置数据
-     * */
-    void insertEquipmentPosition(CentermonitorTMonitoringEquipmentPositionDO centermonitorTMonitoringEquipmentPositionDO);
-
-    /**
      * 远程获取图片路径
      * @param attach_ids
      */
-     List<CenterdataTAttach> getImgUrl(List<CenterdataTAttach> attach_ids);
+    List<CenterdataTAttach> getImgUrl(List<CenterdataTAttach> attach_ids);
 
     Long getTimeSeconds(String time);
 

src/main/java/com/sooka/sponest/monitor/dahua/service/impl/DahuaServiceImpl.java

@@ -28,7 +28,6 @@ import com.sooka.sponest.monitor.camera.domain.CentermonitorTCameraStateLog;
 import com.sooka.sponest.monitor.camera.mapper.CentermonitorTCameraMapper;
 import com.sooka.sponest.monitor.camera.service.ICentermonitorTCameraService;
 import com.sooka.sponest.monitor.dahua.domain.CenterdataTAttach;
-import com.sooka.sponest.monitor.dahua.domain.CentermonitorTMonitoringEquipmentPositionDO;
 import com.sooka.sponest.monitor.dahua.domain.PlayBackProperties;
 import com.sooka.sponest.monitor.dahua.service.DahuaService;
 import com.sooka.sponest.monitor.dahua.utils.HttpEnum;
@@ -40,25 +39,19 @@ import com.sooka.sponest.monitor.remoteapi.service.center.event.domain.Centereve
 import com.sooka.sponest.monitor.remoteapi.service.center.file.RemoteFileBaseService;
 import com.sooka.sponest.monitor.util.Mp4ParserUtils;
 import org.apache.commons.collections4.CollectionUtils;
-import org.checkerframework.checker.units.qual.A;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import javax.crypto.Cipher;
 import java.io.File;
-import java.io.IOException;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.security.KeyFactory;
 import java.security.interfaces.RSAPublicKey;
 import java.security.spec.X509EncodedKeySpec;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.concurrent.*;
 
 @Service
 public class DahuaServiceImpl extends BaseService implements DahuaService {
@@ -515,14 +508,6 @@ public class DahuaServiceImpl extends BaseService implements DahuaService {
     }
 
 
-    /**
-     * 获取记录仪位置数据
-     */
-    @Override
-    public void insertEquipmentPosition(CentermonitorTMonitoringEquipmentPositionDO centermonitorTMonitoringEquipmentPositionDO) {
-        centermonitorTMonitoringEquipmentPositionMapper.insertEquipmentPosition(centermonitorTMonitoringEquipmentPositionDO);
-    }
-
 
     /**
      * 获取执法记录仪token

src/main/java/com/sooka/sponest/monitor/device/mapper/CentermonitorTMonitoringEquipmentPositionMapper.java

@@ -1,7 +1,6 @@
 package com.sooka.sponest.monitor.device.mapper;
 
 import com.sooka.sponest.monitor.dahua.domain.CentermonitorTMonitoringEquipmentPositionDO;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -13,13 +12,6 @@ import java.util.List;
  */
 public interface CentermonitorTMonitoringEquipmentPositionMapper {
 
-    /**
-     * 长轮询获取设备位置消息
-     */
-    public int insertEquipmentPosition(CentermonitorTMonitoringEquipmentPositionDO centermonitorTMonitoringEquipmentPositionDO);
-
-
     List<CentermonitorTMonitoringEquipmentPositionDO> selectRecorderGPSList();
 
-    void updateLongitudeAndLatitudeByCameraCode(@Param("longitude")String longitude, @Param("latitude")String latitude, @Param("code")String code);
 }

src/main/resources/mapper/monitor/device/CentermonitorTMonitoringEquipmentPositionMapper.xml

@@ -23,14 +23,6 @@
         <result property="channelCode" column="channel_code"/>
     </resultMap>
 
-    <insert id="insertEquipmentPosition">
-        insert into centermonitor_t_monitoring_equpment_position (angle,is_online,
-        `event`,device_code,data_source,gps_x,gps_y,height,speed,star_count,antenna_status,orientation_status,extend_info,cap_time,create_time,channel_code)
-        values
-            (#{angle},#{isOnline}, #{event}, #{deviceCode}, #{dataSource}, #{gpsX}, #{gpsY},
-            #{height}, #{speed}, #{starCount}, #{antennaStatus}, #{orientationStatus},
-            #{extendInfo}, #{capTime},now(), #{channelCode})
-    </insert>
 
     <select id="selectRecorderGPSList" resultMap="CentermonitorTMonitoringEquipmentPositionResult" parameterType="CentermonitorTMonitoringEquipmentPositionDO">
         SELECT
@@ -50,8 +42,4 @@
             device_code;
     </select>
 
-    <update id="updateLongitudeAndLatitudeByCameraCode">
-        UPDATE centermonitor_t_camera
-        SET longitude = #{longitude},latitude = #{latitude} where camera_code = #{code}
-    </update>
 </mapper>