Merge branch 'develop' of https://bdgit.educoder.net/mwxbgi697/softegg into develop

src/后端/java/Configurer.java

@@ -18,7 +18,7 @@ public class Configurer implements WebMvcConfigurer {
                 .allowCredentials(true)
                 //放行哪些原始域
                 .allowedOriginPatterns("*")
-                .allowedMethods(new String[]{"GET", "POST", "PUT", "DELETE"})
+                .allowedMethods("GET", "POST", "PUT", "DELETE")
                 .allowedHeaders("*")
                 .exposedHeaders("*");
     }

src/后端/java/Demand/Dao/DemandsRepository.java

@@ -0,0 +1,13 @@
+package com.softegg.freetogo.Demand.Dao;
+
+import com.softegg.freetogo.Demand.bean.Demands;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+/**
+ * @description:继承Jpa数据库接口类
+ * @author:wuyifan
+ * @date:2024/5/10 19:50
+ */
+public interface DemandsRepository extends JpaRepository<Demands, Integer> {
+
+}

src/后端/java/Demand/bean/Demands.java

@@ -0,0 +1,47 @@
+package com.softegg.freetogo.Demand.bean;
+
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+/**
+ * @description:数据库中表demand的对应实体类
+ * @author:wuyifan
+ * @date:2024/5/10 11:36
+ */
+@Entity
+@Table(name="demands")
+@Setter
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+public class Demands {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer uid;
+    @Column
+    private String phone;//游客手机号码
+    @Column
+    private boolean touristGender;//游客性别 ture:male, false:female
+    @Column
+    private String nickname;//发布需求的游客昵称信息
+    @Column
+    private String createTime;//需求发布时间
+    @Column
+    private String departureDate;//游客需求起始日期
+    @Column
+    private String endDate;//游客需求结束日期
+    @Column
+    private String sumDay;//游客旅游总天数
+    @Column
+    private String city;//发布需求的目的城市
+    @Column
+    private String message;//需求备注内容
+//    @Column
+//    private boolean guideGender;//希望导游性别
+//    @Column
+//    private int status;
+
+}

src/后端/java/Demand/controller/DemandsController.java

@@ -0,0 +1,85 @@
+package com.softegg.freetogo.Demand.controller;
+
+import com.softegg.freetogo.Demand.bean.Demands;
+import com.softegg.freetogo.Demand.service.DemandsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @description:Demand控制类，用于前后端交互
+ * @author:wuyifan
+ * @date:2024/5/10 11:40
+ */
+@RestController
+//@CrossOrigin(origins = "*")
+@RequestMapping("/demands")
+public class DemandsController {
+    @Autowired
+    private DemandsService demandsService;
+
+    @GetMapping("findAll")
+    public List<Demands> findAll() {
+        return demandsService.findAll();
+    }
+
+    @GetMapping("add")
+    public String add(String phone,
+                      boolean tGender,
+                      String nkn,
+                      String ct,
+                      String dDate,
+                      String eDate,
+                      String sDay,
+                      String city,
+                      String message) {
+        Demands demand = new Demands();
+        setDemands(phone, tGender, nkn, ct, dDate, eDate, sDay, city, message, demand);
+        demandsService.add(demand);
+        return "添加成功";
+    }
+
+    @GetMapping("delbyid")
+    public String delById(int id) {
+        demandsService.deleteById(id);
+        return "删除成功";
+    }
+
+    @GetMapping("findbyid")
+    public Demands getUserById(int id) {
+        return demandsService.getDemandById(id);
+    }
+
+    @GetMapping("update")
+    public String update(int id,
+                         String phone,
+                         boolean tGender,
+                         String nkn,
+                         String ct,
+                         String dDate,
+                         String eDate,
+                         String sDay,
+                         String city,
+                         String message) {
+        Demands demand = demandsService.getDemandById(id);
+        setDemands(phone, tGender, nkn, ct, dDate, eDate, sDay, city, message, demand);
+        demandsService.update(demand);
+        return "更新成功";
+    }
+
+    private void setDemands(String phone, boolean tGender, String nkn, String ct, String dDate, String eDate, String sDay, String city, String message, Demands demand) {
+        demand.setPhone(phone);
+        demand.setTouristGender(tGender);
+        demand.setNickname(nkn);
+        demand.setCreateTime(ct);
+        demand.setDepartureDate(dDate);
+        demand.setEndDate(eDate);
+        demand.setSumDay(sDay);
+        demand.setCity(city);
+        demand.setMessage(message);
+//        demand.setGuideGender(gGender);
+    }
+}

