hexiao 2 лет назад
Родитель
Сommit
dc19c2f590

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

@@ -22,6 +22,7 @@ import com.ozs.vo.ReqDeviceVo;
 import com.ozs.vo.ReqMsgAlarmVo;
 import com.ozs.vo.RespGeoHazardMonitorVo;
 import com.ozs.vo.RespMsgAlarmVo;
+import io.lettuce.core.ScriptOutputType;
 import io.swagger.models.auth.In;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
@@ -236,4 +237,11 @@ public class GeoHazardMonitorTokenController {
             return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
         }
     }
+
+    public static void main(String[] args) {
+        String parameter = "rjW9XcaNdY1M2rtUj4rYsW+3nqcJUDBuE6Orqvd4vyMhOh3fQGPNava0aOcUA7h0wuxoQtHE3bUP5imxqbRd/iBT7QDkrqtdPP5QLEhQodT8v0l8YMMtb7yohAJfEThLJOJ8Odl0kuTJXEJBMD8pE//K9KpRGDY4eEKPdS26YywnIl6HwK9EweYxVGtfJOP3/N7lwum2ROv7iqYgefXd/IxGEG8eVqEUutGKpeCcM0dds/N3Uq5ri/k/BrpaKcV96GnlR4pWkBjWOW08eGJ78shuUJkC682294W4RUp3NPPR7OTErtVAh65or8pB+RGDZuZQlUJ/QVpWp2ZdCrN5Wjqsi1TIa00oGQbYmMixOF0=";
+        String s = SM4Utils.decryptData_ECB(parameter, "4370780c9a8c43e5");
+        ReqMsgAlarmVo reqMsgAlarmVo = JSON.parseObject(s, ReqMsgAlarmVo.class);
+        System.out.println(reqMsgAlarmVo.toString());
+    }
 }

+ 5 - 3
hazard-sdk/src/main/java/com/ozs/vo/ReqMsgAlarmVo.java

@@ -22,8 +22,10 @@ public class ReqMsgAlarmVo implements Serializable {
     /** 报警时间 */
     private Long alarmTime;
 
-    /** 相机编码 */
-    private Integer alarmCamera;
+    /**
+     * 相机编码
+     */
+    private String alarmCamera;
 
     /** 报警里程位置 */
     private String alarmMile;
@@ -42,7 +44,7 @@ public class ReqMsgAlarmVo implements Serializable {
 
     /** 报警病害属性(可以给出泥石流的框定范围) */
     private String alarmAttr;
-    
+
     /** 报警图片地址 */
     private String[] imageUrls;
 }

+ 14 - 6
hazard-sdk/src/main/java/com/ozs/vo/RespMsgAlarmVo.java

@@ -13,15 +13,23 @@ public class RespMsgAlarmVo implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /** 主键ID */
+    /**
+     * 主键ID
+     */
     private String alarmId;
 
-    /** 报警解除时间 */
+    /**
+     * 报警解除时间
+     */
     private Long cancelTime;
 
-    /** 相机编码 */
-    private Integer cameraCode;
-    
-    /** 报警是否解除 1已解除2未解除 */
+    /**
+     * 相机编码
+     */
+    private String cameraCode;
+
+    /**
+     * 报警是否解除 1已解除2未解除
+     */
     private Integer isCancel;
 }