1、增加地区、职位、行业 list接口

2、增加热门职位接口

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/visits/vo/MdeVisitsListReqVO.java

@@ -1,10 +1,10 @@
 package com.citu.module.menduner.system.controller.admin.visits.vo;
 
-import com.citu.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
+import lombok.NoArgsConstructor;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDateTime;
@@ -13,9 +13,10 @@ import static com.citu.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DA
 
 @Schema(description = "管理后台 - 门墩儿-访问量 Request VO")
 @Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class MdeVisitsListReqVO extends PageParam {
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class MdeVisitsListReqVO {
 
     @Schema(description = "业务类型")
     private Integer type;
@@ -28,6 +29,6 @@ public class MdeVisitsListReqVO extends PageParam {
 
     @Schema(description = "访问日期")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] date;
+    private LocalDateTime date;
 
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/area/AppAreaController.java

@@ -4,6 +4,8 @@ import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.security.core.annotations.PreAuthenticated;
 import com.citu.module.menduner.system.controller.admin.area.vo.AreaListReqVO;
 import com.citu.module.menduner.system.controller.app.area.vo.AppAreaChildrenRespVO;
+import com.citu.module.menduner.system.controller.app.area.vo.AppAreaListReqVO;
+import com.citu.module.menduner.system.controller.app.area.vo.AppAreaSimpleRespVO;
 import com.citu.module.menduner.system.service.area.AreaService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -46,4 +48,12 @@ public class AppAreaController {
         return success(list);
     }
 
+    @GetMapping("/list")
+    @Operation(summary = "获得地区列表")
+    @PreAuthenticated
+    public CommonResult<List<AppAreaSimpleRespVO>> getAreaList(@Valid AppAreaListReqVO reqVO) {
+        List<AppAreaSimpleRespVO> list = areaService.getAreaList(reqVO);
+        return success(list);
+    }
+
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/area/vo/AppAreaChildrenRespVO.java

@@ -7,7 +7,7 @@ import lombok.NoArgsConstructor;
 
 import java.util.List;
 
-@Schema(description = "menduner -  地区列表 Request VO")
+@Schema(description = "menduner -  地区列表 Response VO")
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/area/vo/AppAreaListReqVO.java

@@ -0,0 +1,28 @@
+package com.citu.module.menduner.system.controller.app.area.vo;
+
+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 = "menduner -  地区列表 Request VO")
+@Data
+public class AppAreaListReqVO {
+
+    @Schema(description = "名字", example = "芋艿")
+    private String name;
+
+    @Schema(description = "区域类型", example = "2")
+    private Integer type;
+
+    @Schema(description = "父级编号", example = "6080")
+    private Long parentId;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/area/vo/AppAreaSimpleRespVO.java

@@ -0,0 +1,29 @@
+package com.citu.module.menduner.system.controller.app.area.vo;
+
+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 = "menduner -  地区列表 Response VO")
+@Data
+public class AppAreaSimpleRespVO {
+
+    @Schema(description = "id", example = "28186")
+    private Long id;
+
+    @Schema(description = "名字", example = "芋艿")
+    private String name;
+
+    @Schema(description = "区域类型", example = "2")
+    private Integer type;
+
+    @Schema(description = "父级编号", example = "6080")
+    private Long parentId;
+
+
+
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/industry/AppIndustryController.java

@@ -3,7 +3,11 @@ package com.citu.module.menduner.system.controller.app.industry;
 import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.security.core.annotations.PreAuthenticated;
 import com.citu.module.menduner.system.controller.admin.industry.vo.IndustryListReqVO;
+import com.citu.module.menduner.system.controller.app.area.vo.AppAreaListReqVO;
+import com.citu.module.menduner.system.controller.app.area.vo.AppAreaSimpleRespVO;
 import com.citu.module.menduner.system.controller.app.industry.vo.AppIndustryChildrenRespVO;
+import com.citu.module.menduner.system.controller.app.industry.vo.AppIndustryListReqVO;
+import com.citu.module.menduner.system.controller.app.industry.vo.AppIndustrySimpleRespVO;
 import com.citu.module.menduner.system.service.industry.IndustryService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -45,4 +49,11 @@ public class AppIndustryController {
         return success(list);
     }
 
+    @GetMapping("/list")
+    @Operation(summary = "获得行业列表")
+    @PreAuthenticated
+    public CommonResult<List<AppIndustrySimpleRespVO>> getIndustryList(@Valid AppIndustryListReqVO reqVO) {
+        List<AppIndustrySimpleRespVO> list = industryService.getIndustryList(reqVO);
+        return success(list);
+    }
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/industry/vo/AppIndustryListReqVO.java

@@ -0,0 +1,30 @@
+package com.citu.module.menduner.system.controller.app.industry.vo;
+
+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 = "menduner -  行业信息 Request VO")
+@Data
+public class AppIndustryListReqVO {
+    @Schema(description = "行业中文名称")
+    private String nameCn;
+
+    @Schema(description = "行业英文名称")
+    private String nameEn;
+
+    @Schema(description = "上级id", example = "11085")
+    private Long parentId;
+
+    @Schema(description = "层级")
+    private Integer level;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/industry/vo/AppIndustrySimpleRespVO.java

@@ -0,0 +1,21 @@
+package com.citu.module.menduner.system.controller.app.industry.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "menduner -  行业信息 Response VO")
+@Data
+public class AppIndustrySimpleRespVO {
+
+    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "7293")
+    private Long id;
+
+    @Schema(description = "行业中文名称")
+    private String nameCn;
+
+    @Schema(description = "行业英文名称")
+    private String nameEn;
+
+
+
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/position/AppPositionController.java

@@ -3,8 +3,12 @@ package com.citu.module.menduner.system.controller.app.position;
 import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.security.core.annotations.PreAuthenticated;
 import com.citu.module.menduner.system.controller.admin.position.vo.PositionListReqVO;
+import com.citu.module.menduner.system.controller.app.industry.vo.AppIndustryListReqVO;
+import com.citu.module.menduner.system.controller.app.industry.vo.AppIndustrySimpleRespVO;
 import com.citu.module.menduner.system.controller.app.position.vo.AppPositionChildrenRespVO;
 import com.citu.module.menduner.system.controller.app.position.vo.AppPositionClickReqVO;
+import com.citu.module.menduner.system.controller.app.position.vo.AppPositionListReqVO;
+import com.citu.module.menduner.system.controller.app.position.vo.AppPositionSimpleRespVO;
 import com.citu.module.menduner.system.service.position.PositionService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -52,4 +56,20 @@ public class AppPositionController {
         return success(list);
     }
 
+    @GetMapping("/list")
+    @Operation(summary = "获得职位列表")
+    @PreAuthenticated
+    public CommonResult<List<AppPositionSimpleRespVO>> getPositionList(@Valid AppPositionListReqVO reqVO) {
+        List<AppPositionSimpleRespVO> list = positionService.getPositionList(reqVO);
+        return success(list);
+    }
+
+    @GetMapping("/hot")
+    @Operation(summary = "获取热门职位")
+    @PreAuthenticated
+    public CommonResult<List<AppPositionSimpleRespVO>> getHotPosition() {
+        List<AppPositionSimpleRespVO> list = positionService.getHotPosition();
+        return success(list);
+    }
+
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/position/vo/AppPositionListReqVO.java

@@ -0,0 +1,31 @@
+package com.citu.module.menduner.system.controller.app.position.vo;
+
+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 = "menduner -  职位信息 Request VO")
+@Data
+public class AppPositionListReqVO {
+
+    @Schema(description = "职位中文名称")
+    private String nameCn;
+
+    @Schema(description = "职位英文名称")
+    private String nameEn;
+
+    @Schema(description = "上级id", example = "11085")
+    private Long parentId;
+
+    @Schema(description = "层级")
+    private Integer level;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/position/vo/AppPositionSimpleRespVO.java

@@ -0,0 +1,17 @@
+package com.citu.module.menduner.system.controller.app.position.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "menduner - 职位简易 Request VO")
+@Data
+public class AppPositionSimpleRespVO {
+
+    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "27892")
+    private Long id;
+
+    private String nameCn;
+
+    @Schema(description = "职位英文名称")
+    private String nameEn;
+}

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

