From 6707291f226589214f1de20cb37374392155c9f8 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Fri, 12 Jul 2024 11:03:00 +0800
Subject: [PATCH] 1
---
src/main/resources/application.properties | 2 +-
src/main/java/com/nq/utils/stock/sina/StockApi.java | 2 +-
src/main/java/com/nq/controller/UserApiController.java | 14 +++++++++++---
3 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/nq/controller/UserApiController.java b/src/main/java/com/nq/controller/UserApiController.java
index 0176507..baf50d6 100644
--- a/src/main/java/com/nq/controller/UserApiController.java
+++ b/src/main/java/com/nq/controller/UserApiController.java
@@ -26,6 +26,7 @@
import com.nq.utils.redis.RedisShardedPoolUtils;
+import com.nq.utils.translate.GoogleTranslateUtil;
import com.nq.vo.user.UserLoginResultVO;
import javax.annotation.Resource;
@@ -54,6 +55,7 @@
import org.springframework.web.bind.annotation.ResponseBody;
import java.math.BigDecimal;
+import java.util.List;
@Controller
@@ -151,13 +153,13 @@
}
-
@RequestMapping({"moneylogAll.do"})
@ResponseBody
public ServerResponse taskList(@RequestParam(value = "userId") String userId,
@RequestParam(value = "type", required = false) String type,
@RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
- @RequestParam(value = "pageSize", defaultValue = "50") int pageSize) {
+ @RequestParam(value = "pageSize", defaultValue = "50") int pageSize,
+ HttpServletRequest request) {
Page<MoneyLog> page1 = new Page<>(pageNum, pageSize);
QueryWrapper<MoneyLog> queryWrapper = new QueryWrapper<>();
@@ -168,7 +170,13 @@
queryWrapper.eq("type",type);
}
queryWrapper.orderByDesc("create_time");
- return ServerResponse.createBySuccess(moneyLogMapper.selectPage(page1,queryWrapper));
+ Page<MoneyLog> moneyLogPage = moneyLogMapper.selectPage(page1, queryWrapper);
+ List<MoneyLog> records = moneyLogPage.getRecords();
+ records.forEach(f->{
+ f.setDescs( new GoogleTranslateUtil().translate(f.getDescs(),request.getHeader("lang")));
+ });
+ moneyLogPage.setRecords(records);
+ return ServerResponse.createBySuccess(moneyLogPage);
}
}
diff --git a/src/main/java/com/nq/utils/stock/sina/StockApi.java b/src/main/java/com/nq/utils/stock/sina/StockApi.java
index f9f6dd5..76fb377 100644
--- a/src/main/java/com/nq/utils/stock/sina/StockApi.java
+++ b/src/main/java/com/nq/utils/stock/sina/StockApi.java
@@ -56,7 +56,7 @@
stockListVO.setName(stock.getStockName());
stockListVO.setCode(stock.getStockCode());
stockListVO.setSpell(stock.getStockSpell());
- stockListVO.setGid(stock.getStockGid().toUpperCase());
+ stockListVO.setGid(stock.getStockGid());
stockListVO.setStock_plate(stock.getStockPlate());
stockListVO.setStock_type(stock.getStockType());
stockListVOs.add(stockListVO);
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 2781616..c7afa34 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -17,7 +17,7 @@
ftp.user=ftp_stock
ftp.pass=123456
ftp.address =/www/wwwroot/ftp_stock/
-ftp.server.http.prefix=https://img.dfddgj346.xyz/
+ftp.server.http.prefix=https://img.pentagon-member.com/
redis1.ip=localhost
redis1.port=6379
--
Gitblit v1.9.3