|
@@ -1269,23 +1269,23 @@ public class TaskNodeServiceImpl extends SuperServiceImpl<TaskNodeMapper, TaskNo
|
|
|
String taskNodeId = bean.getTaskNodeId() == null ? "" : bean.getTaskNodeId().toString();
|
|
|
|
|
|
|
|
|
- String taskInfos = msgUtil.redis_get(taskNodeId).toString();
|
|
|
-
|
|
|
- JSONObject taskInfosObject = JSONObject.parseObject(taskInfos);
|
|
|
- ManualInfo manualInfo = JSONObject.parseObject(taskInfosObject.getString("taskInfo"),ManualInfo.class);
|
|
|
+ Object taskInfoObject = msgUtil.redis_get(taskNodeId);
|
|
|
+ if(null != taskInfoObject){
|
|
|
+ String taskInfos = taskInfoObject.toString();
|
|
|
+
|
|
|
+ JSONObject taskInfosObject = JSONObject.parseObject(taskInfos);
|
|
|
+ ManualInfo manualInfo = JSONObject.parseObject(taskInfosObject.getString("taskInfo"),ManualInfo.class);
|
|
|
+ String handModeFlag = bean.getHandModeFlag();
|
|
|
+ if(null != manualInfo && "1".equals(manualInfo.getHandModeFlag())){//手动模式是特殊处理
|
|
|
+ return handModeStock(bean);
|
|
|
+ }
|
|
|
|
|
|
+ }
|
|
|
|
|
|
String taskId = bean.getTaskId() == null ? "" : bean.getTaskId().toString();
|
|
|
String bizCallBackData = bean.getBizCallBackData();
|
|
|
String uid = bean.getUid() == null ? "" : bean.getUid().toString();
|
|
|
|
|
|
- String handModeFlag = bean.getHandModeFlag();
|
|
|
- if(null != manualInfo && "1".equals(manualInfo.getHandModeFlag())){//手动模式是特殊处理
|
|
|
- return handModeStock(bean);
|
|
|
- }
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
//验证是否重复回调
|
|
|
String cacheUid = msgUtil.redis_get(uid) == null ? "" : msgUtil.redis_get(uid).toString();
|
|
|
if (StringUtil.isNotEmpty(cacheUid)) {//排除掉重复回调
|