料仓在线时显示IP

src/main/java/com/neotel/smfcore/core/device/handler/impl/AccShelfHandler.java

@@ -25,6 +25,7 @@ public class AccShelfHandler extends BaseDeviceHandler{
 
 
     @Override
     @Override
     public StatusBean handleClientRequest(StatusBean statusBean, HttpServletRequest request) {
     public StatusBean handleClientRequest(StatusBean statusBean, HttpServletRequest request) {
+        statusBean.setClientIp(request.getRemoteHost());
         handleMsg(statusBean);
         handleMsg(statusBean);
         statusBean = saveAlarmAndHumidity(statusBean);
         statusBean = saveAlarmAndHumidity(statusBean);
         OrderSetting orderSetting = dataCache.getOrderSetting();
         OrderSetting orderSetting = dataCache.getOrderSetting();

src/main/java/com/neotel/smfcore/core/device/handler/impl/BaseDeviceHandler.java

@@ -123,6 +123,7 @@ public class BaseDeviceHandler implements IDeviceHandler {
 
 
     @Override
     @Override
     public StatusBean handleClientRequest(StatusBean statusBean, HttpServletRequest request) {
     public StatusBean handleClientRequest(StatusBean statusBean, HttpServletRequest request) {
+        statusBean.setClientIp(request.getRemoteHost());
         handleMsg(statusBean);
         handleMsg(statusBean);
         statusBean = saveAlarmAndHumidity(statusBean);
         statusBean = saveAlarmAndHumidity(statusBean);
 
 
@@ -708,7 +709,11 @@ public class BaseDeviceHandler implements IDeviceHandler {
             //展示到界面
             //展示到界面
             String msg = statusBean.getMsg();
             String msg = statusBean.getMsg();
             String msgEn = statusBean.getMsgEn();
             String msgEn = statusBean.getMsgEn();
-            DevicesStatusUtil.updateClientMsg(statusBean.getCid(), msg, msgEn);
+            String msgCode=statusBean.getMsgCode();
+
+            if(ObjectUtil.isNotEmpty(msg)||ObjectUtil.isNotEmpty(msgCode)){
+                DevicesStatusUtil.updateClientMsg(statusBean.getCid(),msgCode, msg, msgEn,statusBean.getMsgParam());
+            }
         } catch (Exception e) {
         } catch (Exception e) {
             log.error("客户端故障消息处理出错", e);
             log.error("客户端故障消息处理出错", e);
         }
         }

src/main/java/com/neotel/smfcore/core/device/handler/impl/NLPShelfHandler.java

@@ -181,6 +181,7 @@ public class NLPShelfHandler extends BaseDeviceHandler{
 
 
     @Override
     @Override
     public StatusBean handleClientRequest(StatusBean statusBean, HttpServletRequest request) {
     public StatusBean handleClientRequest(StatusBean statusBean, HttpServletRequest request) {
+        statusBean.setClientIp(request.getRemoteHost());
         handleMsg(statusBean);
         handleMsg(statusBean);
         statusBean = saveAlarmAndHumidity(statusBean);
         statusBean = saveAlarmAndHumidity(statusBean);
 
 

src/main/java/com/neotel/smfcore/core/device/handler/impl/NLShelfHandler.java

@@ -54,6 +54,7 @@ public class NLShelfHandler extends BaseDeviceHandler {
 
 
     @Override
     @Override
     public StatusBean handleClientRequest(StatusBean statusBean, HttpServletRequest request) {
     public StatusBean handleClientRequest(StatusBean statusBean, HttpServletRequest request) {
+        statusBean.setClientIp(request.getRemoteHost());
         handleMsg(statusBean);
         handleMsg(statusBean);
         statusBean = saveAlarmAndHumidity(statusBean);
         statusBean = saveAlarmAndHumidity(statusBean);
 
 

src/main/java/com/neotel/smfcore/core/device/handler/impl/SisoBoxHandler.java

@@ -20,6 +20,7 @@ public class SisoBoxHandler extends BaseDeviceHandler {
     }
     }
     @Override
     @Override
     public StatusBean handleClientRequest(StatusBean statusBean, HttpServletRequest request) {
     public StatusBean handleClientRequest(StatusBean statusBean, HttpServletRequest request) {
+        statusBean.setClientIp(request.getRemoteHost());
         String cid = statusBean.getCid();
         String cid = statusBean.getCid();
         Storage storage = dataCache.getStorage(cid);
         Storage storage = dataCache.getStorage(cid);
         if (storage == null) {
         if (storage == null) {

src/main/java/com/neotel/smfcore/core/device/handler/impl/SpBoxHandler.java

@@ -50,6 +50,7 @@ public class SpBoxHandler extends BaseDeviceHandler {
 
 
     @Override
     @Override
     public StatusBean handleClientRequest(StatusBean statusBean, HttpServletRequest request) {
     public StatusBean handleClientRequest(StatusBean statusBean, HttpServletRequest request) {
+        statusBean.setClientIp(request.getRemoteHost());
         handleMsg(statusBean);
         handleMsg(statusBean);
         statusBean = saveAlarmAndHumidity(statusBean);
         statusBean = saveAlarmAndHumidity(statusBean);
         statusBean = handleInOutFinished(statusBean);
         statusBean = handleInOutFinished(statusBean);

src/main/java/com/neotel/smfcore/core/device/handler/impl/VerticalBoxHandler.java

@@ -40,6 +40,7 @@ public class VerticalBoxHandler extends BaseDeviceHandler {
 
 
     @Override
     @Override
     public StatusBean handleClientRequest(StatusBean statusBean, HttpServletRequest request) {
     public StatusBean handleClientRequest(StatusBean statusBean, HttpServletRequest request) {
+        statusBean.setClientIp(request.getRemoteHost());
         handleMsg(statusBean);
         handleMsg(statusBean);
 //        statusBean = saveStatus(statusBean);
 //        statusBean = saveStatus(statusBean);
         String cid = statusBean.getCid();
         String cid = statusBean.getCid();

src/main/java/com/neotel/smfcore/core/device/handler/impl/XLCBoxHandler.java

@@ -151,6 +151,7 @@ public class XLCBoxHandler extends BaseDeviceHandler {
             log.error("料仓cid: [" + cid + "]不存在");
             log.error("料仓cid: [" + cid + "]不存在");
             return null;
             return null;
         }
         }
+        statusBean.setClientIp(request.getRemoteHost());
         handleMsg(statusBean);
         handleMsg(statusBean);
         statusBean = saveAlarmAndHumidity(statusBean);
         statusBean = saveAlarmAndHumidity(statusBean);
         statusBean = handleXLCStatusBean(statusBean);
         statusBean = handleXLCStatusBean(statusBean);

src/main/java/com/neotel/smfcore/core/device/handler/impl/XlBoxHandler.java

@@ -57,6 +57,7 @@ public class XlBoxHandler extends BaseDeviceHandler {
 
 
     @Override
     @Override
     public StatusBean handleClientRequest(StatusBean statusBean, HttpServletRequest request) {
     public StatusBean handleClientRequest(StatusBean statusBean, HttpServletRequest request) {
+        statusBean.setClientIp(request.getRemoteHost());
         handleMsg(statusBean);
         handleMsg(statusBean);
         statusBean = saveAlarmAndHumidity(statusBean);
         statusBean = saveAlarmAndHumidity(statusBean);
         statusBean = handleXlStatusBean(statusBean);
         statusBean = handleXlStatusBean(statusBean);

src/main/java/com/neotel/smfcore/core/kanban/rest/bean/dto/BoxStatusDto.java

@@ -68,6 +68,13 @@ public class BoxStatusDto {
     @ApiModelProperty("使用情况")
     @ApiModelProperty("使用情况")
     private Map<String, UsageItem> usageMap = new ConcurrentHashMap<>();
     private Map<String, UsageItem> usageMap = new ConcurrentHashMap<>();
     @ApiModelProperty("操作信息")
     @ApiModelProperty("操作信息")
+    //单盘入库：singleReelIn
+    // 打开门锁：openLock
+    //关闭门锁：closeLock
+    //开始批量入库：startBatchIn
+    //取出出库料盘:takeOutReel
+    //关闭仓门:confirmReelOut
+//      状态显示：  disable:不可用，enable：可用，点击按钮后发送 doit
     private Map<String, String> data = new HashMap<>();
     private Map<String, String> data = new HashMap<>();
 
 
     @ApiModelProperty("当前绑定的入库单名称")
     @ApiModelProperty("当前绑定的入库单名称")