diff --git a/haiwei-admin/src/main/java/com/haiwei/web/controller/broad/ApiController.java b/haiwei-admin/src/main/java/com/haiwei/web/controller/broad/ApiController.java index 9215107..f59093b 100644 --- a/haiwei-admin/src/main/java/com/haiwei/web/controller/broad/ApiController.java +++ b/haiwei-admin/src/main/java/com/haiwei/web/controller/broad/ApiController.java @@ -5,6 +5,7 @@ import static com.haiwei.common.core.domain.AjaxResult.*; import com.haiwei.manage.service.IBaseCustomerService; import com.haiwei.manage.service.IBaseDeviceInfoService; +import com.haiwei.manage.service.IBaseDeviceTypeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.models.Tag; @@ -24,7 +25,8 @@ import org.springframework.web.bind.annotation.RestController; public class ApiController { @Autowired - private IBaseDeviceInfoService baseDeviceInfoService;//设备 + private IBaseDeviceTypeService baseDeviceTypeService; + @Autowired private IBaseCustomerService baseCustomerService;//客户 @@ -39,7 +41,7 @@ public class ApiController { @ApiOperation(tags = {"首页"}, value = "获取产品列表") @GetMapping("/home/queryDevice") public AjaxResult queryDevice(){ - return success(baseDeviceInfoService.selectBaseDeviceInfoList(null)); + return success(baseDeviceTypeService.selectBaseDeviceTypeList(null)); } diff --git a/haiwei-admin/src/main/java/com/haiwei/web/controller/broad/BroadController.java b/haiwei-admin/src/main/java/com/haiwei/web/controller/broad/BroadController.java index 31c1766..8e7c37c 100644 --- a/haiwei-admin/src/main/java/com/haiwei/web/controller/broad/BroadController.java +++ b/haiwei-admin/src/main/java/com/haiwei/web/controller/broad/BroadController.java @@ -9,13 +9,19 @@ import org.springframework.web.bind.annotation.RequestMapping; * @date 2023/8/14 10:18 */ @Controller -@RequestMapping("/board/board1") +@RequestMapping("/board") public class BroadController { private String prefix = "board"; - @GetMapping() + @GetMapping("/board1") public String board1() { return prefix + "/board1"; } + + @GetMapping("/board2") + public String board2() + { + return prefix + "/board2"; + } } diff --git a/haiwei-admin/src/main/java/com/haiwei/web/controller/broad/BroadController2.java b/haiwei-admin/src/main/java/com/haiwei/web/controller/broad/BroadController2.java index 1a04e6b..07048dd 100644 --- a/haiwei-admin/src/main/java/com/haiwei/web/controller/broad/BroadController2.java +++ b/haiwei-admin/src/main/java/com/haiwei/web/controller/broad/BroadController2.java @@ -13,9 +13,5 @@ import org.springframework.web.bind.annotation.RequestMapping; public class BroadController2 { private String prefix = "board"; - @GetMapping() - public String board1() - { - return prefix + "/board2"; - } + }