|
@@ -3,6 +3,8 @@ package cn.com.ctop.kuaishou.modules.live.service.impl;
|
|
|
import cn.com.ctop.common.module.utils.Check;
|
|
|
import cn.com.ctop.common.module.utils.ExportExcelUtils;
|
|
|
import cn.com.ctop.kuaishou.modules.live.entity.LiveDataTouch;
|
|
|
+import cn.com.ctop.kuaishou.modules.live.enums.ProvinceEnum;
|
|
|
+import cn.com.ctop.kuaishou.modules.live.enums.TouchEnum;
|
|
|
import cn.com.ctop.kuaishou.modules.live.enums.liveDataUtil;
|
|
|
import cn.com.ctop.kuaishou.modules.live.mapper.LiveDataTouchMapper;
|
|
|
import cn.com.ctop.kuaishou.modules.live.service.ILiveDataTouchService;
|
|
@@ -77,13 +79,7 @@ public class LiveDataTouchServiceImpl extends ServiceImpl<LiveDataTouchMapper, L
|
|
|
String code = titleObj.getString(String.valueOf(j));
|
|
|
//URL 和 日期 为空时,添加不成功!
|
|
|
if (Check.isNull(value)) {
|
|
|
- if ("fanStrat".equals(code)) {
|
|
|
- return Result.error("数据缺失,文档中第" + (i + 1) + "行,【粉丝分层】为必填项,请补充完善后导入");
|
|
|
- } else if ("customerStrat".equals(code)) {
|
|
|
- return Result.error("数据缺失,文档中第" + (i + 1) + "行,【客群分层】为必填项,请补充完善后导入");
|
|
|
- } else if ("statDate".equals(code)) {
|
|
|
- return Result.error("数据缺失,文档中第" + (i + 1) + "行,【时间】为必填项,请补充完善后导入");
|
|
|
- }
|
|
|
+ return Result.error("数据缺失,文档中第" + (i + 1) + "行,【" + TouchEnum.getNameByCode(code) + "】为空项,请补充完善后导入");
|
|
|
}
|
|
|
entityObj.put(code, value);
|
|
|
}
|
|
@@ -130,18 +126,22 @@ public class LiveDataTouchServiceImpl extends ServiceImpl<LiveDataTouchMapper, L
|
|
|
String value = values.get(j);
|
|
|
String code = titleObj.getString(String.valueOf(j));
|
|
|
if (Check.isNull(value)) {
|
|
|
- if ("fanStrat".equals(code)) {
|
|
|
- return Result.error("数据缺失,文档中第" + (i + 1) + "行,【粉丝分层】为必填项,请补充完善后导入");
|
|
|
- } else if ("customerStrat".equals(code)) {
|
|
|
- return Result.error("数据缺失,文档中第" + (i + 1) + "行,【客群分层】为必填项,请补充完善后导入");
|
|
|
- } else if ("statDate".equals(code)) {
|
|
|
- return Result.error("数据缺失,文档中第" + (i + 1) + "行,【时间】为必填项,请补充完善后导入");
|
|
|
- }
|
|
|
+ return Result.error("数据缺失,文档中第" + (i + 1) + "行,【" + TouchEnum.getNameByCode(code) + "】为空项,请补充完善后导入");
|
|
|
}
|
|
|
if ("statDate".equals(code)) {
|
|
|
- value = DateUtils.formatDate(value.replace("/","-"), DateUtils.WEB_FORMAT);
|
|
|
+ value = DateUtils.formatDate(value.replace("/", "-"), DateUtils.WEB_FORMAT);
|
|
|
+ }
|
|
|
+ if (value.contains("%")) {
|
|
|
+ value = value.replace("%", "");
|
|
|
+ if (!("0.00".equals(value) || "0.0".equals(value) || "0".equals(value))) {
|
|
|
+ float f = Float.valueOf(value) / 100;
|
|
|
+ entityObj.put(code, f);
|
|
|
+ } else {
|
|
|
+ entityObj.put(code, value);
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ entityObj.put(code, value);
|
|
|
}
|
|
|
- entityObj.put(code, value);
|
|
|
}
|
|
|
entityObj.put("accountId", accountId);
|
|
|
entityObj.put("id", accountId + "_" + DateUtils.formatDate("yyyyMMdd") + "_" + UUID.randomUUID().toString().replace("-", "").substring(0, 9));
|