q792602257/FrameTour-BE
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

StringUtils替换

Browse Source
This commit is contained in:
Jerry Yan
2025-07-30 13:43:20 +08:00
parent 2a7b8664f8
commit 05412b2abf
9 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/ycwl/basic/biz/PriceBiz.java
View File

@@ -13,7 +13,7 @@ import com.ycwl.basic.repository.FaceRepository;
import com.ycwl.basic.repository.PriceRepository;
import com.ycwl.basic.repository.ScenicRepository;
import com.ycwl.basic.repository.TemplateRepository;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.Strings;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -72,7 +72,7 @@ public class PriceBiz {
String[] goodsIds = priceConfig.getGoodsIds().split(",");
return goodsList.stream().filter(goods -> {
for (String goodsId : goodsIds) {
if (StringUtils.equals(goods.getGoodsId().toString(), goodsId)) {
if (Strings.CS.equals(goods.getGoodsId().toString(), goodsId)) {
return true;
}
}

2
src/main/java/com/ycwl/basic/controller/extern/LyCompatibleController.java vendored
View File

@@ -88,7 +88,7 @@ public class LyCompatibleController {
if (StringUtils.isBlank(scid)) {
return R.error("景区ID为空！");
}
// if (StringUtils.equals("288",scid)) {
// if (Strings.CS.equals("288",scid)) {
scenicId = 3955650120997015552L;
// } else {
// scenicId = 3946669713328836608L;

6
src/main/java/com/ycwl/basic/controller/mobile/manage/AppScenicAccountController.java
View File

@@ -14,7 +14,7 @@ import com.ycwl.basic.service.mobile.AppScenicService;
import com.ycwl.basic.service.pc.ScenicAccountService;
import com.ycwl.basic.service.pc.ScenicService;
import com.ycwl.basic.utils.ApiResponse;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.Strings;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
@@ -65,8 +65,8 @@ public class AppScenicAccountController {
@GetMapping("/myScenicList")
public ApiResponse<List<ScenicRespVO>> myScenicList() {
List<ScenicRespVO> list = Collections.emptyList();
if (StringUtils.equals(BaseContextHandler.getRoleId(), MERCHANT.type)) {
List<ScenicRespVO> list;
if (Strings.CS.equals(BaseContextHandler.getRoleId(), MERCHANT.type)) {
String userId = BaseContextHandler.getUserId();
ScenicAccountEntity account = accountService.getScenicAccountById(Long.valueOf(userId));
if (account == null || account.getScenicId().isEmpty()) {

4
src/main/java/com/ycwl/basic/controller/pc/ScenicController.java
View File

@@ -19,7 +19,7 @@ import com.ycwl.basic.utils.ApiResponse;
import com.ycwl.basic.utils.WxMpUtil;
import com.ycwl.basic.repository.ScenicRepository;
import com.ycwl.basic.model.pc.mp.MpConfigEntity;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.Strings;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -169,7 +169,7 @@ public class ScenicController {
@GetMapping("/myScenicList")
public ApiResponse<List<ScenicRespVO>> myScenicList() {
List<ScenicRespVO> list = Collections.emptyList();
if (StringUtils.equals(BaseContextHandler.getRoleId(), MERCHANT.type)) {
if (Strings.CS.equals(BaseContextHandler.getRoleId(), MERCHANT.type)) {
String userId = BaseContextHandler.getUserId();
ScenicAccountEntity account = accountService.getScenicAccountById(Long.valueOf(userId));
if (account == null || account.getScenicId().isEmpty()) {

5
src/main/java/com/ycwl/basic/interceptor/AuthInterceptor.java
View File

@@ -17,6 +17,7 @@ import com.ycwl.basic.model.pc.scenic.entity.ScenicAccountEntity;
import com.ycwl.basic.utils.JwtTokenUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.Strings;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component;
@@ -78,7 +79,7 @@ public class AuthInterceptor implements HandlerInterceptor {
JwtInfo jwtInfo;
try {
jwtInfo = JwtTokenUtil.parsingToken(token);
if (StringUtils.equals(jwtInfo.getRoleId(), MERCHANT.type)) {
if (Strings.CS.equals(jwtInfo.getRoleId(), MERCHANT.type)) {
Long merchantId = jwtInfo.getUserId();
ScenicAccountEntity account = scenicAccountMapper.findAccountById(merchantId.toString());
LocalDateTime expireTime = jwtInfo.getExpireTime();
@@ -86,7 +87,7 @@ public class AuthInterceptor implements HandlerInterceptor {
throw new TokenExpireException("token过期");
}
}
if (StringUtils.equals(jwtInfo.getRoleId(), ADMIN.type)) {
if (Strings.CS.equals(jwtInfo.getRoleId(), ADMIN.type)) {
Long adminId = jwtInfo.getUserId();
LoginEntity account = adminUserMapper.getById(adminId);
LocalDateTime expireTime = jwtInfo.getExpireTime();

14
src/main/java/com/ycwl/basic/pay/adapter/CongMingPayAdapter.java
View File

@@ -12,9 +12,9 @@ import com.ycwl.basic.pay.entity.RefundOrderRequest;
import com.ycwl.basic.pay.entity.RefundOrderResponse;
import com.ycwl.basic.pay.entity.RefundResponse;
import com.ycwl.basic.pay.exceptions.PayException;
import jakarta.servlet.ServletInputStream;
import jakarta.servlet.http.HttpServletRequest;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.Strings;
import java.io.BufferedReader;
import java.io.ByteArrayOutputStream;
@@ -81,7 +81,7 @@ public class CongMingPayAdapter implements IPayAdapter {
String response = HttpUtil.post(url, JacksonUtil.toJSONString(params));
Map<String, Object> json = JacksonUtil.parseObject(response, Map.class);
System.out.println(json);
if (StringUtils.equals((String) json.get("result_code"), "fail")) {
if (Strings.CS.equals((String) json.get("result_code"), "fail")) {
throw new PayException("查询异常！异常提示：" + json.get("error_msg"));
}
resp.setSkipPay(false);
@@ -115,7 +115,7 @@ public class CongMingPayAdapter implements IPayAdapter {
PayResponse resp = new PayResponse();
resp.setPayPriceInYuan(new BigDecimal(moneyStr));
resp.setOrderNo(orderId);
if (StringUtils.equalsIgnoreCase("success", resultCode)) {
if (Strings.CI.equals("success", resultCode)) {
resp.setState(PayResponse.PAY_STATE.SUCCESS);
} else {
resp.setState(PayResponse.PAY_STATE.FAIL);
@@ -136,7 +136,7 @@ public class CongMingPayAdapter implements IPayAdapter {
String response = HttpUtil.post(url, JacksonUtil.toJSONString(params));
Map<String, Object> json = JacksonUtil.parseObject(response, Map.class);
System.out.println(json);
if (StringUtils.equals((String) json.get("result_code"), "fail")) {
if (Strings.CS.equals((String) json.get("result_code"), "fail")) {
throw new PayException("查询异常！异常提示：" + json.get("error_msg"));
}
resp.setOriginalResponse(json);
@@ -180,7 +180,7 @@ public class CongMingPayAdapter implements IPayAdapter {
String response = HttpUtil.post(url, JacksonUtil.toJSONString(params));
Map<String, Object> json = JacksonUtil.parseObject(response, Map.class);
System.out.println(json);
if (StringUtils.equalsIgnoreCase((String) json.get("result_code"), "fail")) {
if (Strings.CI.equals((String) json.get("result_code"), "fail")) {
throw new PayException("退款异常！异常提示：" + json.get("error_msg"));
}
return resp;
@@ -195,7 +195,7 @@ public class CongMingPayAdapter implements IPayAdapter {
resp.setValid(true);
resp.setRefundPriceInYuan(new BigDecimal(moneyStr));
resp.setOrderNo(orderId);
if (StringUtils.equals("success", resultCode)) {
if (Strings.CS.equals("success", resultCode)) {
resp.setSuccess();
} else {
resp.setFail();
@@ -220,7 +220,7 @@ public class CongMingPayAdapter implements IPayAdapter {
params.put("sign", parseSign(params, config.getApiKey()));
String response = HttpUtil.post(url, JacksonUtil.toJSONString(params));
Map<String, Object> json = JacksonUtil.parseObject(response, Map.class);
if (StringUtils.equals((String) json.get("result_code"), "fail")) {
if (Strings.CS.equals((String) json.get("result_code"), "fail")) {
throw new PayException("取消订单异常！异常提示：" + json.get("error_msg"));
}
}

5
src/main/java/com/ycwl/basic/service/pc/impl/PriceConfigServiceImpl.java
View File

@@ -11,6 +11,7 @@ import com.ycwl.basic.model.pc.template.resp.TemplateRespVO;
import com.ycwl.basic.repository.TemplateRepository;
import com.ycwl.basic.service.pc.PriceConfigService;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.Strings;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -56,9 +57,9 @@ public class PriceConfigServiceImpl extends ServiceImpl<PriceConfigMapper, Price
} else if (StringUtils.isNotBlank(item.getGoodsIds())) {
List<String> goodsNames = new ArrayList<>();
for (String s : item.getGoodsIds().split(",")) {
if (StringUtils.equals(s, "1")) {
if (Strings.CS.equals(s, "1")) {
goodsNames.add("录像集");
} else if (StringUtils.equals(s, "2")) {
} else if (Strings.CS.equals(s, "2")) {
goodsNames.add("照片集");
} else {
if (StringUtils.isNumeric(s)) {

3
src/main/java/com/ycwl/basic/service/printer/impl/PrinterServiceImpl.java
View File

@@ -31,6 +31,7 @@ import com.ycwl.basic.utils.ApiResponse;
import com.ycwl.basic.utils.SnowFlakeUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.Strings;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
@@ -119,7 +120,7 @@ public class PrinterServiceImpl implements PrinterService {
}
List<String> printers = req.getPrinters();
String printersStr = StringUtils.join(printers, ",");
if (!StringUtils.equals(printersStr, printer.getPrinters())) {
if (!Strings.CS.equals(printersStr, printer.getPrinters())) {
printer.setPrinters(printersStr);
printerMapper.update(printer);
}

5
src/main/java/com/ycwl/basic/utils/VideoReUploader.java
View File

@@ -16,6 +16,7 @@ import com.ycwl.basic.storage.enums.StorageAcl;
import com.ycwl.basic.storage.utils.StorageUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.Strings;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -65,7 +66,7 @@ public class VideoReUploader {
}
final String dstFilePath = StorageUtil.joinPath(StorageConstant.VIDEO_PIECE_PATH, entity.getId().toString() + ".mp4");
final IStorageAdapter adapter = scenicService.getScenicStorageAdapter(entity.getScenicId());
if (StringUtils.equals(entity.getVideoUrl(), adapter.getUrl(dstFilePath))) {
if (Strings.CS.equals(entity.getVideoUrl(), adapter.getUrl(dstFilePath))) {
return;
}
String tmpFilePath = UUID.randomUUID().toString();
@@ -103,7 +104,7 @@ public class VideoReUploader {
}
final String dstFilePath = StorageUtil.joinPath(StorageConstant.VLOG_PATH, entity.getTaskId() + "_" + entity.getScenicId() + ".mp4");
final IStorageAdapter adapter = scenicService.getScenicStorageAdapter(entity.getScenicId());
if (StringUtils.equals(entity.getVideoUrl(), adapter.getUrl(dstFilePath))) {
if (Strings.CS.equals(entity.getVideoUrl(), adapter.getUrl(dstFilePath))) {
return;
}
String tmpFilePath = UUID.randomUUID().toString();