@@ -1,6 +1,7 @@
 package com.citu.module.menduner.system.convert;
 
 import com.citu.module.menduner.system.controller.app.area.vo.AppAreaChildrenRespVO;
+import com.citu.module.menduner.system.controller.app.area.vo.AppAreaSimpleRespVO;
 import com.citu.module.menduner.system.dal.dataobject.area.AreaDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
@@ -15,4 +16,6 @@ public interface AreaConvert {
     AppAreaChildrenRespVO convert(AreaDO areaDO);
 
     List<AppAreaChildrenRespVO> convertList(List<AreaDO> list);
+
+    List<AppAreaSimpleRespVO> convertList2(List<AreaDO> list);
 }

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

@@ -1,6 +1,7 @@
 package com.citu.module.menduner.system.convert;
 
 import com.citu.module.menduner.system.controller.app.industry.vo.AppIndustryChildrenRespVO;
+import com.citu.module.menduner.system.controller.app.industry.vo.AppIndustrySimpleRespVO;
 import com.citu.module.menduner.system.dal.dataobject.industry.IndustryDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
@@ -15,4 +16,6 @@ public interface IndustryConvert {
     AppIndustryChildrenRespVO convert(IndustryDO industryDO);
 
     List<AppIndustryChildrenRespVO> convertList(List<IndustryDO> list);
+
+    List<AppIndustrySimpleRespVO> convertList2(List<IndustryDO> list);
 }

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

