From 7cd7bbd166dc721d0240b8a3507da891816afafb Mon Sep 17 00:00:00 2001 From: oneao Date: Tue, 16 Dec 2025 22:26:59 +0800 Subject: [PATCH] u --- .../cn/link56/mapper/WebAreaMapper.xml | 1 + .../identity/service/AuthIdentityService.java | 24 ++-- .../cn/link56/base/mapper/AreaMapper.java | 4 +- .../cn/link56/base/mapper/BCompanyMapper.java | 9 -- .../base/mapper/BCompanyUserMapper.java | 9 -- .../cn/link56/base/mapper/IndustryMapper.java | 4 +- .../BArea.java => base/model/po/AreaPO.java} | 4 +- .../model/po/IndustryPO.java} | 4 +- .../link56/base/service/BCompanyService.java | 39 ------ .../base/service/BCompanyUserService.java | 59 --------- .../link56/base/service/BaseDataService.java | 22 +-- .../cn/link56/common/config/WebMvcConfig.java | 4 +- .../company/controller/CompanyController.java | 31 +++++ .../link56/company/mapper/CompanyMapper.java | 13 ++ .../company/mapper/CompanyUserMapper.java | 9 ++ .../model/middle/RecommendCompanyRow.java | 17 +++ .../model/po/CompanyPO.java} | 7 +- .../model/po/CompanyUserPO.java} | 4 +- .../company/model/vo/RecommendCompanyVO.java | 25 ++++ .../model/vo/RecommendHotCompanyVO.java | 13 ++ .../company/service/CompanyService.java | 89 +++++++++++++ .../company/service/CompanyUserService.java | 59 +++++++++ .../feature/controller/FeatureController.java | 9 -- .../cn/link56/base/mapper/AreaMapper.xml | 2 +- .../link56/company/mapper/CompanyMapper.xml | 34 +++++ code/link56/link56-frontend-new/src/App.vue | 1 + .../src/components/QueryCompany.vue | 38 ++---- .../src/layout/components/header.vue | 12 +- .../src/request/api/company/index.ts | 10 ++ .../link56-frontend-new/src/router/index.ts | 4 + .../src/types/company/index.ts | 14 ++ .../src/views/company/index.vue | 23 ++++ .../src/views/home/components/recommend.vue | 125 +++++++++++++----- .../src/views/home/index.vue | 21 ++- 34 files changed, 516 insertions(+), 227 deletions(-) delete mode 100644 code/link56/link56-backend/src/main/java/cn/link56/base/mapper/BCompanyMapper.java delete mode 100644 code/link56/link56-backend/src/main/java/cn/link56/base/mapper/BCompanyUserMapper.java rename code/link56/link56-backend/src/main/java/cn/link56/{entity/BArea.java => base/model/po/AreaPO.java} (86%) rename code/link56/link56-backend/src/main/java/cn/link56/{entity/BIndustry.java => base/model/po/IndustryPO.java} (91%) delete mode 100644 code/link56/link56-backend/src/main/java/cn/link56/base/service/BCompanyService.java delete mode 100644 code/link56/link56-backend/src/main/java/cn/link56/base/service/BCompanyUserService.java create mode 100644 code/link56/link56-backend/src/main/java/cn/link56/company/controller/CompanyController.java create mode 100644 code/link56/link56-backend/src/main/java/cn/link56/company/mapper/CompanyMapper.java create mode 100644 code/link56/link56-backend/src/main/java/cn/link56/company/mapper/CompanyUserMapper.java create mode 100644 code/link56/link56-backend/src/main/java/cn/link56/company/model/middle/RecommendCompanyRow.java rename code/link56/link56-backend/src/main/java/cn/link56/{entity/BCompany.java => company/model/po/CompanyPO.java} (91%) rename code/link56/link56-backend/src/main/java/cn/link56/{entity/BCompanyUser.java => company/model/po/CompanyUserPO.java} (95%) create mode 100644 code/link56/link56-backend/src/main/java/cn/link56/company/model/vo/RecommendCompanyVO.java create mode 100644 code/link56/link56-backend/src/main/java/cn/link56/company/model/vo/RecommendHotCompanyVO.java create mode 100644 code/link56/link56-backend/src/main/java/cn/link56/company/service/CompanyService.java create mode 100644 code/link56/link56-backend/src/main/java/cn/link56/company/service/CompanyUserService.java delete mode 100644 code/link56/link56-backend/src/main/java/cn/link56/feature/controller/FeatureController.java create mode 100644 code/link56/link56-backend/src/main/resources/cn/link56/company/mapper/CompanyMapper.xml create mode 100644 code/link56/link56-frontend-new/src/request/api/company/index.ts create mode 100644 code/link56/link56-frontend-new/src/views/company/index.vue diff --git a/code/link56/link56-backend-old/src/main/resources/cn/link56/mapper/WebAreaMapper.xml b/code/link56/link56-backend-old/src/main/resources/cn/link56/mapper/WebAreaMapper.xml index fe5b09cd..0d6837f2 100644 --- a/code/link56/link56-backend-old/src/main/resources/cn/link56/mapper/WebAreaMapper.xml +++ b/code/link56/link56-backend-old/src/main/resources/cn/link56/mapper/WebAreaMapper.xml @@ -44,6 +44,7 @@ ORDER BY b_name ASC + + + SELECT + sheng.b_name AS shengName, + shi.b_name AS shiName, + + c.b_id AS companyId, + c.b_name AS companyName, + c.b_recommend_color AS color + FROM b_area_shi shi + JOIN b_area_sheng sheng + ON shi.b_father_id = sheng.b_id + + LEFT JOIN b_company c + ON c.b_canuse = '1' + AND c.b_recommend = '1' + AND c.b_address LIKE '%' + shi.b_name + '%' + + WHERE + shi.b_canuse = '1' + AND shi.b_visible = '1' + AND sheng.b_canuse = '1' + + ORDER BY + sheng.b_order ASC, + shi.b_order ASC + + + diff --git a/code/link56/link56-frontend-new/src/App.vue b/code/link56/link56-frontend-new/src/App.vue index 9d1105c2..fd69cb23 100644 --- a/code/link56/link56-frontend-new/src/App.vue +++ b/code/link56/link56-frontend-new/src/App.vue @@ -24,6 +24,7 @@ function handleInitData() { console.log(err) ElMessage.error('初始化失败,请刷新页面后重试') }) + } diff --git a/code/link56/link56-frontend-new/src/components/QueryCompany.vue b/code/link56/link56-frontend-new/src/components/QueryCompany.vue index e440e30e..bd4e566e 100644 --- a/code/link56/link56-frontend-new/src/components/QueryCompany.vue +++ b/code/link56/link56-frontend-new/src/components/QueryCompany.vue @@ -1,43 +1,19 @@