功能修改-sjx

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipResourceMapper.java

@@ -66,4 +66,7 @@ public interface EquipResourceMapper extends BaseMapper<EquipResourceEntity> {
     List<EquipResourceEntity> selectCommonCraftList();
 
 
+    boolean deleteByDateTime();
+
+
 }

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipResourceMapper.xml

@@ -55,4 +55,8 @@
           AND id > nvl(( SELECT max( id ) FROM MES_EQUIP_RESOURCE WHERE is_used = '1' AND CRAFT_ID = '27' ),0) order by date_time,start_time
     </select>
 
+    <delete id="deleteByDateTime">
+        delete from MES_EQUIP_RESOURCE where date_time <![CDATA[ < ]]> to_char(sysdate,'yyyy-MM-dd')
+    </delete>
+
 </mapper>

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PersonResourceMapper.java

@@ -63,4 +63,6 @@ public interface PersonResourceMapper extends BaseMapper<PersonResourceEntity> {
 
     List<Map<String,Object>> selectTeamByWorkCenter(@Param("workCenterId") Long workCenterId);
 
+    boolean deleteByDateTime();
+
 }

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PersonResourceMapper.xml

@@ -43,4 +43,8 @@
           and c.IS_DELETED = 0
           and a.work_center_id = #{workCenterId}
     </select>
+
+    <delete id="deleteByDateTime">
+        delete from MES_PERSON_RESOURCE where date_time <![CDATA[ < ]]> to_char(sysdate,'yyyy-MM-dd')
+    </delete>
 </mapper>

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/EquipResourceServiceImpl.java

@@ -36,7 +36,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateFormatUtils;
 import org.apache.commons.lang3.time.DateUtils;
-import org.springblade.core.mp.base.BaseEntity;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.tool.jackson.JsonUtil;
 import org.springblade.scheduling.pojo.entity.EquipAbilityEntity;
@@ -58,7 +57,6 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * 工艺能力表 服务实现类
@@ -107,10 +105,8 @@ public class EquipResourceServiceImpl extends BaseServiceImpl<EquipResourceMappe
 				}
 			}
 		}
-		//删除3天之前的数据
+		//删除今天之前的数据
-		List<EquipResourceEntity> deleteList = this.list(Wrappers.<EquipResourceEntity>lambdaQuery().le(EquipResourceEntity::getDateTime,DateFormatUtils.format(DateUtils.addDays(date,-3),"yyyy-MM-dd")));
+		baseMapper.deleteByDateTime();
-		List<Long> idList = deleteList.stream().map(BaseEntity::getId).collect(Collectors.toList());
-		baseMapper.deleteByIds(idList);
 		log.info("初始化设备资源结束："+ DateFormatUtils.format(new Date(),"yyyy-MM-dd HH:mm:ss"));
 	}
 

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/PersonResourceServiceImpl.java

@@ -34,7 +34,6 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.time.DateFormatUtils;
 import org.apache.commons.lang3.time.DateUtils;
-import org.springblade.core.mp.base.BaseEntity;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.scheduling.pojo.entity.PersonAbilityEntity;
 import org.springblade.scheduling.pojo.entity.PersonResourceEntity;
@@ -51,7 +50,6 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * 工艺能力表 服务实现类
@@ -99,17 +97,7 @@ public class PersonResourceServiceImpl extends BaseServiceImpl<PersonResourceMap
 
 		}
 		//删除3天之前的数据
-		List<PersonResourceEntity> deleteList = this.list(Wrappers.<PersonResourceEntity>lambdaQuery().le(PersonResourceEntity::getDateTime,DateFormatUtils.format(DateUtils.addDays(date,-3),"yyyy-MM-dd")));
+		baseMapper.deleteByDateTime();
-		List<Long> idList = deleteList.stream().map(BaseEntity::getId).collect(Collectors.toList());
-		List<List<Long>> partitionedList = new ArrayList<>();
-		int size = idList.size();
-		for (int i = 0; i < size; i += 1000) {
-			int end = Math.min(i + 1000, size);
-			partitionedList.add(idList.subList(i, end));
-		}
-		for(List<Long> sublist : partitionedList){
-			baseMapper.deleteByIds(sublist);
-		}
 		log.info("初始化人力资源结束："+ DateFormatUtils.format(new Date(),"yyyy-MM-dd HH:mm:ss"));
 	}