Merge remote-tracking branch 'origin/master'

jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/RecycleDeviceController.java

@@ -356,5 +356,21 @@ public class RecycleDeviceController {
         }
     }
 
+    @PostMapping("/getSnapShot")
+    @Operation(summary = "获取抓拍结果")
+    public ActionResult getSnapShot(@RequestBody DeviceVO deviceVO) {
+        String deviceCode = deviceVO.getDeviceCode();
+        boolean exists = redisUtil.exists("snap_" + deviceCode);
+        long expire = redisUtil.getLiveTime("snap_" + deviceCode);
+        if (!exists || expire <= 0) {
+            return ActionResult.fail(400, "获取快照失败");
+        } else {
+            Object value = redisUtil.getString("snap_" + deviceCode);
+            List<FileUploadRespVO> list = JSONUtil.toList(value.toString(), FileUploadRespVO.class);
+            redisUtil.remove("snap_" + deviceCode);
+            return ActionResult.success(list);
+        }
+    }
+
 
 }

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recycledevice/FileUploadRespVO.java

@@ -0,0 +1,10 @@
+package jnpf.model.recycledevice;
+
+import lombok.Data;
+
+@Data
+public class FileUploadRespVO {
+    private String name;
+    private String url;
+    private String field;
+}