Skip to content

孙克 / smf-core

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 92da1a2c 由 LN
选项

单盘入库和设备管理界面增加状态显示。

1 个父辈 9215fe6d
内嵌 并排
正在显示 4 个修改的文件 包含 46 行增加 和 24 行删除
src/main/java/com/neotel/smfcore/core/hik/bean/ShelfPosInfo.java
...@@ -25,6 +25,14 @@ public class ShelfPosInfo implements Serializable ,Comparable<ShelfPosInfo> { ...@@ -25,6 +25,14 @@ public class ShelfPosInfo implements Serializable ,Comparable<ShelfPosInfo> {
@ApiModelProperty("指定库位空库位数") @ApiModelProperty("指定库位空库位数")
private int posEmptySlots; private int posEmptySlots;
@ApiModelProperty("单台BOX状态,0=离线，1=正常运行中, 2=急停，3=故障，4=警告,5=调试中,6入库执行中，7入仓位完成，8入库失败, 9出库执行中，10出仓位完成，11出库失败")
private int status=0;
@ApiModelProperty("是否在线")
private boolean onLine=false;
@ApiModelProperty("客户端IP")
private String clientIp;
@Override @Override
public int compareTo(ShelfPosInfo o) { public int compareTo(ShelfPosInfo o) {
if (this.getPosEmptySlots() != o.getPosEmptySlots()) { if (this.getPosEmptySlots() != o.getPosEmptySlots()) {
......
src/main/java/com/neotel/smfcore/core/hik/rest/SingleInController.java
...@@ -9,6 +9,8 @@ import com.neotel.smfcore.common.utils.SecurityUtils; ...@@ -9,6 +9,8 @@ import com.neotel.smfcore.common.utils.SecurityUtils;
import com.neotel.smfcore.core.barcode.service.manager.IBarcodeManager; import com.neotel.smfcore.core.barcode.service.manager.IBarcodeManager;
import com.neotel.smfcore.core.barcode.service.po.Barcode; import com.neotel.smfcore.core.barcode.service.po.Barcode;
import com.neotel.smfcore.core.barcode.utils.CodeResolve; import com.neotel.smfcore.core.barcode.utils.CodeResolve;
import com.neotel.smfcore.core.device.bean.BoxStatusBean;
import com.neotel.smfcore.core.device.bean.StatusBean;
import com.neotel.smfcore.core.device.enums.OP; import com.neotel.smfcore.core.device.enums.OP;
import com.neotel.smfcore.core.device.enums.OP_STATUS; import com.neotel.smfcore.core.device.enums.OP_STATUS;
import com.neotel.smfcore.core.device.util.DataCache; import com.neotel.smfcore.core.device.util.DataCache;
...@@ -19,6 +21,7 @@ import com.neotel.smfcore.core.storage.bean.UsageItem; ...@@ -19,6 +21,7 @@ import com.neotel.smfcore.core.storage.bean.UsageItem;
import com.neotel.smfcore.core.storage.service.manager.IStorageManager; import com.neotel.smfcore.core.storage.service.manager.IStorageManager;
import com.neotel.smfcore.core.storage.service.po.Storage; import com.neotel.smfcore.core.storage.service.po.Storage;
import com.neotel.smfcore.core.system.service.po.DataLog; import com.neotel.smfcore.core.system.service.po.DataLog;
import com.neotel.smfcore.core.system.util.DevicesStatusUtil;
import com.neotel.smfcore.core.system.util.TaskService; import com.neotel.smfcore.core.system.util.TaskService;
import com.neotel.smfcore.core.system.websocket.MsgType; import com.neotel.smfcore.core.system.websocket.MsgType;
import com.neotel.smfcore.core.system.websocket.SocketMsg; import com.neotel.smfcore.core.system.websocket.SocketMsg;
...@@ -91,7 +94,7 @@ public class SingleInController { ...@@ -91,7 +94,7 @@ public class SingleInController {
} }
for (String groupid : mygroups) { for (String groupid : mygroups) {
List<BoxStatusDto> boxStatusDtos = new ArrayList<>(); List<BoxStatusDto> boxStatusDtos = new ArrayList<>();
List<String> cidList =dataCache. getCidsByGroupId(groupid, false); List<String> cidList = dataCache.getCidsByGroupId(groupid, false);
for (String cid : for (String cid :
cidList) { cidList) {
Storage storage = dataCache.getStorage(cid); Storage storage = dataCache.getStorage(cid);
...@@ -120,6 +123,19 @@ public class SingleInController { ...@@ -120,6 +123,19 @@ public class SingleInController {
shelfPosInfo.setPosTotalSlots(posTotalCount); shelfPosInfo.setPosTotalSlots(posTotalCount);
shelfPosInfo.setPosEmptySlots(emptyCount); shelfPosInfo.setPosEmptySlots(emptyCount);
shelfPosInfo.setOnLine(false);
shelfPosInfo.setStatus(0);
StatusBean bean = DevicesStatusUtil.getStatusBean(storage.getCid());
if (bean != null && (!bean.timeOut())) {
shelfPosInfo.setOnLine(true);
for (BoxStatusBean boxStatus : bean.getBoxStatus().values()) {
shelfPosInfo.setStatus(bean.getStatus());
shelfPosInfo.setClientIp(bean.getClientIp());
break;
}
}
if (emptyCount > 0) { if (emptyCount > 0) {
shelfPosInfos.add(shelfPosInfo); shelfPosInfos.add(shelfPosInfo);
} }
......
src/main/java/com/neotel/smfcore/core/storage/rest/StorageController.java
...@@ -10,6 +10,7 @@ import com.neotel.smfcore.common.utils.FileUtil; ...@@ -10,6 +10,7 @@ import com.neotel.smfcore.common.utils.FileUtil;
import com.neotel.smfcore.common.utils.PointUtil; import com.neotel.smfcore.common.utils.PointUtil;
import com.neotel.smfcore.common.utils.QueryHelp; import com.neotel.smfcore.common.utils.QueryHelp;
import com.neotel.smfcore.common.utils.SecurityUtils; import com.neotel.smfcore.common.utils.SecurityUtils;
import com.neotel.smfcore.core.device.bean.BoxStatusBean;
import com.neotel.smfcore.core.device.bean.StatusBean; import com.neotel.smfcore.core.device.bean.StatusBean;
import com.neotel.smfcore.core.device.util.DataCache; import com.neotel.smfcore.core.device.util.DataCache;
import com.neotel.smfcore.core.storage.enums.DeviceType; import com.neotel.smfcore.core.storage.enums.DeviceType;
...@@ -90,29 +91,20 @@ public class StorageController { ...@@ -90,29 +91,20 @@ public class StorageController {
PageData<Storage> pages=storageManager.findByPage(query,pageable); PageData<Storage> pages=storageManager.findByPage(query,pageable);
List<StorageDto> StorageDtos=storageMapper.toDto(pages.getContent()); List<StorageDto> StorageDtos=storageMapper.toDto(pages.getContent());
StorageDtos=updateDtos(StorageDtos); StorageDtos=updateDtos(StorageDtos);
// for (int i=0;i<StorageDtos.size();i++) { for (int i=0;i<StorageDtos.size();i++) {
// String groupId = ""; StorageDtos.get(i).setOnLine(false);
// if (StorageDtos.get(i).getGroupId() != null && (!StorageDtos.get(i).getGroupId().isEmpty())) { StorageDtos.get(i).setStatus(0);
// groupId = StorageDtos.get(i).getGroupId(); StatusBean bean = DevicesStatusUtil.getStatusBean(StorageDtos.get(i).getCid());
// }
// Group group = groupManager.get(groupId); if (bean != null && (!bean.timeOut())) {
// if (group != null) { StorageDtos.get(i).setOnLine(true);
// StorageDtos.get(i).setGroupName(group.getGroupName()); for (BoxStatusBean boxStatus : bean.getBoxStatus().values()) {
// } else { StorageDtos.get(i).setStatus(bean.getStatus());
// //此料仓未分组 StorageDtos.get(i).setClientIp(bean.getClientIp());
// StorageDtos.get(i).setGroupName(""); break;
// if (!StorageDtos.get(i).getGroupId().equals("")) { }
// storageManager.updateStorageGroup(StorageDtos.get(i).getId(), ""); }
// log.info("料仓[" + StorageDtos.get(i).getId() + "][" + StorageDtos.get(i).getName() + "]的组不存在，修改组为空"); }
// }
//
// }
// //获取设备状态，设置状态和当前任务信息
// StatusBean bean = DevicesStatusUtil.getStatusBean(StorageDtos.get(i).getCid());
// if (bean != null && bean.getBoxStatus() != null) {
// StorageDtos.get(i).setClientIp(bean.getClientIp());
// }
// }
return new PageData(StorageDtos,pages.getTotalElements()); return new PageData(StorageDtos,pages.getTotalElements());
} }
......
src/main/java/com/neotel/smfcore/core/storage/rest/dto/StorageDto.java
...@@ -68,4 +68,10 @@ public class StorageDto implements Serializable { ...@@ -68,4 +68,10 @@ public class StorageDto implements Serializable {
@ApiModelProperty("是否可以合并库位") @ApiModelProperty("是否可以合并库位")
private boolean mergePos=false; private boolean mergePos=false;
@ApiModelProperty("单台BOX状态,0=离线，1=正常运行中, 2=急停，3=故障，4=警告,5=调试中,6入库执行中，7入仓位完成，8入库失败, 9出库执行中，10出仓位完成，11出库失败")
private int status=0;
@ApiModelProperty("是否在线")
private boolean onLine=false;
} }
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!