机车挂载 bug

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

@@ -25,12 +25,6 @@ public class BaseVehicle implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 挂载终端名称
-     */
-    @TableField(exist = false)
-    private String terminalName;
-
     /**
      * 主键ID
      */
@@ -71,8 +65,16 @@ 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/service/impl/BaseVehicleServiceImpl.java

@@ -60,6 +60,7 @@ 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)
@@ -207,6 +208,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

@@ -373,14 +373,14 @@ 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);
         baseCameraManagement.setLineDirStr(baseCameraManagement.getLineDir() == 1 ? "上行" : "下行");
-        baseCameraManagement.setMilesRange(begin + "-" + end);
+//        baseCameraManagement.setMilesRange(begin + "-" + end);
         baseCameraManagement.setLongitudeAndLatitude(baseCameraManagement.getInstallLongitude() + "," + baseCameraManagement.getInstallLongitude());
         return AjaxResult.success(baseCameraManagement);
     }

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
      */