钢网料架无法亮灯问题

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

 package com.neotel.smfcore.core.device.handler.impl;
 
+import com.neotel.smfcore.common.utils.StringUtils;
+import com.neotel.smfcore.core.device.bean.StatusBean;
+import com.neotel.smfcore.core.device.enums.OP_STATUS;
+import com.neotel.smfcore.core.order.enums.ORDER_COLOR;
 import com.neotel.smfcore.core.storage.enums.DeviceType;
+import com.neotel.smfcore.core.system.bean.OrderSetting;
+import com.neotel.smfcore.core.system.service.po.DataLog;
+import com.neotel.smfcore.core.system.util.DevicesStatusUtil;
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.*;
 
 @Api(tags = "SHELF: NLS(扫码钢网料架)")
 @Slf4j
-public class NLSShelfHandler  extends NLShelfHandler{
+@Service
+public class NLSShelfHandler  extends BaseDeviceHandler{
+
 
     @Override
+    public StatusBean handleClientRequest(StatusBean statusBean, HttpServletRequest request) {
+        statusBean.setClientIp(request.getRemoteHost());
+        handleMsg(statusBean);
+        statusBean = saveAlarmAndHumidity(statusBean);
+
+
+        OrderSetting orderSetting = dataCache.getOrderSetting();
+        boolean openZhiYin = orderSetting.getShelfLightType().equals(1);
+        Map<String, List<DataLog>> outMap = new HashMap<>();
+
+        if (statusBean != null) {
+            String cid = statusBean.getCid();
+            List<DataLog> finishedTasks = taskService.getFinishedTasks();
+            for (DataLog finishedTask : finishedTasks) {
+                if(finishedTask.getCid().equals(cid) && finishedTask.isCheckOutTask() && finishedTask.isCancel()){
+                    //取消的任务,需要关灯
+                    taskService.removeFinishedTask(finishedTask);
+                    statusBean.addData("close",finishedTask.getPosName());
+                }
+            }
+
+
+            Map<String, String> opMap = DevicesStatusUtil.getAndRemoveOp(statusBean.getCid());
+            statusBean.addOp(opMap);
+        }
+
+        //亮灯
+        Collection<DataLog> queueTasks = taskService.getQueueTasks(statusBean.getCid());
+
+        for (DataLog queueTask : queueTasks) {
+            if (!openZhiYin || StringUtils.isBlank(queueTask.getSourceId())) {
+                if (queueTask.isWait()) {
+                    String rgb = queueTask.getLightColor();
+                    ORDER_COLOR color = ORDER_COLOR.fromRgb(rgb);
+                    if (color == null) {
+                        if (queueTask.isPutInTask()) {
+                            color = ORDER_COLOR.FORESTGREEN;
+                        } else {
+                            color = ORDER_COLOR.BLUE;
+                        }
+                    }
+                    queueTask.setStatus(OP_STATUS.EXECUTING.name());
+                    taskService.updateQueueTask(queueTask);
+                    statusBean.addData("open", queueTask.getPosName() + "=" + color.name());
+                    log.info("库位[" + queueTask.getPosName() + "][" + queueTask.getType() + "]+亮灯:" + color.name());
+                }
+            } else {
+                if (queueTask.isWait() || queueTask.isExecuting()) {
+                    List<DataLog> dataLogList = outMap.get(queueTask.getSourceId());
+                    if (dataLogList == null) {
+                        dataLogList = new ArrayList<>();
+                    }
+                    dataLogList.add(queueTask);
+                    outMap.put(queueTask.getSourceId(), dataLogList);
+                }
+            }
+        }
+
+        List<DataLog> dataLogs = getLightGuideTask(outMap,statusBean.getCid());
+        for (DataLog task : dataLogs) {
+            if (StringUtils.isBlank(task.getLightColor())){
+                task.setLightColor(ORDER_COLOR.BLUE.getRgb());
+            }
+            String colorName = ORDER_COLOR.fromRgb(task.getLightColor()).name();
+            statusBean.addData("open", task.getPosName() + "=" + colorName);
+            log.info("库位[" + task.getPosName() + "][" + task.getType() + "]+亮灯:" + colorName);
+
+        }
+        return statusBean;
+    }
+    @Override
     public DeviceType getDeviceType() {
         return DeviceType.NLS;
     }
+
+
 }