dict 本地化

ibzdst-core/src/main/java/cn/ibizlab/core/dict/extensions/aspect/CacheRefreshAspect.java

 package cn.ibizlab.core.dict.extensions.aspect;
 
 import cn.ibizlab.core.dict.domain.DictCatalog;
-import cn.ibizlab.core.dict.extensions.service.DictCoreService;
+import cn.ibizlab.core.dict.extensions.service.DictDstService;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
@@ -19,7 +19,7 @@ public class CacheRefreshAspect
 {
     @Autowired
     @Lazy
-    private DictCoreService dictCoreService;
+    private DictDstService dictDstService;
 
     @Before(value = "execution(* cn.ibizlab.core.dict.service.IDictCatalogService.update(..))")
     public void BeforeUpdateEmp(JoinPoint point) throws Exception {
@@ -41,8 +41,8 @@ public class CacheRefreshAspect
             {
                 String code=((DictCatalog) obj).getCode();
                 if(!StringUtils.isEmpty(code)) {
-                    dictCoreService.resetDictCatalog(code);
-                    dictCoreService.resetCodeListCatalog(code);
+                    dictDstService.resetDictCatalog(code);
+                    dictDstService.resetCodeListCatalog(code);
                 }
             }
 

ibzdst-core/src/main/java/cn/ibizlab/core/dict/extensions/service/DictCoreService.java → ibzdst-core/src/main/java/cn/ibizlab/core/dict/extensions/service/DictDstService.java

@@ -27,7 +27,7 @@ import java.util.Map;
 
 @Slf4j
 @Service
-public class DictCoreService
+public class DictDstService
 {
     @Autowired
     private IDictCatalogService dictCatalogService;

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

 package cn.ibizlab.core.extensions.service;
 
 import cn.ibizlab.core.analysis.domain.DADimension;
-import cn.ibizlab.core.analysis.service.IDABuildService;
-import cn.ibizlab.core.dict.extensions.service.DictCoreService;
+import cn.ibizlab.core.dict.extensions.service.DictDstService;
 import cn.ibizlab.core.extensions.cql.ExecResult;
 import cn.ibizlab.core.extensions.domain.BaseRequest;
 import cn.ibizlab.core.extensions.domain.ResultsMQMsg;
@@ -13,7 +12,6 @@ import cn.ibizlab.core.rule.domain.ExecLog;
 import cn.ibizlab.core.rule.service.IExecLogService;
 import cn.ibizlab.util.dict.CodeItem;
 import cn.ibizlab.util.helper.CachedBeanCopier;
-import cn.ibizlab.util.helper.DataObject;
 import lombok.extern.slf4j.Slf4j;
 import org.kie.api.runtime.KieSession;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,10 +20,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
-import java.math.BigDecimal;
 import java.sql.Timestamp;
 import java.util.ArrayList;
-import java.util.Hashtable;
 import java.util.List;
 
 @Slf4j
@@ -42,7 +38,7 @@ public class AnalyseEntityServiceImpl extends BaseEntityServiceImpl {
 
     @Autowired
     @Lazy
-    private DictCoreService dictCoreService;
+    private DictDstService dictDstService;
 
     @Override
     public void saveResult(ModelObj param, String RULEID,String RULECODE, String RULENAME, String RU_EXECRESULTNAME, FieldObj BUSINESSCAT,
@@ -124,7 +120,7 @@ public class AnalyseEntityServiceImpl extends BaseEntityServiceImpl {
                             //维度指定代码表时，向上同时为每一个父节点添加一条数据
                             while(true)
                             {
-                                CodeItem code=dictCoreService.getCodeListCatalog(dictname).findCodeItem(val);
+                                CodeItem code= dictDstService.getCodeListCatalog(dictname).findCodeItem(val);
                                 if(code!=null)
                                 {
                                     ExecResult result2 = new ExecResult();

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

@@ -2,15 +2,13 @@ package cn.ibizlab.core.extensions.service;
 
 import cn.ibizlab.core.analysis.domain.DAMetric;
 import cn.ibizlab.core.analysis.domain.DAReport;
-import cn.ibizlab.core.analysis.filter.DAMetricSearchContext;
 import cn.ibizlab.core.analysis.service.impl.DAReportServiceImpl;
-import cn.ibizlab.core.dict.extensions.service.DictCoreService;
+import cn.ibizlab.core.dict.extensions.service.DictDstService;
 import cn.ibizlab.core.extensions.cql.ExecResult;
 import cn.ibizlab.core.extensions.cql.ExecResultRepository;
 import cn.ibizlab.core.extensions.domain.FetchMetricDatasParam;
 import cn.ibizlab.core.rule.domain.RuleItem;
 import cn.ibizlab.util.dict.CodeItem;
-import cn.ibizlab.util.dict.CodeList;
 import cn.ibizlab.util.errors.BadRequestAlertException;
 import cn.ibizlab.util.helper.DataObject;
 import com.alibaba.fastjson.JSONArray;
@@ -19,17 +17,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.datastax.driver.core.PagingState;
 import com.datastax.driver.core.ResultSet;
 import com.datastax.driver.core.Row;
-import com.datastax.driver.mapping.Mapper;
-import com.datastax.driver.mapping.MappingManager;
-import lombok.extern.log4j.Log4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.cache.annotation.Caching;
 import org.springframework.context.annotation.Lazy;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
@@ -53,7 +46,7 @@ public class DACoreService {
 
     @Autowired
     @Lazy
-    private DictCoreService dictCoreService;
+    private DictDstService dictDstService;
 
     @Autowired
     @Lazy
@@ -279,7 +272,7 @@ public class DACoreService {
         Hashtable<String,HashMap<String,Object>> dimsSet = new Hashtable<>();
 
 //        CodeItem code=CodeListBase.getCodeList(dimcodelist).getCodeList().getCodeItemModelMap().get(dimval);
-        CodeItem code=dictCoreService.getCodeListCatalog(dimcodelist).findChildren(dimval);
+        CodeItem code= dictDstService.getCodeListCatalog(dimcodelist).findChildren(dimval);
         if(code==null)
             return null;
         int no=1;

ibzdst-provider/ibzdst-provider-api/src/main/java/cn/ibizlab/api/rest/extensions/DstCoreResource.java

 package cn.ibizlab.api.rest.extensions;
 
-import cn.ibizlab.core.dict.extensions.service.DictCoreService;
+import cn.ibizlab.core.dict.extensions.service.DictDstService;
 import cn.ibizlab.core.lite.domain.DstSystem;
 import cn.ibizlab.core.lite.domain.MetaField;
 import cn.ibizlab.core.lite.extensions.domain.*;
@@ -8,21 +8,13 @@ import cn.ibizlab.core.lite.extensions.model.DataModel;
 import cn.ibizlab.core.lite.extensions.model.Property;
 import cn.ibizlab.core.lite.extensions.service.LiteDataService;
 import cn.ibizlab.core.lite.extensions.service.LiteModelService;
-import cn.ibizlab.util.client.IBZDictFeignClient;
 import cn.ibizlab.util.dict.CodeItem;
 import cn.ibizlab.util.dict.CodeList;
 import cn.ibizlab.util.dict.Option;
-import cn.ibizlab.util.errors.BadRequestAlertException;
 import cn.ibizlab.util.filter.QueryFilter;
-import cn.ibizlab.util.helper.DataObject;
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.util.StringUtils;
@@ -125,7 +117,7 @@ public class DstCoreResource {
     }
 
     @Autowired
-    private DictCoreService dictCoreService;
+    private DictDstService dictDstService;
 
     @RequestMapping(method = RequestMethod.GET, value = {"/dst/datamodels/{modelid}/{propertyname}.{fieldname}/dict"})
     public ResponseEntity<List<CodeItem>> getDataModelFieldDict(@PathVariable(name="modelid",required = false) String modelid,
@@ -142,7 +134,7 @@ public class DstCoreResource {
                 String dict = field.getDict();
                 if(!StringUtils.isEmpty(dict))
                 {
-                    CodeList codeList=dictCoreService.getCodeListCatalog(dict);
+                    CodeList codeList= dictDstService.getCodeListCatalog(dict);
                     if(codeList!=null)
                         list=codeList.getOptions();