From da688f4d2941a0539a897eca9cb34bb72d685f73 Mon Sep 17 00:00:00 2001 From: b2baccline <23131013+b2baccline@users.noreply.github.com> Date: Sat, 30 Oct 2021 19:08:08 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E7=BB=9F=E4=B8=80=E6=8F=8F=E8=BF=B0?= =?UTF-8?q?=E3=80=81=E5=A4=87=E6=B3=A8=E7=AD=89=E5=B1=9E=E6=80=A7=E5=90=8D?= =?UTF-8?q?=E4=B8=BA=20remarks?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ballcat/i18n/mapper/I18nDataMapper.java | 2 +- .../i18n/controller/I18nDataController.java | 2 +- .../i18n/model/dto/I18nDataCreateDTO.java | 2 +- .../ballcat/i18n/model/dto/I18nDataDTO.java | 2 +- .../ballcat/i18n/model/entity/I18nData.java | 2 +- .../i18n/model/vo/I18nDataExcelVO.java | 6 ++--- .../ballcat/i18n/model/vo/I18nDataPageVO.java | 2 +- .../resources/ballcat-i18nData.properties | 2 +- .../ballcat-i18nData_en_US.properties | 2 +- .../ballcat-i18nData_zh_CN.properties | 2 +- .../mapper/SysOrganizationMapper.xml | 3 ++- .../system/model/dto/SysOrganizationDTO.java | 12 +++++----- .../system/model/dto/SysRoleUpdateDTO.java | 2 +- .../system/model/entity/SysConfig.java | 6 ++--- .../ballcat/system/model/entity/SysDict.java | 12 +++++----- .../system/model/entity/SysOrganization.java | 12 +++++----- .../ballcat/system/model/entity/SysRole.java | 2 +- .../system/model/vo/SysConfigPageVO.java | 2 +- .../system/model/vo/SysOrganizationTree.java | 18 +++------------ .../system/model/vo/SysRolePageVO.java | 2 +- doc/update_sql/0.5.0.sql | 23 +++++++++++++++++++ 21 files changed, 64 insertions(+), 54 deletions(-) diff --git a/ballcat-i18n/ballcat-i18n-biz/src/main/java/com/hccake/ballcat/i18n/mapper/I18nDataMapper.java b/ballcat-i18n/ballcat-i18n-biz/src/main/java/com/hccake/ballcat/i18n/mapper/I18nDataMapper.java index 696e65ea..7331650e 100644 --- a/ballcat-i18n/ballcat-i18n-biz/src/main/java/com/hccake/ballcat/i18n/mapper/I18nDataMapper.java +++ b/ballcat-i18n/ballcat-i18n-biz/src/main/java/com/hccake/ballcat/i18n/mapper/I18nDataMapper.java @@ -96,7 +96,7 @@ public interface I18nDataMapper extends ExtendMapper { I18nData entity = new I18nData(); entity.setMessage(i18nDataDTO.getMessage()); - entity.setRemark(i18nDataDTO.getRemark()); + entity.setRemarks(i18nDataDTO.getRemarks()); return SqlHelper.retBool(this.update(entity, wrapper)); } diff --git a/ballcat-i18n/ballcat-i18n-controller/src/main/java/com/hccake/ballcat/i18n/controller/I18nDataController.java b/ballcat-i18n/ballcat-i18n-controller/src/main/java/com/hccake/ballcat/i18n/controller/I18nDataController.java index d5b2ec05..f70f6aff 100644 --- a/ballcat-i18n/ballcat-i18n-controller/src/main/java/com/hccake/ballcat/i18n/controller/I18nDataController.java +++ b/ballcat-i18n/ballcat-i18n-controller/src/main/java/com/hccake/ballcat/i18n/controller/I18nDataController.java @@ -86,7 +86,7 @@ public class I18nDataController { for (I18nDataCreateDTO.LanguageText languageText : languageTexts) { I18nData i18nData = new I18nData(); i18nData.setCode(i18nDataCreateDTO.getCode()); - i18nData.setRemark(i18nDataCreateDTO.getRemark()); + i18nData.setRemarks(i18nDataCreateDTO.getRemarks()); i18nData.setLanguageTag(languageText.getLanguageTag()); i18nData.setMessage(languageText.getMessage()); list.add(i18nData); diff --git a/ballcat-i18n/ballcat-i18n-model/src/main/java/com/hccake/ballcat/i18n/model/dto/I18nDataCreateDTO.java b/ballcat-i18n/ballcat-i18n-model/src/main/java/com/hccake/ballcat/i18n/model/dto/I18nDataCreateDTO.java index 8e2f0363..3a664f29 100644 --- a/ballcat-i18n/ballcat-i18n-model/src/main/java/com/hccake/ballcat/i18n/model/dto/I18nDataCreateDTO.java +++ b/ballcat-i18n/ballcat-i18n-model/src/main/java/com/hccake/ballcat/i18n/model/dto/I18nDataCreateDTO.java @@ -41,7 +41,7 @@ public class I18nDataCreateDTO { * 备注 */ @ApiModelProperty(value = "备注") - private String remark; + private String remarks; /** * 语言文本 diff --git a/ballcat-i18n/ballcat-i18n-model/src/main/java/com/hccake/ballcat/i18n/model/dto/I18nDataDTO.java b/ballcat-i18n/ballcat-i18n-model/src/main/java/com/hccake/ballcat/i18n/model/dto/I18nDataDTO.java index 97d972fe..54bc3cc2 100644 --- a/ballcat-i18n/ballcat-i18n-model/src/main/java/com/hccake/ballcat/i18n/model/dto/I18nDataDTO.java +++ b/ballcat-i18n/ballcat-i18n-model/src/main/java/com/hccake/ballcat/i18n/model/dto/I18nDataDTO.java @@ -37,6 +37,6 @@ public class I18nDataDTO { * 备注 */ @ApiModelProperty(value = "备注") - private String remark; + private String remarks; } \ No newline at end of file diff --git a/ballcat-i18n/ballcat-i18n-model/src/main/java/com/hccake/ballcat/i18n/model/entity/I18nData.java b/ballcat-i18n/ballcat-i18n-model/src/main/java/com/hccake/ballcat/i18n/model/entity/I18nData.java index 89f7c9cb..9174aaa5 100644 --- a/ballcat-i18n/ballcat-i18n-model/src/main/java/com/hccake/ballcat/i18n/model/entity/I18nData.java +++ b/ballcat-i18n/ballcat-i18n-model/src/main/java/com/hccake/ballcat/i18n/model/entity/I18nData.java @@ -54,7 +54,7 @@ public class I18nData extends BaseEntity { * 备注 */ @ApiModelProperty(value = "备注") - private String remark; + private String remarks; @Override public boolean equals(Object o) { diff --git a/ballcat-i18n/ballcat-i18n-model/src/main/java/com/hccake/ballcat/i18n/model/vo/I18nDataExcelVO.java b/ballcat-i18n/ballcat-i18n-model/src/main/java/com/hccake/ballcat/i18n/model/vo/I18nDataExcelVO.java index 75dcfcac..00eace9f 100644 --- a/ballcat-i18n/ballcat-i18n-model/src/main/java/com/hccake/ballcat/i18n/model/vo/I18nDataExcelVO.java +++ b/ballcat-i18n/ballcat-i18n-model/src/main/java/com/hccake/ballcat/i18n/model/vo/I18nDataExcelVO.java @@ -5,8 +5,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.time.LocalDateTime; - /** * 国际化信息Excel映射对象 * @@ -43,7 +41,7 @@ public class I18nDataExcelVO { * 备注 */ @ApiModelProperty(value = "备注") - @ExcelProperty(value = "{i18nData.remark}", index = 3) - private String remark; + @ExcelProperty(value = "{i18nData.remarks}", index = 3) + private String remarks; } \ No newline at end of file diff --git a/ballcat-i18n/ballcat-i18n-model/src/main/java/com/hccake/ballcat/i18n/model/vo/I18nDataPageVO.java b/ballcat-i18n/ballcat-i18n-model/src/main/java/com/hccake/ballcat/i18n/model/vo/I18nDataPageVO.java index b149a769..b031f27b 100644 --- a/ballcat-i18n/ballcat-i18n-model/src/main/java/com/hccake/ballcat/i18n/model/vo/I18nDataPageVO.java +++ b/ballcat-i18n/ballcat-i18n-model/src/main/java/com/hccake/ballcat/i18n/model/vo/I18nDataPageVO.java @@ -45,7 +45,7 @@ public class I18nDataPageVO { * 备注 */ @ApiModelProperty(value = "备注") - private String remark; + private String remarks; /** * 创建时间 diff --git a/ballcat-i18n/ballcat-i18n-model/src/main/resources/ballcat-i18nData.properties b/ballcat-i18n/ballcat-i18n-model/src/main/resources/ballcat-i18nData.properties index 4cce6b84..b47cea53 100644 --- a/ballcat-i18n/ballcat-i18n-model/src/main/resources/ballcat-i18nData.properties +++ b/ballcat-i18n/ballcat-i18n-model/src/main/resources/ballcat-i18nData.properties @@ -1,2 +1,2 @@ -i18nData.remark=Remark +i18nData.remarks=Remarks i18nData.languageTexts=Language Text List \ No newline at end of file diff --git a/ballcat-i18n/ballcat-i18n-model/src/main/resources/ballcat-i18nData_en_US.properties b/ballcat-i18n/ballcat-i18n-model/src/main/resources/ballcat-i18nData_en_US.properties index 4cce6b84..b47cea53 100644 --- a/ballcat-i18n/ballcat-i18n-model/src/main/resources/ballcat-i18nData_en_US.properties +++ b/ballcat-i18n/ballcat-i18n-model/src/main/resources/ballcat-i18nData_en_US.properties @@ -1,2 +1,2 @@ -i18nData.remark=Remark +i18nData.remarks=Remarks i18nData.languageTexts=Language Text List \ No newline at end of file diff --git a/ballcat-i18n/ballcat-i18n-model/src/main/resources/ballcat-i18nData_zh_CN.properties b/ballcat-i18n/ballcat-i18n-model/src/main/resources/ballcat-i18nData_zh_CN.properties index 85aedc34..485b3d03 100644 --- a/ballcat-i18n/ballcat-i18n-model/src/main/resources/ballcat-i18nData_zh_CN.properties +++ b/ballcat-i18n/ballcat-i18n-model/src/main/resources/ballcat-i18nData_zh_CN.properties @@ -1,2 +1,2 @@ -i18nData.remark=\u5907\u6CE8 +i18nData.remarks=\u5907\u6CE8s i18nData.languageTexts=\u8BED\u8A00\u6587\u672C\u5217\u8868 \ No newline at end of file diff --git a/ballcat-system/ballcat-system-biz/src/main/resources/mapper/SysOrganizationMapper.xml b/ballcat-system/ballcat-system-biz/src/main/resources/mapper/SysOrganizationMapper.xml index 02a8442a..4798da72 100644 --- a/ballcat-system/ballcat-system-biz/src/main/resources/mapper/SysOrganizationMapper.xml +++ b/ballcat-system/ballcat-system-biz/src/main/resources/mapper/SysOrganizationMapper.xml @@ -8,8 +8,9 @@ parent_id, hierarchy, depth, - description, sort, + remarks, + deleted, create_by, update_by, create_time, diff --git a/ballcat-system/ballcat-system-model/src/main/java/com/hccake/ballcat/system/model/dto/SysOrganizationDTO.java b/ballcat-system/ballcat-system-model/src/main/java/com/hccake/ballcat/system/model/dto/SysOrganizationDTO.java index 882590db..75c773bb 100644 --- a/ballcat-system/ballcat-system-model/src/main/java/com/hccake/ballcat/system/model/dto/SysOrganizationDTO.java +++ b/ballcat-system/ballcat-system-model/src/main/java/com/hccake/ballcat/system/model/dto/SysOrganizationDTO.java @@ -33,16 +33,16 @@ public class SysOrganizationDTO { @ApiModelProperty(value = "父级ID") private Integer parentId; - /** - * 描述信息 - */ - @ApiModelProperty(value = "描述信息") - private String description; - /** * 排序字段，由小到大 */ @ApiModelProperty(value = "排序字段，由小到大") private Integer sort; + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + private String remarks; + } diff --git a/ballcat-system/ballcat-system-model/src/main/java/com/hccake/ballcat/system/model/dto/SysRoleUpdateDTO.java b/ballcat-system/ballcat-system-model/src/main/java/com/hccake/ballcat/system/model/dto/SysRoleUpdateDTO.java index 5b3baaa3..6c5daf75 100644 --- a/ballcat-system/ballcat-system-model/src/main/java/com/hccake/ballcat/system/model/dto/SysRoleUpdateDTO.java +++ b/ballcat-system/ballcat-system-model/src/main/java/com/hccake/ballcat/system/model/dto/SysRoleUpdateDTO.java @@ -27,7 +27,7 @@ public class SysRoleUpdateDTO { private String name; @ApiModelProperty(value = "角色备注") - private String note; + private String remarks; @ApiModelProperty(value = "数据权限") private Integer scopeType; diff --git a/ballcat-system/ballcat-system-model/src/main/java/com/hccake/ballcat/system/model/entity/SysConfig.java b/ballcat-system/ballcat-system-model/src/main/java/com/hccake/ballcat/system/model/entity/SysConfig.java index 951d64f9..c774e618 100644 --- a/ballcat-system/ballcat-system-model/src/main/java/com/hccake/ballcat/system/model/entity/SysConfig.java +++ b/ballcat-system/ballcat-system-model/src/main/java/com/hccake/ballcat/system/model/entity/SysConfig.java @@ -52,9 +52,9 @@ public class SysConfig extends LogicDeletedBaseEntity { private String category; /** - * 描述 + * 备注 */ - @ApiModelProperty(value = "描述") - private String description; + @ApiModelProperty(value = "备注") + private String remarks; } diff --git a/ballcat-system/ballcat-system-model/src/main/java/com/hccake/ballcat/system/model/entity/SysDict.java b/ballcat-system/ballcat-system-model/src/main/java/com/hccake/ballcat/system/model/entity/SysDict.java index 29f4dc46..7589b3ac 100644 --- a/ballcat-system/ballcat-system-model/src/main/java/com/hccake/ballcat/system/model/entity/SysDict.java +++ b/ballcat-system/ballcat-system-model/src/main/java/com/hccake/ballcat/system/model/entity/SysDict.java @@ -47,12 +47,6 @@ public class SysDict extends LogicDeletedBaseEntity { @ApiModelProperty(value = "Hash值") private String hashCode; - /** - * 备注 - */ - @ApiModelProperty(value = "备注") - private String remarks; - /** * 可编辑的 */ @@ -65,4 +59,10 @@ public class SysDict extends LogicDeletedBaseEntity { @ApiModelProperty("数据类型,1:Number 2:String 3:Boolean") private Integer valueType; + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + private String remarks; + } diff --git a/ballcat-system/ballcat-system-model/src/main/java/com/hccake/ballcat/system/model/entity/SysOrganization.java b/ballcat-system/ballcat-system-model/src/main/java/com/hccake/ballcat/system/model/entity/SysOrganization.java index b000f79a..bd75737d 100644 --- a/ballcat-system/ballcat-system-model/src/main/java/com/hccake/ballcat/system/model/entity/SysOrganization.java +++ b/ballcat-system/ballcat-system-model/src/main/java/com/hccake/ballcat/system/model/entity/SysOrganization.java @@ -53,16 +53,16 @@ public class SysOrganization extends LogicDeletedBaseEntity { @ApiModelProperty(value = "当前节点深度") private Integer depth; - /** - * 描述信息 - */ - @ApiModelProperty(value = "描述信息") - private String description; - /** * 排序字段，由小到大 */ @ApiModelProperty(value = "排序字段，由小到大") private Integer sort; + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + private String remarks; + } diff --git a/ballcat-system/ballcat-system-model/src/main/java/com/hccake/ballcat/system/model/entity/SysRole.java b/ballcat-system/ballcat-system-model/src/main/java/com/hccake/ballcat/system/model/entity/SysRole.java index 867b9d4f..8e4e7329 100644 --- a/ballcat-system/ballcat-system-model/src/main/java/com/hccake/ballcat/system/model/entity/SysRole.java +++ b/ballcat-system/ballcat-system-model/src/main/java/com/hccake/ballcat/system/model/entity/SysRole.java @@ -50,7 +50,7 @@ public class SysRole extends LogicDeletedBaseEntity { private String scopeResources; @ApiModelProperty(value = "角色备注") - private String note; + private String remarks; @Override public boolean equals(Object o) { diff --git a/ballcat-system/ballcat-system-model/src/main/java/com/hccake/ballcat/system/model/vo/SysConfigPageVO.java b/ballcat-system/ballcat-system-model/src/main/java/com/hccake/ballcat/system/model/vo/SysConfigPageVO.java index 25c288b9..cb6daa94 100644 --- a/ballcat-system/ballcat-system-model/src/main/java/com/hccake/ballcat/system/model/vo/SysConfigPageVO.java +++ b/ballcat-system/ballcat-system-model/src/main/java/com/hccake/ballcat/system/model/vo/SysConfigPageVO.java @@ -50,7 +50,7 @@ public class SysConfigPageVO { * 描述 */ @ApiModelProperty(value = "描述") - private String description; + private String remarks; /** * 创建时间 diff --git a/ballcat-system/ballcat-system-model/src/main/java/com/hccake/ballcat/system/model/vo/SysOrganizationTree.java b/ballcat-system/ballcat-system-model/src/main/java/com/hccake/ballcat/system/model/vo/SysOrganizationTree.java index d9c07ed1..588a4ba1 100644 --- a/ballcat-system/ballcat-system-model/src/main/java/com/hccake/ballcat/system/model/vo/SysOrganizationTree.java +++ b/ballcat-system/ballcat-system-model/src/main/java/com/hccake/ballcat/system/model/vo/SysOrganizationTree.java @@ -50,12 +50,6 @@ public class SysOrganizationTree implements TreeNode { @ApiModelProperty(value = "当前节点深度") private Integer depth; - /** - * 描述信息 - */ - @ApiModelProperty(value = "描述信息") - private String description; - /** * 排序字段，由小到大 */ @@ -63,16 +57,10 @@ public class SysOrganizationTree implements TreeNode { private Integer sort; /** - * 创建者 + * 描述信息 */ - @ApiModelProperty(value = "创建者") - private String createBy; - - /** - * 修改者 - */ - @ApiModelProperty(value = "修改者") - private String updateBy; + @ApiModelProperty(value = "描述信息") + private String remarks; /** * 创建时间 diff --git a/ballcat-system/ballcat-system-model/src/main/java/com/hccake/ballcat/system/model/vo/SysRolePageVO.java b/ballcat-system/ballcat-system-model/src/main/java/com/hccake/ballcat/system/model/vo/SysRolePageVO.java index 09fd0a80..0f40a3a7 100644 --- a/ballcat-system/ballcat-system-model/src/main/java/com/hccake/ballcat/system/model/vo/SysRolePageVO.java +++ b/ballcat-system/ballcat-system-model/src/main/java/com/hccake/ballcat/system/model/vo/SysRolePageVO.java @@ -39,7 +39,7 @@ public class SysRolePageVO { private String scopeResources; @ApiModelProperty(value = "角色备注") - private String note; + private String remarks; @ApiModelProperty(value = "创建时间") private LocalDateTime createTime; diff --git a/doc/update_sql/0.5.0.sql b/doc/update_sql/0.5.0.sql index f1634e28..2b33c46e 100644 --- a/doc/update_sql/0.5.0.sql +++ b/doc/update_sql/0.5.0.sql @@ -89,3 +89,26 @@ MODIFY COLUMN `update_time` datetime NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTA ALTER TABLE `i18n_data` DROP INDEX `udx_laguage_tag_code`, ADD UNIQUE INDEX `udx_laguage_tag_code`(`language_tag`, `code`, `deleted`) USING BTREE; + + +-- 统一备注属性的名称为 remarks +ALTER TABLE `sys_role` + CHANGE COLUMN `note` `remarks` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注' AFTER `scope_resources`; + +ALTER TABLE `sys_menu` + MODIFY COLUMN `remarks` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注信息' AFTER `type`; + +ALTER TABLE `sys_organization` + CHANGE COLUMN `description` `remarks` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注' AFTER `sort`; + +ALTER TABLE `sys_dict` + MODIFY COLUMN `remarks` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注' AFTER `hash_code`; + +ALTER TABLE `sys_dict_item` + MODIFY COLUMN `remarks` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注' AFTER `sort`; + +ALTER TABLE `sys_config` + CHANGE COLUMN `description` `remarks` varchar(256) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注' AFTER `category`; + +ALTER TABLE `i18n_data` + CHANGE COLUMN `remark` `remarks` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注' AFTER `message`; \ No newline at end of file