|
|
@@ -13,6 +13,7 @@ import com.ozs.service.service.BaseUserService;
|
|
|
import com.ozs.service.service.UserRegistrationidService;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
+import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.stereotype.Controller;
|
|
|
import org.springframework.util.ObjectUtils;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
@@ -40,6 +41,8 @@ public class WebSocketConteoller extends BaseController {
|
|
|
private BaseCameraManagementService baseCameraManagementService;
|
|
|
@Autowired
|
|
|
private UserRegistrationidService userRegistrationidService;
|
|
|
+ @Value("${base.imgUrl:http://124.71.171.71:18801/picbucket}")
|
|
|
+ private String imgUrl;
|
|
|
|
|
|
@ResponseBody
|
|
|
@PostMapping("/publish")
|
|
|
@@ -65,6 +68,15 @@ public class WebSocketConteoller extends BaseController {
|
|
|
String cameraName = baseRailwayManagementService.getCameraNameByCameraCode(cameraCode);
|
|
|
msgAlarmResp.setRailwayName(cameraName != null ? cameraName : "");
|
|
|
msgAlarmResp.setLineDirStr(baseCameraManagement.getLineDir() == 1 ? "上行" : "下行");
|
|
|
+ msgAlarmResp.setAlarmTime(msgAlarm.getAlarmTime() != null ? msgAlarm.getAlarmTime() : new Date());
|
|
|
+ // 图片
|
|
|
+ ArrayList<String> objects = new ArrayList<>();
|
|
|
+ String[] split = msgAlarm.getImageUrl().split(";");
|
|
|
+ for (String s : split) {
|
|
|
+ s = imgUrl + s;
|
|
|
+ objects.add(s);
|
|
|
+ }
|
|
|
+ msgAlarmResp.setImageUrls(objects);
|
|
|
// 推送消息reqMsgAlarmVo
|
|
|
webSocketServer.sendMoreMessage(list, objStr(msgAlarmResp));
|
|
|
|
|
|
@@ -79,7 +91,7 @@ public class WebSocketConteoller extends BaseController {
|
|
|
JPushUtil.sendToRegistrationId(
|
|
|
alias,
|
|
|
"报警通知！", cameraName != null ? cameraName : "",
|
|
|
- formatDate + " " + (msgAlarmResp.getAlarmType() == 1 ? "泥石流" : msgAlarmResp.getAlarmType())+ " " + (baseCameraManagement.getLineDir() == 1 ? "上行" : "下行") + " " + mile + " " + endMile,
|
|
|
+ formatDate + " " + (msgAlarmResp.getAlarmType() == 1 ? "泥石流" : msgAlarmResp.getAlarmType()) + " " + (baseCameraManagement.getLineDir() == 1 ? "上行" : "下行") + " " + mile + " " + endMile,
|
|
|
"");
|
|
|
HashMap<String, Object> map = new HashMap<>();
|
|
|
map.put("code", 200);
|
sunhh