~api:导入:+log+锁主动释放;

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/manage/GoblinStoreMgtGoodsImportController.java

@@ -45,7 +45,8 @@ public class GoblinStoreMgtGoodsImportController {
         if (!goblinRedisUtils.hasStoreId(currentUid, storeId)) {
             return ResponseDto.failure(ErrorMapping.get("149002"));
         }
-        if (!goblinRedisUtils.redisUtil.lock(GoblinRedisConst.BASIC_GOODS_SKU.concat("lk").concat(storeId), 1, 30)) {
+        String lk = GoblinRedisConst.BASIC_GOODS_SKU.concat("lk").concat(storeId);
+        if (!goblinRedisUtils.redisUtil.lock(lk, 1, 30)) {
             return ResponseDto.failure(ErrorMapping.get("140000"));
         }
         String analysisResultMsg;
@@ -59,10 +60,13 @@ public class GoblinStoreMgtGoodsImportController {
                     return ResponseDto.failure(ErrorMapping.get("149001"));
             }
         } catch (LiquidnetServiceException e) {
+            goblinRedisUtils.redisUtil.uLock(lk);
             return ResponseDto.failure(e.getMessage());
-        } catch (IOException e) {
+        } catch (Exception e) {
             log.warn("店铺商品管理:批量导入数据:异常[UID={},dataType={},fileName={}]", currentUid, dataType, file.getOriginalFilename(), e);
             return ResponseDto.failure("数据有误，解析失败");
+        } finally {
+            goblinRedisUtils.redisUtil.uLock(lk);
         }
         return ResponseDto.success(analysisResultMsg);
     }

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinStoreMgtGoodsImportService.java

@@ -60,6 +60,7 @@ public class GoblinStoreMgtGoodsImportService {
     private static final String LAST_SKU_SPEC_VALUE_STR = "%#V1%#V2%#V3%#V4%#V5";
 
     public String goodsInformationDataAnalysisProcessing(MultipartFile file, String uid, String storeId) throws IOException {
+        String originalFilename = file.getOriginalFilename();
         AnalysisEventListener<GoblinGoodsImportDto> analysisEventListener = new AnalysisEventListener<GoblinGoodsImportDto>() {
             List<GoblinGoodsSkuInfoVo> goodsSkuInfoVos;
             List<GoblinGoodsInfoVo> goodsInfoVos;
@@ -87,6 +88,7 @@ public class GoblinStoreMgtGoodsImportService {
                 } else if (approximateTotalRowNumber <= 1) {
                     throw new LiquidnetServiceException("-1", "导入文件不能为空");
                 }
+                log.info("DT-IN-BEGIN:[storeId={},uid={},fileName={},totalRow={}]", uid, storeId, originalFilename, approximateTotalRowNumber);
 
                 goodsSkuInfoVos = ObjectUtil.getGoblinGoodsSkuInfoVoArrayList();
                 goodsInfoVos = ObjectUtil.goblinGoodsInfoVoArrayList();
@@ -144,10 +146,11 @@ public class GoblinStoreMgtGoodsImportService {
 //                        }
 //                        throw new LiquidnetServiceException("-1", String.format("规格条码与已添加商品条码重复，重复条码如下：   %s", StringUtils.join(existGoodsSkuNoList, ",")));
 //                    }
-
+                    log.info("DT-IN-ToMDB:[storeId={},uid={},fileName={},spuCount={},skuCount={}]", uid, storeId, originalFilename, goodsInfoVos.size(), goodsSkuInfoVos.size());
                     goblinMongoUtils.insertMgtGoodsInfoVos(goodsInfoVos);
                     goblinMongoUtils.insertMgtGoodsSkuInfoVos(goodsSkuInfoVos);
 
+                    log.info("DT-IN-ToSQL1:[storeId={},uid={},fileName={}]", uid, storeId, originalFilename);
                     LinkedList<String> toMqSqls = CollectionUtil.linkedListString();
                     toMqSqls.add(SqlMapping.get("goblin_goods.insert"));
                     LinkedList<Object[]> initGoodsObjs = CollectionUtil.linkedListObjectArr();
@@ -183,7 +186,7 @@ public class GoblinStoreMgtGoodsImportService {
                     if (initGoodsObjs.size() > 0) {
                         queueUtils.sendMsgByRedis(MQConst.GoblinQueue.SQL_GOODS.getKey(), SqlMapping.gets(toMqSqls, initGoodsObjs, initGoodsImageObjs, initGoodsSpuSpecValueObjs));
                     }
-
+                    log.info("DT-IN-ToSQL2:[storeId={},uid={},fileName={}]", uid, storeId, originalFilename);
                     toMqSqls.clear();
                     toMqSqls.add(SqlMapping.get("goblin_goods_sku.insert"));
                     LinkedList<Object[]> initGoodsSkuObjs = CollectionUtil.linkedListObjectArr();
@@ -222,7 +225,7 @@ public class GoblinStoreMgtGoodsImportService {
 
         long failureRows = readDtoList.stream().filter(r -> StringUtils.isNotEmpty(r.getFailureReason())).count();
         String analysisResultMsg = String.format("导入成功%s条数据，导入失败%s条数据", readDtoList.size() - failureRows, failureRows);
-        log.info("DT-IN:[storeId={},uid={},fileName={},readResult:{}]", uid, storeId, file.getOriginalFilename(), analysisResultMsg);
+        log.info("DT-IN-END:[storeId={},uid={},fileName={},readResult:{}]", uid, storeId, originalFilename, analysisResultMsg);
         return analysisResultMsg;
     }