1、引入es

2、修改企业查询

menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/enums/ErrorCodeConstants.java

@@ -163,6 +163,13 @@ public interface ErrorCodeConstants {
 
     // ========== 企业注册申请 1_200_006_000 ==========
     ErrorCode MDE_ENTERPRISE_REGISTER_NOT_EXISTS = new ErrorCode(1_200_006_001, "企业注册申请不存在");
+    ErrorCode MDE_ENTERPRISE_REGISTER_AUDITING_APPROVED =
+            new ErrorCode(1_200_006_002, "企业注册申请已审批");
+    ErrorCode MDE_ENTERPRISE_REGISTER_AUDITING_APPROVED_NOT_REJECT =
+            new ErrorCode(1_200_006_003, "企业注册申请已审批通过,无法拒绝");
+
+
+
 
     // ========== 企业地址 1_200_007_001 ==========
     ErrorCode MDE_ENTERPRISE_ADDRESS_NOT_EXISTS = new ErrorCode(1_200_007_001, "企业地址不存在");
@@ -227,4 +234,5 @@ public interface ErrorCodeConstants {
     ErrorCode MDE_ACCOUNT_STATUS_ERROR = new ErrorCode(1_200_018_002, "修改状态必须是 {value}");
     ErrorCode MDE_ACCOUNT_SORT_NOT_NULL = new ErrorCode(1_200_018_003, "显示顺序不能为空");
     ErrorCode MDE_ACCOUNT_PARENT_ID_NOT_NULL = new ErrorCode(1_200_018_004, "上级id不能为空");
+    ErrorCode MDE_ACCOUNT_ID_NOT_NULL = new ErrorCode(1_200_018_005, "id不能为空");
 }

menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/enums/FieldAnalyzer.java

@@ -0,0 +1,26 @@
+package com.citu.module.menduner.system.enums;
+
+/**
+ * ES 字段分析器的枚举类
+ * <p>
+ * 关于 IK 分词，文章 https://blog.csdn.net/xsdxs/article/details/72853288 不错。
+ * 目前项目使用的 ES 版本是 6.7.1 ，可以在 https://www.elastic.co/cn/downloads/past-releases/elasticsearch-6-7-1 下载。
+ * 如果不知道怎么安装 ES ，可以看 https://blog.csdn.net/chengyuqiang/article/details/78837712 简单。
+ */
+public class FieldAnalyzer {
+
+    /**
+     * IK 最大化分词
+     * <p>
+     * 会将文本做最细粒度的拆分
+     */
+    public static final String IK_MAX_WORD = "ik_max_word";
+
+    /**
+     * IK 智能分词
+     * <p>
+     * 会做最粗粒度的拆分
+     */
+    public static final String IK_SMART = "ik_smart";
+
+}

menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/enums/enterprise/EnterpriseRegisterAuditStatusEnum.java

@@ -0,0 +1,19 @@
+package com.citu.module.menduner.system.enums.enterprise;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 企业注册信息审核状态 0审核中 1审核通过 2审核不通过
+ **/
+@Getter
+@AllArgsConstructor
+public enum EnterpriseRegisterAuditStatusEnum {
+
+    AUDITING("0", "审核中"),
+    APPROVED("1", "审核通过"),
+    REJECT("2", "审核不通过");
+
+    private final String status;
+    private final String name;
+}

menduner/menduner-system-biz/pom.xml

@@ -51,6 +51,11 @@
             <artifactId>spring-boot-starter-captcha-plus</artifactId> <!-- 验证码，一般用于登录使用 -->
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-elasticsearch</artifactId>
+        </dependency>
+
         <!-- Web 相关 -->
         <dependency>
             <groupId>com.citu</groupId>
@@ -99,7 +104,11 @@
             <groupId>com.citu</groupId>
             <artifactId>citu-spring-boot-starter-excel</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
 
 
     </dependencies>

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/enterprise/EnterpriseAddressController.java

@@ -10,7 +10,7 @@ import com.citu.module.menduner.system.controller.admin.enterprise.address.Enter
 import com.citu.module.menduner.system.controller.admin.enterprise.address.EnterpriseAddressRespVO;
 import com.citu.module.menduner.system.controller.admin.enterprise.address.EnterpriseAddressSaveReqVO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseAddressDO;
-import com.citu.module.menduner.system.service.enterprise.EnterpriseAddressService;
+import com.citu.module.menduner.system.service.enterprise.address.EnterpriseAddressService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/enterprise/EnterpriseBusinessController.java

@@ -11,7 +11,7 @@ import com.citu.module.menduner.system.controller.admin.enterprise.business.Ente
 import com.citu.module.menduner.system.controller.admin.enterprise.business.EnterpriseBusinessRespVO;
 import com.citu.module.menduner.system.controller.admin.enterprise.business.EnterpriseBusinessSaveReqVO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseBusinessDO;
-import com.citu.module.menduner.system.service.enterprise.EnterpriseBusinessService;
+import com.citu.module.menduner.system.service.enterprise.business.EnterpriseBusinessService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/enterprise/EnterprisePostController.java

@@ -10,7 +10,7 @@ import com.citu.module.menduner.system.controller.admin.enterprise.post.Enterpri
 import com.citu.module.menduner.system.controller.admin.enterprise.post.EnterprisePostRespVO;
 import com.citu.module.menduner.system.controller.admin.enterprise.post.EnterprisePostSaveReqVO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterprisePostDO;
-import com.citu.module.menduner.system.service.enterprise.EnterprisePostService;
+import com.citu.module.menduner.system.service.enterprise.post.EnterprisePostService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/enterprise/EnterpriseRegisterController.java

@@ -6,11 +6,12 @@ import com.citu.framework.common.pojo.PageParam;
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.framework.common.util.object.BeanUtils;
 import com.citu.framework.excel.core.util.ExcelUtils;
+import com.citu.module.menduner.system.controller.admin.enterprise.register.EnterpriseRegisterAuditReqVO;
 import com.citu.module.menduner.system.controller.admin.enterprise.register.EnterpriseRegisterPageReqVO;
 import com.citu.module.menduner.system.controller.admin.enterprise.register.EnterpriseRegisterRespVO;
 import com.citu.module.menduner.system.controller.admin.enterprise.register.EnterpriseRegisterSaveReqVO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseRegisterDO;
-import com.citu.module.menduner.system.service.enterprise.EnterpriseRegisterService;
+import com.citu.module.menduner.system.service.enterprise.register.EnterpriseRegisterService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -90,4 +91,20 @@ public class EnterpriseRegisterController {
                 BeanUtils.toBean(list, EnterpriseRegisterRespVO.class));
     }
 
+    @PutMapping("/approved")
+    @Operation(summary = "审核通过")
+    @PreAuthorize("@ss.hasPermission('menduner:system:enterprise-register:update')")
+    public CommonResult<Boolean> approved(@Valid @RequestBody EnterpriseRegisterAuditReqVO reqVO) {
+        enterpriseRegisterService.approved(reqVO);
+        return success(true);
+    }
+
+    @PutMapping("/reject")
+    @Operation(summary = "审核拒绝驳回")
+    @PreAuthorize("@ss.hasPermission('menduner:system:enterprise-register:update')")
+    public CommonResult<Boolean> reject(@Valid @RequestBody EnterpriseRegisterAuditReqVO reqVO) {
+        enterpriseRegisterService.reject(reqVO);
+        return success(true);
+    }
+
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/enterprise/EnterpriseUserBindController.java

@@ -10,7 +10,7 @@ import com.citu.module.menduner.system.controller.admin.enterprise.bind.Enterpri
 import com.citu.module.menduner.system.controller.admin.enterprise.bind.EnterpriseUserBindRespVO;
 import com.citu.module.menduner.system.controller.admin.enterprise.bind.EnterpriseUserBindSaveReqVO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseUserBindDO;
-import com.citu.module.menduner.system.service.enterprise.EnterpriseUserBindService;
+import com.citu.module.menduner.system.service.enterprise.bind.EnterpriseUserBindService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/enterprise/EnterpriseUserLookController.java

@@ -10,7 +10,7 @@ import com.citu.module.menduner.system.controller.admin.enterprise.look.Enterpri
 import com.citu.module.menduner.system.controller.admin.enterprise.look.EnterpriseUserLookRespVO;
 import com.citu.module.menduner.system.controller.admin.enterprise.look.EnterpriseUserLookSaveReqVO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseUserLookDO;
