From 92a36252bf8e4e484cf17abf6d12b4e86497f6e9 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期三, 10 十二月 2025 09:22:22 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/param/MapAreaParam.java | 19 +++++++++
zy-acs-flow/src/map/http.js | 2
zy-acs-manager/src/main/java/com/zy/acs/manager/common/domain/AreaShapeDto.java | 12 ++++++
zy-acs-manager/src/main/java/com/zy/acs/manager/common/domain/MapPointDto.java | 12 ++++++
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/AreaService.java | 3 +
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java | 5 +-
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AreaServiceImpl.java | 52 ++++++++++++++++++++++++-
7 files changed, 98 insertions(+), 7 deletions(-)
diff --git a/zy-acs-flow/src/map/http.js b/zy-acs-flow/src/map/http.js
index 0d0e7a5..be18f40 100644
--- a/zy-acs-flow/src/map/http.js
+++ b/zy-acs-flow/src/map/http.js
@@ -400,7 +400,7 @@
try {
const res = await request.post('/map/area/save', {
zoneId: zoneId,
- area: areaData,
+ ...areaData,
});
const { code, msg } = res.data;
if (code !== 200) {
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/common/domain/AreaShapeDto.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/common/domain/AreaShapeDto.java
new file mode 100644
index 0000000..9e43591
--- /dev/null
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/common/domain/AreaShapeDto.java
@@ -0,0 +1,12 @@
+package com.zy.acs.manager.common.domain;
+
+import lombok.Data;
+
+@Data
+public class AreaShapeDto {
+
+ private MapPointDto start;
+
+ private MapPointDto end;
+
+}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/common/domain/MapPointDto.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/common/domain/MapPointDto.java
new file mode 100644
index 0000000..6c4a13a
--- /dev/null
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/common/domain/MapPointDto.java
@@ -0,0 +1,12 @@
+package com.zy.acs.manager.common.domain;
+
+import lombok.Data;
+
+@Data
+public class MapPointDto {
+
+ private Double x;
+
+ private Double y;
+
+}
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 02792d4..ec0c524 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
@@ -428,12 +428,11 @@
// area operate -------------------------
- @PreAuthorize("hasAuthority('map:save')")
+ @PreAuthorize("hasAuthority('manager:loc:update')")
@PostMapping("/area/save")
@Transactional
public R save(@RequestBody MapAreaParam param) {
- Date now = new Date();
-
+ areaService.saveMapArea(param, getLoginUserId());
return R.ok();
}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/param/MapAreaParam.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/param/MapAreaParam.java
index a963ade..7244aec 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/param/MapAreaParam.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/param/MapAreaParam.java
@@ -1,5 +1,6 @@
package com.zy.acs.manager.manager.controller.param;
+import com.zy.acs.manager.common.domain.MapPointDto;
import lombok.Data;
@Data
@@ -7,6 +8,24 @@
private String zoneId;
+ private String name;
+ private MapPointDto start;
+
+ private MapPointDto end;
+
+ private String color;
+
+ private String code;
+
+ private String type;
+
+ private Integer maxCount;
+
+ private String speedLimit;
+
+ private Integer priority;
+
+ private String memo;
}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/AreaService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/AreaService.java
index 8ab9984..2627aa6 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/AreaService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/AreaService.java
@@ -1,8 +1,11 @@
package com.zy.acs.manager.manager.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.zy.acs.manager.manager.controller.param.MapAreaParam;
import com.zy.acs.manager.manager.entity.Area;
public interface AreaService extends IService<Area> {
+ void saveMapArea(MapAreaParam param, Long loginUserId);
+
}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AreaServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AreaServiceImpl.java
index 263cbf7..ae20671 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AreaServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AreaServiceImpl.java
@@ -1,12 +1,58 @@
package com.zy.acs.manager.manager.service.impl;
-import com.zy.acs.manager.manager.mapper.AreaMapper;
-import com.zy.acs.manager.manager.entity.Area;
-import com.zy.acs.manager.manager.service.AreaService;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zy.acs.framework.common.Cools;
+import com.zy.acs.manager.common.domain.AreaShapeDto;
+import com.zy.acs.manager.manager.controller.param.MapAreaParam;
+import com.zy.acs.manager.manager.entity.Area;
+import com.zy.acs.manager.manager.enums.StatusType;
+import com.zy.acs.manager.manager.mapper.AreaMapper;
+import com.zy.acs.manager.manager.service.AreaService;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.util.Date;
+
+@Slf4j
@Service("areaService")
public class AreaServiceImpl extends ServiceImpl<AreaMapper, Area> implements AreaService {
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void saveMapArea(MapAreaParam param, Long loginUserId) {
+ Date now = new Date();
+
+ Area area = new Area();
+ // major
+ if (!Cools.isEmpty(param.getZoneId())) {
+ area.setZoneId(Long.parseLong(param.getZoneId()));
+ }
+ area.setName(param.getName());
+ area.setCode(param.getCode());
+ area.setColor(param.getColor());
+ area.setMaxCount(param.getMaxCount());
+ area.setSpeedLimit(param.getSpeedLimit());
+ area.setPriority(param.getPriority());
+
+ // shape
+ AreaShapeDto shapeDto = new AreaShapeDto();
+ shapeDto.setStart(param.getStart());
+ shapeDto.setEnd(param.getEnd());
+ area.setShapeData(JSON.toJSONString(shapeDto));
+
+ // common
+ area.setStatus(StatusType.ENABLE.val);
+ area.setCreateTime(now);
+ area.setCreateBy(loginUserId);
+ area.setUpdateTime(now);
+ area.setUpdateBy(loginUserId);
+ area.setMemo(param.getMemo());
+ if (!this.save(area)) {
+ log.error("failed to save area");
+ }
+ }
+
}
--
Gitblit v1.9.1