|
|
|
@@ -63,8 +63,9 @@ public class WxImportTemplateController extends BaseController { |
|
|
|
throw new MallinkException(Result.ERROR, "上传文件不能为空"); |
|
|
|
} |
|
|
|
//得到当前用户ID |
|
|
|
String typeStr = EnumImportType.getEnum(type).getMessage(); |
|
|
|
final MallUserInfo user = getUser(); |
|
|
|
String userId = type + "_" + user.getId(); |
|
|
|
String userId = typeStr + "_" + user.getId(); |
|
|
|
String importKey = Constant.importMemPrev + userId; |
|
|
|
final String tenantId = getTenantId(); |
|
|
|
|
|
|
|
@@ -145,8 +146,9 @@ public class WxImportTemplateController extends BaseController { |
|
|
|
|
|
|
|
@GetMapping("/queryTemplateCount") |
|
|
|
@SystemControllerLog(description = "导入数据查询") |
|
|
|
public ResultData queryTemplateCount(@RequestParam("type") MultipartFile type) { |
|
|
|
String importKey = Constant.importMemPrev + type + "_" + getUser().getId(); |
|
|
|
public ResultData queryTemplateCount(@RequestParam("type") Integer type) { |
|
|
|
String typeStr = EnumImportType.getEnum(type).getMessage(); |
|
|
|
String importKey = Constant.importMemPrev + typeStr + "_" + getUser().getId(); |
|
|
|
Map entries = stringRedisTemplate.opsForHash().entries(importKey); |
|
|
|
logger.info(JSONArray.toJSONString(entries) + ">>>>>>>>>>>>>>>>>>>>>1"); |
|
|
|
if (entries.size() < 4) { |
|
|
|
|