From 46de46ed851dc909f0ff355e9c6e3422efb5b4ad Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 30 四月 2024 14:27:10 +0800
Subject: [PATCH] 集成代码调整
---
Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/vo/DockingResultVO.java | 7 +++++++
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java | 2 +-
Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/service/BladeUserDetailsServiceImpl.java | 12 +++++-------
Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java | 11 +++++++++--
4 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/service/BladeUserDetailsServiceImpl.java b/Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/service/BladeUserDetailsServiceImpl.java
index eb886d5..ab06f3a 100644
--- a/Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/service/BladeUserDetailsServiceImpl.java
+++ b/Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/service/BladeUserDetailsServiceImpl.java
@@ -34,7 +34,6 @@
import org.springblade.core.launch.constant.TokenConstant;
import org.springblade.core.log.annotation.LoginOrLogoutLog;
import org.springblade.core.redis.cache.BladeRedis;
-import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.*;
@@ -43,7 +42,6 @@
import com.vci.ubcs.system.entity.Tenant;
import com.vci.ubcs.system.feign.ISysClient;
import org.springframework.beans.factory.annotation.Value;
-import org.springframework.security.core.AuthenticationException;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.AuthorityUtils;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
@@ -133,9 +131,9 @@
int count = getFailCount(tenantId, username);
//涓洪槻姝㈠彇鍊间负绌烘姤閿欑殑鎯呭喌锛屽綋涓虹┖鐨勬椂鍊欑粰榛樿鍙负5娆′究閿佸畾鐢ㄦ埛鐧诲綍锛屼絾鏄竴鑸緢闅惧嚭鐜拌繖绉嶆儏鍐碉紝鍥犱负鎴慺eign閲岄潰鏄粰浜嗛粯璁ゅ瘑鐮佺瓥鐣ユ煡璇㈢殑
int failCountValue = Func.isEmpty(strategy) ? FAIL_COUNT:Func.toInt(strategy.getLockingNum());
- int failCount = Func.toInt(ParamCache.getValue(FAIL_COUNT_VALUE), failCountValue);
+ //int failCount = Func.toInt(ParamCache.getValue(FAIL_COUNT_VALUE), failCountValue);
- if (count >= failCount) {
+ if (count >= failCountValue) {
throw new UserDeniedAuthorizationException(TokenUtil.USER_HAS_TOO_MANY_FAILS);
}
@@ -145,7 +143,7 @@
&& (!this.userName.equals(username) || !BladePasswordEncoderFactories.createDelegatingPasswordEncoder().encode(password).equalsIgnoreCase(AuthConstant.ENCRYPT+this.password))
) {
setFailCount(tenantId, username, count,strategy.getLockingTime());
- throw new UsernameNotFoundException(TokenUtil.USER_NOT_FOUND+"杩樻湁銆�"+(failCount-count)+"銆戞灏濊瘯鏈轰細!");
+ throw new UsernameNotFoundException(TokenUtil.USER_NOT_FOUND+"杩樻湁銆�"+(failCountValue-count)+"銆戞灏濊瘯鏈轰細!");
}
//濡傛灉ip姣斿鍚巊et鎶涘嚭寮傚父No value present灏辩洿鎺ユ姏寮傚父缁撴潫鐧诲綍
if(ipEnable){
@@ -201,7 +199,7 @@
// 鐢ㄦ埛涓嶅瓨鍦�,浣嗘彁绀虹敤鎴峰悕涓庡瘑鐮侀敊璇苟閿佸畾璐﹀彿
if (user == null || user.getId() == null) {
setFailCount(tenantId, username, count,strategy.getLockingTime());
- throw new UsernameNotFoundException(TokenUtil.USER_NOT_FOUND+"杩樻湁銆�"+(failCount-count)+"銆戞灏濊瘯鏈轰細!");
+ throw new UsernameNotFoundException(TokenUtil.USER_NOT_FOUND+"杩樻湁銆�"+(failCountValue-count)+"銆戞灏濊瘯鏈轰細!");
}
// 鐢ㄦ埛鐘舵�佷负1鏃惰鏄庤鐢ㄦ埛琚攣瀹�
if(user.getUserStatus() == 1){
@@ -211,7 +209,7 @@
// 鐢ㄦ埛瀛樺湪浣嗗瘑鐮侀敊璇�,瓒呰繃娆℃暟鍒欓攣瀹氳处鍙�
if (grantType != null && !grantType.equals(TokenUtil.REFRESH_TOKEN_KEY) && !user.getPassword().equals(hex)) {
setFailCount(tenantId, username, count,strategy.getLockingTime());
- throw new UsernameNotFoundException(TokenUtil.USER_NOT_FOUND+"杩樻湁銆�"+(failCount-count)+"銆戞灏濊瘯鏈轰細!");
+ throw new UsernameNotFoundException(TokenUtil.USER_NOT_FOUND+"杩樻湁銆�"+(failCountValue-count)+"銆戞灏濊瘯鏈轰細!");
}
// 鐢ㄦ埛瑙掕壊涓嶅瓨鍦�
if (Func.isEmpty(userInfo.getRoles())) {
diff --git a/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/vo/DockingResultVO.java b/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/vo/DockingResultVO.java
index c601aff..54b0407 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/vo/DockingResultVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/vo/DockingResultVO.java
@@ -10,27 +10,34 @@
* @date 2023-05-26
*/
public class DockingResultVO {
+
/**
* 鐘舵�佺爜 1锛氭垚鍔燂紱2锛氬け璐�
*/
private String code;
+
/**
* 鎺ュ彛璋冪敤缁撴灉 鎴愬姛锛涘け璐ュ師鍥�
*/
private String msg;
+
/***
* 鏁版嵁瀵硅薄
*/
private List<DockingDataVO> data;
+
public String getCode() {
return code;
}
+
public void setCode(String code) {
this.code = code;
}
+
public String getMsg() {
return msg;
}
+
public void setMsg(String msg) {
this.msg = msg;
}
diff --git a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java
index 320f739..df1435e 100644
--- a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java
+++ b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java
@@ -15,7 +15,6 @@
import com.vci.ubcs.starter.util.MdmBtmTypeConstant;
import com.vci.ubcs.starter.util.SaveLogUtil;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
-import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.map.CaseInsensitiveMap;
@@ -45,7 +44,10 @@
public class MdmInterJtClient implements IMdmInterJtClient {
@Value("${docking.apply.partCode:10}")
- public String partCode;
+ private String partCode;
+
+ @Value("#{'${docking.apply.jDataBtmNames:wupin}'.split(',')}")
+ private List<String> JDATABTMNAMES;
/**
* 闆嗗洟鐢宠鍗曟湇鍔�
@@ -197,6 +199,10 @@
dockingPreApplyFormList.add(dockingPreApplyForm);
String jdataid = dockingPreApplyForm.getDataOid();
String jdatabtmname = dockingPreApplyForm.getDataBtmName();
+ // 璺宠繃涓嶉渶瑕佸鐞嗛泦鍥㈣繑鐮佺殑鍒嗙被
+ if(!JDATABTMNAMES.contains(jdatabtmname)){
+ continue;
+ }
if (res) {
//姝ゅ闇�瑕佹煡璇笟鍔℃暟鎹紝鍘绘洿鏀�
R<List<BaseModel>> R = mdmEngineClient.selectByTypeAndOid(jdatabtmname,jdataid);
@@ -249,6 +255,7 @@
return R.fail("闆嗗洟鐮侀泦鎴愯祴鍊煎け璐ワ紝鍘熷洜锛�"+e.getMessage());
}
log.info("鑾峰彇闆嗗洟闆嗗洟鐮侊紝璧嬪�煎埌涓绘暟鎹� end");
+
return R.success("闆嗗洟鐮佽祴鍊兼垚鍔�");
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java
index 07ada19..85b7cb8 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java
@@ -120,7 +120,7 @@
DockingLog::getMsg,
//DockingLog::getParamString,
DockingLog::getSendXml,
- DockingLog::getReturnString,
+ //DockingLog::getReturnString,
DockingLog::getInterfaceStatus
);
IPage<DockingLog> pages=dockingLogeService.page(Condition.getPage(query), lambdaQueryWrapper);
--
Gitblit v1.9.3