Commit 7fe2a693 authored by 韩桐桐's avatar 韩桐桐

fix(cyl):接口修改,企业气瓶信息统计,单日刷入数据,若重复刷入则覆盖原先记录

parent f2dec891
...@@ -10,6 +10,7 @@ import com.google.common.collect.Lists; ...@@ -10,6 +10,7 @@ import com.google.common.collect.Lists;
import com.yeejoin.amos.boot.biz.common.utils.DateUtils; import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
import com.yeejoin.amos.boot.module.cylinder.api.dto.CylinderFillingRecordStatisticsUnitDayDto; import com.yeejoin.amos.boot.module.cylinder.api.dto.CylinderFillingRecordStatisticsUnitDayDto;
import com.yeejoin.amos.boot.module.cylinder.api.dto.WarningMsgDto; import com.yeejoin.amos.boot.module.cylinder.api.dto.WarningMsgDto;
import com.yeejoin.amos.boot.module.cylinder.api.entity.CylinderFillingRecordStatisticsUnitDay;
import com.yeejoin.amos.boot.module.cylinder.api.entity.ESCylinderInfoDto; import com.yeejoin.amos.boot.module.cylinder.api.entity.ESCylinderInfoDto;
import com.yeejoin.amos.boot.module.cylinder.api.entity.MsgLog; import com.yeejoin.amos.boot.module.cylinder.api.entity.MsgLog;
import com.yeejoin.amos.boot.module.cylinder.api.enums.EarlyWarningLevelEnum; import com.yeejoin.amos.boot.module.cylinder.api.enums.EarlyWarningLevelEnum;
...@@ -817,6 +818,7 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind ...@@ -817,6 +818,7 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
CompletableFuture.runAsync(() -> countByUnit(cylinderUnit -> { CompletableFuture.runAsync(() -> countByUnit(cylinderUnit -> {
CylinderFillingRecordStatisticsUnitDayDto unitDay = new CylinderFillingRecordStatisticsUnitDayDto(); CylinderFillingRecordStatisticsUnitDayDto unitDay = new CylinderFillingRecordStatisticsUnitDayDto();
calcCylinderFillingCheckDataUnitDataWithDay(cylinderUnit, calendar, unitDay); calcCylinderFillingCheckDataUnitDataWithDay(cylinderUnit, calendar, unitDay);
checkFillingRecordStatisticsUnitDay(unitDay);
cylinderFillingRecordStatisticsUnitDayServiceImpl.createWithModel(unitDay); cylinderFillingRecordStatisticsUnitDayServiceImpl.createWithModel(unitDay);
})); }));
} else {// 刷入指定企业数据 } else {// 刷入指定企业数据
...@@ -826,6 +828,7 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind ...@@ -826,6 +828,7 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
.orElseThrow(() -> new NoSuchElementException("没有对应appid的企业")); .orElseThrow(() -> new NoSuchElementException("没有对应appid的企业"));
CylinderFillingRecordStatisticsUnitDayDto unitDay = new CylinderFillingRecordStatisticsUnitDayDto(); CylinderFillingRecordStatisticsUnitDayDto unitDay = new CylinderFillingRecordStatisticsUnitDayDto();
calcCylinderFillingCheckDataUnitDataWithDay(targetUnit, calendar, unitDay); calcCylinderFillingCheckDataUnitDataWithDay(targetUnit, calendar, unitDay);
checkFillingRecordStatisticsUnitDay(unitDay);
cylinderFillingRecordStatisticsUnitDayServiceImpl.createWithModel(unitDay); cylinderFillingRecordStatisticsUnitDayServiceImpl.createWithModel(unitDay);
} }
} catch (ParseException e) { } catch (ParseException e) {
...@@ -837,6 +840,19 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind ...@@ -837,6 +840,19 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
} }
} }
/**
* 检查CylinderFillingRecordStatisticsUnitDayDto是否已经存在数据,若存在,则删除该条记录
* 检查维度:appId + fillingDate
*/
public void checkFillingRecordStatisticsUnitDay(CylinderFillingRecordStatisticsUnitDayDto unitDay) {
LambdaQueryWrapper<CylinderFillingRecordStatisticsUnitDay> queryWrapper = new QueryWrapper<CylinderFillingRecordStatisticsUnitDay>().lambda()
.eq(CylinderFillingRecordStatisticsUnitDay::getAppId, unitDay.getAppId())
.eq(CylinderFillingRecordStatisticsUnitDay::getFillingDate, unitDay.getFillingDate());
CylinderFillingRecordStatisticsUnitDay one = cylinderFillingRecordStatisticsUnitDayServiceImpl.getOne(queryWrapper);
if (!ValidationUtil.isEmpty(one)){
cylinderFillingRecordStatisticsUnitDayServiceImpl.deleteBySeq(one.getSequenceNbr());
}
}
@Override @Override
public void fillingRecordDataSynHandler() { public void fillingRecordDataSynHandler() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment