-首页

dsk-admin/src/main/java/com/dsk/web/controller/dsk/IndexController.java

@@ -32,35 +32,16 @@ public class IndexController {
     @Autowired
     private IndexService enterpriseService;
 
-    @ApiOperation(value = "企业中标排行榜")
-    @PostMapping("/winningBidsRanking")
-    public R winningBidsRanking(@RequestBody Map<String, Object> paramMap) throws Exception {
-        return enterpriseService.winningBidsRanking(paramMap);
-    }
-
-    @ApiOperation(value = "企业中标排行-项目类型")
-    @PostMapping("/rankingProjectType")
-    public R rankingProjectType(@RequestBody Map<String, Object> paramMap) throws Exception {
-        return enterpriseService.rankingProjectType(paramMap);
-    }
-
-
     @ApiOperation(value = "大项目最新中标")
     @PostMapping(value = "bigWinningBidsPage")
-    public TableDataInfo bigWinningBidsPage(@RequestBody IndexBigWinningBidsPageBody vo) throws Exception {
-        return enterpriseService.bigWinningBidsPage(vo);
+    public AjaxResult bigWinningBidsPage(@RequestBody JSONObject object) throws Exception {
+        return enterpriseService.bigWinningBidsPage(object);
     }
 
     @ApiOperation(value = "大项目最新招标")
     @PostMapping(value = "bigBidPage")
-    public TableDataInfo bigBidPage(@RequestBody IndexBigBidPageBody vo) throws Exception {
-        return enterpriseService.bigBidPage(vo);
-    }
-
-    @ApiOperation(value = "企业中标排行-项目类型")
-    @PostMapping("/bigBidProjectType")
-    public R bigBidProjectType(@RequestBody Map<String, Object> paramMap) throws Exception {
-        return enterpriseService.bigBidProjectType(paramMap);
+    public AjaxResult bigBidPage(@RequestBody JSONObject object) throws Exception {
+        return enterpriseService.bigBidPage(object);
     }
 
     @ApiOperation(value = "集团中标统计")

dsk-system/src/main/java/com/dsk/system/dskService/IndexService.java

 package com.dsk.system.dskService;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson2.JSONObject;
 import com.dsk.common.core.domain.AjaxResult;
-import com.dsk.common.core.domain.R;
-import com.dsk.common.core.domain.model.*;
-import com.dsk.common.core.page.TableDataInfo;
+import com.dsk.common.utils.DateUtils;
 import com.dsk.common.utils.DskOpenApiUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -29,29 +28,53 @@ public class IndexService {
     @Autowired
     private DskOpenApiUtil dskOpenApiUtil;
 
-    public R winningBidsRanking(Map<String, Object> paramMap) throws Exception {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/winningBidsRanking", paramMap);
-        return BeanUtil.toBean(map, R.class);
-    }
-
-    public R rankingProjectType(Map<String, Object> paramMap) throws Exception {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/rankingProjectType", paramMap);
-        return BeanUtil.toBean(map, R.class);
-    }
-
-    public TableDataInfo bigWinningBidsPage(IndexBigWinningBidsPageBody body) throws Exception {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/bigWinningBidsPage", BeanUtil.beanToMap(body, false, false));
-        return dskOpenApiUtil.responsePage(map);
-    }
-
-    public TableDataInfo bigBidPage(IndexBigBidPageBody body) throws Exception {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/bigBidPage", BeanUtil.beanToMap(body, false, false));
-        return dskOpenApiUtil.responsePage(map);
+    public AjaxResult bigWinningBidsPage(JSONObject object) {
+        ArrayList recentlyBidQueryDtoList = object.getJSONArray("recentlyBidQueryDto");
+        Map<String,Object> objectMap = new HashMap<>();
+        Map<String,Object> pageMap = new HashMap<>(4);
+        pageMap.put("page",  object.get("pageNum"));
+        pageMap.put("limit", object.get("pageSize"));
+        pageMap.put("field", "tenderDate");
+        pageMap.put("order", "desc");
+        objectMap.put("page", pageMap);
+        if (ObjectUtil.isEmpty(recentlyBidQueryDtoList)) {
+            Map<String,Object> recentlyBidQueryMap = new HashMap<>();
+            recentlyBidQueryDtoList = new ArrayList();
+            recentlyBidQueryMap.put("startTenderTime", DateUtils.dateTime(DateUtils.addDays(new Date(), -6)));
+            recentlyBidQueryMap.put("endTenderTime", DateUtils.getDate());
+            recentlyBidQueryMap.put("endMoney", 20000);
+            recentlyBidQueryMap.put("tenderType","施工,工程总承包");
+            recentlyBidQueryDtoList.add(recentlyBidQueryMap);
+            objectMap.put("recentlyBidQueryDto", recentlyBidQueryDtoList);
+        } else {
+            Map<String,Object> recentlyBidQueryMap = (Map<String,Object>)recentlyBidQueryDtoList.get(0);
+            recentlyBidQueryMap.put("tenderType","施工,工程总承包");
+            objectMap.put("recentlyBidQueryDto", recentlyBidQueryDtoList);
+        }
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/project/recently", objectMap);
+        return BeanUtil.toBean(map, AjaxResult.class);
     }
 
-    public R bigBidProjectType(Map<String, Object> paramMap) throws Exception {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/bigBidProjectType", paramMap);
-        return BeanUtil.toBean(map, R.class);
+    public AjaxResult bigBidPage(JSONObject body) throws Exception {
+        Object jskBidQueryDto = body.get("jskBidQueryDto");
+        Map<String,Object> objectMap = new HashMap<>(2);
+        Map<String,Object> pageMap = new HashMap<>(4);
+        pageMap.put("page",  body.get("pageNum"));
+        pageMap.put("limit", body.get("pageSize"));
+        pageMap.put("field", "punishDate");
+        pageMap.put("order", "desc");
+        objectMap.put("page", pageMap);
+        if (ObjectUtil.isEmpty(jskBidQueryDto)) {
+            Map<String,Object> jskBidQueryDtoMap = new HashMap<>(1);
+//            jskBidQueryDtoMap.put("startTenderTime", DateUtils.dateTime(DateUtils.addDays(new Date(), -6)));
+//            jskBidQueryDtoMap.put("endTenderTime", DateUtils.getDate());
+            jskBidQueryDtoMap.put("startBidMoney", 20000);
+            objectMap.put("jskBidQueryDto", jskBidQueryDtoMap);
+        } else {
+            objectMap.put("jskBidQueryDto", jskBidQueryDto);
+        }
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBid/page", objectMap);
+        return BeanUtil.toBean(map, AjaxResult.class);
     }
 
     public AjaxResult countByCompany(JSONObject object) {
@@ -63,4 +86,8 @@ public class IndexService {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/bidRank", object);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
+
+    public static void main(String[] args) {
+        System.out.println(DateUtils.getDate());
+    }
 }