|
@@ -15,7 +15,6 @@ import com.fjhx.utils.MyUtil;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
-import java.util.Objects;
|
|
|
import java.util.concurrent.ConcurrentHashMap;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
@@ -38,11 +37,13 @@ public class ServiceImpl implements Service {
|
|
|
// 获取指令
|
|
|
String instructions = data.getString("instructions");
|
|
|
|
|
|
- if (!ObjectUtil.isAllNotEmpty(forwardUserId, forwardSessionId, instructions)
|
|
|
- && !Objects.equals(instructions, "check1") && !Objects.equals(instructions, "check4")) {
|
|
|
- MyUtil.errorLog("未知数据:" + data.toJSONString());
|
|
|
+ if (!ObjectUtil.isAllNotEmpty(forwardUserId, forwardSessionId, instructions)) {
|
|
|
+ MyUtil.errorLog("盘点数据:" + data.toJSONString());
|
|
|
}
|
|
|
|
|
|
+ forwardUserId = ObjectUtil.defaultIfBlank(forwardUserId, "default");
|
|
|
+ forwardSessionId = ObjectUtil.defaultIfBlank(forwardSessionId, "default");
|
|
|
+
|
|
|
// 操作上位机类型
|
|
|
Integer type = data.getInteger("type");
|
|
|
|