更新后端代码

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

@@ -0,0 +1,12 @@
+package com.softegg.freetogo.Evaluate.Dao;
+
+import com.softegg.freetogo.Evaluate.bean.Evaluations;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+/**
+ * @description: 继承Jpa数据库接口类
+ * @author: zhanglinhao
+ * @date: 2024/5/10 9:27
+ */
+public interface EvaluateRepository extends JpaRepository<Evaluations, Integer> {
+}

src/后端/java/Evaluate/bean/Evaluations.java

@@ -0,0 +1,38 @@
+package com.softegg.freetogo.Evaluate.bean;
+
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+/**
+ * @description:
+ * @author:zhanglinhao
+ * @date:2024/5/10 9:07
+ */
+@Entity
+@Table(name = "evaluation")
+@Setter
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+public class Evaluations {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private int eid;
+    @Column(name = "etorname")
+    private String editorName;
+    @Column(name = "etorphone")
+    private String editorPhone;
+    @Column(name = "etedname")
+    private String editedName;
+    @Column(name = "etedphone")
+    private String editedPhone;
+    @Column(name = "createtime")
+    private String ct;
+    @Column(name = "modifytime")
+    private String mt;
+    @Column
+    private String ebody;
+}

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

@@ -0,0 +1,17 @@
+package com.softegg.freetogo.Evaluate.service;
+
+import com.softegg.freetogo.Evaluate.bean.Evaluations;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author:zhanglinhao
+ * @date:2024/5/10 8:52
+ */
+@Service
+public interface evaluateService {
+    List<Evaluations> evaluationList();//获取所有评论
+    void addEvaluation(Evaluations evaluation);//添加评论
+}

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

@@ -0,0 +1,46 @@
+package com.softegg.freetogo.Evaluate.service;
+
+import com.softegg.freetogo.Evaluate.Dao.EvaluateRepository;
+import com.softegg.freetogo.Evaluate.bean.Evaluations;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author:zhanglinhao
+ * @date:2024/5/10 9:25
+ */
+@Component
+public class evaluateServiceImpl implements evaluateService {
+
+    @Autowired
+    EvaluateRepository evaluateRepository;
+
+    /**
+     * @description: 获取所有评论
+     * @param: null
+     * @return: void
+     * @author: zhanglinhao
+     * @date: 2024/5/10 9:25
+     */
+    @Override
+    public List<Evaluations> evaluationList() {
+        System.out.println("查询评论");
+        return evaluateRepository.findAll();
+    }
+
+    /**
+     * @description: 添加评论
+     * @param: evaluation
+     * @return: void
+     * @author: zhanglinhao
+     * @date: 2024/5/10 21:20
+     */
+    @Override
+    public void addEvaluation(Evaluations evaluation) {
+        evaluateRepository.save(evaluation);
+        System.out.println("添加评论" + evaluation.getEbody());
+    }
+}

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

