From bab04be9f744772638f4e6e12a83b8f1054c70a6 Mon Sep 17 00:00:00 2001 From: luotaiqian <1147642922@qq.com> Date: Tue, 14 Jul 2026 18:16:02 +0800 Subject: [PATCH] basic --- ...industry_professional_standards_insert.sql | 65 +++++++++++++++++++ ...dustryProfessionalStandardsController.java | 2 +- ...stryProfessionalStandardsCmdConvertor.java | 2 +- ...ndustryProfessionalStandardsAddCmdExe.java | 2 +- ...ndustryProfessionalStandardsDelCmdExe.java | 2 +- ...stryProfessionalStandardsUpdateCmdExe.java | 2 +- ...stryProfessionalStandardsListQueryExe.java | 2 +- ...stryProfessionalStandardsPageQueryExe.java | 2 +- ...IndustryProfessionalStandardsServiceI.java | 2 +- ...ustryProfessionalStandardsServiceImpl.java | 2 +- .../IndustryProfessionalStandardsAddCmd.java | 9 ++- .../IndustryProfessionalStandardsPageQry.java | 7 +- ...ndustryProfessionalStandardsUpdateCmd.java | 8 ++- .../IndustryProfessionalStandardsCo.java | 7 +- .../domain/constant/IndustryEnum.java | 5 +- .../constant/ProfessionalCapabilityEnum.java | 4 +- .../IndustryProfessionalStandardsAbility.java | 2 +- .../model/IndustryProfessionalStandardsE.java | 6 +- ...ustryProfessionalStandardsDoConvertor.java | 2 +- ...ustryProfessionalStandardsGatewayImpl.java | 2 +- .../IndustryProfessionalStandardsDO.java | 6 +- .../IndustryProfessionalStandardsMapper.java | 2 +- ...stryProfessionalStandardsQueryService.java | 2 +- ...ProfessionalStandardsQueryServiceImpl.java | 2 +- ...dustryProfessionalStandardsRepository.java | 2 +- ...ryProfessionalStandardsRepositoryImpl.java | 5 +- .../IndustryProfessionalStandardsMapper.xml | 2 + 27 files changed, 130 insertions(+), 26 deletions(-) create mode 100644 docs/sql/industry_professional_standards_insert.sql diff --git a/docs/sql/industry_professional_standards_insert.sql b/docs/sql/industry_professional_standards_insert.sql new file mode 100644 index 0000000..d7f8b2c --- /dev/null +++ b/docs/sql/industry_professional_standards_insert.sql @@ -0,0 +1,65 @@ +-- 安全评价机构业务范围与专业能力配备标准 数据初始化 +-- 行业code参照 IndustryEnum 枚举，专业能力code参照 ProfessionalCapabilityEnum 枚举 +-- 专业能力配备标准拆解为单条记录，每条记录对应一个专业能力及人员数量要求 + +INSERT INTO `industry_professional_standards` +(`id`, `industry_code`, `professional_capability_code`, `professional_capability_name`, `person_num`, `delete_enum`, `tenant_id`, `version`, `create_time`, `update_time`, `env`) +VALUES +-- ========== 煤炭开采业 (COAL_MINING) ========== +(1, 'COAL_MINING', 'SAFETY', '安全', 1, 'false', NULL, 0, NOW(), NOW(), NULL), +(2, 'COAL_MINING', 'MECHANICAL', '机械', 1, 'false', NULL, 0, NOW(), NOW(), NULL), +(3, 'COAL_MINING', 'ELECTRICAL', '电气', 1, 'false', NULL, 0, NOW(), NOW(), NULL), +(4, 'COAL_MINING', 'MINING', '采矿', 1, 'false', NULL, 0, NOW(), NOW(), NULL), +(5, 'COAL_MINING', 'VENTILATION', '通风', 1, 'false', NULL, 0, NOW(), NOW(), NULL), +(6, 'COAL_MINING', 'GEOLOGY', '地质', 1, 'false', NULL, 0, NOW(), NOW(), NULL), +(7, 'COAL_MINING', 'MINE_CONSTRUCTION', '矿建', 1, 'false', NULL, 0, NOW(), NOW(), NULL), + +-- ========== 金属、非金属矿及其他矿采选业 (METAL_NONMETAL_MINING) ========== +(8, 'METAL_NONMETAL_MINING', 'SAFETY', '安全', 1, 'false', NULL, 0, NOW(), NOW(), NULL), +(9, 'METAL_NONMETAL_MINING', 'MECHANICAL', '机械', 1, 'false', NULL, 0, NOW(), NOW(), NULL), +(10, 'METAL_NONMETAL_MINING', 'ELECTRICAL', '电气', 1, 'false', NULL, 0, NOW(), NOW(), NULL), +(11, 'METAL_NONMETAL_MINING', 'MINING', '采矿', 1, 'false', NULL, 0, NOW(), NOW(), NULL), +(12, 'METAL_NONMETAL_MINING', 'VENTILATION', '通风', 1, 'false', NULL, 0, NOW(), NOW(), NULL), +(13, 'METAL_NONMETAL_MINING', 'GEOLOGY', '地质', 1, 'false', NULL, 0, NOW(), NOW(), NULL), +(14, 'METAL_NONMETAL_MINING', 'HYDRAULIC_STRUCTURE', '水工结构', 1, 'false', NULL, 0, NOW(), NOW(), NULL), + +-- ========== 陆地石油和天然气开采业 (ONSHORE_OIL_GAS) ========== +(15, 'ONSHORE_OIL_GAS', 'SAFETY', '安全', 1, 'false', NULL, 0, NOW(), NOW(), NULL), +(16, 'ONSHORE_OIL_GAS', 'MECHANICAL', '机械', 1, 'false', NULL, 0, NOW(), NOW(), NULL), +(17, 'ONSHORE_OIL_GAS', 'ELECTRICAL', '电气', 1, 'false', NULL, 0, NOW(), NOW(), NULL), +(18, 'ONSHORE_OIL_GAS', 'OIL_PRODUCTION', '采油', 1, 'false', NULL, 0, NOW(), NOW(), NULL), +(19, 'ONSHORE_OIL_GAS', 'STORAGE_AND_TRANSPORT', '储运', 1, 'false', NULL, 0, NOW(), NOW(), NULL), + +-- ========== 陆上油气管道运输业 (ONSHORE_OIL_GAS_PIPELINE) ========== +(20, 'ONSHORE_OIL_GAS_PIPELINE', 'OIL_GAS_STORAGE_TRANSPORT', '油气储运', 2, 'false', NULL, 0, NOW(), NOW(), NULL), +(21, 'ONSHORE_OIL_GAS_PIPELINE', 'EQUIPMENT', '设备', 1, 'false', NULL, 0, NOW(), NOW(), NULL), +(22, 'ONSHORE_OIL_GAS_PIPELINE', 'INSTRUMENT', '仪表', 1, 'false', NULL, 0, NOW(), NOW(), NULL), +(23, 'ONSHORE_OIL_GAS_PIPELINE', 'ELECTRICAL', '电气', 1, 'false', NULL, 0, NOW(), NOW(), NULL), +(24, 'ONSHORE_OIL_GAS_PIPELINE', 'ANTICORROSION', '防腐', 1, 'false', NULL, 0, NOW(), NOW(), NULL), +(25, 'ONSHORE_OIL_GAS_PIPELINE', 'SAFETY', '安全', 1, 'false', NULL, 0, NOW(), NOW(), NULL), + +-- ========== 石油加工业，化学原料、化学品及医药制造业 (PETROCHEMICAL_CHEMICAL_PHARMACEUTICAL) ========== +(26, 'PETROCHEMICAL_CHEMICAL_PHARMACEUTICAL', 'CHEMICAL_PROCESS', '化工工艺', 2, 'false', NULL, 0, NOW(), NOW(), NULL), +(27, 'PETROCHEMICAL_CHEMICAL_PHARMACEUTICAL', 'CHEMICAL_MECHANICAL', '化工机械', 2, 'false', NULL, 0, NOW(), NOW(), NULL), +(28, 'PETROCHEMICAL_CHEMICAL_PHARMACEUTICAL', 'INSTRUMENT_AUTOMATION', '仪表自动化', 2, 'false', NULL, 0, NOW(), NOW(), NULL), +(29, 'PETROCHEMICAL_CHEMICAL_PHARMACEUTICAL', 'ELECTRICAL', '电气', 2, 'false', NULL, 0, NOW(), NOW(), NULL), +(30, 'PETROCHEMICAL_CHEMICAL_PHARMACEUTICAL', 'SAFETY', '安全', 2, 'false', NULL, 0, NOW(), NOW(), NULL), + +-- ========== 烟花爆竹制造业和仓储业 (FIREWORKS_FIRECRACKERS) ========== +(31, 'FIREWORKS_FIRECRACKERS', 'EXPLOSIVES', '火炸药（爆炸技术）', 1, 'false', NULL, 0, NOW(), NOW(), NULL), +(32, 'FIREWORKS_FIRECRACKERS', 'MECHANICAL', '机械', 1, 'false', NULL, 0, NOW(), NOW(), NULL), +(33, 'FIREWORKS_FIRECRACKERS', 'ELECTRICAL', '电气', 1, 'false', NULL, 0, NOW(), NOW(), NULL), +(34, 'FIREWORKS_FIRECRACKERS', 'SAFETY', '安全', 1, 'false', NULL, 0, NOW(), NOW(), NULL), + +-- ========== 金属冶炼 (METAL_SMELTING) ========== +(35, 'METAL_SMELTING', 'SAFETY', '安全', 1, 'false', NULL, 0, NOW(), NOW(), NULL), +(36, 'METAL_SMELTING', 'MECHANICAL', '机械', 1, 'false', NULL, 0, NOW(), NOW(), NULL), +(37, 'METAL_SMELTING', 'ELECTRICAL', '电气', 1, 'false', NULL, 0, NOW(), NOW(), NULL), +(38, 'METAL_SMELTING', 'METALLURGY', '冶金', 1, 'false', NULL, 0, NOW(), NOW(), NULL), +(39, 'METAL_SMELTING', 'NONFERROUS_METAL', '有色金属', 1, 'false', NULL, 0, NOW(), NOW(), NULL), + +-- ========== 民用爆炸物品行业 (CIVIL_EXPLOSIVES) ========== +(40, 'CIVIL_EXPLOSIVES', 'EXPLOSIVES', '火炸药（爆炸技术）', 10, 'false', NULL, 0, NOW(), NOW(), NULL), +(41, 'CIVIL_EXPLOSIVES', 'MECHANICAL', '机械', 2, 'false', NULL, 0, NOW(), NOW(), NULL), +(42, 'CIVIL_EXPLOSIVES', 'ELECTRICAL', '电气', 2, 'false', NULL, 0, NOW(), NOW(), NULL), +(43, 'CIVIL_EXPLOSIVES', 'SAFETY', '安全', 2, 'false', NULL, 0, NOW(), NOW(), NULL); diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/controller/web/IndustryProfessionalStandardsController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/controller/web/IndustryProfessionalStandardsController.java index 15354c6..48ea4d1 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/controller/web/IndustryProfessionalStandardsController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/controller/web/IndustryProfessionalStandardsController.java @@ -20,7 +20,7 @@ import java.io.Serializable; * 安全评价机构业务范围与专业能力配备标准 * * @Author: ltq - * @Date: 2026-07-14 18:05:26 + * @Date: 2026-07-14 18:07:00 */ @RestController @AllArgsConstructor diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/standards/convertor/IndustryProfessionalStandardsCmdConvertor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/standards/convertor/IndustryProfessionalStandardsCmdConvertor.java index 8f559e4..407fafa 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/standards/convertor/IndustryProfessionalStandardsCmdConvertor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/standards/convertor/IndustryProfessionalStandardsCmdConvertor.java @@ -10,7 +10,7 @@ import org.qinan.safetyeval.domain.standards.model.IndustryProfessionalStandards * 安全评价机构业务范围与专业能力配备标准转换 * * @Author: ltq - * @date 2026-07-14 18:05:26 + * @date 2026-07-14 18:07:00 */ @Mapper(componentModel = "spring") public interface IndustryProfessionalStandardsCmdConvertor { diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/standards/executor/command/IndustryProfessionalStandardsAddCmdExe.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/standards/executor/command/IndustryProfessionalStandardsAddCmdExe.java index 3e5f1d9..aab94c0 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/standards/executor/command/IndustryProfessionalStandardsAddCmdExe.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/standards/executor/command/IndustryProfessionalStandardsAddCmdExe.java @@ -14,7 +14,7 @@ import org.springframework.transaction.annotation.Transactional; * 新增安全评价机构业务范围与专业能力配备标准执行器 * * @author ltq - * @date 2026-07-14 18:05:26 + * @date 2026-07-14 18:07:00 */ @Component @AllArgsConstructor diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/standards/executor/command/IndustryProfessionalStandardsDelCmdExe.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/standards/executor/command/IndustryProfessionalStandardsDelCmdExe.java index cdf1665..10484a5 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/standards/executor/command/IndustryProfessionalStandardsDelCmdExe.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/standards/executor/command/IndustryProfessionalStandardsDelCmdExe.java @@ -11,7 +11,7 @@ import org.springframework.transaction.annotation.Transactional; * 删除安全评价机构业务范围与专业能力配备标准询执行器 * * @author ltq - * @date 2026-07-14 18:05:26 + * @date 2026-07-14 18:07:00 */ @Component @AllArgsConstructor diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/standards/executor/command/IndustryProfessionalStandardsUpdateCmdExe.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/standards/executor/command/IndustryProfessionalStandardsUpdateCmdExe.java index a563898..b7fe98a 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/standards/executor/command/IndustryProfessionalStandardsUpdateCmdExe.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/standards/executor/command/IndustryProfessionalStandardsUpdateCmdExe.java @@ -14,7 +14,7 @@ import org.springframework.transaction.annotation.Transactional; * 修改安全评价机构业务范围与专业能力配备标准资源执行器 * * @author ltq - * @date 2026-07-14 18:05:26 + * @date 2026-07-14 18:07:00 */ @Component @AllArgsConstructor diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/standards/executor/query/IndustryProfessionalStandardsListQueryExe.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/standards/executor/query/IndustryProfessionalStandardsListQueryExe.java index aa5ea45..d8092a0 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/standards/executor/query/IndustryProfessionalStandardsListQueryExe.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/standards/executor/query/IndustryProfessionalStandardsListQueryExe.java @@ -11,7 +11,7 @@ import org.springframework.stereotype.Component; * 安全评价机构业务范围与专业能力配备标准查询执行器 * * @author ltq - * @date 2026-07-14 18:05:26 + * @date 2026-07-14 18:07:00 */ @Component @AllArgsConstructor diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/standards/executor/query/IndustryProfessionalStandardsPageQueryExe.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/standards/executor/query/IndustryProfessionalStandardsPageQueryExe.java index 5a80729..5d00acc 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/standards/executor/query/IndustryProfessionalStandardsPageQueryExe.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/standards/executor/query/IndustryProfessionalStandardsPageQueryExe.java @@ -11,7 +11,7 @@ import org.springframework.stereotype.Component; * 安全评价机构业务范围与专业能力配备标准分页查询执行器 * * @author ltq - * @date 2026-07-14 18:05:26 + * @date 2026-07-14 18:07:00 */ @Component @AllArgsConstructor diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/standards/service/IndustryProfessionalStandardsServiceI.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/standards/service/IndustryProfessionalStandardsServiceI.java index d1809f8..df1912c 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/standards/service/IndustryProfessionalStandardsServiceI.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/standards/service/IndustryProfessionalStandardsServiceI.java @@ -10,7 +10,7 @@ import org.qinan.safetyeval.client.standards.response.IndustryProfessionalStanda * 安全评价机构业务范围与专业能力配备标准 * * @Author: ltq - * @date 2026-07-14 18:05:26 + * @date 2026-07-14 18:07:00 */ public interface IndustryProfessionalStandardsServiceI { /** diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/standards/service/impl/IndustryProfessionalStandardsServiceImpl.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/standards/service/impl/IndustryProfessionalStandardsServiceImpl.java index 881b607..5a17a1b 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/standards/service/impl/IndustryProfessionalStandardsServiceImpl.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/standards/service/impl/IndustryProfessionalStandardsServiceImpl.java @@ -18,7 +18,7 @@ import org.springframework.stereotype.Service; * 安全评价机构业务范围与专业能力配备标准 * * @Author: ltq - * @date 2026-07-14 18:05:26 + * @date 2026-07-14 18:07:00 */ @Service @AllArgsConstructor diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/standards/request/IndustryProfessionalStandardsAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/standards/request/IndustryProfessionalStandardsAddCmd.java index 8366015..7641565 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/standards/request/IndustryProfessionalStandardsAddCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/standards/request/IndustryProfessionalStandardsAddCmd.java @@ -4,13 +4,14 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.io.Serializable; /** * 安全评价机构业务范围与专业能力配备标准新增Cmd * * @Author: ltq - * @date 2026-07-14 18:05:26 + * @date 2026-07-14 18:07:00 */ @Data public class IndustryProfessionalStandardsAddCmd implements Serializable { @@ -33,6 +34,12 @@ public class IndustryProfessionalStandardsAddCmd implements Serializable { */ @ApiModelProperty(value = "专业能力名称") private String professionalCapabilityName; + /** + * 人员数量要求 + */ + @ApiModelProperty(value = "人员数量要求", required = true) + @NotNull(message = "人员数量要求不能为空") + private Long personNum; /** * 环境 */ diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/standards/request/IndustryProfessionalStandardsPageQry.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/standards/request/IndustryProfessionalStandardsPageQry.java index 49b4b54..8cf58f7 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/standards/request/IndustryProfessionalStandardsPageQry.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/standards/request/IndustryProfessionalStandardsPageQry.java @@ -8,7 +8,7 @@ import lombok.Data; * 安全评价机构业务范围与专业能力配备标准分页查询Qry * * @Author: ltq - * @date 2026-07-14 18:05:26 + * @date 2026-07-14 18:07:00 */ @Data public class IndustryProfessionalStandardsPageQry extends PageQuery { @@ -29,6 +29,11 @@ public class IndustryProfessionalStandardsPageQry extends PageQuery { */ @ApiModelProperty(value = "专业能力名称") private String professionalCapabilityName; + /** + * 人员数量要求 + */ + @ApiModelProperty(value = "人员数量要求") + private Long personNum; /** * 环境 */ diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/standards/request/IndustryProfessionalStandardsUpdateCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/standards/request/IndustryProfessionalStandardsUpdateCmd.java index 62308d7..63e301b 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/standards/request/IndustryProfessionalStandardsUpdateCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/standards/request/IndustryProfessionalStandardsUpdateCmd.java @@ -12,7 +12,7 @@ import java.io.Serializable; * 安全评价机构业务范围与专业能力配备标准修改Cmd * * @Author: ltq - * @date 2026-07-14 18:05:26 + * @date 2026-07-14 18:07:00 */ @Data public class IndustryProfessionalStandardsUpdateCmd implements Serializable { @@ -36,6 +36,12 @@ public class IndustryProfessionalStandardsUpdateCmd implements Serializable { */ @ApiModelProperty(value = "专业能力名称") private String professionalCapabilityName; + /** + * 人员数量要求 + */ + @ApiModelProperty(value = "人员数量要求", required = true) + @NotNull(message = "人员数量要求不能为空") + private Long personNum; /** * 环境 */ diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/standards/response/IndustryProfessionalStandardsCo.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/standards/response/IndustryProfessionalStandardsCo.java index 86e5b64..2a57166 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/standards/response/IndustryProfessionalStandardsCo.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/standards/response/IndustryProfessionalStandardsCo.java @@ -9,7 +9,7 @@ import lombok.Data; * 安全评价机构业务范围与专业能力配备标准Co * * @Author: ltq - * @date 2026-07-14 18:05:26 + * @date 2026-07-14 18:07:00 */ @Data public class IndustryProfessionalStandardsCo extends ClientObject { @@ -31,6 +31,11 @@ public class IndustryProfessionalStandardsCo extends ClientObject { */ @ApiModelProperty(value = "专业能力名称") private String professionalCapabilityName; + /** + * 人员数量要求 + */ + @ApiModelProperty(value = "人员数量要求") + private Long personNum; /** * 环境 */ diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/IndustryEnum.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/IndustryEnum.java index 82e4ba3..0964fe0 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/IndustryEnum.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/IndustryEnum.java @@ -10,14 +10,15 @@ public enum IndustryEnum { ONSHORE_OIL_GAS("ONSHORE_OIL_GAS", "陆地石油和天然气开采业"), ONSHORE_OIL_GAS_PIPELINE("ONSHORE_OIL_GAS_PIPELINE", "陆上油气管道运输业"), PETROCHEMICAL_CHEMICAL_PHARMACEUTICAL("PETROCHEMICAL_CHEMICAL_PHARMACEUTICAL", "石油加工业，化学原料、化学品及医药制造业"), - FIREWORKS_FIRECRACKERS("FIREWORKS_FIRECRACKERS", "烟花爆竹制造业"), + FIREWORKS_FIRECRACKERS("FIREWORKS_FIRECRACKERS", "烟花爆竹制造业和仓储业"), METAL_SMELTING("METAL_SMELTING", "金属冶炼"), + CIVIL_EXPLOSIVES("CIVIL_EXPLOSIVES", "民用爆炸物品行业"), ; private final String code; private final String value; public static final String REMARKS = "行业类型枚举=COAL_MINING:煤炭开采业,METAL_NONMETAL_MINING:金属、非金属矿及其他矿采选业" + - ",ONSHORE_OIL_GAS:陆地石油和天然气开采业,ONSHORE_OIL_GAS_PIPELINE:陆上油气管道运输业,PETROCHEMICAL_CHEMICAL_PHARMACEUTICAL:石油加工业，化学原料、化学品及医药制造业,FIREWORKS_FIRECRACKERS:烟花爆竹制造业,METAL_SMELTING:金属冶炼"; + ",ONSHORE_OIL_GAS:陆地石油和天然气开采业,ONSHORE_OIL_GAS_PIPELINE:陆上油气管道运输业,PETROCHEMICAL_CHEMICAL_PHARMACEUTICAL:石油加工业，化学原料、化学品及医药制造业,FIREWORKS_FIRECRACKERS:烟花爆竹制造业和仓储业,METAL_SMELTING:金属冶炼,CIVIL_EXPLOSIVES:民用爆炸物品行业"; IndustryEnum(String code, String value) { this.code = code; diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/ProfessionalCapabilityEnum.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/ProfessionalCapabilityEnum.java index 1a045ac..ee48ae8 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/ProfessionalCapabilityEnum.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/ProfessionalCapabilityEnum.java @@ -26,6 +26,8 @@ public enum ProfessionalCapabilityEnum { EXPLOSION_TECHNOLOGY("EXPLOSION_TECHNOLOGY", "爆炸技术"), METALLURGY("METALLURGY", "冶金"), NONFERROUS_METAL("NONFERROUS_METAL", "有色金属"), + EQUIPMENT("EQUIPMENT", "设备"), + INSTRUMENT("INSTRUMENT", "仪表"), ; private final String code; @@ -35,7 +37,7 @@ public enum ProfessionalCapabilityEnum { "MINE_CONSTRUCTION:矿建,GEOLOGY:地质,HYDRAULIC_STRUCTURE:水工结构,OIL_PRODUCTION:采油,STORAGE_AND_TRANSPORT:储运" + ",OIL_GAS_STORAGE_TRANSPORT:油气储运,PROCESS_EQUIPMENT_CONTROL:工艺设备与控制,AUTOMATION_INSTRUMENT:自动化(仪表)" + ",ANTICORROSION:防腐,CHEMICAL_PROCESS:化工工艺,CHEMICAL_MECHANICAL:化工机械,AUTOMATION:自动化,EXPLOSIVES:火炸药" + - ",EXPLOSION_TECHNOLOGY:爆炸技术,METALLURGY:冶金,NONFERROUS_METAL:有色金属"; + ",EXPLOSION_TECHNOLOGY:爆炸技术,METALLURGY:冶金,NONFERROUS_METAL:有色金属,EQUIPMENT:设备,INSTRUMENT:仪表"; ProfessionalCapabilityEnum(String code, String value) { this.code = code; diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/standards/ability/IndustryProfessionalStandardsAbility.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/standards/ability/IndustryProfessionalStandardsAbility.java index e8e3132..a113a11 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/standards/ability/IndustryProfessionalStandardsAbility.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/standards/ability/IndustryProfessionalStandardsAbility.java @@ -8,7 +8,7 @@ import org.springframework.stereotype.Service; * 安全评价机构业务范围与专业能力配备标准 * * @Author: ltq - * @date 2026-07-14 18:05:26 + * @date 2026-07-14 18:07:00 */ @Service @AllArgsConstructor diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/standards/model/IndustryProfessionalStandardsE.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/standards/model/IndustryProfessionalStandardsE.java index ee4948e..75a933a 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/standards/model/IndustryProfessionalStandardsE.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/standards/model/IndustryProfessionalStandardsE.java @@ -12,7 +12,7 @@ import org.qinan.safetyeval.domain.standards.gateway.IndustryProfessionalStandar * 安全评价机构业务范围与专业能力配备标准领域模型 * * @Author: ltq - * @date 2026-07-14 18:05:26 + * @date 2026-07-14 18:07:00 */ @Data @Entity @@ -32,6 +32,10 @@ public class IndustryProfessionalStandardsE extends BaseE { * 专业能力名称 */ private String professionalCapabilityName; + /** + * 人员数量要求 + */ + private Long personNum; /** * 环境 */ diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/convertor/IndustryProfessionalStandardsDoConvertor.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/convertor/IndustryProfessionalStandardsDoConvertor.java index b2fbe63..7c81c4a 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/convertor/IndustryProfessionalStandardsDoConvertor.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/convertor/IndustryProfessionalStandardsDoConvertor.java @@ -13,7 +13,7 @@ import java.util.List; * 安全评价机构业务范围与专业能力配备标准对象转换 * * @Author: ltq - * @date 2026-07-14 18:05:26 + * @date 2026-07-14 18:07:00 */ @Mapper(componentModel = "spring") public interface IndustryProfessionalStandardsDoConvertor { diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gateway/IndustryProfessionalStandardsGatewayImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gateway/IndustryProfessionalStandardsGatewayImpl.java index 158b547..6895bf3 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gateway/IndustryProfessionalStandardsGatewayImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gateway/IndustryProfessionalStandardsGatewayImpl.java @@ -12,7 +12,7 @@ import org.springframework.stereotype.Service; * 安全评价机构业务范围与专业能力配备标准网关实现 * * @Author: ltq - * @date 2026-07-14 18:05:26 + * @date 2026-07-14 18:07:00 */ @Service @AllArgsConstructor diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/IndustryProfessionalStandardsDO.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/IndustryProfessionalStandardsDO.java index e8cbffc..c837f1c 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/IndustryProfessionalStandardsDO.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/IndustryProfessionalStandardsDO.java @@ -9,7 +9,7 @@ import lombok.EqualsAndHashCode; * 安全评价机构业务范围与专业能力配备标准领域模型 * * @Author: ltq - * @date 2026-07-14 18:05:26 + * @date 2026-07-14 18:07:00 */ @Data @EqualsAndHashCode(callSuper = true) @@ -29,6 +29,10 @@ public class IndustryProfessionalStandardsDO extends BaseDO { * 专业能力名称 */ private String professionalCapabilityName; + /** + * 人员数量要求 + */ + private Long personNum; /** * 环境 */ diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/mapper/IndustryProfessionalStandardsMapper.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/mapper/IndustryProfessionalStandardsMapper.java index 0849ded..30b8f8e 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/mapper/IndustryProfessionalStandardsMapper.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/mapper/IndustryProfessionalStandardsMapper.java @@ -8,7 +8,7 @@ import org.qinan.safetyeval.infrastructure.persistence.domainobject.IndustryProf * 安全评价机构业务范围与专业能力配备标准Mapper * * @Author: ltq - * @date 2026-07-14 18:05:26 + * @date 2026-07-14 18:07:00 */ @Mapper public interface IndustryProfessionalStandardsMapper extends BaseMapper { diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/queryservice/IndustryProfessionalStandardsQueryService.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/queryservice/IndustryProfessionalStandardsQueryService.java index fecf81e..f44a5c1 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/queryservice/IndustryProfessionalStandardsQueryService.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/queryservice/IndustryProfessionalStandardsQueryService.java @@ -9,7 +9,7 @@ import org.qinan.safetyeval.infrastructure.persistence.domainobject.IndustryProf * 安全评价机构业务范围与专业能力配备标准 * * @Author: ltq - * @date 2026-07-14 18:05:26 + * @date 2026-07-14 18:07:00 */ public interface IndustryProfessionalStandardsQueryService { diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/queryservice/impl/IndustryProfessionalStandardsQueryServiceImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/queryservice/impl/IndustryProfessionalStandardsQueryServiceImpl.java index 8d03764..56e2aae 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/queryservice/impl/IndustryProfessionalStandardsQueryServiceImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/queryservice/impl/IndustryProfessionalStandardsQueryServiceImpl.java @@ -18,7 +18,7 @@ import java.util.List; * 安全评价机构业务范围与专业能力配备标准 * * @Author: ltq - * @date 2026-07-14 18:05:26 + * @date 2026-07-14 18:07:00 */ @Service @AllArgsConstructor diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/IndustryProfessionalStandardsRepository.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/IndustryProfessionalStandardsRepository.java index 400ea5e..1c371c8 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/IndustryProfessionalStandardsRepository.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/IndustryProfessionalStandardsRepository.java @@ -9,7 +9,7 @@ import org.qinan.safetyeval.infrastructure.persistence.domainobject.IndustryProf * 安全评价机构业务范围与专业能力配备标准 * * @Author: ltq - * @date 2026-07-14 18:05:26 + * @date 2026-07-14 18:07:00 */ public interface IndustryProfessionalStandardsRepository extends BaseRepository { /** diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/IndustryProfessionalStandardsRepositoryImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/IndustryProfessionalStandardsRepositoryImpl.java index f1efc60..25fd30d 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/IndustryProfessionalStandardsRepositoryImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/IndustryProfessionalStandardsRepositoryImpl.java @@ -18,7 +18,7 @@ import java.util.Arrays; * 安全评价机构业务范围与专业能力配备标准 * * @Author: ltq - * @date 2026-07-14 18:05:26 + * @date 2026-07-14 18:07:00 */ @Service @AllArgsConstructor @@ -43,6 +43,9 @@ public class IndustryProfessionalStandardsRepositoryImpl extends BaseRepositoryI if (ObjectUtil.isNotEmpty(industryProfessionalStandardsPageQry.getProfessionalCapabilityName())) { industryProfessionalStandardsDoQueryWrapper.like("professional_capability_name", industryProfessionalStandardsPageQry.getProfessionalCapabilityName()); } + if (ObjectUtil.isNotEmpty(industryProfessionalStandardsPageQry.getPersonNum())) { + industryProfessionalStandardsDoQueryWrapper.eq("person_num", industryProfessionalStandardsPageQry.getPersonNum()); + } if (ObjectUtil.isNotEmpty(industryProfessionalStandardsPageQry.getEnv())) { industryProfessionalStandardsDoQueryWrapper.eq("env", industryProfessionalStandardsPageQry.getEnv()); } diff --git a/safety-eval-infrastructure/src/main/resources/mapper/IndustryProfessionalStandardsMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/IndustryProfessionalStandardsMapper.xml index ee787ea..b4451a3 100644 --- a/safety-eval-infrastructure/src/main/resources/mapper/IndustryProfessionalStandardsMapper.xml +++ b/safety-eval-infrastructure/src/main/resources/mapper/IndustryProfessionalStandardsMapper.xml @@ -9,6 +9,7 @@ + @@ -28,6 +29,7 @@ industry_code, professional_capability_code, professional_capability_name, + person_num, delete_enum, remarks, create_name,