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

@@ -84,10 +84,18 @@ public class BusinessOpportunityRadarController {
     }
 
     /*
-     * 投标计划查询
+     * 推荐关键词
      */
     @RequestMapping("/keywordList")
     public AjaxResult keywordList() {
         return opportunityRadarService.keywordList();
     }
+
+    /*
+     * 招标来源网站
+     */
+    @RequestMapping("/bidSourceList")
+    public AjaxResult bidSourceList(@RequestBody ComposeQueryDto compose) {
+        return opportunityRadarService.bidSourceList(compose);
+    }
 }

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

@@ -32,4 +32,6 @@ public interface BusinessOpportunityRadarService {
 
     AjaxResult keywordList();
 
+    AjaxResult bidSourceList(ComposeQueryDto compose);
+
 }

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

@@ -94,4 +94,10 @@ public class BusinessOpportunityRadarServiceImpl implements BusinessOpportunityR
         Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/project/keywordList", null);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
+
+    @Override
+    public AjaxResult bidSourceList(ComposeQueryDto compose) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBid/source", BeanUtil.beanToMap(compose, false, false));
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
 }