From 77af84d48baf554a16f393992c4f9cb40692a4bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Mon, 30 Jun 2025 14:34:16 +0800
Subject: [PATCH] =?UTF-8?q?tplinkapi=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=8F=98=E7=84=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/AppCameraInfoController.java   | 120 ++----------------
 .../iot/tplink/entity/AppCameraInfo.java      |   9 ++
 .../modules/iot/tplink/enums/AppApiEnum.java  |   3 +-
 .../tplink/service/IAppCameraInfoService.java |   1 +
 .../impl/AppCameraInfoServiceImpl.java        |  30 +++++
 .../modules/iot/tplink/utils/AppTumsApi.java  |  13 ++
 6 files changed, 69 insertions(+), 107 deletions(-)

diff --git a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/controller/AppCameraInfoController.java b/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/controller/AppCameraInfoController.java
index 3f9100f..f8b699e 100644
--- a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/controller/AppCameraInfoController.java
+++ b/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/controller/AppCameraInfoController.java
@@ -19,14 +19,13 @@ import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
 /**
-* @Description: 护理单元-物联管理-摄像头信息
+* @Description: API-摄像头信息
 * @Author: jeecg-boot
 * @Date:   2025-01-17
 * @Version: V1.0
 */
-@Api(tags="护理单元-物联管理-摄像头信息")
 @RestController
-@RequestMapping("/nuIpadApi/iot/tplink/cameraInfo")
+@RequestMapping("/api/iot/tplink/cameraInfo")
 @Slf4j
 public class AppCameraInfoController extends JeecgController<AppCameraInfo, IAppCameraInfoService> {
    @Autowired
@@ -41,7 +40,6 @@ public class AppCameraInfoController extends JeecgController<AppCameraInfo, IApp
     * @param req
     * @return
     */
-   @ApiOperation(value="护理单元-物联管理-摄像头信息-分页列表查询", notes="护理单元-物联管理-摄像头信息-分页列表查询")
    @GetMapping(value = "/list")
    public Result<IPage<AppCameraInfo>> queryPageList(AppCameraInfo CameraInfo,
                                                      @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -52,7 +50,6 @@ public class AppCameraInfoController extends JeecgController<AppCameraInfo, IApp
        return Result.OK(pageList);
    }
 
-    @ApiOperation(value="护理单元分页列表查询", notes="护理单元分页列表查询")
     @GetMapping(value = "/nuList")
     public Result<IPage<AppCameraInfo>> queryNuPageList(AppCameraInfo CameraInfo,
                                                         @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -63,7 +60,6 @@ public class AppCameraInfoController extends JeecgController<AppCameraInfo, IApp
         return Result.OK(pageList);
     }
 
-    @ApiOperation(value="护理单元-物联管理-摄像头信息-查询", notes="护理单元-物联管理-摄像头信息-查询")
     @GetMapping(value = "/getByNuId")
     public Result<AppCameraInfo> getByNuId(AppCameraInfo CameraInfo) {
         AppCameraInfo entity = service.getByNuId(CameraInfo);
@@ -71,7 +67,7 @@ public class AppCameraInfoController extends JeecgController<AppCameraInfo, IApp
     }
 
     /**
-     * 重启摄像头
+     * 修改摄像头信息
      *
      * @param cameraInfo
      * @return
@@ -104,17 +100,6 @@ public class AppCameraInfoController extends JeecgController<AppCameraInfo, IApp
         return service.setImageCommon(map);
     }
 
-    /**
-     * 获取OSD能力集
-     *
-     * @param map
-     * @return
-     */
-    @PostMapping(value = "/getOsdCapability")
-    public Result<JSONObject> getOsdCapability(@RequestBody Map<String,Object> map) {
-        return service.getOsdCapability(map);
-    }
-
     /**
      * 获取OSD参数
      *
@@ -181,50 +166,6 @@ public class AppCameraInfoController extends JeecgController<AppCameraInfo, IApp
         return service.getPreviewUrl(cameraInfo);
     }
 
-    /**
-     * 获取镜头遮挡参数
-     *
-     * @param map
-     * @return
-     */
-    @PostMapping(value = "/getTamperDet")
-    public Result<JSONObject> getTamperDet(@RequestBody Map<String,Object> map) {
-        return service.getTamperDet(map);
-    }
-
-    /**
-     * 设置镜头遮挡参数
-     *
-     * @param map
-     * @return
-     */
-    @PostMapping(value = "/setTamperDet")
-    public Result<String> setTamperDet(@RequestBody Map<String,Object> map) {
-        return service.setTamperDet(map);
-    }
-
-    /**
-     * 获取镜头遮挡处理方式
-     *
-     * @param map
-     * @return
-     */
-    @PostMapping(value = "/getTamperNotif")
-    public Result<JSONObject> getTamperNotif(@RequestBody Map<String,Object> map) {
-        return service.getTamperNotif(map);
-    }
-
-    /**
-     * 设置镜头遮挡处理方式
-     *
-     * @param map
-     * @return
-     */
-    @PostMapping(value = "/setTamperNotif")
-    public Result setTamperNotif(@RequestBody Map<String,Object> map) {
-        return service.setTamperNotif(map);
-    }
-
     /**
      * 报警声音试听
      *
@@ -236,50 +177,6 @@ public class AppCameraInfoController extends JeecgController<AppCameraInfo, IApp
         return service.testAudio(map);
     }
 
-    /**
-     * 获取白光/声音告警参数
-     *
-     * @param map
-     * @return
-     */
-    @PostMapping(value = "/getAlarmInfo")
-    public Result<JSONObject> getAlarmInfo(@RequestBody Map<String,Object> map) {
-        return service.getAlarmInfo(map);
-    }
-
-    /**
-     * 设置白光/声音告警参数
-     *
-     * @param map
-     * @return
-     */
-    @PostMapping(value = "/setAlarmInfo")
-    public Result<String> setAlarmInfo(@RequestBody Map<String,Object> map) {
-        return service.setAlarmInfo(map);
-    }
-
-    /**
-     * 获取白光/声音告警布防时间
-     *
-     * @param map
-     * @return
-     */
-    @PostMapping(value = "/getAlarmPlan")
-    public Result<JSONObject> getAlarmPlan(@RequestBody Map<String,Object> map) {
-        return service.getAlarmPlan(map);
-    }
-
-    /**
-     * 设置白光/声音告警布防时间
-     *
-     * @param map
-     * @return
-     */
-    @PostMapping(value = "/setAlarmPlan")
-    public Result setAlarmPlan(@RequestBody Map<String,Object> map) {
-        return service.setAlarmPlan(map);
-    }
-
     /**
      * 搜索某天的录像数据
      *
@@ -360,4 +257,15 @@ public class AppCameraInfoController extends JeecgController<AppCameraInfo, IApp
         return service.getUploadToServerProcess(cameraInfo);
     }
 
+    /**
+     * 高速球机移动方向控制
+     *
+     * @param cameraInfo
+     * @return
+     */
+    @GetMapping(value = "/motionCtrl")
+    public Result motionCtrl(AppCameraInfo cameraInfo) throws Exception{
+        return service.motionCtrl(cameraInfo);
+    }
+
 }
