From 87ec373c158f7fa4c65fb037822fe7142a6fd5e7 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期二, 26 三月 2024 16:46:32 +0800
Subject: [PATCH] 整理
---
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 | 20 +++++-
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/InterfaceLogServiceImpl.java | 6 ++
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 23 +++++--
server/dmvisit_service/src/main/java/com/doumee/service/business/InterfaceLogService.java | 2
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java | 2
server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/CarEventDTO.java | 2
server/dmvisit_admin/src/main/resources/application.yml | 2
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 2
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java | 44 ++++++++------
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java | 10 +++
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java | 8 ++
server/dmvisit_admin/src/main/java/com/doumee/api/business/HkSyncController.java | 6 +-
13 files changed, 91 insertions(+), 37 deletions(-)
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/HkSyncController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/HkSyncController.java
index 98132b6..2de1007 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/HkSyncController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/HkSyncController.java
@@ -68,21 +68,21 @@
String result = hkSyncPrivilegeService.syncPrivilege(param);
return ApiResponse.success(result);
}
- @PreventRepeat
+// @PreventRepeat
@ApiOperation("銆愭捣搴枫�戦棬绂佷簨浠惰闃呮帹閫佸鎺ュ鐞嗘帴鍙�")
@PostMapping("/push/acs")
public ApiResponse pushAcs( HttpServletRequest request,@RequestBody EventAcsRequest param, HttpServletResponse response) {
String result = hkSyncPushService.dealAcsEvent(param,response);
return ApiResponse.success(result);
}
- @PreventRepeat
+// @PreventRepeat
@ApiOperation("銆愭捣搴枫�戣瀹簨浠惰闃呮帹閫佸鎺ュ鐞嗘帴鍙�")
@PostMapping("/push/visit")
public ApiResponse pushVisit(@RequestBody EventVisitRequest param, HttpServletResponse response) {
String result = hkSyncPushService.dealVisitEvent(param,response);
return ApiResponse.success(result);
}
- @PreventRepeat
+// @PreventRepeat
@ApiOperation("銆愭捣搴枫�戝仠杞﹀満浜嬩欢璁㈤槄鎺ㄩ�佸鎺ュ鐞嗘帴鍙�")
@PostMapping("/push/parks")
public ApiResponse pushParks(@RequestBody EventParkRequest param, HttpServletResponse response) {
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 da5d9f1..05436ba 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
@@ -5,6 +5,7 @@
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.utils.Constants;
+import com.doumee.service.business.InterfaceLogService;
import com.doumee.service.business.MemberService;
import com.doumee.service.business.impl.hksync.HkSyncEmpowerServiceImpl;
import com.doumee.service.business.impl.hksync.HkSyncImgServiceImpl;
@@ -26,8 +27,8 @@
* @date 2021-10-10 14:40:35
* https://www.bejson.com/othertools/cron/ cron 琛ㄨ揪寮忕敓鎴愬湴鍧�
*/
-//@Component
-//@EnableScheduling
+@Component
+@EnableScheduling
public class ScheduleTool {
@Autowired
@@ -46,6 +47,8 @@
private HkSyncVisitServiceImpl hkSyncVisitService;
@Autowired
private MemberService memberService;
+ @Autowired
+ private InterfaceLogService interfaceLogService;
/**
* 鏄惁寮�鍙戣��
*/
@@ -143,7 +146,8 @@
public void syncEmpowerResultData() {
hkSyncEmpowerService.syncEmpowerResultData();
}
- *//**
+ */
+ /**
* 瀹氭椂鏌ヨ浜哄憳瀹為檯涓嬪彂鏉冮檺缁撴灉锛屾槸鍚﹀凡缁忎笅杞芥垚鍔�
* @throws Exception
*//*
@@ -160,7 +164,6 @@
hkSyncParkService.syncParkBookData();
}
-
/**
* 瀹氭椂鍐荤粨鍐呴儴浜哄憳
*/
@@ -168,5 +171,12 @@
public void memberFreeze() {
memberService.memberFreeze();
}
-
+ /**
+ * 姣忓ぉ娓呯悊瓒呰繃涓�鍛ㄧ殑鎺ュ彛鏃ュ織鏁版嵁锛堟竻闄ゅ拰瀹夐槻骞冲彴瀵规帴鐨勬帴鍙ｆ暟鎹級
+ * @throws Exception
+ */
+ @Scheduled(cron= "0 0 23 * * ?")
+ public void clearThreeMonthLog() throws Exception {
+ interfaceLogService.clearThreeMonthLog();
+ }
}
diff --git a/server/dmvisit_admin/src/main/resources/application.yml b/server/dmvisit_admin/src/main/resources/application.yml
index e051fda..e7fd5cb 100644
--- a/server/dmvisit_admin/src/main/resources/application.yml
+++ b/server/dmvisit_admin/src/main/resources/application.yml
@@ -10,7 +10,7 @@
# application:
# name: doumeemes
profiles:
- active: testHS
+ active: proHS
# JSON杩斿洖閰嶇疆
jackson:
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 3f5df42..11e0557 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
@@ -16,6 +16,7 @@
private Logger logger = LoggerFactory.getLogger(HKConstants.class);
//娴峰悍骞冲彴鏍规嵁鐜板満鐜閰嶇疆http杩樻槸https
public static final String RESPONSE_SUCCEE = "0";
+ public static final String RESPONSE_DOWNLOAD_ERROR= "0x15406001";
public static String https ;
/**
* 鑳藉姏寮�鏀惧钩鍙扮殑缃戠珯璺緞 璺緞涓嶇敤淇敼锛屽氨鏄�/artemis
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/CarEventDTO.java b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/CarEventDTO.java
index 1fa552a..525e3ca 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/CarEventDTO.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/CarEventDTO.java
@@ -92,6 +92,8 @@
@ApiModelProperty(value = "浜哄憳缁勭粐鍏徃")
@ExcelColumn(name="鍏徃/閮ㄩ棬",index = 9,width = 16)
private String personCompanyName;
+ @ApiModelProperty(value = "璁垮鍏徃1")
+ private String visitCompanyName;
@ApiModelProperty(value = "濮撳悕")
@ExcelColumn(name="濮撳悕",index = 7,width = 16)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/InterfaceLogService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/InterfaceLogService.java
index 8ea103d..01d40d7 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/InterfaceLogService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/InterfaceLogService.java
@@ -94,4 +94,6 @@
* @return long
*/
long count(InterfaceLog interfaceLog);
+
+ void clearThreeMonthLog();
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java
index 76454bb..629b747 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java
@@ -305,7 +305,10 @@
vo.setPlateNos(obj.getPlateNos());
vo.setPersonName(obj.getPersonName());
vo.setPersonPhone(obj.getPersonPhone());
- vo.setPersonCompanyName(obj.getPersonCompanyName());
+ if(!Constants.equalsInteger(obj.getPersonType(),Constants.TWO)){
+ //濡傛灉涓嶆槸鍐呴儴浜哄憳锛屾樉绀鸿瀹紒涓氬悕绉�
+ vo.setPersonCompanyName(obj.getVisitCompanyName());
+ }
vo.setParkName(obj.getParkName());
vo.setGateName(obj.getGateName());
vo.setInoutType(obj.getInoutType());
@@ -330,6 +333,7 @@
.selectAs(Member::getPhone,CarEventDTO::getPersonPhone)
.selectAs(Member::getIdcardDecode,CarEventDTO::getPersonIdcardDecode)
.selectAs(Member::getName,CarEventDTO::getPersonName)
+ .selectAs(Member::getVisitCompanyName,CarEventDTO::getVisitCompanyName)
.selectAs(Company::getName,CarEventDTO::getPersonCompanyName);
queryWrapper
@@ -377,6 +381,10 @@
+dataMap.get(Constants.CAR_EVENT_IMG).getCode()
+obj.getPlatePicUrl());
}
+ if(!Constants.equalsInteger(obj.getPersonType(),Constants.TWO)){
+ //濡傛灉涓嶆槸鍐呴儴浜哄憳锛屾樉绀鸿瀹紒涓氬悕绉�
+ obj.setPersonCompanyName(obj.getVisitCompanyName());
+ }
obj.setEventTypeName(HKConstants.EventTypes.getName(obj.getEventType()) );
newDataList.add(obj);
});
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/InterfaceLogServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/InterfaceLogServiceImpl.java
index 2a7a93e..9f11835 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/InterfaceLogServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/InterfaceLogServiceImpl.java
@@ -155,4 +155,10 @@
QueryWrapper<InterfaceLog> wrapper = new QueryWrapper<>(interfaceLog);
return interfaceLogMapper.selectCount(wrapper);
}
+ @Override
+ public void clearThreeMonthLog() {
+ interfaceLogMapper.delete(new UpdateWrapper<InterfaceLog>().lambda()
+ .apply("to_days(create_date)+15 < to_days(now())")
+ .like(InterfaceLog::getUrl,"/artemis/api/"));
+ }
}
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 abe77b2..ba50685 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
@@ -291,7 +291,7 @@
update.setId(m.getId());
update.setFaceId(faceId);
update.setRemark("浜鸿劯宸插悓姝ユ渶鏂�");
- update.setFaceStatus(Constants.ZERO);
+ update.setFaceStatus(Constants.ONE);
memberMapper.updateById(update);
}
}
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 3ebc38d..e238c53 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
@@ -402,7 +402,7 @@
member.setErpDate(date);
member.setErpId(param.getId());
member.setIdcardType(param.getIdType());
- member.setFsStatus(Constants.ZERO);
+ member.setFaceStatus(Constants.ZERO);
member.setStatus(param.getStatus());
member.setType(Constants.memberType.internal);
String encryptIdNo = DESUtil.encrypt(Constants.EDS_PWD,param.getIdNo());
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 d94d165..ae2b0f8 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
@@ -81,7 +81,7 @@
BaseResponse<TaskPersonDetailListResponse> response = HKService.taskPersoDetail(param);
if(response!=null
&& StringUtils.equals(response.getCode(),HKConstants.RESPONSE_SUCCEE) && response.getData()!=null
- ) {
+ ){
if (response.getData().getList() != null
&& response.getData().getList().size() > 0) {
TaskPersonDetailResponse model = response.getData().getList().get(0);
@@ -108,6 +108,10 @@
.set(Empower::getRemark, remark)
.set(Empower::getSendInfo, remark)
.set(Empower::getSendStatus, Constants.EmpowerStatus.pass));
+ if(Constants.equalsInteger(c.getMemberDeleted(), Constants.ONE)&& Constants.equalsInteger(c.getIsdeleted(), Constants.ONE) ){
+ //濡傛灉鏄垹闄ゆ潈闄愭垚鍔燂紝妫�鏌ユ槸鍚﹀垹闄や汉鍛�
+ checkDelMemberTask(c.getMemberId(),c.getMemberHkId());
+ }
} else {
empowerMapper.update(null, new UpdateWrapper<Empower>()
.lambda()
@@ -119,14 +123,6 @@
} else {
//濡傛灉鏄凡鍒犻櫎鐨勬暟鎹紝涓嬪彂澶辫触锛堥槻姝㈣澶囩绾匡級锛屽垯灏濊瘯閲嶆柊涓嬪彂浠诲姟
if(Constants.equalsInteger(c.getIsdeleted(), Constants.ONE) ){
-// && Constants.formatIntegerNum(c.getTryNum())+1 < tryNum ){
- /* 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.wait));*/
empowerMapper.update(null, new UpdateWrapper<Empower>()
.lambda()
.eq(Empower::getId, c.getId())
@@ -144,7 +140,15 @@
.set(Empower::getSendStatus, Constants.EmpowerStatus.fail));
}
}
- checkDelMemberTask(c.getMemberId());
+ }else if(response!=null && StringUtils.equals(response.getCode(),HKConstants.RESPONSE_DOWNLOAD_ERROR) ){
+ empowerMapper.update(null, new UpdateWrapper<Empower>()
+ .lambda()
+ .eq(Empower::getId, c.getId())
+ .set(Empower::getRemark, "涓嬪彂澶辫触")
+// .set(Empower::getFailFlag, Constants.ONE)//鏃犻渶閲嶅彂锛堜笅杞戒换鍔′笉瀛樺湪锛�
+ .set(Empower::getTryNum,Constants.formatIntegerNum(c.getTryNum())+1)
+ .set(Empower::getSendInfo, "涓嬪彂澶辫触")
+ .set(Empower::getSendStatus, Constants.EmpowerStatus.fail));
}
}
}catch (Exception e){
@@ -186,7 +190,7 @@
//鏍囪鍒犻櫎鎴愬姛鐨勬暟鎹紙娴峰悍瀵规帴鐘舵�佷负宸插悓姝ワ紝锛屽悓姝ュけ璐ョ殑浠嶄负寰呭悓姝ワ紝绛変笅涓�娆＄户缁鐞嗭紝鐭ラ亾鍏ㄩ儴鍒犻櫎瀹屾瘯锛�
memberMapper.update(null,new UpdateWrapper<Member>().lambda()
.set(Member::getHkStatus,Constants.ONE)//鍚屾鎴愬姛
- .set(Member::getRemark,"鍚屾娴峰悍鍒犻櫎澶辫触")//鍚屾澶辫触
+ .set(Member::getRemark,"宸插悓姝�")//鍚屾澶辫触
.set(Member::getHkDate,date)
.in(Member::getId, id));
//鍒犻櫎鎵�鏈夌粦瀹氱殑鍗＄墖淇℃伅
@@ -200,17 +204,18 @@
/**
* 妫�鏌ュ垹闄や汉鍛樼殑鏉冮檺鏄惁閮藉垹闄ゅ畬鎴愶紝濡傛灉鏉冮檺鍒犻櫎瀹屾垚锛� 杩涜娴峰悍浜哄憳鐨勫垹闄ゆ搷浣�
*/
- private void checkDelMemberTask(Integer memberId) {
+ private void checkDelMemberTask(Integer memberId,String memberHkid) {
Date date = new Date();
- Member member = memberMapper.selectById(memberId);
- if(member!=null && Constants.equalsInteger(member.getIsdeleted(),Constants.ONE) ){
+// Member member = memberMapper.selectById(memberId);
+// if(member!=null && Constants.equalsInteger(member.getIsdeleted(),Constants.ONE) ){
if(empowerMapper.selectCount(new QueryWrapper<Empower>().lambda()
- .eq(Empower::getMemberId,member.getId())
+ .eq(Empower::getMemberId,memberId)
.eq(Empower::getIsdeleted,Constants.ONE)
+ .ne(Empower::getFailFlag,Constants.ONE)
.ne(Empower::getSendStatus,Constants.EmpowerStatus.pass)) ==0){
//濡傛灉鏉冮檺閮藉凡缁忓垹闄ゆ垚鍔燂紝鍒欏垹闄ゆ捣搴蜂汉鍛樺拰鍗＄墖鏁版嵁
- doHkDeleteUser(member.getId(),member.getHkId(),date);
- }
+ doHkDeleteUser(memberId,memberHkid,date);
+// }
}
}
@@ -336,9 +341,9 @@
// .gt(Empower::getId,empower.getId())
// .last("limit 1"));
if(empower.getTempCouunt() ==0){
- //濡傛灉涔嬪悗鏃堕棿鍐呭張閲嶆柊涓嬪彂璁板綍锛屽垯璺宠繃涓嶅仛澶勭悊
retryIds.add(empower.getId());
}else{
+ //濡傛灉涔嬪悗鏃堕棿鍐呭張閲嶆柊涓嬪彂璁板綍锛屽垯璺宠繃涓嶅仛澶勭悊
noIds.add(empower.getId());
}
}
@@ -355,6 +360,8 @@
if(noIds.size()>0){
empowerMapper.update(null,new UpdateWrapper<Empower>().lambda()
.set(Empower::getEditDate,date)
+ .set(Empower::getRemark,"涓嬪彂澶辫触锛屽凡澶辨晥~")
+ .set(Empower::getSendInfo,"涓嬪彂澶辫触锛屽凡澶辨晥~")
.set(Empower::getFailFlag,Constants.ONE)
.in(Empower::getId,noIds));
}
@@ -680,6 +687,7 @@
MPJLambdaWrapper<Empower> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.selectAll(Empower.class);
queryWrapper.selectAs(Device::getChannelNo,Empower::getDeviceChannelNo);
+ queryWrapper.selectAs(Member::getIsdeleted,Empower::getMemberDeleted);
queryWrapper.selectAs(Member::getHkId,Empower::getMemberHkId);
queryWrapper.selectAs(Device::getHkId,Empower::getDeviceIndexCode);
queryWrapper.selectAs(Device::getResourceType,Empower::getDeviceType);
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
index 987b0de..d967f24 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
@@ -541,14 +541,25 @@
event.setPlatePicUrl(getHkImgUrl(request.getData().getPicUrl().getPlatePicUrl()));
}
if(StringUtils.isNotBlank(event.getPlateNos())){
- ParkBook cars = parkBookMapper.selectOne(new QueryWrapper<ParkBook>().lambda()
- .eq(ParkBook::getCarCode,event.getPlateNos())
- .eq(ParkBook::getIsdeleted,Constants.ZERO )
+ ParkBook cars = parkBookMapper.selectOne(new QueryWrapper<ParkBook>().lambda()
+ .eq(ParkBook::getCarCode,event.getPlateNos())
+ .eq(ParkBook::getIsdeleted,Constants.ZERO )
+ .last("limit 1" ));
+ if(cars!=null){
+ event.setMemberId(cars.getMemberId());
+ }else{
+ Visits visits = visitsMapper.selectOne(new QueryWrapper<Visits>().lambda()
+ .eq(Visits::getCarNos,event.getPlateNos())
+ .eq(Visits::getIsdeleted,Constants.ZERO )
+ .in(Visits::getStatus,Constants.VisitStatus.signin,Constants.VisitStatus.signout)//鏈�杩戜竴涓凡鍒拌揪鎴栬�呭凡绛剧
+ .isNull(Visits::getParentId)
+ .orderByDesc(Visits::getId)
.last("limit 1" ));
- if(cars!=null){
- event.setMemberId(cars.getMemberId());
+ if(visits!=null){
+ //鏈�杩戜娇鐢ㄨ杞︾殑鐢宠浜猴紙宸插埌杈撅級
+ event.setMemberId(visits.getMemberId());
}
-
+ }
if(Constants.formatIntegerNum(request.getEventType()) == HKConstants.EventTypes.PARK_PASS_IN.getKey()){
//濡傛灉鏄叆鍘傛斁琛�
delRetentionList.add(event.getPlateNos());
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 852ec47..0fe2776 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
@@ -587,7 +587,6 @@
//鍒犻櫎鎵�鏈夌粦瀹氱殑鍗＄墖淇℃伅
memberCardMapper.delete(new QueryWrapper<MemberCard>().lambda().eq(MemberCard::getMemberId,c.getId()));
}
-
}else{
//澶勭悊淇敼鏁版嵁锛屽苟涓旀洿鏂颁汉鑴�
UserAddRequest addHkModel = getUserAddModel(c,path,1);//淇敼
@@ -606,6 +605,7 @@
c.setFaceId(faceid);
c.setFaceStatus(Constants.ONE);
//濡傛灉浜鸿劯璺熶綘锛岄噸鏂颁笅鍙戞潈闄愭暟鎹�
+ c.setRemark("浜哄憳鍜屼汉鑴镐俊鎭悓姝ユ垚鍔�"+result.getMsg());
dealMemberRoleEmpower(c);
}
}
@@ -642,6 +642,7 @@
//濡傛灉浜鸿劯鏁版嵁涓嶆纭紝涓嬭浇澶辫触绛夊師鍥�
noticeErpFail(c,Constants.ZERO,"浜鸿劯鐓х墖涓嶅瓨鍦紝鑾峰彇澶辫触锛�");
c.setHkStatus(Constants.TWO);
+ c.setFaceStatus(Constants.TWO);
c.setRemark("浜鸿劯鐓х墖涓嶅瓨鍦紝鑾峰彇澶辫触锛�");
c.setHkDate(new Date());
memberMapper.updateById(c);
@@ -651,6 +652,11 @@
BaseResponse<UserAddResponse> result = HKService.addUser(addHkModel);
if(result!=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE) && result.getData()!=null){
c.setFaceId(result.getData().getFaceId());
+ if(StringUtils.isNotBlank(c.getFaceId())){
+ c.setFaceStatus(Constants.ONE);
+ }else{
+ c.setFaceStatus(Constants.ZERO);
+ }
c.setHkStatus(Constants.ONE);
c.setHkId(addHkModel.getPersonId());
c.setHkDate(new Date());
--
Gitblit v1.9.3