From 368bc8d1f2b61543ef1b82d53568fbf1beb4dd39 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 02 十二月 2024 15:00:23 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/constants.js | 2 ++
zy-acs-flow/src/i18n/en.js | 2 +-
zy-acs-common/src/main/java/com/zy/acs/common/enums/error/CtuErrorType.java | 8 ++++++++
zy-acs-flow/src/i18n/zh.js | 2 +-
zy-acs-flow/src/map/MapPage.jsx | 4 ++--
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java | 3 +++
6 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/zy-acs-common/src/main/java/com/zy/acs/common/enums/error/CtuErrorType.java b/zy-acs-common/src/main/java/com/zy/acs/common/enums/error/CtuErrorType.java
new file mode 100644
index 0000000..b6dbc4c
--- /dev/null
+++ b/zy-acs-common/src/main/java/com/zy/acs/common/enums/error/CtuErrorType.java
@@ -0,0 +1,8 @@
+package com.zy.acs.common.enums.error;
+
+public enum CtuErrorType {
+
+
+
+
+}
diff --git a/zy-acs-flow/src/i18n/en.js b/zy-acs-flow/src/i18n/en.js
index de2d753..3998961 100644
--- a/zy-acs-flow/src/i18n/en.js
+++ b/zy-acs-flow/src/i18n/en.js
@@ -629,7 +629,7 @@
}
},
map: {
- welcome: 'Welcome To Rcs',
+ welcome: 'Welcome to the RCS System. Tip: Left-click to select objects, right-click to pan the view, and use the scroll wheel to zoom the view.',
devices: {
title: 'Icons',
shelf: 'SHELF',
diff --git a/zy-acs-flow/src/i18n/zh.js b/zy-acs-flow/src/i18n/zh.js
index 693fa88..36553a5 100644
--- a/zy-acs-flow/src/i18n/zh.js
+++ b/zy-acs-flow/src/i18n/zh.js
@@ -628,7 +628,7 @@
}
},
map: {
- welcome: '娆㈣繋浣跨敤RCS',
+ welcome: '娆㈣繋浣跨敤 RCS 绯荤粺銆傛彁绀猴細榧犳爣宸﹂敭閫変腑瀵硅薄锛屽彸閿钩绉昏鍥撅紝婊氳疆缂╂斁瑙嗗浘銆�',
devices: {
title: '鍥炬爣搴�',
shelf: '璐ф灦',
diff --git a/zy-acs-flow/src/map/MapPage.jsx b/zy-acs-flow/src/map/MapPage.jsx
index 3fa87d0..e19fb86 100644
--- a/zy-acs-flow/src/map/MapPage.jsx
+++ b/zy-acs-flow/src/map/MapPage.jsx
@@ -8,7 +8,7 @@
useTheme,
Fab,
} from '@mui/material';
-import { MAP_MODE } from "./constants";
+import { MAP_MODE, MAP_DEFAULT_ROTATION } from "./constants";
import Player from './player';
import * as Tool from './tool';
import { NotificationProvider, useNotification } from './Notification';
@@ -86,7 +86,7 @@
}
}
- player.rotateMap(localStorage.getItem('mapRotation'));
+ player.rotateMap(localStorage.getItem('mapRotation') || Tool.rotationParseNum(MAP_DEFAULT_ROTATION));
setTimeout(() => {
notify.info(translate('page.map.welcome'));
player.adaptScreen();
diff --git a/zy-acs-flow/src/map/constants.js b/zy-acs-flow/src/map/constants.js
index 6564ea1..601bd97 100644
--- a/zy-acs-flow/src/map/constants.js
+++ b/zy-acs-flow/src/map/constants.js
@@ -1,6 +1,8 @@
export const ANIMATE_DURING_TIME = 200;
+export const MAP_DEFAULT_ROTATION = 270;
+
export const MAP_MODE = Object.freeze({
OBSERVER_MODE: "1",
MOVABLE_MODE: "2",
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java
index 9a2e298..027a4e7 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java
@@ -121,6 +121,9 @@
notInCodeList.add("00000363");
notInCodeList.add("00000411");
notInCodeList.add("00000412");
+
+ notInCodeList.add("00000046");
+ notInCodeList.add("00000047");
List<Code> list = codeService.list(new LambdaQueryWrapper<Code>().notIn(Code::getData, notInCodeList));
Collections.shuffle(list);
--
Gitblit v1.9.1