代码整合

business-service/src/main/java/com/ozs/service/entity/MsgAlarmCloud.java

@@ -240,4 +240,24 @@ public class MsgAlarmCloud extends BaseEntity implements Serializable {
      */
     @TableField(exist = false)
     private Integer failureToAlarm;
+
+    /**
+     *所属工务段名称
+     */
+    @TableField(exist = false)
+    private String deptName;
+
+    /**
+     * 版本号
+     */
+    @Excel(name = "版本号")
+    @TableField(exist = false)
+    private String versionNum;
+
+    /**
+     * 版本名称
+     */
+    @Excel(name = "版本名称")
+    @TableField(exist = false)
+    private String versionName;
 }

business-service/src/main/java/com/ozs/service/mapper/BaseCameraManagementMapper.java

@@ -2,9 +2,7 @@ package com.ozs.service.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ozs.service.entity.BaseCameraManagement;
-import com.ozs.service.entity.MsgAlarm;
 import com.ozs.service.entity.vo.*;
-import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

business-service/src/main/java/com/ozs/service/mapper/MsgAlarmCloudMapper.java

@@ -1,7 +1,6 @@
 package com.ozs.service.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ozs.service.entity.MsgAlarm;
 import com.ozs.service.entity.MsgAlarmCloud;
 import com.ozs.service.entity.vo.*;
 import org.apache.ibatis.annotations.Mapper;

business-service/src/main/java/com/ozs/service/mapper/MsgAlarmMatterMapper.java

@@ -1,11 +1,9 @@
 package com.ozs.service.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ozs.service.entity.MsgAlarm;
 import com.ozs.service.entity.MsgAlarmMatter;
 import com.ozs.service.entity.vo.*;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;

business-service/src/main/java/com/ozs/service/mapper/MsgAppPushMapper.java

@@ -1,12 +1,11 @@
 package com.ozs.service.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ozs.service.entity.MsgAlarm;
+import com.ozs.service.entity.MsgAlarmCloud;
 import com.ozs.service.entity.MsgAppPush;
 import com.ozs.service.entity.vo.MsgAlarmVo;
 import com.ozs.service.entity.vo.MsgAppPushVo;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -36,7 +35,7 @@ public interface MsgAppPushMapper extends BaseMapper<MsgAppPush> {
      */
     int updates(MsgAppPush msgAppPush);
 
-    List<MsgAlarm> messageMoreApp(MsgAlarmVo msgAlarmVo);
+    List<MsgAlarmCloud> messageMoreApp(MsgAlarmVo msgAlarmVo);
 
     List<MsgAppPush> getByUserId(String userId);
 }

business-service/src/main/java/com/ozs/service/mapper/MsgWebPushMapper.java

@@ -1,7 +1,7 @@
 package com.ozs.service.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ozs.service.entity.MsgAlarm;
+import com.ozs.service.entity.MsgAlarmCloud;
 import com.ozs.service.entity.MsgWebPush;
 import com.ozs.service.entity.vo.MsgAlarmVo;
 import org.apache.ibatis.annotations.Mapper;