src/后端/java/Demand/service/DemandsService.java

@@ -0,0 +1,23 @@
+package com.softegg.freetogo.Demand.service;
+
+import com.softegg.freetogo.Demand.bean.Demands;
+
+import java.util.List;
+
+/**
+ * @description:数据库操作抽象接口类
+ * @author:wuyifan
+ * @date:2024/5/10 20：59
+ */
+public interface DemandsService {
+    List<Demands> findAll();//查找所有需求
+
+    void add(Demands demand);//以demand为用户入库
+
+    void deleteById(int id);//删除对应id需求
+
+    Demands getDemandById(int id);//获得对应id需求
+
+    void update(Demands demand);//更新需求信息
+
+}

src/后端/java/Demand/service/DemandsServiceImpl.java

@@ -0,0 +1,92 @@
+package com.softegg.freetogo.Demand.service;
+
+import com.softegg.freetogo.Demand.Dao.DemandsRepository;
+import com.softegg.freetogo.Demand.bean.Demands;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @description:数据库操作接口实现类
+ * @author:wuyifan
+ * @date:2024/5/10 19:50
+ */
+@Component
+public class DemandsServiceImpl implements DemandsService {
+    @Autowired
+    private DemandsRepository DemandsRepository;
+
+    /**
+     * @description: 查找所有游客需求
+     * @param: null
+     * @return: java.util.List<com.softegg.freetogo.Demand.Bean.Demands>
+     * @author: wuyifan
+     * @date: 2024/5/10 19:53
+     */
+    public List<Demands> findAll() {
+        System.out.println("查询成功");
+        return DemandsRepository.findAll();
+    }
+
+    /**
+     * @description: 以demand为游客需求入库
+     * @param: demand
+     * @return: void
+     * @author: wuyifan
+     * @date: 2024/5/10 19:55
+     */
+    public void add(Demands demand) {
+        DemandsRepository.save(demand);
+        System.out.println("添加成功");
+    }
+
+    /**
+     * @description: 删除对应序号id的需求
+     * @param: id
+     * @return: void
+     * @author: wuyifan
+     * @date: 2024/5/10 19:59
+     */
+    public void deleteById(int id) {
+        DemandsRepository.deleteById(id);
+        System.out.println("删除成功");
+    }
+
+    /**
+     * @description: 获得对应序号id的需求
+     * @param: id
+     * @return: com.softegg.freetogo.Demand.Bean.Demands
+     * @author: wuyifan
+     * @date: 2024/5/10 20:02
+     */
+    public Demands getDemandById(int id) {
+        return DemandsRepository.findById(id).orElse(null);
+    }
+
+    /**
+     * @description: 更新需求信息
+     * @param: demand
+     * @return: void
+     * @author: wuyifan
+     * @date: 2024/5/10 20:05
+     */
+    public void update(Demands demand) {
+        DemandsRepository.save(demand);
+        System.out.println("更新成功");
+    }
+
+//    /**
+//     * @description: 判断相同需求是否已经入库
+//     * @param: id
+//     * @return: boolean
+//     * @author: wuyifan
+//     * @date: 2024/5/10 20:05
+//     */
+//    public boolean isRegister(int id) {
+//        Demands demand = DemandsRepository.findById(id);
+//        System.out.println(demand);
+//        return users != null;
+//    }
+
+}

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<Evaluations, Integer> {
+    List<Evaluations> findByEditorPhone(String phone);
 }

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

