123

ruoyi-ui-app/locale/bo.js

@@ -1,7 +1,7 @@
 /** 藏文文案（键与 zh.js 一致） */
 export default {
   app: {
-    name: 'རུའོ་ཡི་ APP'
+    name: 'ལས་ཁུངས་གྲངས་ཀ་ཞབས་ཞུའི་འབྲེལ་ལམ།'
   },
   nav: {
     home: 'གཙོ་ངོས།',

ruoyi-ui-app/locale/zh.js

@@ -1,7 +1,7 @@
 /** 中文文案（键与 bo.js 保持一致） */
 export default {
   app: {
-    name: '巴青牧业大脑'
+    name: '行业数字服务链'
   },
   nav: {
     home: '首页',

ruoyi-ui-app/locale/zh.json

@@ -1,6 +1,6 @@
 {
   "app": {
-    "name": "巴青移动端"
+    "name": "行业数字服务链"
   },
   "nav": {
     "home": "首页",

ruoyi-ui/src/api/videoSurveillance/livestockMonitor.js

@@ -51,3 +51,20 @@ export function listLivestockMonitorOwnerOptions(query) {
     params: query
   })
 }
+
+/** 第三方同步（仅列表 upsert） */
+export function syncLivestockMonitor() {
+  return request({
+    url: "/videoSurveillance/livestockMonitor/sync",
+    method: "post"
+  })
+}
+
+/** 实时播放地址（不落库） */
+export function getLivestockMonitorPlayUrl(monitorId) {
+  return request({
+    url: "/videoSurveillance/livestockMonitor/playUrl",
+    method: "get",
+    params: { monitorId }
+  })
+}

ruoyi-ui/src/lang/bo/videoSurveillance.js

@@ -17,12 +17,16 @@ export default {
     colCreate: "བཟོ་དུས།",
     msgDelOk: "བསུབ་ལེགས།",
     msgModOk: "རྩོམ་ལེགས།",
-    msgAddOk: "གསར་ལེགས།"
+    msgAddOk: "གསར་ལེགས།",
+    syncLoading: "གཞི་གྲངས་མཉམ་སྒྲིག་བཞིན... སྒུག་རོགས།"
   },
   status: {
     dash: "—",
     ownerType1: "འཕྲོད་ལས་གཙོ་བོ།",
-    ownerType2: "ཚོང་ལས་ཁང་།"
+    ownerType2: "ཚོང་ལས་ཁང་།",
+    videoSourceWvp: "WVP",
+    videoSourceYs7: "萤石云",
+    videoSourceUrl: "直链 URL"
   },
   livestockMonitor: {
     queryMonitorName: "བརྙན་ཟློས་མིང་།",
@@ -34,33 +38,42 @@ export default {
     colInstallLocation: "སྒྲིག་གནས།",
     actionLiveView: "ད་ལྟ་བརྙན་ལྟ",
     dialogLiveView: "ད་ལྟ་བརྙན",
+    btnSync: "མཉམ་སྒྲིག",
+    syncSummary: "མཉམ་སྒྲིག་ཟིན：གསར་{insert} རྩོམ་{update} ཕམ་{fail}",
+    syncTimeHint: "མཉམ་སྒྲིག་དུས：{time}",
+    formMonitorId: "摄像头 ID",
     formMonitorName: "བརྙན་ཟློས་མིང་།",
     formOwner: "གཙོ་བོ།",
+    formEnclosureName: "圈舍",
     formInstallLocation: "སྒྲིག་གནས།",
-    formIpAddress: "IP",
+    formVideoSource: "视频来源",
+    phMonitorId: "摄像头 ID ≤32",
     phMonitorName: "མིང 1～10",
-    phOwner: "གཙོ་བོ་འདེམ",
-    phInstallLocation: "སྒྲིག་གནས 1～10",
-    phIpAddress: "192.168.1.100",
+    phOwner: "可选",
+    phEnclosureName: "圈舍 ≤64",
+    phInstallLocation: "སྒྲིག་གནས ≤10",
+    phVideoSource: "视频来源",
     dialogAdd: "[གསར]བརྙན་ཟློས",
     dialogEdit: "[རྩོམ]བརྙན་ཟློས",
     confirmDelete: "ཐོ་གཞུང་འདི་སུབ་རྒྱུ་གཏན་ཁེལ་ལམ？",
-    msgLiveNotOpen: "ད་ལྟ་བརྙན་མ་ཁ་ཕྱེ། སྒྲིག་གནས་སྔོན་དུ་གྲུབ",
-    msgLiveNoStream: "བརྙན་ཟློས་མེད（接口对接待）",
+    msgLiveNoMonitorId: "摄像头 ID མེད",
+    msgLiveNoStream: "བརྙན་ཟློས་མེད",
+    viewMonitorId: "摄像头 ID",
     viewMonitorName: "བརྙན་ཟློས་མིང་།",
     viewOwner: "གཙོ་བོ།",
+    viewEnclosureName: "圈舍",
     viewInstallLocation: "སྒྲིག་གནས།",
-    viewIpAddress: "IP",
+    viewVideoSource: "视频来源",
     viewCreateBy: "བཟོ་མཁན།",
     viewUpdateBy: "རྩོམ་མཁན།",
     viewUpdateTime: "རྩོམ་དུས།",
+    ruleMonitorIdRequired: "摄像头 ID འབྲི",
+    ruleMonitorIdLen: "ID 32 ལས་མི་འགྲོ",
     ruleMonitorNameRequired: "མིང་འབྲི",
     ruleMonitorNameLen: "1～10 ཡིག",
-    ruleOwnerRequired: "གཙོ་བོ་འདེམ",
-    ruleInstallLocationRequired: "སྒྲིག་གནས་འབྲི",
+    ruleOwnerIncomplete: "གཙོ་བོ་ཆ་ཚང་མིན",
+    ruleEnclosureNameLen: "圈舍 64 ལས་མི་འགྲོ",
     ruleInstallLocationLen: "1～10 ཡིག",
-    ruleIpRequired: "IP་འབྲི",
-    ruleIpFormat: "IP་ནོར",
-    ruleIpLen: "IP 20 ལས་མི་འགྲོ"
+    ruleVideoSourceRequired: "视频来源 འདེམ"
   }
 }

ruoyi-ui/src/lang/zh/videoSurveillance.js

@@ -17,12 +17,16 @@ export default {
     colCreate: "创建时间",
     msgDelOk: "删除成功",
     msgModOk: "修改成功",
-    msgAddOk: "新增成功"
+    msgAddOk: "新增成功",
+    syncLoading: "正在同步数据，请稍候..."
   },
   status: {
     dash: "—",
     ownerType1: "养殖主体",
-    ownerType2: "交易市场"
+    ownerType2: "交易市场",
+    videoSourceWvp: "WVP 平台",
+    videoSourceYs7: "萤石云",
+    videoSourceUrl: "直链 URL"
   },
   livestockMonitor: {
     queryMonitorName: "监控名称",
@@ -34,33 +38,42 @@ export default {
     colInstallLocation: "安装位置",
     actionLiveView: "查看实时监控",
     dialogLiveView: "实时监控",
+    btnSync: "同步",
+    syncSummary: "同步完成：新增 {insert} 条，更新 {update} 条，失败 {fail} 条",
+    syncTimeHint: "最近同步时间：{time}",
+    formMonitorId: "摄像头 ID",
     formMonitorName: "监控名称",
     formOwner: "所属主体",
+    formEnclosureName: "圈舍",
     formInstallLocation: "安装位置",
-    formIpAddress: "IP 地址",
+    formVideoSource: "视频来源",
+    phMonitorId: "请输入摄像头 ID（≤32 字符）",
     phMonitorName: "请输入监控名称（1～10字）",
-    phOwner: "输入关键字检索并选择主体",
-    phInstallLocation: "请输入安装位置（1～10字）",
-    phIpAddress: "如 192.168.1.100",
+    phOwner: "可选，输入关键字检索并选择主体",
+    phEnclosureName: "请输入圈舍名称（可选，≤64字）",
+    phInstallLocation: "请输入安装位置（可选，≤10字）",
+    phVideoSource: "请选择视频来源",
     dialogAdd: "[新增]监控点位",
     dialogEdit: "[编辑]监控点位",
     confirmDelete: "是否确认删除这条数据？",
-    msgLiveNotOpen: "实时监控功能暂未开放，请先完成监控点位登记",
-    msgLiveNoStream: "暂无直播流（监控流地址待接口对接）",
+    msgLiveNoMonitorId: "该监控点位缺少摄像头 ID，无法获取播放地址",
+    msgLiveNoStream: "暂无直播流",
+    viewMonitorId: "摄像头 ID",
     viewMonitorName: "监控名称",
     viewOwner: "所属主体",
+    viewEnclosureName: "圈舍",
     viewInstallLocation: "安装位置",
-    viewIpAddress: "IP 地址",
+    viewVideoSource: "视频来源",
     viewCreateBy: "创建人",
     viewUpdateBy: "修改人",
     viewUpdateTime: "修改时间",
+    ruleMonitorIdRequired: "请填写摄像头 ID",
+    ruleMonitorIdLen: "摄像头 ID 不能超过 32 个字符",
     ruleMonitorNameRequired: "请填写监控名称",
     ruleMonitorNameLen: "监控名称长度为 1～10 个字符",
-    ruleOwnerRequired: "请选择所属主体",
-    ruleInstallLocationRequired: "请填写安装位置",
-    ruleInstallLocationLen: "安装位置长度为 1～10 个字符",
-    ruleIpRequired: "请填写 IP 地址",
-    ruleIpFormat: "请输入正确的 IP 地址",
-    ruleIpLen: "IP 地址不能超过 20 个字符"
+    ruleOwnerIncomplete: "所属主体信息不完整，请重新选择或清空",
+    ruleEnclosureNameLen: "圈舍名称不能超过 64 个字符",
+    ruleInstallLocationLen: "安装位置长度不能超过 10 个字符",
+    ruleVideoSourceRequired: "请选择视频来源"
   }
 }

ruoyi-ui/src/mixins/videoSurveillanceLocaleMixin.js

@@ -21,6 +21,22 @@ export default {
         return "warning"
       }
       return "info"
+    },
+    /** 第三方数据同步，带全局 loading */
+    runSyncWithLoading(syncFn) {
+      if (this.syncing) {
+        return Promise.reject(new Error("syncing"))
+      }
+      let modalLoading = false
+      this.syncing = true
+      this.$modal.loading(this.vsCommon("syncLoading"))
+      modalLoading = true
+      return syncFn().finally(() => {
+        this.syncing = false
+        if (modalLoading) {
+          this.$modal.closeLoading()
+        }
+      })
     }
   }
 }

ruoyi-ui/src/views/videoSurveillance/livestockMonitor/index.vue

@@ -37,6 +37,16 @@
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{ vsCommon("search") }}</el-button>
           <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ vsCommon("reset") }}</el-button>
