机车编码改为机车号

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;
 

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

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/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/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/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,7 +148,7 @@ 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());
@@ -163,7 +163,7 @@ public class BaseVehicleServiceImpl extends ServiceImpl<BaseVehicleMapper, BaseV
                     baseVehicle.setUpdateTime(date);
                     int insert = baseVehicleMapper.insert(baseVehicle);
                     successNum++;
-                    successMsg.append(successNum + "、机车编码 " + baseVehicle.getVehicleCode() + " 导入成功");
+                    successMsg.append(successNum + "、机车号 " + baseVehicle.getVehicleCode() + " 导入成功");
                 } else if (updateSupport) {
                     BeanValidators.validateWithException(validator, baseVehicle);
                     LambdaQueryWrapper<BaseVehicle> lambdaQueryWrapper = new LambdaQueryWrapper<BaseVehicle>();
@@ -177,10 +177,10 @@ public class BaseVehicleServiceImpl extends ServiceImpl<BaseVehicleMapper, BaseV
                         baseVehicle.setId(baseVehicle4.getId());
                         baseVehicleMapper.updateById(baseVehicle);
                         successNum++;
-                        successMsg.append(successNum + "、机车编码 " + baseVehicle.getVehicleCode() + " 更新成功");
+                        successMsg.append(successNum + "、机车号 " + baseVehicle.getVehicleCode() + " 更新成功");
                     } else {
                         failureNum++;
-                        failureMsg.append(failureNum + "、机车编码 " + baseVehicle.getVehicleCode() + "不存在");
+                        failureMsg.append(failureNum + "、机车号 " + baseVehicle.getVehicleCode() + "不存在");
                     }
                 }
             } catch (Exception e) {
@@ -189,7 +189,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);

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/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);
 //            //获取在线用户