diff --git a/backend/crm/src/main/java/cn/cordys/common/permission/PermissionDefinition.java b/backend/crm/src/main/java/cn/cordys/common/permission/PermissionDefinition.java deleted file mode 100644 index 5cf3b12fc..000000000 --- a/backend/crm/src/main/java/cn/cordys/common/permission/PermissionDefinition.java +++ /dev/null @@ -1,21 +0,0 @@ -package cn.cordys.common.permission; - -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; -import java.util.List; - -/** - * 加载的权限定义 - * - * @author jianxing - */ -@Data -public class PermissionDefinition implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - private List resource; - private List permissions; -} diff --git a/backend/crm/src/main/java/cn/cordys/common/permission/RoleResource.java b/backend/crm/src/main/java/cn/cordys/common/permission/RoleResource.java deleted file mode 100644 index 274c75723..000000000 --- a/backend/crm/src/main/java/cn/cordys/common/permission/RoleResource.java +++ /dev/null @@ -1,21 +0,0 @@ -package cn.cordys.common.permission; - -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 权限所属资源，例如 SYSTEM_ROLE - * - * @author jianxing - */ -@Data -public class RoleResource implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - private String id; - private String name; - private Boolean license = false; -} diff --git a/backend/crm/src/main/java/cn/cordys/common/resolver/field/AbstractModuleFieldResolver.java b/backend/crm/src/main/java/cn/cordys/common/resolver/field/AbstractModuleFieldResolver.java index ac87dc70e..0d6803280 100644 --- a/backend/crm/src/main/java/cn/cordys/common/resolver/field/AbstractModuleFieldResolver.java +++ b/backend/crm/src/main/java/cn/cordys/common/resolver/field/AbstractModuleFieldResolver.java @@ -35,7 +35,7 @@ public abstract class AbstractModuleFieldResolver { * * @return */ - public Object parse2Value(T selectField, String value) { + public Object convertToValue(T selectField, String value) { return value; } @@ -46,7 +46,7 @@ public Object parse2Value(T selectField, String value) { * * @return */ - public Object trans2Value(T selectField, String value) { + public Object transformToValue(T selectField, String value) { return value; } @@ -58,7 +58,7 @@ public Object trans2Value(T selectField, String value) { * * @return 字段值 */ - public Object text2Value(T field, String text) { + public Object textToValue(T field, String text) { return text; } @@ -70,7 +70,7 @@ public Object text2Value(T field, String text) { * * @return */ - public String parse2String(T selectField, Object value) { + public String convertToString(T selectField, Object value) { return value == null ? null : value.toString(); } @@ -86,8 +86,8 @@ protected void validateArray(String name, Object value) { if (value == null) { return; } - if (value instanceof List) { - ((List) value).forEach(v -> validateString(name, v)); + if (value instanceof List list) { + list.forEach(v -> validateString(name, v)); } else { throwValidateException(name); } diff --git a/backend/crm/src/main/java/cn/cordys/common/resolver/field/AttachmentFieldResolver.java b/backend/crm/src/main/java/cn/cordys/common/resolver/field/AttachmentFieldResolver.java index 4c959a98e..b20397524 100644 --- a/backend/crm/src/main/java/cn/cordys/common/resolver/field/AttachmentFieldResolver.java +++ b/backend/crm/src/main/java/cn/cordys/common/resolver/field/AttachmentFieldResolver.java @@ -11,12 +11,12 @@ public void validate(AttachmentField customField, Object value) { } @Override - public String parse2String(AttachmentField attachmentField, Object value) { + public String convertToString(AttachmentField attachmentField, Object value) { return getJsonString(value); } @Override - public Object parse2Value(AttachmentField attachmentField, String value) { + public Object convertToValue(AttachmentField attachmentField, String value) { return parse2Array(value); } } diff --git a/backend/crm/src/main/java/cn/cordys/common/resolver/field/CheckBoxResolver.java b/backend/crm/src/main/java/cn/cordys/common/resolver/field/CheckBoxResolver.java index f4f2b1219..bcb387b62 100644 --- a/backend/crm/src/main/java/cn/cordys/common/resolver/field/CheckBoxResolver.java +++ b/backend/crm/src/main/java/cn/cordys/common/resolver/field/CheckBoxResolver.java @@ -28,17 +28,17 @@ public void validate(CheckBoxField checkBoxField, Object value) { } @Override - public String parse2String(CheckBoxField checkBoxField, Object value) { + public String convertToString(CheckBoxField checkBoxField, Object value) { return JSON.toJSONString(value); } @Override - public Object parse2Value(CheckBoxField checkBoxField, String value) { + public Object convertToValue(CheckBoxField checkBoxField, String value) { return parse2Array(value); } @Override - public Object trans2Value(CheckBoxField checkBoxField, String value) { + public Object transformToValue(CheckBoxField checkBoxField, String value) { if (StringUtils.isBlank(value) || Strings.CS.equals(value, "[]")) { return StringUtils.EMPTY; } @@ -54,7 +54,7 @@ public Object trans2Value(CheckBoxField checkBoxField, String value) { } @Override - public Object text2Value(CheckBoxField field, String text) { + public Object textToValue(CheckBoxField field, String text) { if (StringUtils.isBlank(text) || Strings.CS.equals(text, "[]")) { return StringUtils.EMPTY; } diff --git a/backend/crm/src/main/java/cn/cordys/common/resolver/field/DatasourceMultipleResolver.java b/backend/crm/src/main/java/cn/cordys/common/resolver/field/DatasourceMultipleResolver.java index 22daeca3c..5c092168b 100644 --- a/backend/crm/src/main/java/cn/cordys/common/resolver/field/DatasourceMultipleResolver.java +++ b/backend/crm/src/main/java/cn/cordys/common/resolver/field/DatasourceMultipleResolver.java @@ -42,18 +42,18 @@ public void validate(DatasourceMultipleField customField, Object value) { } @Override - public Object parse2Value(DatasourceMultipleField customField, String value) { + public Object convertToValue(DatasourceMultipleField customField, String value) { return parse2Array(value); } @Override - public String parse2String(DatasourceMultipleField customField, Object value) { + public String convertToString(DatasourceMultipleField customField, Object value) { return getJsonString(value); } @Override - public Object trans2Value(DatasourceMultipleField datasourceMultipleField, String value) { + public Object transformToValue(DatasourceMultipleField datasourceMultipleField, String value) { if (StringUtils.isBlank(value) || Strings.CS.equals(value, "[]")) { return StringUtils.EMPTY; } @@ -83,7 +83,7 @@ public Object trans2Value(DatasourceMultipleField datasourceMultipleField, Strin } @Override - public Object text2Value(DatasourceMultipleField field, String text) { + public Object textToValue(DatasourceMultipleField field, String text) { if (StringUtils.isBlank(text) || Strings.CS.equals(text, "[]")) { return StringUtils.EMPTY; } diff --git a/backend/crm/src/main/java/cn/cordys/common/resolver/field/DatasourceResolver.java b/backend/crm/src/main/java/cn/cordys/common/resolver/field/DatasourceResolver.java index ad982d177..33a9fd3ee 100644 --- a/backend/crm/src/main/java/cn/cordys/common/resolver/field/DatasourceResolver.java +++ b/backend/crm/src/main/java/cn/cordys/common/resolver/field/DatasourceResolver.java @@ -42,7 +42,7 @@ public void validate(DatasourceField customField, Object value) { @Override - public Object trans2Value(DatasourceField datasourceField, String value) { + public Object transformToValue(DatasourceField datasourceField, String value) { if (StringUtils.isBlank(value)) { return StringUtils.EMPTY; } @@ -71,7 +71,7 @@ public Object trans2Value(DatasourceField datasourceField, String value) { } @Override - public Object text2Value(DatasourceField field, String text) { + public Object textToValue(DatasourceField field, String text) { if (StringUtils.isBlank(text)) { return StringUtils.EMPTY; } diff --git a/backend/crm/src/main/java/cn/cordys/common/resolver/field/DateTimeResolver.java b/backend/crm/src/main/java/cn/cordys/common/resolver/field/DateTimeResolver.java index 299752c32..800a8e40a 100644 --- a/backend/crm/src/main/java/cn/cordys/common/resolver/field/DateTimeResolver.java +++ b/backend/crm/src/main/java/cn/cordys/common/resolver/field/DateTimeResolver.java @@ -33,12 +33,12 @@ protected void validateLong(String name, Object value) { } @Override - public Object parse2Value(DateTimeField dateTimeField, String value) { + public Object convertToValue(DateTimeField dateTimeField, String value) { return parse2Long(value); } @Override - public Object trans2Value(DateTimeField dateTimeField, String value) { + public Object transformToValue(DateTimeField dateTimeField, String value) { if (Strings.CI.equals(dateTimeField.getDateType(), DATE)) { return TimeUtils.getDataStr(Long.valueOf(value)); } @@ -52,7 +52,7 @@ public Object trans2Value(DateTimeField dateTimeField, String value) { } @Override - public Object text2Value(DateTimeField field, String text) { + public Object textToValue(DateTimeField field, String text) { DateTimeFormatter formatter = new DateTimeFormatterBuilder() .appendOptional(DateTimeFormatter.ofPattern("yyyy-M-d H:m:s")) .appendOptional(DateTimeFormatter.ofPattern("yyyy/M/d H:m:s")) diff --git a/backend/crm/src/main/java/cn/cordys/common/resolver/field/DefaultModuleFieldResolver.java b/backend/crm/src/main/java/cn/cordys/common/resolver/field/DefaultModuleFieldResolver.java index 766326b9a..173638abf 100644 --- a/backend/crm/src/main/java/cn/cordys/common/resolver/field/DefaultModuleFieldResolver.java +++ b/backend/crm/src/main/java/cn/cordys/common/resolver/field/DefaultModuleFieldResolver.java @@ -16,7 +16,7 @@ public void validate(BaseField customField, Object value) { } @Override - public String parse2String(BaseField selectField, Object value) { + public String convertToString(BaseField selectField, Object value) { if (value instanceof List) { return getJsonString(value); } diff --git a/backend/crm/src/main/java/cn/cordys/common/resolver/field/DepartmentMultipleResolver.java b/backend/crm/src/main/java/cn/cordys/common/resolver/field/DepartmentMultipleResolver.java index e261852dc..a63517135 100644 --- a/backend/crm/src/main/java/cn/cordys/common/resolver/field/DepartmentMultipleResolver.java +++ b/backend/crm/src/main/java/cn/cordys/common/resolver/field/DepartmentMultipleResolver.java @@ -26,17 +26,17 @@ public void validate(DepartmentMultipleField departmentField, Object value) { } @Override - public String parse2String(DepartmentMultipleField departmentField, Object value) { + public String convertToString(DepartmentMultipleField departmentField, Object value) { return getJsonString(value); } @Override - public Object parse2Value(DepartmentMultipleField departmentField, String value) { + public Object convertToValue(DepartmentMultipleField departmentField, String value) { return parse2Array(value); } @Override - public Object trans2Value(DepartmentMultipleField departmentMultipleField, String value) { + public Object transformToValue(DepartmentMultipleField departmentMultipleField, String value) { if (StringUtils.isBlank(value) || Strings.CS.equals(value, "[]")) { return StringUtils.EMPTY; } @@ -52,7 +52,7 @@ public Object trans2Value(DepartmentMultipleField departmentMultipleField, Strin } @Override - public Object text2Value(DepartmentMultipleField field, String text) { + public Object textToValue(DepartmentMultipleField field, String text) { if (StringUtils.isBlank(text) || Strings.CS.equals(text, "[]")) { return StringUtils.EMPTY; } diff --git a/backend/crm/src/main/java/cn/cordys/common/resolver/field/DepartmentResolver.java b/backend/crm/src/main/java/cn/cordys/common/resolver/field/DepartmentResolver.java index 3c9aa5e79..52e84cc68 100644 --- a/backend/crm/src/main/java/cn/cordys/common/resolver/field/DepartmentResolver.java +++ b/backend/crm/src/main/java/cn/cordys/common/resolver/field/DepartmentResolver.java @@ -25,18 +25,18 @@ public void validate(DepartmentField departmentField, Object value) { } @Override - public String parse2String(DepartmentField selectField, Object value) { + public String convertToString(DepartmentField selectField, Object value) { return getStringValue(value); } @Override - public Object parse2Value(DepartmentField selectField, String value) { + public Object convertToValue(DepartmentField selectField, String value) { return getStringValue(value); } @Override - public Object trans2Value(DepartmentField departmentField, String value) { + public Object transformToValue(DepartmentField departmentField, String value) { if (StringUtils.isBlank(value)) { return StringUtils.EMPTY; } @@ -50,7 +50,7 @@ public Object trans2Value(DepartmentField departmentField, String value) { } @Override - public Object text2Value(DepartmentField field, String text) { + public Object textToValue(DepartmentField field, String text) { if (StringUtils.isBlank(text)) { return StringUtils.EMPTY; } diff --git a/backend/crm/src/main/java/cn/cordys/common/resolver/field/IndustryResolver.java b/backend/crm/src/main/java/cn/cordys/common/resolver/field/IndustryResolver.java index 334d02e13..a93557d88 100644 --- a/backend/crm/src/main/java/cn/cordys/common/resolver/field/IndustryResolver.java +++ b/backend/crm/src/main/java/cn/cordys/common/resolver/field/IndustryResolver.java @@ -14,12 +14,12 @@ public void validate(IndustryField customField, Object value) { } @Override - public Object trans2Value(IndustryField field, String value) { + public Object transformToValue(IndustryField field, String value) { return IndustryUtils.mapping(value, false); } @Override - public Object text2Value(IndustryField field, String text) { + public Object textToValue(IndustryField field, String text) { return IndustryUtils.mapping(text, true); } } diff --git a/backend/crm/src/main/java/cn/cordys/common/resolver/field/LocationResolver.java b/backend/crm/src/main/java/cn/cordys/common/resolver/field/LocationResolver.java index 319ce1a41..2f1cb098e 100644 --- a/backend/crm/src/main/java/cn/cordys/common/resolver/field/LocationResolver.java +++ b/backend/crm/src/main/java/cn/cordys/common/resolver/field/LocationResolver.java @@ -20,12 +20,12 @@ public void validate(LocationField customField, Object value) { @Override - public Object trans2Value(LocationField locationField, String value) { + public Object transformToValue(LocationField locationField, String value) { return RegionUtils.mapping(value, false); } @Override - public Object text2Value(LocationField field, String text) { + public Object textToValue(LocationField field, String text) { return RegionUtils.mapping(text, true); } } diff --git a/backend/crm/src/main/java/cn/cordys/common/resolver/field/MemberMultipleResolver.java b/backend/crm/src/main/java/cn/cordys/common/resolver/field/MemberMultipleResolver.java index 081a8ad35..7eb97ad0b 100644 --- a/backend/crm/src/main/java/cn/cordys/common/resolver/field/MemberMultipleResolver.java +++ b/backend/crm/src/main/java/cn/cordys/common/resolver/field/MemberMultipleResolver.java @@ -31,18 +31,18 @@ public void validate(MemberMultipleField memberField, Object value) { } @Override - public String parse2String(MemberMultipleField memberField, Object value) { + public String convertToString(MemberMultipleField memberField, Object value) { return getJsonString(value); } @Override - public Object parse2Value(MemberMultipleField memberField, String value) { + public Object convertToValue(MemberMultipleField memberField, String value) { return parse2Array(value); } @Override - public Object trans2Value(MemberMultipleField memberMultipleField, String value) { + public Object transformToValue(MemberMultipleField memberMultipleField, String value) { if (StringUtils.isBlank(value) || Strings.CS.equals(value, "[]")) { return StringUtils.EMPTY; } @@ -58,7 +58,7 @@ public Object trans2Value(MemberMultipleField memberMultipleField, String value) } @Override - public Object text2Value(MemberMultipleField field, String text) { + public Object textToValue(MemberMultipleField field, String text) { if (StringUtils.isBlank(text) || Strings.CS.equals(text, "[]")) { return StringUtils.EMPTY; } diff --git a/backend/crm/src/main/java/cn/cordys/common/resolver/field/MemberResolver.java b/backend/crm/src/main/java/cn/cordys/common/resolver/field/MemberResolver.java index 1a09d7606..a24407bc6 100644 --- a/backend/crm/src/main/java/cn/cordys/common/resolver/field/MemberResolver.java +++ b/backend/crm/src/main/java/cn/cordys/common/resolver/field/MemberResolver.java @@ -30,17 +30,17 @@ public void validate(MemberField memberField, Object value) { } @Override - public String parse2String(MemberField memberField, Object value) { + public String convertToString(MemberField memberField, Object value) { return getStringValue(value); } @Override - public Object parse2Value(MemberField memberField, String value) { + public Object convertToValue(MemberField memberField, String value) { return getStringValue(value); } @Override - public Object trans2Value(MemberField memberField, String value) { + public Object transformToValue(MemberField memberField, String value) { if (StringUtils.isBlank(value)) { return StringUtils.EMPTY; } @@ -55,7 +55,7 @@ public Object trans2Value(MemberField memberField, String value) { } @Override - public Object text2Value(MemberField field, String text) { + public Object textToValue(MemberField field, String text) { if (StringUtils.isBlank(text)) { return StringUtils.EMPTY; } diff --git a/backend/crm/src/main/java/cn/cordys/common/resolver/field/NumberResolver.java b/backend/crm/src/main/java/cn/cordys/common/resolver/field/NumberResolver.java index c73b1d4d5..58cb2841e 100644 --- a/backend/crm/src/main/java/cn/cordys/common/resolver/field/NumberResolver.java +++ b/backend/crm/src/main/java/cn/cordys/common/resolver/field/NumberResolver.java @@ -25,17 +25,17 @@ public void validate(InputNumberField numberField, Object value) { } @Override - public Object parse2Value(InputNumberField numberField, String value) { + public Object convertToValue(InputNumberField numberField, String value) { return value == null ? null : new BigDecimal(value); } @Override - public Object trans2Value(InputNumberField numberField, String value) { + public Object transformToValue(InputNumberField numberField, String value) { return value == null ? null : new BigDecimal(value); } @Override - public Object text2Value(InputNumberField field, String text) { + public Object textToValue(InputNumberField field, String text) { if (Strings.CS.equals(field.getNumberFormat(), PERCENT_FORMAT)) { text = text.replace(PERCENT_SUFFIX, StringUtils.EMPTY); } diff --git a/backend/crm/src/main/java/cn/cordys/common/resolver/field/PhoneResolver.java b/backend/crm/src/main/java/cn/cordys/common/resolver/field/PhoneResolver.java index 99f4aa471..c9fd58583 100644 --- a/backend/crm/src/main/java/cn/cordys/common/resolver/field/PhoneResolver.java +++ b/backend/crm/src/main/java/cn/cordys/common/resolver/field/PhoneResolver.java @@ -12,7 +12,7 @@ public void validate(PhoneField field, Object value) { } @Override - public Object text2Value(PhoneField field, String text) { + public Object textToValue(PhoneField field, String text) { if (StringUtils.isEmpty(text)) { return text; } diff --git a/backend/crm/src/main/java/cn/cordys/common/resolver/field/PictureResolver.java b/backend/crm/src/main/java/cn/cordys/common/resolver/field/PictureResolver.java index 36877b364..ddfac9f68 100644 --- a/backend/crm/src/main/java/cn/cordys/common/resolver/field/PictureResolver.java +++ b/backend/crm/src/main/java/cn/cordys/common/resolver/field/PictureResolver.java @@ -14,7 +14,7 @@ public void validate(PictureField customField, Object value) { } @Override - public Object parse2Value(PictureField selectField, String value) { + public Object convertToValue(PictureField selectField, String value) { return JSON.parseArray(value, String.class); } } diff --git a/backend/crm/src/main/java/cn/cordys/common/resolver/field/RadioResolver.java b/backend/crm/src/main/java/cn/cordys/common/resolver/field/RadioResolver.java index 5ccdd3c60..1b9a3ab75 100644 --- a/backend/crm/src/main/java/cn/cordys/common/resolver/field/RadioResolver.java +++ b/backend/crm/src/main/java/cn/cordys/common/resolver/field/RadioResolver.java @@ -25,17 +25,17 @@ public void validate(RadioField radioField, Object value) { } @Override - public String parse2String(RadioField radioField, Object value) { + public String convertToString(RadioField radioField, Object value) { return getStringValue(value); } @Override - public Object parse2Value(RadioField selectField, String value) { - return super.parse2Value(selectField, value); + public Object convertToValue(RadioField selectField, String value) { + return super.convertToValue(selectField, value); } @Override - public Object trans2Value(RadioField radioField, String value) { + public Object transformToValue(RadioField radioField, String value) { return radioField.getOptions().stream() .filter(option -> Strings.CI.equals(option.getValue(), value)) .map(OptionProp::getLabel) @@ -44,7 +44,7 @@ public Object trans2Value(RadioField radioField, String value) { } @Override - public Object text2Value(RadioField field, String text) { + public Object textToValue(RadioField field, String text) { return field.getOptions().stream() .filter(option -> Strings.CI.equals(option.getLabel(), text)) .map(OptionProp::getValue) diff --git a/backend/crm/src/main/java/cn/cordys/common/resolver/field/SelectMultipleResolver.java b/backend/crm/src/main/java/cn/cordys/common/resolver/field/SelectMultipleResolver.java index 8c7fc33b5..52fc8f1b3 100644 --- a/backend/crm/src/main/java/cn/cordys/common/resolver/field/SelectMultipleResolver.java +++ b/backend/crm/src/main/java/cn/cordys/common/resolver/field/SelectMultipleResolver.java @@ -27,17 +27,17 @@ public void validate(SelectMultipleField selectField, Object value) { } @Override - public String parse2String(SelectMultipleField selectField, Object value) { + public String convertToString(SelectMultipleField selectField, Object value) { return getJsonString(value); } @Override - public Object parse2Value(SelectMultipleField selectField, String value) { + public Object convertToValue(SelectMultipleField selectField, String value) { return parse2Array(value); } @Override - public Object trans2Value(SelectMultipleField selectMultipleField, String value) { + public Object transformToValue(SelectMultipleField selectMultipleField, String value) { if (StringUtils.isBlank(value) || Strings.CS.equals(value, "[]")) { return StringUtils.EMPTY; } @@ -63,7 +63,7 @@ public Object trans2Value(SelectMultipleField selectMultipleField, String value) } @Override - public Object text2Value(SelectMultipleField field, String text) { + public Object textToValue(SelectMultipleField field, String text) { if (StringUtils.isBlank(text) || Strings.CS.equals(text, "[]")) { return StringUtils.EMPTY; } diff --git a/backend/crm/src/main/java/cn/cordys/common/resolver/field/SelectResolver.java b/backend/crm/src/main/java/cn/cordys/common/resolver/field/SelectResolver.java index 6b3f09e65..9506db954 100644 --- a/backend/crm/src/main/java/cn/cordys/common/resolver/field/SelectResolver.java +++ b/backend/crm/src/main/java/cn/cordys/common/resolver/field/SelectResolver.java @@ -25,17 +25,17 @@ public void validate(SelectField selectField, Object value) { } @Override - public String parse2String(SelectField selectField, Object value) { + public String convertToString(SelectField selectField, Object value) { return getStringValue(value); } @Override - public Object parse2Value(SelectField selectField, String value) { - return super.parse2Value(selectField, value); + public Object convertToValue(SelectField selectField, String value) { + return super.convertToValue(selectField, value); } @Override - public Object trans2Value(SelectField selectField, String value) { + public Object transformToValue(SelectField selectField, String value) { return selectField.getOptions().stream() .filter(option -> Strings.CI.equals(option.getValue(), value)) .findFirst() @@ -44,7 +44,7 @@ public Object trans2Value(SelectField selectField, String value) { } @Override - public Object text2Value(SelectField field, String text) { + public Object textToValue(SelectField field, String text) { return field.getOptions().stream() .filter(option -> Strings.CI.equals(option.getLabel(), text)) .findFirst() diff --git a/backend/crm/src/main/java/cn/cordys/common/resolver/field/TextMultipleResolver.java b/backend/crm/src/main/java/cn/cordys/common/resolver/field/TextMultipleResolver.java index e22396ab1..b3f34857b 100644 --- a/backend/crm/src/main/java/cn/cordys/common/resolver/field/TextMultipleResolver.java +++ b/backend/crm/src/main/java/cn/cordys/common/resolver/field/TextMultipleResolver.java @@ -23,18 +23,18 @@ public void validate(InputMultipleField inputMultipleField, Object value) { } @Override - public String parse2String(InputMultipleField inputMultipleField, Object value) { + public String convertToString(InputMultipleField inputMultipleField, Object value) { return getJsonString(value); } @Override - public Object parse2Value(InputMultipleField inputMultipleField, String value) { + public Object convertToValue(InputMultipleField inputMultipleField, String value) { return parse2Array(value); } @Override - public Object trans2Value(InputMultipleField inputMultipleField, String value) { + public Object transformToValue(InputMultipleField inputMultipleField, String value) { if (StringUtils.isEmpty(value)) { return StringUtils.EMPTY; } @@ -42,7 +42,7 @@ public Object trans2Value(InputMultipleField inputMultipleField, String value) { } @Override - public Object text2Value(InputMultipleField field, String text) { + public Object textToValue(InputMultipleField field, String text) { if (StringUtils.isBlank(text) || Strings.CS.equals(text, ARR_SQUARE)) { return null; } diff --git a/backend/crm/src/main/java/cn/cordys/common/service/BaseExportService.java b/backend/crm/src/main/java/cn/cordys/common/service/BaseExportService.java index 3c076b84f..3d0a525cf 100644 --- a/backend/crm/src/main/java/cn/cordys/common/service/BaseExportService.java +++ b/backend/crm/src/main/java/cn/cordys/common/service/BaseExportService.java @@ -157,7 +157,7 @@ public void getResourceFieldMap(Map moduleFieldMap, List // 获取字段解析器 AbstractModuleFieldResolver customFieldResolver = ModuleFieldResolverFactory.getResolver(fieldConfig.getType()); // 将数据库中的字符串值,转换为对应的对象值 - Object objectValue = customFieldResolver.trans2Value(fieldConfig, value instanceof List ? JSON.toJSONString(value) : value.toString()); + Object objectValue = customFieldResolver.transformToValue(fieldConfig, value instanceof List ? JSON.toJSONString(value) : value.toString()); dataList.add(objectValue); }); } diff --git a/backend/crm/src/main/java/cn/cordys/common/service/BaseResourceFieldService.java b/backend/crm/src/main/java/cn/cordys/common/service/BaseResourceFieldService.java index 3b3a9d08c..3c7c083a4 100644 --- a/backend/crm/src/main/java/cn/cordys/common/service/BaseResourceFieldService.java +++ b/backend/crm/src/main/java/cn/cordys/common/service/BaseResourceFieldService.java @@ -232,7 +232,7 @@ public void saveModuleField(K resource, String orgId, String userId, List void addCustomFieldBatchUpdateLog(List originResourceList, // 获取字段解析器 AbstractModuleFieldResolver customFieldResolver = ModuleFieldResolverFactory.getResolver(field.getType()); // 将数据库中的字符串值,转换为对应的对象值 - Object objectValue = customFieldResolver.parse2Value(field, baseResourceField.getFieldValue().toString()); + Object objectValue = customFieldResolver.convertToValue(field, baseResourceField.getFieldValue().toString()); baseResourceField.setFieldValue(objectValue); originResource.put(request.getFieldId(), baseResourceField.getFieldValue()); } @@ -586,7 +586,7 @@ public Map> getResourceFieldMap(List // 获取字段解析器 AbstractModuleFieldResolver customFieldResolver = ModuleFieldResolverFactory.getResolver(fieldConfig.getType()); // 将数据库中的字符串值,转换为对应的对象值 - Object objectValue = customFieldResolver.parse2Value(fieldConfig, resourceField.getFieldValue().toString()); + Object objectValue = customFieldResolver.convertToValue(fieldConfig, resourceField.getFieldValue().toString()); resourceField.setFieldValue(objectValue); String resourceId = resourceField.getResourceId(); @@ -608,7 +608,7 @@ public Map> getResourceFieldMap(List return; } AbstractModuleFieldResolver customFieldResolver = ModuleFieldResolverFactory.getResolver(fieldConfig.getType()); - Object objectValue = customFieldResolver.parse2Value(fieldConfig, resourceFieldBlob.getFieldValue().toString()); + Object objectValue = customFieldResolver.convertToValue(fieldConfig, resourceFieldBlob.getFieldValue().toString()); String resourceId = resourceFieldBlob.getResourceId(); resourceMap.putIfAbsent(resourceId, new ArrayList<>()); @@ -705,7 +705,7 @@ public void saveModuleFieldByResourceIds(List resourceIds, List void updateModuleField(K resource, String orgId, String userId, List< // 校验参数值 customFieldResolver.validate(base, fieldValue.getFieldValue()); // 将参数值转换成字符串入库 - String strValue = customFieldResolver.parse2String(base, fieldValue.getFieldValue()); + String strValue = customFieldResolver.convertToString(base, fieldValue.getFieldValue()); if (base.isBlob()) { V fieldBlob = newResourceFieldBlob(); fieldBlob.setId(resourceField.getId()); diff --git a/backend/crm/src/main/java/cn/cordys/crm/customer/service/PoolCustomerService.java b/backend/crm/src/main/java/cn/cordys/crm/customer/service/PoolCustomerService.java index 08460a9b9..f92f9cd49 100644 --- a/backend/crm/src/main/java/cn/cordys/crm/customer/service/PoolCustomerService.java +++ b/backend/crm/src/main/java/cn/cordys/crm/customer/service/PoolCustomerService.java @@ -311,33 +311,6 @@ public void validateCapacity(int processCount, String ownUserId, String currentO } } - /** - * 获取剩余库容 - * - * @param ownUserId 负责人 - * @param currentOrgId 当前组织ID - * - * @return 剩余库容 - */ - public Long getRemainCapacity(String ownUserId, String currentOrgId) { - CustomerCapacity customerCapacity = getUserCapacity(ownUserId, currentOrgId); - if (customerCapacity == null || customerCapacity.getCapacity() == null) { - return null; - } - List conditions = StringUtils.isEmpty(customerCapacity.getFilter()) ? - new ArrayList<>() : JSON.parseArray(customerCapacity.getFilter(), FilterConditionDTO.class); - conditions = conditions.stream().filter(condition -> StringUtils.isNotEmpty(condition.getColumn()) - && StringUtils.isNotEmpty(condition.getOperator()) && CollectionUtils.isNotEmpty(condition.getValue())).toList(); - int filter = 0; - if (CollectionUtils.isNotEmpty(conditions)) { - filter = (int) extCustomerMapper.filterOwnerCount(ownUserId, conditions); - } - LambdaQueryWrapper customerWrapper = new LambdaQueryWrapper<>(); - customerWrapper.eq(Customer::getOwner, ownUserId).eq(Customer::getInSharedPool, false); - int ownCount = customerMapper.selectListByLambda(customerWrapper).size(); - return Math.max(0, customerCapacity.getCapacity().longValue() - ownCount + filter); - } - /** * 校验每日领取数量 * diff --git a/backend/crm/src/main/java/cn/cordys/crm/system/excel/listener/CustomFieldImportEventListener.java b/backend/crm/src/main/java/cn/cordys/crm/system/excel/listener/CustomFieldImportEventListener.java index 6088a87fc..f1089c7ff 100644 --- a/backend/crm/src/main/java/cn/cordys/crm/system/excel/listener/CustomFieldImportEventListener.java +++ b/backend/crm/src/main/java/cn/cordys/crm/system/excel/listener/CustomFieldImportEventListener.java @@ -296,7 +296,7 @@ private Object convertValue(String text, BaseField field) { } try { AbstractModuleFieldResolver customFieldResolver = ModuleFieldResolverFactory.getResolver(field.getType()); - return customFieldResolver.text2Value(field, text); + return customFieldResolver.textToValue(field, text); } catch (Exception e) { LogUtils.error(String.format("parse field %s error, %s cannot be transfer, error: %s", field.getName(), text, e.getMessage())); } diff --git a/backend/crm/src/main/java/cn/cordys/crm/system/service/ModuleFormService.java b/backend/crm/src/main/java/cn/cordys/crm/system/service/ModuleFormService.java index 5001c0134..c436cebf7 100644 --- a/backend/crm/src/main/java/cn/cordys/crm/system/service/ModuleFormService.java +++ b/backend/crm/src/main/java/cn/cordys/crm/system/service/ModuleFormService.java @@ -921,7 +921,7 @@ private Object displayOfType(BaseField sourceField, Object actualVal) { } AbstractModuleFieldResolver customFieldResolver = ModuleFieldResolverFactory.getResolver(sourceField.getType()); // 将数据库中的字符串值,转换为对应的对象值 - return customFieldResolver.trans2Value(sourceField, actualVal instanceof List ? JSON.toJSONString(actualVal) : actualVal.toString()); + return customFieldResolver.transformToValue(sourceField, actualVal instanceof List ? JSON.toJSONString(actualVal) : actualVal.toString()); } /** diff --git a/backend/crm/src/main/java/cn/cordys/crm/system/service/OrganizationUserService.java b/backend/crm/src/main/java/cn/cordys/crm/system/service/OrganizationUserService.java index 91e324719..27269469d 100644 --- a/backend/crm/src/main/java/cn/cordys/crm/system/service/OrganizationUserService.java +++ b/backend/crm/src/main/java/cn/cordys/crm/system/service/OrganizationUserService.java @@ -59,8 +59,6 @@ @Transactional(rollbackFor = Exception.class) public class OrganizationUserService { - private static final String DEFAULT_USER_PASSWORD = "CordysCRM"; - @Resource private ExtOrganizationUserMapper extOrganizationUserMapper; @Resource @@ -491,7 +489,7 @@ public void batchResetPassword(UserBatchRequest request, String operatorId, Stri throw new GenericException(Translator.get("user_phone_not_exist")); } - List logDTOS = new ArrayList<>(); + List logs = new ArrayList<>(); User originPasswdUser = new User(); originPasswdUser.setPassword("############"); User newPasswdUser = new User(); @@ -505,12 +503,12 @@ public void batchResetPassword(UserBatchRequest request, String operatorId, Stri LogDTO logDTO = new LogDTO(orgId, user.getId(), operatorId, LogType.UPDATE, LogModule.SYSTEM_ORGANIZATION, user.getName()); logDTO.setOriginalValue(originPasswdUser); logDTO.setModifiedValue(newPasswdUser); - logDTOS.add(logDTO); + logs.add(logDTO); // 踢出该用户 SessionUtils.kickOutUser(operatorId, user.getId()); }); extUserMapper.batchUpdatePassword(userList); - logService.batchAdd(logDTOS); + logService.batchAdd(logs); }