diff --git a/backend/src/main/java/io/dataease/controller/panel/PanelAppTemplateController.java b/backend/src/main/java/io/dataease/controller/panel/PanelAppTemplateController.java index f41f81a9b4..984d04326d 100644 --- a/backend/src/main/java/io/dataease/controller/panel/PanelAppTemplateController.java +++ b/backend/src/main/java/io/dataease/controller/panel/PanelAppTemplateController.java @@ -2,15 +2,12 @@ package io.dataease.controller.panel; import com.github.xiaoymin.knife4j.annotations.ApiSupport; import io.dataease.controller.handler.annotation.I18n; -import io.dataease.controller.request.panel.PanelAppTemplateApplyRequest; import io.dataease.controller.request.panel.PanelAppTemplateRequest; -import io.dataease.plugins.common.base.domain.PanelAppTemplate; import io.dataease.plugins.common.base.domain.PanelAppTemplateWithBLOBs; import io.dataease.service.panel.PanelAppTemplateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; - import javax.annotation.Resource; import java.util.List; @@ -63,12 +60,4 @@ public class PanelAppTemplateController { return panelAppTemplateService.nameCheck(request); } - @ApiOperation("应用模板") - @PostMapping("/appApply") - @I18n - public String appApply(@RequestBody PanelAppTemplateApplyRequest request) throws Exception{ -// return panelAppTemplateService.appApply(request); - return null; - } - } diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java index 460303a966..923e958cc3 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -299,7 +299,7 @@ public class DataSetTableService { @DeCleaner(value = DePermissionType.DATASET, key = "sceneId") public DatasetTable save(DataSetTableRequest datasetTable) throws Exception { checkName(datasetTable); - if (StringUtils.equalsIgnoreCase(datasetTable.getType(), DatasetType.SQL.name())&&!"appApply".equalsIgnoreCase(datasetTable.getOptFrom())) { + if (StringUtils.equalsIgnoreCase(datasetTable.getType(), DatasetType.SQL.name()) && !"appApply".equalsIgnoreCase(datasetTable.getOptFrom())) { DataSetTableRequest dataSetTableRequest = new DataSetTableRequest(); BeanUtils.copyBean(dataSetTableRequest, datasetTable); getSQLPreview(dataSetTableRequest); @@ -317,7 +317,7 @@ public class DataSetTableService { // 添加表成功后，获取当前表字段和类型，抽象到dataease数据库 if (insert == 1) { - if(datasetTable.getOptFrom()==null || !"appApply".equalsIgnoreCase(datasetTable.getOptFrom())){ + if (datasetTable.getOptFrom() == null || !"appApply".equalsIgnoreCase(datasetTable.getOptFrom())) { saveTableField(datasetTable); } extractData(datasetTable); @@ -2871,18 +2871,18 @@ public class DataSetTableService { return sql.contains(SubstitutedParams); } - public void createAppCustomDorisView(String datasetInfo,String tableId) throws Exception { + public void createAppCustomDorisView(String datasetInfo, String tableId) throws Exception { DataTableInfoDTO dataTableInfoDTO = new Gson().fromJson(datasetInfo, DataTableInfoDTO.class); createDorisView(TableUtils.tableName(tableId), getCustomViewSQL(dataTableInfoDTO, dataSetTableUnionService.listByTableId(dataTableInfoDTO.getList().get(0).getTableId()))); } - public void createAppUnionDorisView(String datasetInfo,String tableId) throws Exception { + public void createAppUnionDorisView(String datasetInfo, String tableId) throws Exception { // save field DataTableInfoDTO dataTableInfoDTO = new Gson().fromJson(datasetInfo, DataTableInfoDTO.class); Map sqlMap = getUnionSQLDoris(dataTableInfoDTO); String sql = (String) sqlMap.get("sql"); // custom 创建doris视图 - createDorisView(TableUtils.tableName(tableId),sql); + createDorisView(TableUtils.tableName(tableId), sql); } } diff --git a/backend/src/main/java/io/dataease/service/panel/PanelAppTemplateLogService.java b/backend/src/main/java/io/dataease/service/panel/PanelAppTemplateLogService.java index 5d305c47f5..366950cabe 100644 --- a/backend/src/main/java/io/dataease/service/panel/PanelAppTemplateLogService.java +++ b/backend/src/main/java/io/dataease/service/panel/PanelAppTemplateLogService.java @@ -1,34 +1,11 @@ package io.dataease.service.panel; -import com.alibaba.fastjson.JSON; -import com.google.gson.Gson; -import io.dataease.commons.constants.CommonConstants; import io.dataease.commons.utils.AuthUtils; -import io.dataease.commons.utils.BeanUtils; -import io.dataease.controller.request.dataset.DataSetTableRequest; -import io.dataease.controller.request.panel.PanelAppTemplateApplyRequest; -import io.dataease.controller.request.panel.PanelAppTemplateRequest; -import io.dataease.controller.request.panel.PanelGroupRequest; -import io.dataease.dto.dataset.DataSetTaskDTO; import io.dataease.plugins.common.base.domain.*; import io.dataease.plugins.common.base.mapper.PanelAppTemplateLogMapper; -import io.dataease.plugins.common.base.mapper.PanelAppTemplateMapper; -import io.dataease.plugins.common.constants.DatasetType; -import io.dataease.service.chart.ChartViewFieldService; -import io.dataease.service.chart.ChartViewService; -import io.dataease.service.dataset.DataSetTableFieldsService; -import io.dataease.service.dataset.DataSetTableService; -import io.dataease.service.datasource.DatasourceService; -import org.apache.commons.lang3.StringUtils; import org.pentaho.di.core.util.UUIDUtil; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.CollectionUtils; - import javax.annotation.Resource; -import java.util.HashMap; -import java.util.List; -import java.util.Map; /** * Author: wangjiahao diff --git a/backend/src/main/java/io/dataease/service/panel/PanelAppTemplateService.java b/backend/src/main/java/io/dataease/service/panel/PanelAppTemplateService.java index 775ba20898..88799a76a6 100644 --- a/backend/src/main/java/io/dataease/service/panel/PanelAppTemplateService.java +++ b/backend/src/main/java/io/dataease/service/panel/PanelAppTemplateService.java @@ -21,7 +21,6 @@ import io.dataease.service.datasource.DatasourceService; import org.apache.commons.lang3.StringUtils; import org.pentaho.di.core.util.UUIDUtil; import org.springframework.context.annotation.Lazy; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; @@ -60,40 +59,40 @@ public class PanelAppTemplateService { @Resource private DataSetGroupService dataSetGroupService; - public List list(PanelAppTemplateRequest request){ + public List list(PanelAppTemplateRequest request) { PanelAppTemplateExample example = new PanelAppTemplateExample(); - if(StringUtils.isNotEmpty(request.getPid())){ + if (StringUtils.isNotEmpty(request.getPid())) { example.createCriteria().andPidEqualTo(request.getPid()); } - if(StringUtils.isNotEmpty(request.getNodeType())){ + if (StringUtils.isNotEmpty(request.getNodeType())) { example.createCriteria().andNodeTypeEqualTo(request.getNodeType()); } return panelAppTemplateMapper.selectByExampleWithBLOBs(example); } - public void save(PanelAppTemplateRequest request){ + public void save(PanelAppTemplateRequest request) { request.setId(UUIDUtil.getUUIDAsString()); request.setCreateUser(AuthUtils.getUser().getUsername()); request.setCreateTime(System.currentTimeMillis()); - PanelAppTemplateWithBLOBs requestTemplate = new PanelAppTemplateWithBLOBs(); - BeanUtils.copyBean(requestTemplate,request); - if(StringUtils.isEmpty(requestTemplate.getNodeType())){ + PanelAppTemplateWithBLOBs requestTemplate = new PanelAppTemplateWithBLOBs(); + BeanUtils.copyBean(requestTemplate, request); + if (StringUtils.isEmpty(requestTemplate.getNodeType())) { requestTemplate.setNodeType("template"); } panelAppTemplateMapper.insertSelective(requestTemplate); } - public void update(PanelAppTemplateRequest request){ - nameCheck(CommonConstants.OPT_TYPE.UPDATE,request.getName(),request.getPid(),request.getId()); + public void update(PanelAppTemplateRequest request) { + nameCheck(CommonConstants.OPT_TYPE.UPDATE, request.getName(), request.getPid(), request.getId()); request.setUpdateUser(AuthUtils.getUser().getUsername()); request.setUpdateTime(System.currentTimeMillis()); - PanelAppTemplateWithBLOBs requestTemplate = new PanelAppTemplateWithBLOBs(); - BeanUtils.copyBean(requestTemplate,request); + PanelAppTemplateWithBLOBs requestTemplate = new PanelAppTemplateWithBLOBs(); + BeanUtils.copyBean(requestTemplate, request); panelAppTemplateMapper.updateByPrimaryKeySelective(requestTemplate); } - public void delete(String appTemplateId){ + public void delete(String appTemplateId) { panelAppTemplateMapper.deleteByPrimaryKey(appTemplateId); } @@ -118,19 +117,21 @@ public class PanelAppTemplateService { return CommonConstants.CHECK_RESULT.EXIST_ALL; } } + @Transactional(rollbackFor = Exception.class) - public Map applyDatasource(List oldDatasourceList,List newDatasourceList) throws Exception{ - Map datasourceRelaMap = new HashMap<>(); - for(int i=0;i applyDatasource(List oldDatasourceList, List newDatasourceList) throws Exception { + Map datasourceRelaMap = new HashMap<>(); + for (int i = 0; i < newDatasourceList.size(); i++) { Datasource datasource = newDatasourceList.get(0); datasource.setId(null); - Datasource newDatasource = datasourceService.addDatasource(datasource); - datasourceRelaMap.put(oldDatasourceList.get(i).getId(),newDatasource.getId()); + Datasource newDatasource = datasourceService.addDatasource(datasource); + datasourceRelaMap.put(oldDatasourceList.get(i).getId(), newDatasource.getId()); } return datasourceRelaMap; } + @Transactional(rollbackFor = Exception.class) - public void applyPanelView(List panelViewsInfo,Map chartViewsRelaMap,String panelId){ + public void applyPanelView(List panelViewsInfo, Map chartViewsRelaMap, String panelId) { Long time = System.currentTimeMillis(); String userName = AuthUtils.getUser().getUsername(); panelViewsInfo.forEach(panelView -> { @@ -142,8 +143,9 @@ public class PanelAppTemplateService { panelViewService.save(panelView); }); } + @Transactional(rollbackFor = Exception.class) - public String applyPanel(PanelGroupRequest panelInfo,Map chartViewsRelaMap,String newPanelId,String panelName,String pid){ + public String applyPanel(PanelGroupRequest panelInfo, Map chartViewsRelaMap, String newPanelId, String panelName, String pid) { panelInfo.setId(newPanelId); panelInfo.setPid(pid); panelInfo.setName(panelName); @@ -151,101 +153,105 @@ public class PanelAppTemplateService { panelInfo.setPanelType("self"); panelInfo.setCreateBy(AuthUtils.getUser().getUsername()); panelInfo.setCreateTime(System.currentTimeMillis()); - panelGroupService.newPanelFromApp(panelInfo,chartViewsRelaMap); + panelGroupService.newPanelFromApp(panelInfo, chartViewsRelaMap); return newPanelId; } @Transactional(rollbackFor = Exception.class) - public Map applyDataset(List datasetTablesInfo,Map datasourceRelaMap,String sceneId) throws Exception{ - Map datasetsRelaMap = new HashMap<>(); - for(DatasetTable datasetTable:datasetTablesInfo){ + public Map applyDataset(List datasetTablesInfo, Map datasourceRelaMap, String sceneId) throws Exception { + Map datasetsRelaMap = new HashMap<>(); + for (DatasetTable datasetTable : datasetTablesInfo) { String oldId = datasetTable.getId(); datasetTable.setId(null); datasetTable.setSceneId(sceneId); datasetTable.setDataSourceId(datasourceRelaMap.get(datasetTable.getDataSourceId())); DataSetTableRequest datasetRequest = new DataSetTableRequest(); - BeanUtils.copyBean(datasetRequest,datasetTable); + BeanUtils.copyBean(datasetRequest, datasetTable); datasetRequest.setOptFrom("appApply"); DatasetTable newDataset = dataSetTableService.save(datasetRequest); - datasetsRelaMap.put(oldId,newDataset.getId()); + datasetsRelaMap.put(oldId, newDataset.getId()); } return datasetsRelaMap; } + @Transactional(rollbackFor = Exception.class) - public Map applyDatasetField(List datasetTableFieldsInfo ,Map datasetsRelaMap ){ - Map datasetFieldsRelaMap = new HashMap<>(); - for(DatasetTableField datasetTableField:datasetTableFieldsInfo){ + public Map applyDatasetField(List datasetTableFieldsInfo, Map datasetsRelaMap) { + Map datasetFieldsRelaMap = new HashMap<>(); + for (DatasetTableField datasetTableField : datasetTableFieldsInfo) { String oldId = datasetTableField.getId(); datasetTableField.setTableId(datasetsRelaMap.get(datasetTableField.getTableId())); DatasetTableField newTableField = dataSetTableFieldsService.save(datasetTableField); - datasetFieldsRelaMap.put(oldId,newTableField.getId()); + datasetFieldsRelaMap.put(oldId, newTableField.getId()); } return datasetFieldsRelaMap; } + @Transactional(rollbackFor = Exception.class) - public void resetCustomAndUnionDataset(List datasetTablesInfo, Map datasetRelaMap, Map datasetFieldsRelaMap) throws Exception{ - for(DatasetTable datasetTable:datasetTablesInfo ){ - if((DatasetType.CUSTOM.name().equalsIgnoreCase(datasetTable.getType())||DatasetType.UNION.name().equalsIgnoreCase(datasetTable.getType()))){ - datasetRelaMap.forEach((k,v)->{ - datasetTable.setInfo(datasetTable.getInfo().replaceAll(k,v)); + public void resetCustomAndUnionDataset(List datasetTablesInfo, Map datasetRelaMap, Map datasetFieldsRelaMap) throws Exception { + for (DatasetTable datasetTable : datasetTablesInfo) { + if ((DatasetType.CUSTOM.name().equalsIgnoreCase(datasetTable.getType()) || DatasetType.UNION.name().equalsIgnoreCase(datasetTable.getType()))) { + datasetRelaMap.forEach((k, v) -> { + datasetTable.setInfo(datasetTable.getInfo().replaceAll(k, v)); }); - datasetFieldsRelaMap.forEach((k,v)->{ - datasetTable.setInfo(datasetTable.getInfo().replaceAll(k,v)); + datasetFieldsRelaMap.forEach((k, v) -> { + datasetTable.setInfo(datasetTable.getInfo().replaceAll(k, v)); }); - if(1 == datasetTable.getMode()){ - if(DatasetType.CUSTOM.name().equalsIgnoreCase(datasetTable.getType())){ - dataSetTableService.createAppCustomDorisView(datasetTable.getInfo(),datasetTable.getId()); - }else if(DatasetType.UNION.name().equalsIgnoreCase(datasetTable.getType())){ - dataSetTableService.createAppUnionDorisView(datasetTable.getInfo(),datasetTable.getId()); + if (1 == datasetTable.getMode()) { + if (DatasetType.CUSTOM.name().equalsIgnoreCase(datasetTable.getType())) { + dataSetTableService.createAppCustomDorisView(datasetTable.getInfo(), datasetTable.getId()); + } else if (DatasetType.UNION.name().equalsIgnoreCase(datasetTable.getType())) { + dataSetTableService.createAppUnionDorisView(datasetTable.getInfo(), datasetTable.getId()); } } } } } + @Transactional(rollbackFor = Exception.class) - public Map applyViews(List chartViewsInfo,Map datasetsRelaMap,Map datasetFieldsRelaMap,String sceneId) throws Exception{ - Map chartViewsRelaMap = new HashMap<>(); - for(ChartViewWithBLOBs chartView:chartViewsInfo){ + public Map applyViews(List chartViewsInfo, Map datasetsRelaMap, Map datasetFieldsRelaMap, String sceneId) throws Exception { + Map chartViewsRelaMap = new HashMap<>(); + for (ChartViewWithBLOBs chartView : chartViewsInfo) { String oldViewId = chartView.getId(); // 替换datasetId chartView.setTableId(datasetsRelaMap.get(chartView.getTableId())); - datasetsRelaMap.forEach((k,v)->{ - chartView.setXAxis(chartView.getXAxis().replaceAll(k,v)); - chartView.setXAxisExt(chartView.getXAxisExt().replaceAll(k,v)); - chartView.setYAxis(chartView.getYAxis().replaceAll(k,v)); - chartView.setYAxisExt(chartView.getYAxisExt().replaceAll(k,v)); - chartView.setExtStack(chartView.getExtStack().replaceAll(k,v)); - chartView.setExtBubble(chartView.getExtBubble().replaceAll(k,v)); - chartView.setCustomAttr(chartView.getCustomAttr().replaceAll(k,v)); - chartView.setCustomStyle(chartView.getCustomStyle().replaceAll(k,v)); - chartView.setCustomFilter(chartView.getCustomFilter().replaceAll(k,v)); - chartView.setDrillFields(chartView.getDrillFields().replaceAll(k,v)); + datasetsRelaMap.forEach((k, v) -> { + chartView.setXAxis(chartView.getXAxis().replaceAll(k, v)); + chartView.setXAxisExt(chartView.getXAxisExt().replaceAll(k, v)); + chartView.setYAxis(chartView.getYAxis().replaceAll(k, v)); + chartView.setYAxisExt(chartView.getYAxisExt().replaceAll(k, v)); + chartView.setExtStack(chartView.getExtStack().replaceAll(k, v)); + chartView.setExtBubble(chartView.getExtBubble().replaceAll(k, v)); + chartView.setCustomAttr(chartView.getCustomAttr().replaceAll(k, v)); + chartView.setCustomStyle(chartView.getCustomStyle().replaceAll(k, v)); + chartView.setCustomFilter(chartView.getCustomFilter().replaceAll(k, v)); + chartView.setDrillFields(chartView.getDrillFields().replaceAll(k, v)); }); //替换datasetFieldId - datasetFieldsRelaMap.forEach((k,v)->{ - chartView.setXAxis(chartView.getXAxis().replaceAll(k,v)); - chartView.setXAxisExt(chartView.getXAxisExt().replaceAll(k,v)); - chartView.setYAxis(chartView.getYAxis().replaceAll(k,v)); - chartView.setYAxisExt(chartView.getYAxisExt().replaceAll(k,v)); - chartView.setExtStack(chartView.getExtStack().replaceAll(k,v)); - chartView.setExtBubble(chartView.getExtBubble().replaceAll(k,v)); - chartView.setCustomAttr(chartView.getCustomAttr().replaceAll(k,v)); - chartView.setCustomStyle(chartView.getCustomStyle().replaceAll(k,v)); - chartView.setCustomFilter(chartView.getCustomFilter().replaceAll(k,v)); - chartView.setDrillFields(chartView.getDrillFields().replaceAll(k,v)); + datasetFieldsRelaMap.forEach((k, v) -> { + chartView.setXAxis(chartView.getXAxis().replaceAll(k, v)); + chartView.setXAxisExt(chartView.getXAxisExt().replaceAll(k, v)); + chartView.setYAxis(chartView.getYAxis().replaceAll(k, v)); + chartView.setYAxisExt(chartView.getYAxisExt().replaceAll(k, v)); + chartView.setExtStack(chartView.getExtStack().replaceAll(k, v)); + chartView.setExtBubble(chartView.getExtBubble().replaceAll(k, v)); + chartView.setCustomAttr(chartView.getCustomAttr().replaceAll(k, v)); + chartView.setCustomStyle(chartView.getCustomStyle().replaceAll(k, v)); + chartView.setCustomFilter(chartView.getCustomFilter().replaceAll(k, v)); + chartView.setDrillFields(chartView.getDrillFields().replaceAll(k, v)); }); chartView.setId(null); chartView.setSceneId(sceneId); ChartViewWithBLOBs newOne = chartViewService.newOne(chartView); - chartViewsRelaMap.put(oldViewId,newOne.getId()); + chartViewsRelaMap.put(oldViewId, newOne.getId()); } return chartViewsRelaMap; } + @Transactional(rollbackFor = Exception.class) - public Map applyViewsField(List chartViewFieldsInfo,Map chartViewsRelaMap,Map datasetsRelaMap,Map datasetFieldsRelaMap){ - Map chartViewFieldsRelaMap = new HashMap<>(); - if(!CollectionUtils.isEmpty(chartViewFieldsInfo)){ - for(ChartViewField chartViewField:chartViewFieldsInfo){ + public Map applyViewsField(List chartViewFieldsInfo, Map chartViewsRelaMap, Map datasetsRelaMap, Map datasetFieldsRelaMap) { + Map chartViewFieldsRelaMap = new HashMap<>(); + if (!CollectionUtils.isEmpty(chartViewFieldsInfo)) { + for (ChartViewField chartViewField : chartViewFieldsInfo) { String oldChartFieldId = chartViewField.getId(); chartViewField.setId(null); //替换datasetId @@ -253,24 +259,24 @@ public class PanelAppTemplateService { //替换chartViewId chartViewField.setChartId(chartViewsRelaMap.get(chartViewField.getId())); //替换datasetFieldId - datasetFieldsRelaMap.forEach((k,v)->{ - chartViewField.setOriginName(chartViewField.getOriginName().replaceAll(k,v)); + datasetFieldsRelaMap.forEach((k, v) -> { + chartViewField.setOriginName(chartViewField.getOriginName().replaceAll(k, v)); }); ChartViewField newChartViewField = chartViewFieldService.save(chartViewField); - chartViewFieldsRelaMap.put(oldChartFieldId,newChartViewField.getId()); + chartViewFieldsRelaMap.put(oldChartFieldId, newChartViewField.getId()); } } return chartViewFieldsRelaMap; } - public void nameCheck(PanelAppTemplateApplyRequest request){ - panelGroupService.checkPanelName(request.getPanelName(),request.getPanelId(), PanelConstants.OPT_TYPE_UPDATE,null,null); + public void nameCheck(PanelAppTemplateApplyRequest request) { + panelGroupService.checkPanelName(request.getPanelName(), request.getPanelId(), PanelConstants.OPT_TYPE_INSERT, null, "panel"); DatasetGroup datasetGroup = new DatasetGroup(); datasetGroup.setPid(request.getDatasetGroupId()); datasetGroup.setName(request.getDatasetGroupName()); dataSetGroupService.checkName(datasetGroup); request.getDatasourceList().stream().forEach(datasource -> { - datasourceService.checkName(datasource.getName(),datasource.getType(),null); + datasourceService.checkName(datasource.getName(), datasource.getType(), null); }); } diff --git a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java index f96c627f61..68ce807eeb 100644 --- a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java +++ b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java @@ -1,9 +1,9 @@ package io.dataease.service.panel; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; import io.dataease.auth.annotation.DeCleaner; import io.dataease.commons.constants.*; import io.dataease.commons.utils.*; @@ -33,6 +33,7 @@ import io.dataease.listener.util.CacheUtils; import io.dataease.plugins.common.base.domain.*; import io.dataease.plugins.common.base.mapper.*; import io.dataease.plugins.common.constants.DeTypeConstants; +import io.dataease.plugins.common.dto.dataset.SqlVariableDetails; import io.dataease.service.chart.ChartGroupService; import io.dataease.service.chart.ChartViewService; import io.dataease.service.dataset.DataSetGroupService; @@ -829,21 +830,21 @@ public class PanelGroupService { //查询应用信息 PanelAppTemplateWithBLOBs appInfo = panelAppTemplateMapper.selectByPrimaryKey(request.getAppTemplateId()); //1.获取所有视图信息 - List chartViewsInfo = JSON.parseArray(appInfo.getChartViewsInfo(),ChartViewWithBLOBs.class); + List chartViewsInfo = gson.fromJson(appInfo.getChartViewsInfo(), new TypeToken>(){}.getType()); //2.获取视图扩展字段信息 - List chartViewFieldsInfo = JSON.parseArray(appInfo.getChartViewFieldsInfo(),ChartViewField.class); + List chartViewFieldsInfo = gson.fromJson(appInfo.getChartViewFieldsInfo(), new TypeToken>(){}.getType()); //3.获取所有数据集信息 - List datasetTablesInfo = JSON.parseArray(appInfo.getDatasetTablesInfo(),DatasetTable.class); + List datasetTablesInfo = gson.fromJson(appInfo.getDatasetTablesInfo(), new TypeToken>(){}.getType()); //4.获取所有数据集字段信息 - List datasetTableFieldsInfo = JSON.parseArray(appInfo.getDatasetTableFieldsInfo(),DatasetTableField.class); + List datasetTableFieldsInfo = gson.fromJson(appInfo.getDatasetTableFieldsInfo(), new TypeToken>(){}.getType()); //5.获取所有任务信息 - List dataSetTasksInfo = JSON.parseArray(appInfo.getDatasetTasksInfo(),DataSetTaskDTO.class); + List dataSetTasksInfo = gson.fromJson(appInfo.getDatasetTasksInfo(), new TypeToken>(){}.getType()); //6.获取所有数据源信息 - List oldDatasourceInfo = JSON.parseArray(appInfo.getDatasourceInfo(),Datasource.class); + List oldDatasourceInfo = gson.fromJson(appInfo.getDatasourceInfo(), new TypeToken>(){}.getType()); //获取仪表板信息 - PanelGroupRequest panelInfo = JSON.parseObject(appInfo.getPanelInfo(),PanelGroupRequest.class); + PanelGroupRequest panelInfo = gson.fromJson(appInfo.getPanelInfo(),PanelGroupRequest.class); //获取仪表板视图信息 - List panelViewsInfo = JSON.parseArray(appInfo.getPanelViewsInfo(),PanelView.class); + List panelViewsInfo = gson.fromJson(appInfo.getPanelViewsInfo(), new TypeToken>(){}.getType()); Map datasourceRelaMap = panelAppTemplateService.applyDatasource(oldDatasourceInfo,request.getDatasourceList()); diff --git a/backend/src/main/resources/i18n/messages_zh_CN.properties b/backend/src/main/resources/i18n/messages_zh_CN.properties index c09261929f..ca5ee13079 100644 --- a/backend/src/main/resources/i18n/messages_zh_CN.properties +++ b/backend/src/main/resources/i18n/messages_zh_CN.properties @@ -1,7 +1,7 @@ \u4E2A\u4EBA\u4FE1\u606F=\u4E2A\u4EBA\u4FE1\u606F \u4EEA\u8868\u677F=\u4EEA\u8868\u677F \u6A21\u677F\u5E02\u573A=\u6A21\u677F\u5E02\u573A -\u5E94\u7528\u5E02\u573A=\u5E94\u7528\u5E02\u5834 +\u5E94\u7528\u5E02\u573A=\u5E94\u7528\u5E02\u573A \u5E94\u7528\u7BA1\u7406=\u5E94\u7528\u7BA1\u7406 \u4FEE\u6539\u5BC6\u7801=\u4FEE\u6539\u5BC6\u7801 \u521B\u5EFA\u7528\u6237=\u521B\u5EFA\u7528\u6237 diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 3e290a98e9..3b5f04c910 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -2487,6 +2487,8 @@ export default { app_group_icon: 'Cover icon', app_name: 'Application name', search_by_keyword:'Search by keyword', - apply_logs:'Apply logs' + apply_logs:'Apply logs', + app_group_delete_tips: 'Are you sure to delete this application category?', + app_group_delete_content: 'After deletion, all application templates in this category will also be deleted.' } } diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index e21db2f6c9..fd96439103 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -2487,6 +2487,9 @@ export default { no_apps: '暫無應用', app_group_icon: '封面圖標', app_name: '應用名稱', - search_by_keyword:'通過關鍵字搜索' + search_by_keyword:'通過關鍵字搜索', + apply_logs:'應用記錄', + app_group_delete_tips: '確定刪除該應用分類嗎?', + app_group_delete_content: '刪除後，該分類中所有的應用模闆也將被刪除。' } } diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 22a3f137f9..14e91bc5ae 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -2487,6 +2487,9 @@ export default { no_apps: '暂无应用', app_group_icon: '封面图标', app_name: '应用名称', - search_by_keyword:'通过关键字搜索' + search_by_keyword:'通过关键字搜索', + apply_logs:'应用记录', + app_group_delete_tips: '确定删除该应用分类吗?', + app_group_delete_content: '删除后，该分类中所有的应用模板也将被删除。' } } diff --git a/frontend/src/views/panel/appTemplate/component/TemplateItem.vue b/frontend/src/views/panel/appTemplate/component/TemplateItem.vue index 1b477388e3..588f91ca28 100644 --- a/frontend/src/views/panel/appTemplate/component/TemplateItem.vue +++ b/frontend/src/views/panel/appTemplate/component/TemplateItem.vue @@ -1,7 +1,7 @@