线路增加起止里程

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

@@ -141,4 +141,8 @@ public class MsgAlarmResp implements Serializable {
     private String sourceName;
 
     private String alarmAttrName;
+    
+    private String onlineName;
+    
+    private String enableOrNotName;
 }

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

@@ -25,7 +25,7 @@ import java.util.List;
  */
 @Service
 public class BaseRailwayManagementServiceImpl extends ServiceImpl<BaseRailwayManagementMapper, BaseRailwayManagement> implements BaseRailwayManagementService {
-
+    public static final String PATTERN = "^[0-9]*$";
     @Resource
     BaseRailwayManagementMapper baseRailwayManagementMapper;
     @Autowired
@@ -62,12 +62,17 @@ public class BaseRailwayManagementServiceImpl extends ServiceImpl<BaseRailwayMan
                     }
                     BaseRailwayManagement baseLineManagement = baseRailwayManagementMapper.selectOne(lw);
                     if (ObjectUtils.isEmpty(baseLineManagement)) {
-                        BeanValidators.validateWithException(validator, railwayManagement);
-                        railwayManagement.setUpdateBy(userId);
-                        railwayManagement.setCreateBy(userId);
-                        baseRailwayManagementMapper.insert(railwayManagement);
-                        successNum++;
-                        successMsg.append(successNum + "、线路编码 " + railwayManagement.getRailwayCode() + " 导入成功");
+                        if (!railwayManagement.getInitialMileage().toString().matches(PATTERN) || !railwayManagement.getEndMileage().toString().matches(PATTERN)) {
+                            failureNum++;
+                            failureMsg.append(failureNum + "、线路编码: " + railwayManagement.getRailwayCode() + "的数据,里程位置填写格式不正确,请填写数字");
+                        }else {
+                            BeanValidators.validateWithException(validator, railwayManagement);
+                            railwayManagement.setUpdateBy(userId);
+                            railwayManagement.setCreateBy(userId);
+                            baseRailwayManagementMapper.insert(railwayManagement);
+                            successNum++;
+                            successMsg.append(successNum + "、线路编码 " + railwayManagement.getRailwayCode() + " 导入成功");
+                        }
                     } else if (updateSupport) {
                         BeanValidators.validateWithException(validator, railwayManagement);
                         railwayManagement.setUpdateBy(userId);

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

@@ -966,6 +966,12 @@ public class BaseCameraManagementController extends BaseController {
             msgAlarmResp.setLineDir(baseCameraManagement.getLineDir());
             SysDept sysDept = deptService.selectDeptById(baseCameraManagement.getDeptId());
             msgAlarmResp.setDeptName(sysDept.getDeptName());
+            if (!ObjectUtils.isEmpty(baseCameraManagement.getOnline())) {
+                msgAlarmResp.setOnlineName(baseCameraManagement.getOnline() == 2 ? "在线" : "离线");
+            }
+            if (!ObjectUtils.isEmpty(baseCameraManagement.getEnableOrNot())) {
+                msgAlarmResp.setEnableOrNotName(baseCameraManagement.getEnableOrNot() == 1 ? "启用" : "弃用");
+            }
             return AjaxResult.success(msgAlarmResp);
         } else {
             return error("该相机编码在相机台账表中不存在");