From cab87dcfaa7b1e2bc1298572b775026bb17ef38b Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期四, 17 十月 2024 13:54:41 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/service/MapService.java | 65 ++++++++++++++++++++++++--------
1 files changed, 49 insertions(+), 16 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 3807225..66c59da 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,6 +5,7 @@
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.BasShuttle;
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;
@@ -12,27 +13,29 @@
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.DeviceCtgType;
import com.zy.asrs.wcs.core.model.enums.LocStsType;
+import com.zy.asrs.wcs.core.service.BasShuttleService;
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 com.zy.asrs.wcs.utils.CommonUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Optional;
import java.util.stream.Collectors;
/**
@@ -53,6 +56,8 @@
private LocService locService;
@Autowired
private LocStsService locStsService;
+ @Autowired
+ private BasShuttleService basShuttleService;
public String getMapFloorList(Long userId) {
String floorKey = "floor-list";
@@ -150,39 +155,65 @@
}
}
-
- public List<LocVo> getShelfLocNoList(String locNo) {
+ public List<LocVo> getShelfLocNoGroup(String locNo) {
List<LocVo> locVos = new ArrayList<>();
int row = Utils.getRow(locNo);
int bay = Utils.getBay(locNo);
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()));
+ LocVo locVo = new LocVo();
+ locVo.setLocNo(loc.getLocNo());
+ locVo.setLocSts(loc.getLocStsFlag());
+ locVo.setZpallet(loc.getZpallet());
+ locVo.setEnable(CommonUtils.getStatusBool(loc.getStatus()));
+ locVos.add(locVo);
}
return locVos;
+ }
+
+ public LocVo getShelfLocNoInfo(String locNo) {
+ LocVo locVo = new LocVo();
+ locVo.setLocNo(locNo);
+ Loc loc = locService.selectByLocNo(locNo);
+ if (null == loc) {
+ return locVo;
+ }
+ locVo.setLocSts(loc.getLocStsFlag());
+ locVo.setZpallet(loc.getZpallet());
+ locVo.setEnable(CommonUtils.getStatusBool(loc.getStatus()));
+ return locVo;
}
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));
+ Device device = deviceService.getOne(new LambdaQueryWrapper<Device>()
+ .eq(Device::getDeviceType, DeviceCtgType.SHUTTLE.val())
+ .eq(Device::getDeviceNo, shuttleNo)
+ .eq(Device::getStatus, 1)
+ );
if (null == device) {
return vo;
}
- ShuttleThread thread = (ShuttleThread)SlaveConnection.get(SlaveType.Shuttle, device.getId().intValue());
- if (null == thread) {
+ BasShuttle basShuttle = basShuttleService.getOne(new LambdaQueryWrapper<BasShuttle>().eq(BasShuttle::getDeviceId, device.getId()));
+ if (null == basShuttle || Cools.isEmpty(basShuttle.getProtocol())) {
return vo;
}
- ShuttleProtocol protocol = thread.getStatus();
- if (null == protocol) {
- return vo;
- }
+ ShuttleProtocol protocol = JSON.parseObject(basShuttle.getProtocol(), ShuttleProtocol.class);
+// 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.setCurrentLocNo(protocol.getCurrentLocNo());
vo.setBatteryPower(protocol.getBatteryPower());
vo.setErrorCode(protocol.getErrorCode());
vo.setBatteryTemp(protocol.getBatteryTemp());
@@ -190,7 +221,9 @@
vo.setHasPallet(protocol.getHasPallet());
vo.setHasCharge(protocol.getHasCharge());
vo.setBatteryVoltage(String.valueOf(protocol.getBatteryVoltage()));
+// vo.setZpallet();
vo.setPakMk(protocol.getPakMk());
+ vo.setEnable(CommonUtils.getStatusBool(basShuttle.getStatus()));
return vo;
}
--
Gitblit v1.9.1