报表数据构建维度缓存逻辑调整

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

@@ -34,6 +34,10 @@ public class AnalyseEntityServiceImpl extends BaseEntityServiceImpl {
     @Autowired
     private DefaultMQProducerService defaultMQProducerService;
 
+    @Autowired
+    @Lazy
+    private DABuildExService daBuildExService;
+
     @Autowired
     @Lazy
     private cn.ibizlab.util.client.IBZDictFeignClient ibzDictFeignClient;
@@ -94,7 +98,7 @@ public class AnalyseEntityServiceImpl extends BaseEntityServiceImpl {
         if((!StringUtils.isEmpty(result.getRuleid()))&&(!StringUtils.isEmpty(result.getDomainsfield()))&&(!StringUtils.isEmpty(result.getKeyvaluefield()))&&(!ObjectUtils.isEmpty(result.getTimefield()))) {
             result.setUpdatedate(ExecResult.nowLocalDate());
 
-            List<DADimension> dims=this.getDims(result.getBusinesscat());
+            List<DADimension> dims=daBuildExService.getDims(result.getBusinesscat());
             if(dims!=null) {
                 ArrayList<ExecResult> results = new ArrayList<>();
                 for (DADimension dim : dims) {
@@ -116,7 +120,8 @@ public class AnalyseEntityServiceImpl extends BaseEntityServiceImpl {
                                     CachedBeanCopier.copy(result, result2);
                                     result2.setDimfield(valuesOf(code.getValue()));
                                     saveResults.add(result2);
-                                    if(StringUtils.isEmpty(code.getParent()))
+                                    //非逐层核算或无父代码项退出
+                                    if(dim.getRecursive() == 0 || StringUtils.isEmpty(code.getParent()))
                                     {
                                         break;
                                     }
@@ -144,22 +149,6 @@ public class AnalyseEntityServiceImpl extends BaseEntityServiceImpl {
 
     }
 
-    private Hashtable<String, List<DADimension>> dimset=new Hashtable<>();
-    private Object dimslock=new Object();
-
-    @Autowired
-    private IDABuildService daBuildExService;
-
-    private List<DADimension>  getDims(String id)
-    {
-        synchronized(dimslock)
-        {
-            if(!dimset.containsKey(id))
-                dimset.put(id, daBuildExService.get(id).getDadimension());
-            return dimset.get(id);
-        }
-    }
-
     @Autowired
     protected IExecLogService ruExecLogService;
     public ExecLog processAll(BaseRequest msg)

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

 package cn.ibizlab.core.extensions.service;
 
+import cn.ibizlab.core.analysis.domain.DABuild;
+import cn.ibizlab.core.analysis.domain.DADimension;
 import cn.ibizlab.core.analysis.domain.DAMetric;
 import cn.ibizlab.core.analysis.service.IDAMetricService;
 import cn.ibizlab.core.analysis.service.impl.DABuildServiceImpl;
@@ -8,13 +10,11 @@ import cn.ibizlab.core.extensions.domain.EngineMQMsg;
 import cn.ibizlab.core.extensions.util.DefaultMQProducerService;
 import cn.ibizlab.core.extensions.util.MQConsumeMsgListenerProcessor;
 import cn.ibizlab.core.lite.extensions.domain.EntityObj;
-import cn.ibizlab.core.lite.extensions.domain.Setting;
 import cn.ibizlab.core.lite.extensions.model.DataModel;
 import cn.ibizlab.core.lite.extensions.service.LiteDataCallback;
 import cn.ibizlab.core.lite.extensions.service.LiteDataService;
 import cn.ibizlab.core.lite.extensions.service.LiteModelService;
 import cn.ibizlab.core.rule.domain.ExecLog;
-import cn.ibizlab.core.rule.domain.RuleEngine;
 import cn.ibizlab.core.rule.domain.RuleItem;
 import cn.ibizlab.core.rule.service.IExecLogService;
 import cn.ibizlab.core.rule.service.IRuleItemService;
@@ -24,19 +24,18 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.extern.slf4j.Slf4j;
-import cn.ibizlab.core.analysis.domain.DABuild;
-import org.kie.api.definition.rule.Rule;
 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;
 import org.springframework.context.annotation.Lazy;
+import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.context.annotation.Primary;
 import org.springframework.util.StringUtils;
 
 import java.io.File;
-import java.sql.Wrapper;
 import java.util.*;
 
 
@@ -249,5 +248,19 @@ public class DABuildExService extends DABuildServiceImpl {
         param.put("engineId", engineMQMsg.getEngineId());
         this.execute(updateSql, param);
     }
+
+
+    @Cacheable(value ="dabuilddims", key = "'row:'+#p0")
+    public List<DADimension>  getDims(String id)
+    {
+        return this.get(id).getDadimension();
+    }
+
+    @Override
+    @Transactional
+    @CacheEvict(value ={"dabuild","dabuilddims"}, key = "'row:'+#p0.buildId")
+    public boolean update(DABuild et) {
+        return super.update(et);
+    }
 }
 

ibzdst-util/src/main/java/cn/ibizlab/util/client/IBZDictFeignClient.java

@@ -4,6 +4,7 @@ import cn.ibizlab.util.dict.CodeItem;
 import cn.ibizlab.util.dict.CodeList;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -19,7 +20,7 @@ public interface IBZDictFeignClient
 	@RequestMapping(method = RequestMethod.POST, value = "/dictionarys/catalogs/sync")
 	Boolean syncRuntimeDict(@RequestBody JSONArray catalogs);
 
-
+	@Cacheable( value="dictcatalog",key = "'codelist:'+#p0")
 	@RequestMapping(method = RequestMethod.GET, value = "/dictionarys/codelist/{code}")
 	CodeList getCodeList(@PathVariable("code") String code);