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

dsk-admin/src/main/java/com/dsk/web/controller/customer/CustomerController.java

@@ -14,8 +14,8 @@ import com.dsk.common.utils.poi.ExcelUtil;
 import com.dsk.system.domain.customer.Customer;
 import com.dsk.system.domain.customer.dto.CustomerBusinessSearchDto;
 import com.dsk.system.domain.customer.dto.CustomerSearchDto;
+import com.dsk.system.searchService.BusinessOpportunityRadarService;
 import com.dsk.system.service.ICustomerService;
-import com.dsk.web.controller.search.service.BusinessOpportunityRadarService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.util.ObjectUtils;
@@ -39,8 +39,8 @@ public class CustomerController extends BaseController {
 
     @Autowired
     private ICustomerService baseService;
-    @Autowired
-    private BusinessOpportunityRadarService opportunityRadarService;
+//    @Autowired
+//    private BusinessOpportunityRadarService opportunityRadarService;
 
     /**
      * 查询客户列表
@@ -68,7 +68,6 @@ public class CustomerController extends BaseController {
     @PostMapping()
     @RepeatSubmit
     public AjaxResult add(@RequestBody Customer customer) {
-        dealWithcustomerData(customer);
         return toAjax(baseService.add(customer));
     }
 
@@ -80,7 +79,6 @@ public class CustomerController extends BaseController {
     @RepeatSubmit
     public AjaxResult claim(@RequestBody Customer customer) {
         if (ObjectUtils.isEmpty(customer.getUipId())) throw new BeanException("城投uipId不能为空");
-        dealWithcustomerData(customer);
         boolean add = baseService.add(customer);
         if (add) {
             Map<String, Object> map = new HashMap<>();
@@ -90,43 +88,6 @@ public class CustomerController extends BaseController {
         return AjaxResult.error();
     }
 
-    private void dealWithcustomerData(Customer customer) {
-        if (ObjectUtils.isEmpty(customer.getCompanyName())) throw new BeanException("企业名称不能为空");
-        if (ObjectUtils.isEmpty(customer.getCompanyId())) {
-            try {
-                Map<String, Object> map = opportunityRadarService.enterpriseByName(customer.getCompanyName());
-                if (!ObjectUtils.isEmpty(map.get("data"))) {
-                    customer.setCompanyId(MapUtil.getInt(BeanUtil.beanToMap(map.get("data")), "jskEid"));
-                    if (ObjectUtils.isEmpty(customer.getLegalPerson())) {
-                        customer.setLegalPerson(MapUtil.getStr(map, "legalPerson"));
-                    }
-                    if (ObjectUtils.isEmpty(customer.getRegisterCapital())) {
-                        customer.setRegisterCapital(MapUtil.getStr(map, "registeredCapitalStr"));
-                    }
-                    if (ObjectUtils.isEmpty(customer.getProvinceId())) {
-                        customer.setProvinceId(MapUtil.getInt(map, "provinceId"));
-                    }
-                    if (ObjectUtils.isEmpty(customer.getCityId())) {
-                        customer.setCityId(MapUtil.getInt(map, "cityId"));
-                    }
-                    if (ObjectUtils.isEmpty(customer.getDistrictId())) {
-                        customer.setDistrictId(MapUtil.getInt(map, "countyId"));
-                    }
-                    if (ObjectUtils.isEmpty(customer.getRegisterAddress())) {
-                        customer.setRegisterAddress(MapUtil.getStr(map, "domicile"));
-                    }
-                    if (ObjectUtils.isEmpty(customer.getCreditCode())) {
-                        customer.setCreditCode(MapUtil.getStr(map, "creditCode"));
-                    }
-                }
-            } catch (Exception e) {
-                logger.debug("获取企业id错误！error：{}", e.getMessage());
-            }
-        }
-    }
-
-
-
     /**
      * 编辑客户
      */
@@ -167,21 +128,21 @@ public class CustomerController extends BaseController {
                 continue;
             }
             try {
-                Map<String, Object> map = opportunityRadarService.enterpriseByName(customer.getCompanyName());
-                if (ObjectUtils.isEmpty(map)) {
-                    throw new HttpException("远程调用匹配接口失败！");
-                }
-                Map<String, Object> obj = BeanUtil.beanToMap(map.get("data"));
-                if (!ObjectUtils.isEmpty(obj)) {
-                    customer.setCompanyId(MapUtil.getInt(obj, "jskEid"));
-                    customer.setLegalPerson(MapUtil.getStr(obj, "legalPerson"));
-                    customer.setRegisterCapital(MapUtil.getStr(obj, "registeredCapitalStr"));
-                    customer.setProvinceId(MapUtil.getInt(obj, "provinceId"));
-                    customer.setCityId(MapUtil.getInt(obj, "cityId"));
-                    customer.setDistrictId(MapUtil.getInt(obj, "countyId"));
-                    customer.setRegisterAddress(MapUtil.getStr(obj, "domicile"));
-                    customer.setCreditCode(MapUtil.getStr(obj, "creditCode"));
-                }
+//                Map<String, Object> map = opportunityRadarService.enterpriseByName(customer.getCompanyName());
+//                if (ObjectUtils.isEmpty(map)) {
+//                    throw new HttpException("远程调用匹配接口失败！");
+//                }
+//                Map<String, Object> obj = BeanUtil.beanToMap(map.get("data"));
+//                if (!ObjectUtils.isEmpty(obj)) {
+//                    customer.setCompanyId(MapUtil.getInt(obj, "jskEid"));
+//                    customer.setLegalPerson(MapUtil.getStr(obj, "legalPerson"));
+//                    customer.setRegisterCapital(MapUtil.getStr(obj, "registeredCapitalStr"));
+//                    customer.setProvinceId(MapUtil.getInt(obj, "provinceId"));
+//                    customer.setCityId(MapUtil.getInt(obj, "cityId"));
+//                    customer.setDistrictId(MapUtil.getInt(obj, "countyId"));
+//                    customer.setRegisterAddress(MapUtil.getStr(obj, "domicile"));
+//                    customer.setCreditCode(MapUtil.getStr(obj, "creditCode"));
+//                }
                 baseService.add(customer);
                 successCount++;
             } catch (Exception e) {

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

@@ -3,9 +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 com.dsk.system.searchService.BusinessOpportunityRadarService;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

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

@@ -4,7 +4,7 @@ import cn.hutool.json.JSONUtil;
 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.system.searchService.BusinessOpportunityRadarService;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;

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

@@ -4,8 +4,7 @@ import com.alibaba.fastjson2.JSONObject;
 import com.dsk.common.core.controller.BaseController;
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.core.page.TableDataInfo;
-import com.dsk.common.dtos.ComposeQueryDto;
-import com.dsk.web.controller.search.service.MarketAnalysisService;
+import com.dsk.system.searchService.MarketAnalysisService;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

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(JSONObject object);
-
-    AjaxResult jskBidTenderPage(JSONObject object);
-
-    AjaxResult jskBidPage(JSONObject object);
-
-    AjaxResult landMarketPage( JSONObject object);
-
-    AjaxResult establishmentPage(JSONObject object);
-
-    AjaxResult enterpriseIndex(JSONObject object);
-
-    AjaxResult enterpriseByName(String keyword);
-
-    AjaxResult enterprisePage(JSONObject object);
-
-    AjaxResult bondProjectPage( JSONObject object);
-
-    AjaxResult jskBidPlanPage( JSONObject object);
-
-    AjaxResult getCapitalSourceSelect();
-
-    AjaxResult keywordList();
-
-    AjaxResult bidSourceList( JSONObject object);
-
-}
+//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(JSONObject object);
+//
+//    AjaxResult jskBidTenderPage(JSONObject object);
+//
+//    AjaxResult jskBidPage(JSONObject object);
+//
+//    AjaxResult landMarketPage( JSONObject object);
+//
+//    AjaxResult establishmentPage(JSONObject object);
+//
+//    AjaxResult enterpriseIndex(JSONObject object);
+//
+//    AjaxResult enterpriseByName(String keyword);
+//
+//    AjaxResult enterprisePage(JSONObject object);
+//
+//    AjaxResult bondProjectPage( JSONObject object);
+//
+//    AjaxResult jskBidPlanPage( JSONObject object);
+//
+//    AjaxResult getCapitalSourceSelect();
+//
+//    AjaxResult keywordList();
+//
+//    AjaxResult bidSourceList( JSONObject object);
+//
+//}

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;
-
-/**
- * @Author liujie
- * @ClassName MarketAnalysisService
- * @Date 2023/5/15 16:39
- **/
-public interface MarketAnalysisService {
-
-    AjaxResult areaGroupByProvince();
-
-    AjaxResult certGroupByMajorAndLevel();
-
-    AjaxResult certGroupByMajorProvinceLevel();
-
-    AjaxResult countGroupByProvince(JSONObject object);
-
-    AjaxResult countGroupByMonth(JSONObject object);
-
-    AjaxResult bidMoneyGroupByProjectType(JSONObject object);
-
-    AjaxResult bidGroupCountByProjectType(JSONObject object);
-}
+//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 MarketAnalysisService {
+//
+//    AjaxResult areaGroupByProvince();
+//
+//    AjaxResult certGroupByMajorAndLevel();
+//
+//    AjaxResult certGroupByMajorProvinceLevel();
+//
+//    AjaxResult countGroupByProvince(JSONObject object);
+//
+//    AjaxResult countGroupByMonth(JSONObject object);
+//
+//    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.HashMap;
-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(JSONObject object) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBid/news/page", object);
-        return BeanUtil.toBean(map, AjaxResult.class);
-    }
-
-
-    @Override
-    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(JSONObject object) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/establishment/page", object);
-        return BeanUtil.toBean(map, AjaxResult.class);
-    }
-
-    @Override
-    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(JSONObject object) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/landMarket/page", object);
-        return BeanUtil.toBean(map, AjaxResult.class);
-    }
-
-    @Override
-    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(JSONObject object) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/page",object);
-        return BeanUtil.toBean(map, AjaxResult.class);
-    }
-
-
-    @Override
-    public AjaxResult enterpriseByName(String keyword){
-        Map<String,Object> params = new HashMap<>();
-        params.put("keyword",keyword);
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/findByName", params);
-        return BeanUtil.toBean(map, AjaxResult.class);
-    }
-
-    @Override
-    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(JSONObject object) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBidPlan/page",object);
-        return BeanUtil.toBean(map, AjaxResult.class);
-    }
-
-    @Override
-    public AjaxResult getCapitalSourceSelect() {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBidPlan/getCapitalSourceSelect", null);
-        return BeanUtil.toBean(map, AjaxResult.class);
-    }
-
-    @Override
-    public AjaxResult keywordList() {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/project/keywordList", null);
-        return BeanUtil.toBean(map, AjaxResult.class);
-    }
-
-    @Override
-    public AjaxResult bidSourceList(JSONObject object) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBid/source",object);
-        return BeanUtil.toBean(map, AjaxResult.class);
-    }
-}
+//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.HashMap;
+//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(JSONObject object) {
+//        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBid/news/page", object);
+//        return BeanUtil.toBean(map, AjaxResult.class);
+//    }
+//
+//
+//    @Override
+//    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(JSONObject object) {
+//        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/establishment/page", object);
+//        return BeanUtil.toBean(map, AjaxResult.class);
+//    }
+//
+//    @Override
+//    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(JSONObject object) {
+//        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/landMarket/page", object);
+//        return BeanUtil.toBean(map, AjaxResult.class);
+//    }
+//
+//    @Override
+//    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(JSONObject object) {
+//        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/page",object);
+//        return BeanUtil.toBean(map, AjaxResult.class);
+//    }
+//
+//
+//    @Override
+//    public AjaxResult enterpriseByName(String keyword){
+//        Map<String,Object> params = new HashMap<>();
+//        params.put("keyword",keyword);
+//        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/findByName", params);
+//        return BeanUtil.toBean(map, AjaxResult.class);
+//    }
+//
+//    @Override
+//    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(JSONObject object) {
+//        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBidPlan/page",object);
+//        return BeanUtil.toBean(map, AjaxResult.class);
+//    }
+//
+//    @Override
+//    public AjaxResult getCapitalSourceSelect() {
+//        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBidPlan/getCapitalSourceSelect", null);
+//        return BeanUtil.toBean(map, AjaxResult.class);
+//    }
+//
+//    @Override
+//    public AjaxResult keywordList() {
+//        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/project/keywordList", null);
+//        return BeanUtil.toBean(map, AjaxResult.class);
+//    }
+//
+//    @Override
+//    public AjaxResult bidSourceList(JSONObject object) {
+//        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBid/source",object);
+//        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;
-import com.dsk.common.utils.DskOpenApiUtil;
-import com.dsk.common.utils.http.HttpUtils;
-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 MarketAnalysisServiceImpl implements MarketAnalysisService {
-
-    @Autowired
-    private DskOpenApiUtil dskOpenApiUtil;
-    @Override
-    public AjaxResult areaGroupByProvince() {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/areaGroupByProvince", null);
-        return BeanUtil.toBean(map, AjaxResult.class);
-    }
-
-    @Override
-    public AjaxResult certGroupByMajorAndLevel() {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/certGroupByMajorAndLevel", null);
-        return BeanUtil.toBean(map, AjaxResult.class);
-    }
-
-
-    @Override
-    public AjaxResult certGroupByMajorProvinceLevel()  {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/certGroupByMajorProvinceLevel", null);
-        return BeanUtil.toBean(map, AjaxResult.class);
-    }
-
-
-    @Override
-    public AjaxResult bidMoneyGroupByProjectType(JSONObject object) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/bidMoneyGroupByProjectType", object);
-        return BeanUtil.toBean(map, AjaxResult.class);
-    }
-
-    @Override
-    public AjaxResult bidGroupCountByProjectType(JSONObject object) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/bidGroupCountByProjectType", object);
-        return BeanUtil.toBean(map, AjaxResult.class);
-    }
-
-    @Override
-    public AjaxResult countGroupByProvince(JSONObject object) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/countGroupByProvince", object);
-        return BeanUtil.toBean(map, AjaxResult.class);
-    }
-
-    @Override
-    public AjaxResult countGroupByMonth(JSONObject object) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/countGroupByMonth", object);
-        return BeanUtil.toBean(map, AjaxResult.class);
-    }
-}
+//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;
+//import com.dsk.common.utils.DskOpenApiUtil;
+//import com.dsk.common.utils.http.HttpUtils;
+//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 MarketAnalysisServiceImpl implements MarketAnalysisService {
+//
+//    @Autowired
+//    private DskOpenApiUtil dskOpenApiUtil;
+//    @Override
+//    public AjaxResult areaGroupByProvince() {
+//        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/areaGroupByProvince", null);
+//        return BeanUtil.toBean(map, AjaxResult.class);
+//    }
+//
+//    @Override
+//    public AjaxResult certGroupByMajorAndLevel() {
+//        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/certGroupByMajorAndLevel", null);
+//        return BeanUtil.toBean(map, AjaxResult.class);
+//    }
+//
+//
+//    @Override
+//    public AjaxResult certGroupByMajorProvinceLevel()  {
+//        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/certGroupByMajorProvinceLevel", null);
+//        return BeanUtil.toBean(map, AjaxResult.class);
+//    }
+//
+//
+//    @Override
+//    public AjaxResult bidMoneyGroupByProjectType(JSONObject object) {
+//        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/bidMoneyGroupByProjectType", object);
+//        return BeanUtil.toBean(map, AjaxResult.class);
+//    }
+//
+//    @Override
+//    public AjaxResult bidGroupCountByProjectType(JSONObject object) {
+//        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/bidGroupCountByProjectType", object);
+//        return BeanUtil.toBean(map, AjaxResult.class);
+//    }
+//
+//    @Override
+//    public AjaxResult countGroupByProvince(JSONObject object) {
+//        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/countGroupByProvince", object);
+//        return BeanUtil.toBean(map, AjaxResult.class);
+//    }
+//
+//    @Override
+//    public AjaxResult countGroupByMonth(JSONObject object) {
+//        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/countGroupByMonth", object);
+//        return BeanUtil.toBean(map, AjaxResult.class);
+//    }
+//}