@@ -1,6 +1,7 @@
 package com.citu.module.menduner.system.convert;
 
 import com.citu.module.menduner.system.controller.app.position.vo.AppPositionChildrenRespVO;
+import com.citu.module.menduner.system.controller.app.position.vo.AppPositionSimpleRespVO;
 import com.citu.module.menduner.system.dal.dataobject.position.PositionDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
@@ -15,4 +16,6 @@ public interface PositionConvert {
     AppPositionChildrenRespVO convert(PositionDO industryDO);
 
     List<AppPositionChildrenRespVO> convertList(List<PositionDO> list);
+
+    List<AppPositionSimpleRespVO> convertList2(List<PositionDO> list);
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/area/AreaMapper.java

@@ -5,6 +5,7 @@ import com.citu.framework.mybatis.core.mapper.BaseMapperX;
 import com.citu.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.citu.module.menduner.system.controller.admin.area.vo.AreaListReqVO;
 import com.citu.module.menduner.system.controller.admin.area.vo.AreaPageReqVO;
+import com.citu.module.menduner.system.controller.app.area.vo.AppAreaListReqVO;
 import com.citu.module.menduner.system.dal.dataobject.area.AreaDO;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -39,6 +40,16 @@ public interface AreaMapper extends BaseMapperX<AreaDO> {
 
     }
 
+    default List<AreaDO> selectList(AppAreaListReqVO reqVO) {
+        return selectList(new LambdaQueryWrapperX<AreaDO>()
+                .likeRightIfPresent(AreaDO::getName, reqVO.getName())
+                .eqIfPresent(AreaDO::getType, reqVO.getType())
+                .eqIfPresent(AreaDO::getParentId, reqVO.getParentId())
+                .betweenIfPresent(AreaDO::getCreateTime, reqVO.getCreateTime())
+                .orderByAsc(AreaDO::getId));
+
+    }
+
     default List<AreaDO> selectListByParentId(Collection<Long> parentIds) {
         return selectList(AreaDO::getParentId, parentIds);
     }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/industry/IndustryMapper.java

@@ -5,6 +5,7 @@ import com.citu.framework.mybatis.core.mapper.BaseMapperX;
 import com.citu.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.citu.module.menduner.system.controller.admin.industry.vo.IndustryListReqVO;
 import com.citu.module.menduner.system.controller.admin.industry.vo.IndustryPageReqVO;
+import com.citu.module.menduner.system.controller.app.industry.vo.AppIndustryListReqVO;
 import com.citu.module.menduner.system.dal.dataobject.industry.IndustryDO;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -36,6 +37,14 @@ public interface IndustryMapper extends BaseMapperX<IndustryDO> {
                 .orderByAsc(IndustryDO::getUpdateTime));
     }
 
