1

src/main/java/com/sooka/sponest/monitor/camera/mapper/CentermonitorTCameraMapper.java

@@ -391,7 +391,7 @@ public interface CentermonitorTCameraMapper {
     * @author 韩福成
     * @date 2025/8/20 上午10:22
     */
-    List<String> getCreamList(List<String> list);
+    List<String> selectChannelNumListByCameraCodes(List<String> cameraCodes);
 
 }
 

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

@@ -83,6 +83,18 @@ public class DahuaController {
         return dahuaService.calPTAngleAndSitPosition(json);
     }
 
+    /*
+     *  联动调转摄像头指向
+     *
+     * @author 韩福成
+     * @date 2025/8/19 上午9:23
+     */
+    @Log(title = "大华联动调转摄像头指向", businessType = BusinessType.OTHER)
+    @GetMapping(value = "/rotation")
+    public AjaxResult rotation(Double lng, Double lat, @RequestParam("list") List<String> cameraCodes) {
+        return dahuaService.cameraSteering(lng, lat, cameraCodes);
+    }
+
     /**
      * 三维定位/雷球定位
      *
@@ -342,17 +354,7 @@ public class DahuaController {
         return sb.toString();
     }
 
-    /*
-     *  联动调转摄像头指向
-     *
-     * @author 韩福成
-     * @date 2025/8/19 上午9:23
-     */
-    @Log(title = "大华联动调转摄像头指向", businessType = BusinessType.OTHER)
-    @GetMapping(value = "/rotation")
-    public AjaxResult rotation(Double lng, Double lat, @RequestParam("list") List<String> list) {
-        return dahuaService.cameraSteering(lng, lat, list);
-    }
+
 
     @PostMapping("/reportMp4ToFileService")
     public AjaxResult reportMp4ToFileService(@RequestBody List<DaHuaMp4VO> mp4VO) {

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

@@ -115,7 +115,7 @@ public interface DahuaService {
     * @author 韩福成
     * @date 2025/8/19 上午9:26
     */
-    AjaxResult cameraSteering(Double lng, Double lat, List<String> list);
+    AjaxResult cameraSteering(Double lng, Double lat, List<String> cameraCodes);
 
     AjaxResult reportMp4ToFileService(List<DaHuaMp4VO> mp4VO);
 

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

@@ -787,15 +787,14 @@ public class DahuaServiceImpl extends BaseService implements DahuaService {
      * @author 韩福成
      * @date 2025/8/19 上午9:26
      */
-    public AjaxResult cameraSteering(Double lng, Double lat, List<String> list) {
-        List<String> creamList = centermonitorTCameraMapper.getCreamList(list);
-        if (CollectionUtils.isEmpty(creamList)) {
+    public AjaxResult cameraSteering(Double lng, Double lat, List<String> cameraCodes) {
+        List<String> channelNumList = centermonitorTCameraMapper.selectChannelNumListByCameraCodes(cameraCodes);
+        if (CollectionUtils.isEmpty(channelNumList)) {
             return AjaxResult.error("未找到对应的摄像头编码");
         }
         String ROTATION_URL = host + "/evo-apigw/evo-gmcommon/" + versionLinkage + "/watchtower/calPTAngleAndSitPosition";
         String token = getToken();
-        for (String channelNum : creamList) {
-
+        for (String channelNum : channelNumList) {
             String urlWithParams = ROTATION_URL + "?lng=" + lng + "&lat=" + lat + "&channelCode=" + channelNum;
             log.info("----开始执行----{}------请求参数:{}", "调转摄像头指向", JSONUtil.toJsonStr(urlWithParams));
             String prBody = null;
@@ -888,7 +887,9 @@ public class DahuaServiceImpl extends BaseService implements DahuaService {
         log.info("----开始执行----{}------返回报文:{}", "地视联动、三维定位计算", json);
         for (String channelCode : channelCodes) {
             String token = getTokenByPassword();
-            String CALCULATE_PT_ANGLE_URL = host + "/evo-apigw/evo-gmcommon/1.3.2/watchtower/calPTAngleAndSitPosition?lng="
+//            String CALCULATE_PT_ANGLE_URL = host + "/evo-apigw/evo-gmcommon/1.3.2/watchtower/calPTAngleAndSitPosition?lng="
+//                    + json.get("lng") + "&lat=" + json.get("lat") + "&channelCode=" + channelCode;
+            String CALCULATE_PT_ANGLE_URL = host + "/evo-apigw/evo-gmcommon/1.3.2/watchtower/calPTAngle?resourceId=201&lng="
                     + json.get("lng") + "&lat=" + json.get("lat") + "&channelCode=" + channelCode;
             try {
                 IccHttpHttpRequest pr = new IccHttpHttpRequest(CALCULATE_PT_ANGLE_URL, Method.GET);

src/main/resources/bootstrap.yml

@@ -13,12 +13,12 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: www.sooka.onest.com:8848
-#        server-addr: 127.0.0.1:8848
+#        server-addr: www.sooka.onest.com:8848
+        server-addr: 127.0.0.1:8848
       config:
         # 配置中心地址
-        server-addr: www.sooka.onest.com:8848
-#        server-addr: 127.0.0.1:8848
+#        server-addr: www.sooka.onest.com:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

src/main/resources/mapper/monitor/camera/CentermonitorTCameraMapper.xml

@@ -1661,11 +1661,11 @@
         WHERE ctc.channel_code = #{channelCode} limit 1
     </select>
 
-    <select id="getCreamList" resultType="java.lang.String">
+    <select id="selectChannelNumListByCameraCodes" resultType="java.lang.String">
         SELECT channel_num FROM centermonitor_t_camera
         WHERE camera_code IN
         <foreach collection="list" item="code" open="(" separator="," close=")">
-            #{code}
+            #{cameraCode}
         </foreach>
     </select>