Merge remote-tracking branch 'origin/master'

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

@@ -5,9 +5,13 @@ 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.core.domain.AjaxResult;
 import com.ozs.common.core.domain.entity.SysUser;
 import com.ozs.common.utils.AppendUtils;
 import com.ozs.common.utils.StringUtils;
+import com.ozs.common.utils.bean.BeanUtils;
+import com.ozs.entity.BaseCameraManagement;
+import com.ozs.entity.BaseRailwayManagement;
 import com.ozs.entity.MsgAlarm;
 import com.ozs.entity.MsgWebPush;
 import com.ozs.entity.vo.MsgAlarmResp;
@@ -57,23 +61,44 @@ public class MsgWebPushServiceImpl extends ServiceImpl<MsgWebPushMapper, MsgWebP
 //                    lw.eq(BaseCameraManagement::getCameraCode, msgAlarm.getCameraCode());
 //                }
 //                BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(lw);
-//                LambdaQueryWrapper<BaseRailwayManagement> wrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
-//                if (!ObjectUtils.isEmpty(baseCameraManagement.getRailwayCode())) {
-//                    wrapper.eq(BaseRailwayManagement::getRailwayCode, baseCameraManagement.getRailwayCode());
-//                }
-//                BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(wrapper);
+                LambdaQueryWrapper<BaseRailwayManagement> wrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
+                if (!ObjectUtils.isEmpty(msgAlarm.getRailwayCode())) {
+                    wrapper.eq(BaseRailwayManagement::getRailwayCode, msgAlarm.getRailwayCode());
+                }
+                BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(wrapper);
+                if (StringUtils.isEmptySunhh(baseRailwayManagement)) {
+                    return AjaxResult.error("线路编码：" + msgAlarm.getRailwayCode() + "不存在！");
+                }
+                // 查询里程位置最近的相机
+                LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<>();
+                if (!StringUtils.isEmptySunhh(msgAlarm.getRailwayCode())) {
+                    lw.eq(BaseCameraManagement::getRailwayCode, msgAlarm.getRailwayCode());
+                }
+                if (!StringUtils.isEmptySunhh(msgAlarm.getAlarmMile())) {
+                    lw.le(BaseCameraManagement::getBeginMile, msgAlarm.getAlarmMile());
+                    lw.gt(BaseCameraManagement::getEndMile, msgAlarm.getAlarmMile());
+                }
+                List<BaseCameraManagement> baseCameraManagementList = baseCameraManagementService.list(lw);
+                BaseCameraManagement baseCameraManagement = new BaseCameraManagement();
+                if (!StringUtils.isEmptySunhh(baseCameraManagementList) && baseCameraManagementList.size() > 0) {
+                    baseCameraManagement = baseCameraManagementList.get(0);
+                }
+                if (StringUtils.isEmptySunhh(baseCameraManagement)) {
+                    return AjaxResult.error("里程位置：" + msgAlarm.getAlarmMile() + "，不存在关联相机！");
+                }
                 MsgAlarmResp msgAlarmResp = new MsgAlarmResp();
-//                BeanUtils.copyProperties(msgAlarm, msgAlarmResp);
-//                msgAlarmResp.setRailwayName(baseRailwayManagement.getRailwayName());
-//                msgAlarmResp.setDeptId(baseCameraManagement.getDeptId());
-//                String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
-//                String end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
-//                String endMile = begin + "-" + end;
-//                msgAlarmResp.setBeginMile(endMile);
-//                String mile = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
-//                msgAlarmResp.setAlarmMile(mile);
-//                msgAlarmResp.setInstallLongitude(baseCameraManagement.getInstallLongitude() + "," + baseCameraManagement.getInstallLatitude());
-//                msgAlarmResp.setPushId(msgAlarm.getMsgId());
+                BeanUtils.copyProperties(msgAlarm, msgAlarmResp);
+                msgAlarmResp.setRailwayName(baseRailwayManagement.getRailwayName());
+                // msgAlarmResp.setDeptId(baseCameraManagement.getDeptId());
+                String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
+                String end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
+                String endMile = begin + "-" + end;
+                msgAlarmResp.setBeginMile(endMile);
+                String mile = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
+                msgAlarmResp.setAlarmMile(mile);
+                msgAlarmResp.setInstallLongitude(baseCameraManagement.getInstallLongitude() + "," + baseCameraManagement.getInstallLatitude());
+                msgAlarmResp.setPushId(msgAlarm.getMsgId());
+                msgAlarmResp.setCameraCode(baseCameraManagement.getCameraCode());
                 msgAlarmRespList.add(msgAlarmResp);
             }
         }

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

@@ -248,7 +248,7 @@ public class MsgAlarmController extends BaseController {
     public AjaxResult getInfo(@PathVariable Long id) {
         MsgAlarm msgAlarm = msgAlarmService.getById(id);
         if (!ObjectUtils.isEmpty(msgAlarm)) {
-            LambdaQueryWrapper<BaseRailwayManagement> wrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
+            LambdaQueryWrapper<BaseRailwayManagement> wrapper = new LambdaQueryWrapper<>();
             if (!ObjectUtils.isEmpty(msgAlarm.getRailwayCode())) {
                 wrapper.eq(BaseRailwayManagement::getRailwayCode, msgAlarm.getRailwayCode());
             }