+    default List<IndustryDO> selectList(AppIndustryListReqVO reqVO) {
+        return selectList(new LambdaQueryWrapperX<IndustryDO>()
+                .likeRightIfPresent(IndustryDO::getNameCn, reqVO.getNameCn())
+                .likeRightIfPresent(IndustryDO::getNameEn, reqVO.getNameEn())
+                .betweenIfPresent(IndustryDO::getCreateTime, reqVO.getCreateTime())
+                .orderByAsc(IndustryDO::getUpdateTime));
+    }
+
     default List<IndustryDO> selectListByParentId(Collection<Long> parentIds) {
         return selectList(IndustryDO::getParentId, parentIds);
     }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/position/PositionMapper.java

@@ -5,6 +5,7 @@ import com.citu.framework.mybatis.core.mapper.BaseMapperX;
 import com.citu.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.citu.module.menduner.system.controller.admin.position.vo.PositionListReqVO;
 import com.citu.module.menduner.system.controller.admin.position.vo.PositionPageReqVO;
+import com.citu.module.menduner.system.controller.app.position.vo.AppPositionListReqVO;
 import com.citu.module.menduner.system.dal.dataobject.industry.IndustryDO;
 import com.citu.module.menduner.system.dal.dataobject.position.PositionDO;
 import org.apache.ibatis.annotations.Mapper;
@@ -40,10 +41,24 @@ public interface PositionMapper extends BaseMapperX<PositionDO> {
                 .orderByAsc(PositionDO::getId));
     }
 
+    default List<PositionDO> selectList(AppPositionListReqVO reqVO) {
+        return selectList(new LambdaQueryWrapperX<PositionDO>()
+                .likeRightIfPresent(PositionDO::getNameCn, reqVO.getNameCn())
+                .likeRightIfPresent(PositionDO::getNameEn, reqVO.getNameEn())
+                .eqIfPresent(PositionDO::getParentId, reqVO.getParentId())
+                .eqIfPresent(PositionDO::getLevel, reqVO.getLevel())
+                .betweenIfPresent(PositionDO::getCreateTime, reqVO.getCreateTime())
+                .orderByAsc(PositionDO::getId));
+    }
+
     default List<PositionDO> selectListByParentId(Collection<Long> parentIds) {
         return selectList(PositionDO::getParentId, parentIds);
     }
 
+    default List<PositionDO> selectListByIdList(Collection<Long> idList) {
+        return selectList(PositionDO::getId, idList);
+    }
+
     /**
      * 清空职位数据
      **/

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/visits/MdeVisitsMapper.java

@@ -1,12 +1,16 @@
 package com.citu.module.menduner.system.dal.mysql.visits;
 
 import com.citu.framework.common.pojo.PageResult;
+import com.citu.framework.common.util.date.DateUtils;
 import com.citu.framework.mybatis.core.mapper.BaseMapperX;
 import com.citu.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.citu.module.menduner.system.controller.admin.visits.vo.MdeVisitsListReqVO;
 import com.citu.module.menduner.system.controller.admin.visits.vo.MdeVisitsPageReqVO;
 import com.citu.module.menduner.system.dal.dataobject.visits.MdeVisitsDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 门墩儿-访问量 Mapper
  *
@@ -25,4 +29,17 @@ public interface MdeVisitsMapper extends BaseMapperX<MdeVisitsDO> {
                 .betweenIfPresent(MdeVisitsDO::getDate, reqVO.getDate())
                 .orderByAsc(MdeVisitsDO::getId));
     }
+
+
+    default List<MdeVisitsDO> getBizIdVisitsTop10List(MdeVisitsListReqVO reqVO){
+        return selectList(new LambdaQueryWrapperX<MdeVisitsDO>()
+                .eqIfPresent(MdeVisitsDO::getUserId, reqVO.getUserId())
+                .eqIfPresent(MdeVisitsDO::getType, reqVO.getType())
+                .eqIfPresent(MdeVisitsDO::getDate, reqVO.getDate())
+                .eqIfPresent(MdeVisitsDO::getBizId, reqVO.getBizId())
+                .eqIfPresent(MdeVisitsDO::getDate, DateUtils.of(reqVO.getDate()))
+                .orderByDesc(MdeVisitsDO::getDate)
+        );
+
+    }
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/area/AreaService.java

@@ -1,10 +1,12 @@
 package com.citu.module.menduner.system.service.area;
 
 import com.citu.framework.common.pojo.PageResult;
