任务列表保存失败
This commit is contained in:
parent
822650135c
commit
44abed9927
|
|
@ -346,7 +346,7 @@ public class PollingTaskServiceImpl extends ServiceImpl<PollingTaskMapper, Polli
|
||||||
max = max == null ? 1 : max + 1;
|
max = max == null ? 1 : max + 1;
|
||||||
task.setSearchNum(max + "-");
|
task.setSearchNum(max + "-");
|
||||||
task.setSearchIndex(max);
|
task.setSearchIndex(max);
|
||||||
task.setLevel(max);
|
task.setLevel(1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -194,15 +194,20 @@ public class TerminalServiceImpl extends ServiceImpl<TerminalMapper, Terminal> i
|
||||||
@Override
|
@Override
|
||||||
@Transactional(rollbackFor = Exception.class)
|
@Transactional(rollbackFor = Exception.class)
|
||||||
public long updateTerminalAndStore(TerminalQuery query) {
|
public long updateTerminalAndStore(TerminalQuery query) {
|
||||||
/**
|
|
||||||
* 当前终端
|
|
||||||
*/
|
|
||||||
Terminal curTerminal = getById(query.getTerminalId());
|
Terminal curTerminal = getById(query.getTerminalId());
|
||||||
AssertUtil.invalidate(ObjectUtil.isEmpty(curTerminal), "未找寻到对应的终端信息");
|
AssertUtil.invalidate(ObjectUtil.isEmpty(curTerminal), "未找寻到对应的终端信息");
|
||||||
Terminal terminal = BeanCopyUtils.copy(query, Terminal.class);
|
curTerminal.setTerminalNo(query.getTerminalNo());
|
||||||
updateById(terminal);
|
curTerminal.setTerminalSn(query.getTerminalSn());
|
||||||
Store store = BeanCopyUtils.copy(query, Store.class);
|
curTerminal.setTerminalAddress(query.getTerminalAddress());
|
||||||
|
curTerminal.setTerminalModel(query.getTerminalModel());
|
||||||
|
curTerminal.setTerminalType(query.getTerminalType());
|
||||||
|
curTerminal.setTerminalSource(query.getTerminalSource());
|
||||||
|
updateById(curTerminal);
|
||||||
|
Store store = new Store();
|
||||||
store.setStoreId(curTerminal.getStoreId());
|
store.setStoreId(curTerminal.getStoreId());
|
||||||
|
store.setStoreNo(query.getStoreNo());
|
||||||
|
store.setStoreName(query.getStoreName());
|
||||||
|
store.setState(query.getStoreState());
|
||||||
storeService.updateById(store);
|
storeService.updateById(store);
|
||||||
return query.getTerminalId();
|
return query.getTerminalId();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue