feat: sync-camera-result-modal

src/apis/model/biz/entity/index.ts

@@ -15,4 +15,5 @@ export * from './alarm';
 export * from './log';
 export * from './other';
 export * from './storage';
+export * from './upper-ndm';
 export * from './video';

src/apis/model/biz/entity/upper-ndm/index.ts

@@ -0,0 +1,2 @@
+export * from './sync-camera-result';
+export * from './sync-camera-result-detail';

src/apis/model/biz/entity/upper-ndm/sync-camera-result-detail.ts

@@ -0,0 +1,6 @@
+export interface SyncCameraResultDetail {
+  name: string;
+  deviceId: string;
+  ipAddress: string;
+  gbCode: string;
+}

src/apis/model/biz/entity/upper-ndm/sync-camera-result.ts

@@ -0,0 +1,10 @@
+import type { SyncCameraResultDetail } from './sync-camera-result-detail';
+
+export interface SyncCameraResult {
+  stationCode: string;
+  startTime: string;
+  endTime: string;
+  insertList: SyncCameraResultDetail[];
+  updateList: SyncCameraResultDetail[];
+  deleteList: SyncCameraResultDetail[];
+}

src/components/station-page/device-export-modal.vue

@@ -1,13 +1,17 @@
 <script setup lang="ts">
-import { exportIcmpApi } from '@/apis';
+import { exportIcmpApi, type Station } from '@/apis';
 import { DeviceType } from '@/enums';
-import { useDeviceStore, useStationStore } from '@/stores';
+import { useDeviceStore } from '@/stores';
 import { downloadByData } from '@/utils';
 import { useMutation } from '@tanstack/vue-query';
 import dayjs from 'dayjs';
 import { NButton, NFlex, NGrid, NGridItem, NModal, NRadio, NRadioGroup, NStatistic } from 'naive-ui';
 import { storeToRefs } from 'pinia';
-import { computed, ref } from 'vue';
+import { computed, ref, toRefs } from 'vue';
+
+const props = defineProps<{
+  stationList: Station[];
+}>();
 
 const show = defineModel<boolean>('show', { default: false });
 
@@ -15,11 +19,11 @@ const emit = defineEmits<{
   'after-leave': [];
 }>();
 
-const stationStore = useStationStore();
-const { stationList } = storeToRefs(stationStore);
 const deviceStore = useDeviceStore();
 const { lineDevices } = storeToRefs(deviceStore);
 