diff --git a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/entity/AppCameraInfo.java b/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/entity/AppCameraInfo.java
index 94b58b8..6ddd80e 100644
--- a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/entity/AppCameraInfo.java
+++ b/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/entity/AppCameraInfo.java
@@ -278,4 +278,13 @@ public class AppCameraInfo implements Serializable {
 	@ApiModelProperty(value = "上传进度")
 	@TableField(exist = false)
 	private String process;
+	@ApiModelProperty(value = "移动方向;枚举:[0:左上,1:上,2:右上,3:左,4:持续水平转动,5:右,6:左下,7:下,8:右下,9:缩小画面,10:放大画面,11:聚焦近处,12:聚焦远处]")
+	@TableField(exist = false)
+	private String direction;
+	@ApiModelProperty(value = "开始或停止移动;枚举:[0:停止,1:开始]")
+	@TableField(exist = false)
+	private String startOrNot;
+	@ApiModelProperty(value = "球机移动速度")
+	@TableField(exist = false)
+	private String speed;
 }
diff --git a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/enums/AppApiEnum.java b/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/enums/AppApiEnum.java
index 561464f..02a85bc 100644
--- a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/enums/AppApiEnum.java
+++ b/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/enums/AppApiEnum.java
@@ -35,7 +35,8 @@ public enum AppApiEnum {
     IPC_GET_MULTITRANS_URL("/tums/playback/v1/getMultitransUrl","获取nvmp设备双向通信URL"),
     IPC_UPLOAD_TO_SERVER("/tums/playback/v1/uploadToServer","回放视频转mp4上传"),
     IPC_STOP_UPLOAD_TO_SERVER("/tums/preview/v1/stopUploadToServer","停止转存MP4上传任务"),
-    IPC_GET_UPLOAD_TO_SERVER_PROCESS("/tums/preview/v1/getUploadToServerProcess","获取转存MP4上传任务进度");
+    IPC_GET_UPLOAD_TO_SERVER_PROCESS("/tums/preview/v1/getUploadToServerProcess","获取转存MP4上传任务进度"),
+    IPC_MOTION_CTRL("/tums/ptz/v1/motionCtrl","高速球机移动方向控制");
 
     private final String value;//自定义属性，枚举值，获取：如ApiEnum.GET_ENCRYPT_KEY_FOR_LOGIN.getValue();
     private final String remark;//自定义属性，枚举描述，获取：如ApiEnum.GET_ENCRYPT_KEY_FOR_LOGIN.getRemark();
diff --git a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/service/IAppCameraInfoService.java b/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/service/IAppCameraInfoService.java
index 07387b9..2fa5e97 100644
--- a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/service/IAppCameraInfoService.java
+++ b/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/service/IAppCameraInfoService.java
@@ -45,4 +45,5 @@ public interface IAppCameraInfoService extends IService<AppCameraInfo> {
     Result uploadToServer(AppCameraInfo cameraInfo);
     Result<String> stopUploadToServer(AppCameraInfo cameraInfo);
     Result getUploadToServerProcess(AppCameraInfo cameraInfo);
+    Result motionCtrl(AppCameraInfo cameraInfo);
 }
diff --git a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/service/impl/AppCameraInfoServiceImpl.java b/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/service/impl/AppCameraInfoServiceImpl.java
index 2d06c89..ab931ae 100644
--- a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/service/impl/AppCameraInfoServiceImpl.java
+++ b/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/service/impl/AppCameraInfoServiceImpl.java
@@ -1890,4 +1890,34 @@ public class AppCameraInfoServiceImpl extends ServiceImpl<AppCameraInfoMapper, A
             return Result.error(errMsg);
         }
     }
+
+    /**
+     * 高速球机移动方向控制
+     * @param cameraInfo
+     * @return
+     */
+    @Override
+    public Result motionCtrl(AppCameraInfo cameraInfo){
+        StringBuffer sb = new StringBuffer();
+        sb.append("{");
+        sb.append("\"id\"").append(":").append("\"").append(cameraInfo.getDeviceIndex()).append("\",");
+        sb.append("\"direction\"").append(":").append(cameraInfo.getDirection()).append(",");
+        sb.append("\"startOrNot\"").append(":").append(cameraInfo.getStartOrNot()).append(",");
+        sb.append("\"speed\"").append(":").append("\"").append(cameraInfo.getSpeed()).append("\"");
+        sb.append("}");
+        String res = tumsApi.motionCtrl(sb.toString());
+        JSONObject jsonObject = new JSONObject(res);
+        int errorCode = jsonObject.getInt("error_code");
+        if(errorCode == 0){
+            return Result.OK();
+        }else{
+            String errMsg = jsonObject.getStr("msg");
+            if(errMsg == null || errMsg.equals("")) {
+                AppErrorCode errVo = errorCodeService.getByCode(String.valueOf(errorCode));
+                errMsg = errVo.getErrorMsg();
+            }
+            log.info("motionCtrl:{}-{}",errorCode,errMsg);
+            return Result.error(errMsg);
+        }
+    }
 }
diff --git a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/utils/AppTumsApi.java b/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/utils/AppTumsApi.java
index b412401..899b71d 100644
--- a/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/utils/AppTumsApi.java
+++ b/nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/utils/AppTumsApi.java
@@ -268,4 +268,17 @@ public class AppTumsApi {
         return jsonResponse;
     }
 
+    /**
+     * 高速球机移动方向控制
+     * @param jsonRequest
+     * @return
+     */
+    public String motionCtrl(String jsonRequest){
+        this.createTumsClient();
+        log.info("motionCtrl:request:{}",jsonRequest);
+        String jsonResponse = tumsClient.request(jsonRequest, AppApiEnum.IPC_MOTION_CTRL.getValue());
+        log.info("motionCtrl:response:{}",jsonResponse);
+        return jsonResponse;
+    }
+
 }