From d72cdefc313e6000c5f7f0ad37686fb63a7fbdbe Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 10 七月 2024 16:53:04 +0800
Subject: [PATCH] 提交
---
server/admin/src/main/java/com/doumee/api/business/ShopController.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/server/admin/src/main/java/com/doumee/api/business/ShopController.java b/server/admin/src/main/java/com/doumee/api/business/ShopController.java
index c31334a..1afee8f 100644
--- a/server/admin/src/main/java/com/doumee/api/business/ShopController.java
+++ b/server/admin/src/main/java/com/doumee/api/business/ShopController.java
@@ -109,18 +109,40 @@
})
@RequiresPermissions("business:shop:create")
public ApiResponse<String> importExcel (@ApiParam(value = "file") MultipartFile file ) {
+// Boolean importing = (Boolean) redisTemplate.opsForValue().get(Constants.RedisKeys.IMPORTING_SHOP);
+// if(importing!=null && importing){
+// throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝宸插瓨鍦ㄥ鍏ヤ换鍔℃鍦ㄦ墽琛屼腑锛岃绋嶅悗鍐嶈瘯锛�");
+// }
shopService.importBatch(file);
// shopService.dealShopNamePath();
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
- @ApiOperation(value = "缁勭粐Fcode涓�у寲淇℃伅瀵煎叆" ,notes = "缁勭粐淇℃伅鍒濆鍖栧鍏�")
+ @ApiOperation(value = "缁勭粐Fcode涓�у寲淇℃伅瀵煎叆" ,notes = "缁勭粐Fcode涓�у寲淇℃伅瀵煎叆")
@PostMapping("/importFcodeBatch")
@ApiImplicitParams({
@ApiImplicitParam(name = "file", value = "file", required = true, paramType = "query", dataType = "file", dataTypeClass = File.class),
})
@RequiresPermissions("business:shop:create")
public ApiResponse<String> importFcodeBatch (@ApiParam(value = "file") MultipartFile file ) {
+// Boolean importing = (Boolean) redisTemplate.opsForValue().get(Constants.RedisKeys.IMPORTING_SHOP);
+// if(importing!=null && importing){
+// throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝宸插瓨鍦ㄥ鍏ヤ换鍔℃鍦ㄦ墽琛屼腑锛岃绋嶅悗鍐嶈瘯锛�");
+// }
shopService.importFcodeBatch(file);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+ @ApiOperation(value = "缁勭粐鍝佺被鍒濆鍖栧鍏�" ,notes = "缁勭粐鍝佺被鍒濆鍖栧鍏�")
+ @PostMapping("/importCategoryBatch")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "file", value = "file", required = true, paramType = "query", dataType = "file", dataTypeClass = File.class),
+ })
+ @RequiresPermissions("business:shop:create")
+ public ApiResponse<String> importCategoryBatch (@ApiParam(value = "file") MultipartFile file ) {
+// Boolean importing = (Boolean) redisTemplate.opsForValue().get(Constants.RedisKeys.IMPORTING_SHOP);
+// if(importing!=null && importing){
+// throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝宸插瓨鍦ㄥ鍏ヤ换鍔℃鍦ㄦ墽琛屼腑锛岃绋嶅悗鍐嶈瘯锛�");
+// }
+ shopService.importCategoryBatch(file);
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
@ApiOperation(value = "閲嶇疆涓婁笅绾у叧绯�" ,notes = "閲嶇疆涓婁笅绾у叧绯�")
@@ -129,7 +151,7 @@
public ApiResponse<String> resetRelations ( ) {
Boolean importing = (Boolean) redisTemplate.opsForValue().get(Constants.RedisKeys.IMPORTING_SHOP);
if(importing!=null && importing){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝宸插瓨鍦ㄥ鍏ユ垨鑰呬笂涓嬬骇閲嶇疆浠诲姟姝ｅ湪鎵ц涓紝璇风◢鍚庡啀璇曪紒");
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝宸插瓨鍦ㄥ鍏ヤ换鍔℃鍦ㄦ墽琛屼腑锛岃绋嶅悗鍐嶈瘯锛�");
}
shopService.dealShopNamePath();
return ApiResponse.success("鎿嶄綔鎴愬姛");
--
Gitblit v1.9.3