Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/VehicleMonitor

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

@@ -181,7 +181,12 @@ public class MsgAlarmServiceImpl extends ServiceImpl<MsgAlarmMapper, MsgAlarm> i
             lw.le(BaseCameraManagement::getBeginMile, msgAlarmVo.getAlarmMile());
             lw.gt(BaseCameraManagement::getEndMile, msgAlarmVo.getAlarmMile());
         }
-        BaseCameraManagement baseCameraManagement = baseCameraManagementMapper.selectOne(lw);
+        List<BaseCameraManagement> baseCameraManagementList = baseCameraManagementMapper.selectList(lw);
+        BaseCameraManagement baseCameraManagement = new BaseCameraManagement();
+        if (!StringUtils.isEmptySunhh(baseCameraManagementList) && baseCameraManagementList.size() > 0) {
+            baseCameraManagement = baseCameraManagementList.get(0);
+        }
+//        BaseCameraManagement baseCameraManagement = baseCameraManagementMapper.selectOne(lw);
         if (StringUtils.isEmptySunhh(baseCameraManagement)) {
             return AjaxResult.error("线路编码：" + msgAlarmVo.getRailwayCode() + "不存在对应里程范围为："+ msgAlarmVo.getAlarmMile() +"的相机！");
         }

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

@@ -56,12 +56,7 @@ public class MsgWebPushServiceImpl extends ServiceImpl<MsgWebPushMapper, MsgWebP
         List<MsgAlarm> webAlarm = msgWebPushMapper.webAlarm(userId);
         if (!StringUtils.isEmpty(webAlarm) && webAlarm.size() > 0) {
             for (MsgAlarm msgAlarm : webAlarm) {
-//                LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
-//                if (!ObjectUtils.isEmpty(msgAlarm.getCameraCode())) {
-//                    lw.eq(BaseCameraManagement::getCameraCode, msgAlarm.getCameraCode());
-//                }
-//                BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(lw);
-                LambdaQueryWrapper<BaseRailwayManagement> wrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
+                LambdaQueryWrapper<BaseRailwayManagement> wrapper = new LambdaQueryWrapper<>();
                 if (!ObjectUtils.isEmpty(msgAlarm.getRailwayCode())) {
                     wrapper.eq(BaseRailwayManagement::getRailwayCode, msgAlarm.getRailwayCode());
                 }
@@ -78,19 +73,27 @@ public class MsgWebPushServiceImpl extends ServiceImpl<MsgWebPushMapper, MsgWebP
                     lw.le(BaseCameraManagement::getBeginMile, msgAlarm.getAlarmMile());
                     lw.gt(BaseCameraManagement::getEndMile, msgAlarm.getAlarmMile());
                 }
-                BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(lw);
+                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(Integer.parseInt(msgAlarm.getBeginMile()));
-                String end = AppendUtils.stringAppend(Integer.parseInt(msgAlarm.getEndMile()));
+                String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
+                String end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
                 String endMile = begin + "-" + end;
                 msgAlarmResp.setBeginMile(endMile);
-                String mile = AppendUtils.stringAppend(msgAlarm.getAlarmMile());
+                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);
             }
         }
@@ -113,25 +116,39 @@ public class MsgWebPushServiceImpl extends ServiceImpl<MsgWebPushMapper, MsgWebP
 //                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);
+                LambdaQueryWrapper<BaseRailwayManagement> wrapper = new LambdaQueryWrapper<>();
+                if (!ObjectUtils.isEmpty(o.getRailwayCode())) {
+                    wrapper.eq(BaseRailwayManagement::getRailwayCode, o.getRailwayCode());
+                }
+                BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(wrapper);
+                if (StringUtils.isEmptySunhh(baseRailwayManagement)) {
+//                    return AjaxResult.error("线路编码：" + o.getRailwayCode() + "不存在！");
+                }
+                // 查询里程位置最近的相机
+                LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<>();
+                if (!StringUtils.isEmptySunhh(o.getRailwayCode())) {
+                    lw.eq(BaseCameraManagement::getRailwayCode, o.getRailwayCode());
+                }
+                if (!StringUtils.isEmptySunhh(o.getAlarmMile())) {
+                    lw.le(BaseCameraManagement::getBeginMile, o.getAlarmMile());
+                    lw.gt(BaseCameraManagement::getEndMile, o.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("里程位置：" + o.getAlarmMile() + "，不存在关联相机！");
+                }
+                o.setRailwayName(baseRailwayManagement.getRailwayName());
+                String mils = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
+                o.setAlarmMiles(mils);
+                String end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
+                o.setEndMile(end);
+                String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
+                o.setBeginMile(begin);
+                // o.setAlarmCount((int) msgAlarmFrequencyService.count()+1);
                 return o;
             }).collect(Collectors.toList());
             pageR.setRecords(dto1);

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

@@ -185,17 +185,29 @@
 
     <select id="getAlarmNum" resultType="java.lang.Long">
         select count(DISTINCT alarm_id) as alarmNum
-        from
-        msg_alarm
+        from msg_alarm
     </select>
 
     <select id="selectCameraCode" parameterType="java.lang.String" resultType="java.lang.Integer">
-        select is_lock from msg_alarm where camera_code = #{cameraCode} ORDER BY alarm_time DESC LIMIT 1
+        select is_lock
+        from msg_alarm
+        where camera_code = #{cameraCode}
+        ORDER BY alarm_time DESC
+        LIMIT 1
     </select>
 
     <select id="selectByCameraCode" parameterType="java.lang.String" resultType="com.ozs.entity.MsgAlarm">
