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

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

@@ -2,6 +2,7 @@ package com.ozs.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -46,6 +47,7 @@ public class BaseTerminal implements Serializable {
     /**
      * 创建时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     /**
@@ -56,6 +58,7 @@ public class BaseTerminal implements Serializable {
     /**
      * 更新时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
     /**

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

@@ -1,7 +1,9 @@
 package com.ozs.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ozs.common.annotation.Excel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -49,6 +51,7 @@ public class BaseVehicle implements Serializable {
     /**
      * 创建时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     /**
@@ -59,10 +62,19 @@ public class BaseVehicle implements Serializable {
     /**
      * 更新时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
+    /**
+     * 挂载终端名称
+     */
+    @TableField(exist = false)
+    @Excel(name = "挂载终端名称")
+    private String terminalName;
+
     /**
      * 备注
      */
+    @Excel(name = "备注")
     private String remark;
 }

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

@@ -3,6 +3,7 @@ package com.ozs.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ozs.common.annotation.Excel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -58,6 +59,7 @@ public class BaseVehicleTerminal implements Serializable {
     /**
      * 创建时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     /**
@@ -68,13 +70,9 @@ public class BaseVehicleTerminal implements Serializable {
     /**
      * 更新时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
-    /**
-     * 备注
-     */
-    private String remark;
-
     /**
      * 终端经度
      */
@@ -86,4 +84,10 @@ public class BaseVehicleTerminal implements Serializable {
      */
     @Excel(name = "终端纬度")
     private String terminalLatitude;
+
+    /**
+     * 备注
+     */
+    @Excel(name = "备注")
+    private String remark;
 }

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

@@ -1,5 +1,6 @@
 package com.ozs.entity.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ozs.common.vo.PageVo;
 import lombok.Data;
 
@@ -44,6 +45,7 @@ public class BaseVehicleTerminalVo extends PageVo {
     /**
      * 创建时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     /**
@@ -54,6 +56,7 @@ public class BaseVehicleTerminalVo extends PageVo {
     /**
      * 更新时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
     /**

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

@@ -2,6 +2,7 @@ package com.ozs.entity.vo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ozs.common.vo.PageVo;
 import lombok.Data;
 
@@ -38,6 +39,7 @@ public class BaseVehicleVo extends PageVo {
     /**
      * 创建时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     /**
@@ -48,6 +50,7 @@ public class BaseVehicleVo extends PageVo {
     /**
      * 更新时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
     /**

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

@@ -60,10 +60,27 @@ public class BaseVehicleServiceImpl extends ServiceImpl<BaseVehicleMapper, BaseV
         if (!StringUtils.isEmptySunhh(baseVehicle) && !StringUtils.isEmptySunhh(baseVehicle.getVehicleCode())) {
             wrapper.eq(BaseVehicle::getVehicleCode, baseVehicle.getVehicleCode());
         }
+        wrapper.orderByDesc(BaseVehicle::getCreateTime);
         int pageNum = Integer.parseInt(baseVehicle.getPageNum().toString());
         int pageSize = Integer.parseInt(baseVehicle.getPageSize().toString());
         com.github.pagehelper.Page<BaseVehicle> page = PageHelper.startPage(pageNum, pageSize)
                 .doSelectPage(() -> baseVehicleMapper.selectList(wrapper));
+        if (!StringUtils.isEmptySunhh(page) && page.getResult().size() > 0) {
+            List<BaseVehicle> dto1 = page.getResult().stream().map(o -> {
+                BaseTerminal baseTerminal = baseTerminalMapper.selectTerminal(o.getVehicleCode());
+                if (!StringUtils.isEmptySunhh(baseTerminal) && !StringUtils.isEmptySunhh(baseTerminal.getVehicleCode())) {
+                    LambdaQueryWrapper<BaseVehicleTerminal> wrapperBaseVehicleTerminal = new LambdaQueryWrapper<>();
+                    if (!StringUtils.isEmptySunhh(baseTerminal) && !StringUtils.isEmptySunhh(baseTerminal.getTerminalCode())) {
+                        wrapperBaseVehicleTerminal.eq(BaseVehicleTerminal::getTerminalCode, baseTerminal.getTerminalCode());
+                    }
+                    BaseVehicleTerminal baseVehicleTerminal = baseVehicleTerminalMapper.selectOne(wrapperBaseVehicleTerminal);
+                    if (!StringUtils.isEmptySunhh(baseVehicleTerminal) && !StringUtils.isEmptySunhh(baseVehicleTerminal.getTerminalName())) {
+                        o.setTerminalName(baseVehicleTerminal.getTerminalName());
+                    }
+                }
+                return o;
+            }).collect(Collectors.toList());
+        }
         com.baomidou.mybatisplus.extension.plugins.pagination.Page<BaseVehicle> pageR =
                 new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(pageNum, pageSize);
         pageR.setRecords(page.getResult());
@@ -100,6 +117,9 @@ public class BaseVehicleServiceImpl extends ServiceImpl<BaseVehicleMapper, BaseV
         if (!StringUtils.isEmptySunhh(baseVehicle) && !StringUtils.isEmptySunhh(baseVehicle.getVehicleCode())) {
             wrapper.eq(BaseVehicle::getVehicleCode, baseVehicle.getVehicleCode());
         }
+        if (!StringUtils.isEmptySunhh(baseVehicle) && !StringUtils.isEmptySunhh(baseVehicle.getId())) {
+            wrapper.ne(BaseVehicle::getId, baseVehicle.getId());
+        }
         List<BaseVehicle> baseVehicles = baseVehicleMapper.selectList(wrapper);
         if (baseVehicles.size() > 0) {
             return AjaxResult.error("机车编码已存在！");
@@ -191,6 +211,21 @@ public class BaseVehicleServiceImpl extends ServiceImpl<BaseVehicleMapper, BaseV
             wrapper.eq(BaseVehicle::getVehicleCode, baseVehicle.getVehicleCode());
         }
         List<BaseVehicle> baseVehicles = baseVehicleMapper.selectList(wrapper);
+        for (BaseVehicle baseVehicle1 : baseVehicles) {
+            BaseTerminal baseTerminal = baseTerminalMapper.selectTerminal(baseVehicle1.getVehicleCode());
+            if (!StringUtils.isEmptySunhh(baseTerminal) && !StringUtils.isEmptySunhh(baseTerminal.getVehicleCode())) {
+                LambdaQueryWrapper<BaseVehicleTerminal> wrapperBaseVehicleTerminal = new LambdaQueryWrapper<>();
+                if (!StringUtils.isEmptySunhh(baseTerminal) && !StringUtils.isEmptySunhh(baseTerminal.getTerminalCode())) {
+                    wrapperBaseVehicleTerminal.eq(BaseVehicleTerminal::getTerminalCode, baseTerminal.getTerminalCode());
+                }
+                BaseVehicleTerminal baseVehicleTerminal = baseVehicleTerminalMapper.selectOne(wrapperBaseVehicleTerminal);
+                if (!StringUtils.isEmptySunhh(baseVehicleTerminal) && !StringUtils.isEmptySunhh(baseVehicleTerminal.getTerminalName())) {
+                    baseVehicle1.setTerminalName(baseVehicleTerminal.getTerminalName());
+                } else {
+                    baseVehicle1.setTerminalName("");
+                }
+            }
+        }
         return baseVehicles;
     }
 

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

@@ -47,6 +47,7 @@ public class BaseVehicleTerminalServiceImpl extends ServiceImpl<BaseVehicleTermi
         if (!StringUtils.isEmptySunhh(baseVehicleTerminalleVo) && !StringUtils.isEmptySunhh(baseVehicleTerminalleVo.getStatus())) {
             wrapper.eq(BaseVehicleTerminal::getStatus, baseVehicleTerminalleVo.getStatus());
         }
+        wrapper.orderByDesc(BaseVehicleTerminal::getCreateTime);
         int pageNum = Integer.parseInt(baseVehicleTerminalleVo.getPageNum().toString());
         int pageSize = Integer.parseInt(baseVehicleTerminalleVo.getPageSize().toString());
         com.github.pagehelper.Page<BaseVehicleTerminal> page = PageHelper.startPage(pageNum, pageSize)

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

@@ -104,8 +104,8 @@ public class BaseCameraManagementController extends BaseController {
                 queryWrapper.eq(BaseRailwayManagement::getRailwayCode, baseCameraManagement.getRailwayCode());
             }
             BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(queryWrapper);
-            SysDept sysDept = deptService.selectDeptById(baseCameraManagement.getDeptId());
-            baseCameraManagement.setDeptName(sysDept.getDeptName());
+//            SysDept sysDept = deptService.selectDeptById(baseCameraManagement.getDeptId());
+//            baseCameraManagement.setDeptName(sysDept.getDeptName());
             baseCameraManagement.setRailwayName(baseRailwayManagement.getRailwayName());
             String mils = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
             baseCameraManagement.setInstallMiles(mils);
@@ -244,7 +244,7 @@ public class BaseCameraManagementController extends BaseController {
             return error("你的网络卡顿,请不要一直添加!!!");
         }
         idempotenceUtils.createIdempotence(baseCameraManagement.getCameraCode());
-        LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
+        LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<>();
         if (!ObjectUtils.isEmpty(baseCameraManagement.getCameraCode())) {
             lw.eq(BaseCameraManagement::getCameraCode, baseCameraManagement.getCameraCode());
         }
@@ -253,7 +253,7 @@ public class BaseCameraManagementController extends BaseController {
             idempotenceUtils.deleteIdempotence(baseCameraManagement.getCameraCode());
             return error("相机台账管理信息相机编码已存在,不能重复添加");
         }
-        LambdaQueryWrapper<BaseDeviceDynamicManagement> queryWrapper = new LambdaQueryWrapper<BaseDeviceDynamicManagement>();
+        LambdaQueryWrapper<BaseDeviceDynamicManagement> queryWrapper = new LambdaQueryWrapper<>();
         if (!ObjectUtils.isEmpty(baseCameraManagement.getCameraCode())) {
             queryWrapper.eq(BaseDeviceDynamicManagement::getCameraCode, baseCameraManagement.getCameraCode());
         }
@@ -262,22 +262,22 @@ public class BaseCameraManagementController extends BaseController {
             idempotenceUtils.deleteIdempotence(baseCameraManagement.getCameraCode());
             return error("设备动态管理表该相机编码已存在,不能重复添加");
         }
-        if (!baseCameraManagement.getBeginMiles().matches(PATTERN)) {
+        if (!baseCameraManagement.getBeginMile().toString().matches(PATTERN)) {
             return error("监控范围开始里程位置填写格式不正确");
         } else {
-            double begin = Double.parseDouble(baseCameraManagement.getBeginMiles());
+            double begin = Double.parseDouble(baseCameraManagement.getBeginMile().toString());
             baseCameraManagement.setBeginMile((int) (begin * 1000));
         }
-        if (!baseCameraManagement.getInstallMiles().matches(PATTERN)) {
+        if (!baseCameraManagement.getInstallMile().toString().matches(PATTERN)) {
             return error("监控相机安装里程位置填写格式不正确");
         } else {
-            double install = Double.parseDouble(baseCameraManagement.getInstallMiles());
+            double install = Double.parseDouble(baseCameraManagement.getInstallMile().toString());
             baseCameraManagement.setInstallMile((int) (install * 1000));
         }
-        if (!baseCameraManagement.getEndMiles().matches(PATTERN)) {
+        if (!baseCameraManagement.getEndMile().toString().matches(PATTERN)) {
             return error("监控范围结束里程位置填写格式不正确");
         } else {
-            double end = Double.parseDouble(baseCameraManagement.getEndMiles());
+            double end = Double.parseDouble(baseCameraManagement.getEndMile().toString());
             baseCameraManagement.setEndMile((int) (end * 1000));
         }
         if (baseCameraManagement.getBeginMile() > baseCameraManagement.getEndMile()) {
@@ -322,22 +322,22 @@ public class BaseCameraManagementController extends BaseController {
         if (!ObjectUtils.isEmpty(cameraManagement) && !cameraManagement.getId().equals(baseCameraManagement.getId())) {
             return error("相机编码已存在,不能进行修改操作");
         }
-        if (!baseCameraManagement.getBeginMiles().matches(PATTERN)) {
+        if (!baseCameraManagement.getBeginMile().toString().matches(PATTERN)) {
             return error("监控范围开始里程位置填写格式不正确");
         } else {
-            double begin = Double.parseDouble(baseCameraManagement.getBeginMiles());
+            double begin = Double.parseDouble(baseCameraManagement.getBeginMile().toString());
             baseCameraManagement.setBeginMile((int) (begin * 1000));
         }
-        if (!baseCameraManagement.getInstallMiles().matches(PATTERN)) {
+        if (!baseCameraManagement.getInstallMile().toString().matches(PATTERN)) {
             return error("监控相机安装里程位置填写格式不正确");
         } else {
-            double install = Double.parseDouble(baseCameraManagement.getInstallMiles());
+            double install = Double.parseDouble(baseCameraManagement.getInstallMile().toString());
             baseCameraManagement.setInstallMile((int) (install * 1000));
         }
-        if (!baseCameraManagement.getEndMiles().matches(PATTERN)) {
+        if (!baseCameraManagement.getEndMile().toString().matches(PATTERN)) {
             return error("监控范围结束里程位置填写格式不正确");
         } else {
-            double end = Double.parseDouble(baseCameraManagement.getEndMiles());
+            double end = Double.parseDouble(baseCameraManagement.getEndMile().toString());
             baseCameraManagement.setEndMile((int) (end * 1000));
         }
         if (baseCameraManagement.getBeginMile() > baseCameraManagement.getEndMile()) {
@@ -373,14 +373,23 @@ public class BaseCameraManagementController extends BaseController {
 //        SysDept sysDept = deptService.selectDeptById(baseCameraManagement.getDeptId());
 //        baseCameraManagement.setDeptName(sysDept.getDeptName());
         baseCameraManagement.setRailwayName(baseRailwayManagement.getRailwayName());
-        String mils = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
-        baseCameraManagement.setInstallMiles(mils);
-        String end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
-        baseCameraManagement.setEndMiles(end);
-        String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
-        baseCameraManagement.setBeginMiles(begin);
+//        String mils = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
+//        baseCameraManagement.setInstallMiles(mils);
+//        String end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
+//        baseCameraManagement.setEndMiles(end);
+//        String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
+//        baseCameraManagement.setBeginMiles(begin);
+        if (!StringUtils.isEmptySunhh(baseCameraManagement.getInstallMile())) {
+            baseCameraManagement.setInstallMile(baseCameraManagement.getInstallMile()/1000);
+        }
+        if (!StringUtils.isEmptySunhh(baseCameraManagement.getBeginMile())) {
+            baseCameraManagement.setBeginMile(baseCameraManagement.getBeginMile()/1000);
+        }
+        if (!StringUtils.isEmptySunhh(baseCameraManagement.getEndMile())) {
+            baseCameraManagement.setEndMile(baseCameraManagement.getEndMile()/1000);
+        }
         baseCameraManagement.setLineDirStr(baseCameraManagement.getLineDir() == 1 ? "上行" : "下行");
-        baseCameraManagement.setMilesRange(begin + "-" + end);
+//        baseCameraManagement.setMilesRange(begin + "-" + end);
         baseCameraManagement.setLongitudeAndLatitude(baseCameraManagement.getInstallLongitude() + "," + baseCameraManagement.getInstallLongitude());
         return AjaxResult.success(baseCameraManagement);
     }
@@ -472,8 +481,8 @@ public class BaseCameraManagementController extends BaseController {
         }
         List<BaseCameraManagement> baseCameraManagementList = baseCameraManagementService.baseCameraManagementList(baseCameraManagementVo);
         for (BaseCameraManagement baseCameraManagement : baseCameraManagementList) {
-            SysDept sysDept = deptService.selectDeptById(baseCameraManagement.getDeptId());
-            baseCameraManagement.setDeptName(sysDept.getDeptName());
+//            SysDept sysDept = deptService.selectDeptById(baseCameraManagement.getDeptId());
+//            baseCameraManagement.setDeptName(sysDept.getDeptName());
             LambdaQueryWrapper<BaseRailwayManagement> queryWrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
             if (!ObjectUtils.isEmpty(baseCameraManagement.getRailwayCode())) {
                 queryWrapper.eq(BaseRailwayManagement::getRailwayCode, baseCameraManagement.getRailwayCode());

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

@@ -165,7 +165,9 @@ public class MsgAlarmController extends BaseController {
                     queryWrapper.eq(BaseRailwayManagement::getRailwayCode, o.getRailwayCode());
                 }
                 BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(queryWrapper);
-                o.setRailwayName(baseRailwayManagement.getRailwayName());
+                if (!StringUtils.isEmptySunhh(baseRailwayManagement) && !StringUtils.isEmptySunhh(baseRailwayManagement.getRailwayName())) {
+                    o.setRailwayName(baseRailwayManagement.getRailwayName());
+                }
                 if (StringUtils.isNotEmpty(o.getReleasedBy())) {
                     BaseUser user = baseUserService.getUser(o.getReleasedBy());
                     o.setReleasedByName(user.getNickName());
@@ -340,6 +342,7 @@ public class MsgAlarmController extends BaseController {
 
     /**
      * 视频上方显示的数据
+     *
      * @param msgAlarmVo
      * @return
      */

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

@@ -573,6 +573,7 @@ public class GeoHazardMonitorTokenController {
             vehiclePosition.setVehicleCode(baseTerminal.getVehicleCode());
             vehiclePosition.setTerminalLatitude(heartbeatVo.getLatitude());
             vehiclePosition.setTerminalLongitude(heartbeatVo.getLongitude());
+            vehiclePosition.setCreateTime(new Date());
             //机车行驶表添加数据
             boolean save = vehiclePositionService.save(vehiclePosition);
             //修改车载终端经度纬度