代码整合

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

@@ -15,10 +15,7 @@ import com.ozs.common.utils.SecurityUtils;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.uuid.IdUtils;
 import com.ozs.framework.web.service.TokenService;
-import com.ozs.service.entity.BaseCameraManagement;
-import com.ozs.service.entity.BaseRailwayManagement;
-import com.ozs.service.entity.MsgAlarm;
-import com.ozs.service.entity.MsgAppPush;
+import com.ozs.service.entity.*;
 import com.ozs.service.entity.vo.MsgAlarmVo;
 import com.ozs.service.entity.vo.MsgAppPushVo;
 import com.ozs.service.service.MsgAppPushService;
@@ -135,7 +132,7 @@ public class GeoHazardMineController extends BaseController {
         if (!StringUtils.isEmpty(userId)) {
             msgAlarmVo.setUserId(userId);
         }
-        IPage<MsgAlarm> list = msgAppPushService.alarmPushMsg(msgAlarmVo);
+        IPage<MsgAlarmCloud> list = msgAppPushService.alarmPushMsg(msgAlarmVo);
         return AjaxResult.success(list);
     }