Merge branch 'master' of http://192.168.60.201/root/dsk-operate-sys

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

+package com.dsk.web.controller.dsk;
+
+
+import com.dsk.common.core.domain.R;
+import com.dsk.common.core.page.TableDataInfo;
+import com.dsk.system.dskService.EnterpriseBussinessService;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+*@Description: 央企经营管理系统企业业务相关
+*@Author: zhangyi
+*@date: 2023/5/17 9:03
+*/
+@Slf4j
+@RestController
+@RequestMapping(value = "/enterpriseBussiness")
+public class EnterpriseBussinessController {
+    @Autowired
+    EnterpriseBussinessService enterpriseBussinessService;
+
+    @ApiOperation(value = "客户信息列表")
+    @RequestMapping(value = "/clientPage", method = RequestMethod.POST)
+    public TableDataInfo clientPage(@RequestBody Map<String, Object> paramMap) throws Exception {
+        return enterpriseBussinessService.clientPage(paramMap);
+    }
+
+    @ApiOperation(value = "客户项目列表")
+    @RequestMapping(value = "/clientProjectPage", method = RequestMethod.POST)
+    public TableDataInfo clientProjectPage(@RequestBody Map<String, Object> paramMap) throws Exception {
+        return enterpriseBussinessService.clientProjectPage(paramMap);
+    }
+
+    @ApiOperation(value = "投标记录列表（开标记录）")
+    @RequestMapping(value = "/tenderPage",method = RequestMethod.POST)
+    public TableDataInfo tenderPage(@RequestBody Map<String, Object> paramMap) throws Exception {
+        return enterpriseBussinessService.tenderPage(paramMap);
+    }
+
+    @ApiOperation(value = "投标记录详情（开标记录）")
+    @RequestMapping(value = "/tenderDetail",method = RequestMethod.POST)
+    public R tenderDetail(@RequestBody Map<String, Object> paramMap) throws Exception {
+        return enterpriseBussinessService.tenderDetail(paramMap);
+    }
+
+    @ApiOperation(value = "供应商列表")
+    @RequestMapping(value = "/supplierPage",method = RequestMethod.POST)
+    public TableDataInfo supplierPage(@RequestBody Map<String, Object> paramMap) throws Exception {
+        return enterpriseBussinessService.supplierPage(paramMap);
+    }
+
+    @ApiOperation(value = "供应商项目列表")
+    @RequestMapping(value = "/supplierProjectPage",method = RequestMethod.POST)
+    public TableDataInfo supplierProjectPage(@RequestBody Map<String, Object> paramMap) throws Exception {
+        return enterpriseBussinessService.supplierProjectPage(paramMap);
+    }
+
+    @ApiOperation(value = "中标项目详情")
+    @RequestMapping(value = "/projectDetail", method = RequestMethod.POST)
+    public R projectDetail(@RequestBody Map<String, Object> paramMap) throws Exception {
+        return enterpriseBussinessService.projectDetail(paramMap);
+    }
+
+    @ApiOperation(value = "招标代理常合作代理机构列表")
+    @RequestMapping(value = "/oftenAgencyPage",method = RequestMethod.POST)
+    public TableDataInfo oftenAgencyPage(@RequestBody Map<String, Object> paramMap) throws Exception {
+        return enterpriseBussinessService.oftenAgencyPage(paramMap);
+    }
+
+    @ApiOperation(value = "招标合作明细列表")
+    @RequestMapping(value = "/bidCooperatePage", method = RequestMethod.POST)
+    public TableDataInfo bidCooperatePage(@RequestBody Map<String, Object> paramMap) throws Exception {
+        return enterpriseBussinessService.bidCooperatePage(paramMap);
+    }
+
+    @ApiOperation(value = "历史发包列表")
+    @RequestMapping(value = "/historySendPage", method = RequestMethod.POST)
+    public TableDataInfo historySendPage(@RequestBody Map<String, Object> paramMap) throws Exception {
+        return enterpriseBussinessService.historySendPage(paramMap);
+    }
+
+    @ApiOperation(value = "历史发包省份")
+    @RequestMapping(value = "/historySendProvince", method = RequestMethod.POST)
+    public R historySendProvince(@RequestBody Map<String, Object> paramMap) throws Exception {
+        return enterpriseBussinessService.historySendProvince(paramMap);
+    }
+
+
+}

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

@@ -2,6 +2,7 @@ package com.dsk.web.controller.dsk;
 
 import com.dsk.common.core.domain.R;
 import com.dsk.common.core.domain.model.*;