@@ -0,0 +1,58 @@
+package com.softegg.freetogo.Evaluate.controller;
+
+import com.softegg.freetogo.Evaluate.bean.Evaluations;
+import com.softegg.freetogo.Evaluate.service.EvaluateService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @description: 对评价的操作
+ * @author: zhanglinhao
+ * @date: 2024/5/11 17:33
+ */
+@RestController
+@RequestMapping("/evaluate")
+public class EvaluationController {
+    @Autowired
+    EvaluateService evaluateService;
+
+    /**
+     * @description: 获取所有需求
+     * @param: null
+     * @return: java.util.List<com.softegg.freetogo.Evaluate.bean.Evaluations>
+     * @author: zhanglinhao
+     * @date: 2024/5/12 0:11
+     */
+    @GetMapping("findAllEvaluation")
+    public List<Evaluations> findAllEvaluation() {
+        return evaluateService.evaluationList();
+    }
+
+    /**
+     * @description: 添加评价
+     * @param: ebody
+     * @return: void
+     * @author: zhanglinhao
+     * @date: 2024/5/12 0:28
+     */
+    @PostMapping("addEvaluation")
+    public void addEvaluation(@RequestBody Map<String, Evaluations> ebody) {
+        Evaluations evaluation = ebody.get("evaluation");
+        evaluateService.addEvaluation(evaluation);
+    }
+
+    /**
+     * @description: 通过手机获取评价
+     * @param: phone
+     * @return: java.util.List<com.softegg.freetogo.Evaluate.bean.Evaluations>
+     * @author: zhanglinhao
+     * @date: 2024/5/12 0:30
+     */
+    @GetMapping("evaluationByPhone")
+    public List<Evaluations> evaluationByPhone(String phone) {
+        return evaluateService.getEListByPhone(phone);
+    }
+}

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

@@ -11,7 +11,20 @@ import java.util.List;
  * @date:2024/5/10 8:52
  */
 @Service
