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/CompanySearchController.java

@@ -3,15 +3,13 @@ package com.dsk.web.controller.search.controller;
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.dtos.ComposeQueryDto;
 import com.dsk.web.controller.search.service.BusinessOpportunityRadarService;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 
 
 /**
- * 模糊查企业
+ * 查企业
  * @author Administrator
  *
  */
@@ -24,11 +22,18 @@ public class CompanySearchController {
     BusinessOpportunityRadarService opportunityRadarService;
 
     /*
-     * 土地交易
+     * 模糊查询企业名称
      */
     @RequestMapping("/index")
     public AjaxResult landMarketPage(@RequestBody ComposeQueryDto compose) {
         return opportunityRadarService.enterprisePage(compose);
     }
 
+    /*
+     * 完全匹配企业名称
+     */
+    @GetMapping("/findByName/{keyword}")
+    public AjaxResult findByName(@PathVariable String keyword) {
+        return opportunityRadarService.enterpriseByName(keyword);
+    }
 }

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

@@ -20,7 +20,7 @@ public interface BusinessOpportunityRadarService {
 
     AjaxResult enterprisePage(ComposeQueryDto compose);
 
-    AjaxResult enterpriseByName(ComposeQueryDto compose);
+    AjaxResult enterpriseByName(String keyword);
 
     AjaxResult bondProjectPage(ComposeQueryDto compose);
 

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

@@ -10,6 +10,7 @@ import com.dsk.web.controller.search.service.MarketAnalysisService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -51,13 +52,15 @@ public class BusinessOpportunityRadarServiceImpl implements BusinessOpportunityR
 
     @Override
     public AjaxResult enterprisePage(ComposeQueryDto compose) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/enterprice/index", BeanUtil.beanToMap(compose, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/index", BeanUtil.beanToMap(compose, false, false));
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
     @Override
-    public AjaxResult enterpriseByName(ComposeQueryDto compose){
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/enterprice/findByName", BeanUtil.beanToMap(compose, false, false));
+    public AjaxResult enterpriseByName(String keyword){
+        Map<String,Object> params = new HashMap<>();
+        params.put("keyword",keyword);
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/findByName", params);
         return BeanUtil.toBean(map, AjaxResult.class);
     }