From 50353c2ae43cdddb8433358f4ba66bef30c5d628 Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期二, 05 十一月 2024 14:00:12 +0800 Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit --- server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/SecurityController.java | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/SecurityController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/SecurityController.java index 0aeaa35..fb631e5 100644 --- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/SecurityController.java +++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/SecurityController.java @@ -2,15 +2,18 @@ import com.doumee.api.BaseController; import com.doumee.config.annotation.LoginNoRequired; +import com.doumee.core.haikang.model.param.respose.PageRegionInfoResponse; import com.doumee.core.model.ApiResponse; import com.doumee.core.utils.Constants; import com.doumee.dao.web.response.platformReport.*; +import com.doumee.service.business.third.BoardService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -34,6 +37,8 @@ @RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/board/api/security") public class SecurityController extends BaseController { + @Autowired + private BoardService boardService; @LoginNoRequired @ApiOperation("涓績鏁版嵁") @@ -117,8 +122,18 @@ visitDataVO.setRetentionRata(BigDecimal.valueOf(random.nextInt(20))); return ApiResponse.success(visitDataVO); } - - + @LoginNoRequired + @ApiOperation("鏍戝舰鍖哄煙闆嗗悎鎺ュ彛") + @GetMapping("/regionTree") + public ApiResponse<List<PageRegionInfoResponse>> regionTree(CarmeraListVO param) { + return ApiResponse.success(boardService.getRegionTree(param)); + } + @LoginNoRequired + @ApiOperation("骞抽摵缁撴灉鍖哄煙闆嗗悎鎺ュ彛") + @GetMapping("/regionList") + public ApiResponse<List<PageRegionInfoResponse>> regionList(CarmeraListVO param) { + return ApiResponse.success(boardService.regionList(param)); + } -- Gitblit v1.9.3