合并分支

src/后端/java/Evaluate/Dao/EvaluateRepository.java

@@ -12,4 +12,6 @@ import java.util.List;
  */
 public interface EvaluateRepository extends JpaRepository<Evaluations, Integer> {
     List<Evaluations> findByEditorPhone(String phone);
+
+    List<Evaluations> findByEditedPhone(String phone);
 }

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
 }

src/后端/java/Evaluate/controller/EvaluationController.java

@@ -45,7 +45,7 @@ public class EvaluationController {
     }
 
     /**
-     * @description: 通过手机获取评价
+     * @description: 获取该用户对别人的评价
      * @param: phone
      * @return: java.util.List<com.softegg.freetogo.Evaluate.bean.Evaluations>
      * @author: zhanglinhao
@@ -55,4 +55,47 @@ public class EvaluationController {
     public List<Evaluations> 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<Evaluations> elist = evaluateService.getEvaluatedByPhone(phone);
+        float sumOfSatisfaction = 0;
+        for (Evaluations evaluation : elist) {
+            sumOfSatisfaction += evaluation.getSatisfaction();
+        }
+        System.out.println("查询满意度:"+ sumOfSatisfaction);
+        return Float.toString(sumOfSatisfaction /elist.size());
+    }
 }

src/后端/java/Evaluate/service/evaluateService.java

@@ -13,18 +13,14 @@ import java.util.List;
 @Service
 public interface EvaluateService {
     List<Evaluations> evaluationList();//获取所有评论
-<<<<<<< HEAD
-    List<Evaluations> getEListByPhone(String phone);//根据电话筛选评价
-    void addEvaluation(Evaluations evaluation);//添加评论
-
-=======
 
     List<Evaluations> getEListByPhone(String phone);//根据电话筛选评价
 
+    List<Evaluations> getEvaluatedByPhone(String phone);
+
     void addEvaluation(Evaluations evaluation);//添加评论
 
     void editEvaluation(int eid, String ebody);//编辑评论
 
     void deleteEvaluation(int eid);//删除评论
->>>>>>> zhanglinhao_branch
 }

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<com.softegg.freetogo.Evaluate.bean.Evaluations>
+     * @author: zhanglinhao
+     * @date: 2024/5/12 21:21
+     */
+    @Override
+    public List<Evaluations> 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
-
 }

src/后端/java/Login/controller/LoginController.java

@@ -32,11 +32,10 @@ public class LoginController {
     @PostMapping("login")
     public int Login(@RequestBody Map<String, Object> map) {
         System.out.println(map);
-<<<<<<< HEAD
+        System.out.println("phone:" + map.get("phone").toString());
-        System.out.println("phone:"+map.get("phone").toString());
+        System.out.println("password" + map.get("password").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<String, Object> 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"));
-        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);
-        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);

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
     }
 }