Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/GeoHazardMonitor

hazard-admin/src/main/java/com/ozs/web/controller/app/JPushAppController.java

@@ -42,7 +42,9 @@ public class JPushAppController extends BaseController {
     @PostMapping("/addRegistrationID")
     @ApiOperation("存储RegistrationID")
     public AjaxResult addRegistrationID(@RequestBody UserRegistrationid userRegistrationid) {
-        if (StringUtils.isBlank(userRegistrationid.getUserId()) || StringUtils.isBlank(userRegistrationid.getRegistrationId())) {
+        if (StringUtils.isEmpty(userRegistrationid)
+                || StringUtils.isEmpty(userRegistrationid.getUserId())
+                || StringUtils.isEmpty(userRegistrationid.getRegistrationId())) {
             return AjaxResult.error("userId,RegistrationID 不能为空！");
         }
         return toAjax(userRegistrationidService.addRegistrationID(userRegistrationid));

hazard-admin/src/main/java/com/ozs/web/controller/websocket/WebSocketConteoller.java

@@ -85,8 +85,9 @@ public class WebSocketConteoller extends BaseController {
         if (!StringUtils.isEmpty(msgAlarm.getId())) {
             msgAlarmResp.setId(msgAlarm.getId());
         }
+        String content = objStr(msgAlarmResp);
         // 推送消息reqMsgAlarmVo
-        webSocketServer.sendMoreMessage(list, objStr(msgAlarmResp));
+        webSocketServer.sendMoreMessage(list, content);
         // app 消息推送
         List<String> alias = new ArrayList<>();
         if (!StringUtils.isEmpty(userIdList) || userIdList.size() > 0) {
@@ -101,7 +102,8 @@ public class WebSocketConteoller extends BaseController {
             JPushUtil.sendToRegistrationId(
                     alias,
                     "报警通知！", cameraName != null ? cameraName : "",
-                    formatDate + "     " + (msgAlarmResp.getAlarmType() == 1 ? "泥石流" : msgAlarmResp.getAlarmType()) + "     " + (baseCameraManagement.getLineDir() == 1 ? "上行" : "下行") + "     " + mile + "     " + endMile,
+                    content,
+                    // formatDate + "     " + (msgAlarmResp.getAlarmType() == 1 ? "泥石流" : msgAlarmResp.getAlarmType()) + "     " + (baseCameraManagement.getLineDir() == 1 ? "上行" : "下行") + "     " + mile + "     " + endMile,
                     "");
         }
         // 存入数据