瀏覽代碼

1、增加猎寻模块

rayson 11 月之前
父節點
當前提交
dc4cd6d1b7
共有 26 個文件被更改,包括 864 次插入10 次删除
  1. 13 0
      menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/enums/ErrorCodeConstants.java
  2. 17 0
      menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/enums/hunt/HuntStatusEnum.java
  3. 6 0
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/enterprise/vo/EnterpriseAccountPageRespVO.java
  4. 109 0
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/hunt/HuntController.java
  5. 12 4
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/tag/TagController.java
  6. 42 0
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/hunt/HuntPageReqVO.java
  7. 19 0
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/hunt/HuntProcessedReqVO.java
  8. 51 0
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/hunt/HuntRespVO.java
  9. 37 0
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/hunt/HuntSaveReqVO.java
  10. 26 0
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/hunt/HuntSubmitReqVO.java
  11. 31 0
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/tag/TagListReqVO.java
  12. 3 3
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/tag/TagSaveReqVO.java
  13. 58 0
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/hunt/HuntDO.java
  14. 2 0
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/enterprise/EnterpriseAccountMapper.java
  15. 49 0
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/hunt/HuntMapper.java
  16. 13 0
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/tag/TagMapper.java
  17. 71 0
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/hunt/HuntService.java
  18. 102 0
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/hunt/HuntServiceImpl.java
  19. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/industry/IndustryService.java
  20. 11 0
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/tag/TagService.java
  21. 6 0
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/tag/TagServiceImpl.java
  22. 11 0
      menduner/menduner-system-biz/src/main/resources/i18n/messages_en_US.properties
  23. 12 1
      menduner/menduner-system-biz/src/main/resources/i18n/messages_zh_CN.properties
  24. 144 0
      menduner/menduner-system-biz/src/test/java/com/citu/module/menduner/system/service/hunt/HuntServiceImplTest.java
  25. 2 1
      menduner/menduner-system-biz/src/test/resources/sql/clean.sql
  26. 16 0
      menduner/menduner-system-biz/src/test/resources/sql/create_tables.sql

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

@@ -412,4 +412,17 @@ public interface ErrorCodeConstants {
 
     // ========== 标签管理 1_100_044_000 ==========
     ErrorCode TAG_NOT_EXISTS = new ErrorCode(1_100_044_001, "标签管理不存在");
+
+    ErrorCode TAG_NAME_CN_NOT_NULL = new ErrorCode(1_100_044_002, "中文名称不能为空");
+    ErrorCode TAG_NAME_EN_NOT_NULL = new ErrorCode(1_100_044_003, "英文名称不能为空");
+    ErrorCode TAG_TYPE_NOT_NULL = new ErrorCode(1_100_044_004, "标签类型不能为空");
+
+    // ========== 猎寻服务 1_100_045_000 ==========
+    ErrorCode HUNT_NOT_EXISTS = new ErrorCode(1_100_045_001, "猎寻服务不存在");
+
+    ErrorCode HUNT_NAME_NOT_NULL = new ErrorCode(1_100_045_002, "姓名不能为空");
+    ErrorCode HUNT_ENTERPRISE_NAME_NOT_NULL = new ErrorCode(1_100_045_003, "企业名称不能为空");
+    ErrorCode HUNT_PHONE_NOT_NULL = new ErrorCode(1_100_045_004, "联系方式不能为空");
+
+    ErrorCode HUNT_PHONE_FREQUENT = new ErrorCode(1_100_045_005, "数据提交频繁,已超过今天最大提交次数");
 }

+ 17 - 0
menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/enums/hunt/HuntStatusEnum.java

@@ -0,0 +1,17 @@
+package com.citu.module.menduner.system.enums.hunt;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 猎寻服务状态 0 待处理 | 1 已处理
+ **/
+@Getter
+@AllArgsConstructor
+public enum HuntStatusEnum {
+    WAIT_PROCESSED("0", "待处理"),
+    PROCESSED("1", "已处理");
+
+    private final String status;
+    private final String desc;
+}

+ 6 - 0
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/enterprise/vo/EnterpriseAccountPageRespVO.java

@@ -28,4 +28,10 @@ public class EnterpriseAccountPageRespVO extends EnterpriseAccountRespVO {
 
     @Schema(description = "头像地址")
     private String avatar;
+
+    @Schema(description = "邮箱")
+    private String email;
+
+    @Schema(description = "手机号")
+    private String phone;
 }

+ 109 - 0
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/hunt/HuntController.java

