diff --git a/modules/carbon-public/src/main/java/com/thing/carbon/pub/controller/IotCarbonEnterpriseAuthController.java b/modules/carbon-public/src/main/java/com/thing/carbon/pub/controller/IotCarbonEnterpriseAuthController.java index 5d307a9..518cdc8 100644 --- a/modules/carbon-public/src/main/java/com/thing/carbon/pub/controller/IotCarbonEnterpriseAuthController.java +++ b/modules/carbon-public/src/main/java/com/thing/carbon/pub/controller/IotCarbonEnterpriseAuthController.java @@ -89,7 +89,7 @@ public class IotCarbonEnterpriseAuthController { @PostMapping("examine") @Operation(summary="审核") - public Result examine(@RequestBody IotCarbonEnterpriseAuthDTO dto){ + public Result examine(@RequestBody IotCarbonEnterpriseAuthDTO dto) throws InterruptedException { dto.setUpdateTime(System.currentTimeMillis()); if(dto.getStatus().equals("2")){ //审核通过 diff --git a/modules/carbon-public/src/main/java/com/thing/carbon/pub/listener/SupplierCreateListener.java b/modules/carbon-public/src/main/java/com/thing/carbon/pub/listener/SupplierCreateListener.java index 73afdbf..24c7c8f 100644 --- a/modules/carbon-public/src/main/java/com/thing/carbon/pub/listener/SupplierCreateListener.java +++ b/modules/carbon-public/src/main/java/com/thing/carbon/pub/listener/SupplierCreateListener.java @@ -33,7 +33,7 @@ public class SupplierCreateListener { CarbonPubSupplierEntity supplier = new CarbonPubSupplierEntity(); supplier.setName(tenantDetail.getName()) .setCode(tenantDetail.getId()) - .setAccessToken(RandomUtils.getRandomString(10)) + .setAccessToken(tenantDetail.getAccessToken()) .setPoints(100) .setRegionId(Long.parseLong(tenantDetail.getRegionCode())); supplierService.save(supplier); diff --git a/modules/carbon-public/src/main/java/com/thing/carbon/pub/service/IotCarbonEnterpriseAuthService.java b/modules/carbon-public/src/main/java/com/thing/carbon/pub/service/IotCarbonEnterpriseAuthService.java index 14590fb..db82f8f 100644 --- a/modules/carbon-public/src/main/java/com/thing/carbon/pub/service/IotCarbonEnterpriseAuthService.java +++ b/modules/carbon-public/src/main/java/com/thing/carbon/pub/service/IotCarbonEnterpriseAuthService.java @@ -13,7 +13,7 @@ import com.thing.common.orm.service.IBaseService; */ public interface IotCarbonEnterpriseAuthService extends IBaseService { - void doSaveTenant(IotCarbonEnterpriseAuthDTO dto); + void doSaveTenant(IotCarbonEnterpriseAuthDTO dto) throws InterruptedException; void sendMsg(IotCarbonEnterpriseAuthDTO dto); diff --git a/modules/carbon-public/src/main/java/com/thing/carbon/pub/service/impl/IotCarbonEnterpriseAuthServiceImpl.java b/modules/carbon-public/src/main/java/com/thing/carbon/pub/service/impl/IotCarbonEnterpriseAuthServiceImpl.java index 869831a..4d8840a 100644 --- a/modules/carbon-public/src/main/java/com/thing/carbon/pub/service/impl/IotCarbonEnterpriseAuthServiceImpl.java +++ b/modules/carbon-public/src/main/java/com/thing/carbon/pub/service/impl/IotCarbonEnterpriseAuthServiceImpl.java @@ -3,12 +3,18 @@ package com.thing.carbon.pub.service.impl; import cn.hutool.core.collection.CollectionUtil; import com.mybatisflex.core.query.QueryWrapper; import com.thing.carbon.pub.dto.IotCarbonEnterpriseAuthDTO; +import com.thing.carbon.pub.entity.CarbonPubSupplierEntity; import com.thing.carbon.pub.entity.IotCarbonEnterpriseAuthEntity; import com.thing.carbon.pub.mapper.IotCarbonEnterpriseAuthMapper; +import com.thing.carbon.pub.service.CarbonPubSupplierService; import com.thing.carbon.pub.service.IotCarbonEnterpriseAuthService; +import com.thing.carbontrack.share.dto.IotCarbonShareDTO; +import com.thing.carbontrack.share.service.IotCarbonShareService; import com.thing.common.core.enumeration.TenantSaveType; +import com.thing.common.core.utils.RandomUtils; import com.thing.common.core.web.response.Result; import com.thing.common.orm.service.impl.BaseServiceImpl; +import com.thing.common.orm.utils.IdGenerator; import com.thing.sys.biz.service.SysRoleMenuService; import com.thing.sys.tenant.dto.SysTenantDetailDTO; import com.thing.sys.tenant.dto.TenantDetailForm; @@ -35,6 +41,12 @@ public class IotCarbonEnterpriseAuthServiceImpl extends BaseServiceImpl typeList) { + long tenanId = 0L; + if(detailForm.getTenantDetail().getId()==null){ + tenanId = IdGenerator.nextId(); + }else { + tenanId= detailForm.getTenantDetail().getId(); - long id = IdGenerator.nextId(); + } + long id = tenanId; SysTenantDetailEntity tenantDetail = ConvertUtils.sourceToTarget(detailForm.getTenantDetail(), SysTenantDetailEntity.class); - tenantDetail.setId(id); + tenantDetail.setId(tenanId); //企业物编码 统一信用编码存在使用编码不存在使用id String thingCode = "CO_".concat(StringUtils.isNotBlank(tenantDetail.getCorporationCode()) ? tenantDetail.getCorporationCode() : String.valueOf(id)); //部门信息 部门主键与租户详情主键与tenantCode相同 @@ -399,6 +406,7 @@ public class SysTenantDetailServiceImpl extends BaseServiceImpl thingList = detailForm.getThingList(); if (CollectionUtil.isNotEmpty(thingList)) { List codes = thingList.stream().map(TenantDetailForm.TenantThing::getCode).filter(StringUtils::isNotBlank).toList(); + long finalId = id; thingTenantList = thingList.parallelStream() .map(item -> { IotThingEntity iotThingEntity = new IotThingEntity() @@ -408,7 +416,7 @@ public class SysTenantDetailServiceImpl extends BaseServiceImpl