Merge remote-tracking branch 'origin/于相涌/Lark' into 于相涌/Lark
continuous-integration/drone/push Build is passing Details

于相涌/mail
YXY 2 years ago
commit 28bc414c65

@ -13,14 +13,14 @@ import org.springframework.web.multipart.MultipartFile;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
import com.ruoyi.common.utils.file.FileUploadUtils;
import com.ruoyi.common.utils.file.FileUtils;
import com.ruoyi.framework.config.ServerConfig;
/**
*
*
*
* @author ruoyi
*/
@RestController
@ -33,7 +33,7 @@ public class CommonController
/**
*
*
*
* @param fileName
* @param delete
*/
@ -44,7 +44,7 @@ public class CommonController
{
if (!FileUtils.checkAllowDownload(fileName))
{
throw new Exception(StringUtils.format("文件名称({})非法,不允许下载。 ", fileName));
throw new Exception(StringPlusUtils.format("文件名称({})非法,不允许下载。 ", fileName));
}
String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1);
String filePath = RuoYiConfig.getDownloadPath() + fileName;
@ -98,14 +98,14 @@ public class CommonController
{
if (!FileUtils.checkAllowDownload(resource))
{
throw new Exception(StringUtils.format("资源文件({})非法,不允许下载。 ", resource));
throw new Exception(StringPlusUtils.format("资源文件({})非法,不允许下载。 ", resource));
}
// 本地资源路径
String localPath = RuoYiConfig.getProfile();
// 数据库资源地址
String downloadPath = localPath + StringUtils.substringAfter(resource, Constants.RESOURCE_PREFIX);
String downloadPath = localPath + StringPlusUtils.substringAfter(resource, Constants.RESOURCE_PREFIX);
// 下载名称
String downloadName = StringUtils.substringAfterLast(downloadPath, "/");
String downloadName = StringPlusUtils.substringAfterLast(downloadPath, "/");
response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
FileUtils.setAttachmentResponseHeader(response, downloadName);
FileUtils.writeBytes(downloadPath, response.getOutputStream());

@ -13,11 +13,11 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
/**
*
*
*
* @author ruoyi
*/
@RestController
@ -43,8 +43,8 @@ public class CacheController
commandStats.stringPropertyNames().forEach(key -> {
Map<String, String> data = new HashMap<>(2);
String property = commandStats.getProperty(key);
data.put("name", StringUtils.removeStart(key, "cmdstat_"));
data.put("value", StringUtils.substringBetween(property, "calls=", ",usec"));
data.put("name", StringPlusUtils.removeStart(key, "cmdstat_"));
data.put("value", StringPlusUtils.substringBetween(property, "calls=", ",usec"));
pieList.add(data);
});
result.put("commandStats", pieList);

@ -19,13 +19,13 @@ import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
import com.ruoyi.system.domain.SysUserOnline;
import com.ruoyi.system.service.ISysUserOnlineService;
/**
* 线
*
*
* @author ruoyi
*/
@RestController
@ -47,23 +47,23 @@ public class SysUserOnlineController extends BaseController
for (String key : keys)
{
LoginUser user = redisCache.getCacheObject(key);
if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName))
if (StringPlusUtils.isNotEmpty(ipaddr) && StringPlusUtils.isNotEmpty(userName))
{
if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsername()))
if (StringPlusUtils.equals(ipaddr, user.getIpaddr()) && StringPlusUtils.equals(userName, user.getUsername()))
{
userOnlineList.add(userOnlineService.selectOnlineByInfo(ipaddr, userName, user));
}
}
else if (StringUtils.isNotEmpty(ipaddr))
else if (StringPlusUtils.isNotEmpty(ipaddr))
{
if (StringUtils.equals(ipaddr, user.getIpaddr()))
if (StringPlusUtils.equals(ipaddr, user.getIpaddr()))
{
userOnlineList.add(userOnlineService.selectOnlineByIpaddr(ipaddr, user));
}
}
else if (StringUtils.isNotEmpty(userName) && StringUtils.isNotNull(user.getUser()))
else if (StringPlusUtils.isNotEmpty(userName) && StringPlusUtils.isNotNull(user.getUser()))
{
if (StringUtils.equals(userName, user.getUsername()))
if (StringPlusUtils.equals(userName, user.getUsername()))
{
userOnlineList.add(userOnlineService.selectOnlineByUserName(userName, user));
}

@ -21,12 +21,12 @@ import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
import com.ruoyi.system.service.ISysDeptService;
/**
*
*
*
* @author ruoyi
*/
@RestController
@ -60,7 +60,7 @@ public class SysDeptController extends BaseController
{
SysDept d = (SysDept) it.next();
if (d.getDeptId().intValue() == deptId
|| ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + ""))
|| ArrayUtils.contains(StringPlusUtils.split(d.getAncestors(), ","), deptId + ""))
{
it.remove();
}
@ -133,7 +133,7 @@ public class SysDeptController extends BaseController
{
return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败,上级部门不能是自己");
}
else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus())
else if (StringPlusUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus())
&& deptService.selectNormalChildrenDeptById(dept.getDeptId()) > 0)
{
return AjaxResult.error("该部门包含未停用的子部门!");

@ -20,14 +20,14 @@ import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.service.ISysDictDataService;
import com.ruoyi.system.service.ISysDictTypeService;
/**
*
*
*
* @author ruoyi
*/
@RestController
@ -76,7 +76,7 @@ public class SysDictDataController extends BaseController
public AjaxResult dictType(@PathVariable String dictType)
{
List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
if (StringUtils.isNull(data))
if (StringPlusUtils.isNull(data))
{
data = new ArrayList<SysDictData>();
}

@ -22,13 +22,13 @@ import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.service.ISysMenuService;
/**
*
*
*
* @author ruoyi
*/
@RestController
@ -103,7 +103,7 @@ public class SysMenuController extends BaseController
return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败,菜单名称已存在");
}
else if (UserConstants.YES_FRAME.equals(menu.getIsFrame())
&& !StringUtils.startsWithAny(menu.getPath(), Constants.HTTP, Constants.HTTPS))
&& !StringPlusUtils.startsWithAny(menu.getPath(), Constants.HTTP, Constants.HTTPS))
{
return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败地址必须以http(s)://开头");
}
@ -124,7 +124,7 @@ public class SysMenuController extends BaseController
return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败,菜单名称已存在");
}
else if (UserConstants.YES_FRAME.equals(menu.getIsFrame())
&& !StringUtils.startsWithAny(menu.getPath(), Constants.HTTP, Constants.HTTPS))
&& !StringPlusUtils.startsWithAny(menu.getPath(), Constants.HTTP, Constants.HTTPS))
{
return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败地址必须以http(s)://开头");
}
@ -154,4 +154,4 @@ public class SysMenuController extends BaseController
}
return toAjax(menuService.deleteMenuById(menuId));
}
}
}

@ -22,7 +22,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.service.SysPermissionService;
import com.ruoyi.framework.web.service.TokenService;
@ -31,7 +31,7 @@ import com.ruoyi.system.service.ISysUserService;
/**
*
*
*
* @author ruoyi
*/
@RestController
@ -43,10 +43,10 @@ public class SysRoleController extends BaseController
@Autowired
private TokenService tokenService;
@Autowired
private SysPermissionService permissionService;
@Autowired
private ISysUserService userService;
@ -118,12 +118,12 @@ public class SysRoleController extends BaseController
return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败,角色权限已存在");
}
role.setUpdateBy(SecurityUtils.getUsername());
if (roleService.updateRole(role) > 0)
{
// 更新缓存用户权限
LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
if (StringUtils.isNotNull(loginUser.getUser()) && !loginUser.getUser().isAdmin())
if (StringPlusUtils.isNotNull(loginUser.getUser()) && !loginUser.getUser().isAdmin())
{
loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getUser()));
loginUser.setUser(userService.selectUserByUserName(loginUser.getUser().getUserName()));

