1、增加区域用户端接口

2、增加行业用户端接口
3、增加职位类型用户端接口

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/area/AreaController.java

@@ -1,32 +1,32 @@
 package com.citu.module.menduner.system.controller.admin.area;
 
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-
-import javax.validation.*;
-import javax.servlet.http.*;
-import java.util.*;
-import java.io.IOException;
-
+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.pojo.CommonResult;
 import com.citu.framework.common.util.object.BeanUtils;
-import static com.citu.framework.common.pojo.CommonResult.success;
-
 import com.citu.framework.excel.core.util.ExcelUtils;
-
-import com.citu.framework.apilog.core.annotation.ApiAccessLog;
-import static com.citu.framework.apilog.core.enums.OperateTypeEnum.*;
-
-import com.citu.module.menduner.system.controller.admin.area.vo.*;
+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.AreaRespVO;
+import com.citu.module.menduner.system.controller.admin.area.vo.AreaSaveReqVO;
 import com.citu.module.menduner.system.dal.dataobject.area.AreaDO;
 import com.citu.module.menduner.system.service.area.AreaService;
+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.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
@@ -91,25 +91,12 @@ public class AreaController {
     @PreAuthorize("@ss.hasPermission('menduner:system:area:export')")
     @ApiAccessLog(operateType = EXPORT)
     public void exportAreaExcel(@Valid AreaPageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
+                                HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
         List<AreaDO> list = areaService.getAreaPage(pageReqVO).getList();
         // 导出 Excel
         ExcelUtils.write(response, "地区.xls", "数据", AreaRespVO.class,
-                        BeanUtils.toBean(list, AreaRespVO.class));
-    }
-
-    @GetMapping("/get/tree")
-    @Operation(summary = "获取区域树形")
-    public CommonResult<List<AreaChildrenRespVO>> getArea(@Valid AreaListReqVO listReqVO) {
-        List<AreaChildrenRespVO> list = areaService.getArea(listReqVO);
-        return success(list);
-    }
-    @GetMapping("/get/children")
-    @Operation(summary = "根据区域id获得地区下级列表")
-    public CommonResult<List<AreaChildrenRespVO>> getAreaIdChildren(@RequestParam("id") Long id) {
-        List<AreaChildrenRespVO> list = areaService.getAreaIdChildren(id);
-        return success(list);
+                BeanUtils.toBean(list, AreaRespVO.class));
     }
 
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/industry/IndustryController.java

@@ -104,17 +104,6 @@ public class IndustryController {
         industryService.syncBossIndustry();
     }
 
-    @GetMapping("/get/tree")
-    @Operation(summary = "获取行业树形")
-    public CommonResult<List<IndustryChildrenRespVO>> getIndustry(@Valid IndustryListReqVO listReqVO) {
-        List<IndustryChildrenRespVO> list = industryService.getIndustry(listReqVO);
-        return success(list);
-    }
-    @GetMapping("/get/children")
-    @Operation(summary = "根据职位id获得职位下级列表")
-    public CommonResult<List<IndustryChildrenRespVO>> getIndustryIdChildren(@RequestParam("id") Long id) {
-        List<IndustryChildrenRespVO> list = industryService.getIndustryIdChildren(id);
-        return success(list);
-    }
+
 
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/position/PositionController.java

@@ -7,12 +7,12 @@ 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.position.vo.*;
+import com.citu.module.menduner.system.controller.app.position.vo.AppPositionChildrenRespVO;
 import com.citu.module.menduner.system.dal.dataobject.position.PositionDO;
 import com.citu.module.menduner.system.service.position.PositionService;
 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.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -22,7 +22,6 @@ import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
 import java.util.List;
-import java.util.Map;
 
 import static com.citu.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
 import static com.citu.framework.common.pojo.CommonResult.success;
@@ -105,16 +104,4 @@ public class PositionController {
         positionService.syncBossPosition();
     }
 
