Merge remote-tracking branch 'origin/master'

k94314517

2024-07-25 28c725308aaf418e9032964ffcf5ca3b0d8a1208

 server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomIAMServiceImpl.java

@@ -34,6 +34,8 @@
    @Autowired
    private UsersMapper usersMapper;
    @Autowired
    private IamRoleMapper iamRoleMapper;
    @Autowired
    private ShopMapper shopMapper;
    @Autowired
    private CategorySegMapper categorySegMapper;
@@ -67,7 +69,49 @@
    }
    @Override
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public void updateShopInfo(String token, String uuid, String timestamp, List<IamUpateShopModel> shopList) {
    public void updateRoleInfo(String token, String uuid, String timestamp, IamUpdateRoleModel upateModel){
        if(upateModel == null ||StringUtils.isBlank(upateModel.getId()) ){
            return;
        }
        isValidToken(uuid,timestamp,token);

            IamRole role = iamRoleMapper.selectOne(new QueryWrapper<IamRole>().lambda()
                    .eq(IamRole::getIamId,upateModel.getId())
                    .eq(IamRole::getIsdeleted,Constants.ZERO)
                    .last("limit 1"));
            if(role == null){
                role = new IamRole();
                role.setCreateDate(new Date());
                iamRoleMapper.insert(initRoleInfo(role,upateModel));
            }else {
                role.setEditDate(new Date());
                iamRoleMapper.updateById(initRoleInfo(role,upateModel));
            }


    }

    private IamRole initRoleInfo(IamRole role, IamUpdateRoleModel upateModel) {
        role.setEditDate(new Date());
        role.setIsdeleted(Constants.ZERO);
        role.setIamId(upateModel.getId());
        role.setAppId(upateModel.getAppId());
        role.setName(upateModel.getName());
        role.setEid(upateModel.getEid());
        role.setCode(upateModel.getCode());
        role.setStatus(upateModel.getStatus());
        role.setRegister(upateModel.getRegister());
        role.setSyncDate(role.getEditDate());
        role.setType(upateModel.getType());
        role.setRemark(upateModel.getRemark());
        role.setLabels(upateModel.getLabel());
        role.setCustomUnique(upateModel.getCustomUnique());
        return role;
    }

    @Override
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public void updateShopInfo(String token, String uuid, String timestamp, List<IamUpdateShopModel> shopList) {
        if(shopList == null ||shopList.size() == 0){
            return;
        }
@@ -78,7 +122,7 @@
        List<CategorySeg> categorySegList = new ArrayList<>();
        List<Segments> segmentsList = new ArrayList<>();
        Date date  = new Date();
        for(IamUpateShopModel model : shopList){
        for(IamUpdateShopModel model : shopList){
            Shop shop = shopMapper.selectOne(new QueryWrapper<Shop>().lambda()
                    .eq(Shop::getOrgId,model.getIdtOrgId())
                    .last("limit 1"));
@@ -87,7 +131,7 @@
                shop.setCreateDate(date);
                addShops.add(initShopInfo(shop,model,date));
            }else {
                segDelOrgIds.add(shop.getOrgId());
                segDelOrgIds.add(shop.getCode());
                updateShops.add(initShopInfo(shop,model,date));
            }
            //处理品类数据逻辑
@@ -194,7 +238,7 @@
        data.setCreateDate(date);
        data.setEditDate(date);
        data.setIsdeleted(Constants.ZERO);
        data.setOrgId(shop.getOrgId());
        data.setOrgId(shop.getCode());
        data.setSegId(model.getSegment1());
        data.setSegId2(model.getSegment2());
        data.setSegId3(model.getSegment3());
@@ -215,7 +259,7 @@
        return data;
    }

    private Shop initShopInfo(Shop shop, IamUpateShopModel model, Date date) {
    private Shop initShopInfo(Shop shop, IamUpdateShopModel model, Date date) {
        shop.setEditDate(date);
        shop.setOrgId(model.getIdtOrgId());
        shop.setName(model.getIdtOrgName());
@@ -268,9 +312,6 @@
    }

    private void isValidToken(String uuid, String timestamp, String token) {
        if(isDebug){
            return;
        }
        if (!StringUtils.equalsIgnoreCase( getToken( uuid, timestamp), token)) {
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "对不起，token错误~");
        }
@@ -278,7 +319,7 @@

    @Override
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public void updateUserInfo(String token, String uuid, String timestamp, IamUpateUserModel upateUserModel){
    public void updateUserInfo(String token, String uuid, String timestamp, IamUpdateUserModel upateUserModel){
        if(upateUserModel == null ||upateUserModel.getIdtUserId() == null){
            return;
        }
@@ -296,7 +337,7 @@
        }
    }

    private Users initUserModel(Users users, IamUpateUserModel upateUserModel) {
    private Users initUserModel(Users users, IamUpdateUserModel upateUserModel) {
        if(users == null){
            users = new Users();
            users.setCreateDate(new Date());
@@ -314,6 +355,7 @@
        users.setRemark(JSONObject.toJSONString(upateUserModel));
        users.setRoleNames(null);
        users.setRoleCodes(null);
        users.setCardImg("-");
        users.setRoleIds(null);
        users.setUserTypes(null);
        if( upateUserModel.getUserTypes() !=null){
@@ -368,7 +410,7 @@
    }
    @Override
    @Async
    public  void  saveInterfaceLog(String url,String name, String token, String uuid, String timestamp, Object obj,Integer success,String respone){
    public  void  saveInterfaceLog(String url,int type,String name, String token, String uuid, String timestamp, Object obj,Integer success,String respone){
            Map<String,Object> map = new HashMap<>();
            map.put("token",token);
            map.put("uuid",uuid);
@@ -382,7 +424,7 @@
            log.setName(name);
            log.setIsdeleted(Constants.ZERO);
            log.setRequest(JSONObject.toJSONString(map));
            log.setType(Constants.ONE);
            log.setType(type);
            log.setSuccess(success);
            log.setRepose(respone);
            iamInterfaceLogMapper.insert(log);