调试问题修改。组修改。

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

@@ -91,6 +91,9 @@ public class SensorShelfHandler extends BaseDeviceHandler {
 //        if(group != null){
 //            groupName = group.getGroupName();
 //        }
+        if(groupId.equals("")){
+            groupId="-1";
+        }
         String[] hasReelPosList = request.getParameterValues("hasReelPosList");
         String[] noReelPosList = request.getParameterValues("noReelPosList");
 

src/main/java/com/neotel/smfcore/core/device/util/DataCache.java

@@ -5,7 +5,6 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.utils.Constants;
-import com.neotel.smfcore.common.utils.StorageConstants;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import com.neotel.smfcore.core.barcode.utils.CodeResolve;
 import com.neotel.smfcore.core.storage.bean.InventoryItem;
@@ -14,7 +13,6 @@ import com.neotel.smfcore.core.storage.service.po.StoragePos;
 import com.neotel.smfcore.core.system.service.dao.ICacheItemDao;
 import com.neotel.smfcore.core.system.service.dao.ISettingsDao;
 import com.neotel.smfcore.core.barcode.bean.PlateSizeBean;
-import com.neotel.smfcore.core.system.service.manager.IDataLogManager;
 import com.neotel.smfcore.core.storage.service.manager.IStorageManager;
 import com.neotel.smfcore.core.storage.service.manager.IStoragePosManager;
 import com.neotel.smfcore.core.system.service.po.CacheItem;
@@ -24,7 +22,6 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
-import org.springframework.util.ObjectUtils;
 
 import javax.annotation.PostConstruct;
 import java.util.*;
@@ -461,15 +458,22 @@ public class DataCache {
         inventoryMap.put(cid, storageInventory);
     }
     public List<String> getCidsByGroupId(String groupId,boolean nullReturnAll){
+
+        if(groupId!=null&&groupId.equals("-1")){
+            groupId="";
+        }
         List<String> cidList = Lists.newArrayList();
 
         for (Storage storage : getAllStorage().values()) {
             if (groupId!=null) {
-                String storageGroupId = storage.getGroupId();
-                if(ObjectUtils.isEmpty(storageGroupId)){
-                    storageGroupId="";
-                }
-                if ( storageGroupId.equals(groupId)) {
+//                String storageGroupId = storage.getGroupId();
+//                if(ObjectUtils.isEmpty(storageGroupId)){
+//                    storageGroupId="";
+//                }
+//                if ( storageGroupId.equals(groupId)) {
+//                    cidList.add(storage.getCid());
+//                }
+                if(storage.IsRightGroup(groupId)){
                     cidList.add(storage.getCid());
                 }
             } else if(nullReturnAll){

src/main/java/com/neotel/smfcore/core/kanban/rest/BoxKanbanController.java

@@ -84,10 +84,7 @@ public class BoxKanbanController {
             Group group = groupManager.get(groupid);
             if (group == null) {
                 if(groupid.equals("")){
-                    group=new Group("" );
-                    group.setId("");
-                    group.setCreateDate(new Date());
-                    group.setUpdateDate(new Date());
+                    group=Group.defaulGroup();
                 }else
                 {
                     continue;

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

@@ -87,7 +87,11 @@ public class StoragePosController {
     @ApiOperation("删除指定料仓所有库位")
     @PutMapping("/removeAllPos")
     @PreAuthorize("@el.check('storage:edit')")
-    public ResponseEntity<Object> clearAllPos(@RequestBody  String cid) {
+    public ResultBean clearAllPos(@RequestBody  Map<String,String> map) {
+        String cid="";
+        if(map.containsKey("cid")){
+            cid= map.get("cid");
+        }
         log.info("开始清理料仓["+cid+"] 所有位置");
         Storage storage=dataCache.getStorage(cid);
         if(storage==null){
@@ -96,14 +100,17 @@ public class StoragePosController {
         }
         storagePosManager.removePosByStorageId(storage.getId());
         log.info("清理料仓["+cid+"] 所有位置完成");
-        return new ResponseEntity<>(HttpStatus.OK);
+        return ResultBean.newOkResult("");
     }
 
     @ApiOperation("清空指定料仓所有库位")
     @PutMapping("/clearStoragePos")
     @PreAuthorize("@el.check('storage:edit')")
-    public ResultBean clearStoragePos(@RequestBody  String cid) {
-
+    public ResultBean clearStoragePos(@RequestBody  Map<String,String> map) {
+        String cid="";
+        if(map.containsKey("cid")){
+            cid= map.get("cid");
+        }
         Storage storage = dataCache.getStorage(cid);
         if(storage==null){
             throw new ValidateException("smfcode.valueNotFind","未找到{0}[{1}]" ,new String[]{"cid", cid});

src/main/java/com/neotel/smfcore/core/storage/service/po/Storage.java

@@ -257,4 +257,16 @@ public class Storage extends BasePo implements Serializable {
         this.setEmptySlots(emptyPosCount);
         this.setTotalSlots(totalPosCount);
     }
+
+    public boolean IsRightGroup(String groupId) {
+
+        if (getGroupId().equals("")) {
+            if (groupId == null || groupId.equals("") || groupId.equals("-1")) {
+                return true;
+            }
+        }
+
+        return getGroupId().equals(groupId);
+    }
+
 }

src/main/java/com/neotel/smfcore/core/system/rest/TaskController.java

 
 package com.neotel.smfcore.core.system.rest;
 
-import cn.hutool.core.util.PageUtil;
-import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
 import com.neotel.smfcore.common.bean.PageData;
-import com.neotel.smfcore.common.bean.ResultBean;
-import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.utils.QueryHelp;
 import com.neotel.smfcore.core.device.enums.OP_STATUS;
 import com.neotel.smfcore.core.device.util.DataCache;
@@ -23,7 +19,6 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.http.HttpStatus;
@@ -33,7 +28,6 @@ import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.Calendar;
 import java.util.List;
 import java.util.Set;
 
@@ -79,7 +73,7 @@ public class TaskController {
         if (unEnd) {
             query.addCriteria(Criteria.where("status").nin(OP_STATUS.END.name(), OP_STATUS.FINISHED.name()));
         }
-        query.with(Sort.by(Sort.Direction.DESC,"updateDate","createDate"));
+//        query.with(Sort.by(Sort.Direction.DESC,"updateDate","createDate"));
         PageData<DataLog> taskList = dataLogManager.findByPage(query, pageable);
         PageData<TaskDto> result= taskMapper.toDto(taskList);
         return  result;
@@ -89,6 +83,9 @@ public class TaskController {
     @GetMapping("/{groupId}")
     @PreAuthorize("@el.check('task:inQueue','task:list')")
     public List<TaskDto> groupTask(@PathVariable String groupId){
+        if(groupId!=null&&groupId.equals("-1")){
+            groupId="";
+        }
         return getTaskList(groupId,null);
     }
 
@@ -108,11 +105,14 @@ public class TaskController {
 
         if (!ObjectUtils.isEmpty(groupId)) {
             for (Storage storage : dataCache.getAllStorage().values()) {
-                String storageGroupId = storage.getGroupId();
-                if (ObjectUtils.isEmpty(storageGroupId)) {
-                    storageGroupId = "";
-                }
-                if (storageGroupId != null && storageGroupId.equals(groupId)) {
+//                String storageGroupId = storage.getGroupId();
+//                if (ObjectUtils.isEmpty(storageGroupId)) {
+//                    storageGroupId = "";
+//                }
+//                if (storageGroupId != null && storageGroupId.equals(groupId)) {
+//                    cidList.add(storage.getCid());
+//                }
+                if(storage.IsRightGroup(groupId)){
                     cidList.add(storage.getCid());
                 }
             }
@@ -129,8 +129,9 @@ public class TaskController {
 
         if(!ObjectUtils.isEmpty(groupId)){
             for (Storage storage : dataCache.getAllStorage().values()) {
-                String storageGroupId = storage.getGroupId();
-                if(storageGroupId!= null && storageGroupId.equals(groupId)){
+//                String storageGroupId = storage.getGroupId();
+//                if(storageGroupId!= null && storageGroupId.equals(groupId)){
+                if(storage.IsRightGroup(groupId)){
                     cidList.add(storage.getCid());
                 }
             }

src/main/java/com/neotel/smfcore/hella/handler/HellaServiceHandler.java

@@ -377,7 +377,8 @@ public class HellaServiceHandler extends IoHandlerAdapter implements ITaskListen
             Group group = groupManager.getByGroupName(groupName);
             if(group != null){
                 for (Storage storage : allStorage.values()) {
-                    if(storage.getGroupId().equals(storage.getGroupId())){
+//                    if(storage.getGroupId().equals(storage.getGroupId())){
+                    if(storage.IsRightGroup(group.getId())){
                         storageIdList.add(storage.getId());
                     }
                 }

src/main/java/com/neotel/smfcore/hella/rest/HellaSensorShelfController.java

@@ -72,9 +72,12 @@ public class HellaSensorShelfController {
         if(ObjectUtils.isEmpty(code)){
             throw new ValidateException("smfcode.valueCanotNull", "{0}不能为空", new String[]{"code"});
         }
-        if(ObjectUtils.isEmpty(groupId)){
+        if(groupId==null){
             throw new ValidateException("smfcode.valueCanotNull", "{0}不能为空", new String[]{"group"});
         }
+        if(groupId!=null&&groupId.equals("-1")){
+            groupId="";
+        }
         String loginUser = SecurityUtils.getLoginUsername();
         Collection<DataLog> queueTasks = taskService.getQueueTasks();
         ResultBean resultBean = null;

src/main/java/com/neotel/smfcore/hella/tcp/command/HellaRespCommand.java

@@ -30,7 +30,7 @@ public class HellaRespCommand extends HellaCommand {
     }
 
     public boolean isCheckMaterialResp(){
-        return getCmd().equalsIgnoreCase("\u0002checkMaterialResp");
+        return getCmd().equalsIgnoreCase("checkMaterialResp");
     }
 
     public boolean isLoadMaterialResp(){

src/main/java/com/neotel/smfcore/security/service/po/Group.java

@@ -16,8 +16,8 @@ public class Group extends BasePo implements Serializable {
     private String groupName;
 
     public static Group defaulGroup() {
-        Group group=new Group("");
-        group.setId("");
+        Group group=new Group("-1");
+        group.setId("-1");
         group.setUpdateDate(new Date());
         group.setCreateDate(new Date());
         return group;