@@ -32,12 +32,17 @@ public class LoginController {
     @PostMapping("login")
     public int Login(@RequestBody Map<String, Object> map) {
         System.out.println(map);
-        System.out.println(map.get("username").toString());
+        System.out.println("phone:"+map.get("phone").toString());
-        System.out.println(map.get("password").toString());
+        System.out.println("password"+map.get("password").toString());
-        return switch (loginService.loginAccount(map.get("username").toString(), map.get("password").toString())) {
+        int tag = loginService.loginAccount(map.get("phone").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;//未输入密码
             default -> 0;
         };
     }
@@ -51,7 +56,9 @@ public class LoginController {
      */
     @PostMapping("register")
     public int Register(@RequestBody Map<String, Object> map) {
-        return switch (loginService.registerAccount(map.get("username").toString(), map.get("password").toString())) {
+        int tag = loginService.registerAccount(map.get("username").toString(), map.get("password").toString());
+        System.out.println("RegisterTag:"+tag);
+        return switch (tag) {
             case 1003 -> 4;//该账户已经注册
             case 1004 -> 5;//注册成功
             default -> 0;

src/后端/java/Login/service/LoginService.java

@@ -10,6 +10,17 @@ 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);//注册
 }

src/后端/java/Login/service/LoginServiceImpl.java

@@ -27,8 +27,12 @@ public class LoginServiceImpl implements LoginService {
      */
     @Override
     public int loginAccount(String phone, String password) {
-        if(Objects.equals(phone, "")||Objects.equals(password,""))
+        if(phone.isEmpty() && password.isEmpty())
-            return 1005;
+            return 1005;//未输入账号密码
+        else if(phone.isEmpty())
+            return 1006;//未输入账号
+        else if(password.isEmpty())
+            return 1007;//未输入密码
         if (usersService.isRegister(phone)) {
             if (usersService.getUserByPhone(phone).getPassword().equals(password))
                 return 1000;//登录成功

src/后端/java/User/bean/Users.java

@@ -12,7 +12,7 @@ import lombok.Setter;
  * @date:2024/5/7 15:36
  */
 @Entity
-@Table(name="users")
+@Table(name = "users")
 @Setter
 @Getter
 @NoArgsConstructor
@@ -43,4 +43,18 @@ public class Users {
     private String nickname;
     @Column
     private int status;
+
+    public Users(String name, String email, String psw, String ct, int rpt, String phone, String nkn, String idc, boolean gender, boolean type, int status) {
+        this.name = name;
+        this.email = email;
+        this.password = psw;
+        this.createtime = ct;
+        this.reputation = rpt;
+        this.phone = phone;
+        this.nickname = nkn;
+        this.IDCard = idc;
+        this.gender = gender;
+        this.membertype = type;
+        this.status = status;
+    }
 }

src/后端/java/User/controller/UsersController.java

@@ -3,12 +3,10 @@ package com.softegg.freetogo.User.controller;
 import com.softegg.freetogo.User.bean.Users;
 import com.softegg.freetogo.User.service.UsersService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.service.annotation.GetExchange;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @description:Users控制类，用于前后端交互
@@ -22,88 +20,178 @@ public class UsersController {
     @Autowired
     private UsersService usersService;
 
+    /**
+     * @description: 查找users表中所有数据
+     * @param: null
+     * @return: java.util.List<com.softegg.freetogo.User.bean.Users>
+     * @author: zhanglinhao
+     * @date: 2024/5/10 8:16
+     */
     @GetMapping("findAll")
     public List<Users> findAll() {
+        System.out.println("响应查找所有数据");
         return usersService.findAll();
     }
 
+    /**
+     * @description: 新增用户
+     * @param: name
+     * @param: email
+     * @param: psw
+     * @param: ct
+     * @param: rpt
+     * @param: phone
+     * @param: nkn
+     * @param: idc
+     * @param: gender
+     * @param: type
+     * @param: status
+     * @return: java.lang.String
+     * @author: zhanglinhao
+     * @date: 2024/5/10 8:17
+     */
     @GetMapping("add")
     public String add(String name,
                       String email,
-                      String psw,
+                      String password,
-                      String ct,
+                      String createtime,
-                      int rpt,
+                      int reputation,
                       String phone,
-                      String nkn,
+                      String nickname,
-                      String idc,
+                      String IDCard,
                       boolean gender,
                       boolean type,
                       int status) {
-        Users user = new Users();
+        Users user = new Users(name, email, password, createtime, reputation, phone, nickname, IDCard, gender, type, status);
-        setUsers(name, email, psw, ct, rpt, phone, nkn, idc, gender, type, user, status);
         usersService.add(user);
+        System.out.println("添加用户");
         return "添加成功";
     }
 
+    /**
+     * @description: 根据id删除用户
+     * @param: id
+     * @return: java.lang.String
+     * @author: zhanglinhao
+     * @date: 2024/5/10 8:17
+     */
     @GetMapping("delbyid")
     public String delById(int id) {
         usersService.deleteById(id);
+        System.out.println("通过id删除用户");
         return "删除成功";
     }
 
+    /**
+     * @description: 根据id获取用户数据
+     * @param: id
+     * @return: com.softegg.freetogo.User.bean.Users
+     * @author: zhanglinhao
+     * @date: 2024/5/10 8:17
+     */
     @GetMapping("findbyid")
     public Users getUserById(int id) {
+        System.out.println("通过id获取用户数据");
         return usersService.getUserById(id);
     }
 
+    /**
+     * @description: 使用GET接收参数更新用户信息
+     * @param: name
+     * @param: email
+     * @param: password
+     * @param: ct
+     * @param: rpt
+     * @param: phone
+     * @param: nkn
+     * @param: idc
+     * @param: gender
+     * @param: type
+     * @param: status
+     * @return: java.lang.String
+     * @author: zhanglinhao
+     * @date: 2024/5/10 8:17
+     */
     @GetMapping("update")
-    public String update(
+    public String update(String name,
-            String name,
+                         String email,
-            String email,
+                         String password,
-            String psw,
+                         String createtime,
-            String ct,
+                         int reputation,
-            int rpt,
+                         String phone,
-            String phone,
+                         String nickname,
-            String nkn,
+                         String IDCard,
-            String idc,
+                         boolean gender,
-            boolean gender,
+                         boolean type,
-            boolean type,
+                         int status) {
-            int status) {//@RequestBody Map<String,Object> map){//HttpServletRequest user) {
-//        int id = Integer.parseInt(user.getParameter("uid"));
-//        String name=user.getParameter("name");
-//        String email=user.getParameter("email");
-//        String psw=user.getParameter("password");
-//        String ct=user.getParameter("createtime");
-//        int rpt=Integer.parseInt(user.getParameter("reputation"));
-//        String phone=user.getParameter("phone");
-//        String nkn=user.getParameter("nickname");
-//        String idc=user.getParameter("IDCard");
-//        boolean gender=false;
-//        boolean type=false;
-//        int status=Integer.parseInt(user.getParameter("status"));
-//        String phone = map.get("phone").toString();
-//        String name = map.get("name").toString();
-//        String email = map.get("email").toString();
-//        String psw=map.get("password").toString();
-//        String ct=map.get("createtime").toString();
-//        int rpt=Integer.parseInt(map.get("reputation").toString());
-//        String nkn=map.get("nickname").toString();
-//        String idc=map.get("IDCard").toString();
-//        boolean gender = true;
-//        boolean type = false;
-//        int status = Integer.parseInt(map.get("status").toString());
         Users User = usersService.getUserByPhone(phone);
         System.out.println(User);
-        setUsers(name, email, psw, ct, rpt, phone, nkn, idc, gender, type, User, status);
+        setUsers(name, email, password, createtime, reputation, phone, nickname, IDCard, gender, type, status, User);
         usersService.update(User);
+        System.out.println("更新用户信息:" + User);
         return "更新成功";
     }
 
+    /**
+     * @description: 使用POST接受参数更新用户信息
+     * @param: user
+     * @return: void
+     * @author: zhanglinhao
+     * @date: 2024/5/10 19:45
+     */
+    @PostMapping("pupdate")
+    public boolean pupdate(@RequestBody Map<String, Map<String,Object>> user) {
+        Map<String,Object> ubody = user.get("user");
+//        System.out.println(ubody);
+//        System.out.println(ubody.get("uid"));
+        Users User = new Users((int)ubody.get("uid"), (String) ubody.get("name"), (String) ubody.get("email"), (String) ubody.get("password"), (String) ubody.get("createtime"), (String) ubody.get("IDCard"), (int)ubody.get("reputation"), (boolean)ubody.get("gender"), (boolean)ubody.get("membertype"), (String) ubody.get("phone"), (String) ubody.get("nickname"), (int)ubody.get("status"));
+        usersService.update(User);
+        return true;
+    }
+
+    /**
+     * @description: 通过手机号获取用户信息
+     * @param: phone
+     * @return: com.softegg.freetogo.User.bean.Users
+     * @author: zhanglinhao
+     * @date: 2024/5/10 8:17
+     */
     @GetMapping("getByPhone")
-    public Users getByPhone(String phone){
+    public Users getByPhone(String phone) {
+        System.out.println("根据手机号获取用户信息:" + phone);
         return usersService.getUserByPhone(phone);
     }
-    private void setUsers(String name, String email, String psw, String ct, int rpt, String phone, String nkn, String idc, boolean gender, boolean type, Users user, int status) {
+
+    /**
+     * @description: 设置user属性
+     * @param: name
+     * @param: email
+     * @param: psw
+     * @param: ct
+     * @param: rpt
+     * @param: phone
+     * @param: nkn
+     * @param: idc
+     * @param: gender
+     * @param: type
+     * @param: status
+     * @param: user
+     * @return: void
+     * @author: zhanglinhao
+     * @date: 2024/5/10 8:18
+     */
+    private void setUsers(String name,
+                          String email,
+                          String psw,
+                          String ct,
+                          int rpt,
+                          String phone,
+                          String nkn,
+                          String idc,
+                          boolean gender,
+                          boolean type,
+                          int status,
+                          Users user) {
         user.setName(name);
         user.setGender(gender);
         user.setPassword(psw);

src/后端/java/User/service/UserServiceImpl.java

@@ -8,9 +8,9 @@ import org.springframework.stereotype.Component;
 import java.util.List;
 
 /**
- * @description:数据库操作接口实现类
+ * @description: 数据库操作接口实现类
- * @author:zhanglinhao
+ * @author: zhanglinhao
- * @date:2024/5/8 8:50
+ * @date: 2024/5/8 8:50
  */
 @Component
 public class UserServiceImpl implements UsersService {
@@ -38,7 +38,7 @@ public class UserServiceImpl implements UsersService {
      */
     public void add(Users user) {
         usersRepository.save(user);
-        System.out.println("添加成功");
+        System.out.println("添加成功:"+user);
     }
 
     /**
@@ -50,7 +50,7 @@ public class UserServiceImpl implements UsersService {
      */
     public void deleteById(int id) {
         usersRepository.deleteById(id);
-        System.out.println("删除成功");
+        System.out.println("删除成功:"+id);
     }
 
     /**
@@ -73,7 +73,7 @@ public class UserServiceImpl implements UsersService {
      */
     public void update(Users user) {
         usersRepository.save(user);
-        System.out.println("更新成功");
+        System.out.println("更新成功:"+user);
     }
 
     /**
@@ -85,7 +85,7 @@ public class UserServiceImpl implements UsersService {
      */
     public boolean isRegister(String phone) {
         Users users = usersRepository.findByPhone(phone);
-        System.out.println(users);
+        System.out.println("正在验证用户是否注册:"+users);
         return users != null;
     }
 
@@ -97,6 +97,7 @@ public class UserServiceImpl implements UsersService {
      * @date: 2024/5/9 22:55
      */
     public Users getUserByPhone(String phone) {
+        System.out.println("通过手机号查找用户:"+phone);
         return usersRepository.findByPhone(phone);
     }
 }

src/后端/java/User/service/UsersService.java

@@ -1,6 +1,7 @@
 package com.softegg.freetogo.User.service;
 
 import com.softegg.freetogo.User.bean.Users;
+import org.springframework.stereotype.Service;
 
 import java.util.List;
 
@@ -9,7 +10,7 @@ import java.util.List;
  * @author:zhanglinhaon
  * @date:2024/5/7 16:06
  */
-
+@Service
 public interface UsersService {
     List<Users> findAll();//查找所有用户