From cd52c4d6d8f9e311645aa1197e8f260e9386e83b Mon Sep 17 00:00:00 2001
From: yz <3614508250@qq.com>
Date: Fri, 4 Aug 2023 15:53:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A0=B9=E6=8D=AEstudentnumb?=
 =?UTF-8?q?er=E8=8E=B7=E5=8F=96=E8=AE=AD=E7=BB=83memberID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/MemberController.java               | 11 +++++++++--
 .../trading_trading/service/MemberService.java     | 14 ++++++++++++--
 src/main/resources/application-test.yml            |  4 ++--
 src/main/resources/application.yml                 |  2 +-
 4 files changed, 24 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 2bf99d7..86fdc7c 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
@@ -81,10 +81,17 @@ public class MemberController {
         return new ResultEntity(HttpStatus.OK, "根据成员ID获取成员对象", member);
     }
 
+    @AnonymousAccess
+    @PostMapping("getPracticeMemberIdByStudentNumberAndPracticeTrainingId")
+    public ResultEntity getPracticeMemberIdByStudentNumberAndPracticeTrainingId(@RequestBody String studentNumber) {
+        Member member = memberService.getPracticeMemberIdByStudentNumberAndPracticeTrainingId(studentNumber,Constant.PRACTICE_TRAINING_ID);
+        return new ResultEntity(HttpStatus.OK, "根据学号获取成员ID", member.getMemberId());
+    }
+
     @AnonymousAccess
     @PostMapping("getMember")
     public ResultEntity getMemberId(@RequestBody JSONObject jsonObject) {
-        String name = jsonObject.getString("name");
+        String studentNumber = jsonObject.getString("studentNumber");
         String trainingId = jsonObject.getString("trainingId");
         String trainingStatus=jsonObject.getString("trainingStatus");
         Integer schoolId =Constant.PRACTICE_SCHOOL_ID;
@@ -94,7 +101,7 @@ public class MemberController {
         if(!Constant.PRACTICE_TRAINING_ID.equals(trainingId)){
             schoolId = jsonObject.getInteger("schoolId");
         }
-        Member member = memberService.selectByNameAndSchoolIdAndTrainingID(name, schoolId, trainingId);
+        Member member = memberService.selectByStudentNumberAndSchoolIdAndTrainingID(studentNumber, schoolId, trainingId);
         Double positionProfitLoss=0.0;
         if(!Constant.TRAINING_STATUS_FINISHED.equals(trainingStatus)){
             positionProfitLoss = takeStashController.flashTotalPositionProfitLoss(member.getMemberId());
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 4c55f13..e63fc5c 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
@@ -180,10 +180,10 @@ public class MemberService {
         return memberMapper.classScoreTrend(schoolId);
     }
 
-    public Member selectByNameAndSchoolIdAndTrainingID(String name, Integer schoolId, String trainingId) {
+    public Member selectByStudentNumberAndSchoolIdAndTrainingID(String studentNumber, Integer schoolId, String trainingId) {
         MemberExample example = new MemberExample();
         MemberExample.Criteria criteria = example.createCriteria();
-        criteria.andSchoolIdEqualTo(schoolId).andNameEqualTo(name).andTrainingIdEqualTo(trainingId);
+        criteria.andSchoolIdEqualTo(schoolId).andStudentNumberEqualTo(studentNumber).andTrainingIdEqualTo(trainingId);
         List<Member> members = memberMapper.selectByExample(example);
         return members.get(0);
     }
@@ -200,6 +200,14 @@ public class MemberService {
         return memberMapper.selectAllTrainingList(schoolId);
     }
 
+    public Member getPracticeMemberIdByStudentNumberAndPracticeTrainingId(String studentNumber,String practiceTrainingId) {
+        MemberExample example = new MemberExample();
+        MemberExample.Criteria criteria = example.createCriteria();
+        criteria.andStudentNumberEqualTo(studentNumber).andTrainingIdEqualTo(practiceTrainingId);
+        List<Member> members = memberMapper.selectByExample(example);
+        return members.get(0);
+    }
+
     public List<Member> findByTrainingId(String trainingId) {
         MemberExample example = new MemberExample();
         example.createCriteria().andTrainingIdEqualTo(trainingId);
@@ -286,4 +294,6 @@ public class MemberService {
     public void updateStuRank(){
         memberMapper.updateStuRank();
     }
+
+
 }
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index 34fa4dd..2e14ebb 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -2,7 +2,7 @@ spring:
   datasource:
     druid:
       db-type: mysql
-      url: jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:foreign_exchange_trading}?useSSL=false&serverTimezone=UTC
+      url: jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:foreign_exchange_trading}?useSSL=false&serverTimezone=UTC
       username: ${DB_USER:root}
       password: ${DB_PWD:sztzjy2017}
       driver-class-name: com.mysql.cj.jdbc.Driver
@@ -11,7 +11,7 @@ spring:
 # 文件存储
 file:
   type: local
-  path: /home/foreignExchangeTrading/file
+  path: /usr/local/tianzeProject/foreignExchange/uploadFile
 
 
 timer:
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 64f2976..839a761 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 server:
-  port: 8800
+  port: 8801
   servlet:
     context-path: /