From 684484fb93775edcfa19cfc7a43d0a748c8362be Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期五, 12 四月 2024 10:59:30 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/service/MapService.java | 154 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 131 insertions(+), 23 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/service/MapService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/service/MapService.java
index 94a8a55..3807225 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/service/MapService.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/service/MapService.java
@@ -5,17 +5,35 @@
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wcs.common.domain.enums.DictType;
+import com.zy.asrs.wcs.core.entity.Loc;
import com.zy.asrs.wcs.core.map.controller.param.MapDataParam;
import com.zy.asrs.wcs.core.map.controller.param.MapQueryParam;
+import com.zy.asrs.wcs.core.map.controller.result.LiftVo;
import com.zy.asrs.wcs.core.map.controller.result.LocVo;
+import com.zy.asrs.wcs.core.map.controller.result.ShuttleVo;
+import com.zy.asrs.wcs.core.map.entity.MapItem;
+import com.zy.asrs.wcs.core.model.enums.LocStsType;
+import com.zy.asrs.wcs.core.service.LocService;
+import com.zy.asrs.wcs.core.service.LocStsService;
import com.zy.asrs.wcs.core.utils.Utils;
+import com.zy.asrs.wcs.rcs.cache.SlaveConnection;
+import com.zy.asrs.wcs.rcs.entity.Device;
+import com.zy.asrs.wcs.rcs.entity.DeviceType;
+import com.zy.asrs.wcs.rcs.model.enums.SlaveType;
+import com.zy.asrs.wcs.rcs.model.protocol.LiftProtocol;
+import com.zy.asrs.wcs.rcs.model.protocol.ShuttleProtocol;
+import com.zy.asrs.wcs.rcs.service.DeviceService;
+import com.zy.asrs.wcs.rcs.service.DeviceTypeService;
+import com.zy.asrs.wcs.rcs.thread.ShuttleThread;
import com.zy.asrs.wcs.system.entity.Dict;
import com.zy.asrs.wcs.system.service.DictService;
import com.zy.asrs.wcs.system.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.util.*;
+import java.util.stream.Collectors;
/**
* Created by vincent on 3/15/2024
@@ -27,9 +45,17 @@
private UserService userService;
@Autowired
private DictService dictService;
+ @Autowired
+ private DeviceTypeService deviceTypeService;
+ @Autowired
+ private DeviceService deviceService;
+ @Autowired
+ private LocService locService;
+ @Autowired
+ private LocStsService locStsService;
public String getMapFloorList(Long userId) {
- String floorKey = "map-floor-list";
+ String floorKey = "floor-list";
Dict dict = dictService.getOne(new LambdaQueryWrapper<Dict>().eq(Dict::getFlag, floorKey));
if (null == dict) {
dict = new Dict();
@@ -52,7 +78,10 @@
return Optional.ofNullable(dict).map(Dict::getValue).orElse(null);
}
+ @Transactional
public void saveMapData(MapDataParam param, Long userId) {
+ Date now = new Date();
+ // dict
String mapKey = getMapKey(param.getFloor());
Dict dict = dictService.getOne(new LambdaQueryWrapper<Dict>().eq(Dict::getFlag, mapKey));
if (Cools.isEmpty(dict)) {
@@ -74,6 +103,51 @@
throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
}
}
+ // loc
+ List<String> newLocList = new ArrayList<>();
+ for (MapItem item : param.getItemList()) {
+ int row = Integer.parseInt(String.valueOf(item.getProperty().get("row")));
+ int bay = Integer.parseInt(String.valueOf(item.getProperty().get("bay")));
+ String locNo = Utils.getLocNo(row, bay, param.getFloor());
+ newLocList.add(locNo);
+ }
+
+ List<String> existLocList = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getLev, param.getFloor()))
+ .stream().map(Loc::getLocNo).collect(Collectors.toList());
+
+
+ List<String> locListToSave = newLocList.stream().filter(locNo -> !existLocList.contains(locNo)).collect(Collectors.toList());
+
+ List<String> locListToRemove = existLocList.stream().filter(locNo -> !newLocList.contains(locNo)).collect(Collectors.toList());
+
+ List<String> locListInBoth = newLocList.stream().filter(existLocList::contains).collect(Collectors.toList());
+
+ for (String locNo : locListToSave) {
+ Loc loc = new Loc();
+ loc.setLocNo(locNo);
+ loc.setName(locNo);
+ loc.setRow(Utils.getRow(locNo));
+ loc.setBay(Utils.getBay(locNo));
+ loc.setLev(Utils.getLev(locNo));
+ loc.setLocSts(LocStsType.O.val());
+ loc.setCreateBy(userId);
+ loc.setCreateTime(now);
+ loc.setUpdateBy(userId);
+ loc.setUpdateTime(now);
+ if (!locService.save(loc)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
+ }
+ }
+
+ for (String locNo : locListToRemove) {
+ if (!locService.remove(new LambdaQueryWrapper<Loc>().eq(Loc::getLocNo, locNo))) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
+ }
+ }
+
+ for (String locNo : locListInBoth) {
+
+ }
}
@@ -81,14 +155,64 @@
List<LocVo> locVos = new ArrayList<>();
int row = Utils.getRow(locNo);
int bay = Utils.getBay(locNo);
-
-
- String[] statusOptions = {"F", "D", "O"};
- Random random = new Random();
- for (int lev = 1; lev < 6; lev++) {
- locVos.add(new LocVo(Utils.getLocNo(row, bay, lev), statusOptions[random.nextInt(statusOptions.length)]));
+ List<Loc> locList = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getRow, row).eq(Loc::getBay, bay).orderByAsc(Loc::getLev));
+ for (Loc loc : locList) {
+ locVos.add(new LocVo(loc.getLocNo(), loc.getLocStsFlag()));
}
return locVos;
+ }
+
+ public ShuttleVo getShuttleInfo(String shuttleNo) {
+ ShuttleVo vo = new ShuttleVo();
+ vo.setShuttleNo(shuttleNo);
+ DeviceType deviceType = deviceTypeService.getOne(new LambdaQueryWrapper<DeviceType>().eq(DeviceType::getFlag, SlaveType.Shuttle.toString()));
+ Device device = deviceService.getOne(new LambdaQueryWrapper<Device>().eq(Device::getDeviceType, deviceType.getId()).eq(Device::getDeviceNo, shuttleNo));
+ if (null == device) {
+ return vo;
+ }
+ ShuttleThread thread = (ShuttleThread)SlaveConnection.get(SlaveType.Shuttle, device.getId().intValue());
+ if (null == thread) {
+ return vo;
+ }
+ ShuttleProtocol protocol = thread.getStatus();
+ if (null == protocol) {
+ return vo;
+ }
+ vo.setTaskNo(String.valueOf(protocol.getTaskNo()));
+ vo.setStatus(protocol.getProtocolStatusType().desc);
+ vo.setOriginLocNo(protocol.getSourceLocNo());
+ vo.setDestLocNo(protocol.getLocNo());
+ vo.setCurrentCode(protocol.getCurrentCode());
+ vo.setBatteryPower(protocol.getBatteryPower());
+ vo.setErrorCode(protocol.getErrorCode());
+ vo.setBatteryTemp(protocol.getBatteryTemp());
+ vo.setHasLift(protocol.getHasLift());
+ vo.setHasPallet(protocol.getHasPallet());
+ vo.setHasCharge(protocol.getHasCharge());
+ vo.setBatteryVoltage(String.valueOf(protocol.getBatteryVoltage()));
+ vo.setPakMk(protocol.getPakMk());
+ return vo;
+ }
+
+ public LiftVo getLiftInfo(String liftNo) {
+ LiftVo vo = new LiftVo();
+ vo.setLiftNo(liftNo);
+ LiftProtocol protocol = new LiftProtocol();
+ // todo checkout protocol
+// vo.setTaskNo(String.valueOf(protocol.getTaskNo()));
+// vo.setStatus(protocol.getProtocolStatusType().desc);
+// vo.setOriginLocNo(protocol.getSourceLocNo());
+// vo.setDestLocNo(protocol.getLocNo());
+// vo.setCurrentCode(protocol.getCurrentCode());
+// vo.setBatteryPower(protocol.getBatteryPower());
+// vo.setErrorCode(protocol.getErrorCode());
+// vo.setBatteryTemp(protocol.getBatteryTemp());
+// vo.setHasLift(protocol.getHasLift());
+// vo.setHasPallet(protocol.getHasPallet());
+// vo.setHasCharge(protocol.getHasCharge());
+// vo.setBatteryVoltage(String.valueOf(protocol.getBatteryVoltage()));
+// vo.setPakMk(protocol.getPakMk());
+ return vo;
}
private String getMapKey(Integer floor) {
@@ -102,22 +226,6 @@
" {\n" +
" label: '1F',\n" +
" value: 1\n" +
- " },\n" +
- " {\n" +
- " label: '2F',\n" +
- " value: 2\n" +
- " },\n" +
- " {\n" +
- " label: '3F',\n" +
- " value: 3\n" +
- " },\n" +
- " {\n" +
- " label: '4F',\n" +
- " value: 4\n" +
- " },\n" +
- " {\n" +
- " label: '5F',\n" +
- " value: 5\n" +
" },\n" +
"]";
--
Gitblit v1.9.1