-import com.citu.module.menduner.system.service.enterprise.EnterpriseUserLookService;
+import com.citu.module.menduner.system.service.enterprise.look.EnterpriseUserLookService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/enterprise/register/EnterpriseRegisterAuditReqVO.java

@@ -0,0 +1,18 @@
+package com.citu.module.menduner.system.controller.admin.enterprise.register;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Schema(description = "管理后台 - 门墩儿-企业注册审核 Request VO")
+@Data
+public class EnterpriseRegisterAuditReqVO {
+
+    @NotNull(message = "{1_200_018_005}")
+    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "9045")
+    private Long id;
+
+    @Schema(description = "原因")
+    private String reason;
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/enterprise/AppEnterpriseController.java

@@ -57,4 +57,11 @@ public class AppEnterpriseController {
     }
 
 
+    @GetMapping("/tets")
+    @Operation(summary = "test")
+    public CommonResult<Boolean> test() {
+        enterpriseService.test();
+        return success(true);
+    }
+
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/enterprise/vo/AppEnterpriseSearchPageReqVO.java

@@ -3,10 +3,14 @@ package com.citu.module.menduner.system.controller.app.enterprise.vo;
 import com.citu.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.util.List;
 
 @Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
 @Schema(description = "menduner - 首页-企业分页搜索 Request VO")
 public class AppEnterpriseSearchPageReqVO extends PageParam {
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/person/AppPersonRecordController.java

@@ -8,7 +8,7 @@ import com.citu.module.menduner.system.controller.admin.person.vo.record.PersonB
 import com.citu.module.menduner.system.controller.app.enterprise.vo.AppEnterpriseUserLookPageReqVO;
 import com.citu.module.menduner.system.controller.app.person.vo.AppPersonBrowseRecordPageReqVO;
 import com.citu.module.menduner.system.dal.dataobject.person.PersonBrowseRecordDO;
-import com.citu.module.menduner.system.service.enterprise.EnterpriseUserLookService;
+import com.citu.module.menduner.system.service.enterprise.look.EnterpriseUserLookService;
 import com.citu.module.menduner.system.service.person.record.PersonBrowseRecordService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/convert/EnterpriseConvert.java

@@ -4,6 +4,8 @@ import com.citu.module.menduner.system.controller.app.contact.AppEnterpriseUserC
 import com.citu.module.menduner.system.controller.app.enterprise.vo.AppEnterpriseSimpleRespVO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseDO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseUserBindDO;
+import com.citu.module.menduner.system.dal.es.EsEnterpriseMergeDO;
+import com.citu.module.menduner.system.dal.es.enterprise.ESEnterpriseDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 
@@ -15,4 +17,6 @@ public interface EnterpriseConvert {
     AppEnterpriseSimpleRespVO convert(EnterpriseDO bean);
 
     AppEnterpriseUserContactRespVO convert(EnterpriseUserBindDO bean);
+
+    EsEnterpriseMergeDO convert2(EnterpriseDO bean);
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/area/AreaDO.java

@@ -1,11 +1,10 @@
 package com.citu.module.menduner.system.dal.dataobject.area;
 
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.citu.framework.tenant.core.db.TenantBaseDO;
 import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
-import com.citu.framework.mybatis.core.dataobject.BaseDO;
 
 /**
  * 地区 DO
@@ -20,7 +19,7 @@ import com.citu.framework.mybatis.core.dataobject.BaseDO;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class AreaDO extends BaseDO {
+public class AreaDO extends TenantBaseDO {
 
     /**
      * id

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/area/AreaHotDO.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.citu.framework.mybatis.core.dataobject.BaseDO;
+import com.citu.framework.tenant.core.db.TenantBaseDO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
@@ -20,7 +21,7 @@ import lombok.*;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class AreaHotDO extends BaseDO {
+public class AreaHotDO extends TenantBaseDO {
 
     /**
      * id

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/certificate/CertificateDO.java

@@ -1,5 +1,6 @@
 package com.citu.module.menduner.system.dal.dataobject.certificate;
 
+import com.citu.framework.tenant.core.db.TenantBaseDO;
 import lombok.*;
 import java.util.*;
 import java.time.LocalDateTime;
@@ -20,7 +21,7 @@ import com.citu.framework.mybatis.core.dataobject.BaseDO;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class CertificateDO extends BaseDO {
+public class CertificateDO extends TenantBaseDO {
 
     /**
      * id

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/cvattachment/CvAttachmentDO.java

@@ -1,5 +1,6 @@
 package com.citu.module.menduner.system.dal.dataobject.cvattachment;
 
+import com.citu.framework.tenant.core.db.TenantBaseDO;
 import lombok.*;
 import java.util.*;
 import java.time.LocalDateTime;
@@ -20,7 +21,7 @@ import com.citu.framework.mybatis.core.dataobject.BaseDO;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class CvAttachmentDO extends BaseDO {
+public class CvAttachmentDO extends TenantBaseDO {
 
     /**
      * id

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/eduexp/EduExpDO.java

@@ -1,5 +1,6 @@
 package com.citu.module.menduner.system.dal.dataobject.eduexp;
 
+import com.citu.framework.tenant.core.db.TenantBaseDO;
 import com.citu.module.menduner.system.enums.eduexp.EducationSystemTypeEnum;
 import com.citu.module.menduner.system.enums.eduexp.EducationTypeEnum;
 import lombok.*;
@@ -24,7 +25,7 @@ import com.citu.framework.mybatis.core.dataobject.BaseDO;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class EduExpDO extends BaseDO {
+public class EduExpDO extends TenantBaseDO {
 
     /**
      * id

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/enterprise/EnterpriseAddressDO.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.citu.framework.mybatis.core.dataobject.BaseDO;
+import com.citu.framework.tenant.core.db.TenantBaseDO;
 import lombok.*;
 
 /**
@@ -19,7 +20,7 @@ import lombok.*;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class EnterpriseAddressDO extends BaseDO {
+public class EnterpriseAddressDO extends TenantBaseDO {
 
     /**
      * id

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/enterprise/EnterpriseBusinessDO.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.citu.framework.mybatis.core.dataobject.BaseDO;
+import com.citu.framework.tenant.core.db.TenantBaseDO;
 import lombok.*;
 
 import java.time.LocalDateTime;
@@ -21,7 +22,7 @@ import java.time.LocalDateTime;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class EnterpriseBusinessDO extends BaseDO {
+public class EnterpriseBusinessDO extends TenantBaseDO {
 
     /**
      * id

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/enterprise/EnterpriseDO.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import com.citu.framework.mybatis.core.dataobject.BaseDO;
+import com.citu.framework.tenant.core.db.TenantBaseDO;
 import lombok.*;
 
 import java.util.List;
@@ -23,7 +24,7 @@ import java.util.List;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class EnterpriseDO extends BaseDO {
+public class EnterpriseDO extends TenantBaseDO {
 
     /**
      * id

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/enterprise/EnterprisePostDO.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.citu.framework.mybatis.core.dataobject.BaseDO;
+import com.citu.framework.tenant.core.db.TenantBaseDO;
 import lombok.*;
 
 /**
@@ -19,7 +20,7 @@ import lombok.*;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class EnterprisePostDO extends BaseDO {
+public class EnterprisePostDO extends TenantBaseDO {
 
     /**
      * 岗位ID

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/enterprise/EnterpriseRegisterDO.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.citu.framework.mybatis.core.dataobject.BaseDO;
+import com.citu.framework.tenant.core.db.TenantBaseDO;
 import lombok.*;
 
 /**
@@ -19,7 +20,7 @@ import lombok.*;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class EnterpriseRegisterDO extends BaseDO {
+public class EnterpriseRegisterDO extends TenantBaseDO {
 
     /**
      * id

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/enterprise/EnterpriseUserBindDO.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.citu.framework.mybatis.core.dataobject.BaseDO;
+import com.citu.framework.tenant.core.db.TenantBaseDO;
 import lombok.*;
 
 import java.time.LocalDateTime;
@@ -22,7 +23,7 @@ import java.time.LocalDateTime;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class EnterpriseUserBindDO extends BaseDO {
+public class EnterpriseUserBindDO extends TenantBaseDO {
 
     /**
      * id

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/enterprise/EnterpriseUserLookDO.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.citu.framework.mybatis.core.dataobject.BaseDO;
+import com.citu.framework.tenant.core.db.TenantBaseDO;
 import lombok.*;
 
 /**
@@ -19,7 +20,7 @@ import lombok.*;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class EnterpriseUserLookDO extends BaseDO {
+public class EnterpriseUserLookDO extends TenantBaseDO {
 
     /**
      * id

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/industry/IndustryDO.java

@@ -3,7 +3,7 @@ package com.citu.module.menduner.system.dal.dataobject.industry;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.citu.framework.mybatis.core.dataobject.BaseDO;
+import com.citu.framework.tenant.core.db.TenantBaseDO;
 import lombok.*;
 
 /**
@@ -19,7 +19,7 @@ import lombok.*;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class IndustryDO extends BaseDO {
+public class IndustryDO extends TenantBaseDO {
 
     /**
      * id

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/job/JobAdvertisedDO.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import com.citu.framework.mybatis.core.dataobject.BaseDO;
+import com.citu.framework.tenant.core.db.TenantBaseDO;
 import lombok.*;
 
 import java.math.BigDecimal;
@@ -25,7 +26,7 @@ import java.util.List;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class JobAdvertisedDO extends BaseDO {
+public class JobAdvertisedDO extends TenantBaseDO {
 
     /**
      * id

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/job/JobInterestedDO.java

@@ -1,6 +1,7 @@
 package com.citu.module.menduner.system.dal.dataobject.job;
 
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import com.citu.framework.tenant.core.db.TenantBaseDO;
 import lombok.*;
 
 import java.math.BigDecimal;
@@ -22,7 +23,7 @@ import com.citu.framework.mybatis.core.dataobject.BaseDO;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class JobInterestedDO extends BaseDO {
+public class JobInterestedDO extends TenantBaseDO {
 
     /**
      * id

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/major/MajorDO.java

@@ -1,5 +1,6 @@
 package com.citu.module.menduner.system.dal.dataobject.major;
 
+import com.citu.framework.tenant.core.db.TenantBaseDO;
 import com.citu.module.menduner.system.enums.MendunerStatusEnum;
 import lombok.*;
 import java.util.*;
@@ -21,7 +22,7 @@ import com.citu.framework.mybatis.core.dataobject.BaseDO;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class MajorDO extends BaseDO {
+public class MajorDO extends TenantBaseDO {
 
     /**
      * id

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/permission/MdeUserRoleDO.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.citu.framework.mybatis.core.dataobject.BaseDO;
+import com.citu.framework.tenant.core.db.TenantBaseDO;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -16,7 +17,7 @@ import lombok.EqualsAndHashCode;
 @KeySequence("mde_user_role_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class MdeUserRoleDO extends BaseDO {
+public class MdeUserRoleDO extends TenantBaseDO {
 
     /**
      * 自增主键

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/person/PersonBrowseRecordDO.java

@@ -3,7 +3,7 @@ package com.citu.module.menduner.system.dal.dataobject.person;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.citu.framework.mybatis.core.dataobject.BaseDO;
+import com.citu.framework.tenant.core.db.TenantBaseDO;
 import lombok.*;
 
 import java.math.BigDecimal;
@@ -21,7 +21,7 @@ import java.math.BigDecimal;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class PersonBrowseRecordDO extends BaseDO {
+public class PersonBrowseRecordDO extends TenantBaseDO {
 
     /**
      * id

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/person/PersonCertificateDO.java

@@ -1,8 +1,10 @@
 package com.citu.module.menduner.system.dal.dataobject.person;
 
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.citu.framework.tenant.core.db.TenantBaseDO;
 import lombok.*;
-import com.baomidou.mybatisplus.annotation.*;
-import com.citu.framework.mybatis.core.dataobject.BaseDO;
 
 /**
  * 人才证书 DO
@@ -17,7 +19,7 @@ import com.citu.framework.mybatis.core.dataobject.BaseDO;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class PersonCertificateDO extends BaseDO {
+public class PersonCertificateDO extends TenantBaseDO {
 
     /**
      * id

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/person/PersonEnterpriseSubscribeDO.java

@@ -3,7 +3,7 @@ package com.citu.module.menduner.system.dal.dataobject.person;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.citu.framework.mybatis.core.dataobject.BaseDO;
+import com.citu.framework.tenant.core.db.TenantBaseDO;
 import lombok.*;
 
 /**
@@ -19,7 +19,7 @@ import lombok.*;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class PersonEnterpriseSubscribeDO extends BaseDO {
+public class PersonEnterpriseSubscribeDO extends TenantBaseDO {
 
     /**
      * 岗位ID

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/person/PersonInfoDO.java

@@ -3,7 +3,7 @@ package com.citu.module.menduner.system.dal.dataobject.person;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.citu.framework.mybatis.core.dataobject.BaseDO;
+import com.citu.framework.tenant.core.db.TenantBaseDO;
 import lombok.*;
 
 import java.time.LocalDateTime;
@@ -21,7 +21,7 @@ import java.time.LocalDateTime;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class PersonInfoDO extends BaseDO {
+public class PersonInfoDO extends TenantBaseDO {
 
     /**
      * id

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/person/PersonJobFavoriteDO.java

@@ -3,7 +3,7 @@ package com.citu.module.menduner.system.dal.dataobject.person;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.citu.framework.mybatis.core.dataobject.BaseDO;
+import com.citu.framework.tenant.core.db.TenantBaseDO;
 import lombok.*;
 
 /**
@@ -19,7 +19,7 @@ import lombok.*;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class PersonJobFavoriteDO extends BaseDO {
+public class PersonJobFavoriteDO extends TenantBaseDO {
 
     /**
      * 岗位ID

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/person/PersonSkillDO.java

@@ -1,9 +1,11 @@
 package com.citu.module.menduner.system.dal.dataobject.person;
 
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.citu.framework.tenant.core.db.TenantBaseDO;
 import com.citu.module.menduner.system.enums.userskill.SkillLevelEnum;
 import lombok.*;
-import com.baomidou.mybatisplus.annotation.*;
-import com.citu.framework.mybatis.core.dataobject.BaseDO;
 
 /**
  * 人才技能 DO
@@ -18,7 +20,7 @@ import com.citu.framework.mybatis.core.dataobject.BaseDO;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class PersonSkillDO extends BaseDO {
+public class PersonSkillDO extends TenantBaseDO {
 
     /**
      * id
@@ -35,7 +37,7 @@ public class PersonSkillDO extends BaseDO {
     private String skillId;
     /**
      * 技能等级（0一般 1良好 2熟练 3 精通）
-     *
+     * <p>
      * 枚举 {@link SkillLevelEnum 对应的类}
      */
     private String level;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/position/PositionDO.java

@@ -3,7 +3,7 @@ package com.citu.module.menduner.system.dal.dataobject.position;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.citu.framework.mybatis.core.dataobject.BaseDO;
+import com.citu.framework.tenant.core.db.TenantBaseDO;
 import lombok.*;
 
 /**
@@ -19,7 +19,7 @@ import lombok.*;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class PositionDO extends BaseDO {
+public class PositionDO extends TenantBaseDO {
 
     /**
      * id

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/position/PositionTagDO.java

@@ -1,8 +1,10 @@
 package com.citu.module.menduner.system.dal.dataobject.position;
 
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.citu.framework.tenant.core.db.TenantBaseDO;
 import lombok.*;
-import com.baomidou.mybatisplus.annotation.*;
-import com.citu.framework.mybatis.core.dataobject.BaseDO;
 
 /**
  * 职位标签 DO
@@ -17,7 +19,7 @@ import com.citu.framework.mybatis.core.dataobject.BaseDO;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class PositionTagDO extends BaseDO {
+public class PositionTagDO extends TenantBaseDO {
 
     /**
      * id

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/projectexp/ProjectExpDO.java

@@ -1,13 +1,12 @@
 package com.citu.module.menduner.system.dal.dataobject.projectexp;
 
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.citu.framework.tenant.core.db.TenantBaseDO;
 import lombok.*;
 
-import java.time.LocalDate;
-import java.util.*;
 import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
-import com.citu.framework.mybatis.core.dataobject.BaseDO;
 
 /**
  * 门墩儿-项目经历 DO
@@ -22,7 +21,7 @@ import com.citu.framework.mybatis.core.dataobject.BaseDO;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class ProjectExpDO extends BaseDO {
+public class ProjectExpDO extends TenantBaseDO {
 
     /**
      * id

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/school/SchoolDO.java

@@ -1,11 +1,10 @@
 package com.citu.module.menduner.system.dal.dataobject.school;
 
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.citu.framework.tenant.core.db.TenantBaseDO;
 import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
-import com.citu.framework.mybatis.core.dataobject.BaseDO;
 
 /**
  * 学校 DO
@@ -20,7 +19,7 @@ import com.citu.framework.mybatis.core.dataobject.BaseDO;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class SchoolDO extends BaseDO {
+public class SchoolDO extends TenantBaseDO {
 
     /**
      * id

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/skill/SkillDO.java

@@ -3,7 +3,7 @@ package com.citu.module.menduner.system.dal.dataobject.skill;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.citu.framework.mybatis.core.dataobject.BaseDO;
+import com.citu.framework.tenant.core.db.TenantBaseDO;
 import lombok.*;
 
 /**
@@ -19,7 +19,7 @@ import lombok.*;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class SkillDO extends BaseDO {
+public class SkillDO extends TenantBaseDO {
 
     public static final Long PARENT_ID_ROOT = 0L;
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/trainexp/TrainExpDO.java

@@ -3,10 +3,9 @@ package com.citu.module.menduner.system.dal.dataobject.trainexp;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.citu.framework.mybatis.core.dataobject.BaseDO;
+import com.citu.framework.tenant.core.db.TenantBaseDO;
 import lombok.*;
 
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -22,7 +21,7 @@ import java.time.LocalDateTime;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class TrainExpDO extends BaseDO {
+public class TrainExpDO extends TenantBaseDO {
 
     /**
      * id

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/user/MdeUserDO.java

@@ -4,7 +4,7 @@ package com.citu.module.menduner.system.dal.dataobject.user;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.citu.framework.mybatis.core.dataobject.BaseDO;
+import com.citu.framework.tenant.core.db.TenantBaseDO;
 import lombok.*;
 
 import java.time.LocalDateTime;
@@ -22,7 +22,7 @@ import java.time.LocalDateTime;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class MdeUserDO extends BaseDO {
+public class MdeUserDO extends TenantBaseDO {
 
     /**
      * 用户ID

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/visits/MdeVisitsDO.java

@@ -3,7 +3,7 @@ package com.citu.module.menduner.system.dal.dataobject.visits;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.citu.framework.mybatis.core.dataobject.BaseDO;
+import com.citu.framework.tenant.core.db.TenantBaseDO;
 import lombok.*;
 
 import java.time.LocalDateTime;
@@ -21,7 +21,7 @@ import java.time.LocalDateTime;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class  MdeVisitsDO extends BaseDO {
+public class MdeVisitsDO extends TenantBaseDO {
 
     /**
      * ID

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/workexp/WorkExpDO.java

@@ -3,13 +3,12 @@ package com.citu.module.menduner.system.dal.dataobject.workexp;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.citu.framework.mybatis.core.dataobject.BaseDO;
+import com.citu.framework.tenant.core.db.TenantBaseDO;
 import com.citu.module.menduner.system.enums.eduexp.CurrencyTypeEnum;
 import com.citu.module.menduner.system.enums.eduexp.PayTypeEnum;
 import lombok.*;
 
 import java.math.BigDecimal;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -25,7 +24,7 @@ import java.time.LocalDateTime;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class WorkExpDO extends BaseDO {
+public class WorkExpDO extends TenantBaseDO {
 
     /**
      * id

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/es/EsEnterpriseMergeDO.java

@@ -0,0 +1,41 @@
+package com.citu.module.menduner.system.dal.es;
+
+import com.citu.module.menduner.system.dal.es.enterprise.ESEnterpriseAddressDO;
+import com.citu.module.menduner.system.dal.es.enterprise.ESEnterpriseBusinessDO;
+import com.citu.module.menduner.system.dal.es.enterprise.ESEnterpriseDO;
+import com.citu.module.menduner.system.dal.es.job.ESJobAdvertisedDO;
+import lombok.Data;
+import org.springframework.data.elasticsearch.annotations.Document;
+import org.springframework.data.elasticsearch.annotations.Field;
+import org.springframework.data.elasticsearch.annotations.FieldType;
+
+import java.util.List;
+
+/**
+ * ES 企业信息-合并索引 DO
+ *
+ * @author rayson
+ */
+@Data
+@Document(indexName = "mde_enterprise")
+public class EsEnterpriseMergeDO extends ESEnterpriseDO {
+
+    /**
+     * 企业工商信息
+     **/
+    @Field(type = FieldType.Object, ignoreMalformed = true)
+    private ESEnterpriseBusinessDO business;
+
+    /**
+     * 企业地址
+     **/
+    @Field(type = FieldType.Nested, ignoreMalformed = true)
+    private List<ESEnterpriseAddressDO> addressList;
+
+    /**
+     * 企业发布的招聘职位
+     **/
+    @Field(type = FieldType.Nested, ignoreMalformed = true)
+    private List<ESJobAdvertisedDO> jobAdvertisedList;
+
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/es/base/ESBaseDO.java

@@ -0,0 +1,51 @@
+package com.citu.module.menduner.system.dal.es.base;
+
+import lombok.Data;
+import org.springframework.data.elasticsearch.annotations.DateFormat;
+import org.springframework.data.elasticsearch.annotations.Field;
+import org.springframework.data.elasticsearch.annotations.FieldType;
+
+import java.time.LocalDateTime;
+
+/**
+ * ES 基础 DO
+ *
+ * @author rayson
+ */
+@Data
+public class ESBaseDO {
+
+    /**
+     * 多租户编号
+     */
+    private Long tenantId;
+
+    /**
+     * 创建时间
+     */
+
+    @Field(type = FieldType.Date, format = DateFormat.custom, pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createTime;
+    /**
+     * 最后更新时间
+     */
+    @Field(type = FieldType.Date, format = DateFormat.custom, pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime updateTime;
+    /**
+     * 创建者，目前使用 SysUser 的 id 编号
+     * <p>
+     * 使用 String 类型的原因是，未来可能会存在非数值的情况，留好拓展性。
+     */
+    private String creator;
+    /**
+     * 更新者，目前使用 SysUser 的 id 编号
+     * <p>
+     * 使用 String 类型的原因是，未来可能会存在非数值的情况，留好拓展性。
+     */
+    private String updater;
+    /**
+     * 是否删除
+     */
+    private Boolean deleted;
+
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/es/enterprise/ESEnterpriseAddressDO.java

@@ -0,0 +1,44 @@
+package com.citu.module.menduner.system.dal.es.enterprise;
+
+import com.citu.framework.tenant.core.db.TenantBaseDO;
+import com.citu.module.menduner.system.enums.FieldAnalyzer;
+import lombok.Data;
+import org.springframework.data.elasticsearch.annotations.Field;
+import org.springframework.data.elasticsearch.annotations.FieldType;
+
+
+/**
+ * ES 门墩儿-企业地址 DO
+ *
+ * @author rayson
+ */
+@Data
+public class ESEnterpriseAddressDO extends TenantBaseDO {
+
+    /**
+     * id
+     */
+    private Long id;
+    /**
+     * 企业id
+     */
+    private Long enterpriseId;
+    /**
+     * 地区id
+     */
+    private Long areaId;
+    /**
+     * 公司地址
+     */
+    @Field(analyzer = FieldAnalyzer.IK_MAX_WORD, type = FieldType.Text)
+    private String address;
+    /**
+     * 经度
+     */
+    private String longitude;
+    /**
+     * 维度
+     */
+    private String latitude;
+
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/es/enterprise/ESEnterpriseBusinessDO.java

@@ -0,0 +1,106 @@
+package com.citu.module.menduner.system.dal.es.enterprise;
+
+import com.citu.framework.tenant.core.db.TenantBaseDO;
+import com.citu.module.menduner.system.dal.es.base.ESBaseDO;
+import com.citu.module.menduner.system.enums.FieldAnalyzer;
+import lombok.Data;
+import org.springframework.data.elasticsearch.annotations.DateFormat;
+import org.springframework.data.elasticsearch.annotations.Field;
+import org.springframework.data.elasticsearch.annotations.FieldType;
+
+import java.time.LocalDateTime;
+
+
+/**
+ * ES 门墩儿-企业工商信息 DO
+ *
+ * @author rayson
+ */
+@Data
+public class ESEnterpriseBusinessDO extends ESBaseDO {
+
+    /**
+     * id
+     */
+    private Long id;
+    /**
+     * 企业id
+     */
+    private Long enterpriseId;
+    /**
+     * 统一社会信用代码
+     */
+    private String code;
+    /**
+     * 企业名称
+     */
+    @Field(analyzer = FieldAnalyzer.IK_MAX_WORD, type = FieldType.Text)
+    private String name;
+    /**
+     * 企业类型
+     * <p>
+     * 枚举 {@link TODO menduner_enterprise_type 对应的类}
+     */
+    @Field(analyzer = FieldAnalyzer.IK_MAX_WORD, type = FieldType.Text)
+    private String type;
+    /**
+     * 所属地区
+     */
+    @Field(analyzer = FieldAnalyzer.IK_MAX_WORD, type = FieldType.Text)
+    private String area;
+    /**
+     * 注册地址
+     */
+    @Field(analyzer = FieldAnalyzer.IK_MAX_WORD, type = FieldType.Text)
+    private String address;
+    /**
+     * 法定代表人
+     */
+    private String representative;
+    /**
+     * 成立时间
+     */
+    @Field(type = FieldType.Date, format = DateFormat.custom, pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime establishmentTime;
+    /**
+     * 注册资金
+     */
+    private String registeredCapital;
+    /**
+     * 核准日期
+     */
+    private String approvalTime;
+    /**
+     * 曾用名
+     */
+    @Field(analyzer = FieldAnalyzer.IK_MAX_WORD, type = FieldType.Text)
+    private String formerName;
+    /**
+     * 所属行业
+     */
+    @Field(analyzer = FieldAnalyzer.IK_MAX_WORD, type = FieldType.Text)
+    private String industry;
+    /**
+     * 注册机关
+     */
+    @Field(analyzer = FieldAnalyzer.IK_MAX_WORD, type = FieldType.Text)
+    private String registrationAuthority;
+    /**
+     * 经营状态
+     * <p>
+     * 枚举 {@link TODO menduner_business_status 对应的类}
+     */
+    @Field(analyzer = FieldAnalyzer.IK_MAX_WORD, type = FieldType.Text)
+    private String businessStatus;
+    /**
+     * 营业期限
+     */
+    @Field(analyzer = FieldAnalyzer.IK_MAX_WORD, type = FieldType.Text)
+    private String businessTerm;
+    /**
+     * 经营范围
+     */
+    @Field(analyzer = FieldAnalyzer.IK_MAX_WORD, type = FieldType.Text)
+    private String businessScope;
+
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/es/enterprise/ESEnterpriseDO.java

@@ -0,0 +1,108 @@
+package com.citu.module.menduner.system.dal.es.enterprise;
+
+import com.citu.framework.tenant.core.db.TenantBaseDO;
+import com.citu.module.menduner.system.dal.es.base.ESBaseDO;
+import com.citu.module.menduner.system.dal.es.job.ESJobAdvertisedDO;
+import com.citu.module.menduner.system.enums.FieldAnalyzer;
+import lombok.Data;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.elasticsearch.annotations.Document;
+import org.springframework.data.elasticsearch.annotations.Field;
+import org.springframework.data.elasticsearch.annotations.FieldType;
+
+import java.util.List;
+
+/**
+ * ES 门墩儿-企业基本信息 DO
+ *
+ * @author rayson
+ */
+@Data
+public class ESEnterpriseDO extends ESBaseDO {
+
+
+    @Id
+    private Long id;
+
+    /**
+     * 上级id
+     **/
+    private Long parentId;
+    /**
+     * 企业全称
+     */
+    @Field(analyzer = FieldAnalyzer.IK_MAX_WORD, type = FieldType.Text)
+    private String name;
+    /**
+     * 企业别称
+     */
+    @Field(analyzer = FieldAnalyzer.IK_MAX_WORD, type = FieldType.Text)
+    private String anotherName;
+    /**
+     * 企业官网
+     */
+    private String website;
+    /**
+     * 公司简介
+     */
+    @Field(analyzer = FieldAnalyzer.IK_MAX_WORD, type = FieldType.Text)
+    private String introduce;
+    /**
+     * 联系人
+     */
+    @Field(analyzer = FieldAnalyzer.IK_MAX_WORD, type = FieldType.Text)
+    private String contact;
+    /**
+     * 联系电话
+     */
+    private String phone;
+    /**
+     * logo图片地址
+     */
+    private String logoUrl;
+    /**
+     * 所在行业
+     */
+    private Long industryId;
+    /**
+     * 融资阶段（未融资，天使轮，A轮，B轮，C轮，D轮以上，已上市，不需要融资）
+     * <p>
+     * 枚举 {@link TODO menduner_financing_status 对应的类}
+     */
+    private String financingStatus;
+    /**
+     * 人员规模（0-20人，20-99人，100-499人，500-999人，1000-9999人，9999人以上）
+     * <p>
+     * 枚举 {@link TODO menduner_scale 对应的类}
+     */
+    private String scale;
+    /**
+     * 公司福利
+     */
+    private List<String> welfareList;
+    /**
+     * 公司相册
+     */
+    private List<String> albumList;
+    /**
+     * 上班时间
+     */
+    private String workTime;
+    /**
+     * 发展历程
+     */
+    @Field(analyzer = FieldAnalyzer.IK_MAX_WORD, type = FieldType.Text)
+    private String developHistory;
+    /**
+     * 获得荣誉
+     */
+    @Field(analyzer = FieldAnalyzer.IK_MAX_WORD, type = FieldType.Text)
+    private String receivedHonors;
+    /**
+     * 帐号状态（0正常 1停用）
+     **/
+    private String status;
+
+
+
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/es/job/ESJobAdvertisedDO.java

@@ -0,0 +1,107 @@
+package com.citu.module.menduner.system.dal.es.job;
+
+
+import com.citu.module.menduner.system.dal.es.base.ESBaseDO;
+import com.citu.module.menduner.system.enums.FieldAnalyzer;
+import lombok.Data;
+import org.springframework.data.elasticsearch.annotations.Field;
+import org.springframework.data.elasticsearch.annotations.FieldType;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * ES 门墩儿-招聘职位 DO
+ *
+ * @author rayson
+ */
+@Data
+public class ESJobAdvertisedDO extends ESBaseDO {
+
+    /**
+     * id
+     */
+    private Long id;
+    /**
+     * 企业id
+     */
+    private Long enterpriseId;
+    /**
+     * 发布用户id
+     */
+    private Long userId;
+    /**
+     * 工作地区
+     */
+    private Long areaId;
+    /**
+     * 职位名称
+     */
+    @Field(analyzer = FieldAnalyzer.IK_MAX_WORD, type = FieldType.Text)
+    private String name;
+    /**
+     * 职位类型id
+     */
+    private Long positionId;
+    /**
+     * 招聘类型
+     * <p>
+     * 枚举 {@link TODO menduner_job_type 对应的类}
+     */
+    private String type;
+    /**
+     * 工作经验
+     */
+    private String expType;
+    /**
+     * 学历要求
+     */
+    private String eduType;
+    /**
+     * 薪酬from
+     */
+    private BigDecimal payFrom;
+    /**
+     * 薪酬to
+     */
+    private BigDecimal payTo;
+    /**
+     * 薪酬单位
+     */
+    private String payUnit;
+    /**
+     * 职位标签
+     */
+//    @Field(type = FieldType.Nested, ignoreMalformed = true)
+    private List<String> tagList;
+    /**
+     * 职位内容
+     */
+    @Field(analyzer = FieldAnalyzer.IK_MAX_WORD, type = FieldType.Text)
+    private String content;
+    /**
+     * 职位要求
+     */
+    @Field(analyzer = FieldAnalyzer.IK_MAX_WORD, type = FieldType.Text)
+    private String requirement;
+    /**
+     * 工作地址
+     */
+    @Field(analyzer = FieldAnalyzer.IK_MAX_WORD, type = FieldType.Text)
+    private String address;
+    /**
+     * 经度
+     */
+    private String longitude;
+    /**
+     * 维度
+     */
+    private String latitude;
+    /**
+     * 职位状态
+     * <p>
+     * 枚举 {@link TODO menduner_status 对应的类}
+     */
+    private String status;
+
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/repository/ESEnterpriseDORepository.java

@@ -0,0 +1,10 @@
+package com.citu.module.menduner.system.dal.repository;
+
+import com.citu.module.menduner.system.dal.es.EsEnterpriseMergeDO;
+import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
+
+/**
+ * ES 企业基本信息 repository
+ **/
+public interface ESEnterpriseDORepository extends ElasticsearchRepository<EsEnterpriseMergeDO, Long> {
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/mq/consumer/ESConsumer.java

@@ -0,0 +1,37 @@
+package com.citu.module.menduner.system.mq.consumer;
+
+import com.citu.module.menduner.system.mq.message.*;
+import org.springframework.context.event.EventListener;
+import org.springframework.scheduling.annotation.Async;
+
+/**
+ * @author rayson
+ * @description ESConsumer
+ * @create 2024/5/29 下午5:12
+ **/
+public class ESConsumer {
+
+    @EventListener
+    @Async
+    public void onMessage(ESEnterpriseSendMessage message) {
+
+    }
+
+    @EventListener
+    @Async
+    public void onMessage(ESEnterpriseBusinessSendMessage message) {
+
+    }
+
+    @EventListener
+    @Async
+    public void onMessage(ESEnterpriseAddressSendMessage message) {
+
+    }
+
+    @EventListener
+    @Async
+    public void onMessage(ESJobAdvertisedSendMessage message) {
+
+    }
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/mq/message/ESEnterpriseAddressSendMessage.java

@@ -0,0 +1,12 @@
+package com.citu.module.menduner.system.mq.message;
+
+import com.citu.module.menduner.system.dal.es.enterprise.ESEnterpriseAddressDO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+
+@Data
+@Schema(description = "ES 企业地址信息")
+public class ESEnterpriseAddressSendMessage extends ESEnterpriseAddressDO {
+
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/mq/message/ESEnterpriseBusinessSendMessage.java

@@ -0,0 +1,11 @@
+package com.citu.module.menduner.system.mq.message;
+
+import com.citu.module.menduner.system.dal.es.enterprise.ESEnterpriseBusinessDO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+
+@Data
+@Schema(description = "ES 企业工商信息")
+public class ESEnterpriseBusinessSendMessage extends ESEnterpriseBusinessDO {
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/mq/message/ESEnterpriseSendMessage.java

@@ -0,0 +1,10 @@
+package com.citu.module.menduner.system.mq.message;
+
+import com.citu.module.menduner.system.dal.es.enterprise.ESEnterpriseDO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+@Schema(description = "ES 企业信息")
+public class ESEnterpriseSendMessage extends ESEnterpriseDO {
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/mq/message/ESJobAdvertisedSendMessage.java

@@ -0,0 +1,12 @@
+package com.citu.module.menduner.system.mq.message;
+
+
+import com.citu.module.menduner.system.dal.es.job.ESJobAdvertisedDO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+
+@Data
+@Schema(description = "ES 招聘职位")
+public class ESJobAdvertisedSendMessage extends ESJobAdvertisedDO {
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/mq/message/MdeVisitsSendMessage.java

@@ -18,7 +18,7 @@ import static com.citu.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DA
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-@Schema(description = "用户端 - 访问量新增/修改 Request VO")
+@Schema(description = "访问量新增")
 public class MdeVisitsSendMessage {
 
     @NotBlank(message = "{1_100_015_002}")

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/EnterpriseService.java

@@ -129,4 +129,6 @@ public interface EnterpriseService {
      * @return List<AppCommonRespVO>
      **/
     List<AppCommonRespVO> searchByName(String name);
+
+    void test();
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/EnterpriseServiceImpl.java

@@ -13,12 +13,25 @@ import com.citu.module.menduner.system.controller.app.appbase.AppCommonRespVO;
 import com.citu.module.menduner.system.controller.app.enterprise.vo.*;
 import com.citu.module.menduner.system.convert.EnterpriseConvert;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseDO;
+import com.citu.module.menduner.system.dal.es.EsEnterpriseMergeDO;
+import com.citu.module.menduner.system.dal.es.enterprise.ESEnterpriseDO;
 import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseMapper;
 import com.citu.module.menduner.system.dal.redis.RedisKeyConstants;
+import com.citu.module.menduner.system.dal.repository.ESEnterpriseDORepository;
 import com.citu.module.menduner.system.enums.visits.MdeVisitsEnum;
 import com.citu.module.menduner.system.mq.producer.MdeVisitsProducer;
+import org.elasticsearch.index.query.BoolQueryBuilder;
+import org.elasticsearch.index.query.QueryBuilders;
+import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder;
 import org.springframework.cache.annotation.Cacheable;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate;
+import org.springframework.data.elasticsearch.core.SearchHits;
+import org.springframework.data.elasticsearch.core.query.NativeSearchQuery;
+import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
@@ -44,6 +57,12 @@ public class EnterpriseServiceImpl implements EnterpriseService {
     @Resource
     private MdeVisitsProducer producer;
 
+    @Resource
+    private ESEnterpriseDORepository repository;
+
+    @Resource
+    private ElasticsearchRestTemplate elasticsearchTemplate;
+
 
     @Override
     public Long createEnterprise(EnterpriseSaveReqVO createReqVO) {
@@ -215,16 +234,62 @@ public class EnterpriseServiceImpl implements EnterpriseService {
         result.setList(list);
         result.setTotal(2L);
 
+        //分页
+        BoolQueryBuilder boolQuery = QueryBuilders.boolQuery();
+
+        // 添加关键词查询条件
+        if (StringUtils.hasText(reqVO.getName())) {
+            boolQuery.must(QueryBuilders.matchQuery("name", reqVO.getName()));
+            boolQuery.must(QueryBuilders.matchQuery("anotherName", reqVO.getName()));
+        }
+        if (null!= reqVO.getAreaIds() ) {
+            boolQuery.should(QueryBuilders.termsQuery("areaIds", reqVO.getAreaIds()));
+        }
+        if (null!= reqVO.getIndustryIds()) {
+            boolQuery.should(QueryBuilders.termsQuery("industryIds", reqVO.getIndustryIds()));
+        }
+        // 添加范围查询条件
+        if (StringUtils.hasText(reqVO.getScale())) {
+            boolQuery.must(QueryBuilders.termQuery("scale", reqVO.getScale()));
+        }
+        if (StringUtils.hasText(reqVO.getFinancingStatus())) {
+            boolQuery.must(QueryBuilders.termQuery("financingStatus", reqVO.getFinancingStatus()));
+        }
+
+        // 构建分页
+        Pageable pageable = PageRequest.of(reqVO.getPageNo()-1, reqVO.getPageSize());
+
+        // 构建高亮
+        HighlightBuilder highlightBuilder = new HighlightBuilder();
+        highlightBuilder.field("name").preTags("<span style='color:red'>").postTags("</span>");
+        highlightBuilder.field("anotherName").preTags("<span style='color:red'>").postTags("</span>");
+
+//        // 构建排序
+//        Sort sort = Sort.by(Sort.Order.asc("name"));
+
+        NativeSearchQuery searchQuery = new NativeSearchQueryBuilder()
+                .withQuery(boolQuery)
+                .withHighlightFields(  new HighlightBuilder
+                        .Field("*")
+                        .preTags("<span style='color:red'>")
+                        .postTags("</span>").requireFieldMatch(false))
+//                .withHighlightBuilder(new HighlightBuilder().preTags("<span style='color:red'>").postTags("</span>"))
+                .withPageable(pageable)
+//                .withSort(sort)
+                .build();
+
+        SearchHits<EsEnterpriseMergeDO> searchHits =  elasticsearchTemplate.search(searchQuery, EsEnterpriseMergeDO.class);
+        System.out.println(searchHits);
         return result;
     }
 
     @Override
     public AppEnterpriseSimpleRespVO getEnterpriseSimple(Long id) {
-        EnterpriseDO enterprise= enterpriseMapper.selectById(id);
-        if(null == enterprise) {
+        EnterpriseDO enterprise = enterpriseMapper.selectById(id);
+        if (null == enterprise) {
             throw exception(MDE_ENTERPRISE_NOT_EXISTS);
         }
-        return  EnterpriseConvert.INSTANCE.convert(enterprise);
+        return EnterpriseConvert.INSTANCE.convert(enterprise);
     }
 
     @Override
@@ -236,4 +301,30 @@ public class EnterpriseServiceImpl implements EnterpriseService {
     public List<AppCommonRespVO> searchByName(String name) {
         return enterpriseMapper.searchByName(name);
     }
+
+    @Override
+    public void test() {
+        EnterpriseDO enterprise = enterpriseMapper.selectById(1L);
+        if (null == enterprise) {
+            throw exception(MDE_ENTERPRISE_NOT_EXISTS);
+        }
+
+        EsEnterpriseMergeDO esEnterprise = EnterpriseConvert.INSTANCE.convert2(enterprise);
+        ESEnterpriseDO entity = repository.save(esEnterprise);
+        System.out.println(entity);
+
+        Optional<EsEnterpriseMergeDO> query = repository.findById(1L);
+        if (query.isPresent()) {
+            EsEnterpriseMergeDO esEnterpriseDO = query.get();
+            System.out.println(esEnterpriseDO);
+
+            if (null != esEnterpriseDO.getWelfareList()
+                    && esEnterpriseDO.getWelfareList().size() < 8) {
+                esEnterpriseDO.getWelfareList().add("我是测试");
+                entity = repository.save(esEnterpriseDO);
+                System.out.println(entity);
+            }
+        }
+
+    }
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/EnterpriseAddressService.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/address/EnterpriseAddressService.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.service.enterprise;
+package com.citu.module.menduner.system.service.enterprise.address;
 
 
 import com.citu.framework.common.pojo.PageResult;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/EnterpriseAddressServiceImpl.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/address/EnterpriseAddressServiceImpl.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.service.enterprise;
+package com.citu.module.menduner.system.service.enterprise.address;
 
 
 import com.citu.framework.common.pojo.PageResult;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/EnterpriseUserBindService.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/bind/EnterpriseUserBindService.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.service.enterprise;
+package com.citu.module.menduner.system.service.enterprise.bind;
 
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.module.menduner.system.controller.admin.enterprise.bind.EnterpriseUserBindPageReqVO;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/EnterpriseUserBindServiceImpl.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/bind/EnterpriseUserBindServiceImpl.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.service.enterprise;
+package com.citu.module.menduner.system.service.enterprise.bind;
 
 
 import com.citu.framework.common.pojo.PageResult;
@@ -10,6 +10,7 @@ import com.citu.module.menduner.system.convert.EnterpriseConvert;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterprisePostDO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseUserBindDO;
 import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseUserBindMapper;
+import com.citu.module.menduner.system.service.enterprise.post.EnterprisePostService;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/EnterpriseBusinessService.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/business/EnterpriseBusinessService.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.service.enterprise;
+package com.citu.module.menduner.system.service.enterprise.business;
 
 import javax.validation.*;
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/EnterpriseBusinessServiceImpl.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/business/EnterpriseBusinessServiceImpl.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.service.enterprise;
+package com.citu.module.menduner.system.service.enterprise.business;
 
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.framework.common.util.object.BeanUtils;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/EnterpriseUserLookService.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/look/EnterpriseUserLookService.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.service.enterprise;
+package com.citu.module.menduner.system.service.enterprise.look;
 
 import com.citu.framework.common.pojo.PageParam;
 import com.citu.framework.common.pojo.PageResult;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/EnterpriseUserLookServiceImpl.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/look/EnterpriseUserLookServiceImpl.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.service.enterprise;
+package com.citu.module.menduner.system.service.enterprise.look;
 
 import com.citu.framework.common.pojo.PageParam;
 import com.citu.framework.common.pojo.PageResult;
@@ -12,8 +12,6 @@ import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
 
-import java.util.List;
-
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.citu.module.menduner.system.enums.ErrorCodeConstants.ENTERPRISE_USER_LOOK_NOT_EXISTS;
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/EnterprisePostService.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/post/EnterprisePostService.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.service.enterprise;
+package com.citu.module.menduner.system.service.enterprise.post;
 
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.module.menduner.system.controller.admin.enterprise.post.EnterprisePostPageReqVO;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/EnterprisePostServiceImpl.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/post/EnterprisePostServiceImpl.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.service.enterprise;
+package com.citu.module.menduner.system.service.enterprise.post;
 
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.framework.common.util.object.BeanUtils;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/EnterpriseRegisterService.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/register/EnterpriseRegisterService.java

@@ -1,12 +1,13 @@
-package com.citu.module.menduner.system.service.enterprise;
+package com.citu.module.menduner.system.service.enterprise.register;
 
 
-import javax.validation.*;
-
+import com.citu.framework.common.pojo.PageResult;
+import com.citu.module.menduner.system.controller.admin.enterprise.register.EnterpriseRegisterAuditReqVO;
 import com.citu.module.menduner.system.controller.admin.enterprise.register.EnterpriseRegisterPageReqVO;
 import com.citu.module.menduner.system.controller.admin.enterprise.register.EnterpriseRegisterSaveReqVO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseRegisterDO;
-import com.citu.framework.common.pojo.PageResult;
+
+import javax.validation.Valid;
 
 /**
  * 门墩儿-企业注册申请 Service 接口
@@ -53,4 +54,17 @@ public interface EnterpriseRegisterService {
      */
     PageResult<EnterpriseRegisterDO> getEnterpriseRegisterPage(EnterpriseRegisterPageReqVO pageReqVO);
 
+    /**
+     * 通过
+     * @param reqVO
+     * @return boolean
+     **/
+    void approved(EnterpriseRegisterAuditReqVO reqVO);
+
+    /**
+     * 拒绝
+     * @param reqVO
+     * @return boolean
+     **/
+    void reject(EnterpriseRegisterAuditReqVO reqVO);
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/EnterpriseRegisterServiceImpl.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/register/EnterpriseRegisterServiceImpl.java

@@ -1,17 +1,19 @@
-package com.citu.module.menduner.system.service.enterprise;
+package com.citu.module.menduner.system.service.enterprise.register;
 
 
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
+import com.citu.framework.common.pojo.PageResult;
+import com.citu.framework.common.util.object.BeanUtils;
+import com.citu.module.menduner.system.controller.admin.enterprise.register.EnterpriseRegisterAuditReqVO;
 import com.citu.module.menduner.system.controller.admin.enterprise.register.EnterpriseRegisterPageReqVO;
 import com.citu.module.menduner.system.controller.admin.enterprise.register.EnterpriseRegisterSaveReqVO;
+import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseRegisterDO;
+import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseRegisterMapper;
+import com.citu.module.menduner.system.enums.enterprise.EnterpriseRegisterAuditStatusEnum;
 import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
 
-import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseRegisterDO;
-import com.citu.framework.common.pojo.PageResult;
-import com.citu.framework.common.util.object.BeanUtils;
-
-import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseRegisterMapper;
+import javax.annotation.Resource;
 
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.citu.module.menduner.system.enums.ErrorCodeConstants.*;
@@ -70,4 +72,42 @@ public class EnterpriseRegisterServiceImpl implements EnterpriseRegisterService
         return enterpriseRegisterMapper.selectPage(pageReqVO);
     }
 
+    @Override
+    @DSTransactional
+    public void approved(EnterpriseRegisterAuditReqVO reqVO) {
+        EnterpriseRegisterDO enterpriseRegister = enterpriseRegisterMapper.selectById(reqVO.getId());
+        if (null == enterpriseRegister) {
+            throw exception(MDE_ENTERPRISE_REGISTER_NOT_EXISTS);
+        }
+        if (!EnterpriseRegisterAuditStatusEnum.AUDITING.getStatus()
+                .equals(enterpriseRegister.getStatus())) {
+            // 已审批
+            throw exception(MDE_ENTERPRISE_REGISTER_AUDITING_APPROVED);
+        }
+        enterpriseRegister.setStatus(EnterpriseRegisterAuditStatusEnum.APPROVED.getStatus());
+        enterpriseRegister.setReason(reqVO.getReason());
+        enterpriseRegisterMapper.updateById(enterpriseRegister);
+    }
+
+    @Override
+    @DSTransactional
+    public void reject(EnterpriseRegisterAuditReqVO reqVO) {
+        EnterpriseRegisterDO enterpriseRegister = enterpriseRegisterMapper.selectById(reqVO.getId());
+        if (null == enterpriseRegister) {
+            throw exception(MDE_ENTERPRISE_REGISTER_NOT_EXISTS);
+        }
+        if (!EnterpriseRegisterAuditStatusEnum.AUDITING.getStatus()
+                .equals(enterpriseRegister.getStatus())) {
+            // 已审批
+            throw exception(MDE_ENTERPRISE_REGISTER_AUDITING_APPROVED);
+        }
+        if (EnterpriseRegisterAuditStatusEnum.APPROVED.getStatus()
+                .equals(enterpriseRegister.getStatus())) {
+            // 已审批通过,无法拒绝
+            throw exception(MDE_ENTERPRISE_REGISTER_AUDITING_APPROVED_NOT_REJECT);
+        }
+        enterpriseRegister.setStatus(EnterpriseRegisterAuditStatusEnum.REJECT.getStatus());
+        enterpriseRegister.setReason(reqVO.getReason());
+        enterpriseRegisterMapper.updateById(enterpriseRegister);
+    }
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/job/JobAdvertisedServiceImpl.java

@@ -15,7 +15,7 @@ import com.citu.module.menduner.system.convert.JobAdvertisedConvert;
 import com.citu.module.menduner.system.dal.dataobject.job.JobAdvertisedDO;
 import com.citu.module.menduner.system.dal.mysql.job.JobAdvertisedMapper;
 import com.citu.module.menduner.system.service.enterprise.EnterpriseService;
-import com.citu.module.menduner.system.service.enterprise.EnterpriseUserBindService;
+import com.citu.module.menduner.system.service.enterprise.bind.EnterpriseUserBindService;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/permission/MdePermissionServiceImpl.java

@@ -14,7 +14,7 @@ import com.citu.module.menduner.system.dal.dataobject.user.MdeUserDO;
 import com.citu.module.menduner.system.dal.mysql.permission.MdeUserRoleMapper;
 import com.citu.module.menduner.system.dal.redis.RedisKeyConstants;
 import com.citu.module.menduner.system.service.enterprise.EnterpriseService;
-import com.citu.module.menduner.system.service.enterprise.EnterpriseUserBindService;
+import com.citu.module.menduner.system.service.enterprise.bind.EnterpriseUserBindService;
 import com.citu.module.menduner.system.service.user.MdeUserService;
 import com.citu.module.system.api.permission.dto.DataPermissionRespDTO;
 import com.citu.module.system.enums.permission.DataScopeEnum;
@@ -26,7 +26,6 @@ import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.cache.annotation.Caching;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.Collection;

menduner/menduner-system-biz/src/main/resources/application-dev.yaml

@@ -74,6 +74,9 @@ spring:
   # Kafka 配置项，对应 KafkaProperties 配置类
   kafka:
     bootstrap-servers: 127.0.0.1:9092 # 指定 Kafka Broker 地址，可以设置多个，以逗号分隔
+  # elasticsearch 配置项
+  elasticsearch:
+    uris: http://192.168.3.80:9200
 
 --- #################### 定时任务相关配置 ####################
 xxl:

menduner/menduner-system-biz/src/main/resources/i18n/messages_en_US.properties

@@ -139,6 +139,8 @@
 1_200_005_001=Enterprise business information does not exist
 # ========== 企业注册申请 1_200_006_000 ==========
 1_200_006_001=The enterprise registration application does not exist
+1_200_006_002=Enterprise registration application has been approved
+1_200_006_003=The enterprise registration application has been approved and cannot be rejected
 # ========== 企业地址 1_200_007_001 ==========
 1_200_007_001=The company address does not exist
 # ========== 企业登录用户 1_200_008_000 ==========
@@ -186,4 +188,7 @@
 1_200_017_006=Cannot set one's own child Skill as the parent Skill
 # ========== 公共 1_200_018_000 ==========
 1_200_018_001=Status cannot be empty
-1_200_018_002=The modification status must be {value}
+1_200_018_002=The modification status must be {value}
+1_200_018_003=Display order cannot be empty
+1_200_018_004=Superior ID cannot be empty
+1_200_018_005=id cannot be empty

menduner/menduner-system-biz/src/main/resources/i18n/messages_zh_CN.properties

@@ -140,6 +140,8 @@
 1_200_005_001=企业工商信息不存在
 # ========== 企业注册申请 1_200_006_000 ==========
 1_200_006_001=企业注册申请不存在
+1_200_006_002=企业注册申请已审批
+1_200_006_003=企业注册申请已审批通过,无法拒绝
 # ========== 企业地址 1_200_007_001 ==========
 1_200_007_001=企业地址不存在
 # ========== 企业登录用户 1_200_008_000 ==========
@@ -187,4 +189,7 @@
 1_200_017_006=不能设置自己的子Skill为父Skill
 # ========== 公共 1_200_018_000 ==========
 1_200_018_001=帐号状态不能为空
-1_200_018_002=修改状态必须是 {value}
+1_200_018_002=修改状态必须是 {value}
+1_200_018_003=显示顺序不能为空
+1_200_018_004=上级id不能为空
+1_200_018_005=id不能为空

menduner/menduner-system-biz/src/test/java/com/citu/module/menduner/system/service/enterprise/EnterpriseAddressServiceImplTest.java

@@ -7,6 +7,7 @@ import com.citu.module.menduner.system.controller.admin.enterprise.address.Enter
 import com.citu.module.menduner.system.controller.admin.enterprise.address.EnterpriseAddressSaveReqVO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseAddressDO;
 import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseAddressMapper;
+import com.citu.module.menduner.system.service.enterprise.address.EnterpriseAddressServiceImpl;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.springframework.context.annotation.Import;

menduner/menduner-system-biz/src/test/java/com/citu/module/menduner/system/service/enterprise/EnterpriseBusinessServiceImplTest.java

@@ -3,6 +3,7 @@ package com.citu.module.menduner.system.service.enterprise;
 
 import com.citu.module.menduner.system.controller.admin.enterprise.business.EnterpriseBusinessPageReqVO;
 import com.citu.module.menduner.system.controller.admin.enterprise.business.EnterpriseBusinessSaveReqVO;
+import com.citu.module.menduner.system.service.enterprise.business.EnterpriseBusinessServiceImpl;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
@@ -18,7 +19,6 @@ import org.springframework.context.annotation.Import;
 
 import java.time.LocalDateTime;
 
-import static com.citu.module.menduner.system.enums.ErrorCodeConstants.*;
 import static com.citu.framework.test.core.util.AssertUtils.*;
 import static com.citu.framework.test.core.util.RandomUtils.*;
 import static com.citu.framework.common.util.date.LocalDateTimeUtils.*;

menduner/menduner-system-biz/src/test/java/com/citu/module/menduner/system/service/enterprise/EnterprisePostServiceImplTest.java

@@ -6,6 +6,7 @@ import com.citu.module.menduner.system.controller.admin.enterprise.post.Enterpri
 import com.citu.module.menduner.system.controller.admin.enterprise.post.EnterprisePostSaveReqVO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterprisePostDO;
 import com.citu.module.menduner.system.dal.mysql.enterprise.EnterprisePostMapper;
+import com.citu.module.menduner.system.service.enterprise.post.EnterprisePostServiceImpl;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.springframework.context.annotation.Import;

menduner/menduner-system-biz/src/test/java/com/citu/module/menduner/system/service/enterprise/EnterpriseRegisterServiceImplTest.java

@@ -6,6 +6,7 @@ import com.citu.module.menduner.system.controller.admin.enterprise.register.Ente
 import com.citu.module.menduner.system.controller.admin.enterprise.register.EnterpriseRegisterSaveReqVO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseRegisterDO;
 import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseRegisterMapper;
+import com.citu.module.menduner.system.service.enterprise.register.EnterpriseRegisterServiceImpl;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.springframework.context.annotation.Import;

menduner/menduner-system-biz/src/test/java/com/citu/module/menduner/system/service/enterprise/EnterpriseUserBindServiceImplTest.java

@@ -7,6 +7,7 @@ import com.citu.module.menduner.system.controller.admin.enterprise.bind.Enterpri
 import com.citu.module.menduner.system.controller.admin.enterprise.bind.EnterpriseUserBindSaveReqVO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseUserBindDO;
 import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseUserBindMapper;
+import com.citu.module.menduner.system.service.enterprise.bind.EnterpriseUserBindServiceImpl;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.springframework.context.annotation.Import;

menduner/menduner-system-biz/src/test/java/com/citu/module/menduner/system/service/enterprise/EnterpriseUserLookServiceImplTest.java

@@ -6,6 +6,7 @@ import com.citu.module.menduner.system.controller.admin.enterprise.look.Enterpri
 import com.citu.module.menduner.system.controller.admin.enterprise.look.EnterpriseUserLookSaveReqVO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseUserLookDO;
 import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseUserLookMapper;
+import com.citu.module.menduner.system.service.enterprise.look.EnterpriseUserLookServiceImpl;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.springframework.context.annotation.Import;

menduner/menduner-system-biz/src/test/resources/application-unit-test.yaml

@@ -25,6 +25,9 @@ spring:
     host: 127.0.0.1 # 地址
     port: 16379 # 端口（单元测试，使用 16379 端口）
     database: 0 # 数据库索引
+  # elasticsearch 配置项
+  elasticsearch:
+    uris: http://192.168.3.80:9200
 
 mybatis:
   lazy-initialization: true # 单元测试，设置 MyBatis Mapper 延迟加载，加速每个单元测试