diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/service/impl/CqcCarbonReportServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/service/impl/CqcCarbonReportServiceImpl.java deleted file mode 100644 index 85b2349..0000000 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/service/impl/CqcCarbonReportServiceImpl.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.thing.cqc.CqcCarbonReport.service.impl; - -import com.mybatisflex.core.query.QueryWrapper; -import com.thing.common.orm.service.impl.BaseServiceImpl; -import com.thing.cqc.CqcCarbonReport.mapper.CqcCarbonReportMapper; -import com.thing.cqc.CqcCarbonReport.entity.CqcCarbonReportEntity; -import com.thing.cqc.CqcCarbonReport.service.CqcCarbonReportService; -import com.thing.sys.security.context.UserContext; -import org.springframework.stereotype.Service; - -import java.util.Map; - -/** - * 申请表基础数据 - * - * @author xc - * @since 3.0 2024-08-08 - */ -@Service -public class CqcCarbonReportServiceImpl extends BaseServiceImpl implements CqcCarbonReportService { - - @Override - public QueryWrapper getWrapper(Map params){ - QueryWrapper wrapper = new QueryWrapper(); - Long tenantCode = UserContext.getTenantCode(); - if(!tenantCode.equals(1001L)){ - wrapper.eq(CqcCarbonReportEntity::getTenantCode,tenantCode); - } - return wrapper; - } - - -} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/controller/CqcCarbonConsumablesController.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/controller/CqcCarbonConsumablesController.java similarity index 90% rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/controller/CqcCarbonConsumablesController.java rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/controller/CqcCarbonConsumablesController.java index 16d9d93..a9bedf3 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/controller/CqcCarbonConsumablesController.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/controller/CqcCarbonConsumablesController.java @@ -1,21 +1,15 @@ -package com.thing.cqc.CqcCarbonConsumables.controller; +package com.thing.cqc.cqcCarbonConsumables.controller; import com.thing.common.core.annotation.LogOperation; -import com.thing.common.core.constants.Constant; import com.thing.common.core.validator.AssertUtils; import com.thing.common.core.validator.ValidatorUtils; import com.thing.common.core.validator.group.AddGroup; import com.thing.common.core.validator.group.DefaultGroup; import com.thing.common.core.validator.group.UpdateGroup; -import com.thing.common.core.web.response.PageData; import com.thing.common.core.web.response.Result; -import com.thing.cqc.CqcCarbonConsumables.dto.CqcCarbonConsumablesDTO; -import com.thing.cqc.CqcCarbonConsumables.service.CqcCarbonConsumablesService; - -import com.thing.cqc.CqcCarbonRaw.dto.CqcCarbonRawDTO; +import com.thing.cqc.cqcCarbonConsumables.dto.CqcCarbonConsumablesDTO; +import com.thing.cqc.cqcCarbonConsumables.service.CqcCarbonConsumablesService; import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/dto/CqcCarbonConsumablesDTO.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/dto/CqcCarbonConsumablesDTO.java similarity index 97% rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/dto/CqcCarbonConsumablesDTO.java rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/dto/CqcCarbonConsumablesDTO.java index 4c7448f..200a4c5 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/dto/CqcCarbonConsumablesDTO.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/dto/CqcCarbonConsumablesDTO.java @@ -1,7 +1,6 @@ -package com.thing.cqc.CqcCarbonConsumables.dto; +package com.thing.cqc.cqcCarbonConsumables.dto; import io.swagger.v3.oas.annotations.media.Schema; - import lombok.Data; import java.io.Serial; diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/entity/CqcCarbonConsumablesEntity.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/entity/CqcCarbonConsumablesEntity.java similarity index 97% rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/entity/CqcCarbonConsumablesEntity.java rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/entity/CqcCarbonConsumablesEntity.java index 8f3d81e..5990ef9 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/entity/CqcCarbonConsumablesEntity.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/entity/CqcCarbonConsumablesEntity.java @@ -1,8 +1,7 @@ -package com.thing.cqc.CqcCarbonConsumables.entity; +package com.thing.cqc.cqcCarbonConsumables.entity; import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.Table; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/mapper/CqcCarbonConsumablesMapper.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/mapper/CqcCarbonConsumablesMapper.java similarity index 71% rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/mapper/CqcCarbonConsumablesMapper.java rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/mapper/CqcCarbonConsumablesMapper.java index 1b27ac9..4ee39c9 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/mapper/CqcCarbonConsumablesMapper.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/mapper/CqcCarbonConsumablesMapper.java @@ -1,7 +1,7 @@ -package com.thing.cqc.CqcCarbonConsumables.mapper; +package com.thing.cqc.cqcCarbonConsumables.mapper; import com.thing.common.orm.mapper.PowerBaseMapper; -import com.thing.cqc.CqcCarbonConsumables.entity.CqcCarbonConsumablesEntity; +import com.thing.cqc.cqcCarbonConsumables.entity.CqcCarbonConsumablesEntity; import org.apache.ibatis.annotations.Mapper; /** diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/service/CqcCarbonConsumablesService.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/service/CqcCarbonConsumablesService.java similarity index 67% rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/service/CqcCarbonConsumablesService.java rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/service/CqcCarbonConsumablesService.java index a59ff6b..80c6860 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/service/CqcCarbonConsumablesService.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/service/CqcCarbonConsumablesService.java @@ -1,7 +1,7 @@ -package com.thing.cqc.CqcCarbonConsumables.service; +package com.thing.cqc.cqcCarbonConsumables.service; import com.thing.common.orm.service.IBaseService; -import com.thing.cqc.CqcCarbonConsumables.entity.CqcCarbonConsumablesEntity; +import com.thing.cqc.cqcCarbonConsumables.entity.CqcCarbonConsumablesEntity; /** * 使用阶段耗材信息 diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/service/impl/CqcCarbonConsumablesServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/service/impl/CqcCarbonConsumablesServiceImpl.java similarity index 74% rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/service/impl/CqcCarbonConsumablesServiceImpl.java rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/service/impl/CqcCarbonConsumablesServiceImpl.java index 37ab7c2..6371a95 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/service/impl/CqcCarbonConsumablesServiceImpl.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/service/impl/CqcCarbonConsumablesServiceImpl.java @@ -1,11 +1,10 @@ -package com.thing.cqc.CqcCarbonConsumables.service.impl; +package com.thing.cqc.cqcCarbonConsumables.service.impl; import com.mybatisflex.core.query.QueryWrapper; import com.thing.common.orm.service.impl.BaseServiceImpl; -import com.thing.cqc.CqcCarbonConsumables.mapper.CqcCarbonConsumablesMapper; -import com.thing.cqc.CqcCarbonConsumables.entity.CqcCarbonConsumablesEntity; -import com.thing.cqc.CqcCarbonConsumables.service.CqcCarbonConsumablesService; -import com.thing.cqc.CqcCarbonRaw.entity.CqcCarbonRawEntity; +import com.thing.cqc.cqcCarbonConsumables.entity.CqcCarbonConsumablesEntity; +import com.thing.cqc.cqcCarbonConsumables.mapper.CqcCarbonConsumablesMapper; +import com.thing.cqc.cqcCarbonConsumables.service.CqcCarbonConsumablesService; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/controller/CqcCarbonDiscardController.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/controller/CqcCarbonDiscardController.java similarity index 95% rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/controller/CqcCarbonDiscardController.java rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/controller/CqcCarbonDiscardController.java index 52af7b0..baed0c3 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/controller/CqcCarbonDiscardController.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/controller/CqcCarbonDiscardController.java @@ -1,4 +1,4 @@ -package com.thing.cqc.CqcCarbonDiscard.controller; +package com.thing.cqc.cqcCarbonDiscard.controller; import com.thing.common.core.annotation.LogOperation; import com.thing.common.core.constants.Constant; @@ -9,9 +9,8 @@ import com.thing.common.core.validator.group.DefaultGroup; import com.thing.common.core.validator.group.UpdateGroup; import com.thing.common.core.web.response.PageData; import com.thing.common.core.web.response.Result; -import com.thing.cqc.CqcCarbonDiscard.dto.CqcCarbonDiscardDTO; -import com.thing.cqc.CqcCarbonDiscard.service.CqcCarbonDiscardService; - +import com.thing.cqc.cqcCarbonDiscard.dto.CqcCarbonDiscardDTO; +import com.thing.cqc.cqcCarbonDiscard.service.CqcCarbonDiscardService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/dto/CqcCarbonDiscardDTO.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/dto/CqcCarbonDiscardDTO.java similarity index 97% rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/dto/CqcCarbonDiscardDTO.java rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/dto/CqcCarbonDiscardDTO.java index 9027ac7..0777019 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/dto/CqcCarbonDiscardDTO.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/dto/CqcCarbonDiscardDTO.java @@ -1,7 +1,6 @@ -package com.thing.cqc.CqcCarbonDiscard.dto; +package com.thing.cqc.cqcCarbonDiscard.dto; import io.swagger.v3.oas.annotations.media.Schema; - import lombok.Data; import java.io.Serial; diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/entity/CqcCarbonDiscardEntity.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/entity/CqcCarbonDiscardEntity.java similarity index 97% rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/entity/CqcCarbonDiscardEntity.java rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/entity/CqcCarbonDiscardEntity.java index 82e0dc9..d3b0193 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/entity/CqcCarbonDiscardEntity.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/entity/CqcCarbonDiscardEntity.java @@ -1,4 +1,4 @@ -package com.thing.cqc.CqcCarbonDiscard.entity; +package com.thing.cqc.cqcCarbonDiscard.entity; import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.Table; diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/mapper/CqcCarbonDiscardMapper.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/mapper/CqcCarbonDiscardMapper.java similarity index 71% rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/mapper/CqcCarbonDiscardMapper.java rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/mapper/CqcCarbonDiscardMapper.java index 740834f..16d0f92 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/mapper/CqcCarbonDiscardMapper.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/mapper/CqcCarbonDiscardMapper.java @@ -1,7 +1,7 @@ -package com.thing.cqc.CqcCarbonDiscard.mapper; +package com.thing.cqc.cqcCarbonDiscard.mapper; import com.thing.common.orm.mapper.PowerBaseMapper; -import com.thing.cqc.CqcCarbonDiscard.entity.CqcCarbonDiscardEntity; +import com.thing.cqc.cqcCarbonDiscard.entity.CqcCarbonDiscardEntity; import org.apache.ibatis.annotations.Mapper; /** diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/service/CqcCarbonDiscardService.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/service/CqcCarbonDiscardService.java similarity index 67% rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/service/CqcCarbonDiscardService.java rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/service/CqcCarbonDiscardService.java index ebf4d7b..0993aaf 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/service/CqcCarbonDiscardService.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/service/CqcCarbonDiscardService.java @@ -1,7 +1,7 @@ -package com.thing.cqc.CqcCarbonDiscard.service; +package com.thing.cqc.cqcCarbonDiscard.service; import com.thing.common.orm.service.IBaseService; -import com.thing.cqc.CqcCarbonDiscard.entity.CqcCarbonDiscardEntity; +import com.thing.cqc.cqcCarbonDiscard.entity.CqcCarbonDiscardEntity; /** * 废物处置及再利用信息 diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/service/impl/CqcCarbonDiscardServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/service/impl/CqcCarbonDiscardServiceImpl.java similarity index 70% rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/service/impl/CqcCarbonDiscardServiceImpl.java rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/service/impl/CqcCarbonDiscardServiceImpl.java index 9436f08..bd85ec7 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/service/impl/CqcCarbonDiscardServiceImpl.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/service/impl/CqcCarbonDiscardServiceImpl.java @@ -1,10 +1,10 @@ -package com.thing.cqc.CqcCarbonDiscard.service.impl; +package com.thing.cqc.cqcCarbonDiscard.service.impl; import com.mybatisflex.core.query.QueryWrapper; import com.thing.common.orm.service.impl.BaseServiceImpl; -import com.thing.cqc.CqcCarbonDiscard.mapper.CqcCarbonDiscardMapper; -import com.thing.cqc.CqcCarbonDiscard.entity.CqcCarbonDiscardEntity; -import com.thing.cqc.CqcCarbonDiscard.service.CqcCarbonDiscardService; +import com.thing.cqc.cqcCarbonDiscard.mapper.CqcCarbonDiscardMapper; +import com.thing.cqc.cqcCarbonDiscard.entity.CqcCarbonDiscardEntity; +import com.thing.cqc.cqcCarbonDiscard.service.CqcCarbonDiscardService; import org.springframework.stereotype.Service; import java.util.Map; diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/controller/CqcCarbonDistributionController.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/controller/CqcCarbonDistributionController.java similarity index 90% rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/controller/CqcCarbonDistributionController.java rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/controller/CqcCarbonDistributionController.java index bae4155..ed81e9e 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/controller/CqcCarbonDistributionController.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/controller/CqcCarbonDistributionController.java @@ -1,21 +1,15 @@ -package com.thing.cqc.CqcCarbonDistribution.controller; +package com.thing.cqc.cqcCarbonDistribution.controller; import com.thing.common.core.annotation.LogOperation; -import com.thing.common.core.constants.Constant; import com.thing.common.core.validator.AssertUtils; import com.thing.common.core.validator.ValidatorUtils; import com.thing.common.core.validator.group.AddGroup; import com.thing.common.core.validator.group.DefaultGroup; import com.thing.common.core.validator.group.UpdateGroup; -import com.thing.common.core.web.response.PageData; import com.thing.common.core.web.response.Result; -import com.thing.cqc.CqcCarbonDistribution.dto.CqcCarbonDistributionDTO; -import com.thing.cqc.CqcCarbonDistribution.service.CqcCarbonDistributionService; - -import com.thing.cqc.CqcCarbonRaw.dto.CqcCarbonRawDTO; +import com.thing.cqc.cqcCarbonDistribution.dto.CqcCarbonDistributionDTO; +import com.thing.cqc.cqcCarbonDistribution.service.CqcCarbonDistributionService; import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/dto/CqcCarbonDistributionDTO.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/dto/CqcCarbonDistributionDTO.java similarity index 97% rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/dto/CqcCarbonDistributionDTO.java rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/dto/CqcCarbonDistributionDTO.java index 5353eae..57116a1 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/dto/CqcCarbonDistributionDTO.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/dto/CqcCarbonDistributionDTO.java @@ -1,7 +1,6 @@ -package com.thing.cqc.CqcCarbonDistribution.dto; +package com.thing.cqc.cqcCarbonDistribution.dto; import io.swagger.v3.oas.annotations.media.Schema; - import lombok.Data; import java.io.Serial; diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/entity/CqcCarbonDistributionEntity.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/entity/CqcCarbonDistributionEntity.java similarity index 96% rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/entity/CqcCarbonDistributionEntity.java rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/entity/CqcCarbonDistributionEntity.java index 6441b5f..926d7a5 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/entity/CqcCarbonDistributionEntity.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/entity/CqcCarbonDistributionEntity.java @@ -1,8 +1,7 @@ -package com.thing.cqc.CqcCarbonDistribution.entity; +package com.thing.cqc.cqcCarbonDistribution.entity; import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.Table; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/mapper/CqcCarbonDistributionMapper.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/mapper/CqcCarbonDistributionMapper.java similarity index 71% rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/mapper/CqcCarbonDistributionMapper.java rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/mapper/CqcCarbonDistributionMapper.java index 55a7270..fd42454 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/mapper/CqcCarbonDistributionMapper.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/mapper/CqcCarbonDistributionMapper.java @@ -1,7 +1,7 @@ -package com.thing.cqc.CqcCarbonDistribution.mapper; +package com.thing.cqc.cqcCarbonDistribution.mapper; import com.thing.common.orm.mapper.PowerBaseMapper; -import com.thing.cqc.CqcCarbonDistribution.entity.CqcCarbonDistributionEntity; +import com.thing.cqc.cqcCarbonDistribution.entity.CqcCarbonDistributionEntity; import org.apache.ibatis.annotations.Mapper; /** diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/service/CqcCarbonDistributionService.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/service/CqcCarbonDistributionService.java similarity index 66% rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/service/CqcCarbonDistributionService.java rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/service/CqcCarbonDistributionService.java index f11db4b..ab7ad20 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/service/CqcCarbonDistributionService.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/service/CqcCarbonDistributionService.java @@ -1,7 +1,7 @@ -package com.thing.cqc.CqcCarbonDistribution.service; +package com.thing.cqc.cqcCarbonDistribution.service; import com.thing.common.orm.service.IBaseService; -import com.thing.cqc.CqcCarbonDistribution.entity.CqcCarbonDistributionEntity; +import com.thing.cqc.cqcCarbonDistribution.entity.CqcCarbonDistributionEntity; /** * 产品分销信息 diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/service/impl/CqcCarbonDistributionServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/service/impl/CqcCarbonDistributionServiceImpl.java similarity index 74% rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/service/impl/CqcCarbonDistributionServiceImpl.java rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/service/impl/CqcCarbonDistributionServiceImpl.java index 8b00ddf..e083b4e 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/service/impl/CqcCarbonDistributionServiceImpl.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/service/impl/CqcCarbonDistributionServiceImpl.java @@ -1,11 +1,10 @@ -package com.thing.cqc.CqcCarbonDistribution.service.impl; +package com.thing.cqc.cqcCarbonDistribution.service.impl; import com.mybatisflex.core.query.QueryWrapper; import com.thing.common.orm.service.impl.BaseServiceImpl; -import com.thing.cqc.CqcCarbonDistribution.mapper.CqcCarbonDistributionMapper; -import com.thing.cqc.CqcCarbonDistribution.entity.CqcCarbonDistributionEntity; -import com.thing.cqc.CqcCarbonDistribution.service.CqcCarbonDistributionService; -import com.thing.cqc.CqcCarbonRaw.entity.CqcCarbonRawEntity; +import com.thing.cqc.cqcCarbonDistribution.entity.CqcCarbonDistributionEntity; +import com.thing.cqc.cqcCarbonDistribution.mapper.CqcCarbonDistributionMapper; +import com.thing.cqc.cqcCarbonDistribution.service.CqcCarbonDistributionService; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/controller/CqcCarbonEnergyController.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/controller/CqcCarbonEnergyController.java similarity index 89% rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/controller/CqcCarbonEnergyController.java rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/controller/CqcCarbonEnergyController.java index 4cb3f1a..b8b993b 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/controller/CqcCarbonEnergyController.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/controller/CqcCarbonEnergyController.java @@ -1,21 +1,16 @@ -package com.thing.cqc.CqcCarbonEnergy.controller; +package com.thing.cqc.cqcCarbonEnergy.controller; import com.thing.common.core.annotation.LogOperation; -import com.thing.common.core.constants.Constant; import com.thing.common.core.validator.AssertUtils; import com.thing.common.core.validator.ValidatorUtils; import com.thing.common.core.validator.group.AddGroup; import com.thing.common.core.validator.group.DefaultGroup; import com.thing.common.core.validator.group.UpdateGroup; -import com.thing.common.core.web.response.PageData; import com.thing.common.core.web.response.Result; -import com.thing.cqc.CqcCarbonEnergy.dto.CqcCarbonEnergyDTO; -import com.thing.cqc.CqcCarbonEnergy.service.CqcCarbonEnergyService; +import com.thing.cqc.cqcCarbonEnergy.dto.CqcCarbonEnergyDTO; +import com.thing.cqc.cqcCarbonEnergy.service.CqcCarbonEnergyService; -import com.thing.cqc.CqcCarbonRaw.dto.CqcCarbonRawDTO; import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/dto/CqcCarbonEnergyDTO.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/dto/CqcCarbonEnergyDTO.java similarity index 97% rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/dto/CqcCarbonEnergyDTO.java rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/dto/CqcCarbonEnergyDTO.java index be1d4fc..9b73dc0 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/dto/CqcCarbonEnergyDTO.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/dto/CqcCarbonEnergyDTO.java @@ -1,4 +1,4 @@ -package com.thing.cqc.CqcCarbonEnergy.dto; +package com.thing.cqc.cqcCarbonEnergy.dto; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/entity/CqcCarbonEnergyEntity.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/entity/CqcCarbonEnergyEntity.java similarity index 96% rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/entity/CqcCarbonEnergyEntity.java rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/entity/CqcCarbonEnergyEntity.java index c9d8339..4803121 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/entity/CqcCarbonEnergyEntity.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/entity/CqcCarbonEnergyEntity.java @@ -1,4 +1,4 @@ -package com.thing.cqc.CqcCarbonEnergy.entity; +package com.thing.cqc.cqcCarbonEnergy.entity; import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.Table; diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/mapper/CqcCarbonEnergyMapper.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/mapper/CqcCarbonEnergyMapper.java similarity index 71% rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/mapper/CqcCarbonEnergyMapper.java rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/mapper/CqcCarbonEnergyMapper.java index 9bc4363..d8b5627 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/mapper/CqcCarbonEnergyMapper.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/mapper/CqcCarbonEnergyMapper.java @@ -1,7 +1,7 @@ -package com.thing.cqc.CqcCarbonEnergy.mapper; +package com.thing.cqc.cqcCarbonEnergy.mapper; import com.thing.common.orm.mapper.PowerBaseMapper; -import com.thing.cqc.CqcCarbonEnergy.entity.CqcCarbonEnergyEntity; +import com.thing.cqc.cqcCarbonEnergy.entity.CqcCarbonEnergyEntity; import org.apache.ibatis.annotations.Mapper; /** diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/service/CqcCarbonEnergyService.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/service/CqcCarbonEnergyService.java similarity index 66% rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/service/CqcCarbonEnergyService.java rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/service/CqcCarbonEnergyService.java index c8550d5..8f2da2e 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/service/CqcCarbonEnergyService.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/service/CqcCarbonEnergyService.java @@ -1,7 +1,7 @@ -package com.thing.cqc.CqcCarbonEnergy.service; +package com.thing.cqc.cqcCarbonEnergy.service; import com.thing.common.orm.service.IBaseService; -import com.thing.cqc.CqcCarbonEnergy.entity.CqcCarbonEnergyEntity; +import com.thing.cqc.cqcCarbonEnergy.entity.CqcCarbonEnergyEntity; /** * 使用阶段能源信息 diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/service/impl/CqcCarbonEnergyServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/service/impl/CqcCarbonEnergyServiceImpl.java similarity index 73% rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/service/impl/CqcCarbonEnergyServiceImpl.java rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/service/impl/CqcCarbonEnergyServiceImpl.java index 750630e..27b87ef 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/service/impl/CqcCarbonEnergyServiceImpl.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/service/impl/CqcCarbonEnergyServiceImpl.java @@ -1,11 +1,10 @@ -package com.thing.cqc.CqcCarbonEnergy.service.impl; +package com.thing.cqc.cqcCarbonEnergy.service.impl; import com.mybatisflex.core.query.QueryWrapper; import com.thing.common.orm.service.impl.BaseServiceImpl; -import com.thing.cqc.CqcCarbonEnergy.mapper.CqcCarbonEnergyMapper; -import com.thing.cqc.CqcCarbonEnergy.entity.CqcCarbonEnergyEntity; -import com.thing.cqc.CqcCarbonEnergy.service.CqcCarbonEnergyService; -import com.thing.cqc.CqcCarbonRaw.entity.CqcCarbonRawEntity; +import com.thing.cqc.cqcCarbonEnergy.mapper.CqcCarbonEnergyMapper; +import com.thing.cqc.cqcCarbonEnergy.entity.CqcCarbonEnergyEntity; +import com.thing.cqc.cqcCarbonEnergy.service.CqcCarbonEnergyService; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/controller/CqcCarbonMakeController.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/controller/CqcCarbonMakeController.java similarity index 89% rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/controller/CqcCarbonMakeController.java rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/controller/CqcCarbonMakeController.java index 3913c2c..27627a8 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/controller/CqcCarbonMakeController.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/controller/CqcCarbonMakeController.java @@ -1,21 +1,16 @@ -package com.thing.cqc.CqcCarbonMake.controller; +package com.thing.cqc.cqcCarbonMake.controller; import com.thing.common.core.annotation.LogOperation; -import com.thing.common.core.constants.Constant; import com.thing.common.core.validator.AssertUtils; import com.thing.common.core.validator.ValidatorUtils; import com.thing.common.core.validator.group.AddGroup; import com.thing.common.core.validator.group.DefaultGroup; import com.thing.common.core.validator.group.UpdateGroup; -import com.thing.common.core.web.response.PageData; import com.thing.common.core.web.response.Result; -import com.thing.cqc.CqcCarbonMake.dto.CqcCarbonMakeDTO; -import com.thing.cqc.CqcCarbonMake.service.CqcCarbonMakeService; +import com.thing.cqc.cqcCarbonMake.dto.CqcCarbonMakeDTO; +import com.thing.cqc.cqcCarbonMake.service.CqcCarbonMakeService; -import com.thing.cqc.CqcCarbonRaw.dto.CqcCarbonRawDTO; import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/dto/CqcCarbonMakeDTO.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/dto/CqcCarbonMakeDTO.java similarity index 97% rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/dto/CqcCarbonMakeDTO.java rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/dto/CqcCarbonMakeDTO.java index b0206ce..2da0c61 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/dto/CqcCarbonMakeDTO.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/dto/CqcCarbonMakeDTO.java @@ -1,4 +1,4 @@ -package com.thing.cqc.CqcCarbonMake.dto; +package com.thing.cqc.cqcCarbonMake.dto; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/entity/CqcCarbonMakeEntity.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/entity/CqcCarbonMakeEntity.java similarity index 96% rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/entity/CqcCarbonMakeEntity.java rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/entity/CqcCarbonMakeEntity.java index 33758da..5cba885 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/entity/CqcCarbonMakeEntity.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/entity/CqcCarbonMakeEntity.java @@ -1,4 +1,4 @@ -package com.thing.cqc.CqcCarbonMake.entity; +package com.thing.cqc.cqcCarbonMake.entity; import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.Table; diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/mapper/CqcCarbonMakeMapper.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/mapper/CqcCarbonMakeMapper.java similarity index 71% rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/mapper/CqcCarbonMakeMapper.java rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/mapper/CqcCarbonMakeMapper.java index 5fef182..02d407b 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/mapper/CqcCarbonMakeMapper.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/mapper/CqcCarbonMakeMapper.java @@ -1,7 +1,7 @@ -package com.thing.cqc.CqcCarbonMake.mapper; +package com.thing.cqc.cqcCarbonMake.mapper; import com.thing.common.orm.mapper.PowerBaseMapper; -import com.thing.cqc.CqcCarbonMake.entity.CqcCarbonMakeEntity; +import com.thing.cqc.cqcCarbonMake.entity.CqcCarbonMakeEntity; import org.apache.ibatis.annotations.Mapper; /** diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/service/CqcCarbonMakeService.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/service/CqcCarbonMakeService.java similarity index 66% rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/service/CqcCarbonMakeService.java rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/service/CqcCarbonMakeService.java index 2bb4955..88da54e 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/service/CqcCarbonMakeService.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/service/CqcCarbonMakeService.java @@ -1,7 +1,7 @@ -package com.thing.cqc.CqcCarbonMake.service; +package com.thing.cqc.cqcCarbonMake.service; import com.thing.common.orm.service.IBaseService; -import com.thing.cqc.CqcCarbonMake.entity.CqcCarbonMakeEntity; +import com.thing.cqc.cqcCarbonMake.entity.CqcCarbonMakeEntity; /** * 制造阶段能源消耗信息 diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/service/impl/CqcCarbonMakeServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/service/impl/CqcCarbonMakeServiceImpl.java similarity index 73% rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/service/impl/CqcCarbonMakeServiceImpl.java rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/service/impl/CqcCarbonMakeServiceImpl.java index 93b3980..79e02c9 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/service/impl/CqcCarbonMakeServiceImpl.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/service/impl/CqcCarbonMakeServiceImpl.java @@ -1,11 +1,10 @@ -package com.thing.cqc.CqcCarbonMake.service.impl; +package com.thing.cqc.cqcCarbonMake.service.impl; import com.mybatisflex.core.query.QueryWrapper; import com.thing.common.orm.service.impl.BaseServiceImpl; -import com.thing.cqc.CqcCarbonMake.mapper.CqcCarbonMakeMapper; -import com.thing.cqc.CqcCarbonMake.entity.CqcCarbonMakeEntity; -import com.thing.cqc.CqcCarbonMake.service.CqcCarbonMakeService; -import com.thing.cqc.CqcCarbonRaw.entity.CqcCarbonRawEntity; +import com.thing.cqc.cqcCarbonMake.mapper.CqcCarbonMakeMapper; +import com.thing.cqc.cqcCarbonMake.entity.CqcCarbonMakeEntity; +import com.thing.cqc.cqcCarbonMake.service.CqcCarbonMakeService; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/controller/CqcCarbonRawController.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonRaw/controller/CqcCarbonRawController.java similarity index 91% rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/controller/CqcCarbonRawController.java rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonRaw/controller/CqcCarbonRawController.java index 92a18ef..9fd8640 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/controller/CqcCarbonRawController.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonRaw/controller/CqcCarbonRawController.java @@ -1,19 +1,15 @@ -package com.thing.cqc.CqcCarbonRaw.controller; +package com.thing.cqc.cqcCarbonRaw.controller; import com.thing.common.core.annotation.LogOperation; -import com.thing.common.core.constants.Constant; import com.thing.common.core.validator.AssertUtils; import com.thing.common.core.validator.ValidatorUtils; import com.thing.common.core.validator.group.AddGroup; import com.thing.common.core.validator.group.DefaultGroup; import com.thing.common.core.validator.group.UpdateGroup; -import com.thing.common.core.web.response.PageData; import com.thing.common.core.web.response.Result; -import com.thing.cqc.CqcCarbonRaw.dto.CqcCarbonRawDTO; -import com.thing.cqc.CqcCarbonRaw.service.CqcCarbonRawService; +import com.thing.cqc.cqcCarbonRaw.dto.CqcCarbonRawDTO; +import com.thing.cqc.cqcCarbonRaw.service.CqcCarbonRawService; import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/dto/CqcCarbonRawDTO.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonRaw/dto/CqcCarbonRawDTO.java similarity index 98% rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/dto/CqcCarbonRawDTO.java rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonRaw/dto/CqcCarbonRawDTO.java index 49023f4..ad39a80 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/dto/CqcCarbonRawDTO.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonRaw/dto/CqcCarbonRawDTO.java @@ -1,4 +1,4 @@ -package com.thing.cqc.CqcCarbonRaw.dto; +package com.thing.cqc.cqcCarbonRaw.dto; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/CqcCarbonRawEntity.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonRaw/entity/CqcCarbonRawEntity.java similarity index 97% rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/CqcCarbonRawEntity.java rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonRaw/entity/CqcCarbonRawEntity.java index f5f79e5..c8bf0b6 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/CqcCarbonRawEntity.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonRaw/entity/CqcCarbonRawEntity.java @@ -1,4 +1,4 @@ -package com.thing.cqc.CqcCarbonRaw.entity; +package com.thing.cqc.cqcCarbonRaw.entity; import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.Table; diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/mapper/CqcCarbonRawMapper.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonRaw/mapper/CqcCarbonRawMapper.java similarity index 71% rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/mapper/CqcCarbonRawMapper.java rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonRaw/mapper/CqcCarbonRawMapper.java index 922d3cb..966eff6 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/mapper/CqcCarbonRawMapper.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonRaw/mapper/CqcCarbonRawMapper.java @@ -1,7 +1,7 @@ -package com.thing.cqc.CqcCarbonRaw.mapper; +package com.thing.cqc.cqcCarbonRaw.mapper; import com.thing.common.orm.mapper.PowerBaseMapper; -import com.thing.cqc.CqcCarbonRaw.entity.CqcCarbonRawEntity; +import com.thing.cqc.cqcCarbonRaw.entity.CqcCarbonRawEntity; import org.apache.ibatis.annotations.Mapper; /** diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/service/CqcCarbonRawService.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonRaw/service/CqcCarbonRawService.java similarity index 66% rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/service/CqcCarbonRawService.java rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonRaw/service/CqcCarbonRawService.java index 196a81d..ab3a822 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/service/CqcCarbonRawService.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonRaw/service/CqcCarbonRawService.java @@ -1,7 +1,7 @@ -package com.thing.cqc.CqcCarbonRaw.service; +package com.thing.cqc.cqcCarbonRaw.service; import com.thing.common.orm.service.IBaseService; -import com.thing.cqc.CqcCarbonRaw.entity.CqcCarbonRawEntity; +import com.thing.cqc.cqcCarbonRaw.entity.CqcCarbonRawEntity; /** * 原物料阶段数据 diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/service/impl/CqcCarbonRawServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonRaw/service/impl/CqcCarbonRawServiceImpl.java similarity index 77% rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/service/impl/CqcCarbonRawServiceImpl.java rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonRaw/service/impl/CqcCarbonRawServiceImpl.java index fc0ffa1..219940c 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/service/impl/CqcCarbonRawServiceImpl.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonRaw/service/impl/CqcCarbonRawServiceImpl.java @@ -1,10 +1,10 @@ -package com.thing.cqc.CqcCarbonRaw.service.impl; +package com.thing.cqc.cqcCarbonRaw.service.impl; import com.mybatisflex.core.query.QueryWrapper; import com.thing.common.orm.service.impl.BaseServiceImpl; -import com.thing.cqc.CqcCarbonRaw.entity.CqcCarbonRawEntity; -import com.thing.cqc.CqcCarbonRaw.mapper.CqcCarbonRawMapper; -import com.thing.cqc.CqcCarbonRaw.service.CqcCarbonRawService; +import com.thing.cqc.cqcCarbonRaw.entity.CqcCarbonRawEntity; +import com.thing.cqc.cqcCarbonRaw.mapper.CqcCarbonRawMapper; +import com.thing.cqc.cqcCarbonRaw.service.CqcCarbonRawService; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/controller/CqcCarbonReportController.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/controller/CqcCarbonReportController.java similarity index 80% rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/controller/CqcCarbonReportController.java rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/controller/CqcCarbonReportController.java index 2d0a2f6..3f4de37 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/controller/CqcCarbonReportController.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/controller/CqcCarbonReportController.java @@ -1,4 +1,4 @@ -package com.thing.cqc.CqcCarbonReport.controller; +package com.thing.cqc.cqcCarbonReport.controller; import com.thing.common.core.annotation.LogOperation; import com.thing.common.core.constants.Constant; @@ -9,9 +9,10 @@ import com.thing.common.core.validator.group.DefaultGroup; import com.thing.common.core.validator.group.UpdateGroup; import com.thing.common.core.web.response.PageData; import com.thing.common.core.web.response.Result; -import com.thing.cqc.CqcCarbonReport.dto.CqcCarbonReportDTO; -import com.thing.cqc.CqcCarbonReport.service.CqcCarbonReportService; - +import com.thing.cqc.cqcCarbonReport.dto.CqcCarbonReportDTO; +import com.thing.cqc.cqcCarbonReport.service.CqcCarbonReportService; +import com.thing.cqc.rpcService.service.CqcRpcService; +import com.thing.sys.security.context.UserContext; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; @@ -36,6 +37,8 @@ public class CqcCarbonReportController { private final CqcCarbonReportService cqcCarbonReportService; + private final CqcRpcService cqcRpcService; + @GetMapping("page") @Operation(summary="分页") @Parameters({ @@ -50,7 +53,6 @@ public class CqcCarbonReportController { } @GetMapping("{id}") - @Operation(summary="信息") public Result get(@PathVariable("id") Long id){ CqcCarbonReportDTO data = cqcCarbonReportService.getByIdAs(id, CqcCarbonReportDTO.class); return new Result().ok(data); @@ -58,18 +60,19 @@ public class CqcCarbonReportController { @PostMapping @Operation(summary="保存") - @LogOperation("保存") public Result save(@RequestBody CqcCarbonReportDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); dto.setApplyNo(String.valueOf(UUID.randomUUID())); + dto.setCreateDate(System.currentTimeMillis()); + dto.setCompanyId(UserContext.getCompanyId()); + dto.setTenantCode(UserContext.getTenantCode()); cqcCarbonReportService.saveDto(dto); return new Result().ok(dto.getApplyNo()); } @PutMapping @Operation(summary="修改") - @LogOperation("修改") public Result update(@RequestBody CqcCarbonReportDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); @@ -79,7 +82,6 @@ public class CqcCarbonReportController { @DeleteMapping @Operation(summary="删除") - @LogOperation("删除") public Result delete(@RequestBody Long[] ids){ //效验数据 AssertUtils.isArrayEmpty(ids, "id"); @@ -87,14 +89,9 @@ public class CqcCarbonReportController { return new Result<>(); } - /** - *@GetMapping("export") - *@Operation(summary="导出") - *@LogOperation("导出") - *public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception { - * List list = cqcCarbonReportService.listAs(params, CqcCarbonReportDTO.class); - * //ExcelUtils.exportExcelToTarget(response, null, "申请表基础数据", list, CqcCarbonReportExcel.class); - *} - */ + @GetMapping("uploadReport/{id}") + private Result uploadReport(@PathVariable("id") Long id){ + return cqcCarbonReportService.uploadReport(id); + } } \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/dto/CqcCarbonReportDTO.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/dto/CqcCarbonReportDTO.java similarity index 87% rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/dto/CqcCarbonReportDTO.java rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/dto/CqcCarbonReportDTO.java index 5869011..37b805e 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/dto/CqcCarbonReportDTO.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/dto/CqcCarbonReportDTO.java @@ -1,11 +1,18 @@ -package com.thing.cqc.CqcCarbonReport.dto; +package com.thing.cqc.cqcCarbonReport.dto; +import com.thing.cqc.cqcCarbonConsumables.dto.CqcCarbonConsumablesDTO; +import com.thing.cqc.cqcCarbonDiscard.dto.CqcCarbonDiscardDTO; +import com.thing.cqc.cqcCarbonDistribution.dto.CqcCarbonDistributionDTO; +import com.thing.cqc.cqcCarbonEnergy.dto.CqcCarbonEnergyDTO; +import com.thing.cqc.cqcCarbonMake.dto.CqcCarbonMakeDTO; +import com.thing.cqc.cqcCarbonRaw.dto.CqcCarbonRawDTO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.io.Serial; import java.io.Serializable; +import java.util.List; /** * 申请表基础数据 @@ -154,6 +161,21 @@ public class CqcCarbonReportDTO implements Serializable { private String email; @Schema(description = "审核状态") private String status; + + + @Schema(description = "原物料阶段") + private List materialList; + @Schema(description = "制造阶段") + private List makeList; + @Schema(description = "分销阶段") + private List disList; + @Schema(description = "使用阶段耗材") + private List consumeList; + @Schema(description = "使用阶段能源") + private List energyList; + @Schema(description = "废弃阶段") + private List wasteList; + @Schema(description = "主键id") private Long id; @Schema(description = "租户编码") diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/entity/CqcCarbonReportEntity.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/entity/CqcCarbonReportEntity.java similarity index 98% rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/entity/CqcCarbonReportEntity.java rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/entity/CqcCarbonReportEntity.java index 2045339..28dda29 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/entity/CqcCarbonReportEntity.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/entity/CqcCarbonReportEntity.java @@ -1,8 +1,8 @@ -package com.thing.cqc.CqcCarbonReport.entity; +package com.thing.cqc.cqcCarbonReport.entity; +import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.Table; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -23,7 +23,11 @@ import java.io.Serializable; public class CqcCarbonReportEntity implements Serializable { @Serial private static final long serialVersionUID = 1L; - + /** + * 主键id + */ + @Id + private Long id; /** * 受理机构 */ @@ -288,10 +292,7 @@ public class CqcCarbonReportEntity implements Serializable { * email */ private String email; - /** - * 主键id - */ - private Long id; + /** * 审核状态 */ diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/mapper/CqcCarbonReportMapper.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/mapper/CqcCarbonReportMapper.java similarity index 70% rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/mapper/CqcCarbonReportMapper.java rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/mapper/CqcCarbonReportMapper.java index 4fe6c55..d8b8011 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/mapper/CqcCarbonReportMapper.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/mapper/CqcCarbonReportMapper.java @@ -1,7 +1,7 @@ -package com.thing.cqc.CqcCarbonReport.mapper; +package com.thing.cqc.cqcCarbonReport.mapper; import com.thing.common.orm.mapper.PowerBaseMapper; -import com.thing.cqc.CqcCarbonReport.entity.CqcCarbonReportEntity; +import com.thing.cqc.cqcCarbonReport.entity.CqcCarbonReportEntity; import org.apache.ibatis.annotations.Mapper; /** diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/service/CqcCarbonReportService.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/service/CqcCarbonReportService.java similarity index 51% rename from modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/service/CqcCarbonReportService.java rename to modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/service/CqcCarbonReportService.java index 157d1b2..0ab8952 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/service/CqcCarbonReportService.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/service/CqcCarbonReportService.java @@ -1,7 +1,8 @@ -package com.thing.cqc.CqcCarbonReport.service; +package com.thing.cqc.cqcCarbonReport.service; +import com.thing.common.core.web.response.Result; import com.thing.common.orm.service.IBaseService; -import com.thing.cqc.CqcCarbonReport.entity.CqcCarbonReportEntity; +import com.thing.cqc.cqcCarbonReport.entity.CqcCarbonReportEntity; /** * 申请表基础数据 @@ -11,4 +12,5 @@ import com.thing.cqc.CqcCarbonReport.entity.CqcCarbonReportEntity; */ public interface CqcCarbonReportService extends IBaseService { + Result uploadReport(Long id); } \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/service/impl/CqcCarbonReportServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/service/impl/CqcCarbonReportServiceImpl.java new file mode 100644 index 0000000..9b3b121 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/service/impl/CqcCarbonReportServiceImpl.java @@ -0,0 +1,109 @@ +package com.thing.cqc.cqcCarbonReport.service.impl; + +import com.alibaba.fastjson.JSONObject; +import com.mybatisflex.core.query.QueryWrapper; +import com.thing.common.core.web.response.Result; +import com.thing.common.orm.service.impl.BaseServiceImpl; +import com.thing.cqc.cqcCarbonConsumables.dto.CqcCarbonConsumablesDTO; +import com.thing.cqc.cqcCarbonConsumables.entity.CqcCarbonConsumablesEntity; +import com.thing.cqc.cqcCarbonConsumables.service.CqcCarbonConsumablesService; +import com.thing.cqc.cqcCarbonDiscard.dto.CqcCarbonDiscardDTO; +import com.thing.cqc.cqcCarbonDiscard.entity.CqcCarbonDiscardEntity; +import com.thing.cqc.cqcCarbonDiscard.service.CqcCarbonDiscardService; +import com.thing.cqc.cqcCarbonDistribution.dto.CqcCarbonDistributionDTO; +import com.thing.cqc.cqcCarbonDistribution.entity.CqcCarbonDistributionEntity; +import com.thing.cqc.cqcCarbonDistribution.service.CqcCarbonDistributionService; +import com.thing.cqc.cqcCarbonEnergy.dto.CqcCarbonEnergyDTO; +import com.thing.cqc.cqcCarbonEnergy.entity.CqcCarbonEnergyEntity; +import com.thing.cqc.cqcCarbonEnergy.service.CqcCarbonEnergyService; +import com.thing.cqc.cqcCarbonMake.dto.CqcCarbonMakeDTO; +import com.thing.cqc.cqcCarbonMake.entity.CqcCarbonMakeEntity; +import com.thing.cqc.cqcCarbonMake.service.CqcCarbonMakeService; +import com.thing.cqc.cqcCarbonRaw.dto.CqcCarbonRawDTO; +import com.thing.cqc.cqcCarbonRaw.service.CqcCarbonRawService; +import com.thing.cqc.cqcCarbonReport.dto.CqcCarbonReportDTO; +import com.thing.cqc.cqcCarbonReport.mapper.CqcCarbonReportMapper; +import com.thing.cqc.cqcCarbonReport.entity.CqcCarbonReportEntity; +import com.thing.cqc.cqcCarbonReport.service.CqcCarbonReportService; +import com.thing.cqc.rpcService.service.CqcRpcService; +import com.thing.sys.security.context.UserContext; +import org.apache.commons.lang3.ObjectUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Map; + +/** + * 申请表基础数据 + * + * @author xc + * @since 3.0 2024-08-08 + */ +@Service +public class CqcCarbonReportServiceImpl extends BaseServiceImpl implements CqcCarbonReportService { + + @Autowired //原料 + private CqcCarbonRawService cqcCarbonRawService; + @Autowired //制造 + private CqcCarbonMakeService cqcCarbonMakeService; + @Autowired //分销阶段 + private CqcCarbonDistributionService cqcCarbonDistributionService; + @Autowired //使用阶段耗材 + private CqcCarbonConsumablesService cqcCarbonConsumablesService; + @Autowired //使用阶段能源 + private CqcCarbonEnergyService cqcCarbonEnergyService; + @Autowired //废弃阶段 + private CqcCarbonDiscardService cqcCarbonDiscardService; + @Autowired + private CqcRpcService cqcRpcService; + + + @Override + public QueryWrapper getWrapper(Map params){ + QueryWrapper wrapper = new QueryWrapper(); + Long tenantCode = UserContext.getTenantCode(); + if(!tenantCode.equals(1001L)){ + wrapper.eq(CqcCarbonReportEntity::getTenantCode,tenantCode); + } + return wrapper; + } + + + @Override + public Result uploadReport(Long id) { + Result result = new Result<>(); + + + + CqcCarbonReportDTO reportDTO = this.getByIdAs(id,CqcCarbonReportDTO.class); + String applyNo = reportDTO.getApplyNo(); + if(ObjectUtils.isNotEmpty(reportDTO.getApplyNo())){ + reportDTO.setMaterialList(cqcCarbonRawService.listAs(Map.of("applyNo",applyNo), CqcCarbonRawDTO.class)); + reportDTO.setMakeList(cqcCarbonMakeService.listAs(Map.of("applyNo",applyNo), CqcCarbonMakeDTO.class)); + reportDTO.setDisList(cqcCarbonDistributionService.listAs(Map.of("applyNo",applyNo), CqcCarbonDistributionDTO.class)); + reportDTO.setConsumeList(cqcCarbonConsumablesService.listAs(Map.of("applyNo",applyNo), CqcCarbonConsumablesDTO.class)); + reportDTO.setEnergyList(cqcCarbonEnergyService.listAs(Map.of("applyNo",applyNo), CqcCarbonEnergyDTO.class)); + reportDTO.setWasteList(cqcCarbonDiscardService.listAs(Map.of("applyNo",applyNo), CqcCarbonDiscardDTO.class)); + } + String paramBodyStr = JSONObject.toJSONString(reportDTO); + try { + String reqResult = cqcRpcService.doUploadData(paramBodyStr); + + JSONObject object = JSONObject.parseObject(reqResult); + if(ObjectUtils.isNotEmpty(object)){ + Integer code = object.getInteger("code"); + String data = object.getString("data"); + String msg = object.getString("msg"); + result.setCode(code); + result.setData(data); + result.setMsg(msg); + } + } catch (Exception e) { + e.printStackTrace(); + result.setCode(405); + result.setData(""); + result.setMsg("RPC 调用异常！"); + } + return result; + } +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/rpcService/JsonCryptoUtils.java b/modules/cqc-service/src/main/java/com/thing/cqc/rpcService/JsonCryptoUtils.java new file mode 100644 index 0000000..35f43a4 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/rpcService/JsonCryptoUtils.java @@ -0,0 +1,32 @@ +package com.thing.cqc.rpcService; + +import javax.crypto.Cipher; +import javax.crypto.spec.SecretKeySpec; +import java.util.Base64; + +public class JsonCryptoUtils { + + private static final String ALGORITHM = "AES"; + public static final String SECRETKEY = "6276a411ba4fec23"; // 16 characters key for AES + + public static String encryptJson(String jsonString, String secretKey) throws Exception { + SecretKeySpec keySpec = new SecretKeySpec(secretKey.getBytes(), ALGORITHM); + Cipher cipher = Cipher.getInstance(ALGORITHM); + cipher.init(Cipher.ENCRYPT_MODE, keySpec); + byte[] encryptedBytes = cipher.doFinal(jsonString.getBytes()); + return Base64.getEncoder().encodeToString(encryptedBytes); + } + + public static String decryptJson(String encryptedJsonString, String secretKey) throws Exception { + SecretKeySpec keySpec = new SecretKeySpec(secretKey.getBytes(), ALGORITHM); + Cipher cipher = Cipher.getInstance(ALGORITHM); + cipher.init(Cipher.DECRYPT_MODE, keySpec); + byte[] decryptedBytes = cipher.doFinal(Base64.getDecoder().decode(encryptedJsonString)); + return new String(decryptedBytes); + } + + + + + +} diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/rpcService/service/CqcRpcService.java b/modules/cqc-service/src/main/java/com/thing/cqc/rpcService/service/CqcRpcService.java new file mode 100644 index 0000000..507fe0f --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/rpcService/service/CqcRpcService.java @@ -0,0 +1,6 @@ +package com.thing.cqc.rpcService.service; + +public interface CqcRpcService { + + public String doUploadData(String param) throws Exception; +} diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/rpcService/service/impl/CqcRpcServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/rpcService/service/impl/CqcRpcServiceImpl.java new file mode 100644 index 0000000..37b4d59 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/rpcService/service/impl/CqcRpcServiceImpl.java @@ -0,0 +1,32 @@ +package com.thing.cqc.rpcService.service.impl; + +import com.thing.cqc.rpcService.JsonCryptoUtils; +import com.thing.cqc.rpcService.service.CqcRpcService; +import com.thing.sys.biz.utils.HttpClientUtil; +import org.springframework.stereotype.Service; + +import java.util.HashMap; +import java.util.Map; + +@Service +public class CqcRpcServiceImpl implements CqcRpcService { + + private static final String url = "http://114.249.188.139:8099/"; + + private static final String uploadDataFix = "api/uploadData"; + + private static final String token = "6276a411ba4fec238500f8123f89192"; + + @Override + public String doUploadData(String param) throws Exception { + //数据加密 + String encryptParam = JsonCryptoUtils.encryptJson(param,JsonCryptoUtils.SECRETKEY); + Map paramMap = new HashMap<>(); + paramMap.put("token",token); + paramMap.put("content",encryptParam); + String postUrl = url+uploadDataFix; + String httpResultStr = HttpClientUtil.post(postUrl,paramMap); + //返回结果解析 + return httpResultStr; + } +} diff --git a/modules/cqc-service/src/main/resources/mapper/CqcCarbonConsumables/CqcCarbonConsumablesMapper.xml b/modules/cqc-service/src/main/resources/mapper/CqcCarbonConsumables/CqcCarbonConsumablesMapper.xml deleted file mode 100644 index bb08a24..0000000 --- a/modules/cqc-service/src/main/resources/mapper/CqcCarbonConsumables/CqcCarbonConsumablesMapper.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/cqc-service/src/main/resources/mapper/CqcCarbonConsumablesMapper.xml b/modules/cqc-service/src/main/resources/mapper/CqcCarbonConsumablesMapper.xml new file mode 100644 index 0000000..3c269af --- /dev/null +++ b/modules/cqc-service/src/main/resources/mapper/CqcCarbonConsumablesMapper.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/modules/cqc-service/src/main/resources/mapper/CqcCarbonDiscard/CqcCarbonDiscardMapper.xml b/modules/cqc-service/src/main/resources/mapper/CqcCarbonDiscard/CqcCarbonDiscardMapper.xml deleted file mode 100644 index bdb6f7e..0000000 --- a/modules/cqc-service/src/main/resources/mapper/CqcCarbonDiscard/CqcCarbonDiscardMapper.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/cqc-service/src/main/resources/mapper/CqcCarbonDiscardMapper.xml b/modules/cqc-service/src/main/resources/mapper/CqcCarbonDiscardMapper.xml new file mode 100644 index 0000000..e0b9d39 --- /dev/null +++ b/modules/cqc-service/src/main/resources/mapper/CqcCarbonDiscardMapper.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/modules/cqc-service/src/main/resources/mapper/CqcCarbonDistribution/CqcCarbonDistributionMapper.xml b/modules/cqc-service/src/main/resources/mapper/CqcCarbonDistribution/CqcCarbonDistributionMapper.xml deleted file mode 100644 index 4a9a35d..0000000 --- a/modules/cqc-service/src/main/resources/mapper/CqcCarbonDistribution/CqcCarbonDistributionMapper.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/cqc-service/src/main/resources/mapper/CqcCarbonDistributionMapper.xml b/modules/cqc-service/src/main/resources/mapper/CqcCarbonDistributionMapper.xml new file mode 100644 index 0000000..690715c --- /dev/null +++ b/modules/cqc-service/src/main/resources/mapper/CqcCarbonDistributionMapper.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/modules/cqc-service/src/main/resources/mapper/CqcCarbonEnergy/CqcCarbonEnergyMapper.xml b/modules/cqc-service/src/main/resources/mapper/CqcCarbonEnergy/CqcCarbonEnergyMapper.xml deleted file mode 100644 index 1c253cc..0000000 --- a/modules/cqc-service/src/main/resources/mapper/CqcCarbonEnergy/CqcCarbonEnergyMapper.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/cqc-service/src/main/resources/mapper/CqcCarbonEnergyMapper.xml b/modules/cqc-service/src/main/resources/mapper/CqcCarbonEnergyMapper.xml new file mode 100644 index 0000000..d046813 --- /dev/null +++ b/modules/cqc-service/src/main/resources/mapper/CqcCarbonEnergyMapper.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/modules/cqc-service/src/main/resources/mapper/CqcCarbonMake/CqcCarbonMakeMapper.xml b/modules/cqc-service/src/main/resources/mapper/CqcCarbonMake/CqcCarbonMakeMapper.xml deleted file mode 100644 index 20d88c9..0000000 --- a/modules/cqc-service/src/main/resources/mapper/CqcCarbonMake/CqcCarbonMakeMapper.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/cqc-service/src/main/resources/mapper/CqcCarbonMakeMapper.xml b/modules/cqc-service/src/main/resources/mapper/CqcCarbonMakeMapper.xml new file mode 100644 index 0000000..3a4329d --- /dev/null +++ b/modules/cqc-service/src/main/resources/mapper/CqcCarbonMakeMapper.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/modules/cqc-service/src/main/resources/mapper/CqcCarbonRaw/CqcCarbonRawMapper.xml b/modules/cqc-service/src/main/resources/mapper/CqcCarbonRaw/CqcCarbonRawMapper.xml deleted file mode 100644 index 39c14ff..0000000 --- a/modules/cqc-service/src/main/resources/mapper/CqcCarbonRaw/CqcCarbonRawMapper.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/cqc-service/src/main/resources/mapper/CqcCarbonRawMapper.xml b/modules/cqc-service/src/main/resources/mapper/CqcCarbonRawMapper.xml new file mode 100644 index 0000000..4c77db1 --- /dev/null +++ b/modules/cqc-service/src/main/resources/mapper/CqcCarbonRawMapper.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/modules/cqc-service/src/main/resources/mapper/CqcCarbonReport/CqcCarbonReportMapper.xml b/modules/cqc-service/src/main/resources/mapper/CqcCarbonReport/CqcCarbonReportMapper.xml deleted file mode 100644 index 7302bcf..0000000 --- a/modules/cqc-service/src/main/resources/mapper/CqcCarbonReport/CqcCarbonReportMapper.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/cqc-service/src/main/resources/mapper/CqcCarbonReportMapper.xml b/modules/cqc-service/src/main/resources/mapper/CqcCarbonReportMapper.xml new file mode 100644 index 0000000..6692d43 --- /dev/null +++ b/modules/cqc-service/src/main/resources/mapper/CqcCarbonReportMapper.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/modules/thing/src/main/java/com/thing/sys/biz/utils/HttpClientUtil.java b/modules/thing/src/main/java/com/thing/sys/biz/utils/HttpClientUtil.java index 0014a3c..ea0457a 100644 --- a/modules/thing/src/main/java/com/thing/sys/biz/utils/HttpClientUtil.java +++ b/modules/thing/src/main/java/com/thing/sys/biz/utils/HttpClientUtil.java @@ -53,31 +53,42 @@ public class HttpClientUtil { * @return */ @SuppressWarnings("unchecked") - public static String post(String url, Map data){ + public static String post(String url, Map data) { StringBuffer sb = new StringBuffer(); HttpPost httpPost = new HttpPost(url); List valuePairs = new ArrayList<>(); - if(null != data) { - for (String key : data.keySet()) { - valuePairs.addAll((Collection) new BasicNameValuePair(key, data.get(key))); + + // Ensure 'data' is not null + if (data != null) { + // Iterate through the map entries + for (Map.Entry entry : data.entrySet()) { + // Create a NameValuePair and add it to the list + valuePairs.add(new BasicNameValuePair(entry.getKey(), entry.getValue())); } } + try { - httpPost.setEntity(new UrlEncodedFormEntity(valuePairs)); + // Set the entity of the HttpPost with UrlEncodedFormEntity + httpPost.setEntity(new UrlEncodedFormEntity(valuePairs, "UTF-8")); HttpResponse response = httpClient.execute(httpPost); HttpEntity httpEntity = response.getEntity(); BufferedInputStream bis = new BufferedInputStream(httpEntity.getContent()); - byte [] buffer; - while (0 dragAndDrop(@PathVariable("id") Long id,@PathVariable("toId") Long toId,@PathVariable("sort")Long sort) { + service.dragAndDrop(id, toId, sort); + return new Result<>(); + } + } \ No newline at end of file diff --git a/modules/thing/src/main/java/com/thing/thing/dict/service/IotThingDictService.java b/modules/thing/src/main/java/com/thing/thing/dict/service/IotThingDictService.java index 059833e..34ecf94 100644 --- a/modules/thing/src/main/java/com/thing/thing/dict/service/IotThingDictService.java +++ b/modules/thing/src/main/java/com/thing/thing/dict/service/IotThingDictService.java @@ -57,4 +57,6 @@ public interface IotThingDictService extends IBaseService { List> type(); + void dragAndDrop(Long id,Long toId,Long sort); + } \ No newline at end of file diff --git a/modules/thing/src/main/java/com/thing/thing/dict/service/impl/IotThingDictServiceImpl.java b/modules/thing/src/main/java/com/thing/thing/dict/service/impl/IotThingDictServiceImpl.java index cc1f2b7..0e0355e 100644 --- a/modules/thing/src/main/java/com/thing/thing/dict/service/impl/IotThingDictServiceImpl.java +++ b/modules/thing/src/main/java/com/thing/thing/dict/service/impl/IotThingDictServiceImpl.java @@ -3,11 +3,14 @@ package com.thing.thing.dict.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.ObjectUtil; +import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.mybatisflex.core.constant.SqlConsts; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.query.QueryCondition; import com.mybatisflex.core.query.QueryWrapper; +import com.mybatisflex.core.row.Db; +import com.mybatisflex.core.update.UpdateChain; import com.thing.common.core.enumeration.DictTypeEnum; import com.thing.common.core.enumeration.IsDefaultEnum; import com.thing.common.core.exception.SysException; @@ -384,4 +387,63 @@ public class IotThingDictServiceImpl extends BaseServiceImpl noDefaultList = mapper.selectListByQuery(QueryWrapper.create().eq(IotThingDictEntity::getTenantCode, UserContext.getRealTenantCode()) + .eq(IotThingDictEntity::getIsDefault, 1)); + + //自定义字典列表 + List defaultList = mapper.selectListByQuery(QueryWrapper.create() + .eq(IotThingDictEntity::getIsDefault, 0)); + List iotThingDictEntities = Lists.newArrayList(); + iotThingDictEntities.addAll(noDefaultList); + iotThingDictEntities.addAll(defaultList); + //若是大于当前目前序号，则更新当前序号之前的排序 + AtomicLong aLong = new AtomicLong(0); + if(toDictEntity.getSort()<=sort){ + iotThingDictEntities.stream().filter(s -> s.getSort() < sort) + .sorted(Comparator.comparing(IotThingDictEntity::getSort)) + .forEach(s -> { + s.setSort(aLong.incrementAndGet()); + mapper.update(s); + }); + iotThingDictEntity.setSort(aLong.incrementAndGet()); + mapper.update(iotThingDictEntity); + iotThingDictEntities.stream() + .sorted(Comparator.comparing(IotThingDictEntity::getSort)) + .filter(s -> s.getSort() >= sort).forEach(s -> { + s.setSort(aLong.incrementAndGet()); + mapper.update(s); + }); + }else{ + iotThingDictEntities.stream().filter(s -> s.getSort() >= sort) + .sorted(Comparator.comparing(IotThingDictEntity::getSort)) + .forEach(s -> { + s.setSort(aLong.incrementAndGet()); + mapper.update(s); + }); + iotThingDictEntity.setSort(aLong.incrementAndGet()); + iotThingDictEntities.stream().filter(s -> s.getSort() > sort) + .sorted(Comparator.comparing(IotThingDictEntity::getSort)) + .forEach(s -> { + s.setSort(aLong.incrementAndGet()); + mapper.update(s); + }); + } + +// Db.executeBatch(iotThingDictEntities.size(), 1000, IotThingDictMapper.class, (mapper, index) -> { +// IotThingDictEntity account = iotThingDictEntities.get(index); +// UpdateChain.of(account).update(); +// }); + + // iotThingDictEntities.forEach(s -> mapper.update(s)); +// +// int i = Db.updateEntitiesBatch(iotThingDictEntities, 1000); +// System.out.println(i); + } + } \ No newline at end of file diff --git a/modules/thing/src/main/java/com/thing/thing/group/service/impl/IotGroupInfoServiceImpl.java b/modules/thing/src/main/java/com/thing/thing/group/service/impl/IotGroupInfoServiceImpl.java index a20df93..ee44a7f 100644 --- a/modules/thing/src/main/java/com/thing/thing/group/service/impl/IotGroupInfoServiceImpl.java +++ b/modules/thing/src/main/java/com/thing/thing/group/service/impl/IotGroupInfoServiceImpl.java @@ -440,13 +440,6 @@ public class IotGroupInfoServiceImpl extends BaseServiceImpl thingDictEntities = dictService.findAllByGroupId(id); - List groupRelationEntities = groupRelationService.findAllByGroupId(id); - if (/*(CollectionUtil.isNotEmpty(thingDictEntities) ||*/ CollectionUtil.isNotEmpty(groupRelationEntities)) - /*&& !StringUtils.equals(groupInfoEntity.getType(), dto.getType()))*/ { - throw new SysException("当前组关联了字典或者物实体,不能修改组类型"); - } if (!UserContext.isAdmin() && ObjectUtil.equals(groupInfoEntity.getIsDefault(), IsDefaultEnum.Y.getValue())) { throw new SysException("暂无修改系统默认组的权限"); } diff --git a/modules/thing/src/main/java/com/thing/thing/model/controller/IotThingModelController.java b/modules/thing/src/main/java/com/thing/thing/model/controller/IotThingModelController.java index 7e37cb8..9819187 100644 --- a/modules/thing/src/main/java/com/thing/thing/model/controller/IotThingModelController.java +++ b/modules/thing/src/main/java/com/thing/thing/model/controller/IotThingModelController.java @@ -143,6 +143,16 @@ public class IotThingModelController { return new Result>().ok(service.latestData(entityCode,attrs,startTime,endTime,page,limit)); } + @GetMapping("latestList") + @Operation(summary="获取code在时序数据库中的时序属性") + @Parameters({ + @Parameter(name = "entityCode",description ="物编码"), + @Parameter(name = "attrs",description ="属性编码集合") + }) + public Result> latestList(String entityCode,String attrs) { + return new Result>().ok(service.latestList(entityCode,attrs)); + } + @GetMapping("getSequenceAttr") @Operation(summary="获取code在时序数据库中的时序属性") @Parameters({ diff --git a/modules/thing/src/main/java/com/thing/thing/model/service/IotThingModelService.java b/modules/thing/src/main/java/com/thing/thing/model/service/IotThingModelService.java index 91f9f2e..6197538 100644 --- a/modules/thing/src/main/java/com/thing/thing/model/service/IotThingModelService.java +++ b/modules/thing/src/main/java/com/thing/thing/model/service/IotThingModelService.java @@ -41,6 +41,8 @@ public interface IotThingModelService extends IBaseService PageData latestData(String entityCode, String attrs, Long startTime, Long endTime,Integer page,Integer limit); + List latestList(String entityCode, String attrs); + void saveSequenceAttr(List tsKvDTOS); void deleteSequenceAttr(List tsKvDTOS); diff --git a/modules/thing/src/main/java/com/thing/thing/model/service/impl/IotThingModelServiceImpl.java b/modules/thing/src/main/java/com/thing/thing/model/service/impl/IotThingModelServiceImpl.java index cddcbc3..d065851 100644 --- a/modules/thing/src/main/java/com/thing/thing/model/service/impl/IotThingModelServiceImpl.java +++ b/modules/thing/src/main/java/com/thing/thing/model/service/impl/IotThingModelServiceImpl.java @@ -265,6 +265,20 @@ public class IotThingModelServiceImpl extends BaseServiceImpl latestList(String entityCode, String attrs) { + Optional optional = findByCode(entityCode); + if (optional.isEmpty()) { + return null; + } + //获取时序属性 + List attrList = Lists.newArrayList(); + if (StringUtils.isNotBlank(attrs)) { + attrList.addAll(Arrays.stream(attrs.split(",")).distinct().toList()); + } + return tsKvService.findLatestByCodeAndAttrs(entityCode, attrList, false); + } + @Override public void saveSequenceAttr(List tsKvDTOS) {