From 755e527c1b95349e478203190a71035d4dd88ead Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=B2=85?= <907037276@qq.com> Date: Mon, 24 Jul 2023 16:06:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=BC=96=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MemberController.java | 17 +++++++++++++---- .../forex/trading_trading/entity/Training.java | 2 ++ .../trading_trading/service/MemberService.java | 10 ++++++++++ .../forex/trading_trading/util/TzApi.java | 4 +++- src/main/resources/mappers/MemberMapper.xml | 5 +++-- 5 files changed, 31 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/sztzjy/forex/trading_trading/controller/MemberController.java b/src/main/java/com/sztzjy/forex/trading_trading/controller/MemberController.java index 89056e2..433663f 100644 --- a/src/main/java/com/sztzjy/forex/trading_trading/controller/MemberController.java +++ b/src/main/java/com/sztzjy/forex/trading_trading/controller/MemberController.java @@ -24,6 +24,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.FileNotFoundException; +import java.util.List; @Api(tags = "实训任务用户管理") @@ -62,13 +63,13 @@ public class MemberController { Double positionProfitLoss = takeStashController.flashTotalPositionProfitLoss(member.getMemberId()); member.setPositionProfitLoss(positionProfitLoss); //设置持仓盈亏 Double totalAssets = member.getTotalAssets(); - Double netValue=bigDecimalUtils.add(totalAssets,positionProfitLoss); + Double netValue = bigDecimalUtils.add(totalAssets, positionProfitLoss); member.setNetValue(netValue); //设置净值 Double marginUsed = member.getMarginUsed(); //获取已用保证金 - member.setAvailableFunds(bigDecimalUtils.sub(netValue,marginUsed)); //设置可用资金 - member.setMarginLevel(bigDecimalUtils.div(netValue,marginUsed,2)); //设置保证金水平 + member.setAvailableFunds(bigDecimalUtils.sub(netValue, marginUsed)); //设置可用资金 + member.setMarginLevel(bigDecimalUtils.div(netValue, marginUsed, 2)); //设置保证金水平 - return new ResultEntity(HttpStatus.OK, "获取成员ID",member); + return new ResultEntity(HttpStatus.OK, "获取成员ID", member); } @Permission(codes = PermissionType.TRAINING_MANAGEMENT_SEARCH) @@ -104,4 +105,12 @@ public class MemberController { TokenProvider.getJWTUser(TOKEN); memberService.exportMembers(className, trainingName, markStatus, keyword, response); } + + @Permission(codes = PermissionType.TRAINING_MANAGEMENT_SEARCH) + @ApiOperation("根据实训任务id获取成员列表") + @GetMapping("listMembersByTrainingId") + public ResultEntity> listMembersByTrainingId(@RequestParam String trainingId, @RequestParam Integer index, @RequestParam Integer size) { + PageInfo members = memberService.pageListMemberByTrainingId(trainingId, index, size); + return new ResultEntity>(members); + } } diff --git a/src/main/java/com/sztzjy/forex/trading_trading/entity/Training.java b/src/main/java/com/sztzjy/forex/trading_trading/entity/Training.java index 5b2488f..ece643f 100644 --- a/src/main/java/com/sztzjy/forex/trading_trading/entity/Training.java +++ b/src/main/java/com/sztzjy/forex/trading_trading/entity/Training.java @@ -470,6 +470,8 @@ public class Training { training.schoolId = currentUser.getSchoolId(); training.peopleCount = bo.getPeopleCount()==null?0:bo.getPeopleCount(); training.status = startTime > now ? "NOT_STARTED" : "ONGOING"; + training.createTime = new Date(); + training.updateTime = new Date(); return training; } diff --git a/src/main/java/com/sztzjy/forex/trading_trading/service/MemberService.java b/src/main/java/com/sztzjy/forex/trading_trading/service/MemberService.java index 2f5a144..57cad8d 100644 --- a/src/main/java/com/sztzjy/forex/trading_trading/service/MemberService.java +++ b/src/main/java/com/sztzjy/forex/trading_trading/service/MemberService.java @@ -101,6 +101,16 @@ public class MemberService { return new PageInfo<>(memberMapper.pagedListMembers(example)); } + + public PageInfo pageListMemberByTrainingId(String trainingId,Integer index,Integer size) { + MemberExample example = new MemberExample(); + MemberExample.Criteria criteria = example.createCriteria(); + criteria.andTrainingIdEqualTo(trainingId); + PageHelper.startPage(index, size); + return new PageInfo<>(memberMapper.selectByExample(example)); + } + + public void exportMembers(String className, String trainingName, Integer markStatus, 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 a2b7c95..5c2309d 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 @@ -104,7 +104,7 @@ public class TzApi { public static List> GetStudentInfoByKeywordForForeignExchangeTrading(JwtUser user, String keyword) { String token = getToken(user); String url = GET_STUDENT_BY_KEYWORD + "?keyword=" + keyword; - return getDataFromApi(url, token); + return getStudentsFromApi(url, token); } public static PageInfo> PagedListStudentInfoByClassIdForForeignExchangeTrading(JwtUser user, String classIds, int page, int size) { @@ -157,6 +157,7 @@ public class TzApi { dataMap.put("majorName",node.get("majorName").asText()); dataMap.put("className",node.get("className").asText()); dataMap.put("classId",node.get("classId").asText()); + dataMap.put("studentNo",node.get("studentNo").asText()); dataList.add(dataMap); } } @@ -195,6 +196,7 @@ public class TzApi { 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); } } diff --git a/src/main/resources/mappers/MemberMapper.xml b/src/main/resources/mappers/MemberMapper.xml index 6da2d70..935582b 100644 --- a/src/main/resources/mappers/MemberMapper.xml +++ b/src/main/resources/mappers/MemberMapper.xml @@ -351,7 +351,7 @@ net_value, margin_used, available_funds, margin_level, position_profit_loss, cumulative_profit_loss, yield, opening_trades, closing_trades, - school_id, create_school, training_name + school_id, create_school, training_name,class_id ) values @@ -368,7 +368,8 @@ #{member.yield,jdbcType=DOUBLE}, #{member.openingTrades,jdbcType=INTEGER}, #{member.closingTrades,jdbcType=INTEGER}, #{member.schoolId,jdbcType=INTEGER}, #{member.createSchool,jdbcType=VARCHAR}, - #{member.trainingName,jdbcType=VARCHAR} + #{member.trainingName,jdbcType=VARCHAR}, + #{member.classId,jdbcType=INTEGER} )