diff --git a/src/后端/java/Evaluate/Dao/EvaluateRepository.java b/src/后端/java/Evaluate/Dao/EvaluateRepository.java index 4700ad4..60b0104 100644 --- a/src/后端/java/Evaluate/Dao/EvaluateRepository.java +++ b/src/后端/java/Evaluate/Dao/EvaluateRepository.java @@ -3,10 +3,13 @@ package com.softegg.freetogo.Evaluate.Dao; import com.softegg.freetogo.Evaluate.bean.Evaluations; import org.springframework.data.jpa.repository.JpaRepository; +import java.util.List; + /** * @description: 继承Jpa数据库接口类 * @author: zhanglinhao * @date: 2024/5/10 9:27 */ public interface EvaluateRepository extends JpaRepository { + List findByEditorPhone(String phone); } diff --git a/src/后端/java/Evaluate/service/evaluateService.java b/src/后端/java/Evaluate/service/evaluateService.java index 88e167e..e833253 100644 --- a/src/后端/java/Evaluate/service/evaluateService.java +++ b/src/后端/java/Evaluate/service/evaluateService.java @@ -13,5 +13,7 @@ import java.util.List; @Service public interface evaluateService { List evaluationList();//获取所有评论 + List getEListByPhone(String phone);//根据电话筛选评价 void addEvaluation(Evaluations evaluation);//添加评论 + } diff --git a/src/后端/java/Evaluate/service/evaluateServiceImpl.java b/src/后端/java/Evaluate/service/evaluateServiceImpl.java index 9404172..507c6f8 100644 --- a/src/后端/java/Evaluate/service/evaluateServiceImpl.java +++ b/src/后端/java/Evaluate/service/evaluateServiceImpl.java @@ -30,6 +30,18 @@ public class evaluateServiceImpl implements evaluateService { System.out.println("查询评论"); return evaluateRepository.findAll(); } + /** + * @description: 根据电话筛选评价 + * @param: phone + * @return: java.util.List + * @author: zhanglinhao + * @date: 2024/5/11 16:28 + */ + @Override + public List getEListByPhone(String phone) { + System.out.println("查询"+phone+"的评论"); + return evaluateRepository.findByEditorPhone(phone); + } /** * @description: 添加评论 @@ -43,4 +55,6 @@ public class evaluateServiceImpl implements evaluateService { evaluateRepository.save(evaluation); System.out.println("添加评论" + evaluation.getEbody()); } + + } diff --git a/src/后端/java/Login/controller/LoginController.java b/src/后端/java/Login/controller/LoginController.java index ad174e4..8b5c5fc 100644 --- a/src/后端/java/Login/controller/LoginController.java +++ b/src/后端/java/Login/controller/LoginController.java @@ -34,15 +34,16 @@ public class LoginController { System.out.println(map); System.out.println("phone:"+map.get("phone").toString()); System.out.println("password"+map.get("password").toString()); - int tag = loginService.loginAccount(map.get("phone").toString(), map.get("password").toString()); + int tag = loginService.loginAccount(map.get("name").toString(), map.get("password").toString()); System.out.println("LoginTag:"+tag); return switch (tag) { case 1000 -> 1;//登陆成功 case 1001 -> 2;//密码或账号错误 case 1002 -> 3;//该账户未注册 - case 1005 -> 4;//未输入账号密码 - case 1006 -> 6;//未输入账号 - case 1007 -> 7;//未输入密码 + case 1005 -> 6;//未输入账号密码 + case 1006 -> 7;//未输入账号 + case 1007 -> 8;//未输入密码 + case 1008 -> 9;//身份证输入错误 default -> 0; }; } @@ -56,7 +57,8 @@ public class LoginController { */ @PostMapping("register") public int Register(@RequestBody Map map) { - int tag = loginService.registerAccount(map.get("username").toString(), map.get("password").toString()); + System.out.println(map); + int tag = loginService.registerAccount((String)map.get("name"), (String)map.get("password"),(String)map.get("phone"),(String)map.get("nickname"),(String)map.get("IDCard")); System.out.println("RegisterTag:"+tag); return switch (tag) { case 1003 -> 4;//该账户已经注册 diff --git a/src/后端/java/Login/service/LoginService.java b/src/后端/java/Login/service/LoginService.java index 10b599c..ba67c50 100644 --- a/src/后端/java/Login/service/LoginService.java +++ b/src/后端/java/Login/service/LoginService.java @@ -10,17 +10,11 @@ import org.springframework.stereotype.Service; @Service public interface LoginService { int loginAccount(String phone, String password);//登录 - int registerAccount(String phone, String password); +// int registerAccount(String phone, String password); -// int registerAccount(String name, -// String email, -// String password, -// String createtime, -// int reputation, -// String phone, -// String nickname, -// String IDCard, -// boolean gender, -// boolean type, -// int status);//注册 + int registerAccount(String name, + String password, + String phone, + String nickname, + String IDCard);//注册 } diff --git a/src/后端/java/Login/service/LoginServiceImpl.java b/src/后端/java/Login/service/LoginServiceImpl.java index c276f6e..9c61ccc 100644 --- a/src/后端/java/Login/service/LoginServiceImpl.java +++ b/src/后端/java/Login/service/LoginServiceImpl.java @@ -5,6 +5,7 @@ import com.softegg.freetogo.User.service.UsersService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.time.LocalDateTime; import java.util.Objects; /** @@ -44,22 +45,43 @@ public class LoginServiceImpl implements LoginService { /** * @description: 注册接口实现函数，根据返回码进行操作 - * @param: phone + * @param: name * @param: password + * @param: phone + * @param: nickname + * @param: IDCard * @return: int * @author: zhanglinhao - * @date: 2024/5/9 22:47 + * @date: 2024/5/11 15:57 */ @Override - public int registerAccount(String phone, String password) { + public int registerAccount(String name, + String password, + String phone, + String nickname, + String IDCard) { if (usersService.isRegister(phone)) return 1003;//该账户已经注册 + else if(IDCard.length()!=18) + return 1008;//身份证输入错误 else { + LocalDateTime currentTime = LocalDateTime.now(); + System.out.println("注册信息:姓名:"+name+"密码:"+password+"电话:"+phone+"昵称:"+nickname+"身份证:"+IDCard); Users user = new Users(); user.setPhone(phone); user.setPassword(password); + user.setNickname(nickname); + user.setIDCard(IDCard); + user.setName(name); + user.setCreatetime((currentTime.getYear()+"-"+currentTime.getMonthValue()+"-"+currentTime.getDayOfMonth())); + user.setGender(isMale(IDCard)); usersService.add(user); return 1004;//注册成功 } } + + boolean isMale(String IDCard){ + System.out.println("根据身份证判断性别:"+IDCard+" 第17位:"+IDCard.charAt(16)); + return (int)IDCard.charAt(16) % 2 != 0; + } } diff --git a/src/后端/java/Login/返回码.txt b/src/后端/java/Login/返回码.txt new file mode 100644 index 0000000..d967fb2 --- /dev/null +++ b/src/后端/java/Login/返回码.txt @@ -0,0 +1,9 @@ +1000->1 登录成功 +1001->2 密码或账号错误 +1002->3 该账户未注册 +1003->4 该账户已经注册 +1004->5 注册成功 +1005->6 未输入账号密码 +1006->7 未输入账号 +1007->8 身份证输入错误 +1008->9 \ No newline at end of file