From 90f695daf5942ec72337014a7961d49aa75b9c47 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 16 十月 2024 15:05:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java | 9 ++++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java | 14 +++---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 32 ++++++++++++++++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWmsJobServiceImpl.java | 13 +++++-
4 files changed, 58 insertions(+), 10 deletions(-)
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 d90b4e8..dbb67f0 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
@@ -1231,20 +1231,20 @@
return null;
}
/**
- *澧為噺杞﹁締鏌ヨ锛堝垎椤碉級
+ *浜鸿劯璇勫垎
* @return
*/
- public static BaseResponse<BaseListPageResponse<VehicleTimeRangeInfoResponse>> facePictureCheck(TimeRangeListRequest param){
- log.info("銆愭捣搴峰閲忎汉鍛樻煡璇€��================寮�濮�===="+JSONObject.toJSONString(param));
+ public static BaseResponse<FacePictureCheckResponse> facePictureCheck(FacePictureCheckRequest 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,"娴峰悍澧為噺浜哄憳鏌ヨ");
+ new TypeReference<BaseResponse<FacePictureCheckResponse>>(){};
+ BaseResponse<FacePictureCheckResponse> result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"浜鸿劯璇勫垎");
return result;
}catch (Exception e){
- log.error("銆愭捣搴峰閲忎汉鍛樻煡璇€��================澶辫触====锛歕n"+ e.getMessage());
+ log.error("銆愪汉鑴歌瘎鍒嗐��================澶辫触====锛歕n"+ e.getMessage());
}
return null;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWmsJobServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWmsJobServiceImpl.java
index 1aa81ba..1a0d1ad 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWmsJobServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWmsJobServiceImpl.java
@@ -110,9 +110,16 @@
);
if(Objects.isNull(wmsJobContractVO.getLockStatus())&&
com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(wmsJobContractVO.getPlatformWmsDetailList())){
- wmsJobContractVO.setLockStatus(
- wmsJobContractVO.getPlatformWmsDetailList().get(Constants.ZERO).getLockStatus()
- );
+ if(Constants.equalsInteger(platformWmsJob.getType(),Constants.ONE)){
+ if(Objects.isNull(wmsJobContractVO.getPlatformWmsDetailList().get(Constants.ZERO).getLockStatus())){
+ wmsJobContractVO.setLockStatus(Constants.ZERO
+ );
+ }else{
+ wmsJobContractVO.setLockStatus(
+ wmsJobContractVO.getPlatformWmsDetailList().get(Constants.ZERO).getLockStatus()
+ );
+ }
+ }
wmsJobContractVO.setStatus(
wmsJobContractVO.getPlatformWmsDetailList().get(Constants.ZERO).getStatus()
);
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
index 3196d04..63dac41 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
@@ -12,9 +12,13 @@
import com.doumee.core.erp.model.openapi.response.erp.ApproveInfoResponse;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.haikang.model.HKConstants;
+import com.doumee.core.haikang.model.param.BaseListPageResponse;
import com.doumee.core.haikang.model.param.BaseResponse;
+import com.doumee.core.haikang.model.param.request.FacePictureCheckRequest;
import com.doumee.core.haikang.model.param.request.VisitAppointmentOutRequest;
import com.doumee.core.haikang.model.param.request.VisitAppointmentRequest;
+import com.doumee.core.haikang.model.param.respose.AscDeviceStatusInfoResponse;
+import com.doumee.core.haikang.model.param.respose.FacePictureCheckResponse;
import com.doumee.core.haikang.model.param.respose.VisitAppointmentResponse;
import com.doumee.core.haikang.service.HKService;
import com.doumee.core.model.LoginUserInfo;
@@ -64,6 +68,9 @@
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
import java.util.*;
import java.util.stream.Collectors;
@@ -232,6 +239,31 @@
visits.setVisitType(Integer.valueOf(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.MDJ_VISIT_REQUIRED).getCode()));
//鍒濆鍖栬瀹俊鎭�
initVisitInfo(visits,date);
+
+ //浜鸿劯璇勫垎
+ FacePictureCheckRequest param = new FacePictureCheckRequest();
+ String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() +
+ systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
+ param.setFacePicBinaryData(visits.getFaceImg());
+ try{
+ Path path = Paths.get(prefixUrl + visits.getFaceImg());
+// Path path = Paths.get("d://b0e01861-fcef-4e22-a209-66a649f1b7ef.jpg");
+ byte[] imageBytes = Files.readAllBytes(path);
+ param.setFacePicBinaryData(Base64.getEncoder().encodeToString(imageBytes));
+ }catch (Exception e){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浜鸿劯淇℃伅瑙ｆ瀽澶辫触");
+
+ }
+ BaseResponse<FacePictureCheckResponse> response = HKService.facePictureCheck(param);
+ if(response == null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)){
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝浜鸿劯璇勫垎鑾峰彇鏁版嵁澶辫触~");
+ }
+ FacePictureCheckResponse facePictureCheckResponse = response.getData();
+ if(!facePictureCheckResponse.getCheckResult()){
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), facePictureCheckResponse.getStatusMessage());
+ }
+
+
visitsMapper.insert(visits);
//鍙戣捣ERP瀹℃壒鐢宠
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java
index 68245b6..7d5e472 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java
@@ -23,8 +23,10 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
import java.util.*;
+import java.util.stream.Collectors;
/**
* WMS骞冲彴瀵规帴Service瀹炵幇
@@ -340,6 +342,13 @@
job.setArriveDate(new Date());
job.setSingType(Constants.TWO);
job.setSignDate(new Date());
+ List<PlatformJob> signList = platformJobMapper.selectList(new QueryWrapper<PlatformJob>().lambda().apply(" DATE(SIGN_DATE) = DATE(NOW()) and sign_date is not null "));
+ if(CollectionUtils.isEmpty(signList)){
+ job.setSignNum(Constants.ONE);
+ } else{
+ int maxNumber = Collections.max(signList.stream().map(i->i.getSignNum()).collect(Collectors.toList()));
+ job.setSignNum(maxNumber + Constants.ONE);
+ }
}
}
PlatformGroup group = platformGroupMapper.selectOne(new QueryWrapper<PlatformGroup>().lambda()
--
Gitblit v1.9.3