+          <el-button
+            v-hasPermi="['videoSurveillance:livestockMonitor:sync']"
+            type="warning"
+            plain
+            icon="el-icon-refresh"
+            size="mini"
+            :loading="syncing"
+            @click="handleSync"
+          >{{ vsT("btnSync") }}</el-button>
+          <!-- 新增（暂隐藏）
           <el-button
             v-hasPermi="['videoSurveillance:livestockMonitor:add']"
             type="primary"
@@ -45,8 +55,10 @@
             size="mini"
             @click="handleAdd"
           >{{ vsCommon("add") }}</el-button>
+          -->
         </el-form-item>
       </el-form>
+      <div v-if="lastSyncHint" class="livestock-monitor__sync-hint">{{ lastSyncHint }}</div>
     </el-card>
 
     <br />
@@ -63,15 +75,21 @@
           </template>
         </el-table-column>
         <el-table-column :label="vsT('colInstallLocation')" prop="installLocation" align="center" min-width="120" :show-overflow-tooltip="true" />
-        <el-table-column :label="vsCommon('colOp')" align="center" class-name="small-padding fixed-width" width="300" fixed="right">
+        <el-table-column :label="vsCommon('colOp')" align="center" class-name="small-padding fixed-width" width="180" fixed="right">
           <template slot-scope="scope">