-    @GetMapping("/get/tree")
-    @Operation(summary = "获取职位树形")
-    public CommonResult<List<PositionChildrenRespVO>> getPosition(@Valid PositionListReqVO listReqVO) {
-        List<PositionChildrenRespVO> list = positionService.getPosition(listReqVO);
-        return success(list);
-    }
-    @GetMapping("/get/children")
-    @Operation(summary = "根据职位id获得职位下级列表")
-    public CommonResult<List<PositionChildrenRespVO>> getPositionIdChildren(@RequestParam("id") Long id) {
-        List<PositionChildrenRespVO> list = positionService.getPositionIdChildren(id);
-        return success(list);
-    }
 }

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

@@ -0,0 +1,33 @@
+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.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 MdeVisitsListReqVO extends PageParam {
+
+    @Schema(description = "业务类型")
+    private Integer type;
+
+    @Schema(description = "业务id")
+    private Long bizId;
+
+    @Schema(description = "用户id")
+    private Long userId;
+
+    @Schema(description = "访问日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] date;
+
+}

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

@@ -0,0 +1,49 @@
+package com.citu.module.menduner.system.controller.app.area;
+
+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.service.area.AreaService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.List;
+
+import static com.citu.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "用户端 - 区域信息")
+@RestController
+@RequestMapping("/menduner/system/area")
+@Validated
+@Slf4j
+public class AppAreaController {
+
+    @Resource
+    private AreaService areaService;
+
+    @GetMapping("/get/tree")
+    @PreAuthenticated
+    @Operation(summary = "获取区域树形")
+    public CommonResult<List<AppAreaChildrenRespVO>> getArea(@Valid AreaListReqVO listReqVO) {
+        List<AppAreaChildrenRespVO> list = areaService.getArea(listReqVO);
+        return success(list);
+    }
+
+    @GetMapping("/get/children")
+    @PreAuthenticated
+    @Operation(summary = "根据区域id获得地区下级列表")
+    public CommonResult<List<AppAreaChildrenRespVO>> getAreaIdChildren(@RequestParam("id") Long id) {
+        List<AppAreaChildrenRespVO> list = areaService.getAreaIdChildren(id);
+        return success(list);
+    }
+
+}

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

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.admin.area.vo;
+package com.citu.module.menduner.system.controller.app.area.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
@@ -7,11 +7,11 @@ import lombok.NoArgsConstructor;
 
 import java.util.List;
 
