| zy-acs-flow/src/map/http.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| zy-acs-manager/src/main/java/com/zy/acs/manager/common/domain/AreaShapeDto.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| zy-acs-manager/src/main/java/com/zy/acs/manager/common/domain/MapPointDto.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/param/MapAreaParam.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/AreaService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AreaServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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) { zy-acs-manager/src/main/java/com/zy/acs/manager/common/domain/AreaShapeDto.java
New file @@ -0,0 +1,12 @@ package com.zy.acs.manager.common.domain; import lombok.Data; @Data public class AreaShapeDto { private MapPointDto start; private MapPointDto end; } zy-acs-manager/src/main/java/com/zy/acs/manager/common/domain/MapPointDto.java
New file @@ -0,0 +1,12 @@ package com.zy.acs.manager.common.domain; import lombok.Data; @Data public class MapPointDto { private Double x; private Double y; } 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(); } 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; } 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); } 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"); } } }