Commit 58bf543e authored by fangxinjiang's avatar fangxinjiang

Merge remote-tracking branch 'origin/develop' into develop

parents d8a8dc09 8668b87d
......@@ -13,8 +13,8 @@ import java.util.concurrent.TimeUnit;
public class YFSocialImportThreadPoolExecutor extends ThreadPoolExecutor {
private static final int CORE_POOL_SIZE = 8;
private static final int MAX_POOL_SIZE = 12;
private static final int CORE_POOL_SIZE = 30;
private static final int MAX_POOL_SIZE = 30;
private static final long KEEP_ALIVE_TIME = 15;
private static final int CAPACITY = 1024;
......
......@@ -149,7 +149,7 @@ public class TPaymentInfoController {
@PostMapping("/importListAdd")
@PreAuthorize("@pms.hasPermission('social_tpaymentinfo_batchImport')")
public R<List<ErrorMessage>> importListAdd(@RequestBody MultipartFile file, @RequestParam String random) {
return tPaymentInfoService.importSocialDiy(file.getInputStream(), random);
return tPaymentInfoService.importSocialDiy(file.getInputStream());
}
/**
......
......@@ -49,7 +49,7 @@ public interface TPaymentInfoService extends IService<TPaymentInfo> {
* @param inputStream
* @return
*/
R<List<ErrorMessage>> importSocialDiy(InputStream inputStream, String random);
R<List<ErrorMessage>> importSocialDiy(InputStream inputStream);
/**
* 批量新增缴费库-合肥三险
......
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