Merge remote-tracking branch 'origin/master'

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

@@ -80,7 +80,7 @@ import java.util.stream.Collectors;
 @RequestMapping("/service/baseCameraManagement")
 @Slf4j
 public class BaseCameraManagementController extends BaseController {
-    public static final String PATTERN = "^K([0-9]+)\\+([0-9]+)$";
+    public static final String PATTERN = "^K([0-9]+)\\+([0-9]{3})$";
     @Resource
     BaseCameraManagementService baseCameraManagementService;
     @Resource
@@ -416,6 +416,7 @@ public class BaseCameraManagementController extends BaseController {
         SimpleDateFormat dateFormat1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String format1 = dateFormat1.format(new Date());
         list.add(format1);
+        list.add(msgAlarm.getLineDir());
         return AjaxResult.success(list);
     }