dsk-admin/src/main/resources/application-pre.yml

@@ -194,11 +194,11 @@ xss:
 
 dsk:
   open:
-    endPoint: 120.27.13.145:8865
-    accessKeyId: aec7b3ff2y2q8x6t49a7e2c463ce21912
-    accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b
-    protocol: http
-#    endPoint: openapi.jiansheku.com
+#    endPoint: 120.27.13.145:8865
 #    accessKeyId: aec7b3ff2y2q8x6t49a7e2c463ce21912
 #    accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b
-#    protocol: https
+#    protocol: http
+    endPoint: openapi.jiansheku.com
+    accessKeyId: aec7b3ff2y2q8x6t49a7e2c463ce21912
+    accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b
+    protocol: https

dsk-admin/src/main/resources/application.yml

 spring:
   profiles:
-    active: pre
+    active: test
 
 # MyBatisPlus配置
 # https://baomidou.com/config/

dsk-common/src/main/java/com/dsk/common/core/domain/entity/BusinessUser.java

 package com.dsk.common.core.domain.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.dsk.common.annotation.Excel;
 import com.dsk.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -11,11 +17,16 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author lxl
  * @date 2023-05-17
  */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("business_user")
 public class BusinessUser extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** $column.columnComment */
+    @TableId(value = "id",type = IdType.INPUT)
     private Integer id;
 
     /** 项目id(business_info表id) */
