From df0bfe5ad02fa6d7d956e566799b62327f0425a8 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 13 十一月 2025 17:02:36 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/admin_timer/src/main/resources/bootstrap.yml | 2 +-
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java | 2 +-
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java | 8 ++++----
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java | 8 ++++----
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/server/visits/admin_timer/src/main/resources/bootstrap.yml b/server/visits/admin_timer/src/main/resources/bootstrap.yml
index fb74d1e..b5b65b7 100644
--- a/server/visits/admin_timer/src/main/resources/bootstrap.yml
+++ b/server/visits/admin_timer/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- active: test
+ active: pro
application:
name: visitsTimer
# 瀹夊叏閰嶇疆
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
index 5382dfa..d955006 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
@@ -430,7 +430,7 @@
String[] findDeviceStatistics= new String[]{"/api/v1/device/findDeviceStatistics","鍒嗛〉鏌ヨ璁惧鐨勪互鍙婁笅灞炰紶鎰熷櫒鏁版嵁鐨勭姸鎬佺粺璁�"};// 鍒嗛〉鏌ヨ璁惧鐨勪互鍙婁笅灞炰紶鎰熷櫒鏁版嵁鐨勭姸鎬佺粺璁�
String[] resourcesByParams= new String[]{"/api/irds/v2/resource/resourcesByParams","銆愭捣搴锋秷闃茬湅鏉裤�戞牴鎹潯浠舵煡璇㈢洰褰曚笅鏈夋潈闄愮殑璧勬簮鍒楄〃"};// 銆愭捣搴锋秷闃茬湅鏉裤�戞牴鎹潯浠舵煡璇㈢洰褰曚笅鏈夋潈闄愮殑璧勬簮鍒楄〃
String[] iccmSignoff= new String[]{"/api/iccm/v1/signoff","iccm璁垮绛剧"};// iccm璁垮绛剧
- String[] authResultPage= new String[]{"/open/v1/auth/result/businessNo/page","鎸変笟鍔＄紪鍙锋煡璇笅鍙戣褰�"};// 1.4.7.3鎸変笟鍔＄紪鍙锋煡璇笅鍙戣褰�
+ String[] authResultPage= new String[]{"/api/acps/auth/open/v1/auth/result/businessNo/page","鎸変笟鍔＄紪鍙锋煡璇笅鍙戣褰�"};// 1.4.7.3鎸変笟鍔＄紪鍙锋煡璇笅鍙戣褰�
String[] wxAuthUrl= new String[]{"dps/web/wxAuth/loginV2?oaId=atwl&redirectUrl=","寰呭姙鑰冨嫟璺宠浆鍦板潃"};// 寰呭姙鑰冨嫟璺宠浆鍦板潃
}
/**
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
index 20ee209..d6d1024 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
@@ -421,7 +421,7 @@
public static String startDoPostStringArtemis(String[] pathStr,String body ){
Map<String, String> path = getPath(pathStr[0]);
Map<String, String> header = new HashMap<>();
- header.put("tagId", UUID.randomUUID().toString().replace("-", ""));
+ header.put("tagId","frs");
String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", header);// post璇锋眰application/json绫诲瀷鍙傛暟
saveInterfaceLog(body,result,path,pathStr[1]);
return result;
@@ -440,7 +440,7 @@
public static String startDoGetStringArtemis(String[] pathStr,Map<String,String> body ){
Map<String, String> path = getPath(pathStr[0]);
Map<String, String> header = new HashMap<>();
- header.put("tagId", UUID.randomUUID().toString().replace("-", ""));
+ header.put("tagId", "frs");
String result = ArtemisHttpUtil.doGetArtemis(path, body, null, null, header);
saveInterfaceLog(JSONObject.toJSONString(body),result,path,pathStr[1]);
return result;
@@ -461,7 +461,7 @@
public static String startDoPostStringArtemis(String[] pathStr,String param,String body ){
Map<String, String> path = getPath(pathStr[0]+StringUtils.defaultString(param,""));
Map<String, String> header = new HashMap<>();
- header.put("tagId", UUID.randomUUID().toString().replace("-", ""));
+ header.put("tagId","frs");
String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", header);// post璇锋眰application/json绫诲瀷鍙傛暟
saveInterfaceLog(body,result,path,pathStr[1]);
return result;
@@ -470,7 +470,7 @@
public static String startDoPostStringArtemis(String[] pathStr,Map<String, String> querys,Map<String, String> header,String body){
Map<String, String> path = getPath(pathStr[0]);
- header.put("tagId", UUID.randomUUID().toString().replace("-", ""));
+ header.put("tagId","frs");
String result = ArtemisHttpUtil.doPostStringArtemis(path, body, querys, null, "application/json", header);// post璇锋眰application/json绫诲瀷鍙傛暟
saveInterfaceLog(body,result,path,pathStr[1]);
return result;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java
index 267814e..77e9960 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java
@@ -150,15 +150,15 @@
if (Constants.equalsInteger(model.getDownCardStatus(),0)) {
cardInfo = "鍗＄墖涓嬪彂鏈彉鏇�";
- }else if (!Constants.equalsInteger(model.getDownCardStatus(),1)) {
+ }else if (Constants.equalsInteger(model.getDownCardStatus(),1)) {
cardInfo = "鍗＄墖涓嬪彂鎴愬姛";
}else {
cardInfo = "鍗＄墖涓嬪彂澶辫触";
}
if ( Constants.equalsInteger(model.getDownFaceStatus(),0)) {
- remark = "浜鸿劯涓哄彉鏇达紒";
- } else if (!Constants.equalsInteger(model.getDownFaceStatus(),1)) {
+ remark = "浜鸿劯涓嬪彂鏈彉鏇达紒";
+ } else if (Constants.equalsInteger(model.getDownFaceStatus(),1)) {
remark = "浜鸿劯涓嬪彂鎴愬姛锛�";
}else{
remark = "浜鸿劯涓嬪彂澶辫触锛�";
@@ -691,7 +691,7 @@
if(list ==null || list.size()==0){
return;
}
-// clearAllEmpowerFirst(list);
+// clearAllEmpowerFirst(list);
Date date = new Date();
//鍒涘缓浠诲姟
String taskId = hkTaskAddtion();
--
Gitblit v1.9.3