refactor: 移除polling-store,重构setting-store
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
import { batchVerifyApi, type Station } from '@/apis';
|
||||
import { LINE_STATIONS_MUTATION_KEY, LINE_STATIONS_QUERY_KEY } from '@/constants';
|
||||
import { usePollingStore, useStationStore } from '@/stores';
|
||||
import { useSettingStore, useStationStore } from '@/stores';
|
||||
import { getAppEnvConfig, parseErrorFeedback } from '@/utils';
|
||||
import { CancelledError, useMutation, useQuery } from '@tanstack/vue-query';
|
||||
import axios, { isCancel } from 'axios';
|
||||
@@ -44,8 +44,8 @@ export const useLineStationsMutation = () => {
|
||||
};
|
||||
|
||||
export const useLineStationsQuery = () => {
|
||||
const pollingStore = usePollingStore();
|
||||
const { pollingEnabled } = storeToRefs(pollingStore);
|
||||
const settingStore = useSettingStore();
|
||||
const { pollingStations } = storeToRefs(settingStore);
|
||||
const { requestInterval } = getAppEnvConfig();
|
||||
const { mutateAsync: getLineStations } = useLineStationsMutation();
|
||||
const { refetch: refetchLineDevicesQuery } = useLineDevicesQuery();
|
||||
@@ -53,7 +53,7 @@ export const useLineStationsQuery = () => {
|
||||
|
||||
return useQuery({
|
||||
queryKey: computed(() => [LINE_STATIONS_QUERY_KEY]),
|
||||
enabled: computed(() => pollingEnabled.value),
|
||||
enabled: computed(() => pollingStations.value),
|
||||
refetchInterval: requestInterval * 1000,
|
||||
staleTime: (requestInterval * 1000) / 2,
|
||||
queryFn: async ({ signal }) => {
|
||||
@@ -62,10 +62,10 @@ export const useLineStationsQuery = () => {
|
||||
const endTime = performance.now();
|
||||
console.log(`${LINE_STATIONS_QUERY_KEY}: ${endTime - startTime} ms`);
|
||||
|
||||
if (!pollingEnabled.value) return null;
|
||||
if (!pollingStations.value) return null;
|
||||
await refetchLineDevicesQuery();
|
||||
|
||||
if (!pollingEnabled.value) return null;
|
||||
if (!pollingStations.value) return null;
|
||||
await refetchLineAlarmsQuery();
|
||||
|
||||
return null;
|
||||
|
||||
@@ -8,17 +8,17 @@ import { computed, watch } from 'vue';
|
||||
export const useVerifyUserQuery = () => {
|
||||
const queryClient = useQueryClient();
|
||||
const settingStore = useSettingStore();
|
||||
const { offlineDev } = storeToRefs(settingStore);
|
||||
const { activeRequests } = storeToRefs(settingStore);
|
||||
|
||||
watch(offlineDev, (offline) => {
|
||||
if (offline) {
|
||||
watch(activeRequests, (active) => {
|
||||
if (!active) {
|
||||
queryClient.cancelQueries({ queryKey: [VERIFY_USER_QUERY_KEY] });
|
||||
}
|
||||
});
|
||||
|
||||
return useQuery({
|
||||
queryKey: [VERIFY_USER_QUERY_KEY],
|
||||
enabled: computed(() => !offlineDev.value),
|
||||
enabled: computed(() => activeRequests.value),
|
||||
refetchInterval: 10 * 1000,
|
||||
queryFn: async ({ signal }) => {
|
||||
await verifyApi({ signal });
|
||||
|
||||
@@ -24,7 +24,7 @@ export const useStompClient = () => {
|
||||
const { unreadLineAlarms } = storeToRefs(unreadStore);
|
||||
|
||||
const settingStore = useSettingStore();
|
||||
const { offlineDev } = storeToRefs(settingStore);
|
||||
const { subscribeMessages } = storeToRefs(settingStore);
|
||||
|
||||
const { mutate: refreshStationAlarms } = useStationAlarmsMutation();
|
||||
|
||||
@@ -66,7 +66,7 @@ export const useStompClient = () => {
|
||||
window.$message.error('WebSocket错误');
|
||||
},
|
||||
});
|
||||
if (!offlineDev.value) {
|
||||
if (subscribeMessages.value) {
|
||||
stompClient.value.activate();
|
||||
}
|
||||
});
|
||||
@@ -76,11 +76,11 @@ export const useStompClient = () => {
|
||||
stompClient.value = null;
|
||||
});
|
||||
|
||||
watch(offlineDev, (offline) => {
|
||||
if (offline) {
|
||||
stompClient.value?.deactivate();
|
||||
} else {
|
||||
watch(subscribeMessages, (subscribe) => {
|
||||
if (subscribe) {
|
||||
stompClient.value?.activate();
|
||||
} else {
|
||||
stompClient.value?.deactivate();
|
||||
}
|
||||
});
|
||||
|
||||
@@ -90,8 +90,8 @@ export const useStompClient = () => {
|
||||
watchDebounced(
|
||||
() => Object.entries(unreadLineAlarms.value).map(([stationCode, stationAlarms]) => ({ stationCode, count: stationAlarms['unclassified'].length })),
|
||||
(newValue, oldValue) => {
|
||||
// 启用离线模式时,跳过处理
|
||||
if (offlineDev.value) return;
|
||||
// 关闭消息订阅时,跳过处理
|
||||
if (!subscribeMessages.value) return;
|
||||
if (newValue.length === 0) return;
|
||||
const codes: Station['code'][] = [];
|
||||
newValue.forEach(({ stationCode, count }) => {
|
||||
|
||||
Reference in New Issue
Block a user