diff --git a/src/后端/java/Evaluate/Dao/EvaluateRepository.java b/src/后端/java/Evaluate/Dao/EvaluateRepository.java index 60b0104..94a675a 100644 --- a/src/后端/java/Evaluate/Dao/EvaluateRepository.java +++ b/src/后端/java/Evaluate/Dao/EvaluateRepository.java @@ -12,4 +12,6 @@ import java.util.List; */ public interface EvaluateRepository extends JpaRepository { List findByEditorPhone(String phone); + + List findByEditedPhone(String phone); } diff --git a/src/后端/java/Evaluate/bean/Evaluations.java b/src/后端/java/Evaluate/bean/Evaluations.java index e1ac580..d90b359 100644 --- a/src/后端/java/Evaluate/bean/Evaluations.java +++ b/src/后端/java/Evaluate/bean/Evaluations.java @@ -20,19 +20,21 @@ import lombok.Setter; public class Evaluations { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - private int eid; + private int eid;//评价id @Column(name = "etorname") - private String editorName; + private String editorName;//评价者姓名 @Column(name = "etorphone") - private String editorPhone; + private String editorPhone;//评价者电话 @Column(name = "etedname") - private String editedName; + private String editedName;//被评价者姓名 @Column(name = "etedphone") - private String editedPhone; + private String editedPhone;//被评价者电话 @Column(name = "createtime") - private String ct; + private String ct;//创建日期 @Column(name = "modifytime") - private String mt; + private String mt;//编辑日期 @Column - private String ebody; + private String ebody;//评价本体 + @Column + private int satisfaction;//满意度整数1-5 } diff --git a/src/后端/java/Evaluate/controller/EvaluationController.java b/src/后端/java/Evaluate/controller/EvaluationController.java index 26f12db..0fa15e9 100644 --- a/src/后端/java/Evaluate/controller/EvaluationController.java +++ b/src/后端/java/Evaluate/controller/EvaluationController.java @@ -45,7 +45,7 @@ public class EvaluationController { } /** - * @description: 通过手机获取评价 + * @description: 获取该用户对别人的评价 * @param: phone * @return: java.util.List * @author: zhanglinhao @@ -55,4 +55,47 @@ public class EvaluationController { public List evaluationByPhone(String phone) { return evaluateService.getEListByPhone(phone); } + + /** + * @description: 编辑评论 + * @param: eid + * @param: ebody + * @return: void + * @author: zhanglinhao + * @date: 2024/5/12 13:31 + */ + @GetMapping("editEvaluation") + public void editEvaluation(int eid, String ebody) { + evaluateService.editEvaluation(eid, ebody); + } + + /** + * @description: 删除评论 + * @param: eid + * @return: void + * @author: zhanglinhao + * @date: 2024/5/12 13:32 + */ + @GetMapping("deleteEvaluation") + public void deleteEvaluation(int eid) { + evaluateService.deleteEvaluation(eid); + } + + /** + * @description: 获取该用户的受满意程度 + * @param: phone + * @return: int + * @author: zhanglinhao + * @date: 2024/5/12 13:39 + */ + @GetMapping("getSatisfaction") + public String getSatisfaction(String phone) { + List elist = evaluateService.getEvaluatedByPhone(phone); + float sumOfSatisfaction = 0; + for (Evaluations evaluation : elist) { + sumOfSatisfaction += evaluation.getSatisfaction(); + } + System.out.println("查询满意度:"+ sumOfSatisfaction); + return Float.toString(sumOfSatisfaction /elist.size()); + } } diff --git a/src/后端/java/Evaluate/service/evaluateService.java b/src/后端/java/Evaluate/service/evaluateService.java index e96e43e..1c1abca 100644 --- a/src/后端/java/Evaluate/service/evaluateService.java +++ b/src/后端/java/Evaluate/service/evaluateService.java @@ -13,18 +13,14 @@ import java.util.List; @Service public interface EvaluateService { List evaluationList();//获取所有评论 -<<<<<<< HEAD - List getEListByPhone(String phone);//根据电话筛选评价 - void addEvaluation(Evaluations evaluation);//添加评论 - -======= List getEListByPhone(String phone);//根据电话筛选评价 + List getEvaluatedByPhone(String phone); + void addEvaluation(Evaluations evaluation);//添加评论 void editEvaluation(int eid, String ebody);//编辑评论 void deleteEvaluation(int eid);//删除评论 ->>>>>>> zhanglinhao_branch } diff --git a/src/后端/java/Evaluate/service/evaluateServiceImpl.java b/src/后端/java/Evaluate/service/evaluateServiceImpl.java index da3e305..c0d1c39 100644 --- a/src/后端/java/Evaluate/service/evaluateServiceImpl.java +++ b/src/后端/java/Evaluate/service/evaluateServiceImpl.java @@ -57,6 +57,18 @@ public class EvaluateServiceImpl implements EvaluateService { return evaluateRepository.findByEditorPhone(phone); } + /** + * @description: 获取该用户所有被他人评价的评价 + * @param: phone + * @return: java.util.List + * @author: zhanglinhao + * @date: 2024/5/12 21:21 + */ + @Override + public List getEvaluatedByPhone(String phone) { + return evaluateRepository.findByEditedPhone(phone); + } + /** * @description: 添加评论 * @param: evaluation @@ -70,8 +82,6 @@ public class EvaluateServiceImpl implements EvaluateService { System.out.println("添加评论" + evaluation.getEbody()); } -<<<<<<< HEAD -======= /** * @description: 编辑评论 * @param: eid @@ -103,7 +113,4 @@ public class EvaluateServiceImpl implements EvaluateService { evaluateRepository.deleteById(eid); System.out.println("删除评论:" + eid); } - ->>>>>>> zhanglinhao_branch - } diff --git a/src/后端/java/Login/controller/LoginController.java b/src/后端/java/Login/controller/LoginController.java index 773907c..589dc18 100644 --- a/src/后端/java/Login/controller/LoginController.java +++ b/src/后端/java/Login/controller/LoginController.java @@ -32,11 +32,10 @@ public class LoginController { @PostMapping("login") public int Login(@RequestBody Map map) { System.out.println(map); -<<<<<<< HEAD - System.out.println("phone:"+map.get("phone").toString()); - System.out.println("password"+map.get("password").toString()); + System.out.println("phone:" + map.get("phone").toString()); + System.out.println("password" + map.get("password").toString()); int tag = loginService.loginAccount(map.get("name").toString(), map.get("password").toString()); - System.out.println("LoginTag:"+tag); + System.out.println("LoginTag:" + tag); ======= System.out.println("phone:" + map.get("phone").toString()); System.out.println("password" + map.get("password").toString()); @@ -65,9 +64,8 @@ public class LoginController { @PostMapping("register") public int Register(@RequestBody Map map) { System.out.println(map); -<<<<<<< HEAD - 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); + 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); ======= 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); diff --git a/src/后端/java/Login/service/LoginServiceImpl.java b/src/后端/java/Login/service/LoginServiceImpl.java index cf4c5ed..319f3cf 100644 --- a/src/后端/java/Login/service/LoginServiceImpl.java +++ b/src/后端/java/Login/service/LoginServiceImpl.java @@ -6,8 +6,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.time.LocalDateTime; -<<<<<<< HEAD -import java.util.Objects; ======= >>>>>>> zhanglinhao_branch @@ -65,44 +63,26 @@ public class LoginServiceImpl implements LoginService { String IDCard) { if (usersService.isRegister(phone)) return 1003;//该账户已经注册 -<<<<<<< HEAD - else if(IDCard.length()!=18) - return 1008;//身份证输入错误 - else { - LocalDateTime currentTime = LocalDateTime.now(); - System.out.println("注册信息:姓名:"+name+"密码:"+password+"电话:"+phone+"昵称:"+nickname+"身份证:"+IDCard); -======= else if (IDCard.length() != 18) return 1008;//身份证输入错误 else { LocalDateTime currentTime = LocalDateTime.now(); System.out.println("注册信息:姓名:" + name + "密码:" + password + "电话:" + phone + "昵称:" + nickname + "身份证:" + IDCard); ->>>>>>> zhanglinhao_branch Users user = new Users(); user.setPhone(phone); user.setPassword(password); user.setNickname(nickname); user.setIDCard(IDCard); user.setName(name); -<<<<<<< HEAD - user.setCreatetime((currentTime.getYear()+"-"+currentTime.getMonthValue()+"-"+currentTime.getDayOfMonth())); -======= user.setCreatetime((currentTime.getYear() + "-" + currentTime.getMonthValue() + "-" + currentTime.getDayOfMonth())); ->>>>>>> zhanglinhao_branch user.setGender(isMale(IDCard)); usersService.add(user); return 1004;//注册成功 } } -<<<<<<< HEAD - boolean isMale(String IDCard){ - System.out.println("根据身份证判断性别:"+IDCard+" 第17位:"+IDCard.charAt(16)); - return (int)IDCard.charAt(16) % 2 != 0; -======= boolean isMale(String IDCard) { System.out.println("根据身份证判断性别:" + IDCard + " 第17位:" + IDCard.charAt(16)); return (int) IDCard.charAt(16) % 2 != 0; ->>>>>>> zhanglinhao_branch } }