feat: 阿拉钉河南薪泰梓-加日志

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysUserSignCertController.java

@@ -263,6 +263,9 @@ public class SysUserSignCertController {
 	public R<?> getSignCertResult(@PathVariable("userId") Integer userId) {
 		String key = CacheConstants.USER_SIGN_CERT_RESPONSE_KEY + userId;
 		String response = (String) redisTemplate.opsForValue().get(key);
+
+		log.info("查询签约认证结果:key={}, value={}", key,  response);
+
 		if (response == null) {
 			return R.failed("没有结果");
 		}

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/SysUserSub.java

@@ -8,6 +8,7 @@ import com.qunzhixinxi.hnqz.admin.enums.GigChannelEnum;
 import com.qunzhixinxi.hnqz.admin.enums.GigTypeEnum;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.time.LocalDateTime;
 
@@ -18,6 +19,7 @@ import java.time.LocalDateTime;
  * @date 2022年03月01日 18:17
  */
 @Data
+@ToString
 @EqualsAndHashCode(callSuper = true)
 @TableName("sys_user_sub")
 public class SysUserSub extends Model<SysUserSub> {

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/mq/GigSignCertReceiver.java

@@ -119,6 +119,7 @@ public class GigSignCertReceiver extends BaseRabbiMqHandler<String> {
 							case TAX_HELPOR:
 								this.taxHelperHandler(user, dept, subjectResult);
 								// 本次结果存入redis
+								log.info("缓存认证结果到redis：{}", JSONUtil.toJsonStr(subjectTypes));
 								redisTemplate.opsForValue().set(CacheConstants.USER_SIGN_CERT_RESPONSE_KEY + user.getUserId(),
 										JSONUtil.toJsonStr(subjectTypes), 1, TimeUnit.MINUTES);
 								break;
@@ -271,9 +272,8 @@ public class GigSignCertReceiver extends BaseRabbiMqHandler<String> {
 		// 查询redis是否有同时发起的标记
 		String oladingRedisKey = CacheConstants.OLADING_CERT_SEND_CHANNEL + user.getUserId();
 		String gigTypeJson = (String) redisTemplate.opsForValue().get(oladingRedisKey);
-		if (!JSONUtil.isJsonArray(gigTypeJson)) {
-			log.warn("redis没有查询到选择的渠道:{}", gigTypeJson);
-			return;
+		if (JSONUtil.isJsonArray(gigTypeJson)) {
+			log.info("redis同时发起的标记:key={}, value={}", oladingRedisKey, gigTypeJson);
 		}
 
 		JSONArray gigTypeArray = JSONUtil.parseArray(gigTypeJson);
@@ -301,6 +301,7 @@ public class GigSignCertReceiver extends BaseRabbiMqHandler<String> {
 			resultMap.putAll(certResultMap);
 		}
 		String key = CacheConstants.USER_SIGN_CERT_RESPONSE_KEY + user.getUserId();
+		log.info("缓存认证结果到redis：{}", JSONUtil.toJsonStr(resultMap));
 		redisTemplate.opsForValue().set(key, JSONUtil.toJsonStr(resultMap), 1, TimeUnit.MINUTES);
 
 		// 处理同时发起时阿拉丁多个渠道的情况（补发）
@@ -320,7 +321,6 @@ public class GigSignCertReceiver extends BaseRabbiMqHandler<String> {
 			if (StrUtil.isNotBlank(toSendChannel) && !StrUtil.equals(firstChannel, toSendChannel)) {
 				// 如果阿拉丁第一个渠道是已认证的，则补发下一个阿拉丁的渠道(由于阿拉钉同一人不同渠道的回调只有一次，所以这里出现多个渠道需要依次补发)
 				if (CollUtil.isNotEmpty(certStatusMap) && OladingCertStatus.CERT.name().equals(certStatusMap.get("certStatus"))) {
-
 					log.info("=============================补发阿拉钉另一渠道MQ:{}==================================", toSendChannel);
 					UserSignCertDTO reCertDTO = new UserSignCertDTO();
 					reCertDTO.setUserId(user.getUserId());

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/gig/impl/GigThirdApiServiceImpl.java

@@ -294,6 +294,7 @@ public class GigThirdApiServiceImpl implements GigThirdApiService {
 			result.putAll(dbResultMap);
 		}
 
+		log.info("缓存认证结果到redis：{}", JSONUtil.toJsonStr(result));
 		redisTemplate.opsForValue().set(key, JSONUtil.toJsonStr(result), 1, TimeUnit.MINUTES);
 
 		// 如果成功，则发送证照上传MQ
@@ -366,6 +367,7 @@ public class GigThirdApiServiceImpl implements GigThirdApiService {
 			result.putAll(dbResultMap);
 		}
 
+		log.info("缓存认证结果到redis：{}", JSONUtil.toJsonStr(result));
 		redisTemplate.opsForValue().set(key, JSONUtil.toJsonStr(result), 1, TimeUnit.MINUTES);
 
 
@@ -437,6 +439,7 @@ public class GigThirdApiServiceImpl implements GigThirdApiService {
 			result.putAll(dbResultMap);
 		}
 
+		log.info("缓存认证结果到redis：{}", JSONUtil.toJsonStr(result));
 		redisTemplate.opsForValue().set(key, JSONUtil.toJsonStr(result), 1, TimeUnit.MINUTES);
 
 		if (OladingCommonRequest.UploadTaxpayerAgreementStatus.SUCCESS.equals(agreementStatus)) {

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/gig/impl/SysUserSignCertServiceImpl.java

@@ -321,14 +321,16 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
 				}
 				return false;
 			}).forEach(userSub -> {
-				// 请求流水号
-				String requestId = RandomStringUtils.randomAlphabetic(16);
 
 				// 发起前置判断
 				if (!this.preSignCert(sysUser, userSub, userSignCertDTO)) {
 					// false直接返回，不发送mq
+					log.info("本次不发起认证，userSub={}", userSub.toString());
 					return;
+
 				}
+				// 请求流水号
+				String requestId = RandomStringUtils.randomAlphabetic(16);
 
 				// 是否需要传核身视频，阿拉丁、易联默认都要传
 				boolean uploadFaceID = userSignCertDTO.getUploadFaceID() != null && userSignCertDTO.getUploadFaceID();
@@ -371,7 +373,7 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
 		if (!oladingTypeList.isEmpty()) {
 			// 选择的渠道的阿拉钉的部分记录到redis
 			String redisKey = CacheConstants.OLADING_CERT_SEND_CHANNEL + sysUser.getUserId();
-			redisTemplate.opsForValue().set(redisKey, JSONUtil.toJsonStr(oladingTypeList));
+			redisTemplate.opsForValue().set(redisKey, JSONUtil.toJsonStr(oladingTypeList), 24, TimeUnit.HOURS);
 		}
 
 		switch (userSub.getGigType()) {