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

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/java/com/yeejoin/amos/boot/module/cylinder/flc/biz/service/impl/CylinderInfoServiceImpl.java

@@ -10,6 +10,7 @@ import com.google.common.collect.Lists;
 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.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.MsgLog;
 import com.yeejoin.amos.boot.module.cylinder.api.enums.EarlyWarningLevelEnum;
@@ -817,6 +818,7 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
                 CompletableFuture.runAsync(() -> countByUnit(cylinderUnit -> {
                     CylinderFillingRecordStatisticsUnitDayDto unitDay = new CylinderFillingRecordStatisticsUnitDayDto();
                     calcCylinderFillingCheckDataUnitDataWithDay(cylinderUnit, calendar, unitDay);
+                    checkFillingRecordStatisticsUnitDay(unitDay);
                     cylinderFillingRecordStatisticsUnitDayServiceImpl.createWithModel(unitDay);
                 }));
             } else {// 刷入指定企业数据
@@ -826,6 +828,7 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
                         .orElseThrow(() -> new NoSuchElementException("没有对应appid的企业"));
                 CylinderFillingRecordStatisticsUnitDayDto unitDay = new CylinderFillingRecordStatisticsUnitDayDto();
                 calcCylinderFillingCheckDataUnitDataWithDay(targetUnit, calendar, unitDay);
+                checkFillingRecordStatisticsUnitDay(unitDay);
                 cylinderFillingRecordStatisticsUnitDayServiceImpl.createWithModel(unitDay);
             }
         } catch (ParseException e) {
@@ -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
     public void fillingRecordDataSynHandler() {