@@ -24,76 +35,17 @@ public class BusinessUser extends BaseEntity
 
     /** 部门id */
     @Excel(name = "部门id")
-    private Integer deptId;
+    private Long deptId;
 
     /** 用户id */
     @Excel(name = "用户id")
-    private Integer userId;
+    private Long userId;
 
     /** 是否创建人(1 是,0 否) */
     @Excel(name = "是否创建人(1 是,0 否)")
     private Integer isFounder;
 
-    public void setId(Integer id)
-    {
-        this.id = id;
-    }
-
-    public Integer getId()
-    {
-        return id;
-    }
-    public void setBusinessId(Integer businessId)
-    {
-        this.businessId = businessId;
-    }
-
-    public Integer getBusinessId()
-    {
-        return businessId;
-    }
-    public void setDeptId(Integer deptId)
-    {
-        this.deptId = deptId;
-    }
-
-    public Integer getDeptId()
-    {
-        return deptId;
-    }
-    public void setUserId(Integer userId)
-    {
-        this.userId = userId;
-    }
-
-    public Integer getUserId()
-    {
-        return userId;
-    }
-    public void setIsFounder(Integer isFounder)
-    {
-        this.isFounder = isFounder;
-    }
-
-    public Integer getIsFounder()
-    {
-        return isFounder;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("businessId", getBusinessId())
-            .append("deptId",getDeptId() )
-            .append("userId", getUserId())
-            .append("isFounder", getIsFounder())
-            .append("createTime", getCreateTime())
-            .append("updateTime", getUpdateTime())
-            .toString();
-    }
-
-    public BusinessUser(Integer businessId, Integer deptId, Integer userId, Integer isFounder) {
+    public BusinessUser(Integer businessId, Long deptId, Long userId, Integer isFounder) {
         this.businessId = businessId;
         this.deptId = deptId;
         this.userId = userId;

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

@@ -21,6 +21,8 @@ public class EnterpriseInvestmentBody extends BasePage {
     private Integer hasBid;
     private double stockPercentageMin;
     private double stockPercentageMax;
+    //搜索-企业名称
+    private String keyword;
 
     public boolean isVaildCid() {
         return 0 == cid;

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

@@ -524,15 +524,15 @@ ul, li {
     line-height: 50px;
     height: 50px;
   }
-  .el-tabs__item.is-disabled {
-    color: #C0C4CC;
-    cursor: not-allowed;
-  }
   .is-active{
     color: #0081FF;
     font-weight: bold;
   }
 }
+.el-tabs__item.is-disabled {
+  color: #C0C4CC;
+  cursor: not-allowed;
+}
 //按钮
 .btn{
   margin-left: 8px;

dsk-operate-ui/src/views/detail/party-a/opport/proposed.vue

@@ -61,6 +61,7 @@ export default {
       ],
       formData: [
         { type: 3, fieldName: 'keys', value: '', placeholder: '输入项目名称关键词查询', options: [], width: 220},
+        { type: 4, fieldName: 'isProjcet', value: '', placeholder: '是否为民间推介项目', options: []},
       ],
       //列表
       tableLoading:false,

dsk-operate-ui/src/views/detail/party-a/overview/businfo.vue

@@ -2,7 +2,7 @@
   <div class="app-container detail-container">
     <el-tabs v-model="activeName" @tab-click="handleClick" class="detail-tab">
       <el-tab-pane label="工商信息" name="first"></el-tab-pane>
-      <el-tab-pane label="工商变更" name="second"></el-tab-pane>
+      <el-tab-pane label="工商变更" :disabled="tableDataTotal>0" name="second"></el-tab-pane>
     </el-tabs>
 
 
@@ -91,11 +91,13 @@ export default {
       ],
       //列表
       tableLoading:false,
-      tableData:[]
+      tableData:[],
+      tableDataTotal:0
     }
   },
   created() {
-    this.handleQuery()
+    this.handleQuery();
+    this.handleQuery1();
   },
   methods: {
     handleClick(){
@@ -103,13 +105,20 @@ export default {
     },
     async handleQuery() {
       this.tableLoading = true
-      let param = this.activeName == 'first' ? this.baseParams : this.queryParams
-      let res = this.activeName == 'first' ? await icInfo(param) : await changeInfo(param)
+      let param = this.baseParams;
+      let res = await icInfo(param);
       this.tableLoading = false
       if(res.code==200){
-        this.activeName == 'first' ? this.forInfo = res.data : this.tableData = res.rows
+        this.forInfo = res.data
+      }
+    },
+    async handleQuery1() {
+      let param = this.queryParams
+      let res = await changeInfo(param)
+      if(res.code==200){
+        this.tableData = res.rows;
+        this.tableDataTotal = res.total
       }
-      this.activeName == 'first' ? '' : this.tableDataTotal = res.total
     },
     showRegion(region){
       if(region) {

dsk-operate-ui/src/views/detail/party-a/overview/component/relationship.vue

@@ -3,7 +3,7 @@
     <div class="common-title">关系企业</div>
     <el-tabs v-model="activeName" @tab-click="handleClick" class="tabpane selfTab">
       <el-tab-pane label="股东" name="first"></el-tab-pane>
-      <el-tab-pane label="对外投资" name="second"></el-tab-pane>
+      <el-tab-pane label="对外投资" :disabled="shipTotal<1" name="second"></el-tab-pane>
       <el-tab-pane label="分支机构" :disabled="affiliatesTotal<1" name="third"></el-tab-pane>
     </el-tabs>
     <div class="table-item">

dsk-operate-ui/src/views/detail/party-a/overview/holderinfo.vue

@@ -8,7 +8,7 @@
     />
     <el-tabs v-model="activeName" @tab-click="handleClick" class="detail-tab">
       <el-tab-pane label="股东信息" name="first"></el-tab-pane>
-      <el-tab-pane label="历史股东" name="second"></el-tab-pane>
+      <el-tab-pane label="历史股东" :disabled="disabled" name="second"></el-tab-pane>
     </el-tabs>
 
     <tables
@@ -65,11 +65,13 @@ export default {
       tableLoading:false,
       tableData:[],
       tableDataTotal:0,
+      disabled:false,
       labelArr:['失信联合惩戒企业','严重行政处罚','司法纠纷','注销', '注销企业'],
     }
   },
   created() {
-    this.handleQuery()
+    this.handleQuery();
+    this.handleQuery1();
   },
   methods: {
     handleClick(){
@@ -85,6 +87,17 @@ export default {
         this.tableData = res.rows
       }
       this.tableDataTotal = res.total
+    },
+    async handleQuery1(params) {
+      let param = params?params:this.queryParams
+      param.isHistory = 1
+      let res = await bestStockPage(param)
+      this.tableLoading = false
+      if(res.code==200){
+        if(res.total<1){
+          this.disabled = true
+        }
+      }
     }
   }
 }

dsk-operate-ui/src/views/detail/party-a/overview/overseas.vue

@@ -82,7 +82,8 @@ export default {
             {name:'不到5%',value:'0~0.05'}
           ],
           width: 130
-        }
+        },
+        { type: 3, fieldName: 'investName', value: '', placeholder: '输入企业名称查询'},
       ],
       //列表
       tableLoading:false,

dsk-system/src/main/java/com/dsk/system/domain/BusinessAddDto.java

@@ -18,7 +18,7 @@ public class BusinessAddDto {
     /**
      * 用户id
      */
-    private Integer userId;
+    private Long userId;
 
     /**
      * 项目类型

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

@@ -145,9 +145,35 @@ public class EnterpriseService {
     }
 
     public TableDataInfo investment(EnterpriseInvestmentBody body) throws Exception {
-        if (body.isVaildCid()) return new TableDataInfo(new ArrayList<>(), 0);
+        if (body.isVaildCid()) {
+            return new TableDataInfo(new ArrayList<>(), 0);
+        }
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/investment", BeanUtil.beanToMap(body, false, false));
-        return dskOpenApiUtil.responsePage(map);
+        Integer code = MapUtils.getInteger(map, "code", 300);
+        if (!code.equals(HttpStatus.OK.value())) {
+            throw new RuntimeException();
+        }
+        Map data = MapUtils.getMap(map, "data", null);
+        List<Object> list = CommonUtils.assertAsArray(MapUtils.getObject(data, "list", ""));
+        if (CollectionUtils.isEmpty(list)) {
+            return new TableDataInfo(list, 0);
+        }
+        List<Object> newList = new ArrayList<>(20);
+        for (Object companyObj : list) {
+            Map<String, Object> companyMap = CommonUtils.assertAsMap(companyObj);
+            String businessStatus = MapUtils.getString(companyMap, "businessStatus");
+            if (!"注销".equals(businessStatus)) {
+                newList.add(companyMap);
+            }
+        }
+        for (Object companyObj : list) {
+            Map<String, Object> companyMap = CommonUtils.assertAsMap(companyObj);
+            String businessStatus = MapUtils.getString(companyMap, "businessStatus");
+            if ("注销".equals(businessStatus)) {
+                newList.add(companyMap);
+            }
+        }
+        return new TableDataInfo(newList, MapUtils.getInteger(data, "totalCount", 0));
     }
 
     public TableDataInfo affiliates(EnterpriseAffiliatesBody body) throws Exception {

dsk-system/src/main/java/com/dsk/system/mapper/BusinessInfoMapper.java

@@ -14,7 +14,7 @@ import java.util.List;
 
 /**
  * 项目详情Mapper接口
- * 
+ *
  * @author lxl
  * @date 2023-05-17
  */
@@ -23,7 +23,7 @@ public interface BusinessInfoMapper extends BaseMapper<BusinessInfo>
 {
     /**
      * 查询项目详情
-     * 
+     *
      * @param id 项目详情主键
      * @return 项目详情
      */
@@ -45,7 +45,7 @@ public interface BusinessInfoMapper extends BaseMapper<BusinessInfo>
 
     /**
      * 查询项目详情列表
-     * 
+     *
      * @param dto 项目详情
      * @return 项目详情集合
      */
@@ -53,7 +53,7 @@ public interface BusinessInfoMapper extends BaseMapper<BusinessInfo>
 
     /**
      * 新增项目详情
-     * 
+     *
      * @param businessInfo 项目详情
      * @return 结果
      */
@@ -96,7 +96,7 @@ public interface BusinessInfoMapper extends BaseMapper<BusinessInfo>
      * @param userId
      * @return
      */
-    int isRepetitionProjectName(@Param("projectName") String projectName,@Param("userId") Integer userId);
+    int isRepetitionProjectName(@Param("projectName") String projectName,@Param("userId") Long userId);
 
     int selectCountByStatusAndCustomerId(@Param("status") Integer status,@Param("customerId") String customerId);
 

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

+package com.dsk.system.searchService;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson2.JSONObject;
+import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.utils.DskOpenApiUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @Author liujie
+ * @ClassName MarketAnalysisServiceImpl
+ * @Date 2023/5/15 16:40
+ **/
+@Service
+public class BusinessOpportunityRadarService {
+
+    @Autowired
+    private DskOpenApiUtil dskOpenApiUtil;
+
+    public AjaxResult jskBidNewsPage(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBid/news/page", object);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    public AjaxResult jskBidTenderPage(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBidTender/page", object);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    public AjaxResult establishmentPage(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/establishment/page", object);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    public AjaxResult jskBidPage(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBid/page", object);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    public AjaxResult landMarketPage(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/landMarket/page", object);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    public AjaxResult enterpriseIndex(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/index", object);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    public AjaxResult enterprisePage(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/page", object);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    public AjaxResult enterpriseByName(String keyword) {
+        Map<String, Object> params = new HashMap<>();
+        params.put("keyword", keyword);
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/findByName", params);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    public AjaxResult bondProjectPage(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/bondProject/page", object);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    public AjaxResult jskBidPlanPage(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBidPlan/page", object);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    public AjaxResult getCapitalSourceSelect() {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBidPlan/getCapitalSourceSelect", null);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    public AjaxResult keywordList() {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/project/keywordList", null);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    public AjaxResult bidSourceList(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBid/source", object);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+}

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

+package com.dsk.system.searchService;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson2.JSONObject;
+import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.utils.DskOpenApiUtil;
+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 MarketAnalysisService {
+
+    @Autowired
+    private DskOpenApiUtil dskOpenApiUtil;
+
+    public AjaxResult areaGroupByProvince() {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/areaGroupByProvince", null);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    public AjaxResult certGroupByMajorAndLevel() {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/certGroupByMajorAndLevel", null);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    public AjaxResult certGroupByMajorProvinceLevel()  {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/certGroupByMajorProvinceLevel", null);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    public AjaxResult bidMoneyGroupByProjectType(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/bidMoneyGroupByProjectType", object);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    public AjaxResult bidGroupCountByProjectType(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/bidGroupCountByProjectType", object);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    public AjaxResult countGroupByProvince(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/countGroupByProvince", object);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    public AjaxResult countGroupByMonth(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/countGroupByMonth", object);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+}

dsk-system/src/main/java/com/dsk/system/service/ICustomerService.java

@@ -39,4 +39,6 @@ public interface ICustomerService {
 
     boolean historyClaim(String companyName);
 
+    Customer selectByCompanyNameAndUserId(String companyName);
+
 }

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

@@ -11,24 +11,32 @@ import com.dsk.common.constant.HttpStatus;
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.core.domain.entity.BusinessInfo;
 import com.dsk.common.core.domain.entity.BusinessLabel;
+import com.dsk.common.core.domain.entity.BusinessRelateCompany;
 import com.dsk.common.core.domain.entity.BusinessUser;
+import com.dsk.common.exception.ServiceException;
 import com.dsk.common.exception.base.BaseException;
 import com.dsk.common.utils.*;
 import com.dsk.common.utils.file.FileUtils;
 import com.dsk.system.domain.BusinessAddDto;
 import com.dsk.system.domain.BusinessExcelDto;
 import com.dsk.system.domain.BusinessListDto;
+import com.dsk.system.domain.customer.Customer;
 import com.dsk.system.domain.customer.dto.CustomerBusinessSearchDto;
 import com.dsk.system.domain.customer.vo.CustomerBusinessListVo;
+import com.dsk.system.domain.customer.vo.CustomerVo;
 import com.dsk.system.domain.vo.BusinessBrowseVo;
 import com.dsk.system.domain.vo.BusinessLabelVo;
 import com.dsk.system.domain.vo.BusinessListVo;
 import com.dsk.system.mapper.BusinessInfoMapper;
 import com.dsk.system.mapper.BusinessLabelMapper;
+import com.dsk.system.mapper.BusinessRelateCompanyMapper;
 import com.dsk.system.mapper.BusinessUserMapper;
 import com.dsk.system.service.IBusinessInfoService;
+import com.dsk.system.service.IBusinessRelateCompanyService;
+import com.dsk.system.service.ICustomerService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.MapUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
@@ -57,7 +65,12 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
     @Resource
     private ReadBusinessInfoExcel readBusinessInfoExcel;
     @Resource
+    private BusinessRelateCompanyMapper relateCompanyMapper;
+    @Resource
     private DskOpenApiUtil dskOpenApiUtil;
+    @Autowired
+    private ICustomerService customerService;
+
 
     /**
      * 查询项目详情
@@ -72,7 +85,7 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
 
     @Override
     public BusinessInfo getConstruction(Integer id) {
-        BusinessInfo businessInfo =businessInfoMapper.getConstruction(id);
+        BusinessInfo businessInfo = businessInfoMapper.getConstruction(id);
         return ObjectUtil.isEmpty(businessInfo) ? new BusinessInfo() : businessInfo;
     }
 
@@ -84,7 +97,7 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
      */
     @Override
     public List<BusinessListVo> selectBusinessInfoList(BusinessListDto dto) {
-        if(StringUtils.isEmpty(dto.getMinAmount()))dto.setMinAmount("0");
+        if (StringUtils.isEmpty(dto.getMinAmount())) dto.setMinAmount("0");
         List<BusinessListVo> othersList = new ArrayList<>();
         //userId不传值，就查询全部他人可见项目+自己的
         if (dto.getUserId() == null) {
@@ -106,7 +119,7 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
         BusinessBrowseVo businessBrowseVo = new BusinessBrowseVo();
         //查询项目基本信息
         BusinessInfo businessInfo = businessInfoMapper.selectBusinessInfoById(businessId);
-        if(ObjectUtil.isNotEmpty(businessInfo)) BeanUtil.copyProperties(businessInfo, businessBrowseVo);
+        if (ObjectUtil.isNotEmpty(businessInfo)) BeanUtil.copyProperties(businessInfo, businessBrowseVo);
         //商务团队
         businessBrowseVo.setTeam(businessUserMapper.selectCreatorByBusinessId(businessId));
         //查询是否是项目创建人
@@ -125,7 +138,7 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
         businessBrowseVo.setFollowRecordCount(total.getFollowRecordCount());
         businessBrowseVo.setRelateCompanyCount(total.getRelateCompanyCount());
         //资料文档统计
-        businessBrowseVo.setFileCount(FileUtils.getAllFileNames(RuoYiConfig.getProfile()+businessId).size());
+        businessBrowseVo.setFileCount(FileUtils.getAllFileNames(RuoYiConfig.getProfile() + businessId).size());
         return businessBrowseVo;
     }
 
@@ -144,10 +157,10 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
         Integer errorCount = 0;//失败条数
         List<String> result = new LinkedList();//导入结果汇总
         List<BusinessExcelDto> businessInfoList = readBusinessInfoExcel.getExcelInfo(file);
-        if(CollectionUtil.isEmpty(businessInfoList))return AjaxResult.error("文档中无项目信息,请按照模板文档格式上传");
+        if (CollectionUtil.isEmpty(businessInfoList)) return AjaxResult.error("文档中无项目信息,请按照模板文档格式上传");
         for (BusinessExcelDto businessInfo : businessInfoList) {
             //查询已有的项目名称
-            Integer count = businessInfoMapper.isRepetitionProjectName(businessInfo.getProjectName(), userId.intValue());
+            Integer count = businessInfoMapper.isRepetitionProjectName(businessInfo.getProjectName(), userId);
             row++;
             if (count > 0) {
                 //如果存在，跳过该项目，不保存
@@ -158,7 +171,7 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
                 //保存到数据库
                 BusinessAddDto businessAddDto = new BusinessAddDto();
                 BeanUtil.copyProperties(businessInfo, businessAddDto);
-                businessAddDto.setUserId(userId.intValue());
+                businessAddDto.setUserId(userId);
                 AjaxResult add = insertBusinessInfo(businessAddDto);
                 if (add.get("code").equals(HttpStatus.SUCCESS)) rowSuccess++;
             }
@@ -166,7 +179,7 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
         result.add("导入项目成功条数" + rowSuccess);
         result.add("导入项目去重条数" + errorCount);
         AjaxResult success = AjaxResult.success(String.join(",", result));
-        success.put("successCount",rowSuccess);
+        success.put("successCount", rowSuccess);
         return success;
     }
 
@@ -192,26 +205,42 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
         //新增项目主信息
         BusinessInfo businessInfo = new BusinessInfo();
         BeanUtil.copyProperties(dto, businessInfo);
-        businessInfo.setConstructionUnit(dto.getOwnerCompany());
-        //查询企业的城投id和建设库id
-        Map map = queryUipIdOrCid(dto.getOwnerCompany());
-        if(map.containsKey("jskEid")){
-            businessInfo.setConstructionUnitCid(MapUtils.getInteger(map,"jskEid",null));
-        }else {
-            businessInfo.setConstructionUnitUipId(MapUtils.getString(map,"uipId",null));
-            businessInfo.setConstructionUnitCid(MapUtils.getInteger(map,"companyId",null));
+
+        CustomerVo vo = new CustomerVo();
+        if (ObjectUtil.isNotEmpty(dto.getCustomerId())) {
+            vo = customerService.info(dto.getCustomerId());
+        } else {
+            Customer verifyCustomer = customerService.selectByCompanyNameAndUserId(dto.getOwnerCompany());
+            if (ObjectUtil.isNotEmpty(verifyCustomer)) {
+                BeanUtil.copyProperties(verifyCustomer, vo);
+            } else {
+                vo.setCompanyName(dto.getOwnerCompany());
+                customerService.add(vo);
+            }
+            businessInfo.setCustomerId(vo.getCustomerId());
         }
+        businessInfo.setConstructionUnit(vo.getCompanyName());
+        businessInfo.setConstructionUnitUipId(vo.getUipId());
+        businessInfo.setConstructionUnitCid(vo.getCompanyId());
+        businessInfo.setConstructionPrincipal(vo.getLegalPerson());
 
         int addBusiness = businessInfoMapper.insertBusinessInfo(businessInfo);
         if (addBusiness > 0) {
             //获取登陆用户的部门id
-//            Long deptId = SecurityUtils.getLoginUser().getDeptId();
-            Long deptId = 100l;
             //新增用户-项目关系信息
-            int addbusinessUser = businessUserMapper.insertBusinessUser(new BusinessUser(businessInfo.getId(), deptId.intValue(), dto.getUserId(), 1));
-            return addbusinessUser > 0 ? AjaxResult.success() : AjaxResult.error();
+            int addbusinessUser = businessUserMapper.insertBusinessUser(new BusinessUser(businessInfo.getId(), SecurityUtils.getDeptId(), dto.getUserId(), 1));
+            if (addbusinessUser == 0) {
+                throw new ServiceException("项目关系信息添加失败！");
+            }
         }
-        return AjaxResult.error();
+
+        BusinessRelateCompany relateCompany = dealwithCustomer(vo);
+        relateCompany.setBusinessId(businessInfo.getId());
+        int i = relateCompanyMapper.insertBusinessRelateCompany(relateCompany);
+        if (i == 0) {
+            throw new ServiceException("业主单位信息添加失败！");
+        }
+        return AjaxResult.success();
 
     }
 
@@ -238,11 +267,11 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
         businessInfo.setUpdateTime(DateUtils.getNowDate());
         //查询企业的城投id和建设库id
         Map map = queryUipIdOrCid(businessInfo.getConstructionUnit());
-        if(map.containsKey("jskEid")){
-            businessInfo.setConstructionUnitCid(MapUtils.getInteger(map,"jskEid",null));
-        }else {
-            businessInfo.setConstructionUnitUipId(MapUtils.getString(map,"uipId",null));
-            businessInfo.setConstructionUnitCid(MapUtils.getInteger(map,"companyId",null));
+        if (map.containsKey("jskEid")) {
+            businessInfo.setConstructionUnitCid(MapUtils.getInteger(map, "jskEid", null));
+        } else {
+            businessInfo.setConstructionUnitUipId(MapUtils.getString(map, "uipId", null));
+            businessInfo.setConstructionUnitCid(MapUtils.getInteger(map, "companyId", null));
         }
         return businessInfoMapper.updateBusinessInfo(businessInfo);
     }
@@ -250,6 +279,7 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
     /**
      * 批量删除项目
      * 项目关联的其他所有表数据一并删除
+     *
      * @param ids 需要删除的项目详情主键
      * @return 结果
      */
@@ -298,34 +328,34 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
     }
 
     @Override
-    public Map queryUipIdOrCid (String companyName){
+    public Map queryUipIdOrCid(String companyName) {
         Map<Object, Object> map = MapUtil.builder().build();
-        if(StringUtils.isEmpty(companyName))return map;
+        if (StringUtils.isEmpty(companyName)) return map;
         //查询城投企业
-        Map<String, Object> paramMap = MapUtil.<String,Object>builder().put("companyName", companyName).build();
+        Map<String, Object> paramMap = MapUtil.<String, Object>builder().put("companyName", companyName).build();
         Map<String, Object> resultMap = dskOpenApiUtil.requestBody("/urbanInvestment/detailsByCompanyName", paramMap);
         Integer code = MapUtils.getInteger(resultMap, "code", 300);
-        if(code == HttpStatus.SUCCESS){
-            Map data = MapUtils.getMap(resultMap, "data",null);
-            if(data != null){
-                map.put("uipId",MapUtils.getString(data,"uipId",null));
-                map.put("companyId",MapUtils.getInteger(data,"companyId",null));
+        if (code == HttpStatus.SUCCESS) {
+            Map data = MapUtils.getMap(resultMap, "data", null);
+            if (data != null) {
+                map.put("uipId", MapUtils.getString(data, "uipId", null));
+                map.put("companyId", MapUtils.getInteger(data, "companyId", null));
             }
         }
-        if(MapUtil.isEmpty(map)) {
+        if (MapUtil.isEmpty(map)) {
             //查村建设库企业
-            Map<String, Object> jskParamMap = MapUtil.<String,Object>builder()
+            Map<String, Object> jskParamMap = MapUtil.<String, Object>builder()
                     .put("keyword", companyName)
-                    .put("page",MapUtil.<String,Object>builder().put("page",1).put("limit",10).build())
+                    .put("page", MapUtil.<String, Object>builder().put("page", 1).put("limit", 10).build())
                     .build();
             Map<String, Object> jskResultMap = dskOpenApiUtil.requestBody("/enterprise/index", jskParamMap);
-            if(MapUtils.getInteger(resultMap,"code",300).equals(HttpStatus.SUCCESS)){
-                Map data = MapUtils.getMap(jskResultMap, "data",null);
-                if(data != null){
+            if (MapUtils.getInteger(resultMap, "code", 300).equals(HttpStatus.SUCCESS)) {
+                Map data = MapUtils.getMap(jskResultMap, "data", null);
+                if (data != null) {
                     List<Object> list = CommonUtils.assertAsArray(MapUtils.getObject(data, "list", ""));
-                    if(CollectionUtil.isNotEmpty(list)){
+                    if (CollectionUtil.isNotEmpty(list)) {
                         for (Object obj : list) {
-                            map.put("jskEid",MapUtils.getInteger(BeanUtil.beanToMap(obj,false,false),"jskEid",null));
+                            map.put("jskEid", MapUtils.getInteger(BeanUtil.beanToMap(obj, false, false), "jskEid", null));
                         }
                     }
                 }
@@ -333,4 +363,16 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
         }
         return map;
     }
+
+
+    private BusinessRelateCompany dealwithCustomer(Customer bean) {
+        BusinessRelateCompany relateCompany = new BusinessRelateCompany();
+        relateCompany.setCompanyId(bean.getCompanyId());
+        relateCompany.setCompanyUipId(bean.getUipId());
+        relateCompany.setCompanyName(bean.getCompanyName());
+        relateCompany.setCompanyRole("业主");
+        relateCompany.setResponsiblePerson(bean.getLegalPerson());
+        relateCompany.setCompanyType("业主单位");
+        return relateCompany;
+    }
 }

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

@@ -15,6 +15,7 @@ import com.dsk.system.domain.customer.vo.*;
 import com.dsk.system.dskService.EnterpriseService;
 import com.dsk.system.mapper.CustomerMapper;
 import com.dsk.system.mapper.CustomerUserMapper;
+import com.dsk.system.searchService.BusinessOpportunityRadarService;
 import com.dsk.system.service.IBusinessInfoService;
 import com.dsk.system.service.ICustomerService;
 import lombok.extern.slf4j.Slf4j;
@@ -25,6 +26,7 @@ import org.springframework.util.ObjectUtils;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 客户信息表(Customer)表服务实现类
@@ -44,6 +46,8 @@ public class CustomerServiceImpl implements ICustomerService {
     private IBusinessInfoService businessInfoService;
     @Autowired
     private EnterpriseService enterpriseService;
+    @Autowired
+    private BusinessOpportunityRadarService opportunityRadarService;
 
     @Override
     public List<CustomerListVo> selectList(CustomerSearchDto dto) {
@@ -65,6 +69,7 @@ public class CustomerServiceImpl implements ICustomerService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean add(Customer customer) {
+        dealWithcustomerData(customer);
         if (ObjectUtils.isEmpty(customer.getUipId())) {
             try {
                 R res = enterpriseService.getUipId(customer.getCompanyName());
@@ -153,6 +158,11 @@ public class CustomerServiceImpl implements ICustomerService {
         return updateClaimStatus(companyName, 0);
     }
 
+    @Override
+    public Customer selectByCompanyNameAndUserId(String companyName) {
+        return baseMapper.selectByCompanyNameAndUserId(companyName, SecurityUtils.getUserId());
+    }
+
     //修改客户认领状态
     private boolean updateClaimStatus(String companyName, Integer status) {
         Customer cus = baseMapper.selectByCompanyNameAndUserId(companyName, SecurityUtils.getUserId());
@@ -167,5 +177,39 @@ public class CustomerServiceImpl implements ICustomerService {
         return customerUserMapper.updateById(customerUser) == 1;
     }
 
+    private void dealWithcustomerData(Customer customer) {
+        if (ObjectUtils.isEmpty(customer.getCompanyName())) throw new BeanException("企业名称不能为空");
+        if (ObjectUtils.isEmpty(customer.getCompanyId())) {
+            try {
+                Map<String, Object> map = opportunityRadarService.enterpriseByName(customer.getCompanyName());
+                if (!ObjectUtils.isEmpty(map.get("data"))) {
+                    customer.setCompanyId(MapUtil.getInt(BeanUtil.beanToMap(map.get("data")), "jskEid"));
+                    if (ObjectUtils.isEmpty(customer.getLegalPerson())) {
+                        customer.setLegalPerson(MapUtil.getStr(map, "legalPerson"));
+                    }
+                    if (ObjectUtils.isEmpty(customer.getRegisterCapital())) {
+                        customer.setRegisterCapital(MapUtil.getStr(map, "registeredCapitalStr"));
+                    }
+                    if (ObjectUtils.isEmpty(customer.getProvinceId())) {
+                        customer.setProvinceId(MapUtil.getInt(map, "provinceId"));
+                    }
+                    if (ObjectUtils.isEmpty(customer.getCityId())) {
+                        customer.setCityId(MapUtil.getInt(map, "cityId"));
+                    }
+                    if (ObjectUtils.isEmpty(customer.getDistrictId())) {
+                        customer.setDistrictId(MapUtil.getInt(map, "countyId"));
+                    }
+                    if (ObjectUtils.isEmpty(customer.getRegisterAddress())) {
+                        customer.setRegisterAddress(MapUtil.getStr(map, "domicile"));
+                    }
+                    if (ObjectUtils.isEmpty(customer.getCreditCode())) {
+                        customer.setCreditCode(MapUtil.getStr(map, "creditCode"));
+                    }
+                }
+            } catch (Exception e) {
+                log.debug("获取企业id错误！error：{}", e.getMessage());
+            }
+        }
+    }
 
 }

dsk-system/src/main/resources/mapper/business/BusinessRelateCompanyMapper.xml

@@ -70,8 +70,6 @@
             <if test="companyRole != null">company_role,</if>
             <if test="responsiblePerson != null">responsible_person,</if>
             <if test="phone != null">phone,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateTime != null">update_time,</if>
             <if test="companyType != null">company_type,</if>
             <if test="companyUipId != null">company_uip_id,</if>
         </trim>
@@ -83,8 +81,6 @@
             <if test="companyRole != null">#{companyRole},</if>
             <if test="responsiblePerson != null">#{responsiblePerson},</if>
             <if test="phone != null">#{phone},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateTime != null">#{updateTime},</if>
             <if test="companyType != null">#{companyType},</if>
             <if test="companyUipId != null">#{companyUipId},</if>
         </trim>
@@ -120,4 +116,4 @@
             #{id}
         </foreach>
     </delete>
-</mapper>
+</mapper>
\ No newline at end of file