@@ -0,0 +1,109 @@
+package com.citu.module.menduner.system.controller.admin.hunt;
+
+
+import com.citu.framework.apilog.core.annotation.ApiAccessLog;
+import com.citu.framework.common.pojo.CommonResult;
+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.base.hunt.*;
+import com.citu.module.menduner.system.dal.dataobject.hunt.HuntDO;
+import com.citu.module.menduner.system.service.hunt.HuntService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.annotation.security.PermitAll;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
+
+import static com.citu.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static com.citu.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "管理后台 - 猎寻服务")
+@RestController
+@RequestMapping("/menduner/system/hunt")
+@Validated
+public class HuntController {
+
+    @Resource
+    private HuntService huntService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建猎寻服务")
+    @PreAuthorize("@ss.hasPermission('menduner:system:hunt:create')")
+    public CommonResult<Long> createHunt(@Valid @RequestBody HuntSaveReqVO createReqVO) {
+        return success(huntService.createHunt(createReqVO));
+    }
+
+    @PermitAll
+    @PostMapping("/submit")
+    @Operation(summary = "提交猎寻服务")
+    public CommonResult<Boolean> submit(@Valid @RequestBody HuntSubmitReqVO reqVO) {
+        huntService.submit(reqVO);
+        return success(true);
+    }
+
+    @PutMapping("/processed")
+    @Operation(summary = "已处理")
+    @PreAuthorize("@ss.hasPermission('menduner:system:hunt:update')")
+    public CommonResult<Boolean> processed(@Valid @RequestBody HuntProcessedReqVO reqVO) {
+        huntService.processed(reqVO);
+        return success(true);
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新猎寻服务")
+    @PreAuthorize("@ss.hasPermission('menduner:system:hunt:update')")
+    public CommonResult<Boolean> updateHunt(@Valid @RequestBody HuntSaveReqVO updateReqVO) {
+        huntService.updateHunt(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除猎寻服务")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('menduner:system:hunt:delete')")
+    public CommonResult<Boolean> deleteHunt(@RequestParam("id") Long id) {
+        huntService.deleteHunt(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得猎寻服务")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('menduner:system:hunt:query')")
+    public CommonResult<HuntRespVO> getHunt(@RequestParam("id") Long id) {
+        HuntDO hunt = huntService.getHunt(id);
+        return success(BeanUtils.toBean(hunt, HuntRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得猎寻服务分页")
+    @PreAuthorize("@ss.hasPermission('menduner:system:hunt:query')")
+    public CommonResult<PageResult<HuntRespVO>> getHuntPage(@Valid HuntPageReqVO pageReqVO) {
+        PageResult<HuntDO> pageResult = huntService.getHuntPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, HuntRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出猎寻服务 Excel")
+    @PreAuthorize("@ss.hasPermission('menduner:system:hunt:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportHuntExcel(@Valid HuntPageReqVO pageReqVO,
+                                HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<HuntDO> list = huntService.getHuntPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "猎寻服务.xls", "数据", HuntRespVO.class,
+                BeanUtils.toBean(list, HuntRespVO.class));
+    }
+
+}

+ 12 - 4
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/tag/TagController.java

@@ -6,10 +6,10 @@ 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.base.tag.TagChildrenRespVO;
-import com.citu.module.menduner.system.controller.base.tag.TagPageReqVO;
-import com.citu.module.menduner.system.controller.base.tag.TagRespVO;
-import com.citu.module.menduner.system.controller.base.tag.TagSaveReqVO;
+import com.citu.module.menduner.system.controller.base.industry.IndustryListReqVO;
+import com.citu.module.menduner.system.controller.base.industry.IndustryRespVO;
+import com.citu.module.menduner.system.controller.base.tag.*;
+import com.citu.module.menduner.system.dal.dataobject.industry.IndustryDO;
 import com.citu.module.menduner.system.dal.dataobject.tag.TagDO;
 import com.citu.module.menduner.system.service.tag.TagService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -99,4 +99,12 @@ public class TagController {
         return success(tagService.getTagByType(type));
     }
 
+    @GetMapping("/list")
+    @Operation(summary = "获得标签信息列表")
+    @PreAuthorize("@ss.hasPermission('menduner:system:tag:query')")
+    public CommonResult<List<TagRespVO>> getTagList(@Valid TagListReqVO listReqVO) {
+        List<TagDO> list = tagService.getTagList(listReqVO);
+        return success(BeanUtils.toBean(list, TagRespVO.class));
+    }
+
 }

+ 42 - 0
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/hunt/HuntPageReqVO.java

@@ -0,0 +1,42 @@
+package com.citu.module.menduner.system.controller.base.hunt;
+
+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 org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+import static com.citu.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 猎寻服务分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class HuntPageReqVO extends PageParam {
+
+    @Schema(description = "姓名", example = "赵六")
+    private String name;
+
+    @Schema(description = "企业名称", example = "赵六")
+    private String enterpriseName;
+
+    @Schema(description = "联系方式")
+    private String phone;
+
+    @Schema(description = "提交ip")
+    private String ip;
+
+    @Schema(description = "状态(0待处理|1已联系)", example = "2")
+    private String status;
+
+    @Schema(description = "备注", example = "你说的对")
+    private String remark;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+}

+ 19 - 0
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/hunt/HuntProcessedReqVO.java

@@ -0,0 +1,19 @@
+package com.citu.module.menduner.system.controller.base.hunt;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+
+@Schema(description = "管理后台 - 猎寻已处理 Request VO")
+@Data
+public class HuntProcessedReqVO {
+
+    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "12183")
+    private Long id;
+
+    @Schema(description = "备注", example = "你说的对")
+    private String remark;
+
+}

+ 51 - 0
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/hunt/HuntRespVO.java

@@ -0,0 +1,51 @@
+package com.citu.module.menduner.system.controller.base.hunt;
+
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.citu.framework.excel.core.annotations.DictFormat;
+import com.citu.framework.excel.core.convert.DictConvert;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 猎寻服务 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class HuntRespVO {
+
+    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "12183")
+    @ExcelProperty("id")
+    private Long id;
+
+    @Schema(description = "姓名", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
+    @ExcelProperty("姓名")
+    private String name;
+
+    @Schema(description = "企业名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
+    @ExcelProperty("企业名称")
+    private String enterpriseName;
+
+    @Schema(description = "联系方式", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("联系方式")
+    private String phone;
+
+    @Schema(description = "提交ip")
+    @ExcelProperty("提交ip")
+    private String ip;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "状态(0待处理|1已联系)", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @ExcelProperty(value = "状态(0待处理|1已联系)", converter = DictConvert.class)
+    @DictFormat("menduner_hunt_status") // TODO 代码优化:建议设置到对应的 DictTypeConstants 枚举类中
+    private String status;
+
+    @Schema(description = "备注", example = "你说的对")
+    @ExcelProperty("备注")
+    private String remark;
+
+}

+ 37 - 0
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/hunt/HuntSaveReqVO.java

@@ -0,0 +1,37 @@
+package com.citu.module.menduner.system.controller.base.hunt;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+
+@Schema(description = "管理后台 - 猎寻服务新增/修改 Request VO")
+@Data
+public class HuntSaveReqVO {
+
+    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "12183")
+    private Long id;
+
+    @Schema(description = "姓名", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
+    @NotEmpty(message = "{1_100_045_002}")
+    private String name;
+
+    @Schema(description = "企业名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
+    @NotEmpty(message = "{1_100_045_003}")
+    private String enterpriseName;
+
+    @Schema(description = "联系方式", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "{1_100_045_004}")
+    private String phone;
+
+    @Schema(description = "提交ip")
+    private String ip;
+
+    @Schema(description = "状态(0待处理|1已联系)", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    private String status;
+
+    @Schema(description = "备注", example = "你说的对")
+    private String remark;
+
+}

+ 26 - 0
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/hunt/HuntSubmitReqVO.java

@@ -0,0 +1,26 @@
+package com.citu.module.menduner.system.controller.base.hunt;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+
+@Schema(description = "管理后台 - 猎寻服务提交 Request VO")
+@Data
+public class HuntSubmitReqVO {
+
+    @Schema(description = "姓名", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
+    @NotEmpty(message = "{1_100_045_002}")
+    private String name;
+
+    @Schema(description = "企业名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
+    @NotEmpty(message = "{1_100_045_003}")
+    private String enterpriseName;
+
+    @Schema(description = "联系方式", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "{1_100_045_004}")
+    private String phone;
+
+
+}

+ 31 - 0
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/tag/TagListReqVO.java

@@ -0,0 +1,31 @@
+package com.citu.module.menduner.system.controller.base.tag;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+import static com.citu.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 标签管理列表 Request VO")
+@Data
+public class TagListReqVO {
+
+    @Schema(description = "中文名称")
+    private String nameCn;
+
+    @Schema(description = "英文名称")
+    private String nameEn;
+
+    @Schema(description = "标签类型(0人员画像标签|1职位标签|2招聘职位标签|3企业福利标签|4企业标签)", example = "1")
+    private String type;
+
+    @Schema(description = "上级id", example = "29684")
+    private Long parentId;
+
+    @Schema(description = "层级")
+    private Integer level;
+
+}

+ 3 - 3
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/tag/TagSaveReqVO.java

@@ -14,15 +14,15 @@ public class TagSaveReqVO {
     private Long id;
 
     @Schema(description = "中文名称", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "中文名称不能为空")
+    @NotEmpty(message = "{1_100_044_002}")
     private String nameCn;
 
     @Schema(description = "英文名称", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "英文名称不能为空")
+    @NotEmpty(message = "{1_100_044_003}")
     private String nameEn;
 
     @Schema(description = "标签类型(0人员画像标签|1职位标签|2招聘职位标签|3企业福利标签|4企业标签)", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @NotEmpty(message = "标签类型(0人员画像标签|1职位标签|2招聘职位标签|3企业福利标签|4企业标签)不能为空")
+    @NotEmpty(message = "{1_100_044_004}")
     private String type;
 
     @Schema(description = "上级id", example = "29684")

+ 58 - 0
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/hunt/HuntDO.java

@@ -0,0 +1,58 @@
+package com.citu.module.menduner.system.dal.dataobject.hunt;
+
+
+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 io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+/**
+ * 猎寻服务 DO
+ *
+ * @author Rayson
+ */
+@TableName("mde_hunt")
+@KeySequence("mde_hunt_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class HuntDO extends BaseDO {
+
+    /**
+     * id
+     */
+    @TableId
+    private Long id;
+    /**
+     * 姓名
+     */
+    private String name;
+    /**
+     * 企业名称
+     */
+    private String enterpriseName;
+    /**
+     * 联系方式
+     */
+    private String phone;
+    /**
+     * 提交ip
+     */
+    private String ip;
+    /**
+     * 状态(0待处理|1已联系)
+     * <p>
+     * 枚举 {@link TODO menduner_hunt_status 对应的类}
+     */
+    private String status;
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

+ 2 - 0
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/enterprise/EnterpriseAccountMapper.java

@@ -45,6 +45,8 @@ public interface EnterpriseAccountMapper extends BaseMapperX<EnterpriseAccountDO
         query.selectAs(EnterpriseUserBindDO::getName, EnterpriseAccountPageRespVO::getUserName);
         query.selectAs(EnterpriseUserBindDO::getSex, EnterpriseAccountPageRespVO::getSex);
         query.selectAs(EnterpriseUserBindDO::getAvatar, EnterpriseAccountPageRespVO::getAvatar);
+        query.selectAs(EnterpriseUserBindDO::getPhone, EnterpriseAccountPageRespVO::getPhone);
+        query.selectAs(EnterpriseUserBindDO::getEmail, EnterpriseAccountPageRespVO::getEmail);
 
         query.innerJoin(EnterpriseDO.class, EnterpriseDO::getId, EnterpriseAccountDO::getEnterpriseId);
         query.innerJoin(EnterpriseUserBindDO.class, on ->

+ 49 - 0
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/hunt/HuntMapper.java

@@ -0,0 +1,49 @@
+package com.citu.module.menduner.system.dal.mysql.hunt;
+
+
+import com.citu.framework.common.pojo.PageResult;
+import com.citu.framework.mybatis.core.mapper.BaseMapperX;
+import com.citu.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.citu.module.menduner.system.controller.base.hunt.HuntPageReqVO;
+import com.citu.module.menduner.system.dal.dataobject.hunt.HuntDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.util.List;
+
+
+/**
+ * 猎寻服务 Mapper
+ *
+ * @author Rayson
+ */
+@Mapper
+public interface HuntMapper extends BaseMapperX<HuntDO> {
+
+    default PageResult<HuntDO> selectPage(HuntPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<HuntDO>()
+                .likeIfPresent(HuntDO::getName, reqVO.getName())
+                .likeIfPresent(HuntDO::getEnterpriseName, reqVO.getEnterpriseName())
+                .eqIfPresent(HuntDO::getPhone, reqVO.getPhone())
+                .betweenIfPresent(HuntDO::getCreateTime, reqVO.getCreateTime())
+                .eqIfPresent(HuntDO::getStatus, reqVO.getStatus())
+                .eqIfPresent(HuntDO::getRemark, reqVO.getRemark())
+                .eqIfPresent(HuntDO::getIp, reqVO.getIp())
+                .orderByDesc(HuntDO::getId));
+    }
+
+
+    /**
+     * 根据ip查询今天的提交猎寻数据
+     **/
+    default List<HuntDO> selectTodaySubmitByIp(String ip) {
+        LocalDate date = LocalDate.now();
+        return selectList(new LambdaQueryWrapperX<HuntDO>()
+                .eq(HuntDO::getIp, ip)
+                .between(HuntDO::getCreateTime, date.atStartOfDay(), date.atTime(LocalTime.MAX))
+                .orderByDesc(HuntDO::getId));
+    }
+
+
+}

+ 13 - 0
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/tag/TagMapper.java

@@ -4,7 +4,10 @@ package com.citu.module.menduner.system.dal.mysql.tag;
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.framework.mybatis.core.mapper.BaseMapperX;
 import com.citu.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.citu.module.menduner.system.controller.base.industry.IndustryListReqVO;
+import com.citu.module.menduner.system.controller.base.tag.TagListReqVO;
 import com.citu.module.menduner.system.controller.base.tag.TagPageReqVO;
+import com.citu.module.menduner.system.dal.dataobject.industry.IndustryDO;
 import com.citu.module.menduner.system.dal.dataobject.tag.TagDO;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -36,4 +39,14 @@ public interface TagMapper extends BaseMapperX<TagDO> {
         );
     }
 
+    default List<TagDO> selectList(TagListReqVO reqVO) {
+        return selectList(new LambdaQueryWrapperX<TagDO>()
+                .likeRightIfPresent(TagDO::getNameCn, reqVO.getNameCn())
+                .likeRightIfPresent(TagDO::getNameEn, reqVO.getNameEn())
+                .eqIfPresent(TagDO::getType, reqVO.getType())
+                .eqIfPresent(TagDO::getParentId, reqVO.getParentId())
+                .eqIfPresent(TagDO::getLevel, reqVO.getLevel())
+                .orderByAsc(TagDO::getUpdateTime));
+    }
+
 }

+ 71 - 0
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/hunt/HuntService.java

@@ -0,0 +1,71 @@
+package com.citu.module.menduner.system.service.hunt;
+
+
+import com.citu.framework.common.pojo.PageResult;
+import com.citu.module.menduner.system.controller.base.hunt.HuntPageReqVO;
+import com.citu.module.menduner.system.controller.base.hunt.HuntProcessedReqVO;
+import com.citu.module.menduner.system.controller.base.hunt.HuntSaveReqVO;
+import com.citu.module.menduner.system.controller.base.hunt.HuntSubmitReqVO;
+import com.citu.module.menduner.system.dal.dataobject.hunt.HuntDO;
+
+import javax.validation.Valid;
+
+/**
+ * 猎寻服务 Service 接口
+ *
+ * @author Rayson
+ */
+public interface HuntService {
+
+    /**
+     * 创建猎寻服务
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createHunt(@Valid HuntSaveReqVO createReqVO);
+
+    /**
+     * 更新猎寻服务
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateHunt(@Valid HuntSaveReqVO updateReqVO);
+
+    /**
+     * 删除猎寻服务
+     *
+     * @param id 编号
+     */
+    void deleteHunt(Long id);
+
+    /**
+     * 获得猎寻服务
+     *
+     * @param id 编号
+     * @return 猎寻服务
+     */
+    HuntDO getHunt(Long id);
+
+    /**
+     * 获得猎寻服务分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 猎寻服务分页
+     */
+    PageResult<HuntDO> getHuntPage(HuntPageReqVO pageReqVO);
+
+    /**
+     * 已处理猎寻服务
+     *
+     * @param reqVO 处理信息
+     */
+    void processed(HuntProcessedReqVO reqVO);
+
+    /**
+     * 提交猎寻服务
+     *
+     * @param reqVO 提交信息
+     */
+    void submit(HuntSubmitReqVO reqVO);
+}

+ 102 - 0
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/hunt/HuntServiceImpl.java

@@ -0,0 +1,102 @@
+package com.citu.module.menduner.system.service.hunt;
+
+
+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.base.hunt.HuntPageReqVO;
+import com.citu.module.menduner.system.controller.base.hunt.HuntProcessedReqVO;
+import com.citu.module.menduner.system.controller.base.hunt.HuntSaveReqVO;
+import com.citu.module.menduner.system.controller.base.hunt.HuntSubmitReqVO;
+import com.citu.module.menduner.system.dal.dataobject.hunt.HuntDO;
+import com.citu.module.menduner.system.dal.mysql.hunt.HuntMapper;
+import com.citu.module.menduner.system.enums.hunt.HuntStatusEnum;
+import org.springframework.stereotype.Service;
+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.framework.common.util.servlet.ServletUtils.getClientIP;
+import static com.citu.module.menduner.system.enums.ErrorCodeConstants.HUNT_NOT_EXISTS;
+
+/**
+ * 猎寻服务 Service 实现类
+ *
+ * @author Rayson
+ */
+@Service
+@Validated
+public class HuntServiceImpl implements HuntService {
+
+    @Resource
+    private HuntMapper huntMapper;
+
+    @Override
+    public Long createHunt(HuntSaveReqVO createReqVO) {
+        // 插入
+        HuntDO hunt = BeanUtils.toBean(createReqVO, HuntDO.class);
+        hunt.setStatus(HuntStatusEnum.WAIT_PROCESSED.getStatus());
+        huntMapper.insert(hunt);
+        // 返回
+        return hunt.getId();
+    }
+
+    @Override
+    public void updateHunt(HuntSaveReqVO updateReqVO) {
+        // 校验存在
+        validateHuntExists(updateReqVO.getId());
+        // 更新
+        HuntDO updateObj = BeanUtils.toBean(updateReqVO, HuntDO.class);
+        huntMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteHunt(Long id) {
+        // 校验存在
+        validateHuntExists(id);
+        // 删除
+        huntMapper.deleteById(id);
+    }
+
+    private HuntDO validateHuntExists(Long id) {
+        HuntDO HuntDO = huntMapper.selectById(id);
+        if (null == HuntDO) {
+            throw exception(HUNT_NOT_EXISTS);
+        }
+        return HuntDO;
+    }
+
+    @Override
+    public HuntDO getHunt(Long id) {
+        return huntMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<HuntDO> getHuntPage(HuntPageReqVO pageReqVO) {
+        return huntMapper.selectPage(pageReqVO);
+    }
+
+    @Override
+    @DSTransactional
+    public void processed(HuntProcessedReqVO reqVO) {
+        HuntDO hunt = validateHuntExists(reqVO.getId());
+        hunt.setRemark(reqVO.getRemark());
+        hunt.setStatus(HuntStatusEnum.PROCESSED.getStatus());
+        huntMapper.updateById(hunt);
+    }
+
+    @Override
+    public void submit(HuntSubmitReqVO reqVO) {
+        String ip = getClientIP();
+        List<HuntDO> existList = huntMapper.selectTodaySubmitByIp(ip);
+        if (existList.size() >= 5) {
+            throw exception(1_100_045_005);
+        }
+        HuntDO hunt = BeanUtils.toBean(reqVO, HuntDO.class);
+        hunt.setStatus(HuntStatusEnum.WAIT_PROCESSED.getStatus());
+        hunt.setIp(ip);
+        huntMapper.insert(hunt);
+    }
+}

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/industry/IndustryService.java

@@ -58,7 +58,7 @@ public interface IndustryService {
     PageResult<IndustryDO> getIndustryPage(IndustryPageReqVO pageReqVO);
 
     /**
-     * 获得行业信息列表
+     * 获得行业信息列表
      *
      * @param pageReqVO 分页查询
      * @return 行业信息分页

+ 11 - 0
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/tag/TagService.java

@@ -2,9 +2,12 @@ package com.citu.module.menduner.system.service.tag;
 
 
 import com.citu.framework.common.pojo.PageResult;
+import com.citu.module.menduner.system.controller.base.industry.IndustryListReqVO;
 import com.citu.module.menduner.system.controller.base.tag.TagChildrenRespVO;
+import com.citu.module.menduner.system.controller.base.tag.TagListReqVO;
 import com.citu.module.menduner.system.controller.base.tag.TagPageReqVO;
 import com.citu.module.menduner.system.controller.base.tag.TagSaveReqVO;
+import com.citu.module.menduner.system.dal.dataobject.industry.IndustryDO;
 import com.citu.module.menduner.system.dal.dataobject.tag.TagDO;
 
 import javax.validation.Valid;
@@ -63,4 +66,12 @@ public interface TagService {
      */
     List<TagChildrenRespVO> getTagByType(String type);
 
+    /**
+     * 获得标签信息列表
+     *
+     * @param reqVO 查询
+     * @return 标签信息分页
+     */
+    List<TagDO> getTagList(TagListReqVO reqVO);
+
 }

+ 6 - 0
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/tag/TagServiceImpl.java

@@ -6,6 +6,7 @@ import com.citu.framework.common.pojo.PageResult;
 import com.citu.framework.common.util.object.BeanUtils;
 import com.citu.module.menduner.system.controller.app.industry.vo.AppIndustryChildrenRespVO;
 import com.citu.module.menduner.system.controller.base.tag.TagChildrenRespVO;
+import com.citu.module.menduner.system.controller.base.tag.TagListReqVO;
 import com.citu.module.menduner.system.controller.base.tag.TagPageReqVO;
 import com.citu.module.menduner.system.controller.base.tag.TagSaveReqVO;
 import com.citu.module.menduner.system.convert.IndustryConvert;
@@ -119,4 +120,9 @@ public class TagServiceImpl implements TagService {
                 })
                 .collect(Collectors.toList());
     }
+
+    @Override
+    public List<TagDO> getTagList(TagListReqVO reqVO) {
+        return tagMapper.selectList(reqVO);
+    }
 }

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

@@ -295,3 +295,14 @@
 1_100_043_004=ID card number cannot be empty
 1_100_043_005=ID card front not uploaded
 1_100_043_006=ID card reverse not uploaded
+# ========== 标签管理 1_100_044_000 ==========
+1_100_044_001=Label management does not exist
+1_100_044_002=Chinese name cannot be empty
+1_100_044_003=English name cannot be empty
+1_100_044_004=Label type cannot be empty
+# ========== 猎寻服务 1_100_045_000 ==========
+1_100_045_001=Hunting service does not exist
+1_100_045_002=Name cannot be empty
+1_100_045_003=Enterprise name cannot be empty
+1_100_045_004=Contact information cannot be empty
+1_100_045_005=Data submission frequency has exceeded today's maximum submission count

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

@@ -297,4 +297,15 @@
 1_100_043_003=姓名不能为空
 1_100_043_004=身份证号码不能为空
 1_100_043_005=身份证正面未上传
-1_100_043_006=身份证反面未上传
+1_100_043_006=身份证反面未上传
+# ========== 标签管理 1_100_044_000 ==========
+1_100_044_001=标签管理不存在
+1_100_044_002=中文名称不能为空
+1_100_044_003=英文名称不能为空
+1_100_044_004=标签类型不能为空
+# ========== 猎寻服务 1_100_045_000 ==========
+1_100_045_001=猎寻服务不存在
+1_100_045_002=姓名不能为空
+1_100_045_003=企业名称不能为空
+1_100_045_004=联系方式不能为空
+1_100_045_005=数据提交频繁,已超过今天最大提交次数

+ 144 - 0
menduner/menduner-system-biz/src/test/java/com/citu/module/menduner/system/service/hunt/HuntServiceImplTest.java

@@ -0,0 +1,144 @@
+package com.citu.module.menduner.system.service.hunt;
+
+
+import com.citu.framework.common.pojo.PageResult;
+import com.citu.framework.test.core.ut.BaseDbUnitTest;
+import com.citu.module.menduner.system.controller.base.hunt.HuntPageReqVO;
+import com.citu.module.menduner.system.controller.base.hunt.HuntSaveReqVO;
+import com.citu.module.menduner.system.dal.dataobject.hunt.HuntDO;
+import com.citu.module.menduner.system.dal.mysql.hunt.HuntMapper;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.springframework.context.annotation.Import;
+
+import javax.annotation.Resource;
+
+import static com.citu.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime;
+import static com.citu.framework.common.util.object.ObjectUtils.cloneIgnoreId;
+import static com.citu.framework.test.core.util.AssertUtils.assertPojoEquals;
+import static com.citu.framework.test.core.util.AssertUtils.assertServiceException;
+import static com.citu.framework.test.core.util.RandomUtils.randomLongId;
+import static com.citu.framework.test.core.util.RandomUtils.randomPojo;
+import static com.citu.module.menduner.system.enums.ErrorCodeConstants.HUNT_NOT_EXISTS;
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * {@link HuntServiceImpl} 的单元测试类
+ *
+ * @author Rayson
+ */
+@Import(HuntServiceImpl.class)
+public class HuntServiceImplTest extends BaseDbUnitTest {
+
+    @Resource
+    private HuntServiceImpl huntService;
+
+    @Resource
+    private HuntMapper huntMapper;
+
+    @Test
+    public void testCreateHunt_success() {
+        // 准备参数
+        HuntSaveReqVO createReqVO = randomPojo(HuntSaveReqVO.class).setId(null);
+
+        // 调用
+        Long huntId = huntService.createHunt(createReqVO);
+        // 断言
+        assertNotNull(huntId);
+        // 校验记录的属性是否正确
+        HuntDO hunt = huntMapper.selectById(huntId);
+        assertPojoEquals(createReqVO, hunt, "id");
+    }
+
+    @Test
+    public void testUpdateHunt_success() {
+        // mock 数据
+        HuntDO dbHunt = randomPojo(HuntDO.class);
+        huntMapper.insert(dbHunt);// @Sql: 先插入出一条存在的数据
+        // 准备参数
+        HuntSaveReqVO updateReqVO = randomPojo(HuntSaveReqVO.class, o -> {
+            o.setId(dbHunt.getId()); // 设置更新的 ID
+        });
+
+        // 调用
+        huntService.updateHunt(updateReqVO);
+        // 校验是否更新正确
+        HuntDO hunt = huntMapper.selectById(updateReqVO.getId()); // 获取最新的
+        assertPojoEquals(updateReqVO, hunt);
+    }
+
+    @Test
+    public void testUpdateHunt_notExists() {
+        // 准备参数
+        HuntSaveReqVO updateReqVO = randomPojo(HuntSaveReqVO.class);
+
+        // 调用, 并断言异常
+        assertServiceException(() -> huntService.updateHunt(updateReqVO), HUNT_NOT_EXISTS);
+    }
+
+    @Test
+    public void testDeleteHunt_success() {
+        // mock 数据
+        HuntDO dbHunt = randomPojo(HuntDO.class);
+        huntMapper.insert(dbHunt);// @Sql: 先插入出一条存在的数据
+        // 准备参数
+        Long id = dbHunt.getId();
+
+        // 调用
+        huntService.deleteHunt(id);
+        // 校验数据不存在了
+        assertNull(huntMapper.selectById(id));
+    }
+
+    @Test
+    public void testDeleteHunt_notExists() {
+        // 准备参数
+        Long id = randomLongId();
+
+        // 调用, 并断言异常
+        assertServiceException(() -> huntService.deleteHunt(id), HUNT_NOT_EXISTS);
+    }
+
+    @Test
+    @Disabled  // TODO 请修改 null 为需要的值,然后删除 @Disabled 注解
+    public void testGetHuntPage() {
+        // mock 数据
+        HuntDO dbHunt = randomPojo(HuntDO.class, o -> { // 等会查询到
+            o.setName(null);
+            o.setEnterpriseName(null);
+            o.setPhone(null);
+            o.setCreateTime(null);
+            o.setStatus(null);
+            o.setRemark(null);
+        });
+        huntMapper.insert(dbHunt);
+        // 测试 name 不匹配
+        huntMapper.insert(cloneIgnoreId(dbHunt, o -> o.setName(null)));
+        // 测试 enterpriseName 不匹配
+        huntMapper.insert(cloneIgnoreId(dbHunt, o -> o.setEnterpriseName(null)));
+        // 测试 phone 不匹配
+        huntMapper.insert(cloneIgnoreId(dbHunt, o -> o.setPhone(null)));
+        // 测试 createTime 不匹配
+        huntMapper.insert(cloneIgnoreId(dbHunt, o -> o.setCreateTime(null)));
+        // 测试 status 不匹配
+        huntMapper.insert(cloneIgnoreId(dbHunt, o -> o.setStatus(null)));
+        // 测试 remark 不匹配
+        huntMapper.insert(cloneIgnoreId(dbHunt, o -> o.setRemark(null)));
+        // 准备参数
+        HuntPageReqVO reqVO = new HuntPageReqVO();
+        reqVO.setName(null);
+        reqVO.setEnterpriseName(null);
+        reqVO.setPhone(null);
+        reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
+        reqVO.setStatus(null);
+        reqVO.setRemark(null);
+
+        // 调用
+        PageResult<HuntDO> pageResult = huntService.getHuntPage(reqVO);
+        // 断言
+        assertEquals(1, pageResult.getTotal());
+        assertEquals(1, pageResult.getList().size());
+        assertPojoEquals(dbHunt, pageResult.getList().get(0));
+    }
+
+}

+ 2 - 1
menduner/menduner-system-biz/src/test/resources/sql/clean.sql

@@ -36,4 +36,5 @@ DELETE FROM "mde_enterprise_invite_record";
 DELETE FROM "mde_interview_invite";
 
 DELETE FROM "mde_enterprise_auth";
-DELETE FROM "mde_tag";
+DELETE FROM "mde_tag";
+DELETE FROM "mde_hunt";

+ 16 - 0
menduner/menduner-system-biz/src/test/resources/sql/create_tables.sql

@@ -640,3 +640,19 @@ CREATE TABLE IF NOT EXISTS "mde_tag" (
     "tenant_id" bigint NOT NULL,
     PRIMARY KEY ("id")
 ) COMMENT '标签管理';
+
+CREATE TABLE IF NOT EXISTS "mde_hunt" (
+    "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
+    "name" varchar NOT NULL,
+    "enterprise_name" varchar NOT NULL,
+    "phone" varchar NOT NULL,
+    "creator" varchar DEFAULT '',
+    "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updater" varchar DEFAULT '',
+    "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    "deleted" bit NOT NULL DEFAULT FALSE,
+    "tenant_id" bigint NOT NULL,
+    "status" varchar NOT NULL,
+    "remark" varchar,
+    PRIMARY KEY ("id")
+) COMMENT '猎寻服务';