diff --git a/backend/pom.xml b/backend/pom.xml index e3370c8d27..7539ed412b 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -384,7 +384,7 @@ **/* - false + true @@ -414,6 +414,12 @@ true + + org.apache.maven.plugins + maven-resources-plugin + 2.4.3 + + maven-clean-plugin diff --git a/backend/src/main/java/io/dataease/auth/api/AuthApi.java b/backend/src/main/java/io/dataease/auth/api/AuthApi.java index d21dd55365..5cdbd7151c 100644 --- a/backend/src/main/java/io/dataease/auth/api/AuthApi.java +++ b/backend/src/main/java/io/dataease/auth/api/AuthApi.java @@ -1,5 +1,6 @@ package io.dataease.auth.api; +import com.github.xiaoymin.knife4j.annotations.ApiSupport; import io.dataease.auth.api.dto.CurrentUserDto; import io.dataease.auth.api.dto.LoginDto; import io.swagger.annotations.Api; @@ -12,6 +13,7 @@ import java.util.Map; @Api(tags = "权限：权限管理") +@ApiSupport(order = 10) @RequestMapping("/api/auth") public interface AuthApi { diff --git a/backend/src/main/java/io/dataease/auth/api/DynamicMenuApi.java b/backend/src/main/java/io/dataease/auth/api/DynamicMenuApi.java index d25e0b8657..790c4917bb 100644 --- a/backend/src/main/java/io/dataease/auth/api/DynamicMenuApi.java +++ b/backend/src/main/java/io/dataease/auth/api/DynamicMenuApi.java @@ -1,14 +1,17 @@ package io.dataease.auth.api; +import com.github.xiaoymin.knife4j.annotations.ApiSupport; import io.dataease.auth.api.dto.DynamicMenuDto; import io.dataease.controller.handler.annotation.I18n; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import java.util.List; @Api(tags = "权限：动态菜单") +@ApiSupport(order = 20) @RequestMapping("/api/dynamicMenu") public interface DynamicMenuApi { @@ -16,6 +19,7 @@ public interface DynamicMenuApi { * 根据heads中获取的token 获取username 获取对应权限的菜单 * @return */ + @ApiOperation("查询") @PostMapping("/menus") @I18n List menus(); diff --git a/backend/src/main/java/io/dataease/auth/filter/F2CLinkFilter.java b/backend/src/main/java/io/dataease/auth/filter/F2CLinkFilter.java index 8cca8edbf7..94a43bce52 100644 --- a/backend/src/main/java/io/dataease/auth/filter/F2CLinkFilter.java +++ b/backend/src/main/java/io/dataease/auth/filter/F2CLinkFilter.java @@ -34,10 +34,14 @@ public class F2CLinkFilter extends AnonymousFilter { String id = resourceId.asString(); PanelLink panelLink = LinkUtil.queryLink(id); if (ObjectUtil.isEmpty(panelLink)) return false; + String pwd; if (!panelLink.getEnablePwd()) { panelLink.setPwd("dataease"); + pwd = panelLink.getPwd(); + }else { + pwd = RsaUtil.decryptByPrivateKey(RsaProperties.privateKey, panelLink.getPwd()); } - return JWTUtils.verifyLink(link_token, id, RsaUtil.decryptByPrivateKey(RsaProperties.privateKey, panelLink.getPwd())); + return JWTUtils.verifyLink(link_token, id, pwd); }catch (Exception e) { LogUtil.error(e); } diff --git a/backend/src/main/java/io/dataease/auth/filter/JWTFilter.java b/backend/src/main/java/io/dataease/auth/filter/JWTFilter.java index 1c45756a52..ba23292a7a 100644 --- a/backend/src/main/java/io/dataease/auth/filter/JWTFilter.java +++ b/backend/src/main/java/io/dataease/auth/filter/JWTFilter.java @@ -49,6 +49,9 @@ public class JWTFilter extends BasicHttpAuthenticationFilter { protected boolean executeLogin(ServletRequest request, ServletResponse response) throws Exception { HttpServletRequest httpServletRequest = (HttpServletRequest) request; String authorization = httpServletRequest.getHeader("Authorization"); + if (StringUtils.startsWith(authorization, "Basic")) { + return false; + } // 当没有出现登录超时 且需要刷新token 则执行刷新token if (JWTUtils.loginExpire(authorization)){ throw new AuthenticationException(expireMessage); diff --git a/backend/src/main/java/io/dataease/auth/server/AuthServer.java b/backend/src/main/java/io/dataease/auth/server/AuthServer.java index 09a311c22c..74bf04c371 100644 --- a/backend/src/main/java/io/dataease/auth/server/AuthServer.java +++ b/backend/src/main/java/io/dataease/auth/server/AuthServer.java @@ -12,6 +12,7 @@ import io.dataease.auth.util.JWTUtils; import io.dataease.auth.util.RsaUtil; import io.dataease.commons.utils.BeanUtils; import io.dataease.commons.utils.CodingUtil; +import io.dataease.commons.utils.LogUtil; import io.dataease.commons.utils.ServletUtils; import io.dataease.exception.DataEaseException; @@ -84,8 +85,17 @@ public class AuthServer implements AuthApi { @Override public String logout() { String token = ServletUtils.getToken(); - Long userId = JWTUtils.tokenInfoByToken(token).getUserId(); - authUserService.clearCache(userId); + if (StringUtils.isEmpty(token) || StringUtils.equals("null", token) || StringUtils.equals("undefined", token)) { + return "success"; + } + try{ + Long userId = JWTUtils.tokenInfoByToken(token).getUserId(); + authUserService.clearCache(userId); + }catch (Exception e) { + LogUtil.error(e); + return "fail"; + } + return "success"; } diff --git a/backend/src/main/java/io/dataease/auth/service/impl/ExtAuthServiceImpl.java b/backend/src/main/java/io/dataease/auth/service/impl/ExtAuthServiceImpl.java index f38f9272a0..07eccc92c1 100644 --- a/backend/src/main/java/io/dataease/auth/service/impl/ExtAuthServiceImpl.java +++ b/backend/src/main/java/io/dataease/auth/service/impl/ExtAuthServiceImpl.java @@ -52,11 +52,11 @@ public class ExtAuthServiceImpl implements ExtAuthService { } if (!CollectionUtils.isEmpty(authMap.get("role"))) { - authURD.setUserIds(authMap.get("role").stream().map(item -> Long.parseLong(item.getAuthTarget())).collect(Collectors.toList())); + authURD.setRoleIds(authMap.get("role").stream().map(item -> Long.parseLong(item.getAuthTarget())).collect(Collectors.toList())); } if (!CollectionUtils.isEmpty(authMap.get("dept"))) { - authURD.setUserIds(authMap.get("dept").stream().map(item -> Long.parseLong(item.getAuthTarget())).collect(Collectors.toList())); + authURD.setDeptIds(authMap.get("dept").stream().map(item -> Long.parseLong(item.getAuthTarget())).collect(Collectors.toList())); } return authURD; } diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtSysMsgMapper.java b/backend/src/main/java/io/dataease/base/mapper/ext/ExtSysMsgMapper.java index 110b76dafb..a04c3f07ab 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtSysMsgMapper.java +++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtSysMsgMapper.java @@ -2,7 +2,7 @@ package io.dataease.base.mapper.ext; import io.dataease.base.domain.SysMsgExample; import io.dataease.base.domain.SysMsgSetting; -import io.dataease.controller.message.dto.MsgGridDto; +import io.dataease.controller.sys.response.MsgGridDto; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtSysMsgMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtSysMsgMapper.xml index 567993eef3..a102c9f6d2 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtSysMsgMapper.xml +++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtSysMsgMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/backend/src/main/java/io/dataease/config/Knife4jConfiguration.java b/backend/src/main/java/io/dataease/config/Knife4jConfiguration.java index 0a9717caf4..c8174f6e31 100644 --- a/backend/src/main/java/io/dataease/config/Knife4jConfiguration.java +++ b/backend/src/main/java/io/dataease/config/Knife4jConfiguration.java @@ -3,6 +3,7 @@ package io.dataease.config; import cn.hutool.core.collection.CollectionUtil; import com.github.xiaoymin.knife4j.spring.extension.OpenApiExtensionResolver; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; @@ -24,6 +25,9 @@ public class Knife4jConfiguration { private final OpenApiExtensionResolver openApiExtensionResolver; + @Value("${app.version}") + private String version; + @Autowired public Knife4jConfiguration(OpenApiExtensionResolver openApiExtensionResolver) { @@ -63,24 +67,20 @@ public class Knife4jConfiguration { private ApiInfo apiInfo(){ return new ApiInfoBuilder() - .title("DataEase很棒~~~！！！") - .license("杭州飞致云信息科技有限公司 1.0-b9") - .description("人人可用的可视化工具") - .termsOfServiceUrl("http://fit2cloud.com/") + .title("DataEase") + .description("人人可用的开源数据可视化分析工具") + .termsOfServiceUrl("https://dataease.io") .contact(new Contact("fit2cloud","https://www.fit2cloud.com/dataease/index.html","dataease@fit2cloud.com")) - .version("1.0") + .version(version) .build(); } private Docket defaultApi(String groupName, String packageName) { List securitySchemes=new ArrayList<>(); + securitySchemes.add(apiKey()); List securityContexts = new ArrayList<>(); securityContexts.add(securityContext()); - HttpAuthenticationScheme httpAuthenticationScheme = HttpAuthenticationScheme.JWT_BEARER_BUILDER - .name(HttpHeaders.AUTHORIZATION) - .description("Bearer Token") - .build(); - securitySchemes.add(httpAuthenticationScheme); + Docket docket=new Docket(DocumentationType.OAS_30) .apiInfo(apiInfo()) .groupName(groupName) @@ -100,12 +100,16 @@ public class Knife4jConfiguration { .build(); } + private ApiKey apiKey() { + return new ApiKey("Authorization", "Authorization", "header"); + } + List defaultAuth() { AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything"); AuthorizationScope[] authorizationScopes = new AuthorizationScope[1]; authorizationScopes[0] = authorizationScope; - return CollectionUtil.newArrayList(new SecurityReference("BearerToken", authorizationScopes)); + return CollectionUtil.newArrayList(new SecurityReference("Authorization", authorizationScopes)); } } diff --git a/backend/src/main/java/io/dataease/controller/chart/ChartController.java b/backend/src/main/java/io/dataease/controller/chart/ChartController.java index e0e02d577a..9497adbce9 100644 --- a/backend/src/main/java/io/dataease/controller/chart/ChartController.java +++ b/backend/src/main/java/io/dataease/controller/chart/ChartController.java @@ -1,18 +1,24 @@ package io.dataease.controller.chart; import com.alibaba.fastjson.JSON; +import com.github.xiaoymin.knife4j.annotations.ApiSupport; import io.dataease.controller.request.dataset.DataSetTableRequest; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; import java.util.ArrayList; import java.util.List; +@Api(tags = "视图：视图管理") +@ApiSupport(order = 110) @RestController @RequestMapping("chart/table") public class ChartController { + @ApiOperation("查询") @PostMapping("list") public List list(@RequestBody DataSetTableRequest dataSetTableRequest) { return new ArrayList<>(); diff --git a/backend/src/main/java/io/dataease/controller/chart/ChartGroupController.java b/backend/src/main/java/io/dataease/controller/chart/ChartGroupController.java index 80bd9f956f..783a48c74a 100644 --- a/backend/src/main/java/io/dataease/controller/chart/ChartGroupController.java +++ b/backend/src/main/java/io/dataease/controller/chart/ChartGroupController.java @@ -1,40 +1,51 @@ package io.dataease.controller.chart; +import com.github.xiaoymin.knife4j.annotations.ApiSupport; import io.dataease.base.domain.ChartGroup; import io.dataease.controller.request.chart.ChartGroupRequest; import io.dataease.dto.chart.ChartGroupDTO; import io.dataease.service.chart.ChartGroupService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; import javax.annotation.Resource; import java.util.List; +@Api(tags = "视图：视图组") +@ApiSupport(order = 120) @RestController @RequestMapping("chart/group") public class ChartGroupController { @Resource private ChartGroupService chartGroupService; + @ApiOperation("保存") @PostMapping("/save") public ChartGroupDTO save(@RequestBody ChartGroup ChartGroup) { return chartGroupService.save(ChartGroup); } + @ApiOperation("查询树") @PostMapping("/tree") public List tree(@RequestBody ChartGroupRequest ChartGroup) { return chartGroupService.tree(ChartGroup); } + @ApiOperation("查询树节点") @PostMapping("/treeNode") public List treeNode(@RequestBody ChartGroupRequest ChartGroup) { return chartGroupService.tree(ChartGroup); } + @ApiOperation("删除") @PostMapping("/delete/{id}") public void tree(@PathVariable String id) { chartGroupService.delete(id); } + @ApiIgnore @PostMapping("/getScene/{id}") public ChartGroup getScene(@PathVariable String id) { return chartGroupService.getScene(id); diff --git a/backend/src/main/java/io/dataease/controller/chart/ChartViewController.java b/backend/src/main/java/io/dataease/controller/chart/ChartViewController.java index ad43882cc3..5b50abc369 100644 --- a/backend/src/main/java/io/dataease/controller/chart/ChartViewController.java +++ b/backend/src/main/java/io/dataease/controller/chart/ChartViewController.java @@ -1,5 +1,6 @@ package io.dataease.controller.chart; +import com.github.xiaoymin.knife4j.annotations.ApiSupport; import io.dataease.base.domain.ChartViewWithBLOBs; import io.dataease.commons.utils.AuthUtils; import io.dataease.controller.request.chart.ChartExtRequest; @@ -8,7 +9,10 @@ import io.dataease.controller.request.dataset.DataSetTableRequest; import io.dataease.dto.chart.ChartViewDTO; import io.dataease.dto.dataset.DataSetTableDTO; import io.dataease.service.chart.ChartViewService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; import javax.annotation.Resource; import java.util.List; @@ -18,57 +22,69 @@ import java.util.Map; * @Author gin * @Date 2021/3/1 1:17 下午 */ +@Api(tags = "视图：视图域") +@ApiSupport(order = 130) @RestController @RequestMapping("/chart/view") public class ChartViewController { @Resource private ChartViewService chartViewService; + @ApiOperation("保存") @PostMapping("/save") public ChartViewWithBLOBs save(@RequestBody ChartViewWithBLOBs chartViewWithBLOBs) { return chartViewService.save(chartViewWithBLOBs); } + @ApiOperation("查询") @PostMapping("/list") public List list(@RequestBody ChartViewRequest chartViewRequest) { return chartViewService.list(chartViewRequest); } + @ApiOperation("查询组") @PostMapping("/listAndGroup") public List listAndGroup(@RequestBody ChartViewRequest chartViewRequest) { return chartViewService.listAndGroup(chartViewRequest); } + @ApiOperation("详息") @PostMapping("/get/{id}") public ChartViewWithBLOBs get(@PathVariable String id) { return chartViewService.get(id); } + @ApiOperation("删除") @PostMapping("/delete/{id}") public void delete(@PathVariable String id) { chartViewService.delete(id); } + @ApiOperation("数据") @PostMapping("/getData/{id}") public ChartViewDTO getData(@PathVariable String id, @RequestBody ChartExtRequest requestList) throws Exception { return chartViewService.getData(id, requestList); } + @ApiOperation("视图详情") @PostMapping("chartDetail/{id}") public Map chartDetail(@PathVariable String id) { return chartViewService.getChartDetail(id); } + @ApiOperation("复制") @PostMapping("chartCopy/{id}") public String chartCopy(@PathVariable String id) { return chartViewService.chartCopy(id); } + @ApiIgnore @GetMapping("searchAdviceSceneId/{panelId}") public String searchAdviceSceneId(@PathVariable String panelId) { return chartViewService.searchAdviceSceneId(panelId); } + @ApiOperation("根据权限查详情") @PostMapping("/getOneWithPermission/{id}") public ChartViewDTO getOneWithPermission(@PathVariable String id, @RequestBody ChartExtRequest requestList) throws Exception { //如果能获取用户 则添加对应的权限 @@ -80,7 +96,7 @@ public class ChartViewController { return dto; } - + @ApiOperation("搜索") @PostMapping("search") public List search(@RequestBody ChartViewRequest chartViewRequest) { return chartViewService.search(chartViewRequest); diff --git a/backend/src/main/java/io/dataease/controller/dataset/DataSetGroupController.java b/backend/src/main/java/io/dataease/controller/dataset/DataSetGroupController.java index 91de251ca2..0a52e11796 100644 --- a/backend/src/main/java/io/dataease/controller/dataset/DataSetGroupController.java +++ b/backend/src/main/java/io/dataease/controller/dataset/DataSetGroupController.java @@ -1,11 +1,15 @@ package io.dataease.controller.dataset; +import com.github.xiaoymin.knife4j.annotations.ApiSupport; import io.dataease.base.domain.DatasetGroup; import io.dataease.controller.request.dataset.DataSetGroupRequest; import io.dataease.dto.dataset.DataSetGroupDTO; import io.dataease.service.dataset.DataSetGroupService; import io.dataease.service.dataset.ExtractDataService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; import javax.annotation.Resource; import java.util.List; @@ -14,6 +18,8 @@ import java.util.List; * @Author gin * @Date 2021/2/20 8:29 下午 */ +@Api(tags = "数据集：数据集组") +@ApiSupport(order = 40) @RestController @RequestMapping("dataset/group") public class DataSetGroupController { @@ -22,31 +28,37 @@ public class DataSetGroupController { @Resource private ExtractDataService extractDataService; + @ApiOperation("保存") @PostMapping("/save") public DataSetGroupDTO save(@RequestBody DatasetGroup datasetGroup) { return dataSetGroupService.save(datasetGroup); } + @ApiOperation("查询树") @PostMapping("/tree") public List tree(@RequestBody DataSetGroupRequest datasetGroup) { return dataSetGroupService.tree(datasetGroup); } + @ApiOperation("查询树节点") @PostMapping("/treeNode") public List treeNode(@RequestBody DataSetGroupRequest datasetGroup) { return dataSetGroupService.treeNode(datasetGroup); } + @ApiOperation("删除") @PostMapping("/delete/{id}") public void tree(@PathVariable String id) throws Exception { dataSetGroupService.delete(id); } + @ApiIgnore @PostMapping("/getScene/{id}") public DatasetGroup getScene(@PathVariable String id) { return dataSetGroupService.getScene(id); } + @ApiOperation("检测kettle") @PostMapping("/isKettleRunning") public boolean isKettleRunning() { return extractDataService.isKettleRunning(); diff --git a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java index 2ab3bd8075..0d952442be 100644 --- a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java +++ b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java @@ -1,5 +1,6 @@ package io.dataease.controller.dataset; +import com.github.xiaoymin.knife4j.annotations.ApiSupport; import io.dataease.base.domain.DatasetTable; import io.dataease.base.domain.DatasetTableField; import io.dataease.base.domain.DatasetTableIncrementalConfig; @@ -7,6 +8,8 @@ import io.dataease.controller.request.dataset.DataSetTableRequest; import io.dataease.datasource.dto.TableFiled; import io.dataease.dto.dataset.DataSetTableDTO; import io.dataease.service.dataset.DataSetTableService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -18,97 +21,117 @@ import java.util.Map; * @Author gin * @Date 2021/2/20 8:29 下午 */ +@Api(tags = "数据集：数据集表") +@ApiSupport(order = 50) @RestController @RequestMapping("dataset/table") public class DataSetTableController { @Resource private DataSetTableService dataSetTableService; + @ApiOperation("批量保存") @PostMapping("batchAdd") public void batchAdd(@RequestBody List datasetTable) throws Exception { dataSetTableService.batchInsert(datasetTable); } + @ApiOperation("更新") @PostMapping("update") public DatasetTable save(@RequestBody DataSetTableRequest datasetTable) throws Exception { return dataSetTableService.save(datasetTable); } + @ApiOperation("删除") @PostMapping("delete/{id}") public void delete(@PathVariable String id) throws Exception { dataSetTableService.delete(id); } + @ApiOperation("查询") @PostMapping("list") public List list(@RequestBody DataSetTableRequest dataSetTableRequest) { return dataSetTableService.list(dataSetTableRequest); } + @ApiOperation("查询组") @PostMapping("listAndGroup") public List listAndGroup(@RequestBody DataSetTableRequest dataSetTableRequest) { return dataSetTableService.listAndGroup(dataSetTableRequest); } + @ApiOperation("详息") @PostMapping("get/{id}") public DatasetTable get(@PathVariable String id) { return dataSetTableService.get(id); } + @ApiOperation("带权限查询") @PostMapping("getWithPermission/{id}") public DataSetTableDTO getWithPermission(@PathVariable String id) { return dataSetTableService.getWithPermission(id); } + @ApiOperation("查询原始字段") @PostMapping("getFields") public List getFields(@RequestBody DataSetTableRequest dataSetTableRequest) throws Exception { return dataSetTableService.getFields(dataSetTableRequest); } + @ApiOperation("查询生成字段") @PostMapping("getFieldsFromDE") public Map> getFieldsFromDE(@RequestBody DataSetTableRequest dataSetTableRequest) throws Exception { return dataSetTableService.getFieldsFromDE(dataSetTableRequest); } + @ApiOperation("查询预览数据") @PostMapping("getPreviewData/{page}/{pageSize}") public Map getPreviewData(@RequestBody DataSetTableRequest dataSetTableRequest, @PathVariable Integer page, @PathVariable Integer pageSize) throws Exception { return dataSetTableService.getPreviewData(dataSetTableRequest, page, pageSize); } + @ApiOperation("根据sql查询预览数据") @PostMapping("sqlPreview") public Map getSQLPreview(@RequestBody DataSetTableRequest dataSetTableRequest) throws Exception { return dataSetTableService.getSQLPreview(dataSetTableRequest); } + @ApiOperation("客户预览数据") @PostMapping("customPreview") public Map customPreview(@RequestBody DataSetTableRequest dataSetTableRequest) throws Exception { return dataSetTableService.getCustomPreview(dataSetTableRequest); } + @ApiOperation("查询增量配置") @PostMapping("incrementalConfig") public DatasetTableIncrementalConfig incrementalConfig(@RequestBody DatasetTableIncrementalConfig datasetTableIncrementalConfig) throws Exception { return dataSetTableService.incrementalConfig(datasetTableIncrementalConfig); } + @ApiOperation("保存增量配置") @PostMapping("save/incrementalConfig") public void saveIncrementalConfig(@RequestBody DatasetTableIncrementalConfig datasetTableIncrementalConfig) throws Exception { dataSetTableService.saveIncrementalConfig(datasetTableIncrementalConfig); } + @ApiOperation("数据集详息") @PostMapping("datasetDetail/{id}") public Map datasetDetail(@PathVariable String id) { return dataSetTableService.getDatasetDetail(id); } + @ApiOperation("excel上传") @PostMapping("excel/upload") public Map excelUpload(@RequestParam("file") MultipartFile file, @RequestParam("tableId") String tableId) throws Exception { return dataSetTableService.excelSaveAndParse(file, tableId); } + @ApiOperation("检测doris") @PostMapping("checkDorisTableIsExists/{id}") public Boolean checkDorisTableIsExists(@PathVariable String id) throws Exception { return dataSetTableService.checkDorisTableIsExists(id); } + @ApiOperation("搜索") @PostMapping("search") public List search(@RequestBody DataSetTableRequest dataSetTableRequest) { return dataSetTableService.search(dataSetTableRequest); diff --git a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableFieldController.java b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableFieldController.java index ec815cf692..882f06c7f4 100644 --- a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableFieldController.java +++ b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableFieldController.java @@ -1,8 +1,11 @@ package io.dataease.controller.dataset; +import com.github.xiaoymin.knife4j.annotations.ApiSupport; import io.dataease.base.domain.DatasetTableField; import io.dataease.service.dataset.DataSetFieldService; import io.dataease.service.dataset.DataSetTableFieldsService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -15,6 +18,8 @@ import java.util.Map; * @Author gin * @Date 2021/2/24 4:28 下午 */ +@Api(tags = "数据集：数据集字段") +@ApiSupport(order = 60) @RestController @RequestMapping("/dataset/field") public class DataSetTableFieldController { @@ -24,6 +29,7 @@ public class DataSetTableFieldController { @Autowired private DataSetFieldService dataSetFieldService; + @ApiOperation("查询表下属字段") @PostMapping("list/{tableId}") public List list(@PathVariable String tableId) { DatasetTableField datasetTableField = DatasetTableField.builder().build(); @@ -31,6 +37,7 @@ public class DataSetTableFieldController { return dataSetTableFieldsService.list(datasetTableField); } + @ApiOperation("分组查询表下属字段") @PostMapping("listByDQ/{tableId}") public Map> listByDQ(@PathVariable String tableId) { DatasetTableField datasetTableField = DatasetTableField.builder().build(); @@ -46,21 +53,24 @@ public class DataSetTableFieldController { return map; } + @ApiOperation("批量更新") @PostMapping("batchEdit") public void batchEdit(@RequestBody List list) { dataSetTableFieldsService.batchEdit(list); } + @ApiOperation("保存") @PostMapping("save") public DatasetTableField save(@RequestBody DatasetTableField datasetTableField) { return dataSetTableFieldsService.save(datasetTableField); } - + @ApiOperation("删除") @PostMapping("delete/{id}") public void delete(@PathVariable String id) { dataSetTableFieldsService.delete(id); } + @ApiOperation("值枚举") @PostMapping("fieldValues/{fieldId}") public List fieldValues(@PathVariable String fieldId) { return dataSetFieldService.fieldValues(fieldId); diff --git a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskController.java b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskController.java index 5eb8b32c92..4a65249061 100644 --- a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskController.java +++ b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskController.java @@ -2,6 +2,7 @@ package io.dataease.controller.dataset; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; +import com.github.xiaoymin.knife4j.annotations.ApiSupport; import io.dataease.base.domain.DatasetTableTask; import io.dataease.commons.utils.PageUtils; import io.dataease.commons.utils.Pager; @@ -10,6 +11,7 @@ import io.dataease.controller.sys.base.BaseGridRequest; import io.dataease.dto.dataset.DataSetTaskDTO; import io.dataease.service.dataset.DataSetTableTaskLogService; import io.dataease.service.dataset.DataSetTableTaskService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; @@ -20,6 +22,8 @@ import java.util.List; * @Author gin * @Date 2021/3/4 1:32 下午 */ +@Api(tags = "数据集：数据集任务") +@ApiSupport(order = 90) @RestController @RequestMapping("dataset/task") public class DataSetTableTaskController { @@ -28,22 +32,25 @@ public class DataSetTableTaskController { @Resource private DataSetTableTaskLogService dataSetTableTaskLogService; + @ApiOperation("保存") @PostMapping("save") public DatasetTableTask save(@RequestBody DataSetTaskRequest dataSetTaskRequest) throws Exception { return dataSetTableTaskService.save(dataSetTaskRequest); } + @ApiOperation("删除") @PostMapping("delete/{id}") public void delete(@PathVariable String id) { dataSetTableTaskService.delete(id); } + @ApiOperation("查询") @PostMapping("list") public List list(@RequestBody DatasetTableTask datasetTableTask) { return dataSetTableTaskService.list(datasetTableTask); } - @ApiOperation("查看数据集任务") + @ApiOperation("分页查询") @PostMapping("/pageList/{goPage}/{pageSize}") public Pager> taskList(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody BaseGridRequest request) { Page page = PageHelper.startPage(goPage, pageSize, true); @@ -51,16 +58,19 @@ public class DataSetTableTaskController { return PageUtils.setPageInfo(page, dataSetTableTaskService.taskList4User(request)); } + @ApiOperation("上次执行时间") @PostMapping("/lastExecStatus") public DataSetTaskDTO lastExecStatus(@RequestBody DataSetTaskDTO datasetTableTask) { return dataSetTableTaskLogService.lastExecStatus(datasetTableTask); } + @ApiOperation("更新状态") @PostMapping("/updateStatus") public void updateStatus(@RequestBody DatasetTableTask datasetTableTask) { dataSetTableTaskService.updateDatasetTableTaskStatus(datasetTableTask); } + @ApiOperation("执行任务") @PostMapping("/execTask") public void execTask(@RequestBody DatasetTableTask datasetTableTask) throws Exception{ dataSetTableTaskService.execTask(datasetTableTask); diff --git a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskLogController.java b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskLogController.java index 4b8063795d..638145fd5d 100644 --- a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskLogController.java +++ b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskLogController.java @@ -2,12 +2,15 @@ package io.dataease.controller.dataset; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; +import com.github.xiaoymin.knife4j.annotations.ApiSupport; import io.dataease.base.domain.DatasetTableTaskLog; import io.dataease.commons.utils.PageUtils; import io.dataease.commons.utils.Pager; import io.dataease.controller.sys.base.BaseGridRequest; import io.dataease.dto.dataset.DataSetTaskLogDTO; import io.dataease.service.dataset.DataSetTableTaskLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -17,22 +20,27 @@ import java.util.List; * @Author gin * @Date 2021/3/4 1:32 下午 */ +@Api(tags = "数据集：数据集任务执行记录") +@ApiSupport(order = 100) @RestController @RequestMapping("dataset/taskLog") public class DataSetTableTaskLogController { @Resource private DataSetTableTaskLogService dataSetTableTaskLogService; + @ApiOperation("保存") @PostMapping("save") public DatasetTableTaskLog save(@RequestBody DatasetTableTaskLog datasetTableTaskLog) { return dataSetTableTaskLogService.save(datasetTableTaskLog); } + @ApiOperation("删除") @PostMapping("delete/{id}") public void delete(@PathVariable String id) { dataSetTableTaskLogService.delete(id); } + @ApiOperation("分页查询") @PostMapping("list/{type}/{goPage}/{pageSize}") public Pager> list(@RequestBody BaseGridRequest request, @PathVariable String type, @PathVariable int goPage, @PathVariable int pageSize) { Page page = PageHelper.startPage(goPage, pageSize, true); diff --git a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableUnionController.java b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableUnionController.java index 73d6e11b4d..c2b8a689d7 100644 --- a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableUnionController.java +++ b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableUnionController.java @@ -1,8 +1,11 @@ package io.dataease.controller.dataset; +import com.github.xiaoymin.knife4j.annotations.ApiSupport; import io.dataease.base.domain.DatasetTableUnion; import io.dataease.dto.dataset.DataSetTableUnionDTO; import io.dataease.service.dataset.DataSetTableUnionService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -12,22 +15,27 @@ import java.util.List; * @Author gin * @Date 2021/5/7 10:30 上午 */ +@Api(tags = "数据集：数据集关联") +@ApiSupport(order = 70) @RestController @RequestMapping("dataset/union") public class DataSetTableUnionController { @Resource private DataSetTableUnionService dataSetTableUnionService; + @ApiOperation("保存") @PostMapping("save") public DatasetTableUnion save(@RequestBody DatasetTableUnion datasetTableUnion) { return dataSetTableUnionService.save(datasetTableUnion); } + @ApiOperation("删除") @PostMapping("delete/{id}") public void delete(@PathVariable String id) { dataSetTableUnionService.delete(id); } + @ApiOperation("查询") @PostMapping("listByTableId/{tableId}") public List listByTableId(@PathVariable String tableId) { return dataSetTableUnionService.listByTableId(tableId); diff --git a/backend/src/main/java/io/dataease/controller/dataset/DatasetFunctionController.java b/backend/src/main/java/io/dataease/controller/dataset/DatasetFunctionController.java index 915e7d556d..32bb6c4067 100644 --- a/backend/src/main/java/io/dataease/controller/dataset/DatasetFunctionController.java +++ b/backend/src/main/java/io/dataease/controller/dataset/DatasetFunctionController.java @@ -1,7 +1,10 @@ package io.dataease.controller.dataset; +import com.github.xiaoymin.knife4j.annotations.ApiSupport; import io.dataease.base.domain.DatasetTableFunction; import io.dataease.service.dataset.DatasetFunctionService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -14,12 +17,15 @@ import java.util.List; * @Author gin * @Date 2021/7/29 11:58 上午 */ +@Api(tags = "数据集：数据集方法") +@ApiSupport(order = 80) @RestController @RequestMapping("dataset/function") public class DatasetFunctionController { @Resource private DatasetFunctionService datasetFunctionService; + @ApiOperation("查询") @PostMapping("listByTableId/{tableId}") public List listByTableId(@PathVariable String tableId) { return datasetFunctionService.listByTableId(tableId); diff --git a/backend/src/main/java/io/dataease/controller/panel/PanelDesignController.java b/backend/src/main/java/io/dataease/controller/panel/PanelDesignController.java index a4e9a09a0f..19e5c9c959 100644 --- a/backend/src/main/java/io/dataease/controller/panel/PanelDesignController.java +++ b/backend/src/main/java/io/dataease/controller/panel/PanelDesignController.java @@ -1,6 +1,9 @@ package io.dataease.controller.panel; +import com.github.xiaoymin.knife4j.annotations.ApiSupport; import io.dataease.service.panel.PanelGroupService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -10,6 +13,8 @@ import javax.annotation.Resource; * Date: 2021-03-05 * Description: */ +@Api(tags = "仪表板：设计") +@ApiSupport(order = 140) @RestController @RequestMapping("panel/design") public class PanelDesignController { @@ -17,6 +22,7 @@ public class PanelDesignController { @Resource private PanelGroupService panelGroupService; + @ApiOperation("保存") @PostMapping("/saveDesign/{id}") public void deleteCircle(@PathVariable String id) { panelGroupService.deleteCircle(id); diff --git a/backend/src/main/java/io/dataease/controller/panel/PanelGroupController.java b/backend/src/main/java/io/dataease/controller/panel/PanelGroupController.java index 7fd8f25181..7808cb394c 100644 --- a/backend/src/main/java/io/dataease/controller/panel/PanelGroupController.java +++ b/backend/src/main/java/io/dataease/controller/panel/PanelGroupController.java @@ -1,11 +1,14 @@ package io.dataease.controller.panel; +import com.github.xiaoymin.knife4j.annotations.ApiSupport; import io.dataease.base.domain.PanelGroup; import io.dataease.base.domain.PanelGroupWithBLOBs; import io.dataease.controller.handler.annotation.I18n; import io.dataease.controller.request.panel.PanelGroupRequest; import io.dataease.dto.panel.PanelGroupDTO; import io.dataease.service.panel.PanelGroupService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -16,6 +19,8 @@ import java.util.List; * Date: 2021-03-05 * Description: */ +@Api(tags = "仪表板：仪表板组") +@ApiSupport(order = 150) @RestController @RequestMapping("panel/group") public class PanelGroupController { @@ -23,27 +28,32 @@ public class PanelGroupController { @Resource private PanelGroupService panelGroupService; + @ApiOperation("查询树") @PostMapping("/tree") public List tree(@RequestBody PanelGroupRequest request) { return panelGroupService.tree(request); } + @ApiOperation("默认树") @PostMapping("/defaultTree") public List defaultTree(@RequestBody PanelGroupRequest request) { return panelGroupService.defaultTree(request); } + @ApiOperation("保存") @PostMapping("/save") @I18n public PanelGroup saveOrUpdate(@RequestBody PanelGroupRequest request) { return panelGroupService.saveOrUpdate(request); } + @ApiOperation("删除") @PostMapping("/deleteCircle/{id}") public void deleteCircle(@PathVariable String id) { panelGroupService.deleteCircle(id); } + @ApiOperation("详息") @GetMapping("/findOne/{id}") public PanelGroupWithBLOBs findOne(@PathVariable String id) throws Exception { return panelGroupService.findOne(id); diff --git a/backend/src/main/java/io/dataease/controller/panel/PanelSubjectController.java b/backend/src/main/java/io/dataease/controller/panel/PanelSubjectController.java index 6164643ff5..eaf4bb7e6b 100644 --- a/backend/src/main/java/io/dataease/controller/panel/PanelSubjectController.java +++ b/backend/src/main/java/io/dataease/controller/panel/PanelSubjectController.java @@ -1,8 +1,11 @@ package io.dataease.controller.panel; +import com.github.xiaoymin.knife4j.annotations.ApiSupport; import io.dataease.base.domain.PanelSubject; import io.dataease.controller.request.panel.PanelSubjectRequest; import io.dataease.service.panel.PanelSubjectService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -13,6 +16,8 @@ import java.util.List; * Date: 2021-05-06 * Description: */ +@Api(tags = "仪表板：主题") +@ApiSupport(order = 160) @RestController @RequestMapping("panel/subject") public class PanelSubjectController { @@ -20,22 +25,25 @@ public class PanelSubjectController { @Resource private PanelSubjectService panelSubjectService; + @ApiOperation("查询") @PostMapping("/query") public List query(@RequestBody PanelSubjectRequest request) { return panelSubjectService.query(request); } + @ApiOperation("根据仪表板查询") @PostMapping("/querySubjectWithGroup") public List querySubjectWithGroup(@RequestBody PanelSubjectRequest request) { return panelSubjectService.querySubjectWithGroup(request); } + @ApiOperation("更新") @PostMapping("/update") public void update(@RequestBody PanelSubjectRequest request) { panelSubjectService.update(request); } - + @ApiOperation("删除") @DeleteMapping("/delete/{id}") public void update(@PathVariable String id) { panelSubjectService.delete(id); diff --git a/backend/src/main/java/io/dataease/controller/panel/PanelTemplateController.java b/backend/src/main/java/io/dataease/controller/panel/PanelTemplateController.java index c4de49468a..5ef39ee6fd 100644 --- a/backend/src/main/java/io/dataease/controller/panel/PanelTemplateController.java +++ b/backend/src/main/java/io/dataease/controller/panel/PanelTemplateController.java @@ -1,10 +1,13 @@ package io.dataease.controller.panel; +import com.github.xiaoymin.knife4j.annotations.ApiSupport; import io.dataease.base.domain.PanelTemplateWithBLOBs; import io.dataease.controller.handler.annotation.I18n; import io.dataease.controller.request.panel.PanelTemplateRequest; import io.dataease.dto.panel.PanelTemplateDTO; import io.dataease.service.panel.PanelTemplateService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -15,6 +18,8 @@ import java.util.List; * Date: 2021-03-05 * Description: */ +@Api(tags = "仪表板：模版") +@ApiSupport(order = 170) @RestController @RequestMapping("template") public class PanelTemplateController { @@ -22,33 +27,38 @@ public class PanelTemplateController { @Resource private PanelTemplateService panelTemplateService; + @ApiOperation("查询树") @PostMapping("/templateList") @I18n public List templateList(@RequestBody PanelTemplateRequest request) { return panelTemplateService.templateList(request); } + @ApiOperation("保存") @PostMapping("/save") public PanelTemplateDTO save(@RequestBody PanelTemplateRequest request) { return panelTemplateService.save(request); } + @ApiOperation("删除") @DeleteMapping("/delete/{id}") public void delete(@PathVariable String id) { panelTemplateService.delete(id); } + @ApiOperation("详息") @GetMapping("/findOne/{id}") public PanelTemplateWithBLOBs findOne(@PathVariable String id) throws Exception { return panelTemplateService.findOne(id); } + @ApiOperation("查询") @PostMapping("/find") public List find(@RequestBody PanelTemplateRequest request) { return panelTemplateService.find(request); } - + @ApiOperation("名称校验") @PostMapping("/nameCheck") public String nameCheck(@RequestBody PanelTemplateRequest request) { return panelTemplateService.nameCheck(request); diff --git a/backend/src/main/java/io/dataease/controller/panel/api/LinkApi.java b/backend/src/main/java/io/dataease/controller/panel/api/LinkApi.java index 3508368537..5b2eb05d08 100644 --- a/backend/src/main/java/io/dataease/controller/panel/api/LinkApi.java +++ b/backend/src/main/java/io/dataease/controller/panel/api/LinkApi.java @@ -1,6 +1,7 @@ package io.dataease.controller.panel.api; +import com.github.xiaoymin.knife4j.annotations.ApiSupport; import io.dataease.controller.request.chart.ChartExtRequest; import io.dataease.controller.request.panel.link.EnablePwdRequest; import io.dataease.controller.request.panel.link.LinkRequest; @@ -14,6 +15,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Map; @Api(tags = "仪表板：链接管理") +@ApiSupport(order = 200) @RequestMapping("/api/link") public interface LinkApi { diff --git a/backend/src/main/java/io/dataease/controller/panel/api/ShareApi.java b/backend/src/main/java/io/dataease/controller/panel/api/ShareApi.java index 379c3174c4..5d3833dc39 100644 --- a/backend/src/main/java/io/dataease/controller/panel/api/ShareApi.java +++ b/backend/src/main/java/io/dataease/controller/panel/api/ShareApi.java @@ -1,5 +1,6 @@ package io.dataease.controller.panel.api; +import com.github.xiaoymin.knife4j.annotations.ApiSupport; import io.dataease.base.domain.PanelShare; import io.dataease.controller.request.panel.PanelShareFineDto; import io.dataease.controller.request.panel.PanelShareRequest; @@ -9,6 +10,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; +import springfox.documentation.annotations.ApiIgnore; import java.util.List; @@ -16,9 +18,11 @@ import java.util.List; * 分享API */ @Api(tags = "仪表板：分享管理") +@ApiSupport(order = 180) @RequestMapping("/api/share") public interface ShareApi { + @ApiIgnore @ApiOperation("创建分享") @PostMapping("/") void share(PanelShareRequest request); diff --git a/backend/src/main/java/io/dataease/controller/panel/api/StoreApi.java b/backend/src/main/java/io/dataease/controller/panel/api/StoreApi.java index 2844f250d3..5f1f3d8ec4 100644 --- a/backend/src/main/java/io/dataease/controller/panel/api/StoreApi.java +++ b/backend/src/main/java/io/dataease/controller/panel/api/StoreApi.java @@ -1,5 +1,6 @@ package io.dataease.controller.panel.api; +import com.github.xiaoymin.knife4j.annotations.ApiSupport; import io.dataease.controller.sys.base.BaseGridRequest; import io.dataease.dto.panel.PanelStoreDto; import io.swagger.annotations.Api; @@ -16,6 +17,7 @@ import java.util.List; */ @Api(tags = "仪表板：收藏管理") +@ApiSupport(order = 190) @RequestMapping("/api/store") public interface StoreApi { diff --git a/backend/src/main/java/io/dataease/controller/panel/api/ViewApi.java b/backend/src/main/java/io/dataease/controller/panel/api/ViewApi.java index bef168d13d..bd427768d4 100644 --- a/backend/src/main/java/io/dataease/controller/panel/api/ViewApi.java +++ b/backend/src/main/java/io/dataease/controller/panel/api/ViewApi.java @@ -1,6 +1,7 @@ package io.dataease.controller.panel.api; +import com.github.xiaoymin.knife4j.annotations.ApiSupport; import io.dataease.base.domain.ChartView; import io.dataease.base.domain.ChartViewWithBLOBs; import io.dataease.dto.panel.PanelViewDto; @@ -13,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import java.util.List; @Api(tags = "仪表板：视图管理") +@ApiSupport(order = 210) @RequestMapping("/api/panelView") public interface ViewApi { diff --git a/backend/src/main/java/io/dataease/controller/sys/AboutController.java b/backend/src/main/java/io/dataease/controller/sys/AboutController.java index 32fbd92273..d4ef963dc6 100644 --- a/backend/src/main/java/io/dataease/controller/sys/AboutController.java +++ b/backend/src/main/java/io/dataease/controller/sys/AboutController.java @@ -4,10 +4,12 @@ package io.dataease.controller.sys; import io.dataease.commons.license.F2CLicenseResponse; import io.dataease.service.AboutService; import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; import javax.annotation.Resource; import java.util.Map; +@ApiIgnore @RequestMapping("/about") @RestController public class AboutController { diff --git a/backend/src/main/java/io/dataease/controller/sys/CommonFilesController.java b/backend/src/main/java/io/dataease/controller/sys/CommonFilesController.java index 434841b447..8b7e50329c 100644 --- a/backend/src/main/java/io/dataease/controller/sys/CommonFilesController.java +++ b/backend/src/main/java/io/dataease/controller/sys/CommonFilesController.java @@ -6,9 +6,11 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.annotations.ApiIgnore; import javax.annotation.Resource; +@ApiIgnore @RestController @RequestMapping("common-files") public class CommonFilesController { diff --git a/backend/src/main/java/io/dataease/controller/sys/DisplayController.java b/backend/src/main/java/io/dataease/controller/sys/DisplayController.java index 0521f552be..dedf1ad54d 100644 --- a/backend/src/main/java/io/dataease/controller/sys/DisplayController.java +++ b/backend/src/main/java/io/dataease/controller/sys/DisplayController.java @@ -6,10 +6,12 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.annotations.ApiIgnore; import javax.annotation.Resource; import java.io.IOException; +@ApiIgnore @RestController @RequestMapping public class DisplayController { diff --git a/backend/src/main/java/io/dataease/controller/sys/I18nController.java b/backend/src/main/java/io/dataease/controller/sys/I18nController.java index 26e0c595f0..d9f826e0ba 100644 --- a/backend/src/main/java/io/dataease/controller/sys/I18nController.java +++ b/backend/src/main/java/io/dataease/controller/sys/I18nController.java @@ -10,6 +10,8 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.annotations.ApiIgnore; + import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -17,6 +19,7 @@ import javax.servlet.http.HttpServletResponse; /** * Created by liqiang on 2019/4/1. */ +@ApiIgnore @RestController public class I18nController { diff --git a/backend/src/main/java/io/dataease/controller/sys/LicenseController.java b/backend/src/main/java/io/dataease/controller/sys/LicenseController.java index e9ca2a353c..0e932cec62 100644 --- a/backend/src/main/java/io/dataease/controller/sys/LicenseController.java +++ b/backend/src/main/java/io/dataease/controller/sys/LicenseController.java @@ -11,8 +11,11 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.annotations.ApiIgnore; + import javax.annotation.Resource; +@ApiIgnore @RestController @RequestMapping(headers = "Accept=application/json") public class LicenseController { diff --git a/backend/src/main/java/io/dataease/controller/message/MsgController.java b/backend/src/main/java/io/dataease/controller/sys/MsgController.java similarity index 80% rename from backend/src/main/java/io/dataease/controller/message/MsgController.java rename to backend/src/main/java/io/dataease/controller/sys/MsgController.java index 2812686bde..1b4ce8bc8f 100644 --- a/backend/src/main/java/io/dataease/controller/message/MsgController.java +++ b/backend/src/main/java/io/dataease/controller/sys/MsgController.java @@ -1,14 +1,19 @@ -package io.dataease.controller.message; +package io.dataease.controller.sys; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; +import com.github.xiaoymin.knife4j.annotations.ApiSupport; import io.dataease.base.domain.SysMsgChannel; import io.dataease.base.domain.SysMsgSetting; import io.dataease.base.domain.SysMsgType; import io.dataease.commons.utils.AuthUtils; import io.dataease.commons.utils.PageUtils; import io.dataease.commons.utils.Pager; -import io.dataease.controller.message.dto.*; +import io.dataease.controller.sys.request.BatchSettingRequest; +import io.dataease.controller.sys.request.MsgRequest; +import io.dataease.controller.sys.request.MsgSettingRequest; +import io.dataease.controller.sys.response.MsgGridDto; +import io.dataease.controller.sys.response.SettingTreeNode; import io.dataease.service.message.SysMsgService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -19,6 +24,7 @@ import java.util.List; import java.util.stream.Collectors; @Api(tags = "系统：消息管理") +@ApiSupport(order = 230) @RequestMapping("/api/sys_msg") @RestController public class MsgController { @@ -26,7 +32,7 @@ public class MsgController { @Resource private SysMsgService sysMsgService; - @ApiOperation("查询消息") + @ApiOperation("分页查询") @PostMapping("/list/{goPage}/{pageSize}") public Pager> messages(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody MsgRequest msgRequest) { Long userId = AuthUtils.getUser().getUserId(); @@ -40,50 +46,59 @@ public class MsgController { return listPager; } + @ApiOperation("设置已读") @PostMapping("/setReaded/{msgId}") public void setReaded(@PathVariable Long msgId) { sysMsgService.setReaded(msgId); } + @ApiOperation("批量设置已读") @PostMapping("/batchRead") public void batchRead(@RequestBody List msgIds) { sysMsgService.setBatchReaded(msgIds); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public void batchDelete(@RequestBody List msgIds) { sysMsgService.batchDelete(msgIds); } - @PostMapping("/treeNodes") - public List treeNodes() { - - return sysMsgService.treeNodes(); - } - - @PostMapping("/channelList") - public List channelList() { - return sysMsgService.channelList(); - } - - @PostMapping("/settingList") - public List settingList() { - return sysMsgService.settingList(); - } - - @PostMapping("/updateSetting") - public void updateSetting(@RequestBody MsgSettingRequest request) { - Long userId = AuthUtils.getUser().getUserId(); - sysMsgService.updateSetting(request, userId); - } - + @ApiOperation("查询类型") @PostMapping("/types") public List allTypes() { List sysMsgTypes = sysMsgService.queryMsgTypes(); return sysMsgTypes; } + @ApiOperation("类型树") + @PostMapping("/treeNodes") + public List treeNodes() { + + return sysMsgService.treeNodes(); + } + + @ApiOperation("查询渠道") + @PostMapping("/channelList") + public List channelList() { + return sysMsgService.channelList(); + } + + @ApiOperation("查询订阅") + @PostMapping("/settingList") + public List settingList() { + return sysMsgService.settingList(); + } + + @ApiOperation("更新订阅") + @PostMapping("/updateSetting") + public void updateSetting(@RequestBody MsgSettingRequest request) { + Long userId = AuthUtils.getUser().getUserId(); + sysMsgService.updateSetting(request, userId); + } + + @ApiOperation("批量更新订阅") @PostMapping("/batchUpdate") public void batchUpdate(@RequestBody BatchSettingRequest request) { Long userId = AuthUtils.getUser().getUserId(); diff --git a/backend/src/main/java/io/dataease/controller/sys/SysDeptController.java b/backend/src/main/java/io/dataease/controller/sys/SysDeptController.java index 6b322c6714..421aaafa25 100644 --- a/backend/src/main/java/io/dataease/controller/sys/SysDeptController.java +++ b/backend/src/main/java/io/dataease/controller/sys/SysDeptController.java @@ -15,9 +15,12 @@ import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; + import java.util.List; import java.util.stream.Collectors; +@ApiIgnore @RestController @RequiredArgsConstructor @Api(tags = "系统：部门管理") diff --git a/backend/src/main/java/io/dataease/controller/sys/SysMenuController.java b/backend/src/main/java/io/dataease/controller/sys/SysMenuController.java index 492d13ad57..d93e0e454b 100644 --- a/backend/src/main/java/io/dataease/controller/sys/SysMenuController.java +++ b/backend/src/main/java/io/dataease/controller/sys/SysMenuController.java @@ -15,11 +15,13 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; + import javax.annotation.Resource; import java.util.List; import java.util.Set; import java.util.stream.Collectors; - +@ApiIgnore @RestController @RequiredArgsConstructor @Api(tags = "系统：菜单管理") diff --git a/backend/src/main/java/io/dataease/controller/sys/SysPluginController.java b/backend/src/main/java/io/dataease/controller/sys/SysPluginController.java index ce8cc9ee5e..0fb95021e6 100644 --- a/backend/src/main/java/io/dataease/controller/sys/SysPluginController.java +++ b/backend/src/main/java/io/dataease/controller/sys/SysPluginController.java @@ -13,11 +13,12 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import springfox.documentation.annotations.ApiIgnore; import java.util.List; import java.util.Map; - +@ApiIgnore @RestController @Api(tags = "系统：插件管理") @RequestMapping("/api/plugin") diff --git a/backend/src/main/java/io/dataease/controller/sys/SysRoleController.java b/backend/src/main/java/io/dataease/controller/sys/SysRoleController.java index a1bd02516f..38ab9ead04 100644 --- a/backend/src/main/java/io/dataease/controller/sys/SysRoleController.java +++ b/backend/src/main/java/io/dataease/controller/sys/SysRoleController.java @@ -14,9 +14,11 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; + import javax.annotation.Resource; import java.util.List; - +@ApiIgnore @RestController @RequiredArgsConstructor @Api(tags = "系统：角色管理") diff --git a/backend/src/main/java/io/dataease/controller/sys/SysUserController.java b/backend/src/main/java/io/dataease/controller/sys/SysUserController.java index 710c2a2411..08fa39bd9b 100644 --- a/backend/src/main/java/io/dataease/controller/sys/SysUserController.java +++ b/backend/src/main/java/io/dataease/controller/sys/SysUserController.java @@ -3,6 +3,7 @@ package io.dataease.controller.sys; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; +import com.github.xiaoymin.knife4j.annotations.ApiSupport; import io.dataease.auth.api.dto.CurrentUserDto; import io.dataease.commons.utils.AuthUtils; import io.dataease.commons.utils.PageUtils; @@ -16,12 +17,15 @@ import io.dataease.service.sys.SysUserService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; + import javax.annotation.Resource; import java.util.List; import java.util.Optional; @RestController @Api(tags = "系统：用户管理") +@ApiSupport(order = 220) @RequestMapping("/api/user") public class SysUserController { diff --git a/backend/src/main/java/io/dataease/controller/sys/SystemParameterController.java b/backend/src/main/java/io/dataease/controller/sys/SystemParameterController.java index 7a7e225808..bafbffc95f 100644 --- a/backend/src/main/java/io/dataease/controller/sys/SystemParameterController.java +++ b/backend/src/main/java/io/dataease/controller/sys/SystemParameterController.java @@ -11,12 +11,14 @@ import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import springfox.documentation.annotations.ApiIgnore; + import javax.annotation.Resource; import java.io.IOException; import java.util.HashMap; import java.util.List; import java.util.Map; - +@ApiIgnore @RestController @RequestMapping(value = "/system") public class SystemParameterController { diff --git a/backend/src/main/java/io/dataease/controller/sys/base/BaseGridRequest.java b/backend/src/main/java/io/dataease/controller/sys/base/BaseGridRequest.java index 1e8f28f5bf..7ad000f0a8 100644 --- a/backend/src/main/java/io/dataease/controller/sys/base/BaseGridRequest.java +++ b/backend/src/main/java/io/dataease/controller/sys/base/BaseGridRequest.java @@ -1,7 +1,6 @@ package io.dataease.controller.sys.base; import io.dataease.base.mapper.ext.query.GridExample; -import lombok.Data; import org.apache.commons.collections.CollectionUtils; import java.io.Serializable; diff --git a/backend/src/main/java/io/dataease/controller/message/dto/BatchSettingRequest.java b/backend/src/main/java/io/dataease/controller/sys/request/BatchSettingRequest.java similarity index 84% rename from backend/src/main/java/io/dataease/controller/message/dto/BatchSettingRequest.java rename to backend/src/main/java/io/dataease/controller/sys/request/BatchSettingRequest.java index 56497cbba0..f318e7f1dd 100644 --- a/backend/src/main/java/io/dataease/controller/message/dto/BatchSettingRequest.java +++ b/backend/src/main/java/io/dataease/controller/sys/request/BatchSettingRequest.java @@ -1,4 +1,4 @@ -package io.dataease.controller.message.dto; +package io.dataease.controller.sys.request; import lombok.Data; diff --git a/backend/src/main/java/io/dataease/controller/message/dto/MsgRequest.java b/backend/src/main/java/io/dataease/controller/sys/request/MsgRequest.java similarity index 86% rename from backend/src/main/java/io/dataease/controller/message/dto/MsgRequest.java rename to backend/src/main/java/io/dataease/controller/sys/request/MsgRequest.java index 6f9c3daba2..30f55e4093 100644 --- a/backend/src/main/java/io/dataease/controller/message/dto/MsgRequest.java +++ b/backend/src/main/java/io/dataease/controller/sys/request/MsgRequest.java @@ -1,4 +1,4 @@ -package io.dataease.controller.message.dto; +package io.dataease.controller.sys.request; import lombok.Data; diff --git a/backend/src/main/java/io/dataease/controller/message/dto/MsgSettingRequest.java b/backend/src/main/java/io/dataease/controller/sys/request/MsgSettingRequest.java similarity index 79% rename from backend/src/main/java/io/dataease/controller/message/dto/MsgSettingRequest.java rename to backend/src/main/java/io/dataease/controller/sys/request/MsgSettingRequest.java index 3f1ec00b85..68ac29e79c 100644 --- a/backend/src/main/java/io/dataease/controller/message/dto/MsgSettingRequest.java +++ b/backend/src/main/java/io/dataease/controller/sys/request/MsgSettingRequest.java @@ -1,4 +1,4 @@ -package io.dataease.controller.message.dto; +package io.dataease.controller.sys.request; import lombok.Data; diff --git a/backend/src/main/java/io/dataease/controller/message/dto/MsgGridDto.java b/backend/src/main/java/io/dataease/controller/sys/response/MsgGridDto.java similarity index 78% rename from backend/src/main/java/io/dataease/controller/message/dto/MsgGridDto.java rename to backend/src/main/java/io/dataease/controller/sys/response/MsgGridDto.java index f88d6a57f3..917c13874b 100644 --- a/backend/src/main/java/io/dataease/controller/message/dto/MsgGridDto.java +++ b/backend/src/main/java/io/dataease/controller/sys/response/MsgGridDto.java @@ -1,4 +1,4 @@ -package io.dataease.controller.message.dto; +package io.dataease.controller.sys.response; import io.dataease.base.domain.SysMsg; import lombok.Data; diff --git a/backend/src/main/java/io/dataease/controller/message/dto/SettingTreeNode.java b/backend/src/main/java/io/dataease/controller/sys/response/SettingTreeNode.java similarity index 87% rename from backend/src/main/java/io/dataease/controller/message/dto/SettingTreeNode.java rename to backend/src/main/java/io/dataease/controller/sys/response/SettingTreeNode.java index 154147a223..bbbd574c00 100644 --- a/backend/src/main/java/io/dataease/controller/message/dto/SettingTreeNode.java +++ b/backend/src/main/java/io/dataease/controller/sys/response/SettingTreeNode.java @@ -1,4 +1,4 @@ -package io.dataease.controller.message.dto; +package io.dataease.controller.sys.response; import lombok.Data; diff --git a/backend/src/main/java/io/dataease/controller/message/dto/SubscribeNode.java b/backend/src/main/java/io/dataease/controller/sys/response/SubscribeNode.java similarity index 88% rename from backend/src/main/java/io/dataease/controller/message/dto/SubscribeNode.java rename to backend/src/main/java/io/dataease/controller/sys/response/SubscribeNode.java index 40773bd735..128960177e 100644 --- a/backend/src/main/java/io/dataease/controller/message/dto/SubscribeNode.java +++ b/backend/src/main/java/io/dataease/controller/sys/response/SubscribeNode.java @@ -1,4 +1,4 @@ -package io.dataease.controller.message.dto; +package io.dataease.controller.sys.response; import lombok.Data; diff --git a/backend/src/main/java/io/dataease/datasource/controller/DatasourceController.java b/backend/src/main/java/io/dataease/datasource/controller/DatasourceController.java index 5445953b0a..6e5e6ba63e 100644 --- a/backend/src/main/java/io/dataease/datasource/controller/DatasourceController.java +++ b/backend/src/main/java/io/dataease/datasource/controller/DatasourceController.java @@ -2,6 +2,7 @@ package io.dataease.datasource.controller; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; +import com.github.xiaoymin.knife4j.annotations.ApiSupport; import io.dataease.base.domain.Datasource; import io.dataease.commons.utils.AuthUtils; import io.dataease.commons.utils.PageUtils; @@ -11,11 +12,16 @@ import io.dataease.controller.sys.base.BaseGridRequest; import io.dataease.datasource.dto.DBTableDTO; import io.dataease.datasource.service.DatasourceService; import io.dataease.dto.DatasourceDTO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; import javax.annotation.Resource; import java.util.List; +@Api(tags = "数据源：数据源管理") +@ApiSupport(order = 30) @RequestMapping("datasource") @RestController public class DatasourceController { @@ -23,16 +29,19 @@ public class DatasourceController { @Resource private DatasourceService datasourceService; + @ApiOperation("新增数据源") @PostMapping("/add") public Datasource addDatasource(@RequestBody Datasource datasource) { return datasourceService.addDatasource(datasource); } + @ApiOperation("验证数据源") @PostMapping("/validate") public void validate(@RequestBody Datasource datasource) throws Exception { datasourceService.validate(datasource); } + @ApiOperation("查询当前用户数据源") @GetMapping("/list") public List getDatasourceList() throws Exception { DatasourceUnionRequest request = new DatasourceUnionRequest(); @@ -40,6 +49,7 @@ public class DatasourceController { return datasourceService.getDatasourceList(request); } + @ApiIgnore @PostMapping("/list/{goPage}/{pageSize}") public Pager> getDatasourceList(@RequestBody BaseGridRequest request, @PathVariable int goPage, @PathVariable int pageSize) throws Exception { Page page = PageHelper.startPage(goPage, pageSize, true); @@ -47,21 +57,25 @@ public class DatasourceController { return PageUtils.setPageInfo(page, datasourceService.gridQuery(request)); } + @ApiOperation("删除数据源") @PostMapping("/delete/{datasourceID}") public void deleteDatasource(@PathVariable(value = "datasourceID") String datasourceID) throws Exception { datasourceService.deleteDatasource(datasourceID); } + @ApiOperation("更新数据源") @PostMapping("/update") public void updateDatasource(@RequestBody Datasource Datasource) { datasourceService.updateDatasource(Datasource); } + @ApiOperation("查询数据源下属所有表") @PostMapping("/getTables") public List getTables(@RequestBody Datasource datasource) throws Exception { return datasourceService.getTables(datasource); } + @ApiIgnore @PostMapping("/getSchema") public List getSchema(@RequestBody Datasource datasource) throws Exception { return datasourceService.getSchema(datasource); diff --git a/backend/src/main/java/io/dataease/dto/chart/ChartViewFieldDTO.java b/backend/src/main/java/io/dataease/dto/chart/ChartViewFieldDTO.java index b21b9adc8c..2d90dfbcbf 100644 --- a/backend/src/main/java/io/dataease/dto/chart/ChartViewFieldDTO.java +++ b/backend/src/main/java/io/dataease/dto/chart/ChartViewFieldDTO.java @@ -42,4 +42,6 @@ public class ChartViewFieldDTO implements Serializable { private String dateStyle; private String datePattern; + + private Integer extField; } diff --git a/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java b/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java index 5132840ea6..fc995d6e11 100644 --- a/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java @@ -1,13 +1,14 @@ package io.dataease.provider.doris; import io.dataease.base.domain.DatasetTableField; +import io.dataease.base.domain.DatasetTableFieldExample; +import io.dataease.base.mapper.DatasetTableFieldMapper; import io.dataease.controller.request.chart.ChartExtFilterRequest; import io.dataease.dto.chart.ChartCustomFilterDTO; import io.dataease.dto.chart.ChartViewFieldDTO; import io.dataease.dto.sqlObj.SQLObj; import io.dataease.provider.QueryProvider; import io.dataease.provider.SQLConstants; -import io.dataease.provider.mysql.MySQLConstants; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; @@ -16,11 +17,12 @@ import org.stringtemplate.v4.ST; import org.stringtemplate.v4.STGroup; import org.stringtemplate.v4.STGroupFile; +import javax.annotation.Resource; import java.text.MessageFormat; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; +import java.util.*; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import static io.dataease.provider.SQLConstants.TABLE_ALIAS_PREFIX; @@ -30,6 +32,9 @@ import static io.dataease.provider.SQLConstants.TABLE_ALIAS_PREFIX; */ @Service("dorisQuery") public class DorisQueryProvider extends QueryProvider { + @Resource + private DatasetTableFieldMapper datasetTableFieldMapper; + @Override public Integer transFieldType(String field) { switch (field) { @@ -91,7 +96,15 @@ public class DorisQueryProvider extends QueryProvider { if (CollectionUtils.isNotEmpty(fields)) { for (int i = 0; i < fields.size(); i++) { DatasetTableField f = fields.get(i); - String originField = String.format(DorisConstants.KEYWORD_FIX, tableObj.getTableAlias(), f.getDataeaseName()); + String originField; + if (ObjectUtils.isNotEmpty(f.getExtField()) && f.getExtField() == 2) { + // 解析origin name中有关联的字段生成sql表达式 + originField = calcFieldRegex(f.getOriginName(), tableObj); + } else if (ObjectUtils.isNotEmpty(f.getExtField()) && f.getExtField() == 1) { + originField = String.format(DorisConstants.KEYWORD_FIX, tableObj.getTableAlias(), f.getDataeaseName()); + } else { + originField = String.format(DorisConstants.KEYWORD_FIX, tableObj.getTableAlias(), f.getDataeaseName()); + } String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i); String fieldName = ""; // 处理横轴字段 @@ -181,7 +194,15 @@ public class DorisQueryProvider extends QueryProvider { if (CollectionUtils.isNotEmpty(xAxis)) { for (int i = 0; i < xAxis.size(); i++) { ChartViewFieldDTO x = xAxis.get(i); - String originField = String.format(DorisConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getDataeaseName()); + String originField; + if (ObjectUtils.isNotEmpty(x.getExtField()) && x.getExtField() == 2) { + // 解析origin name中有关联的字段生成sql表达式 + originField = calcFieldRegex(x.getOriginName(), tableObj); + } else if (ObjectUtils.isNotEmpty(x.getExtField()) && x.getExtField() == 1) { + originField = String.format(DorisConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getDataeaseName()); + } else { + originField = String.format(DorisConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getDataeaseName()); + } String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i); // 处理横轴字段 xFields.add(getXFields(x, originField, fieldAlias)); @@ -203,7 +224,15 @@ public class DorisQueryProvider extends QueryProvider { if (CollectionUtils.isNotEmpty(yAxis)) { for (int i = 0; i < yAxis.size(); i++) { ChartViewFieldDTO y = yAxis.get(i); - String originField = String.format(DorisConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getDataeaseName()); + String originField; + if (ObjectUtils.isNotEmpty(y.getExtField()) && y.getExtField() == 2) { + // 解析origin name中有关联的字段生成sql表达式 + originField = calcFieldRegex(y.getOriginName(), tableObj); + } else if (ObjectUtils.isNotEmpty(y.getExtField()) && y.getExtField() == 1) { + originField = String.format(DorisConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getDataeaseName()); + } else { + originField = String.format(DorisConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getDataeaseName()); + } String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_Y_PREFIX, i); // 处理纵轴字段 yFields.add(getYFields(y, originField, fieldAlias)); @@ -279,7 +308,15 @@ public class DorisQueryProvider extends QueryProvider { if (CollectionUtils.isNotEmpty(xList)) { for (int i = 0; i < xList.size(); i++) { ChartViewFieldDTO x = xList.get(i); - String originField = String.format(DorisConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getDataeaseName()); + String originField; + if (ObjectUtils.isNotEmpty(x.getExtField()) && x.getExtField() == 2) { + // 解析origin name中有关联的字段生成sql表达式 + originField = calcFieldRegex(x.getOriginName(), tableObj); + } else if (ObjectUtils.isNotEmpty(x.getExtField()) && x.getExtField() == 1) { + originField = String.format(DorisConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getDataeaseName()); + } else { + originField = String.format(DorisConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getDataeaseName()); + } String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i); // 处理横轴字段 xFields.add(getXFields(x, originField, fieldAlias)); @@ -301,7 +338,15 @@ public class DorisQueryProvider extends QueryProvider { if (CollectionUtils.isNotEmpty(yAxis)) { for (int i = 0; i < yAxis.size(); i++) { ChartViewFieldDTO y = yAxis.get(i); - String originField = String.format(DorisConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getDataeaseName()); + String originField; + if (ObjectUtils.isNotEmpty(y.getExtField()) && y.getExtField() == 2) { + // 解析origin name中有关联的字段生成sql表达式 + originField = calcFieldRegex(y.getOriginName(), tableObj); + } else if (ObjectUtils.isNotEmpty(y.getExtField()) && y.getExtField() == 1) { + originField = String.format(DorisConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getDataeaseName()); + } else { + originField = String.format(DorisConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getDataeaseName()); + } String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_Y_PREFIX, i); // 处理纵轴字段 yFields.add(getYFields(y, originField, fieldAlias)); @@ -380,7 +425,15 @@ public class DorisQueryProvider extends QueryProvider { if (CollectionUtils.isNotEmpty(yAxis)) { for (int i = 0; i < yAxis.size(); i++) { ChartViewFieldDTO y = yAxis.get(i); - String originField = String.format(DorisConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getDataeaseName()); + String originField; + if (ObjectUtils.isNotEmpty(y.getExtField()) && y.getExtField() == 2) { + // 解析origin name中有关联的字段生成sql表达式 + originField = calcFieldRegex(y.getOriginName(), tableObj); + } else if (ObjectUtils.isNotEmpty(y.getExtField()) && y.getExtField() == 1) { + originField = String.format(DorisConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getDataeaseName()); + } else { + originField = String.format(DorisConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getDataeaseName()); + } String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_Y_PREFIX, i); // 处理纵轴字段 yFields.add(getYFields(y, originField, fieldAlias)); @@ -515,7 +568,17 @@ public class DorisQueryProvider extends QueryProvider { String whereName = ""; String whereTerm = transMysqlFilterTerm(request.getTerm()); String whereValue = ""; - String originName = String.format(DorisConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getDataeaseName()); + + String originName; + if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 2) { + // 解析origin name中有关联的字段生成sql表达式 + originName = calcFieldRegex(field.getOriginName(), tableObj); + } else if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 1) { + originName = String.format(DorisConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getDataeaseName()); + } else { + originName = String.format(DorisConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getDataeaseName()); + } + if (field.getDeType() == 1 && field.getDeExtractType() != 1) { String cast = String.format(DorisConstants.CAST, originName, DorisConstants.DEFAULT_INT_FORMAT) + "/1000"; whereName = String.format(DorisConstants.FROM_UNIXTIME, cast, DorisConstants.DEFAULT_DATE_FORMAT); @@ -557,7 +620,16 @@ public class DorisQueryProvider extends QueryProvider { String whereName = ""; String whereTerm = transMysqlFilterTerm(request.getOperator()); String whereValue = ""; - String originName = String.format(DorisConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getDataeaseName()); + + String originName; + if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 2) { + // 解析origin name中有关联的字段生成sql表达式 + originName = calcFieldRegex(field.getOriginName(), tableObj); + } else if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 1) { + originName = String.format(DorisConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getDataeaseName()); + } else { + originName = String.format(DorisConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getDataeaseName()); + } if (field.getDeType() == 1 && field.getDeExtractType() != 1) { String cast = String.format(DorisConstants.CAST, originName, DorisConstants.DEFAULT_INT_FORMAT) + "/1000"; @@ -580,7 +652,7 @@ public class DorisQueryProvider extends QueryProvider { String endTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(1)))); whereValue = String.format(DorisConstants.WHERE_BETWEEN, startTime, endTime); } else { - whereValue = String.format(MySQLConstants.WHERE_BETWEEN, value.get(0), value.get(1)); + whereValue = String.format(DorisConstants.WHERE_BETWEEN, value.get(0), value.get(1)); } } else { whereValue = String.format(DorisConstants.WHERE_VALUE_VALUE, value.get(0)); @@ -736,4 +808,28 @@ public class DorisQueryProvider extends QueryProvider { } return list; } + + private String calcFieldRegex(String originField, SQLObj tableObj) { + originField = originField.replaceAll("[\\t\\n\\r]]", ""); + // 正则提取[xxx] + String regex = "\\[(.*?)]"; + Pattern pattern = Pattern.compile(regex); + Matcher matcher = pattern.matcher(originField); + Set ids = new HashSet<>(); + while (matcher.find()) { + String id = matcher.group(1); + ids.add(id); + } + if (CollectionUtils.isEmpty(ids)) { + return originField; + } + DatasetTableFieldExample datasetTableFieldExample = new DatasetTableFieldExample(); + datasetTableFieldExample.createCriteria().andIdIn(new ArrayList<>(ids)); + List calcFields = datasetTableFieldMapper.selectByExample(datasetTableFieldExample); + for (DatasetTableField ele : calcFields) { + originField = originField.replaceAll("\\[" + ele.getId() + "]", + String.format(DorisConstants.KEYWORD_FIX, tableObj.getTableAlias(), ele.getDataeaseName())); + } + return originField; + } } diff --git a/backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java b/backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java index 108d0a9fd0..13ba47b27f 100644 --- a/backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java @@ -1,6 +1,8 @@ package io.dataease.provider.mysql; import io.dataease.base.domain.DatasetTableField; +import io.dataease.base.domain.DatasetTableFieldExample; +import io.dataease.base.mapper.DatasetTableFieldMapper; import io.dataease.controller.request.chart.ChartExtFilterRequest; import io.dataease.dto.chart.ChartCustomFilterDTO; import io.dataease.dto.chart.ChartViewFieldDTO; @@ -15,11 +17,12 @@ import org.stringtemplate.v4.ST; import org.stringtemplate.v4.STGroup; import org.stringtemplate.v4.STGroupFile; +import javax.annotation.Resource; import java.text.MessageFormat; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; +import java.util.*; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import static io.dataease.provider.SQLConstants.TABLE_ALIAS_PREFIX; @@ -29,6 +32,9 @@ import static io.dataease.provider.SQLConstants.TABLE_ALIAS_PREFIX; */ @Service("mysqlQuery") public class MysqlQueryProvider extends QueryProvider { + @Resource + private DatasetTableFieldMapper datasetTableFieldMapper; + @Override public Integer transFieldType(String field) { switch (field) { @@ -89,7 +95,15 @@ public class MysqlQueryProvider extends QueryProvider { if (CollectionUtils.isNotEmpty(fields)) { for (int i = 0; i < fields.size(); i++) { DatasetTableField f = fields.get(i); - String originField = String.format(MySQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), f.getOriginName()); + String originField; + if (ObjectUtils.isNotEmpty(f.getExtField()) && f.getExtField() == 2) { + // 解析origin name中有关联的字段生成sql表达式 + originField = calcFieldRegex(f.getOriginName(), tableObj); + } else if (ObjectUtils.isNotEmpty(f.getExtField()) && f.getExtField() == 1) { + originField = String.format(MySQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), f.getOriginName()); + } else { + originField = String.format(MySQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), f.getOriginName()); + } String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i); String fieldName = ""; // 处理横轴字段 @@ -171,7 +185,15 @@ public class MysqlQueryProvider extends QueryProvider { if (CollectionUtils.isNotEmpty(xAxis)) { for (int i = 0; i < xAxis.size(); i++) { ChartViewFieldDTO x = xAxis.get(i); - String originField = String.format(MySQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName()); + String originField; + if (ObjectUtils.isNotEmpty(x.getExtField()) && x.getExtField() == 2) { + // 解析origin name中有关联的字段生成sql表达式 + originField = calcFieldRegex(x.getOriginName(), tableObj); + } else if (ObjectUtils.isNotEmpty(x.getExtField()) && x.getExtField() == 1) { + originField = String.format(MySQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName()); + } else { + originField = String.format(MySQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName()); + } String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i); // 处理横轴字段 xFields.add(getXFields(x, originField, fieldAlias)); @@ -193,7 +215,15 @@ public class MysqlQueryProvider extends QueryProvider { if (CollectionUtils.isNotEmpty(yAxis)) { for (int i = 0; i < yAxis.size(); i++) { ChartViewFieldDTO y = yAxis.get(i); - String originField = String.format(MySQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName()); + String originField; + if (ObjectUtils.isNotEmpty(y.getExtField()) && y.getExtField() == 2) { + // 解析origin name中有关联的字段生成sql表达式 + originField = calcFieldRegex(y.getOriginName(), tableObj); + } else if (ObjectUtils.isNotEmpty(y.getExtField()) && y.getExtField() == 1) { + originField = String.format(MySQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName()); + } else { + originField = String.format(MySQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName()); + } String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_Y_PREFIX, i); // 处理纵轴字段 yFields.add(getYFields(y, originField, fieldAlias)); @@ -270,7 +300,15 @@ public class MysqlQueryProvider extends QueryProvider { if (CollectionUtils.isNotEmpty(xList)) { for (int i = 0; i < xList.size(); i++) { ChartViewFieldDTO x = xList.get(i); - String originField = String.format(MySQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName()); + String originField; + if (ObjectUtils.isNotEmpty(x.getExtField()) && x.getExtField() == 2) { + // 解析origin name中有关联的字段生成sql表达式 + originField = calcFieldRegex(x.getOriginName(), tableObj); + } else if (ObjectUtils.isNotEmpty(x.getExtField()) && x.getExtField() == 1) { + originField = String.format(MySQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName()); + } else { + originField = String.format(MySQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName()); + } String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i); // 处理横轴字段 xFields.add(getXFields(x, originField, fieldAlias)); @@ -292,7 +330,15 @@ public class MysqlQueryProvider extends QueryProvider { if (CollectionUtils.isNotEmpty(yAxis)) { for (int i = 0; i < yAxis.size(); i++) { ChartViewFieldDTO y = yAxis.get(i); - String originField = String.format(MySQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName()); + String originField; + if (ObjectUtils.isNotEmpty(y.getExtField()) && y.getExtField() == 2) { + // 解析origin name中有关联的字段生成sql表达式 + originField = calcFieldRegex(y.getOriginName(), tableObj); + } else if (ObjectUtils.isNotEmpty(y.getExtField()) && y.getExtField() == 1) { + originField = String.format(MySQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName()); + } else { + originField = String.format(MySQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName()); + } String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_Y_PREFIX, i); // 处理纵轴字段 yFields.add(getYFields(y, originField, fieldAlias)); @@ -313,7 +359,15 @@ public class MysqlQueryProvider extends QueryProvider { if (CollectionUtils.isNotEmpty(extStack)) { for (int i = 0; i < extStack.size(); i++) { ChartViewFieldDTO stack = extStack.get(i); - String originField = String.format(MySQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), stack.getOriginName()); + String originField; + if (ObjectUtils.isNotEmpty(stack.getExtField()) && stack.getExtField() == 2) { + // 解析origin name中有关联的字段生成sql表达式 + originField = calcFieldRegex(stack.getOriginName(), tableObj); + } else if (ObjectUtils.isNotEmpty(stack.getExtField()) && stack.getExtField() == 1) { + originField = String.format(MySQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), stack.getOriginName()); + } else { + originField = String.format(MySQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), stack.getOriginName()); + } String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i); // 处理横轴字段 stackFields.add(getXFields(stack, originField, fieldAlias)); @@ -390,7 +444,15 @@ public class MysqlQueryProvider extends QueryProvider { if (CollectionUtils.isNotEmpty(yAxis)) { for (int i = 0; i < yAxis.size(); i++) { ChartViewFieldDTO y = yAxis.get(i); - String originField = String.format(MySQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName()); + String originField; + if (ObjectUtils.isNotEmpty(y.getExtField()) && y.getExtField() == 2) { + // 解析origin name中有关联的字段生成sql表达式 + originField = calcFieldRegex(y.getOriginName(), tableObj); + } else if (ObjectUtils.isNotEmpty(y.getExtField()) && y.getExtField() == 1) { + originField = String.format(MySQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName()); + } else { + originField = String.format(MySQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName()); + } String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_Y_PREFIX, i); // 处理纵轴字段 yFields.add(getYFields(y, originField, fieldAlias)); @@ -522,7 +584,15 @@ public class MysqlQueryProvider extends QueryProvider { String whereName = ""; String whereTerm = transMysqlFilterTerm(request.getTerm()); String whereValue = ""; - String originName = String.format(MySQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName()); + String originName; + if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 2) { + // 解析origin name中有关联的字段生成sql表达式 + originName = calcFieldRegex(field.getOriginName(), tableObj); + } else if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 1) { + originName = String.format(MySQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName()); + } else { + originName = String.format(MySQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName()); + } if (field.getDeType() == 1 && field.getDeExtractType() != 1) { String cast = String.format(MySQLConstants.CAST, originName, MySQLConstants.DEFAULT_INT_FORMAT) + "/1000"; whereName = String.format(MySQLConstants.FROM_UNIXTIME, cast, MySQLConstants.DEFAULT_DATE_FORMAT); @@ -562,7 +632,16 @@ public class MysqlQueryProvider extends QueryProvider { String whereName = ""; String whereTerm = transMysqlFilterTerm(request.getOperator()); String whereValue = ""; - String originName = String.format(MySQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName()); + + String originName; + if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 2) { + // 解析origin name中有关联的字段生成sql表达式 + originName = calcFieldRegex(field.getOriginName(), tableObj); + } else if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 1) { + originName = String.format(MySQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName()); + } else { + originName = String.format(MySQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName()); + } if (field.getDeType() == 1 && field.getDeExtractType() != 1) { String cast = String.format(MySQLConstants.CAST, originName, MySQLConstants.DEFAULT_INT_FORMAT) + "/1000"; @@ -743,4 +822,28 @@ public class MysqlQueryProvider extends QueryProvider { } return list; } + + private String calcFieldRegex(String originField, SQLObj tableObj) { + originField = originField.replaceAll("[\\t\\n\\r]]", ""); + // 正则提取[xxx] + String regex = "\\[(.*?)]"; + Pattern pattern = Pattern.compile(regex); + Matcher matcher = pattern.matcher(originField); + Set ids = new HashSet<>(); + while (matcher.find()) { + String id = matcher.group(1); + ids.add(id); + } + if (CollectionUtils.isEmpty(ids)) { + return originField; + } + DatasetTableFieldExample datasetTableFieldExample = new DatasetTableFieldExample(); + datasetTableFieldExample.createCriteria().andIdIn(new ArrayList<>(ids)); + List calcFields = datasetTableFieldMapper.selectByExample(datasetTableFieldExample); + for (DatasetTableField ele : calcFields) { + originField = originField.replaceAll("\\[" + ele.getId() + "]", + String.format(MySQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), ele.getOriginName())); + } + return originField; + } } diff --git a/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java b/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java index 5b9204dee8..124c383736 100644 --- a/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java @@ -1,13 +1,14 @@ package io.dataease.provider.oracle; import io.dataease.base.domain.DatasetTableField; +import io.dataease.base.domain.DatasetTableFieldExample; +import io.dataease.base.mapper.DatasetTableFieldMapper; import io.dataease.controller.request.chart.ChartExtFilterRequest; import io.dataease.dto.chart.ChartCustomFilterDTO; import io.dataease.dto.chart.ChartViewFieldDTO; import io.dataease.dto.sqlObj.SQLObj; import io.dataease.provider.QueryProvider; import io.dataease.provider.SQLConstants; -import io.dataease.provider.mysql.MySQLConstants; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; @@ -16,11 +17,12 @@ import org.stringtemplate.v4.ST; import org.stringtemplate.v4.STGroup; import org.stringtemplate.v4.STGroupFile; +import javax.annotation.Resource; import java.text.MessageFormat; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; +import java.util.*; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import static io.dataease.provider.SQLConstants.TABLE_ALIAS_PREFIX; @@ -37,6 +39,9 @@ public class OracleQueryProvider extends QueryProvider { private static Integer FLOAT = 3; private static Integer BOOLEAN = 4; + @Resource + private DatasetTableFieldMapper datasetTableFieldMapper; + @Override public Integer transFieldType(String field) { switch (field) { @@ -118,7 +123,15 @@ public class OracleQueryProvider extends QueryProvider { if (CollectionUtils.isNotEmpty(fields)) { for (int i = 0; i < fields.size(); i++) { DatasetTableField f = fields.get(i); - String originField = String.format(OracleConstants.KEYWORD_FIX, tableObj.getTableAlias(), f.getOriginName()); + String originField; + if (ObjectUtils.isNotEmpty(f.getExtField()) && f.getExtField() == 2) { + // 解析origin name中有关联的字段生成sql表达式 + originField = calcFieldRegex(f.getOriginName(), tableObj); + } else if (ObjectUtils.isNotEmpty(f.getExtField()) && f.getExtField() == 1) { + originField = String.format(OracleConstants.KEYWORD_FIX, tableObj.getTableAlias(), f.getOriginName()); + } else { + originField = String.format(OracleConstants.KEYWORD_FIX, tableObj.getTableAlias(), f.getOriginName()); + } String fieldAlias = String.format(OracleConstants.ALIAS_FIX, String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i)); String fieldName = ""; // 处理横轴字段 @@ -206,7 +219,15 @@ public class OracleQueryProvider extends QueryProvider { if (CollectionUtils.isNotEmpty(xAxis)) { for (int i = 0; i < xAxis.size(); i++) { ChartViewFieldDTO x = xAxis.get(i); - String originField = String.format(OracleConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName()); + String originField; + if (ObjectUtils.isNotEmpty(x.getExtField()) && x.getExtField() == 2) { + // 解析origin name中有关联的字段生成sql表达式 + originField = calcFieldRegex(x.getOriginName(), tableObj); + } else if (ObjectUtils.isNotEmpty(x.getExtField()) && x.getExtField() == 1) { + originField = String.format(OracleConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName()); + } else { + originField = String.format(OracleConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName()); + } String fieldAlias = String.format(OracleConstants.ALIAS_FIX, String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i)); // 处理横轴字段 xFields.add(getXFields(x, originField, fieldAlias)); @@ -228,7 +249,15 @@ public class OracleQueryProvider extends QueryProvider { if (CollectionUtils.isNotEmpty(yAxis)) { for (int i = 0; i < yAxis.size(); i++) { ChartViewFieldDTO y = yAxis.get(i); - String originField = String.format(OracleConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName()); + String originField; + if (ObjectUtils.isNotEmpty(y.getExtField()) && y.getExtField() == 2) { + // 解析origin name中有关联的字段生成sql表达式 + originField = calcFieldRegex(y.getOriginName(), tableObj); + } else if (ObjectUtils.isNotEmpty(y.getExtField()) && y.getExtField() == 1) { + originField = String.format(OracleConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName()); + } else { + originField = String.format(OracleConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName()); + } String fieldAlias = String.format(OracleConstants.ALIAS_FIX, String.format(SQLConstants.FIELD_ALIAS_Y_PREFIX, i)); // 处理纵轴字段 yFields.add(getYFields(y, originField, fieldAlias)); @@ -304,7 +333,15 @@ public class OracleQueryProvider extends QueryProvider { if (CollectionUtils.isNotEmpty(xList)) { for (int i = 0; i < xList.size(); i++) { ChartViewFieldDTO x = xList.get(i); - String originField = String.format(OracleConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName()); + String originField; + if (ObjectUtils.isNotEmpty(x.getExtField()) && x.getExtField() == 2) { + // 解析origin name中有关联的字段生成sql表达式 + originField = calcFieldRegex(x.getOriginName(), tableObj); + } else if (ObjectUtils.isNotEmpty(x.getExtField()) && x.getExtField() == 1) { + originField = String.format(OracleConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName()); + } else { + originField = String.format(OracleConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName()); + } String fieldAlias = String.format(OracleConstants.ALIAS_FIX, String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i)); // 处理横轴字段 xFields.add(getXFields(x, originField, fieldAlias)); @@ -326,7 +363,15 @@ public class OracleQueryProvider extends QueryProvider { if (CollectionUtils.isNotEmpty(yAxis)) { for (int i = 0; i < yAxis.size(); i++) { ChartViewFieldDTO y = yAxis.get(i); - String originField = String.format(OracleConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName()); + String originField; + if (ObjectUtils.isNotEmpty(y.getExtField()) && y.getExtField() == 2) { + // 解析origin name中有关联的字段生成sql表达式 + originField = calcFieldRegex(y.getOriginName(), tableObj); + } else if (ObjectUtils.isNotEmpty(y.getExtField()) && y.getExtField() == 1) { + originField = String.format(OracleConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName()); + } else { + originField = String.format(OracleConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName()); + } String fieldAlias = String.format(OracleConstants.ALIAS_FIX, String.format(SQLConstants.FIELD_ALIAS_Y_PREFIX, i)); // 处理纵轴字段 yFields.add(getYFields(y, originField, fieldAlias)); @@ -405,7 +450,15 @@ public class OracleQueryProvider extends QueryProvider { if (CollectionUtils.isNotEmpty(yAxis)) { for (int i = 0; i < yAxis.size(); i++) { ChartViewFieldDTO y = yAxis.get(i); - String originField = String.format(OracleConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName()); + String originField; + if (ObjectUtils.isNotEmpty(y.getExtField()) && y.getExtField() == 2) { + // 解析origin name中有关联的字段生成sql表达式 + originField = calcFieldRegex(y.getOriginName(), tableObj); + } else if (ObjectUtils.isNotEmpty(y.getExtField()) && y.getExtField() == 1) { + originField = String.format(OracleConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName()); + } else { + originField = String.format(OracleConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName()); + } String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_Y_PREFIX, i); // 处理纵轴字段 yFields.add(getYFields(y, originField, fieldAlias)); @@ -532,7 +585,17 @@ public class OracleQueryProvider extends QueryProvider { String whereName = ""; String whereTerm = transMysqlFilterTerm(request.getTerm()); String whereValue = ""; - String originName = String.format(OracleConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName()); + + String originName; + if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 2) { + // 解析origin name中有关联的字段生成sql表达式 + originName = calcFieldRegex(field.getOriginName(), tableObj); + } else if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 1) { + originName = String.format(OracleConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName()); + } else { + originName = String.format(OracleConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName()); + } + if (field.getDeType() == 1 && field.getDeExtractType() != 1) { String cast = String.format(OracleConstants.CAST, originName, OracleConstants.DEFAULT_INT_FORMAT) + "/1000"; whereName = String.format(OracleConstants.FROM_UNIXTIME, cast, OracleConstants.DEFAULT_DATE_FORMAT); @@ -572,7 +635,16 @@ public class OracleQueryProvider extends QueryProvider { String whereName = ""; String whereTerm = transMysqlFilterTerm(request.getOperator()); String whereValue = ""; - String originName = String.format(OracleConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName()); + + String originName; + if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 2) { + // 解析origin name中有关联的字段生成sql表达式 + originName = calcFieldRegex(field.getOriginName(), tableObj); + } else if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 1) { + originName = String.format(OracleConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName()); + } else { + originName = String.format(OracleConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName()); + } if (field.getDeType() == 1 && field.getDeExtractType() != 1) { String cast = String.format(OracleConstants.CAST, originName, OracleConstants.DEFAULT_INT_FORMAT) + "/1000"; @@ -592,7 +664,7 @@ public class OracleQueryProvider extends QueryProvider { String endTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(1)))); whereValue = String.format(OracleConstants.WHERE_BETWEEN, startTime, endTime); } else { - whereValue = String.format(MySQLConstants.WHERE_BETWEEN, value.get(0), value.get(1)); + whereValue = String.format(OracleConstants.WHERE_BETWEEN, value.get(0), value.get(1)); } } else { whereValue = String.format(OracleConstants.WHERE_VALUE_VALUE, value.get(0)); @@ -766,4 +838,28 @@ public class OracleQueryProvider extends QueryProvider { } return list; } + + private String calcFieldRegex(String originField, SQLObj tableObj) { + originField = originField.replaceAll("[\\t\\n\\r]]", ""); + // 正则提取[xxx] + String regex = "\\[(.*?)]"; + Pattern pattern = Pattern.compile(regex); + Matcher matcher = pattern.matcher(originField); + Set ids = new HashSet<>(); + while (matcher.find()) { + String id = matcher.group(1); + ids.add(id); + } + if (CollectionUtils.isEmpty(ids)) { + return originField; + } + DatasetTableFieldExample datasetTableFieldExample = new DatasetTableFieldExample(); + datasetTableFieldExample.createCriteria().andIdIn(new ArrayList<>(ids)); + List calcFields = datasetTableFieldMapper.selectByExample(datasetTableFieldExample); + for (DatasetTableField ele : calcFields) { + originField = originField.replaceAll("\\[" + ele.getId() + "]", + String.format(OracleConstants.KEYWORD_FIX, tableObj.getTableAlias(), ele.getOriginName())); + } + return originField; + } } 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 2908ce5daf..2bb34dce5b 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -11,8 +11,8 @@ import io.dataease.base.mapper.ext.UtilMapper; import io.dataease.commons.constants.JobStatus; import io.dataease.commons.constants.ScheduleType; import io.dataease.commons.constants.TaskStatus; +import io.dataease.commons.exception.DEException; import io.dataease.commons.utils.*; -import io.dataease.controller.request.chart.ChartGroupRequest; import io.dataease.controller.request.dataset.DataSetGroupRequest; import io.dataease.controller.request.dataset.DataSetTableRequest; import io.dataease.controller.request.dataset.DataSetTaskRequest; @@ -383,12 +383,14 @@ public class DataSetTableService { data.addAll(datasourceProvider.getData(datasourceRequest)); } catch (Exception e) { e.printStackTrace(); + DEException.throwException(e.getMessage()); } try { datasourceRequest.setQuery(qp.createQueryTableWithLimit(table, fields, Integer.valueOf(dataSetTableRequest.getRow()), false)); dataSetPreviewPage.setTotal(datasourceProvider.getData(datasourceRequest).size()); } catch (Exception e) { e.printStackTrace(); + DEException.throwException(e.getMessage()); } } else { // check doris table @@ -407,12 +409,14 @@ public class DataSetTableService { data.addAll(jdbcProvider.getData(datasourceRequest)); } catch (Exception e) { e.printStackTrace(); + DEException.throwException(e.getMessage()); } try { datasourceRequest.setQuery(qp.createQueryTableWithLimit(table, fields, Integer.valueOf(dataSetTableRequest.getRow()), false)); dataSetPreviewPage.setTotal(jdbcProvider.getData(datasourceRequest).size()); } catch (Exception e) { e.printStackTrace(); + DEException.throwException(e.getMessage()); } } @@ -434,12 +438,14 @@ public class DataSetTableService { data.addAll(datasourceProvider.getData(datasourceRequest)); } catch (Exception e) { e.printStackTrace(); + DEException.throwException(e.getMessage()); } try { datasourceRequest.setQuery(qp.createQuerySqlWithLimit(sql, fields, Integer.valueOf(dataSetTableRequest.getRow()), false)); dataSetPreviewPage.setTotal(datasourceProvider.getData(datasourceRequest).size()); } catch (Exception e) { e.printStackTrace(); + DEException.throwException(e.getMessage()); } } else { // check doris table @@ -458,12 +464,14 @@ public class DataSetTableService { data.addAll(jdbcProvider.getData(datasourceRequest)); } catch (Exception e) { e.printStackTrace(); + DEException.throwException(e.getMessage()); } try { datasourceRequest.setQuery(qp.createQueryTableWithLimit(table, fields, Integer.valueOf(dataSetTableRequest.getRow()), false)); dataSetPreviewPage.setTotal(jdbcProvider.getData(datasourceRequest).size()); } catch (Exception e) { e.printStackTrace(); + DEException.throwException(e.getMessage()); } } } else if (StringUtils.equalsIgnoreCase(datasetTable.getType(), "excel")) { @@ -483,12 +491,14 @@ public class DataSetTableService { data.addAll(jdbcProvider.getData(datasourceRequest)); } catch (Exception e) { e.printStackTrace(); + DEException.throwException(e.getMessage()); } try { datasourceRequest.setQuery(qp.createQueryTableWithLimit(table, fields, Integer.valueOf(dataSetTableRequest.getRow()), false)); dataSetPreviewPage.setTotal(jdbcProvider.getData(datasourceRequest).size()); } catch (Exception e) { e.printStackTrace(); + DEException.throwException(e.getMessage()); } } else if (StringUtils.equalsIgnoreCase(datasetTable.getType(), "custom")) { if (datasetTable.getMode() == 0) { @@ -511,12 +521,14 @@ public class DataSetTableService { data.addAll(datasourceProvider.getData(datasourceRequest)); } catch (Exception e) { e.printStackTrace(); + DEException.throwException(e.getMessage()); } try { datasourceRequest.setQuery(qp.createQuerySqlWithLimit(sql, fields, Integer.valueOf(dataSetTableRequest.getRow()), false)); dataSetPreviewPage.setTotal(datasourceProvider.getData(datasourceRequest).size()); } catch (Exception e) { e.printStackTrace(); + DEException.throwException(e.getMessage()); } } else { Datasource ds = (Datasource) CommonBeanFactory.getBean("DorisDatasource"); @@ -531,6 +543,7 @@ public class DataSetTableService { data.addAll(jdbcProvider.getData(datasourceRequest)); } catch (Exception e) { e.printStackTrace(); + DEException.throwException(e.getMessage()); } try { @@ -538,6 +551,7 @@ public class DataSetTableService { dataSetPreviewPage.setTotal(jdbcProvider.getData(datasourceRequest).size()); } catch (Exception e) { e.printStackTrace(); + DEException.throwException(e.getMessage()); } } } @@ -972,14 +986,15 @@ public class DataSetTableService { DatasetTable datasetTable = datasetTableMapper.selectByPrimaryKey(datasetTableIncrementalConfig.getTableId()); List datasetTableFields = dataSetTableFieldsService.getFieldsByTableId(datasetTable.getId()); datasetTableFields.sort((o1, o2) -> { - if (o1.getOriginName() == null) { + if (o1.getColumnIndex() == null) { return -1; } - if (o2.getOriginName() == null) { + if (o2.getColumnIndex() == null) { return 1; } - return o1.getOriginName().compareTo(o2.getOriginName()); + return o1.getColumnIndex().compareTo(o2.getColumnIndex()); }); + List originNameFileds = datasetTableFields.stream().map(DatasetTableField::getOriginName).collect(Collectors.toList()); Datasource ds = datasourceMapper.selectByPrimaryKey(datasetTable.getDataSourceId()); QueryProvider qp = ProviderFactory.getQueryProvider(ds.getType()); @@ -998,10 +1013,7 @@ public class DataSetTableService { }catch (Exception e){ DataEaseException.throwException(Translator.get("i18n_check_sql_error") + e.getMessage()); } - datasourceProvider.fetchResultField(datasourceRequest).stream().map(TableFiled::getFieldName).forEach(filed -> { - sqlFileds.add(filed); - }); - sort(sqlFileds); + if (!originNameFileds.equals(sqlFileds)) { DataEaseException.throwException(Translator.get("i18n_sql_add_not_matching") + sqlFileds.toString()); } @@ -1011,28 +1023,20 @@ public class DataSetTableService { .replace(currentUpdateTime, Long.valueOf(System.currentTimeMillis()).toString()); datasourceRequest.setQuery(qp.wrapSql(sql)); List sqlFileds = new ArrayList<>(); - datasourceProvider.fetchResultField(datasourceRequest).stream().map(TableFiled::getFieldName).forEach(filed -> { - sqlFileds.add(filed); - }); - sort(sqlFileds); + try{ + datasourceProvider.fetchResultField(datasourceRequest).stream().map(TableFiled::getFieldName).forEach(filed -> { + sqlFileds.add(filed); + }); + }catch (Exception e){ + DataEaseException.throwException(Translator.get("i18n_check_sql_error") + e.getMessage()); + } + if (!originNameFileds.equals(sqlFileds)) { DataEaseException.throwException(Translator.get("i18n_sql_delete_not_matching") + sqlFileds.toString()); } } } - private void sort(List sqlFileds) { - sqlFileds.sort((o1, o2) -> { - if (o1 == null) { - return -1; - } - if (o2 == null) { - return 1; - } - return o1.compareTo(o2); - }); - } - private void checkName(DatasetTable datasetTable) { // if (StringUtils.isEmpty(datasetTable.getId()) && StringUtils.equalsIgnoreCase("db", datasetTable.getType())) { // return; @@ -1449,7 +1453,6 @@ public class DataSetTableService { datasetTableTaskLogMapper.updateByExampleSelective(datasetTableTaskLog, datasetTableTaskLogExample); dataSetTableTaskService.updateTaskStatus(taskIds, JobStatus.Error); - //TODO check task status for (DatasetTable jobStoppeddDatasetTable : jobStoppeddDatasetTables) { extractDataService.deleteFile("all_scope", jobStoppeddDatasetTable.getId()); diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java index 3cb68d14ee..439ba55d79 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java @@ -1,6 +1,5 @@ package io.dataease.service.dataset; -import com.google.gson.Gson; import io.dataease.base.domain.*; import io.dataease.base.mapper.DatasetTableMapper; import io.dataease.base.mapper.DatasetTableTaskMapper; @@ -201,6 +200,7 @@ public class DataSetTableTaskService { datasetTableTask.setStatus(TaskStatus.Stopped.name()); }else { datasetTableTask = datasetTableTaskMapper.selectByPrimaryKey(datasetTableTask.getId()); + datasetTableTask.setLastExecStatus(lastExecStatus.name()); if(StringUtils.isNotEmpty(datasetTableTask.getEnd()) && datasetTableTask.getEnd().equalsIgnoreCase("1")){ BaseGridRequest request = new BaseGridRequest(); ConditionEntity conditionEntity = new ConditionEntity(); diff --git a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java index c70feb1fe1..d49469e0e7 100644 --- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java +++ b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java @@ -123,8 +123,7 @@ public class ExtractDataService { "else\n" + " echo $result\n" + " exit 1\n" + - "fi\n" + - "rm -rf %s\n"; + "fi\n"; public synchronized boolean existSyncTask(DatasetTable datasetTable, DatasetTableTask datasetTableTask, Long startTime) { datasetTable.setSyncStatus(JobStatus.Underway.name()); @@ -185,15 +184,15 @@ public class ExtractDataService { replaceTable(DorisTableUtils.dorisName(datasetTableId)); saveSucessLog(datasetTableTaskLog); // sendWebMsg(datasetTable, null, true); - deleteFile("all_scope", datasetTableId); updateTableStatus(datasetTableId, datasetTable, JobStatus.Completed, execTime); } catch (Exception e) { saveErrorLog(datasetTableId, null, e); // sendWebMsg(datasetTable, null, false); updateTableStatus(datasetTableId, datasetTable, JobStatus.Error, null); dropDorisTable(DorisTableUtils.dorisTmpName(DorisTableUtils.dorisName(datasetTableId))); - deleteFile("all_scope", datasetTableId); } finally { + deleteFile("all_scope", datasetTableId); + deleteFile(new Gson().fromJson(datasetTable.getInfo(), DataTableInfoDTO.class).getData()); } break; @@ -211,9 +210,9 @@ public class ExtractDataService { saveErrorLog(datasetTableId, null, e); // sendWebMsg(datasetTable, null, false); updateTableStatus(datasetTableId, datasetTable, JobStatus.Error, null); + } finally { deleteFile("incremental_add", datasetTableId); deleteFile("incremental_delete", datasetTableId); - } finally { } break; } @@ -931,38 +930,36 @@ public class ExtractDataService { case "all_scope": transName = "trans_" + DorisTableUtils.dorisName(dataSetTableId); jobName = "job_" + DorisTableUtils.dorisName(dataSetTableId); - fileName = DorisTableUtils.dorisTmpName(dataSetTableId); + fileName = DorisTableUtils.dorisTmpName(DorisTableUtils.dorisName(dataSetTableId)); break; case "incremental_add": transName = "trans_add_" + DorisTableUtils.dorisName(dataSetTableId); jobName = "job_add_" + DorisTableUtils.dorisName(dataSetTableId); - fileName = DorisTableUtils.dorisAddName(dataSetTableId); + fileName = DorisTableUtils.dorisAddName(DorisTableUtils.dorisName(dataSetTableId)); break; case "incremental_delete": transName = "trans_delete_" + DorisTableUtils.dorisName(dataSetTableId); jobName = "job_delete_" + DorisTableUtils.dorisName(dataSetTableId); - fileName = DorisTableUtils.dorisDeleteName(dataSetTableId); + fileName = DorisTableUtils.dorisDeleteName(DorisTableUtils.dorisName(dataSetTableId)); break; default: break; } - try { - File file = new File(root_path + fileName + "." + extention); - FileUtils.forceDelete(file); - } catch (Exception e) { + deleteFile(root_path + fileName + "." + extention); + deleteFile(root_path + jobName + ".kjb"); + deleteFile(root_path + transName + ".ktr"); + } + + private void deleteFile(String filePath){ + if(StringUtils.isEmpty(filePath)){ + return; } try { - File file = new File(root_path + jobName + ".kjb"); - FileUtils.forceDelete(file); - } catch (Exception e) { - } - try { - File file = new File(root_path + transName + ".ktr"); + File file = new File(filePath); FileUtils.forceDelete(file); } catch (Exception e) { } } - public boolean isKettleRunning() { try { if (!InetAddress.getByName(carte).isReachable(1000)) { diff --git a/backend/src/main/java/io/dataease/service/message/MsgAop.java b/backend/src/main/java/io/dataease/service/message/MsgAop.java index cf4cb8790e..a617aab1d5 100644 --- a/backend/src/main/java/io/dataease/service/message/MsgAop.java +++ b/backend/src/main/java/io/dataease/service/message/MsgAop.java @@ -1,7 +1,7 @@ package io.dataease.service.message; -import io.dataease.controller.message.dto.SubscribeNode; +import io.dataease.controller.sys.response.SubscribeNode; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.aspectj.lang.ProceedingJoinPoint; diff --git a/backend/src/main/java/io/dataease/service/message/SysMsgService.java b/backend/src/main/java/io/dataease/service/message/SysMsgService.java index b43d1cf687..0bfa10c343 100644 --- a/backend/src/main/java/io/dataease/service/message/SysMsgService.java +++ b/backend/src/main/java/io/dataease/service/message/SysMsgService.java @@ -10,7 +10,12 @@ import io.dataease.base.mapper.ext.ExtSysMsgMapper; import io.dataease.commons.constants.SysMsgConstants; import io.dataease.commons.utils.AuthUtils; import io.dataease.commons.utils.CommonBeanFactory; -import io.dataease.controller.message.dto.*; +import io.dataease.controller.sys.request.BatchSettingRequest; +import io.dataease.controller.sys.request.MsgRequest; +import io.dataease.controller.sys.request.MsgSettingRequest; +import io.dataease.controller.sys.response.MsgGridDto; +import io.dataease.controller.sys.response.SettingTreeNode; +import io.dataease.controller.sys.response.SubscribeNode; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.springframework.cache.annotation.CacheEvict; diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties index c0e7b296f7..5084fb866f 100644 --- a/backend/src/main/resources/application.properties +++ b/backend/src/main/resources/application.properties @@ -26,11 +26,15 @@ mybatis.configuration.map-underscore-to-camel-case=true # knife4j knife4j.enable=true knife4j.setting.enableFooter=false -knife4j.setting.enableFooterCustom=true -knife4j.setting.footerCustomContent=杭州飞致云信息科技有限公司 1.0-b9 +knife4j.setting.enableFooterCustom=false +knife4j.setting.footerCustomContent=fit2cloud 1.0-b9 knife4j.setting.enableSwaggerModels=false knife4j.setting.enableDocumentManage=false +knife4j.setting.enableSearch=false +knife4j.setting.enableOpenApi=false +knife4j.setting.enableAfterScript=false +app.version=@project.version@ logging.file.path=/opt/dataease/logs/${spring.application.name} diff --git a/frontend/src/api/dataset/dataset.js b/frontend/src/api/dataset/dataset.js index a91a6c7d06..5813b7611c 100644 --- a/frontend/src/api/dataset/dataset.js +++ b/frontend/src/api/dataset/dataset.js @@ -111,7 +111,7 @@ export function batchEdit(data) { }) } -export function post(url, data, showLoading = true, timeout = 10000) { +export function post(url, data, showLoading = true, timeout = 20000) { return request({ url: url, method: 'post', diff --git a/frontend/src/components/Notification/index.vue b/frontend/src/components/Notification/index.vue index e295018421..6e0d6cae1a 100644 --- a/frontend/src/components/Notification/index.vue +++ b/frontend/src/components/Notification/index.vue @@ -64,6 +64,7 @@ import { query, updateStatus } from '@/api/system/msg' import { getTypeName, loadMsgTypes } from '@/utils/webMsg' import { mapGetters } from 'vuex' import bus from '@/utils/bus' +import { getToken } from '@/utils/auth' export default { data() { return { @@ -172,6 +173,11 @@ export default { query(currentPage, pageSize, param).then(response => { this.data = response.data.listObject this.paginationConfig.total = response.data.itemCount + }).catch(() => { + const token = getToken() + if (!token || token === 'null' || token === 'undefined') { + this.timer && clearInterval(this.timer) + } }) }, getTypeName(value) { diff --git a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue index fd39afd240..7b39cf585a 100644 --- a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue +++ b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue @@ -4,7 +4,9 @@ :class="{'gap_class':canvasStyleData.panel.gap==='yes'}" class="component" @click="handleClick" + @mousedown="elementMouseDown" > + { this[event](events[event]) }) + }, + elementMouseDown(e) { + debugger + // private 设置当前组件数据及状态 + this.$store.commit('setClickComponentStatus', true) + if (this.config.component !== 'v-text' && this.config.component !== 'rect-shape' && this.config.component !== 'de-input-search' && this.config.component !== 'de-number-range') { + e.preventDefault() + } + // 阻止冒泡事件 + e.stopPropagation() + this.$store.commit('setCurComponent', { component: this.config, index: this.index }) + }, + showViewDetails(){ + this.$refs.wrapperChild.openChartDetailsDialog(); } } } diff --git a/frontend/src/components/canvas/components/Editor/EditBar.vue b/frontend/src/components/canvas/components/Editor/EditBar.vue new file mode 100644 index 0000000000..872b0cfc6b --- /dev/null +++ b/frontend/src/components/canvas/components/Editor/EditBar.vue @@ -0,0 +1,70 @@ + + + + + diff --git a/frontend/src/components/canvas/components/Editor/Preview.vue b/frontend/src/components/canvas/components/Editor/Preview.vue index 5b8fcbd1c9..9b6728fbf5 100644 --- a/frontend/src/components/canvas/components/Editor/Preview.vue +++ b/frontend/src/components/canvas/components/Editor/Preview.vue @@ -1,5 +1,5 @@