Merge branch 'dyf-device'

revert 晶全代码同步，app接口开发

fys-admin/src/main/java/com/fuyuanshen/app/controller/AppOperationVideoController.java

@@ -29,16 +29,16 @@ public class AppOperationVideoController extends BaseController {
      * 查询操作视频列表
      */
     @GetMapping("/listOperationVideos")
-    public List<AppOperationVideoVo> listOperationVideos(AppOperationVideoBo bo) {
+    public R<List<AppOperationVideoVo>> listOperationVideos(AppOperationVideoBo bo) {
-        return appOperationVideoService.queryList(bo);
+        return R.ok(appOperationVideoService.queryList(bo));
     }
 
     /**
      * 查询操作视频详情信息
      */
     @GetMapping("/getOperationVideoInfo")
-    public AppOperationVideoVo getOperationVideoInfo(AppOperationVideoBo bo) {
+    public R<AppOperationVideoVo> getOperationVideoInfo(AppOperationVideoBo bo) {
-        return appOperationVideoService.queryById(bo.getId());
+        return R.ok(appOperationVideoService.queryById(bo.getId()));
     }
 
     /**
@@ -64,8 +64,8 @@ public class AppOperationVideoController extends BaseController {
     /**
      * 操作视频删除
      */
-    @DeleteMapping("/deleteOperationVideo")
+    @DeleteMapping("/deleteOperationVideo/{id}")
-    public R<Void> deleteOperationVideo(Long[] ids) {
+    public R<Void> deleteOperationVideo(@PathVariable Long id) {
-        return toAjax(appOperationVideoService.deleteWithValidByIds(List.of(ids), true));
+        return toAjax(appOperationVideoService.deleteWithValidByIds(List.of(id), true));
     }
 }

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java

@@ -547,7 +547,7 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
             deviceUpdateWrapper.eq("id", device.getId())
                     .set("binding_status", BindingStatusEnum.BOUND.getCode())
                     .set("binding_user_id", userId);
-            return baseMapper.update(null, qw);
+            return baseMapper.update(null, deviceUpdateWrapper);
         } else {
             throw new RuntimeException("通讯方式错误");
         }
@@ -564,7 +564,8 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
 //        String mode = deviceType.getCommunicationMode();
         UpdateWrapper<Device> deviceUpdateWrapper = new UpdateWrapper<>();
         deviceUpdateWrapper.eq("id", device.getId())
-                .set("binding_status", BindingStatusEnum.UNBOUND.getCode());
+                .set("binding_status", BindingStatusEnum.UNBOUND.getCode())
+                .set("binding_user_id", null);
         return baseMapper.update(null, deviceUpdateWrapper);
     }