diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/constant/CommonConstant.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/constant/CommonConstant.java index af51034..d2e4adc 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/constant/CommonConstant.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/constant/CommonConstant.java @@ -116,4 +116,17 @@ public class CommonConstant { Tuples.of("4", "民办院校") ))); + /** + * 产业列表 + */ + public static final List> SECTOR_LIST = + Collections.unmodifiableList(new ArrayList<>(Arrays.asList( + Tuples.of("1", "新材料"), + Tuples.of("2", "新能源"), + Tuples.of("3", "现代服务业"), + Tuples.of("4", "先进服务"), + Tuples.of("5", "数字经济"), + Tuples.of("6", "农业") + ))); + } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/AnalysisCommonController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/AnalysisCommonController.java index 24fc6b4..3d484c4 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/AnalysisCommonController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/AnalysisCommonController.java @@ -63,4 +63,15 @@ public class AnalysisCommonController { public AjaxResult majorIndustryList() { return AjaxResult.success(analysisCommonService.majorIndustryList()); } + + /** + * 查询产业列表 + * + * @return 产业列表 + */ + @GetMapping("/sectorList") +// @Log(title = "根据枚举名称查询枚举的所有值", businessType = BusinessType.QUERY) + public AjaxResult sectorList() { + return AjaxResult.success(analysisCommonService.sectorList()); + } } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/AnalysisCommonService.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/AnalysisCommonService.java index c4e8bf9..330cd89 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/AnalysisCommonService.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/AnalysisCommonService.java @@ -40,4 +40,11 @@ public interface AnalysisCommonService { * @return 重点行业列表 */ List majorIndustryList(); + + /** + * 查询产业列表 + * + * @return 产业列表 + */ + List sectorList(); } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AnalysisCommonServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AnalysisCommonServiceImpl.java index 693eedc..bf4e9cf 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AnalysisCommonServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AnalysisCommonServiceImpl.java @@ -62,4 +62,14 @@ public class AnalysisCommonServiceImpl implements AnalysisCommonService { return list; } + + @Override + public List sectorList() { + List list = new ArrayList<>(); + for (Tuple2 industry : CommonConstant.SECTOR_LIST) { + list.add(DictVo.builder().code(industry.getT1()).desc(industry.getT2()).build()); + } + + return list; + } } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AnalysisSectorTalentServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AnalysisSectorTalentServiceImpl.java index bdd48c2..be464ed 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AnalysisSectorTalentServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AnalysisSectorTalentServiceImpl.java @@ -79,8 +79,7 @@ public class AnalysisSectorTalentServiceImpl implements AnalysisSectorTalentServ @Override public List talentDemandStructure(QueryParamDto dto) { List list = new ArrayList<>(); - - for (Tuple2 industry : CommonConstant.INDUSTRY_LIST) { + for (Tuple2 industry : CommonConstant.SECTOR_LIST) { list.add(QueryResultVo.builder() .code(industry.getT1()) .desc(industry.getT2()) @@ -137,7 +136,7 @@ public class AnalysisSectorTalentServiceImpl implements AnalysisSectorTalentServ @Override public List talentSupplyDemandMatchingDegree(QueryParamDto dto) { List list = new ArrayList<>(); - for (Tuple2 industry : CommonConstant.MAJOR_INDUSTRY_LIST) { + for (Tuple2 industry : CommonConstant.SECTOR_LIST) { list.add(QueryResultVo.builder() .code(industry.getT1()) .desc(industry.getT2())