From fbe4a03ed81a61bed4b7323c7ddb7e25c5a0e41f Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Wed, 8 Mar 2023 10:02:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E4=B8=AD=E5=BF=83=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E5=93=81=E7=89=8C=E3=80=81=E5=93=81=E7=B1=BB=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productinformation/ProductInformationFeign.java | 4 ++-- .../ProductInformationFeignFallback.java | 2 +- .../api/restrictedbrand/RestrictedBrandFeign.java | 4 ++-- .../restrictedbrand/RestrictedBrandFeignFallback.java | 2 +- .../restrictedcategory/RestrictedCategoryFeign.java | 4 ++-- .../RestrictedCategoryFeignFallback.java | 2 +- .../biz/productinformation/ProductInformationRest.java | 10 ++++++---- .../biz/restrictedbrand/RestrictedBrandRest.java | 10 ++++++---- .../biz/restrictedcategory/RestrictedCategoryRest.java | 10 ++++++---- 9 files changed, 27 insertions(+), 21 deletions(-) diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/productinformation/ProductInformationFeign.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/productinformation/ProductInformationFeign.java index 96b09f97..d6bfd310 100644 --- a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/productinformation/ProductInformationFeign.java +++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/productinformation/ProductInformationFeign.java @@ -65,9 +65,9 @@ public interface ProductInformationFeign { public ResultBean save(@RequestBody ProductInformationDto dto); @ApiOperation("根据sid删除记录") - @PostMapping("/delBySids") + @DeleteMapping("/delBySid/{sid}") @ResponseBody - public ResultBean delBySids(@RequestBody String[] sids); + public ResultBean delBySid(@PathVariable("sid")String sid); @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/productinformation/ProductInformationFeignFallback.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/productinformation/ProductInformationFeignFallback.java index 358ea9d4..5c5e2759 100644 --- a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/productinformation/ProductInformationFeignFallback.java +++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/productinformation/ProductInformationFeignFallback.java @@ -58,7 +58,7 @@ public class ProductInformationFeignFallback implements ProductInformationFeign } @Override - public ResultBean delBySids(String[] sids) { + public ResultBean delBySid(String sid) { return ResultBean.fireFail().setMsg("接口yxt_supervise/productinformation/delBySids无法访问"); } diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/restrictedbrand/RestrictedBrandFeign.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/restrictedbrand/RestrictedBrandFeign.java index 5034e5a5..14200786 100644 --- a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/restrictedbrand/RestrictedBrandFeign.java +++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/restrictedbrand/RestrictedBrandFeign.java @@ -65,9 +65,9 @@ public interface RestrictedBrandFeign { public ResultBean save(@RequestBody RestrictedBrandDto dto); @ApiOperation("根据sid删除记录") - @PostMapping("/delBySids") + @DeleteMapping("/delBySid/{sid}") @ResponseBody - public ResultBean delBySids(@RequestBody String[] sids); + public ResultBean delBySid(@PathVariable("sid")String sid); @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/restrictedbrand/RestrictedBrandFeignFallback.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/restrictedbrand/RestrictedBrandFeignFallback.java index f499b342..c67b057b 100644 --- a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/restrictedbrand/RestrictedBrandFeignFallback.java +++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/restrictedbrand/RestrictedBrandFeignFallback.java @@ -58,7 +58,7 @@ public class RestrictedBrandFeignFallback implements RestrictedBrandFeign { } @Override - public ResultBean delBySids(String[] sids) { + public ResultBean delBySid(String sid) { return ResultBean.fireFail().setMsg("接口yxt-supervise/restrictedbrand/delBySids无法访问"); } diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/restrictedcategory/RestrictedCategoryFeign.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/restrictedcategory/RestrictedCategoryFeign.java index 549b00a7..c522d419 100644 --- a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/restrictedcategory/RestrictedCategoryFeign.java +++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/restrictedcategory/RestrictedCategoryFeign.java @@ -65,9 +65,9 @@ public interface RestrictedCategoryFeign { public ResultBean save(@RequestBody RestrictedCategoryDto dto); @ApiOperation("根据sid删除记录") - @PostMapping("/delBySids") + @DeleteMapping("/delBySid/{sid}") @ResponseBody - public ResultBean delBySids(@RequestBody String[] sids); + public ResultBean delBySid(@PathVariable("sid")String sid); @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/restrictedcategory/RestrictedCategoryFeignFallback.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/restrictedcategory/RestrictedCategoryFeignFallback.java index 45b20210..1241f048 100644 --- a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/restrictedcategory/RestrictedCategoryFeignFallback.java +++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/restrictedcategory/RestrictedCategoryFeignFallback.java @@ -58,7 +58,7 @@ public class RestrictedCategoryFeignFallback implements RestrictedCategoryFeign } @Override - public ResultBean delBySids(String[] sids) { + public ResultBean delBySid(String sid) { return ResultBean.fireFail().setMsg("接口yxt-supervise/restrictedcategory/delBySids无法访问"); } diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/productinformation/ProductInformationRest.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/productinformation/ProductInformationRest.java index 0ce135b4..96f7a937 100644 --- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/productinformation/ProductInformationRest.java +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/productinformation/ProductInformationRest.java @@ -79,11 +79,13 @@ public class ProductInformationRest implements ProductInformationFeign { } @Override - @ApiOperation("根据sid批量删除") - @PostMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids) { + public ResultBean delBySid(String sid) { ResultBean rb = ResultBean.fireFail(); - productInformationService.delBySids(sids); + ProductInformation productInformation = productInformationService.fetchBySid(sid); + if(productInformation == null){ + return rb.setMsg("该商品档案不存在"); + } + productInformationService.deleteBySid(sid); return rb.success(); } diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/restrictedbrand/RestrictedBrandRest.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/restrictedbrand/RestrictedBrandRest.java index 2e04338c..dabcf36a 100644 --- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/restrictedbrand/RestrictedBrandRest.java +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/restrictedbrand/RestrictedBrandRest.java @@ -79,11 +79,13 @@ public class RestrictedBrandRest implements RestrictedBrandFeign { } @Override - @ApiOperation("根据sid批量删除") - @PostMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids) { + public ResultBean delBySid(String sid) { ResultBean rb = ResultBean.fireFail(); - restrictedBrandService.delBySids(sids); + RestrictedBrand restrictedBrand = restrictedBrandService.fetchBySid(sid); + if(restrictedBrand == null){ + return rb.setMsg("该监管品牌不存在"); + } + restrictedBrandService.deleteBySid(sid); return rb.success(); } diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/restrictedcategory/RestrictedCategoryRest.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/restrictedcategory/RestrictedCategoryRest.java index fe33adaf..a9b16f79 100644 --- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/restrictedcategory/RestrictedCategoryRest.java +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/restrictedcategory/RestrictedCategoryRest.java @@ -79,11 +79,13 @@ public class RestrictedCategoryRest implements RestrictedCategoryFeign { } @Override - @ApiOperation("根据sid批量删除") - @PostMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids) { + public ResultBean delBySid(String sid) { ResultBean rb = ResultBean.fireFail(); - restrictedCategoryService.delBySids(sids); + RestrictedCategory restrictedCategory = restrictedCategoryService.fetchBySid(sid); + if(restrictedCategory == null){ + return rb.setMsg("该监管类别不存在"); + } + restrictedCategoryService.deleteBySid(sid); return rb.success(); }