集成代码调整

 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次便锁定用户登录，但是一般很难出现这种情况，因为我feign里面是给了默认密码策略查询的
        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比对后get抛出异常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())) {

 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;
    }

 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("集团码赋值成功");
    }


 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);