-public interface evaluateService {
+public interface EvaluateService {
     List<Evaluations> evaluationList();//获取所有评论
+<<<<<<< HEAD
+    List<Evaluations> getEListByPhone(String phone);//根据电话筛选评价
     void addEvaluation(Evaluations evaluation);//添加评论
+
+=======
+
+    List<Evaluations> getEListByPhone(String phone);//根据电话筛选评价
+
+    void addEvaluation(Evaluations evaluation);//添加评论
+
+    void editEvaluation(int eid, String ebody);//编辑评论
+
+    void deleteEvaluation(int eid);//删除评论
+>>>>>>> zhanglinhao_branch
 }

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

@@ -6,6 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
+import java.util.Optional;
 
 /**
  * @description:
@@ -13,7 +14,7 @@ import java.util.List;
  * @date:2024/5/10 9:25
  */
 @Component
-public class evaluateServiceImpl implements evaluateService {
+public class EvaluateServiceImpl implements EvaluateService {
 
     @Autowired
     EvaluateRepository evaluateRepository;
@@ -30,6 +31,31 @@ public class evaluateServiceImpl implements evaluateService {
         System.out.println("查询评论");
         return evaluateRepository.findAll();
     }
+    /**
+     * @description: 根据电话筛选评价
+     * @param: phone
+     * @return: java.util.List<com.softegg.freetogo.Evaluate.bean.Evaluations>
+     * @author: zhanglinhao
+     * @date: 2024/5/11 16:28
+     */
+    @Override
+    public List<Evaluations> getEListByPhone(String phone) {
+        System.out.println("查询"+phone+"的评论");
+        return evaluateRepository.findByEditorPhone(phone);
+    }
+
+    /**
+     * @description: 根据电话筛选评价
+     * @param: phone
+     * @return: java.util.List<com.softegg.freetogo.Evaluate.bean.Evaluations>
+     * @author: zhanglinhao
+     * @date: 2024/5/11 16:28
+     */
+    @Override
+    public List<Evaluations> getEListByPhone(String phone) {
+        System.out.println("查询" + phone + "的评论");
+        return evaluateRepository.findByEditorPhone(phone);
+    }
 
     /**
      * @description: 添加评论
@@ -43,4 +69,41 @@ public class evaluateServiceImpl implements evaluateService {
         evaluateRepository.save(evaluation);
         System.out.println("添加评论" + evaluation.getEbody());
     }
+
+<<<<<<< HEAD
+=======
+    /**
+     * @description: 编辑评论
+     * @param: eid
+     * @return: void
+     * @author: zhanglinhao
+     * @date: 2024/5/11 17:10
+     */
+    @Override
+    public void editEvaluation(int eid, String ebody) {
+        System.out.println("编辑评论:" + eid);
+        Optional<Evaluations> opt = evaluateRepository.findById(eid);
+        if (opt.isPresent()) {
+            Evaluations evaluation = opt.get();
+            evaluation.setEbody(ebody);
+            evaluateRepository.save(evaluation);
+            System.out.println("编辑成功:" + eid);
+        }
+    }
+
+    /**
+     * @description: 删除评论
+     * @param: eid
+     * @return: void
+     * @author: zhanglinhao
+     * @date: 2024/5/11 17:28
+     */
+    @Override
+    public void deleteEvaluation(int eid) {
+        evaluateRepository.deleteById(eid);
+        System.out.println("删除评论:" + eid);
+    }
+
+>>>>>>> zhanglinhao_branch
+
 }

src/后端/java/FreeToGoApplication.java

@@ -1,9 +1,7 @@
 package com.softegg.freetogo;
 
-import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
 
 @SpringBootApplication
 public class FreeToGoApplication {

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

@@ -1,42 +0,0 @@
-package com.softegg.freetogo.Login;
-
-import org.apache.ibatis.annotations.Param;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-
-/**
- * @description:
- * @author:zhanglinhao
- * @date:2024/5/9 9:35
- */
-@RestController
-//@CrossOrigin(origins = "*")
-@RequestMapping("/Login")
-public class LoginController {
-    @Autowired
-    LoginService loginService;
-
-    @PostMapping("login")
-    public String Login(@RequestBody Map<String,Object> map){
-        System.out.println(map);
-        System.out.println(map.get("username").toString());
-        System.out.println(map.get("password").toString());
-        return switch (loginService.loginAccount( map.get("username").toString(), map.get("password").toString())) {
-            case 1000 -> "登陆成功";
-            case 1001 -> "密码错误";
-            case 1002 -> "未注册";
-            default -> null;
-        };
-    }
-
-    @PostMapping("register")
-    public String Register(@RequestBody Map<String,Object> map){
-        return switch (loginService.registerAccount(map.get("username").toString(), map.get("password").toString())) {
-            case 1003 -> "已注册";
-            case 1004 -> "注册成功";
-            default -> null;
-        };
-    }
-}

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

@@ -1,16 +0,0 @@
-package com.softegg.freetogo.Login;
-
-import jakarta.annotation.Resource;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Service;
-
-/**
- * @description:
- * @author:zhanglinhao
- * @date:2024/5/9 8:37
- */
-@Service
-public interface LoginService {
-    int loginAccount(String phone,String password);
-    int registerAccount(String phone,String password);
-}

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

@@ -1,52 +0,0 @@
-package com.softegg.freetogo.Login;
-
-import com.softegg.freetogo.Users;
-import com.softegg.freetogo.UsersService;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-/**
- * @description:
- * @author:zhanglinhao
- * @date:2024/5/9 9:33
- */
-@Component
-public class LoginServiceImpl implements LoginService{
-    @Autowired
-    UsersService usersService;
-    /**
-     * @param phone
-     * @param password
-     * @return
-     */
-    @Override
-    public int loginAccount(String phone,String password){
-        if(usersService.isRegister(phone)){
-            if(usersService.getUserByPhone(phone).getPassword().equals(password))
-                return 1000;
-            else
-                return 1001;
-        }
-        else
-            return 1002;
-    }
-
-    /**
-     * @param phone
-     * @param password
-     * @return
-     */
-    @Override
-    public int registerAccount(String phone,String password) {
-        if (usersService.isRegister(phone))
-            return 1003;
-        else {
-            Users user = new Users();
-            user.setPhone(phone);
-            user.setPassword(password);
-            usersService.add(user);
-            return 1004;
-        }
-    }
-}

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

@@ -32,17 +32,25 @@ 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("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);
+=======
+        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);
+>>>>>>> zhanglinhao_branch
         return switch (tag) {
             case 1000 -> 1;//登陆成功
             case 1001 -> 2;//密码或账号错误
             case 1002 -> 3;//该账户未注册
-            case 1005 -> 4;//未输入账号密码
+            case 1005 -> 6;//未输入账号密码
-            case 1006 -> 6;//未输入账号
+            case 1006 -> 7;//未输入账号
-            case 1007 -> 7;//未输入密码
+            case 1007 -> 8;//未输入密码
+            case 1008 -> 9;//身份证输入错误
             default -> 0;
         };
     }
@@ -56,8 +64,14 @@ public class LoginController {
      */
     @PostMapping("register")
     public int Register(@RequestBody Map<String, Object> map) {
-        int tag = loginService.registerAccount(map.get("username").toString(), map.get("password").toString());
+        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);
+>>>>>>> zhanglinhao_branch
         return switch (tag) {
             case 1003 -> 4;//该账户已经注册
             case 1004 -> 5;//注册成功

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,
+    int registerAccount(String name,
-//                        String email,
+                        String password,
-//                        String password,
+                        String phone,
-//                        String createtime,
+                        String nickname,
-//                        int reputation,
+                        String IDCard);//注册
-//                        String phone,
-//                        String nickname,
-//                        String IDCard,
-//                        boolean gender,
-//                        boolean type,
-//                        int status);//注册
 }

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

@@ -5,7 +5,11 @@ import com.softegg.freetogo.User.service.UsersService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.time.LocalDateTime;
+<<<<<<< HEAD
 import java.util.Objects;
+=======
+>>>>>>> zhanglinhao_branch
 
 /**
  * @description:登录服务实现类
@@ -27,11 +31,11 @@ public class LoginServiceImpl implements LoginService {
      */
     @Override
     public int loginAccount(String phone, String password) {
-        if(phone.isEmpty() && password.isEmpty())
+        if (phone.isEmpty() && password.isEmpty())
             return 1005;//未输入账号密码
-        else if(phone.isEmpty())
+        else if (phone.isEmpty())
             return 1006;//未输入账号
-        else if(password.isEmpty())
+        else if (password.isEmpty())
             return 1007;//未输入密码
         if (usersService.isRegister(phone)) {
             if (usersService.getUserByPhone(phone).getPassword().equals(password))
@@ -44,22 +48,61 @@ 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;//该账户已经注册
+<<<<<<< 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
+    }
 }

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

src/后端/java/SendDemand/controller/SendDemandController.java

@@ -0,0 +1,41 @@
+package com.softegg.freetogo.SendDemand.controller;
+
+import com.softegg.freetogo.SendDemand.service.SendDemandService;
+import com.softegg.freetogo.Demand.Dao.DemandsRepository;
+import com.softegg.freetogo.Demand.bean.Demands;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+/**
+ * @description:登录服务前后端交互
+ * @author:wuyifan
+ * @date:2024/5/10 23:09
+ */
+
+@RestController
+//@CrossOrigin(origins = "*")
+@RequestMapping("/SendDemand")
+public class SendDemandController {
+
+    @Autowired
+    SendDemandService sendDemandService;
+
+    /**
+     * @description: 发送需求的交互逻辑
+     * @param: map
+     * @return: java.lang.String
+     * @author: zhanglinhao
+     * @date: 2024/5/9 22:45
+     */
+    @PostMapping("register")
+    public int SendDemand(@RequestBody Map<String, Object> map) {
+        return switch (sendDemandService.sendnewDemandAccount(map.get("city").toString(), map.get("phone").toString())){
+            case 1005 -> 1;//需求发送成功
+            default -> 0;
+        };
+    }
+}

src/后端/java/SendDemand/service/SendDemandService.java

@@ -0,0 +1,13 @@
+package com.softegg.freetogo.SendDemand.service;
+
+import org.springframework.stereotype.Service;
+
+/**
+ * @description:抽象需求发送服务接口类
+ * @author:wuyifan
+ * @date:2024/5/10 23:31
+ */
+@Service
+public interface SendDemandService {
+    int sendnewDemandAccount(String city, String phone);
+}

src/后端/java/SendDemand/service/SendDemandServiceImpl.java

@@ -0,0 +1,39 @@
+package com.softegg.freetogo.SendDemand.service;
+
+import com.softegg.freetogo.Demand.bean.Demands;
+import com.softegg.freetogo.Demand.service.DemandsService;
+import com.softegg.freetogo.User.service.UsersService;
+import com.softegg.freetogo.User.bean.Users;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * @description:需求服务实现类
+ * @author:wuyifan
+ * @date:2024/5/10 23:10
+ */
+@Component
+public class SendDemandServiceImpl implements SendDemandService {
+    @Autowired
+    DemandsService demandsService;
+    UsersService usersService;
+    /**
+     * @description: 注册接口实现函数，根据返回码进行操作
+     * @param: city
+     * @return: int
+     * @author: wuyifan
+     * @date: 2024/5/10 23:25
+     */
+
+    @Override
+    public int sendnewDemandAccount(String city, String phone) {
+        Demands demand = new Demands();
+        Users user = usersService.getUserByPhone(phone);
+        demand.setPhone(phone);
+        demand.setCity(city);
+        demand.setTouristGender(user.isGender());
+        demand.setNickname(user.getNickname());
+        demandsService.add(demand);
+        return 1005;//添加需求成功
+    }
+}

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

@@ -15,7 +15,7 @@ import java.util.Map;
  */
 @RestController
 //@CrossOrigin(origins = "*")
-@RequestMapping("/users")
+@RequestMapping("/Users")
 public class UsersController {
     @Autowired
     private UsersService usersService;
@@ -140,11 +140,21 @@ public class UsersController {
      * @date: 2024/5/10 19:45
      */
     @PostMapping("pupdate")
-    public boolean pupdate(@RequestBody Map<String, Map<String,Object>> user) {
+    public boolean pupdate(@RequestBody Map<String, Map<String, Object>> user) {
-        Map<String,Object> ubody = user.get("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"));
+        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;
+    }
+
+    @PostMapping("Pupdate")
+    public boolean Pupdate(@RequestBody Map<String, Users> user) {
+        Users ubody = user.get("user");
+        System.out.println(ubody);
+//        System.out.println(ubody.get("uid"));
+        Users User = new Users(ubody.getUid(), ubody.getName(), ubody.getEmail(), ubody.getPassword(), ubody.getCreatetime(), ubody.getIDCard(), ubody.getReputation(), ubody.isGender(), ubody.isMembertype(), ubody.getPhone(), ubody.getNickname(), ubody.getStatus());
         usersService.update(User);
         return true;
     }

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

@@ -38,7 +38,7 @@ public class UserServiceImpl implements UsersService {
      */
     public void add(Users user) {
         usersRepository.save(user);
-        System.out.println("添加成功:"+user);
+        System.out.println("添加成功:" + user);
     }
 
     /**
@@ -50,7 +50,7 @@ public class UserServiceImpl implements UsersService {
      */
     public void deleteById(int id) {
         usersRepository.deleteById(id);
-        System.out.println("删除成功:"+id);
+        System.out.println("删除成功:" + id);
     }
 
     /**
@@ -73,7 +73,7 @@ public class UserServiceImpl implements UsersService {
      */
     public void update(Users user) {
         usersRepository.save(user);
-        System.out.println("更新成功:"+user);
+        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,7 +97,7 @@ public class UserServiceImpl implements UsersService {
      * @date: 2024/5/9 22:55
      */
     public Users getUserByPhone(String phone) {
-        System.out.println("通过手机号查找用户:"+phone);
+        System.out.println("通过手机号查找用户:" + phone);
         return usersRepository.findByPhone(phone);
     }
 }

src/后端/java/UserServiceImpl.java

@@ -1,51 +0,0 @@
-package com.softegg.freetogo;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * @description:UsersService接口实现类
- * @author:zhanglinhao
- * @date:2024/5/8 8:50
- */
-@Component
-public class UserServiceImpl implements UsersService{
-    @Autowired
-    private UsersRepository usersRepository;
-
-    public List<Users> findAll(){
-        System.out.println("查询成功");
-        return usersRepository.findAll();
-    }
-
-    public void add(Users user){
-        usersRepository.save(user);
-        System.out.println("添加成功");
-    }
-
-    public void deleteById(int id){
-        usersRepository.deleteById(id);
-        System.out.println("删除成功");
-    }
-
-    public Users getUserById(int id) {
-        return usersRepository.findById(id).orElse(null);
-    }
-
-    public void update(Users user){
-        usersRepository.save(user);
-        System.out.println("更新成功");
-    }
-
-    public boolean isRegister(String phone){
-        Users users = usersRepository.findByPhone(phone);
-        System.out.println(users);
-        return users != null;
-    }
-
-    public Users getUserByPhone(String phone){
-        return usersRepository.findByPhone(phone);
-    }
-}

src/后端/java/Users.java

@@ -1,44 +0,0 @@
-package com.softegg.freetogo;
-
-import jakarta.persistence.*;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
-/**
- * @description:数据库中表users的对应实体类
- * @author:zhanglinhao
- * @date:2024/5/7 15:36
- */
-@Entity
-@Table(name="users")
-@Setter
-@Getter
-@NoArgsConstructor
-@AllArgsConstructor
-public class Users {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Integer uid;
-    @Column
-    private String name;
-    @Column
-    private String email;
-    @Column
-    private String password;
-    @Column
-    private String createtime;
-    @Column
-    private String IDCard;
-    @Column
-    private int reputation;
-    @Column
-    private boolean gender;
-    @Column
-    private boolean membertype;
-    @Column
-    private String phone;
-    @Column
-    private String nickname;
-}

src/后端/java/UsersController.java

@@ -1,86 +0,0 @@
-package com.softegg.freetogo;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * @description:
- * @author:zhanglinhao
- * @date:2024/5/8 8:28
- */
-@RestController
-//@CrossOrigin(origins = "*")
-@RequestMapping("/users")
-public class UsersController {
-    @Autowired
-    private UsersService usersService;
-
-    @GetMapping("findAll")
-    public List<Users> findAll() {
-        return usersService.findAll();
-    }
-
-    @GetMapping("add")
-    public String add(String name,
-                      String email,
-                      String psw,
-                      String ct,
-                      int rpt,
-                      String phone,
-                      String nkn,
-                      String idc,
-                      boolean gender,
-                      boolean type) {
-        Users user = new Users();
-        setUsers(name, email, psw, ct, rpt, phone, nkn, idc, gender, type, user);
-        usersService.add(user);
-        return "添加成功";
-    }
-
-    @GetMapping("delbyid")
-    public String delById(int id) {
-        usersService.deleteById(id);
-        return "删除成功";
-    }
-
-    @GetMapping("findbyid")
-    public Users getUserById(int id) {
-        return usersService.getUserById(id);
-    }
-
-    @GetMapping("update")
-    public String update(int id,
-                         String name,
-                         String email,
-                         String psw,
-                         String ct,
-                         int rpt,
-                         String phone,
-                         String nkn,
-                         String idc,
-                         boolean gender,
-                         boolean type){
-        Users user = usersService.getUserById(id);
-        setUsers(name, email, psw, ct, rpt, phone, nkn, idc, gender, type, user);
-        usersService.update(user);
-        return "更新成功";
-    }
-
-    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) {
-        user.setName(name);
-        user.setGender(gender);
-        user.setPassword(psw);
-        user.setEmail(email);
-        user.setReputation(rpt);
-        user.setMembertype(type);
-        user.setCreatetime(ct);
-        user.setPhone(phone);
-        user.setNickname(nkn);
-        user.setIDCard(idc);
-    }
-}

src/后端/java/UsersRepository.java

@@ -1,16 +0,0 @@
-package com.softegg.freetogo;
-
-import org.apache.ibatis.annotations.Param;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-
-import java.util.List;
-/**
- * @description:继承Jpa数据库接口类
- * @author:zhanglinhao
- * @date:2024/5/8 8:50
- */
-public interface UsersRepository extends JpaRepository<Users, Integer> {
-//    @Query(value = "select * from users where phone = ?1",nativeQuery = true)
-    Users findByPhone(String phone);
-}

src/后端/java/UsersService.java

@@ -1,22 +0,0 @@
-package com.softegg.freetogo;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * @description:Service接口类
- * @author:zhanglinhaon
- * @date:2024/5/7 16:06
- */
-
-public interface UsersService {
-    List<Users> findAll();
-    void add(Users user);
-    void deleteById(int id);
-    Users getUserById(int id);
-    void update(Users user);
-    boolean isRegister(String phone);
-    Users getUserByPhone(String phone);
-}

src/后端/java/helloController.java

@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 public class helloController {
     @GetMapping("/hello")
-    public String hello(){
+    public String hello() {
         return "hello world!";
     }
 }