From f24c08de6e0b3ff0ab17047653e2fea46381b225 Mon Sep 17 00:00:00 2001 From: luotaiqian <1147642922@qq.com> Date: Tue, 14 Jul 2026 10:34:35 +0800 Subject: [PATCH] version --- .../safetyeval/adapter/config/GbsUserSyncInterceptor.java | 4 +++- .../adapter/web/BasicDisciplineMajorController.java | 2 +- .../web/OrgBusinessScopeDeviceRefController.java | 6 +++--- .../client/major/response/BasicDisciplineMajorCo.java | 2 +- .../org/qinan/safetyeval/domain/constant/IndustryEnum.java | 2 ++ 5 files changed, 10 insertions(+), 6 deletions(-) rename safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/{controller => }/web/OrgBusinessScopeDeviceRefController.java (94%) diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/config/GbsUserSyncInterceptor.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/config/GbsUserSyncInterceptor.java index 4cae586..9b34257 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/config/GbsUserSyncInterceptor.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/config/GbsUserSyncInterceptor.java @@ -33,7 +33,9 @@ public class GbsUserSyncInterceptor implements WebMvcConfigurer { "/safetyEval-h5/**", "/**/images/**", "/**/file/**", - "/**/tree/**" + "/**/tree/**", + "/**/safety-eval/**", + "/**/safetyEval/**" }; @Override diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/BasicDisciplineMajorController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/BasicDisciplineMajorController.java index b04008a..18b9c02 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/BasicDisciplineMajorController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/BasicDisciplineMajorController.java @@ -32,7 +32,7 @@ public class BasicDisciplineMajorController implements Serializable { private final BasicDisciplineMajorServiceI basicDisciplineMajorServiceI; @GetMapping - @ApiOperation("查询基础学科专业列表-分页") + @ApiOperation("v1.0.1_查询基础学科专业列表-分页") public PageResponse list(@Validated BasicDisciplineMajorPageQry qry) { return basicDisciplineMajorServiceI.listBasicDisciplineMajorPage(qry); } diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/controller/web/OrgBusinessScopeDeviceRefController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgBusinessScopeDeviceRefController.java similarity index 94% rename from safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/controller/web/OrgBusinessScopeDeviceRefController.java rename to safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgBusinessScopeDeviceRefController.java index 4752596..790fa20 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/controller/web/OrgBusinessScopeDeviceRefController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgBusinessScopeDeviceRefController.java @@ -1,4 +1,4 @@ -package org.qinan.safetyeval.adapter.controller.web; +package org.qinan.safetyeval.adapter.web; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.Response; @@ -25,14 +25,14 @@ import java.io.Serializable; @RestController @AllArgsConstructor @Api(tags = "安全评价机构业务范围与设备参照") -@RequestMapping("/ref") +@RequestMapping("/safetyEval/org-business-scope-device-ref") public class OrgBusinessScopeDeviceRefController implements Serializable { private static final long serialVersionUID = 1L; private final OrgBusinessScopeDeviceRefServiceI orgBusinessScopeDeviceRefServiceI; @GetMapping - @ApiOperation("查询安全评价机构业务范围与设备参照列表-分页") + @ApiOperation("v1.0.1_查询安全评价机构业务范围与设备参照列表-分页") public PageResponse list(@Validated OrgBusinessScopeDeviceRefPageQry qry) { return orgBusinessScopeDeviceRefServiceI.listOrgBusinessScopeDeviceRefPage(qry); } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/major/response/BasicDisciplineMajorCo.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/major/response/BasicDisciplineMajorCo.java index 671bcfa..6019ac5 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/major/response/BasicDisciplineMajorCo.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/major/response/BasicDisciplineMajorCo.java @@ -25,7 +25,7 @@ public class BasicDisciplineMajorCo extends ClientObject { ("FIREWORKS_FIRECRACKERS", "烟花爆竹制造业"), ("METAL_SMELTING", "金属冶炼"), ; */ - @ApiModelProperty(value = "行业code 看 IndustryEnum),;") + @ApiModelProperty(value = "行业code 看 IndustryEnum);") private String industryCode; /** * 专业能力 code 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 4093dd5..82e4ba3 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 @@ -16,6 +16,8 @@ public enum IndustryEnum { 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:金属冶炼"; IndustryEnum(String code, String value) { this.code = code;