@ -25,7 +25,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.service.ISysPostService;
@ -34,7 +34,7 @@ import com.ruoyi.system.service.ISysUserService;
/**
*
*
*
* @author ruoyi
*/
@RestController
@ -106,7 +106,7 @@ public class SysUserController extends BaseController
List<SysRole> roles = roleService.selectRoleAll();
ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
ajax.put("posts", postService.selectPostAll());
if (StringUtils.isNotNull(userId))
if (StringPlusUtils.isNotNull(userId))
{
ajax.put(AjaxResult.DATA_TAG, userService.selectUserById(userId));
ajax.put("postIds", postService.selectPostListByUserId(userId));
@ -127,12 +127,12 @@ public class SysUserController extends BaseController
{
return AjaxResult.error("新增用户'" + user.getUserName() + "'失败,登录账号已存在");
}
else if (StringUtils.isNotEmpty(user.getPhonenumber())
else if (StringPlusUtils.isNotEmpty(user.getPhonenumber())
&& UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
{
return AjaxResult.error("新增用户'" + user.getUserName() + "'失败,手机号码已存在");
}
else if (StringUtils.isNotEmpty(user.getEmail())
else if (StringPlusUtils.isNotEmpty(user.getEmail())
&& UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
{
return AjaxResult.error("新增用户'" + user.getUserName() + "'失败,邮箱账号已存在");
@ -151,12 +151,12 @@ public class SysUserController extends BaseController
public AjaxResult edit(@Validated @RequestBody SysUser user)
{
userService.checkUserAllowed(user);
if (StringUtils.isNotEmpty(user.getPhonenumber())
if (StringPlusUtils.isNotEmpty(user.getPhonenumber())
&& UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
{
return AjaxResult.error("修改用户'" + user.getUserName() + "'失败,手机号码已存在");
}
else if (StringUtils.isNotEmpty(user.getEmail())
else if (StringPlusUtils.isNotEmpty(user.getEmail())
&& UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
{
return AjaxResult.error("修改用户'" + user.getUserName() + "'失败,邮箱账号已存在");

@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiModel;
@ -22,7 +22,7 @@ import io.swagger.annotations.ApiOperation;
/**
* swagger
*
*
* @author ruoyi
*/
@Api("用户信息管理")
@ -64,7 +64,7 @@ public class TestController extends BaseController
@PostMapping("/save")
public AjaxResult save(UserEntity user)
{
if (StringUtils.isNull(user) || StringUtils.isNull(user.getUserId()))
if (StringPlusUtils.isNull(user) || StringPlusUtils.isNull(user.getUserId()))
{
return AjaxResult.error("用户ID不能为空");
}
@ -76,7 +76,7 @@ public class TestController extends BaseController
@PutMapping("/update")
public AjaxResult update(UserEntity user)
{
if (StringUtils.isNull(user) || StringUtils.isNull(user.getUserId()))
if (StringPlusUtils.isNull(user) || StringPlusUtils.isNull(user.getUserId()))
{
return AjaxResult.error("用户ID不能为空");
}

@ -35,6 +35,7 @@ logging:
level:
com.ruoyi: debug
org.springframework: warn
org.flowable: debug
# Spring配置
spring:

@ -15,12 +15,12 @@ import com.ruoyi.common.core.page.PageDomain;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.page.TableSupport;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
import com.ruoyi.common.utils.sql.SqlUtil;
/**
* web
*
*
* @author ruoyi
*/
public class BaseController
@ -52,7 +52,7 @@ public class BaseController
PageDomain pageDomain = TableSupport.buildPageRequest();
Integer pageNum = pageDomain.getPageNum();
Integer pageSize = pageDomain.getPageSize();
if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize))
if (StringPlusUtils.isNotNull(pageNum) && StringPlusUtils.isNotNull(pageSize))
{
String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
PageHelper.startPage(pageNum, pageSize, orderBy);
@ -75,7 +75,7 @@ public class BaseController
/**
*
*
*
* @param rows
* @return
*/
@ -86,7 +86,7 @@ public class BaseController
/**
*
*
*
* @param result
* @return
*/
@ -132,6 +132,6 @@ public class BaseController
*/
public String redirect(String url)
{
return StringUtils.format("redirect:{}", url);
return StringPlusUtils.format("redirect:{}", url);
}
}

@ -2,11 +2,11 @@ package com.ruoyi.common.core.domain;
import java.util.HashMap;
import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
/**
*
*
*
* @author ruoyi
*/
public class AjaxResult extends HashMap<String, Object>
@ -31,7 +31,7 @@ public class AjaxResult extends HashMap<String, Object>
/**
* AjaxResult
*
*
* @param code
* @param msg
*/
@ -43,7 +43,7 @@ public class AjaxResult extends HashMap<String, Object>
/**
* AjaxResult
*
*
* @param code
* @param msg
* @param data
@ -52,7 +52,7 @@ public class AjaxResult extends HashMap<String, Object>
{
super.put(CODE_TAG, code);
super.put(MSG_TAG, msg);
if (StringUtils.isNotNull(data))
if (StringPlusUtils.isNotNull(data))
{
super.put(DATA_TAG, data);
}
@ -60,7 +60,7 @@ public class AjaxResult extends HashMap<String, Object>
/**
*
*
*
* @return
*/
public static AjaxResult success()
@ -70,7 +70,7 @@ public class AjaxResult extends HashMap<String, Object>
/**
*
*
*
* @return
*/
public static AjaxResult success(Object data)
@ -89,7 +89,7 @@ public class AjaxResult extends HashMap<String, Object>
/**
*
*
*
* @param msg
* @return
*/
@ -100,7 +100,7 @@ public class AjaxResult extends HashMap<String, Object>
/**
*
*
*
* @param msg
* @param data
* @return
@ -112,7 +112,7 @@ public class AjaxResult extends HashMap<String, Object>
/**
*
*
*
* @return
*/
public static AjaxResult error()
@ -122,7 +122,7 @@ public class AjaxResult extends HashMap<String, Object>
/**
*
*
*
* @param msg
* @return
*/
@ -133,7 +133,7 @@ public class AjaxResult extends HashMap<String, Object>
/**
*
*
*
* @param msg
* @param data
* @return
@ -145,7 +145,7 @@ public class AjaxResult extends HashMap<String, Object>
/**
*
*
*
* @param code
* @param msg
* @return

@ -1,10 +1,10 @@
package com.ruoyi.common.core.page;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
/**
*
*
*
* @author ruoyi
*/
public class PageDomain
@ -23,11 +23,11 @@ public class PageDomain
public String getOrderBy()
{
if (StringUtils.isEmpty(orderByColumn))
if (StringPlusUtils.isEmpty(orderByColumn))
{
return "";
}
return StringUtils.toUnderScoreCase(orderByColumn) + " " + isAsc;
return StringPlusUtils.toUnderScoreCase(orderByColumn) + " " + isAsc;
}
public Integer getPageNum()

@ -2,11 +2,11 @@ package com.ruoyi.common.core.text;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
/**
*
*
*
* @author ruoyi
*/
public class CharsetKit
@ -27,18 +27,18 @@ public class CharsetKit
/**
* Charset
*
*
* @param charset
* @return Charset
*/
public static Charset charset(String charset)
{
return StringUtils.isEmpty(charset) ? Charset.defaultCharset() : Charset.forName(charset);
return StringPlusUtils.isEmpty(charset) ? Charset.defaultCharset() : Charset.forName(charset);
}
/**
*
*
*
* @param source
* @param srcCharset ISO-8859-1
* @param destCharset UTF-8
@ -51,7 +51,7 @@ public class CharsetKit
/**
*
*
*
* @param source
* @param srcCharset ISO-8859-1
* @param destCharset UTF-8
@ -69,7 +69,7 @@ public class CharsetKit
destCharset = StandardCharsets.UTF_8;
}
if (StringUtils.isEmpty(source) || srcCharset.equals(destCharset))
if (StringPlusUtils.isEmpty(source) || srcCharset.equals(destCharset))
{
return source;
}

@ -6,7 +6,7 @@ import java.nio.ByteBuffer;
import java.nio.charset.Charset;
import java.text.NumberFormat;
import java.util.Set;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
import org.apache.commons.lang3.ArrayUtils;
/**
@ -72,7 +72,7 @@ public class Convert
}
final String valueStr = toStr(value, null);
return StringUtils.isEmpty(valueStr) ? defaultValue : valueStr.charAt(0);
return StringPlusUtils.isEmpty(valueStr) ? defaultValue : valueStr.charAt(0);
}
/**
@ -112,7 +112,7 @@ public class Convert
return ((Number) value).byteValue();
}
final String valueStr = toStr(value, null);
if (StringUtils.isEmpty(valueStr))
if (StringPlusUtils.isEmpty(valueStr))
{
return defaultValue;
}
@ -163,7 +163,7 @@ public class Convert
return ((Number) value).shortValue();
}
final String valueStr = toStr(value, null);
if (StringUtils.isEmpty(valueStr))
if (StringPlusUtils.isEmpty(valueStr))
{
return defaultValue;
}
@ -210,7 +210,7 @@ public class Convert
return (Number) value;
}
final String valueStr = toStr(value, null);
if (StringUtils.isEmpty(valueStr))
if (StringPlusUtils.isEmpty(valueStr))
{
return defaultValue;
}
@ -261,7 +261,7 @@ public class Convert
return ((Number) value).intValue();
}
final String valueStr = toStr(value, null);
if (StringUtils.isEmpty(valueStr))
if (StringPlusUtils.isEmpty(valueStr))
{
return defaultValue;
}
@ -319,7 +319,7 @@ public class Convert
*/
public static Integer[] toIntArray(String split, String str)
{
if (StringUtils.isEmpty(str))
if (StringPlusUtils.isEmpty(str))
{
return new Integer[] {};
}
@ -342,7 +342,7 @@ public class Convert
*/
public static Long[] toLongArray(String split, String str)
{
if (StringUtils.isEmpty(str))
if (StringPlusUtils.isEmpty(str))
{
return new Long[] {};
}
@ -403,7 +403,7 @@ public class Convert
return ((Number) value).longValue();
}
final String valueStr = toStr(value, null);
if (StringUtils.isEmpty(valueStr))
if (StringPlusUtils.isEmpty(valueStr))
{
return defaultValue;
}
@ -455,7 +455,7 @@ public class Convert
return ((Number) value).doubleValue();
}
final String valueStr = toStr(value, null);
if (StringUtils.isEmpty(valueStr))
if (StringPlusUtils.isEmpty(valueStr))
{
return defaultValue;
}
@ -507,7 +507,7 @@ public class Convert
return ((Number) value).floatValue();
}
final String valueStr = toStr(value, null);
if (StringUtils.isEmpty(valueStr))
if (StringPlusUtils.isEmpty(valueStr))
{
return defaultValue;
}
@ -554,7 +554,7 @@ public class Convert
return (Boolean) value;
}
String valueStr = toStr(value, null);
if (StringUtils.isEmpty(valueStr))
if (StringPlusUtils.isEmpty(valueStr))
{
return defaultValue;
}
@ -615,7 +615,7 @@ public class Convert
return myE;
}
final String valueStr = toStr(value, null);
if (StringUtils.isEmpty(valueStr))
if (StringPlusUtils.isEmpty(valueStr))
{
return defaultValue;
}
@ -666,7 +666,7 @@ public class Convert
return BigInteger.valueOf((Long) value);
}
final String valueStr = toStr(value, null);
if (StringUtils.isEmpty(valueStr))
if (StringPlusUtils.isEmpty(valueStr))
{
return defaultValue;
}
@ -725,7 +725,7 @@ public class Convert
return new BigDecimal((Integer) value);
}
final String valueStr = toStr(value, null);
if (StringUtils.isEmpty(valueStr))
if (StringPlusUtils.isEmpty(valueStr))
{
return defaultValue;
}
@ -821,7 +821,7 @@ public class Convert
*/
public static String str(byte[] bytes, String charset)
{
return str(bytes, StringUtils.isEmpty(charset) ? Charset.defaultCharset() : Charset.forName(charset));
return str(bytes, StringPlusUtils.isEmpty(charset) ? Charset.defaultCharset() : Charset.forName(charset));
}
/**

@ -1,10 +1,10 @@
package com.ruoyi.common.core.text;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
/**
*
*
*
* @author ruoyi
*/
public class StrFormatter
@ -22,14 +22,14 @@ public class StrFormatter
* 使format("this is {} for {}", "a", "b") -> this is a for b<br>
* {} format("this is \\{} for {}", "a", "b") -> this is \{} for a<br>
* \ format("this is \\\\{} for {}", "a", "b") -> this is \a for b<br>
*
*
* @param strPattern
* @param argArray
* @return
*/
public static String format(final String strPattern, final Object... argArray)
{
if (StringUtils.isEmpty(strPattern) || StringUtils.isEmpty(argArray))
if (StringPlusUtils.isEmpty(strPattern) || StringPlusUtils.isEmpty(argArray))
{
return strPattern;
}

@ -1,11 +1,11 @@
package com.ruoyi.common.exception;
import com.ruoyi.common.utils.MessageUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
/**
*
*
*
* @author ruoyi
*/
public class BaseException extends RuntimeException
@ -64,7 +64,7 @@ public class BaseException extends RuntimeException
public String getMessage()
{
String message = null;
if (!StringUtils.isEmpty(code))
if (!StringPlusUtils.isEmpty(code))
{
message = MessageUtils.message(code, args);
}

@ -9,11 +9,11 @@ import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import org.springframework.http.MediaType;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
/**
* Repeatable
*
*
* @author ruoyi
*/
public class RepeatableFilter implements Filter
@ -30,7 +30,7 @@ public class RepeatableFilter implements Filter
{
ServletRequest requestWrapper = null;
if (request instanceof HttpServletRequest
&& StringUtils.equalsAnyIgnoreCase(request.getContentType(), MediaType.APPLICATION_JSON_VALUE))
&& StringPlusUtils.equalsAnyIgnoreCase(request.getContentType(), MediaType.APPLICATION_JSON_VALUE))
{
requestWrapper = new RepeatedlyRequestWrapper((HttpServletRequest) request, response);
}

@ -13,11 +13,11 @@ import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
/**
* XSS
*
*
* @author ruoyi
*/
public class XssFilter implements Filter
@ -37,7 +37,7 @@ public class XssFilter implements Filter
{
String tempExcludes = filterConfig.getInitParameter("excludes");
String tempEnabled = filterConfig.getInitParameter("enabled");
if (StringUtils.isNotEmpty(tempExcludes))
if (StringPlusUtils.isNotEmpty(tempExcludes))
{
String[] url = tempExcludes.split(",");
for (int i = 0; url != null && i < url.length; i++)
@ -45,7 +45,7 @@ public class XssFilter implements Filter
excludes.add(url[i]);
}
}
if (StringUtils.isNotEmpty(tempEnabled))
if (StringPlusUtils.isNotEmpty(tempEnabled))
{
enabled = Boolean.valueOf(tempEnabled);
}
@ -94,4 +94,4 @@ public class XssFilter implements Filter
{
}
}
}

@ -9,12 +9,12 @@ import javax.servlet.http.HttpServletRequestWrapper;
import org.apache.commons.io.IOUtils;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
import com.ruoyi.common.utils.html.EscapeUtil;
/**
* XSS
*
*
* @author ruoyi
*/
public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper
@ -56,7 +56,7 @@ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper
// 为空,直接返回
String json = IOUtils.toString(super.getInputStream(), "utf-8");
if (StringUtils.isEmpty(json))
if (StringPlusUtils.isEmpty(json))
{
return super.getInputStream();
}
@ -93,7 +93,7 @@ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper
/**
* Json
*
*
* @param request
*/
public boolean isJsonRequest()
@ -101,4 +101,4 @@ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper
String header = super.getHeader(HttpHeaders.CONTENT_TYPE);
return MediaType.APPLICATION_JSON_VALUE.equalsIgnoreCase(header);
}
}
}

@ -9,7 +9,7 @@ import com.ruoyi.common.utils.spring.SpringUtils;
/**
*
*
*
* @author ruoyi
*/
public class DictUtils
@ -21,7 +21,7 @@ public class DictUtils
/**
*
*
*
* @param key
* @param dictDatas
*/
@ -32,16 +32,16 @@ public class DictUtils
/**
*
*
*
* @param key
* @return dictDatas
*/
public static List<SysDictData> getDictCache(String key)
{
Object cacheObj = SpringUtils.getBean(RedisCache.class).getCacheObject(getCacheKey(key));
if (StringUtils.isNotNull(cacheObj))
if (StringPlusUtils.isNotNull(cacheObj))
{
List<SysDictData> dictDatas = StringUtils.cast(cacheObj);
List<SysDictData> dictDatas = StringPlusUtils.cast(cacheObj);
return dictDatas;
}
return null;
@ -49,7 +49,7 @@ public class DictUtils
/**
*
*
*
* @param dictType
* @param dictValue
* @return
@ -61,7 +61,7 @@ public class DictUtils
/**
*
*
*
* @param dictType
* @param dictLabel
* @return
@ -73,7 +73,7 @@ public class DictUtils
/**
*
*
*
* @param dictType
* @param dictValue
* @param separator
@ -84,7 +84,7 @@ public class DictUtils
StringBuilder propertyString = new StringBuilder();
List<SysDictData> datas = getDictCache(dictType);
if (StringUtils.containsAny(separator, dictValue) && StringUtils.isNotEmpty(datas))
if (StringPlusUtils.containsAny(separator, dictValue) && StringPlusUtils.isNotEmpty(datas))
{
for (SysDictData dict : datas)
{
@ -108,12 +108,12 @@ public class DictUtils
}
}
}
return StringUtils.stripEnd(propertyString.toString(), separator);
return StringPlusUtils.stripEnd(propertyString.toString(), separator);
}
/**
*
*
*
* @param dictType
* @param dictLabel
* @param separator
@ -124,7 +124,7 @@ public class DictUtils
StringBuilder propertyString = new StringBuilder();
List<SysDictData> datas = getDictCache(dictType);
if (StringUtils.containsAny(separator, dictLabel) && StringUtils.isNotEmpty(datas))
if (StringPlusUtils.containsAny(separator, dictLabel) && StringPlusUtils.isNotEmpty(datas))
{
for (SysDictData dict : datas)
{
@ -148,7 +148,7 @@ public class DictUtils
}
}
}
return StringUtils.stripEnd(propertyString.toString(), separator);
return StringPlusUtils.stripEnd(propertyString.toString(), separator);
}
/**
@ -162,7 +162,7 @@ public class DictUtils
/**
* cache key
*
*
* @param configKey
* @return key
*/

@ -35,6 +35,6 @@ public class ExceptionUtil
{
return "null";
}
return StringUtils.defaultString(msg);
return StringPlusUtils.defaultString(msg);
}
}

@ -11,7 +11,7 @@ import com.ruoyi.common.core.text.Convert;
/**
*
*
*
* @author ruoyi
*/
public class ServletUtils
@ -80,7 +80,7 @@ public class ServletUtils
/**
*
*
*
* @param response
* @param string
* @return null
@ -103,7 +103,7 @@ public class ServletUtils
/**
* Ajax
*
*
* @param request
*/
public static boolean isAjaxRequest(HttpServletRequest request)
@ -121,13 +121,13 @@ public class ServletUtils
}
String uri = request.getRequestURI();
if (StringUtils.inStringIgnoreCase(uri, ".json", ".xml"))
if (StringPlusUtils.inStringIgnoreCase(uri, ".json", ".xml"))
{
return true;
}
String ajax = request.getParameter("__ajax");
if (StringUtils.inStringIgnoreCase(ajax, "json", "xml"))
if (StringPlusUtils.inStringIgnoreCase(ajax, "json", "xml"))
{
return true;
}

@ -6,24 +6,27 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import cn.hutool.core.util.StrUtil;
import com.ruoyi.common.core.text.StrFormatter;
/**
*
*
*
* @author ruoyi
*/
public class StringUtils extends org.apache.commons.lang3.StringUtils
public class StringPlusUtils extends org.apache.commons.lang3.StringUtils
{
/** 空字符串 */
private static final String NULLSTR = "";
/** 下划线 */
private static final char SEPARATOR = '_';
private static final String ARRAY_EMPTY_CHAR = "[]";
/**
*
*
*
* @param value defaultValue value
* @return value
*/
@ -34,7 +37,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
/**
* * Collection ListSetQueue
*
*
* @param coll Collection
* @return true false
*/
@ -43,9 +46,20 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
return isNull(coll) || coll.isEmpty();
}
/**
* * array []
*
* @param array Collection
* @return true false
*/
public static boolean isEmptyArray(String array)
{
return StrUtil.equals(ARRAY_EMPTY_CHAR, array);
}
/**
* * CollectionListSetQueue
*
*
* @param coll Collection
* @return true false
*/
@ -56,7 +70,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
/**
* *
*
*
* @param objects
** @return true false
*/
@ -67,7 +81,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
/**
* *
*
*
* @param objects
* @return true false
*/
@ -78,7 +92,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
/**
* * Map
*
*
* @param map Map
* @return true false
*/
@ -89,7 +103,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
/**
* * Map
*
*
* @param map Map
* @return true false
*/
@ -100,7 +114,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
/**
* *
*
*
* @param str String
* @return true false
*/
@ -111,7 +125,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
/**
* *
*
*
* @param str String
* @return true false
*/
@ -122,7 +136,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
/**
* *
*
*
* @param object Object
* @return true false
*/
@ -133,7 +147,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
/**
* *
*
*
* @param object Object
* @return true false
*/
@ -144,7 +158,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
/**
* * Java
*
*
* @param object
* @return true false
*/
@ -163,7 +177,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
/**
*
*
*
* @param str
* @param start
* @return
@ -194,7 +208,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
/**
*
*
*
* @param str
* @param start
* @param end
@ -246,7 +260,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
* 使format("this is {} for {}", "a", "b") -> this is a for b<br>
* {} format("this is \\{} for {}", "a", "b") -> this is \{} for a<br>
* \ format("this is \\\\{} for {}", "a", "b") -> this is \a for b<br>
*
*
* @param template {}
* @param params
* @return
@ -262,7 +276,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
/**
* set
*
*
* @param str
* @param sep
* @return set
@ -274,7 +288,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
/**
* list
*
*
* @param str
* @param sep
* @param filterBlank
@ -284,20 +298,20 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
public static final List<String> str2List(String str, String sep, boolean filterBlank, boolean trim)
{
List<String> list = new ArrayList<String>();
if (StringUtils.isEmpty(str))
if (StringPlusUtils.isEmpty(str))
{
return list;
}
// 过滤空白字符串
if (filterBlank && StringUtils.isBlank(str))
if (filterBlank && StringPlusUtils.isBlank(str))
{
return list;
}
String[] split = str.split(sep);
for (String string : split)
{
if (filterBlank && StringUtils.isBlank(string))
if (filterBlank && StringPlusUtils.isBlank(string))
{
continue;
}
@ -362,7 +376,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
/**
*
*
*
* @param str
* @param strs
* @return true
@ -384,7 +398,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
/**
* 线线 HELLO_WORLD->HelloWorld
*
*
* @param name 线
* @return
*/
@ -456,4 +470,4 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
{
return (T) obj;
}
}
}

