From 3cda8f117002469fc0069416704a44930dea4701 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 15 十二月 2025 10:40:44 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/http.js | 16 ++++++++++++++++
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java | 7 +++++++
zy-acs-flow/src/map/areaSettings/index.jsx | 12 ++++++++++++
3 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/zy-acs-flow/src/map/areaSettings/index.jsx b/zy-acs-flow/src/map/areaSettings/index.jsx
index db2f207..11dd4a1 100644
--- a/zy-acs-flow/src/map/areaSettings/index.jsx
+++ b/zy-acs-flow/src/map/areaSettings/index.jsx
@@ -17,6 +17,7 @@
import { PAGE_DRAWER_WIDTH } from '@/config/setting';
import AreaBasicTab from './AreaBasicTab';
import AreaAdvancedTab from './AreaAdvancedTab';
+import { getAreaInfo } from '../http';
const AreaSettings = (props) => {
const { open, onCancel, sprite, width = PAGE_DRAWER_WIDTH } = props;
@@ -38,8 +39,19 @@
const [shapeData, setShapeData] = useState('');
const [priority, setPriority] = useState('');
+ const [curAreaInfo, setCurAreaInfo] = useState(null);
+
+ const fetchAreaInfo = (areaId) => {
+ getAreaInfo({ params: { areaId: areaId } }, (data) => {
+ setCurAreaInfo(data);
+ })
+ }
+
useEffect(() => {
if (sprite?.data) {
+ console.log(sprite.data);
+ fetchAreaInfo(sprite.data.id);
+
setAreaName(sprite.data.name || '');
setAreaCode(sprite.data.code || '');
setMaxQty(sprite.data.maxQty || '');
diff --git a/zy-acs-flow/src/map/http.js b/zy-acs-flow/src/map/http.js
index be18f40..6180ac3 100644
--- a/zy-acs-flow/src/map/http.js
+++ b/zy-acs-flow/src/map/http.js
@@ -396,6 +396,22 @@
}
}
+export const getAreaInfo = async (param, callback) => {
+ await request.get('/map/area/get', param).then((res) => {
+ const { code, msg, data } = res.data;
+ if (code === 200) {
+ if (callback) {
+ callback(data)
+ }
+ } else {
+ notify.error(msg);
+ }
+ }).catch((error) => {
+ notify.error(error.message);
+ console.error(error.message);
+ })
+}
+
export const saveAreaData = async (zoneId, areaData) => {
try {
const res = await request.post('/map/area/save', {
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java
index 860783b..b225fbb 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java
@@ -441,6 +441,13 @@
return R.ok().add(list);
}
+ @PreAuthorize("hasAuthority('manager:loc:list')")
+ @GetMapping("/area/get")
+ public R areaGet(@RequestParam Long areaId) {
+ Area area = areaService.getById(areaId);
+ return R.ok().add(area);
+ }
+
@PreAuthorize("hasAuthority('manager:loc:update')")
@PostMapping("/area/save")
@Transactional
--
Gitblit v1.9.1