料架设置页面：一键灭灯，一键亮灯功能

src/main/java/com/neotel/smfcore/core/storage/rest/StorageController.java

@@ -207,26 +207,78 @@ public class StorageController {
     @ApiOperation("料架设置页面：一键亮灯")
     @ApiOperation("料架设置页面：一键亮灯")
     @PostMapping(value = "/shelfLight")
     @PostMapping(value = "/shelfLight")
     public ResultBean shelfLight(  @RequestBody Map<String,String> params) {
     public ResultBean shelfLight(  @RequestBody Map<String,String> params) {
-        String storageId=params.get("storageId");
+        String storageId = params.get("storageId");
         Storage storage = dataCache.getStorageById(storageId);
         Storage storage = dataCache.getStorageById(storageId);
         if (storage == null) {
         if (storage == null) {
             log.error("Storage id is not exist");
             log.error("Storage id is not exist");
             throw new ValidateException("smfcore.storage.error.notExist", "未找到料仓{0}", new String[]{storageId});
             throw new ValidateException("smfcore.storage.error.notExist", "未找到料仓{0}", new String[]{storageId});
         }
         }
+        List<String> posNames = dataCache.getUsedPosNameList(storage.getCid());
 
 
-        //获取料架的所有库位号
-        List<StoragePos> usePos = storagePosManager.findNotEmptyByStorageId(storage.getId());
+        log.info(storage.getCid() + " 点击： 一键亮灯 ");
+        for (String poaName :
+                posNames) {
+            String colorStr = ORDER_COLOR.BLUE.name();
+            String opStr = poaName + "=" + colorStr;
+            DevicesStatusUtil.appendOp(storage.getCid(), "open", opStr);
+            log.info("操作库位[" + poaName + "]" + "open" + " : " + opStr);
+        }
+        return ResultBean.newOkResult("");
+    }
 
 
-        for (StoragePos pos :
-                usePos) {
+    @ApiOperation("料架设置页面：一键灭灯")
+    @PostMapping(value = "/shelfClose")
+    public ResultBean shelfClose(  @RequestBody Map<String,String> params) {
+        String storageId = params.get("storageId");
+        Storage storage = dataCache.getStorageById(storageId);
+        if (storage == null) {
+            log.error("Storage id is not exist");
+            throw new ValidateException("smfcore.storage.error.notExist", "未找到料仓{0}", new String[]{storageId});
+        }
+
+        log.info(storage.getCid() + " 点击： 一键灭灯 ");
+        DevicesStatusUtil.appendOp(storage.getCid(), "closeAll", "true");
+        return ResultBean.newOkResult("");
+    }
+
+    @ApiOperation("料架设置页面：全部一键亮灯")
+    @PostMapping(value = "/allShelfLight")
+    public ResultBean allShelfLight( ) {
+        Map<String, Storage> storages = dataCache.getAllStorage();
+        log.info(" 点击： 全部一键亮灯 ");
+        for (Storage storage :
+                storages.values()) {
+
+            if (storage.isNLMShelf() || storage.isNLPShelf() || storage.isNLShelf()) {
+                log.info(storage.getCid() + "   一键灭灯 ");
+                //获取料架使用的库位号
+                List<String> posNames = dataCache.getUsedPosNameList(storage.getCid());
+                for (String posName :
+                        posNames) {
                     String colorStr = ORDER_COLOR.BLUE.name();
                     String colorStr = ORDER_COLOR.BLUE.name();
-            String opStr = pos.getPosName() + "=" + colorStr;
+                    String opStr = posName + "=" + colorStr;
                     DevicesStatusUtil.appendOp(storage.getCid(), "open", opStr);
                     DevicesStatusUtil.appendOp(storage.getCid(), "open", opStr);
-            log.info("操作库位[" + pos.getPosName() + "]" + "open" + " : " + opStr);
+                    log.info(storage.getCid() + "操作库位[" + posName + "]" + "open" + " : " + opStr);
+                }
+            }
         }
         }
         return ResultBean.newOkResult("");
         return ResultBean.newOkResult("");
     }
     }
 
 
+    @ApiOperation("料架设置页面：全部一键灭灯")
+    @PostMapping(value = "/allShelfClose")
+    public ResultBean allShelfClose(  ) {
+        Map<String, Storage> storages = dataCache.getAllStorage();
+        log.info(" 点击： 全部一键亮灯 ");
+        for (Storage storage :
+                storages.values()) {
+            if (storage.isNLMShelf() || storage.isNLPShelf() || storage.isNLShelf()) {
+                log.info(storage.getCid() + "   一键灭灯 ");
+                DevicesStatusUtil.appendOp(storage.getCid(), "closeAll", "true");
+            }
+        }
+        return ResultBean.newOkResult("");
+    }
     @ApiOperation("返回所有料仓类型")
     @ApiOperation("返回所有料仓类型")
     @GetMapping(value = "/typeList")
     @GetMapping(value = "/typeList")
     public List<String> typeList() {
     public List<String> typeList() {