-        select * from msg_alarm where camera_code = #{cameraCode} order by alarm_time desc limit 1
+        select *
+        from msg_alarm
+        where camera_code = #{cameraCode}
+        order by alarm_time desc
+        limit 1
     </select>
+
+    <!-- and date_format(alarm_time,'%Y-%m-%d %H:%i:%S') &gt;= date_format(#{beginAlarmTime},'%Y-%m-%d
+             %H:%i:%S')         -->
+    <!-- AND date_format(alarm_time,'%Y-%m-%d %H:%i:%S') &lt;= date_format(#{endAlarmTime},'%Y-%m-%d
+     %H:%i:%S')-->
     <select id="selectMsgAlarmList" resultType="com.ozs.entity.MsgAlarm" parameterType="com.ozs.entity.vo.MsgAlarmVo">
         SELECT * FROM msg_alarm
         <where>
@@ -217,13 +229,9 @@
             <if test="beginAlarmTime != null and beginAlarmTime != ''">
                 and TO_CHAR(alarm_time, 'YYYY-MM-DD HH24:MI:SS') &gt;= TO_CHAR(#{beginAlarmTime}, 'YYYY-MM-DD
                 HH24:MI:SS')
-                -- and date_format(alarm_time,'%Y-%m-%d %H:%i:%S') &gt;= date_format(#{beginAlarmTime},'%Y-%m-%d
-                %H:%i:%S')
             </if>
             <if test="endAlarmTime != null and endAlarmTime != ''">
                 and TO_CHAR(alarm_time, 'YYYY-MM-DD HH24:MI:SS') &lt;= TO_CHAR(#{endAlarmTime}, 'YYYY-MM-DD HH24:MI:SS')
-                -- AND date_format(alarm_time,'%Y-%m-%d %H:%i:%S') &lt;= date_format(#{endAlarmTime},'%Y-%m-%d
-                %H:%i:%S')
             </if>
         </where>
         order by  alarm_time desc

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

@@ -23,7 +23,7 @@
         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 base_camera_management AS c on b.camera_code = c.camera_code
+        join base_railway_management AS c on b.railway_code = c.railway_code
         <where>
             <if test="userId != null and userId != ''">
                 and a.receive_by = #{userId}
@@ -46,12 +46,12 @@
             <if test="railwayCode != null and railwayCode != ''">
                 and c.railway_code = #{railwayCode}
             </if>
-            <if test="beginMile != null and beginMile != ''">
-                and c.begin_mile &gt;= #{beginMile}
-            </if>
-            <if test="endMile != null and endMile != ''">
-                and c.end_mile &lt;= #{endMile}
-            </if>
+<!--            <if test="beginMile != null and beginMile != ''">-->
+<!--                and c.begin_mile &gt;= #{beginMile}-->
+<!--            </if>-->
+<!--            <if test="endMile != null and endMile != ''">-->
+<!--                and c.end_mile &lt;= #{endMile}-->
+<!--            </if>-->
         </where>
     </select>
 

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

@@ -850,7 +850,9 @@ public class BaseCameraManagementController extends BaseController {
                 MsgAlarm msgAlarm = list.get(0);
                 if (StringUtils.isNotEmpty(msgAlarm.getReleasedBy())) {
                     BaseUser user = baseUserService.getUser(msgAlarm.getReleasedBy());
-                    msgAlarm.setReleasedByName(user.getNickName());
+                    if (!StringUtils.isEmptySunhh(user) && !StringUtils.isEmptySunhh(user.getNickName())) {
+                        msgAlarm.setReleasedByName(user.getNickName());
+                    }
                 }
                 msgAlarmResp.setAlarmType(msgAlarm.getAlarmType());
                 msgAlarmResp.setIsRelease(msgAlarm.getIsRelease());

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

@@ -224,7 +224,9 @@ public class MsgAlarmController extends BaseController {
             }
             if (StringUtils.isNotEmpty(o.getReleasedBy())) {
                 BaseUser user = baseUserService.getUser(o.getReleasedBy());
-                o.setReleasedByName(user.getNickName());
+                if (!StringUtils.isEmptySunhh(user) && !StringUtils.isEmptySunhh(user.getNickName())) {
+                    o.setReleasedByName(user.getNickName());
+                }
             }
             String mils = AppendUtils.stringAppend(o.getAlarmMile());
             o.setAlarmMiles(mils);
@@ -257,7 +259,9 @@ public class MsgAlarmController extends BaseController {
             BeanUtils.copyProperties(msgAlarm, msgAlarmResp);
             if (!StringUtils.isEmptySunhh(msgAlarm.getReleasedBy())) {
                 BaseUser user = baseUserService.getUser(msgAlarm.getReleasedBy());
-                msgAlarmResp.setReleasedByName(user.getNickName());
+                if (!StringUtils.isEmptySunhh(user) && !StringUtils.isEmptySunhh(user.getNickName())) {
+                    msgAlarmResp.setReleasedByName(user.getNickName());
+                }
             }
             if (!StringUtils.isEmptySunhh(baseRailwayManagement) && !StringUtils.isEmptySunhh(baseRailwayManagement.getRailwayName())) {
                 msgAlarmResp.setRailwayName(baseRailwayManagement.getRailwayName());