|
|
@ -74,11 +74,9 @@ public class AccidentController extends BladeController { |
|
|
|
if (ObjectUtil.isNotEmpty(accidentEntity)) { |
|
|
|
if (ObjectUtil.isNotEmpty(accidentEntity)) { |
|
|
|
accidentVO = AccidentWrapper.build().entityVO(accidentEntity); |
|
|
|
accidentVO = AccidentWrapper.build().entityVO(accidentEntity); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} catch (Exception e) { |
|
|
|
catch(Exception e){ |
|
|
|
|
|
|
|
e.printStackTrace(); |
|
|
|
e.printStackTrace(); |
|
|
|
} |
|
|
|
} finally { |
|
|
|
finally { |
|
|
|
|
|
|
|
readLock.unlock(); |
|
|
|
readLock.unlock(); |
|
|
|
} |
|
|
|
} |
|
|
|
return R.data(accidentVO); |
|
|
|
return R.data(accidentVO); |
|
|
@ -93,11 +91,9 @@ public class AccidentController extends BladeController { |
|
|
|
try { |
|
|
|
try { |
|
|
|
AccidentEntity accidentEntity = BeanUtil.copy(req, AccidentEntity.class); |
|
|
|
AccidentEntity accidentEntity = BeanUtil.copy(req, AccidentEntity.class); |
|
|
|
accidentService.updateById(accidentEntity); |
|
|
|
accidentService.updateById(accidentEntity); |
|
|
|
} |
|
|
|
} catch (Exception e) { |
|
|
|
catch(Exception e) { |
|
|
|
|
|
|
|
e.printStackTrace(); |
|
|
|
e.printStackTrace(); |
|
|
|
} |
|
|
|
} finally { |
|
|
|
finally { |
|
|
|
|
|
|
|
writeLock.unlock(); |
|
|
|
writeLock.unlock(); |
|
|
|
} |
|
|
|
} |
|
|
|
return R.success("操作成功"); |
|
|
|
return R.success("操作成功"); |
|
|
@ -117,7 +113,7 @@ public class AccidentController extends BladeController { |
|
|
|
@ApiOperationSupport(order = 5) |
|
|
|
@ApiOperationSupport(order = 5) |
|
|
|
@OperationAnnotation(moduleName = "安全管理", |
|
|
|
@OperationAnnotation(moduleName = "安全管理", |
|
|
|
title = "事故管理", operatorType = OperatorType.MOBILE, businessType = BusinessType.GENCODE, |
|
|
|
title = "事故管理", operatorType = OperatorType.MOBILE, businessType = BusinessType.GENCODE, |
|
|
|
action = "分页条件") |
|
|
|
action = "分页查询事故管理列表") |
|
|
|
public R<IPage> pageList(AccidentDTO req, Query query) { |
|
|
|
public R<IPage> pageList(AccidentDTO req, Query query) { |
|
|
|
AccidentEntity accidentEntity = BeanUtil.copy(req, AccidentEntity.class); |
|
|
|
AccidentEntity accidentEntity = BeanUtil.copy(req, AccidentEntity.class); |
|
|
|
LambdaQueryWrapper<AccidentEntity> queryWrapper = Condition.getQueryWrapper(new AccidentEntity(), accidentEntity); |
|
|
|
LambdaQueryWrapper<AccidentEntity> queryWrapper = Condition.getQueryWrapper(new AccidentEntity(), accidentEntity); |
|
|
|