From 755b60c531999e9d3c0a94759a2a5e92f5e4ad4e Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期一, 25 三月 2024 14:18:01 +0800
Subject: [PATCH] 整理
---
server/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java | 18 +++
server/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java | 1
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java | 1
server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java | 26 ++--
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FacePictureCheckResponse.java | 29 ++++
server/admin_timer/src/main/java/com/doumee/task/ScheduleTaskFailRetrylTool.java | 32 +++++
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java | 60 +++++++--
server/admin_timer/src/main/java/com/doumee/task/ScheduleTaskDetailTool.java | 2
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java | 11 +
server/dmvisit_service/src/main/java/com/doumee/dao/business/join/EmpowerJoinMapper.java | 4
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 36 +++--
server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/ApproveNoticeRequest.java | 9 +
server/admin_timer/src/main/java/com/doumee/task/ScheduleTaskProgressTool.java | 2
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java | 62 +++++----
server/admin_timer/src/main/java/com/doumee/task/ScheduleSendTaskTool.java | 2
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java | 22 ++-
server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/erp/ApproveAddRequest.java | 5
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java | 5
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FacePictureCheckRequest.java | 11 +
server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java | 6 +
server/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/ErpVisitDTO.java | 2
21 files changed, 258 insertions(+), 88 deletions(-)
diff --git a/server/admin_timer/src/main/java/com/doumee/task/ScheduleSendTaskTool.java b/server/admin_timer/src/main/java/com/doumee/task/ScheduleSendTaskTool.java
index 0ff1fe9..34164ae 100644
--- a/server/admin_timer/src/main/java/com/doumee/task/ScheduleSendTaskTool.java
+++ b/server/admin_timer/src/main/java/com/doumee/task/ScheduleSendTaskTool.java
@@ -27,7 +27,7 @@
* 瀹氭椂鍚屾鍐呴儴浜哄憳鎺堟潈鍒版捣搴风郴缁�
* @throws Exception
*/
- @Scheduled(fixedDelay= 30*1000)
+ @Scheduled(fixedRate= 30*1000)
public void syncEmpowerData() {
if(endId ==null){
endId =0;
diff --git a/server/admin_timer/src/main/java/com/doumee/task/ScheduleTaskDetailTool.java b/server/admin_timer/src/main/java/com/doumee/task/ScheduleTaskDetailTool.java
index 84fdd4f..e61efcb 100644
--- a/server/admin_timer/src/main/java/com/doumee/task/ScheduleTaskDetailTool.java
+++ b/server/admin_timer/src/main/java/com/doumee/task/ScheduleTaskDetailTool.java
@@ -27,7 +27,7 @@
* 瀹氭椂鏌ヨ浜哄憳瀹為檯涓嬪彂鏉冮檺缁撴灉锛屾槸鍚﹀凡缁忎笅杞芥垚鍔�
* @throws Exception
*/
- @Scheduled(fixedDelay= 30*1000)
+ @Scheduled(fixedRate= 30*1000)
public void syncEmpowerDetailData() {
if(endId ==null){
endId =0;
diff --git a/server/admin_timer/src/main/java/com/doumee/task/ScheduleTaskFailRetrylTool.java b/server/admin_timer/src/main/java/com/doumee/task/ScheduleTaskFailRetrylTool.java
new file mode 100644
index 0000000..8f3a2fc
--- /dev/null
+++ b/server/admin_timer/src/main/java/com/doumee/task/ScheduleTaskFailRetrylTool.java
@@ -0,0 +1,32 @@
+package com.doumee.task;
+
+
+import com.doumee.service.business.impl.hksync.HkSyncEmpowerServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+/**
+ * 瀹氭椂浠诲姟
+ * @author jiangping
+ * @date 2021-10-10 14:40:35
+ * https://www.bejson.com/othertools/cron/ cron 琛ㄨ揪寮忕敓鎴愬湴鍧�
+ */
+@Component
+@EnableScheduling
+public class ScheduleTaskFailRetrylTool {
+
+ public static Integer endId = 0;
+ @Autowired
+ private HkSyncEmpowerServiceImpl hkSyncEmpowerService;
+
+ /**
+ * 瀹氭椂瀵逛笅鍙戝け璐ョ殑鎺堟潈杩涜閲嶈瘯锛�10鍒嗛挓锛�
+ * @throws Exception
+ */
+ @Scheduled(fixedRate= 60*1000 *10)
+ public void syncEmpowerDetailData() {
+ hkSyncEmpowerService.syncEmpowerFailData(endId);
+ }
+}
diff --git a/server/admin_timer/src/main/java/com/doumee/task/ScheduleTaskProgressTool.java b/server/admin_timer/src/main/java/com/doumee/task/ScheduleTaskProgressTool.java
index 441e001..8d74060 100644
--- a/server/admin_timer/src/main/java/com/doumee/task/ScheduleTaskProgressTool.java
+++ b/server/admin_timer/src/main/java/com/doumee/task/ScheduleTaskProgressTool.java
@@ -26,7 +26,7 @@
* 瀹氭椂鏌ヨ浜哄憳涓嬪彂娴峰悍缁撴灉锛堜换鍔℃槸鍚﹀凡涓嬭浇缁撴潫锛�
* @throws Exception
*/
- @Scheduled(fixedDelay=20*1000)
+ @Scheduled(fixedRate=20*1000)
public void syncEmpowerResultData() {
hkSyncEmpowerService.syncEmpowerResultData(endId);
}
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
index f514f8d..2dc9432 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
@@ -89,6 +89,12 @@
}
+ @ApiOperation("鍚屾浜鸿劯淇℃伅")
+ @PostMapping("/updateFace")
+ public ApiResponse updateFace(@RequestBody Member member) {
+ memberService.updateFace(member);
+ return ApiResponse.success(null);
+ }
@ApiOperation("鏍规嵁ID淇敼")
@PostMapping("/updateById")
@RequiresPermissions("business:member:update")
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java b/server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java
index 5fa143f..da5d9f1 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java
@@ -26,8 +26,8 @@
* @date 2021-10-10 14:40:35
* https://www.bejson.com/othertools/cron/ cron 琛ㄨ揪寮忕敓鎴愬湴鍧�
*/
-@Component
-@EnableScheduling
+//@Component
+//@EnableScheduling
public class ScheduleTool {
@Autowired
@@ -64,7 +64,7 @@
* 姣忓垎閽熸媺鍙栦竴娆′粖鏃ョ殑璁垮棰勭害鏁版嵁
* @throws Exception
*/
- @Scheduled(fixedDelay= 30*1000)
+ @Scheduled(fixedRate= 30*1000)
public void syncVistAppointData() throws Exception {
if(Constants.DEALING_FROM_HK_VISIT){
return ;
@@ -83,7 +83,7 @@
* 姣�10鍒嗛挓鎷夊彇涓�娆℃渶鏂拌瀹㈢櫥璁扮姸鎬侊紙棰勭害鎴愬姛鍜屽凡鐧昏锛�
* @throws Exception
*/
- @Scheduled(fixedDelay= 10*60*1000)
+ @Scheduled(fixedRate= 10*60*1000)
public void syncVisitOuttimeStatus() throws Exception {
hkSyncVisitService.getOutTimeVisitRecord();
}
@@ -91,7 +91,7 @@
* 涓嬭浇娴峰悍绯荤粺鍥剧墖鏁版嵁
* @throws Exception
*/
- @Scheduled(fixedDelay= 60*1000)
+ @Scheduled(fixedRate= 60*1000)
public void downloadHkImg() throws Exception {
if(dataSyncConfig.getNeedDealImg()!=null && dataSyncConfig.getNeedDealImg()){
hkSyncImgService.downHKImgs(0);
@@ -101,7 +101,7 @@
* 瀹氭椂鍚屾缁勭粐淇℃伅鍒版捣搴风郴缁�
* @throws Exception
*/
- @Scheduled(fixedDelay= 60*1000)
+ @Scheduled(fixedRate= 60*1000)
public void syncOrgData() {
if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.erp){
//濡傛灉鏄疎RP绯荤粺鍚屾涓嬪彂
@@ -112,7 +112,7 @@
* 瀹氭椂鍚屾鐢ㄦ埛淇℃伅鍒版捣搴风郴缁�
* @throws Exception
*/
- @Scheduled(fixedDelay= 60*1000)
+ @Scheduled(fixedRate= 60*1000)
public void syncUserData() {
if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.erp) {
//濡傛灉鏄疎RP绯荤粺鍚屾涓嬪彂
@@ -123,7 +123,7 @@
* 瀹氭椂鍚屾鐢宠閫氳繃鐨勮瀹㈡暟鎹埌娴峰悍绯荤粺
* @throws Exception
*/
- @Scheduled(fixedDelay= 60*1000)
+ @Scheduled(fixedRate= 60*1000)
public void syncVisitData() {
hkSyncVisitService.syncVisitData();
}
@@ -131,7 +131,7 @@
* 瀹氭椂鍚屾鍐呴儴浜哄憳鎺堟潈鍒版捣搴风郴缁�
* @throws Exception
*//*
- @Scheduled(fixedDelay= 3*1000)
+ @Scheduled(fixedRate= 3*1000)
public void syncEmpowerData() {
hkSyncEmpowerService.syncEmpowerData();
}
@@ -139,7 +139,7 @@
* 瀹氭椂鏌ヨ浜哄憳涓嬪彂娴峰悍缁撴灉锛堜换鍔℃槸鍚﹀凡涓嬭浇缁撴潫锛�
* @throws Exception
*//*
- @Scheduled(fixedDelay= 60*1000)
+ @Scheduled(fixedRate= 60*1000)
public void syncEmpowerResultData() {
hkSyncEmpowerService.syncEmpowerResultData();
}
@@ -147,7 +147,7 @@
* 瀹氭椂鏌ヨ浜哄憳瀹為檯涓嬪彂鏉冮檺缁撴灉锛屾槸鍚﹀凡缁忎笅杞芥垚鍔�
* @throws Exception
*//*
- @Scheduled(fixedDelay= 60*1000)
+ @Scheduled(fixedRate= 60*1000)
public void syncEmpowerDetailData() {
hkSyncEmpowerService.syncEmpowerDetailData();
}*/
@@ -155,7 +155,7 @@
* 瀹氭椂鍚屾杞﹁締鍖呮湡鍒版捣搴风郴缁�
* @throws Exception
*/
- @Scheduled(fixedDelay= 60*1000)
+ @Scheduled(fixedRate= 60*1000)
public void syncParkBookData() {
hkSyncParkService.syncParkBookData();
}
@@ -164,7 +164,7 @@
/**
* 瀹氭椂鍐荤粨鍐呴儴浜哄憳
*/
- @Scheduled(fixedDelay= 60*1000)
+ @Scheduled(fixedRate= 60*1000)
public void memberFreeze() {
memberService.memberFreeze();
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/ApproveNoticeRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/ApproveNoticeRequest.java
index 9de2e39..d40397e 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/ApproveNoticeRequest.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/ApproveNoticeRequest.java
@@ -5,6 +5,9 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.Date;
+import java.util.List;
+
/**
* 鍒嗙被淇℃伅琛�
* @author 姹熻箘韫�
@@ -19,4 +22,10 @@
private Integer status;
@ApiModelProperty(value = "瀹℃牳鏃堕棿 yyyy-MM-dd HH:mm:ss" )
private String approveDate ;
+ @ApiModelProperty(value = "瀹℃牳鍚庡厑璁歌繘鍦烘椂闂� 鏍煎紡锛歽yyy-MM-dd HH:mm:ss,涓虹┖琛ㄧず淇濇寔鐢宠鏁版嵁" )
+ private Date startTime ;
+ @ApiModelProperty(value = "瀹℃壒鍚庡厑璁哥寮�鏃堕棿 鏍煎紡锛歽yyy-MM-dd HH:mm:ss,涓虹┖琛ㄧず淇濇寔鐢宠鏁版嵁" )
+ private Date endTime ;
+ @ApiModelProperty(value = "瀹℃壒鍚庡厑璁歌瀹㈤棬绂佺粍缂栫爜,澶氫釜璇蜂娇鐢ㄨ嫳鏂囬�楀彿,闅斿紑锛屽1,2,涓虹┖琛ㄧず淇濇寔鐢宠鏁版嵁" )
+ private String doors;
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/erp/ApproveAddRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/erp/ApproveAddRequest.java
index 7fcbec5..ea5f34e 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/erp/ApproveAddRequest.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/erp/ApproveAddRequest.java
@@ -29,10 +29,11 @@
private String startTime ;
@ApiModelProperty(value = "鐢宠绂诲紑鏃堕棿" )
private String endTime ;
- @ApiModelProperty(value = "杞︾墝鍙烽泦鍚�" )
- private List<String> carNo ;
@ApiModelProperty(value = "闂ㄧ缁勭紪鐮侀泦鍚�" )
private List<Integer> roleIds ;
+ @ApiModelProperty(value = "杞︾墝鍙烽泦鍚�" )
+ private List<String> carNo ;
+
@ApiModelProperty(value = "闂ㄧ缁勫悕绉伴泦鍚�" )
private List<String> roleNames ;
@ApiModelProperty(value = "琚闂汉鎵�灞炵粍缁嘔d(ERP绔疘D)" )
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
index 10f24d9..3f5df42 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
@@ -79,6 +79,7 @@
String visitingRecords= "/api/visitor/v2/visiting/records";//鏌ヨ璁垮鏉ヨ璁板綍v2
String vehicleList= "/api/resource/v2/vehicle/advance/vehicleList";//鏌ヨ杞﹁締鍒楄〃v2
String vehicleTimeRangeList= "/api/resource/v1/vehicle/timeRange";//澧為噺鑾峰彇杞﹁締鏁版嵁
+ String facePictureCheck= "/api/frs/v1/face/picture/check";//浜鸿劯璇勫垎
}
/**
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
index 9680ddc..ede07f3 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
@@ -695,5 +695,16 @@
saveInterfaceLog(body,result,path);
return result;
}
+ /**
+ * 鍋滆溅鍦鸿繃杞﹁褰曟煡璇�
+ * @param body
+ * @return
+ */
+ public static String facePictureCheck(String body) {
+ Map<String, String> path = getPath(HKConstants.InterfacePath.facePictureCheck);
+ String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
+ saveInterfaceLog(body,result,path);
+ return result;
+ }
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FacePictureCheckRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FacePictureCheckRequest.java
new file mode 100644
index 0000000..610d964
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FacePictureCheckRequest.java
@@ -0,0 +1,11 @@
+package com.doumee.core.haikang.model.param.request;
+
+import lombok.Data;
+
+@Data
+public class FacePictureCheckRequest {
+
+ private String facePicBinaryData;// string False 浜鸿劯鍥剧墖鐨勪簩杩涘埗鏁版嵁缁忚繃 Base64 缂栫爜鍚庣殑瀛楃涓诧紝璇ュ弬鏁颁笌 f acePicUrl 鑷冲皯鏈変竴涓瓨鍦紝閮藉瓨鍦ㄦ椂浼樺厛浣跨敤姝ゅ弬鏁�
+ private String facePicUrl ;//string False 浜鸿劯鍥剧墖url 锛岃姹� URL 鍙互閫氳繃 GET 鏂瑰紡鐩存帴涓嬭浇锛岃 鍙傛暟涓� facePicBinaryData 鑷冲皯鏈変竴涓瓨鍦�
+
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FacePictureCheckResponse.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FacePictureCheckResponse.java
new file mode 100644
index 0000000..99c4d52
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FacePictureCheckResponse.java
@@ -0,0 +1,29 @@
+package com.doumee.core.haikang.model.param.respose;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class FacePictureCheckResponse {
+
+ private Integer total;// number False 鎬绘潯鏁�
+
+ private Boolean checkResult;// boolean False 浜鸿劯鍥剧墖妫�娴嬬粨鏋滐紝true-璇勫垎鍚堟牸false-璇勫垎涓� 鍚堟牸
+ /**
+ * 0x1f902300-浜鸿劯妫�娴嬮敊璇紙鍥剧墖鏍煎紡涓嶇鍚堣姹傘�佹娴嬩笉鍒颁汉鑴哥瓑鎯呭喌鏃讹級
+ * 0x1f902301-浜鸿劯妫�娴嬭秴鏃�
+ * 0x1f902303-鍥剧墖涓ょ溂闂磋窛杩囧皬
+ * 0x1f902304-鍥剧墖褰╄壊缃俊搴﹁繃浣�
+ * 0x1f902305-鍥剧墖浜鸿劯瑙掑害杩囧ぇ
+ * 0x1f902306-鍥剧墖娓呮櫚搴﹁繃浣�
+ * 0x1f902307-鍥剧墖杩囨洕鎴栬繃鏆楋紙鐏伴樁鍊间笉绗﹀悎瑕佹眰锛�
+ * 0x1f902308-鍥剧墖閬尅涓ラ噸
+ * 0x1f902309-鍥剧墖鍒嗘暟杩囦綆
+ */
+ private String statusCode ;//string False 璇勫垎澶辫触璇︾粏閿欒鐮侊紝
+ private String statusMessage;// string False 璇勫垎澶辫触璇︽儏鎻忚堪
+ private String faceScore ;//number False 浜鸿劯璇勫垎锛岃寖鍥达細 1-100
+ private String facePicAnalysisResult ;//object False 璇勫垎鎴愬姛鍚庣殑浜鸿劯 淇℃伅锛岀敤浜庝汉鑴歌鍓�
+
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
index a4f28f0..fb4fbb7 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
@@ -945,6 +945,24 @@
}
return null;
}
+ /**
+ *澧為噺杞﹁締鏌ヨ锛堝垎椤碉級
+ * @return
+ */
+ public static BaseResponse<BaseListPageResponse<VehicleTimeRangeInfoResponse>> facePictureCheck(TimeRangeListRequest param){
+ log.info("銆愭捣搴峰閲忎汉鍛樻煡璇€��================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.facePictureCheck(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<BaseListPageResponse<VehicleTimeRangeInfoResponse>> >(){};
+ BaseResponse<BaseListPageResponse<VehicleTimeRangeInfoResponse>> result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍澧為噺浜哄憳鏌ヨ");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴峰閲忎汉鍛樻煡璇€��================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
private static void logResult(BaseResponse res,String name) {
if(StringUtils.equals(res.getCode(),HKConstants.RESPONSE_SUCCEE)){
log.info("銆�"+name+"銆�================鎴愬姛====\n"+res);
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/EmpowerJoinMapper.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/EmpowerJoinMapper.java
index 7b7548b..f920075 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/EmpowerJoinMapper.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/EmpowerJoinMapper.java
@@ -4,10 +4,12 @@
import com.doumee.dao.business.model.Empower;
import com.github.yulichang.base.mapper.MPJJoinMapper;
+import java.util.List;
+
/**
* @author 姹熻箘韫�
* @date 2023/11/30 15:33
*/
public interface EmpowerJoinMapper extends MPJJoinMapper<Empower> {
-
+ void insertBatchSomeColumn(List<Empower> list);
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java
index d628089..7cc4b0a 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java
@@ -63,6 +63,8 @@
private Integer sendUserId;
@ApiModelProperty(value = "涓嬪彂娆℃暟", example = "1")
private Integer tryNum;
+ @ApiModelProperty(value = "澶辫触閲嶈瘯 0闇�瑕� 1涓嶉渶瑕�", example = "1")
+ private Integer failFlag;
@ApiModelProperty(value = "鍙栨秷浜哄憳", example = "1")
private Integer cancelUserId;
@@ -164,5 +166,8 @@
@ApiModelProperty(value = "浜哄憳鏄惁鍒犻櫎 0鍚� 1鏄�")
@TableField(exist = false)
private Integer memberDeleted;
+ @ApiModelProperty(value = "涓存椂瀛楁")
+ @TableField(exist = false)
+ private Integer tempCouunt;
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/ErpVisitDTO.java b/server/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/ErpVisitDTO.java
index dc375df..c7f204b 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/ErpVisitDTO.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/ErpVisitDTO.java
@@ -83,6 +83,4 @@
@ApiModelProperty(value = "闅忚浜哄憳淇℃伅")
List<ErpWithVisitDTO> erpWithVisitDTOList;
-
-
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java
index ae0dfc7..6209e5a 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java
@@ -70,6 +70,7 @@
* @param member 瀹炰綋瀵硅薄
*/
void updateById(Member member);
+ void updateFace(Member member);
/**
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 09b51e9..abe77b2 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -189,19 +189,8 @@
if(member==null || member.getIsdeleted().equals(Constants.ONE)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鍛樺伐淇℃伅宸插垹闄�");
}
- List<MemberCard> cards = HkSyncOrgUserToHKServiceImpl.getNormalCardList(member,memberCardMapper);
- HkSyncOrgUserToHKServiceImpl.dealMemberRoleEmpowerDo(cards,member,deviceRoleMapper,empowerMapper,deviceMapper);
-
- /* LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- Member member = memberMapper.selectById(id);
- if(member.getIsdeleted().equals(Constants.ONE)){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍛樺伐淇℃伅宸插垹闄�");
- }
- if(!member.getType().equals(Constants.memberType.internal)){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炲唴閮ㄤ汉鍛樻棤娉曡繘琛岃鎿嶄綔");
- }
- List<MemberRole> roleList = memberRoleMapper.selectList(new QueryWrapper<MemberRole>().lambda().eq(MemberRole::getMemberId,member.getId()));
-*/
+// List<MemberCard> cards = HkSyncOrgUserToHKServiceImpl.getNormalCardList(member,memberCardMapper);
+ HkSyncOrgUserToHKServiceImpl.dealMemberRoleEmpowerDo(null,member,deviceRoleMapper,empowerMapper,deviceMapper);
}
@@ -287,6 +276,27 @@
public void updateById(Member member) {
memberMapper.updateById(member);
}
+ @Override
+ public void updateFace(Member member) {
+ QueryWrapper<Member> wrapper = new QueryWrapper<>(member);
+ wrapper.lambda().ne(Member::getRemark,"浜鸿劯宸插悓姝ユ渶鏂�");
+ List<Member> list =memberMapper.selectList(wrapper);
+ if(list!=null){
+ String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
+ +systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
+ for(Member m : list){
+ String faceId= HkSyncOrgUserToHKServiceImpl.dealMemberFace(m,path);
+ if(StringUtils.isNotBlank(faceId)){
+ Member update = new Member();
+ update.setId(m.getId());
+ update.setFaceId(faceId);
+ update.setRemark("浜鸿劯宸插悓姝ユ渶鏂�");
+ update.setFaceStatus(Constants.ZERO);
+ memberMapper.updateById(update);
+ }
+ }
+ }
+ }
@Override
public void updateStatusById(Member member) {
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
index 26aad7c..3ebc38d 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
@@ -36,6 +36,7 @@
import com.doumee.dao.business.model.*;
import com.doumee.service.business.ext.ERPSyncService;
import com.doumee.service.business.InterfaceLogService;
+import com.doumee.service.business.impl.hksync.ferp.HkSyncOrgUserToHKServiceImpl;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.Synchronized;
import org.apache.commons.collections.CollectionUtils;
@@ -305,22 +306,22 @@
dealUserChangeList(list,addList,updateList,delList,allList,param);
if(addList.size()>0){
memberMapper.insertBatchSomeColumn(addList);
- for (Member member:addList) {
+ /* for (Member member:addList) {
dealRoleEmpower(member );
- }
+ }*/
}
if(updateList.size()>0){
for(Member c : updateList){
- dealRoleEmpower(c );
+// dealRoleEmpower(c );
c.setHkStatus(Constants.ZERO);
c.setRemark("寰呭悓姝ュ畨闃插钩鍙�");
memberMapper.updateById(c);
}
}
if(delList.size()>0){
- for (Member member:delList) {
+ /* for (Member member:delList) {
dealRoleEmpower(member );
- }
+ }*/
delIds = delList.stream().map(m->m.getId()).collect(Collectors.toList());
memberMapper.update(null,new UpdateWrapper<Member>().lambda()
.set(Member::getHkStatus,Constants.ZERO)
@@ -839,7 +840,7 @@
member.setErpStatus(Constants.ONE);
member.setErpDate(new Date());
member.setErpId(param.getId());
- member.setFsStatus(Constants.ZERO);
+ member.setFaceStatus(Constants.ZERO);
member.setCompanyId(company.getId());
member.setType(Constants.memberType.internal);
member.setCanVisit(Constants.ONE);
@@ -853,6 +854,7 @@
memberMapper.insert(member);
}else{
Integer id = member.getId();
+ String faceImg = member.getFaceImg();
BeanUtils.copyProperties(param,member);
member.setId(id);
member.setCompanyId(company.getId());
@@ -863,15 +865,20 @@
member.setEditDate(new Date());
member.setErpDate(new Date());
member.setHkStatus(Constants.ZERO);
- member.setRemark("寰呭悓姝ュ畨闃插钩鍙�");
+ if(StringUtils.isNotBlank(param.getFaceImg())
+ && !StringUtils.equals(param.getFaceImg(),faceImg)){
+ //鍙湁浜鸿劯鍙戠敓鍙樺寲锛屾墠杩涜閲嶆柊鍚屾
+ member.setFaceStatus(Constants.ZERO);
+ member.setRemark("寰呭悓姝ュ畨闃插钩鍙�");
+ }
member.setStartTime(param.getValidStartTime());
member.setEndTime(param.getValidEndTime());
memberMapper.updateById(member);
}
//2024骞�3鏈�7鏃�17:49:33 鍙栨秷姝や笟鍔″鐞嗕汉鍛橀棬绂佹潈闄�
// getRoleIdByParam(param.getRoleIds(),member);
- //娣诲姞浜哄憳鍗＄墖鏁版嵁
- dealMemberCard(member,param);
+ //娣诲姞浜哄憳鍗＄墖鏁版嵁(宸插紑鍚櫄鎷熷崱鍔熻兘锛岀郴缁熶笉闇�瑕佺粰铏氭嫙鍗�)
+// dealMemberCard(member,param);
}
}
@@ -988,14 +995,18 @@
if(param.getRoleIds()!=null && param.getRoleIds().length>0 && StringUtils.isBlank(member.getRoleId())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝鏈煡璇㈠埌鏈夋晥闂ㄧ缁勬暟鎹�");
}
- memberMapper.update(null,new UpdateWrapper<Member>().lambda()
+ //閲嶆柊鎺堟潈
+ HkSyncOrgUserToHKServiceImpl.dealMemberRoleEmpowerDo(null,member,deviceRoleMapper,empowerMapper,deviceMapper);
+
+
+ /* memberMapper.update(null,new UpdateWrapper<Member>().lambda()
.eq(Member::getId,member.getId())
.set(Member::getRoleId,member.getRoleId())
.set(Member::getRemark,"寰呭悓姝ュ畨闃插钩鍙�")
.set(Member::getStartTime,param.getValidStartTime())
.set(Member::getEndTime,param.getValidEndTime())
.set(Member::getEditDate,new Date())
- .set(Member::getHkStatus,Constants.ZERO ));
+ .set(Member::getHkStatus,Constants.ZERO ));*/
}
@@ -1048,34 +1059,49 @@
}
}
}
+ private void isValidDoors(String doors) {
+ if(StringUtils.isNotBlank(doors)){
+ String[] dIds = doors.split(",");
+ List<DeviceRole> roles = deviceRoleMapper.selectList(new QueryWrapper<DeviceRole>().lambda()
+ .eq(DeviceRole::getIsdeleted,Constants.ZERO)
+ .eq(DeviceRole::getType,Constants.DeviceRoleType.fk)
+ .in(DeviceRole::getId, Arrays.asList(dIds)));
+ if(roles == null || roles.size()==0 || roles.size() != dIds.length){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝璇烽�夋嫨鏈夋晥鐨勮瀹㈤棬绂佺粍锛�");
+ }
+ }
+ }
@Override
public void approveApply(ApproveNoticeRequest param){
try{
- if(!Objects.isNull(param)
- ){
-
- }
if(Objects.isNull(param)
||Objects.isNull(param.getId())
||Objects.isNull(param.getStatus())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
if(!(param.getStatus()==Constants.ZERO||param.getStatus()==Constants.ONE)){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鐘舵�佺爜閿欒");
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀹℃壒缁撴灉鍙傛暟涓嶆纭�");
}
if(visitsMapper.selectCount(new QueryWrapper<Visits>().lambda().eq(Visits::getErpId,param.getId())
.ne(Visits::getStatus,Constants.VisitStatus.submitCheck))>Constants.ZERO){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏁版嵁鐘舵�佺爜閿欒");
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璇ョ敵璇峰綋鍓嶇姸鎬佷笉鏀寔璇ユ搷浣�");
}
+ isValidDoors(param.getDoors());
List<Visits> visitsList = visitsMapper.selectList(new QueryWrapper<Visits>().lambda().eq(Visits::getErpId,param.getId()));
if(CollectionUtils.isNotEmpty(visitsList)){
visitsList.forEach(i->{
+ i.setEndCheckInfo("鐢宠鏃堕棿锛�"+DateUtil.getPlusTime2(i.getStarttime())+"-"
+ +DateUtil.getPlusTime2(i.getEndtime())
+ +" 鐢宠闂ㄧ锛�"+i.getDoors());
i.setStatus(!param.getStatus().equals(Constants.ZERO)?Constants.VisitStatus.pass:Constants.VisitStatus.noPass);
i.setEndCheckDate(DateUtil.StringToDate(param.getApproveDate(),"yyyy-MM-dd HH:mm:ss"));
i.setHkStatus(Constants.ZERO);
i.setRemark("寰呭悓姝ュ畨闃插钩鍙�");
+ i.setStarttime( param.getStartTime());
+ i.setEndtime(param.getEndTime());
+ i.setDoors(param.getDoors());
visitsMapper.updateById(i);
if(Objects.isNull(i.getParentId())){
wxPlatNotice.sendVisitAuditTemplateNotice(i,
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java
index d9c6ddd..d94d165 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java
@@ -132,12 +132,14 @@
.eq(Empower::getId, c.getId())
.set(Empower::getRemark, "鍒犻櫎鏉冮檺涓嬪彂澶辫触")
.set(Empower::getSendInfo, "鍒犻櫎鏉冮檺涓嬪彂澶辫触")
+ .set(Empower::getTryNum,Constants.formatIntegerNum(c.getTryNum())+1)
.set(Empower::getSendStatus, Constants.EmpowerStatus.fail));
}else{
empowerMapper.update(null, new UpdateWrapper<Empower>()
.lambda()
.eq(Empower::getId, c.getId())
.set(Empower::getRemark, "涓嬪彂澶辫触")
+ .set(Empower::getTryNum,Constants.formatIntegerNum(c.getTryNum())+1)
.set(Empower::getSendInfo, "涓嬪彂澶辫触")
.set(Empower::getSendStatus, Constants.EmpowerStatus.fail));
}
@@ -321,28 +323,40 @@
List<Empower> allList =getAllFailDealList( endId);
if(allList!=null && allList.size()>0){
Date date = new Date();
+ List<Integer> retryIds = new ArrayList<>();
+ List<Integer> noIds = new ArrayList<>();
for(Empower empower:allList){
- if(Constants.equalsObject(empower.getIsdeleted(),Constants.ONE)){
- //濡傛灉鏄垹闄ょ殑鏉冮檺涓嬪彂锛屾煡璇㈡槸鍚︿己鍊欐湁涓嬪彂鎴愬姛鐨勬暟鎹紝濡傛灉鏈夛紝鍒欎笉澶勭悊
- Empower param = empowerMapper.selectOne(new QueryWrapper<Empower>().lambda()
- .eq(Empower::getMemberId,empower.getMemberId())
- .eq(Empower::getDeviceId,empower.getDeviceId() )
- .gt(Empower::getId,empower.getId())
- .last("limit 1"));
- if(empower ==null || Constants.equalsInteger(empower.getIsdeleted(),Constants.ONE)){
-// addIds.add(did);
- }
+ //濡傛灉鏄垹闄ょ殑鏉冮檺涓嬪彂锛屾煡璇㈡槸鍚︿己鍊欐湁涓嬪彂鎴愬姛鐨勬暟鎹紝濡傛灉鏈夛紝鍒欎笉澶勭悊
+ if(empower.getId().equals(392479)){
+ System.out.println("============================");
}
- //鏇存柊閲嶆柊涓嬪彂娆℃暟
+// int flag= empowerMapper.selectCount(new QueryWrapper<Empower>().lambda()
+// .eq(Empower::getMemberId,empower.getMemberId())
+// .eq(Empower::getDeviceId,empower.getDeviceId() )
+// .gt(Empower::getId,empower.getId())
+// .last("limit 1"));
+ if(empower.getTempCouunt() ==0){
+ //濡傛灉涔嬪悗鏃堕棿鍐呭張閲嶆柊涓嬪彂璁板綍锛屽垯璺宠繃涓嶅仛澶勭悊
+ retryIds.add(empower.getId());
+ }else{
+ noIds.add(empower.getId());
+ }
+ }
+
+ if(retryIds.size()>0){
empowerMapper.update(null,new UpdateWrapper<Empower>().lambda()
- .eq(Empower::getEditDate,date)
- .setSql("try_num = ifnull(tyr_num,0) +1" )
+ .set(Empower::getCreateDate,date)
.set(Empower::getSendStatus,Constants.EmpowerStatus.wait)
- .set(Empower::getSendDate,null)
.set(Empower::getEditDate,date)
.set(Empower::getRemark,"涓嬪彂澶辫触锛屽緟閲嶆柊涓嬪彂~")
- .set(Empower::getRemark,"涓嬪彂澶辫触锛屽緟閲嶆柊涓嬪彂~")
- .eq(Empower::getId,empower.getId()));
+ .set(Empower::getSendInfo,"涓嬪彂澶辫触锛屽緟閲嶆柊涓嬪彂~")
+ .in(Empower::getId,retryIds));
+ }
+ if(noIds.size()>0){
+ empowerMapper.update(null,new UpdateWrapper<Empower>().lambda()
+ .set(Empower::getEditDate,date)
+ .set(Empower::getFailFlag,Constants.ONE)
+ .in(Empower::getId,noIds));
}
return allList.get(allList.size()-1).getId();
}
@@ -631,22 +645,14 @@
List<Empower> list = empowerMapper.selectJoinList(Empower.class,queryWrapper);
return list;
}
- private List<Empower> getAllFailDealList(int endId ) {
+ private List<Empower> getAllFailDealList(int endId ) {
MPJLambdaWrapper<Empower> queryWrapper = new MPJLambdaWrapper<>();
- queryWrapper.selectAll(Empower.class);
- queryWrapper.selectAs(Device::getChannelNo,Empower::getDeviceChannelNo);
- queryWrapper.selectAs(Member::getHkStatus,Empower::getMemberHkStatus);
- queryWrapper.selectAs(Member::getIsdeleted,Empower::getMemberDeleted);
- queryWrapper.selectAs(Member::getHkId,Empower::getMemberHkId);
- queryWrapper.selectAs(Device::getHkId,Empower::getDeviceIndexCode);
- queryWrapper.selectAs(Device::getResourceType,Empower::getDeviceType);
- queryWrapper.leftJoin(Device.class,Device::getId,Empower::getDeviceId);
- queryWrapper.leftJoin(Member.class,Member::getId,Empower::getMemberId);
+ queryWrapper.select(Empower::getId,Empower::getMemberId,Empower::getDeviceId,Empower::getIsdeleted);
+ queryWrapper.select(" (select count(1) from empower ee where ee.member_id=t.MEMBER_ID and ee.device_id =t.DEVICE_ID and ee.id>t.id) as tempCouunt");
queryWrapper.eq(Empower::getSendStatus,Constants.EmpowerStatus.fail);
queryWrapper.gt(Empower::getId,endId);
queryWrapper.orderByAsc(Empower::getId );
-// queryWrapper.orderByAsc(Empower::getCreateDate );
- queryWrapper.last("limit 100");//姣忔闄愬埗涓嬪彂100涓�
+ queryWrapper.ne( Empower::getFailFlag,Constants.ONE);
List<Empower> list = empowerMapper.selectJoinList(Empower.class,queryWrapper);
return list;
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
index f4066e7..852ec47 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
@@ -365,7 +365,7 @@
dealMemberRoleEmpowerDo(cards,member,deviceRoleMapper,empowerMapper,deviceMapper);
}
- public static void dealMemberRoleEmpowerDo(List<MemberCard> cards,Member member , DeviceRoleMapper deviceRoleMapper, EmpowerMapper empowerMapper, DeviceMapper deviceMapper) {
+ public static void dealMemberRoleEmpowerDo(List<MemberCard> cards1,Member member , DeviceRoleMapper deviceRoleMapper, EmpowerMapper empowerMapper, DeviceMapper deviceMapper) {
List<Integer> doorIds = getRoleIdByParam(member,deviceRoleMapper);
if(doorIds==null || doorIds.size() == 0){
//濡傛灉鏉冮檺娓呯┖锛屽垯娓呯┖浜哄憳鎺堟潈鐨勬潈闄愭暟鎹�
@@ -376,7 +376,8 @@
.set(Empower::getSendStatus,Constants.ZERO));
return;
}
- if((cards == null || cards.size() == 0) && StringUtils.isBlank(member.getFaceId())){
+// if((cards == null || cards.size() == 0) && StringUtils.isBlank(member.getFaceId())){
+ if( StringUtils.isBlank(member.getFaceId())){
//濡傛灉娌℃湁鍗� 涔熸病鏈変汉鑴�
return;
}
@@ -593,15 +594,19 @@
//澶勭悊鏂板鏁版嵁
BaseResponse result = HKService.editUser(addHkModel);
if(result !=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE) ){
- if(StringUtils.isNotBlank(c.getFaceImg())){
+ if(StringUtils.isNotBlank(c.getFaceImg()) && Constants.equalsInteger(c.getFaceStatus(),Constants.ZERO)){
//濡傛灉鏈変汉鑴哥収鐗囷紝澶勭悊浜鸿劯鐓х墖鍚屾
String faceid = dealMemberFace(c,path);
if(StringUtils.isBlank(faceid)){
noticeErpFail(c,Constants.ZERO,"浜鸿劯淇℃伅鏇存柊澶辫触锛岃妫�鏌ヤ汉鑴哥収鐗囨槸鍚﹀悎娉曪紒");
c.setHkStatus(Constants.TWO);
+ c.setFaceStatus(Constants.TWO);
c.setRemark("浜鸿劯淇℃伅鏇存柊澶辫触锛岃妫�鏌ヤ汉鑴哥収鐗囨槸鍚﹀悎娉曪紒锛�"+result.getMsg());
}else{
c.setFaceId(faceid);
+ c.setFaceStatus(Constants.ONE);
+ //濡傛灉浜鸿劯璺熶綘锛岄噸鏂颁笅鍙戞潈闄愭暟鎹�
+ dealMemberRoleEmpower(c);
}
}
}else{
@@ -609,8 +614,7 @@
c.setHkStatus(Constants.TWO);
c.setRemark("浜哄憳淇℃伅鍚屾瀹夐槻骞冲彴鏇存柊澶辫触锛岃淇鍚庨噸璇曪紒锛�"+(result!=null?result.getCode()+result.getMsg():""));
}
- //閲嶆柊涓嬪彂鏉冮檺鏁版嵁
- dealMemberRoleEmpower(c);
+
}
c.setHkDate(date);
memberMapper.updateById(c);
@@ -651,7 +655,7 @@
c.setHkId(addHkModel.getPersonId());
c.setHkDate(new Date());
memberMapper.updateById(c);
- dealMemberRoleEmpower(c);
+// dealMemberRoleEmpower(c);
return true;
}else{
noticeErpFail(c,Constants.ZERO,"浜哄憳淇℃伅鍚屾瀹夐槻骞冲彴澶辫触锛岃淇鍚庨噸璇曪紒"+result.getCode()+result.getMsg());
@@ -669,7 +673,7 @@
* @param path
* @return
*/
- private String dealMemberFace(Member c,String path) {
+ public static String dealMemberFace(Member c,String path) {
if(StringUtils.isBlank(c.getFaceId())){
BaseResponse<FaceAddOrEditesponse> response = HKService.addFace(getFaceAddModel(c,path));
if(response !=null && StringUtils.equals(response.getCode(),HKConstants.RESPONSE_SUCCEE)&& response.getData()!=null ){
@@ -774,7 +778,7 @@
}
return model;
}
- private FaceAddRequest getFaceAddModel(Member c,String path) {
+ public static FaceAddRequest getFaceAddModel(Member c,String path) {
FaceAddRequest model = new FaceAddRequest();
model.setPersonId(c.getHkId());
if(StringUtils.isNotBlank(c.getFaceImg())){
@@ -787,7 +791,7 @@
}
return model;
}
- private FaceEditRequest getFaceUpdateModel(Member c,String path) {
+ public static FaceEditRequest getFaceUpdateModel(Member c,String path) {
FaceEditRequest model = new FaceEditRequest();
model.setFaceId(c.getFaceId());
if(StringUtils.isNotBlank(c.getFaceImg())){
--
Gitblit v1.9.3