-@Schema(description = "管理后台 -  地区列表 Request VO")
+@Schema(description = "menduner -  地区列表 Request VO")
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class AreaChildrenRespVO {
+public class AppAreaChildrenRespVO {
 
     @Schema(description = "id", example = "28186")
     private Long id;
@@ -28,6 +28,6 @@ public class AreaChildrenRespVO {
     /**
      * 子节点
      */
-    private List<AreaChildrenRespVO> children;
+    private List<AppAreaChildrenRespVO> children;
 
 }

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

@@ -0,0 +1,48 @@
+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.industry.vo.AppIndustryChildrenRespVO;
+import com.citu.module.menduner.system.service.industry.IndustryService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.List;
+
+import static com.citu.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "用户端 - 行业信息")
+@RestController
+@RequestMapping("/menduner/system/industry")
+@Validated
+@Slf4j
+public class AppIndustryController {
+
+    @Resource
+    private IndustryService industryService;
+
+    @GetMapping("/get/tree")
+    @PreAuthenticated
+    @Operation(summary = "获取行业树形")
+    public CommonResult<List<AppIndustryChildrenRespVO>> getIndustry(@Valid IndustryListReqVO listReqVO) {
+        List<AppIndustryChildrenRespVO> list = industryService.getIndustry(listReqVO);
+        return success(list);
+    }
+    @GetMapping("/get/children")
+    @PreAuthenticated
+    @Operation(summary = "根据职位id获得职位下级列表")
+    public CommonResult<List<AppIndustryChildrenRespVO>> getIndustryIdChildren(@RequestParam("id") Long id) {
+        List<AppIndustryChildrenRespVO> list = industryService.getIndustryIdChildren(id);
+        return success(list);
+    }
+
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/industry/vo/IndustryChildrenRespVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/industry/vo/AppIndustryChildrenRespVO.java

@@ -1,6 +1,5 @@
-package com.citu.module.menduner.system.controller.admin.industry.vo;
+package com.citu.module.menduner.system.controller.app.industry.vo;
 
-import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -8,11 +7,11 @@ import lombok.NoArgsConstructor;
 
 import java.util.List;
 
-@Schema(description = "管理后台 -  行业信息 Request VO")
+@Schema(description = "menduner -  行业信息 Request VO")
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class IndustryChildrenRespVO {
+public class AppIndustryChildrenRespVO {
 
 
     @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "7293")
@@ -33,6 +32,6 @@ public class IndustryChildrenRespVO {
     /**
      * 子节点
      */
-    private List<IndustryChildrenRespVO> children;
+    private List<AppIndustryChildrenRespVO> children;
 
 }

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

@@ -2,20 +2,21 @@ 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.position.vo.AppPositionChildrenRespVO;
 import com.citu.module.menduner.system.controller.app.position.vo.AppPositionClickReqVO;
 import com.citu.module.menduner.system.service.position.PositionService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
 
+import java.util.List;
+
 import static com.citu.framework.common.pojo.CommonResult.success;
 
 @Tag(name = "用户端 - 职位信息")
@@ -36,4 +37,19 @@ public class AppPositionController {
         return success(true);
     }
 
+    @GetMapping("/get/tree")
+    @PreAuthenticated
+    @Operation(summary = "获取职位树形")
+    public CommonResult<List<AppPositionChildrenRespVO>> getPosition(@Valid PositionListReqVO listReqVO) {
+        List<AppPositionChildrenRespVO> list = positionService.getPosition(listReqVO);
+        return success(list);
+    }
+    @GetMapping("/get/children")
+    @PreAuthenticated
+    @Operation(summary = "根据职位id获得职位下级列表")
+    public CommonResult<List<AppPositionChildrenRespVO>> getPositionIdChildren(@RequestParam("id") Long id) {
+        List<AppPositionChildrenRespVO> list = positionService.getPositionIdChildren(id);
+        return success(list);
+    }
+
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/position/vo/PositionChildrenRespVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/position/vo/AppPositionChildrenRespVO.java

@@ -1,6 +1,5 @@
-package com.citu.module.menduner.system.controller.admin.position.vo;
+package com.citu.module.menduner.system.controller.app.position.vo;
 
-import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -8,11 +7,11 @@ import lombok.NoArgsConstructor;
 
 import java.util.List;
 
-@Schema(description = "管理后台 -  行业信息 Request VO")
+@Schema(description = "menduner -  行业信息 Request VO")
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class PositionChildrenRespVO {
+public class AppPositionChildrenRespVO {
 
 
     @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "27892")
@@ -33,6 +32,6 @@ public class PositionChildrenRespVO {
     /**
      * 子节点
      */
-    private List<PositionChildrenRespVO> children;
+    private List<AppPositionChildrenRespVO> children;
 
 }

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

@@ -1,6 +1,6 @@
 package com.citu.module.menduner.system.convert;
 
-import com.citu.module.menduner.system.controller.admin.area.vo.AreaChildrenRespVO;
+import com.citu.module.menduner.system.controller.app.area.vo.AppAreaChildrenRespVO;
 import com.citu.module.menduner.system.dal.dataobject.area.AreaDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
@@ -12,7 +12,7 @@ public interface AreaConvert {
 
     AreaConvert INSTANCE = Mappers.getMapper(AreaConvert.class);
 
-    AreaChildrenRespVO convert(AreaDO areaDO);
+    AppAreaChildrenRespVO convert(AreaDO areaDO);
 
-    List<AreaChildrenRespVO> convertList(List<AreaDO> list);
+    List<AppAreaChildrenRespVO> convertList(List<AreaDO> list);
 }

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

@@ -1,6 +1,6 @@
 package com.citu.module.menduner.system.convert;
 
-import com.citu.module.menduner.system.controller.admin.industry.vo.IndustryChildrenRespVO;
+import com.citu.module.menduner.system.controller.app.industry.vo.AppIndustryChildrenRespVO;
 import com.citu.module.menduner.system.dal.dataobject.industry.IndustryDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
@@ -12,7 +12,7 @@ public interface IndustryConvert {
 
     IndustryConvert INSTANCE = Mappers.getMapper(IndustryConvert.class);
 
-    IndustryChildrenRespVO convert(IndustryDO industryDO);
+    AppIndustryChildrenRespVO convert(IndustryDO industryDO);
 
-    List<IndustryChildrenRespVO> convertList(List<IndustryDO> list);
+    List<AppIndustryChildrenRespVO> convertList(List<IndustryDO> list);
 }

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

@@ -1,6 +1,6 @@
 package com.citu.module.menduner.system.convert;
 
-import com.citu.module.menduner.system.controller.admin.position.vo.PositionChildrenRespVO;
+import com.citu.module.menduner.system.controller.app.position.vo.AppPositionChildrenRespVO;
 import com.citu.module.menduner.system.dal.dataobject.position.PositionDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
@@ -12,7 +12,7 @@ public interface PositionConvert {
 
     PositionConvert INSTANCE = Mappers.getMapper(PositionConvert.class);
 
-    PositionChildrenRespVO convert(PositionDO industryDO);
+    AppPositionChildrenRespVO convert(PositionDO industryDO);
 
-    List<PositionChildrenRespVO> convertList(List<PositionDO> list);
+    List<AppPositionChildrenRespVO> convertList(List<PositionDO> list);
 }

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

@@ -21,7 +21,7 @@ public interface MdeVisitsMapper extends BaseMapperX<MdeVisitsDO> {
                 .eqIfPresent(MdeVisitsDO::getUserId, reqVO.getUserId())
                 .eqIfPresent(MdeVisitsDO::getType, reqVO.getType())
                 .eqIfPresent(MdeVisitsDO::getDate, reqVO.getDate())
-                .eqIfPresent(MdeVisitsDO::getBusinessId, reqVO.getBusinessId())
+                .eqIfPresent(MdeVisitsDO::getBizId, reqVO.getBizId())
                 .betweenIfPresent(MdeVisitsDO::getDate, reqVO.getDate())
                 .orderByAsc(MdeVisitsDO::getId));
     }

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

@@ -1,7 +1,7 @@
 package com.citu.module.menduner.system.service.area;
 
 import com.citu.framework.common.pojo.PageResult;
-import com.citu.module.menduner.system.controller.admin.area.vo.AreaChildrenRespVO;
+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;
@@ -74,11 +74,11 @@ public interface AreaService {
      * @param id 查询条件
      * @return 地区列表
      **/
-    List<AreaChildrenRespVO> getAreaIdChildren(Long id);
+    List<AppAreaChildrenRespVO> getAreaIdChildren(Long id);
 
     /**
      * 获取中国的区域
      * @param reqVO 查询条件
      **/
-    List<AreaChildrenRespVO> getArea(AreaListReqVO reqVO);
+    List<AppAreaChildrenRespVO> getArea(AreaListReqVO reqVO);
 }

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

@@ -3,7 +3,7 @@ package com.citu.module.menduner.system.service.area;
 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.admin.area.vo.AreaChildrenRespVO;
+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;
@@ -37,7 +37,7 @@ public class AreaServiceImpl implements AreaService {
     @Resource
     private AreaMapper areaMapper;
     @Resource
-    private  RedisTemplate<String, AreaChildrenRespVO> redisTemplate;
+    private  RedisTemplate<String, AppAreaChildrenRespVO> redisTemplate;
     @Override
     public Long createArea(AreaSaveReqVO createReqVO) {
         // 插入
@@ -96,8 +96,8 @@ public class AreaServiceImpl implements AreaService {
 
     @Override
     @Cacheable(cacheNames = RedisKeyConstants.MDE_AREA_CHILDREN_id_LIST, key = "#id", unless = "#result.size==0")
-    public List<AreaChildrenRespVO> getAreaIdChildren(Long id) {
-        List<AreaChildrenRespVO> children = new LinkedList<>();
+    public List<AppAreaChildrenRespVO> getAreaIdChildren(Long id) {
+        List<AppAreaChildrenRespVO> children = new LinkedList<>();
         // 遍历每一层
         Collection<Long> parentIds = Collections.singleton(id);
         for (int i = 0; i < Short.MAX_VALUE; i++) { // 使用 Short.MAX_VALUE 避免 bug 场景下，存在死循环
@@ -115,14 +115,14 @@ public class AreaServiceImpl implements AreaService {
     }
 
     @Override
-    public List<AreaChildrenRespVO> getArea(AreaListReqVO reqVO){
+    public List<AppAreaChildrenRespVO> getArea(AreaListReqVO reqVO){
         List<AreaDO> areaList = areaMapper.selectList(reqVO);
         if (null == areaList) {
             return null;
         }
-        List<AreaChildrenRespVO> convertList = AreaConvert.INSTANCE.convertList(areaList);
+        List<AppAreaChildrenRespVO> convertList = AreaConvert.INSTANCE.convertList(areaList);
         //获取父节点
-        List<AreaChildrenRespVO> collect = convertList.stream().filter(m -> m.getParentId() == 0).map(
+        List<AppAreaChildrenRespVO> collect = convertList.stream().filter(m -> m.getParentId() == 0).map(
                 (m) -> {
                     m.setChildren(getChildren(m, convertList));
                     return m;
@@ -137,8 +137,8 @@ public class AreaServiceImpl implements AreaService {
      * @param all   所有节点
      * @return 根节点信息
      */
-    private List<AreaChildrenRespVO> getChildren(AreaChildrenRespVO root, List<AreaChildrenRespVO> all) {
-        List<AreaChildrenRespVO> children = all.stream().filter(m -> {
+    private List<AppAreaChildrenRespVO> getChildren(AppAreaChildrenRespVO root, List<AppAreaChildrenRespVO> all) {
+        List<AppAreaChildrenRespVO> children = all.stream().filter(m -> {
             return Objects.equals(m.getParentId(), root.getId());
         }).map(
                 (m) -> {

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

@@ -1,7 +1,7 @@
 package com.citu.module.menduner.system.service.industry;
 
 import com.citu.framework.common.pojo.PageResult;
-import com.citu.module.menduner.system.controller.admin.industry.vo.IndustryChildrenRespVO;
+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;
@@ -74,12 +74,12 @@ public interface IndustryService {
      * @param id 查询条件
      * @return 地区列表
      **/
-    List<IndustryChildrenRespVO> getIndustryIdChildren(Long id);
+    List<AppIndustryChildrenRespVO> getIndustryIdChildren(Long id);
 
     /**
      * 获取中国的行业
      * @param reqVO 查询条件
      **/
-    List<IndustryChildrenRespVO> getIndustry(IndustryListReqVO reqVO);
+    List<AppIndustryChildrenRespVO> getIndustry(IndustryListReqVO reqVO);
 
 }

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

@@ -4,7 +4,7 @@ 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.admin.industry.vo.IndustryChildrenRespVO;
+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;
@@ -155,14 +155,14 @@ public class IndustryServiceImpl implements IndustryService {
     }
 
     @Override
-    public List<IndustryChildrenRespVO> getIndustry(IndustryListReqVO reqVO) {
+    public List<AppIndustryChildrenRespVO> getIndustry(IndustryListReqVO reqVO) {
         List<IndustryDO> areaList = industryMapper.selectList(reqVO);
         if (null == areaList) {
             return null;
         }
-        List<IndustryChildrenRespVO> convertList = IndustryConvert.INSTANCE.convertList(areaList);
+        List<AppIndustryChildrenRespVO> convertList = IndustryConvert.INSTANCE.convertList(areaList);
         //获取父节点
-        List<IndustryChildrenRespVO> collect = convertList.stream().filter(m -> m.getParentId() == 0).map(
+        List<AppIndustryChildrenRespVO> collect = convertList.stream().filter(m -> m.getParentId() == 0).map(
                 (m) -> {
                     m.setChildren(getChildren(m, convertList));
                     return m;
@@ -173,8 +173,8 @@ public class IndustryServiceImpl implements IndustryService {
 
     @Override
     @Cacheable(cacheNames = RedisKeyConstants.MDE_INDUSTRY_CHILDREN_id_LIST, key = "#id", unless = "#result.size==0")
-    public List<IndustryChildrenRespVO> getIndustryIdChildren(Long id) {
-        List<IndustryChildrenRespVO> children = new LinkedList<>();
+    public List<AppIndustryChildrenRespVO> getIndustryIdChildren(Long id) {
+        List<AppIndustryChildrenRespVO> children = new LinkedList<>();
         // 遍历每一层
         Collection<Long> parentIds = Collections.singleton(id);
         for (int i = 0; i < Short.MAX_VALUE; i++) { // 使用 Short.MAX_VALUE 避免 bug 场景下，存在死循环
@@ -197,8 +197,8 @@ public class IndustryServiceImpl implements IndustryService {
      * @param all   所有节点
      * @return 根节点信息
      */
-    private List<IndustryChildrenRespVO> getChildren(IndustryChildrenRespVO root, List<IndustryChildrenRespVO> all) {
-        List<IndustryChildrenRespVO> children = all.stream().filter(m -> {
+    private List<AppIndustryChildrenRespVO> getChildren(AppIndustryChildrenRespVO root, List<AppIndustryChildrenRespVO> all) {
+        List<AppIndustryChildrenRespVO> children = all.stream().filter(m -> {
             return Objects.equals(m.getParentId(), root.getId());
         }).map(
                 (m) -> {

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

@@ -1,7 +1,7 @@
 package com.citu.module.menduner.system.service.position;
 
 import com.citu.framework.common.pojo.PageResult;
-import com.citu.module.menduner.system.controller.admin.position.vo.PositionChildrenRespVO;
+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;
@@ -80,12 +80,13 @@ public interface PositionService {
      * @param id 查询条件
      * @return 地区列表
      **/
-    List<PositionChildrenRespVO> getPositionIdChildren(Long id);
+    List<AppPositionChildrenRespVO> getPositionIdChildren(Long id);
 
     /**
      * 获取职位信息
      *
      * @param reqVO 查询条件
      **/
-    List<PositionChildrenRespVO> getPosition(PositionListReqVO reqVO);
+    List<AppPositionChildrenRespVO> getPosition(PositionListReqVO reqVO);
+
 }

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

@@ -3,7 +3,7 @@ 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.admin.position.vo.PositionChildrenRespVO;
+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;
@@ -164,14 +164,14 @@ public class PositionServiceImpl implements PositionService {
     }
 
     @Override
-    public List<PositionChildrenRespVO> getPosition(PositionListReqVO reqVO) {
+    public List<AppPositionChildrenRespVO> getPosition(PositionListReqVO reqVO) {
         List<PositionDO> areaList = positionMapper.selectList(reqVO);
         if (null == areaList) {
             return null;
         }
-        List<PositionChildrenRespVO> convertList = PositionConvert.INSTANCE.convertList(areaList);
+        List<AppPositionChildrenRespVO> convertList = PositionConvert.INSTANCE.convertList(areaList);
         //获取父节点
-        List<PositionChildrenRespVO> collect = convertList.stream().filter(m -> m.getParentId() == 0).map(
+        List<AppPositionChildrenRespVO> collect = convertList.stream().filter(m -> m.getParentId() == 0).map(
                 (m) -> {
                     m.setChildren(getChildren(m, convertList));
                     return m;
@@ -182,8 +182,8 @@ public class PositionServiceImpl implements PositionService {
 
     @Override
     @Cacheable(cacheNames = RedisKeyConstants.MDE_POSITION_CHILDREN_id_LIST, key = "#id", unless = "#result.size==0")
-    public List<PositionChildrenRespVO> getPositionIdChildren(Long id) {
-        List<PositionChildrenRespVO> children = new LinkedList<>();
+    public List<AppPositionChildrenRespVO> getPositionIdChildren(Long id) {
+        List<AppPositionChildrenRespVO> children = new LinkedList<>();
         // 遍历每一层
         Collection<Long> parentIds = Collections.singleton(id);
         for (int i = 0; i < Short.MAX_VALUE; i++) { // 使用 Short.MAX_VALUE 避免 bug 场景下，存在死循环
@@ -207,8 +207,8 @@ public class PositionServiceImpl implements PositionService {
      * @param all  所有节点
      * @return 根节点信息
      */
-    private List<PositionChildrenRespVO> getChildren(PositionChildrenRespVO root, List<PositionChildrenRespVO> all) {
-        List<PositionChildrenRespVO> children = all.stream().filter(m -> {
+    private List<AppPositionChildrenRespVO> getChildren(AppPositionChildrenRespVO root, List<AppPositionChildrenRespVO> all) {
+        List<AppPositionChildrenRespVO> children = all.stream().filter(m -> {
             return Objects.equals(m.getParentId(), root.getId());
         }).map(
                 (m) -> {

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

@@ -1,12 +1,14 @@
 package com.citu.module.menduner.system.service.visits;
 
 import com.citu.framework.common.pojo.PageResult;
+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.mq.message.MdeVisitsSendMessage;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * 访问量 Service 接口
@@ -57,4 +59,13 @@ public interface MdeVisitsService {
      * 创建访问量
      **/
     void create(@Valid MdeVisitsSendMessage reqVO);
+
+
+    /**
+     * 创建访问量
+     *
+     * @param reqVO 查询条件
+     * @return 业务id集合
+     **/
+    List<Long> getBizIdVisitsTop10List(MdeVisitsListReqVO reqVO);
 }

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

@@ -4,6 +4,7 @@ import com.citu.framework.common.pojo.PageResult;
 import com.citu.framework.common.util.date.DateUtils;
 import com.citu.framework.common.util.object.BeanUtils;
 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;
@@ -16,6 +17,9 @@ import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
 
+import java.util.Collections;
+import java.util.List;
+
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.citu.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_VISITS_NOT_EXISTS;
@@ -86,7 +90,7 @@ public class MdeVisitsServiceImpl implements MdeVisitsService {
         MdeVisitsDO visitsDO = mdeVisitsMapper.selectOne(new LambdaQueryWrapperX<MdeVisitsDO>()
                 .eq(MdeVisitsDO::getUserId, null == userId ? 0 : userId)
                 .eq(MdeVisitsDO::getType, reqVO.getType())
-                .eq(MdeVisitsDO::getBusinessId, reqVO.getBusinessId())
+                .eq(MdeVisitsDO::getBizId, reqVO.getBizId())
                 .eq(MdeVisitsDO::getDate, DateUtils.of(reqVO.getDate()))
         );
         if (null == visitsDO) {
@@ -94,7 +98,7 @@ public class MdeVisitsServiceImpl implements MdeVisitsService {
             MdeVisitsDO visits = MdeVisitsDO.builder()
                     .userId(userId)
                     .type(reqVO.getType())
-                    .businessId(reqVO.getBusinessId())
+                    .bizId(reqVO.getBizId())
                     .date(reqVO.getDate())
                     .count(0)
                     .build();
@@ -107,4 +111,9 @@ public class MdeVisitsServiceImpl implements MdeVisitsService {
         mdeVisitsMapper.updateById(visitsDO);
 
     }
+
+    @Override
+    public List<Long> getBizIdVisitsTop10List(MdeVisitsListReqVO reqVO) {
+        return Collections.emptyList();
+    }
 }