ruoyi
/
cloud-server
12
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(): 修复代码格式

boot3.0
dongzeliang 2025-01-01 13:42:46 +08:00
parent f9df70870e
commit 25888aa95a
5 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/text/Convert.java
View File

@ -876,17 +876,17 @@ public class Convert {
String head = n < 0 ? "负" : ""; String head = n < 0 ? "负" : "";
n = Math.abs(n); n = Math.abs(n);
String s = ""; StringBuilder s = new StringBuilder();
for (int i = 0 ; i < fraction.length ; i++) { for (int i = 0 ; i < fraction.length ; i++) {
// 优化double计算精度丢失问题 // 优化double计算精度丢失问题
BigDecimal nNum = new BigDecimal(n); BigDecimal nNum = new BigDecimal(n);
BigDecimal decimal = new BigDecimal(10); BigDecimal decimal = new BigDecimal(10);
BigDecimal scale = nNum.multiply(decimal).setScale(2, RoundingMode.HALF_EVEN); BigDecimal scale = nNum.multiply(decimal).setScale(2, RoundingMode.HALF_EVEN);
double d = scale.doubleValue(); double d = scale.doubleValue();
s += (digit[(int) (Math.floor(d * Math.pow(10, i)) % 10)] + fraction[i]).replaceAll("(零.)+", ""); s.append((digit[(int) (Math.floor(d * Math.pow(10, i)) % 10)] + fraction[i]).replaceAll("(零.)+", ""));
} }
if (s.length() < 1) { if (s.isEmpty()) {
s = "整"; s = new StringBuilder("整");
} }
int integerPart = (int) Math.floor(n); int integerPart = (int) Math.floor(n);
@ -896,8 +896,8 @@ public class Convert {
p = digit[integerPart % 10] + unit[1][j] + p; p = digit[integerPart % 10] + unit[1][j] + p;
integerPart = integerPart / 10; integerPart = integerPart / 10;
} }
s = p.replaceAll("(零.)*零$", "").replaceAll("^$", "零") + unit[0][i] + s; s.insert(0, p.replaceAll("(零.)*零$", "").replaceAll("^$", "零") + unit[0][i]);
} }
return head + s.replaceAll("(零.)*零元", "元").replaceFirst("(零.)+", "").replaceAll("(零.)+", "零").replaceAll("^整$", "零元整"); return head + s.toString().replaceAll("(零.)*零元", "元").replaceFirst("(零.)+", "").replaceAll("(零.)+", "零").replaceAll("^整$", "零元整");
} }
} }

3
cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/SpringUtils.java
View File

@ -43,8 +43,7 @@ public final class SpringUtils implements BeanFactoryPostProcessor {
* @throws org.springframework.beans.BeansException * @throws org.springframework.beans.BeansException
*/ */
public static <T> T getBean (Class<T> clz) throws BeansException { public static <T> T getBean (Class<T> clz) throws BeansException {
T result = (T) beanFactory.getBean(clz); return beanFactory.getBean(clz);
return result;
} }
/** /**

6
cloud-common/cloud-common-datascope/src/main/java/com/muyu/common/datascope/aspect/DataScopeAspect.java
View File

@ -109,8 +109,7 @@ public class DataScopeAspect {
if (StringUtils.isNotBlank(sqlString.toString())) { if (StringUtils.isNotBlank(sqlString.toString())) {
Object params = joinPoint.getArgs()[0]; Object params = joinPoint.getArgs()[0];
if (StringUtils.isNotNull(params) && params instanceof BaseEntity) { if (StringUtils.isNotNull(params) && params instanceof BaseEntity baseEntity) {
BaseEntity baseEntity = (BaseEntity) params;
baseEntity.getParams().put(DATA_SCOPE, " AND (" + sqlString.substring(4) + ")"); baseEntity.getParams().put(DATA_SCOPE, " AND (" + sqlString.substring(4) + ")");
} }
} }
@ -141,8 +140,7 @@ public class DataScopeAspect {
*/ */
private void clearDataScope (final JoinPoint joinPoint) { private void clearDataScope (final JoinPoint joinPoint) {
Object params = joinPoint.getArgs()[0]; Object params = joinPoint.getArgs()[0];
if (StringUtils.isNotNull(params) && params instanceof BaseEntity) { if (StringUtils.isNotNull(params) && params instanceof BaseEntity baseEntity) {
BaseEntity baseEntity = (BaseEntity) params;
baseEntity.getParams().put(DATA_SCOPE, ""); baseEntity.getParams().put(DATA_SCOPE, "");
} }
} }

2
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java
View File

@ -464,7 +464,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
public List<SysMenu> getChildPerms (List<SysMenu> list, int parentId) { public List<SysMenu> getChildPerms (List<SysMenu> list, int parentId) {
List<SysMenu> returnList = new ArrayList<SysMenu>(); List<SysMenu> returnList = new ArrayList<SysMenu>();
for (Iterator<SysMenu> iterator = list.iterator() ; iterator.hasNext() ; ) { for (Iterator<SysMenu> iterator = list.iterator() ; iterator.hasNext() ; ) {
SysMenu t = (SysMenu) iterator.next(); SysMenu t = iterator.next();
// 一、根据传入的某个父节点ID,遍历该父节点的所有子节点 // 一、根据传入的某个父节点ID,遍历该父节点的所有子节点
if (t.getParentId() == parentId) { if (t.getParentId() == parentId) {
recursionFn(list, t); recursionFn(list, t);

3
xxl-job/xxl-job-core/src/main/java/com/xxl/job/core/util/IpUtil.java
View File

@ -57,11 +57,10 @@ public class IpUtil {
return false; return false;
} }
String name = address.getHostAddress(); String name = address.getHostAddress();
boolean result = (name != null return (name != null
&& IP_PATTERN.matcher(name).matches() && IP_PATTERN.matcher(name).matches()
&& !ANYHOST_VALUE.equals(name) && !ANYHOST_VALUE.equals(name)
&& !LOCALHOST_VALUE.equals(name)); && !LOCALHOST_VALUE.equals(name));
return result;
} }