From 26ee9f01a9c27a671f8d39f42e4e19c5c3e7c6b5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 22 八月 2024 15:00:11 +0800
Subject: [PATCH] 最新版本
---
admin/src/components/business/OperaPlatformApproveTemplWindow.vue | 2 ++
admin/src/views/vehicle/parks.vue | 4 ++--
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 2 +-
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java | 6 +++---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java | 14 ++++++++++----
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPrivilegeServiceImpl.java | 6 ++++++
admin/src/views/business/approvalConfiguration.vue | 3 +++
admin/src/views/operation/serviceCar/apprConfig.vue | 2 ++
admin/src/views/business/approvalReport.vue | 2 ++
server/system_timer/src/main/resources/bootstrap.yml | 2 +-
server/visits/admin_timer/src/main/java/com/doumee/api/HkUsersTimerController.java | 4 ++--
11 files changed, 34 insertions(+), 13 deletions(-)
diff --git a/admin/src/components/business/OperaPlatformApproveTemplWindow.vue b/admin/src/components/business/OperaPlatformApproveTemplWindow.vue
index 902bf73..6ff22bc 100644
--- a/admin/src/components/business/OperaPlatformApproveTemplWindow.vue
+++ b/admin/src/components/business/OperaPlatformApproveTemplWindow.vue
@@ -353,6 +353,8 @@
companyName: i.companyName
}
})
+ }else{
+ item.objIds = []
}
})
this.apprList = arr
diff --git a/admin/src/views/business/approvalConfiguration.vue b/admin/src/views/business/approvalConfiguration.vue
index c295e5a..f894e52 100644
--- a/admin/src/views/business/approvalConfiguration.vue
+++ b/admin/src/views/business/approvalConfiguration.vue
@@ -316,6 +316,7 @@
this.apprList.forEach((item, index) => {
if (i === index) {
item.active = true
+ console.log("====================",item.objIds)
if (item.objIds && item.objIds.length > 0) {
const objIds = item.objIds.map(i => {
return `${i.id}-${i.name}${i.companyName ? '-' + i.companyName : ''}`
@@ -343,6 +344,8 @@
companyName: i.companyName
}
})
+ }else{
+ item.objIds = []
}
})
this.apprList = arr
diff --git a/admin/src/views/business/approvalReport.vue b/admin/src/views/business/approvalReport.vue
index b5b2c9f..cb2cfef 100644
--- a/admin/src/views/business/approvalReport.vue
+++ b/admin/src/views/business/approvalReport.vue
@@ -330,6 +330,8 @@
companyName: i.companyName
}
})
+ }else{
+ item.objIds = []
}
})
this.apprList = arr
diff --git a/admin/src/views/operation/serviceCar/apprConfig.vue b/admin/src/views/operation/serviceCar/apprConfig.vue
index daef69a..a26b625 100644
--- a/admin/src/views/operation/serviceCar/apprConfig.vue
+++ b/admin/src/views/operation/serviceCar/apprConfig.vue
@@ -349,6 +349,8 @@
companyName: i.companyName
}
})
+ }else{
+ item.objIds = []
}
})
this.apprList = arr
diff --git a/admin/src/views/vehicle/parks.vue b/admin/src/views/vehicle/parks.vue
index 04aff12..d0764f3 100644
--- a/admin/src/views/vehicle/parks.vue
+++ b/admin/src/views/vehicle/parks.vue
@@ -32,8 +32,8 @@
>
<el-table-column prop="name" label="鍋滆溅搴撳悕绉�" min-width="100px"></el-table-column>
<el-table-column prop="parentName" label="鎵�灞炲仠杞﹀簱" min-width="100px"></el-table-column>
- <el-table-column prop="parkCreateDate" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="parkEditDate" label="鏇存柊鏃堕棿" min-width="100px"></el-table-column>
+ <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
+ <el-table-column prop="editDate" label="鏇存柊鏃堕棿" min-width="100px"></el-table-column>
</el-table>
<pagination
@size-change="handleSizeChange"
diff --git a/server/system_timer/src/main/resources/bootstrap.yml b/server/system_timer/src/main/resources/bootstrap.yml
index 5eb6d62..107b53b 100644
--- a/server/system_timer/src/main/resources/bootstrap.yml
+++ b/server/system_timer/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- active: test
+ active: dev
application:
name: systemTimer
# 瀹夊叏閰嶇疆
diff --git a/server/visits/admin_timer/src/main/java/com/doumee/api/HkUsersTimerController.java b/server/visits/admin_timer/src/main/java/com/doumee/api/HkUsersTimerController.java
index 879d448..ffef6c7 100644
--- a/server/visits/admin_timer/src/main/java/com/doumee/api/HkUsersTimerController.java
+++ b/server/visits/admin_timer/src/main/java/com/doumee/api/HkUsersTimerController.java
@@ -38,7 +38,7 @@
public ApiResponse syncOrgData() {
if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.erp){
//濡傛灉鏄疎RP绯荤粺鍚屾涓嬪彂
- hkSyncOrgUserService.syncOrgData();
+ hkSyncOrgUserService.syncOrgData(null);
}
return ApiResponse.success("寮�鍚畾鏃跺悓姝ユ捣搴风粍缁囨暟鎹垚鍔�");
}
@@ -53,7 +53,7 @@
public ApiResponse syncUserData() {
if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.erp) {
//濡傛灉鏄疎RP绯荤粺鍚屾涓嬪彂
- hkSyncOrgUserService.syncUserData();
+ hkSyncOrgUserService.syncUserData(null);
}
return ApiResponse.success("寮�鍚畾鏃跺悓姝ユ捣搴蜂汉鍛樻暟鎹垚鍔�");
}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java
index 254b0ef..9118d7a 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java
@@ -2,6 +2,7 @@
import com.doumee.api.BaseController;
import com.doumee.config.annotation.CloudRequiredPermission;
+import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.haikang.model.param.request.*;
import com.doumee.core.haikang.model.param.request.event.acs.EventAcsRequest;
@@ -101,19 +102,22 @@
// @PreventRepeat
@ApiOperation("銆愭捣搴枫�戦棬绂佷簨浠惰闃呮帹閫佸鎺ュ鐞嗘帴鍙�")
@PostMapping("/push/acs")
- public ApiResponse pushAcs( HttpServletRequest request,@RequestBody EventAcsRequest param, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ @LoginNoRequired
+ public ApiResponse pushAcs( HttpServletRequest request,@RequestBody EventAcsRequest param, HttpServletResponse response ){
String result = hkSyncPushService.dealAcsEvent(param,response);
return ApiResponse.success(result);
}
// @PreventRepeat
@ApiOperation("銆愭捣搴枫�戣瀹簨浠惰闃呮帹閫佸鎺ュ鐞嗘帴鍙�")
@PostMapping("/push/visit")
- public ApiResponse pushVisit(@RequestBody EventVisitRequest param, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ @LoginNoRequired
+ public ApiResponse pushVisit(@RequestBody EventVisitRequest param, HttpServletResponse response){
String result = hkSyncPushService.dealVisitEvent(param,response);
return ApiResponse.success(result);
}
@ApiOperation("銆愭捣搴枫�戣瀹CCM浜嬩欢璁㈤槄鎺ㄩ�佸鎺ュ鐞嗘帴鍙�")
@PostMapping("/push/visitIccm")
+ @LoginNoRequired
public ApiResponse pushVisitIccm(@RequestBody EventVisitIccmRequest param, HttpServletResponse response) {
String result = hkSyncPushService.dealVisitEventIccm(param,response);
return ApiResponse.success(result);
@@ -121,14 +125,16 @@
// @PreventRepeat
@ApiOperation("銆愭捣搴枫�戝仠杞﹀満浜嬩欢璁㈤槄鎺ㄩ�佸鎺ュ鐞嗘帴鍙�")
@PostMapping("/push/parks")
- public ApiResponse pushParks(@RequestBody EventParkRequest param, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ @LoginNoRequired
+ public ApiResponse pushParks(@RequestBody EventParkRequest param, HttpServletResponse response ){
String result = hkSyncPushService.dealParkEvent(param,response);
return ApiResponse.success(result);
}
@PreventRepeat
@ApiOperation("銆愭捣搴枫�戝彇娑堣闃呬簨浠�")
@PostMapping("/cancelEventSub")
- public ApiResponse cancelEventSub(@RequestBody EventSubRequest param, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ @LoginNoRequired
+ public ApiResponse cancelEventSub(@RequestBody EventSubRequest param, HttpServletResponse response){
hkSyncPushService.cancelEventSub();
return ApiResponse.success(null);
}
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 9889344..2b59378 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
@@ -488,16 +488,16 @@
* @return
*/
public static BaseResponse<IccmAppointmentMDJResponse> iccmAppiontmentMDJ(IccmAppointmentMDJRequest param){
- log.info("銆愭捣搴疯瀹㈠厤鐧昏棰勭害銆�================寮�濮�===="+JSONObject.toJSONString(param));
+ log.info("銆愭捣搴疯瀹㈠厤鐧昏棰勭害銆�================iccm寮�濮�===="+JSONObject.toJSONString(param));
try {
- String res = HKTools.visitAppiontmentMDJ(JSONObject.toJSONString(param));
+ String res = HKTools.iccmAppointmentMDJ(JSONObject.toJSONString(param));
TypeReference typeReference =
new TypeReference< BaseResponse<IccmAppointmentMDJResponse> >(){};
BaseResponse<IccmAppointmentMDJResponse> result = JSONObject.parseObject(res, typeReference.getType());
logResult(result,"娴峰悍璁垮鍏嶇櫥璁伴绾�");
return result;
}catch (Exception e){
- log.error("銆愭捣搴疯瀹㈠厤鐧昏棰勭害銆�================澶辫触====锛歕n"+ e.getMessage());
+ log.error("銆愭捣搴疯瀹㈠厤鐧昏棰勭害銆�================iccm澶辫触====锛歕n"+ e.getMessage());
}
return null;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 06f7454..693f779 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -1590,7 +1590,7 @@
.eq(Member::getType,Constants.memberType.internal)
.eq(Member::getStatus,Constants.ZERO)
.isNotNull(Member::getHkId)
- .apply("to_days(lastVisitDate)+ "+days+" < to_days(now())" ));
+ .apply("to_days(LAST_VISIT_DATE)+ "+days+" < to_days(now())" ));
if(CollectionUtils.isEmpty(memberList)){
return;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPrivilegeServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPrivilegeServiceImpl.java
index 62b5b77..dad3c62 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPrivilegeServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPrivilegeServiceImpl.java
@@ -120,11 +120,17 @@
if(model !=null){
//濡傛灉宸插瓨鍦紝鍒欐洿鏂版暟鎹�
model = initDataByHkData(model,device,date);
+ if(allHkList.size()==1){
+ model.setIsDefault(Constants.ZERO);
+ }
editList.add(model);
}else{
//濡傛灉涓嶅瓨鍦紝鍒欐柊澧炴暟鎹�
model = new DeviceRole();
model = initDataByHkData(model,device,date);
+ if(allHkList.size()==1){
+ model.setIsDefault(Constants.ZERO);
+ }
addList.add(model);
}
}
--
Gitblit v1.9.3