Merge remote-tracking branch 'origin/develop' into develop

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java

@@ -28,7 +28,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yifu.cloud.plus.v1.yifu.archives.Constants.EmployeeConstants;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TCustomerInfo;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject;
@@ -46,11 +45,9 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.exception.ErrorCodes;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
 import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
-import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprCheckProperties;
 import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cache.Cache;
 import org.springframework.cache.CacheManager;
 import org.springframework.cache.support.SimpleValueWrapper;
@@ -75,7 +72,6 @@ import java.util.stream.Collectors;
  */
 @Service
 @RequiredArgsConstructor
-@EnableConfigurationProperties(DaprCheckProperties.class)
 @Log4j2
 public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMapper, TEmployeeProject> implements TEmployeeProjectService {
 
@@ -87,8 +83,6 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 
 	private final TCustomerInfoMapper tCustomerInfoMapper;
 
-	private final DaprCheckProperties daprCheckProperties;
-
 	// 缓存信息
 	private final CacheManager cacheManager;
 
@@ -118,7 +112,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 			//项目状态为已减项
 			if (CommonConstants.dingleDigitIntArray[1] == employeeProject.getProjectStatus()) {
 				if (!Common.isEmpty(tEmployeeInfo)) {
-					map.put("empProId",tEmployeeProject.getId());
+					map.put("empProId",employeeProject.getId());
 					if (CommonConstants.dingleDigitIntArray[0] == tEmployeeInfo.getFileStatus()) {
 						return new R<>(CommonConstants.dingleDigitIntArray[4],"该人员已减项，是否“复项”",map);
 					} else {

yifu-archives/yifu-archives-biz/src/main/resources/application-test.yml

@@ -6,8 +6,7 @@ spring:
     activate:
       on-profile: test
   redis:
-    host: 192.168.1.65
-    port: 22379
+    host: 127.0.0.1
     password: '@yf_2017'
   datasource:
     type: com.zaxxer.hikari.HikariDataSource
@@ -15,4 +14,12 @@ spring:
     username: root
     password: yf_zsk
     #url: jdbc:mysql://127.0.0.1:3306/yifu_upms?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
-    url: jdbc:mysql://192.168.1.65:22306/mvp_archives?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
\ No newline at end of file
+    url: jdbc:mysql://192.168.1.65:22306/mvp_archives?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+
+fdd:
+  app-id: FA05480470
+  app-key: GTYGFVFOYUYP3ONRHY91EK8IEAK5L9E7
+  server-url: https://openapi.fadada.com/api/v3/
+  connect-timeout: 10000
+  read-timeout: 10000
+  hrms-url: http://2349f6a315.wicp.vip:39468/v1.0/invoke/yifu-archives/method/fdd/notifyUrl
\ No newline at end of file

yifu-archives/yifu-archives-biz/src/main/resources/application.yml

@@ -39,6 +39,7 @@ security:
         - /v3/api-docs
         - /actuator/**
         - /swagger-ui/**
+        - /fdd/*