报警推送假数据修改

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

@@ -40,7 +40,7 @@ public class BaseRailwayManagement extends BaseEntity implements Serializable {
     /**
      * 线路编码（四位数字）
      */
-    @Excel(name = "编码")
+    @Excel(name = "线路编码")
     private String railwayCode;
 
     /**

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

@@ -50,7 +50,6 @@ public class BaseTerminal implements Serializable {
      * 状态 1在线2离线
      */
     private Integer status;
-    @Excel(name = "状态")
     @TableField(exist = false)
     private String statusStr;
 
@@ -79,13 +78,11 @@ public class BaseTerminal implements Serializable {
     /**
      * 终端经度
      */
-    @Excel(name = "终端经度")
     private String terminalLongitude;
 
     /**
      * 终端纬度
      */
-    @Excel(name = "终端纬度")
     private String terminalLatitude;
 
     /**

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

@@ -37,9 +37,9 @@ public class BaseVehicle implements Serializable {
     private Long id;
 
     /**
-     * 机车编码
+     * 机车号
      */
-    @Excel(name = "机车编码")
+    @Excel(name = "机车号")
     private String vehicleCode;
 
     /**
@@ -73,7 +73,7 @@ public class BaseVehicle implements Serializable {
      * 挂载终端名称
      */
     @TableField(exist = false)
-    @Excel(name = "挂载终端名称")
+    @Excel(name = "车载终端")
     private String terminalName;
 
     /**

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

@@ -30,7 +30,7 @@ public class BaseVehicleTerminal implements Serializable {
     private Long id;
 
     /**
-     * 机车编码
+     * 机车号
      */
     private String vehicleCode;
 

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

@@ -112,6 +112,5 @@ public class MonitorSystem extends BaseEntity implements Serializable {
      * 未报警总数
      */
     @TableField(exist = false)
-    private  Integer failureToReport
-            ;
+    private  Integer failureToReport;
 }

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

@@ -249,7 +249,7 @@ public class MsgAlarm extends BaseEntity implements Serializable {
 
 
     /**
-     * 机车编码
+     * 机车号
      */
     @Excel(name = "车号")
     @TableField(exist = false)

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

@@ -36,9 +36,9 @@ public class VehiclePosition implements Serializable {
     private Long id;
 
     /**
-     * 机车编码
+     * 机车号
      */
-    @Excel(name = "机车编码")
+    @Excel(name = "机车号")
     private String vehicleCode;
 
     /**

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

@@ -85,4 +85,7 @@ public class BaseCameraManagementVos implements Serializable {
      */
     @Excel(name = "线路名称")
     private String railwayName;
+
+    @Excel(name = "测点名称")
+    private  String  stationName;
 }

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

@@ -21,7 +21,7 @@ public class BaseVehicleTerminalDto implements Serializable {
     private String terminalCode;
 
     /**
-     * 机车编码
+     * 机车号
      */
     private String vehicleCode;
     /**

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

@@ -22,7 +22,7 @@ public class BaseVehicleVo extends PageVo {
     private Long id;
 
     /**
-     * 机车编码
+     * 机车号
      */
     private String vehicleCode;
 

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

@@ -15,7 +15,7 @@ public class HeartbeatVo implements Serializable {
      */
     private String terminalCode;
     /**
-     * 机车编码
+     * 机车号
      */
     private String vehicleCode;
     /**

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

@@ -145,4 +145,6 @@ public class MsgAlarmResp implements Serializable {
     private String onlineName;
     
     private String enableOrNotName;
+
+    private Integer alarmLevel;
 }

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

@@ -138,6 +138,9 @@ public class MsgAlarmTemporary  implements Serializable {
     private String alarmTypeName;
 
 
-
+    /**
+     * 来源
+     */
+    private String source;
 
 }

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

@@ -13,7 +13,7 @@ import java.io.Serializable;
  */
 @Data
 public class VehiclePositionResp extends PageVo implements Serializable {
-    //机车编码
+    //机车号
     private String vehicleCode;
 
     //线路编码

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

@@ -17,7 +17,7 @@ import java.util.List;
 public interface VehiclePositionMapper extends BaseMapper<VehiclePosition> {
     /**
      * 查询机车行驶日志列表
-     *@param vehicleCode 机车编码
+     *@param vehicleCode 机车号
      *@param railwayCode 线路编码
      *@param lineDir 行别
      *@param status 车载状态

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

@@ -131,7 +131,7 @@ public class BaseTerminalServiceImpl extends ServiceImpl<BaseTerminalMapper, Bas
         }
         List<BaseTerminal> baseVehicles = baseTerminalMapper.selectList(wrapper);
         if (baseVehicles.size() > 0) {
-            return AjaxResult.error("机车编码已存在！");
+            return AjaxResult.error("机车号已存在！");
         }
         baseTerminal.setUpdateBy(userId);
         baseTerminal.setUpdateTime(new Date());
@@ -153,7 +153,7 @@ public class BaseTerminalServiceImpl extends ServiceImpl<BaseTerminalMapper, Bas
             try {
 //                BaseVehicle baseVehicle = new BaseVehicle();
 //                BeanUtils.copyProperties(baseVehicleTerminal, baseVehicle);
-                // 判断机车编码是否存在
+                // 判断机车号是否存在
                 LambdaQueryWrapper<BaseTerminal> lw = new LambdaQueryWrapper<BaseTerminal>();
                 if (!StringUtils.isEmptySunhh(baseVehicleTerminal.getTerminalCode())) {
                     lw.eq(BaseTerminal::getTerminalCode, baseVehicleTerminal.getTerminalCode());

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

@@ -100,7 +100,7 @@ public class BaseVehicleServiceImpl extends ServiceImpl<BaseVehicleMapper, BaseV
         }
         List<BaseVehicle> baseVehicles = baseVehicleMapper.selectList(wrapper);
         if (baseVehicles.size() > 0) {
-            return AjaxResult.error("机车编码已存在！");
+            return AjaxResult.error("机车号已存在！");
         }
         Date date = new Date();
         baseVehicle.setCreateBy(userId);
@@ -126,7 +126,7 @@ public class BaseVehicleServiceImpl extends ServiceImpl<BaseVehicleMapper, BaseV
         }
         List<BaseVehicle> baseVehicles = baseVehicleMapper.selectList(wrapper);
         if (baseVehicles.size() > 0) {
-            return AjaxResult.error("机车编码已存在！");
+            return AjaxResult.error("机车号已存在！");
         }
         baseVehicle.setUpdateBy(userId);
         baseVehicle.setUpdateTime(new Date());
@@ -148,13 +148,13 @@ public class BaseVehicleServiceImpl extends ServiceImpl<BaseVehicleMapper, BaseV
             try {
                 BaseVehicle baseVehicle = new BaseVehicle();
                 BeanUtils.copyProperties(baseVehicle2, baseVehicle);
-                // 判断机车编码是否存在
+                // 判断机车号是否存在
                 LambdaQueryWrapper<BaseVehicle> lw = new LambdaQueryWrapper<BaseVehicle>();
                 if (!StringUtils.isEmptySunhh(baseVehicle.getVehicleCode())) {
                     lw.eq(BaseVehicle::getVehicleCode, baseVehicle.getVehicleCode());
                 }
                 BaseVehicle baseVehicle1 = baseVehicleMapper.selectOne(lw);
-                if (StringUtils.isEmptySunhh(baseVehicle1)) {
+                if (ObjectUtils.isEmpty(baseVehicle1)) {
                     BeanValidators.validateWithException(validator, baseVehicle);
                     baseVehicle.setUpdateBy(userId);
                     baseVehicle.setCreateBy(userId);
@@ -163,25 +163,24 @@ public class BaseVehicleServiceImpl extends ServiceImpl<BaseVehicleMapper, BaseV
                     baseVehicle.setUpdateTime(date);
                     int insert = baseVehicleMapper.insert(baseVehicle);
                     successNum++;
-                    successMsg.append(successNum + "、机车编码 " + baseVehicle.getVehicleCode() + " 导入成功");
-                } else if (updateSupport) {
-                    BeanValidators.validateWithException(validator, baseVehicle);
-                    LambdaQueryWrapper<BaseVehicle> lambdaQueryWrapper = new LambdaQueryWrapper<BaseVehicle>();
-                    if (!StringUtils.isEmptySunhh(baseVehicle.getVehicleCode())) {
-                        lambdaQueryWrapper.eq(BaseVehicle::getVehicleCode, baseVehicle.getVehicleCode());
-                    }
-                    BaseVehicle baseVehicle4 = baseVehicleMapper.selectOne(lambdaQueryWrapper);
-                    if (StringUtils.isEmptySunhh(baseVehicle4)) {
-                        baseVehicle.setUpdateBy(userId);
-                        baseVehicle.setUpdateTime(new Date());
-                        baseVehicle.setId(baseVehicle4.getId());
-                        baseVehicleMapper.updateById(baseVehicle);
-                        successNum++;
-                        successMsg.append(successNum + "、机车编码 " + baseVehicle.getVehicleCode() + " 更新成功");
-                    } else {
-                        failureNum++;
-                        failureMsg.append(failureNum + "、机车编码 " + baseVehicle.getVehicleCode() + "不存在");
-                    }
+                    successMsg.append(successNum + "、机车号 " + baseVehicle.getVehicleCode() + " 导入成功");
+//                } else if (updateSupport) {
+//                    BeanValidators.validateWithException(validator, baseVehicle);
+//                    LambdaQueryWrapper<BaseVehicle> lambdaQueryWrapper = new LambdaQueryWrapper<BaseVehicle>();
+//                    if (!StringUtils.isEmptySunhh(baseVehicle.getVehicleCode())) {
+//                        lambdaQueryWrapper.eq(BaseVehicle::getVehicleCode, baseVehicle.getVehicleCode());
+//                    }
+//                    BaseVehicle baseVehicle4 = baseVehicleMapper.selectOne(lambdaQueryWrapper);
+//                    if (StringUtils.isEmptySunhh(baseVehicle4)) {
+//                        baseVehicle.setUpdateBy(userId);
+//                        baseVehicle.setUpdateTime(new Date());
+//                        baseVehicle.setId(baseVehicle4.getId());
+//                        baseVehicleMapper.updateById(baseVehicle);
+//                        successNum++;
+//                        successMsg.append(successNum + "、机车号 " + baseVehicle.getVehicleCode() + " 更新成功");
+                } else {
+                    failureNum++;
+                    failureMsg.append(failureNum + "、机车号 " + baseVehicle.getVehicleCode() + "已存在");
                 }
             } catch (Exception e) {
                 String msg = null;
@@ -189,7 +188,7 @@ public class BaseVehicleServiceImpl extends ServiceImpl<BaseVehicleMapper, BaseV
                 if (ObjectUtils.isEmpty(baseVehicle2)) {
                     msg = "导入的文档格式不正确";
                 } else {
-                     msg = failureNum + "、机车编码 " + baseVehicle2.getVehicleCode() + " 导入失败：";
+                    msg = failureNum + "、机车号 " + baseVehicle2.getVehicleCode() + " 导入失败：";
                 }
                 failureMsg.append(msg);
                 log.error(msg, e);

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

@@ -196,7 +196,7 @@ public class MonitorSystemServiceImpl extends ServiceImpl<MonitorSystemMapper, M
                 AlarmHeartbeatLog alarmHeartbeatLog = monitorSystemMapper.selectAlarmHeartbeatLogByClientId(monitorSystem.getClientId());
                 if (StringUtils.isEmptySunhh(alarmHeartbeatLog)) {
                     offlineMonitor++;
-                    monitorSystem.setStatus(1);
+                    monitorSystem.setStatus(2);
                 } else {
                     long timeNow = System.currentTimeMillis();
                     long createTime = alarmHeartbeatLog.getCreateTime().getTime();

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

@@ -89,7 +89,9 @@ public class VehiclePositionServiceImpl extends ServiceImpl<VehiclePositionMappe
                         lwBaseRailwayManagement.eq(BaseRailwayManagement::getRailwayCode, vehiclePosition.getRailwayCode());
                     }
                     BaseRailwayManagement baseRailwayManagement = baseRailwayManagementMapper.selectOne(lwBaseRailwayManagement);
-                    vehiclePosition.setRailwayName(baseRailwayManagement.getRailwayName());
+                    if (!ObjectUtils.isEmpty(baseRailwayManagement)) {
+                        vehiclePosition.setRailwayName(baseRailwayManagement.getRailwayName());
+                    }
                     if (!ObjectUtils.isEmpty(vehiclePosition.getTravelMile())) {
                         vehiclePosition.setTravelMileFormat(AppendUtils.stringAppend(vehiclePosition.getTravelMile()));
                     }
@@ -99,11 +101,6 @@ public class VehiclePositionServiceImpl extends ServiceImpl<VehiclePositionMappe
                     if (!ObjectUtils.isEmpty(baseTerminal.getStatus())) {
                         vehiclePosition.setStatus(baseTerminal.getStatus() == 1 ? "在线" : "离线");
                     }
-                    String builder = vehiclePosition.getRailwayName() +
-                            "-" +
-                            vehiclePosition.getLineDirName() + "-" +
-                            "里程位置" + vehiclePosition.getTravelMileFormat();
-                    vehiclePosition.setMileagePosition(builder);
                     vehiclePositionArrayList.add(vehiclePosition);
                     state = false;
                     break;

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

@@ -83,7 +83,7 @@ public class BaseVehicleController extends BaseController {
     @Log(title = "机车信息管理", businessType = BusinessType.SELECT)
     public AjaxResult vehicleTerminal(@RequestBody BaseVehicleVo baseVehicleVo) {
         if (StringUtils.isEmptySunhh(baseVehicleVo) || StringUtils.isEmptySunhh(baseVehicleVo.getVehicleCode())) {
-            return AjaxResult.error("机车编码不能为空！");
+            return AjaxResult.error("机车号不能为空！");
         }
         IPage<BaseVehicleTerminalVo> baseVehicleTerminalVoIPage = baseVehicleService.vehicleTerminal(baseVehicleVo);
         return AjaxResult.success(baseVehicleTerminalVoIPage);
@@ -100,7 +100,7 @@ public class BaseVehicleController extends BaseController {
     @Log(title = "机车信息管理", businessType = BusinessType.SELECT)
     public AjaxResult isMount(@RequestBody BaseVehicleVo baseVehicleVo) {
         if (StringUtils.isEmptySunhh(baseVehicleVo) || StringUtils.isEmptySunhh(baseVehicleVo.getVehicleCode())) {
-            return AjaxResult.error("机车编码不能为空！");
+            return AjaxResult.error("机车号不能为空！");
         }
         Boolean isMount = baseVehicleService.isMount(baseVehicleVo);
         return AjaxResult.success(isMount);
@@ -117,7 +117,7 @@ public class BaseVehicleController extends BaseController {
     @Log(title = "机车信息管理", businessType = BusinessType.INSERT)
     public AjaxResult vehicleTerminalUnmount(@RequestBody BaseVehicleTerminal baseTerminal) {
         if (StringUtils.isEmptySunhh(baseTerminal) || StringUtils.isEmptySunhh(baseTerminal.getVehicleCode())) {
-            return AjaxResult.error("机车编码、终端编码不能为空！");
+            return AjaxResult.error("机车号、终端编码不能为空！");
         }
         return baseVehicleService.vehicleTerminalUnmount(baseTerminal);
     }
@@ -134,7 +134,7 @@ public class BaseVehicleController extends BaseController {
     public AjaxResult vehicleTerminalAdd(@RequestBody BaseVehicleTerminal baseTerminal) {
         if (StringUtils.isEmptySunhh(baseTerminal) || StringUtils.isEmptySunhh(baseTerminal.getVehicleCode())
                 || StringUtils.isEmptySunhh(baseTerminal.getTerminalCode())) {
-            return AjaxResult.error("机车编码、终端编码不能为空！");
+            return AjaxResult.error("机车号、终端编码不能为空！");
         }
         return baseVehicleService.vehicleTerminalAdd(baseTerminal, getUserId());
     }

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

@@ -356,14 +356,15 @@ public class MsgAlarmController extends BaseController {
             msgAlarmResp.setAlarmMile(mile);
             if (StringUtils.isNotEmpty(msgAlarm.getAlarmAttr())) {
                 String[] split1 = msgAlarm.getAlarmAttr().split(",");
-                String stringBuilder = "画面,大小为" + split1[0] + "×" + split1[1] + "," +
-                        "泥石流范围为左上角坐标(" + split1[2] + "," + split1[3] + ")" +
-                        "大小" + split1[4] + "×" + split1[5];
-                msgAlarmResp.setAlarmAttrName(stringBuilder);
+//                String stringBuilder = "画面,大小为" + split1[0] + "×" + split1[1] + "," +
+//                        "泥石流范围为左上角坐标(" + split1[2] + "," + split1[3] + ")" +
+//                        "大小" + split1[4] + "×" + split1[5];
+                msgAlarmResp.setAlarmAttrName(msgAlarm.getAlarmAttr());
             }
             msgAlarmResp.setLineDirStr(msgAlarm.getLineDir() == 1 ? "上行" : "下行");
             msgAlarmResp.setAlarmTypeStr(msgAlarm.getAlarmType() == 1 ? "泥石流" : (msgAlarm.getAlarmType() == 2 ? "异物侵线" : (msgAlarm.getAlarmType() == 3 ? "断轨监测" : "未知")));
             msgAlarmResp.setIsReleaseName(msgAlarm.getIsRelease() == 1 ? "已解除" : (msgAlarm.getIsRelease() == 2 ? "未解除" : "未知"));
+            msgAlarmResp.setAlarmLevel(msgAlarm.getAlarmLevel());
             List<SysDictData> data = dictTypeService.selectDictDataByType("sys_alarm_type");
             data.stream().forEach(sysDictData -> {
                 if (sysDictData.getDictValue().equals(msgAlarm.getAlarmType().toString())) {
@@ -371,7 +372,9 @@ public class MsgAlarmController extends BaseController {
                 }
                 if(!ObjectUtils.isEmpty(msgAlarm.getSource())){
                     MonitorSystem monitorSystem = monitorSystemService.selectByClientId(msgAlarm.getSource());
-                    msgAlarmResp.setSourceName(monitorSystem.getMonitorSystemName());
+                    if (!ObjectUtils.isEmpty(monitorSystem)) {
+                        msgAlarmResp.setSourceName(monitorSystem.getMonitorSystemName());
+                    }
                 }
             });
             return AjaxResult.success(msgAlarmResp);

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

@@ -224,10 +224,8 @@ public class MsgAlarmTemporaryController extends BaseController {
         Files[] files2 = new Files[1];
         files2[0] = files;
         reqMsgAlarmVo.setFiles(files2);
-        if (!ObjectUtils.isEmpty(reqMsgAlarmVo.getAlarmAttr())) {
-            if (!reqMsgAlarmVo.getAlarmAttr().matches(PATTERN)) {
-                return AjaxResult.error("你填写的报警病害属性不符合规则!!!");
-            }
+        if (ObjectUtils.isEmpty(reqMsgAlarmVo.getAlarmAttr())) {
+                return AjaxResult.error("你填写的报警属性不能为空!!!");
         }
         if (!reqMsgAlarmVo.getAlarmMile().toString().matches(PATTERNS)) {
             return AjaxResult.error("报警里程位置填写错误");
@@ -285,7 +283,7 @@ public class MsgAlarmTemporaryController extends BaseController {
             msgAlarm.setUpdateBy(admin.getUserId());
             msgAlarm.setAlarmTime(new Date(reqMsgAlarmVo.getAlarmTime()));
             msgAlarm.setRailwayCode(reqMsgAlarmVo.getAlarmRailway());
-            msgAlarm.setSource("09061114");
+            msgAlarm.setSource(msgAlarmTemporary.getSource());
             msgAlarmService.save(msgAlarm);
             Files[] files1 = reqMsgAlarmVo.getFiles();
             if (files1.length > 0) {

vehicle-admin/src/main/java/com/ozs/web/controller/sdk/GeoHazardMonitorTokenController.java

@@ -605,7 +605,7 @@ public class GeoHazardMonitorTokenController {
 //            //*******获取终端经度纬度，将车载终端code改为机车的code，便是机车的位置
 //            HeartbeatVo heartbeatVoCH = new HeartbeatVo();
 //            BeanUtils.copyProperties(heartbeatVo, heartbeatVoCH);
-//            //*******将终端关联的机车编码赋值给推送信息对象
+//            //*******将终端关联的机车号赋值给推送信息对象
 //            heartbeatVoCH.setVehicleCode(baseTerminal.getVehicleCode());
 //            String content = objStr(heartbeatVoCH);
 //            //获取在线用户

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

@@ -1,5 +1,6 @@
 package com.ozs.web.controller.system;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ozs.common.annotation.Log;
 import com.ozs.common.constant.UserConstants;
@@ -36,6 +37,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -117,6 +119,11 @@ public class SysUserController extends BaseController {
                     longs = iSysRoleService.selectRoleListByUserId(o.getId());
                 }
                 Long[] objects = longs.toArray(new Long[]{});
+                QueryWrapper<SysRole> wrapper=new QueryWrapper<>();
+                wrapper.in("role_id", Arrays.asList(objects));
+                List<SysRole> roles = roleService.list(wrapper);
+                List<String> collect = roles.stream().map(SysRole::getRoleName).collect(Collectors.toList());
+                o.setRoleNames(collect);
                 o.setRoleIds(objects);
                 return o;
             }).collect(Collectors.toList());