+const { stationList } = toRefs(props);
+
 const status = ref('');
 
 const onAfterLeave = () => {

src/components/station-page/index.ts

@@ -4,3 +4,4 @@ export { default as DeviceParamsConfigModal } from './device-params-config-modal
 export { default as OfflineDeviceDetailModal } from './offline-device-detail-modal.vue';
 export { default as RecordCheckExportModal } from './record-check-export-modal.vue';
 export { default as StationCard } from './station-card.vue';
+export { default as SyncCameraResultModal } from './sync-camera-result-modal.vue';

src/components/station-page/sync-camera-result-modal.vue

@@ -0,0 +1,88 @@
+<script setup lang="ts">
+import { watchDebounced } from '@vueuse/core';
+import { NFlex, NIcon, NList, NListItem, NModal, NScrollbar, NStatistic, NText, NThing } from 'naive-ui';
+import { computed, ref, toRefs } from 'vue';
+import { useStationStore } from '@/stores';
+import { storeToRefs } from 'pinia';
+import type { Station, SyncCameraResult } from '@/apis';
+import { DeleteFilled, EditFilled, PlusCircleFilled } from '@vicons/antd';
+
+const props = defineProps<{
+  syncCameraResult: Record<Station['code'], SyncCameraResult>;
+}>();
+
+const emit = defineEmits<{
+  'after-leave': [];
+}>();
+
+const stationStore = useStationStore();
+const { stationList } = storeToRefs(stationStore);
+
+const { syncCameraResult } = toRefs(props);
+
+const show = ref(false);
+
+watchDebounced(
+  [syncCameraResult],
+  ([result]) => {
+    show.value = Object.keys(result).length > 0;
+  },
+  {
+    debounce: 500,
+    deep: true,
+  },
+);
+
+const onAfterLeave = () => {
+  emit('after-leave');
+};
+
+const syncList = computed(() => {
+  return Object.values(syncCameraResult.value).map((sync) => {
+    const { stationCode, startTime, endTime, insertList, updateList, deleteList } = sync;
+    const stationName = stationList.value.find((station) => station.code === stationCode)?.name;
+    return { stationName, startTime, endTime, insertList, updateList, deleteList };
+  });
+});
+</script>
+
+<template>
+  <NModal v-model:show="show" preset="card" title="摄像机同步结果" style="width: 600px" @after-leave="onAfterLeave">
+    <NScrollbar style="max-height: 400px">
+      <NList hoverable clickable>
+        <NListItem v-for="{ stationName, endTime, insertList, updateList, deleteList } in syncList" :key="stationName">
+          <NThing title-independent>
+            <template #header>
+              <NText strong>{{ stationName }}</NText>
+            </template>
+            <template #header-extra>
+              <NText depth="3"> {{ endTime }} 完成 </NText>
+            </template>
+            <NFlex justify="space-around" :size="24" style="margin-top: 8px">
+              <NStatistic label="新增">
+                <template #prefix>
+                  <NIcon :component="PlusCircleFilled" />
+                </template>
+                {{ insertList.length }}
+              </NStatistic>
+              <NStatistic label="更新">
+                <template #prefix>
+                  <NIcon :component="EditFilled" />
+                </template>
+                {{ updateList.length }}
+              </NStatistic>
+              <NStatistic label="删除">
+                <template #prefix>
+                  <NIcon :component="DeleteFilled" />
+                </template>
+                {{ deleteList.length }}
+              </NStatistic>
+            </NFlex>
+          </NThing>
+        </NListItem>
+      </NList>
+    </NScrollbar>
+  </NModal>
+</template>
+
+<style scoped lang="scss"></style>

src/composables/stomp/index.ts

@@ -1,5 +1,5 @@
-import type { NdmDeviceAlarmLogResultVO } from '@/apis';
+import type { NdmDeviceAlarmLogResultVO, Station, SyncCameraResult } from '@/apis';
-import { TOPIC_DEVICE_ALARM } from '@/constants';
+import { TOPIC_DEVICE_ALARM, SYNC_CAMERA_STATUS_TOPIC } from '@/constants';
 import { useAlarmStore } from '@/stores';
 import { Client } from '@stomp/stompjs';
 import { destr } from 'destr';
@@ -19,6 +19,8 @@ export const useStompClient = () => {
   const { unreadAlarmCount } = storeToRefs(alarmStore);
   const stompClient = ref<Client | null>(null);
 
+  const syncCameraResult = ref<Record<Station['code'], SyncCameraResult>>({});
+
   onMounted(() => {
     stompClient.value = new Client({
       brokerURL: getBrokerUrl(),
@@ -33,10 +35,15 @@ export const useStompClient = () => {
             unreadAlarmCount.value++;
           }
         });
+        stompClient.value?.subscribe(SYNC_CAMERA_STATUS_TOPIC, (message) => {
+          const { stationCode, startTime, endTime, insertList, updateList, deleteList } = destr<SyncCameraResult>(message.body);
+          syncCameraResult.value[stationCode] = { stationCode, startTime, endTime, insertList, updateList, deleteList };
+        });
       },
       onDisconnect: () => {
         console.log('Stomp连接断开');
         stompClient.value?.unsubscribe(TOPIC_DEVICE_ALARM);
+        stompClient.value?.unsubscribe(SYNC_CAMERA_STATUS_TOPIC);
       },
       onStompError: (frame) => {
         console.log('Stomp错误', frame);
@@ -57,5 +64,10 @@ export const useStompClient = () => {
 
   return {
     stompClient,
+
+    syncCameraResult,
+    afterCheckSyncCamera: () => {
+      syncCameraResult.value = {};
+    },
   };
 };

src/constants/stomp.ts

@@ -1 +1,3 @@
 export const TOPIC_DEVICE_ALARM = '/topic/deviceAlarm';
+
+export const SYNC_CAMERA_STATUS_TOPIC = '/topic/syncCameraStatus';

src/layouts/app-layout.vue

@@ -5,7 +5,7 @@ function renderIcon(icon: Component): () => VNode {
 </script>
 
 <script setup lang="ts">
-import { SettingsDrawer } from '@/components';
+import { SettingsDrawer, SyncCameraResultModal } from '@/components';
 import { useStompClient } from '@/composables';
 import { useLineStationsQuery } from '@/composables';
 import { LINE_STATIONS_QUERY_KEY, LINE_DEVICES_QUERY_KEY, LINE_ALARMS_QUERY_KEY } from '@/constants';
@@ -29,7 +29,7 @@ import { storeToRefs } from 'pinia';
 import { computed, h, onBeforeMount, ref, watch, type Component, type VNode } from 'vue';
 import { RouterLink, useRoute, useRouter } from 'vue-router';
 
-useStompClient();
+const { syncCameraResult, afterCheckSyncCamera } = useStompClient();
 
 const userStore = useUserStore();
 const { userInfo } = storeToRefs(userStore);
@@ -205,7 +205,10 @@ const openSettingsDrawer = () => {
       </NLayout>
     </NLayout>
   </NScrollbar>
+
   <SettingsDrawer v-model:show="settingsDrawerShow" />
+
+  <SyncCameraResultModal :sync-camera-result="syncCameraResult" @after-leave="afterCheckSyncCamera" />
 </template>
 
 <style scoped lang="scss">

src/pages/station-page.vue

@@ -3,7 +3,6 @@ import { syncCameraApi, syncNvrChannelsApi, type Station } from '@/apis';
 import { DeviceAlarmDetailModal, DeviceExportModal, DeviceParamsConfigModal, OfflineDeviceDetailModal, RecordCheckExportModal, StationCard } from '@/components';
 import { useLineAlarmsQuery, useLineDevicesQuery } from '@/composables';
 import { useAlarmStore, useDeviceStore, usePollingStore, useSettingStore, useStationStore } from '@/stores';
-import { sleep } from '@/utils';
 import { useMutation } from '@tanstack/vue-query';
 import { NGrid, NGi, NScrollbar, NFlex, NButtonGroup, NButton, NCheckbox } from 'naive-ui';
 import { storeToRefs } from 'pinia';
@@ -38,9 +37,9 @@ const selectedAction = ref<Action>(null);
 const showOperation = ref(false);
 const stationSelectable = ref(false);
 const stationSelection = ref<Record<Station['code'], boolean>>({});
-// TODO: 后期导出设备也会支持选择车站，而不是目前的Modal交互
 const showIcmpExportModal = ref(false);
 const showRecordCheckExportModal = ref(false);
+
 const onToggleSelectAll = (checked: boolean) => {
   if (!checked) {
     stationSelection.value = {};
@@ -48,23 +47,23 @@ const onToggleSelectAll = (checked: boolean) => {
     stationSelection.value = Object.fromEntries(stationList.value.map((station) => [station.code, true]));
   }
 };
+
 const onAction = (action: Action) => {
   selectedAction.value = action;
-  if (action === 'export-icmp') {
+  if (action === null) return;
-    showIcmpExportModal.value = true;
+  showOperation.value = true;
-  } else if (action === 'export-record') {
+  stationSelectable.value = true;
-    showOperation.value = true;
-    stationSelectable.value = true;
-  } else if (action === 'sync-camera') {
-    showOperation.value = true;
-    stationSelectable.value = true;
-  } else if (action === 'sync-nvr') {
-    showOperation.value = true;
-    stationSelectable.value = true;
-  } else {
-    return;
-  }
 };
+
+const onCancel = () => {
+  selectedAction.value = null;
+  showOperation.value = false;
+  stationSelectable.value = false;
+  stationSelection.value = {};
+};
+
+const onFinish = onCancel;
+
 const { mutate: syncCamera, isPending: cameraSyncing } = useMutation({
   mutationFn: async () => {
     const stationCodes = Object.entries(stationSelection.value)
@@ -101,6 +100,7 @@ const { mutate: syncCamera, isPending: cameraSyncing } = useMutation({
     onCancel();
   },
 });
+
 const { mutate: syncNvrChannels, isPending: nvrChannelsSyncing } = useMutation({
   mutationFn: async () => {
     const stationCodes = Object.entries(stationSelection.value)
@@ -133,23 +133,31 @@ const { mutate: syncNvrChannels, isPending: nvrChannelsSyncing } = useMutation({
     onCancel();
   },
 });
+
 const confirming = computed(() => cameraSyncing.value || nvrChannelsSyncing.value);
+
 const onConfirm = async () => {
+  const noStationSelected = !Object.values(stationSelection.value).some((selected) => selected);
   if (selectedAction.value === 'export-icmp') {
+    if (noStationSelected) {
+      window.$message.warning('请选择要导出设备状态的车站');
+      return;
+    }
+    showIcmpExportModal.value = true;
   } else if (selectedAction.value === 'export-record') {
-    if (!Object.values(stationSelection.value).some((selected) => selected)) {
+    if (noStationSelected) {
       window.$message.warning('请选择要导出录像诊断的车站');
       return;
     }
     showRecordCheckExportModal.value = true;
   } else if (selectedAction.value === 'sync-camera') {
-    if (!Object.values(stationSelection.value).some((selected) => selected)) {
+    if (noStationSelected) {
       window.$message.warning('请选择要同步摄像机的车站');
       return;
     }
     syncCamera();
   } else if (selectedAction.value === 'sync-nvr') {
-    if (!Object.values(stationSelection.value).some((selected) => selected)) {
+    if (noStationSelected) {
       window.$message.warning('请选择要同步录像机通道的车站');
       return;
     }
@@ -158,13 +166,6 @@ const onConfirm = async () => {
     return;
   }
 };
-const onCancel = () => {
-  selectedAction.value = null;
-  showOperation.value = false;
-  stationSelectable.value = false;
-  stationSelection.value = {};
-};
-const onFinish = onCancel;
 
 // 车站卡片的事件
 const selectedStation = ref<Station>();
@@ -225,7 +226,7 @@ const openDeviceParamsConfigModal = (station: Station) => {
   <!-- 设备配置面板对话框 -->
   <DeviceParamsConfigModal v-model:show="showDeviceParamsConfigModal" :station="selectedStation" />
   <!-- 设备状态导出对话框 -->
-  <DeviceExportModal v-model:show="showIcmpExportModal" @after-leave="onFinish" />
+  <DeviceExportModal v-model:show="showIcmpExportModal" :station-list="stationList.filter((station) => stationSelection[station.code])" @after-leave="onFinish" />
   <!-- 录像诊断导出对话框 -->
   <RecordCheckExportModal v-model:show="showRecordCheckExportModal" :stations="stationList.filter((station) => stationSelection[station.code])" @after-leave="onFinish" />
 </template>

vite.config.ts

@@ -11,6 +11,36 @@ type ProxyItem = {
   rewrite?: [string, string];
 };
 
+const line04ApiProxyList: ProxyItem[] = [
+  { key: '/minio', target: 'http://10.15.128.10:9000', rewrite: ['/minio', ''] },
+
+  { key: '/api', target: 'http://10.15.128.10:18760' },
+
+  { key: '/0475/api', target: 'http://10.15.128.10:18760', rewrite: ['/0475/api', '/api'] },
+
+  { key: '/0401/api', target: 'http://10.15.129.10:18760', rewrite: ['/0401/api', '/api'] },
+  { key: '/0402/api', target: 'http://10.15.131.10:18760', rewrite: ['/0402/api', '/api'] },
+  { key: '/0403/api', target: 'http://10.15.133.10:18760', rewrite: ['/0403/api', '/api'] },
+  { key: '/0404/api', target: 'http://10.15.135.10:18760', rewrite: ['/0404/api', '/api'] },
+  { key: '/0405/api', target: 'http://10.15.137.10:18760', rewrite: ['/0405/api', '/api'] },
+  { key: '/0406/api', target: 'http://10.15.139.10:18760', rewrite: ['/0406/api', '/api'] },
+  { key: '/0407/api', target: 'http://10.15.141.10:18760', rewrite: ['/0407/api', '/api'] },
+  { key: '/0408/api', target: 'http://10.15.143.10:18760', rewrite: ['/0408/api', '/api'] },
+  { key: '/0409/api', target: 'http://10.15.145.10:18760', rewrite: ['/0409/api', '/api'] },
+  { key: '/0410/api', target: 'http://10.15.147.10:18760', rewrite: ['/0410/api', '/api'] },
+
+  { key: '/0411/api', target: 'http://10.15.149.10:18760', rewrite: ['/0411/api', '/api'] },
+  { key: '/0412/api', target: 'http://10.15.151.10:18760', rewrite: ['/0412/api', '/api'] },
+  { key: '/0413/api', target: 'http://10.15.153.10:18760', rewrite: ['/0413/api', '/api'] },
+  { key: '/0414/api', target: 'http://10.15.155.10:18760', rewrite: ['/0414/api', '/api'] },
+  { key: '/0415/api', target: 'http://10.15.157.10:18760', rewrite: ['/0415/api', '/api'] },
+  { key: '/0416/api', target: 'http://10.15.159.10:18760', rewrite: ['/0416/api', '/api'] },
+  { key: '/0417/api', target: 'http://10.15.161.10:18760', rewrite: ['/0417/api', '/api'] },
+  { key: '/0418/api', target: 'http://10.15.163.10:18760', rewrite: ['/0418/api', '/api'] },
+  { key: '/0419/api', target: 'http://10.15.165.10:18760', rewrite: ['/0419/api', '/api'] },
+  { key: '/0420/api', target: 'http://10.15.167.10:18760', rewrite: ['/0420/api', '/api'] },
+];
+
 const line10ApiProxyList: ProxyItem[] = [
   { key: '/minio', target: 'http://10.18.128.10:9000', rewrite: ['/minio', ''] },
 
@@ -54,12 +84,14 @@ const line10ApiProxyList: ProxyItem[] = [
   { key: '/1031/api', target: 'http://10.18.189.10:18760', rewrite: ['/1031/api', '/api'] },
   { key: '/1032/api', target: 'http://10.18.244.10:18760', rewrite: ['/1032/api', '/api'] },
 ];
+
 const apiProxyList: ProxyItem[] = [
-  //
+  // ...line04ApiProxyList,
   ...line10ApiProxyList,
 ];
 const wsProxyList: ProxyItem[] = [
   //
+  // { key: '/ws', target: 'ws://10.15.128.10:18103' },
   { key: '/ws', target: 'ws://10.18.128.10:18103' },
 ];