-            <el-button type="text" size="mini" @click="handleLiveView(scope.row)">{{ vsT("actionLiveView") }}</el-button>
+            <el-button
+              v-hasPermi="['videoSurveillance:livestockMonitor:query']"
+              type="text"
+              size="mini"
+              @click="handleLiveView(scope.row)"
+            >{{ vsT("actionLiveView") }}</el-button>
             <el-button
               v-hasPermi="['videoSurveillance:livestockMonitor:query']"
               type="text"
               size="mini"
               @click="handleView(scope.row)"
             >{{ vsCommon("view") }}</el-button>
+            <!-- 编辑、删除（暂隐藏）
             <el-button
               v-hasPermi="['videoSurveillance:livestockMonitor:edit']"
               type="text"
@@ -84,6 +102,7 @@
               size="mini"
               @click="handleDelete(scope.row)"
             >{{ vsCommon("delete") }}</el-button>
+            -->
           </template>
         </el-table-column>
       </el-table>
@@ -96,8 +115,13 @@
       />
     </el-card>
 
-    <el-dialog :title="dialogTitle" :visible.sync="open" width="560px" append-to-body @close="cancel">
+    <!-- 新增/编辑弹窗（暂隐藏）
+    <el-dialog :title="dialogTitle" :visible.sync="open" width="620px" append-to-body @close="cancel">
       <el-form :key="formKey" ref="form" :model="form" label-width="110px">
+        <el-form-item prop="monitorId" :rules="formRules.monitorId">
+          <template slot="label">{{ vsT("formMonitorId") }}</template>
+          <el-input v-model="form.monitorId" :placeholder="vsT('phMonitorId')" maxlength="32" show-word-limit />
+        </el-form-item>
         <el-form-item prop="monitorName" :rules="formRules.monitorName">
           <template slot="label">{{ vsT("formMonitorName") }}</template>
           <el-input v-model="form.monitorName" :placeholder="vsT('phMonitorName')" maxlength="10" show-word-limit />
@@ -109,6 +133,7 @@
             filterable
             remote
             reserve-keyword
+            clearable
             :placeholder="vsT('phOwner')"
             :remote-method="searchOwner"
             :loading="ownerLoading"
@@ -123,13 +148,24 @@
             />
           </el-select>
         </el-form-item>
+        <el-form-item prop="enclosureName" :rules="formRules.enclosureName">
+          <template slot="label">{{ vsT("formEnclosureName") }}</template>
+          <el-input v-model="form.enclosureName" :placeholder="vsT('phEnclosureName')" maxlength="64" show-word-limit />
+        </el-form-item>
         <el-form-item prop="installLocation" :rules="formRules.installLocation">
           <template slot="label">{{ vsT("formInstallLocation") }}</template>
           <el-input v-model="form.installLocation" :placeholder="vsT('phInstallLocation')" maxlength="10" show-word-limit />
         </el-form-item>
-        <el-form-item prop="ipAddress" :rules="formRules.ipAddress">
-          <template slot="label">{{ vsT("formIpAddress") }}</template>
-          <el-input v-model="form.ipAddress" :placeholder="vsT('phIpAddress')" maxlength="20" />
+        <el-form-item prop="videoSource" :rules="formRules.videoSource">
+          <template slot="label">{{ vsT("formVideoSource") }}</template>
+          <el-select v-model="form.videoSource" :placeholder="vsT('phVideoSource')" style="width: 100%">
+            <el-option
+              v-for="item in videoSourceOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -137,9 +173,13 @@
         <el-button @click="cancel">{{ vsCommon("cancel") }}</el-button>
       </div>
     </el-dialog>
+    -->
 
-    <el-dialog :title="vsCommon('viewTitle')" :visible.sync="viewOpen" width="560px" append-to-body>
+    <el-dialog :title="vsCommon('viewTitle')" :visible.sync="viewOpen" width="620px" append-to-body>
       <el-form label-width="110px" size="small">
+        <el-form-item :label="vsT('viewMonitorId')">
+          <span>{{ viewRow.monitorId || dash }}</span>
+        </el-form-item>
         <el-form-item :label="vsT('viewMonitorName')">
           <span>{{ viewRow.monitorName || dash }}</span>
         </el-form-item>
@@ -149,11 +189,14 @@
           </el-tag>
           <span>{{ viewRow.ownerName || dash }}</span>
         </el-form-item>
