Merge branch 'master' of 192.168.60.201:root/dsk-operate-sys

# Conflicts:
#	dsk-admin/src/main/java/com/dsk/web/controller/search/service/BusinessOpportunityRadarService.java
关键词

dsk-admin/src/main/java/com/dsk/web/controller/search/controller/BusinessOpportunityRadarController.java

@@ -82,4 +82,12 @@ public class BusinessOpportunityRadarController {
     public AjaxResult getCapitalSourceSelect() {
         return opportunityRadarService.getCapitalSourceSelect();
     }
+
+    /*
+     * 投标计划查询
+     */
+    @RequestMapping("/keywordList")
+    public AjaxResult keywordList() {
+        return opportunityRadarService.keywordList();
+    }
 }

dsk-admin/src/main/java/com/dsk/web/controller/search/service/BusinessOpportunityRadarService.java

@@ -30,4 +30,6 @@ public interface BusinessOpportunityRadarService {
 
     AjaxResult getCapitalSourceSelect();
 
+    AjaxResult keywordList();
+
 }

dsk-admin/src/main/java/com/dsk/web/controller/search/service/impl/BusinessOpportunityRadarServiceImpl.java

@@ -88,4 +88,10 @@ public class BusinessOpportunityRadarServiceImpl implements BusinessOpportunityR
         Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBidPlan/getCapitalSourceSelect", null);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
+
+    @Override
+    public AjaxResult keywordList() {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/project/keywordList", null);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
 }