Browse Source

迭代,需求完善优化

qingyuan_dev_new
xiachao 1 year ago
parent
commit
a954c49910
  1. 3
      modules/carbon-public/src/main/java/com/thing/carbon/pub/service/impl/IotCarbonEnterpriseAuthServiceImpl.java
  2. 1
      modules/thing/src/main/java/com/thing/sys/tenant/service/impl/SysTenantDetailServiceImpl.java

3
modules/carbon-public/src/main/java/com/thing/carbon/pub/service/impl/IotCarbonEnterpriseAuthServiceImpl.java

@ -88,8 +88,9 @@ public class IotCarbonEnterpriseAuthServiceImpl extends BaseServiceImpl<IotCarbo
detailForm.setTenantUser(tenantUser); detailForm.setTenantUser(tenantUser);
List<Long> menuIdList = sysRoleMenuService.getMenuIdList(roleId); List<Long> menuIdList = sysRoleMenuService.getMenuIdList(roleId);
TenantDetailForm.TenantRole role = new TenantDetailForm.TenantRole(); TenantDetailForm.TenantRole role = new TenantDetailForm.TenantRole();
role.setDefaultRole(false);
role.setDefaultRole(true);
role.setMenuIdList(menuIdList); role.setMenuIdList(menuIdList);
role.setRoleId(roleId);
detailForm.setTenantRole(role); detailForm.setTenantRole(role);
sysTenantDetailService.saveDetail(detailForm, sysTenantDetailService.saveDetail(detailForm,
CollectionUtil.newArrayList(TenantSaveType.base, TenantSaveType.user, TenantSaveType.menu)); CollectionUtil.newArrayList(TenantSaveType.base, TenantSaveType.user, TenantSaveType.menu));

1
modules/thing/src/main/java/com/thing/sys/tenant/service/impl/SysTenantDetailServiceImpl.java

@ -442,6 +442,7 @@ public class SysTenantDetailServiceImpl extends BaseServiceImpl<SysTenantDetailM
thingCache.updateAccurateKeyEntity(CacheNameEnum.THING_MODEL, thingCache.updateAccurateKeyEntity(CacheNameEnum.THING_MODEL,
modelEntity.getCode()+CacheInit.KEY+modelEntity.getId(),ConvertUtils.sourceToTarget(modelEntity, ModelDetailDTO.class)); modelEntity.getCode()+CacheInit.KEY+modelEntity.getId(),ConvertUtils.sourceToTarget(modelEntity, ModelDetailDTO.class));
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace();
throw new SysException("保存失败,请检查数据源配置"); throw new SysException("保存失败,请检查数据源配置");
} }
//保存分配物及企业物至物实体表 //保存分配物及企业物至物实体表

Loading…
Cancel
Save