@ -10,7 +10,7 @@ import com.ruoyi.common.exception.file.FileNameLengthLimitExceededException;
import com.ruoyi.common.exception.file.FileSizeLimitExceededException;
import com.ruoyi.common.exception.file.InvalidExtensionException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
/**
@ -145,7 +145,7 @@ public class FileUploadUtils
private static final String getPathFileName(String uploadDir, String fileName) throws IOException
{
int dirLastIndex = RuoYiConfig.getProfile().length() + 1;
String currentDir = StringUtils.substring(uploadDir, dirLastIndex);
String currentDir = StringPlusUtils.substring(uploadDir, dirLastIndex);
String pathFileName = Constants.RESOURCE_PREFIX + "/" + currentDir + "/" + fileName;
return pathFileName;
}
@ -222,7 +222,7 @@ public class FileUploadUtils
public static final String getExtension(MultipartFile file)
{
String extension = FilenameUtils.getExtension(file.getOriginalFilename());
if (StringUtils.isEmpty(extension))
if (StringPlusUtils.isEmpty(extension))
{
extension = MimeTypeUtils.getExtension(file.getContentType());
}

@ -11,11 +11,11 @@ import java.nio.charset.StandardCharsets;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.ArrayUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
/**
*
*
*
* @author ruoyi
*/
public class FileUtils extends org.apache.commons.io.FileUtils
@ -24,7 +24,7 @@ public class FileUtils extends org.apache.commons.io.FileUtils
/**
* byte
*
*
* @param filePath
* @param os
* @return
@ -80,7 +80,7 @@ public class FileUtils extends org.apache.commons.io.FileUtils
/**
*
*
*
* @param filePath
* @return
*/
@ -99,7 +99,7 @@ public class FileUtils extends org.apache.commons.io.FileUtils
/**
*
*
*
* @param filename
* @return true false
*/
@ -110,14 +110,14 @@ public class FileUtils extends org.apache.commons.io.FileUtils
/**
*
*
*
* @param resource
* @return true false
*/
public static boolean checkAllowDownload(String resource)
{
// 禁止目录上跳级别
if (StringUtils.contains(resource, ".."))
if (StringPlusUtils.contains(resource, ".."))
{
return false;
}
@ -134,7 +134,7 @@ public class FileUtils extends org.apache.commons.io.FileUtils
/**
*
*
*
* @param request
* @param fileName
* @return

@ -12,7 +12,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
/**
*
@ -58,7 +58,7 @@ public class ImageUtils
/**
*
*
*
* @param key
* @return
*/
@ -82,7 +82,7 @@ public class ImageUtils
{
// 本机地址
String localPath = RuoYiConfig.getProfile();
String downloadPath = localPath + StringUtils.substringAfter(url, Constants.RESOURCE_PREFIX);
String downloadPath = localPath + StringPlusUtils.substringAfter(url, Constants.RESOURCE_PREFIX);
in = new FileInputStream(downloadPath);
}
return IOUtils.toByteArray(in);

@ -1,10 +1,10 @@
package com.ruoyi.common.utils.html;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
/**
*
*
*
* @author ruoyi
*/
public class EscapeUtil
@ -30,7 +30,7 @@ public class EscapeUtil
/**
* HTML
*
*
* @param text
* @return
*/
@ -41,7 +41,7 @@ public class EscapeUtil
/**
* HTML
*
*
* @param content HTML
* @return
*/
@ -52,7 +52,7 @@ public class EscapeUtil
/**
* HTML
*
*
* @param content
* @return
*/
@ -63,7 +63,7 @@ public class EscapeUtil
/**
* Escape
*
*
* @param text
* @return
*/
@ -72,7 +72,7 @@ public class EscapeUtil
int len;
if ((text == null) || ((len = text.length()) == 0))
{
return StringUtils.EMPTY;
return StringPlusUtils.EMPTY;
}
StringBuilder buffer = new StringBuilder(len + (len >> 2));
char c;
@ -93,13 +93,13 @@ public class EscapeUtil
/**
* Escape
*
*
* @param content
* @return
*/
public static String decode(String content)
{
if (StringUtils.isEmpty(content))
if (StringPlusUtils.isEmpty(content))
{
return content;
}

@ -5,12 +5,12 @@ import org.slf4j.LoggerFactory;
import com.alibaba.fastjson.JSONObject;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
import com.ruoyi.common.utils.http.HttpUtils;
/**
*
*
*
* @author ruoyi
*/
public class AddressUtils
@ -36,7 +36,7 @@ public class AddressUtils
try
{
String rspStr = HttpUtils.sendGet(IP_URL, "ip=" + ip + "&json=true", Constants.GBK);
if (StringUtils.isEmpty(rspStr))
if (StringPlusUtils.isEmpty(rspStr))
{
log.error("获取地理位置异常 {}", ip);
return UNKNOWN;

@ -3,12 +3,12 @@ package com.ruoyi.common.utils.ip;
import java.net.InetAddress;
import java.net.UnknownHostException;
import javax.servlet.http.HttpServletRequest;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
import com.ruoyi.common.utils.html.EscapeUtil;
/**
* IP
*
*
* @author ruoyi
*/
public class IpUtils
@ -52,7 +52,7 @@ public class IpUtils
private static boolean internalIp(byte[] addr)
{
if (StringUtils.isNull(addr) || addr.length < 2)
if (StringPlusUtils.isNull(addr) || addr.length < 2)
{
return true;
}
@ -89,7 +89,7 @@ public class IpUtils
/**
* IPv4
*
*
* @param text IPv4
* @return byte
*/
@ -192,4 +192,4 @@ public class IpUtils
}
return "未知";
}
}
}

@ -53,14 +53,14 @@ import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.exception.CustomException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.DictUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
import com.ruoyi.common.utils.file.FileTypeUtils;
import com.ruoyi.common.utils.file.ImageUtils;
import com.ruoyi.common.utils.reflect.ReflectUtils;
/**
* Excel
*
*
* @author ruoyi
*/
public class ExcelUtil<T>
@ -116,12 +116,12 @@ public class ExcelUtil<T>
*
*/
private Map<Integer, Double> statistics = new HashMap<Integer, Double>();
/**
*
*/
private static final DecimalFormat DOUBLE_FORMAT = new DecimalFormat("######0.00");
/**
*
*/
@ -147,18 +147,18 @@ public class ExcelUtil<T>
/**
* excellist
*
*
* @param is
* @return
*/
public List<T> importExcel(InputStream is) throws Exception
{
return importExcel(StringUtils.EMPTY, is);
return importExcel(StringPlusUtils.EMPTY, is);
}
/**
* excellist
*
*
* @param sheetName
* @param is
* @return
@ -169,7 +169,7 @@ public class ExcelUtil<T>
this.wb = WorkbookFactory.create(is);
List<T> list = new ArrayList<T>();
Sheet sheet = null;
if (StringUtils.isNotEmpty(sheetName))
if (StringPlusUtils.isNotEmpty(sheetName))
{
// 如果指定sheet名,则取指定sheet中的内容.
sheet = wb.getSheet(sheetName);
@ -196,7 +196,7 @@ public class ExcelUtil<T>
for (int i = 0; i < heard.getPhysicalNumberOfCells(); i++)
{
Cell cell = heard.getCell(i);
if (StringUtils.isNotNull(cell))
if (StringPlusUtils.isNotNull(cell))
{
String value = this.getCellValue(heard, i).toString();
cellMap.put(value, i);
@ -243,14 +243,14 @@ public class ExcelUtil<T>
if (String.class == fieldType)
{
String s = Convert.toStr(val);
if (StringUtils.endsWith(s, ".0"))
if (StringPlusUtils.endsWith(s, ".0"))
{
val = StringUtils.substringBefore(s, ".0");
val = StringPlusUtils.substringBefore(s, ".0");
}
else
{
String dateFormat = field.getAnnotation(Excel.class).dateFormat();
if (StringUtils.isNotEmpty(dateFormat))
if (StringPlusUtils.isNotEmpty(dateFormat))
{
val = DateUtils.parseDateToStr(dateFormat, (Date) val);
}
@ -260,7 +260,7 @@ public class ExcelUtil<T>
}
}
}
else if ((Integer.TYPE == fieldType || Integer.class == fieldType) && StringUtils.isNumeric(Convert.toStr(val)))
else if ((Integer.TYPE == fieldType || Integer.class == fieldType) && StringPlusUtils.isNumeric(Convert.toStr(val)))
{
val = Convert.toInt(val);
}
@ -295,19 +295,19 @@ public class ExcelUtil<T>
{
val = Convert.toBool(val, false);
}
if (StringUtils.isNotNull(fieldType))
if (StringPlusUtils.isNotNull(fieldType))
{
Excel attr = field.getAnnotation(Excel.class);
String propertyName = field.getName();
if (StringUtils.isNotEmpty(attr.targetAttr()))
if (StringPlusUtils.isNotEmpty(attr.targetAttr()))
{
propertyName = field.getName() + "." + attr.targetAttr();
}
else if (StringUtils.isNotEmpty(attr.readConverterExp()))
else if (StringPlusUtils.isNotEmpty(attr.readConverterExp()))
{
val = reverseByExp(Convert.toStr(val), attr.readConverterExp(), attr.separator());
}
else if (StringUtils.isNotEmpty(attr.dictType()))
else if (StringPlusUtils.isNotEmpty(attr.dictType()))
{
val = reverseDictByExp(Convert.toStr(val), attr.dictType(), attr.separator());
}
@ -322,7 +322,7 @@ public class ExcelUtil<T>
/**
* listexcel
*
*
* @param list
* @param sheetName
* @return
@ -335,7 +335,7 @@ public class ExcelUtil<T>
/**
* listexcel
*
*
* @param sheetName
* @return
*/
@ -347,7 +347,7 @@ public class ExcelUtil<T>
/**
* listexcel
*
*
* @return
*/
public AjaxResult exportExcel()
@ -415,7 +415,7 @@ public class ExcelUtil<T>
/**
* excel
*
*
* @param index
* @param row
*/
@ -442,7 +442,7 @@ public class ExcelUtil<T>
/**
*
*
*
* @param wb
* @return
*/
@ -480,7 +480,7 @@ public class ExcelUtil<T>
headerFont.setColor(IndexedColors.WHITE.getIndex());
style.setFont(headerFont);
styles.put("header", style);
style = wb.createCellStyle();
style.setAlignment(HorizontalAlignment.CENTER);
style.setVerticalAlignment(VerticalAlignment.CENTER);
@ -524,7 +524,7 @@ public class ExcelUtil<T>
/**
*
*
*
* @param value
* @param attr
* @param cell
@ -533,18 +533,18 @@ public class ExcelUtil<T>
{
if (ColumnType.STRING == attr.cellType())
{
cell.setCellValue(StringUtils.isNull(value) ? attr.defaultValue() : value + attr.suffix());
cell.setCellValue(StringPlusUtils.isNull(value) ? attr.defaultValue() : value + attr.suffix());
}
else if (ColumnType.NUMERIC == attr.cellType())
{
cell.setCellValue(StringUtils.contains(Convert.toStr(value), ".") ? Convert.toDouble(value) : Convert.toInt(value));
cell.setCellValue(StringPlusUtils.contains(Convert.toStr(value), ".") ? Convert.toDouble(value) : Convert.toInt(value));
}
else if (ColumnType.IMAGE == attr.cellType())
{
ClientAnchor anchor = new XSSFClientAnchor(0, 0, 0, 0, (short) cell.getColumnIndex(), cell.getRow().getRowNum(), (short) (cell.getColumnIndex() + 1),
cell.getRow().getRowNum() + 1);
String imagePath = Convert.toStr(value);
if (StringUtils.isNotEmpty(imagePath))
if (StringPlusUtils.isNotEmpty(imagePath))
{
byte[] data = ImageUtils.getImage(imagePath);
getDrawingPatriarch(cell.getSheet()).createPicture(anchor,
@ -552,7 +552,7 @@ public class ExcelUtil<T>
}
}
}
/**
*
*/
@ -597,7 +597,7 @@ public class ExcelUtil<T>
sheet.setColumnWidth(column, (int) ((attr.width() + 0.72) * 256));
}
// 如果设置了提示信息则鼠标放上去提示.
if (StringUtils.isNotEmpty(attr.prompt()))
if (StringPlusUtils.isNotEmpty(attr.prompt()))
{
// 这里默认设了2-101列提示.
setXSSFPrompt(sheet, "", attr.prompt(), 1, 100, column, column);
@ -634,15 +634,15 @@ public class ExcelUtil<T>
String readConverterExp = attr.readConverterExp();
String separator = attr.separator();
String dictType = attr.dictType();
if (StringUtils.isNotEmpty(dateFormat) && StringUtils.isNotNull(value))
if (StringPlusUtils.isNotEmpty(dateFormat) && StringPlusUtils.isNotNull(value))
{
cell.setCellValue(DateUtils.parseDateToStr(dateFormat, (Date) value));
}
else if (StringUtils.isNotEmpty(readConverterExp) && StringUtils.isNotNull(value))
else if (StringPlusUtils.isNotEmpty(readConverterExp) && StringPlusUtils.isNotNull(value))
{
cell.setCellValue(convertByExp(Convert.toStr(value), readConverterExp, separator));
}
else if (StringUtils.isNotEmpty(dictType) && StringUtils.isNotNull(value))
else if (StringPlusUtils.isNotEmpty(dictType) && StringPlusUtils.isNotNull(value))
{
cell.setCellValue(convertDictByExp(Convert.toStr(value), dictType, separator));
}
@ -667,7 +667,7 @@ public class ExcelUtil<T>
/**
* POI XSSFSheet
*
*
* @param sheet
* @param promptTitle
* @param promptContent
@ -690,7 +690,7 @@ public class ExcelUtil<T>
/**
* ,.
*
*
* @param sheet sheet.
* @param textlist
* @param firstRow
@ -724,7 +724,7 @@ public class ExcelUtil<T>
/**
* 0=,1=,2=
*
*
* @param propertyValue
* @param converterExp
* @param separator
@ -737,7 +737,7 @@ public class ExcelUtil<T>
for (String item : convertSource)
{
String[] itemArray = item.split("=");
if (StringUtils.containsAny(separator, propertyValue))
if (StringPlusUtils.containsAny(separator, propertyValue))
{
for (String value : propertyValue.split(separator))
{
@ -756,12 +756,12 @@ public class ExcelUtil<T>
}
}
}
return StringUtils.stripEnd(propertyString.toString(), separator);
return StringPlusUtils.stripEnd(propertyString.toString(), separator);
}
/**
* =0,=1,=2
*
*
* @param propertyValue
* @param converterExp
* @param separator
@ -774,7 +774,7 @@ public class ExcelUtil<T>
for (String item : convertSource)
{
String[] itemArray = item.split("=");
if (StringUtils.containsAny(separator, propertyValue))
if (StringPlusUtils.containsAny(separator, propertyValue))
{
for (String value : propertyValue.split(separator))
{
@ -793,12 +793,12 @@ public class ExcelUtil<T>
}
}
}
return StringUtils.stripEnd(propertyString.toString(), separator);
return StringPlusUtils.stripEnd(propertyString.toString(), separator);
}
/**
*
*
*
* @param dictValue
* @param dictType
* @param separator
@ -811,7 +811,7 @@ public class ExcelUtil<T>
/**
*
*
*
* @param dictLabel
* @param dictType
* @param separator
@ -821,7 +821,7 @@ public class ExcelUtil<T>
{
return DictUtils.getDictValue(dictType, dictLabel, separator);
}
/**
*
*/
@ -858,7 +858,7 @@ public class ExcelUtil<T>
cell = row.createCell(0);
cell.setCellStyle(styles.get("total"));
cell.setCellValue("合计");
for (Integer key : keys)
{
cell = row.createCell(key);
@ -880,7 +880,7 @@ public class ExcelUtil<T>
/**
*
*
*
* @param filename
*/
public String getAbsoluteFile(String filename)
@ -896,7 +896,7 @@ public class ExcelUtil<T>
/**
* bean
*
*
* @param vo
* @param field
* @param excel
@ -906,7 +906,7 @@ public class ExcelUtil<T>
private Object getTargetValue(T vo, Field field, Excel excel) throws Exception
{
Object o = field.get(vo);
if (StringUtils.isNotEmpty(excel.targetAttr()))
if (StringPlusUtils.isNotEmpty(excel.targetAttr()))
{
String target = excel.targetAttr();
if (target.indexOf(".") > -1)
@ -927,7 +927,7 @@ public class ExcelUtil<T>
/**
* get
*
*
* @param o
* @param name
* @return value
@ -935,7 +935,7 @@ public class ExcelUtil<T>
*/
private Object getValue(Object o, String name) throws Exception
{
if (StringUtils.isNotNull(o) && StringUtils.isNotEmpty(name))
if (StringPlusUtils.isNotNull(o) && StringPlusUtils.isNotEmpty(name))
{
Class<?> clazz = o.getClass();
Field field = clazz.getDeclaredField(name);
@ -976,7 +976,7 @@ public class ExcelUtil<T>
this.fields = this.fields.stream().sorted(Comparator.comparing(objects -> ((Excel) objects[1]).sort())).collect(Collectors.toList());
this.maxHeight = getRowHeight();
}
/**
*
*/
@ -1012,7 +1012,7 @@ public class ExcelUtil<T>
/**
*
*
*
* @param sheetNo sheet
* @param index
*/
@ -1033,7 +1033,7 @@ public class ExcelUtil<T>
/**
*
*
*
* @param row
* @param column
* @return
@ -1048,7 +1048,7 @@ public class ExcelUtil<T>
try
{
Cell cell = row.getCell(column);
if (StringUtils.isNotNull(cell))
if (StringPlusUtils.isNotNull(cell))
{
if (cell.getCellType() == CellType.NUMERIC || cell.getCellType() == CellType.FORMULA)
{
@ -1090,4 +1090,4 @@ public class ExcelUtil<T>
}
return val;
}
}
}

@ -8,15 +8,15 @@ import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.stereotype.Component;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
/**
* spring 便springbean
*
*
* @author ruoyi
*/
@Component
public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationContextAware
public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationContextAware
{
/** Spring应用上下文环境 */
private static ConfigurableListableBeanFactory beanFactory;
@ -24,13 +24,13 @@ public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationC
private static ApplicationContext applicationContext;
@Override
public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException
public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException
{
SpringUtils.beanFactory = beanFactory;
}
@Override
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException
{
SpringUtils.applicationContext = applicationContext;
}
@ -113,7 +113,7 @@ public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationC
/**
* aop
*
*
* @param invoker
* @return
*/
@ -141,6 +141,6 @@ public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationC
public static String getActiveProfile()
{
final String[] activeProfiles = getActiveProfiles();
return StringUtils.isNotEmpty(activeProfiles) ? activeProfiles[0] : null;
return StringPlusUtils.isNotEmpty(activeProfiles) ? activeProfiles[0] : null;
}
}

@ -1,11 +1,11 @@
package com.ruoyi.common.utils.sql;
import com.ruoyi.common.exception.BaseException;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
/**
* sql
*
*
* @author ruoyi
*/
public class SqlUtil
@ -20,7 +20,7 @@ public class SqlUtil
*/
public static String escapeOrderBySql(String value)
{
if (StringUtils.isNotEmpty(value) && !isValidOrderBySql(value))
if (StringPlusUtils.isNotEmpty(value) && !isValidOrderBySql(value))
{
throw new BaseException("参数不符合规范,不能进行查询");
}

@ -4,6 +4,7 @@ import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.util.ZipUtil;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.StringPlusUtils;
import com.ruoyi.system.domain.SysAttachment;
import com.ruoyi.system.service.ISysAttachmentService;
import org.apache.commons.collections4.CollectionUtils;
@ -47,7 +48,7 @@ public class SysAttachmentController {
return AjaxResult.error("该流程无附件!");
}
Object attachmentIds = runtimeService.getVariable(execution.getId(), "attachmentIds");
if (StrUtil.isEmptyIfStr(attachmentIds)) {
if (StrUtil.isEmptyIfStr(attachmentIds) || StringPlusUtils.isEmptyArray(attachmentIds.toString())) {
return AjaxResult.error("该流程无附件!");
}
List<Long> ids = StrUtil.split(attachmentIds.toString(), ',', -1, true, Long::parseLong);
@ -67,7 +68,7 @@ public class SysAttachmentController {
response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
response.setContentType("application/octet-stream");
String downloadFileName = processInstanceId + "-" + "attachment.zip";
response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename="+downloadFileName);
response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "filename="+downloadFileName);
ZipUtil.zip(response.getOutputStream(), ArrayUtil.toArray(fileNames, String.class), ArrayUtil.toArray(fileInputStreams, FileInputStream.class));
return null;
}

@ -14,6 +14,7 @@ import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.exception.CustomException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringPlusUtils;
import com.ruoyi.flowable.common.constant.ProcessConstants;
import com.ruoyi.flowable.common.enums.FlowComment;
import com.ruoyi.flowable.common.enums.FlowStatus;
@ -263,6 +264,10 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
if (taskService.createTaskQuery().taskId(flowTaskVo.getTaskId()).singleResult().isSuspended()) {
throw new CustomException("任务处于挂起状态");
}
// 分配task给当前退回用户用于用户行为留痕
Long userId = SecurityUtils.getLoginUser().getUser().getUserId();
taskService.setAssignee(flowTaskVo.getTaskId(), userId.toString());
// 当前任务 task
Task task = taskService.createTaskQuery().taskId(flowTaskVo.getTaskId()).singleResult();
// 获取流程定义信息
@ -327,6 +332,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
} catch (FlowableException e) {
throw new CustomException("无法取消或开始活动");
}
runtimeService.updateBusinessStatus(flowTaskVo.getInstanceId(), FlowStatus.REJECT.getValue());
}
@ -840,7 +846,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
String attachmentIdsStr = MapUtils.getString(variables, ATTACHMENT_IDS_VARIABLE_KEY);
// get AttachmentIds
if (!variables.containsKey(ATTACHMENT_IDS_VARIABLE_KEY) || StringUtils.isBlank(attachmentIdsStr) || StrUtil.equals("[]",attachmentIdsStr)) {
if (!variables.containsKey(ATTACHMENT_IDS_VARIABLE_KEY) || StringUtils.isBlank(attachmentIdsStr) || StringPlusUtils.isEmptyArray(attachmentIdsStr)) {
return result;
}
// get Attachment info

@ -2,7 +2,7 @@ package com.ruoyi.flowable.survey;
import java.util.List;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
import com.ruoyi.system.domain.survey.SurveyPaper;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
@ -24,7 +24,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
/**
* Controller
*
*
* @author 2y
* @date 2021-03-21
*/
@ -67,7 +67,7 @@ public class SurveyPaperController extends BaseController
@GetMapping(value = { "/", "/{id}" })
public AjaxResult getInfo(@PathVariable(value = "id", required = false) Long id)
{
if (StringUtils.isNull(id)) {
if (StringPlusUtils.isNull(id)) {
return AjaxResult.success(surveyPaperService.selectPaperAll());
}
return AjaxResult.success(surveyPaperService.selectSurveyPaperById(id));

@ -3,18 +3,18 @@ package com.ruoyi.flyingbook.service.impl;
import java.util.List;
import com.ruoyi.common.enums.FlagStatus;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.flyingbook.domain.LarkCompanyRelation;
import com.ruoyi.flyingbook.mapper.LarkCompanyRelationMapper;
import com.ruoyi.flyingbook.service.ILarkCompanyRelationService;
import com.ruoyi.common.utils.DateUtils;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
* Service
*
*
* @author ruoyi
* @date 2023-03-12
*/
@ -26,7 +26,7 @@ public class LarkCompanyRelationServiceImpl implements ILarkCompanyRelationServi
/**
*
*
*
* @param id ID
* @return
*/
@ -38,7 +38,7 @@ public class LarkCompanyRelationServiceImpl implements ILarkCompanyRelationServi
/**
*
*
*
* @param larkCompanyRelation
* @return
*/
@ -50,7 +50,7 @@ public class LarkCompanyRelationServiceImpl implements ILarkCompanyRelationServi
/**
*
*
*
* @param larkCompanyRelation
* @return
*/
@ -63,7 +63,7 @@ public class LarkCompanyRelationServiceImpl implements ILarkCompanyRelationServi
/**
*
*
*
* @param larkCompanyRelation
* @return
*/
@ -76,7 +76,7 @@ public class LarkCompanyRelationServiceImpl implements ILarkCompanyRelationServi
/**
*
*
*
* @param ids ID
* @return
*/
@ -88,7 +88,7 @@ public class LarkCompanyRelationServiceImpl implements ILarkCompanyRelationServi
/**
*
*
*
* @param id ID
* @return
*/

@ -3,7 +3,6 @@ package com.ruoyi.flyingbook.service.impl;
import java.util.ArrayList;
import java.util.List;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.flyingbook.domain.LarkTableRelation;
import com.ruoyi.flyingbook.mapper.LarkTableRelationMapper;
import com.ruoyi.flyingbook.service.ILarkTableRelationService;
@ -13,7 +12,7 @@ import org.springframework.stereotype.Service;
/**
* Service
*
*
* @author ruoyi
* @date 2023-03-12
*/
@ -25,7 +24,7 @@ public class LarkTableRelationServiceImpl implements ILarkTableRelationService
/**
*
*
*
* @param id ID
* @return
*/
@ -37,7 +36,7 @@ public class LarkTableRelationServiceImpl implements ILarkTableRelationService
/**
*
*
*
* @param larkTableRelation
* @return
*/
@ -49,7 +48,7 @@ public class LarkTableRelationServiceImpl implements ILarkTableRelationService
/**
*
*
*
* @param larkTableRelation
* @return
*/
@ -62,7 +61,7 @@ public class LarkTableRelationServiceImpl implements ILarkTableRelationService
/**
*
*
*
* @param larkTableRelation
* @return
*/
@ -75,7 +74,7 @@ public class LarkTableRelationServiceImpl implements ILarkTableRelationService
/**
*
*
*
* @param ids ID
* @return
*/
@ -87,7 +86,7 @@ public class LarkTableRelationServiceImpl implements ILarkTableRelationService
/**
*
*
*
* @param id ID
* @return
*/

@ -14,7 +14,7 @@ import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.framework.web.service.TokenService;
@ -79,11 +79,11 @@ public class DataScopeAspect
}
// 获取当前的用户
LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
if (StringUtils.isNotNull(loginUser))
if (StringPlusUtils.isNotNull(loginUser))
{
SysUser currentUser = loginUser.getUser();
// 如果是超级管理员,则不过滤数据
if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin())
if (StringPlusUtils.isNotNull(currentUser) && !currentUser.isAdmin())
{
dataScopeFilter(joinPoint, currentUser, controllerDataScope.deptAlias(),
controllerDataScope.userAlias());
@ -112,25 +112,25 @@ public class DataScopeAspect
}
else if (DATA_SCOPE_CUSTOM.equals(dataScope))
{
sqlString.append(StringUtils.format(
sqlString.append(StringPlusUtils.format(
" OR {}.dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id = {} ) ", deptAlias,
role.getRoleId()));
}
else if (DATA_SCOPE_DEPT.equals(dataScope))
{
sqlString.append(StringUtils.format(" OR {}.dept_id = {} ", deptAlias, user.getDeptId()));
sqlString.append(StringPlusUtils.format(" OR {}.dept_id = {} ", deptAlias, user.getDeptId()));
}
else if (DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope))
{
sqlString.append(StringUtils.format(
sqlString.append(StringPlusUtils.format(
" OR {}.dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) )",
deptAlias, user.getDeptId(), user.getDeptId()));
}
else if (DATA_SCOPE_SELF.equals(dataScope))
{
if (StringUtils.isNotBlank(userAlias))
if (StringPlusUtils.isNotBlank(userAlias))
{
sqlString.append(StringUtils.format(" OR {}.user_id = {} ", userAlias, user.getUserId()));
sqlString.append(StringPlusUtils.format(" OR {}.user_id = {} ", userAlias, user.getUserId()));
}
else
{
@ -140,10 +140,10 @@ public class DataScopeAspect
}
}
if (StringUtils.isNotBlank(sqlString.toString()))
if (StringPlusUtils.isNotBlank(sqlString.toString()))
{
Object params = joinPoint.getArgs()[0];
if (StringUtils.isNotNull(params) && params instanceof BaseEntity)
if (StringPlusUtils.isNotNull(params) && params instanceof BaseEntity)
{
BaseEntity baseEntity = (BaseEntity) params;
baseEntity.getParams().put(DATA_SCOPE, " AND (" + sqlString.substring(4) + ")");

@ -12,12 +12,12 @@ import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
import com.ruoyi.common.annotation.DataSource;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
import com.ruoyi.framework.datasource.DynamicDataSourceContextHolder;
/**
*
*
*
* @author ruoyi
*/
@Aspect
@ -39,7 +39,7 @@ public class DataSourceAspect
{
DataSource dataSource = getDataSource(point);
if (StringUtils.isNotNull(dataSource))
if (StringPlusUtils.isNotNull(dataSource))
{
DynamicDataSourceContextHolder.setDataSourceType(dataSource.value().name());
}

@ -24,7 +24,7 @@ import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.enums.BusinessStatus;
import com.ruoyi.common.enums.HttpMethod;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
import com.ruoyi.common.utils.ip.IpUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.framework.manager.AsyncManager;
@ -34,7 +34,7 @@ import com.ruoyi.system.domain.SysOperLog;
/**
*
*
*
* @author ruoyi
*/
@Aspect
@ -62,7 +62,7 @@ public class LogAspect
/**
*
*
*
* @param joinPoint
* @param e
*/
@ -104,7 +104,7 @@ public class LogAspect
if (e != null)
{
operLog.setStatus(BusinessStatus.FAIL.ordinal());
operLog.setErrorMsg(StringUtils.substring(e.getMessage(), 0, 2000));
operLog.setErrorMsg(StringPlusUtils.substring(e.getMessage(), 0, 2000));
}
// 设置方法名称
String className = joinPoint.getTarget().getClass().getName();
@ -128,7 +128,7 @@ public class LogAspect
/**
* Controller
*
*
* @param log
* @param operLog
* @throws Exception
@ -151,7 +151,7 @@ public class LogAspect
/**
* log
*
*
* @param operLog
* @throws Exception
*/
@ -161,12 +161,12 @@ public class LogAspect
if (HttpMethod.PUT.name().equals(requestMethod) || HttpMethod.POST.name().equals(requestMethod))
{
String params = argsArrayToString(joinPoint.getArgs());
operLog.setOperParam(StringUtils.substring(params, 0, 2000));
operLog.setOperParam(StringPlusUtils.substring(params, 0, 2000));
}
else
{
Map<?, ?> paramsMap = (Map<?, ?>) ServletUtils.getRequest().getAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE);
operLog.setOperParam(StringUtils.substring(paramsMap.toString(), 0, 2000));
operLog.setOperParam(StringPlusUtils.substring(paramsMap.toString(), 0, 2000));
}
}
@ -208,7 +208,7 @@ public class LogAspect
/**
*
*
*
* @param o
* @return truefalse
*/

@ -9,7 +9,7 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import com.ruoyi.common.filter.RepeatableFilter;
import com.ruoyi.common.filter.XssFilter;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
/**
* Filter
@ -35,7 +35,7 @@ public class FilterConfig
FilterRegistrationBean registration = new FilterRegistrationBean();
registration.setDispatcherTypes(DispatcherType.REQUEST);
registration.setFilter(new XssFilter());
registration.addUrlPatterns(StringUtils.split(urlPatterns, ","));
registration.addUrlPatterns(StringPlusUtils.split(urlPatterns, ","));
registration.setName("xssFilter");
registration.setOrder(FilterRegistrationBean.HIGHEST_PRECEDENCE);
Map<String, String> initParameters = new HashMap<String, String>();

@ -22,11 +22,11 @@ import org.springframework.core.type.classreading.CachingMetadataReaderFactory;
import org.springframework.core.type.classreading.MetadataReader;
import org.springframework.core.type.classreading.MetadataReaderFactory;
import org.springframework.util.ClassUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
/**
* Mybatis*
*
*
* @author ruoyi
*/
@Configuration
@ -125,8 +125,8 @@ public class MyBatisConfig
final SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean();
sessionFactory.setDataSource(dataSource);
sessionFactory.setTypeAliasesPackage(typeAliasesPackage);
sessionFactory.setMapperLocations(resolveMapperLocations(StringUtils.split(mapperLocations, ",")));
sessionFactory.setMapperLocations(resolveMapperLocations(StringPlusUtils.split(mapperLocations, ",")));
sessionFactory.setConfigLocation(new DefaultResourceLoader().getResource(configLocation));
return sessionFactory.getObject();
}
}
}

@ -11,14 +11,14 @@ import com.alibaba.fastjson.JSONObject;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.filter.RepeatedlyRequestWrapper;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
import com.ruoyi.common.utils.http.HttpHelper;
import com.ruoyi.framework.interceptor.RepeatSubmitInterceptor;
/**
* url
* 10
*
*
* @author ruoyi
*/
@Component
@ -37,7 +37,7 @@ public class SameUrlDataInterceptor extends RepeatSubmitInterceptor
/**
* : 10
*
*
*
*/
private int intervalTime = 10;
@ -59,7 +59,7 @@ public class SameUrlDataInterceptor extends RepeatSubmitInterceptor
}
// body参数为空获取Parameter的数据
if (StringUtils.isEmpty(nowParams))
if (StringPlusUtils.isEmpty(nowParams))
{
nowParams = JSONObject.toJSONString(request.getParameterMap());
}
@ -72,7 +72,7 @@ public class SameUrlDataInterceptor extends RepeatSubmitInterceptor
// 唯一值(没有消息头则使用请求地址)
String submitKey = request.getHeader(header);
if (StringUtils.isEmpty(submitKey))
if (StringPlusUtils.isEmpty(submitKey))
{
submitKey = url;
}

@ -13,12 +13,12 @@ import org.springframework.stereotype.Component;
import org.springframework.web.filter.OncePerRequestFilter;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
import com.ruoyi.framework.web.service.TokenService;
/**
* token token
*
*
* @author ruoyi
*/
@Component
@ -32,7 +32,7 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter
throws ServletException, IOException
{
LoginUser loginUser = tokenService.getLoginUser(request);
if (StringUtils.isNotNull(loginUser) && StringUtils.isNull(SecurityUtils.getAuthentication()))
if (StringPlusUtils.isNotNull(loginUser) && StringPlusUtils.isNull(SecurityUtils.getAuthentication()))
{
tokenService.verifyToken(loginUser);
UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(loginUser, null, loginUser.getAuthorities());

@ -11,11 +11,11 @@ import com.alibaba.fastjson.JSON;
import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
/**
*
*
*
* @author ruoyi
*/
@Component
@ -28,7 +28,7 @@ public class AuthenticationEntryPointImpl implements AuthenticationEntryPoint, S
throws IOException
{
int code = HttpStatus.UNAUTHORIZED;
String msg = StringUtils.format("请求访问:{},认证失败,无法访问系统资源", request.getRequestURI());
String msg = StringPlusUtils.format("请求访问:{},认证失败,无法访问系统资源", request.getRequestURI());
ServletUtils.renderString(response, JSON.toJSONString(AjaxResult.error(code, msg)));
}
}

@ -14,14 +14,14 @@ import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
import com.ruoyi.framework.manager.AsyncManager;
import com.ruoyi.framework.manager.factory.AsyncFactory;
import com.ruoyi.framework.web.service.TokenService;
/**
* 退
*
*
* @author ruoyi
*/
@Configuration
@ -32,7 +32,7 @@ public class LogoutSuccessHandlerImpl implements LogoutSuccessHandler
/**
* 退
*
*
* @return
*/
@Override
@ -40,7 +40,7 @@ public class LogoutSuccessHandlerImpl implements LogoutSuccessHandler
throws IOException, ServletException
{
LoginUser loginUser = tokenService.getLoginUser(request);
if (StringUtils.isNotNull(loginUser))
if (StringPlusUtils.isNotNull(loginUser))
{
String userName = loginUser.getUsername();
// 删除用户缓存记录

@ -15,11 +15,11 @@ import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.exception.BaseException;
import com.ruoyi.common.exception.CustomException;
import com.ruoyi.common.exception.DemoModeException;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
/**
*
*
*
* @author ruoyi
*/
@RestControllerAdvice
@ -42,7 +42,7 @@ public class GlobalExceptionHandler
@ExceptionHandler(CustomException.class)
public AjaxResult businessException(CustomException e)
{
if (StringUtils.isNull(e.getCode()))
if (StringPlusUtils.isNull(e.getCode()))
{
return AjaxResult.error(e.getMessage());
}

@ -7,11 +7,11 @@ import org.springframework.util.CollectionUtils;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
/**
* RuoYi ssSpringSecurity
*
*
* @author ruoyi
*/
@Service("ss")
@ -32,18 +32,18 @@ public class PermissionService
/**
*
*
*
* @param permission
* @return
*/
public boolean hasPermi(String permission)
{
if (StringUtils.isEmpty(permission))
if (StringPlusUtils.isEmpty(permission))
{
return false;
}
LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getPermissions()))
if (StringPlusUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getPermissions()))
{
return false;
}
@ -69,12 +69,12 @@ public class PermissionService
*/
public boolean hasAnyPermi(String permissions)
{
if (StringUtils.isEmpty(permissions))
if (StringPlusUtils.isEmpty(permissions))
{
return false;
}
LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getPermissions()))
if (StringPlusUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getPermissions()))
{
return false;
}
@ -91,25 +91,25 @@ public class PermissionService
/**
*
*
*
* @param role
* @return
*/
public boolean hasRole(String role)
{
if (StringUtils.isEmpty(role))
if (StringPlusUtils.isEmpty(role))
{
return false;
}
LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getUser().getRoles()))
if (StringPlusUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getUser().getRoles()))
{
return false;
}
for (SysRole sysRole : loginUser.getUser().getRoles())
{
String roleKey = sysRole.getRoleKey();
if (SUPER_ADMIN.equals(roleKey) || roleKey.equals(StringUtils.trim(role)))
if (SUPER_ADMIN.equals(roleKey) || roleKey.equals(StringPlusUtils.trim(role)))
{
return true;
}
@ -136,12 +136,12 @@ public class PermissionService
*/
public boolean hasAnyRoles(String roles)
{
if (StringUtils.isEmpty(roles))
if (StringPlusUtils.isEmpty(roles))
{
return false;
}
LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getUser().getRoles()))
if (StringPlusUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getUser().getRoles()))
{
return false;
}
@ -157,13 +157,13 @@ public class PermissionService
/**
*
*
*
* @param permissions
* @param permission
* @return
*/
private boolean hasPermissions(Set<String> permissions, String permission)
{
return permissions.contains(ALL_PERMISSION) || permissions.contains(StringUtils.trim(permission));
return permissions.contains(ALL_PERMISSION) || permissions.contains(StringPlusUtils.trim(permission));
}
}

