迭代，需求完善优化

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<Void> examine(@RequestBody IotCarbonEnterpriseAuthDTO dto){
+    public Result<Void> examine(@RequestBody IotCarbonEnterpriseAuthDTO dto) throws InterruptedException {
         dto.setUpdateTime(System.currentTimeMillis());
         if(dto.getStatus().equals("2")){
             //审核通过

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

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<IotCarbonEnterpriseAuthEntity> {
 
-    void doSaveTenant(IotCarbonEnterpriseAuthDTO dto);
+    void doSaveTenant(IotCarbonEnterpriseAuthDTO dto) throws InterruptedException;
 
     void sendMsg(IotCarbonEnterpriseAuthDTO dto);
 

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<IotCarbo
     @Autowired
     private SysRoleMenuService sysRoleMenuService;
 
+    @Autowired
+    private CarbonPubSupplierService supplierService;
+
+    @Autowired
+    private IotCarbonShareService carbonShareService;
+
     Long roleId = 169210973415018496L;
 
     @Override
@@ -49,7 +61,7 @@ public class IotCarbonEnterpriseAuthServiceImpl extends BaseServiceImpl<IotCarbo
 
 
     @Override
-    public void doSaveTenant(IotCarbonEnterpriseAuthDTO dto) {
+    public void doSaveTenant(IotCarbonEnterpriseAuthDTO dto) throws InterruptedException {
         TenantDetailForm detailForm = new TenantDetailForm();
         SysTenantDetailDTO tenantDetail = new SysTenantDetailDTO();
         tenantDetail.setName(dto.getTenantName());
@@ -63,6 +75,9 @@ public class IotCarbonEnterpriseAuthServiceImpl extends BaseServiceImpl<IotCarbo
         tenantDetail.setContact(dto.getContact());
         tenantDetail.setContactNumber(dto.getContactNumber());
         tenantDetail.setTenantType(0);
+        tenantDetail.setId(IdGenerator.nextId());
+        // 租户创建成功后，push租户存储完成事件
+        tenantDetail.setAccessToken(RandomUtils.getRandomString(10));
         detailForm.setTenantDetail(tenantDetail);
         TenantDetailForm.TenantUser tenantUser = new TenantDetailForm.TenantUser();
         tenantUser.setUsername(dto.getUsername());
@@ -78,6 +93,13 @@ public class IotCarbonEnterpriseAuthServiceImpl extends BaseServiceImpl<IotCarbo
         detailForm.setTenantRole(role);
         sysTenantDetailService.saveDetail(detailForm,
                 CollectionUtil.newArrayList(TenantSaveType.base, TenantSaveType.user, TenantSaveType.menu));
+        Long tenantId = tenantDetail.getId();
+
+        CarbonPubSupplierEntity entity =supplierService.getByCode(tenantId);
+        if(ObjectUtils.isNotEmpty(entity)){
+            IotCarbonShareDTO shareDTO = IotCarbonShareDTO.init(tenantDetail.getId(),tenantDetail.getAccessToken());
+            carbonShareService.saveDto(shareDTO);
+        }
         this.updateDto(dto);
     }
 

modules/carbon-track/src/main/java/com/thing/carbontrack/production/service/impl/IotCarbonProductionVarietyServiceImpl.java

@@ -94,10 +94,12 @@ public class IotCarbonProductionVarietyServiceImpl extends BaseServiceImpl<IotCa
         wrapper.eq("industry",industry, StringUtils.isNotEmpty(industry));
         wrapper.eq("industry_sub",industry_sub, StringUtils.isNotEmpty(industry_sub));
         wrapper.eq("tenant_code",currentTenantCode);
+        wrapper.isNotNull("code");
         if(StringUtils.isNotEmpty(key)){
             wrapper.and(code.like(key).or(name.like(key)));
         }
         wrapper.eq("type",type, StringUtils.isNotEmpty(type));
+        wrapper.isNotNull("code");
         return wrapper;
     }
 

modules/carbon-track/src/main/java/com/thing/carbontrack/share/dto/IotCarbonShareDTO.java

@@ -41,4 +41,13 @@ public class IotCarbonShareDTO implements Serializable {
     @Schema(description = "更新时间")
     private Long updateDate;
 
+    public static IotCarbonShareDTO init(Long tenantId, String accessToken) {
+
+        IotCarbonShareDTO dto = new IotCarbonShareDTO();
+        dto.setName("碳足迹共享配置");
+        dto.setUrl("pub.lrdiot.cn");
+        dto.setToken(accessToken);
+        dto.setTenantCode(tenantId);
+        return dto;
+    }
 }

modules/thing/src/main/java/com/thing/sys/tenant/dto/SysTenantDetailDTO.java

@@ -72,4 +72,5 @@ public class SysTenantDetailDTO implements Serializable {
     private String englishName;
     private String title;
 
+    private String accessToken;
 }

modules/thing/src/main/java/com/thing/sys/tenant/entity/SysTenantDetailEntity.java

@@ -85,6 +85,8 @@ public class SysTenantDetailEntity extends BaseDateEntity {
 	 */
 	@Column(ignore = true)
 	private String thingCode;
+	@Column(ignore = true)
+	private String accessToken;
 	/**
 	 * 企業英文名
 	 */

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

@@ -15,6 +15,7 @@ import com.thing.common.core.exception.ErrorCode;
 import com.thing.common.core.exception.SysException;
 import com.thing.common.core.utils.ConvertUtils;
 import com.thing.common.core.utils.DateTimeUtils;
+import com.thing.common.core.utils.RandomUtils;
 import com.thing.common.core.utils.TokenGenerator;
 import com.thing.common.core.web.response.PageData;
 import com.thing.common.orm.service.impl.BaseServiceImpl;
@@ -328,10 +329,16 @@ public class SysTenantDetailServiceImpl extends BaseServiceImpl<SysTenantDetailM
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void saveDetail(TenantDetailForm detailForm, List<TenantSaveType> 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<SysTenantDetailM
             List<TenantDetailForm.TenantThing> thingList = detailForm.getThingList();
             if (CollectionUtil.isNotEmpty(thingList)) {
                 List<String> 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<SysTenantDetailM
                                             .setEnableStatus("1")
                                             .setTemplateMark(TemplateMark.NO.getValue())
                                             .setType("默认物类型");
-                                    iotThingEntity.setId(id);
+                                    iotThingEntity.setId(finalId);
                                     return iotThingEntity;
                                 }
                         ).collect(Collectors.toList());
@@ -470,11 +478,8 @@ public class SysTenantDetailServiceImpl extends BaseServiceImpl<SysTenantDetailM
         tenantDetail.setImageUrl(OSSFactory.cutOut(tenantDetail.getImageUrl()));
         tenantDetail.setLogoUrl(OSSFactory.cutOut(tenantDetail.getLogoUrl()));
         save(tenantDetail);
-
-        // 租户创建成功后，push租户存储完成事件
         applicationEventPublisher.publishEvent(new TenantDetailSavedEvent(this, tenantDetail));
 
-
 //        新增租户保存公共机构
 //       sysTenantMapper.insertList(deptEntity.getId(), tenantDetail.getName(), deptEntity.getId(), tenantDetail.getId(), tenantDetail.getUpdater(), tenantDetail.getUpdateDate());