+import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.system.dskService.EnterpriseService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -28,8 +29,7 @@ public class EnterpriseController {
 
     @ApiOperation(value = "企业详情头部信息（建设库）")
     @PostMapping("/infoHeader")
-    public R infoHeader(@RequestBody @Valid EnterpriseInfoHeaderBody body) throws Exception
-    {
+    public R infoHeader(@RequestBody @Valid EnterpriseInfoHeaderBody body) throws Exception {
         return enterpriseService.infoHeader(body);
     }
 
@@ -59,19 +59,19 @@ public class EnterpriseController {
 
     @ApiOperation(value = "股东列表（openApi）")
     @PostMapping(value = "partners")
-    public R partners(@RequestBody @Valid EnterprisePartnersBody vo) throws Exception {
+    public TableDataInfo partners(@RequestBody @Valid EnterprisePartnersBody vo) throws Exception {
         return enterpriseService.partners(vo);
     }
 
     @ApiOperation(value = "对外投资列表（openApi）")
     @PostMapping(value = "investment")
-    public R investment(@RequestBody @Valid EnterpriseInvestmentBody vo) throws Exception {
+    public TableDataInfo investment(@RequestBody @Valid EnterpriseInvestmentBody vo) throws Exception {
         return enterpriseService.investment(vo);
     }
 
     @ApiOperation(value = "分支机构列表（openApi）")
     @PostMapping(value = "affiliates")
-    public R affiliates(@RequestBody @Valid EnterpriseAffiliatesBody vo) throws Exception {
+    public TableDataInfo affiliates(@RequestBody @Valid EnterpriseAffiliatesBody vo) throws Exception {
         return enterpriseService.affiliates(vo);
     }
 
@@ -101,7 +101,7 @@ public class EnterpriseController {
 
     @ApiOperation(value = "企业动态列表（建设库）")
     @PostMapping(value = "dynamicPage")
-    public R dynamicPage(@RequestBody @Valid EnterpriseDynamicPageBody vo) throws Exception {
+    public TableDataInfo dynamicPage(@RequestBody @Valid EnterpriseDynamicPageBody vo) throws Exception {
         return enterpriseService.dynamicPage(vo);
     }
 
@@ -113,19 +113,19 @@ public class EnterpriseController {
 
     @ApiOperation(value = "工商变更信息列表（openApi）")
     @PostMapping(value = "changeInfo")
-    public R changeInfo(@RequestBody @Valid EnterpriseChangeInfoBody vo) throws Exception {
+    public TableDataInfo changeInfo(@RequestBody @Valid EnterpriseChangeInfoBody vo) throws Exception {
         return enterpriseService.changeInfo(vo);
     }
 
     @ApiOperation(value = "高管信息列表（openApi）")
     @PostMapping(value = "keymembers")
-    public R keymembers(@RequestBody @Valid EnterpriseKeymembersBody vo) throws Exception {
+    public TableDataInfo keymembers(@RequestBody @Valid EnterpriseKeymembersBody vo) throws Exception {
         return enterpriseService.keymembers(vo);
     }
 
     @ApiOperation(value = "工商股东信息（openApi）")
     @PostMapping(value = "bestStockPage")
-    public R bestStockPage(@RequestBody @Valid EnterpriseKeymembersBody vo) throws Exception {
+    public TableDataInfo bestStockPage(@RequestBody @Valid EnterpriseKeymembersBody vo) throws Exception {
         return enterpriseService.bestStockPage(vo);
     }
 

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

+package com.dsk.web.controller.dsk;
+
+
+import com.dsk.common.core.controller.BaseController;
+import com.dsk.common.core.domain.R;
+import com.dsk.common.core.domain.model.*;
+import com.dsk.common.core.page.TableDataInfo;
+import com.dsk.system.dskService.EnterpriseCreditService;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+*@Description: 央企经营管理系统企业风险相关
+*@Author: zhangyi
+*@date: 2023/5/17 9:03
+*/
+@Slf4j
+@RestController
+@RequestMapping(value = "/enterpriseCredit")
+public class EnterpriseCreditController {
+    @Autowired
+    EnterpriseCreditService enterpriseCreditService;
+
+    @RequestMapping(value = "/penalizePage", method = RequestMethod.POST)
+    @ApiOperation(value = "行政处罚列表")
+    public TableDataInfo penalizePage(@RequestBody @Valid EnterpriseCreditPenalizePageBody body) throws Exception {
+        return enterpriseCreditService.penalizePage(body);
+    }
+
+    @RequestMapping(value = "/penalizeReasonType", method = RequestMethod.POST)
+    @ApiOperation(value = "行政处罚类型")
+    public R penalizeReasonType(@RequestBody @Valid EnterpriseCreditPenalizeReasonTypeBody body) throws Exception {
+        return enterpriseCreditService.penalizeReasonType(body);
+    }
+
+    @RequestMapping(value = "/abnormalPage", method = RequestMethod.POST)
+    @ApiOperation(value = "经营异常列表")
+    public TableDataInfo abnormalPage(@RequestBody @Valid EnterpriseCreditAbnormalPageBody body) throws Exception {
+        return enterpriseCreditService.abnormalPage(body);
+    }
+
+    @RequestMapping(value = "/abnormalYears", method = RequestMethod.POST)
+    @ApiOperation(value = "经营异常年份")
+    public R abnormalYears(@RequestBody @Valid EnterpriseCreditAbnormalYearsBody body) throws Exception {
+        return enterpriseCreditService.abnormalYears(body);
+    }
+
+    @RequestMapping(value = "/executedPersonsPage", method = RequestMethod.POST)
+    @ApiOperation(value = "被执行人列表")
+    public TableDataInfo executedPersonsPage(@RequestBody @Valid EnterpriseCreditExecutedPersonsPageBody body) throws Exception {
+        return enterpriseCreditService.executedPersonsPage(body);
+    }
+
+    @RequestMapping(value = "/executedPage", method = RequestMethod.POST)
+    @ApiOperation(value = "失信被执行人列表")
+    public TableDataInfo executedPage(@RequestBody @Valid EnterpriseCreditExecutedPageBody body) throws Exception {
+        return enterpriseCreditService.executedPage(body);
+    }
+
+    @RequestMapping(value = "/lawsuitsPage", method = RequestMethod.POST)
+    @ApiOperation(value = "裁判文书列表")
+    public TableDataInfo lawsuitsPage(@RequestBody @Valid EnterpriseCreditLawsuitsPageBody body) throws Exception {
+        return enterpriseCreditService.lawsuitsPage(body);
+    }
+
+    @RequestMapping(value = "/lawsuitsCauseAction", method = RequestMethod.POST)
+    @ApiOperation(value = "裁判文书案由")
+    public R lawsuitsCauseAction(@RequestBody @Valid EnterpriseCreditLawsuitsCauseActionBody body) throws Exception {
+        return enterpriseCreditService.lawsuitsCauseAction(body);
+    }
+
+    @RequestMapping(value = "/lawsuitsRole", method = RequestMethod.POST)
+    @ApiOperation(value = "裁判文书身份")
+    public R lawsuitsRole(@RequestBody @Valid EnterpriseCreditLawsuitsRoleBody body) throws Exception {
+        return enterpriseCreditService.lawsuitsRole(body);
+    }
+
+    @RequestMapping(value = "/noticesPage", method = RequestMethod.POST)
+    @ApiOperation(value = "法院公告列表")
+    public TableDataInfo noticesPage(@RequestBody @Valid EnterpriseCreditNoticePageBody body) throws Exception {
+        return enterpriseCreditService.noticesPage(body);
+    }
+
+    @RequestMapping(value = "/noticesType", method = RequestMethod.POST)
+    @ApiOperation(value = "法院公告类型")
+    public R noticesType(@RequestBody @Valid EnterpriseCreditNoticeTypeBody body) throws Exception {
+        return enterpriseCreditService.noticesType(body);
+    }
+
+    @RequestMapping(value = "/noticesRole", method = RequestMethod.POST)
+    @ApiOperation(value = "法院公告身份")
+    public R noticesRole(@RequestBody @Valid EnterpriseCreditNoticeRoleBody body) throws Exception {
+        return enterpriseCreditService.noticesRole(body);
+    }
+
+    @RequestMapping(value = "/noticesCaseReason", method = RequestMethod.POST)
+    @ApiOperation(value = "法院公告案由")
+    public R noticesCaseReason(@RequestBody @Valid EnterpriseCreditNoticeCaseReasonBody body) throws Exception {
+        return enterpriseCreditService.noticesCaseReason(body);
+    }
+
+    @RequestMapping(value = "/kaitingPage", method = RequestMethod.POST)
+    @ApiOperation(value = "开庭公告列表")
+    public TableDataInfo kaitingPage(@RequestBody @Valid EnterpriseCreditKaitingPageBody body) throws Exception {
+        return enterpriseCreditService.kaitingPage(body);
+    }
+
+    @RequestMapping(value = "/kaitingCauseAction", method = RequestMethod.POST)
+    @ApiOperation(value = "开庭公告案由")
+    public R kaitingCauseAction(@RequestBody @Valid EnterpriseCreditKaitingCauseActionBody body) throws Exception {
+        return enterpriseCreditService.kaitingCauseAction(body);
+    }
+
+    @RequestMapping(value = "/kaitingPureRole", method = RequestMethod.POST)
+    @ApiOperation(value = "开庭公告当事人身份")
+    public R kaitingPureRole(@RequestBody @Valid EnterpriseCreditKaitingPureRoleBody body) throws Exception {
+        return enterpriseCreditService.kaitingPureRole(body);
+    }
+
+}

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

+package com.dsk.web.controller.dsk;
+
+
+import com.dsk.common.core.domain.R;
+import com.dsk.common.core.page.TableDataInfo;
+import com.dsk.system.dskService.EnterpriseProjectService;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+*@Description: 央企经营管理系统企业项目相关
+*@Author: zhangyi
+*@date: 2023/5/17 9:03
+*/
+@Slf4j
+@RestController
+@RequestMapping(value = "/enterpriseProject")
+public class EnterpriseProjectController {
+    @Autowired
+    EnterpriseProjectService enterpriseProjectService;
+
+
+    @ApiOperation(value = "土地交易员列表")
+    @RequestMapping(value = "/landTransactionPage", method = RequestMethod.POST)
+    public TableDataInfo landTransactionPage(@RequestBody Map<String, Object> paramMap) throws Exception {
+        return enterpriseProjectService.landTransactionPage(paramMap);
+    }
+
+    @ApiOperation(value = "土地用途列表")
+    @RequestMapping(value = "/landUse", method = RequestMethod.POST)
+    public R landUse(@RequestBody Map<String, Object> paramMap) throws Exception {
+        return enterpriseProjectService.landUse(paramMap);
+    }
+
+    @ApiOperation(value = "土地信息详情")
+    @RequestMapping(value = "/landDetail",method = RequestMethod.POST)
+    public R landDetail(@RequestBody Map<String, Object> paramMap) throws Exception {
+        return enterpriseProjectService.landDetail(paramMap);
+    }
+
+    @ApiOperation(value = "拟建项目列表")
+    @RequestMapping(value = "/approvalProjectPage",method = RequestMethod.POST)
+    public TableDataInfo approvalProjectPage(@RequestBody Map<String, Object> paramMap) throws Exception {
+        return enterpriseProjectService.approvalProjectPage(paramMap);
+    }
+
+    @ApiOperation(value = "拟建项目详情基本信息")
+    @RequestMapping(value = "/approvalInfoDetail",method = RequestMethod.POST)
+    public R approvalInfoDetail(@RequestBody Map<String, Object> paramMap) throws Exception {
+        return enterpriseProjectService.approvalInfoDetail(paramMap);
+    }
+
+    @ApiOperation(value = "拟建项目详情立项审批列表")
+    @RequestMapping(value = "/approvalExaminePage",method = RequestMethod.POST)
+    public TableDataInfo approvalExaminePage(@RequestBody Map<String, Object> paramMap) throws Exception {
+        return enterpriseProjectService.approvalExaminePage(paramMap);
+    }
+
+    @ApiOperation(value = "拟建项目详情民间推介列表")
+    @RequestMapping(value = "/approvalMarketingPage", method = RequestMethod.POST)
+    public TableDataInfo approvalMarketingPage(@RequestBody Map<String, Object> paramMap) throws Exception {
+        return enterpriseProjectService.approvalMarketingPage(paramMap);
+    }
+
+    @ApiOperation(value = "专项债项目列表")
+    @RequestMapping(value = "/specialDebtPage", method = RequestMethod.POST)
+    public TableDataInfo specialDebtPage(@RequestBody Map<String, Object> paramMap) throws Exception {
+        return enterpriseProjectService.specialDebtPage(paramMap);
+    }
+
+    @ApiOperation(value = "专项债项目详情")
+    @RequestMapping(value = "/specialDebtDetail", method = RequestMethod.POST)
+    public R specialDebtDetail(@RequestBody Map<String, Object> paramMap) throws Exception {
+        return enterpriseProjectService.specialDebtDetail(paramMap);
+    }
+
+    @ApiOperation(value = "招标公告列表")
+    @RequestMapping(value = "/bidNoticePage",method = RequestMethod.POST)
+    public TableDataInfo bidNoticePage(@RequestBody Map<String, Object> paramMap) throws Exception {
+        return enterpriseProjectService.bidNoticePage(paramMap);
+    }
+
+    @ApiOperation(value = "招标公告招标类别")
+    @RequestMapping(value = "/bidNoticeTenderStage", method = RequestMethod.POST)
+    public R bidNoticeTenderStage(@RequestBody Map<String, Object> paramMap) throws Exception {
+        return enterpriseProjectService.bidNoticeTenderStage(paramMap);
+    }
+
+    @ApiOperation(value = "招标公告招标地区")
+    @RequestMapping(value = "/bidNoticeProvince", method = RequestMethod.POST)
+    public R bidNoticeProvince(@RequestBody Map<String, Object> paramMap) throws Exception {
+        return enterpriseProjectService.bidNoticeProvince(paramMap);
+    }
+
+    @ApiOperation(value = "招标公告详情")
+    @RequestMapping(value = "/bidNoticeDetail", method = RequestMethod.POST)
+    public R bidNoticeDetail(@RequestBody Map<String, Object> paramMap) throws Exception {
+        return enterpriseProjectService.bidNoticeDetail(paramMap);
+    }
+
+    @ApiOperation(value = "招标计划列表")
+    @RequestMapping(value = "/bidPlanPage",method = RequestMethod.POST)
+    public TableDataInfo bidPlanPage(@RequestBody Map<String, Object> paramMap) throws Exception {
+        return enterpriseProjectService.bidPlanPage(paramMap);
+    }
+
+    @ApiOperation(value = "招标计划详情")
+    @RequestMapping(value = "/bidPlanDetail", method = RequestMethod.POST)
+    public R bidPlanDetail(@RequestBody Map<String, Object> paramMap) throws Exception {
+        return enterpriseProjectService.bidPlanDetail(paramMap);
+    }
+
+    @ApiOperation(value = "标讯pro招标公告列表")
+    @RequestMapping(value = "/bidNoticeProPage", method = RequestMethod.POST)
+    public TableDataInfo bidNoticeProPage(@RequestBody Map<String, Object> paramMap) throws Exception {
+        return enterpriseProjectService.bidNoticeProPage(paramMap);
+    }
+
+    @ApiOperation(value = "标讯pro招标公告详情")
+    @RequestMapping(value = "/bidNoticeProDetail", method = RequestMethod.POST)
+    public R bidNoticeProDetail(@RequestBody Map<String, Object> paramMap) throws Exception {
+        return enterpriseProjectService.bidNoticeProDetail(paramMap);
+    }
+
+    @ApiOperation(value = "行政许可列表")
+    @RequestMapping(value = "/creditXzxkPage", method = RequestMethod.POST)
+    public TableDataInfo creditXzxkPage(@RequestBody Map<String, Object> paramMap) throws Exception {
+        return enterpriseProjectService.creditXzxkPage(paramMap);
+    }
+
+}

dsk-admin/src/main/java/com/dsk/web/controller/search/controller/BusinessOpportunityRadarController.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;
+import com.dsk.web.controller.search.service.MarketAnalysisService;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+
+/**
+ * 商机雷达 查询接口
+ * @author Administrator
+ *
+ */
+@RequestMapping("/radar")
+@RestController
+public class BusinessOpportunityRadarController {
+
+
+    @Resource
+    BusinessOpportunityRadarService opportunityRadarService;
+
+    /*
+     * 土地交易
+     */
+    @RequestMapping("/landMarketPage")
+    public AjaxResult landMarketPage(@RequestBody ComposeQueryDto compose) {
+        return opportunityRadarService.landMarketPage(compose);
+    }
+
+    /*
+     * 拟建项目
+     */
+    @RequestMapping("/establishmentPage")
+    public AjaxResult establishmentPage(@RequestBody ComposeQueryDto compose) {
+        return opportunityRadarService.establishmentPage(compose);
+    }
+
+    /*
+     * 开标记录
+     */
+    @RequestMapping("/jskBidTenderPage")
+    public AjaxResult jskBidTenderPage(@RequestBody ComposeQueryDto compose) {
+        return opportunityRadarService.jskBidTenderPage(compose);
+    }
+
+
+    /*
+     * 标讯pro
+     */
+    @RequestMapping("/jskBidNewsPage")
+    public AjaxResult jskBidNewsPage(@RequestBody ComposeQueryDto compose) {
+        return opportunityRadarService.jskBidNewsPage(compose);
+    }
+
+}

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

+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 javax.annotation.Resource;
+
+
+/**
+ * 模糊查企业
+ * @author Administrator
+ *
+ */
+@RequestMapping("/enterprise")
+@RestController
+public class CompanySearchController {
+
+
+    @Resource
+    BusinessOpportunityRadarService opportunityRadarService;
+
+    /*
+     * 土地交易
+     */
+    @RequestMapping("/index")
+    public AjaxResult landMarketPage(@RequestBody ComposeQueryDto compose) {
+        return opportunityRadarService.enterprisePage(compose);
+    }
+
+}

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

-package com.dsk.web.controller.search;
+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.MarketAnalysisService;
@@ -51,6 +52,32 @@ public class MarketAnalysisController {
         return marketAnalysisService.certGroupByMajorProvinceLevel();
     }
 
+
+
+    /*
+     * 产业结构-按年份选择  各个项目类型项目总数
+     */
+    @RequestMapping("/bidGroupCountByProjectType")
+    public AjaxResult bidGroupCountByProjectType(@RequestBody JSONObject object) {
+        return marketAnalysisService.bidGroupCountByProjectType(object);
+    }
+    /*
+     * 产业结构-近两年各个项目类型项目总数及金额占比
+     */
+    @RequestMapping("/bidMoneyGroupByProjectType")
+    public AjaxResult bidMoneyGroupByProjectType(@RequestBody JSONObject object) {
+        return marketAnalysisService.bidMoneyGroupByProjectType(object);
+    }
+
+
+
+
+
+
+
+
+
+
     /*
      * 中标数量按省份分组
      */

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

+package com.dsk.web.controller.search.service;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.dtos.ComposeQueryDto;
+
+/**
+ * @Author liujie
+ * @ClassName MarketAnalysisService
+ * @Date 2023/5/15 16:39
+ **/
+public interface BusinessOpportunityRadarService {
+
+
+    AjaxResult jskBidNewsPage(ComposeQueryDto compose);
+    AjaxResult jskBidTenderPage(ComposeQueryDto compose);
+
+    AjaxResult landMarketPage(ComposeQueryDto compose);
+    AjaxResult establishmentPage(ComposeQueryDto compose);
+
+    AjaxResult enterprisePage(ComposeQueryDto compose);
+}

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

 package com.dsk.web.controller.search.service;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.dtos.ComposeQueryDto;
 
@@ -19,4 +20,8 @@ public interface MarketAnalysisService {
     AjaxResult countGroupByProvince(ComposeQueryDto compose);
 
     AjaxResult countGroupByMonth(ComposeQueryDto compose);
+
+    AjaxResult bidMoneyGroupByProjectType(JSONObject object);
+
+    AjaxResult bidGroupCountByProjectType(JSONObject object);
 }

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

+package com.dsk.web.controller.search.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson2.JSONObject;
+import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.dtos.ComposeQueryDto;
+import com.dsk.common.utils.DskOpenApiUtil;
+import com.dsk.web.controller.search.service.BusinessOpportunityRadarService;
+import com.dsk.web.controller.search.service.MarketAnalysisService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * @Author liujie
+ * @ClassName MarketAnalysisServiceImpl
+ * @Date 2023/5/15 16:40
+ **/
+@Service
+public class BusinessOpportunityRadarServiceImpl implements BusinessOpportunityRadarService {
+
+    @Autowired
+    private DskOpenApiUtil dskOpenApiUtil;
+
+
+    @Override
+    public AjaxResult jskBidNewsPage(ComposeQueryDto compose) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/jskBid/news/page", BeanUtil.beanToMap(compose, false, false));
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+
+    @Override
+    public AjaxResult jskBidTenderPage(ComposeQueryDto compose) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/jskBidTender/page", BeanUtil.beanToMap(compose, false, false));
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    @Override
+    public AjaxResult establishmentPage(ComposeQueryDto compose) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/establishment/page", BeanUtil.beanToMap(compose, false, false));
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    @Override
+    public AjaxResult landMarketPage(ComposeQueryDto compose) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/landMarket/page", BeanUtil.beanToMap(compose, false, false));
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    @Override
+    public AjaxResult enterprisePage(ComposeQueryDto compose) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/enterprice/index", BeanUtil.beanToMap(compose, false, false));
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+}

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

 package com.dsk.web.controller.search.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson2.JSONObject;
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.core.domain.R;
 import com.dsk.common.dtos.ComposeQueryDto;
@@ -24,33 +25,45 @@ public class MarketAnalysisServiceImpl implements MarketAnalysisService {
     private DskOpenApiUtil dskOpenApiUtil;
     @Override
     public AjaxResult areaGroupByProvince() {
-
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/marketAnalysis/areaGroupByProvince", null);
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/marketAnalysis/areaGroupByProvince", null);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
     @Override
     public AjaxResult certGroupByMajorAndLevel() {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/marketAnalysis/certGroupByMajorAndLevel", null);
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/marketAnalysis/certGroupByMajorAndLevel", null);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
 
     @Override
     public AjaxResult certGroupByMajorProvinceLevel()  {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/marketAnalysis/certGroupByMajorProvinceLevel", null);
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/marketAnalysis/certGroupByMajorProvinceLevel", null);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+
+    @Override
+    public AjaxResult bidMoneyGroupByProjectType(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/marketAnalysis/bidMoneyGroupByProjectType", object);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    @Override
+    public AjaxResult bidGroupCountByProjectType(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/marketAnalysis/bidGroupCountByProjectType", object);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
     @Override
     public AjaxResult countGroupByProvince(ComposeQueryDto compose) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/marketAnalysis/countGroupByProvince", BeanUtil.beanToMap(compose, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/marketAnalysis/countGroupByProvince", BeanUtil.beanToMap(compose, false, false));
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
     @Override
     public AjaxResult countGroupByMonth(ComposeQueryDto compose) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/marketAnalysis/countGroupByDate", BeanUtil.beanToMap(compose, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/marketAnalysis/countGroupByDate", BeanUtil.beanToMap(compose, false, false));
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/BasePage.java

@@ -9,11 +9,16 @@ package com.dsk.common.core.domain.model;
  */
 public class BasePage {
 	
+	/**
+	 * 当前页码
+	 */
+	private Integer pageNum = 1;
+
 	/**
 	 * 当前页码
 	 */
 	private Integer pageIndex = 1;
-	
+
 	/**
 	 * 每页数量
 	 */
@@ -22,7 +27,7 @@ public class BasePage {
 	/**
 	 * 最大页码
 	 */
-	private Integer pageMaxIndex;
+	private Integer pageMaxNum;
 	
 	/**
 	 * 最大条数
@@ -31,11 +36,14 @@ public class BasePage {
 
 	
 	public Integer getPageIndex() {
-		return pageMaxIndex != null && pageIndex > pageMaxIndex?  pageMaxIndex : pageIndex;
+		return pageNum;
+	}
+	public Integer getPageNum() {
+		return pageMaxNum != null && pageNum > pageMaxNum?  pageMaxNum : pageNum;
 	}
 
-	public void setPageIndex(Integer pageIndex) {
-		this.pageIndex = pageIndex;
+	public void setPageNum(Integer pageNum) {
+		this.pageNum = pageNum;
 	}
 
 	public Integer getPageSize() {
@@ -46,12 +54,12 @@ public class BasePage {
 		this.pageSize = pageSize;
 	}
 
-	public Integer getPageMaxIndex() {
-		return pageMaxIndex;
+	public Integer getPageMaxNum() {
+		return pageMaxNum;
 	}
 
-	public void setPageMaxIndex(Integer pageMaxIndex) {
-		this.pageMaxIndex = pageMaxIndex;
+	public void setPageMaxNum(Integer pageMaxNum) {
+		this.pageMaxNum = pageMaxNum;
 	}
 
 	public Integer getPageMaxSize() {
@@ -62,11 +70,15 @@ public class BasePage {
 		this.pageMaxSize = pageMaxSize;
 	}
 
+	public void setPageIndex(Integer pageIndex) {
+		this.pageIndex = pageNum;
+	}
+
 	@Override
 	public String toString() {
 		StringBuilder builder = new StringBuilder();
 		builder.append("BasePageVo [pageIndex=");
-		builder.append(pageIndex);
+		builder.append(pageNum);
 		builder.append(", pageSize=");
 		builder.append(pageSize);
 		builder.append("]");

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditAbnormalPageBody.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseCreditAbnormalPageBody extends BasePage {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+    /**
+     * 年份列表
+     */
+    private List<String> years;
+
+
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditAbnormalYearsBody.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseCreditAbnormalYearsBody {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditExecutedPageBody.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseCreditExecutedPageBody extends BasePage {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+    /**
+     * 开始时间（年月日）
+     */
+    private String dateFrom;
+    /**
+     * 截止时间（年月日）
+     */
+    private String dateTo;
+
+
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditExecutedPersonsPageBody.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseCreditExecutedPersonsPageBody extends BasePage {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+    /**
+     * 开始时间（年月日）
+     */
+    private String dateFrom;
+    /**
+     * 截止时间（年月日）
+     */
+    private String dateTo;
+
+
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditKaitingCauseActionBody.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseCreditKaitingCauseActionBody {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditKaitingPageBody.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseCreditKaitingPageBody extends BasePage {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+    /**
+     * 案由
+     */
+    private String causeAction;
+
+    /**
+     * 身份
+     */
+    private String pureRole;
+
+    /**
+     * 查询关键词
+     */
+    private String keys;
+
+    /**
+     * 开始时间（年月日）
+     */
+    private String dateFrom;
+
+    /**
+     * 截止时间（年月日）
+     */
+    private String dateTo;
+
+
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditKaitingPureRoleBody.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseCreditKaitingPureRoleBody {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditLawsuitsCauseActionBody.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseCreditLawsuitsCauseActionBody {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditLawsuitsPageBody.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseCreditLawsuitsPageBody extends BasePage {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+    /**
+     * 裁判文书案由
+     */
+    private String causeAction;
+    /**
+     * 裁判文书身份
+     */
+    private String role;
+
+    /**
+     * 查询关键词
+     */
+    private String keys;
+
+
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditLawsuitsRoleBody.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseCreditLawsuitsRoleBody {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditNoticeCaseReasonBody.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseCreditNoticeCaseReasonBody {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditNoticePageBody.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseCreditNoticePageBody extends BasePage {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+    /**
+     * 公告类型
+     */
+    private String type;
+
+    /**
+     * 身份
+     */
+    private String role;
+
+    /**
+     * 案由
+     */
+    private String caseReason;
+
+    /**
+     * 开始时间（年月日）
+     */
+    private String dateFrom;
+
+    /**
+     * 截止时间（年月日）
+     */
+    private String dateTo;
+
+
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditNoticeRoleBody.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseCreditNoticeRoleBody {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditNoticeTypeBody.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseCreditNoticeTypeBody {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditPenalizePageBody.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseCreditPenalizePageBody extends BasePage {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+    /**
+     * 处罚原因类型
+     */
+    private Integer penalizeReasonType;
+
+    /**
+     * 查询关键字
+     */
+    private String keys;
+
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditPenalizeReasonTypeBody.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseCreditPenalizeReasonTypeBody {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+}

dsk-common/src/main/java/com/dsk/common/core/page/TableDataInfo.java

 package com.dsk.common.core.page;
 
+import com.dsk.common.constant.HttpStatus;
+
 import java.io.Serializable;
 import java.util.List;
 
@@ -41,6 +43,8 @@ public class TableDataInfo implements Serializable
     {
         this.rows = list;
         this.total = total;
+        this.code = HttpStatus.SUCCESS;
+        this.msg = "查询成功";
     }
 
     public long getTotal()

dsk-common/src/main/java/com/dsk/common/utils/DskOpenApiUtil.java

 package com.dsk.common.utils;
 
+import cn.hutool.http.HttpUtil;
+import cn.hutool.json.JSONConfig;
+import cn.hutool.json.JSONUtil;
 import com.dsk.acc.openapi.api.AccClient;
 import com.dsk.acc.openapi.client.Config;
 import com.dsk.acc.openapi.client.util.CommonUtils;
 import com.dsk.common.config.DskOpenApiConfig;
+import com.dsk.common.core.page.TableDataInfo;
+import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
 @Component
@@ -24,6 +31,10 @@ public class DskOpenApiUtil {
 		return request(path, bodyMap, "json");
 	}
 
+	public Map<String,Object> requestBodyLocal(String path, Map<String, Object> bodyMap){
+		return JSONUtil.toBean(HttpUtil.post("http://127.0.0.1:8766"+path, JSONUtil.toJsonStr(bodyMap)), JSONConfig.create().setIgnoreNullValue(true), Map.class);
+	}
+
 	public Map<String,Object> requestBodyWithHeader(String path, Map<String, Object> bodyMap, Map<String, String> headerMap){
 		return requestWithHeader(path, bodyMap, "json", headerMap);
 	}
@@ -88,4 +99,14 @@ public class DskOpenApiUtil {
 		}
 	}
 
+
+	public TableDataInfo responsePage(Map<String, Object> resMap) throws Exception {
+		Integer code = MapUtils.getInteger(resMap, "code", 300);
+		Map data = MapUtils.getMap(resMap, "data", null);
+		if (200 != code) throw new RuntimeException();
+		Integer count = MapUtils.getInteger(data, "totalCount", 0);
+		Object list = MapUtils.getObject(data, "list", "");
+		return new TableDataInfo((List<?>) list, count);
+	}
+
 }
\ No newline at end of file

dsk-operate-ui/package.json

@@ -40,7 +40,7 @@
     "axios": "0.24.0",
     "clipboard": "2.0.8",
     "core-js": "3.25.3",
-    "echarts": "5.4.0",
+    "echarts": "^5.4.0",
     "element-resize-detector": "^1.2.4",
     "element-ui": "2.15.12",
     "file-saver": "2.0.5",

dsk-operate-ui/src/assets/styles/project.scss

+
+.app-container{
+  padding: 0;
+}
 //小导航
 .miantitle{
   color: #232323;
@@ -791,3 +795,23 @@
 .p10{
   padding: 0 10px;
 }
+
+.tips{
+  display: inline-block;
+  padding: 4px 8px;
+  border-radius: 2px;
+  font-size: 12px;
+  margin-right: 8px;
+  &.tip1{
+    background-color: #E4F3FD;
+    color: #41A1FD;
+  }
+  &.tip2{
+    background-color: #F3F3FF;
+    color: #8491E8;
+  }
+  &.tip3{
+    background-color: #DEF6F0;
+    color: #0BAE8D;
+  }
+}

dsk-operate-ui/src/views/custom/customList/index.vue

@@ -228,7 +228,6 @@ export default {
 
 <style lang="scss" scoped>
   .app-container{
-    padding: 0;
     height: calc(100vh - 134px)
   }
 .box-card{

dsk-operate-ui/src/views/project/projectList/detail.vue

@@ -132,9 +132,6 @@
 </script>
 
 <style lang="scss" scoped>
-  .app-container{
-    padding: 0;
-  }
   .head{
     .titles{
       line-height: 31px;

dsk-operate-ui/src/views/project/projectList/index.vue

@@ -331,10 +331,6 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-  .app-container{
-    padding: 0;
-  }
-
   .noborder{
     position: relative;
   }
@@ -484,21 +480,6 @@ export default {
       }
       .det-tips{
         padding: 8px 0 ;
-        .tips{
-          display: inline-block;
-          padding: 4px 8px;
-          border-radius: 2px;
-          font-size: 12px;
-          margin-right: 8px;
-          &.tip1{
-            background-color: #E4F3FD;
-            color: #41A1FD;
-          }
-          &.tip2{
-            background-color: #F3F3FF;
-            color: #8491E8;
-          }
-        }
       }
       .det-contets{
         padding: 4px 0 16px;

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

+package com.dsk.system.dskService;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.dsk.common.core.domain.R;
+import com.dsk.common.core.page.TableDataInfo;
+import com.dsk.common.utils.DskOpenApiUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+@Service
+public class EnterpriseBussinessService {
+
+    private static final Logger log = LoggerFactory.getLogger(EnterpriseService.class);
+
+    @Autowired
+    private DskOpenApiUtil dskOpenApiUtil;
+
+
+    public TableDataInfo clientPage(Map<String, Object> body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/clientPage", BeanUtil.beanToMap(body, false, false));
+        return dskOpenApiUtil.responsePage(map);
+    }
+
+
+    public TableDataInfo clientProjectPage(Map<String, Object> body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/clientProjectPage", BeanUtil.beanToMap(body, false, false));
+        return dskOpenApiUtil.responsePage(map);
+    }
+
+
+    public TableDataInfo tenderPage(Map<String, Object> body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/tenderPage", BeanUtil.beanToMap(body, false, false));
+        return dskOpenApiUtil.responsePage(map);
+    }
+
+
+    public R tenderDetail(Map<String, Object> body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/tenderDetail", BeanUtil.beanToMap(body, false, false));
+        return BeanUtil.toBean(map, R.class);
+    }
+
+
+    public TableDataInfo supplierPage(Map<String, Object> body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/supplierPage", BeanUtil.beanToMap(body, false, false));
+        return dskOpenApiUtil.responsePage(map);
+    }
+
+
+    public TableDataInfo supplierProjectPage(Map<String, Object> body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/supplierProjectPage", BeanUtil.beanToMap(body, false, false));
+        return dskOpenApiUtil.responsePage(map);
+    }
+
+
+    public R projectDetail(Map<String, Object> body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/projectDetail", BeanUtil.beanToMap(body, false, false));
+        return BeanUtil.toBean(map, R.class);
+    }
+
+
+    public TableDataInfo oftenAgencyPage(Map<String, Object> body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/oftenAgencyPage", BeanUtil.beanToMap(body, false, false));
+        return dskOpenApiUtil.responsePage(map);
+    }
+
+
+    public TableDataInfo bidCooperatePage(Map<String, Object> body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/bidCooperatePage", BeanUtil.beanToMap(body, false, false));
+        return dskOpenApiUtil.responsePage(map);
+    }
+
+
+    public TableDataInfo historySendPage(Map<String, Object> body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/historySendPage", BeanUtil.beanToMap(body, false, false));
+        return dskOpenApiUtil.responsePage(map);
+    }
+
+
+    public R historySendProvince(Map<String, Object> body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/historySendProvince", BeanUtil.beanToMap(body, false, false));
+        return BeanUtil.toBean(map, R.class);
+    }
+}

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

+package com.dsk.system.dskService;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+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.dtos.Page;
+import com.dsk.common.utils.DskOpenApiUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+import static com.dsk.common.utils.PageUtils.startPage;
+
+@Service
+public class EnterpriseCreditService {
+
+    private static final Logger log = LoggerFactory.getLogger(EnterpriseService.class);
+
+    @Autowired
+    private DskOpenApiUtil dskOpenApiUtil;
+
+
+    public TableDataInfo penalizePage(EnterpriseCreditPenalizePageBody body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBodyLocal("/operate/enterpriseCredit/penalizePage", BeanUtil.beanToMap(body, false, false));
+        return dskOpenApiUtil.responsePage(map);
+    }
+
+
+    public R penalizeReasonType(EnterpriseCreditPenalizeReasonTypeBody body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBodyLocal("/operate/enterpriseCredit/penalizeReasonType", BeanUtil.beanToMap(body, false, false));
+        return BeanUtil.toBean(map, R.class);
+    }
+
+
+    public TableDataInfo abnormalPage(EnterpriseCreditAbnormalPageBody body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBodyLocal("/operate/enterpriseCredit/abnormalPage", BeanUtil.beanToMap(body, false, false));
+        return dskOpenApiUtil.responsePage(map);
+    }
+
+
+    public R abnormalYears(EnterpriseCreditAbnormalYearsBody body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBodyLocal("/operate/enterpriseCredit/abnormalYears", BeanUtil.beanToMap(body, false, false));
+        return BeanUtil.toBean(map, R.class);
+    }
+
+
+    public TableDataInfo executedPersonsPage(EnterpriseCreditExecutedPersonsPageBody body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBodyLocal("/operate/enterpriseCredit/executedPersonsPage", BeanUtil.beanToMap(body, false, false));
+        return dskOpenApiUtil.responsePage(map);
+    }
+
+
+    public TableDataInfo executedPage(EnterpriseCreditExecutedPageBody body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBodyLocal("/operate/enterpriseCredit/executedPage", BeanUtil.beanToMap(body, false, false));
+        return dskOpenApiUtil.responsePage(map);
+    }
+
+
+    public TableDataInfo lawsuitsPage(EnterpriseCreditLawsuitsPageBody body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBodyLocal("/operate/enterpriseCredit/lawsuitsPage", BeanUtil.beanToMap(body, false, false));
+        return dskOpenApiUtil.responsePage(map);
+    }
+
+
+    public R lawsuitsCauseAction(EnterpriseCreditLawsuitsCauseActionBody body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBodyLocal("/operate/enterpriseCredit/lawsuitsCauseAction", BeanUtil.beanToMap(body, false, false));
+        return BeanUtil.toBean(map, R.class);
+    }
+
+
+    public R lawsuitsRole(EnterpriseCreditLawsuitsRoleBody body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBodyLocal("/operate/enterpriseCredit/lawsuitsRole", BeanUtil.beanToMap(body, false, false));
+        return BeanUtil.toBean(map, R.class);
+    }
+
+
+    public TableDataInfo noticesPage(EnterpriseCreditNoticePageBody body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBodyLocal("/operate/enterpriseCredit/noticesPage", BeanUtil.beanToMap(body, false, false));
+        return dskOpenApiUtil.responsePage(map);
+    }
+
+
+    public R noticesType(EnterpriseCreditNoticeTypeBody body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBodyLocal("/operate/enterpriseCredit/noticesType", BeanUtil.beanToMap(body, false, false));
+        return BeanUtil.toBean(map, R.class);
+    }
+
+
+    public R noticesRole(EnterpriseCreditNoticeRoleBody body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBodyLocal("/operate/enterpriseCredit/noticesRole", BeanUtil.beanToMap(body, false, false));
+        return BeanUtil.toBean(map, R.class);
+    }
+
+
+    public R noticesCaseReason(EnterpriseCreditNoticeCaseReasonBody body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBodyLocal("/operate/enterpriseCredit/noticesCaseReason", BeanUtil.beanToMap(body, false, false));
+        return BeanUtil.toBean(map, R.class);
+    }
+
+
+    public TableDataInfo kaitingPage(EnterpriseCreditKaitingPageBody body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBodyLocal("/operate/enterpriseCredit/kaitingPage", BeanUtil.beanToMap(body, false, false));
+        return dskOpenApiUtil.responsePage(map);
+    }
+
+
+    public R kaitingCauseAction(EnterpriseCreditKaitingCauseActionBody body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBodyLocal("/operate/enterpriseCredit/kaitingCauseAction", BeanUtil.beanToMap(body, false, false));
+        return BeanUtil.toBean(map, R.class);
+    }
+
+
+    public R kaitingPureRole(EnterpriseCreditKaitingPureRoleBody body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBodyLocal("/operate/enterpriseCredit/kaitingPureRole", BeanUtil.beanToMap(body, false, false));
+        return BeanUtil.toBean(map, R.class);
+    }
+}

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

+package com.dsk.system.dskService;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.dsk.common.core.domain.R;
+import com.dsk.common.core.page.TableDataInfo;
+import com.dsk.common.utils.DskOpenApiUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+@Service
+public class EnterpriseProjectService {
+
+    private static final Logger log = LoggerFactory.getLogger(EnterpriseService.class);
+
+    @Autowired
+    private DskOpenApiUtil dskOpenApiUtil;
+
+
+    public TableDataInfo landTransactionPage(Map<String, Object> body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/landTransactionPage", BeanUtil.beanToMap(body, false, false));
+        return dskOpenApiUtil.responsePage(map);
+    }
+
+
+    public R landUse(Map<String, Object> body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/landUse", BeanUtil.beanToMap(body, false, false));
+        return BeanUtil.toBean(map, R.class);
+    }
+
+
+    public R landDetail(Map<String, Object> body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/landDetail", BeanUtil.beanToMap(body, false, false));
+        return BeanUtil.toBean(map, R.class);
+    }
+
+
+    public TableDataInfo approvalProjectPage(Map<String, Object> body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/approvalProjectPage", BeanUtil.beanToMap(body, false, false));
+        return dskOpenApiUtil.responsePage(map);
+    }
+
+
+    public R approvalInfoDetail(Map<String, Object> body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/approvalInfoDetail", BeanUtil.beanToMap(body, false, false));
+        return BeanUtil.toBean(map, R.class);
+    }
+
+
+    public TableDataInfo approvalExaminePage(Map<String, Object> body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/approvalExaminePage", BeanUtil.beanToMap(body, false, false));
+        return dskOpenApiUtil.responsePage(map);
+    }
+
+
+    public TableDataInfo approvalMarketingPage(Map<String, Object> body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/approvalMarketingPage", BeanUtil.beanToMap(body, false, false));
+        return dskOpenApiUtil.responsePage(map);
+    }
+
+
+    public TableDataInfo specialDebtPage(Map<String, Object> body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/specialDebtPage", BeanUtil.beanToMap(body, false, false));
+        return dskOpenApiUtil.responsePage(map);
+    }
+
+
+    public R specialDebtDetail(Map<String, Object> body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/specialDebtDetail", BeanUtil.beanToMap(body, false, false));
+        return BeanUtil.toBean(map, R.class);
+    }
+
+
+    public TableDataInfo bidNoticePage(Map<String, Object> body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/bidNoticePage", BeanUtil.beanToMap(body, false, false));
+        return dskOpenApiUtil.responsePage(map);
+    }
+
+
+    public R bidNoticeTenderStage(Map<String, Object> body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/bidNoticeTenderStage", BeanUtil.beanToMap(body, false, false));
+        return BeanUtil.toBean(map, R.class);
+    }
+
+
+    public R bidNoticeProvince(Map<String, Object> body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/bidNoticeProvince", BeanUtil.beanToMap(body, false, false));
+        return BeanUtil.toBean(map, R.class);
+    }
+
+
+    public R bidNoticeDetail(Map<String, Object> body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/bidNoticeDetail", BeanUtil.beanToMap(body, false, false));
+        return BeanUtil.toBean(map, R.class);
+    }
+
+
+    public TableDataInfo bidPlanPage(Map<String, Object> body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/bidPlanPage", BeanUtil.beanToMap(body, false, false));
+        return dskOpenApiUtil.responsePage(map);
+    }
+
+
+    public R bidPlanDetail(Map<String, Object> body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/bidPlanDetail", BeanUtil.beanToMap(body, false, false));
+        return BeanUtil.toBean(map, R.class);
+    }
+
+
+    public TableDataInfo bidNoticeProPage(Map<String, Object> body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/bidNoticeProPage", BeanUtil.beanToMap(body, false, false));
+        return dskOpenApiUtil.responsePage(map);
+    }
+
+
+    public R bidNoticeProDetail(Map<String, Object> body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/bidNoticeProDetail", BeanUtil.beanToMap(body, false, false));
+        return BeanUtil.toBean(map, R.class);
+    }
+
+
+    public TableDataInfo creditXzxkPage(Map<String, Object> body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/creditXzxkPage", BeanUtil.beanToMap(body, false, false));
+        return dskOpenApiUtil.responsePage(map);
+    }
+}

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

@@ -3,6 +3,7 @@ package com.dsk.system.dskService;
 import cn.hutool.core.bean.BeanUtil;
 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.DskOpenApiUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -55,19 +56,19 @@ public class EnterpriseService {
     }
 
     //todo 新数据，待入库
-    public R partners(EnterprisePartnersBody body) throws Exception {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/partners", BeanUtil.beanToMap(body, false, false));
-        return BeanUtil.toBean(map, R.class);
+    public TableDataInfo partners(EnterprisePartnersBody body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBodyLocal("/operate/enterprise/partners", BeanUtil.beanToMap(body, false, false));
+        return dskOpenApiUtil.responsePage(map);
     }
 
-    public R investment(EnterpriseInvestmentBody body) throws Exception {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/investment", BeanUtil.beanToMap(body, false, false));
-        return BeanUtil.toBean(map, R.class);
+    public TableDataInfo investment(EnterpriseInvestmentBody body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBodyLocal("/operate/enterprise/investment", BeanUtil.beanToMap(body, false, false));
+        return dskOpenApiUtil.responsePage(map);
     }
 
-    public R affiliates(EnterpriseAffiliatesBody body) throws Exception {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/affiliates", BeanUtil.beanToMap(body, false, false));
-        return BeanUtil.toBean(map, R.class);
+    public TableDataInfo affiliates(EnterpriseAffiliatesBody body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBodyLocal("/operate/enterprise/affiliates", BeanUtil.beanToMap(body, false, false));
+        return dskOpenApiUtil.responsePage(map);
     }
 
     public R bidNoticePage(EnterpriseBidNoticePageBody body) throws Exception {
@@ -98,28 +99,28 @@ public class EnterpriseService {
         return BeanUtil.toBean(map, R.class);
     }
 
-    public R dynamicPage(EnterpriseDynamicPageBody body) throws Exception {
+    public TableDataInfo dynamicPage(EnterpriseDynamicPageBody body) throws Exception {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/api/jsk/enterprise/dynamic", BeanUtil.beanToMap(body, false, false));
-        return BeanUtil.toBean(map, R.class);
+        return dskOpenApiUtil.responsePage(map);
     }
 
     public R icInfo(EnterpriseIcInfoBody body) throws Exception {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/icInfo", BeanUtil.beanToMap(body, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBodyLocal("/operate/enterprise/icInfo", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
     }
 
-    public R changeInfo(EnterpriseChangeInfoBody body) throws Exception {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/changeInfo", BeanUtil.beanToMap(body, false, false));
-        return BeanUtil.toBean(map, R.class);
+    public TableDataInfo changeInfo(EnterpriseChangeInfoBody body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBodyLocal("/operate/enterprise/changeInfo", BeanUtil.beanToMap(body, false, false));
+        return dskOpenApiUtil.responsePage(map);
     }
 
-    public R keymembers(EnterpriseKeymembersBody body) throws Exception {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/keymembers", BeanUtil.beanToMap(body, false, false));
-        return BeanUtil.toBean(map, R.class);
+    public TableDataInfo keymembers(EnterpriseKeymembersBody body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBodyLocal("/operate/enterprise/keymembers", BeanUtil.beanToMap(body, false, false));
+        return dskOpenApiUtil.responsePage(map);
     }
 
-    public R bestStockPage(EnterpriseKeymembersBody body) throws Exception {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/bestStockPage", BeanUtil.beanToMap(body, false, false));
-        return BeanUtil.toBean(map, R.class);
+    public TableDataInfo bestStockPage(EnterpriseKeymembersBody body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBodyLocal("/operate/enterprise/bestStockPage", BeanUtil.beanToMap(body, false, false));
+        return dskOpenApiUtil.responsePage(map);
     }
 }