diff --git a/src/main/java/cn/lihongjie/coal/coalParameterDef/controller/CoalParameterDefController.java b/src/main/java/cn/lihongjie/coal/coalParameterDef/controller/CoalParameterDefController.java index a2183a20..41a70901 100644 --- a/src/main/java/cn/lihongjie/coal/coalParameterDef/controller/CoalParameterDefController.java +++ b/src/main/java/cn/lihongjie/coal/coalParameterDef/controller/CoalParameterDefController.java @@ -1,6 +1,7 @@ package cn.lihongjie.coal.coalParameterDef.controller; import cn.lihongjie.coal.annotation.Anonymous; +import cn.lihongjie.coal.annotation.OrgScope; import cn.lihongjie.coal.annotation.SysLog; import cn.lihongjie.coal.base.controller.BaseController; import cn.lihongjie.coal.base.dto.CommonQuery; @@ -20,6 +21,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @SysLog(module = "煤参数配置") @Anonymous +@OrgScope public class CoalParameterDefController extends BaseController { @Autowired diff --git a/src/main/java/cn/lihongjie/coal/coalParameterDef/dto/CoalParameterDefDto.java b/src/main/java/cn/lihongjie/coal/coalParameterDef/dto/CoalParameterDefDto.java index ecb6ec3d..d57a0d8a 100644 --- a/src/main/java/cn/lihongjie/coal/coalParameterDef/dto/CoalParameterDefDto.java +++ b/src/main/java/cn/lihongjie/coal/coalParameterDef/dto/CoalParameterDefDto.java @@ -1,10 +1,10 @@ package cn.lihongjie.coal.coalParameterDef.dto; -import cn.lihongjie.coal.base.dto.CommonDto; +import cn.lihongjie.coal.base.dto.OrgCommonDto; import lombok.Data; @Data -public class CoalParameterDefDto extends CommonDto { +public class CoalParameterDefDto extends OrgCommonDto { diff --git a/src/main/java/cn/lihongjie/coal/coalParameterDef/dto/CreateCoalParameterDefDto.java b/src/main/java/cn/lihongjie/coal/coalParameterDef/dto/CreateCoalParameterDefDto.java index 0890a5e0..a30224bf 100644 --- a/src/main/java/cn/lihongjie/coal/coalParameterDef/dto/CreateCoalParameterDefDto.java +++ b/src/main/java/cn/lihongjie/coal/coalParameterDef/dto/CreateCoalParameterDefDto.java @@ -1,10 +1,10 @@ package cn.lihongjie.coal.coalParameterDef.dto; -import cn.lihongjie.coal.base.dto.CommonDto; +import cn.lihongjie.coal.base.dto.OrgCommonDto; import lombok.Data; @Data -public class CreateCoalParameterDefDto extends CommonDto { +public class CreateCoalParameterDefDto extends OrgCommonDto { } diff --git a/src/main/java/cn/lihongjie/coal/coalParameterDef/dto/UpdateCoalParameterDefDto.java b/src/main/java/cn/lihongjie/coal/coalParameterDef/dto/UpdateCoalParameterDefDto.java index e51fa2b7..801030d9 100644 --- a/src/main/java/cn/lihongjie/coal/coalParameterDef/dto/UpdateCoalParameterDefDto.java +++ b/src/main/java/cn/lihongjie/coal/coalParameterDef/dto/UpdateCoalParameterDefDto.java @@ -1,10 +1,10 @@ package cn.lihongjie.coal.coalParameterDef.dto; -import cn.lihongjie.coal.base.dto.CommonDto; +import cn.lihongjie.coal.base.dto.OrgCommonDto; import lombok.Data; @Data -public class UpdateCoalParameterDefDto extends CommonDto { +public class UpdateCoalParameterDefDto extends OrgCommonDto { diff --git a/src/main/java/cn/lihongjie/coal/coalParameterDef/entity/CoalParameterDefEntity.java b/src/main/java/cn/lihongjie/coal/coalParameterDef/entity/CoalParameterDefEntity.java index 678a7baa..e5052015 100644 --- a/src/main/java/cn/lihongjie/coal/coalParameterDef/entity/CoalParameterDefEntity.java +++ b/src/main/java/cn/lihongjie/coal/coalParameterDef/entity/CoalParameterDefEntity.java @@ -1,12 +1,12 @@ package cn.lihongjie.coal.coalParameterDef.entity; -import cn.lihongjie.coal.base.entity.CommonEntity; +import cn.lihongjie.coal.base.entity.OrgCommonEntity; import jakarta.persistence.Entity; import lombok.Data; @Entity @Data -public class CoalParameterDefEntity extends CommonEntity { +public class CoalParameterDefEntity extends OrgCommonEntity { diff --git a/src/main/java/cn/lihongjie/coal/coalParameterDef/repository/CoalParameterDefRepository.java b/src/main/java/cn/lihongjie/coal/coalParameterDef/repository/CoalParameterDefRepository.java index a20ce1e3..44174164 100644 --- a/src/main/java/cn/lihongjie/coal/coalParameterDef/repository/CoalParameterDefRepository.java +++ b/src/main/java/cn/lihongjie/coal/coalParameterDef/repository/CoalParameterDefRepository.java @@ -6,4 +6,5 @@ import org.springframework.stereotype.Repository; @Repository public interface CoalParameterDefRepository extends BaseRepository { + long countByOrganizationId(String organizationId); } \ No newline at end of file diff --git a/src/main/java/cn/lihongjie/coal/coalParameterDef/service/CoalParameterDefService.java b/src/main/java/cn/lihongjie/coal/coalParameterDef/service/CoalParameterDefService.java index fdb6cc54..a8e3e8e3 100644 --- a/src/main/java/cn/lihongjie/coal/coalParameterDef/service/CoalParameterDefService.java +++ b/src/main/java/cn/lihongjie/coal/coalParameterDef/service/CoalParameterDefService.java @@ -9,6 +9,7 @@ import cn.lihongjie.coal.coalParameterDef.dto.UpdateCoalParameterDefDto; import cn.lihongjie.coal.coalParameterDef.entity.CoalParameterDefEntity; import cn.lihongjie.coal.coalParameterDef.mapper.CoalParameterDefMapper; import cn.lihongjie.coal.coalParameterDef.repository.CoalParameterDefRepository; +import cn.lihongjie.coal.organization.service.OrganizationService; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; @@ -94,10 +95,19 @@ public class CoalParameterDefService extends BaseService initDefault(organizationEntity.getId())); + + } + + @SneakyThrows + public void initDefault(String orgId) { + + if (repository.countByOrganizationId(orgId) == 0) { ClassPathResource classPathResource = new ClassPathResource("/config/CoalParameterDef.json"); @@ -109,6 +119,7 @@ public class CoalParameterDefService extends BaseService>() { }); + coalParameterDefs.forEach(x -> x.setOrganizationId(orgId)); this.repository.saveAll(coalParameterDefs); }