From 0417d31de9980cbc1735daffffb308d050ce35b4 Mon Sep 17 00:00:00 2001
From: wfy <260536420@qq.com>
Date: 星期六, 18 九月 2021 16:47:52 +0800
Subject: [PATCH] Merge branch 'master' into wangfy-dev
---
service-api/src/main/java/com/java110/api/smo/assetExport/impl/ExportFeeManualCollectionSMOImpl.java | 21 ++-------------------
1 files changed, 2 insertions(+), 19 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/smo/assetExport/impl/ExportFeeManualCollectionSMOImpl.java b/service-api/src/main/java/com/java110/api/smo/assetExport/impl/ExportFeeManualCollectionSMOImpl.java
index a4276f2..0371f49 100644
--- a/service-api/src/main/java/com/java110/api/smo/assetExport/impl/ExportFeeManualCollectionSMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/smo/assetExport/impl/ExportFeeManualCollectionSMOImpl.java
@@ -147,7 +147,7 @@
String apiUrl = "";
ResponseEntity<String> responseEntity = null;
JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
- apiUrl = "feeApi/listAllRoomOweFees" + mapToUrlParam(reqJson);
+ apiUrl = "/feeApi/listAllRoomOweFees" + mapToUrlParam(reqJson);
responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
@@ -528,22 +528,5 @@
this.restTemplate = restTemplate;
}
- public static void main(String[] args) {
- Java110ThreadPoolFactory<String> pool = Java110ThreadPoolFactory.getInstance().createThreadPool(20);
- for (int i = 21; i > 0; i--) {
- Integer data = i;
- pool.submit(() -> {
-//杩欎釜鍦版柟鍙互鍐欎竴涓嚱鏁帮紝鍙傛暟鍙互浠庡灞備紶鍏�
- System.out.println("缃戠粶鎿嶄綔寮�濮�" + data);
- Thread.sleep(data * 1000);
- System.out.println("缃戠粶鎿嶄綔缁撴潫" + data);
- return data + "";
- });
- }
- List<String> users = pool.get();
- for (String u : users) {
- System.out.println(u);
- }
- pool.stop();
- }
+
}
--
Gitblit v1.8.0