b2baccline/ballcat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🎨 统一描述、备注等属性名为 remarks

Browse Source
This commit is contained in:
b2baccline
2021-10-30 19:08:08 +08:00
parent d1c83ce79a
commit da688f4d29
21 changed files with 64 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ballcat-i18n/ballcat-i18n-biz/src/main/java/com/hccake/ballcat/i18n/mapper/I18nDataMapper.java
View File

@@ -96,7 +96,7 @@ public interface I18nDataMapper extends ExtendMapper<I18nData> {
I18nData entity = new I18nData();
entity.setMessage(i18nDataDTO.getMessage());
entity.setRemark(i18nDataDTO.getRemark());
entity.setRemarks(i18nDataDTO.getRemarks());
return SqlHelper.retBool(this.update(entity, wrapper));
}

2
ballcat-i18n/ballcat-i18n-controller/src/main/java/com/hccake/ballcat/i18n/controller/I18nDataController.java
View File

@@ -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);

2
ballcat-i18n/ballcat-i18n-model/src/main/java/com/hccake/ballcat/i18n/model/dto/I18nDataCreateDTO.java
View File

@@ -41,7 +41,7 @@ public class I18nDataCreateDTO {
* 备注
*/
@ApiModelProperty(value = "备注")
private String remark;
private String remarks;
/**
* 语言文本

2
ballcat-i18n/ballcat-i18n-model/src/main/java/com/hccake/ballcat/i18n/model/dto/I18nDataDTO.java
View File

@@ -37,6 +37,6 @@ public class I18nDataDTO {
* 备注
*/
@ApiModelProperty(value = "备注")
private String remark;
private String remarks;
}

2
ballcat-i18n/ballcat-i18n-model/src/main/java/com/hccake/ballcat/i18n/model/entity/I18nData.java
View File

@@ -54,7 +54,7 @@ public class I18nData extends BaseEntity {
* 备注
*/
@ApiModelProperty(value = "备注")
private String remark;
private String remarks;
@Override
public boolean equals(Object o) {

6
ballcat-i18n/ballcat-i18n-model/src/main/java/com/hccake/ballcat/i18n/model/vo/I18nDataExcelVO.java
View File

@@ -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;
}

2
ballcat-i18n/ballcat-i18n-model/src/main/java/com/hccake/ballcat/i18n/model/vo/I18nDataPageVO.java
View File

@@ -45,7 +45,7 @@ public class I18nDataPageVO {
* 备注
*/
@ApiModelProperty(value = "备注")
private String remark;
private String remarks;
/**
* 创建时间

2
ballcat-i18n/ballcat-i18n-model/src/main/resources/ballcat-i18nData.properties
View File

@@ -1,2 +1,2 @@
i18nData.remark=Remark
i18nData.remarks=Remarks
i18nData.languageTexts=Language Text List

2
ballcat-i18n/ballcat-i18n-model/src/main/resources/ballcat-i18nData_en_US.properties
View File

@@ -1,2 +1,2 @@
i18nData.remark=Remark
i18nData.remarks=Remarks
i18nData.languageTexts=Language Text List

2
ballcat-i18n/ballcat-i18n-model/src/main/resources/ballcat-i18nData_zh_CN.properties
View File

@@ -1,2 +1,2 @@
i18nData.remark=\u5907\u6CE8
i18nData.remarks=\u5907\u6CE8s
i18nData.languageTexts=\u8BED\u8A00\u6587\u672C\u5217\u8868

3
ballcat-system/ballcat-system-biz/src/main/resources/mapper/SysOrganizationMapper.xml
View File

@@ -8,8 +8,9 @@
parent_id,
hierarchy,
depth,
description,
sort,
remarks,
deleted,
create_by,
update_by,
create_time,

12
ballcat-system/ballcat-system-model/src/main/java/com/hccake/ballcat/system/model/dto/SysOrganizationDTO.java
View File

@@ -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;
}

2
ballcat-system/ballcat-system-model/src/main/java/com/hccake/ballcat/system/model/dto/SysRoleUpdateDTO.java
View File

@@ -27,7 +27,7 @@ public class SysRoleUpdateDTO {
private String name;
@ApiModelProperty(value = "角色备注")
private String note;
private String remarks;
@ApiModelProperty(value = "数据权限")
private Integer scopeType;

6
ballcat-system/ballcat-system-model/src/main/java/com/hccake/ballcat/system/model/entity/SysConfig.java
View File

@@ -52,9 +52,9 @@ public class SysConfig extends LogicDeletedBaseEntity {
private String category;
/**
* 描述
* 备注
*/
@ApiModelProperty(value = "描述")
private String description;
@ApiModelProperty(value = "备注")
private String remarks;
}

12
ballcat-system/ballcat-system-model/src/main/java/com/hccake/ballcat/system/model/entity/SysDict.java
View File

@@ -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;
}

12
ballcat-system/ballcat-system-model/src/main/java/com/hccake/ballcat/system/model/entity/SysOrganization.java
View File

@@ -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;
}

2
ballcat-system/ballcat-system-model/src/main/java/com/hccake/ballcat/system/model/entity/SysRole.java
View File

@@ -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) {

2
ballcat-system/ballcat-system-model/src/main/java/com/hccake/ballcat/system/model/vo/SysConfigPageVO.java
View File

@@ -50,7 +50,7 @@ public class SysConfigPageVO {
* 描述
*/
@ApiModelProperty(value = "描述")
private String description;
private String remarks;
/**
* 创建时间

18
ballcat-system/ballcat-system-model/src/main/java/com/hccake/ballcat/system/model/vo/SysOrganizationTree.java
View File

@@ -50,12 +50,6 @@ public class SysOrganizationTree implements TreeNode<Integer> {
@ApiModelProperty(value = "当前节点深度")
private Integer depth;
/**
* 描述信息
*/
@ApiModelProperty(value = "描述信息")
private String description;
/**
* 排序字段，由小到大
*/
@@ -63,16 +57,10 @@ public class SysOrganizationTree implements TreeNode<Integer> {
private Integer sort;
/**
* 创建者
* 描述信息
*/
@ApiModelProperty(value = "创建者")
private String createBy;
/**
* 修改者
*/
@ApiModelProperty(value = "修改者")
private String updateBy;
@ApiModelProperty(value = "描述信息")
private String remarks;
/**
* 创建时间

2
ballcat-system/ballcat-system-model/src/main/java/com/hccake/ballcat/system/model/vo/SysRolePageVO.java
View File

@@ -39,7 +39,7 @@ public class SysRolePageVO {
private String scopeResources;
@ApiModelProperty(value = "角色备注")
private String note;
private String remarks;
@ApiModelProperty(value = "创建时间")
private LocalDateTime createTime;

23
doc/update_sql/0.5.0.sql
View File

@@ -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`;