app 消息列表返回

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

@@ -33,4 +33,6 @@ public interface MsgAppPushMapper extends BaseMapper<MsgAppPush> {
      * @return
      */
     public int update(@Param("id") Long id, @Param("status") Integer status, @Param("updateBy") String updateBy);
+
+    void messageMoreApp(MsgAppPushVo msgAppPushVo);
 }

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

@@ -2,6 +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.vo.MsgAppPushVo;
 import org.apache.ibatis.annotations.Param;
@@ -17,11 +18,11 @@ public interface MsgAppPushService extends IService<MsgAppPush> {
     /**
      * app推送报警信息记录
      *
-     * @param status
+     * @param msgAppPushVo
      * @param
      * @return
      */
-    IPage<MsgAppPushVo> alarmPushMsg(MsgAppPushVo msgAppPushVo);
+    IPage<MsgAlarm> alarmPushMsg(MsgAppPushVo msgAppPushVo);
 
     /**
      * app推送报警信息记录修改状态

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

@@ -5,16 +5,22 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
+import com.ozs.common.utils.AppendUtils;
 import com.ozs.common.utils.StringUtils;
-import com.ozs.service.entity.MsgAlarm;
-import com.ozs.service.entity.MsgAppPush;
+import com.ozs.service.entity.*;
 import com.ozs.service.entity.vo.MsgAppPushVo;
 import com.ozs.service.mapper.MsgAppPushMapper;
+import com.ozs.service.service.BaseCameraManagementService;
+import com.ozs.service.service.BaseRailwayManagementService;
 import com.ozs.service.service.MsgAppPushService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author wyy
@@ -25,17 +31,47 @@ import java.util.List;
 public class MsgAppPushServiceImpl extends ServiceImpl<MsgAppPushMapper, MsgAppPush> implements MsgAppPushService {
     @Autowired
     MsgAppPushMapper msgAppPushMapper;
+    @Autowired
+    private BaseCameraManagementService baseCameraManagementService;
+    @Autowired
+    private BaseRailwayManagementService baseRailwayManagementService;
 
     @Override
-    public IPage<MsgAppPushVo> alarmPushMsg(MsgAppPushVo msgAppPushVo) {
-        // List<MsgAppPushVo> list = msgAppPushMapper.alarmPushMsg(status);
-        Page<MsgAppPushVo> page = PageHelper.startPage(msgAppPushVo.getPageNum().intValue(), msgAppPushVo.getPageSize().intValue())
-                .doSelectPage(() -> msgAppPushMapper.alarmPushMsg(msgAppPushVo));
-        com.baomidou.mybatisplus.extension.plugins.pagination.Page<MsgAppPushVo> pageR =
+    public IPage<MsgAlarm> alarmPushMsg(MsgAppPushVo msgAppPushVo) {
+        // List<MsgAlarm> list = msgAppPushMapper.alarmPushMsg(status);
+        Page<MsgAlarm> page = PageHelper.startPage(msgAppPushVo.getPageNum().intValue(), msgAppPushVo.getPageSize().intValue())
+                .doSelectPage(() -> msgAppPushMapper.messageMoreApp(msgAppPushVo));
+        com.baomidou.mybatisplus.extension.plugins.pagination.Page<MsgAlarm> pageR =
                 new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(msgAppPushVo.getPageNum().intValue(), msgAppPushVo.getPageSize().intValue());
         pageR.setSize(page.size());
         pageR.setTotal(page.getTotal());
-        pageR.setRecords(page.getResult());
+        if (!ObjectUtils.isEmpty(page) && !ObjectUtils.isEmpty(page.getResult())) {
+            List<MsgAlarm> dto1 = page.getResult().stream().map(o -> {
+                String[] split = o.getImageUrl().split(";");
+                ArrayList<String> objects = new ArrayList<>(Arrays.asList(split));
+                o.setImageUrls(objects);
+                LambdaQueryWrapper<BaseCameraManagement> cameraManagementLambdaQueryWrapper = new LambdaQueryWrapper<BaseCameraManagement>();
+                if (!ObjectUtils.isEmpty(o.getCameraCode())) {
+                    cameraManagementLambdaQueryWrapper.eq(BaseCameraManagement::getCameraCode, o.getCameraCode());
+                }
+                BaseCameraManagement cameraManagement = baseCameraManagementService.getOne(cameraManagementLambdaQueryWrapper);
+                LambdaQueryWrapper<BaseRailwayManagement> queryWrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
+                if (!ObjectUtils.isEmpty(cameraManagement.getRailwayCode())) {
+                    queryWrapper.eq(BaseRailwayManagement::getRailwayCode, cameraManagement.getRailwayCode());
+                }
+                BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(queryWrapper);
+                o.setRailwayName(baseRailwayManagement.getRailwayName());
+                String mils = AppendUtils.stringAppend(cameraManagement.getInstallMile());
+                o.setAlarmMiles(mils);
+                String end = AppendUtils.stringAppend(cameraManagement.getEndMile());
+                o.setEndMile(end);
+                String begin = AppendUtils.stringAppend(cameraManagement.getBeginMile());
+                o.setBeginMile(begin);
+                // o.setAlarmCount((int) msgAlarmFrequencyService.count()+1);
+                return o;
+            }).collect(Collectors.toList());
+            pageR.setRecords(dto1);
+        }
         return pageR;
     }
 

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

@@ -77,4 +77,19 @@
         </set>
         where id = #{id}
     </update>
+
+    <select id="messageMoreApp" parameterType="com.ozs.service.entity.vo.MsgAlarmVo" resultType="com.ozs.service.entity.MsgAlarm">
+        select b.*
+        from msg_app_push AS a
+        join msg_alarm 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 != ''">
+                and a.receive_by = #{userId}
+            </if>
+            <if test="status != null and status != ''">
+                and a.status = #{status}
+            </if>
+        </where>
+    </select>
 </mapper>

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

@@ -107,7 +107,7 @@ public class MsgAlarmController extends BaseController {
     public AjaxResult messageMore(@RequestBody MsgAlarmVo msgAlarmVo) {
         // MsgAlarmVo msgAlarmVo1 = (MsgAlarmVo) dataScoreUtil.setDataScore(getUserId(), msgAlarmVo);
         String userId = getUserId();
-        if (!StringUtils.isEmpty(userId)){
+        if (!StringUtils.isEmpty(userId)) {
             msgAlarmVo.setUserId(userId);
         }
         IPage<MsgAlarm> messageMore = msgWebPushService.messageMore(msgAlarmVo);
@@ -130,7 +130,7 @@ public class MsgAlarmController extends BaseController {
      * web消息已读
      */
     @PostMapping("/read")
-    @ApiOperation(value = "web消息已读")  
+    @ApiOperation(value = "web消息已读")
     @Log(title = "报警信息管理", businessType = BusinessType.SELECT)
     public AjaxResult read(@RequestBody MsgWebPush msgWebPush) {
         if (StringUtils.isEmpty(msgWebPush) || StringUtils.isEmpty(msgWebPush.getId())) {
@@ -150,10 +150,10 @@ public class MsgAlarmController extends BaseController {
     @Log(title = "报警信息管理", businessType = BusinessType.SELECT)
     public AjaxResult selectMsgAlarm(@RequestBody MsgAlarmVo msgAlarmVo) {
         msgAlarmVo = (MsgAlarmVo) dataScoreUtil.setDataScore(getUserId(), msgAlarmVo);
-        if (!ObjectUtils.isEmpty(msgAlarmVo.getAlarmMiles())){
+        if (!ObjectUtils.isEmpty(msgAlarmVo.getAlarmMiles())) {
             if (!msgAlarmVo.getAlarmMiles().matches(PATTERN)) {
                 return error("里程位置填写格式不正确!");
-            }else {
+            } else {
                 int miles = AppendUtils.stringSplit(msgAlarmVo.getAlarmMiles());
                 msgAlarmVo.setAlarmMile(miles);
             }
@@ -274,7 +274,7 @@ public class MsgAlarmController extends BaseController {
             msgAlarmResp.setDeptId(baseCameraManagement.getDeptId());
             String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
             String end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
-            String endMile = "["+begin + "]-[" + end+"]";
+            String endMile = "[" + begin + "]-[" + end + "]";
             msgAlarmResp.setBeginMile(endMile);
             String mile = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
             msgAlarmResp.setAlarmMile(mile);

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

@@ -112,7 +112,7 @@ public class GeoHazardMineController extends BaseController {
         if (!StringUtils.isEmpty(userId)) {
             msgAppPushVo.setReceiveBy(userId);
         }
-        IPage<MsgAppPushVo> list = msgAppPushService.alarmPushMsg(msgAppPushVo);
+        IPage<MsgAlarm> list = msgAppPushService.alarmPushMsg(msgAppPushVo);
         return AjaxResult.success(list);
     }