From cc186c32c78fcbeea261a0604e5395356a09d45c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=B2=85?= <907037276@qq.com> Date: Tue, 24 Oct 2023 14:06:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=8E=B7=E5=8F=96=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TrainingController.java | 5 ++- .../forex/trading_trading/util/TzApi.java | 37 +++++++++---------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/sztzjy/forex/trading_trading/controller/TrainingController.java b/src/main/java/com/sztzjy/forex/trading_trading/controller/TrainingController.java index 583f8f0..c0c2f78 100644 --- a/src/main/java/com/sztzjy/forex/trading_trading/controller/TrainingController.java +++ b/src/main/java/com/sztzjy/forex/trading_trading/controller/TrainingController.java @@ -33,6 +33,7 @@ import org.w3c.dom.stylesheets.LinkStyle; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import java.io.UnsupportedEncodingException; import java.util.*; import java.util.stream.Collectors; @@ -166,7 +167,7 @@ public class TrainingController { @Permission(codes = PermissionType.TRAINING_MANAGEMENT_ADD) @ApiOperation("教师端----添加实训成员时用：根据学号或者学生名字获取用户信息") @GetMapping("findStudentInfoByKeyword") - public ResultEntity>> findStudentInfoByKeyword(@ApiParam("关键字") @RequestParam String keyword) { + public ResultEntity>> findStudentInfoByKeyword(@ApiParam("关键字") @RequestParam String keyword) throws UnsupportedEncodingException { JwtUser currentUser = TokenProvider.getJWTUser(request); return new ResultEntity>>(HttpStatus.OK, TzApi.GetStudentInfoByKeywordForForeignExchangeTrading(currentUser, keyword)); } @@ -183,7 +184,7 @@ public class TrainingController { @ApiOperation("教师端----成员管理：在已存在的实训记录添加参赛人员") @PostMapping("addMember") public ResultEntity addMember(@ApiParam("实训记录id") @RequestParam String trainingId, - @ApiParam("查询关键字：用户名字或学号") @RequestParam String keyword) { + @ApiParam("查询关键字：用户名字或学号") @RequestParam String keyword) throws UnsupportedEncodingException { Assert.notNull(trainingId, "实训记录不存在"); Assert.isTrue(StringUtils.hasText(keyword), "查询关键字不能为空"); diff --git a/src/main/java/com/sztzjy/forex/trading_trading/util/TzApi.java b/src/main/java/com/sztzjy/forex/trading_trading/util/TzApi.java index 9fc0bea..6956889 100644 --- a/src/main/java/com/sztzjy/forex/trading_trading/util/TzApi.java +++ b/src/main/java/com/sztzjy/forex/trading_trading/util/TzApi.java @@ -9,6 +9,7 @@ import com.sztzjy.forex.trading_trading.config.security.JwtUser; import com.sztzjy.forex.trading_trading.config.security.TokenProvider; import org.springframework.util.StringUtils; +import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.util.ArrayList; import java.util.HashMap; @@ -29,8 +30,8 @@ public class TzApi { private final static String GET_MAJOR = NEW_API_URL + "/server/account/findMajorsBySchoolId.json"; private final static String GET_CLASS_BY_MAJOR = NEW_API_URL + "/server/account/getClassListByMajorId.json"; private final static String GET_STUDENT_BY_ClALL = NEW_API_URL + "/server/account/getStudentsByClassId.json"; - private final static String GET_STUDENT_BY_KEYWORD = API_URL + "/Account/GetStudentInfoByKeywordForForeignExchangeTrading"; - private final static String PAGE_STUDENT_BY_KEYWORD = API_URL + "/Account/PagedListStudentInfoByClassIdForForeignExchangeTrading"; + private final static String GET_STUDENT_BY_KEYWORD = NEW_API_URL + "/server/account/getStudentByKeyword.json"; + private final static String PAGE_STUDENT_BY_KEYWORD = NEW_API_URL + "/server/account/pagedListStudentByClassId.json"; // 智云接口调用token加入缓存，默认1小时过期 private static CacheProvider cacheProvider = new CacheProvider(2400, 6000); @@ -107,9 +108,9 @@ public class TzApi { return getStudentsFromApi(url, token); } - public static List> GetStudentInfoByKeywordForForeignExchangeTrading(JwtUser user, String keyword) { + public static List> GetStudentInfoByKeywordForForeignExchangeTrading(JwtUser user, String keyword) throws UnsupportedEncodingException { String token = getToken(user); - String url = GET_STUDENT_BY_KEYWORD + "?keyword=" + keyword; + String url = GET_STUDENT_BY_KEYWORD + "?keyword=" + URLEncoder.encode(keyword,"UTF-8") +"&schoolId="+user.getSchoolId(); return getStudentsFromApi(url, token); } @@ -182,26 +183,24 @@ public class TzApi { ObjectMapper objectMapper = new ObjectMapper(); JsonNode jsonNode = objectMapper.readTree(responseBody); - JsonNode resultNode = jsonNode.get("result"); - JsonNode dataNode = resultNode.get("data"); - if (dataNode != null) { - pageInfo.setPages(dataNode.get("totalPages").asInt()); - pageInfo.setHasPreviousPage(dataNode.get("hasPreviousPage").asBoolean()); - pageInfo.setHasNextPage(dataNode.get("hasNextPage").asBoolean()); - pageInfo.setTotal(dataNode.get("totalCount").asInt()); - pageInfo.setPageNum(dataNode.get("pageIndex").asInt()); - pageInfo.setPageSize(dataNode.get("pageSize").asInt()); - JsonNode retNode = dataNode.get("data"); + JsonNode resultNode = jsonNode.get("content"); + + if (resultNode != null) { + pageInfo.setPages(resultNode.get("totalPage").asInt()); + pageInfo.setTotal(resultNode.get("totalRow").asInt()); + pageInfo.setPageNum(resultNode.get("pageNumber").asInt()); + pageInfo.setPageSize(resultNode.get("pageSize").asInt()); + JsonNode retNode = resultNode.get("list"); List> dataList = new ArrayList<>(); if(retNode.isArray()){ for(JsonNode node: retNode){ Map dataMap = new HashMap<>(); - dataMap.put("id", node.get("id").asText()); + dataMap.put("id", node.get("userid").asText()); dataMap.put("name", node.get("name").asText()); - dataMap.put("studentNo", node.get("studentNo").asText()); - dataMap.put("className", node.get("className").asText()); - dataMap.put("majorName", node.get("majorName").asText()); - dataMap.put("classId", node.get("classId").asText()); + dataMap.put("studentNo", node.get("studentno").asText()); + dataMap.put("className", node.get("classname").asText()); +// dataMap.put("majorName", node.get("majorName").asText()); + dataMap.put("classId", node.get("classid").asText()); dataList.add(dataMap); } }