|
@ -14,10 +14,16 @@ import io.swagger.annotations.Api; |
|
|
import io.swagger.annotations.ApiOperation; |
|
|
import io.swagger.annotations.ApiOperation; |
|
|
import org.eclipse.paho.client.mqttv3.*; |
|
|
import org.eclipse.paho.client.mqttv3.*; |
|
|
import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence; |
|
|
import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence; |
|
|
import org.springframework.web.bind.annotation.*; |
|
|
import org.springframework.web.bind.annotation.PostMapping; |
|
|
|
|
|
import org.springframework.web.bind.annotation.RequestMapping; |
|
|
|
|
|
import org.springframework.web.bind.annotation.RestController; |
|
|
|
|
|
|
|
|
import javax.annotation.Resource; |
|
|
import javax.annotation.Resource; |
|
|
import java.util.*; |
|
|
import java.util.ArrayList; |
|
|
|
|
|
import java.util.Date; |
|
|
|
|
|
import java.util.HashMap; |
|
|
|
|
|
import java.util.Map; |
|
|
|
|
|
import java.util.Objects; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
@ -156,7 +162,7 @@ public class NonAutomaticWarningController extends BaseController { |
|
|
dcWarning.setWarningType(7); |
|
|
dcWarning.setWarningType(7); |
|
|
break; |
|
|
break; |
|
|
default://其他
|
|
|
default://其他
|
|
|
dcWarning.setWarningType(10); |
|
|
dcWarning.setWarningType(99); |
|
|
} |
|
|
} |
|
|
if (Objects.equals(directionName, "上行")) { |
|
|
if (Objects.equals(directionName, "上行")) { |
|
|
dcWarning.setDirection("1"); |
|
|
dcWarning.setDirection("1"); |
|
|