From 79c59e2d22ba3765a3ab87e59cd4326345885b9e Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期三, 26 三月 2025 13:36:23 +0800
Subject: [PATCH] 添加 公摊抄表
---
service-api/src/main/java/com/java110/api/smo/impl/ApiServiceSMOImpl.java | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/smo/impl/ApiServiceSMOImpl.java b/service-api/src/main/java/com/java110/api/smo/impl/ApiServiceSMOImpl.java
index a8f3bcb..85fe290 100644
--- a/service-api/src/main/java/com/java110/api/smo/impl/ApiServiceSMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/smo/impl/ApiServiceSMOImpl.java
@@ -156,7 +156,7 @@
String serviceCode = dataFlow.getRequestHeaders().get(CommonConstant.HTTP_SERVICE);
- String logServiceCode = MappingCache.getValue(MappingConstant.DOMAIN_SYSTEM_SWITCH,MappingCache.LOG_SERVICE_CODE);
+ String logServiceCode = MappingCache.getValue(MappingConstant.DOMAIN_SYSTEM_SWITCH, MappingCache.LOG_SERVICE_CODE);
//鏃ュ織鏌ヨ涓嶈褰�
if ("/transactionLog/queryTransactionLog".equals(serviceCode)
@@ -164,7 +164,7 @@
|| "file.getFile".equals(serviceCode)
|| "file.getFileByObjId".equals(serviceCode)
|| "/machine/heartbeat".equals(serviceCode) // 蹇冭烦涔熶笉璁板綍
- ) {
+ ) {
return;
}
@@ -426,12 +426,12 @@
ResponseEntity responseEntity = null;
//閰嶇疆c_service 鏃惰娉ㄦ剰 濡傛灉鏄互out 寮�澶寸殑璋冪敤澶栭儴鐨勫湴鍧�
- RestTemplate restTemplate ;
-// if (Environment.isStartBootWay()) {
+ RestTemplate restTemplate;
+ if (Environment.isStartBootWay()) {
restTemplate = ApplicationContextFactory.getBean("outRestTemplate", RestTemplate.class);
-// } else {
-// restTemplate = ApplicationContextFactory.getBean("restTemplate", RestTemplate.class);
-// }
+ } else {
+ restTemplate = ApplicationContextFactory.getBean("restTemplate", RestTemplate.class);
+ }
try {
if (CommonConstant.HTTP_METHOD_GET.equals(service.getMethod())) {
@@ -444,8 +444,9 @@
requestUrl = service.getUrl() + "?" + param;
}
}
-
- requestUrl = BootReplaceUtil.replaceServiceName(requestUrl);
+ if (Environment.isStartBootWay()) {
+ requestUrl = BootReplaceUtil.replaceServiceName(requestUrl);
+ }
responseEntity = restTemplate.exchange(requestUrl, HttpMethod.GET, httpEntity, String.class);
} else if (CommonConstant.HTTP_METHOD_PUT.equals(service.getMethod())) {
@@ -491,7 +492,7 @@
//String requestUrl = "http://127.0.0.1:8008" + serviceCode;
String requestUrl = serviceCode;
- RestTemplate restTemplate ;
+ RestTemplate restTemplate;
if (Environment.isStartBootWay()) {
requestUrl = Environment.BOOT_PATH + requestUrl;
restTemplate = ApplicationContextFactory.getBean("outRestTemplate", RestTemplate.class);
@@ -565,6 +566,7 @@
/**
* 寮�濮嬭皟搴﹀井鏈嶅姟
+ *
* @param appService
* @param dataFlow
* @param reqJson
@@ -574,7 +576,7 @@
HttpHeaders header = new HttpHeaders();
//todo 瀵瑰ご淇℃伅閲嶆柊鍖呰
for (String key : dataFlow.getRequestCurrentHeaders().keySet()) {
- if("userName".equals(key) || "user-name".equals(key)){
+ if ("userName".equals(key) || "user-name".equals(key)) {
header.add(key, "-");
continue;
}
@@ -665,7 +667,7 @@
private void saveLogMessage(String requestJson, String responseJson) {
try {
- if (MappingConstant.VALUE_ON.equals(MappingCache.getValue(MappingConstant.DOMAIN_SYSTEM_SWITCH,MappingConstant.KEY_LOG_ON_OFF))) {
+ if (MappingConstant.VALUE_ON.equals(MappingCache.getValue(MappingConstant.DOMAIN_SYSTEM_SWITCH, MappingConstant.KEY_LOG_ON_OFF))) {
JSONObject log = new JSONObject();
log.put("request", requestJson);
log.put("response", responseJson);
@@ -683,7 +685,7 @@
*/
private void saveCostTimeLogMessage(DataFlow dataFlow) {
try {
- if (MappingConstant.VALUE_ON.equals(MappingCache.getValue(MappingConstant.DOMAIN_SYSTEM_SWITCH,MappingConstant.KEY_COST_TIME_ON_OFF))) {
+ if (MappingConstant.VALUE_ON.equals(MappingCache.getValue(MappingConstant.DOMAIN_SYSTEM_SWITCH, MappingConstant.KEY_COST_TIME_ON_OFF))) {
List<DataFlowLinksCost> dataFlowLinksCosts = dataFlow.getLinksCostDates();
JSONObject costDate = new JSONObject();
JSONArray costDates = new JSONArray();
--
Gitblit v1.8.0