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

@@ -3,6 +3,7 @@ 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.common.dtos.Page;
 import com.dsk.web.controller.search.service.BusinessOpportunityRadarService;
 import com.dsk.web.controller.search.service.MarketAnalysisService;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -30,6 +31,9 @@ public class BusinessOpportunityRadarController {
      */
     @RequestMapping("/jskBidPage")
     public AjaxResult jskBidPage(@RequestBody ComposeQueryDto compose) {
+        if (PageQueryLimit.pageLimit(compose.getPage())){
+            return AjaxResult.error("翻页已达到上限");
+        }
         return opportunityRadarService.jskBidPage(compose);
     }
 
@@ -38,6 +42,9 @@ public class BusinessOpportunityRadarController {
      */
     @RequestMapping("/landMarketPage")
     public AjaxResult landMarketPage(@RequestBody ComposeQueryDto compose) {
+        if (PageQueryLimit.pageLimit(compose.getPage())){
+            return AjaxResult.error("翻页已达到上限");
+        }
         return opportunityRadarService.landMarketPage(compose);
     }
 
@@ -46,6 +53,9 @@ public class BusinessOpportunityRadarController {
      */
     @RequestMapping("/establishmentPage")
     public AjaxResult establishmentPage(@RequestBody ComposeQueryDto compose) {
+        if (PageQueryLimit.pageLimit(compose.getPage())){
+            return AjaxResult.error("翻页已达到上限");
+        }
         return opportunityRadarService.establishmentPage(compose);
     }
 
@@ -54,6 +64,9 @@ public class BusinessOpportunityRadarController {
      */
     @RequestMapping("/jskBidTenderPage")
     public AjaxResult jskBidTenderPage(@RequestBody ComposeQueryDto compose) {
+        if (PageQueryLimit.pageLimit(compose.getPage())){
+            return AjaxResult.error("翻页已达到上限");
+        }
         return opportunityRadarService.jskBidTenderPage(compose);
     }
 
@@ -63,6 +76,9 @@ public class BusinessOpportunityRadarController {
      */
     @RequestMapping("/jskBidNewsPage")
     public AjaxResult jskBidNewsPage(@RequestBody ComposeQueryDto compose) {
+        if (PageQueryLimit.pageLimit(compose.getPage())){
+            return AjaxResult.error("翻页已达到上限");
+        }
         return opportunityRadarService.jskBidNewsPage(compose);
     }
 
@@ -72,6 +88,9 @@ public class BusinessOpportunityRadarController {
      */
     @RequestMapping("/bondProjectPage")
     public AjaxResult bondProjectPage(@RequestBody ComposeQueryDto compose) {
+        if (PageQueryLimit.pageLimit(compose.getPage())){
+            return AjaxResult.error("翻页已达到上限");
+        }
         return opportunityRadarService.bondProjectPage(compose);
     }
 
@@ -80,6 +99,9 @@ public class BusinessOpportunityRadarController {
      */
     @RequestMapping("/jskBidPlanPage")
     public AjaxResult jskBidPlanPage(@RequestBody ComposeQueryDto compose) {
+        if (PageQueryLimit.pageLimit(compose.getPage())){
+            return AjaxResult.error("翻页已达到上限");
+        }
         return opportunityRadarService.jskBidPlanPage(compose);
     }
 
@@ -104,6 +126,9 @@ public class BusinessOpportunityRadarController {
      */
     @RequestMapping("/bidSourceList")
     public AjaxResult bidSourceList(@RequestBody ComposeQueryDto compose) {
+        if (PageQueryLimit.pageLimit(compose.getPage())){
+            return AjaxResult.error("翻页已达到上限");
+        }
         return opportunityRadarService.bidSourceList(compose);
     }
 }

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

@@ -26,6 +26,9 @@ public class CompanySearchController {
      */
     @RequestMapping("/index")
     public AjaxResult landMarketPage(@RequestBody ComposeQueryDto compose) {
+        if (PageQueryLimit.pageLimit(compose.getPage())){
+            return AjaxResult.error("翻页已达到上限");
+        }
         return opportunityRadarService.enterpriseIndex(compose);
     }
 
@@ -42,6 +45,9 @@ public class CompanySearchController {
      */
     @PostMapping("/page")
     public AjaxResult page(@RequestBody ComposeQueryDto compose) {
+        if (PageQueryLimit.pageLimit(compose.getPage())){
+            return AjaxResult.error("翻页已达到上限");
+        }
         compose.getPage().setPage(compose.getPageNum());
         compose.getPage().setLimit(compose.getPageSize());
         return opportunityRadarService.enterprisePage(compose);

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

+package com.dsk.web.controller.search.controller;
+
+import com.dsk.common.dtos.Page;
+
+/**
+ * @author lc
+ * @date 2023/6/20 17:48
+ */
+public class PageQueryLimit {
+
+    public static boolean pageLimit(Page page){
+        if (null == page) {
+            return true;
+        }
+        if (null==page.getLimit()||null==page.getPage()){
+            return true;
+        }
+        if ( page.getPage()*page.getLimit()>10000){
+            return true;
+        }
+        return false;
+    }
+}

dsk-common/src/main/java/com/dsk/common/dtos/JskBidPlanDto.java

@@ -45,9 +45,13 @@ public class JskBidPlanDto {
 	Double startPlanTenderAmount;
 	Double endPlanTenderAmount;
 	//资金来源
-	String projecetCapitalSource;
+	String projectCapitalSource;
 	//发布时间
 	String issueTime;
+	//计划发布开始时间
+	String planTenderDateStart;
+	//计划发布截止时间
+	String planTenderDateEnd;
 	//来源网站
 	String sourceName;
 

dsk-common/src/main/java/com/dsk/common/dtos/SpecialBondProjectDto.java

@@ -16,6 +16,8 @@ public class SpecialBondProjectDto {
 	String uuid;
 
 	String projectName;
+	//match精确   like模糊
+	String nameType;
 
 	String projectType;
 	//项目总投资