|
@@ -27,7 +27,9 @@ import org.springblade.modules.business.entity.FacilityModel;
|
|
import org.springblade.modules.business.service.IFacilityModelService;
|
|
import org.springblade.modules.business.service.IFacilityModelService;
|
|
import org.springblade.modules.business.service.IFacilityService;
|
|
import org.springblade.modules.business.service.IFacilityService;
|
|
import org.springblade.modules.business.service.IShopService;
|
|
import org.springblade.modules.business.service.IShopService;
|
|
|
|
+import org.springblade.modules.business.vo.FacilityModelVO;
|
|
import org.springblade.modules.business.vo.FacilityVO;
|
|
import org.springblade.modules.business.vo.FacilityVO;
|
|
|
|
+import org.springblade.modules.business.wrapper.FacilityModelWrapper;
|
|
import org.springblade.modules.business.wrapper.FacilityWrapper;
|
|
import org.springblade.modules.business.wrapper.FacilityWrapper;
|
|
import org.springblade.modules.system.service.IUserMerchantService;
|
|
import org.springblade.modules.system.service.IUserMerchantService;
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.web.bind.annotation.*;
|
|
@@ -47,6 +49,7 @@ public class ApiFacilityController extends BaseController {
|
|
private final IFacilityModelService iFacilityModelService;
|
|
private final IFacilityModelService iFacilityModelService;
|
|
private final IShopService iShopService;
|
|
private final IShopService iShopService;
|
|
private final IUserMerchantService iUserMerchantService;
|
|
private final IUserMerchantService iUserMerchantService;
|
|
|
|
+ private final IFacilityModelService facilityModelService;
|
|
|
|
|
|
@PostMapping("/save")
|
|
@PostMapping("/save")
|
|
@ApiOperationSupport(order = 1)
|
|
@ApiOperationSupport(order = 1)
|
|
@@ -55,6 +58,17 @@ public class ApiFacilityController extends BaseController {
|
|
return R.status(iFacilityService.add(facility));
|
|
return R.status(iFacilityService.add(facility));
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * 分页 设备型号表
|
|
|
|
+ */
|
|
|
|
+ @GetMapping("/modelList")
|
|
|
|
+ @ApiOperationSupport(order = 2)
|
|
|
|
+ @ApiOperation(value = "设备型号分页", notes = "传入facilityModel")
|
|
|
|
+ public R<IPage<FacilityModelVO>> modelList(FacilityModel facilityModel, Query query) {
|
|
|
|
+ IPage<FacilityModel> pages = facilityModelService.page(Condition.getPage(query), Condition.getQueryWrapper(facilityModel));
|
|
|
|
+ return R.data(FacilityModelWrapper.build().pageVO(pages));
|
|
|
|
+ }
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 添加设备-商家端
|
|
* 添加设备-商家端
|
|
*
|
|
*
|