|
|
|
@@ -713,14 +713,14 @@ public class WxEnergyServiceImpl implements WxEnergyService { |
|
|
|
logger.error(e.getMessage(),e); |
|
|
|
// 删除缓存文件 |
|
|
|
file.delete(); |
|
|
|
return null; |
|
|
|
throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),e.getMessage()); |
|
|
|
} |
|
|
|
// 删除缓存文件 |
|
|
|
file.delete(); |
|
|
|
|
|
|
|
if(datalist == null) { |
|
|
|
logger.error("导入模板失败: 模板数据解析失败"); |
|
|
|
return null; |
|
|
|
throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),"导入模板失败: 模板数据解析失败"); |
|
|
|
} |
|
|
|
return datalist; |
|
|
|
} |
|
|
|
@@ -757,14 +757,15 @@ public class WxEnergyServiceImpl implements WxEnergyService { |
|
|
|
List<Map> successList = datalist.getList(); |
|
|
|
if(successList.size() > 0) { |
|
|
|
boolean allSuccess = true; |
|
|
|
Long cuteId = (Long)successList.get(0).get("calcuteId"); |
|
|
|
Long cuteId = (Long)successList.get(0).get("编码"); |
|
|
|
try { |
|
|
|
successList.parallelStream().forEach(reading -> { |
|
|
|
Long id = (Long) reading.get("id"); |
|
|
|
Long id = (Long) reading.get("抄表数据编码"); |
|
|
|
WxEnergyMeterReading r = new WxEnergyMeterReading(); |
|
|
|
r.updateTenantInfo(user); |
|
|
|
r.setId(id); |
|
|
|
r.setPrice((String)reading.get("price")); |
|
|
|
r.setPrice((String)reading.get("单价(*)")); |
|
|
|
r.setCurNumber((String)reading.get("本次抄表数")); |
|
|
|
r.setUpdateBy(user.getId()); |
|
|
|
r.setUpdateByName(user.getName()); |
|
|
|
r.setUpdateTime(new Date()); |
|
|
|
|