1078-临时提交

src/main/java/com/genersoft/iot/vmp/jt1078/bean/JConfirmationAlarmMessageType.java

@@ -0,0 +1,78 @@
+package com.genersoft.iot.vmp.jt1078.bean;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+public class JConfirmationAlarmMessageType {
+    @Schema(description = "确认紧急报警 ；")
+    private boolean urgent;
+    @Schema(description = "确认危险预警")
+    private boolean alarmDangerous;
+    @Schema(description = "确认进出区域报警")
+    private boolean alarmRegion;
+    @Schema(description = "确认进出路线报警")
+    private boolean alarmRoute;
+    @Schema(description = "确认路段行驶时间不足/过长报警")
+    private boolean alarmTravelTime;
+    @Schema(description = "确认车辆非法点火报警")
+    private boolean alarmIllegalIgnition;
+    @Schema(description = "确认车辆非法位移报警")
+    private boolean alarmIllegalDisplacement;
+
+
+
+    public boolean isUrgent() {
+        return urgent;
+    }
+
+    public void setUrgent(boolean urgent) {
+        this.urgent = urgent;
+    }
+
+    public boolean isAlarmDangerous() {
+        return alarmDangerous;
+    }
+
+    public void setAlarmDangerous(boolean alarmDangerous) {
+        this.alarmDangerous = alarmDangerous;
+    }
+
+    public boolean isAlarmRegion() {
+        return alarmRegion;
+    }
+
+    public void setAlarmRegion(boolean alarmRegion) {
+        this.alarmRegion = alarmRegion;
+    }
+
+    public boolean isAlarmRoute() {
+        return alarmRoute;
+    }
+
+    public void setAlarmRoute(boolean alarmRoute) {
+        this.alarmRoute = alarmRoute;
+    }
+
+    public boolean isAlarmTravelTime() {
+        return alarmTravelTime;
+    }
+
+    public void setAlarmTravelTime(boolean alarmTravelTime) {
+        this.alarmTravelTime = alarmTravelTime;
+    }
+
+    public boolean isAlarmIllegalIgnition() {
+        return alarmIllegalIgnition;
+    }
+
+    public void setAlarmIllegalIgnition(boolean alarmIllegalIgnition) {
+        this.alarmIllegalIgnition = alarmIllegalIgnition;
+    }
+
+    public boolean isAlarmIllegalDisplacement() {
+        return alarmIllegalDisplacement;
+    }
+
+    public void setAlarmIllegalDisplacement(boolean alarmIllegalDisplacement) {
+        this.alarmIllegalDisplacement = alarmIllegalDisplacement;
+    }
+}

src/main/java/com/genersoft/iot/vmp/jt1078/controller/JT1078Controller.java

@@ -3,6 +3,8 @@ package com.genersoft.iot.vmp.jt1078.controller;
 import com.genersoft.iot.vmp.conf.UserSetting;
 import com.genersoft.iot.vmp.conf.security.JwtUtils;
 import com.genersoft.iot.vmp.jt1078.bean.*;
+import com.genersoft.iot.vmp.jt1078.controller.bean.ConfirmationAlarmMessageParam;
+import com.genersoft.iot.vmp.jt1078.controller.bean.ConnectionControlParam;
 import com.genersoft.iot.vmp.jt1078.proc.request.J1205;
 import com.genersoft.iot.vmp.jt1078.service.Ijt1078Service;
 import com.genersoft.iot.vmp.service.bean.InviteErrorCode;
@@ -385,5 +387,16 @@ public class JT1078Controller {
         service.tempPositionTrackingControl(deviceId, timeInterval, validityPeriod);
     }
 
+    @Operation(summary = "人工确认报警消息", security = @SecurityRequirement(name = JwtUtils.HEADER))
+    @Parameter(name = "deviceId", description = "设备编号", required = true)
+    @Parameter(name = "timeInterval", description = "时间间隔,单位为秒,时间间隔为0 时停止跟踪,停止跟踪无需带后继字段", required = true)
+    @Parameter(name = "validityPeriod", description = "位置跟踪有效期, 单位为秒,终端在接收到位置跟踪控制消息后,在有效期截止时间之前依据消息中的时间间隔发送位置汇报", required = true)
+    @PostMapping("/confirmation-alarm-message")
+    public void confirmationAlarmMessage(@RequestBody ConfirmationAlarmMessageParam param){
+
+        logger.info("[1078-人工确认报警消息] deviceId: {}, 时间间隔 {}秒, 位置跟踪有效期 {}秒", deviceId, timeInterval, validityPeriod);
+        service.confirmationAlarmMessage(param.getDeviceId(), param.getAlarmMessageType());
+    }
+
 }
 

src/main/java/com/genersoft/iot/vmp/jt1078/controller/bean/ConfirmationAlarmMessageParam.java

@@ -0,0 +1,32 @@
+package com.genersoft.iot.vmp.jt1078.controller.bean;
+
+import com.genersoft.iot.vmp.jt1078.bean.JConfirmationAlarmMessageType;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+/**
+ * 人工确认报警消息参数
+ */
+@Schema(description = "人工确认报警消息参数")
+public class ConfirmationAlarmMessageParam {
+    @Schema(description = "设备")
+    private String deviceId;
+    @Schema(description = "报警消息流水号")
+    private int deviceId;
+    private JConfirmationAlarmMessageType alarmMessageType;
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    public JConfirmationAlarmMessageType getAlarmMessageType() {
+        return alarmMessageType;
+    }
+
+    public void setAlarmMessageType(JConfirmationAlarmMessageType alarmMessageType) {
+        this.alarmMessageType = alarmMessageType;
+    }
+}

src/main/java/com/genersoft/iot/vmp/jt1078/controller/bean/ConnectionControlParam.java

@@ -1,4 +1,4 @@
-package com.genersoft.iot.vmp.jt1078.controller;
+package com.genersoft.iot.vmp.jt1078.controller.bean;
 
 import com.genersoft.iot.vmp.jt1078.bean.JTDeviceConnectionControl;