Merge branch 'mzq-sjjq-220929' into 'develop'

Mzq sjjq 220929

See merge request xj-aks/dcuc/app-service!8

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/facade/DataResourceFacade.java

@@ -842,7 +842,7 @@ public class DataResourceFacade implements IDataResourceFacade {
             // 因为表可能属于多个字段分类,前端树结构需要唯一id
             vo.setId(pid + CommonCons.ID_SEPARATOR + e.getId());
             vo.setPId(pid);
-            vo.setLabel(e.getTableName());
+            vo.setLabel(e.getStandardDataName());
             vo.setClassifyCode(resourceEnum.getCode());
             if (null != colInfosMap) {
                 List<AppDataItemInfo> colInfoList = colInfosMap.get(e.getId());
@@ -867,7 +867,7 @@ public class DataResourceFacade implements IDataResourceFacade {
             DataResourceTreeVo vo = new DataResourceTreeVo();
             vo.setId(e.getId());
             vo.setPId(pid);
-            vo.setLabel(e.getColumnName());
+            vo.setLabel(e.getStandardDataItemName());
             vo.setClassifyCode(resourceEnum.getCode());
             vo.setTreeNode(false);
             return vo;

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/facade/sub/AppColumnRelationFacade.java

@@ -14,6 +14,8 @@ import com.dragonsoft.duceap.base.entity.search.SearchDTO;
 import com.dragonsoft.duceap.base.enums.BooleanEnum;
 import com.dragonsoft.duceap.commons.util.collections.CollectionUtils;
 import com.dragonsoft.duceap.core.search.Searchable;
+import com.dragonsoft.duceap.core.search.enums.SearchOperator;
+import com.dragonsoft.duceap.core.search.filter.Condition;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -48,6 +50,11 @@ public class AppColumnRelationFacade implements IAppColumnRelationFacaed {
         Searchable searchable = Searchable.toSearchable(searchDTO);
         Pageable pageable = searchable.getPage();
         searchable.addSort(Sort.Direction.DESC, "createTime");
+        Condition columnRelation = searchable.getSearchFilter("columnRelation", SearchOperator.like);
+        if (columnRelation != null) {
+            searchable.removeSearchFilter("columnRelation", SearchOperator.like);
+            searchable.addSearchFilter("codeName", SearchOperator.like, columnRelation.getValue().toString());
+        }
         Page<AppColumnRelation> page = appColumnRelationService.pageSearch(searchable);
         if (page.isEmpty()) {
             return new PageImpl<>(Collections.emptyList(), pageable, 0L);

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/service/sub/impl/AppDataItemInfoServiceImpl.java

@@ -74,7 +74,8 @@ public class AppDataItemInfoServiceImpl implements IAppDataItemInfoService {
     public List<AppDataItemInfo> getHasClassifyColInfos() {
         LambdaQueryWrapper<AppDataItemInfo> query = Wrappers.lambdaQuery();
         query.select(AppDataItemInfo::getId, AppDataItemInfo::getColumnName, AppDataItemInfo::getResourceTableId,
-                AppDataItemInfo::getColumnClassify, AppDataItemInfo::getDataSecurityLevel);
+                AppDataItemInfo::getColumnClassify, AppDataItemInfo::getDataSecurityLevel,
+                AppDataItemInfo::getStandardDataItemName);
         query.isNotNull(AppDataItemInfo::getColumnClassify);
         List<AppDataItemInfo> appDataItemInfos = appDataItemInfoMapper.selectList(query);
         return appDataItemInfos

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/service/sub/impl/AppDataResourceInfoServiceImpl.java

@@ -59,7 +59,8 @@ public class AppDataResourceInfoServiceImpl implements IAppDataResourceInfoServi
                 AppDataResourceInfo::getDataClassification, AppDataResourceInfo::getDataClassifyOneCode,
                 AppDataResourceInfo::getDataClassifyTwoCode, AppDataResourceInfo::getDataLabelOneCode,
                 AppDataResourceInfo::getDataLabelTwoCode, AppDataResourceInfo::getDataLabelThreeCode,
-                AppDataResourceInfo::getDataLabelFourCode, AppDataResourceInfo::getDataLabelFiveCode);
+                AppDataResourceInfo::getDataLabelFourCode, AppDataResourceInfo::getDataLabelFiveCode,
+                AppDataResourceInfo::getStandardDataName);
         return appDataResourceInfoMapper.selectList(query);
     }
 
@@ -70,7 +71,8 @@ public class AppDataResourceInfoServiceImpl implements IAppDataResourceInfoServi
                 AppDataResourceInfo::getDataClassification, AppDataResourceInfo::getDataClassifyOneCode,
                 AppDataResourceInfo::getDataClassifyTwoCode, AppDataResourceInfo::getDataLabelOneCode,
                 AppDataResourceInfo::getDataLabelTwoCode, AppDataResourceInfo::getDataLabelThreeCode,
-                AppDataResourceInfo::getDataLabelFourCode, AppDataResourceInfo::getDataLabelFiveCode);
+                AppDataResourceInfo::getDataLabelFourCode, AppDataResourceInfo::getDataLabelFiveCode,
+                AppDataResourceInfo::getStandardDataName);
         query.isNotNull(AppDataResourceInfo::getDataClassification);
         List<AppDataResourceInfo> appDataResourceInfos = appDataResourceInfoMapper.selectList(query);
         return appDataResourceInfos.stream()