From 0718ad86475b775f31cc23b709bba669ce07ebb5 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Fri, 21 Oct 2022 23:23:07 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=90=8E=E5=8F=B0=E6=89=80=E6=9C=89?= =?UTF-8?q?=E6=8B=BC=E5=86=99=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/sys/MsgController.java | 4 +-- .../strategy/impl/EmailTaskHandler.java | 4 +-- .../provider/datasource/JdbcProvider.java | 4 +-- .../service/chart/util/ChartDataBuild.java | 36 +++++++++---------- .../service/message/SysMsgService.java | 4 +-- .../main/resources/db/migration/V42__1.16.sql | 2 +- .../resources/i18n/messages_en_US.properties | 10 +++--- .../resources/i18n/messages_zh_CN.properties | 10 +++--- .../resources/i18n/messages_zh_TW.properties | 10 +++--- 9 files changed, 42 insertions(+), 42 deletions(-) diff --git a/backend/src/main/java/io/dataease/controller/sys/MsgController.java b/backend/src/main/java/io/dataease/controller/sys/MsgController.java index e7f8cc5cf9..2fb50323a3 100644 --- a/backend/src/main/java/io/dataease/controller/sys/MsgController.java +++ b/backend/src/main/java/io/dataease/controller/sys/MsgController.java @@ -75,7 +75,7 @@ public class MsgController { @PostMapping("/setReaded/{msgId}") @ApiImplicitParam(paramType = "path", name = "msgId", value = "消息ID", required = true, dataType = "Long") public void setReaded(@PathVariable Long msgId) { - sysMsgService.setReaded(msgId); + sysMsgService.setRead(msgId); } @@ -83,7 +83,7 @@ public class MsgController { @PostMapping("/batchRead") @ApiImplicitParam(name = "msgIds", value = "消息ID集合", required = true, dataType = "List") public void batchRead(@RequestBody List msgIds) { - sysMsgService.setBatchReaded(msgIds); + sysMsgService.setBatchRead(msgIds); } @ApiOperation("全部设置已读") diff --git a/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java b/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java index 6afb467b8f..4f9d1bced1 100644 --- a/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java +++ b/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java @@ -48,7 +48,7 @@ import java.util.stream.Collectors; @Service("emailTaskHandler") public class EmailTaskHandler extends TaskHandler implements Job { - private static final Integer RUNING = 0; + private static final Integer RUNNING = 0; private static final Integer SUCCESS = 1; private static final Integer ERROR = -1; @@ -124,7 +124,7 @@ public class EmailTaskHandler extends TaskHandler implements Job { private GlobalTaskInstance buildInstance(GlobalTaskEntity taskEntity) { GlobalTaskInstance taskInstance = new GlobalTaskInstance(); taskInstance.setTaskId(taskEntity.getTaskId()); - taskInstance.setStatus(RUNING); + taskInstance.setStatus(RUNNING); taskInstance.setExecuteTime(System.currentTimeMillis()); return taskInstance; } diff --git a/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java b/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java index 59208091d0..0a2e7f8800 100644 --- a/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java +++ b/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java @@ -278,8 +278,8 @@ public class JdbcProvider extends DefaultJdbcProvider { row[j] = rs.getBlob(j + 1) == null ? "" : rs.getBlob(j + 1).toString(); } else { if (charset != null && StringUtils.isNotEmpty(rs.getString(j + 1))) { - String orginStr = new String(rs.getString(j + 1).getBytes(charset), targetCharset); - row[j] = new String(orginStr.getBytes("UTF-8"), "UTF-8"); + String originStr = new String(rs.getString(j + 1).getBytes(charset), targetCharset); + row[j] = new String(originStr.getBytes("UTF-8"), "UTF-8"); } else { row[j] = rs.getString(j + 1); } diff --git a/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java b/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java index b403f1e41f..7314367c28 100644 --- a/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java +++ b/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java @@ -18,7 +18,7 @@ public class ChartDataBuild { public static Map transChartDataAntV(List xAxis, List yAxis, ChartViewWithBLOBs view, List data, boolean isDrill) { Map map = new HashMap<>(); - List datas = new ArrayList<>(); + List dataList = new ArrayList<>(); for (int i1 = 0; i1 < data.size(); i1++) { String[] row = data.get(i1); @@ -65,7 +65,7 @@ public class ChartDataBuild { } axisChartDataDTO.setCategory(yAxis.get(j).getName()); } - datas.add(axisChartDataDTO); + dataList.add(axisChartDataDTO); } } else { for (int i = xAxis.size(); i < xAxis.size() + yAxis.size(); i++) { @@ -95,18 +95,18 @@ public class ChartDataBuild { axisChartDataDTO.setValue(new BigDecimal(0)); } axisChartDataDTO.setCategory(yAxis.get(j).getName()); - datas.add(axisChartDataDTO); + dataList.add(axisChartDataDTO); } } } - map.put("datas", datas); + map.put("data", dataList); return map; } public static Map transBaseGroupDataAntV(List xAxisBase, List xAxis, List xAxisExt, List yAxis, ChartViewWithBLOBs view, List data, boolean isDrill) { Map map = new HashMap<>(); - List datas = new ArrayList<>(); + List dataList = new ArrayList<>(); for (int i1 = 0; i1 < data.size(); i1++) { String[] row = data.get(i1); @@ -159,10 +159,10 @@ public class ChartDataBuild { axisChartDataDTO.setValue(new BigDecimal(0)); } axisChartDataDTO.setCategory(b.toString()); - datas.add(axisChartDataDTO); + dataList.add(axisChartDataDTO); } } - map.put("datas", datas); + map.put("data", dataList); return map; } @@ -170,7 +170,7 @@ public class ChartDataBuild { public static Map transStackChartDataAntV(List xAxis, List yAxis, ChartViewWithBLOBs view, List data, List extStack, boolean isDrill) { Map map = new HashMap<>(); - List datas = new ArrayList<>(); + List dataList = new ArrayList<>(); if (CollectionUtils.isNotEmpty(extStack)) { for (int i1 = 0; i1 < data.size(); i1++) { @@ -219,7 +219,7 @@ public class ChartDataBuild { axisChartDataDTO.setQuotaList(quotaList); axisChartDataDTO.setValue(new BigDecimal(0)); } - datas.add(axisChartDataDTO); + dataList.add(axisChartDataDTO); } } else { for (int i1 = 0; i1 < data.size(); i1++) { @@ -265,11 +265,11 @@ public class ChartDataBuild { axisChartDataDTO.setValue(new BigDecimal(0)); } axisChartDataDTO.setCategory(yAxis.get(j).getName()); - datas.add(axisChartDataDTO); + dataList.add(axisChartDataDTO); } } } - map.put("datas", datas); + map.put("data", dataList); return map; } @@ -277,7 +277,7 @@ public class ChartDataBuild { public static Map transScatterDataAntV(List xAxis, List yAxis, ChartViewWithBLOBs view, List data, List extBubble, boolean isDrill) { Map map = new HashMap<>(); - List datas = new ArrayList<>(); + List dataList = new ArrayList<>(); for (int i1 = 0; i1 < data.size(); i1++) { String[] row = data.get(i1); @@ -329,10 +329,10 @@ public class ChartDataBuild { axisChartDataDTO.setPopSize(new BigDecimal(0)); } } - datas.add(axisChartDataDTO); + dataList.add(axisChartDataDTO); } } - map.put("datas", datas); + map.put("data", dataList); return map; } @@ -340,7 +340,7 @@ public class ChartDataBuild { public static Map transRadarChartDataAntV(List xAxis, List yAxis, ChartViewWithBLOBs view, List data, boolean isDrill) { Map map = new HashMap<>(); - List datas = new ArrayList<>(); + List dataList = new ArrayList<>(); for (int i1 = 0; i1 < data.size(); i1++) { String[] row = data.get(i1); @@ -384,10 +384,10 @@ public class ChartDataBuild { axisChartDataDTO.setValue(new BigDecimal(0)); } axisChartDataDTO.setCategory(yAxis.get(j).getName()); - datas.add(axisChartDataDTO); + dataList.add(axisChartDataDTO); } } - map.put("datas", datas); + map.put("data", dataList); return map; } @@ -450,7 +450,7 @@ public class ChartDataBuild { } } - map.put("datas", series); + map.put("data", series); return map; } 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 d4b5ead87f..3621bf8d66 100644 --- a/backend/src/main/java/io/dataease/service/message/SysMsgService.java +++ b/backend/src/main/java/io/dataease/service/message/SysMsgService.java @@ -87,7 +87,7 @@ public class SysMsgService { return sysMsgMapper.countByExample(example); } - public void setReaded(Long msgId) { + public void setRead(Long msgId) { SysMsg sysMsg = new SysMsg(); sysMsg.setMsgId(msgId); sysMsg.setStatus(true); @@ -95,7 +95,7 @@ public class SysMsgService { sysMsgMapper.updateByPrimaryKeySelective(sysMsg); } - public void setBatchReaded(List msgIds) { + public void setBatchRead(List msgIds) { extSysMsgMapper.batchStatus(msgIds, System.currentTimeMillis()); } diff --git a/backend/src/main/resources/db/migration/V42__1.16.sql b/backend/src/main/resources/db/migration/V42__1.16.sql index 68e5d4c663..2423350791 100644 --- a/backend/src/main/resources/db/migration/V42__1.16.sql +++ b/backend/src/main/resources/db/migration/V42__1.16.sql @@ -13,4 +13,4 @@ ALTER TABLE `dataset_table_field` ADD COLUMN `date_format` VARCHAR(255) NULL AFT ALTER TABLE `sys_task_email` ADD COLUMN `view_data_range` VARCHAR(255) NULL DEFAULT 'view' AFTER `reci_users`; - +UPDATE `sys_msg_type` set `type_name` = 'i18n_msg_type_dataset_sync_failed' WHERE (`msg_type_id` = 6); diff --git a/backend/src/main/resources/i18n/messages_en_US.properties b/backend/src/main/resources/i18n/messages_en_US.properties index 0a89245a15..d3ba643e92 100644 --- a/backend/src/main/resources/i18n/messages_en_US.properties +++ b/backend/src/main/resources/i18n/messages_en_US.properties @@ -102,7 +102,7 @@ i18n_msg_type_panel_share=Dashboard sharing i18n_msg_type_panel_share_cacnel=Dashboard unshared i18n_msg_type_dataset_sync=Data set synchronization i18n_msg_type_dataset_sync_success=Dataset synchronization successful -i18n_msg_type_dataset_sync_faild=Dataset synchronization failed +i18n_msg_type_dataset_sync_failed=Dataset synchronization failed i18n_data_not_sync=Please sync data first i18n_excel_column_change=The column name of Excel is inconsistent with the original data set i18n_excel_column_inconsistent=The column names of the selected sheet pages are inconsistent @@ -178,10 +178,10 @@ i18n_not_admin_error=Not an administrator account i18n_user_not_exist=user does not exist i18n_default_login_reset=Switched back to default login mode I18N_COMMON_LEVEL_USE=Consult -I18N_PANNEL_LEVEL_VIEW=Consult -I18N_PANNEL_LEVEL_EXPORT=Export -I18N_PANNEL_LEVEL_MANAGE=Manage -I18N_PANNEL_LEVEL_GRANT=Grant +I18N_PANEL_LEVEL_VIEW=Consult +I18N_PANEL_LEVEL_EXPORT=Export +I18N_PANEL_LEVEL_MANAGE=Manage +I18N_PANEL_LEVEL_GRANT=Grant I18N_DATASET_LEVEL_USE=Consult I18N_DATASET_LEVEL_MANAGE=Manage I18N_DATASET_LEVEL_GRANT=Grant diff --git a/backend/src/main/resources/i18n/messages_zh_CN.properties b/backend/src/main/resources/i18n/messages_zh_CN.properties index b8a3daf1bd..bdaa67a794 100644 --- a/backend/src/main/resources/i18n/messages_zh_CN.properties +++ b/backend/src/main/resources/i18n/messages_zh_CN.properties @@ -102,7 +102,7 @@ i18n_msg_type_panel_share=\u4EEA\u8868\u677F\u5206\u4EAB i18n_msg_type_panel_share_cacnel=\u4EEA\u8868\u677F\u53D6\u6D88\u5206\u4EAB i18n_msg_type_dataset_sync=\u6570\u636E\u96C6\u540C\u6B65 i18n_msg_type_dataset_sync_success=\u6570\u636E\u96C6\u540C\u6B65\u6210\u529F -i18n_msg_type_dataset_sync_faild=\u6570\u636E\u96C6\u540C\u6B65\u5931\u8D25 +i18n_msg_type_dataset_sync_failed=\u6570\u636E\u96C6\u540C\u6B65\u5931\u8D25 i18n_data_not_sync=\u8BF7\u5148\u5B8C\u6210\u6570\u636E\u540C\u6B65 i18n_excel_column_change=Excel\u7684\u5217\u540D\u4E0E\u539F\u6570\u636E\u96C6\u4E0D\u4E00\u81F4 i18n_excel_column_inconsistent=\u6240\u9009sheet\u9875\u9762\u7684\u5217\u540D\u4E0D\u4E00\u81F4 @@ -178,10 +178,10 @@ i18n_not_admin_error=\u4E0D\u662F\u7BA1\u7406\u5458\u8D26\u53F7 i18n_user_not_exist=\u7528\u6237\u4E0D\u5B58\u5728 i18n_default_login_reset=\u5DF2\u5207\u6362\u56DE\u9ED8\u8BA4\u767B\u5F55\u65B9\u5F0F I18N_COMMON_LEVEL_USE=\u67E5\u770B -I18N_PANNEL_LEVEL_VIEW=\u67E5\u770B -I18N_PANNEL_LEVEL_EXPORT=\u5BFC\u51FA -I18N_PANNEL_LEVEL_MANAGE=\u7BA1\u7406 -I18N_PANNEL_LEVEL_GRANT=\u6388\u6743 +I18N_PANEL_LEVEL_VIEW=\u67E5\u770B +I18N_PANEL_LEVEL_EXPORT=\u5BFC\u51FA +I18N_PANEL_LEVEL_MANAGE=\u7BA1\u7406 +I18N_PANEL_LEVEL_GRANT=\u6388\u6743 I18N_DATASET_LEVEL_USE=\u67E5\u770B I18N_DATASET_LEVEL_MANAGE=\u7BA1\u7406 I18N_DATASET_LEVEL_GRANT=\u6388\u6743 diff --git a/backend/src/main/resources/i18n/messages_zh_TW.properties b/backend/src/main/resources/i18n/messages_zh_TW.properties index 035637a4dc..2003f5a638 100644 --- a/backend/src/main/resources/i18n/messages_zh_TW.properties +++ b/backend/src/main/resources/i18n/messages_zh_TW.properties @@ -102,7 +102,7 @@ i18n_msg_type_panel_share=\u5100\u8868\u677F\u5206\u4EAB i18n_msg_type_panel_share_cacnel=\u5100\u8868\u677F\u53D6\u6D88\u5206\u4EAB i18n_msg_type_dataset_sync=\u6578\u64DA\u96C6\u540C\u6B65 i18n_msg_type_dataset_sync_success=\u6578\u64DA\u96C6\u540C\u6B65\u6210\u529F -i18n_msg_type_dataset_sync_faild=\u6578\u64DA\u96C6\u540C\u6B65\u5931\u6557 +i18n_msg_type_dataset_sync_failed=\u6578\u64DA\u96C6\u540C\u6B65\u5931\u6557 i18n_data_not_sync=\u8ACB\u5148\u5B8C\u6210\u6578\u64DA\u540C\u6B65 i18n_excel_column_change=Excel\u7684\u5217\u540D\u8207\u539F\u6578\u64DA\u96C6\u4E0D\u4E00\u81F4 i18n_excel_column_inconsistent=\u6240\u9078sheet\u9801\u9762\u7684\u5217\u540D\u4E0D\u4E00\u81F4 @@ -174,10 +174,10 @@ i18n_not_admin_error=\u4E0D\u662F\u7BA1\u7406\u54E1\u8CEC\u865F i18n_user_not_exist=\u7528\u6236\u4E0D\u5B58\u5728 i18n_default_login_reset=\u5DF2\u5207\u63DB\u56DE\u9ED8\u8A8D\u767B\u9304\u65B9\u5F0F I18N_COMMON_LEVEL_USE=\u67E5\u770B -I18N_PANNEL_LEVEL_VIEW=\u67E5\u770B -I18N_PANNEL_LEVEL_EXPORT=\u5C0E\u51FA -I18N_PANNEL_LEVEL_MANAGE=\u7BA1\u7406 -I18N_PANNEL_LEVEL_GRANT=\u6388\u6B0A +I18N_PANEL_LEVEL_VIEW=\u67E5\u770B +I18N_PANEL_LEVEL_EXPORT=\u5C0E\u51FA +I18N_PANEL_LEVEL_MANAGE=\u7BA1\u7406 +I18N_PANEL_LEVEL_GRANT=\u6388\u6B0A I18N_DATASET_LEVEL_USE=\u67E5\u770B I18N_DATASET_LEVEL_MANAGE=\u7BA1\u7406 I18N_DATASET_LEVEL_GRANT=\u6388\u6B0A