|
@@ -197,7 +197,7 @@ public class TBCrmDetailController {
|
|
@ApiResponses({ @ApiResponse(code = 200, message = "导入成功", response = EditResult.class) })
|
|
@ApiResponses({ @ApiResponse(code = 200, message = "导入成功", response = EditResult.class) })
|
|
public Result sopImport(@ApiParam(value = "上传文件", required = true) @RequestParam MultipartFile file,
|
|
public Result sopImport(@ApiParam(value = "上传文件", required = true) @RequestParam MultipartFile file,
|
|
@ApiParam(value = "派单号", required = true) @RequestParam String crmNo) {
|
|
@ApiParam(value = "派单号", required = true) @RequestParam String crmNo) {
|
|
- boolean lock = memoryLock.lock(SystemConstant.LOCK_CRM_DETAIL_SOP_PREFIX + crmNo, crmNo,
|
|
|
|
|
|
+ boolean lock = memoryLock.lock(SystemConstant.LOCK_CRM_DETAIL_SOP_IMPORT_PREFIX + crmNo, crmNo,
|
|
SystemConstant.LOCK_CRM_DETAIL_SOP_TIME_OUT);
|
|
SystemConstant.LOCK_CRM_DETAIL_SOP_TIME_OUT);
|
|
if (!lock) {
|
|
if (!lock) {
|
|
throw ExceptionResultEnum.ERROR.exception("正在导入数据,请稍候再试!");
|
|
throw ExceptionResultEnum.ERROR.exception("正在导入数据,请稍候再试!");
|
|
@@ -213,7 +213,7 @@ public class TBCrmDetailController {
|
|
ResultUtil.error(e.getMessage());
|
|
ResultUtil.error(e.getMessage());
|
|
}
|
|
}
|
|
} finally {
|
|
} finally {
|
|
- memoryLock.unlock(SystemConstant.LOCK_CRM_DETAIL_SOP_PREFIX + crmNo);
|
|
|
|
|
|
+ memoryLock.unlock(SystemConstant.LOCK_CRM_DETAIL_SOP_IMPORT_PREFIX + crmNo);
|
|
}
|
|
}
|
|
return ResultUtil.ok(map);
|
|
return ResultUtil.ok(map);
|
|
}
|
|
}
|