-

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

@@ -28,6 +28,13 @@ public class EnterpriseBussinessController {
     @Autowired
     EnterpriseBussinessService enterpriseBussinessService;
 
+
+    @ApiOperation(value = "客户-下拉选项（openApi）")
+    @RequestMapping(value = "/customSelect", method = RequestMethod.GET)
+    public R customSelect() throws Exception {
+        return enterpriseBussinessService.customSelect();
+    }
+
     @ApiOperation(value = "客户信息列表（openApi）")
     @RequestMapping(value = "/clientPage", method = RequestMethod.POST)
     public TableDataInfo clientPage(@RequestBody @Valid EnterpriseBussinessClientPageBody paramMap) throws Exception {

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

@@ -72,17 +72,53 @@ public class MarketAnalysisController extends BaseController {
         return marketAnalysisService.bidMoneyGroupByProjectType(object);
     }
 
+    /*
+     * 全国各地区中标统计TOP10
+     */
+    @RequestMapping("/countBidGroupByProvince")
+    public AjaxResult countBidGroupByProvince(@RequestBody JSONObject object) {
+        return marketAnalysisService.countBidGroupByProvince(object);
+    }
 
 
+    //央企数字化经营系统     土地交易
+    @RequestMapping("/countLandMarketByType")
+    public AjaxResult countLandMarketByType(@RequestBody JSONObject object){
+        return marketAnalysisService.countLandMarketByType(object);
+    }
 
+    //央企数字化经营系统     全国土地交易项目地区
+    @RequestMapping("/countLandMarketByProvince")
+    public AjaxResult countLandMarketByProvince(@RequestBody JSONObject object){
+        return marketAnalysisService.countLandMarketByProvince(object);
+    }
 
+    //央企数字化经营系统     全国土地交易项目地区
+    @RequestMapping("/countLandMarketByYear")
+    public AjaxResult countLandMarketByYear(){
+        return marketAnalysisService.countLandMarketByYear();
+    }
 
+    //央企数字化经营系统     全国公招项目统计
+    @RequestMapping("/countNewsBidByYear")
+    public AjaxResult countNewsBidByYear(){
+        return marketAnalysisService.countNewsBidByYear();
+    }
 
+    //央企数字化经营系统     招标公告  全国各地区项目统计TOP10
+    @RequestMapping("/countNewsBidByProvince")
+    public AjaxResult countNewsBidByProvince(@RequestBody JSONObject object){
+        return marketAnalysisService.countNewsBidByProvince(object);
+    }
 
-
+    //央企数字化经营系统     招标公告  月度统计
+    @RequestMapping("/countNewsBidByMonth")
+    public AjaxResult countNewsBidByMonth(@RequestBody JSONObject object){
+        return marketAnalysisService.countNewsBidByMonth(object);
+    }
 
     /*
-     * 中标数量按省份分组
+     * 招标数量按省份分组
      */
     @RequestMapping("/countGroupByProvince")
     public AjaxResult countGroupByProvince(@RequestBody JSONObject object) {

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

@@ -26,6 +26,33 @@ public class EnterpriseBussinessService {
     @Autowired
     private DskOpenApiUtil dskOpenApiUtil;
 
+    public R customSelect() throws Exception {
+        Map<String, Object> objectMap = new HashMap<>(2);
+        List<String> sourceList = new ArrayList<>();
+        sourceList.add("四库业绩");
+        sourceList.add("中标业绩");
+        sourceList.add("水利业绩");
+        sourceList.add("中标公示");
+        sourceList.add("荣誉奖项");
+        objectMap.put("sourceList", sourceList);
+        List<String> projectTypeList = new ArrayList<>();
+
+        projectTypeList.add("房建工程");
+        projectTypeList.add("市政工程");
+        projectTypeList.add("公路工程");
+        projectTypeList.add("水利工程");
+        projectTypeList.add("铁路工程");
+        projectTypeList.add("通信工程");
+        projectTypeList.add("电力工程");
+        projectTypeList.add("机电工程");
+        projectTypeList.add("冶金工程");
+        projectTypeList.add("矿山工程");
+        projectTypeList.add("石油化工工程");
+        projectTypeList.add("港口与航道工程");
+        projectTypeList.add("其他");
+        objectMap.put("projectTypeList", projectTypeList);
+        return BeanUtil.toBean(objectMap, R.class);
+    }
 
     public TableDataInfo clientPage(EnterpriseBussinessClientPageBody body) throws Exception {
         if (body.isVaildCid()) return new TableDataInfo(new ArrayList<>(), 0);

dsk-system/src/main/java/com/dsk/system/searchService/MarketAnalysisService.java

@@ -54,4 +54,39 @@ public class MarketAnalysisService {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/countGroupByMonth", object);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
+
+    public AjaxResult countNewsBidByMonth(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/countNewsBidByMonth", object);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    public AjaxResult countNewsBidByProvince(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/countNewsBidByProvince", object);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    public AjaxResult countNewsBidByYear() {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/countNewsBidByYear", null);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    public AjaxResult countLandMarketByYear() {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/countLandMarketByYear", null);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    public AjaxResult countLandMarketByProvince(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/countLandMarketByProvince", object);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    public AjaxResult countBidGroupByProvince(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/countBidGroupByProvince", object);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    public AjaxResult countLandMarketByType(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/countLandMarketByType", object);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
 }

dsk-system/src/main/java/com/dsk/system/service/impl/EconomicServiceImpl.java

@@ -35,6 +35,12 @@ public class EconomicServiceImpl implements EconomicService {
     @Resource
     private RedisCache redisCache;
 
+    /**
+     * 全国宏观经济：1 / 辖区经济：2 / 地区对比：3
+     */
+    private static final Integer TYPE = 1;
+
+
     @Override
     public AjaxResult nationalPage(OpRegionalEconomicDataV1PageDto dto) {
         if (ObjectUtil.isEmpty(dto.getYear())) {
@@ -52,7 +58,7 @@ public class EconomicServiceImpl implements EconomicService {
         }
         Map data = MapUtils.getMap(map, "data", null);
         List<Object> list = CommonUtils.assertAsArray(MapUtils.getObject(data, "list", ""));
-        if (ObjectUtil.isNotEmpty(list)) {
+        if (ObjectUtil.isNotEmpty(list) && TYPE.equals(dto.getType())) {
             if (ObjectUtil.isEmpty(dto.getProvinceIds()) && ObjectUtil.isEmpty(dto.getCityIds()) && ObjectUtil.isEmpty(dto.getAreaIds())) {
                 redisCache.setCacheObject(redisKey, map);
             }