Merge branch 'feature-licancan' into 'develop'

Feature licancan

See merge request fangxinjiang/yifu!39

yifu-common/yifu-common-dapr/src/main/resources/META-INF/spring.factories

 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
     com.yifu.cloud.plus.v1.yifu.common.dapr.util.ArchivesDaprUtil,\
-    com.yifu.cloud.plus.v1.yifu.common.dapr.util.UpmsDaprUtils
+    com.yifu.cloud.plus.v1.yifu.common.dapr.util.UpmsDaprUtils,\
+    com.yifu.cloud.plus.v1.yifu.common.dapr.util.CheckDaprUtil

yifu-insurances/yifu-insurances-biz/pom.xml

@@ -65,11 +65,6 @@
 			<artifactId>commons-collections</artifactId>
 			<version>3.2.2</version>
 		</dependency>
-        <dependency>
-            <groupId>com.yifu.cloud.plus.v1</groupId>
-            <artifactId>yifu-check-api</artifactId>
-            <version>1.0.0</version>
-        </dependency>
     </dependencies>
 
 	<build>

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/impl/TInsuranceDetailServiceImpl.java

@@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Sets;
 import com.yifu.cloud.plus.v1.check.entity.TCheckIdCard;
-import com.yifu.cloud.plus.v1.check.utils.ChecksUtil;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.ProjectSetInfoVo;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.SetInfoVo;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CacheConstants;
@@ -18,6 +17,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.RedisUtil;
 import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
 import com.yifu.cloud.plus.v1.yifu.common.dapr.util.ArchivesDaprUtil;
+import com.yifu.cloud.plus.v1.yifu.common.dapr.util.CheckDaprUtil;
 import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
 import com.yifu.cloud.plus.v1.yifu.insurances.constants.InsurancesConstants;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.*;
@@ -35,8 +35,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import javax.validation.constraints.NotBlank;
-import java.sql.Array;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.*;
@@ -69,6 +67,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 	private TInsuranceSettleService tInsuranceSettleService;
 	@Resource
 	private TInsuranceOperateService tInsuranceOperateService;
+	@Resource
+	private CheckDaprUtil checkDaprUtil;
 
 
 	/***********************商险办理********************************/
@@ -713,12 +713,15 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			TCheckIdCard checkIdCard = new TCheckIdCard();
 			checkIdCard.setName(param.getEmpName());
 			checkIdCard.setIdCard(param.getEmpIdcardNo());
-			ChecksUtil.checkIdCard(checkIdCard,true);
-			if (CommonConstants.ONE_INT != checkIdCard.getIsTrue()){
+			R<TCheckIdCard> tCheckIdCardR = checkDaprUtil.checkIdCardSingle(checkIdCard);
+			if (null != tCheckIdCardR && tCheckIdCardR.getCode() == CommonConstants.SUCCESS){
+				TCheckIdCard data = tCheckIdCardR.getData();
+				if (CommonConstants.ONE_INT != data.getIsTrue()){
 					param.setErrorMessage(InsurancesConstants.EMP_ID_CARD_NO_NOT_FIT);
 					listResult.add(param);
 					continue;
 				}
+			}
 
 			//根据项目编码查询项目是否存在
 			R<SetInfoVo> setInfoByCodes = archivesDaprUtil.getSetInfoByCodes(Arrays.asList(param.getDeptNo()));
@@ -962,12 +965,15 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			TCheckIdCard checkIdCard = new TCheckIdCard();
 			checkIdCard.setName(param.getEmpName());
 			checkIdCard.setIdCard(param.getEmpIdcardNo());
-			ChecksUtil.checkIdCard(checkIdCard,true);
-			if (CommonConstants.ONE_INT != checkIdCard.getIsTrue()){
+			R<TCheckIdCard> tCheckIdCardR = checkDaprUtil.checkIdCardSingle(checkIdCard);
+			if (null != tCheckIdCardR && tCheckIdCardR.getCode() == CommonConstants.SUCCESS){
+				TCheckIdCard data = tCheckIdCardR.getData();
+				if (CommonConstants.ONE_INT != data.getIsTrue()){
 					param.setErrorMessage(InsurancesConstants.EMP_ID_CARD_NO_NOT_FIT);
 					listResult.add(param);
 					continue;
 				}
+			}
 
 			//根据项目编码查询项目是否存在
 			R<SetInfoVo> setInfoByCodes = archivesDaprUtil.getSetInfoByCodes(Arrays.asList(param.getDeptNo()));
@@ -1200,12 +1206,16 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			TCheckIdCard checkIdCard = new TCheckIdCard();
 			checkIdCard.setName(param.getReplaceEmpName());
 			checkIdCard.setIdCard(param.getReplaceEmpIdcardNo());
-			ChecksUtil.checkIdCard(checkIdCard,true);
-			if (CommonConstants.ONE_INT != checkIdCard.getIsTrue()){
+			R<TCheckIdCard> tCheckIdCardR = checkDaprUtil.checkIdCardSingle(checkIdCard);
+			if (null != tCheckIdCardR && tCheckIdCardR.getCode() == CommonConstants.SUCCESS){
+				TCheckIdCard data = tCheckIdCardR.getData();
+				if (CommonConstants.ONE_INT != data.getIsTrue()){
 					param.setErrorMessage(InsurancesConstants.REPLACE_EMP_ID_CARD_NO_NOT_FIT);
 					listResult.add(param);
 					continue;
 				}
+			}
+
 			if(!LocalDateUtil.isDate(param.getPolicyStart(),LocalDateUtil.NORM_DATE_PATTERN)){
 				param.setErrorMessage(InsurancesConstants.POLICY_START_PARSE_ERROR);
 				listResult.add(param);