Commit 2cd389fd authored by zhoumaotao's avatar zhoumaotao

代码调整3

parent 1850b35f
...@@ -182,9 +182,6 @@ public class McsRestServiceImpl extends BaseEditServiceImpl implements McsRestSe ...@@ -182,9 +182,6 @@ public class McsRestServiceImpl extends BaseEditServiceImpl implements McsRestSe
private boolean allowedMap(Gw gw) { private boolean allowedMap(Gw gw) {
String mapcode = commonService.getStringOptionValue(JcsjParamEnum.AllowVoiceMap.id()); String mapcode = commonService.getStringOptionValue(JcsjParamEnum.AllowVoiceMap.id());
if(StringUtils.isEmpty(mapcode)){
return true;//如果未设置默认全部
}
if(StringUtils.equals(gw.getMapcode(),mapcode)){ if(StringUtils.equals(gw.getMapcode(),mapcode)){
return true; return true;
} }
...@@ -647,6 +644,6 @@ public class McsRestServiceImpl extends BaseEditServiceImpl implements McsRestSe ...@@ -647,6 +644,6 @@ public class McsRestServiceImpl extends BaseEditServiceImpl implements McsRestSe
task.setTaskStatus("5");//取消完成 task.setTaskStatus("5");//取消完成
task.setCancelDate(Calendar.getInstance().getTime()); task.setCancelDate(Calendar.getInstance().getTime());
agvtaskService.update(task); agvtaskService.update(task);
messageService.msgPush("SUPERUSER", "task", "取消任务"); //messageService.msgPush("SUPERUSER", "task", "取消任务");
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment