修改协议为ws

hazard-admin/src/main/java/com/ozs/web/controller/tool/TestController.java

@@ -6,6 +6,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.ozs.common.utils.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -34,7 +35,8 @@ import io.swagger.annotations.ApiOperation;
 @RequestMapping("/test")
 public class TestController extends BaseController {
 
-
+    @Autowired
+    private com.ozs.web.core.util.CameraUtil cameraUtil;
 
     private final static Map<Integer, UserEntity> users = new LinkedHashMap<Integer, UserEntity>();
 
@@ -43,6 +45,11 @@ public class TestController extends BaseController {
         users.put(2, new UserEntity(2, "ry", "admin123", "15666666666"));
     }
 
+    @GetMapping("/deleteFlv")
+    public R<String> deleteFlv() {
+        return R.ok(cameraUtil.deleteFlv());
+    }
+
     @ApiOperation("获取用户列表")
     @GetMapping("/list")
     public R<List<UserEntity>> userList() {

hazard-admin/src/main/java/com/ozs/web/core/util/CameraUtil.java

@@ -41,6 +41,7 @@ import java.util.stream.Collectors;
 
 @Configuration
 @Slf4j
+@Component
 public class CameraUtil {
 
     private static String historyUrl;

hazard-sdk/src/main/java/com/ozs/controller/upload/GeoHazardMonitorTokenController.java

@@ -31,6 +31,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.nio.charset.StandardCharsets;
 import java.text.ParseException;
 import java.util.*;
 
@@ -292,6 +293,10 @@ public class GeoHazardMonitorTokenController {
 //        String s = SM4Utils.decryptData_ECB(parameter, "4370780c9a8c43e5");
 //        ReqMsgAlarmVo reqMsgAlarmVo = JSON.parseObject(s, ReqMsgAlarmVo.class);
 //        System.out.println(reqMsgAlarmVo.toString());
-        System.out.println(new Date().getTime());
+//        System.out.println(new Date().getTime());
+
+        String s = "0e525fd60be888f54f2ae226329859a5";
+        System.out.println(new String());
+        System.out.println(SM4Utils.decryptData_ECB(s, "4370780c9a8c43e5"));
     }
 }