+        <el-form-item :label="vsT('viewEnclosureName')">
+          <span>{{ viewRow.enclosureName || dash }}</span>
+        </el-form-item>
         <el-form-item :label="vsT('viewInstallLocation')">
           <span>{{ viewRow.installLocation || dash }}</span>
         </el-form-item>
-        <el-form-item :label="vsT('viewIpAddress')">
-          <span>{{ viewRow.ipAddress || dash }}</span>
+        <el-form-item :label="vsT('viewVideoSource')">
+          <span>{{ viewRow.videoSourceName || videoSourceLabel(viewRow.videoSource) }}</span>
         </el-form-item>
         <el-form-item :label="vsCommon('colCreate')">
           <span>{{ viewRow.createTime ? parseTime(viewRow.createTime) : dash }}</span>
@@ -169,11 +212,13 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
+        <!-- 编辑（暂隐藏）
         <el-button
           v-hasPermi="['videoSurveillance:livestockMonitor:edit']"
           type="primary"
           @click="handleEditFromView"
         >{{ vsCommon("edit") }}</el-button>
+        -->
         <el-button @click="viewOpen = false">{{ vsCommon("close") }}</el-button>
       </div>
     </el-dialog>
@@ -186,7 +231,7 @@
       destroy-on-close
       @close="closeLiveView"
     >
-      <div class="live-player-wrap">
+      <div v-loading="liveLoading" class="live-player-wrap">
         <LivePlayer
           :video-url="liveVideoUrl"
           :video-title="liveVideoTitle"
@@ -216,18 +261,22 @@ import {
   addLivestockMonitor,
   updateLivestockMonitor,
   delLivestockMonitor,
-  listLivestockMonitorOwnerOptions
+  listLivestockMonitorOwnerOptions,
+  syncLivestockMonitor,
+  getLivestockMonitorPlayUrl
 } from "@/api/videoSurveillance/livestockMonitor"
 