-import com.citu.module.menduner.system.controller.app.area.vo.AppAreaChildrenRespVO;
 import com.citu.module.menduner.system.controller.admin.area.vo.AreaListReqVO;
 import com.citu.module.menduner.system.controller.admin.area.vo.AreaPageReqVO;
 import com.citu.module.menduner.system.controller.admin.area.vo.AreaSaveReqVO;
+import com.citu.module.menduner.system.controller.app.area.vo.AppAreaChildrenRespVO;
+import com.citu.module.menduner.system.controller.app.area.vo.AppAreaListReqVO;
+import com.citu.module.menduner.system.controller.app.area.vo.AppAreaSimpleRespVO;
 import com.citu.module.menduner.system.dal.dataobject.area.AreaDO;
 
 import javax.validation.Valid;
@@ -77,8 +79,16 @@ public interface AreaService {
     List<AppAreaChildrenRespVO> getAreaIdChildren(Long id);
 
     /**
-     * 获取中国的区域
+     * 获取区域
+     *
      * @param reqVO 查询条件
      **/
     List<AppAreaChildrenRespVO> getArea(AreaListReqVO reqVO);
+
+    /**
+     * 获取区域
+     *
+     * @param reqVO 查询条件
+     **/
+    List<AppAreaSimpleRespVO> getAreaList(AppAreaListReqVO reqVO);
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/area/AreaServiceImpl.java

@@ -7,6 +7,8 @@ import com.citu.module.menduner.system.controller.app.area.vo.AppAreaChildrenRes
 import com.citu.module.menduner.system.controller.admin.area.vo.AreaListReqVO;
 import com.citu.module.menduner.system.controller.admin.area.vo.AreaPageReqVO;
 import com.citu.module.menduner.system.controller.admin.area.vo.AreaSaveReqVO;
+import com.citu.module.menduner.system.controller.app.area.vo.AppAreaListReqVO;
+import com.citu.module.menduner.system.controller.app.area.vo.AppAreaSimpleRespVO;
 import com.citu.module.menduner.system.convert.AreaConvert;
 import com.citu.module.menduner.system.dal.dataobject.area.AreaDO;
 import com.citu.module.menduner.system.dal.mysql.area.AreaMapper;
@@ -149,4 +151,8 @@ public class AreaServiceImpl implements AreaService {
         return children;
     }
 
+    @Override
+    public List<AppAreaSimpleRespVO> getAreaList(AppAreaListReqVO reqVO) {
+        return AreaConvert.INSTANCE.convertList2(areaMapper.selectList(reqVO));
+    }
 }

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

@@ -5,6 +5,8 @@ import com.citu.module.menduner.system.controller.app.industry.vo.AppIndustryChi
 import com.citu.module.menduner.system.controller.admin.industry.vo.IndustryListReqVO;
 import com.citu.module.menduner.system.controller.admin.industry.vo.IndustryPageReqVO;
 import com.citu.module.menduner.system.controller.admin.industry.vo.IndustrySaveReqVO;
+import com.citu.module.menduner.system.controller.app.industry.vo.AppIndustryListReqVO;
+import com.citu.module.menduner.system.controller.app.industry.vo.AppIndustrySimpleRespVO;
 import com.citu.module.menduner.system.dal.dataobject.industry.IndustryDO;
 
 import javax.validation.Valid;
