From b20fdb26e9d1d091fd7864de1edcc639e9da01b8 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 16 十月 2024 15:04:14 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 103 insertions(+), 6 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 087f9e7..aebae1e 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,6 +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;
@@ -9,22 +15,21 @@
import com.zy.acs.manager.common.exception.BusinessException;
import com.zy.acs.manager.core.service.MapService;
import com.zy.acs.manager.core.service.floyd.FloydNavigateService;
+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.framework.common.Cools;
-import com.zy.acs.framework.common.R;
+import com.zy.acs.manager.system.service.ConfigService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
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
@@ -47,6 +52,98 @@
private FloydNavigateService floydNavigateService;
@Autowired
private MapService mapService;
+ @Autowired
+ private ConfigService configService;
+ @Autowired
+ private MapMapper mapMapper;
+ @Autowired
+ private SnowflakeIdWorker snowflakeIdWorker;
+ @Autowired
+ private LocService locService;
+
+ @PreAuthorize("hasAuthority('manager:loc:list')")
+ @PostMapping("/data/fetch")
+ 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.setUuid(code.getUuid());
+ 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");
+ }
+
+ @PostMapping("/shelf/group")
+ public R shelfGroup(@RequestParam(required = false) Integer row, @RequestParam(required = false) Integer bay) {
+ if (null == row || null == bay) {
+ return R.error();
+ }
+ List<Loc> locList = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getRow, row).eq(Loc::getBay, bay).orderByAsc(Loc::getLev));
+ return R.ok().add(locList);
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@PreAuthorize("hasAuthority('map:save')")
@PostMapping("/save")
--
Gitblit v1.9.1