@@ -18,9 +18,9 @@ import java.util.Map;
 public interface MsgWebPushMapper extends BaseMapper<MsgWebPush> {
     Integer webAlarmNum(@Param("userId") String userId);
 
-    List<MsgAlarm> webAlarm(@Param("userId") String userId);
+    List<MsgAlarmCloud> webAlarm(@Param("userId") String userId);
 
-    List<MsgAlarm> messageMore(MsgAlarmVo msgAlarmVo);
+    List<MsgAlarmCloud> messageMore(MsgAlarmVo msgAlarmVo);
 
     Map<String, Integer> messageMoreNum(@Param("userId") String userId);
 

business-service/src/main/java/com/ozs/service/service/MsgAppPushService.java

@@ -2,11 +2,9 @@ package com.ozs.service.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ozs.service.entity.MsgAlarm;
+import com.ozs.service.entity.MsgAlarmCloud;
 import com.ozs.service.entity.MsgAppPush;
 import com.ozs.service.entity.vo.MsgAlarmVo;
-import com.ozs.service.entity.vo.MsgAppPushVo;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -23,7 +21,7 @@ public interface MsgAppPushService extends IService<MsgAppPush> {
      * @param
      * @return
      */
-    IPage<MsgAlarm> alarmPushMsg(MsgAlarmVo msgAlarmVo);
+    IPage<MsgAlarmCloud> alarmPushMsg(MsgAlarmVo msgAlarmVo);
 
     /**
      * app推送报警信息记录修改状态

business-service/src/main/java/com/ozs/service/service/MsgWebPushService.java

@@ -2,8 +2,7 @@ package com.ozs.service.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ozs.service.entity.MsgAlarm;
-import com.ozs.service.entity.MsgAppPush;
+import com.ozs.service.entity.MsgAlarmCloud;
 import com.ozs.service.entity.MsgWebPush;
 import com.ozs.service.entity.vo.MsgAlarmVo;
 
@@ -19,7 +18,7 @@ public interface MsgWebPushService extends IService<MsgWebPush> {
 
     Map webAlarm(String userId);
 
-    IPage<MsgAlarm> messageMore(MsgAlarmVo msgAlarmVo);
+    IPage<MsgAlarmCloud> messageMore(MsgAlarmVo msgAlarmVo);
 
     Map<String, Integer> messageMoreNum(String userId);
 

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

@@ -49,8 +49,6 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
     private BaseUserService baseUserService;
     @Resource
     private BaseUserMapper baseUserMapper;
-    @Resource
-    private MsgAlarmMapper msgAlarmMapper;
     @Autowired
     private BaseDeptMapper baseDeptMapper;
     @Autowired

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

@@ -8,7 +8,6 @@ import com.github.pagehelper.PageHelper;
 import com.ozs.common.constant.Constants;
 import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.service.entity.BaseCameraManagement;
-import com.ozs.service.entity.BaseRailwayManagement;
 import com.ozs.service.entity.MsgAlarm;
 import com.ozs.service.entity.vo.*;
 import com.ozs.service.mapper.BaseCameraManagementMapper;

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

@@ -38,15 +38,15 @@ public class MsgAppPushServiceImpl extends ServiceImpl<MsgAppPushMapper, MsgAppP
     private BaseRailwayManagementService baseRailwayManagementService;
 
     @Override
-    public IPage<MsgAlarm> alarmPushMsg(MsgAlarmVo msgAlarmVo) {
-        Page<MsgAlarm> page = PageHelper.startPage(msgAlarmVo.getPageNum().intValue(), msgAlarmVo.getPageSize().intValue())
+    public IPage<MsgAlarmCloud> alarmPushMsg(MsgAlarmVo msgAlarmVo) {
+        Page<MsgAlarmCloud> page = PageHelper.startPage(msgAlarmVo.getPageNum().intValue(), msgAlarmVo.getPageSize().intValue())
                 .doSelectPage(() -> msgAppPushMapper.messageMoreApp(msgAlarmVo));
-        com.baomidou.mybatisplus.extension.plugins.pagination.Page<MsgAlarm> pageR =
+        com.baomidou.mybatisplus.extension.plugins.pagination.Page<MsgAlarmCloud> pageR =
                 new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(msgAlarmVo.getPageNum().intValue(), msgAlarmVo.getPageSize().intValue());
         pageR.setSize(page.size());
         pageR.setTotal(page.getTotal());
         if (!ObjectUtils.isEmpty(page) && !ObjectUtils.isEmpty(page.getResult())) {
-            List<MsgAlarm> dto1 = page.getResult().stream().map(o -> {
+            List<MsgAlarmCloud> dto1 = page.getResult().stream().map(o -> {
                 String[] split = o.getImageUrl().split(";");
                 ArrayList<String> objects = new ArrayList<>(Arrays.asList(split));
                 o.setImageUrls(objects);
@@ -71,7 +71,7 @@ public class MsgAppPushServiceImpl extends ServiceImpl<MsgAppPushMapper, MsgAppP
                     String begin = AppendUtils.stringAppend(cameraManagement.getBeginMile());
                     o.setBeginMile(begin);
                 }
-                // o.setAlarmCount((int) msgAlarmFrequencyService.count()+1);
+                // o.setAlarmCount((int) msgAlarmFrequencyCloudService.count()+1);
                 return o;
             }).collect(Collectors.toList());
             pageR.setRecords(dto1);

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

@@ -8,10 +8,7 @@ import com.github.pagehelper.PageHelper;
 import com.ozs.common.utils.AppendUtils;
 import com.ozs.common.utils.PageUtils;
 import com.ozs.common.utils.StringUtils;
-import com.ozs.service.entity.BaseCameraManagement;
-import com.ozs.service.entity.BaseRailwayManagement;
-import com.ozs.service.entity.MsgAlarm;
-import com.ozs.service.entity.MsgWebPush;
+import com.ozs.service.entity.*;
 import com.ozs.service.entity.vo.MsgAlarmResp;
 import com.ozs.service.entity.vo.MsgAlarmVo;
 import com.ozs.service.mapper.MsgWebPushMapper;
@@ -52,12 +49,12 @@ public class MsgWebPushServiceImpl extends ServiceImpl<MsgWebPushMapper, MsgWebP
         Map<String, Object> webAlarmMap = new HashMap<>();
         List<MsgAlarmResp> msgAlarmRespList = new ArrayList<>();
         Integer webAlarmNum = msgWebPushMapper.webAlarmNum(userId);
-        List<MsgAlarm> webAlarm = msgWebPushMapper.webAlarm(userId);
+        List<MsgAlarmCloud> webAlarm = msgWebPushMapper.webAlarm(userId);
         if (!StringUtils.isEmpty(webAlarm) && webAlarm.size() > 0) {
-            for (MsgAlarm msgAlarm : webAlarm) {
+            for (MsgAlarmCloud msgAlarmcloud : webAlarm) {
                 LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
-                if (!ObjectUtils.isEmpty(msgAlarm.getCameraCode())) {
-                    lw.eq(BaseCameraManagement::getCameraCode, msgAlarm.getCameraCode());
+                if (!ObjectUtils.isEmpty(msgAlarmcloud.getCameraCode())) {
+                    lw.eq(BaseCameraManagement::getCameraCode, msgAlarmcloud.getCameraCode());
                 }
                 BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(lw);
                 LambdaQueryWrapper<BaseRailwayManagement> wrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
@@ -66,7 +63,7 @@ public class MsgWebPushServiceImpl extends ServiceImpl<MsgWebPushMapper, MsgWebP
                 }
                 BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(wrapper);
                 MsgAlarmResp msgAlarmResp = new MsgAlarmResp();
-                BeanUtils.copyProperties(msgAlarm, msgAlarmResp);
+                BeanUtils.copyProperties(msgAlarmcloud, msgAlarmResp);
                 msgAlarmResp.setRailwayName(baseRailwayManagement.getRailwayName());
                 msgAlarmResp.setDeptId(baseCameraManagement.getDeptId());
                 if (!ObjectUtils.isEmpty(baseCameraManagement.getBeginMile())&&!ObjectUtils.isEmpty(baseCameraManagement.getEndMile())) {
@@ -78,7 +75,7 @@ public class MsgWebPushServiceImpl extends ServiceImpl<MsgWebPushMapper, MsgWebP
                 String mile = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
                 msgAlarmResp.setAlarmMile(mile);
                 msgAlarmResp.setInstallLongitude(baseCameraManagement.getInstallLongitude() + "," + baseCameraManagement.getInstallLatitude());
-                msgAlarmResp.setPushId(msgAlarm.getMsgId());
+                msgAlarmResp.setPushId(msgAlarmcloud.getMsgId());
                 msgAlarmRespList.add(msgAlarmResp);
             }
         }
@@ -88,16 +85,15 @@ public class MsgWebPushServiceImpl extends ServiceImpl<MsgWebPushMapper, MsgWebP
     }
 
     @Override
-    public IPage<MsgAlarm> messageMore(MsgAlarmVo msgAlarmVo) {
-        Page<MsgAlarm> page = PageHelper.startPage(msgAlarmVo.getPageNum().intValue(), msgAlarmVo.getPageSize().intValue())
+    public IPage<MsgAlarmCloud> messageMore(MsgAlarmVo msgAlarmVo) {
+        Page<MsgAlarmCloud> page = PageHelper.startPage(msgAlarmVo.getPageNum().intValue(), msgAlarmVo.getPageSize().intValue())
                 .doSelectPage(() -> msgWebPushMapper.messageMore(msgAlarmVo));
-        com.baomidou.mybatisplus.extension.plugins.pagination.Page<MsgAlarm> pageR =
+        com.baomidou.mybatisplus.extension.plugins.pagination.Page<MsgAlarmCloud> pageR =
                 new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(msgAlarmVo.getPageNum().intValue(), msgAlarmVo.getPageSize().intValue());
         pageR.setSize(page.size());
         pageR.setTotal(page.getTotal());
-        // Page<MsgAlarm> page = PageUtils.getPages(msgAlarmVo.getPageNum().intValue(), msgAlarmVo.getPageSize().intValue(), webAlarm);
         if (!ObjectUtils.isEmpty(page) && !ObjectUtils.isEmpty(page.getResult())) {
-            List<MsgAlarm> dto1 = page.getResult().stream().map(o -> {
+            List<MsgAlarmCloud> dto1 = page.getResult().stream().map(o -> {
                 String[] split = o.getImageUrl().split(";");
                 ArrayList<String> objects = new ArrayList<>(Arrays.asList(split));
                 o.setImageUrls(objects);

business-service/src/main/resources/mapper/service/MsgAppPushMapper.xml

@@ -55,7 +55,7 @@
         b.install_longitude AS install_longitude,
         b.install_latitude AS install_latitude
         from msg_app_push m join
-        msg_alarm AS a on m.alarm_id=a.alarm_id join
+        msg_alarm_cloud AS a on m.alarm_id=a.alarm_id join
         base_camera_management AS b on a.camera_code=b.camera_code join
         base_railway_management AS r on b.railway_code=r.railway_code
         <where>
@@ -89,10 +89,10 @@
         </where>
     </update>
 
-    <select id="messageMoreApp" parameterType="com.ozs.service.entity.vo.MsgAlarmVo" resultType="com.ozs.service.entity.MsgAlarm">
+    <select id="messageMoreApp" parameterType="com.ozs.service.entity.vo.MsgAlarmVo" resultType="com.ozs.service.entity.MsgAlarmCloud">
         select b.*, a.status, a.push_id as msgId
         from msg_app_push AS a
-        join msg_alarm AS b on a.alarm_id = b.alarm_id
+        join msg_alarm_cloud AS b on a.alarm_id = b.alarm_id
         join base_camera_management AS c on b.camera_code = c.camera_code
         <where>
             <if test="userId != null and userId != ''">

business-service/src/main/resources/mapper/service/MsgWebPushMapper.xml

@@ -9,20 +9,20 @@
         </if>
     </select>
 
-    <select id="webAlarm" parameterType="java.lang.String" resultType="com.ozs.service.entity.MsgAlarm">
+    <select id="webAlarm" parameterType="java.lang.String" resultType="com.ozs.service.entity.MsgAlarmCloud">
         select b.*, a.push_id as msgId
         from msg_web_push AS a
-        join msg_alarm AS b on a.alarm_id = b.alarm_id
+        join msg_alarm_cloud AS b on a.alarm_id = b.alarm_id
         where a.status = 1
         <if test="userId != null and userId != ''">
             and a.receive_by = #{userId}
         </if>
     </select>
 
-    <select id="messageMore" parameterType="com.ozs.service.entity.vo.MsgAlarmVo" resultType="com.ozs.service.entity.MsgAlarm">
+    <select id="messageMore" parameterType="com.ozs.service.entity.vo.MsgAlarmVo" resultType="com.ozs.service.entity.MsgAlarmCloud">
         select b.*, a.status, a.push_id as msgId
         from msg_web_push AS a
-        join msg_alarm AS b on a.alarm_id = b.alarm_id
+        join msg_alarm_cloud AS b on a.alarm_id = b.alarm_id
         join base_camera_management AS c on b.camera_code = c.camera_code
         <where>
             <if test="userId != null and userId != ''">

hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseCameraManagementController.java

@@ -75,7 +75,7 @@ public class BaseCameraManagementController extends BaseController {
     @Autowired
     private ISysDeptService deptService;
     @Autowired
-    private MsgAlarmService msgAlarmService;
+    private MsgAlarmCloudService msgAlarmCloudService;
     @Autowired
     private BaseRailwayManagementService baseRailwayManagementService;
     @Autowired
@@ -155,10 +155,10 @@ public class BaseCameraManagementController extends BaseController {
             baseCameraManagement.setInstallLongitude(decimalFormat.format(installLongitude));
             return AjaxResult.success(baseCameraManagement);
         } else if (!StringUtils.isEmpty(isLock) && isLock == 2 && !StringUtils.isEmpty(cameraCode)) {
-            MsgAlarm msgAlarm = msgAlarmService.selectByCameraCode(cameraCode);
+            MsgAlarmCloud msgAlarmclou = msgAlarmCloudService.selectByCameraCode(cameraCode);
             LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
-            if (!ObjectUtils.isEmpty(msgAlarm.getCameraCode())) {
-                lw.eq(BaseCameraManagement::getCameraCode, msgAlarm.getCameraCode());
+            if (!ObjectUtils.isEmpty(msgAlarmclou.getCameraCode())) {
+                lw.eq(BaseCameraManagement::getCameraCode, msgAlarmclou.getCameraCode());
             }
             BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(lw);
             LambdaQueryWrapper<BaseRailwayManagement> wrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
@@ -167,7 +167,7 @@ public class BaseCameraManagementController extends BaseController {
             }
             BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(wrapper);
             MsgAlarmResp msgAlarmResp = new MsgAlarmResp();
-            BeanUtils.copyProperties(msgAlarm, msgAlarmResp);
+            BeanUtils.copyProperties(msgAlarmclou, msgAlarmResp);
             msgAlarmResp.setRailwayName(baseRailwayManagement.getRailwayName());
             msgAlarmResp.setDeptId(baseCameraManagement.getDeptId());
             if (!ObjectUtils.isEmpty(baseCameraManagement.getEndMile()) && !ObjectUtils.isEmpty(baseCameraManagement.getBeginMile())) {
@@ -184,7 +184,7 @@ public class BaseCameraManagementController extends BaseController {
             DecimalFormat decimalFormat = new DecimalFormat("#.00");
             // 格式化数字
             msgAlarmResp.setInstallLongitude(decimalFormat.format(installLongitude) + "," + decimalFormat.format(installLatitude));
-            String[] split = msgAlarm.getImageUrl().split(";");
+            String[] split = msgAlarmclou.getImageUrl().split(";");
             ArrayList<String> objects = new ArrayList<>(Arrays.asList(split));
             msgAlarmResp.setImageUrls(objects);
             BaseDeviceDynamicManagement deviceDynamicManagement = baseDeviceDynamicManagementService.getOne(new LambdaQueryWrapper<BaseDeviceDynamicManagement>()
@@ -516,12 +516,12 @@ public class BaseCameraManagementController extends BaseController {
         if (ObjectUtils.isEmpty(baseDeviceDynamicManagement)) {
             return error("设备动态管理表中没有该相机编码:" + baseCameraManagement.getCameraCode() + "的数据");
         }
-        LambdaQueryWrapper<MsgAlarm> wrapper1 = new LambdaQueryWrapper<MsgAlarm>();
+        LambdaQueryWrapper<MsgAlarmCloud> wrapper1 = new LambdaQueryWrapper<MsgAlarmCloud>();
         if (!ObjectUtils.isEmpty(baseCameraManagement.getCameraCode())) {
-            wrapper1.eq(MsgAlarm::getCameraCode, baseCameraManagement.getCameraCode());
-            wrapper1.orderByDesc(MsgAlarm::getAlarmTime);
+            wrapper1.eq(MsgAlarmCloud::getCameraCode, baseCameraManagement.getCameraCode());
+            wrapper1.orderByDesc(MsgAlarmCloud::getAlarmTime);
         }
-        List<MsgAlarm> list1 = msgAlarmService.list(wrapper1);
+        List<MsgAlarmCloud> list1 = msgAlarmCloudService.list(wrapper1);
         List<Object> list = new ArrayList<>();
         list.add(baseRailwayManagement.getRailwayName());
         list.add(AppendUtils.stringAppend(baseCameraManagement.getInstallMile()));
@@ -532,8 +532,8 @@ public class BaseCameraManagementController extends BaseController {
         if (list1.size() <= 0) {
             list.add(1);
         } else {
-            MsgAlarm msgAlarm = list1.get(0);
-            list.add(msgAlarm.getIsLock());
+            MsgAlarmCloud msgAlarmclou = list1.get(0);
+            list.add(msgAlarmclou.getIsLock());
         }
         return AjaxResult.success(list);
     }
@@ -925,30 +925,30 @@ public class BaseCameraManagementController extends BaseController {
             }
             BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(wrapper);
             MsgAlarmResp msgAlarmResp = new MsgAlarmResp();
-            LambdaQueryWrapper<MsgAlarm> wrapper1 = new LambdaQueryWrapper<MsgAlarm>();
+            LambdaQueryWrapper<MsgAlarmCloud> wrapper1 = new LambdaQueryWrapper<MsgAlarmCloud>();
             if (!ObjectUtils.isEmpty(baseCameraManagement.getCameraCode())) {
-                wrapper1.eq(MsgAlarm::getCameraCode, baseCameraManagement.getCameraCode());
-                wrapper1.orderByDesc(MsgAlarm::getAlarmTime);
+                wrapper1.eq(MsgAlarmCloud::getCameraCode, baseCameraManagement.getCameraCode());
+                wrapper1.orderByDesc(MsgAlarmCloud::getAlarmTime);
             }
-            List<MsgAlarm> list = msgAlarmService.list(wrapper1);
+            List<MsgAlarmCloud> list = msgAlarmCloudService.list(wrapper1);
             if (list.size() > 0) {
                 msgAlarmResp.setFailureToAlarm(1);
-                MsgAlarm msgAlarm = list.get(0);
-                if (StringUtils.isNotEmpty(msgAlarm.getReleasedBy())) {
-                    BaseUser user = baseUserService.getUser(msgAlarm.getReleasedBy());
-                    msgAlarm.setReleasedByName(user.getNickName());
+                MsgAlarmCloud msgAlarmclou = list.get(0);
+                if (StringUtils.isNotEmpty(msgAlarmclou.getReleasedBy())) {
+                    BaseUser user = baseUserService.getUser(msgAlarmclou.getReleasedBy());
+                    msgAlarmclou.setReleasedByName(user.getNickName());
                 }
-                msgAlarmResp.setAlarmType(msgAlarm.getAlarmType());
-                msgAlarmResp.setIsLock(msgAlarm.getIsLock());
-                msgAlarmResp.setReleasedTime(msgAlarm.getReleasedTime());
-                msgAlarmResp.setAlarmTime(msgAlarm.getAlarmTime());
-                msgAlarmResp.setReleasedType(msgAlarm.getReleasedType());
-                msgAlarmResp.setReleasedReason(msgAlarm.getReleasedReason());
-                msgAlarmResp.setAlarmAttr(msgAlarm.getAlarmAttr());
-                msgAlarmResp.setContent(msgAlarm.getContent());
-                msgAlarmResp.setReleasedByName(msgAlarm.getReleasedByName());
-                msgAlarmResp.setReleasedReason(msgAlarm.getReleasedReason());
-                String[] split1 = msgAlarm.getAlarmAttr().split(",");
+                msgAlarmResp.setAlarmType(msgAlarmclou.getAlarmType());
+                msgAlarmResp.setIsLock(msgAlarmclou.getIsLock());
+                msgAlarmResp.setReleasedTime(msgAlarmclou.getReleasedTime());
+                msgAlarmResp.setAlarmTime(msgAlarmclou.getAlarmTime());
+                msgAlarmResp.setReleasedType(msgAlarmclou.getReleasedType());
+                msgAlarmResp.setReleasedReason(msgAlarmclou.getReleasedReason());
+                msgAlarmResp.setAlarmAttr(msgAlarmclou.getAlarmAttr());
+                msgAlarmResp.setContent(msgAlarmclou.getContent());
+                msgAlarmResp.setReleasedByName(msgAlarmclou.getReleasedByName());
+                msgAlarmResp.setReleasedReason(msgAlarmclou.getReleasedReason());
+                String[] split1 = msgAlarmclou.getAlarmAttr().split(",");
                 String stringBuilder = "画面大小为" + split1[0] + "×" + split1[1] + "," +
                         "泥石流范围为左上角坐标(" + split1[2] + "," + split1[3] + ")" +
                         "大小" + split1[4] + "×" + split1[5];
@@ -956,8 +956,8 @@ public class BaseCameraManagementController extends BaseController {
                 if (!ObjectUtils.isEmpty(msgAlarmResp.getReleasedType())) {
                     msgAlarmResp.setReleasedTypeName(msgAlarmResp.getReleasedType() == 1 ? "实报" : "误报");
                 }
-                if (!StringUtils.isEmpty(msgAlarm.getImageUrl())) {
-                    String[] split = msgAlarm.getImageUrl().split(";");
+                if (!StringUtils.isEmpty(msgAlarmclou.getImageUrl())) {
+                    String[] split = msgAlarmclou.getImageUrl().split(";");
                     ArrayList<String> objects = new ArrayList<>(Arrays.asList(split));
                     log.info("publish--------" + objects);
                     msgAlarmResp.setImageUrls(objects);
@@ -1019,16 +1019,16 @@ public class BaseCameraManagementController extends BaseController {
     @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
     public AjaxResult getAlarmRecord(@RequestParam("alarmId") String alarmId) {
 
-        LambdaQueryWrapper<MsgAlarm> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(MsgAlarm::getAlarmId, alarmId);
-        MsgAlarm msgAlarm = msgAlarmService.getOne(wrapper);
+        LambdaQueryWrapper<MsgAlarmCloud> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(MsgAlarmCloud::getAlarmId, alarmId);
+        MsgAlarmCloud msgAlarmclou = msgAlarmCloudService.getOne(wrapper);
         // 获取报警时间
-        Date alarmTime = msgAlarm.getAlarmTime();
+        Date alarmTime = msgAlarmclou.getAlarmTime();
         // 获取报警前5分钟的时间
         Date startTime = DateUtils.addMinutes(alarmTime, -5);
         // 获取报警后5分钟的时间
         Date endTime = DateUtils.addMinutes(alarmTime, 5);
-        String recordUrl = CameraUtil.getRecordUrl(msgAlarm.getCameraCode(), msgAlarm.getCameraCode(), startTime, endTime);
+        String recordUrl = CameraUtil.getRecordUrl(msgAlarmclou.getCameraCode(), msgAlarmclou.getCameraCode(), startTime, endTime);
         if (recordUrl.contains("当前相机暂无回放视频")) {
             return AjaxResult.error(recordUrl);
         } else {
@@ -1041,13 +1041,13 @@ public class BaseCameraManagementController extends BaseController {
     @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
     public AjaxResult getRecordByAlarmId(@RequestParam("alarmId") String alarmId) {
 
-        LambdaQueryWrapper<MsgAlarm> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(MsgAlarm::getAlarmId, alarmId);
-        MsgAlarm msgAlarm = msgAlarmService.getOne(wrapper);
-        if (ObjectUtils.isEmpty(msgAlarm.getReleasedUrl())) {
+        LambdaQueryWrapper<MsgAlarmCloud> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(MsgAlarmCloud::getAlarmId, alarmId);
+        MsgAlarmCloud msgAlarmclou = msgAlarmCloudService.getOne(wrapper);
+        if (ObjectUtils.isEmpty(msgAlarmclou.getReleasedUrl())) {
             return error("当前相机暂无回放视频");
         } else {
-            return new AjaxResult(200, "ok", msgAlarm.getReleasedUrl());
+            return new AjaxResult(200, "ok", msgAlarmclou.getReleasedUrl());
         }
     }
 

hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/MsgAlarmController.java

@@ -76,11 +76,9 @@ import java.util.stream.Collectors;
 public class MsgAlarmController extends BaseController {
     private static final Logger log = LoggerFactory.getLogger(MsgAlarmController.class);
     @Resource
-    MsgAlarmService msgAlarmService;
+    MsgAlarmCloudService msgAlarmCloudService;
     @Resource
-    MsgAlarmMapper msgAlarmMapper;
-    @Resource
-    MsgAlarmFrequencyService msgAlarmFrequencyService;
+    MsgAlarmFrequencyCloudService msgAlarmFrequencyCloudService;
     @Autowired
     BaseCameraManagementService baseCameraManagementService;
     @Autowired
@@ -106,7 +104,6 @@ public class MsgAlarmController extends BaseController {
     @PostMapping("/messageMoreNum")
     @Log(title = "报警信息管理", businessType = BusinessType.SELECT)
     public AjaxResult messageMoreNum(@RequestBody MsgAlarmVo msgAlarmVo) {
-        // MsgAlarmVo msgAlarmVo1 = (MsgAlarmVo) dataScoreUtil.setDataScore(getUserId(), msgAlarmVo);
         Map<String, Integer> messageMore = msgWebPushService.messageMoreNum(getUserId());
         return AjaxResult.success(messageMore);
     }
@@ -117,12 +114,11 @@ public class MsgAlarmController extends BaseController {
     @PostMapping("/messageMore")
     @Log(title = "报警信息管理", businessType = BusinessType.SELECT)
     public AjaxResult messageMore(@RequestBody MsgAlarmVo msgAlarmVo) {
-        // MsgAlarmVo msgAlarmVo1 = (MsgAlarmVo) dataScoreUtil.setDataScore(getUserId(), msgAlarmVo);
         String userId = getUserId();
         if (!StringUtils.isEmpty(userId)) {
             msgAlarmVo.setUserId(userId);
         }
-        IPage<MsgAlarm> messageMore = msgWebPushService.messageMore(msgAlarmVo);
+        IPage<MsgAlarmCloud> messageMore = msgWebPushService.messageMore(msgAlarmVo);
         return AjaxResult.success(messageMore);
     }
 
@@ -132,7 +128,6 @@ public class MsgAlarmController extends BaseController {
     @GetMapping("/webAlarm")
     @Log(title = "报警信息管理", businessType = BusinessType.SELECT)
     public AjaxResult webAlarmNum() {
-        // MsgAlarmVo msgAlarm = (MsgAlarmVo) dataScoreUtil.setDataScore(getUserId(), new MsgAlarmVo());
         Map webAlarm = msgWebPushService.webAlarm(getUserId());
         return AjaxResult.success(webAlarm);
     }
@@ -178,12 +173,12 @@ public class MsgAlarmController extends BaseController {
         if (!ObjectUtils.isEmpty(msgAlarmVo.getEndMile())) {
             msgAlarmVo.setEndMile(msgAlarmVo.getEndMile() * 1000);
         }
-        IPage<MsgAlarm> page = msgAlarmService.queryPageHome(msgAlarmVo); 
+        IPage<MsgAlarmCloud> page = msgAlarmCloudService.queryPageHome(msgAlarmVo);
         page.setTotal(page.getTotal());
         page.setCurrent(page.getCurrent());
         page.setPages(page.getPages());
         if (!ObjectUtils.isEmpty(page) && page.getRecords().size() > 0) {
-            List<MsgAlarm> dto1 = page.getRecords().stream().map(o -> {
+            List<MsgAlarmCloud> dto1 = page.getRecords().stream().map(o -> {
                 String[] split = o.getImageUrl().split(";");
                 ArrayList<String> objects = new ArrayList<>(Arrays.asList(split));
                 o.setImageUrls(objects);
@@ -212,11 +207,11 @@ public class MsgAlarmController extends BaseController {
                     String begin = AppendUtils.stringAppend(cameraManagement.getBeginMile());
                     o.setBeginMile(begin);
                 }
-                LambdaQueryWrapper<MsgAlarmFrequency> wrapper = new LambdaQueryWrapper<MsgAlarmFrequency>();
+                LambdaQueryWrapper<MsgAlarmFrequencyCloud> wrapper = new LambdaQueryWrapper<MsgAlarmFrequencyCloud>();
                 if (!ObjectUtils.isEmpty(o.getAlarmId())) {
-                    wrapper.eq(MsgAlarmFrequency::getAlarmId, o.getAlarmId());
+                    wrapper.eq(MsgAlarmFrequencyCloud::getAlarmId, o.getAlarmId());
                 }
-                o.setAlarmCount((int) msgAlarmFrequencyService.count(wrapper));
+                o.setAlarmCount((int) msgAlarmFrequencyCloudService.count(wrapper));
                 if (!ObjectUtils.isEmpty(o.getReleasedType())) {
                     o.setReleasedTypeName(o.getReleasedType() == 1 ? "实报" : "误报");
                 }
@@ -251,13 +246,13 @@ public class MsgAlarmController extends BaseController {
         if (!ObjectUtils.isEmpty(msgAlarmVo.getEndMile())) {
             msgAlarmVo.setEndMile(msgAlarmVo.getEndMile() * 1000);
         }
-        IPage<MsgAlarm> page = msgAlarmService.queryPage(msgAlarmVo);
+        IPage<MsgAlarmCloud> page = msgAlarmCloudService.queryPage(msgAlarmVo);
         page.setTotal(page.getTotal());
         page.setCurrent(page.getCurrent());
         page.setPages(page.getPages());
 
         if (!ObjectUtils.isEmpty(page) && page.getRecords().size() > 0) {
-            List<MsgAlarm> dto1 = page.getRecords().stream().map(o -> {
+            List<MsgAlarmCloud> dto1 = page.getRecords().stream().map(o -> {
                 String[] split = o.getImageUrl().split(";");
                 ArrayList<String> objects = new ArrayList<>(Arrays.asList(split));
                 o.setImageUrls(objects);
@@ -288,11 +283,11 @@ public class MsgAlarmController extends BaseController {
                     String begin = AppendUtils.stringAppend(cameraManagement.getBeginMile());
                     o.setBeginMile(begin);
                 }
-                LambdaQueryWrapper<MsgAlarmFrequency> wrapper = new LambdaQueryWrapper<MsgAlarmFrequency>();
+                LambdaQueryWrapper<MsgAlarmFrequencyCloud> wrapper = new LambdaQueryWrapper<MsgAlarmFrequencyCloud>();
                 if (!ObjectUtils.isEmpty(o.getAlarmId())) {
-                    wrapper.eq(MsgAlarmFrequency::getAlarmId, o.getAlarmId());
+                    wrapper.eq(MsgAlarmFrequencyCloud::getAlarmId, o.getAlarmId());
                 }
-                o.setAlarmCount((int) msgAlarmFrequencyService.count(wrapper));
+                o.setAlarmCount((int) msgAlarmFrequencyCloudService.count(wrapper));
                 if (!ObjectUtils.isEmpty(o.getReleasedType())) {
                     o.setReleasedTypeName(o.getReleasedType() == 1 ? "实报" : "误报");
                 }
@@ -326,8 +321,8 @@ public class MsgAlarmController extends BaseController {
         if (!ObjectUtils.isEmpty(msgAlarmVo.getEndMile())) {
             msgAlarmVo.setEndMile(msgAlarmVo.getEndMile() * 1000);
         }
-        List<MsgAlarm> msgAlarmList = msgAlarmService.msgAlarmList(msgAlarmVo);
-        for (MsgAlarm msgAlarm : msgAlarmList) {
+        List<MsgAlarmCloud> msgAlarmList = msgAlarmCloudService.msgAlarmList(msgAlarmVo);
+        for (MsgAlarmCloud msgAlarm : msgAlarmList) {
             String[] split = msgAlarm.getImageUrl().split(";");
             ArrayList<String> objects = new ArrayList<>(Arrays.asList(split));
             msgAlarm.setImageUrls(objects);
@@ -358,11 +353,11 @@ public class MsgAlarmController extends BaseController {
                 String begin = AppendUtils.stringAppend(cameraManagement.getBeginMile());
                 msgAlarm.setBeginMile(begin);
             }
-            LambdaQueryWrapper<MsgAlarmFrequency> wrapper = new LambdaQueryWrapper<MsgAlarmFrequency>();
+            LambdaQueryWrapper<MsgAlarmFrequencyCloud> wrapper = new LambdaQueryWrapper<MsgAlarmFrequencyCloud>();
             if (!ObjectUtils.isEmpty(msgAlarm.getAlarmId())) {
-                wrapper.eq(MsgAlarmFrequency::getAlarmId, msgAlarm.getAlarmId());
+                wrapper.eq(MsgAlarmFrequencyCloud::getAlarmId, msgAlarm.getAlarmId());
             }
-            msgAlarm.setAlarmCount((int) msgAlarmFrequencyService.count(wrapper));
+            msgAlarm.setAlarmCount((int) msgAlarmFrequencyCloudService.count(wrapper));
             if (!ObjectUtils.isEmpty(msgAlarm.getReleasedType())) {
                 msgAlarm.setReleasedTypeName(msgAlarm.getReleasedType() == 1 ? "实报" : "误报");
             }
@@ -387,14 +382,14 @@ public class MsgAlarmController extends BaseController {
                     "大小" + split1[4] + "×" + split1[5];
             msgAlarm.setAlarmAttr(stringBuilder);
         }
-        ExcelUtil<MsgAlarm> util = new ExcelUtil<>(MsgAlarm.class);
+        ExcelUtil<MsgAlarmCloud> util = new ExcelUtil<>(MsgAlarmCloud.class);
         util.exportExcel(response, msgAlarmList, "报警信息管理");
     }
 
     @GetMapping(value = "/getByAlarmId/{alarmId}")
     @Log(title = "报警信息管理", businessType = BusinessType.MESSAGE)
     public AjaxResult getByAlarmId(@PathVariable String alarmId) {
-        MsgAlarm msgAlarm = msgAlarmService.getByAlarmId(alarmId);
+        MsgAlarmCloud msgAlarm = msgAlarmCloudService.getByAlarmId(alarmId);
         if (!ObjectUtils.isEmpty(msgAlarm)) {
             LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
             if (!ObjectUtils.isEmpty(msgAlarm.getCameraCode())) {
@@ -438,7 +433,7 @@ public class MsgAlarmController extends BaseController {
     @GetMapping(value = "/{id}")
     @Log(title = "报警信息管理", businessType = BusinessType.MESSAGE)
     public AjaxResult getInfo(@PathVariable Long id) {
-        MsgAlarm msgAlarm = msgAlarmService.getById(id);
+        MsgAlarmCloud msgAlarm = msgAlarmCloudService.getById(id);
         if (!ObjectUtils.isEmpty(msgAlarm)) {
             LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
             if (!ObjectUtils.isEmpty(msgAlarm.getCameraCode())) {
@@ -495,7 +490,7 @@ public class MsgAlarmController extends BaseController {
     public AjaxResult updateIsLock(@RequestParam(value = "id") Long id,
                                    @RequestParam(value = "releasedType", required = false) Integer releasedType,
                                    @RequestParam(value = "releasedReason", required = false) String releasedReason) {
-        MsgAlarm msgAlarm = msgAlarmService.getById(id);
+        MsgAlarmCloud msgAlarm = msgAlarmCloudService.getById(id);
         if (msgAlarm.getIsLock() == 1) {
             return AjaxResult.error("501", "报警已解除");
         }
@@ -525,7 +520,7 @@ public class MsgAlarmController extends BaseController {
 //        log.info("updateIsLock-------url" + url);
 //        msgAlarm.setReleasedUrl(url);
         log.info("updateIsLock----------msgAlarm" + msgAlarm);
-        boolean b = msgAlarmService.updateById(msgAlarm);
+        boolean b = msgAlarmCloudService.updateById(msgAlarm);
 //        LambdaQueryWrapper<MsgAppPush> wrapper = new LambdaQueryWrapper<>();
 //        wrapper.eq(MsgAppPush::getAlarmId, msgAlarm.getAlarmId());
 //        MsgAppPush app = new MsgAppPush();
@@ -547,16 +542,16 @@ public class MsgAlarmController extends BaseController {
     @GetMapping(value = "/alarmHistoricalAlarm/{alarmId}")
     @Log(title = "报警信息管理", businessType = BusinessType.SELECT)
     public AjaxResult alarmHistoricalAlarm(@PathVariable String alarmId) {
-        QueryWrapper<MsgAlarm> queryWrapper = new QueryWrapper<>();
+        QueryWrapper<MsgAlarmCloud> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("alarm_id", alarmId);
-        MsgAlarm one = msgAlarmService.getOne(queryWrapper);
+        MsgAlarmCloud one = msgAlarmCloudService.getOne(queryWrapper);
         if (ObjectUtils.isEmpty(one)) {
             return error("报警表没有此报警唯一标识的报警数据");
         }
-        QueryWrapper<MsgAlarmFrequency> wrapper = new QueryWrapper<>();
+        QueryWrapper<MsgAlarmFrequencyCloud> wrapper = new QueryWrapper<>();
         wrapper.eq("alarm_id", alarmId);
         wrapper.orderByDesc("alarm_time");
-        List<MsgAlarmFrequency> list = msgAlarmFrequencyService.list(wrapper);
+        List<MsgAlarmFrequencyCloud> list = msgAlarmFrequencyCloudService.list(wrapper);
         if (list.size() > 0) {
             if (one.getIsLock() == 1) {
                 for (int i = 0; i < list.size(); i++) {
@@ -567,7 +562,7 @@ public class MsgAlarmController extends BaseController {
                     }
                 }
             } else {
-                for (MsgAlarmFrequency msgAlarmFrequency : list) {
+                for (MsgAlarmFrequencyCloud msgAlarmFrequency : list) {
                     msgAlarmFrequency.setIsLock(2);
                 }
             }
@@ -580,12 +575,12 @@ public class MsgAlarmController extends BaseController {
     @GetMapping(value = "/videoHistoricalAlarm/{cameraCode}")
     @Log(title = "报警信息管理", businessType = BusinessType.SELECT)
     public AjaxResult videoHistoricalAlarm(@PathVariable String cameraCode) {
-        QueryWrapper<MsgAlarm> wrapper = new QueryWrapper<>();
+        QueryWrapper<MsgAlarmCloud> wrapper = new QueryWrapper<>();
         wrapper.eq("camera_code", cameraCode);
         wrapper.orderByDesc("alarm_time");
-        List<MsgAlarm> list = msgAlarmService.list(wrapper);
+        List<MsgAlarmCloud> list = msgAlarmCloudService.list(wrapper);
 //        if (list.size() > 0) {
-//            for (MsgAlarm msgAlarm : list) {
+//            for (MsgAlarmCloud msgAlarm : list) {
 //                msgAlarm.setFailureToAlarm(1);
 //            }
 //            return AjaxResult.success(list);
@@ -603,7 +598,7 @@ public class MsgAlarmController extends BaseController {
     @PostMapping("/dataStatistic")
     public AjaxResult dataStatistic(@RequestBody AlarmStatisticResVo alarmStatisticResVo) {
         alarmStatisticResVo = (AlarmStatisticResVo) dataScoreUtil.setDataScore(getUserId(), alarmStatisticResVo);
-        IPage<AlarmStatisticVo> page = msgAlarmService.list(alarmStatisticResVo);
+        IPage<AlarmStatisticVo> page = msgAlarmCloudService.list(alarmStatisticResVo);
         page.setTotal(page.getTotal());
         page.setCurrent(page.getCurrent());
         page.setPages(page.getPages());
@@ -662,7 +657,7 @@ public class MsgAlarmController extends BaseController {
         Integer listSize;
         List<AlarmStatisticMonthDto> list = null;
         if (ObjectUtils.isEmpty(alarmStatisticResVo.getCurrentMonth())) {
-            list = msgAlarmService.getCount(alarmStatisticResVo);
+            list = msgAlarmCloudService.getCount(alarmStatisticResVo);
             listSize = 12;
         } else {
             if (alarmStatisticResVo.getCurrentMonth().equals(2)) {//2
@@ -673,7 +668,7 @@ public class MsgAlarmController extends BaseController {
             } else {//1,3,5,7,8,10,12
                 listSize = 31;
             }
-            list = msgAlarmService.getDayCount(alarmStatisticResVo);
+            list = msgAlarmCloudService.getDayCount(alarmStatisticResVo);
         }
         for (int i = 1; i <= listSize; i++) {
             numbs.add(i);
@@ -718,7 +713,7 @@ public class MsgAlarmController extends BaseController {
     public void exportDataStatistic(HttpServletResponse response, @RequestBody AlarmStatisticResVo alarmStatisticResVo) {
         alarmStatisticResVo = (AlarmStatisticResVo) dataScoreUtil.setDataScore(getUserId(), alarmStatisticResVo);
         try {
-            List<AlarmStatisticDto> list = msgAlarmService.exportExcel(alarmStatisticResVo);
+            List<AlarmStatisticDto> list = msgAlarmCloudService.exportExcel(alarmStatisticResVo);
             if (!CollectionUtils.isEmpty(list) && Objects.nonNull(list.get(0))) {
                 list.forEach(l -> {
                     if (!ObjectUtils.isEmpty(l.getAlarmMile())) {
@@ -777,7 +772,7 @@ public class MsgAlarmController extends BaseController {
         Integer listSize;
         List<AlarmStatisticMonthDto> list = null;
         if (ObjectUtils.isEmpty(alarmStatisticResVo.getCurrentMonth())) {
-            list = msgAlarmService.getCount(alarmStatisticResVo);
+            list = msgAlarmCloudService.getCount(alarmStatisticResVo);
             listSize = 12;
         } else {
             sheetName = "报警月统计数据";
@@ -789,7 +784,7 @@ public class MsgAlarmController extends BaseController {
             } else {//1,3,5,7,8,10,12
                 listSize = 31;
             }
-            list = msgAlarmService.getDayCount(alarmStatisticResVo);
+            list = msgAlarmCloudService.getDayCount(alarmStatisticResVo);
         }
         if (!CollectionUtils.isEmpty(list) && Objects.nonNull(list.get(0))) {
             for (int i = 1; i <= listSize; i++) {
@@ -839,7 +834,7 @@ public class MsgAlarmController extends BaseController {
     public AjaxResult alarmStatistics() {
         MsgAlarmVo msgAlarmVo1 = new MsgAlarmVo();
         MsgAlarmVo msgAlarmVo = (MsgAlarmVo) dataScoreUtil.setDataScore(getUserId(), msgAlarmVo1);
-      return   msgAlarmService.alarmStatistics(msgAlarmVo);
+      return   msgAlarmCloudService.alarmStatistics(msgAlarmVo);
     }
 
     @GetMapping(value = "/alarmCountSort")
@@ -847,7 +842,7 @@ public class MsgAlarmController extends BaseController {
     public AjaxResult alarmCountSort() {
         MsgAlarmVo msgAlarmVo1 = new MsgAlarmVo();
         MsgAlarmVo msgAlarmVo = (MsgAlarmVo) dataScoreUtil.setDataScore(getUserId(), msgAlarmVo1);
-        return   msgAlarmService.alarmCountSort(msgAlarmVo);
+        return   msgAlarmCloudService.alarmCountSort(msgAlarmVo);
     }
 
 }

hazard-admin/src/main/java/com/ozs/web/controller/home/HomeController.java

@@ -1,18 +1,11 @@
 package com.ozs.web.controller.home;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ozs.common.core.controller.BaseController;
 import com.ozs.common.core.domain.AjaxResult;
-import com.ozs.service.entity.MsgAlarm;
-import com.ozs.service.entity.vo.BaseCameraManagementVo;
 import com.ozs.service.entity.vo.MsgAlarmVo;
-import com.ozs.service.service.BaseCameraManagementService;
 import com.ozs.service.service.MsgAlarmService;
 import com.ozs.system.service.DataScoreUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;

hazard-admin/src/main/java/com/ozs/web/controller/shotschedule/ShotPictureTaskExecutors.java

@@ -11,7 +11,6 @@ import com.ozs.common.utils.AppendUtils;
 import com.ozs.common.utils.DictUtils;
 import com.ozs.service.entity.BaseCameraManagement;
 import com.ozs.service.entity.BaseRailwayManagement;
-import com.ozs.service.entity.MsgAlarm;
 import com.ozs.service.entity.vo.BaseCameraVO;
 import com.ozs.service.mapper.BaseCameraManagementMapper;
 import com.ozs.service.mapper.BaseRailwayManagementMapper;

hazard-admin/src/main/java/com/ozs/web/controller/system/SysUserController.java

@@ -25,9 +25,7 @@ import com.ozs.framework.web.service.TokenService;
 import com.ozs.service.entity.BaseCameraManagement;
 import com.ozs.service.entity.BaseRailwayManagement;
 import com.ozs.service.entity.BaseUser;
-import com.ozs.service.entity.MsgAlarm;
 import com.ozs.service.entity.vo.CameraTreeVo;
-import com.ozs.service.entity.vo.MsgAlarmVo;
 import com.ozs.service.service.BaseUserService;
 import com.ozs.system.domain.SysUserRole;
 import com.ozs.system.mapper.SysUserRoleMapper;

hazard-admin/src/main/java/com/ozs/web/controller/upload/UploadController.java

@@ -7,7 +7,6 @@ import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.uuid.IdUtils;
 import com.ozs.service.entity.BaseCameraManagement;
 import com.ozs.service.entity.BaseRailwayManagement;
-import com.ozs.service.entity.MsgAlarm;
 import com.ozs.service.service.BaseCameraManagementService;
 import com.ozs.service.service.BaseRailwayManagementService;
 import com.ozs.service.service.MsgAlarmService;

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

@@ -117,17 +117,17 @@ public class WebSocketConteoller extends BaseController {
 
     /**
      * 推送消息
-     * @param msgAlarm
+     * @param msgAlarmCloud
      * @return
      */
     @ResponseBody
     @PostMapping("/publish")
-    public Map publish(@RequestBody MsgAlarm msgAlarm) {
+    public Map publish(@RequestBody MsgAlarmCloud msgAlarmCloud) {
         String endMile = null;
-        log.info("消息推送:" + msgAlarm.toString());
+        log.info("消息推送:" + msgAlarmCloud.toString());
         LambdaQueryWrapper<BaseCameraManagement> wrapper = new LambdaQueryWrapper<BaseCameraManagement>();
-        if (!ObjectUtils.isEmpty(msgAlarm.getCameraCode())) {
-            wrapper.eq(BaseCameraManagement::getCameraCode, msgAlarm.getCameraCode());
+        if (!ObjectUtils.isEmpty(msgAlarmCloud.getCameraCode())) {
+            wrapper.eq(BaseCameraManagement::getCameraCode, msgAlarmCloud.getCameraCode());
         }
         BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(wrapper);
         log.info("baseCameraManagement-----" + baseCameraManagement);
@@ -144,7 +144,7 @@ public class WebSocketConteoller extends BaseController {
             endMile = begin + "-" + end;
             msgAlarmResp.setBeginMile(endMile);
         }
-        msgAlarmResp.setAlarmType(msgAlarm.getAlarmType());
+        msgAlarmResp.setAlarmType(msgAlarmCloud.getAlarmType());
         String mile = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
         msgAlarmResp.setAlarmMile(mile);
         String cameraCode = baseCameraManagement.getCameraCode();
@@ -159,28 +159,28 @@ public class WebSocketConteoller extends BaseController {
         } else if (baseCameraManagement.getLineDir() == 3) {
             msgAlarmResp.setLineDirStr( "上下行");
         }
-        msgAlarmResp.setAlarmTime(msgAlarm.getAlarmTime() != null ? msgAlarm.getAlarmTime() : new Date());
+        msgAlarmResp.setAlarmTime(msgAlarmCloud.getAlarmTime() != null ? msgAlarmCloud.getAlarmTime() : new Date());
         // 图片
-        if (!StringUtils.isEmpty(msgAlarm.getImageUrl())) {
-            String[] split = msgAlarm.getImageUrl().split(";");
+        if (!StringUtils.isEmpty(msgAlarmCloud.getImageUrl())) {
+            String[] split = msgAlarmCloud.getImageUrl().split(";");
             ArrayList<String> objects = new ArrayList<>(Arrays.asList(split));
             log.info("publish--------" + objects);
             msgAlarmResp.setImageUrls(objects);
         }
-        if (!StringUtils.isEmpty(msgAlarm.getId())) {
-            msgAlarmResp.setId(msgAlarm.getId());
+        if (!StringUtils.isEmpty(msgAlarmCloud.getId())) {
+            msgAlarmResp.setId(msgAlarmCloud.getId());
         }
         String userIdLogin = "admin编码";
         SysUser user = userService.selectUserById(1L);
         if (!ObjectUtils.isEmpty(user)) {
             userIdLogin = user.getUserId();
         }
-        String alarmId = msgAlarm.getAlarmId();
+        String alarmId = msgAlarmCloud.getAlarmId();
         msgAlarmResp.setAlarmId(alarmId);
 
         LambdaQueryWrapper<MsgWebPush> lwMsgWebPush = new LambdaQueryWrapper<MsgWebPush>();
-        if (!ObjectUtils.isEmpty(msgAlarm.getAlarmId())) {
-            lwMsgWebPush.eq(MsgWebPush::getAlarmId, msgAlarm.getAlarmId());
+        if (!ObjectUtils.isEmpty(msgAlarmCloud.getAlarmId())) {
+            lwMsgWebPush.eq(MsgWebPush::getAlarmId, msgAlarmCloud.getAlarmId());
         }
         List<MsgWebPush> msgWebPushList = msgWebPushService.list(lwMsgWebPush);
         if (StringUtils.isEmpty(msgWebPushList) || msgWebPushList.size() == 0) {
@@ -218,8 +218,8 @@ public class WebSocketConteoller extends BaseController {
 
         // app 消息推送
         LambdaQueryWrapper<MsgAppPush> lwMsgAppPush = new LambdaQueryWrapper<MsgAppPush>();
-        if (!ObjectUtils.isEmpty(msgAlarm.getCameraCode())) {
-            lwMsgAppPush.eq(MsgAppPush::getAlarmId, msgAlarm.getAlarmId());
+        if (!ObjectUtils.isEmpty(msgAlarmCloud.getCameraCode())) {
+            lwMsgAppPush.eq(MsgAppPush::getAlarmId, msgAlarmCloud.getAlarmId());
         }
         List<MsgAppPush> msgAppPushList = msgAppPushService.list(lwMsgAppPush);
         log.info("APPmsgAppPushList     size -----" + msgAppPushList.size());
@@ -235,7 +235,7 @@ public class WebSocketConteoller extends BaseController {
                     String pushId = UUID.randomUUID().toString();
                     msgAlarmResp.setPushId(UUID.randomUUID().toString());
                     String content = objStr(msgAlarmResp);
-                    Date alarmTime = msgAlarm.getAlarmTime();
+                    Date alarmTime = msgAlarmCloud.getAlarmTime();
                     SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                     String formatDate = sdf.format(alarmTime != null ? alarmTime : new Date());
                     log.info("APPcontent-----" + content);

hazard-admin/src/main/java/com/ozs/web/core/util/CameraUtil.java

@@ -44,6 +44,8 @@ import com.jcraft.jsch.JSch;
 import com.jcraft.jsch.JSchException;
 import com.jcraft.jsch.Session;
 import com.ozs.common.utils.HttpClientUtil;
+import com.ozs.service.entity.*;
+import com.ozs.service.service.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -64,17 +66,6 @@ import com.ozs.common.utils.DateUtils;
 import com.ozs.common.utils.HttpClientUtil;
 import com.ozs.common.utils.http.HttpUtils;
 import com.ozs.framework.config.ServerConfig;
-import com.ozs.service.entity.BaseCameraManagement;
-import com.ozs.service.entity.BaseDeviceDynamicManagement;
-import com.ozs.service.entity.CameraLogDetail;
-import com.ozs.service.entity.MqLog;
-import com.ozs.service.entity.MsgAlarm;
-import com.ozs.service.entity.MsgWebPush;
-import com.ozs.service.service.BaseCameraManagementService;
-import com.ozs.service.service.BaseDeviceDynamicManagementService;
-import com.ozs.service.service.CameraLogDetailService;
-import com.ozs.service.service.MqLogService;
-import com.ozs.service.service.MsgAlarmService;
 import com.ozs.system.mapper.SysDictDataMapper;
 import com.ozs.web.core.config.CaneraConfig;
 import io.minio.ListObjectsArgs;
@@ -148,7 +139,7 @@ public class CameraUtil {
     @Autowired
     private ServerConfig serverConfig;
     @Autowired
-    private MsgAlarmService msgAlarmService;
+    private MsgAlarmCloudService msgAlarmCloudService;
 
     @Resource
     BaseCameraManagementService baseCameraManagementService;
@@ -951,18 +942,18 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
      * ----------------------------废弃
      */
     public void mergeVideo() {
-        List<MsgAlarm> msgAlarms = msgAlarmService.queryAlarmInfoByAfterTenMinute();
-        if (!ObjectUtils.isEmpty(msgAlarms)) {
-            for (MsgAlarm msgAlarm : msgAlarms) {
+        List<MsgAlarmCloud> msgAlarmCloudList = msgAlarmCloudService.queryAlarmInfoByAfterTenMinute();
+        if (!ObjectUtils.isEmpty(msgAlarmCloudList)) {
+            for (MsgAlarmCloud msgAlarmCloud : msgAlarmCloudList) {
                 // 表示已经超过报警时间10分钟，且没有解除报警、也没有报警Url 的可以合成视频
-                Map<String, Object> map = baseCameraManagementService.getCameraChannelByAlarmId(msgAlarm.getAlarmId());
+                Map<String, Object> map = baseCameraManagementService.getCameraChannelByAlarmId(msgAlarmCloud.getAlarmId());
                 if (!StringUtils.isBlank(map.get("channel").toString())) {
-                    log.info("报警UUID:{},相机通道：{},开始时间：{}，结束时间：{}", msgAlarm.getAlarmId(), map.get("channel").toString(), msgAlarm.getAlarmTime(), new Date());
+                    log.info("报警UUID:{},相机通道：{},开始时间：{}，结束时间：{}", msgAlarmCloud.getAlarmId(), map.get("channel").toString(), msgAlarmCloud.getAlarmTime(), new Date());
                     try {
-                        String url = historyPlayListStr(map.get("channel").toString(), msgAlarm.getAlarmTime(), new Date(), false);
-                        MsgAlarm byId = msgAlarmService.getById(msgAlarm.getId());
+                        String url = historyPlayListStr(map.get("channel").toString(), msgAlarmCloud.getAlarmTime(), new Date(), false);
+                        MsgAlarmCloud byId = msgAlarmCloudService.getById(msgAlarmCloud.getId());
                         byId.setReleasedUrl(url);
-                        msgAlarmService.updateById(byId);
+                        msgAlarmCloudService.updateById(byId);
                     } catch (Exception e) {
                         log.error("mergeVideo error:", e.getMessage());
                     }

hazard-sdk/src/main/java/com/ozs/controller/upload/UploadController.java

@@ -11,10 +11,8 @@ import com.ozs.common.utils.stateSecrets.SM4Utils;
 import com.ozs.common.utils.uuid.IdUtils;
 import com.ozs.service.entity.BaseCameraManagement;
 import com.ozs.service.entity.BaseRailwayManagement;
-import com.ozs.service.entity.MsgAlarm;
 import com.ozs.service.service.BaseCameraManagementService;
 import com.ozs.service.service.BaseRailwayManagementService;
-import com.ozs.service.service.MsgAlarmService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;