From eb4ea056ddd2502fdb6f49a2ad0a01836b7e71fa Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期四, 17 十月 2024 14:40:14 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/entity/BasLiftOpt.java | 30 +++++
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/LiftAction.java | 49 ++++++--
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/NyLiftThread.java | 30 +++--
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayLiftThread.java | 76 +++++++-----
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/JxgtLiftThread.java | 26 ++-
zy-asrs-flow/src/pages/log/basLiftOpt/index.jsx | 126 ++++++++++++++------
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/controller/BasLiftOptController.java | 5
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/LiftThread.java | 11 +
8 files changed, 243 insertions(+), 110 deletions(-)
diff --git a/zy-asrs-flow/src/pages/log/basLiftOpt/index.jsx b/zy-asrs-flow/src/pages/log/basLiftOpt/index.jsx
index 0fb134e..8cf2002 100644
--- a/zy-asrs-flow/src/pages/log/basLiftOpt/index.jsx
+++ b/zy-asrs-flow/src/pages/log/basLiftOpt/index.jsx
@@ -1,6 +1,6 @@
import React, { useState, useRef, useEffect } from 'react';
-import { Button, message, Modal, Tag } from 'antd';
+import { Button, message, Modal, Tag } from 'antd';
import {
FooterToolbar,
PageContainer,
@@ -142,6 +142,19 @@
/>,
},
{
+ title: '妯″紡',
+ dataIndex: 'mode',
+ valueType: 'text',
+ hidden: false,
+ width: 140,
+ filterDropdown: (props) => <TextFilter
+ name='mode'
+ {...props}
+ actionRef={actionRef}
+ setSearchParam={setSearchParam}
+ />,
+ },
+ {
title: '涓嬪彂鏃堕棿',
dataIndex: 'sendTime$',
valueType: 'text',
@@ -149,6 +162,78 @@
width: 140,
filterDropdown: (props) => <DatetimeRangeFilter
name='sendTime'
+ {...props}
+ actionRef={actionRef}
+ setSearchParam={setSearchParam}
+ />,
+ },
+ {
+ title: '鍛戒护',
+ dataIndex: 'command',
+ valueType: 'text',
+ hidden: false,
+ width: 140,
+ ellipsis: true,
+ filterDropdown: (props) => <TextFilter
+ name='command'
+ {...props}
+ actionRef={actionRef}
+ setSearchParam={setSearchParam}
+ />,
+ },
+ {
+ title: '绯荤粺鐘舵��',
+ dataIndex: 'systemStatus',
+ valueType: 'text',
+ hidden: false,
+ width: 140,
+ ellipsis: true,
+ filterDropdown: (props) => <TextFilter
+ name='systemStatus'
+ {...props}
+ actionRef={actionRef}
+ setSearchParam={setSearchParam}
+ />,
+ },
+ {
+ title: '璁惧宸ヤ綔鍙�',
+ dataIndex: 'deviceWrk',
+ valueType: 'text',
+ hidden: false,
+ width: 140,
+ filterDropdown: (props) => <TextFilter
+ name='deviceWrk'
+ {...props}
+ actionRef={actionRef}
+ setSearchParam={setSearchParam}
+ />,
+ },
+ {
+ title: '涓嬪彂鐘舵��',
+ dataIndex: 'send$',
+ valueType: 'text',
+ hidden: false,
+ width: 140,
+ filterDropdown: (props) => <SelectFilter
+ name='send'
+ {...props}
+ actionRef={actionRef}
+ setSearchParam={setSearchParam}
+ data={[
+ { label: '鏈笅鍙�', value: 0 },
+ { label: '宸蹭笅鍙�', value: 1 },
+ ]}
+ />,
+ },
+ {
+ title: '璇锋眰鍝嶅簲',
+ dataIndex: 'response',
+ valueType: 'text',
+ hidden: false,
+ width: 140,
+ ellipsis: true,
+ filterDropdown: (props) => <TextFilter
+ name='response'
{...props}
actionRef={actionRef}
setSearchParam={setSearchParam}
@@ -189,45 +274,6 @@
width: 140,
filterDropdown: (props) => <TextFilter
name='memo'
- {...props}
- actionRef={actionRef}
- setSearchParam={setSearchParam}
- />,
- },
- {
- title: '鍛戒护',
- dataIndex: 'command',
- valueType: 'text',
- hidden: false,
- width: 140,
- filterDropdown: (props) => <TextFilter
- name='command'
- {...props}
- actionRef={actionRef}
- setSearchParam={setSearchParam}
- />,
- },
- {
- title: '绯荤粺鐘舵��',
- dataIndex: 'systemStatus',
- valueType: 'text',
- hidden: false,
- width: 140,
- filterDropdown: (props) => <TextFilter
- name='systemStatus'
- {...props}
- actionRef={actionRef}
- setSearchParam={setSearchParam}
- />,
- },
- {
- title: '璁惧宸ヤ綔鍙�',
- dataIndex: 'deviceWrk',
- valueType: 'text',
- hidden: false,
- width: 140,
- filterDropdown: (props) => <TextFilter
- name='deviceWrk'
{...props}
actionRef={actionRef}
setSearchParam={setSearchParam}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/LiftAction.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/LiftAction.java
index a84e807..1946db0 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/LiftAction.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/LiftAction.java
@@ -10,14 +10,18 @@
import com.zy.asrs.wcs.rcs.News;
import com.zy.asrs.wcs.rcs.cache.SlaveConnection;
import com.zy.asrs.wcs.rcs.constant.DeviceRedisConstant;
+import com.zy.asrs.wcs.rcs.entity.BasLiftOpt;
import com.zy.asrs.wcs.rcs.entity.Device;
+import com.zy.asrs.wcs.rcs.model.CommandResponse;
import com.zy.asrs.wcs.rcs.model.enums.LiftProtocolStatusType;
import com.zy.asrs.wcs.rcs.model.enums.SlaveType;
import com.zy.asrs.wcs.rcs.model.protocol.LiftProtocol;
+import com.zy.asrs.wcs.rcs.service.BasLiftOptService;
import com.zy.asrs.wcs.rcs.thread.LiftThread;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import java.util.Date;
import java.util.List;
@Component
@@ -27,6 +31,8 @@
private RedisUtil redisUtil;
@Autowired
private TaskService taskService;
+ @Autowired
+ private BasLiftOptService basLiftOptService;
public synchronized boolean assignWork(Device device, LiftAssignCommand assignCommand) {
LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, device.getId().intValue());
@@ -147,8 +153,26 @@
//鍙栧嚭鍛戒护
LiftCommand command = commands.get(commandStep);
- boolean result = write(command, device);
- if (!result) {
+ // 涓嬪彂鍛戒护
+ CommandResponse response = write(command, device);
+
+ //淇濆瓨鍛戒护鏃ュ織
+ BasLiftOpt basLiftOpt = new BasLiftOpt();
+ basLiftOpt.setTaskNo(taskNo);
+ basLiftOpt.setLiftNo(liftProtocol.getLiftNo());
+ basLiftOpt.setMode(LiftCommandModeType.get(command.getMode()).desc);
+ basLiftOpt.setCommand(JSON.toJSONString(command));
+ basLiftOpt.setSystemStatus(JSON.toJSONString(liftProtocol));
+ basLiftOpt.setDeviceId(device.getId());
+ basLiftOpt.setDeviceWrk(String.valueOf(command.getTaskNo()));
+ basLiftOpt.setResponse(response.getMessage());//鑾峰彇鍝嶅簲
+ basLiftOpt.setSendTime(new Date());//鎸囦护涓嬪彂鏃堕棿
+ basLiftOpt.setSend(response.getResult() ? 1 : 0);
+ basLiftOpt.setHostId(device.getHostId());
+ //淇濆瓨鍛戒护娴佹按
+ basLiftOptService.save(basLiftOpt);
+
+ if (!response.getResult()) {
News.error("鎻愬崌鏈哄懡浠や笅鍙戝け璐ワ紝鎻愬崌鏈哄彿={}锛屼换鍔℃暟鎹�={}", command.getLiftNo(), JSON.toJSON(command));
return false;
} else {
@@ -164,30 +188,31 @@
return true;
}
- private synchronized boolean write(LiftCommand command, Device device) {
+ private synchronized CommandResponse write(LiftCommand command, Device device) {
+ CommandResponse response = new CommandResponse(false);
if (null == command) {
News.error("鎻愬崌鏈哄啓鍏ュ懡浠や负绌�");
- return false;
+ response.setMessage("鎻愬崌鏈哄啓鍏ュ懡浠や负绌�");
+ return response;
}
LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, device.getId().intValue());
if (liftThread == null) {
- return false;
+ return response;
}
- boolean result = false;
if (command.getMode() == LiftCommandModeType.MOVE.id) {
- result = liftThread.move(command);
+ response = liftThread.move(command);
} else if (command.getMode() == LiftCommandModeType.PALLET_INOUT.id) {
- result = liftThread.palletInOut(command);
+ response = liftThread.palletInOut(command);
} else if (command.getMode() == LiftCommandModeType.LOCK.id) {
- result = liftThread.lock(command);
+ response = liftThread.lock(command);
} else if (command.getMode() == LiftCommandModeType.UNLOCK.id) {
- result = liftThread.unlock(command);
+ response = liftThread.unlock(command);
} else if (command.getMode() == LiftCommandModeType.RESET.id) {
- result = liftThread.reset(command);
+ response = liftThread.reset(command);
}
- return result;
+ return response;
}
}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/controller/BasLiftOptController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/controller/BasLiftOptController.java
index 3716e08..aeb7d03 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/controller/BasLiftOptController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/controller/BasLiftOptController.java
@@ -1,6 +1,7 @@
package com.zy.asrs.wcs.system.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
@@ -33,7 +34,9 @@
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<BasLiftOpt, BaseParam> pageParam = new PageParam<>(baseParam, BasLiftOpt.class);
- return R.ok().add(basLiftOptService.page(pageParam, pageParam.buildWrapper(true)));
+ QueryWrapper<BasLiftOpt> wrapper = pageParam.buildWrapper(true);
+ wrapper.orderByDesc("send_time");
+ return R.ok().add(basLiftOptService.page(pageParam, wrapper));
}
@PreAuthorize("hasAuthority('rcs:basLiftOpt:list')")
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/entity/BasLiftOpt.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/entity/BasLiftOpt.java
index 1a2684c..f373218 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/entity/BasLiftOpt.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/entity/BasLiftOpt.java
@@ -111,6 +111,24 @@
@ApiModelProperty(value= "璁惧ID")
private Long deviceId;
+ /**
+ * 妯″紡
+ */
+ @ApiModelProperty(value= "妯″紡")
+ private String mode;
+
+ /**
+ * 涓嬪彂鐘舵�� 0: 澶辫触 1: 鎴愬姛
+ */
+ @ApiModelProperty(value= "涓嬪彂鐘舵�� 0: 澶辫触 1: 鎴愬姛 ")
+ private Integer send;
+
+ /**
+ * 璇锋眰鍝嶅簲
+ */
+ @ApiModelProperty(value= "璇锋眰鍝嶅簲")
+ private String response;
+
public BasLiftOpt() {}
public BasLiftOpt(Integer taskNo,Integer liftNo,Date sendTime,Date updateTime,Long updateBy,String memo,String command,String systemStatus,String deviceWrk,Integer deleted,Long hostId,Long deviceId) {
@@ -196,5 +214,17 @@
return null;
}
+ public String getSend$(){
+ if (null == this.send){ return null; }
+ switch (this.send){
+ case 0:
+ return "澶辫触";
+ case 1:
+ return "鎴愬姛";
+ default:
+ return String.valueOf(this.send);
+ }
+ }
+
}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/LiftThread.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/LiftThread.java
index 6a5ff8e..1774650 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/LiftThread.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/LiftThread.java
@@ -6,6 +6,7 @@
import com.zy.asrs.wcs.core.model.enums.LiftCommandModeType;
import com.zy.asrs.wcs.core.model.enums.MotionCtgType;
import com.zy.asrs.wcs.rcs.entity.Device;
+import com.zy.asrs.wcs.rcs.model.CommandResponse;
import com.zy.asrs.wcs.rcs.model.enums.LiftProtocolStatusType;
import com.zy.asrs.wcs.rcs.model.protocol.LiftProtocol;
@@ -17,15 +18,15 @@
Device getDevice();//鑾峰彇璁惧淇℃伅
- boolean move(LiftCommand command);//鍗囬檷绉诲姩
+ CommandResponse move(LiftCommand command);//鍗囬檷绉诲姩
- boolean palletInOut(LiftCommand command);//鎵樼洏鍑哄叆
+ CommandResponse palletInOut(LiftCommand command);//鎵樼洏鍑哄叆
- boolean lock(LiftCommand command);//閿佸畾鎻愬崌鏈�
+ CommandResponse lock(LiftCommand command);//閿佸畾鎻愬崌鏈�
- boolean unlock(LiftCommand command);//瑙ｉ攣鎻愬崌鏈�
+ CommandResponse unlock(LiftCommand command);//瑙ｉ攣鎻愬崌鏈�
- boolean reset(LiftCommand command);//澶嶄綅
+ CommandResponse reset(LiftCommand command);//澶嶄綅
boolean isIdle();//鏄惁绌洪棽
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/JxgtLiftThread.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/JxgtLiftThread.java
index 9a77458..039dcbb 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/JxgtLiftThread.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/JxgtLiftThread.java
@@ -22,6 +22,7 @@
import com.zy.asrs.wcs.rcs.cache.OutputQueue;
import com.zy.asrs.wcs.rcs.entity.Device;
import com.zy.asrs.wcs.rcs.entity.DeviceDataLog;
+import com.zy.asrs.wcs.rcs.model.CommandResponse;
import com.zy.asrs.wcs.rcs.model.enums.LiftProtocolStatusType;
import com.zy.asrs.wcs.rcs.model.protocol.LiftProtocol;
import com.zy.asrs.wcs.rcs.service.DeviceDataLogService;
@@ -195,19 +196,21 @@
}
@Override
- public boolean move(LiftCommand command) {
+ public CommandResponse move(LiftCommand command) {
return write(command);
}
@Override
- public boolean palletInOut(LiftCommand command) {
+ public CommandResponse palletInOut(LiftCommand command) {
return write(command);
}
- private boolean write(LiftCommand command) {
+ private CommandResponse write(LiftCommand command) {
+ CommandResponse response = new CommandResponse(false);
if (null == command) {
News.error("鎻愬崌鏈哄啓鍏ュ懡浠や负绌�");
- return false;
+ response.setMessage("鎻愬崌鏈哄啓鍏ュ懡浠や负绌�");
+ return response;
}
List<Integer> list = JSON.parseArray(command.getBody(), Integer.class);
@@ -233,27 +236,30 @@
liftProtocol.setSendTime(System.currentTimeMillis());//鎸囦护涓嬪彂鏃堕棿
News.info("鎻愬崌鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", device.getId(), JSON.toJSON(command));
OutputQueue.LIFT.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), device.getId(), JSON.toJSON(command)));
- return true;
+ response.setMessage(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), device.getId(), JSON.toJSON(command)));
+ response.setResult(true);
+ return response;
} else {
OutputQueue.LIFT.offer(MessageFormat.format("銆恵0}銆戝啓鍏ユ彁鍗囨満plc鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), device.getId(), device.getIp(), device.getPort()));
News.error("鍐欏叆鎻愬崌鏈簆lc鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}]", device.getId(), device.getIp(), device.getPort());
- return false;
+ response.setMessage(MessageFormat.format("銆恵0}銆戝啓鍏ユ彁鍗囨満plc鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), device.getId(), device.getIp(), device.getPort()));
+ return response;
}
}
@Override
- public boolean lock(LiftCommand command) {
+ public CommandResponse lock(LiftCommand command) {
return write(command);
}
@Override
- public boolean unlock(LiftCommand command) {
+ public CommandResponse unlock(LiftCommand command) {
return write(command);
}
@Override
- public boolean reset(LiftCommand command) {
- return false;
+ public CommandResponse reset(LiftCommand command) {
+ return new CommandResponse(true);
}
@Override
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/NyLiftThread.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/NyLiftThread.java
index 0c2e1c6..7e5b117 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/NyLiftThread.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/NyLiftThread.java
@@ -22,6 +22,7 @@
import com.zy.asrs.wcs.rcs.cache.OutputQueue;
import com.zy.asrs.wcs.rcs.entity.Device;
import com.zy.asrs.wcs.rcs.entity.DeviceDataLog;
+import com.zy.asrs.wcs.rcs.model.CommandResponse;
import com.zy.asrs.wcs.rcs.model.enums.LiftProtocolStatusType;
import com.zy.asrs.wcs.rcs.model.protocol.LiftProtocol;
import com.zy.asrs.wcs.rcs.service.DeviceDataLogService;
@@ -252,19 +253,21 @@
}
@Override
- public boolean move(LiftCommand command) {
+ public CommandResponse move(LiftCommand command) {
return write(command);
}
@Override
- public boolean palletInOut(LiftCommand command) {
+ public CommandResponse palletInOut(LiftCommand command) {
return write(command);
}
- private boolean write(LiftCommand command) {
+ private CommandResponse write(LiftCommand command) {
+ CommandResponse response = new CommandResponse(false);
if (null == command) {
News.error("鎻愬崌鏈哄啓鍏ュ懡浠や负绌�");
- return false;
+ response.setMessage("鎻愬崌鏈哄啓鍏ュ懡浠や负绌�");
+ return response;
}
List<Short> shorts = JSON.parseArray(command.getBody(), Short.class);
@@ -278,27 +281,30 @@
liftProtocol.setSendTime(System.currentTimeMillis());//鎸囦护涓嬪彂鏃堕棿
News.info("鎻愬崌鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", device.getId(), JSON.toJSON(command));
OutputQueue.LIFT.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), device.getId(), JSON.toJSON(command)));
- return true;
+ response.setMessage(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), device.getId(), JSON.toJSON(command)));
+ response.setResult(true);
+ return response;
} else {
OutputQueue.LIFT.offer(MessageFormat.format("銆恵0}銆戝啓鍏ユ彁鍗囨満plc鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}],娆℃暟锛歿}", DateUtils.convert(new Date()), device.getId(), device.getIp(), device.getPort()));
News.error("鍐欏叆鎻愬崌鏈簆lc鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}]", device.getId(), device.getIp(), device.getPort());
- return false;
+ response.setMessage(MessageFormat.format("銆恵0}銆戝啓鍏ユ彁鍗囨満plc鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}],娆℃暟锛歿}", DateUtils.convert(new Date()), device.getId(), device.getIp(), device.getPort()));
+ return response;
}
}
@Override
- public boolean lock(LiftCommand command) {
- return true;
+ public CommandResponse lock(LiftCommand command) {
+ return new CommandResponse(true);
}
@Override
- public boolean unlock(LiftCommand command) {
- return true;
+ public CommandResponse unlock(LiftCommand command) {
+ return new CommandResponse(true);
}
@Override
- public boolean reset(LiftCommand command) {
- return false;
+ public CommandResponse reset(LiftCommand command) {
+ return new CommandResponse(false);
}
@Override
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayLiftThread.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayLiftThread.java
index f1c4e9e..a08d18d 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayLiftThread.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayLiftThread.java
@@ -17,6 +17,7 @@
import com.zy.asrs.wcs.rcs.News;
import com.zy.asrs.wcs.rcs.cache.OutputQueue;
import com.zy.asrs.wcs.rcs.entity.DeviceDataLog;
+import com.zy.asrs.wcs.rcs.model.CommandResponse;
import com.zy.asrs.wcs.rcs.model.enums.LiftProtocolStatusType;
import com.zy.asrs.wcs.rcs.model.protocol.LiftProtocol;
import com.zy.asrs.wcs.rcs.service.DeviceDataLogService;
@@ -217,148 +218,163 @@
}
@Override
- public synchronized boolean move(LiftCommand command) {
+ public synchronized CommandResponse move(LiftCommand command) {
+ CommandResponse response = new CommandResponse(false);
try {
String loginToken = requestLoginToken();
if (loginToken == null) {
- return false;
+ return response;
}
HashMap<String, Object> headers = new HashMap<>();
headers.put("Authorization", "Bearer " + loginToken);
- String response = new HttpHandler.Builder()
+ String responseStr = new HttpHandler.Builder()
.setUri(API_URL)
.setPath("/RDS/lifterTask")
.setHeaders(headers)
.setJson(command.getBody())
.build()
.doPost();
- JSONObject jsonObject = JSON.parseObject(response);
+ JSONObject jsonObject = JSON.parseObject(responseStr);
Integer code = jsonObject.getInteger("code");
+ response.setMessage(JSON.toJSONString(jsonObject));
if (code.equals(200)) {
- return true;
+ response.setResult(true);
+ return response;
}
} catch (Exception e) {
e.printStackTrace();
}
- return false;
+ return response;
}
@Override
- public synchronized boolean palletInOut(LiftCommand command) {
+ public synchronized CommandResponse palletInOut(LiftCommand command) {
+ CommandResponse response = new CommandResponse(false);
try {
String loginToken = requestLoginToken();
if (loginToken == null) {
- return false;
+ return response;
}
HashMap<String, Object> headers = new HashMap<>();
headers.put("Authorization", "Bearer " + loginToken);
- String response = new HttpHandler.Builder()
+ String responseStr = new HttpHandler.Builder()
.setUri(API_URL)
.setPath("/RDS/lifterTask")
.setHeaders(headers)
.setJson(command.getBody())
.build()
.doPost();
- JSONObject jsonObject = JSON.parseObject(response);
+ JSONObject jsonObject = JSON.parseObject(responseStr);
Integer code = jsonObject.getInteger("code");
+ response.setMessage(JSON.toJSONString(jsonObject));
if (code.equals(200)) {
- return true;
+ response.setResult(true);
+ return response;
}
} catch (Exception e) {
e.printStackTrace();
}
- return false;
+ return response;
}
@Override
- public synchronized boolean lock(LiftCommand command) {
+ public synchronized CommandResponse lock(LiftCommand command) {
+ CommandResponse response = new CommandResponse(false);
try {
String loginToken = requestLoginToken();
if (loginToken == null) {
- return false;
+ return response;
}
HashMap<String, Object> headers = new HashMap<>();
headers.put("Authorization", "Bearer " + loginToken);
- String response = new HttpHandler.Builder()
+ String responseStr = new HttpHandler.Builder()
.setUri(API_URL)
.setPath("/RDS/lifterOperation")
.setHeaders(headers)
.setJson(command.getBody())
.build()
.doPost();
- JSONObject jsonObject = JSON.parseObject(response);
+ JSONObject jsonObject = JSON.parseObject(responseStr);
Integer code = jsonObject.getInteger("code");
+ response.setMessage(JSON.toJSONString(jsonObject));
if (code.equals(200)) {
- return true;
+ response.setResult(true);
+ return response;
}
} catch (Exception e) {
e.printStackTrace();
}
- return false;
+ return response;
}
@Override
- public synchronized boolean unlock(LiftCommand command) {
+ public synchronized CommandResponse unlock(LiftCommand command) {
+ CommandResponse response = new CommandResponse(false);
try {
String loginToken = requestLoginToken();
if (loginToken == null) {
- return false;
+ return response;
}
HashMap<String, Object> headers = new HashMap<>();
headers.put("Authorization", "Bearer " + loginToken);
- String response = new HttpHandler.Builder()
+ String responseStr = new HttpHandler.Builder()
.setUri(API_URL)
.setPath("/RDS/lifterOperation")
.setHeaders(headers)
.setJson(command.getBody())
.build()
.doPost();
- JSONObject jsonObject = JSON.parseObject(response);
+ JSONObject jsonObject = JSON.parseObject(responseStr);
Integer code = jsonObject.getInteger("code");
+ response.setMessage(JSON.toJSONString(jsonObject));
if (code.equals(200)) {
- return true;
+ response.setResult(true);
+ return response;
}
} catch (Exception e) {
e.printStackTrace();
}
- return false;
+ return response;
}
@Override
- public synchronized boolean reset(LiftCommand command) {
+ public synchronized CommandResponse reset(LiftCommand command) {
+ CommandResponse response = new CommandResponse(false);
try {
String loginToken = requestLoginToken();
if (loginToken == null) {
- return false;
+ return response;
}
HashMap<String, Object> headers = new HashMap<>();
headers.put("Authorization", "Bearer " + loginToken);
- String response = new HttpHandler.Builder()
+ String responseStr = new HttpHandler.Builder()
.setUri(API_URL)
.setPath("/RDS/lifterOperation")
.setHeaders(headers)
.setJson(command.getBody())
.build()
.doPost();
- JSONObject jsonObject = JSON.parseObject(response);
+ JSONObject jsonObject = JSON.parseObject(responseStr);
Integer code = jsonObject.getInteger("code");
+ response.setMessage(JSON.toJSONString(jsonObject));
if (code.equals(200)) {
- return true;
+ response.setResult(true);
+ return response;
}
} catch (Exception e) {
e.printStackTrace();
}
- return false;
+ return response;
}
@Override
--
Gitblit v1.9.1