From 9dd2b6186b18c6d3281fe8c48f1ff4c2bc1fc8d7 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 14 十月 2024 14:00:56 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java | 65 +++++++++++++++++++++++++++-----
1 files changed, 54 insertions(+), 11 deletions(-)
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 2861c4d..7512db7 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
@@ -2,8 +2,12 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.zy.acs.common.utils.GsonUtils;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.common.R;
+import com.zy.acs.framework.common.SnowflakeIdWorker;
+import com.zy.acs.framework.exception.CoolException;
+import com.zy.acs.manager.common.constant.MapItemType;
import com.zy.acs.manager.common.domain.MapAgvDto;
import com.zy.acs.manager.common.domain.MapCodeDto;
import com.zy.acs.manager.common.domain.MapDto;
@@ -14,7 +18,9 @@
import com.zy.acs.manager.manager.controller.param.MapDataParam;
import com.zy.acs.manager.manager.controller.param.MapParam;
import com.zy.acs.manager.manager.entity.*;
+import com.zy.acs.manager.manager.entity.Map;
import com.zy.acs.manager.manager.enums.AgvStsType;
+import com.zy.acs.manager.manager.mapper.MapMapper;
import com.zy.acs.manager.manager.service.*;
import com.zy.acs.manager.system.controller.BaseController;
import com.zy.acs.manager.system.service.ConfigService;
@@ -23,10 +29,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
/**
* Created by vincent on 2023/6/1
@@ -51,21 +54,61 @@
private MapService mapService;
@Autowired
private ConfigService configService;
-
-
-
-
+ @Autowired
+ private MapMapper mapMapper;
+ @Autowired
+ private SnowflakeIdWorker snowflakeIdWorker;
@PreAuthorize("hasAuthority('manager:loc:list')")
@PostMapping("/data/fetch")
- public R fetch(@RequestParam(required = false) Long zoneId) {
- String mapData = configService.getVal("mapData", String.class);
- return R.ok().add(mapData);
+ public R fetch(@RequestParam(required = false) Long zoneId, @RequestParam(required = false) Integer floor) {
+ // code
+ List<Code> codeList = codeService.list(new LambdaQueryWrapper<Code>().eq(Code::getStatus, 1));
+ List<MapItem> mapCodeItems = new ArrayList<>();
+ codeList.forEach(code -> {
+ MapItem mapItem = new MapItem();
+ mapItem.setType(MapItemType.POINT.toString());
+ mapItem.setNo(code.getData());
+ mapItem.setPositionX(code.getX());
+ mapItem.setPositionY(code.getY());
+ mapCodeItems.add(mapItem);
+ });
+ // common
+ Map activeMap = mapMapper.selectActive(zoneId, floor);
+ return R.ok().add(Cools
+ .add("point", GsonUtils.toJson(mapCodeItems))
+ .add("common", activeMap.getData())
+ );
}
@PreAuthorize("hasAuthority('manager:loc:update')")
@PostMapping("/data/save")
+ @Transactional
public R save(@RequestBody MapDataParam param) {
+ Date now = new Date();
+ Long userId = getLoginUserId();
+ // previous
+ Map previousMap = mapMapper.selectActive(param.getZoneId(), param.getFloor());
+ if (null != previousMap) {
+ previousMap.setActive(0);
+ previousMap.setUpdateTime(now);
+ previousMap.setUpdateBy(userId);
+ if (0 == mapMapper.updateById(previousMap)) {
+ throw new CoolException("Save Fail");
+ }
+ }
+ // current
+ Map map = new Map();
+ map.setUuid(String.valueOf(snowflakeIdWorker.nextId()).substring(3));
+ map.setZoneId(param.getZoneId());
+ map.setFloor(param.getFloor());
+ map.setData(GsonUtils.toJson(param.getItemList()));
+ map.setActive(1);
+ map.setUpdateBy(userId);
+ map.setCreateBy(userId);
+ if (0 == mapMapper.insert(map)) {
+ throw new CoolException("Save Fail");
+ }
return R.ok("Save Success");
}
--
Gitblit v1.9.1