app推送

business-service/src/main/java/com/ozs/service/service/impl/UserRegistrationidServiceImpl.java

@@ -26,6 +26,9 @@ public class UserRegistrationidServiceImpl extends ServiceImpl<UserRegistrationi
         if (!ObjectUtils.isEmpty(userRegistrationid.getUserId())) {
             lw.in(UserRegistrationid::getUserId, userRegistrationid.getUserId());
         }
+        if (!ObjectUtils.isEmpty(userRegistrationid.getRegistrationId())) {
+            lw.in(UserRegistrationid::getRegistrationId, userRegistrationid.getRegistrationId());
+        }
         List<UserRegistrationid> userRegistrationids = userRegistrationidMapper.selectList(lw);
         int add = 0;
         if (userRegistrationids.size() > 0) {

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

@@ -100,12 +100,14 @@ public class WebSocketConteoller extends BaseController {
         }
         // List<String> alias = new ArrayList<String>();
         // alias.add("sunhh");
-        if (!StringUtils.isEmpty(alias) || alias.size() > 0) {
+        // list去重
+        List<String> listString = distinct(alias);
+        if (!StringUtils.isEmpty(listString) || listString.size() > 0) {
             Date alarmTime = msgAlarm.getAlarmTime();
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             String formatDate = sdf.format(alarmTime != null ? alarmTime : new Date());
             JPushUtil.sendToRegistrationId(
-                    alias,
+                    listString,
                     "报警通知！", cameraName != null ? cameraName : "",
                     // content,
                     formatDate + "     " + (msgAlarmResp.getAlarmType() == 1 ? "泥石流" : msgAlarmResp.getAlarmType()) + "     " + (baseCameraManagement.getLineDir() == 1 ? "上行" : "下行") + "     " + mile + "     " + endMile,
@@ -142,6 +144,22 @@ public class WebSocketConteoller extends BaseController {
         return map;
     }
 
+    /**
+     * 去除重复数据
+     * 由于Set的无序性，不会保持原来顺序
+     * @param list
+     */
+    public static List<String> distinct(List<String> list) {
+        final boolean sta = null != list && list.size() > 0;
+        List doubleList= new ArrayList();
+        if (sta) {
+            Set set = new HashSet();
+            set.addAll(list);
+            doubleList.addAll(set);
+        }
+        return doubleList;
+    }
+
     private String objStr(MsgAlarmResp msgAlarmResp) {
         JSONObject obj = new JSONObject();
         obj.put("data", msgAlarmResp); //data