From 2ba20a79dacdbde2d7fd2ebc1fc45ed9bbd8bcbd Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 13 十一月 2025 11:58:27 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/AuthResultPageRequest.java | 14 +++++++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/AuthResultPageDetailResponse.java | 24 ++++++++++++
server/visits/dmvisit_admin/src/main/java/com/doumee/service/impl/HkSyncEventServiceImpl.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java | 21 ++++++++++
admin/src/components/common/CommonHeader.vue | 12 ++++++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java | 8 ++++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/AuthResultPageResponse.java | 15 +++++++
admin/src/store/index.js | 1
9 files changed, 96 insertions(+), 2 deletions(-)
diff --git a/admin/src/components/common/CommonHeader.vue b/admin/src/components/common/CommonHeader.vue
index 7b28a6b..7ec3d76 100644
--- a/admin/src/components/common/CommonHeader.vue
+++ b/admin/src/components/common/CommonHeader.vue
@@ -112,6 +112,18 @@
if (this.userInfo && (!this.userInfo.needChangePwd || this.userInfo.needChangePwd == '0')) {
this.visible.changePwd = true
}
+ const queryParams = new URLSearchParams(window.location.search);
+ const param1 = queryParams.get('topmenu');
+ console.log("============================param1=",param1,queryParams)
+ var that = this
+ if(param1 && this.topMenuList){
+ this.topMenuList.list.forEach((item,index)=>{
+ if(item.params && item.params === param1){
+ that.getHeaderNav(item,index)
+ }
+ })
+ }
+
},
filters: {
// 灞曠ず鍚嶇О
diff --git a/admin/src/store/index.js b/admin/src/store/index.js
index eae17b4..a6be0a8 100644
--- a/admin/src/store/index.js
+++ b/admin/src/store/index.js
@@ -61,7 +61,6 @@
},
// 璁剧疆棣栭〉璺敱淇℃伅
setTopMenuCurrent (state, current) {
- console.log("setTopMenuCurrent",current)
if(current.id !== state.topMenuCurrent.id){
state.topMenuList.list.forEach(item => {
console.log(item.id, item.id)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/service/impl/HkSyncEventServiceImpl.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/service/impl/HkSyncEventServiceImpl.java
index 0a46fbe..e4eec8d 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/service/impl/HkSyncEventServiceImpl.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/service/impl/HkSyncEventServiceImpl.java
@@ -104,7 +104,7 @@
,HKConstants.EventTypes.VISIT_SIGN_ICCM_PASS.getKey()
,HKConstants.EventTypes.VISIT_SIGN_ICCM_OUT.getKey()});
HKService.cancelEventSub(param);//鍏堝彇娑�
- HKService.eventSub(param);//璁垮浜嬩欢
+// HKService.eventSub(param);//璁垮浜嬩欢
param.setEventDest(path+"/platform/workstatus");
param.setEventTypes(new Integer[]{HKConstants.EventTypes.PLATFORM_WORKSTATUS.getKey()});
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 8bc7655..5382dfa 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,6 +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[] 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 d305617..20ee209 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
@@ -575,6 +575,14 @@
return startDoPostStringArtemis(HKConstants.InterfacePath.authItemList,body);
}
/**
+ * 鎸変笟鍔＄紪鍙锋煡璇笅鍙戣褰�
+ * @param body
+ * @return
+ */
+ public static String authResultPage(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.authResultPage,body);
+ }
+ /**
* 鎵归噺寮�鍗�
* @param body
* @return
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/AuthResultPageRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/AuthResultPageRequest.java
new file mode 100644
index 0000000..da8218d
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/AuthResultPageRequest.java
@@ -0,0 +1,14 @@
+package com.doumee.core.haikang.model.param.request;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AuthResultPageRequest {
+
+ private String businessNo ;//Body String 32 true 涓氬姟缂栧彿锛岀敤浜庝覆鑱斾笁鏂逛笌娴峰悍鐨勪笟鍔℃暟鎹紝姣斿闂ㄧ鎺堟潈鍗曞彿銆佽鍋囧崟鍙枫�佽瀹㈤绾﹀崟鍙凤紝褰撲竴娆′笟鍔￠渶瑕佽皟鐢ㄥ涓帴鍙ｆ椂锛屽彲浠ョ敤鍚屼竴涓笟鍔＄紪鍙疯繘琛屼覆鑱斻��
+ private Integer pageNo ;//number True 椤电爜,pageNo>0
+ private Integer pageSize ;//number True 椤靛ぇ灏�,0<pageSize<=1000
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/AuthResultPageDetailResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/AuthResultPageDetailResponse.java
new file mode 100644
index 0000000..eb1e9a7
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/AuthResultPageDetailResponse.java
@@ -0,0 +1,24 @@
+package com.doumee.core.haikang.model.param.respose;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AuthResultPageDetailResponse {
+
+
+ private String dataId;// long true 涓嬪彂鍞竴鏍囪瘑
+ private String businessNo ;//String true 涓氬姟缂栧彿
+ private String personId;// String true 浜哄憳缂栧彿
+ private String deviceIndexCode;// String true 璁惧缂栧彿
+ private String deviceType ;//String true 璁惧绫诲瀷
+ private String downloadBeginTime;// String false 涓嬪彂寮�濮嬫椂闂�
+ private String downloadEndTime ;//String false 涓嬪彂缁撴潫鏃堕棿
+ private Integer downPersonStatus;// Integer true 浜哄憳涓嬪彂鐘舵�� 1鎴愬姛锛�3澶辫触锛�0鏈彉鏇�
+ private String downPersonDetail;// String false 浜哄憳涓嬪彂缁撴灉鏄庣粏瀵硅薄銆愯繑鍥炵殑鏄痡son瀛楃涓层�� 鍙傝�冮檮褰�2.3
+ private Integer downCardStatus ;//Integer false 鍗＄墖涓嬪彂鐘舵�� 1鎴愬姛锛�3澶辫触锛�0鏈彉鏇� 鏈彉鏇存寚鏃犻渶涓嬭浇瀵瑰簲浠嬭川锛屾瘮濡備汉鍛樻崲鐓х墖鍙渶涓嬪彂浜鸿劯锛岄偅涔堝崱鐗囩殑鐘舵�佸氨鏄湭鍙樻洿
+ private String downCardDetail ;//String false 鍗＄墖涓嬪彂缁撴灉鏄庣粏瀵硅薄銆愯繑鍥炵殑鏄痡son瀛楃涓层�� 鍙傝�冮檮褰�2.3
+ private Integer downFaceStatus ;//Integer false 浜鸿劯涓嬪彂鐘舵��1鎴愬姛锛�3澶辫触锛�0鏈彉鏇�
+ private String downFaceDetail;// String false 浜鸿劯涓嬪彂缁撴灉鏄庣粏瀵硅薄銆愯繑鍥炵殑鏄痡son瀛楃涓层�� 鍙傝�冮檮褰�2.3
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/AuthResultPageResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/AuthResultPageResponse.java
new file mode 100644
index 0000000..fbd8681
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/AuthResultPageResponse.java
@@ -0,0 +1,15 @@
+package com.doumee.core.haikang.model.param.respose;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AuthResultPageResponse {
+
+ private Integer total;// number False 鎬绘潯鏁�
+ private Integer pageSize;// number False 褰撳墠椤电爜
+ private Integer pageNo;// number False 鍗曢〉灞曠ず鏁版嵁鏁扮洰
+ private List<AuthResultPageDetailResponse> list;//object[] False 璁惧閫氶亾鐨勪笅杞借褰�
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
index 246722c..5cb7b07 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
@@ -764,6 +764,27 @@
return null;
}
/**
+ *娴峰悍1.4.7.3鎸変笟鍔＄紪鍙锋煡璇笅鍙戣褰�
+ * @return
+ */
+ public static BaseResponse<AuthResultPageResponse> authResultPage(AuthResultPageRequest param){
+ log.info("銆愭捣搴锋寜涓氬姟缂栧彿鏌ヨ涓嬪彂璁板綍銆�================寮�濮�===="+JSONObject.toJSONString(param));
+ String res = null;
+ try {
+ res = HKTools.authResultPage(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<AuthResultPageResponse> >(){};
+ BaseResponse<AuthResultPageResponse> result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍鎸変笟鍔＄紪鍙锋煡璇笅鍙戣褰�");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴锋寜涓氬姟缂栧彿鏌ヨ涓嬪彂璁板綍銆�================澶辫触====锛歕n"+ e.getMessage());
+ }finally {
+ // saveInterfaceLog(param,res);
+ }
+ return null;
+ }
+ /**
*娴峰悍涓�鍗￠�氫换鍔″紑濮嬫墽琛�
* @return
*/
--
Gitblit v1.9.3