@ -11,7 +11,7 @@ import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
import com.ruoyi.common.utils.ip.AddressUtils;
import com.ruoyi.common.utils.ip.IpUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
@ -58,7 +58,7 @@ public class TokenService
{
// 获取请求携带的令牌
String token = getToken(request);
if (StringUtils.isNotEmpty(token))
if (StringPlusUtils.isNotEmpty(token))
{
Claims claims = parseToken(token);
// 解析对应的权限以及用户信息
@ -78,7 +78,7 @@ public class TokenService
{
// 获取请求携带的令牌
String token = getToken(request);
if (StringUtils.isNotEmpty(token))
if (StringPlusUtils.isNotEmpty(token))
{
Claims claims = parseToken(token);
// 解析对应的权限以及用户信息
@ -95,7 +95,7 @@ public class TokenService
*/
public void setLoginUser(LoginUser loginUser)
{
if (StringUtils.isNotNull(loginUser) && StringUtils.isNotEmpty(loginUser.getToken()))
if (StringPlusUtils.isNotNull(loginUser) && StringPlusUtils.isNotEmpty(loginUser.getToken()))
{
refreshToken(loginUser);
}
@ -106,7 +106,7 @@ public class TokenService
*/
public void delLoginUser(String token)
{
if (StringUtils.isNotEmpty(token))
if (StringPlusUtils.isNotEmpty(token))
{
String userKey = getTokenKey(token);
redisCache.deleteObject(userKey);
@ -225,7 +225,7 @@ public class TokenService
private String getToken(HttpServletRequest request)
{
String token = request.getHeader(header);
if (StringUtils.isNotEmpty(token) && token.startsWith(Constants.TOKEN_PREFIX))
if (StringPlusUtils.isNotEmpty(token) && token.startsWith(Constants.TOKEN_PREFIX))
{
token = token.replace(Constants.TOKEN_PREFIX, "");
}

@ -11,7 +11,7 @@ import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.enums.UserStatus;
import com.ruoyi.common.exception.BaseException;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
import com.ruoyi.system.service.ISysUserService;
/**
@ -34,7 +34,7 @@ public class UserDetailsServiceImpl implements UserDetailsService
public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException
{
SysUser user = userService.selectUserByUserName(username);
if (StringUtils.isNull(user))
if (StringPlusUtils.isNull(user))
{
log.info("登录用户:{} 不存在.", username);
throw new UsernameNotFoundException("登录用户:" + username + " 不存在");

@ -6,11 +6,11 @@ import javax.validation.constraints.NotBlank;
import org.apache.commons.lang3.ArrayUtils;
import com.ruoyi.common.constant.GenConstants;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
/**
* gen_table
*
*
* @author ruoyi
*/
public class GenTable extends BaseEntity
@ -332,7 +332,7 @@ public class GenTable extends BaseEntity
public static boolean isSub(String tplCategory)
{
return tplCategory != null && StringUtils.equals(GenConstants.TPL_SUB, tplCategory);
return tplCategory != null && StringPlusUtils.equals(GenConstants.TPL_SUB, tplCategory);
}
public boolean isTree()
@ -342,7 +342,7 @@ public class GenTable extends BaseEntity
public static boolean isTree(String tplCategory)
{
return tplCategory != null && StringUtils.equals(GenConstants.TPL_TREE, tplCategory);
return tplCategory != null && StringPlusUtils.equals(GenConstants.TPL_TREE, tplCategory);
}
public boolean isCrud()
@ -352,7 +352,7 @@ public class GenTable extends BaseEntity
public static boolean isCrud(String tplCategory)
{
return tplCategory != null && StringUtils.equals(GenConstants.TPL_CRUD, tplCategory);
return tplCategory != null && StringPlusUtils.equals(GenConstants.TPL_CRUD, tplCategory);
}
public boolean isSuperColumn(String javaField)
@ -364,9 +364,9 @@ public class GenTable extends BaseEntity
{
if (isTree(tplCategory))
{
return StringUtils.equalsAnyIgnoreCase(javaField,
return StringPlusUtils.equalsAnyIgnoreCase(javaField,
ArrayUtils.addAll(GenConstants.TREE_ENTITY, GenConstants.BASE_ENTITY));
}
return StringUtils.equalsAnyIgnoreCase(javaField, GenConstants.BASE_ENTITY);
return StringPlusUtils.equalsAnyIgnoreCase(javaField, GenConstants.BASE_ENTITY);
}
}
}

@ -2,11 +2,11 @@ package com.ruoyi.generator.domain;
import javax.validation.constraints.NotBlank;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
/**
* gen_table_column
*
*
* @author ruoyi
*/
public class GenTableColumn extends BaseEntity
@ -140,7 +140,7 @@ public class GenTableColumn extends BaseEntity
public String getCapJavaField()
{
return StringUtils.capitalize(javaField);
return StringPlusUtils.capitalize(javaField);
}
public void setIsPk(String isPk)
@ -160,7 +160,7 @@ public class GenTableColumn extends BaseEntity
public boolean isPk(String isPk)
{
return isPk != null && StringUtils.equals("1", isPk);
return isPk != null && StringPlusUtils.equals("1", isPk);
}
public String getIsIncrement()
@ -180,7 +180,7 @@ public class GenTableColumn extends BaseEntity
public boolean isIncrement(String isIncrement)
{
return isIncrement != null && StringUtils.equals("1", isIncrement);
return isIncrement != null && StringPlusUtils.equals("1", isIncrement);
}
public void setIsRequired(String isRequired)
@ -200,7 +200,7 @@ public class GenTableColumn extends BaseEntity
public boolean isRequired(String isRequired)
{
return isRequired != null && StringUtils.equals("1", isRequired);
return isRequired != null && StringPlusUtils.equals("1", isRequired);
}
public void setIsInsert(String isInsert)
@ -220,7 +220,7 @@ public class GenTableColumn extends BaseEntity
public boolean isInsert(String isInsert)
{
return isInsert != null && StringUtils.equals("1", isInsert);
return isInsert != null && StringPlusUtils.equals("1", isInsert);
}
public void setIsEdit(String isEdit)
@ -240,7 +240,7 @@ public class GenTableColumn extends BaseEntity
public boolean isEdit(String isEdit)
{
return isEdit != null && StringUtils.equals("1", isEdit);
return isEdit != null && StringPlusUtils.equals("1", isEdit);
}
public void setIsList(String isList)
@ -260,7 +260,7 @@ public class GenTableColumn extends BaseEntity
public boolean isList(String isList)
{
return isList != null && StringUtils.equals("1", isList);
return isList != null && StringPlusUtils.equals("1", isList);
}
public void setIsQuery(String isQuery)
@ -280,7 +280,7 @@ public class GenTableColumn extends BaseEntity
public boolean isQuery(String isQuery)
{
return isQuery != null && StringUtils.equals("1", isQuery);
return isQuery != null && StringPlusUtils.equals("1", isQuery);
}
public void setQueryType(String queryType)
@ -330,7 +330,7 @@ public class GenTableColumn extends BaseEntity
public static boolean isSuperColumn(String javaField)
{
return StringUtils.equalsAnyIgnoreCase(javaField,
return StringPlusUtils.equalsAnyIgnoreCase(javaField,
// BaseEntity
"createBy", "createTime", "updateBy", "updateTime", "remark",
// TreeEntity
@ -345,18 +345,18 @@ public class GenTableColumn extends BaseEntity
public static boolean isUsableColumn(String javaField)
{
// isSuperColumn()中的名单用于避免生成多余Domain属性若某些属性在生成页面时需要用到不能忽略则放在此处白名单
return StringUtils.equalsAnyIgnoreCase(javaField, "parentId", "orderNum", "remark");
return StringPlusUtils.equalsAnyIgnoreCase(javaField, "parentId", "orderNum", "remark");
}
public String readConverterExp()
{
String remarks = StringUtils.substringBetween(this.columnComment, "", "");
String remarks = StringPlusUtils.substringBetween(this.columnComment, "", "");
StringBuffer sb = new StringBuffer();
if (StringUtils.isNotEmpty(remarks))
if (StringPlusUtils.isNotEmpty(remarks))
{
for (String value : remarks.split(" "))
{
if (StringUtils.isNotEmpty(value))
if (StringPlusUtils.isNotEmpty(value))
{
Object startStr = value.subSequence(0, 1);
String endStr = value.substring(1);

@ -26,7 +26,7 @@ import com.ruoyi.common.constant.GenConstants;
import com.ruoyi.common.core.text.CharsetKit;
import com.ruoyi.common.exception.CustomException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
import com.ruoyi.common.utils.file.FileUtils;
import com.ruoyi.generator.domain.GenTable;
import com.ruoyi.generator.domain.GenTableColumn;
@ -38,7 +38,7 @@ import com.ruoyi.generator.util.VelocityUtils;
/**
*
*
*
* @author ruoyi
*/
@Service
@ -54,7 +54,7 @@ public class GenTableServiceImpl implements IGenTableService
/**
*
*
*
* @param id ID
* @return
*/
@ -68,7 +68,7 @@ public class GenTableServiceImpl implements IGenTableService
/**
*
*
*
* @param genTable
* @return
*/
@ -80,7 +80,7 @@ public class GenTableServiceImpl implements IGenTableService
/**
*
*
*
* @param genTable
* @return
*/
@ -92,7 +92,7 @@ public class GenTableServiceImpl implements IGenTableService
/**
*
*
*
* @param tableNames
* @return
*/
@ -104,7 +104,7 @@ public class GenTableServiceImpl implements IGenTableService
/**
*
*
*
* @return
*/
@Override
@ -115,7 +115,7 @@ public class GenTableServiceImpl implements IGenTableService
/**
*
*
*
* @param genTable
* @return
*/
@ -137,7 +137,7 @@ public class GenTableServiceImpl implements IGenTableService
/**
*
*
*
* @param tableIds ID
* @return
*/
@ -151,7 +151,7 @@ public class GenTableServiceImpl implements IGenTableService
/**
*
*
*
* @param tableList
*/
@Override
@ -186,7 +186,7 @@ public class GenTableServiceImpl implements IGenTableService
/**
*
*
*
* @param tableId
* @return
*/
@ -219,7 +219,7 @@ public class GenTableServiceImpl implements IGenTableService
/**
*
*
*
* @param tableName
* @return
*/
@ -235,7 +235,7 @@ public class GenTableServiceImpl implements IGenTableService
/**
*
*
*
* @param tableName
*/
@Override
@ -256,7 +256,7 @@ public class GenTableServiceImpl implements IGenTableService
List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory());
for (String template : templates)
{
if (!StringUtils.containsAny(template, "sql.vm", "api.js.vm", "index.vue.vm", "index-tree.vue.vm"))
if (!StringPlusUtils.containsAny(template, "sql.vm", "api.js.vm", "index.vue.vm", "index-tree.vue.vm"))
{
// 渲染模板
StringWriter sw = new StringWriter();
@ -277,7 +277,7 @@ public class GenTableServiceImpl implements IGenTableService
/**
*
*
*
* @param tableName
*/
@Override
@ -289,7 +289,7 @@ public class GenTableServiceImpl implements IGenTableService
List<String> tableColumnNames = tableColumns.stream().map(GenTableColumn::getColumnName).collect(Collectors.toList());
List<GenTableColumn> dbTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName);
if (StringUtils.isEmpty(dbTableColumns))
if (StringPlusUtils.isEmpty(dbTableColumns))
{
throw new CustomException("同步数据失败,原表结构不存在");
}
@ -304,7 +304,7 @@ public class GenTableServiceImpl implements IGenTableService
});
List<GenTableColumn> delColumns = tableColumns.stream().filter(column -> !dbTableColumnNames.contains(column.getColumnName())).collect(Collectors.toList());
if (StringUtils.isNotEmpty(delColumns))
if (StringPlusUtils.isNotEmpty(delColumns))
{
genTableColumnMapper.deleteGenTableColumns(delColumns);
}
@ -312,7 +312,7 @@ public class GenTableServiceImpl implements IGenTableService
/**
*
*
*
* @param tableNames
* @return
*/
@ -371,7 +371,7 @@ public class GenTableServiceImpl implements IGenTableService
/**
*
*
*
* @param genTable
*/
@Override
@ -381,25 +381,25 @@ public class GenTableServiceImpl implements IGenTableService
{
String options = JSON.toJSONString(genTable.getParams());
JSONObject paramsObj = JSONObject.parseObject(options);
if (StringUtils.isEmpty(paramsObj.getString(GenConstants.TREE_CODE)))
if (StringPlusUtils.isEmpty(paramsObj.getString(GenConstants.TREE_CODE)))
{
throw new CustomException("树编码字段不能为空");
}
else if (StringUtils.isEmpty(paramsObj.getString(GenConstants.TREE_PARENT_CODE)))
else if (StringPlusUtils.isEmpty(paramsObj.getString(GenConstants.TREE_PARENT_CODE)))
{
throw new CustomException("树父编码字段不能为空");
}
else if (StringUtils.isEmpty(paramsObj.getString(GenConstants.TREE_NAME)))
else if (StringPlusUtils.isEmpty(paramsObj.getString(GenConstants.TREE_NAME)))
{
throw new CustomException("树名称字段不能为空");
}
else if (GenConstants.TPL_SUB.equals(genTable.getTplCategory()))
{
if (StringUtils.isEmpty(genTable.getSubTableName()))
if (StringPlusUtils.isEmpty(genTable.getSubTableName()))
{
throw new CustomException("关联子表的表名不能为空");
}
else if (StringUtils.isEmpty(genTable.getSubTableFkName()))
else if (StringPlusUtils.isEmpty(genTable.getSubTableFkName()))
{
throw new CustomException("子表关联的外键名不能为空");
}
@ -409,7 +409,7 @@ public class GenTableServiceImpl implements IGenTableService
/**
*
*
*
* @param table
*/
public void setPkColumn(GenTable table)
@ -422,7 +422,7 @@ public class GenTableServiceImpl implements IGenTableService
break;
}
}
if (StringUtils.isNull(table.getPkColumn()))
if (StringPlusUtils.isNull(table.getPkColumn()))
{
table.setPkColumn(table.getColumns().get(0));
}
@ -436,7 +436,7 @@ public class GenTableServiceImpl implements IGenTableService
break;
}
}
if (StringUtils.isNull(table.getSubTable().getPkColumn()))
if (StringPlusUtils.isNull(table.getSubTable().getPkColumn()))
{
table.getSubTable().setPkColumn(table.getSubTable().getColumns().get(0));
}
@ -445,13 +445,13 @@ public class GenTableServiceImpl implements IGenTableService
/**
*
*
*
* @param table
*/
public void setSubTable(GenTable table)
{
String subTableName = table.getSubTableName();
if (StringUtils.isNotEmpty(subTableName))
if (StringPlusUtils.isNotEmpty(subTableName))
{
table.setSubTable(genTableMapper.selectGenTableByName(subTableName));
}
@ -459,20 +459,20 @@ public class GenTableServiceImpl implements IGenTableService
/**
*
*
*
* @param genTable
*/
public void setTableFromOptions(GenTable genTable)
{
JSONObject paramsObj = JSONObject.parseObject(genTable.getOptions());
if (StringUtils.isNotNull(paramsObj))
if (StringPlusUtils.isNotNull(paramsObj))
{
String treeCode = paramsObj.getString(GenConstants.TREE_CODE);
String treeParentCode = paramsObj.getString(GenConstants.TREE_PARENT_CODE);
String treeName = paramsObj.getString(GenConstants.TREE_NAME);
String parentMenuId = paramsObj.getString(GenConstants.PARENT_MENU_ID);
String parentMenuName = paramsObj.getString(GenConstants.PARENT_MENU_NAME);
genTable.setTreeCode(treeCode);
genTable.setTreeParentCode(treeParentCode);
genTable.setTreeName(treeName);
@ -483,7 +483,7 @@ public class GenTableServiceImpl implements IGenTableService
/**
*
*
*
* @param table
* @param template
* @return
@ -491,10 +491,10 @@ public class GenTableServiceImpl implements IGenTableService
public static String getGenPath(GenTable table, String template)
{
String genPath = table.getGenPath();
if (StringUtils.equals(genPath, "/"))
if (StringPlusUtils.equals(genPath, "/"))
{
return System.getProperty("user.dir") + File.separator + "src" + File.separator + VelocityUtils.getFileName(template, table);
}
return genPath + File.separator + VelocityUtils.getFileName(template, table);
}
}
}

@ -3,14 +3,14 @@ package com.ruoyi.generator.util;
import java.util.Arrays;
import org.apache.commons.lang3.RegExUtils;
import com.ruoyi.common.constant.GenConstants;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
import com.ruoyi.generator.config.GenConfig;
import com.ruoyi.generator.domain.GenTable;
import com.ruoyi.generator.domain.GenTableColumn;
/**
*
*
*
* @author ruoyi
*/
public class GenUtils
@ -39,7 +39,7 @@ public class GenUtils
column.setTableId(table.getTableId());
column.setCreateBy(table.getCreateBy());
// 设置java字段名
column.setJavaField(StringUtils.toCamelCase(columnName));
column.setJavaField(StringPlusUtils.toCamelCase(columnName));
// 设置默认类型
column.setJavaType(GenConstants.TYPE_STRING);
@ -60,7 +60,7 @@ public class GenUtils
column.setHtmlType(GenConstants.HTML_INPUT);
// 如果是浮点型 统一用BigDecimal
String[] str = StringUtils.split(StringUtils.substringBetween(column.getColumnType(), "(", ")"), ",");
String[] str = StringPlusUtils.split(StringPlusUtils.substringBetween(column.getColumnType(), "(", ")"), ",");
if (str != null && str.length == 2 && Integer.parseInt(str[1]) > 0)
{
column.setJavaType(GenConstants.TYPE_BIGDECIMAL);
@ -97,33 +97,33 @@ public class GenUtils
}
// 查询字段类型
if (StringUtils.endsWithIgnoreCase(columnName, "name"))
if (StringPlusUtils.endsWithIgnoreCase(columnName, "name"))
{
column.setQueryType(GenConstants.QUERY_LIKE);
}
// 状态字段设置单选框
if (StringUtils.endsWithIgnoreCase(columnName, "status"))
if (StringPlusUtils.endsWithIgnoreCase(columnName, "status"))
{
column.setHtmlType(GenConstants.HTML_RADIO);
}
// 类型&性别字段设置下拉框
else if (StringUtils.endsWithIgnoreCase(columnName, "type")
|| StringUtils.endsWithIgnoreCase(columnName, "sex"))
else if (StringPlusUtils.endsWithIgnoreCase(columnName, "type")
|| StringPlusUtils.endsWithIgnoreCase(columnName, "sex"))
{
column.setHtmlType(GenConstants.HTML_SELECT);
}
// 图片字段设置图片上传控件
else if (StringUtils.endsWithIgnoreCase(columnName, "image"))
else if (StringPlusUtils.endsWithIgnoreCase(columnName, "image"))
{
column.setHtmlType(GenConstants.HTML_IMAGE_UPLOAD);
}
// 文件字段设置文件上传控件
else if (StringUtils.endsWithIgnoreCase(columnName, "file"))
else if (StringPlusUtils.endsWithIgnoreCase(columnName, "file"))
{
column.setHtmlType(GenConstants.HTML_FILE_UPLOAD);
}
// 内容字段设置富文本控件
else if (StringUtils.endsWithIgnoreCase(columnName, "content"))
else if (StringPlusUtils.endsWithIgnoreCase(columnName, "content"))
{
column.setHtmlType(GenConstants.HTML_EDITOR);
}
@ -131,7 +131,7 @@ public class GenUtils
/**
*
*
*
* @param arr
* @param targetValue
* @return
@ -143,7 +143,7 @@ public class GenUtils
/**
*
*
*
* @param packageName
* @return
*/
@ -151,13 +151,13 @@ public class GenUtils
{
int lastIndex = packageName.lastIndexOf(".");
int nameLength = packageName.length();
String moduleName = StringUtils.substring(packageName, lastIndex + 1, nameLength);
String moduleName = StringPlusUtils.substring(packageName, lastIndex + 1, nameLength);
return moduleName;
}
/**
*
*
*
* @param tableName
* @return
*/
@ -165,13 +165,13 @@ public class GenUtils
{
int lastIndex = tableName.lastIndexOf("_");
int nameLength = tableName.length();
String businessName = StringUtils.substring(tableName, lastIndex + 1, nameLength);
String businessName = StringPlusUtils.substring(tableName, lastIndex + 1, nameLength);
return businessName;
}
/**
* Java
*
*
* @param tableName
* @return
*/
@ -179,17 +179,17 @@ public class GenUtils
{
boolean autoRemovePre = GenConfig.getAutoRemovePre();
String tablePrefix = GenConfig.getTablePrefix();
if (autoRemovePre && StringUtils.isNotEmpty(tablePrefix))
if (autoRemovePre && StringPlusUtils.isNotEmpty(tablePrefix))
{
String[] searchList = StringUtils.split(tablePrefix, ",");
String[] searchList = StringPlusUtils.split(tablePrefix, ",");
tableName = replaceFirst(tableName, searchList);
}
return StringUtils.convertToCamelCase(tableName);
return StringPlusUtils.convertToCamelCase(tableName);
}
/**
*
*
*
* @param replacementm
* @param searchList
* @return
@ -210,7 +210,7 @@ public class GenUtils
/**
*
*
*
* @param text
* @return
*/
@ -221,15 +221,15 @@ public class GenUtils
/**
*
*
*
* @param columnType
* @return
*/
public static String getDbType(String columnType)
{
if (StringUtils.indexOf(columnType, "(") > 0)
if (StringPlusUtils.indexOf(columnType, "(") > 0)
{
return StringUtils.substringBefore(columnType, "(");
return StringPlusUtils.substringBefore(columnType, "(");
}
else
{
@ -239,15 +239,15 @@ public class GenUtils
/**
*
*
*
* @param columnType
* @return
*/
public static Integer getColumnLength(String columnType)
{
if (StringUtils.indexOf(columnType, "(") > 0)
if (StringPlusUtils.indexOf(columnType, "(") > 0)
{
String length = StringUtils.substringBetween(columnType, "(", ")");
String length = StringPlusUtils.substringBetween(columnType, "(", ")");
return Integer.valueOf(length);
}
else

@ -7,13 +7,13 @@ import org.apache.velocity.VelocityContext;
import com.alibaba.fastjson.JSONObject;
import com.ruoyi.common.constant.GenConstants;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
import com.ruoyi.generator.domain.GenTable;
import com.ruoyi.generator.domain.GenTableColumn;
/**
*
*
*
* @author ruoyi
*/
public class VelocityUtils
@ -43,11 +43,11 @@ public class VelocityUtils
VelocityContext velocityContext = new VelocityContext();
velocityContext.put("tplCategory", genTable.getTplCategory());
velocityContext.put("tableName", genTable.getTableName());
velocityContext.put("functionName", StringUtils.isNotEmpty(functionName) ? functionName : "【请填写功能名称】");
velocityContext.put("functionName", StringPlusUtils.isNotEmpty(functionName) ? functionName : "【请填写功能名称】");
velocityContext.put("ClassName", genTable.getClassName());
velocityContext.put("className", StringUtils.uncapitalize(genTable.getClassName()));
velocityContext.put("className", StringPlusUtils.uncapitalize(genTable.getClassName()));
velocityContext.put("moduleName", genTable.getModuleName());
velocityContext.put("BusinessName", StringUtils.capitalize(genTable.getBusinessName()));
velocityContext.put("BusinessName", StringPlusUtils.capitalize(genTable.getBusinessName()));
velocityContext.put("businessName", genTable.getBusinessName());
velocityContext.put("basePackage", getPackagePrefix(packageName));
velocityContext.put("packageName", packageName);
@ -106,15 +106,15 @@ public class VelocityUtils
String subTableName = genTable.getSubTableName();
String subTableFkName = genTable.getSubTableFkName();
String subClassName = genTable.getSubTable().getClassName();
String subTableFkClassName = StringUtils.convertToCamelCase(subTableFkName);
String subTableFkClassName = StringPlusUtils.convertToCamelCase(subTableFkName);
context.put("subTable", subTable);
context.put("subTableName", subTableName);
context.put("subTableFkName", subTableFkName);
context.put("subTableFkClassName", subTableFkClassName);
context.put("subTableFkclassName", StringUtils.uncapitalize(subTableFkClassName));
context.put("subTableFkclassName", StringPlusUtils.uncapitalize(subTableFkClassName));
context.put("subClassName", subClassName);
context.put("subclassName", StringUtils.uncapitalize(subClassName));
context.put("subclassName", StringPlusUtils.uncapitalize(subClassName));
context.put("subImportList", getImportList(genTable.getSubTable()));
}
@ -166,37 +166,37 @@ public class VelocityUtils
// 业务名称
String businessName = genTable.getBusinessName();
String javaPath = PROJECT_PATH + "/" + StringUtils.replace(packageName, ".", "/");
String javaPath = PROJECT_PATH + "/" + StringPlusUtils.replace(packageName, ".", "/");
String mybatisPath = MYBATIS_PATH + "/" + moduleName;
String vuePath = "vue";
if (template.contains("domain.java.vm"))
{
fileName = StringUtils.format("{}/domain/{}.java", javaPath, className);
fileName = StringPlusUtils.format("{}/domain/{}.java", javaPath, className);
}
if (template.contains("sub-domain.java.vm") && StringUtils.equals(GenConstants.TPL_SUB, genTable.getTplCategory()))
if (template.contains("sub-domain.java.vm") && StringPlusUtils.equals(GenConstants.TPL_SUB, genTable.getTplCategory()))
{
fileName = StringUtils.format("{}/domain/{}.java", javaPath, genTable.getSubTable().getClassName());
fileName = StringPlusUtils.format("{}/domain/{}.java", javaPath, genTable.getSubTable().getClassName());
}
else if (template.contains("mapper.java.vm"))
{
fileName = StringUtils.format("{}/mapper/{}Mapper.java", javaPath, className);
fileName = StringPlusUtils.format("{}/mapper/{}Mapper.java", javaPath, className);
}
else if (template.contains("service.java.vm"))
{
fileName = StringUtils.format("{}/service/I{}Service.java", javaPath, className);
fileName = StringPlusUtils.format("{}/service/I{}Service.java", javaPath, className);
}
else if (template.contains("serviceImpl.java.vm"))
{
fileName = StringUtils.format("{}/service/impl/{}ServiceImpl.java", javaPath, className);
fileName = StringPlusUtils.format("{}/service/impl/{}ServiceImpl.java", javaPath, className);
}
else if (template.contains("controller.java.vm"))
{
fileName = StringUtils.format("{}/controller/{}Controller.java", javaPath, className);
fileName = StringPlusUtils.format("{}/controller/{}Controller.java", javaPath, className);
}
else if (template.contains("mapper.xml.vm"))
{
fileName = StringUtils.format("{}/{}Mapper.xml", mybatisPath, className);
fileName = StringPlusUtils.format("{}/{}Mapper.xml", mybatisPath, className);
}
else if (template.contains("sql.vm"))
{
@ -204,15 +204,15 @@ public class VelocityUtils
}
else if (template.contains("api.js.vm"))
{
fileName = StringUtils.format("{}/api/{}/{}.js", vuePath, moduleName, businessName);
fileName = StringPlusUtils.format("{}/api/{}/{}.js", vuePath, moduleName, businessName);
}
else if (template.contains("index.vue.vm"))
{
fileName = StringUtils.format("{}/views/{}/{}/index.vue", vuePath, moduleName, businessName);
fileName = StringPlusUtils.format("{}/views/{}/{}/index.vue", vuePath, moduleName, businessName);
}
else if (template.contains("index-tree.vue.vm"))
{
fileName = StringUtils.format("{}/views/{}/{}/index.vue", vuePath, moduleName, businessName);
fileName = StringPlusUtils.format("{}/views/{}/{}/index.vue", vuePath, moduleName, businessName);
}
return fileName;
}
@ -226,13 +226,13 @@ public class VelocityUtils
public static String getPackagePrefix(String packageName)
{
int lastIndex = packageName.lastIndexOf(".");
String basePackage = StringUtils.substring(packageName, 0, lastIndex);
String basePackage = StringPlusUtils.substring(packageName, 0, lastIndex);
return basePackage;
}
/**
*
*
*
* @param genTable
* @return
*/
@ -241,7 +241,7 @@ public class VelocityUtils
List<GenTableColumn> columns = genTable.getColumns();
GenTable subGenTable = genTable.getSubTable();
HashSet<String> importList = new HashSet<String>();
if (StringUtils.isNotNull(subGenTable))
if (StringPlusUtils.isNotNull(subGenTable))
{
importList.add("java.util.List");
}
@ -269,7 +269,7 @@ public class VelocityUtils
*/
public static String getPermissionPrefix(String moduleName, String businessName)
{
return StringUtils.format("{}:{}", moduleName, businessName);
return StringPlusUtils.format("{}:{}", moduleName, businessName);
}
/**
@ -280,7 +280,7 @@ public class VelocityUtils
*/
public static String getParentMenuId(JSONObject paramsObj)
{
if (StringUtils.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.PARENT_MENU_ID))
if (StringPlusUtils.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.PARENT_MENU_ID))
{
return paramsObj.getString(GenConstants.PARENT_MENU_ID);
}
@ -297,9 +297,9 @@ public class VelocityUtils
{
if (paramsObj.containsKey(GenConstants.TREE_CODE))
{
return StringUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_CODE));
return StringPlusUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_CODE));
}
return StringUtils.EMPTY;
return StringPlusUtils.EMPTY;
}
/**
@ -312,9 +312,9 @@ public class VelocityUtils
{
if (paramsObj.containsKey(GenConstants.TREE_PARENT_CODE))
{
return StringUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_PARENT_CODE));
return StringPlusUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_PARENT_CODE));
}
return StringUtils.EMPTY;
return StringPlusUtils.EMPTY;
}
/**
@ -327,9 +327,9 @@ public class VelocityUtils
{
if (paramsObj.containsKey(GenConstants.TREE_NAME))
{
return StringUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_NAME));
return StringPlusUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_NAME));
}
return StringUtils.EMPTY;
return StringPlusUtils.EMPTY;
}
/**

@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
#if($table.sub)
import java.util.ArrayList;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
import org.springframework.transaction.annotation.Transactional;
import ${packageName}.domain.${subClassName};
#end
@ -21,19 +21,19 @@ import ${packageName}.service.I${ClassName}Service;
/**
* ${functionName}Service业务层处理
*
*
* @author ${author}
* @date ${datetime}
*/
@Service
public class ${ClassName}ServiceImpl implements I${ClassName}Service
public class ${ClassName}ServiceImpl implements I${ClassName}Service
{
@Autowired
private ${ClassName}Mapper ${className}Mapper;
/**
* 查询${functionName}
*
*
* @param ${pkColumn.javaField} ${functionName}ID
* @return ${functionName}
*/
@ -45,7 +45,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
/**
* 查询${functionName}列表
*
*
* @param ${className} ${functionName}
* @return ${functionName}
*/
@ -57,7 +57,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
/**
* 新增${functionName}
*
*
* @param ${className} ${functionName}
* @return 结果
*/
@ -83,7 +83,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
/**
* 修改${functionName}
*
*
* @param ${className} ${functionName}
* @return 结果
*/
@ -107,7 +107,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
/**
* 批量删除${functionName}
*
*
* @param ${pkColumn.javaField}s 需要删除的${functionName}ID
* @return 结果
*/
@ -125,7 +125,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
/**
* 删除${functionName}信息
*
*
* @param ${pkColumn.javaField} ${functionName}ID
* @return 结果
*/
@ -141,14 +141,14 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
/**
* 新增${subTable.functionName}信息
*
*
* @param ${className} ${functionName}对象
*/
public void insert${subClassName}(${ClassName} ${className})
{
List<${subClassName}> ${subclassName}List = ${className}.get${subClassName}List();
Long ${pkColumn.javaField} = ${className}.get${pkColumn.capJavaField}();
if (StringUtils.isNotNull(${subclassName}List))
if (StringPlusUtils.isNotNull(${subclassName}List))
{
List<${subClassName}> list = new ArrayList<${subClassName}>();
for (${subClassName} ${subclassName} : ${subclassName}List)

@ -11,12 +11,12 @@ import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.annotation.Excel.ColumnType;
import com.ruoyi.common.constant.ScheduleConstants;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
import com.ruoyi.quartz.util.CronUtils;
/**
* sys_job
*
*
* @author ruoyi
*/
public class SysJob extends BaseEntity implements Serializable
@ -114,7 +114,7 @@ public class SysJob extends BaseEntity implements Serializable
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
public Date getNextValidTime()
{
if (StringUtils.isNotEmpty(cronExpression))
if (StringPlusUtils.isNotEmpty(cronExpression))
{
return CronUtils.getNextExecution(cronExpression);
}

@ -1,11 +1,11 @@
package com.ruoyi.quartz.task;
import org.springframework.stereotype.Component;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
/**
*
*
*
* @author ruoyi
*/
@Component("ryTask")
@ -13,7 +13,7 @@ public class RyTask
{
public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i)
{
System.out.println(StringUtils.format("执行多参方法: 字符串类型{},布尔类型{},长整型{},浮点型{},整形{}", s, b, l, d, i));
System.out.println(StringPlusUtils.format("执行多参方法: 字符串类型{},布尔类型{},长整型{},浮点型{},整形{}", s, b, l, d, i));
}
public void ryParams(String params)

@ -9,7 +9,7 @@ import org.slf4j.LoggerFactory;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.constant.ScheduleConstants;
import com.ruoyi.common.utils.ExceptionUtil;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.quartz.domain.SysJob;
@ -84,7 +84,7 @@ public abstract class AbstractQuartzJob implements Job
if (e != null)
{
sysJobLog.setStatus(Constants.FAIL);
String errorMsg = StringUtils.substring(ExceptionUtil.getExceptionMessage(e), 0, 2000);
String errorMsg = StringPlusUtils.substring(ExceptionUtil.getExceptionMessage(e), 0, 2000);
sysJobLog.setExceptionInfo(errorMsg);
}
else

@ -4,7 +4,7 @@ import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.LinkedList;
import java.util.List;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.quartz.domain.SysJob;
@ -50,7 +50,7 @@ public class JobInvokeUtil
throws NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException,
InvocationTargetException
{
if (StringUtils.isNotNull(methodParams) && methodParams.size() > 0)
if (StringPlusUtils.isNotNull(methodParams) && methodParams.size() > 0)
{
Method method = bean.getClass().getDeclaredMethod(methodName, getMethodParamsType(methodParams));
method.invoke(bean, getMethodParamsValue(methodParams));
@ -64,49 +64,49 @@ public class JobInvokeUtil
/**
* class
*
*
* @param str
* @return true false
*/
public static boolean isValidClassName(String invokeTarget)
{
return StringUtils.countMatches(invokeTarget, ".") > 1;
return StringPlusUtils.countMatches(invokeTarget, ".") > 1;
}
/**
* bean
*
*
* @param invokeTarget
* @return bean
*/
public static String getBeanName(String invokeTarget)
{
String beanName = StringUtils.substringBefore(invokeTarget, "(");
return StringUtils.substringBeforeLast(beanName, ".");
String beanName = StringPlusUtils.substringBefore(invokeTarget, "(");
return StringPlusUtils.substringBeforeLast(beanName, ".");
}
/**
* bean
*
*
* @param invokeTarget
* @return method
*/
public static String getMethodName(String invokeTarget)
{
String methodName = StringUtils.substringBefore(invokeTarget, "(");
return StringUtils.substringAfterLast(methodName, ".");
String methodName = StringPlusUtils.substringBefore(invokeTarget, "(");
return StringPlusUtils.substringAfterLast(methodName, ".");
}
/**
* method
*
*
* @param invokeTarget
* @return method
*/
public static List<Object[]> getMethodParams(String invokeTarget)
{
String methodStr = StringUtils.substringBetween(invokeTarget, "(", ")");
if (StringUtils.isEmpty(methodStr))
String methodStr = StringPlusUtils.substringBetween(invokeTarget, "(", ")");
if (StringPlusUtils.isEmpty(methodStr))
{
return null;
}
@ -114,26 +114,26 @@ public class JobInvokeUtil
List<Object[]> classs = new LinkedList<>();
for (int i = 0; i < methodParams.length; i++)
{
String str = StringUtils.trimToEmpty(methodParams[i]);
String str = StringPlusUtils.trimToEmpty(methodParams[i]);
// String字符串类型包含'
if (StringUtils.contains(str, "'"))
if (StringPlusUtils.contains(str, "'"))
{
classs.add(new Object[] { StringUtils.replace(str, "'", ""), String.class });
classs.add(new Object[] { StringPlusUtils.replace(str, "'", ""), String.class });
}
// boolean布尔类型等于true或者false
else if (StringUtils.equals(str, "true") || StringUtils.equalsIgnoreCase(str, "false"))
else if (StringPlusUtils.equals(str, "true") || StringPlusUtils.equalsIgnoreCase(str, "false"))
{
classs.add(new Object[] { Boolean.valueOf(str), Boolean.class });
}
// long长整形包含L
else if (StringUtils.containsIgnoreCase(str, "L"))
else if (StringPlusUtils.containsIgnoreCase(str, "L"))
{
classs.add(new Object[] { Long.valueOf(StringUtils.replaceIgnoreCase(str, "L", "")), Long.class });
classs.add(new Object[] { Long.valueOf(StringPlusUtils.replaceIgnoreCase(str, "L", "")), Long.class });
}
// double浮点类型包含D
else if (StringUtils.containsIgnoreCase(str, "D"))
else if (StringPlusUtils.containsIgnoreCase(str, "D"))
{
classs.add(new Object[] { Double.valueOf(StringUtils.replaceIgnoreCase(str, "D", "")), Double.class });
classs.add(new Object[] { Double.valueOf(StringPlusUtils.replaceIgnoreCase(str, "D", "")), Double.class });
}
// 其他类型归类为整形
else
@ -146,7 +146,7 @@ public class JobInvokeUtil
/**
*
*
*
* @param methodParams
* @return
*/
@ -164,7 +164,7 @@ public class JobInvokeUtil
/**
*
*
*
* @param methodParams
* @return
*/

@ -12,14 +12,14 @@ import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.enums.DataSourceType;
import com.ruoyi.common.exception.CustomException;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.mapper.SysConfigMapper;
import com.ruoyi.system.service.ISysConfigService;
/**
*
*
*
* @author ruoyi
*/
@Service
@ -46,7 +46,7 @@ public class SysConfigServiceImpl implements ISysConfigService
/**
*
*
*
* @param configId ID
* @return
*/
@ -61,7 +61,7 @@ public class SysConfigServiceImpl implements ISysConfigService
/**
*
*
*
* @param configKey key
* @return
*/
@ -69,24 +69,24 @@ public class SysConfigServiceImpl implements ISysConfigService
public String selectConfigByKey(String configKey)
{
String configValue = Convert.toStr(redisCache.getCacheObject(getCacheKey(configKey)));
if (StringUtils.isNotEmpty(configValue))
if (StringPlusUtils.isNotEmpty(configValue))
{
return configValue;
}
SysConfig config = new SysConfig();
config.setConfigKey(configKey);
SysConfig retConfig = configMapper.selectConfig(config);
if (StringUtils.isNotNull(retConfig))
if (StringPlusUtils.isNotNull(retConfig))
{
redisCache.setCacheObject(getCacheKey(configKey), retConfig.getConfigValue());
return retConfig.getConfigValue();
}
return StringUtils.EMPTY;
return StringPlusUtils.EMPTY;
}
/**
*
*
*
* @param config
* @return
*/
@ -98,7 +98,7 @@ public class SysConfigServiceImpl implements ISysConfigService
/**
*
*
*
* @param config
* @return
*/
@ -115,7 +115,7 @@ public class SysConfigServiceImpl implements ISysConfigService
/**
*
*
*
* @param config
* @return
*/
@ -132,7 +132,7 @@ public class SysConfigServiceImpl implements ISysConfigService
/**
*
*
*
* @param configIds ID
* @return
*/
@ -142,7 +142,7 @@ public class SysConfigServiceImpl implements ISysConfigService
for (Long configId : configIds)
{
SysConfig config = selectConfigById(configId);
if (StringUtils.equals(UserConstants.YES, config.getConfigType()))
if (StringPlusUtils.equals(UserConstants.YES, config.getConfigType()))
{
throw new CustomException(String.format("内置参数【%1$s】不能删除 ", config.getConfigKey()));
}
@ -168,16 +168,16 @@ public class SysConfigServiceImpl implements ISysConfigService
/**
*
*
*
* @param config
* @return
*/
@Override
public String checkConfigKeyUnique(SysConfig config)
{
Long configId = StringUtils.isNull(config.getConfigId()) ? -1L : config.getConfigId();
Long configId = StringPlusUtils.isNull(config.getConfigId()) ? -1L : config.getConfigId();
SysConfig info = configMapper.checkConfigKeyUnique(config.getConfigKey());
if (StringUtils.isNotNull(info) && info.getConfigId().longValue() != configId.longValue())
if (StringPlusUtils.isNotNull(info) && info.getConfigId().longValue() != configId.longValue())
{
return UserConstants.NOT_UNIQUE;
}
@ -186,7 +186,7 @@ public class SysConfigServiceImpl implements ISysConfigService
/**
* cache key
*
*
* @param configKey
* @return key
*/

@ -12,14 +12,14 @@ import com.ruoyi.common.core.domain.TreeSelect;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.exception.CustomException;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
import com.ruoyi.system.mapper.SysDeptMapper;
import com.ruoyi.system.mapper.SysRoleMapper;
import com.ruoyi.system.service.ISysDeptService;
/**
*
*
*
* @author ruoyi
*/
@Service
@ -33,7 +33,7 @@ public class SysDeptServiceImpl implements ISysDeptService
/**
*
*
*
* @param dept
* @return
*/
@ -46,7 +46,7 @@ public class SysDeptServiceImpl implements ISysDeptService
/**
*
*
*
* @param depts
* @return
*/
@ -78,7 +78,7 @@ public class SysDeptServiceImpl implements ISysDeptService
/**
*
*
*
* @param depts
* @return
*/
@ -91,7 +91,7 @@ public class SysDeptServiceImpl implements ISysDeptService
/**
* ID
*
*
* @param roleId ID
* @return
*/
@ -104,7 +104,7 @@ public class SysDeptServiceImpl implements ISysDeptService
/**
* ID
*
*
* @param deptId ID
* @return
*/
@ -116,7 +116,7 @@ public class SysDeptServiceImpl implements ISysDeptService
/**
* ID
*
*
* @param deptId ID
* @return
*/
@ -128,7 +128,7 @@ public class SysDeptServiceImpl implements ISysDeptService
/**
*
*
*
* @param deptId ID
* @return
*/
@ -141,7 +141,7 @@ public class SysDeptServiceImpl implements ISysDeptService
/**
*
*
*
* @param deptId ID
* @return true false
*/
@ -154,16 +154,16 @@ public class SysDeptServiceImpl implements ISysDeptService
/**
*
*
*
* @param dept
* @return
*/
@Override
public String checkDeptNameUnique(SysDept dept)
{
Long deptId = StringUtils.isNull(dept.getDeptId()) ? -1L : dept.getDeptId();
Long deptId = StringPlusUtils.isNull(dept.getDeptId()) ? -1L : dept.getDeptId();
SysDept info = deptMapper.checkDeptNameUnique(dept.getDeptName(), dept.getParentId());
if (StringUtils.isNotNull(info) && info.getDeptId().longValue() != deptId.longValue())
if (StringPlusUtils.isNotNull(info) && info.getDeptId().longValue() != deptId.longValue())
{
return UserConstants.NOT_UNIQUE;
}
@ -172,7 +172,7 @@ public class SysDeptServiceImpl implements ISysDeptService
/**
*
*
*
* @param dept
* @return
*/
@ -191,7 +191,7 @@ public class SysDeptServiceImpl implements ISysDeptService
/**
*
*
*
* @param dept
* @return
*/
@ -200,7 +200,7 @@ public class SysDeptServiceImpl implements ISysDeptService
{
SysDept newParentDept = deptMapper.selectDeptById(dept.getParentId());
SysDept oldDept = deptMapper.selectDeptById(dept.getDeptId());
if (StringUtils.isNotNull(newParentDept) && StringUtils.isNotNull(oldDept))
if (StringPlusUtils.isNotNull(newParentDept) && StringPlusUtils.isNotNull(oldDept))
{
String newAncestors = newParentDept.getAncestors() + "," + newParentDept.getDeptId();
String oldAncestors = oldDept.getAncestors();
@ -218,7 +218,7 @@ public class SysDeptServiceImpl implements ISysDeptService
/**
*
*
*
* @param dept
*/
private void updateParentDeptStatus(SysDept dept)
@ -231,7 +231,7 @@ public class SysDeptServiceImpl implements ISysDeptService
/**
*
*
*
* @param deptId ID
* @param newAncestors ID
* @param oldAncestors ID
@ -251,7 +251,7 @@ public class SysDeptServiceImpl implements ISysDeptService
/**
*
*
*
* @param deptId ID
* @return
*/
@ -288,7 +288,7 @@ public class SysDeptServiceImpl implements ISysDeptService
while (it.hasNext())
{
SysDept n = (SysDept) it.next();
if (StringUtils.isNotNull(n.getParentId()) && n.getParentId().longValue() == t.getDeptId().longValue())
if (StringPlusUtils.isNotNull(n.getParentId()) && n.getParentId().longValue() == t.getDeptId().longValue())
{
tlist.add(n);
}

@ -10,14 +10,14 @@ import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.domain.entity.SysDictType;
import com.ruoyi.common.exception.CustomException;
import com.ruoyi.common.utils.DictUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
import com.ruoyi.system.mapper.SysDictDataMapper;
import com.ruoyi.system.mapper.SysDictTypeMapper;
import com.ruoyi.system.service.ISysDictTypeService;
/**
*
*
*
* @author ruoyi
*/
@Service
@ -45,7 +45,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
/**
*
*
*
* @param dictType
* @return
*/
@ -57,7 +57,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
/**
*
*
*
* @return
*/
@Override
@ -68,7 +68,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
/**
*
*
*
* @param dictType
* @return
*/
@ -76,12 +76,12 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
public List<SysDictData> selectDictDataByType(String dictType)
{
List<SysDictData> dictDatas = DictUtils.getDictCache(dictType);
if (StringUtils.isNotEmpty(dictDatas))
if (StringPlusUtils.isNotEmpty(dictDatas))
{
return dictDatas;
}
dictDatas = dictDataMapper.selectDictDataByType(dictType);
if (StringUtils.isNotEmpty(dictDatas))
if (StringPlusUtils.isNotEmpty(dictDatas))
{
DictUtils.setDictCache(dictType, dictDatas);
return dictDatas;
@ -91,7 +91,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
/**
* ID
*
*
* @param dictId ID
* @return
*/
@ -103,7 +103,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
/**
*
*
*
* @param dictType
* @return
*/
@ -115,7 +115,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
/**
*
*
*
* @param dictIds ID
* @return
*/
@ -149,7 +149,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
/**
*
*
*
* @param dictType
* @return
*/
@ -166,7 +166,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
/**
*
*
*
* @param dictType
* @return
*/
@ -186,16 +186,16 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
/**
*
*
*
* @param dict
* @return
*/
@Override
public String checkDictTypeUnique(SysDictType dict)
{
Long dictId = StringUtils.isNull(dict.getDictId()) ? -1L : dict.getDictId();
Long dictId = StringPlusUtils.isNull(dict.getDictId()) ? -1L : dict.getDictId();
SysDictType dictType = dictTypeMapper.checkDictTypeUnique(dict.getDictType());
if (StringUtils.isNotNull(dictType) && dictType.getDictId().longValue() != dictId.longValue())
if (StringPlusUtils.isNotNull(dictType) && dictType.getDictId().longValue() != dictId.longValue())
{
return UserConstants.NOT_UNIQUE;
}

@ -16,7 +16,7 @@ import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
import com.ruoyi.system.domain.vo.MetaVo;
import com.ruoyi.system.domain.vo.RouterVo;
import com.ruoyi.system.mapper.SysMenuMapper;
@ -26,7 +26,7 @@ import com.ruoyi.system.service.ISysMenuService;
/**
*
*
*
* @author ruoyi
*/
@Service
@ -45,7 +45,7 @@ public class SysMenuServiceImpl implements ISysMenuService
/**
*
*
*
* @param userId ID
* @return
*/
@ -57,7 +57,7 @@ public class SysMenuServiceImpl implements ISysMenuService
/**
*
*
*
* @param menu
* @return
*/
@ -80,7 +80,7 @@ public class SysMenuServiceImpl implements ISysMenuService
/**
* ID
*
*
* @param userId ID
* @return
*/
@ -91,7 +91,7 @@ public class SysMenuServiceImpl implements ISysMenuService
Set<String> permsSet = new HashSet<>();
for (String perm : perms)
{
if (StringUtils.isNotEmpty(perm))
if (StringPlusUtils.isNotEmpty(perm))
{
permsSet.addAll(Arrays.asList(perm.trim().split(",")));
}
@ -101,7 +101,7 @@ public class SysMenuServiceImpl implements ISysMenuService
/**
* ID
*
*
* @param userId
* @return
*/
@ -122,7 +122,7 @@ public class SysMenuServiceImpl implements ISysMenuService
/**
* ID
*
*
* @param roleId ID
* @return
*/
@ -135,7 +135,7 @@ public class SysMenuServiceImpl implements ISysMenuService
/**
*
*
*
* @param menus
* @return
*/
@ -150,7 +150,7 @@ public class SysMenuServiceImpl implements ISysMenuService
router.setName(getRouteName(menu));
router.setPath(getRouterPath(menu));
router.setComponent(getComponent(menu));
router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache())));
router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StringPlusUtils.equals("1", menu.getIsCache())));
List<SysMenu> cMenus = menu.getChildren();
if (!cMenus.isEmpty() && cMenus.size() > 0 && UserConstants.TYPE_DIR.equals(menu.getMenuType()))
{
@ -164,8 +164,8 @@ public class SysMenuServiceImpl implements ISysMenuService
RouterVo children = new RouterVo();
children.setPath(menu.getPath());
children.setComponent(menu.getComponent());
children.setName(StringUtils.capitalize(menu.getPath()));
children.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache())));
children.setName(StringPlusUtils.capitalize(menu.getPath()));
children.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StringPlusUtils.equals("1", menu.getIsCache())));
childrenList.add(children);
router.setChildren(childrenList);
}
@ -176,7 +176,7 @@ public class SysMenuServiceImpl implements ISysMenuService
/**
*
*
*
* @param menus
* @return
*/
@ -208,7 +208,7 @@ public class SysMenuServiceImpl implements ISysMenuService
/**
*
*
*
* @param menus
* @return
*/
@ -221,7 +221,7 @@ public class SysMenuServiceImpl implements ISysMenuService
/**
* ID
*
*
* @param menuId ID
* @return
*/
@ -233,7 +233,7 @@ public class SysMenuServiceImpl implements ISysMenuService
/**
*
*
*
* @param menuId ID
* @return
*/
@ -246,7 +246,7 @@ public class SysMenuServiceImpl implements ISysMenuService
/**
* 使
*
*
* @param menuId ID
* @return
*/
@ -259,7 +259,7 @@ public class SysMenuServiceImpl implements ISysMenuService
/**
*
*
*
* @param menu
* @return
*/
@ -271,7 +271,7 @@ public class SysMenuServiceImpl implements ISysMenuService
/**
*
*
*
* @param menu
* @return
*/
@ -283,7 +283,7 @@ public class SysMenuServiceImpl implements ISysMenuService
/**
*
*
*
* @param menuId ID
* @return
*/
@ -295,16 +295,16 @@ public class SysMenuServiceImpl implements ISysMenuService
/**
*
*
*
* @param menu
* @return
*/
@Override
public String checkMenuNameUnique(SysMenu menu)
{
Long menuId = StringUtils.isNull(menu.getMenuId()) ? -1L : menu.getMenuId();
Long menuId = StringPlusUtils.isNull(menu.getMenuId()) ? -1L : menu.getMenuId();
SysMenu info = menuMapper.checkMenuNameUnique(menu.getMenuName(), menu.getParentId());
if (StringUtils.isNotNull(info) && info.getMenuId().longValue() != menuId.longValue())
if (StringPlusUtils.isNotNull(info) && info.getMenuId().longValue() != menuId.longValue())
{
return UserConstants.NOT_UNIQUE;
}
@ -313,24 +313,24 @@ public class SysMenuServiceImpl implements ISysMenuService
/**
*
*
*
* @param menu
* @return
*/
public String getRouteName(SysMenu menu)
{
String routerName = StringUtils.capitalize(menu.getPath());
String routerName = StringPlusUtils.capitalize(menu.getPath());
// 非外链并且是一级目录(类型为目录)
if (isMeunFrame(menu))
{
routerName = StringUtils.EMPTY;
routerName = StringPlusUtils.EMPTY;
}
return routerName;
}
/**
*
*
*
* @param menu
* @return
*/
@ -353,18 +353,18 @@ public class SysMenuServiceImpl implements ISysMenuService
/**
*
*
*
* @param menu
* @return
*/
public String getComponent(SysMenu menu)
{
String component = UserConstants.LAYOUT;
if (StringUtils.isNotEmpty(menu.getComponent()) && !isMeunFrame(menu))
if (StringPlusUtils.isNotEmpty(menu.getComponent()) && !isMeunFrame(menu))
{
component = menu.getComponent();
}
else if (StringUtils.isEmpty(menu.getComponent()) && isParentView(menu))
else if (StringPlusUtils.isEmpty(menu.getComponent()) && isParentView(menu))
{
component = UserConstants.PARENT_VIEW;
}
@ -373,7 +373,7 @@ public class SysMenuServiceImpl implements ISysMenuService
/**
*
*
*
* @param menu
* @return
*/
@ -385,7 +385,7 @@ public class SysMenuServiceImpl implements ISysMenuService
/**
* parent_view
*
*
* @param menu
* @return
*/
@ -396,7 +396,7 @@ public class SysMenuServiceImpl implements ISysMenuService
/**
* ID
*
*
* @param list
* @param parentId ID
* @return String
@ -419,7 +419,7 @@ public class SysMenuServiceImpl implements ISysMenuService
/**
*
*
*
* @param list
* @param t
*/

@ -5,7 +5,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.exception.CustomException;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
import com.ruoyi.system.domain.SysPost;
import com.ruoyi.system.mapper.SysPostMapper;
import com.ruoyi.system.mapper.SysUserPostMapper;
@ -13,7 +13,7 @@ import com.ruoyi.system.service.ISysPostService;
/**
*
*
*
* @author ruoyi
*/
@Service
@ -27,7 +27,7 @@ public class SysPostServiceImpl implements ISysPostService
/**
*
*
*
* @param post
* @return
*/
@ -39,7 +39,7 @@ public class SysPostServiceImpl implements ISysPostService
/**
*
*
*
* @return
*/
@Override
@ -50,7 +50,7 @@ public class SysPostServiceImpl implements ISysPostService
/**
* ID
*
*
* @param postId ID
* @return
*/
@ -62,7 +62,7 @@ public class SysPostServiceImpl implements ISysPostService
/**
* ID
*
*
* @param userId ID
* @return ID
*/
@ -74,16 +74,16 @@ public class SysPostServiceImpl implements ISysPostService
/**
*
*
*
* @param post
* @return
*/
@Override
public String checkPostNameUnique(SysPost post)
{
Long postId = StringUtils.isNull(post.getPostId()) ? -1L : post.getPostId();
Long postId = StringPlusUtils.isNull(post.getPostId()) ? -1L : post.getPostId();
SysPost info = postMapper.checkPostNameUnique(post.getPostName());
if (StringUtils.isNotNull(info) && info.getPostId().longValue() != postId.longValue())
if (StringPlusUtils.isNotNull(info) && info.getPostId().longValue() != postId.longValue())
{
return UserConstants.NOT_UNIQUE;
}
@ -92,16 +92,16 @@ public class SysPostServiceImpl implements ISysPostService
/**
*
*
*
* @param post
* @return
*/
@Override
public String checkPostCodeUnique(SysPost post)
{
Long postId = StringUtils.isNull(post.getPostId()) ? -1L : post.getPostId();
Long postId = StringPlusUtils.isNull(post.getPostId()) ? -1L : post.getPostId();
SysPost info = postMapper.checkPostCodeUnique(post.getPostCode());
if (StringUtils.isNotNull(info) && info.getPostId().longValue() != postId.longValue())
if (StringPlusUtils.isNotNull(info) && info.getPostId().longValue() != postId.longValue())
{
return UserConstants.NOT_UNIQUE;
}
@ -110,7 +110,7 @@ public class SysPostServiceImpl implements ISysPostService
/**
* ID使
*
*
* @param postId ID
* @return
*/
@ -122,7 +122,7 @@ public class SysPostServiceImpl implements ISysPostService
/**
*
*
*
* @param postId ID
* @return
*/
@ -134,7 +134,7 @@ public class SysPostServiceImpl implements ISysPostService
/**
*
*
*
* @param postIds ID
* @return
* @throws Exception
@ -155,7 +155,7 @@ public class SysPostServiceImpl implements ISysPostService
/**
*
*
*
* @param post
* @return
*/
@ -167,7 +167,7 @@ public class SysPostServiceImpl implements ISysPostService
/**
*
*
*
* @param post
* @return
*/

@ -12,7 +12,7 @@ import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.exception.CustomException;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.system.domain.SysRoleDept;
import com.ruoyi.system.domain.SysRoleMenu;
@ -24,7 +24,7 @@ import com.ruoyi.system.service.ISysRoleService;
/**
*
*
*
* @author ruoyi
*/
@Service
@ -44,7 +44,7 @@ public class SysRoleServiceImpl implements ISysRoleService
/**
*
*
*
* @param role
* @return
*/
@ -57,7 +57,7 @@ public class SysRoleServiceImpl implements ISysRoleService
/**
* ID
*
*
* @param userId ID
* @return
*/
@ -68,7 +68,7 @@ public class SysRoleServiceImpl implements ISysRoleService
Set<String> permsSet = new HashSet<>();
for (SysRole perm : perms)
{
if (StringUtils.isNotNull(perm))
if (StringPlusUtils.isNotNull(perm))
{
permsSet.addAll(Arrays.asList(perm.getRoleKey().trim().split(",")));
}
@ -78,7 +78,7 @@ public class SysRoleServiceImpl implements ISysRoleService
/**
*
*
*
* @return
*/
@Override
@ -89,7 +89,7 @@ public class SysRoleServiceImpl implements ISysRoleService
/**
* ID
*
*
* @param userId ID
* @return ID
*/
@ -101,7 +101,7 @@ public class SysRoleServiceImpl implements ISysRoleService
/**
* ID
*
*
* @param roleId ID
* @return
*/
@ -113,16 +113,16 @@ public class SysRoleServiceImpl implements ISysRoleService
/**
*
*
*
* @param role
* @return
*/
@Override
public String checkRoleNameUnique(SysRole role)
{
Long roleId = StringUtils.isNull(role.getRoleId()) ? -1L : role.getRoleId();
Long roleId = StringPlusUtils.isNull(role.getRoleId()) ? -1L : role.getRoleId();
SysRole info = roleMapper.checkRoleNameUnique(role.getRoleName());
if (StringUtils.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue())
if (StringPlusUtils.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue())
{
return UserConstants.NOT_UNIQUE;
}
@ -131,16 +131,16 @@ public class SysRoleServiceImpl implements ISysRoleService
/**
*
*
*
* @param role
* @return
*/
@Override
public String checkRoleKeyUnique(SysRole role)
{
Long roleId = StringUtils.isNull(role.getRoleId()) ? -1L : role.getRoleId();
Long roleId = StringPlusUtils.isNull(role.getRoleId()) ? -1L : role.getRoleId();
SysRole info = roleMapper.checkRoleKeyUnique(role.getRoleKey());
if (StringUtils.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue())
if (StringPlusUtils.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue())
{
return UserConstants.NOT_UNIQUE;
}
@ -149,13 +149,13 @@ public class SysRoleServiceImpl implements ISysRoleService
/**
*
*
*
* @param role
*/
@Override
public void checkRoleAllowed(SysRole role)
{
if (StringUtils.isNotNull(role.getRoleId()) && role.isAdmin())
if (StringPlusUtils.isNotNull(role.getRoleId()) && role.isAdmin())
{
throw new CustomException("不允许操作超级管理员角色");
}
@ -163,7 +163,7 @@ public class SysRoleServiceImpl implements ISysRoleService
/**
* ID使
*
*
* @param roleId ID
* @return
*/
@ -175,7 +175,7 @@ public class SysRoleServiceImpl implements ISysRoleService
/**
*
*
*
* @param role
* @return
*/
@ -190,7 +190,7 @@ public class SysRoleServiceImpl implements ISysRoleService
/**
*
*
*
* @param role
* @return
*/
@ -207,7 +207,7 @@ public class SysRoleServiceImpl implements ISysRoleService
/**
*
*
*
* @param role
* @return
*/
@ -219,7 +219,7 @@ public class SysRoleServiceImpl implements ISysRoleService
/**
*
*
*
* @param role
* @return
*/
@ -237,7 +237,7 @@ public class SysRoleServiceImpl implements ISysRoleService
/**
*
*
*
* @param role
*/
public int insertRoleMenu(SysRole role)
@ -285,7 +285,7 @@ public class SysRoleServiceImpl implements ISysRoleService
/**
* ID
*
*
* @param roleId ID
* @return
*/
@ -302,7 +302,7 @@ public class SysRoleServiceImpl implements ISysRoleService
/**
*
*
*
* @param roleIds ID
* @return
*/

@ -2,13 +2,13 @@ package com.ruoyi.system.service.impl;
import org.springframework.stereotype.Service;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
import com.ruoyi.system.domain.SysUserOnline;
import com.ruoyi.system.service.ISysUserOnlineService;
/**
* 线
*
*
* @author ruoyi
*/
@Service
@ -16,7 +16,7 @@ public class SysUserOnlineServiceImpl implements ISysUserOnlineService
{
/**
*
*
*
* @param ipaddr
* @param user
* @return 线
@ -24,7 +24,7 @@ public class SysUserOnlineServiceImpl implements ISysUserOnlineService
@Override
public SysUserOnline selectOnlineByIpaddr(String ipaddr, LoginUser user)
{
if (StringUtils.equals(ipaddr, user.getIpaddr()))
if (StringPlusUtils.equals(ipaddr, user.getIpaddr()))
{
return loginUserToUserOnline(user);
}
@ -33,7 +33,7 @@ public class SysUserOnlineServiceImpl implements ISysUserOnlineService
/**
*
*
*
* @param userName
* @param user
* @return 线
@ -41,7 +41,7 @@ public class SysUserOnlineServiceImpl implements ISysUserOnlineService
@Override
public SysUserOnline selectOnlineByUserName(String userName, LoginUser user)
{
if (StringUtils.equals(userName, user.getUsername()))
if (StringPlusUtils.equals(userName, user.getUsername()))
{
return loginUserToUserOnline(user);
}
@ -50,7 +50,7 @@ public class SysUserOnlineServiceImpl implements ISysUserOnlineService
/**
* /
*
*
* @param ipaddr
* @param userName
* @param user
@ -59,7 +59,7 @@ public class SysUserOnlineServiceImpl implements ISysUserOnlineService
@Override
public SysUserOnline selectOnlineByInfo(String ipaddr, String userName, LoginUser user)
{
if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsername()))
if (StringPlusUtils.equals(ipaddr, user.getIpaddr()) && StringPlusUtils.equals(userName, user.getUsername()))
{
return loginUserToUserOnline(user);
}
@ -68,14 +68,14 @@ public class SysUserOnlineServiceImpl implements ISysUserOnlineService
/**
* 线
*
*
* @param user
* @return 线
*/
@Override
public SysUserOnline loginUserToUserOnline(LoginUser user)
{
if (StringUtils.isNull(user) || StringUtils.isNull(user.getUser()))
if (StringPlusUtils.isNull(user) || StringPlusUtils.isNull(user.getUser()))
{
return null;
}
@ -87,7 +87,7 @@ public class SysUserOnlineServiceImpl implements ISysUserOnlineService
sysUserOnline.setBrowser(user.getBrowser());
sysUserOnline.setOs(user.getOs());
sysUserOnline.setLoginTime(user.getLoginTime());
if (StringUtils.isNotNull(user.getUser().getDept()))
if (StringPlusUtils.isNotNull(user.getUser().getDept()))
{
sysUserOnline.setDeptName(user.getUser().getDept().getDeptName());
}

@ -13,7 +13,7 @@ import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.exception.CustomException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.StringPlusUtils;
import com.ruoyi.system.domain.SysPost;
import com.ruoyi.system.domain.SysUserPost;
import com.ruoyi.system.domain.SysUserRole;
@ -27,7 +27,7 @@ import com.ruoyi.system.service.ISysUserService;
/**
*
*
*
* @author ruoyi
*/
@Service
@ -55,7 +55,7 @@ public class SysUserServiceImpl implements ISysUserService
/**
*
*
*
* @param user
* @return
*/
@ -68,7 +68,7 @@ public class SysUserServiceImpl implements ISysUserService
/**
*
*
*
* @param userName
* @return
*/
@ -80,7 +80,7 @@ public class SysUserServiceImpl implements ISysUserService
/**
* ID
*
*
* @param userId ID
* @return
*/
@ -92,7 +92,7 @@ public class SysUserServiceImpl implements ISysUserService
/**
*
*
*
* @param userName
* @return
*/
@ -105,7 +105,7 @@ public class SysUserServiceImpl implements ISysUserService
{
idsStr.append(role.getRoleName()).append(",");
}
if (StringUtils.isNotEmpty(idsStr.toString()))
if (StringPlusUtils.isNotEmpty(idsStr.toString()))
{
return idsStr.substring(0, idsStr.length() - 1);
}
@ -114,7 +114,7 @@ public class SysUserServiceImpl implements ISysUserService
/**
*
*
*
* @param userName
* @return
*/
@ -127,7 +127,7 @@ public class SysUserServiceImpl implements ISysUserService
{
idsStr.append(post.getPostName()).append(",");
}
if (StringUtils.isNotEmpty(idsStr.toString()))
if (StringPlusUtils.isNotEmpty(idsStr.toString()))
{
return idsStr.substring(0, idsStr.length() - 1);
}
@ -136,7 +136,7 @@ public class SysUserServiceImpl implements ISysUserService
/**
*
*
*
* @param userName
* @return
*/
@ -160,9 +160,9 @@ public class SysUserServiceImpl implements ISysUserService
@Override
public String checkPhoneUnique(SysUser user)
{
Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
Long userId = StringPlusUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
SysUser info = userMapper.checkPhoneUnique(user.getPhonenumber());
if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
if (StringPlusUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
{
return UserConstants.NOT_UNIQUE;
}
@ -178,9 +178,9 @@ public class SysUserServiceImpl implements ISysUserService
@Override
public String checkEmailUnique(SysUser user)
{
Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
Long userId = StringPlusUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
SysUser info = userMapper.checkEmailUnique(user.getEmail());
if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
if (StringPlusUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
{
return UserConstants.NOT_UNIQUE;
}
@ -189,13 +189,13 @@ public class SysUserServiceImpl implements ISysUserService
/**
*
*
*
* @param user
*/
@Override
public void checkUserAllowed(SysUser user)
{
if (StringUtils.isNotNull(user.getUserId()) && user.isAdmin())
if (StringPlusUtils.isNotNull(user.getUserId()) && user.isAdmin())
{
throw new CustomException("不允许操作超级管理员用户");
}
@ -203,7 +203,7 @@ public class SysUserServiceImpl implements ISysUserService
/**
*
*
*
* @param user
* @return
*/
@ -222,7 +222,7 @@ public class SysUserServiceImpl implements ISysUserService
/**
*
*
*
* @param user
* @return
*/
@ -244,7 +244,7 @@ public class SysUserServiceImpl implements ISysUserService
/**
*
*
*
* @param user
* @return
*/
@ -256,7 +256,7 @@ public class SysUserServiceImpl implements ISysUserService
/**
*
*
*
* @param user
* @return
*/
@ -268,7 +268,7 @@ public class SysUserServiceImpl implements ISysUserService
/**
*
*
*
* @param userName
* @param avatar
* @return
@ -281,7 +281,7 @@ public class SysUserServiceImpl implements ISysUserService
/**
*
*
*
* @param user
* @return
*/
@ -293,7 +293,7 @@ public class SysUserServiceImpl implements ISysUserService
/**
*
*
*
* @param userName
* @param password
* @return
@ -306,13 +306,13 @@ public class SysUserServiceImpl implements ISysUserService
/**
*
*
*
* @param user
*/
public void insertUserRole(SysUser user)
{
Long[] roles = user.getRoleIds();
if (StringUtils.isNotNull(roles))
if (StringPlusUtils.isNotNull(roles))
{
// 新增用户与角色管理
List<SysUserRole> list = new ArrayList<SysUserRole>();
@ -332,13 +332,13 @@ public class SysUserServiceImpl implements ISysUserService
/**
*
*
*
* @param user
*/
public void insertUserPost(SysUser user)
{
Long[] posts = user.getPostIds();
if (StringUtils.isNotNull(posts))
if (StringPlusUtils.isNotNull(posts))
{
// 新增用户与岗位管理
List<SysUserPost> list = new ArrayList<SysUserPost>();
@ -358,7 +358,7 @@ public class SysUserServiceImpl implements ISysUserService
/**
* ID
*
*
* @param userId ID
* @return
*/
@ -375,7 +375,7 @@ public class SysUserServiceImpl implements ISysUserService
/**
*
*
*
* @param userIds ID
* @return
*/
@ -396,7 +396,7 @@ public class SysUserServiceImpl implements ISysUserService
/**
*
*
*
* @param userList
* @param isUpdateSupport
* @param operName
@ -405,7 +405,7 @@ public class SysUserServiceImpl implements ISysUserService
@Override
public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName)
{
if (StringUtils.isNull(userList) || userList.size() == 0)
if (StringPlusUtils.isNull(userList) || userList.size() == 0)
{
throw new CustomException("导入用户数据不能为空!");
}
@ -420,7 +420,7 @@ public class SysUserServiceImpl implements ISysUserService
{
// 验证是否存在这个用户
SysUser u = userMapper.selectUserByUserName(user.getUserName());
if (StringUtils.isNull(u))
if (StringPlusUtils.isNull(u))
{
user.setPassword(SecurityUtils.encryptPassword(password));
user.setCreateBy(operName);

Binary file not shown.

@ -389,17 +389,17 @@ export default {
})
}
reader.readAsText(response.data)
}
} else {
let filename = decodeURIComponent(response.headers['filename'])
// let filename = decodeURIComponent(response.headers['content-disposition']).split('filename=')[1];
var blob = new Blob([response.data], {type: 'application/octet-stream'})
var link = document.createElement('a')
link.href = window.URL.createObjectURL(blob)
link.download = filename
// link.download = filename
link.click()
//
window.URL.revokeObjectURL(link.href)
}
}
})
},
}

@ -388,7 +388,7 @@ export default {
this.finished = finished;
},
isRefuse(comment) {
return comment !== null &&comment !== undefined && comment.type !== null && comment.type !== undefined && comment.type === "3"
return comment !== null &&comment !== undefined && comment.type !== null && comment.type !== undefined && (comment.type === "3" || comment.type === "2")
},
/** 查询部门下拉树结构 */
getTreeselect() {

@ -7,66 +7,62 @@
</div>
<!--流程处理表单模块-->
<el-col :span="16" :offset="6" v-if="variableOpen">
<div>
<el-form ref="form" :model="form" :rules="rules" label-width="100px" :disabled="true">
<el-form-item label="所属项目">
<el-select v-model="form.projectId"
clearable
filterable
placeholder="请选择">
<el-option
v-for="(item,index) in projectList"
:key="index"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="项目问题">
<el-input type="textarea" v-model="form.issue"/>
</el-form-item>
<el-form-item label="解决方案">
<el-input type="textarea" v-model="form.solution"/>
</el-form-item>
<el-form-item label="工作记录">
<el-input type="textarea" v-model="form.workRecord"/>
</el-form-item>
<el-form-item label="图片上传" prop="remark">
<el-upload
class="upload-demo"
action="https://jsonplaceholder.typicode.com/posts/"
:on-preview="handlePreview"
:on-remove="handleRemove"
:file-list="fileList">
<el-button size="small" type="primary">点击上传</el-button>
<div slot="tip" class="el-upload__tip">只能上传jpg/png文件且不超过500kb</div>
</el-upload>
</el-form-item>
<el-form-item label="文件上传" prop="remark">
<el-upload
class="upload-demo"
action="https://jsonplaceholder.typicode.com/posts/"
:on-preview="handlePreview"
:on-remove="handleRemove"
multiple
:limit="3"
:file-list="fileList">
<el-button size="small" type="primary">点击上传</el-button>
<div slot="tip" class="el-upload__tip">只能上传jpg/png文件且不超过500kb</div>
</el-upload>
</el-form-item>
</el-form>
</div>
<div style="margin-left:10%;margin-bottom: 20px;font-size: 14px;" v-if="finished === 'true'">
<el-button icon="el-icon-edit-outline" type="success" size="mini" @click="handleComplete"></el-button>
<!-- <el-button icon="el-icon-edit-outline" type="primary" size="mini" @click="handleDelegate"></el-button>-->
<!-- <el-button icon="el-icon-edit-outline" type="primary" size="mini" @click="handleAssign"></el-button>-->
<!-- <el-button icon="el-icon-edit-outline" type="primary" size="mini" @click="handleDelegate"></el-button>-->
<!-- <el-button icon="el-icon-refresh-left" type="warning" size="mini" @click="handleReturn">退</el-button>-->
<el-button icon="el-icon-circle-close" type="danger" size="mini" @click="handleReject"></el-button>
</div>
</el-col>
<!-- <el-col :span="16" :offset="6" v-if="variableOpen">-->
<!-- <div>-->
<!-- <el-form ref="form" :model="form" :rules="rules" label-width="100px" :disabled="true">-->
<!-- <el-form-item label="所属项目">-->
<!-- <el-select v-model="form.projectId"-->
<!-- clearable-->
<!-- filterable-->
<!-- placeholder="请选择">-->
<!-- <el-option-->
<!-- v-for="(item,index) in projectList"-->
<!-- :key="index"-->
<!-- :label="item.label"-->
<!-- :value="item.value">-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="项目问题">-->
<!-- <el-input type="textarea" v-model="form.issue"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="解决方案">-->
<!-- <el-input type="textarea" v-model="form.solution"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="工作记录">-->
<!-- <el-input type="textarea" v-model="form.workRecord"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="附件">-->
<!-- <div v-for="(item,index) in uploadedImgs" class="demo-image__preview">-->
<!-- <el-row :span="24">-->
<!-- <el-col :span="6">-->
<!-- <el-image-->
<!-- style="width: 100px; height: 100px"-->
<!-- :src="'data:image/png;base64,'+item.base64"-->
<!-- :preview-src-list="['data:image/png;base64,'+item.base64]">-->
<!-- </el-image>-->
<!-- </el-col>-->
<!-- <el-col :span="2">-->
<!-- <span>{{item.name}}</span>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- </div>-->
<!-- <div v-for="(item,index) in uploadedFiles" class="demo-image__preview">-->
<!-- <span>{{item.name}}</span>-->
<!-- </div>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- </div>-->
<!-- <div style="margin-left:10%;margin-bottom: 20px;font-size: 14px;" v-if="finished === 'true'">-->
<!-- <el-button icon="el-icon-edit-outline" type="success" size="mini" @click="handleComplete"></el-button>-->
<!--&lt;!&ndash; <el-button icon="el-icon-edit-outline" type="primary" size="mini" @click="handleDelegate"></el-button>&ndash;&gt;-->
<!--&lt;!&ndash; <el-button icon="el-icon-edit-outline" type="primary" size="mini" @click="handleAssign"></el-button>&ndash;&gt;-->
<!--&lt;!&ndash; <el-button icon="el-icon-edit-outline" type="primary" size="mini" @click="handleDelegate"></el-button>&ndash;&gt;-->
<!--&lt;!&ndash; <el-button icon="el-icon-refresh-left" type="warning" size="mini" @click="handleReturn">退</el-button>&ndash;&gt;-->
<!-- <el-button icon="el-icon-circle-close" type="danger" size="mini" @click="handleReject"></el-button>-->
<!-- </div>-->
<!-- </el-col>-->
<!--初始化流程加载表单信息-->
<el-col :span="16" :offset="4" v-if="formConfOpen" >
@ -94,35 +90,28 @@
<el-form-item label="工作记录">
<el-input type="textarea" v-model="form.workRecord"/>
</el-form-item>
<el-form-item label="图片上传" prop="remark">
<el-upload
class="upload-demo"
action="https://jsonplaceholder.typicode.com/posts/"
:on-preview="handlePreview"
:on-remove="handleRemove"
:file-list="fileList">
<el-button size="small" type="primary">点击上传</el-button>
<div slot="tip" class="el-upload__tip">只能上传jpg/png文件且不超过500kb</div>
</el-upload>
</el-form-item>
<el-form-item label="文件上传" prop="remark">
<el-upload
class="upload-demo"
action="https://jsonplaceholder.typicode.com/posts/"
:on-preview="handlePreview"
:on-remove="handleRemove"
multiple
:limit="3"
:file-list="fileList">
<el-button size="small" type="primary">点击上传</el-button>
<div slot="tip" class="el-upload__tip">只能上传jpg/png文件且不超过500kb</div>
</el-upload>
</el-form-item>
<el-form-item label="附件">
<div v-for="(item,index) in uploadedImgs" class="demo-image__preview">
<el-row :span="24">
<el-col :span="6">
<el-image
style="width: 100px; height: 100px"
:src="'data:image/png;base64,'+item.base64"
:preview-src-list="['data:image/png;base64,'+item.base64]">
</el-image>
</el-col>
<el-col :span="2">
<span>{{item.name}}</span>
</el-col>
</el-row>
</div>
<div v-for="(item,index) in uploadedFiles" class="demo-image__preview">
<span>{{item.name}}</span>
</div>
</el-form-item>
</el-form>
</div>
<!-- <div style="margin-left:10%;margin-bottom: 20px;font-size: 14px;" v-if=applyIsRevoked>-->
<!-- <el-button icon="el-icon-edit-outline" type="success" size="mini" @click="handleClaimAndComplete"></el-button>-->
<!-- </div>-->
</el-col>
</el-card>
@ -396,6 +385,8 @@ export default {
submitDate: '',
solution: '',
},
uploadedImgs: [],
uploadedFiles: [],
finishDate: '',
fileList: [],
projectList: [],
@ -432,6 +423,8 @@ export default {
this.taskForm.deployId = null
}
this.optionList();
this.uploadedImgs = []
this.uploadedFiles = []
this.getFlowRecordList( this.taskForm.procInsId, this.taskForm.deployId);
this.finished = this.$route.query && this.$route.query.finished
},
@ -499,7 +492,7 @@ export default {
})
},
isRefuse(comment) {
return comment !== null &&comment !== undefined && comment.type !== null && comment.type !== undefined && comment.type === "3"
return comment !== null &&comment !== undefined && comment.type !== null && comment.type !== undefined && (comment.type === "3" || comment.type === "2")
},
setIcon(finishTime,comment) {
console.log('setIcon::',comment)
@ -558,6 +551,8 @@ export default {
const params = {procInsId: procInsId, deployId: deployId}
flowRecord(params).then(res => {
this.flowRecordList = res.data.flowList;
this.uploadedImgs = res.data.imgs;
this.uploadedFiles = res.data.files;
//
// if (res.data.formData) {
this.form = res.data.form;

@ -60,7 +60,7 @@
<!-- <el-button icon="el-icon-edit-outline" type="primary" size="mini" @click="handleAssign"></el-button>-->
<!-- <el-button icon="el-icon-edit-outline" type="primary" size="mini" @click="handleDelegate"></el-button>-->
<!-- <el-button icon="el-icon-refresh-left" type="warning" size="mini" @click="handleReturn">退</el-button>-->
<el-button icon="el-icon-circle-close" type="danger" size="mini" @click="handleReject"></el-button>
<el-button icon="el-icon-circle-close" type="danger" size="mini" @click="handleReturn"></el-button>
</div>
</el-col>
@ -446,7 +446,9 @@ export default {
})
},
isRefuse(comment) {
return comment !== null &&comment !== undefined && comment.type !== null && comment.type !== undefined && comment.type === "3"
return comment !== null &&comment !== undefined && comment.type !== null
// type=3 type=2 退
&& comment.type !== undefined && (comment.type === "3" || comment.type === "2")
},
setIcon(finishTime,comment) {
console.log('setIcon::',comment)
@ -689,13 +691,22 @@ export default {
this.returnOpen = true;
this.returnTitle = "退回流程";
returnList(this.taskForm).then(res => {
this.returnTaskList = res.data;
this.returnTaskList = res.data.slice(0,1)
//
if (res.data.length > 1) {
this.returnTaskList = res.data.slice(res.data.length-1, res.data.length);
}
//
if (this.returnTaskList.length > 0) {
this.taskForm.targetKey=this.returnTaskList[0].id
}
this.taskForm.values = null;
})
},
/** 提交退回任务 */
taskReturn() {
this.$refs["taskForm"].validate(valid => {
console.log('taskReturn::taskForm=', this.taskForm);
if (valid) {
returnTask(this.taskForm).then(res => {
this.msgSuccess(res.msg);

@ -268,7 +268,7 @@ export default {
})
},
isRefuse(comment) {
return comment !== null &&comment !== undefined && comment.type !== null && comment.type !== undefined && comment.type === "3"
return comment !== null &&comment !== undefined && comment.type !== null && comment.type !== undefined && (comment.type === "3" || comment.type === "2")
},
setIcon(finishTime,comment) {
console.log('setIcon::',comment)

Loading…
Cancel
Save