|
@@ -2676,12 +2676,28 @@ public class WmScorePackageController {
|
|
|
public R<?> batchCreatePackage(@RequestExcel(fileName = "excel", ignoreEmptyRow = true) List<BatchPackageExcelModel> batchPackageExcelModels,
|
|
|
@RequestPart(value = "history") WmScorePackage scorePackage) {
|
|
|
|
|
|
+ log.warn("==========================================批量导入积分包-插入redis:开始=====================================================");
|
|
|
+ // 获取操作人
|
|
|
+ HnqzUser user = SecurityUtils.getUser();
|
|
|
+ // 记录历史信息
|
|
|
+ // 缓存记录key
|
|
|
+ String key = String.format(CacheConstants.BATCH_PACKAGE_HISTORY, user.getDeptId(), user.getId());
|
|
|
+ Map<String, Object> history = new HashMap<>(2);
|
|
|
+ scorePackage.setCreateTime(null);
|
|
|
+ scorePackage.setUpdateTime(null);
|
|
|
+ JSONObject jsonObject = JSONUtil.parseObj(scorePackage);
|
|
|
+ jsonObject.set("relatedService",Integer.parseInt(scorePackage.getRelatedService()));
|
|
|
+ history.put("history", jsonObject);
|
|
|
+ history.put("timestamp", DateTimeFormatter.ofPattern(DatePattern.CHINESE_DATE_TIME_PATTERN).format(LocalDateTime.now()));
|
|
|
+ redisTemplate.opsForValue().set(key, JSONUtil.toJsonStr(history));
|
|
|
+
|
|
|
+ log.warn("==========================================批量导入积分包-插入redis:结束=====================================================");
|
|
|
+
|
|
|
log.warn("==========================================批量导入积分包:开始=====================================================");
|
|
|
|
|
|
- Multimap<String, Object> errorMap = ArrayListMultimap.create();
|
|
|
|
|
|
- // 获取操作人
|
|
|
- HnqzUser user = SecurityUtils.getUser();
|
|
|
+
|
|
|
+ Multimap<String, Object> errorMap = ArrayListMultimap.create();
|
|
|
|
|
|
TargetType targetType = null;
|
|
|
|
|
@@ -2749,20 +2765,7 @@ public class WmScorePackageController {
|
|
|
|
|
|
}
|
|
|
|
|
|
- log.warn("==========================================批量导入积分包-插入redis:开始=====================================================");
|
|
|
- // 记录历史信息
|
|
|
- // 缓存记录key
|
|
|
- String key = String.format(CacheConstants.BATCH_PACKAGE_HISTORY, user.getDeptId(), user.getId());
|
|
|
- Map<String, Object> history = new HashMap<>(2);
|
|
|
- scorePackage.setCreateTime(null);
|
|
|
- scorePackage.setUpdateTime(null);
|
|
|
- JSONObject jsonObject = JSONUtil.parseObj(scorePackage);
|
|
|
- jsonObject.set("relatedService",Integer.parseInt(scorePackage.getRelatedService()));
|
|
|
- history.put("history", jsonObject);
|
|
|
- history.put("timestamp", DateTimeFormatter.ofPattern(DatePattern.CHINESE_DATE_TIME_PATTERN).format(LocalDateTime.now()));
|
|
|
- redisTemplate.opsForValue().set(key, JSONUtil.toJsonStr(history));
|
|
|
|
|
|
- log.warn("==========================================批量导入积分包-插入redis:结束=====================================================");
|
|
|
log.warn("==========================================批量导入积分包:结束=====================================================");
|
|
|
return R.ok();
|
|
|
}
|