From 90c86c95de1d20a3c3a44cab3482388a8c221a5e Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 05 十二月 2024 10:32:59 +0800
Subject: [PATCH] UI数据查询调整
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/uidataservice/impl/UIDataCommonServiceImpl.java | 43 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 36 insertions(+), 7 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIDataServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/uidataservice/impl/UIDataCommonServiceImpl.java
similarity index 97%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIDataServiceImpl.java
rename to Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/uidataservice/impl/UIDataCommonServiceImpl.java
index 1ce66c2..6c38eee 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIDataServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/uidataservice/impl/UIDataCommonServiceImpl.java
@@ -1,4 +1,4 @@
-package com.vci.web.service.impl;
+package com.vci.web.service.uidataservice.impl;
import com.vci.client.common.oq.OQTool;
import com.vci.common.qt.object.QueryTemplate;
@@ -38,6 +38,10 @@
import com.vci.web.enumpck.UIFieldTypeEnum;
import com.vci.web.enumpck.UITreeLoadTypeEnum;
import com.vci.web.service.*;
+import com.vci.web.service.impl.WebBoServiceImpl;
+import com.vci.web.service.impl.WebLoServiceImpl;
+import com.vci.web.service.uidataservice.UIDataBaseServiceI;
+import com.vci.web.service.uidataservice.UIDataCommonServiceI;
import com.vci.web.util.PlatformClientUtil;
import com.vci.web.util.WebUtil;
import org.apache.commons.lang3.StringUtils;
@@ -55,12 +59,12 @@
/**
- * UI涓婄殑鏁版嵁鏌ヨ
- * @author weidy
- * @date 2021/3/3
+ * UI涓婄殑鏁版嵁鏌ヨ(閫氱敤鏌ヨ鏈嶅姟)
+ * @author Ludc
+ * @date 2024/12/04
*/
@Service
-public class UIDataServiceImpl implements UIDataServiceI {
+public class UIDataCommonServiceImpl implements UIDataCommonServiceI {
/**
* 骞冲彴鐨勮皟鐢ㄥ鎴风
@@ -147,9 +151,13 @@
@Override
public DataGrid getDataForGrid(UIDataGridQuery dataGridQuery) throws VciBaseException, PLException {
VciBaseUtil.alertNotNull(dataGridQuery,"鏌ヨ瀵硅薄",dataGridQuery.getBtmname(),"涓氬姟绫诲瀷",dataGridQuery.getTableDefineId());
+ // TODO: 2024/12/4 Ludc 鍓嶇浼犺繃鏉ョ殑sourceData鍙傛暟鐨剉laue鍙兘鏄痡son杩欏効鍋氫竴涓嬪鐞�
+ if(Func.isNotEmpty(dataGridQuery.getSourceData())){
+ dataGridQuery.setSourceData(this.convertMapValueJson2Map(dataGridQuery.getSourceData()));
+ }
//鍏堝垽鏂煡璇㈡ā鏉�
UITableDefineVO tableDefineVO = uiEngineService.getComponentByOid(dataGridQuery.getComponentOid(),null).getTableDefineVO();
- String queryTemplate = !CollectionUtils.isEmpty(dataGridQuery.getSourceData())? (String) dataGridQuery.getSourceData().getOrDefault("querytemplate",tableDefineVO.getQueryTemplateName()) :tableDefineVO.getQueryTemplateName();
+ String queryTemplate = Func.isNotEmpty(dataGridQuery.getSourceData())? (String) dataGridQuery.getSourceData().getOrDefault("querytemplate",tableDefineVO.getQueryTemplateName()) :tableDefineVO.getQueryTemplateName();
if(StringUtils.isBlank(queryTemplate)){
//璇存槑娌℃湁璁剧疆鏌ヨ妯℃澘锛岄渶瑕佺湅鐪嬪湪杩欎釜琛ㄦ牸鎵�鍦ㄧ殑缁勪欢鏈夋病鏈夎缃�
tableDefineVO = uiEngineService.getTableById(dataGridQuery.getBtmname(), dataGridQuery.getTableDefineId());
@@ -226,6 +234,10 @@
@Override
public UIFormDataVO getDataForForm(UIFormQuery formQuery) throws VciBaseException, PLException {
VciBaseUtil.alertNotNull(formQuery,"琛ㄥ崟鐨勬煡璇㈠璞�",formQuery.getBtmname(),"涓氬姟绫诲瀷鐨勪俊鎭�",formQuery.getOid(),"涓氬姟鏁版嵁鐨勪富閿�",formQuery.getFormDefineId(),"琛ㄥ崟鐨勫畾涔夌紪鍙�");
+ // TODO: 2024/12/4 Ludc 鍓嶇浼犺繃鏉ョ殑sourceData鍙傛暟鐨剉laue鍙兘鏄痡son杩欏効鍋氫竴涓嬪鐞�
+ if(Func.isNotEmpty(formQuery.getSourceData())){
+ formQuery.setSourceData(this.convertMapValueJson2Map(formQuery.getSourceData()));
+ }
UIFormDefineVO formDefineVO = uiEngineService.getFormById(formQuery.getBtmname(),formQuery.getFormDefineId());
String queryTemplate = !CollectionUtils.isEmpty(formQuery.getSourceData())? (String) formQuery.getSourceData().getOrDefault("querytemplate",formDefineVO.getQueryTemplateName()) :formDefineVO.getQueryTemplateName();
Set<String> queryFieldList = formDefineVO.getItems().stream().filter(s->!UIFieldTypeEnum.CUSTOM.getValue().equalsIgnoreCase(s.getType())).map(UIFormItemVO::getField).collect(Collectors.toSet());
@@ -326,7 +338,6 @@
/**
* 灏佽replaceMap
-
* @param sourceDataMap 鏉ユ簮鏁版嵁
* @return 鏇挎崲鍚庣殑鍊�
*/
@@ -357,6 +368,10 @@
@Override
public List<UIDataTree> getDataForTree(UITreeQuery treeQuery) throws Exception {
VciBaseUtil.alertNotNull(treeQuery,"琛ㄥ崟鐨勬煡璇㈠璞�",treeQuery.getBtmname(),"涓氬姟绫诲瀷鐨勪俊鎭�",treeQuery.getComponentOid(),"鏍戞墍鍦ㄧ殑缁勪欢鐨勪富閿�");
+ // TODO: 2024/12/4 Ludc 鍓嶇浼犺繃鏉ョ殑sourceData鍙傛暟鐨剉laue鍙兘鏄痡son杩欏効鍋氫竴涓嬪鐞�
+ if(Func.isNotEmpty(treeQuery.getSourceData())){
+ treeQuery.setSourceData(this.convertMapValueJson2Map(treeQuery.getSourceData()));
+ }
Map<String, OsAttributeVO> attributeVOMap = attrService.selectAllAttributeMap();
UIComponentVO componentVO = uiEngineService.getComponentByOid(treeQuery.getComponentOid(),attributeVOMap);
if(componentVO == null || StringUtils.isBlank(componentVO.getOid())){
@@ -570,6 +585,10 @@
@Override
public BaseResult getDataByTemp(UITreeQuery treeQuery) throws Exception {
VciBaseUtil.alertNotNull(treeQuery,"琛ㄥ崟鐨勬煡璇㈠璞�",treeQuery.getComponentOid(),"褰撳墠缁勪欢鐨勪富閿�");
+ // TODO: 2024/12/4 Ludc 鍓嶇浼犺繃鏉ョ殑sourceData鍙傛暟鐨剉laue鍙兘鏄痡son杩欏効鍋氫竴涓嬪鐞�
+ if(Func.isNotEmpty(treeQuery.getSourceData())){
+ treeQuery.setSourceData(this.convertMapValueJson2Map(treeQuery.getSourceData()));
+ }
//1銆佸厛鏌ヨ椤甸潰瀹氫箟缁勪欢
Map<String, OsAttributeVO> attributeVOMap = attrService.selectAllAttributeMap();
UIComponentVO componentVO = uiEngineService.getComponentByOid(treeQuery.getComponentOid(),attributeVOMap);
@@ -755,6 +774,16 @@
Map<String, Object> returnMap = new HashMap<>();
returnMap.put((String) cloMap.get("linktypename"),cloMap);
returnMap.put((String) cbo2Map.get("btmname"),cbo2Map);
+ // TODO: 2024/12/4 Ludc 灏嗕竴浜涢噸瑕佺殑鍚庣画鍙兘闇�瑕佺敤鍒扮殑灞炴�ф斁鍏ョ涓�灞侻ap
+ String fOid = (String)cbo2Map.get("f_oid");
+ if(Func.isNotBlank(fOid)){
+ returnMap.put("f_oid",fOid);
+ }else{
+ if(Func.isNotEmpty(cbo2Map.get("oid"))){
+ returnMap.put("oid",cbo2Map.get("oid").toString());
+ }
+ }
+
tree.setAttributes(returnMap);
tree.setIndex(i[0] + "");
i[0]++;
--
Gitblit v1.9.3