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

business-service/src/main/java/com/ozs/entity/vo/MsgAlarmResp.java

@@ -27,6 +27,11 @@ public class MsgAlarmResp implements Serializable {
      */
     private String pushId;
 
+    /**
+     * 线路编码
+     */
+    private String railwayCode;
+
     /**
      * 线路名称
      */

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

@@ -12,7 +12,6 @@ import com.ozs.common.utils.bean.BeanValidators;
 import com.ozs.entity.BaseTerminal;
 import com.ozs.entity.BaseVehicle;
 import com.ozs.entity.BaseVehicleTerminal;
-import com.ozs.entity.vo.BaseCameraManagementDto;
 import com.ozs.entity.vo.BaseVehicleTerminalDto;
 import com.ozs.entity.vo.BaseVehicleTerminalVo;
 import com.ozs.entity.vo.BaseVehicleVo;
@@ -215,8 +214,12 @@ public class BaseVehicleServiceImpl extends ServiceImpl<BaseVehicleMapper, BaseV
             List<BaseVehicleTerminalVo> dto1 = page.getResult().stream().map(o -> {
                 BaseVehicleTerminalVo baseVehicleTerminalVo = new BaseVehicleTerminalVo();
                 BeanUtils.copyProperties(o, baseVehicleTerminalVo);
-                if (baseTerminal.getTerminalCode().equals(o.getTerminalCode())) {
-                    baseVehicleTerminalVo.setIsMount("2");
+                if (!StringUtils.isEmptySunhh(baseTerminal)) {
+                    if (baseTerminal.getTerminalCode().equals(o.getTerminalCode())) {
+                        baseVehicleTerminalVo.setIsMount("2");
+                    } else {
+                        baseVehicleTerminalVo.setIsMount("1");
+                    }
                 } else {
                     baseVehicleTerminalVo.setIsMount("1");
                 }

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

@@ -353,7 +353,7 @@ public class MsgAlarmController extends BaseController {
     @GetMapping(value = "/alarmHistoricalAlarm/{alarmId}")
     @ApiOperation("报警消息详情历史报警次数信息")
     @Log(title = "报警信息管理", businessType = BusinessType.SELECT)
-    public AjaxResult alarmHistoricalAlarm(@PathVariable Long alarmId) {
+    public AjaxResult alarmHistoricalAlarm(@PathVariable String alarmId) {
         QueryWrapper<MsgAlarmFrequency> wrapper = new QueryWrapper<>();
         wrapper.eq("alarm_id", alarmId);
         wrapper.orderByDesc("alarm_time");

vehicle-admin/src/main/resources/logback.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-<!--	<property name="log.path" value="/home/base/logs" />-->
-    <property name="log.path" value="/Users/sunhuanhuan/Documents/project/106/project/logs"/>
+	<property name="log.path" value="/home/base/logs" />
+<!--    <property name="log.path" value="/Users/sunhuanhuan/Documents/project/106/project/logs"/>-->
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />