liang.cheng
/
weaver-hrm-organization
2
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Labels Milestones

New Pull Request

多语言支持 #252

Merged
dxfeng merged 1 commits from feature/dxf into develop 10 months ago
Conversation 0 Commits 1 Files Changed 5
5 changed files with 102 additions and 55 deletions
Show Stats Download Patch File Download Diff File

10
src/com/engine/organization/entity/logview/vo/LogViewVO.java
Unescape Escape View File

@ -33,19 +33,19 @@ public class LogViewVO {
@OrganizationTableColumn(labelId = 547160, text = "操作者", width = "16%", column = "operator_name")
private String operator;
@OrganizationTableColumn(labelId = 547161, text = "操作类型", width = "16%", column = "operate_type", transmethod = "com.engine.organization.transmethod.LogViewTransMethod.getOperateType")
@OrganizationTableColumn(labelId = 547161, text = "操作类型", width = "16%", column = "operate_type", transmethod = "com.engine.organization.transmethod.LogViewTransMethod.getOperateType", multiLanguage = true)
private String operateType;
@OrganizationTableColumn(labelId = 547162, text = "操作描述", width = "16%", column = "operate_desc")
private String operateDesc;
//@OrganizationTableColumn(labelId = 547162, text = "操作描述", width = "16%", column = "operate_desc")
//private String operateDesc;
@OrganizationTableColumn(labelId = 547163, text = "对象", width = "16%", column = "value")
private String value;
@OrganizationTableColumn(labelId = 547164, text = "所属模块", width = "16%", column = "operate_module_name")
@OrganizationTableColumn(labelId = 547164, text = "所属模块", width = "16%", column = "operate_module_name", transmethod = "com.engine.organization.transmethod.LogViewTransMethod.getOperateModuleName", multiLanguage = true)
private String operateModuleName;
@OrganizationTableColumn(labelId = 547165, text = "修改详情", width = "16%", column = "message")
@OrganizationTableColumn(labelId = 547165, text = "修改详情", width = "16%", column = "message", transmethod = "com.engine.organization.transmethod.LogViewTransMethod.getOperateDetail", multiLanguage = true)
private String showDetail;
@OrganizationTableColumn(labelId = 547166, text = "操作IP", width = "16%", column = "client_ip")

47
src/com/engine/organization/enums/LogModuleNameEnum.java
Unescape Escape View File

@ -6,28 +6,32 @@ package com.engine.organization.enums;
* @version: 1.0
*/
public enum LogModuleNameEnum {
SCHEME("等级方案", 1),
LEVEL("职等", 2),
GRADE("职级", 3),
SEQUENCE("岗位序列", 4),
POSTINFO("职务管理", 6),
GROUP("集团管理", 7),
COMPANY("分部管理", 8),
DEPARTMENT("部门管理", 9),
JOB("岗位管理", 10),
RESOURCE("人员管理", 11),
STAFFPLAN("编制方案", 12),
STAFF("编制上报", 13),
DETACH("模块管理分权", 14),
OTHER("其他模块", 99);
SCHEME("等级方案", 1, 547124),
LEVEL("职等", 2, 547139),
GRADE("职级", 3, 547152),
SEQUENCE("岗位序列", 4, 547147),
POSTINFO("职务管理", 6, 547616),
GROUP("集团管理", 7, 547617),
COMPANY("分部管理", 8, 547178),
DEPARTMENT("部门管理", 9, 547116),
JOB("岗位管理", 10, 547198),
RESOURCE("人员管理", 11, 547618),
STAFFPLAN("编制方案", 12, 547459),
STAFF("编制上报", 13, 547342),
DETACH("模块管理分权", 14, 547402),
OTHER("其他模块", 99, 547619);
private String name;
private Integer value;
LogModuleNameEnum(String name, Integer value) {
private int labelId;
LogModuleNameEnum(String name, Integer value, int labelId) {
this.name = name;
this.value = value;
this.labelId = labelId;
}
public Integer getValue() {
@ -37,4 +41,17 @@ public enum LogModuleNameEnum {
public String getName() {
return name;
}
public int getLabelId() {
return labelId;
}
public static LogModuleNameEnum getByName(String name) {
for (LogModuleNameEnum logModuleNameEnum : values()) {
if (logModuleNameEnum.getName().equals(name)) {
return logModuleNameEnum;
}
}
return null;
}
}

37
src/com/engine/organization/enums/OperateTypeEnum.java
Unescape Escape View File

@ -8,22 +8,37 @@ package com.engine.organization.enums;
**/
public enum OperateTypeEnum {
ADD("1", "新增"),
UPDATE("2", "更新"),
DELETE("4", "删除"),
MOVE("5", "转移"),
MERGE("6", "合并"),
COPY("7", "复制"),
CANCELED("8", "封存"),
RECOVER("9","恢复");
/**
* 操作类型
*/
ADD("1", "新增", 547117),
UPDATE("2", "更新", 547615),
DELETE("4", "删除", 547135),
MOVE("5", "转移", 547594),
MERGE("6", "合并", 547194),
COPY("7", "复制", 547196),
CANCELED("8", "封存", 547494),
RECOVER("9", "恢复", 547495);
private String value;
private String label;
OperateTypeEnum(String value, String label) {
private int labelId;
OperateTypeEnum(String value, String label, int labelId) {
this.value = value;
this.label = label;
this.labelId = labelId;
}
public static OperateTypeEnum getByValue(String name) {
for (OperateTypeEnum operateTypeEnum : values()) {
if (operateTypeEnum.getValue().equals(name)) {
return operateTypeEnum;
}
}
return null;
}
public String getValue() {
@ -33,4 +48,8 @@ public enum OperateTypeEnum {
public String getLabel() {
return label;
}
public int getLabelId() {
return labelId;
}
}

2
src/com/engine/organization/transmethod/CardAccessTrans.java
Unescape Escape View File

@ -27,7 +27,7 @@ public class CardAccessTrans {
return text;
}
Integer labelId = map.get(text);
if (null == language) {
if (null == labelId) {
return text;
}
return SystemEnv.getHtmlLabelName(labelId,language);

61
src/com/engine/organization/transmethod/LogViewTransMethod.java
Unescape Escape View File

@ -1,10 +1,13 @@
package com.engine.organization.transmethod;
import cn.hutool.core.convert.Convert;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializerFeature;
import com.engine.organization.enums.LogModuleNameEnum;
import com.engine.organization.enums.OperateTypeEnum;
import org.apache.commons.lang.StringUtils;
import weaver.systeminfo.SystemEnv;
/**
* @author:dxfeng
@ -13,38 +16,46 @@ import org.apache.commons.lang.StringUtils;
*/
public class LogViewTransMethod {
public String getOperateType(String operateType) {
public String getOperateDetail(String message, String languageId) {
if("8".equals(languageId)){
message=message.replace(":由\"",": Change from \"").replace("\"修改为\"","\" to \"");
}
return message;
}
public String getOperateModuleName(String moduleName, String languageId) {
Integer language = Convert.toInt(languageId, -1);
if (-1 == language) {
return moduleName;
}
if (StringUtils.isNotBlank(moduleName)) {
LogModuleNameEnum moduleNameEnum = LogModuleNameEnum.getByName(moduleName);
if (null == moduleNameEnum) {
return moduleName;
}
return SystemEnv.getHtmlLabelName(moduleNameEnum.getLabelId(), language);
}
return "";
}
public String getOperateType(String operateType, String languageId) {
if (StringUtils.isNotBlank(operateType)) {
switch (operateType) {
case "1":
operateType = OperateTypeEnum.ADD.getLabel();
break;
case "2":
operateType = OperateTypeEnum.UPDATE.getLabel();
break;
case "4":
operateType = OperateTypeEnum.DELETE.getLabel();
break;
case "5":
operateType = OperateTypeEnum.MOVE.getLabel();
break;
case "6":
operateType = OperateTypeEnum.MERGE.getLabel();
break;
case "7":
operateType = OperateTypeEnum.COPY.getLabel();
break;
default:
break;
OperateTypeEnum operateTypeEnum = OperateTypeEnum.getByValue(operateType);
if (null == operateTypeEnum) {
return "";
}
Integer language = Convert.toInt(languageId, -1);
if (-1 == language) {
return operateTypeEnum.getLabel();
}
return operateType;
return SystemEnv.getHtmlLabelName(operateTypeEnum.getLabelId(), language);
}
return "";
}
public String getDateTimeFormat(String dateTime) {
if (StringUtils.isNotBlank(dateTime)) {
dateTime = dateTime.substring(0,19);
dateTime = dateTime.substring(0, 19);
}
return dateTime;
}
@ -55,7 +66,7 @@ public class LogViewTransMethod {
JSONObject object = JSONObject.parseObject(jsonStr);
jsonStr = JSON.toJSONString(object, SerializerFeature.PrettyFormat, SerializerFeature.WriteMapNullValue,
SerializerFeature.WriteDateUseDateFormat);
jsonStr= jsonStr.replace("\n","<br/>").replace("\t","&nbsp&nbsp&nbsp&nbsp");
jsonStr = jsonStr.replace("\n", "<br/>").replace("\t", "&nbsp&nbsp&nbsp&nbsp");
} catch (Exception e) {
return jsonStr;
}

Write Preview
Loading…
Cancel
Save