@@ -82,4 +84,11 @@ public interface IndustryService {
      **/
     List<AppIndustryChildrenRespVO> getIndustry(IndustryListReqVO reqVO);
 
+    /**
+     * 获取行业信息
+     *
+     * @param reqVO 查询条件
+     **/
+    List<AppIndustrySimpleRespVO> getIndustryList(AppIndustryListReqVO reqVO);
+    
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/industry/IndustryServiceImpl.java

@@ -3,13 +3,13 @@ package com.citu.module.menduner.system.service.industry;
 import cn.hutool.core.collection.CollUtil;
 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.admin.industry.vo.IndustryListReqVO;
 import com.citu.module.menduner.system.controller.admin.industry.vo.IndustryPageReqVO;
 import com.citu.module.menduner.system.controller.admin.industry.vo.IndustrySaveReqVO;
+import com.citu.module.menduner.system.controller.app.industry.vo.AppIndustryChildrenRespVO;
+import com.citu.module.menduner.system.controller.app.industry.vo.AppIndustryListReqVO;
+import com.citu.module.menduner.system.controller.app.industry.vo.AppIndustrySimpleRespVO;
 import com.citu.module.menduner.system.convert.IndustryConvert;
-
 import com.citu.module.menduner.system.dal.dataobject.industry.IndustryDO;
 import com.citu.module.menduner.system.dal.mysql.industry.IndustryMapper;
 import com.citu.module.menduner.system.dal.redis.RedisKeyConstants;
@@ -193,8 +193,9 @@ public class IndustryServiceImpl implements IndustryService {
 
     /**
      * 递归查询子节点
-     * @param root  根节点
-     * @param all   所有节点
+     *
+     * @param root 根节点
+     * @param all  所有节点
      * @return 根节点信息
      */
     private List<AppIndustryChildrenRespVO> getChildren(AppIndustryChildrenRespVO root, List<AppIndustryChildrenRespVO> all) {
@@ -208,4 +209,9 @@ public class IndustryServiceImpl implements IndustryService {
         ).collect(Collectors.toList());
         return children;
     }
+
+    @Override
+    public List<AppIndustrySimpleRespVO> getIndustryList(AppIndustryListReqVO reqVO) {
+        return IndustryConvert.INSTANCE.convertList2(industryMapper.selectList(reqVO));
+    }
 }

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

@@ -11,6 +11,7 @@ import com.citu.module.menduner.system.controller.app.job.vo.AppJobHomeRespVO;
 import com.citu.module.menduner.system.controller.app.job.vo.AppJobSimpleRespVO;
 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.visits.MdeVisitsService;
 import org.apache.poi.hpsf.Decimal;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
@@ -37,6 +38,10 @@ public class JobAdvertisedServiceImpl implements JobAdvertisedService {
     @Resource
     private JobAdvertisedMapper jobAdvertisedMapper;
 
+
+    @Resource
+    private MdeVisitsService visitsService;
+
     @Override
     public Long createJobAdvertised(JobAdvertisedSaveReqVO createReqVO) {
         // 插入

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/position/PositionService.java

@@ -1,11 +1,14 @@
 package com.citu.module.menduner.system.service.position;
 
 import com.citu.framework.common.pojo.PageResult;
+
 import com.citu.module.menduner.system.controller.app.position.vo.AppPositionChildrenRespVO;
 import com.citu.module.menduner.system.controller.admin.position.vo.PositionListReqVO;
 import com.citu.module.menduner.system.controller.admin.position.vo.PositionPageReqVO;
 import com.citu.module.menduner.system.controller.admin.position.vo.PositionSaveReqVO;
 import com.citu.module.menduner.system.controller.app.position.vo.AppPositionClickReqVO;
+import com.citu.module.menduner.system.controller.app.position.vo.AppPositionListReqVO;
+import com.citu.module.menduner.system.controller.app.position.vo.AppPositionSimpleRespVO;
 import com.citu.module.menduner.system.dal.dataobject.position.PositionDO;
 
 import javax.validation.Valid;
@@ -78,7 +81,7 @@ public interface PositionService {
      * 根据职位id获得职位列表
      *
      * @param id 查询条件
-     * @return 地区列表
+     * @return 职位列表
      **/
     List<AppPositionChildrenRespVO> getPositionIdChildren(Long id);
 
@@ -86,7 +89,21 @@ public interface PositionService {
      * 获取职位信息
      *
      * @param reqVO 查询条件
+     * @return 职位列表
      **/
     List<AppPositionChildrenRespVO> getPosition(PositionListReqVO reqVO);
 
+    /**
+     * 获取职位信息
+     * @return 热门职位列表
+     **/
+    List<AppPositionSimpleRespVO> getHotPosition();
+
+    /**
+     * 获取职位信息
+     *
+     * @param reqVO 查询条件
+     **/
+    List<AppPositionSimpleRespVO> getPositionList(AppPositionListReqVO reqVO);
+
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/position/PositionServiceImpl.java

@@ -3,17 +3,21 @@ package com.citu.module.menduner.system.service.position;
 import cn.hutool.core.collection.CollUtil;
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.framework.common.util.object.BeanUtils;
-import com.citu.module.menduner.system.controller.app.position.vo.AppPositionChildrenRespVO;
 import com.citu.module.menduner.system.controller.admin.position.vo.PositionListReqVO;
 import com.citu.module.menduner.system.controller.admin.position.vo.PositionPageReqVO;
 import com.citu.module.menduner.system.controller.admin.position.vo.PositionSaveReqVO;
+import com.citu.module.menduner.system.controller.admin.visits.vo.MdeVisitsListReqVO;
+import com.citu.module.menduner.system.controller.app.position.vo.AppPositionChildrenRespVO;
 import com.citu.module.menduner.system.controller.app.position.vo.AppPositionClickReqVO;
+import com.citu.module.menduner.system.controller.app.position.vo.AppPositionListReqVO;
+import com.citu.module.menduner.system.controller.app.position.vo.AppPositionSimpleRespVO;
 import com.citu.module.menduner.system.convert.PositionConvert;
 import com.citu.module.menduner.system.dal.dataobject.position.PositionDO;
 import com.citu.module.menduner.system.dal.mysql.position.PositionMapper;
 import com.citu.module.menduner.system.dal.redis.RedisKeyConstants;
 import com.citu.module.menduner.system.enums.visits.MdeVisitsEnum;
 import com.citu.module.menduner.system.mq.producer.MdeVisitsProducer;
+import com.citu.module.menduner.system.service.visits.MdeVisitsService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
@@ -29,6 +33,7 @@ import java.util.stream.Collectors;
 
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.citu.framework.common.util.collection.CollectionUtils.convertSet;
+import static com.citu.framework.web.core.util.WebFrameworkUtils.getLoginUserId;
 import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_POSITION_NOT_EXISTS;
 
 /**
@@ -47,6 +52,8 @@ public class PositionServiceImpl implements PositionService {
     @Resource
     private MdeVisitsProducer producer;
 
+    @Resource
+    private MdeVisitsService visitsService;
 
     @Resource
     private RestTemplate restTemplate;
@@ -219,4 +226,24 @@ public class PositionServiceImpl implements PositionService {
         return children;
     }
 
+    @Override
+    public List<AppPositionSimpleRespVO> getHotPosition() {
+        List<Long> idList = visitsService.getBizIdVisitsTop10List(
+                MdeVisitsListReqVO.builder()
+                        .type(MdeVisitsEnum.POSITION_CLICK.getType())
+                        .userId(getLoginUserId())
+                        .build()
+        );
+
+        if (CollUtil.isNotEmpty(idList)) {
+            List<PositionDO> positionDOList = positionMapper.selectListByIdList(idList);
+            return PositionConvert.INSTANCE.convertList2(positionDOList);
+        }
+        return Collections.emptyList();
+    }
+
+    @Override
+    public List<AppPositionSimpleRespVO> getPositionList(AppPositionListReqVO reqVO) {
+        return PositionConvert.INSTANCE.convertList2(positionMapper.selectList(reqVO));
+    }
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/visits/MdeVisitsServiceImpl.java

@@ -7,18 +7,17 @@ import com.citu.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.citu.module.menduner.system.controller.admin.visits.vo.MdeVisitsListReqVO;
 import com.citu.module.menduner.system.controller.admin.visits.vo.MdeVisitsPageReqVO;
 import com.citu.module.menduner.system.controller.admin.visits.vo.MdeVisitsSaveReqVO;
-import com.citu.module.menduner.system.mq.message.MdeVisitsSendMessage;
 import com.citu.module.menduner.system.dal.dataobject.visits.MdeVisitsDO;
 import com.citu.module.menduner.system.dal.mysql.visits.MdeVisitsMapper;
+import com.citu.module.menduner.system.mq.message.MdeVisitsSendMessage;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
-
-import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.citu.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
@@ -114,6 +113,10 @@ public class MdeVisitsServiceImpl implements MdeVisitsService {
 
     @Override
     public List<Long> getBizIdVisitsTop10List(MdeVisitsListReqVO reqVO) {
-        return Collections.emptyList();
+        List<MdeVisitsDO> list = mdeVisitsMapper.getBizIdVisitsTop10List(reqVO);
+        if(null == list) {
+            return null;
+        }
+        return list.stream().map(MdeVisitsDO::getBizId).collect(Collectors.toList());
     }
 }