感应料架增加亮灯指引功能

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

@@ -23,6 +23,7 @@ import com.neotel.smfcore.core.order.enums.ORDER_COLOR;
 import com.neotel.smfcore.core.storage.enums.DeviceType;
 import com.neotel.smfcore.core.storage.enums.DeviceType;
 import com.neotel.smfcore.core.storage.service.po.Storage;
 import com.neotel.smfcore.core.storage.service.po.Storage;
 import com.neotel.smfcore.core.storage.service.po.StoragePos;
 import com.neotel.smfcore.core.storage.service.po.StoragePos;
+import com.neotel.smfcore.core.system.bean.OrderSetting;
 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.DevicesStatusUtil;
 import com.neotel.smfcore.core.system.websocket.MsgType;
 import com.neotel.smfcore.core.system.websocket.MsgType;
@@ -193,6 +194,11 @@ public class SensorShelfHandler extends BaseDeviceHandler {
     public StatusBean handleClientRequest(StatusBean statusBean, HttpServletRequest request) {
     public StatusBean handleClientRequest(StatusBean statusBean, HttpServletRequest request) {
         handleMsg(statusBean);
         handleMsg(statusBean);
         statusBean = saveAlarmAndHumidity(statusBean);
         statusBean = saveAlarmAndHumidity(statusBean);
+
+        OrderSetting orderSetting = dataCache.getOrderSetting();
+        boolean openZhiYin = orderSetting.getShelfLightType().equals(1);
+        Map<String, List<DataLog>> outMap = new HashMap<>();
+
         //亮灯
         //亮灯
         Collection<DataLog> queueTasks = taskService.getQueueTasks(statusBean.getCid());
         Collection<DataLog> queueTasks = taskService.getQueueTasks(statusBean.getCid());
         for (DataLog queueTask : queueTasks) {
         for (DataLog queueTask : queueTasks) {
@@ -205,9 +211,18 @@ public class SensorShelfHandler extends BaseDeviceHandler {
                     if(queueTask.isPutInTask()){
                     if(queueTask.isPutInTask()){
                         color = ORDER_COLOR.DARKGREEN;
                         color = ORDER_COLOR.DARKGREEN;
                     }else{
                     }else{
+                        if (openZhiYin && ObjectUtil.isNotEmpty(queueTask.getSourceId())) {
+                            List<DataLog> dataLogList = outMap.get(queueTask.getSourceId());
+                            if (dataLogList == null) {
+                                dataLogList = new ArrayList<>();
+                            }
+                            dataLogList.add(queueTask);
+                            outMap.put(queueTask.getSourceId(), dataLogList);
+                        } else {
                             color = ORDER_COLOR.BLUE;
                             color = ORDER_COLOR.BLUE;
                         }
                         }
                     }
                     }
+                }
                 statusBean.addData("open",queueTask.getPosName()+"="+color.name());
                 statusBean.addData("open",queueTask.getPosName()+"="+color.name());
                 log.info("库位["+queueTask.getPosName()+"]+亮灯:" + color.name());
                 log.info("库位["+queueTask.getPosName()+"]+亮灯:" + color.name());
             }
             }
@@ -221,6 +236,13 @@ public class SensorShelfHandler extends BaseDeviceHandler {
 //                }
 //                }
 //            }
 //            }
         }
         }
+
+        List<DataLog> dataLogs = getLightGuideTask(outMap);
+        for (DataLog task :
+                dataLogs) {
+            statusBean.addData("open", task.getPosName() + "=" + ORDER_COLOR.fromRgb(task.getLightColor()).name());
+        }
+
         return statusBean;
         return statusBean;
     }
     }