manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

StringUtils增加splitComma、joinComma

Browse Source
This commit is contained in:
thinkgem
2023-06-09 20:47:15 +08:00
parent 7fe1faf915
commit 8e4be5f03c
17 changed files with 89 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/core/src/main/java/com/jeesite/common/utils/excel/fieldtype/PostListType.java
View File

@@ -33,8 +33,8 @@ public class PostListType implements FieldType {
*/
@Override
public Object getValue(String val) {
List<String> list = new ArrayList<String>();
for (String s : StringUtils.split(val, ",")) {
List<String> list = new ArrayList<>();
for (String s : StringUtils.splitComma(val)) {
for (Post e : postList) {
if (StringUtils.trimToEmpty(s).equals(e.getPostName())) {
list.add(e.getPostCode());

4
modules/core/src/main/java/com/jeesite/common/utils/excel/fieldtype/RoleListType.java
View File

@@ -33,8 +33,8 @@ public class RoleListType implements FieldType {
*/
@Override
public Object getValue(String val) {
List<String> list = new ArrayList<String>();
for (String s : StringUtils.split(val, ",")) {
List<String> list = new ArrayList<>();
for (String s : StringUtils.splitComma(val)) {
for (Role e : roleList) {
if (StringUtils.trimToEmpty(s).equals(e.getRoleName())) {
list.add(e.getRoleCode());

6
modules/core/src/main/java/com/jeesite/modules/config/web/interceptor/LogInterceptorConfig.java
View File

@@ -28,14 +28,12 @@ public class LogInterceptorConfig implements WebMvcConfigurer {
@Override
public void addInterceptors(InterceptorRegistry registry) {
InterceptorRegistration registration = registry.addInterceptor(new LogInterceptor());
String apps = Global.getProperty("web.interceptor.log.addPathPatterns");
String epps = Global.getProperty("web.interceptor.log.excludePathPatterns");
for (String uri : StringUtils.split(apps, ",")){
for (String uri : StringUtils.splitComma(Global.getProperty("web.interceptor.log.addPathPatterns"))){
if (StringUtils.isNotBlank(uri)){
registration.addPathPatterns(StringUtils.trim(uri));
}
}
for (String uri : StringUtils.split(epps, ",")){
for (String uri : StringUtils.splitComma(Global.getProperty("web.interceptor.log.excludePathPatterns"))){
if (StringUtils.isNotBlank(uri)){
registration.excludePathPatterns(StringUtils.trim(uri));
}

6
modules/core/src/main/java/com/jeesite/modules/config/web/interceptor/MobileViewInterceptorConfig.java
View File

@@ -28,14 +28,12 @@ public class MobileViewInterceptorConfig implements WebMvcConfigurer {
@Override
public void addInterceptors(InterceptorRegistry registry) {
InterceptorRegistration registration = registry.addInterceptor(new MobileInterceptor());
String apps = Global.getProperty("web.interceptor.mobile.addPathPatterns");
String epps = Global.getProperty("web.interceptor.mobile.excludePathPatterns");
for (String uri : StringUtils.split(apps, ",")){
for (String uri : StringUtils.splitComma(Global.getProperty("web.interceptor.mobile.addPathPatterns"))){
if (StringUtils.isNotBlank(uri)){
registration.addPathPatterns(StringUtils.trim(uri));
}
}
for (String uri : StringUtils.split(epps, ",")){
for (String uri : StringUtils.splitComma(Global.getProperty("web.interceptor.mobile.excludePathPatterns"))){
if (StringUtils.isNotBlank(uri)){
registration.excludePathPatterns(StringUtils.trim(uri));
}

6
modules/core/src/main/java/com/jeesite/modules/msg/service/MsgInnerService.java
View File

@@ -106,8 +106,8 @@ public class MsgInnerService extends CrudService<MsgInnerDao, MsgInner> {
empUser.setCodes(new String[]{});
empUserList = empUserService.findUserList(empUser);
}else{
String[] codes = StringUtils.split(msgInner.getReceiveCodes(), ",");
String[] names = StringUtils.split(msgInner.getReceiveNames(), ",");
String[] codes = StringUtils.splitComma(msgInner.getReceiveCodes());
String[] names = StringUtils.splitComma(msgInner.getReceiveNames());
if (codes != null && names != null && codes.length > 0 && codes.length == names.length){
EmpUser empUser = new EmpUser();
empUser.setCodes(codes);
@@ -144,7 +144,7 @@ public class MsgInnerService extends CrudService<MsgInnerDao, MsgInner> {
if (empUserList == null || empUserList.size() <= 0){
return;
}
String[] notifyTypes = StringUtils.split(msgInner.getNotifyTypes(), ",");
String[] notifyTypes = StringUtils.splitComma(msgInner.getNotifyTypes());
List<MsgInnerRecord> recordList = ListUtils.newArrayList();
empUserList.forEach(user -> {
MsgInnerRecord r = new MsgInnerRecord();

74
modules/core/src/main/java/com/jeesite/modules/sys/entity/Company.java
View File

@@ -4,25 +4,23 @@
*/
package com.jeesite.modules.sys.entity;
import java.util.List;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Pattern;
import javax.validation.constraints.Size;
import org.apache.commons.lang3.StringUtils;
import com.jeesite.common.collect.ListUtils;
import com.jeesite.common.entity.BaseEntity;
import com.jeesite.common.entity.DataEntity;
import com.jeesite.common.entity.Extend;
import com.jeesite.common.entity.TreeEntity;
import com.jeesite.common.lang.StringUtils;
import com.jeesite.common.mybatis.annotation.Column;
import com.jeesite.common.mybatis.annotation.JoinTable;
import com.jeesite.common.mybatis.annotation.JoinTable.Type;
import com.jeesite.common.mybatis.annotation.Table;
import com.jeesite.common.mybatis.mapper.query.QueryType;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Pattern;
import javax.validation.constraints.Size;
import java.util.List;
/**
* 公司管理Entity
* @author ThinkGem
@@ -32,35 +30,35 @@ import com.jeesite.common.mybatis.mapper.query.QueryType;
@Column(includeEntity=BaseEntity.class),
@Column(includeEntity=DataEntity.class),
@Column(includeEntity=TreeEntity.class),
@Column(name="company_code", attrName="companyCode", label="公司编码", isPK=true),
@Column(name="view_code", attrName="viewCode", label="公司代码"),
@Column(name="company_name", attrName="companyName", label="公司名称", queryType=QueryType.LIKE, isTreeName=true),
@Column(name="full_name", attrName="fullName", label="公司全称", queryType=QueryType.LIKE),
@Column(name="area_code", attrName="area.areaCode", label="区域编码"),
@Column(name="company_code", attrName="companyCode", label="公司编码", isPK=true),
@Column(name="view_code", attrName="viewCode", label="公司代码"),
@Column(name="company_name", attrName="companyName", label="公司名称", queryType=QueryType.LIKE, isTreeName=true),
@Column(name="full_name", attrName="fullName", label="公司全称", queryType=QueryType.LIKE),
@Column(name="area_code", attrName="area.areaCode", label="区域编码"),
@Column(includeEntity=Extend.class, attrName="extend"),
}, joinTable={
@JoinTable(type=Type.LEFT_JOIN, entity=Area.class, alias="b",
on="b.area_code = a.area_code",
columns={
@Column(name="area_code", label="区域代码", isPK=true),
@Column(name="area_name", label="区域名称", isQuery=false),
@Column(name="area_type", label="区域类型"),
@Column(name="tree_names", label="区域全称"),
}),
@Column(name="area_code", label="区域代码", isPK=true),
@Column(name="area_name", label="区域名称", isQuery=false),
@Column(name="area_type", label="区域类型"),
@Column(name="tree_names", label="区域全称"),
}),
}, extWhereKeys="dsf", orderBy="a.tree_sorts, a.company_code"
)
public class Company extends TreeEntity<Company> {
private static final long serialVersionUID = 1L;
private String companyCode; // 公司编码
private String viewCode; // 公司代码
private String companyName; // 公司名称
private String fullName; // 公司全称
private Area area; // 区域编码
private Extend extend; // 扩展字段
private List<CompanyOffice> companyOfficeList = ListUtils.newArrayList(); // 公司所包含的部门信息
private static final long serialVersionUID = 1L;
private String companyCode; // 公司编码
private String viewCode; // 公司代码
private String companyName; // 公司名称
private String fullName; // 公司全称
private Area area; // 区域编码
private Extend extend; // 扩展字段
private final List<CompanyOffice> companyOfficeList = ListUtils.newArrayList(); // 公司所包含的部门信息
public Company() {
this(null);
}
@@ -68,7 +66,7 @@ public class Company extends TreeEntity<Company> {
public Company(String id){
super(id);
}
@Override
public Company getParent() {
return parent;
@@ -78,7 +76,7 @@ public class Company extends TreeEntity<Company> {
public void setParent(Company parent) {
this.parent = parent;
}
public String getCompanyCode() {
return companyCode;
}
@@ -86,7 +84,7 @@ public class Company extends TreeEntity<Company> {
public void setCompanyCode(String companyCode) {
this.companyCode = companyCode;
}
@NotBlank(message="公司代码不能为空")
@Pattern(regexp="[a-zA-Z0-9_]{0,30}", message="代码长度不能大于 30 个字符，并且只能包含字母、数字、下划线")
public String getViewCode() {
@@ -96,7 +94,7 @@ public class Company extends TreeEntity<Company> {
public void setViewCode(String viewCode) {
this.viewCode = viewCode;
}
@NotBlank(message="公司名称不能为空")
@Size(min=0, max=200, message="公司名称长度不能超过 200 个字符")
public String getCompanyName() {
@@ -106,7 +104,7 @@ public class Company extends TreeEntity<Company> {
public void setCompanyName(String companyName) {
this.companyName = companyName;
}
@NotBlank(message="公司全称不能为空")
@Size(min=0, max=200, message="公司全称长度不能超过 200 个字符")
public String getFullName() {
@@ -116,7 +114,7 @@ public class Company extends TreeEntity<Company> {
public void setFullName(String fullName) {
this.fullName = fullName;
}
public Area getArea() {
return area;
}
@@ -124,7 +122,7 @@ public class Company extends TreeEntity<Company> {
public void setArea(Area area) {
this.area = area;
}
public Extend getExtend() {
return extend;
}
@@ -136,9 +134,9 @@ public class Company extends TreeEntity<Company> {
public List<CompanyOffice> getCompanyOfficeList() {
return companyOfficeList;
}
public void setOfficeCodes(String officeCodes) {
String[] list = StringUtils.split(officeCodes, ",");
String[] list = StringUtils.splitComma(officeCodes);
if (list != null){
for (String val : list){
if (StringUtils.isNotBlank(val)){
@@ -151,5 +149,5 @@ public class Company extends TreeEntity<Company> {
}
}
}
}

2
modules/core/src/main/java/com/jeesite/modules/sys/entity/Employee.java
View File

@@ -155,7 +155,7 @@ public class Employee extends DataEntity<Employee> {
}
public void setEmployeePosts(String employeePosts) {
String[] list = StringUtils.split(employeePosts, ",");
String[] list = StringUtils.splitComma(employeePosts);
for (String val : list){
if (StringUtils.isNotBlank(val)){
EmployeePost e = new EmployeePost();