update：构建批次缓存清理调整

ibzdst-core/src/main/java/cn/ibizlab/core/extensions/service/BaseEntityService.java

@@ -17,4 +17,6 @@ public interface BaseEntityService {
 	ExecLog processAll(BaseRequest msg);
 	void saveResult(ModelObj param, String RULEID, String RULECODE, String RULENAME, String RU_EXECRESULTNAME, FieldObj BUSINESSCAT, Integer RETVALUE, FieldObj KEYVALUEFIELD, FieldObj DOMAINSFIELD, FieldObj DIMFIELD,
 					FieldObj METRICFIELD, FieldObj TIMEFIELD, FieldObj EXT1FIELD, FieldObj EXT2FIELD);
+	void cleanKieContainer();
+	void cleanExpirationKieContainer();
  }
\ No newline at end of file

ibzdst-core/src/main/java/cn/ibizlab/core/extensions/service/BaseEntityServiceImpl.java

@@ -643,14 +643,24 @@ public class BaseEntityServiceImpl implements BaseEntityService
 	/**
 	 * 清理过期的KieContainer，默认超过七天即认为过期失效
 	 */
-	public void cleanExpirationKieContainer() throws ParseException {
-	    int beforeSize = setKc.size();
-        if (setKc.size() > 0){
+	@Override
+	public void cleanExpirationKieContainer(){
+	    int beforeSize = this.setKc.size();
+	    if (beforeSize == 0){
+	    	return;
+		}
 		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
 		SimpleDateFormat simpleDateFormat2 = new SimpleDateFormat("yyyy-MM-dd");
-            long curTime = simpleDateFormat2.parse(LocalDate.now().toString()).getTime();
+		long curTime = 0L;
+		try {
+			curTime = simpleDateFormat2.parse(LocalDate.now().toString()).getTime();
+		} catch (ParseException e) {
+			e.printStackTrace();
+			log.error(String.format("获取当前日期时间戳异常，原因：",e.getMessage()));
+			return;
+		}
 		long timeDifference = this.expirationDays * 24 * 60 * 60 * 1000;
-            Iterator<String> iterator = setKc.keySet().iterator();
+		Iterator<String> iterator = this.setKc.keySet().iterator();
 		while (iterator.hasNext()) {
 			// 构建批次信息，如：20230214140921[高检-信访辅助（规则专用）]-cnt-10
 			String bacth = iterator.next();
@@ -659,6 +669,12 @@ public class BaseEntityServiceImpl implements BaseEntityService
 					String strBatchTime = bacth.substring(0,8);
 					long batchTime = simpleDateFormat.parse(strBatchTime).getTime();
 					if ((curTime - batchTime) > timeDifference){
+						try{
+							this.setKc.get(bacth).dispose();
+						}catch (Exception ex){
+							ex.printStackTrace();
+							log.error(String.format("setKc.get(iterator).dispose()异常，原因：" + ex.getMessage()));
+						}
 						iterator.remove();
 						log.info(String.format("[batch]：%1$s，是否被清除：是",bacth));
 					}else {
@@ -672,8 +688,30 @@ public class BaseEntityServiceImpl implements BaseEntityService
 				log.info(String.format("[batch]：%1$s，是否被清除：否",bacth));
 			}
 		}
-		}
-        int afterSize = setKc.size();
+        int afterSize = this.setKc.size();
         log.info(String.format("清理过期setKc完成，过期时间(天)：%1$s，清理前setKc大小：%2$s，清理后setKc大小：%3$s，清理setKc数：%4$s",this.expirationDays,beforeSize,afterSize,(beforeSize - afterSize) ));
 	}
+
+	@Override
+	public void cleanKieContainer() {
+		int beforeSize = this.setKc.size();
+		if (beforeSize == 0){
+			return;
+		}
+		Iterator<String> iterator = this.setKc.keySet().iterator();
+		while (iterator.hasNext()) {
+			// 构建批次信息，如：20230214140921[高检-信访辅助（规则专用）]-cnt-10
+			String bacth = iterator.next();
+			try{
+				this.setKc.get(bacth).dispose();
+			}catch (Exception ex){
+				ex.printStackTrace();
+				log.error(String.format("--cleanKieContainer--setKc.get(iterator).dispose()异常，[batch]：%1$s，原因：%2$s" ,bacth,ex.getMessage()));
+			}
+			iterator.remove();
+			log.info(String.format("--cleanKieContainer--[batch]：%1$s，已被清除。",bacth));
+		}
+		int afterSize = this.setKc.size();
+		log.info(String.format("--cleanKieContainer--执行完成，清理前setKc大小：%1$s，清理后setKc大小：%2$s，清理setKc数：%3$s",beforeSize,afterSize,(beforeSize - afterSize) ));
+	}
 }
\ No newline at end of file

ibzdst-core/src/main/java/cn/ibizlab/core/extensions/service/RuleEngineExService.java

@@ -25,6 +25,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
@@ -80,6 +81,10 @@ public class RuleEngineExService extends RuleEngineServiceImpl {
     @Autowired
     private ExecResultExService execResultExService;
 
+    @Autowired
+    @Qualifier("AnalyseEntityServiceImpl")
+    private BaseEntityService analyseEntityServiceImpl;
+
     /**
      * [Run:运行] 行为扩展
      * @param et
@@ -347,5 +352,12 @@ public class RuleEngineExService extends RuleEngineServiceImpl {
         }
         return super.check(et);
     }
+
+    @Override
+    public RuleEngine cleanKC(RuleEngine et) {
+        baseEntityService.cleanKieContainer();
+        analyseEntityServiceImpl.cleanKieContainer();
+        return et;
+    }
 }
 

ibzdst-core/src/main/java/cn/ibizlab/core/util/job/CleanExpirationKieContainerJobHandler.java

 package cn.ibizlab.core.util.job;
 
-import cn.ibizlab.core.extensions.service.BaseEntityServiceImpl;
+import cn.ibizlab.core.extensions.service.BaseEntityService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -18,7 +19,11 @@ public class CleanExpirationKieContainerJobHandler {
 
     @Autowired
     @Lazy
-    private BaseEntityServiceImpl baseEntityService;
+    private BaseEntityService baseEntityService;
+    @Autowired
+    @Lazy
+    @Qualifier("AnalyseEntityServiceImpl")
+    private BaseEntityService analyseEntityServiceImpl;
 
     /**
      * 默认每天凌晨6点开始执行
@@ -29,6 +34,7 @@ public class CleanExpirationKieContainerJobHandler {
         log.info("--cleanExpirationKieContainer--开始执行");
         try {
             baseEntityService.cleanExpirationKieContainer();
+            analyseEntityServiceImpl.cleanExpirationKieContainer();
             log.info("--cleanExpirationKieContainer--执行完成，耗时（毫秒）：" + (System.currentTimeMillis() - start));
         }catch (Exception e){
             e.printStackTrace();