-const IPV4_REG = /^((25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(25[0-5]|2[0-4]\d|[01]?\d\d?)$/
+const VIDEO_SOURCE_VALUES = ["wvp", "ys7", "url"]
 
 function createEmptyForm() {
   return {
     id: undefined,
+    monitorId: undefined,
     monitorName: undefined,
     ownerSelectKey: undefined,
+    enclosureName: undefined,
     installLocation: undefined,
-    ipAddress: undefined
+    videoSource: undefined
   }
 }
 
@@ -241,6 +290,8 @@ export default {
     return {
       vsNs: "livestockMonitor",
       loading: false,
+      syncing: false,
+      liveLoading: false,
       open: false,
       viewOpen: false,
       liveOpen: false,
@@ -256,6 +307,7 @@ export default {
       ownerLoading: false,
       ownerSearchTimer: null,
       queryOwnerKey: undefined,
+      lastSyncHint: "",
       queryParams: {
         pageNum: 1,
         pageSize: 20,
@@ -277,23 +329,26 @@ export default {
       const name = this.liveRow.monitorName || this.liveVideoTitle
       return name ? `${this.vsT("dialogLiveView")} - ${name}` : this.vsT("dialogLiveView")
     },
+    videoSourceOptions() {
+      return VIDEO_SOURCE_VALUES.map((value) => ({
+        value,
+        label: this.videoSourceLabel(value)
+      }))
+    },
     formRules() {
       return {
+        monitorId: [
+          { required: true, message: this.vsT("ruleMonitorIdRequired"), trigger: "blur" },
+          { validator: this.validateMonitorId, trigger: "blur" }
+        ],
         monitorName: [
           { required: true, message: this.vsT("ruleMonitorNameRequired"), trigger: "blur" },
           { validator: this.validateMonitorName, trigger: "blur" }
         ],
-        ownerSelectKey: [
-          { required: true, message: this.vsT("ruleOwnerRequired"), trigger: "change" }
-        ],
-        installLocation: [
-          { required: true, message: this.vsT("ruleInstallLocationRequired"), trigger: "blur" },
-          { validator: this.validateInstallLocation, trigger: "blur" }
-        ],
-        ipAddress: [
-          { required: true, message: this.vsT("ruleIpRequired"), trigger: "blur" },
-          { validator: this.validateIpAddress, trigger: "blur" }
-        ]
+        ownerSelectKey: [{ validator: this.validateOwnerSelect, trigger: "change" }],
+        enclosureName: [{ validator: this.validateEnclosureName, trigger: "blur" }],
+        installLocation: [{ validator: this.validateInstallLocation, trigger: "blur" }],
+        videoSource: [{ required: true, message: this.vsT("ruleVideoSourceRequired"), trigger: "change" }]
       }
     }
   },
@@ -306,6 +361,18 @@ export default {
     }
   },
   methods: {
+    videoSourceLabel(value) {
+      if (value === "wvp") {
+        return this.$t("videoSurveillance.status.videoSourceWvp")
+      }
+      if (value === "ys7") {
+        return this.$t("videoSurveillance.status.videoSourceYs7")
+      }
+      if (value === "url") {
+        return this.$t("videoSurveillance.status.videoSourceUrl")
+      }
+      return value || this.dash
+    },
     ownerTypeName(ownerType) {
       if (ownerType === 1) {
         return this.$t("videoSurveillance.status.ownerType1")
@@ -369,42 +436,59 @@ export default {
           })
       }, 300)
     },
-    validateMonitorName(rule, value, callback) {
+    validateMonitorId(rule, value, callback) {
       const text = value != null ? String(value).trim() : ""
       if (!text) {
-        callback(new Error(this.vsT("ruleMonitorNameRequired")))
+        callback(new Error(this.vsT("ruleMonitorIdRequired")))
         return
       }
-      if (text.length > 10) {
-        callback(new Error(this.vsT("ruleMonitorNameLen")))
+      if (text.length > 32) {
+        callback(new Error(this.vsT("ruleMonitorIdLen")))
         return
       }
       callback()
     },
-    validateInstallLocation(rule, value, callback) {
+    validateMonitorName(rule, value, callback) {
       const text = value != null ? String(value).trim() : ""
       if (!text) {
-        callback(new Error(this.vsT("ruleInstallLocationRequired")))
+        callback(new Error(this.vsT("ruleMonitorNameRequired")))
         return
       }
       if (text.length > 10) {
-        callback(new Error(this.vsT("ruleInstallLocationLen")))
+        callback(new Error(this.vsT("ruleMonitorNameLen")))
         return
       }
       callback()
     },
-    validateIpAddress(rule, value, callback) {
-      const text = value != null ? String(value).trim() : ""
-      if (!text) {
-        callback(new Error(this.vsT("ruleIpRequired")))
+    validateOwnerSelect(rule, value, callback) {
+      if (!value) {
+        callback()
         return
       }
-      if (text.length > 20) {
-        callback(new Error(this.vsT("ruleIpLen")))
+      const parsed = this.parseOwnerKey(value)
+      if (
+        parsed.ownerType == null ||
+        isNaN(parsed.ownerType) ||
+        parsed.ownerId == null ||
+        isNaN(parsed.ownerId)
+      ) {
+        callback(new Error(this.vsT("ruleOwnerIncomplete")))
         return
       }
-      if (!IPV4_REG.test(text)) {
-        callback(new Error(this.vsT("ruleIpFormat")))
+      callback()
+    },
+    validateEnclosureName(rule, value, callback) {
+      const text = value != null ? String(value).trim() : ""
+      if (text.length > 64) {
+        callback(new Error(this.vsT("ruleEnclosureNameLen")))
+        return
+      }
+      callback()
+    },
+    validateInstallLocation(rule, value, callback) {
+      const text = value != null ? String(value).trim() : ""
+      if (text.length > 10) {
+        callback(new Error(this.vsT("ruleInstallLocationLen")))
         return
       }
       callback()
@@ -427,13 +511,24 @@ export default {
     },
     buildPayload() {
       const parsed = this.parseOwnerKey(this.form.ownerSelectKey)
-      return {
+      const payload = {
+        monitorId: String(this.form.monitorId).trim(),
         monitorName: String(this.form.monitorName).trim(),
-        ownerType: parsed.ownerType,
-        ownerId: parsed.ownerId,
-        installLocation: String(this.form.installLocation).trim(),
-        ipAddress: String(this.form.ipAddress).trim()
+        videoSource: this.form.videoSource
+      }
+      if (parsed.ownerType != null && !isNaN(parsed.ownerType) && parsed.ownerId != null && !isNaN(parsed.ownerId)) {
+        payload.ownerType = parsed.ownerType
+        payload.ownerId = parsed.ownerId
+      }
+      const enclosureName = this.form.enclosureName != null ? String(this.form.enclosureName).trim() : ""
+      if (enclosureName) {
+        payload.enclosureName = enclosureName
       }
+      const installLocation = this.form.installLocation != null ? String(this.form.installLocation).trim() : ""
+      if (installLocation) {
+        payload.installLocation = installLocation
+      }
+      return payload
     },
     resetFormModel() {
       this.form = createEmptyForm()
@@ -444,10 +539,12 @@ export default {
       this.ensureOwnerOptionInList(data.ownerType, data.ownerId, data.ownerName, data.ownerTypeName)
       this.form = Object.assign(createEmptyForm(), {
         id: data.id,
+        monitorId: data.monitorId,
         monitorName: data.monitorName,
         ownerSelectKey,
+        enclosureName: data.enclosureName,
         installLocation: data.installLocation,
-        ipAddress: data.ipAddress
+        videoSource: data.videoSource
       })
     },
     getList() {
@@ -511,29 +608,56 @@ export default {
       })
     },
     handleLiveView(row) {
-      if (!row || row.id == null) {
+      if (!row || !row.monitorId) {
+        this.$modal.msgWarning(this.vsT("msgLiveNoMonitorId"))
         return
       }
-      getLivestockMonitor(row.id).then((res) => {
-        const data = res.data || row
-        this.liveRow = data
-        this.liveVideoTitle = data.monitorName || ""
-        this.liveVideoUrl = this.resolveLiveVideoUrl(data)
-        this.liveOpen = true
-      })
+      this.liveRow = row
+      this.liveVideoTitle = row.monitorName || ""
+      this.liveVideoUrl = ""
+      this.liveOpen = true
+      this.liveLoading = true
+      getLivestockMonitorPlayUrl(row.monitorId)
+        .then((res) => {
+          const data = res.data || {}
+          this.liveVideoUrl = data.videoUrl ? String(data.videoUrl).trim() : ""
+          if (data.monitorName) {
+            this.liveVideoTitle = data.monitorName
+            this.liveRow = Object.assign({}, row, { monitorName: data.monitorName })
+          }
+        })
+        .catch(() => {})
+        .finally(() => {
+          this.liveLoading = false
+        })
     },
     closeLiveView() {
       this.liveVideoUrl = ""
       this.liveVideoTitle = ""
       this.liveRow = {}
       this.liveOpen = false
+      this.liveLoading = false
     },
-    resolveLiveVideoUrl(row) {
-      if (!row) {
-        return ""
-      }
-      const url = row.liveStreamUrl || row.streamUrl || row.videoUrl
-      return url ? String(url).trim() : ""
+    handleSync() {
+      this.runSyncWithLoading(() => syncLivestockMonitor())
+        .then((res) => {
+          const data = res.data || {}
+          this.$modal.msgSuccess(
+            this.vsT("syncSummary", {
+              insert: data.insertCount != null ? data.insertCount : 0,
+              update: data.updateCount != null ? data.updateCount : 0,
+              fail: data.failCount != null ? data.failCount : 0
+            })
+          )
+          if (data.failCount > 0 && data.failMessages && data.failMessages.length) {
+            this.$modal.msgWarning(data.failMessages.join("；"))
+          }
+          if (data.syncTime) {
+            this.lastSyncHint = this.vsT("syncTimeHint", { time: this.parseTime(data.syncTime) })
+          }
+          this.getList()
+        })
+        .catch(() => {})
     },
     handleDelete(row) {
       this.$modal
@@ -582,6 +706,12 @@ export default {
   vertical-align: middle;
 }
 
+.livestock-monitor__sync-hint {
+  margin-top: 8px;
+  font-size: 12px;
+  color: #909399;
+}
+
 .live-player-wrap {
   position: relative;
   width: 100%;