修改代码

rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/biz/RscpImageCoverBiz.java

@@ -23,6 +23,7 @@ import java.util.stream.Collectors;
 import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FALSE;
 import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
 import static com.upyuns.platform.rs.datacenter.entity.RscpImageCover.TYPE_MONTH;
+import static com.upyuns.platform.rs.datacenter.entity.RscpImageCover.TYPE_YEAR;
 
 @Service
 public class RscpImageCoverBiz extends BaseBiz<RscpImageCoverMapper, RscpImageCover> {
@@ -99,7 +100,7 @@ public class RscpImageCoverBiz extends BaseBiz<RscpImageCoverMapper, RscpImageCo
                         return DateUtil.format(dateTime, "yyyy");
                     }));
 
-                    //处理月份份融合
+                    //处理月份融合
                     monthMap.forEach((mk,mv) -> {
                         String[] mks = mk.split("-");
                         String yearMk = mks[0];
@@ -124,7 +125,6 @@ public class RscpImageCoverBiz extends BaseBiz<RscpImageCoverMapper, RscpImageCo
                                 setIsDel(SYS_TRUE);
                             }});
                             insertCoverDTO.setOldId(oldId);
-
                         }
 
                         insertCoverDTO.setName(mk+""+rscpAreaInfo.getName());
@@ -136,7 +136,42 @@ public class RscpImageCoverBiz extends BaseBiz<RscpImageCoverMapper, RscpImageCo
                         insertCoverDTO.setDateMonth(monthMk);
                         insertCoverDTO.setDateYear(yearMk);
                         insertCoverDTO.setType(TYPE_MONTH);
+                        mapper.coverInsert(insertCoverDTO);
+                    });
+
+                    //处理年份融合
+                    monthMap.forEach((mk,mv) -> {
+                        String yearMk = mk;
+
+                        //查询旧数据
+                        List<RscpImageCover> list = selectList(new RscpImageCover(){{
+                            setDateYear(yearMk);
+                            setIsDel(SYS_FALSE);
+                            setAreaCode(areaCode);
+                            setType(TYPE_YEAR);
+                        }});
+
+                        List<Long> dataIds = mv.parallelStream().map(RscpAreaImageTotal::getDataId).collect(Collectors.toList());
+
+                        InsertCoverDTO insertCoverDTO = new InsertCoverDTO();
+                        if(CollUtil.isNotEmpty(list)) {
+                            Integer oldId = list.get(0).getId();
+                            updateSelectiveById(new RscpImageCover(){{
+                                setId(oldId);
+                                setIsDel(SYS_TRUE);
+                            }});
+                            insertCoverDTO.setOldId(oldId);
+                        }
 
+                        insertCoverDTO.setName(mk+""+rscpAreaInfo.getName());
+                        insertCoverDTO.setDataIds(dataIds);
+                        insertCoverDTO.setAreaCode(areaCode);
+                        insertCoverDTO.setAreaName(rscpAreaInfo.getName());
+                        insertCoverDTO.setCrtTime(now.getTime());
+                        insertCoverDTO.setUpdTime(now.getTime());
+                        insertCoverDTO.setDateYear(yearMk);
+                        insertCoverDTO.setType(TYPE_YEAR);
+                        mapper.coverInsert(insertCoverDTO);
                     });
 
                 });