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

@@ -30,44 +30,48 @@ public class BusinessOpportunityRadarController {
      * 公招标讯
      */
     @RequestMapping("/jskBidPage")
-    public AjaxResult jskBidPage(@RequestBody ComposeQueryDto compose) {
+    public AjaxResult jskBidPage(@RequestBody JSONObject object) {
+        ComposeQueryDto compose = JSONObject.parseObject(object.toJSONString(), ComposeQueryDto.class);
         if (PageQueryLimit.pageLimit(compose.getPage())){
             return AjaxResult.error("翻页已达到上限");
         }
-        return opportunityRadarService.jskBidPage(compose);
+        return opportunityRadarService.jskBidPage(object);
     }
 
     /*
      * 土地交易
      */
     @RequestMapping("/landMarketPage")
-    public AjaxResult landMarketPage(@RequestBody ComposeQueryDto compose) {
+    public AjaxResult landMarketPage(@RequestBody JSONObject object) {
+        ComposeQueryDto compose = JSONObject.parseObject(object.toJSONString(), ComposeQueryDto.class);
         if (PageQueryLimit.pageLimit(compose.getPage())){
             return AjaxResult.error("翻页已达到上限");
         }
-        return opportunityRadarService.landMarketPage(compose);
+        return opportunityRadarService.landMarketPage(object);
     }
 
     /*
      * 拟建项目
      */
     @RequestMapping("/establishmentPage")
-    public AjaxResult establishmentPage(@RequestBody ComposeQueryDto compose) {
+    public AjaxResult establishmentPage(@RequestBody JSONObject object) {
+        ComposeQueryDto compose = JSONObject.parseObject(object.toJSONString(), ComposeQueryDto.class);
         if (PageQueryLimit.pageLimit(compose.getPage())){
             return AjaxResult.error("翻页已达到上限");
         }
-        return opportunityRadarService.establishmentPage(compose);
+        return opportunityRadarService.establishmentPage(object);
     }
 
     /*
      * 开标记录
      */
     @RequestMapping("/jskBidTenderPage")
-    public AjaxResult jskBidTenderPage(@RequestBody ComposeQueryDto compose) {
+    public AjaxResult jskBidTenderPage(@RequestBody JSONObject object) {
+        ComposeQueryDto compose = JSONObject.parseObject(object.toJSONString(), ComposeQueryDto.class);
         if (PageQueryLimit.pageLimit(compose.getPage())){
             return AjaxResult.error("翻页已达到上限");
         }
-        return opportunityRadarService.jskBidTenderPage(compose);
+        return opportunityRadarService.jskBidTenderPage(object);
     }
 
 
@@ -75,11 +79,12 @@ public class BusinessOpportunityRadarController {
      * 标讯pro
      */
     @RequestMapping("/jskBidNewsPage")
-    public AjaxResult jskBidNewsPage(@RequestBody ComposeQueryDto compose) {
+    public AjaxResult jskBidNewsPage(@RequestBody JSONObject object) {
+        ComposeQueryDto compose = JSONObject.parseObject(object.toJSONString(), ComposeQueryDto.class);
         if (PageQueryLimit.pageLimit(compose.getPage())){
             return AjaxResult.error("翻页已达到上限");
         }
-        return opportunityRadarService.jskBidNewsPage(compose);
+        return opportunityRadarService.jskBidNewsPage(object);
     }
 
 
@@ -87,22 +92,24 @@ public class BusinessOpportunityRadarController {
      * 专项债查询
      */
     @RequestMapping("/bondProjectPage")
-    public AjaxResult bondProjectPage(@RequestBody ComposeQueryDto compose) {
+    public AjaxResult bondProjectPage(@RequestBody JSONObject object) {
+        ComposeQueryDto compose = JSONObject.parseObject(object.toJSONString(), ComposeQueryDto.class);
         if (PageQueryLimit.pageLimit(compose.getPage())){
             return AjaxResult.error("翻页已达到上限");
         }
-        return opportunityRadarService.bondProjectPage(compose);
+        return opportunityRadarService.bondProjectPage(object);
     }
 
     /*
      * 投标计划查询
      */
     @RequestMapping("/jskBidPlanPage")
-    public AjaxResult jskBidPlanPage(@RequestBody ComposeQueryDto compose) {
+    public AjaxResult jskBidPlanPage(@RequestBody JSONObject object) {
+        ComposeQueryDto compose = JSONObject.parseObject(object.toJSONString(), ComposeQueryDto.class);
         if (PageQueryLimit.pageLimit(compose.getPage())){
             return AjaxResult.error("翻页已达到上限");
         }
-        return opportunityRadarService.jskBidPlanPage(compose);
+        return opportunityRadarService.jskBidPlanPage(object);
     }
 
     /*
@@ -125,10 +132,11 @@ public class BusinessOpportunityRadarController {
      * 招标来源网站
      */
     @RequestMapping("/bidSourceList")
-    public AjaxResult bidSourceList(@RequestBody ComposeQueryDto compose) {
+    public AjaxResult bidSourceList(@RequestBody JSONObject object) {
+        ComposeQueryDto compose = JSONObject.parseObject(object.toJSONString(), ComposeQueryDto.class);
         if (PageQueryLimit.pageLimit(compose.getPage())){
             return AjaxResult.error("翻页已达到上限");
         }
-        return opportunityRadarService.bidSourceList(compose);
+        return opportunityRadarService.bidSourceList(object);
     }
 }

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

 package com.dsk.web.controller.search.controller;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.dtos.ComposeQueryDto;
 import com.dsk.web.controller.search.service.BusinessOpportunityRadarService;
@@ -25,11 +26,12 @@ public class CompanySearchController {
      * 模糊查询企业名称
      */
     @RequestMapping("/index")
-    public AjaxResult landMarketPage(@RequestBody ComposeQueryDto compose) {
+    public AjaxResult landMarketPage(@RequestBody JSONObject object) {
+        ComposeQueryDto compose = JSONObject.parseObject(object.toJSONString(), ComposeQueryDto.class);
         if (PageQueryLimit.pageLimit(compose.getPage())){
             return AjaxResult.error("翻页已达到上限");
         }
-        return opportunityRadarService.enterpriseIndex(compose);
+        return opportunityRadarService.enterpriseIndex(object);
     }
 
     /*

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

@@ -12,29 +12,30 @@ import com.dsk.common.dtos.ComposeQueryDto;
 public interface BusinessOpportunityRadarService {
 
 
-    AjaxResult jskBidNewsPage(ComposeQueryDto compose);
-    AjaxResult jskBidTenderPage(ComposeQueryDto compose);
+    AjaxResult jskBidNewsPage(JSONObject object);
 
-    AjaxResult jskBidPage(ComposeQueryDto compose);
+    AjaxResult jskBidTenderPage(JSONObject object);
 
-    AjaxResult landMarketPage(ComposeQueryDto compose);
+    AjaxResult jskBidPage(JSONObject object);
 
-    AjaxResult establishmentPage(ComposeQueryDto compose);
+    AjaxResult landMarketPage( JSONObject object);
 
-    AjaxResult enterpriseIndex(ComposeQueryDto compose);
+    AjaxResult establishmentPage(JSONObject object);
+
+    AjaxResult enterpriseIndex(JSONObject object);
 
     AjaxResult enterpriseByName(String keyword);
 
     AjaxResult enterprisePage(ComposeQueryDto compose);
 
-    AjaxResult bondProjectPage(ComposeQueryDto compose);
+    AjaxResult bondProjectPage( JSONObject object);
 
-    AjaxResult jskBidPlanPage(ComposeQueryDto compose);
+    AjaxResult jskBidPlanPage( JSONObject object);
 
     AjaxResult getCapitalSourceSelect();
 
     AjaxResult keywordList();
 
-    AjaxResult bidSourceList(ComposeQueryDto compose);
+    AjaxResult bidSourceList( JSONObject object);
 
 }

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

@@ -26,45 +26,45 @@ public class BusinessOpportunityRadarServiceImpl implements BusinessOpportunityR
 
 
     @Override
-    public AjaxResult jskBidNewsPage(ComposeQueryDto compose) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBid/news/page", BeanUtil.beanToMap(compose, false, false));
+    public AjaxResult jskBidNewsPage(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBid/news/page", object);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
 
     @Override
-    public AjaxResult jskBidTenderPage(ComposeQueryDto compose) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBidTender/page", BeanUtil.beanToMap(compose, false, false));
+    public AjaxResult jskBidTenderPage(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBidTender/page", object);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
     @Override
-    public AjaxResult establishmentPage(ComposeQueryDto compose) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/establishment/page", BeanUtil.beanToMap(compose, false, false));
+    public AjaxResult establishmentPage(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/establishment/page", object);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
     @Override
-    public AjaxResult jskBidPage(ComposeQueryDto compose) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBid/page", BeanUtil.beanToMap(compose, false, false));
+    public AjaxResult jskBidPage(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBid/page",object);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
     @Override
-    public AjaxResult landMarketPage(ComposeQueryDto compose) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/landMarket/page", BeanUtil.beanToMap(compose, false, false));
+    public AjaxResult landMarketPage(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/landMarket/page", object);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
     @Override
-    public AjaxResult enterpriseIndex(ComposeQueryDto compose) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/index", BeanUtil.beanToMap(compose, false, false));
+    public AjaxResult enterpriseIndex(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/index", object);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
     @Override
     public AjaxResult enterprisePage(ComposeQueryDto compose) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/page", BeanUtil.beanToMap(compose, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/page",BeanUtil.beanToMap(compose, false, false));
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
@@ -78,14 +78,14 @@ public class BusinessOpportunityRadarServiceImpl implements BusinessOpportunityR
     }
 
     @Override
-    public AjaxResult bondProjectPage(ComposeQueryDto compose) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/bondProject/page", BeanUtil.beanToMap(compose, false, false));
+    public AjaxResult bondProjectPage(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/bondProject/page", object);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
     @Override
-    public AjaxResult jskBidPlanPage(ComposeQueryDto compose) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBidPlan/page", BeanUtil.beanToMap(compose, false, false));
+    public AjaxResult jskBidPlanPage(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBidPlan/page",object);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
@@ -102,8 +102,8 @@ public class BusinessOpportunityRadarServiceImpl implements BusinessOpportunityR
     }
 
     @Override
-    public AjaxResult bidSourceList(ComposeQueryDto compose) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBid/source", BeanUtil.beanToMap(compose, false, false));
+    public AjaxResult bidSourceList(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBid/source",object);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 }