master:controller入参调整;

pull/1121/head
liujiang 2025-03-27 16:05:11 +08:00
parent ec8b283732
commit 777b656bd3
60 changed files with 910 additions and 568 deletions

View File

@ -1,8 +1,8 @@
package com.ruoyi.web.controller.xkt;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.controller.XktBaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
@ -23,7 +23,7 @@ import java.util.List;
*/
@RestController
@RequestMapping("/rest/v1/pic-searches")
public class PictureSearchController extends BaseController {
public class PictureSearchController extends XktBaseController {
@Autowired
private IPictureSearchService pictureSearchService;
@ -55,7 +55,7 @@ public class PictureSearchController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('system:search:query')")
@GetMapping(value = "/{picSearchId}")
public AjaxResult getInfo(@PathVariable("picSearchId") Long picSearchId) {
public R getInfo(@PathVariable("picSearchId") Long picSearchId) {
return success(pictureSearchService.selectPictureSearchByPicSearchId(picSearchId));
}
@ -65,8 +65,8 @@ public class PictureSearchController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:search:add')")
@Log(title = "以图搜款", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody PictureSearch pictureSearch) {
return toAjax(pictureSearchService.insertPictureSearch(pictureSearch));
public R add(@RequestBody PictureSearch pictureSearch) {
return success(pictureSearchService.insertPictureSearch(pictureSearch));
}
/**
@ -75,8 +75,8 @@ public class PictureSearchController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:search:edit')")
@Log(title = "以图搜款", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody PictureSearch pictureSearch) {
return toAjax(pictureSearchService.updatePictureSearch(pictureSearch));
public R edit(@RequestBody PictureSearch pictureSearch) {
return success(pictureSearchService.updatePictureSearch(pictureSearch));
}
/**
@ -85,7 +85,7 @@ public class PictureSearchController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:search:remove')")
@Log(title = "以图搜款", businessType = BusinessType.DELETE)
@DeleteMapping("/{picSearchIds}")
public AjaxResult remove(@PathVariable Long[] picSearchIds) {
return toAjax(pictureSearchService.deletePictureSearchByPicSearchIds(picSearchIds));
public R remove(@PathVariable Long[] picSearchIds) {
return success(pictureSearchService.deletePictureSearchByPicSearchIds(picSearchIds));
}
}

View File

@ -1,8 +1,8 @@
package com.ruoyi.web.controller.xkt;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.controller.XktBaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
@ -23,7 +23,7 @@ import java.util.List;
*/
@RestController
@RequestMapping("/rest/v1/search-hots")
public class PictureSearchHotController extends BaseController {
public class PictureSearchHotController extends XktBaseController {
@Autowired
private IPictureSearchHotService pictureSearchHotService;
@ -55,7 +55,7 @@ public class PictureSearchHotController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('system:hot:query')")
@GetMapping(value = "/{picSearchHotId}")
public AjaxResult getInfo(@PathVariable("picSearchHotId") Long picSearchHotId) {
public R getInfo(@PathVariable("picSearchHotId") Long picSearchHotId) {
return success(pictureSearchHotService.selectPictureSearchHotByPicSearchHotId(picSearchHotId));
}
@ -65,8 +65,8 @@ public class PictureSearchHotController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:hot:add')")
@Log(title = "图搜热款", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody PictureSearchHot pictureSearchHot) {
return toAjax(pictureSearchHotService.insertPictureSearchHot(pictureSearchHot));
public R add(@RequestBody PictureSearchHot pictureSearchHot) {
return success(pictureSearchHotService.insertPictureSearchHot(pictureSearchHot));
}
/**
@ -75,8 +75,8 @@ public class PictureSearchHotController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:hot:edit')")
@Log(title = "图搜热款", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody PictureSearchHot pictureSearchHot) {
return toAjax(pictureSearchHotService.updatePictureSearchHot(pictureSearchHot));
public R edit(@RequestBody PictureSearchHot pictureSearchHot) {
return success(pictureSearchHotService.updatePictureSearchHot(pictureSearchHot));
}
/**
@ -85,7 +85,7 @@ public class PictureSearchHotController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:hot:remove')")
@Log(title = "图搜热款", businessType = BusinessType.DELETE)
@DeleteMapping("/{picSearchHotIds}")
public AjaxResult remove(@PathVariable Long[] picSearchHotIds) {
return toAjax(pictureSearchHotService.deletePictureSearchHotByPicSearchHotIds(picSearchHotIds));
public R remove(@PathVariable Long[] picSearchHotIds) {
return success(pictureSearchHotService.deletePictureSearchHotByPicSearchHotIds(picSearchHotIds));
}
}

View File

@ -1,8 +1,8 @@
package com.ruoyi.web.controller.xkt;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.controller.XktBaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
@ -23,7 +23,7 @@ import java.util.List;
*/
@RestController
@RequestMapping("/rest/v1/search-results")
public class PictureSearchResultController extends BaseController {
public class PictureSearchResultController extends XktBaseController {
@Autowired
private IPictureSearchResultService pictureSearchResultService;
@ -55,7 +55,7 @@ public class PictureSearchResultController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('system:result:query')")
@GetMapping(value = "/{picSearchResId}")
public AjaxResult getInfo(@PathVariable("picSearchResId") Long picSearchResId) {
public R getInfo(@PathVariable("picSearchResId") Long picSearchResId) {
return success(pictureSearchResultService.selectPictureSearchResultByPicSearchResId(picSearchResId));
}
@ -65,8 +65,8 @@ public class PictureSearchResultController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:result:add')")
@Log(title = "以图搜款结果", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody PictureSearchResult pictureSearchResult) {
return toAjax(pictureSearchResultService.insertPictureSearchResult(pictureSearchResult));
public R add(@RequestBody PictureSearchResult pictureSearchResult) {
return success(pictureSearchResultService.insertPictureSearchResult(pictureSearchResult));
}
/**
@ -75,8 +75,8 @@ public class PictureSearchResultController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:result:edit')")
@Log(title = "以图搜款结果", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody PictureSearchResult pictureSearchResult) {
return toAjax(pictureSearchResultService.updatePictureSearchResult(pictureSearchResult));
public R edit(@RequestBody PictureSearchResult pictureSearchResult) {
return success(pictureSearchResultService.updatePictureSearchResult(pictureSearchResult));
}
/**
@ -85,7 +85,7 @@ public class PictureSearchResultController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:result:remove')")
@Log(title = "以图搜款结果", businessType = BusinessType.DELETE)
@DeleteMapping("/{picSearchResIds}")
public AjaxResult remove(@PathVariable Long[] picSearchResIds) {
return toAjax(pictureSearchResultService.deletePictureSearchResultByPicSearchResIds(picSearchResIds));
public R remove(@PathVariable Long[] picSearchResIds) {
return success(pictureSearchResultService.deletePictureSearchResultByPicSearchResIds(picSearchResIds));
}
}

View File

@ -1,8 +1,8 @@
package com.ruoyi.web.controller.xkt;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.controller.XktBaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
@ -23,7 +23,7 @@ import java.util.List;
*/
@RestController
@RequestMapping("/rest/v1/store-certs")
public class StoreCertificateController extends BaseController {
public class StoreCertificateController extends XktBaseController {
@Autowired
private IStoreCertificateService storeCertificateService;
@ -55,7 +55,7 @@ public class StoreCertificateController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('system:certificate:query')")
@GetMapping(value = "/{storeCertId}")
public AjaxResult getInfo(@PathVariable("storeCertId") Long storeCertId) {
public R getInfo(@PathVariable("storeCertId") Long storeCertId) {
return success(storeCertificateService.selectStoreCertificateByStoreCertId(storeCertId));
}
@ -65,8 +65,8 @@ public class StoreCertificateController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:certificate:add')")
@Log(title = "档口认证", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody StoreCertificate storeCertificate) {
return toAjax(storeCertificateService.insertStoreCertificate(storeCertificate));
public R add(@RequestBody StoreCertificate storeCertificate) {
return success(storeCertificateService.insertStoreCertificate(storeCertificate));
}
/**
@ -75,8 +75,8 @@ public class StoreCertificateController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:certificate:edit')")
@Log(title = "档口认证", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody StoreCertificate storeCertificate) {
return toAjax(storeCertificateService.updateStoreCertificate(storeCertificate));
public R edit(@RequestBody StoreCertificate storeCertificate) {
return success(storeCertificateService.updateStoreCertificate(storeCertificate));
}
/**
@ -85,7 +85,7 @@ public class StoreCertificateController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:certificate:remove')")
@Log(title = "档口认证", businessType = BusinessType.DELETE)
@DeleteMapping("/{storeCertIds}")
public AjaxResult remove(@PathVariable Long[] storeCertIds) {
return toAjax(storeCertificateService.deleteStoreCertificateByStoreCertIds(storeCertIds));
public R remove(@PathVariable Long[] storeCertIds) {
return success(storeCertificateService.deleteStoreCertificateByStoreCertIds(storeCertIds));
}
}

View File

@ -1,8 +1,8 @@
package com.ruoyi.web.controller.xkt;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.controller.XktBaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
@ -23,7 +23,7 @@ import java.util.List;
*/
@RestController
@RequestMapping("/rest/v1/store-colors")
public class StoreColorController extends BaseController {
public class StoreColorController extends XktBaseController {
@Autowired
private IStoreColorService storeColorService;
@ -55,7 +55,7 @@ public class StoreColorController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('system:color:query')")
@GetMapping(value = "/{storeColorId}")
public AjaxResult getInfo(@PathVariable("storeColorId") Long storeColorId) {
public R getInfo(@PathVariable("storeColorId") Long storeColorId) {
return success(storeColorService.selectStoreColorByStoreColorId(storeColorId));
}
@ -65,8 +65,8 @@ public class StoreColorController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:color:add')")
@Log(title = "档口所有颜色", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody StoreColor storeColor) {
return toAjax(storeColorService.insertStoreColor(storeColor));
public R add(@RequestBody StoreColor storeColor) {
return success(storeColorService.insertStoreColor(storeColor));
}
/**
@ -75,8 +75,8 @@ public class StoreColorController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:color:edit')")
@Log(title = "档口所有颜色", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody StoreColor storeColor) {
return toAjax(storeColorService.updateStoreColor(storeColor));
public R edit(@RequestBody StoreColor storeColor) {
return success(storeColorService.updateStoreColor(storeColor));
}
/**
@ -85,7 +85,7 @@ public class StoreColorController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:color:remove')")
@Log(title = "档口所有颜色", businessType = BusinessType.DELETE)
@DeleteMapping("/{storeColorIds}")
public AjaxResult remove(@PathVariable Long[] storeColorIds) {
return toAjax(storeColorService.deleteStoreColorByStoreColorIds(storeColorIds));
public R remove(@PathVariable Long[] storeColorIds) {
return success(storeColorService.deleteStoreColorByStoreColorIds(storeColorIds));
}
}

View File

@ -1,8 +1,8 @@
package com.ruoyi.web.controller.xkt;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.controller.XktBaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
@ -23,7 +23,7 @@ import java.util.List;
*/
@RestController
@RequestMapping("/rest/v1/stores")
public class StoreController extends BaseController {
public class StoreController extends XktBaseController {
@Autowired
private IStoreService storeService;
@ -55,7 +55,7 @@ public class StoreController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('system:store:query')")
@GetMapping(value = "/{storeId}")
public AjaxResult getInfo(@PathVariable("storeId") Long storeId) {
public R getInfo(@PathVariable("storeId") Long storeId) {
return success(storeService.selectStoreByStoreId(storeId));
}
@ -65,8 +65,8 @@ public class StoreController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:store:add')")
@Log(title = "档口", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody Store store) {
return toAjax(storeService.insertStore(store));
public R add(@RequestBody Store store) {
return success(storeService.insertStore(store));
}
/**
@ -75,8 +75,8 @@ public class StoreController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:store:edit')")
@Log(title = "档口", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody Store store) {
return toAjax(storeService.updateStore(store));
public R edit(@RequestBody Store store) {
return success(storeService.updateStore(store));
}
/**
@ -85,7 +85,7 @@ public class StoreController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:store:remove')")
@Log(title = "档口", businessType = BusinessType.DELETE)
@DeleteMapping("/{storeIds}")
public AjaxResult remove(@PathVariable Long[] storeIds) {
return toAjax(storeService.deleteStoreByStoreIds(storeIds));
public R remove(@PathVariable Long[] storeIds) {
return success(storeService.deleteStoreByStoreIds(storeIds));
}
}

View File

@ -1,8 +1,8 @@
package com.ruoyi.web.controller.xkt;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.controller.XktBaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
@ -23,7 +23,7 @@ import java.util.List;
*/
@RestController
@RequestMapping("/rest/v1/store-customers")
public class StoreCustomerController extends BaseController {
public class StoreCustomerController extends XktBaseController {
@Autowired
private IStoreCustomerService storeCustomerService;
@ -55,7 +55,7 @@ public class StoreCustomerController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('system:customer:query')")
@GetMapping(value = "/{storeCusId}")
public AjaxResult getInfo(@PathVariable("storeCusId") Long storeCusId) {
public R getInfo(@PathVariable("storeCusId") Long storeCusId) {
return success(storeCustomerService.selectStoreCustomerByStoreCusId(storeCusId));
}
@ -65,8 +65,8 @@ public class StoreCustomerController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:customer:add')")
@Log(title = "档口客户", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody StoreCustomer storeCustomer) {
return toAjax(storeCustomerService.insertStoreCustomer(storeCustomer));
public R add(@RequestBody StoreCustomer storeCustomer) {
return success(storeCustomerService.insertStoreCustomer(storeCustomer));
}
/**
@ -75,8 +75,8 @@ public class StoreCustomerController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:customer:edit')")
@Log(title = "档口客户", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody StoreCustomer storeCustomer) {
return toAjax(storeCustomerService.updateStoreCustomer(storeCustomer));
public R edit(@RequestBody StoreCustomer storeCustomer) {
return success(storeCustomerService.updateStoreCustomer(storeCustomer));
}
/**
@ -85,7 +85,7 @@ public class StoreCustomerController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:customer:remove')")
@Log(title = "档口客户", businessType = BusinessType.DELETE)
@DeleteMapping("/{storeCusIds}")
public AjaxResult remove(@PathVariable Long[] storeCusIds) {
return toAjax(storeCustomerService.deleteStoreCustomerByStoreCusIds(storeCusIds));
public R remove(@PathVariable Long[] storeCusIds) {
return success(storeCustomerService.deleteStoreCustomerByStoreCusIds(storeCusIds));
}
}

View File

@ -1,8 +1,8 @@
package com.ruoyi.web.controller.xkt;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.controller.XktBaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
@ -23,7 +23,7 @@ import java.util.List;
*/
@RestController
@RequestMapping("/rest/v1/cus-discounts")
public class StoreCustomerProductDiscountController extends BaseController {
public class StoreCustomerProductDiscountController extends XktBaseController {
@Autowired
private IStoreCustomerProductDiscountService storeCustomerProductDiscountService;
@ -55,7 +55,7 @@ public class StoreCustomerProductDiscountController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('system:discount:query')")
@GetMapping(value = "/{storeCusProdDiscId}")
public AjaxResult getInfo(@PathVariable("storeCusProdDiscId") Long storeCusProdDiscId) {
public R getInfo(@PathVariable("storeCusProdDiscId") Long storeCusProdDiscId) {
return success(storeCustomerProductDiscountService.selectStoreCustomerProductDiscountByStoreCusProdDiscId(storeCusProdDiscId));
}
@ -65,8 +65,8 @@ public class StoreCustomerProductDiscountController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:discount:add')")
@Log(title = "档口客户优惠", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody StoreCustomerProductDiscount storeCustomerProductDiscount) {
return toAjax(storeCustomerProductDiscountService.insertStoreCustomerProductDiscount(storeCustomerProductDiscount));
public R add(@RequestBody StoreCustomerProductDiscount storeCustomerProductDiscount) {
return success(storeCustomerProductDiscountService.insertStoreCustomerProductDiscount(storeCustomerProductDiscount));
}
/**
@ -75,8 +75,8 @@ public class StoreCustomerProductDiscountController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:discount:edit')")
@Log(title = "档口客户优惠", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody StoreCustomerProductDiscount storeCustomerProductDiscount) {
return toAjax(storeCustomerProductDiscountService.updateStoreCustomerProductDiscount(storeCustomerProductDiscount));
public R edit(@RequestBody StoreCustomerProductDiscount storeCustomerProductDiscount) {
return success(storeCustomerProductDiscountService.updateStoreCustomerProductDiscount(storeCustomerProductDiscount));
}
/**
@ -85,7 +85,7 @@ public class StoreCustomerProductDiscountController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:discount:remove')")
@Log(title = "档口客户优惠", businessType = BusinessType.DELETE)
@DeleteMapping("/{storeCusProdDiscIds}")
public AjaxResult remove(@PathVariable Long[] storeCusProdDiscIds) {
return toAjax(storeCustomerProductDiscountService.deleteStoreCustomerProductDiscountByStoreCusProdDiscIds(storeCusProdDiscIds));
public R remove(@PathVariable Long[] storeCusProdDiscIds) {
return success(storeCustomerProductDiscountService.deleteStoreCustomerProductDiscountByStoreCusProdDiscIds(storeCusProdDiscIds));
}
}

View File

@ -1,8 +1,8 @@
package com.ruoyi.web.controller.xkt;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.controller.XktBaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
@ -23,7 +23,7 @@ import java.util.List;
*/
@RestController
@RequestMapping("/rest/v1/store-factories")
public class StoreFactoryController extends BaseController {
public class StoreFactoryController extends XktBaseController {
@Autowired
private IStoreFactoryService storeFactoryService;
@ -55,7 +55,7 @@ public class StoreFactoryController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('system:factory:query')")
@GetMapping(value = "/{storeFacId}")
public AjaxResult getInfo(@PathVariable("storeFacId") Long storeFacId) {
public R getInfo(@PathVariable("storeFacId") Long storeFacId) {
return success(storeFactoryService.selectStoreFactoryByStoreFacId(storeFacId));
}
@ -65,8 +65,8 @@ public class StoreFactoryController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:factory:add')")
@Log(title = "档口合作工厂", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody StoreFactory storeFactory) {
return toAjax(storeFactoryService.insertStoreFactory(storeFactory));
public R add(@RequestBody StoreFactory storeFactory) {
return success(storeFactoryService.insertStoreFactory(storeFactory));
}
/**
@ -75,8 +75,8 @@ public class StoreFactoryController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:factory:edit')")
@Log(title = "档口合作工厂", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody StoreFactory storeFactory) {
return toAjax(storeFactoryService.updateStoreFactory(storeFactory));
public R edit(@RequestBody StoreFactory storeFactory) {
return success(storeFactoryService.updateStoreFactory(storeFactory));
}
/**
@ -85,7 +85,7 @@ public class StoreFactoryController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:factory:remove')")
@Log(title = "档口合作工厂", businessType = BusinessType.DELETE)
@DeleteMapping("/{storeFacIds}")
public AjaxResult remove(@PathVariable Long[] storeFacIds) {
return toAjax(storeFactoryService.deleteStoreFactoryByStoreFacIds(storeFacIds));
public R remove(@PathVariable Long[] storeFacIds) {
return success(storeFactoryService.deleteStoreFactoryByStoreFacIds(storeFacIds));
}
}

View File

@ -1,8 +1,8 @@
package com.ruoyi.web.controller.xkt;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.controller.XktBaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
@ -23,7 +23,7 @@ import java.util.List;
*/
@RestController
@RequestMapping("/rest/v1/store-homepages")
public class StoreHomepageController extends BaseController {
public class StoreHomepageController extends XktBaseController {
@Autowired
private IStoreHomepageService storeHomepageService;
@ -55,7 +55,7 @@ public class StoreHomepageController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('system:homepage:query')")
@GetMapping(value = "/{storeHomeId}")
public AjaxResult getInfo(@PathVariable("storeHomeId") Long storeHomeId) {
public R getInfo(@PathVariable("storeHomeId") Long storeHomeId) {
return success(storeHomepageService.selectStoreHomepageByStoreHomeId(storeHomeId));
}
@ -65,8 +65,8 @@ public class StoreHomepageController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:homepage:add')")
@Log(title = "档口首页", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody StoreHomepage storeHomepage) {
return toAjax(storeHomepageService.insertStoreHomepage(storeHomepage));
public R add(@RequestBody StoreHomepage storeHomepage) {
return success(storeHomepageService.insertStoreHomepage(storeHomepage));
}
/**
@ -75,8 +75,8 @@ public class StoreHomepageController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:homepage:edit')")
@Log(title = "档口首页", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody StoreHomepage storeHomepage) {
return toAjax(storeHomepageService.updateStoreHomepage(storeHomepage));
public R edit(@RequestBody StoreHomepage storeHomepage) {
return success(storeHomepageService.updateStoreHomepage(storeHomepage));
}
/**
@ -85,7 +85,7 @@ public class StoreHomepageController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:homepage:remove')")
@Log(title = "档口首页", businessType = BusinessType.DELETE)
@DeleteMapping("/{storeHomeIds}")
public AjaxResult remove(@PathVariable Long[] storeHomeIds) {
return toAjax(storeHomepageService.deleteStoreHomepageByStoreHomeIds(storeHomeIds));
public R remove(@PathVariable Long[] storeHomeIds) {
return success(storeHomepageService.deleteStoreHomepageByStoreHomeIds(storeHomeIds));
}
}

View File

@ -1,8 +1,8 @@
package com.ruoyi.web.controller.xkt;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.controller.XktBaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
@ -23,7 +23,7 @@ import java.util.List;
*/
@RestController
@RequestMapping("/rest/v1/store-orders")
public class StoreOrderController extends BaseController {
public class StoreOrderController extends XktBaseController {
@Autowired
private IStoreOrderService storeOrderService;
@ -55,7 +55,7 @@ public class StoreOrderController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('system:order:query')")
@GetMapping(value = "/{storeOrderId}")
public AjaxResult getInfo(@PathVariable("storeOrderId") Long storeOrderId) {
public R getInfo(@PathVariable("storeOrderId") Long storeOrderId) {
return success(storeOrderService.selectStoreOrderByStoreOrderId(storeOrderId));
}
@ -65,8 +65,8 @@ public class StoreOrderController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:order:add')")
@Log(title = "档口代发订单", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody StoreOrder storeOrder) {
return toAjax(storeOrderService.insertStoreOrder(storeOrder));
public R add(@RequestBody StoreOrder storeOrder) {
return success(storeOrderService.insertStoreOrder(storeOrder));
}
/**
@ -75,8 +75,8 @@ public class StoreOrderController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:order:edit')")
@Log(title = "档口代发订单", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody StoreOrder storeOrder) {
return toAjax(storeOrderService.updateStoreOrder(storeOrder));
public R edit(@RequestBody StoreOrder storeOrder) {
return success(storeOrderService.updateStoreOrder(storeOrder));
}
/**
@ -85,7 +85,7 @@ public class StoreOrderController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:order:remove')")
@Log(title = "档口代发订单", businessType = BusinessType.DELETE)
@DeleteMapping("/{storeOrderIds}")
public AjaxResult remove(@PathVariable Long[] storeOrderIds) {
return toAjax(storeOrderService.deleteStoreOrderByStoreOrderIds(storeOrderIds));
public R remove(@PathVariable Long[] storeOrderIds) {
return success(storeOrderService.deleteStoreOrderByStoreOrderIds(storeOrderIds));
}
}

View File

@ -1,8 +1,8 @@
package com.ruoyi.web.controller.xkt;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.controller.XktBaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
@ -23,7 +23,7 @@ import java.util.List;
*/
@RestController
@RequestMapping("/rest/v1/store-order-details")
public class StoreOrderDetailController extends BaseController {
public class StoreOrderDetailController extends XktBaseController {
@Autowired
private IStoreOrderDetailService storeOrderDetailService;
@ -55,7 +55,7 @@ public class StoreOrderDetailController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('system:detail:query')")
@GetMapping(value = "/{storeOrderDetailId}")
public AjaxResult getInfo(@PathVariable("storeOrderDetailId") Long storeOrderDetailId) {
public R getInfo(@PathVariable("storeOrderDetailId") Long storeOrderDetailId) {
return success(storeOrderDetailService.selectStoreOrderDetailByStoreOrderDetailId(storeOrderDetailId));
}
@ -65,8 +65,8 @@ public class StoreOrderDetailController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:detail:add')")
@Log(title = "档口代发订单明细", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody StoreOrderDetail storeOrderDetail) {
return toAjax(storeOrderDetailService.insertStoreOrderDetail(storeOrderDetail));
public R add(@RequestBody StoreOrderDetail storeOrderDetail) {
return success(storeOrderDetailService.insertStoreOrderDetail(storeOrderDetail));
}
/**
@ -75,8 +75,8 @@ public class StoreOrderDetailController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:detail:edit')")
@Log(title = "档口代发订单明细", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody StoreOrderDetail storeOrderDetail) {
return toAjax(storeOrderDetailService.updateStoreOrderDetail(storeOrderDetail));
public R edit(@RequestBody StoreOrderDetail storeOrderDetail) {
return success(storeOrderDetailService.updateStoreOrderDetail(storeOrderDetail));
}
/**
@ -85,7 +85,7 @@ public class StoreOrderDetailController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:detail:remove')")
@Log(title = "档口代发订单明细", businessType = BusinessType.DELETE)
@DeleteMapping("/{storeOrderDetailIds}")
public AjaxResult remove(@PathVariable Long[] storeOrderDetailIds) {
return toAjax(storeOrderDetailService.deleteStoreOrderDetailByStoreOrderDetailIds(storeOrderDetailIds));
public R remove(@PathVariable Long[] storeOrderDetailIds) {
return success(storeOrderDetailService.deleteStoreOrderDetailByStoreOrderDetailIds(storeOrderDetailIds));
}
}

View File

@ -1,8 +1,8 @@
package com.ruoyi.web.controller.xkt;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.controller.XktBaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
@ -23,7 +23,7 @@ import java.util.List;
*/
@RestController
@RequestMapping("/rest/v1/store-order-expresses")
public class StoreOrderExpressController extends BaseController {
public class StoreOrderExpressController extends XktBaseController {
@Autowired
private IStoreOrderExpressService storeOrderExpressService;
@ -55,7 +55,7 @@ public class StoreOrderExpressController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('system:express:query')")
@GetMapping(value = "/{storeOrderExprId}")
public AjaxResult getInfo(@PathVariable("storeOrderExprId") Long storeOrderExprId) {
public R getInfo(@PathVariable("storeOrderExprId") Long storeOrderExprId) {
return success(storeOrderExpressService.selectStoreOrderExpressByStoreOrderExprId(storeOrderExprId));
}
@ -65,8 +65,8 @@ public class StoreOrderExpressController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:express:add')")
@Log(title = "档口代发订单快递", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody StoreOrderExpress storeOrderExpress) {
return toAjax(storeOrderExpressService.insertStoreOrderExpress(storeOrderExpress));
public R add(@RequestBody StoreOrderExpress storeOrderExpress) {
return success(storeOrderExpressService.insertStoreOrderExpress(storeOrderExpress));
}
/**
@ -75,8 +75,8 @@ public class StoreOrderExpressController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:express:edit')")
@Log(title = "档口代发订单快递", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody StoreOrderExpress storeOrderExpress) {
return toAjax(storeOrderExpressService.updateStoreOrderExpress(storeOrderExpress));
public R edit(@RequestBody StoreOrderExpress storeOrderExpress) {
return success(storeOrderExpressService.updateStoreOrderExpress(storeOrderExpress));
}
/**
@ -85,7 +85,7 @@ public class StoreOrderExpressController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:express:remove')")
@Log(title = "档口代发订单快递", businessType = BusinessType.DELETE)
@DeleteMapping("/{storeOrderExprIds}")
public AjaxResult remove(@PathVariable Long[] storeOrderExprIds) {
return toAjax(storeOrderExpressService.deleteStoreOrderExpressByStoreOrderExprIds(storeOrderExprIds));
public R remove(@PathVariable Long[] storeOrderExprIds) {
return success(storeOrderExpressService.deleteStoreOrderExpressByStoreOrderExprIds(storeOrderExprIds));
}
}

View File

@ -1,8 +1,8 @@
package com.ruoyi.web.controller.xkt;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.controller.XktBaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
@ -23,7 +23,7 @@ import java.util.List;
*/
@RestController
@RequestMapping("/rest/v1/store-order-receives")
public class StoreOrderReceiveController extends BaseController {
public class StoreOrderReceiveController extends XktBaseController {
@Autowired
private IStoreOrderReceiveService storeOrderReceiveService;
@ -55,7 +55,7 @@ public class StoreOrderReceiveController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('system:receive:query')")
@GetMapping(value = "/{storeOrderRcvId}")
public AjaxResult getInfo(@PathVariable("storeOrderRcvId") Long storeOrderRcvId) {
public R getInfo(@PathVariable("storeOrderRcvId") Long storeOrderRcvId) {
return success(storeOrderReceiveService.selectStoreOrderReceiveByStoreOrderRcvId(storeOrderRcvId));
}
@ -65,8 +65,8 @@ public class StoreOrderReceiveController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:receive:add')")
@Log(title = "档口代发订单收件人", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody StoreOrderReceive storeOrderReceive) {
return toAjax(storeOrderReceiveService.insertStoreOrderReceive(storeOrderReceive));
public R add(@RequestBody StoreOrderReceive storeOrderReceive) {
return success(storeOrderReceiveService.insertStoreOrderReceive(storeOrderReceive));
}
/**
@ -75,8 +75,8 @@ public class StoreOrderReceiveController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:receive:edit')")
@Log(title = "档口代发订单收件人", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody StoreOrderReceive storeOrderReceive) {
return toAjax(storeOrderReceiveService.updateStoreOrderReceive(storeOrderReceive));
public R edit(@RequestBody StoreOrderReceive storeOrderReceive) {
return success(storeOrderReceiveService.updateStoreOrderReceive(storeOrderReceive));
}
/**
@ -85,7 +85,7 @@ public class StoreOrderReceiveController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:receive:remove')")
@Log(title = "档口代发订单收件人", businessType = BusinessType.DELETE)
@DeleteMapping("/{storeOrderRcvIds}")
public AjaxResult remove(@PathVariable Long[] storeOrderRcvIds) {
return toAjax(storeOrderReceiveService.deleteStoreOrderReceiveByStoreOrderRcvIds(storeOrderRcvIds));
public R remove(@PathVariable Long[] storeOrderRcvIds) {
return success(storeOrderReceiveService.deleteStoreOrderReceiveByStoreOrderRcvIds(storeOrderRcvIds));
}
}

View File

@ -1,8 +1,8 @@
package com.ruoyi.web.controller.xkt;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.controller.XktBaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
@ -23,7 +23,7 @@ import java.util.List;
*/
@RestController
@RequestMapping("/rest/v1/barcode-matches")
public class StoreProductBarcodeMatchController extends BaseController {
public class StoreProductBarcodeMatchController extends XktBaseController {
@Autowired
private IStoreProductBarcodeMatchService storeProductBarcodeMatchService;
@ -55,7 +55,7 @@ public class StoreProductBarcodeMatchController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('system:match:query')")
@GetMapping(value = "/{storeProdBarcodeMatchId}")
public AjaxResult getInfo(@PathVariable("storeProdBarcodeMatchId") Long storeProdBarcodeMatchId) {
public R getInfo(@PathVariable("storeProdBarcodeMatchId") Long storeProdBarcodeMatchId) {
return success(storeProductBarcodeMatchService.selectStoreProductBarcodeMatchByStoreProdBarcodeMatchId(storeProdBarcodeMatchId));
}
@ -65,8 +65,8 @@ public class StoreProductBarcodeMatchController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:match:add')")
@Log(title = "档口条形码和第三方系统条形码匹配结果", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody StoreProductBarcodeMatch storeProductBarcodeMatch) {
return toAjax(storeProductBarcodeMatchService.insertStoreProductBarcodeMatch(storeProductBarcodeMatch));
public R add(@RequestBody StoreProductBarcodeMatch storeProductBarcodeMatch) {
return success(storeProductBarcodeMatchService.insertStoreProductBarcodeMatch(storeProductBarcodeMatch));
}
/**
@ -75,8 +75,8 @@ public class StoreProductBarcodeMatchController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:match:edit')")
@Log(title = "档口条形码和第三方系统条形码匹配结果", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody StoreProductBarcodeMatch storeProductBarcodeMatch) {
return toAjax(storeProductBarcodeMatchService.updateStoreProductBarcodeMatch(storeProductBarcodeMatch));
public R edit(@RequestBody StoreProductBarcodeMatch storeProductBarcodeMatch) {
return success(storeProductBarcodeMatchService.updateStoreProductBarcodeMatch(storeProductBarcodeMatch));
}
/**
@ -85,7 +85,7 @@ public class StoreProductBarcodeMatchController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:match:remove')")
@Log(title = "档口条形码和第三方系统条形码匹配结果", businessType = BusinessType.DELETE)
@DeleteMapping("/{storeProdBarcodeMatchIds}")
public AjaxResult remove(@PathVariable Long[] storeProdBarcodeMatchIds) {
return toAjax(storeProductBarcodeMatchService.deleteStoreProductBarcodeMatchByStoreProdBarcodeMatchIds(storeProdBarcodeMatchIds));
public R remove(@PathVariable Long[] storeProdBarcodeMatchIds) {
return success(storeProductBarcodeMatchService.deleteStoreProductBarcodeMatchByStoreProdBarcodeMatchIds(storeProdBarcodeMatchIds));
}
}

View File

@ -1,8 +1,8 @@
package com.ruoyi.web.controller.xkt;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.controller.XktBaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
@ -23,7 +23,7 @@ import java.util.List;
*/
@RestController
@RequestMapping("/rest/v1/barcode-records")
public class StoreProductBarcodeRecordController extends BaseController {
public class StoreProductBarcodeRecordController extends XktBaseController {
@Autowired
private IStoreProductBarcodeRecordService storeProductBarcodeRecordService;
@ -55,7 +55,7 @@ public class StoreProductBarcodeRecordController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('system:record:query')")
@GetMapping(value = "/{storeProdBarcodeRecordId}")
public AjaxResult getInfo(@PathVariable("storeProdBarcodeRecordId") Long storeProdBarcodeRecordId) {
public R getInfo(@PathVariable("storeProdBarcodeRecordId") Long storeProdBarcodeRecordId) {
return success(storeProductBarcodeRecordService.selectStoreProductBarcodeRecordByStoreProdBarcodeRecordId(storeProdBarcodeRecordId));
}
@ -65,8 +65,8 @@ public class StoreProductBarcodeRecordController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:record:add')")
@Log(title = "档口打印条形码记录", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody StoreProductBarcodeRecord storeProductBarcodeRecord) {
return toAjax(storeProductBarcodeRecordService.insertStoreProductBarcodeRecord(storeProductBarcodeRecord));
public R add(@RequestBody StoreProductBarcodeRecord storeProductBarcodeRecord) {
return success(storeProductBarcodeRecordService.insertStoreProductBarcodeRecord(storeProductBarcodeRecord));
}
/**
@ -75,8 +75,8 @@ public class StoreProductBarcodeRecordController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:record:edit')")
@Log(title = "档口打印条形码记录", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody StoreProductBarcodeRecord storeProductBarcodeRecord) {
return toAjax(storeProductBarcodeRecordService.updateStoreProductBarcodeRecord(storeProductBarcodeRecord));
public R edit(@RequestBody StoreProductBarcodeRecord storeProductBarcodeRecord) {
return success(storeProductBarcodeRecordService.updateStoreProductBarcodeRecord(storeProductBarcodeRecord));
}
/**
@ -85,7 +85,7 @@ public class StoreProductBarcodeRecordController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:record:remove')")
@Log(title = "档口打印条形码记录", businessType = BusinessType.DELETE)
@DeleteMapping("/{storeProdBarcodeRecordIds}")
public AjaxResult remove(@PathVariable Long[] storeProdBarcodeRecordIds) {
return toAjax(storeProductBarcodeRecordService.deleteStoreProductBarcodeRecordByStoreProdBarcodeRecordIds(storeProdBarcodeRecordIds));
public R remove(@PathVariable Long[] storeProdBarcodeRecordIds) {
return success(storeProductBarcodeRecordService.deleteStoreProductBarcodeRecordByStoreProdBarcodeRecordIds(storeProdBarcodeRecordIds));
}
}

View File

@ -1,8 +1,8 @@
package com.ruoyi.web.controller.xkt;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.controller.XktBaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
@ -23,7 +23,7 @@ import java.util.List;
*/
@RestController
@RequestMapping("/rest/v1/cate-attrs")
public class StoreProductCategoryAttributeController extends BaseController {
public class StoreProductCategoryAttributeController extends XktBaseController {
@Autowired
private IStoreProductCategoryAttributeService storeProductCategoryAttributeService;
@ -55,7 +55,7 @@ public class StoreProductCategoryAttributeController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('system:attribute:query')")
@GetMapping(value = "/{storeProdAttrId}")
public AjaxResult getInfo(@PathVariable("storeProdAttrId") Long storeProdAttrId) {
public R getInfo(@PathVariable("storeProdAttrId") Long storeProdAttrId) {
return success(storeProductCategoryAttributeService.selectStoreProductCategoryAttributeByStoreProdAttrId(storeProdAttrId));
}
@ -65,8 +65,8 @@ public class StoreProductCategoryAttributeController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:attribute:add')")
@Log(title = "档口商品类目信息", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody StoreProductCategoryAttribute storeProductCategoryAttribute) {
return toAjax(storeProductCategoryAttributeService.insertStoreProductCategoryAttribute(storeProductCategoryAttribute));
public R add(@RequestBody StoreProductCategoryAttribute storeProductCategoryAttribute) {
return success(storeProductCategoryAttributeService.insertStoreProductCategoryAttribute(storeProductCategoryAttribute));
}
/**
@ -75,8 +75,8 @@ public class StoreProductCategoryAttributeController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:attribute:edit')")
@Log(title = "档口商品类目信息", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody StoreProductCategoryAttribute storeProductCategoryAttribute) {
return toAjax(storeProductCategoryAttributeService.updateStoreProductCategoryAttribute(storeProductCategoryAttribute));
public R edit(@RequestBody StoreProductCategoryAttribute storeProductCategoryAttribute) {
return success(storeProductCategoryAttributeService.updateStoreProductCategoryAttribute(storeProductCategoryAttribute));
}
/**
@ -85,7 +85,7 @@ public class StoreProductCategoryAttributeController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:attribute:remove')")
@Log(title = "档口商品类目信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{storeProdAttrIds}")
public AjaxResult remove(@PathVariable Long[] storeProdAttrIds) {
return toAjax(storeProductCategoryAttributeService.deleteStoreProductCategoryAttributeByStoreProdAttrIds(storeProdAttrIds));
public R remove(@PathVariable Long[] storeProdAttrIds) {
return success(storeProductCategoryAttributeService.deleteStoreProductCategoryAttributeByStoreProdAttrIds(storeProdAttrIds));
}
}

View File

@ -1,8 +1,8 @@
package com.ruoyi.web.controller.xkt;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.controller.XktBaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
@ -23,7 +23,7 @@ import java.util.List;
*/
@RestController
@RequestMapping("/rest/v1/prod-colors")
public class StoreProductColorController extends BaseController {
public class StoreProductColorController extends XktBaseController {
@Autowired
private IStoreProductColorService storeProductColorService;
@ -55,7 +55,7 @@ public class StoreProductColorController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('system:color:query')")
@GetMapping(value = "/{storeProdColorId}")
public AjaxResult getInfo(@PathVariable("storeProdColorId") Long storeProdColorId) {
public R getInfo(@PathVariable("storeProdColorId") Long storeProdColorId) {
return success(storeProductColorService.selectStoreProductColorByStoreProdColorId(storeProdColorId));
}
@ -65,8 +65,8 @@ public class StoreProductColorController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:color:add')")
@Log(title = "档口当前商品颜色", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody StoreProductColor storeProductColor) {
return toAjax(storeProductColorService.insertStoreProductColor(storeProductColor));
public R add(@RequestBody StoreProductColor storeProductColor) {
return success(storeProductColorService.insertStoreProductColor(storeProductColor));
}
/**
@ -75,8 +75,8 @@ public class StoreProductColorController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:color:edit')")
@Log(title = "档口当前商品颜色", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody StoreProductColor storeProductColor) {
return toAjax(storeProductColorService.updateStoreProductColor(storeProductColor));
public R edit(@RequestBody StoreProductColor storeProductColor) {
return success(storeProductColorService.updateStoreProductColor(storeProductColor));
}
/**
@ -85,7 +85,7 @@ public class StoreProductColorController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:color:remove')")
@Log(title = "档口当前商品颜色", businessType = BusinessType.DELETE)
@DeleteMapping("/{storeProdColorIds}")
public AjaxResult remove(@PathVariable Long[] storeProdColorIds) {
return toAjax(storeProductColorService.deleteStoreProductColorByStoreProdColorIds(storeProdColorIds));
public R remove(@PathVariable Long[] storeProdColorIds) {
return success(storeProductColorService.deleteStoreProductColorByStoreProdColorIds(storeProdColorIds));
}
}

View File

@ -1,8 +1,8 @@
package com.ruoyi.web.controller.xkt;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.controller.XktBaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
@ -23,7 +23,7 @@ import java.util.List;
*/
@RestController
@RequestMapping("/rest/v1/prod-color-prices")
public class StoreProductColorPriceController extends BaseController {
public class StoreProductColorPriceController extends XktBaseController {
@Autowired
private IStoreProductColorPriceService storeProductColorPriceService;
@ -55,7 +55,7 @@ public class StoreProductColorPriceController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('system:price:query')")
@GetMapping(value = "/{storeProdColorPriceId}")
public AjaxResult getInfo(@PathVariable("storeProdColorPriceId") Long storeProdColorPriceId) {
public R getInfo(@PathVariable("storeProdColorPriceId") Long storeProdColorPriceId) {
return success(storeProductColorPriceService.selectStoreProductColorPriceByStoreProdColorPriceId(storeProdColorPriceId));
}
@ -65,8 +65,8 @@ public class StoreProductColorPriceController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:price:add')")
@Log(title = "档口商品颜色定价", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody StoreProductColorPrice storeProductColorPrice) {
return toAjax(storeProductColorPriceService.insertStoreProductColorPrice(storeProductColorPrice));
public R add(@RequestBody StoreProductColorPrice storeProductColorPrice) {
return success(storeProductColorPriceService.insertStoreProductColorPrice(storeProductColorPrice));
}
/**
@ -75,8 +75,8 @@ public class StoreProductColorPriceController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:price:edit')")
@Log(title = "档口商品颜色定价", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody StoreProductColorPrice storeProductColorPrice) {
return toAjax(storeProductColorPriceService.updateStoreProductColorPrice(storeProductColorPrice));
public R edit(@RequestBody StoreProductColorPrice storeProductColorPrice) {
return success(storeProductColorPriceService.updateStoreProductColorPrice(storeProductColorPrice));
}
/**
@ -85,7 +85,7 @@ public class StoreProductColorPriceController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:price:remove')")
@Log(title = "档口商品颜色定价", businessType = BusinessType.DELETE)
@DeleteMapping("/{storeProdColorPriceIds}")
public AjaxResult remove(@PathVariable Long[] storeProdColorPriceIds) {
return toAjax(storeProductColorPriceService.deleteStoreProductColorPriceByStoreProdColorPriceIds(storeProdColorPriceIds));
public R remove(@PathVariable Long[] storeProdColorPriceIds) {
return success(storeProductColorPriceService.deleteStoreProductColorPriceByStoreProdColorPriceIds(storeProdColorPriceIds));
}
}

View File

@ -1,8 +1,8 @@
package com.ruoyi.web.controller.xkt;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.controller.XktBaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
@ -23,7 +23,7 @@ import java.util.List;
*/
@RestController
@RequestMapping("/rest/v1/prod-color-sizes")
public class StoreProductColorSizeController extends BaseController {
public class StoreProductColorSizeController extends XktBaseController {
@Autowired
private IStoreProductColorSizeService storeProductColorSizeService;
@ -55,7 +55,7 @@ public class StoreProductColorSizeController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('system:size:query')")
@GetMapping(value = "/{storeProdColorSizeId}")
public AjaxResult getInfo(@PathVariable("storeProdColorSizeId") Long storeProdColorSizeId) {
public R getInfo(@PathVariable("storeProdColorSizeId") Long storeProdColorSizeId) {
return success(storeProductColorSizeService.selectStoreProductColorSizeByStoreProdColorSizeId(storeProdColorSizeId));
}
@ -65,8 +65,8 @@ public class StoreProductColorSizeController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:size:add')")
@Log(title = "档口商品颜色的尺码", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody StoreProductColorSize storeProductColorSize) {
return toAjax(storeProductColorSizeService.insertStoreProductColorSize(storeProductColorSize));
public R add(@RequestBody StoreProductColorSize storeProductColorSize) {
return success(storeProductColorSizeService.insertStoreProductColorSize(storeProductColorSize));
}
/**
@ -75,8 +75,8 @@ public class StoreProductColorSizeController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:size:edit')")
@Log(title = "档口商品颜色的尺码", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody StoreProductColorSize storeProductColorSize) {
return toAjax(storeProductColorSizeService.updateStoreProductColorSize(storeProductColorSize));
public R edit(@RequestBody StoreProductColorSize storeProductColorSize) {
return success(storeProductColorSizeService.updateStoreProductColorSize(storeProductColorSize));
}
/**
@ -85,7 +85,7 @@ public class StoreProductColorSizeController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:size:remove')")
@Log(title = "档口商品颜色的尺码", businessType = BusinessType.DELETE)
@DeleteMapping("/{storeProdColorSizeIds}")
public AjaxResult remove(@PathVariable Long[] storeProdColorSizeIds) {
return toAjax(storeProductColorSizeService.deleteStoreProductColorSizeByStoreProdColorSizeIds(storeProdColorSizeIds));
public R remove(@PathVariable Long[] storeProdColorSizeIds) {
return success(storeProductColorSizeService.deleteStoreProductColorSizeByStoreProdColorSizeIds(storeProdColorSizeIds));
}
}

View File

@ -1,12 +1,16 @@
package com.ruoyi.web.controller.xkt;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.controller.XktBaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.BeansUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.web.controller.xkt.vo.storeProduct.StoreProdVO;
import com.ruoyi.xkt.domain.StoreProduct;
import com.ruoyi.xkt.dto.storeProduct.StoreProdDTO;
import com.ruoyi.xkt.service.IStoreProductService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@ -23,7 +27,7 @@ import java.util.List;
*/
@RestController
@RequestMapping("/rest/v1/prods")
public class StoreProductController extends BaseController {
public class StoreProductController extends XktBaseController {
@Autowired
private IStoreProductService storeProductService;
@ -55,7 +59,7 @@ public class StoreProductController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('system:product:query')")
@GetMapping(value = "/{storeProdId}")
public AjaxResult getInfo(@PathVariable("storeProdId") Long storeProdId) {
public R getInfo(@PathVariable("storeProdId") Long storeProdId) {
return success(storeProductService.selectStoreProductByStoreProdId(storeProdId));
}
@ -65,8 +69,8 @@ public class StoreProductController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:product:add')")
@Log(title = "档口商品", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody StoreProduct storeProduct) {
return toAjax(storeProductService.insertStoreProduct(storeProduct));
public R add(@RequestBody StoreProdVO storeProdVO) {
return success(storeProductService.insertStoreProduct(BeansUtils.convertObject(storeProdVO, StoreProdDTO.class)));
}
/**
@ -75,8 +79,8 @@ public class StoreProductController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:product:edit')")
@Log(title = "档口商品", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody StoreProduct storeProduct) {
return toAjax(storeProductService.updateStoreProduct(storeProduct));
public R edit(@RequestBody StoreProduct storeProduct) {
return success(storeProductService.updateStoreProduct(storeProduct));
}
/**
@ -85,7 +89,7 @@ public class StoreProductController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:product:remove')")
@Log(title = "档口商品", businessType = BusinessType.DELETE)
@DeleteMapping("/{storeProdIds}")
public AjaxResult remove(@PathVariable Long[] storeProdIds) {
return toAjax(storeProductService.deleteStoreProductByStoreProdIds(storeProdIds));
public R remove(@PathVariable Long[] storeProdIds) {
return success(storeProductService.deleteStoreProductByStoreProdIds(storeProdIds));
}
}

View File

@ -1,8 +1,8 @@
package com.ruoyi.web.controller.xkt;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.controller.XktBaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
@ -23,7 +23,7 @@ import java.util.List;
*/
@RestController
@RequestMapping("/rest/v1/prod-demands")
public class StoreProductDemandController extends BaseController {
public class StoreProductDemandController extends XktBaseController {
@Autowired
private IStoreProductDemandService storeProductDemandService;
@ -55,7 +55,7 @@ public class StoreProductDemandController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('system:demand:query')")
@GetMapping(value = "/{storeProdDemandId}")
public AjaxResult getInfo(@PathVariable("storeProdDemandId") Long storeProdDemandId) {
public R getInfo(@PathVariable("storeProdDemandId") Long storeProdDemandId) {
return success(storeProductDemandService.selectStoreProductDemandByStoreProdDemandId(storeProdDemandId));
}
@ -65,8 +65,8 @@ public class StoreProductDemandController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:demand:add')")
@Log(title = "档口商品需求单", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody StoreProductDemand storeProductDemand) {
return toAjax(storeProductDemandService.insertStoreProductDemand(storeProductDemand));
public R add(@RequestBody StoreProductDemand storeProductDemand) {
return success(storeProductDemandService.insertStoreProductDemand(storeProductDemand));
}
/**
@ -75,8 +75,8 @@ public class StoreProductDemandController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:demand:edit')")
@Log(title = "档口商品需求单", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody StoreProductDemand storeProductDemand) {
return toAjax(storeProductDemandService.updateStoreProductDemand(storeProductDemand));
public R edit(@RequestBody StoreProductDemand storeProductDemand) {
return success(storeProductDemandService.updateStoreProductDemand(storeProductDemand));
}
/**
@ -85,7 +85,7 @@ public class StoreProductDemandController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:demand:remove')")
@Log(title = "档口商品需求单", businessType = BusinessType.DELETE)
@DeleteMapping("/{storeProdDemandIds}")
public AjaxResult remove(@PathVariable Long[] storeProdDemandIds) {
return toAjax(storeProductDemandService.deleteStoreProductDemandByStoreProdDemandIds(storeProdDemandIds));
public R remove(@PathVariable Long[] storeProdDemandIds) {
return success(storeProductDemandService.deleteStoreProductDemandByStoreProdDemandIds(storeProdDemandIds));
}
}

View File

@ -1,8 +1,8 @@
package com.ruoyi.web.controller.xkt;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.controller.XktBaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
@ -23,7 +23,7 @@ import java.util.List;
*/
@RestController
@RequestMapping("/rest/v1/prod-demand-details")
public class StoreProductDemandDetailController extends BaseController {
public class StoreProductDemandDetailController extends XktBaseController {
@Autowired
private IStoreProductDemandDetailService storeProductDemandDetailService;
@ -55,7 +55,7 @@ public class StoreProductDemandDetailController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('system:detail:query')")
@GetMapping(value = "/{storeProdDemaDetailId}")
public AjaxResult getInfo(@PathVariable("storeProdDemaDetailId") Long storeProdDemaDetailId) {
public R getInfo(@PathVariable("storeProdDemaDetailId") Long storeProdDemaDetailId) {
return success(storeProductDemandDetailService.selectStoreProductDemandDetailByStoreProdDemaDetailId(storeProdDemaDetailId));
}
@ -65,8 +65,8 @@ public class StoreProductDemandDetailController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:detail:add')")
@Log(title = "档口商品需求单明细", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody StoreProductDemandDetail storeProductDemandDetail) {
return toAjax(storeProductDemandDetailService.insertStoreProductDemandDetail(storeProductDemandDetail));
public R add(@RequestBody StoreProductDemandDetail storeProductDemandDetail) {
return success(storeProductDemandDetailService.insertStoreProductDemandDetail(storeProductDemandDetail));
}
/**
@ -75,8 +75,8 @@ public class StoreProductDemandDetailController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:detail:edit')")
@Log(title = "档口商品需求单明细", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody StoreProductDemandDetail storeProductDemandDetail) {
return toAjax(storeProductDemandDetailService.updateStoreProductDemandDetail(storeProductDemandDetail));
public R edit(@RequestBody StoreProductDemandDetail storeProductDemandDetail) {
return success(storeProductDemandDetailService.updateStoreProductDemandDetail(storeProductDemandDetail));
}
/**
@ -85,7 +85,7 @@ public class StoreProductDemandDetailController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:detail:remove')")
@Log(title = "档口商品需求单明细", businessType = BusinessType.DELETE)
@DeleteMapping("/{storeProdDemaDetailIds}")
public AjaxResult remove(@PathVariable Long[] storeProdDemaDetailIds) {
return toAjax(storeProductDemandDetailService.deleteStoreProductDemandDetailByStoreProdDemaDetailIds(storeProdDemaDetailIds));
public R remove(@PathVariable Long[] storeProdDemaDetailIds) {
return success(storeProductDemandDetailService.deleteStoreProductDemandDetailByStoreProdDemaDetailIds(storeProdDemaDetailIds));
}
}

View File

@ -1,8 +1,8 @@
package com.ruoyi.web.controller.xkt;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.controller.XktBaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
@ -23,7 +23,7 @@ import java.util.List;
*/
@RestController
@RequestMapping("/rest/v1/prod-details")
public class StoreProductDetailController extends BaseController {
public class StoreProductDetailController extends XktBaseController {
@Autowired
private IStoreProductDetailService storeProductDetailService;
@ -55,7 +55,7 @@ public class StoreProductDetailController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('system:detail:query')")
@GetMapping(value = "/{storeProdDetailId}")
public AjaxResult getInfo(@PathVariable("storeProdDetailId") Long storeProdDetailId) {
public R getInfo(@PathVariable("storeProdDetailId") Long storeProdDetailId) {
return success(storeProductDetailService.selectStoreProductDetailByStoreProdDetailId(storeProdDetailId));
}
@ -65,8 +65,8 @@ public class StoreProductDetailController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:detail:add')")
@Log(title = "档口商品详情内容", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody StoreProductDetail storeProductDetail) {
return toAjax(storeProductDetailService.insertStoreProductDetail(storeProductDetail));
public R add(@RequestBody StoreProductDetail storeProductDetail) {
return success(storeProductDetailService.insertStoreProductDetail(storeProductDetail));
}
/**
@ -75,8 +75,8 @@ public class StoreProductDetailController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:detail:edit')")
@Log(title = "档口商品详情内容", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody StoreProductDetail storeProductDetail) {
return toAjax(storeProductDetailService.updateStoreProductDetail(storeProductDetail));
public R edit(@RequestBody StoreProductDetail storeProductDetail) {
return success(storeProductDetailService.updateStoreProductDetail(storeProductDetail));
}
/**
@ -85,7 +85,7 @@ public class StoreProductDetailController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:detail:remove')")
@Log(title = "档口商品详情内容", businessType = BusinessType.DELETE)
@DeleteMapping("/{storeProdDetailIds}")
public AjaxResult remove(@PathVariable Long[] storeProdDetailIds) {
return toAjax(storeProductDetailService.deleteStoreProductDetailByStoreProdDetailIds(storeProdDetailIds));
public R remove(@PathVariable Long[] storeProdDetailIds) {
return success(storeProductDetailService.deleteStoreProductDetailByStoreProdDetailIds(storeProdDetailIds));
}
}

View File

@ -1,8 +1,8 @@
package com.ruoyi.web.controller.xkt;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.controller.XktBaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
@ -23,7 +23,7 @@ import java.util.List;
*/
@RestController
@RequestMapping("/rest/v1/prod-files")
public class StoreProductFileController extends BaseController {
public class StoreProductFileController extends XktBaseController {
@Autowired
private IStoreProductFileService storeProductFileService;
@ -55,7 +55,7 @@ public class StoreProductFileController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('system:file:query')")
@GetMapping(value = "/{storeProdFileId}")
public AjaxResult getInfo(@PathVariable("storeProdFileId") Long storeProdFileId) {
public R getInfo(@PathVariable("storeProdFileId") Long storeProdFileId) {
return success(storeProductFileService.selectStoreProductFileByStoreProdFileId(storeProdFileId));
}
@ -65,8 +65,8 @@ public class StoreProductFileController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:file:add')")
@Log(title = "档口商品文件", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody StoreProductFile storeProductFile) {
return toAjax(storeProductFileService.insertStoreProductFile(storeProductFile));
public R add(@RequestBody StoreProductFile storeProductFile) {
return success(storeProductFileService.insertStoreProductFile(storeProductFile));
}
/**
@ -75,8 +75,8 @@ public class StoreProductFileController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:file:edit')")
@Log(title = "档口商品文件", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody StoreProductFile storeProductFile) {
return toAjax(storeProductFileService.updateStoreProductFile(storeProductFile));
public R edit(@RequestBody StoreProductFile storeProductFile) {
return success(storeProductFileService.updateStoreProductFile(storeProductFile));
}
/**
@ -85,7 +85,7 @@ public class StoreProductFileController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:file:remove')")
@Log(title = "档口商品文件", businessType = BusinessType.DELETE)
@DeleteMapping("/{storeProdFileIds}")
public AjaxResult remove(@PathVariable Long[] storeProdFileIds) {
return toAjax(storeProductFileService.deleteStoreProductFileByStoreProdFileIds(storeProdFileIds));
public R remove(@PathVariable Long[] storeProdFileIds) {
return success(storeProductFileService.deleteStoreProductFileByStoreProdFileIds(storeProdFileIds));
}
}

View File

@ -1,8 +1,8 @@
package com.ruoyi.web.controller.xkt;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.controller.XktBaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
@ -23,7 +23,7 @@ import java.util.List;
*/
@RestController
@RequestMapping("/rest/v1/prod-processes")
public class StoreProductProcessController extends BaseController {
public class StoreProductProcessController extends XktBaseController {
@Autowired
private IStoreProductProcessService storeProductProcessService;
@ -55,7 +55,7 @@ public class StoreProductProcessController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('system:process:query')")
@GetMapping(value = "/{storeProdProcessId}")
public AjaxResult getInfo(@PathVariable("storeProdProcessId") Long storeProdProcessId) {
public R getInfo(@PathVariable("storeProdProcessId") Long storeProdProcessId) {
return success(storeProductProcessService.selectStoreProductProcessByStoreProdProcessId(storeProdProcessId));
}
@ -65,8 +65,8 @@ public class StoreProductProcessController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:process:add')")
@Log(title = "档口商品工艺信息", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody StoreProductProcess storeProductProcess) {
return toAjax(storeProductProcessService.insertStoreProductProcess(storeProductProcess));
public R add(@RequestBody StoreProductProcess storeProductProcess) {
return success(storeProductProcessService.insertStoreProductProcess(storeProductProcess));
}
/**
@ -75,8 +75,8 @@ public class StoreProductProcessController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:process:edit')")
@Log(title = "档口商品工艺信息", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody StoreProductProcess storeProductProcess) {
return toAjax(storeProductProcessService.updateStoreProductProcess(storeProductProcess));
public R edit(@RequestBody StoreProductProcess storeProductProcess) {
return success(storeProductProcessService.updateStoreProductProcess(storeProductProcess));
}
/**
@ -85,7 +85,7 @@ public class StoreProductProcessController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:process:remove')")
@Log(title = "档口商品工艺信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{storeProdProcessIds}")
public AjaxResult remove(@PathVariable Long[] storeProdProcessIds) {
return toAjax(storeProductProcessService.deleteStoreProductProcessByStoreProdProcessIds(storeProdProcessIds));
public R remove(@PathVariable Long[] storeProdProcessIds) {
return success(storeProductProcessService.deleteStoreProductProcessByStoreProdProcessIds(storeProdProcessIds));
}
}

View File

@ -1,8 +1,8 @@
package com.ruoyi.web.controller.xkt;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.controller.XktBaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
@ -23,7 +23,7 @@ import java.util.List;
*/
@RestController
@RequestMapping("/rest/v1/prod-services")
public class StoreProductServiceController extends BaseController {
public class StoreProductServiceController extends XktBaseController {
@Autowired
private IStoreProductServiceService storeProductServiceService;
@ -55,7 +55,7 @@ public class StoreProductServiceController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('system:service:query')")
@GetMapping(value = "/{storeProdSvcId}")
public AjaxResult getInfo(@PathVariable("storeProdSvcId") Long storeProdSvcId) {
public R getInfo(@PathVariable("storeProdSvcId") Long storeProdSvcId) {
return success(storeProductServiceService.selectStoreProductServiceByStoreProdSvcId(storeProdSvcId));
}
@ -65,8 +65,8 @@ public class StoreProductServiceController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:service:add')")
@Log(title = "档口商品服务", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody StoreProductService storeProductService) {
return toAjax(storeProductServiceService.insertStoreProductService(storeProductService));
public R add(@RequestBody StoreProductService storeProductService) {
return success(storeProductServiceService.insertStoreProductService(storeProductService));
}
/**
@ -75,8 +75,8 @@ public class StoreProductServiceController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:service:edit')")
@Log(title = "档口商品服务", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody StoreProductService storeProductService) {
return toAjax(storeProductServiceService.updateStoreProductService(storeProductService));
public R edit(@RequestBody StoreProductService storeProductService) {
return success(storeProductServiceService.updateStoreProductService(storeProductService));
}
/**
@ -85,7 +85,7 @@ public class StoreProductServiceController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:service:remove')")
@Log(title = "档口商品服务", businessType = BusinessType.DELETE)
@DeleteMapping("/{storeProdSvcIds}")
public AjaxResult remove(@PathVariable Long[] storeProdSvcIds) {
return toAjax(storeProductServiceService.deleteStoreProductServiceByStoreProdSvcIds(storeProdSvcIds));
public R remove(@PathVariable Long[] storeProdSvcIds) {
return success(storeProductServiceService.deleteStoreProductServiceByStoreProdSvcIds(storeProdSvcIds));
}
}

View File

@ -1,8 +1,8 @@
package com.ruoyi.web.controller.xkt;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.controller.XktBaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
@ -23,7 +23,7 @@ import java.util.List;
*/
@RestController
@RequestMapping("/rest/v1/prod-stocks")
public class StoreProductStockController extends BaseController {
public class StoreProductStockController extends XktBaseController {
@Autowired
private IStoreProductStockService storeProductStockService;
@ -55,7 +55,7 @@ public class StoreProductStockController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('system:stock:query')")
@GetMapping(value = "/{storeProdStockId}")
public AjaxResult getInfo(@PathVariable("storeProdStockId") Long storeProdStockId) {
public R getInfo(@PathVariable("storeProdStockId") Long storeProdStockId) {
return success(storeProductStockService.selectStoreProductStockByStoreProdStockId(storeProdStockId));
}
@ -65,8 +65,8 @@ public class StoreProductStockController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:stock:add')")
@Log(title = "档口商品库存", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody StoreProductStock storeProductStock) {
return toAjax(storeProductStockService.insertStoreProductStock(storeProductStock));
public R add(@RequestBody StoreProductStock storeProductStock) {
return success(storeProductStockService.insertStoreProductStock(storeProductStock));
}
/**
@ -75,8 +75,8 @@ public class StoreProductStockController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:stock:edit')")
@Log(title = "档口商品库存", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody StoreProductStock storeProductStock) {
return toAjax(storeProductStockService.updateStoreProductStock(storeProductStock));
public R edit(@RequestBody StoreProductStock storeProductStock) {
return success(storeProductStockService.updateStoreProductStock(storeProductStock));
}
/**
@ -85,7 +85,7 @@ public class StoreProductStockController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:stock:remove')")
@Log(title = "档口商品库存", businessType = BusinessType.DELETE)
@DeleteMapping("/{storeProdStockIds}")
public AjaxResult remove(@PathVariable Long[] storeProdStockIds) {
return toAjax(storeProductStockService.deleteStoreProductStockByStoreProdStockIds(storeProdStockIds));
public R remove(@PathVariable Long[] storeProdStockIds) {
return success(storeProductStockService.deleteStoreProductStockByStoreProdStockIds(storeProdStockIds));
}
}

View File

@ -1,8 +1,8 @@
package com.ruoyi.web.controller.xkt;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.controller.XktBaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
@ -23,7 +23,7 @@ import java.util.List;
*/
@RestController
@RequestMapping("/rest/v1/prod-storages")
public class StoreProductStorageController extends BaseController {
public class StoreProductStorageController extends XktBaseController {
@Autowired
private IStoreProductStorageService storeProductStorageService;
@ -55,7 +55,7 @@ public class StoreProductStorageController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('system:storage:query')")
@GetMapping(value = "/{storeProdStorId}")
public AjaxResult getInfo(@PathVariable("storeProdStorId") Long storeProdStorId) {
public R getInfo(@PathVariable("storeProdStorId") Long storeProdStorId) {
return success(storeProductStorageService.selectStoreProductStorageByStoreProdStorId(storeProdStorId));
}
@ -65,8 +65,8 @@ public class StoreProductStorageController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:storage:add')")
@Log(title = "档口商品入库", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody StoreProductStorage storeProductStorage) {
return toAjax(storeProductStorageService.insertStoreProductStorage(storeProductStorage));
public R add(@RequestBody StoreProductStorage storeProductStorage) {
return success(storeProductStorageService.insertStoreProductStorage(storeProductStorage));
}
/**
@ -75,8 +75,8 @@ public class StoreProductStorageController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:storage:edit')")
@Log(title = "档口商品入库", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody StoreProductStorage storeProductStorage) {
return toAjax(storeProductStorageService.updateStoreProductStorage(storeProductStorage));
public R edit(@RequestBody StoreProductStorage storeProductStorage) {
return success(storeProductStorageService.updateStoreProductStorage(storeProductStorage));
}
/**
@ -85,7 +85,7 @@ public class StoreProductStorageController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:storage:remove')")
@Log(title = "档口商品入库", businessType = BusinessType.DELETE)
@DeleteMapping("/{storeProdStorIds}")
public AjaxResult remove(@PathVariable Long[] storeProdStorIds) {
return toAjax(storeProductStorageService.deleteStoreProductStorageByStoreProdStorIds(storeProdStorIds));
public R remove(@PathVariable Long[] storeProdStorIds) {
return success(storeProductStorageService.deleteStoreProductStorageByStoreProdStorIds(storeProdStorIds));
}
}

View File

@ -1,8 +1,8 @@
package com.ruoyi.web.controller.xkt;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.controller.XktBaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
@ -23,7 +23,7 @@ import java.util.List;
*/
@RestController
@RequestMapping("/rest/v1/storages-demand-deductes")
public class StoreProductStorageDemandDeducteController extends BaseController {
public class StoreProductStorageDemandDeducteController extends XktBaseController {
@Autowired
private IStoreProductStorageDemandDeducteService storeProductStorageDemandDeducteService;
@ -55,7 +55,7 @@ public class StoreProductStorageDemandDeducteController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('system:deducte:query')")
@GetMapping(value = "/{storeProdStorDemaDeducteId}")
public AjaxResult getInfo(@PathVariable("storeProdStorDemaDeducteId") Long storeProdStorDemaDeducteId) {
public R getInfo(@PathVariable("storeProdStorDemaDeducteId") Long storeProdStorDemaDeducteId) {
return success(storeProductStorageDemandDeducteService.selectStoreProductStorageDemandDeducteByStoreProdStorDemaDeducteId(storeProdStorDemaDeducteId));
}
@ -65,8 +65,8 @@ public class StoreProductStorageDemandDeducteController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:deducte:add')")
@Log(title = "档口商品入库抵扣需求", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody StoreProductStorageDemandDeducte storeProductStorageDemandDeducte) {
return toAjax(storeProductStorageDemandDeducteService.insertStoreProductStorageDemandDeducte(storeProductStorageDemandDeducte));
public R add(@RequestBody StoreProductStorageDemandDeducte storeProductStorageDemandDeducte) {
return success(storeProductStorageDemandDeducteService.insertStoreProductStorageDemandDeducte(storeProductStorageDemandDeducte));
}
/**
@ -75,8 +75,8 @@ public class StoreProductStorageDemandDeducteController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:deducte:edit')")
@Log(title = "档口商品入库抵扣需求", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody StoreProductStorageDemandDeducte storeProductStorageDemandDeducte) {
return toAjax(storeProductStorageDemandDeducteService.updateStoreProductStorageDemandDeducte(storeProductStorageDemandDeducte));
public R edit(@RequestBody StoreProductStorageDemandDeducte storeProductStorageDemandDeducte) {
return success(storeProductStorageDemandDeducteService.updateStoreProductStorageDemandDeducte(storeProductStorageDemandDeducte));
}
/**
@ -85,7 +85,7 @@ public class StoreProductStorageDemandDeducteController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:deducte:remove')")
@Log(title = "档口商品入库抵扣需求", businessType = BusinessType.DELETE)
@DeleteMapping("/{storeProdStorDemaDeducteIds}")
public AjaxResult remove(@PathVariable Long[] storeProdStorDemaDeducteIds) {
return toAjax(storeProductStorageDemandDeducteService.deleteStoreProductStorageDemandDeducteByStoreProdStorDemaDeducteIds(storeProdStorDemaDeducteIds));
public R remove(@PathVariable Long[] storeProdStorDemaDeducteIds) {
return success(storeProductStorageDemandDeducteService.deleteStoreProductStorageDemandDeducteByStoreProdStorDemaDeducteIds(storeProdStorDemaDeducteIds));
}
}

View File

@ -1,8 +1,8 @@
package com.ruoyi.web.controller.xkt;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.controller.XktBaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
@ -23,7 +23,7 @@ import java.util.List;
*/
@RestController
@RequestMapping("/rest/v1/storage-details")
public class StoreProductStorageDetailController extends BaseController {
public class StoreProductStorageDetailController extends XktBaseController {
@Autowired
private IStoreProductStorageDetailService storeProductStorageDetailService;
@ -55,7 +55,7 @@ public class StoreProductStorageDetailController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('system:detail:query')")
@GetMapping(value = "/{storeProdStorDetailId}")
public AjaxResult getInfo(@PathVariable("storeProdStorDetailId") Long storeProdStorDetailId) {
public R getInfo(@PathVariable("storeProdStorDetailId") Long storeProdStorDetailId) {
return success(storeProductStorageDetailService.selectStoreProductStorageDetailByStoreProdStorDetailId(storeProdStorDetailId));
}
@ -65,8 +65,8 @@ public class StoreProductStorageDetailController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:detail:add')")
@Log(title = "档口商品入库明细", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody StoreProductStorageDetail storeProductStorageDetail) {
return toAjax(storeProductStorageDetailService.insertStoreProductStorageDetail(storeProductStorageDetail));
public R add(@RequestBody StoreProductStorageDetail storeProductStorageDetail) {
return success(storeProductStorageDetailService.insertStoreProductStorageDetail(storeProductStorageDetail));
}
/**
@ -75,8 +75,8 @@ public class StoreProductStorageDetailController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:detail:edit')")
@Log(title = "档口商品入库明细", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody StoreProductStorageDetail storeProductStorageDetail) {
return toAjax(storeProductStorageDetailService.updateStoreProductStorageDetail(storeProductStorageDetail));
public R edit(@RequestBody StoreProductStorageDetail storeProductStorageDetail) {
return success(storeProductStorageDetailService.updateStoreProductStorageDetail(storeProductStorageDetail));
}
/**
@ -85,7 +85,7 @@ public class StoreProductStorageDetailController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:detail:remove')")
@Log(title = "档口商品入库明细", businessType = BusinessType.DELETE)
@DeleteMapping("/{storeProdStorDetailIds}")
public AjaxResult remove(@PathVariable Long[] storeProdStorDetailIds) {
return toAjax(storeProductStorageDetailService.deleteStoreProductStorageDetailByStoreProdStorDetailIds(storeProdStorDetailIds));
public R remove(@PathVariable Long[] storeProdStorDetailIds) {
return success(storeProductStorageDetailService.deleteStoreProductStorageDetailByStoreProdStorDetailIds(storeProdStorDetailIds));
}
}

View File

@ -1,8 +1,8 @@
package com.ruoyi.web.controller.xkt;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.controller.XktBaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
@ -23,7 +23,7 @@ import java.util.List;
*/
@RestController
@RequestMapping("/rest/v1/quick-funcs")
public class StoreQuickFunctionController extends BaseController {
public class StoreQuickFunctionController extends XktBaseController {
@Autowired
private IStoreQuickFunctionService storeQuickFunctionService;
@ -55,7 +55,7 @@ public class StoreQuickFunctionController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('system:function:query')")
@GetMapping(value = "/{storeQuickFuncId}")
public AjaxResult getInfo(@PathVariable("storeQuickFuncId") Long storeQuickFuncId) {
public R getInfo(@PathVariable("storeQuickFuncId") Long storeQuickFuncId) {
return success(storeQuickFunctionService.selectStoreQuickFunctionByStoreQuickFuncId(storeQuickFuncId));
}
@ -65,8 +65,8 @@ public class StoreQuickFunctionController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:function:add')")
@Log(title = "档口快捷功能", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody StoreQuickFunction storeQuickFunction) {
return toAjax(storeQuickFunctionService.insertStoreQuickFunction(storeQuickFunction));
public R add(@RequestBody StoreQuickFunction storeQuickFunction) {
return success(storeQuickFunctionService.insertStoreQuickFunction(storeQuickFunction));
}
/**
@ -75,8 +75,8 @@ public class StoreQuickFunctionController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:function:edit')")
@Log(title = "档口快捷功能", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody StoreQuickFunction storeQuickFunction) {
return toAjax(storeQuickFunctionService.updateStoreQuickFunction(storeQuickFunction));
public R edit(@RequestBody StoreQuickFunction storeQuickFunction) {
return success(storeQuickFunctionService.updateStoreQuickFunction(storeQuickFunction));
}
/**
@ -85,7 +85,7 @@ public class StoreQuickFunctionController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:function:remove')")
@Log(title = "档口快捷功能", businessType = BusinessType.DELETE)
@DeleteMapping("/{storeQuickFuncIds}")
public AjaxResult remove(@PathVariable Long[] storeQuickFuncIds) {
return toAjax(storeQuickFunctionService.deleteStoreQuickFunctionByStoreQuickFuncIds(storeQuickFuncIds));
public R remove(@PathVariable Long[] storeQuickFuncIds) {
return success(storeQuickFunctionService.deleteStoreQuickFunctionByStoreQuickFuncIds(storeQuickFuncIds));
}
}

View File

@ -1,8 +1,8 @@
package com.ruoyi.web.controller.xkt;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.controller.XktBaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
@ -23,7 +23,7 @@ import java.util.List;
*/
@RestController
@RequestMapping("/rest/v1/store-role-accs")
public class StoreRoleAccountController extends BaseController {
public class StoreRoleAccountController extends XktBaseController {
@Autowired
private IStoreRoleAccountService storeRoleAccountService;
@ -55,7 +55,7 @@ public class StoreRoleAccountController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('system:account:query')")
@GetMapping(value = "/{storeRoleAccId}")
public AjaxResult getInfo(@PathVariable("storeRoleAccId") Long storeRoleAccId) {
public R getInfo(@PathVariable("storeRoleAccId") Long storeRoleAccId) {
return success(storeRoleAccountService.selectStoreRoleAccountByStoreRoleAccId(storeRoleAccId));
}
@ -65,8 +65,8 @@ public class StoreRoleAccountController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:account:add')")
@Log(title = "档口子角色账号", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody StoreRoleAccount storeRoleAccount) {
return toAjax(storeRoleAccountService.insertStoreRoleAccount(storeRoleAccount));
public R add(@RequestBody StoreRoleAccount storeRoleAccount) {
return success(storeRoleAccountService.insertStoreRoleAccount(storeRoleAccount));
}
/**
@ -75,8 +75,8 @@ public class StoreRoleAccountController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:account:edit')")
@Log(title = "档口子角色账号", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody StoreRoleAccount storeRoleAccount) {
return toAjax(storeRoleAccountService.updateStoreRoleAccount(storeRoleAccount));
public R edit(@RequestBody StoreRoleAccount storeRoleAccount) {
return success(storeRoleAccountService.updateStoreRoleAccount(storeRoleAccount));
}
/**
@ -85,7 +85,7 @@ public class StoreRoleAccountController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:account:remove')")
@Log(title = "档口子角色账号", businessType = BusinessType.DELETE)
@DeleteMapping("/{storeRoleAccIds}")
public AjaxResult remove(@PathVariable Long[] storeRoleAccIds) {
return toAjax(storeRoleAccountService.deleteStoreRoleAccountByStoreRoleAccIds(storeRoleAccIds));
public R remove(@PathVariable Long[] storeRoleAccIds) {
return success(storeRoleAccountService.deleteStoreRoleAccountByStoreRoleAccIds(storeRoleAccIds));
}
}

View File

@ -1,8 +1,8 @@
package com.ruoyi.web.controller.xkt;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.controller.XktBaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
@ -23,7 +23,7 @@ import java.util.List;
*/
@RestController
@RequestMapping("/rest/v1/store-roles")
public class StoreRoleController extends BaseController {
public class StoreRoleController extends XktBaseController {
@Autowired
private IStoreRoleService storeRoleService;
@ -55,7 +55,7 @@ public class StoreRoleController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('system:role:query')")
@GetMapping(value = "/{storeRoleId}")
public AjaxResult getInfo(@PathVariable("storeRoleId") Long storeRoleId) {
public R getInfo(@PathVariable("storeRoleId") Long storeRoleId) {
return success(storeRoleService.selectStoreRoleByStoreRoleId(storeRoleId));
}
@ -65,8 +65,8 @@ public class StoreRoleController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:role:add')")
@Log(title = "档口子角色", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody StoreRole storeRole) {
return toAjax(storeRoleService.insertStoreRole(storeRole));
public R add(@RequestBody StoreRole storeRole) {
return success(storeRoleService.insertStoreRole(storeRole));
}
/**
@ -75,8 +75,8 @@ public class StoreRoleController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:role:edit')")
@Log(title = "档口子角色", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody StoreRole storeRole) {
return toAjax(storeRoleService.updateStoreRole(storeRole));
public R edit(@RequestBody StoreRole storeRole) {
return success(storeRoleService.updateStoreRole(storeRole));
}
/**
@ -85,7 +85,7 @@ public class StoreRoleController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:role:remove')")
@Log(title = "档口子角色", businessType = BusinessType.DELETE)
@DeleteMapping("/{storeRoleIds}")
public AjaxResult remove(@PathVariable Long[] storeRoleIds) {
return toAjax(storeRoleService.deleteStoreRoleByStoreRoleIds(storeRoleIds));
public R remove(@PathVariable Long[] storeRoleIds) {
return success(storeRoleService.deleteStoreRoleByStoreRoleIds(storeRoleIds));
}
}

View File

@ -1,8 +1,8 @@
package com.ruoyi.web.controller.xkt;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.controller.XktBaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
@ -23,7 +23,7 @@ import java.util.List;
*/
@RestController
@RequestMapping("/rest/v1/store-role-menus")
public class StoreRoleMenuController extends BaseController {
public class StoreRoleMenuController extends XktBaseController {
@Autowired
private IStoreRoleMenuService storeRoleMenuService;
@ -55,7 +55,7 @@ public class StoreRoleMenuController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('system:menu:query')")
@GetMapping(value = "/{storeRoleMenuId}")
public AjaxResult getInfo(@PathVariable("storeRoleMenuId") Long storeRoleMenuId) {
public R getInfo(@PathVariable("storeRoleMenuId") Long storeRoleMenuId) {
return success(storeRoleMenuService.selectStoreRoleMenuByStoreRoleMenuId(storeRoleMenuId));
}
@ -65,8 +65,8 @@ public class StoreRoleMenuController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:menu:add')")
@Log(title = "档口子角色菜单", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody StoreRoleMenu storeRoleMenu) {
return toAjax(storeRoleMenuService.insertStoreRoleMenu(storeRoleMenu));
public R add(@RequestBody StoreRoleMenu storeRoleMenu) {
return success(storeRoleMenuService.insertStoreRoleMenu(storeRoleMenu));
}
/**
@ -75,8 +75,8 @@ public class StoreRoleMenuController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:menu:edit')")
@Log(title = "档口子角色菜单", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody StoreRoleMenu storeRoleMenu) {
return toAjax(storeRoleMenuService.updateStoreRoleMenu(storeRoleMenu));
public R edit(@RequestBody StoreRoleMenu storeRoleMenu) {
return success(storeRoleMenuService.updateStoreRoleMenu(storeRoleMenu));
}
/**
@ -85,7 +85,7 @@ public class StoreRoleMenuController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:menu:remove')")
@Log(title = "档口子角色菜单", businessType = BusinessType.DELETE)
@DeleteMapping("/{storeRoleMenuIds}")
public AjaxResult remove(@PathVariable Long[] storeRoleMenuIds) {
return toAjax(storeRoleMenuService.deleteStoreRoleMenuByStoreRoleMenuIds(storeRoleMenuIds));
public R remove(@PathVariable Long[] storeRoleMenuIds) {
return success(storeRoleMenuService.deleteStoreRoleMenuByStoreRoleMenuIds(storeRoleMenuIds));
}
}

View File

@ -1,8 +1,8 @@
package com.ruoyi.web.controller.xkt;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.controller.XktBaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
@ -23,7 +23,7 @@ import java.util.List;
*/
@RestController
@RequestMapping("/rest/v1/store-sales")
public class StoreSaleController extends BaseController {
public class StoreSaleController extends XktBaseController {
@Autowired
private IStoreSaleService storeSaleService;
@ -55,7 +55,7 @@ public class StoreSaleController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('system:sale:query')")
@GetMapping(value = "/{storeSaleId}")
public AjaxResult getInfo(@PathVariable("storeSaleId") Long storeSaleId) {
public R getInfo(@PathVariable("storeSaleId") Long storeSaleId) {
return success(storeSaleService.selectStoreSaleByStoreSaleId(storeSaleId));
}
@ -65,8 +65,8 @@ public class StoreSaleController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:sale:add')")
@Log(title = "档口销售出库", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody StoreSale storeSale) {
return toAjax(storeSaleService.insertStoreSale(storeSale));
public R add(@RequestBody StoreSale storeSale) {
return success(storeSaleService.insertStoreSale(storeSale));
}
/**
@ -75,8 +75,8 @@ public class StoreSaleController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:sale:edit')")
@Log(title = "档口销售出库", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody StoreSale storeSale) {
return toAjax(storeSaleService.updateStoreSale(storeSale));
public R edit(@RequestBody StoreSale storeSale) {
return success(storeSaleService.updateStoreSale(storeSale));
}
/**
@ -85,7 +85,7 @@ public class StoreSaleController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:sale:remove')")
@Log(title = "档口销售出库", businessType = BusinessType.DELETE)
@DeleteMapping("/{storeSaleIds}")
public AjaxResult remove(@PathVariable Long[] storeSaleIds) {
return toAjax(storeSaleService.deleteStoreSaleByStoreSaleIds(storeSaleIds));
public R remove(@PathVariable Long[] storeSaleIds) {
return success(storeSaleService.deleteStoreSaleByStoreSaleIds(storeSaleIds));
}
}

View File

@ -1,8 +1,8 @@
package com.ruoyi.web.controller.xkt;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.controller.XktBaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
@ -23,7 +23,7 @@ import java.util.List;
*/
@RestController
@RequestMapping("/rest/v1/store-sale-details")
public class StoreSaleDetailController extends BaseController {
public class StoreSaleDetailController extends XktBaseController {
@Autowired
private IStoreSaleDetailService storeSaleDetailService;
@ -55,7 +55,7 @@ public class StoreSaleDetailController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('system:detail:query')")
@GetMapping(value = "/{storeSaleDetailId}")
public AjaxResult getInfo(@PathVariable("storeSaleDetailId") Long storeSaleDetailId) {
public R getInfo(@PathVariable("storeSaleDetailId") Long storeSaleDetailId) {
return success(storeSaleDetailService.selectStoreSaleDetailByStoreSaleDetailId(storeSaleDetailId));
}
@ -65,8 +65,8 @@ public class StoreSaleDetailController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:detail:add')")
@Log(title = "档口销售明细", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody StoreSaleDetail storeSaleDetail) {
return toAjax(storeSaleDetailService.insertStoreSaleDetail(storeSaleDetail));
public R add(@RequestBody StoreSaleDetail storeSaleDetail) {
return success(storeSaleDetailService.insertStoreSaleDetail(storeSaleDetail));
}
/**
@ -75,8 +75,8 @@ public class StoreSaleDetailController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:detail:edit')")
@Log(title = "档口销售明细", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody StoreSaleDetail storeSaleDetail) {
return toAjax(storeSaleDetailService.updateStoreSaleDetail(storeSaleDetail));
public R edit(@RequestBody StoreSaleDetail storeSaleDetail) {
return success(storeSaleDetailService.updateStoreSaleDetail(storeSaleDetail));
}
/**
@ -85,7 +85,7 @@ public class StoreSaleDetailController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:detail:remove')")
@Log(title = "档口销售明细", businessType = BusinessType.DELETE)
@DeleteMapping("/{storeSaleDetailIds}")
public AjaxResult remove(@PathVariable Long[] storeSaleDetailIds) {
return toAjax(storeSaleDetailService.deleteStoreSaleDetailByStoreSaleDetailIds(storeSaleDetailIds));
public R remove(@PathVariable Long[] storeSaleDetailIds) {
return success(storeSaleDetailService.deleteStoreSaleDetailByStoreSaleDetailIds(storeSaleDetailIds));
}
}

View File

@ -1,8 +1,8 @@
package com.ruoyi.web.controller.xkt;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.controller.XktBaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
@ -23,7 +23,7 @@ import java.util.List;
*/
@RestController
@RequestMapping("/rest/v1/sale-refund-records")
public class StoreSaleRefundRecordController extends BaseController {
public class StoreSaleRefundRecordController extends XktBaseController {
@Autowired
private IStoreSaleRefundRecordService storeSaleRefundRecordService;
@ -55,7 +55,7 @@ public class StoreSaleRefundRecordController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('system:record:query')")
@GetMapping(value = "/{storeSaleRefundRecordId}")
public AjaxResult getInfo(@PathVariable("storeSaleRefundRecordId") Long storeSaleRefundRecordId) {
public R getInfo(@PathVariable("storeSaleRefundRecordId") Long storeSaleRefundRecordId) {
return success(storeSaleRefundRecordService.selectStoreSaleRefundRecordByStoreSaleRefundRecordId(storeSaleRefundRecordId));
}
@ -65,8 +65,8 @@ public class StoreSaleRefundRecordController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:record:add')")
@Log(title = "档口销售返单", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody StoreSaleRefundRecord storeSaleRefundRecord) {
return toAjax(storeSaleRefundRecordService.insertStoreSaleRefundRecord(storeSaleRefundRecord));
public R add(@RequestBody StoreSaleRefundRecord storeSaleRefundRecord) {
return success(storeSaleRefundRecordService.insertStoreSaleRefundRecord(storeSaleRefundRecord));
}
/**
@ -75,8 +75,8 @@ public class StoreSaleRefundRecordController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:record:edit')")
@Log(title = "档口销售返单", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody StoreSaleRefundRecord storeSaleRefundRecord) {
return toAjax(storeSaleRefundRecordService.updateStoreSaleRefundRecord(storeSaleRefundRecord));
public R edit(@RequestBody StoreSaleRefundRecord storeSaleRefundRecord) {
return success(storeSaleRefundRecordService.updateStoreSaleRefundRecord(storeSaleRefundRecord));
}
/**
@ -85,7 +85,7 @@ public class StoreSaleRefundRecordController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:record:remove')")
@Log(title = "档口销售返单", businessType = BusinessType.DELETE)
@DeleteMapping("/{storeSaleRefundRecordIds}")
public AjaxResult remove(@PathVariable Long[] storeSaleRefundRecordIds) {
return toAjax(storeSaleRefundRecordService.deleteStoreSaleRefundRecordByStoreSaleRefundRecordIds(storeSaleRefundRecordIds));
public R remove(@PathVariable Long[] storeSaleRefundRecordIds) {
return success(storeSaleRefundRecordService.deleteStoreSaleRefundRecordByStoreSaleRefundRecordIds(storeSaleRefundRecordIds));
}
}

View File

@ -1,8 +1,8 @@
package com.ruoyi.web.controller.xkt;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.controller.XktBaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
@ -23,7 +23,7 @@ import java.util.List;
*/
@RestController
@RequestMapping("/rest/v1/files")
public class SysFileController extends BaseController {
public class SysFileController extends XktBaseController {
@Autowired
private ISysFileService sysFileService;
@ -55,7 +55,7 @@ public class SysFileController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('system:file:query')")
@GetMapping(value = "/{fileId}")
public AjaxResult getInfo(@PathVariable("fileId") Long fileId) {
public R getInfo(@PathVariable("fileId") Long fileId) {
return success(sysFileService.selectSysFileByFileId(fileId));
}
@ -65,8 +65,8 @@ public class SysFileController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:file:add')")
@Log(title = "file", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody SysFile sysFile) {
return toAjax(sysFileService.insertSysFile(sysFile));
public R add(@RequestBody SysFile sysFile) {
return success(sysFileService.insertSysFile(sysFile));
}
/**
@ -75,8 +75,8 @@ public class SysFileController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:file:edit')")
@Log(title = "file", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody SysFile sysFile) {
return toAjax(sysFileService.updateSysFile(sysFile));
public R edit(@RequestBody SysFile sysFile) {
return success(sysFileService.updateSysFile(sysFile));
}
/**
@ -85,7 +85,7 @@ public class SysFileController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:file:remove')")
@Log(title = "file", businessType = BusinessType.DELETE)
@DeleteMapping("/{fileIds}")
public AjaxResult remove(@PathVariable Long[] fileIds) {
return toAjax(sysFileService.deleteSysFileByFileIds(fileIds));
public R remove(@PathVariable Long[] fileIds) {
return success(sysFileService.deleteSysFileByFileIds(fileIds));
}
}

View File

@ -1,8 +1,8 @@
package com.ruoyi.web.controller.xkt;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.controller.XktBaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
@ -23,7 +23,7 @@ import java.util.List;
*/
@RestController
@RequestMapping("/rest/v1/user-accs")
public class UserAccountController extends BaseController {
public class UserAccountController extends XktBaseController {
@Autowired
private IUserAccountService userAccountService;
@ -55,7 +55,7 @@ public class UserAccountController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('system:account:query')")
@GetMapping(value = "/{userAccId}")
public AjaxResult getInfo(@PathVariable("userAccId") Long userAccId) {
public R getInfo(@PathVariable("userAccId") Long userAccId) {
return success(userAccountService.selectUserAccountByUserAccId(userAccId));
}
@ -65,8 +65,8 @@ public class UserAccountController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:account:add')")
@Log(title = "用户账户(支付宝、微信等)", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody UserAccount userAccount) {
return toAjax(userAccountService.insertUserAccount(userAccount));
public R add(@RequestBody UserAccount userAccount) {
return success(userAccountService.insertUserAccount(userAccount));
}
/**
@ -75,8 +75,8 @@ public class UserAccountController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:account:edit')")
@Log(title = "用户账户(支付宝、微信等)", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody UserAccount userAccount) {
return toAjax(userAccountService.updateUserAccount(userAccount));
public R edit(@RequestBody UserAccount userAccount) {
return success(userAccountService.updateUserAccount(userAccount));
}
/**
@ -85,7 +85,7 @@ public class UserAccountController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:account:remove')")
@Log(title = "用户账户(支付宝、微信等)", businessType = BusinessType.DELETE)
@DeleteMapping("/{userAccIds}")
public AjaxResult remove(@PathVariable Long[] userAccIds) {
return toAjax(userAccountService.deleteUserAccountByUserAccIds(userAccIds));
public R remove(@PathVariable Long[] userAccIds) {
return success(userAccountService.deleteUserAccountByUserAccIds(userAccIds));
}
}

View File

@ -1,8 +1,8 @@
package com.ruoyi.web.controller.xkt;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.controller.XktBaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
@ -23,7 +23,7 @@ import java.util.List;
*/
@RestController
@RequestMapping("/rest/v1/user-addrs")
public class UserAddressController extends BaseController {
public class UserAddressController extends XktBaseController {
@Autowired
private IUserAddressService userAddressService;
@ -55,7 +55,7 @@ public class UserAddressController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('system:address:query')")
@GetMapping(value = "/{userAddrId}")
public AjaxResult getInfo(@PathVariable("userAddrId") Long userAddrId) {
public R getInfo(@PathVariable("userAddrId") Long userAddrId) {
return success(userAddressService.selectUserAddressByUserAddrId(userAddrId));
}
@ -65,8 +65,8 @@ public class UserAddressController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:address:add')")
@Log(title = "用户收货地址", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody UserAddress userAddress) {
return toAjax(userAddressService.insertUserAddress(userAddress));
public R add(@RequestBody UserAddress userAddress) {
return success(userAddressService.insertUserAddress(userAddress));
}
/**
@ -75,8 +75,8 @@ public class UserAddressController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:address:edit')")
@Log(title = "用户收货地址", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody UserAddress userAddress) {
return toAjax(userAddressService.updateUserAddress(userAddress));
public R edit(@RequestBody UserAddress userAddress) {
return success(userAddressService.updateUserAddress(userAddress));
}
/**
@ -85,7 +85,7 @@ public class UserAddressController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:address:remove')")
@Log(title = "用户收货地址", businessType = BusinessType.DELETE)
@DeleteMapping("/{userAddrIds}")
public AjaxResult remove(@PathVariable Long[] userAddrIds) {
return toAjax(userAddressService.deleteUserAddressByUserAddrIds(userAddrIds));
public R remove(@PathVariable Long[] userAddrIds) {
return success(userAddressService.deleteUserAddressByUserAddrIds(userAddrIds));
}
}

View File

@ -1,8 +1,8 @@
package com.ruoyi.web.controller.xkt;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.controller.XktBaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
@ -23,7 +23,7 @@ import java.util.List;
*/
@RestController
@RequestMapping("/rest/v1/user-auths")
public class UserAuthenticationController extends BaseController {
public class UserAuthenticationController extends XktBaseController {
@Autowired
private IUserAuthenticationService userAuthenticationService;
@ -55,7 +55,7 @@ public class UserAuthenticationController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('system:authentication:query')")
@GetMapping(value = "/{userAuthId}")
public AjaxResult getInfo(@PathVariable("userAuthId") Long userAuthId) {
public R getInfo(@PathVariable("userAuthId") Long userAuthId) {
return success(userAuthenticationService.selectUserAuthenticationByUserAuthId(userAuthId));
}
@ -65,8 +65,8 @@ public class UserAuthenticationController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:authentication:add')")
@Log(title = "用户代发认证", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody UserAuthentication userAuthentication) {
return toAjax(userAuthenticationService.insertUserAuthentication(userAuthentication));
public R add(@RequestBody UserAuthentication userAuthentication) {
return success(userAuthenticationService.insertUserAuthentication(userAuthentication));
}
/**
@ -75,8 +75,8 @@ public class UserAuthenticationController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:authentication:edit')")
@Log(title = "用户代发认证", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody UserAuthentication userAuthentication) {
return toAjax(userAuthenticationService.updateUserAuthentication(userAuthentication));
public R edit(@RequestBody UserAuthentication userAuthentication) {
return success(userAuthenticationService.updateUserAuthentication(userAuthentication));
}
/**
@ -85,7 +85,7 @@ public class UserAuthenticationController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:authentication:remove')")
@Log(title = "用户代发认证", businessType = BusinessType.DELETE)
@DeleteMapping("/{userAuthIds}")
public AjaxResult remove(@PathVariable Long[] userAuthIds) {
return toAjax(userAuthenticationService.deleteUserAuthenticationByUserAuthIds(userAuthIds));
public R remove(@PathVariable Long[] userAuthIds) {
return success(userAuthenticationService.deleteUserAuthenticationByUserAuthIds(userAuthIds));
}
}

View File

@ -1,8 +1,8 @@
package com.ruoyi.web.controller.xkt;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.controller.XktBaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
@ -23,7 +23,7 @@ import java.util.List;
*/
@RestController
@RequestMapping("/rest/v1/user-bill-stats")
public class UserBillingStatementController extends BaseController {
public class UserBillingStatementController extends XktBaseController {
@Autowired
private IUserBillingStatementService userBillingStatementService;
@ -55,7 +55,7 @@ public class UserBillingStatementController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('system:statement:query')")
@GetMapping(value = "/{userBillStatId}")
public AjaxResult getInfo(@PathVariable("userBillStatId") Long userBillStatId) {
public R getInfo(@PathVariable("userBillStatId") Long userBillStatId) {
return success(userBillingStatementService.selectUserBillingStatementByUserBillStatId(userBillStatId));
}
@ -65,8 +65,8 @@ public class UserBillingStatementController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:statement:add')")
@Log(title = "用户对账明细", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody UserBillingStatement userBillingStatement) {
return toAjax(userBillingStatementService.insertUserBillingStatement(userBillingStatement));
public R add(@RequestBody UserBillingStatement userBillingStatement) {
return success(userBillingStatementService.insertUserBillingStatement(userBillingStatement));
}
/**
@ -75,8 +75,8 @@ public class UserBillingStatementController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:statement:edit')")
@Log(title = "用户对账明细", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody UserBillingStatement userBillingStatement) {
return toAjax(userBillingStatementService.updateUserBillingStatement(userBillingStatement));
public R edit(@RequestBody UserBillingStatement userBillingStatement) {
return success(userBillingStatementService.updateUserBillingStatement(userBillingStatement));
}
/**
@ -85,7 +85,7 @@ public class UserBillingStatementController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:statement:remove')")
@Log(title = "用户对账明细", businessType = BusinessType.DELETE)
@DeleteMapping("/{userBillStatIds}")
public AjaxResult remove(@PathVariable Long[] userBillStatIds) {
return toAjax(userBillingStatementService.deleteUserBillingStatementByUserBillStatIds(userBillStatIds));
public R remove(@PathVariable Long[] userBillStatIds) {
return success(userBillingStatementService.deleteUserBillingStatementByUserBillStatIds(userBillStatIds));
}
}

View File

@ -1,8 +1,8 @@
package com.ruoyi.web.controller.xkt;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.controller.XktBaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
@ -23,7 +23,7 @@ import java.util.List;
*/
@RestController
@RequestMapping("/rest/v1/user-brow-hises")
public class UserBrowsingHistoryController extends BaseController {
public class UserBrowsingHistoryController extends XktBaseController {
@Autowired
private IUserBrowsingHistoryService userBrowsingHistoryService;
@ -55,7 +55,7 @@ public class UserBrowsingHistoryController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('system:history:query')")
@GetMapping(value = "/{userBrowHisId}")
public AjaxResult getInfo(@PathVariable("userBrowHisId") Long userBrowHisId) {
public R getInfo(@PathVariable("userBrowHisId") Long userBrowHisId) {
return success(userBrowsingHistoryService.selectUserBrowsingHistoryByUserBrowHisId(userBrowHisId));
}
@ -65,8 +65,8 @@ public class UserBrowsingHistoryController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:history:add')")
@Log(title = "用户浏览历史", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody UserBrowsingHistory userBrowsingHistory) {
return toAjax(userBrowsingHistoryService.insertUserBrowsingHistory(userBrowsingHistory));
public R add(@RequestBody UserBrowsingHistory userBrowsingHistory) {
return success(userBrowsingHistoryService.insertUserBrowsingHistory(userBrowsingHistory));
}
/**
@ -75,8 +75,8 @@ public class UserBrowsingHistoryController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:history:edit')")
@Log(title = "用户浏览历史", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody UserBrowsingHistory userBrowsingHistory) {
return toAjax(userBrowsingHistoryService.updateUserBrowsingHistory(userBrowsingHistory));
public R edit(@RequestBody UserBrowsingHistory userBrowsingHistory) {
return success(userBrowsingHistoryService.updateUserBrowsingHistory(userBrowsingHistory));
}
/**
@ -85,7 +85,7 @@ public class UserBrowsingHistoryController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:history:remove')")
@Log(title = "用户浏览历史", businessType = BusinessType.DELETE)
@DeleteMapping("/{userBrowHisIds}")
public AjaxResult remove(@PathVariable Long[] userBrowHisIds) {
return toAjax(userBrowsingHistoryService.deleteUserBrowsingHistoryByUserBrowHisIds(userBrowHisIds));
public R remove(@PathVariable Long[] userBrowHisIds) {
return success(userBrowsingHistoryService.deleteUserBrowsingHistoryByUserBrowHisIds(userBrowHisIds));
}
}

View File

@ -1,8 +1,8 @@
package com.ruoyi.web.controller.xkt;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.controller.XktBaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
@ -23,7 +23,7 @@ import java.util.List;
*/
@RestController
@RequestMapping("/rest/v1/user-faves")
public class UserFavoritesController extends BaseController {
public class UserFavoritesController extends XktBaseController {
@Autowired
private IUserFavoritesService userFavoritesService;
@ -55,7 +55,7 @@ public class UserFavoritesController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('system:favorites:query')")
@GetMapping(value = "/{userFavoId}")
public AjaxResult getInfo(@PathVariable("userFavoId") Long userFavoId) {
public R getInfo(@PathVariable("userFavoId") Long userFavoId) {
return success(userFavoritesService.selectUserFavoritesByUserFavoId(userFavoId));
}
@ -65,8 +65,8 @@ public class UserFavoritesController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:favorites:add')")
@Log(title = "用户收藏商品", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody UserFavorites userFavorites) {
return toAjax(userFavoritesService.insertUserFavorites(userFavorites));
public R add(@RequestBody UserFavorites userFavorites) {
return success(userFavoritesService.insertUserFavorites(userFavorites));
}
/**
@ -75,8 +75,8 @@ public class UserFavoritesController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:favorites:edit')")
@Log(title = "用户收藏商品", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody UserFavorites userFavorites) {
return toAjax(userFavoritesService.updateUserFavorites(userFavorites));
public R edit(@RequestBody UserFavorites userFavorites) {
return success(userFavoritesService.updateUserFavorites(userFavorites));
}
/**
@ -85,7 +85,7 @@ public class UserFavoritesController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:favorites:remove')")
@Log(title = "用户收藏商品", businessType = BusinessType.DELETE)
@DeleteMapping("/{userFavoIds}")
public AjaxResult remove(@PathVariable Long[] userFavoIds) {
return toAjax(userFavoritesService.deleteUserFavoritesByUserFavoIds(userFavoIds));
public R remove(@PathVariable Long[] userFavoIds) {
return success(userFavoritesService.deleteUserFavoritesByUserFavoIds(userFavoIds));
}
}

View File

@ -1,8 +1,8 @@
package com.ruoyi.web.controller.xkt;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.controller.XktBaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
@ -23,7 +23,7 @@ import java.util.List;
*/
@RestController
@RequestMapping("/rest/v1/user-notices")
public class UserNoticeController extends BaseController {
public class UserNoticeController extends XktBaseController {
@Autowired
private IUserNoticeService userNoticeService;
@ -55,7 +55,7 @@ public class UserNoticeController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('system:notice:query')")
@GetMapping(value = "/{userNoticeId}")
public AjaxResult getInfo(@PathVariable("userNoticeId") Long userNoticeId) {
public R getInfo(@PathVariable("userNoticeId") Long userNoticeId) {
return success(userNoticeService.selectUserNoticeByUserNoticeId(userNoticeId));
}
@ -65,8 +65,8 @@ public class UserNoticeController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:notice:add')")
@Log(title = "用户所有通知", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody UserNotice userNotice) {
return toAjax(userNoticeService.insertUserNotice(userNotice));
public R add(@RequestBody UserNotice userNotice) {
return success(userNoticeService.insertUserNotice(userNotice));
}
/**
@ -75,8 +75,8 @@ public class UserNoticeController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:notice:edit')")
@Log(title = "用户所有通知", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody UserNotice userNotice) {
return toAjax(userNoticeService.updateUserNotice(userNotice));
public R edit(@RequestBody UserNotice userNotice) {
return success(userNoticeService.updateUserNotice(userNotice));
}
/**
@ -85,7 +85,7 @@ public class UserNoticeController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:notice:remove')")
@Log(title = "用户所有通知", businessType = BusinessType.DELETE)
@DeleteMapping("/{userNoticeIds}")
public AjaxResult remove(@PathVariable Long[] userNoticeIds) {
return toAjax(userNoticeService.deleteUserNoticeByUserNoticeIds(userNoticeIds));
public R remove(@PathVariable Long[] userNoticeIds) {
return success(userNoticeService.deleteUserNoticeByUserNoticeIds(userNoticeIds));
}
}

View File

@ -1,8 +1,8 @@
package com.ruoyi.web.controller.xkt;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.controller.XktBaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
@ -23,7 +23,7 @@ import java.util.List;
*/
@RestController
@RequestMapping("/rest/v1/user-notice-settings")
public class UserNoticeSettingController extends BaseController {
public class UserNoticeSettingController extends XktBaseController {
@Autowired
private IUserNoticeSettingService userNoticeSettingService;
@ -55,7 +55,7 @@ public class UserNoticeSettingController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('system:setting:query')")
@GetMapping(value = "/{userNoticeSetId}")
public AjaxResult getInfo(@PathVariable("userNoticeSetId") Long userNoticeSetId) {
public R getInfo(@PathVariable("userNoticeSetId") Long userNoticeSetId) {
return success(userNoticeSettingService.selectUserNoticeSettingByUserNoticeSetId(userNoticeSetId));
}
@ -65,8 +65,8 @@ public class UserNoticeSettingController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:setting:add')")
@Log(title = "用户通知接收设置", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody UserNoticeSetting userNoticeSetting) {
return toAjax(userNoticeSettingService.insertUserNoticeSetting(userNoticeSetting));
public R add(@RequestBody UserNoticeSetting userNoticeSetting) {
return success(userNoticeSettingService.insertUserNoticeSetting(userNoticeSetting));
}
/**
@ -75,8 +75,8 @@ public class UserNoticeSettingController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:setting:edit')")
@Log(title = "用户通知接收设置", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody UserNoticeSetting userNoticeSetting) {
return toAjax(userNoticeSettingService.updateUserNoticeSetting(userNoticeSetting));
public R edit(@RequestBody UserNoticeSetting userNoticeSetting) {
return success(userNoticeSettingService.updateUserNoticeSetting(userNoticeSetting));
}
/**
@ -85,7 +85,7 @@ public class UserNoticeSettingController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:setting:remove')")
@Log(title = "用户通知接收设置", businessType = BusinessType.DELETE)
@DeleteMapping("/{userNoticeSetIds}")
public AjaxResult remove(@PathVariable Long[] userNoticeSetIds) {
return toAjax(userNoticeSettingService.deleteUserNoticeSettingByUserNoticeSetIds(userNoticeSetIds));
public R remove(@PathVariable Long[] userNoticeSetIds) {
return success(userNoticeSettingService.deleteUserNoticeSettingByUserNoticeSetIds(userNoticeSetIds));
}
}

View File

@ -1,8 +1,8 @@
package com.ruoyi.web.controller.xkt;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.controller.XktBaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
@ -23,7 +23,7 @@ import java.util.List;
*/
@RestController
@RequestMapping("/rest/v1/user-quick-funcs")
public class UserQuickFunctionController extends BaseController {
public class UserQuickFunctionController extends XktBaseController {
@Autowired
private IUserQuickFunctionService userQuickFunctionService;
@ -55,7 +55,7 @@ public class UserQuickFunctionController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('system:function:query')")
@GetMapping(value = "/{userQuickFuncId}")
public AjaxResult getInfo(@PathVariable("userQuickFuncId") Long userQuickFuncId) {
public R getInfo(@PathVariable("userQuickFuncId") Long userQuickFuncId) {
return success(userQuickFunctionService.selectUserQuickFunctionByUserQuickFuncId(userQuickFuncId));
}
@ -65,8 +65,8 @@ public class UserQuickFunctionController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:function:add')")
@Log(title = "用户快捷功能", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody UserQuickFunction userQuickFunction) {
return toAjax(userQuickFunctionService.insertUserQuickFunction(userQuickFunction));
public R add(@RequestBody UserQuickFunction userQuickFunction) {
return success(userQuickFunctionService.insertUserQuickFunction(userQuickFunction));
}
/**
@ -75,8 +75,8 @@ public class UserQuickFunctionController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:function:edit')")
@Log(title = "用户快捷功能", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody UserQuickFunction userQuickFunction) {
return toAjax(userQuickFunctionService.updateUserQuickFunction(userQuickFunction));
public R edit(@RequestBody UserQuickFunction userQuickFunction) {
return success(userQuickFunctionService.updateUserQuickFunction(userQuickFunction));
}
/**
@ -85,7 +85,7 @@ public class UserQuickFunctionController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:function:remove')")
@Log(title = "用户快捷功能", businessType = BusinessType.DELETE)
@DeleteMapping("/{userQuickFuncIds}")
public AjaxResult remove(@PathVariable Long[] userQuickFuncIds) {
return toAjax(userQuickFunctionService.deleteUserQuickFunctionByUserQuickFuncIds(userQuickFuncIds));
public R remove(@PathVariable Long[] userQuickFuncIds) {
return success(userQuickFunctionService.deleteUserQuickFunctionByUserQuickFuncIds(userQuickFuncIds));
}
}

View File

@ -1,8 +1,8 @@
package com.ruoyi.web.controller.xkt;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.controller.XktBaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
@ -23,7 +23,7 @@ import java.util.List;
*/
@RestController
@RequestMapping("/rest/v1/user-carts")
public class UserShoppingCartController extends BaseController {
public class UserShoppingCartController extends XktBaseController {
@Autowired
private IUserShoppingCartService userShoppingCartService;
@ -55,7 +55,7 @@ public class UserShoppingCartController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('system:cart:query')")
@GetMapping(value = "/{userShopCartId}")
public AjaxResult getInfo(@PathVariable("userShopCartId") Long userShopCartId) {
public R getInfo(@PathVariable("userShopCartId") Long userShopCartId) {
return success(userShoppingCartService.selectUserShoppingCartByUserShopCartId(userShopCartId));
}
@ -65,8 +65,8 @@ public class UserShoppingCartController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:cart:add')")
@Log(title = "用户进货车", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody UserShoppingCart userShoppingCart) {
return toAjax(userShoppingCartService.insertUserShoppingCart(userShoppingCart));
public R add(@RequestBody UserShoppingCart userShoppingCart) {
return success(userShoppingCartService.insertUserShoppingCart(userShoppingCart));
}
/**
@ -75,8 +75,8 @@ public class UserShoppingCartController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:cart:edit')")
@Log(title = "用户进货车", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody UserShoppingCart userShoppingCart) {
return toAjax(userShoppingCartService.updateUserShoppingCart(userShoppingCart));
public R edit(@RequestBody UserShoppingCart userShoppingCart) {
return success(userShoppingCartService.updateUserShoppingCart(userShoppingCart));
}
/**
@ -85,7 +85,7 @@ public class UserShoppingCartController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:cart:remove')")
@Log(title = "用户进货车", businessType = BusinessType.DELETE)
@DeleteMapping("/{userShopCartIds}")
public AjaxResult remove(@PathVariable Long[] userShopCartIds) {
return toAjax(userShoppingCartService.deleteUserShoppingCartByUserShopCartIds(userShopCartIds));
public R remove(@PathVariable Long[] userShopCartIds) {
return success(userShoppingCartService.deleteUserShoppingCartByUserShopCartIds(userShopCartIds));
}
}

View File

@ -1,8 +1,8 @@
package com.ruoyi.web.controller.xkt;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.controller.XktBaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
@ -23,7 +23,7 @@ import java.util.List;
*/
@RestController
@RequestMapping("/rest/v1/user-subs")
public class UserSubscriptionsController extends BaseController {
public class UserSubscriptionsController extends XktBaseController {
@Autowired
private IUserSubscriptionsService userSubscriptionsService;
@ -55,7 +55,7 @@ public class UserSubscriptionsController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('system:subscriptions:query')")
@GetMapping(value = "/{userSubsId}")
public AjaxResult getInfo(@PathVariable("userSubsId") Long userSubsId) {
public R getInfo(@PathVariable("userSubsId") Long userSubsId) {
return success(userSubscriptionsService.selectUserSubscriptionsByUserSubsId(userSubsId));
}
@ -65,8 +65,8 @@ public class UserSubscriptionsController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:subscriptions:add')")
@Log(title = "用户关注u档口", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody UserSubscriptions userSubscriptions) {
return toAjax(userSubscriptionsService.insertUserSubscriptions(userSubscriptions));
public R add(@RequestBody UserSubscriptions userSubscriptions) {
return success(userSubscriptionsService.insertUserSubscriptions(userSubscriptions));
}
/**
@ -75,8 +75,8 @@ public class UserSubscriptionsController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:subscriptions:edit')")
@Log(title = "用户关注u档口", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody UserSubscriptions userSubscriptions) {
return toAjax(userSubscriptionsService.updateUserSubscriptions(userSubscriptions));
public R edit(@RequestBody UserSubscriptions userSubscriptions) {
return success(userSubscriptionsService.updateUserSubscriptions(userSubscriptions));
}
/**
@ -85,7 +85,7 @@ public class UserSubscriptionsController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:subscriptions:remove')")
@Log(title = "用户关注u档口", businessType = BusinessType.DELETE)
@DeleteMapping("/{userSubsIds}")
public AjaxResult remove(@PathVariable Long[] userSubsIds) {
return toAjax(userSubscriptionsService.deleteUserSubscriptionsByUserSubsIds(userSubsIds));
public R remove(@PathVariable Long[] userSubsIds) {
return success(userSubscriptionsService.deleteUserSubscriptionsByUserSubsIds(userSubsIds));
}
}

View File

@ -0,0 +1,46 @@
package com.ruoyi.web.controller.xkt.vo.storeProduct;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
* @author liujiang
* @version v1.0
* @date 2025/3/27 15:12
*/
@ApiModel("创建档口商品")
@Data
public class StoreProdVO {
@ApiModelProperty("档口商品名称")
private String prodName;
@ApiModelProperty(name = "商品分类ID")
private Long prodCateId;
@ApiModelProperty(name = "工厂货号")
private String factoryArtNum;
@ApiModelProperty(name = "商品货号")
private String prodArtNum;
@ApiModelProperty(name = "商品标题")
private String prodTitle;
@ApiModelProperty(name = "商品重量")
private BigDecimal prodWeight;
@ApiModelProperty(name = "生产价格")
private Integer producePrice;
@ApiModelProperty(name = "大小码加价")
private Integer overPrice;
@ApiModelProperty(name = "发货时效")
private Integer deliveryTime;
@ApiModelProperty(name = "上架方式")
private Long listingWay;
@ApiModelProperty(name = "下一个生成的条形码尾号")
private Integer nextBarcodeNum;
@ApiModelProperty(name = "定时发货时间(精确到小时)")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
private Date listingWaySchedule;
}

View File

@ -140,6 +140,13 @@
<artifactId>javax.servlet-api</artifactId>
</dependency>
<!--深拷贝-->
<dependency>
<groupId>com.github.dozermapper</groupId>
<artifactId>dozer-core</artifactId>
<version>6.1.0</version>
</dependency>
</dependencies>
</project>

View File

@ -1,12 +1,5 @@
package com.ruoyi.common.core.controller;
import java.beans.PropertyEditorSupport;
import java.util.Date;
import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.web.bind.WebDataBinder;
import org.springframework.web.bind.annotation.InitBinder;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.ruoyi.common.constant.HttpStatus;
@ -20,28 +13,32 @@ import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.sql.SqlUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.web.bind.WebDataBinder;
import org.springframework.web.bind.annotation.InitBinder;
import java.beans.PropertyEditorSupport;
import java.util.Date;
import java.util.List;
/**
* web
*
*
* @author ruoyi
*/
public class BaseController
{
public class BaseController {
protected final Logger logger = LoggerFactory.getLogger(this.getClass());
/**
* Date
*/
@InitBinder
public void initBinder(WebDataBinder binder)
{
public void initBinder(WebDataBinder binder) {
// Date 类型转换
binder.registerCustomEditor(Date.class, new PropertyEditorSupport()
{
binder.registerCustomEditor(Date.class, new PropertyEditorSupport() {
@Override
public void setAsText(String text)
{
public void setAsText(String text) {
setValue(DateUtils.parseDate(text));
}
});
@ -50,19 +47,16 @@ public class BaseController
/**
*
*/
protected void startPage()
{
protected void startPage() {
PageUtils.startPage();
}
/**
*
*/
protected void startOrderBy()
{
protected void startOrderBy() {
PageDomain pageDomain = TableSupport.buildPageRequest();
if (StringUtils.isNotEmpty(pageDomain.getOrderBy()))
{
if (StringUtils.isNotEmpty(pageDomain.getOrderBy())) {
String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
PageHelper.orderBy(orderBy);
}
@ -71,17 +65,15 @@ public class BaseController
/**
* 线
*/
protected void clearPage()
{
protected void clearPage() {
PageUtils.clearPage();
}
/**
*
*/
@SuppressWarnings({ "rawtypes", "unchecked" })
protected TableDataInfo getDataTable(List<?> list)
{
@SuppressWarnings({"rawtypes", "unchecked"})
protected TableDataInfo getDataTable(List<?> list) {
TableDataInfo rspData = new TableDataInfo();
rspData.setCode(HttpStatus.SUCCESS);
rspData.setMsg("查询成功");
@ -93,110 +85,97 @@ public class BaseController
/**
*
*/
public AjaxResult success()
{
public AjaxResult success() {
return AjaxResult.success();
}
/**
*
*/
public AjaxResult error()
{
public AjaxResult error() {
return AjaxResult.error();
}
/**
*
*/
public AjaxResult success(String message)
{
public AjaxResult success(String message) {
return AjaxResult.success(message);
}
/**
*
*/
public AjaxResult success(Object data)
{
public AjaxResult success(Object data) {
return AjaxResult.success(data);
}
/**
*
*/
public AjaxResult error(String message)
{
public AjaxResult error(String message) {
return AjaxResult.error(message);
}
/**
*
*/
public AjaxResult warn(String message)
{
public AjaxResult warn(String message) {
return AjaxResult.warn(message);
}
/**
*
*
*
* @param rows
* @return
*/
protected AjaxResult toAjax(int rows)
{
protected AjaxResult toAjax(int rows) {
return rows > 0 ? AjaxResult.success() : AjaxResult.error();
}
/**
*
*
*
* @param result
* @return
*/
protected AjaxResult toAjax(boolean result)
{
protected AjaxResult toAjax(boolean result) {
return result ? success() : error();
}
/**
*
*/
public String redirect(String url)
{
public String redirect(String url) {
return StringUtils.format("redirect:{}", url);
}
/**
*
*/
public LoginUser getLoginUser()
{
public LoginUser getLoginUser() {
return SecurityUtils.getLoginUser();
}
/**
* id
*/
public Long getUserId()
{
public Long getUserId() {
return getLoginUser().getUserId();
}
/**
* id
*/
public Long getDeptId()
{
public Long getDeptId() {
return getLoginUser().getDeptId();
}
/**
*
*/
public String getUsername()
{
public String getUsername() {
return getLoginUser().getUsername();
}
}

View File

@ -0,0 +1,175 @@
package com.ruoyi.common.core.controller;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.page.PageDomain;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.page.TableSupport;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.sql.SqlUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.web.bind.WebDataBinder;
import org.springframework.web.bind.annotation.InitBinder;
import java.beans.PropertyEditorSupport;
import java.util.Date;
import java.util.List;
/**
* web
*
* @author ruoyi
*/
public class XktBaseController {
protected final Logger logger = LoggerFactory.getLogger(this.getClass());
/**
* Date
*/
@InitBinder
public void initBinder(WebDataBinder binder) {
// Date 类型转换
binder.registerCustomEditor(Date.class, new PropertyEditorSupport() {
@Override
public void setAsText(String text) {
setValue(DateUtils.parseDate(text));
}
});
}
/**
*
*/
protected void startPage() {
PageUtils.startPage();
}
/**
*
*/
protected void startOrderBy() {
PageDomain pageDomain = TableSupport.buildPageRequest();
if (StringUtils.isNotEmpty(pageDomain.getOrderBy())) {
String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
PageHelper.orderBy(orderBy);
}
}
/**
* 线
*/
protected void clearPage() {
PageUtils.clearPage();
}
/**
*
*/
@SuppressWarnings({"rawtypes", "unchecked"})
protected TableDataInfo getDataTable(List<?> list) {
TableDataInfo rspData = new TableDataInfo();
rspData.setCode(HttpStatus.SUCCESS);
rspData.setMsg("查询成功");
rspData.setRows(list);
rspData.setTotal(new PageInfo(list).getTotal());
return rspData;
}
/**
*
*/
public R success() {
return R.ok();
}
/**
*
*/
public R error() {
return R.fail();
}
/**
*
*/
public R success(String message) {
return R.ok(message);
}
/**
*
*/
public R success(Object data) {
return R.ok(data);
}
/**
*
*/
public R error(String message) {
return R.fail(message);
}
/**
*
*
* @param rows
* @return
*/
protected R response(int rows) {
return rows > 0 ? R.ok() : R.fail();
}
/**
*
*
* @param result
* @return
*/
protected R response(boolean result) {
return result ? success() : error();
}
/**
*
*/
public String redirect(String url) {
return StringUtils.format("redirect:{}", url);
}
/**
*
*/
public LoginUser getLoginUser() {
return SecurityUtils.getLoginUser();
}
/**
* id
*/
public Long getUserId() {
return getLoginUser().getUserId();
}
/**
* id
*/
public Long getDeptId() {
return getLoginUser().getDeptId();
}
/**
*
*/
public String getUsername() {
return getLoginUser().getUsername();
}
}

View File

@ -0,0 +1,72 @@
package com.ruoyi.common.utils;
import org.dozer.DozerBeanMapperBuilder;
import org.dozer.Mapper;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.BeanWrapper;
import org.springframework.beans.BeanWrapperImpl;
import java.beans.FeatureDescriptor;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Stream;
/**
* @author Wenbo Huang
* @version 1.0
* @date 2021/3/31 10:35 AM
*/
public class BeansUtils {
/**
* default MAPPER without config
*/
private static final Mapper MAPPER = DozerBeanMapperBuilder.buildDefault();
/***
* @param listSrc Source object collection
* @param clazz Target object class type
*/
@SuppressWarnings("unchecked")
public static <TContent> List<TContent> convertList(List listSrc,
Class<TContent> clazz) {
List<TContent> listDes = new ArrayList<>();
if (listSrc.isEmpty()) {
return listDes;
}
listSrc.forEach(objSrc -> {
listDes.add(convertObject(objSrc, clazz));
});
return listDes;
}
/**
* Single object conversion
*
* @param content Source object
* @param clazz Target object class type
*/
public static <TContent> TContent convertObject(Object content,
Class<TContent> clazz) {
if (content == null) {
return null;
}
return MAPPER.map(content, clazz);
}
/**
* Exclude NUll value of source target
*
* @param source
* @param target
*/
public static void copyProperties(Object source, Object target) {
BeanWrapper wrappedSource = new BeanWrapperImpl(source);
String[] nullProperties = Stream.of(wrappedSource.getPropertyDescriptors())
.map(FeatureDescriptor::getName)
.filter(propertyName -> wrappedSource.getPropertyValue(propertyName) == null).toArray(String[]::new);
List<String> properties = new ArrayList<>();
properties.addAll(Arrays.asList(nullProperties));
BeanUtils.copyProperties(source, target, properties.toArray(new String[0]));
}
}

View File

@ -21,6 +21,20 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-framework</artifactId>
</dependency>
<!-- Swagger3依赖 -->
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-boot-starter</artifactId>
<version>${swagger.version}</version>
<exclusions>
<exclusion>
<groupId>io.swagger</groupId>
<artifactId>swagger-models</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</project>

View File

@ -105,7 +105,7 @@ public class StoreProduct extends BaseEntity {
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "单据日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date vroucherDate;
private Date voucherDate;
/**
*
@ -140,7 +140,7 @@ public class StoreProduct extends BaseEntity {
.append("listingWay", getListingWay())
.append("nextBarcodeNum", getNextBarcodeNum())
.append("listingWaySchedule", getListingWaySchedule())
.append("vroucherDate", getVroucherDate())
.append("voucherDate", getVoucherDate())
.append("prodStatus", getProdStatus())
.append("version", getVersion())
.append("delFlag", getDelFlag())

View File

@ -0,0 +1,46 @@
package com.ruoyi.xkt.dto.storeProduct;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
* @author liujiang
* @version v1.0
* @date 2025/3/27 15:12
*/
@ApiModel("创建档口商品")
@Data
public class StoreProdDTO {
@ApiModelProperty("档口商品名称")
private String prodName;
@ApiModelProperty(name = "商品分类ID")
private Long prodCateId;
@ApiModelProperty(name = "工厂货号")
private String factoryArtNum;
@ApiModelProperty(name = "商品货号")
private String prodArtNum;
@ApiModelProperty(name = "商品标题")
private String prodTitle;
@ApiModelProperty(name = "商品重量")
private BigDecimal prodWeight;
@ApiModelProperty(name = "生产价格")
private Integer producePrice;
@ApiModelProperty(name = "大小码加价")
private Integer overPrice;
@ApiModelProperty(name = "发货时效")
private Integer deliveryTime;
@ApiModelProperty(name = "上架方式")
private Long listingWay;
@ApiModelProperty(name = "下一个生成的条形码尾号")
private Integer nextBarcodeNum;
@ApiModelProperty(name = "定时发货时间(精确到小时)")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
private Date listingWaySchedule;
}

View File

@ -1,6 +1,7 @@
package com.ruoyi.xkt.service;
import com.ruoyi.xkt.domain.StoreProduct;
import com.ruoyi.xkt.dto.storeProduct.StoreProdDTO;
import java.util.List;
@ -33,7 +34,7 @@ public interface IStoreProductService {
* @param storeProduct
* @return
*/
public int insertStoreProduct(StoreProduct storeProduct);
public int insertStoreProduct(StoreProdDTO storeProdDTO);
/**
*

View File

@ -2,6 +2,7 @@ package com.ruoyi.xkt.service.impl;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.xkt.domain.StoreProduct;
import com.ruoyi.xkt.dto.storeProduct.StoreProdDTO;
import com.ruoyi.xkt.mapper.StoreProductMapper;
import com.ruoyi.xkt.service.IStoreProductService;
import org.springframework.beans.factory.annotation.Autowired;
@ -17,6 +18,7 @@ import java.util.List;
*/
@Service
public class StoreProductServiceImpl implements IStoreProductService {
@Autowired
private StoreProductMapper storeProductMapper;
@ -42,16 +44,12 @@ public class StoreProductServiceImpl implements IStoreProductService {
return storeProductMapper.selectStoreProductList(storeProduct);
}
/**
*
*
* @param storeProduct
* @return
*/
@Override
public int insertStoreProduct(StoreProduct storeProduct) {
storeProduct.setCreateTime(DateUtils.getNowDate());
return storeProductMapper.insertStoreProduct(storeProduct);
public int insertStoreProduct(StoreProdDTO storeProdDTO) {
// storeProduct.setCreateTime(DateUtils.getNowDate());
// return storeProductMapper.insertStoreProduct(storeProduct);
return 0;
}
/**