From 3375487cb7b39eec2c9c9ad1dfd68c1e3b9ded84 Mon Sep 17 00:00:00 2001 From: unknown <1327677915@qq.com> Date: Sun, 29 Dec 2024 14:35:42 +0800 Subject: [PATCH] submit --- laundrymanagementsystem/pom.xml | 12 - .../mapper/AdministratorMapper.java | 5 +- .../mapper/AnnouncementMapper.java | 32 +- .../mapper/ClothMapper.java | 92 +--- .../mapper/EvaluationMapper.java | 10 +- .../mapper/InformationMapper.java | 29 -- .../mapper/LogMapper.java | 16 + .../mapper/OrderMapper.java | 24 +- .../mapper/ReminderMapper.java | 10 - .../mapper/ReservationMapper.java | 19 +- .../mapper/UserMapper.java | 17 +- .../mapper/WmachineMapper.java | 3 +- .../pojo/Administrator.java | 10 +- .../pojo/Announcement.java | 8 +- .../laundrymanagementsystem/pojo/Cloth.java | 10 +- .../pojo/Evaluation.java | 10 +- .../laundrymanagementsystem/pojo/Log.java | 8 +- .../laundrymanagementsystem/pojo/Order.java | 10 +- .../pojo/Reminder.java | 10 +- .../pojo/Reservation.java | 14 +- .../laundrymanagementsystem/pojo/User.java | 16 +- .../pojo/Wmachine.java | 8 +- .../pojo/query/OrderLogInfo.java | 13 +- .../pojo/query/OrderUserInfo.java | 7 +- .../pojo/query/ReservationUserInfo.java | 7 +- .../mapper/ClothMapper.xml | 23 - .../mapper/UserMapper.xml | 20 - .../LaundryManagementApplicationTests.java | 423 ++++++------------ 28 files changed, 312 insertions(+), 554 deletions(-) delete mode 100644 laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/mapper/InformationMapper.java create mode 100644 laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/mapper/LogMapper.java delete mode 100644 laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/mapper/ReminderMapper.java delete mode 100644 laundrymanagementsystem/src/main/resources/com/guandongzu/laundrymanagementsystem/mapper/ClothMapper.xml delete mode 100644 laundrymanagementsystem/src/main/resources/com/guandongzu/laundrymanagementsystem/mapper/UserMapper.xml diff --git a/laundrymanagementsystem/pom.xml b/laundrymanagementsystem/pom.xml index cb75f17..f72bd68 100644 --- a/laundrymanagementsystem/pom.xml +++ b/laundrymanagementsystem/pom.xml @@ -17,12 +17,6 @@ 11 - - - - - - com.mysql mysql-connector-j @@ -38,12 +32,6 @@ spring-boot-starter-test test - - - - - - com.baomidou mybatis-plus-boot-starter diff --git a/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/mapper/AdministratorMapper.java b/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/mapper/AdministratorMapper.java index d4c470a..f400709 100644 --- a/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/mapper/AdministratorMapper.java +++ b/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/mapper/AdministratorMapper.java @@ -2,7 +2,6 @@ package com.guandongzu.laundrymanagementsystem.mapper; import com.guandongzu.laundrymanagementsystem.pojo.Administrator; import com.guandongzu.laundrymanagementsystem.pojo.AdminInfo; -import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; @@ -10,9 +9,11 @@ import java.util.List; @Mapper public interface AdministratorMapper { + /** * 查看所有管理员的基本信息 */ @Select("SELECT adminID, name, phoneNumber FROM administrator") List selectAllAdmin(); -} + +} \ No newline at end of file diff --git a/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/mapper/AnnouncementMapper.java b/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/mapper/AnnouncementMapper.java index 7675b16..7e23bea 100644 --- a/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/mapper/AnnouncementMapper.java +++ b/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/mapper/AnnouncementMapper.java @@ -2,14 +2,44 @@ package com.guandongzu.laundrymanagementsystem.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.guandongzu.laundrymanagementsystem.pojo.Announcement; +import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.Update; + +import java.util.List; @Mapper public interface AnnouncementMapper extends BaseMapper { + /** * 查询最新的公告信息 */ @Select("SELECT * FROM announcement ORDER BY addTime DESC LIMIT 1") Announcement selectLastestAnnouncement(); -} + + /** + * 查询全部公告 + */ + @Select("SELECT * FROM announcement") + List selectAllAnnouncement(); + + /** + * 插入新公告 + */ + @Insert("INSERT INTO announcement(title, content) VALUES(#{title},#{content})") + void insertAnnouncement(Announcement announcement); + + /** + * 根据ID查询公告 + */ + @Select("SELECT * FROM announcement WHERE announcementID = #{id}") + Announcement selectAnnouncementByID(int id); + + /** + * 更新公告 + */ + @Update("UPDATE announcement SET title = #{title},content = #{content} WHERE announcementID = #{announcementID}") + void updateAnnouncement(Announcement announcement); + +} \ No newline at end of file diff --git a/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/mapper/ClothMapper.java b/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/mapper/ClothMapper.java index 3ce7679..2e4d875 100644 --- a/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/mapper/ClothMapper.java +++ b/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/mapper/ClothMapper.java @@ -2,14 +2,14 @@ package com.guandongzu.laundrymanagementsystem.mapper; import com.guandongzu.laundrymanagementsystem.pojo.Cloth; import com.guandongzu.laundrymanagementsystem.pojo.ClothCleaningInfo; -import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; import java.util.List; @Mapper -public interface ClothMapper{ +public interface ClothMapper { + /** * 查看所有衣物清洗信息 */ @@ -27,91 +27,5 @@ public interface ClothMapper{ */ @Select("SELECT * FROM cloth WHERE clothType IN ('毛衣', '卫衣')") List selectClothByTypeSweaterSweatshirt(); -// /** -// * 根据id选择衣服 -// * -// * @return -// */ -// @Select("select * from cloth where id = #{id}") -// Reservation selectById(Integer id); -// /** -// * 增加衣服 -// */ -// @Options(useGeneratedKeys = true, keyProperty = "id") -// @Insert("insert into cloth (id, type, sum, user_id) " + -// "values (null, #{type}, #{sum}, #{userId})") -// void saveCloth(Cloth cloth); -// /** -// * 将衣服添加到清洗方式表 -// */ -// void saveMethod(Integer clothId); -// /** -// * 将衣服添加到预约表 -// */ -// @Insert("insert into reservation (user_id, notes) VALUES " + -// "(#{userId}, #{notes})") -// void saveRes(Reservation reservation); -// -// /** -// * 用户预约信息查询 -// */ -// @Select("select * from reservation where user_id = #{id}") -// List selectResById(User user); -// /** -// * 用户取消预约 -// */ -// @Delete("delete from reservation where id = #{id}") -// void deleteRes(Integer id); -// /** -// * 用户查看订单 -// */ -// @Select("select * from orders where user_id = #{id}") -// List selectOrdById(Integer id); -// /** -// * 用户删除订单 -// */ -// @Delete("delete from orders where id = #{id}") -// void deleteOrd(Integer id); -// -// /** -// * 加入订单 -// */ -// @Options(useGeneratedKeys = true, keyProperty = "id") -// @Insert("insert into orders (state, user_id, cost) values ('等待', #{userId}, #{cost})") -// void addOrder(Order order); -// /** -// * 调用优惠函数 -// */ -// void preferential(Integer order_id); -// /** -// * 修改用户为vip -// */ -// void upgrade(Integer userid); -// /** -// * 修改预约 -// */ -// void updateById(Reservation r); -// /** -// * 查找预约 -// */ -// @Select("select * from reservation where id = #{id}") -// Reservation selectResByIdReturnOne(Integer id); -// -// /** -// * 插入中间表 -// */ -// @Insert("insert into cloth_orders_res (reservation_id, order_id, cloth_id) VALUES " + -// "(#{id}, #{id1}, #{id2})") -// void insertIntoMid(Integer id, Integer id1, Integer id2); -} - - - - - - - - - - +} \ No newline at end of file diff --git a/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/mapper/EvaluationMapper.java b/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/mapper/EvaluationMapper.java index 6232bd6..94f7300 100644 --- a/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/mapper/EvaluationMapper.java +++ b/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/mapper/EvaluationMapper.java @@ -9,6 +9,7 @@ import java.util.List; @Mapper public interface EvaluationMapper { + /** * 查询所有评价类型为“四星”或“五星”的评价 */ @@ -26,4 +27,11 @@ public interface EvaluationMapper { */ @Select("SELECT * FROM evaluation WHERE content LIKE '%好%'") List selectEvaluationByContentContainingGood(); -} + + /** + * 添加新评价 + */ + @Insert("INSERT INTO evaluation(type, orderID, userID,content) VALUES(#{type},#{orderID},#{userID},#{content})") + void insertNewEvaluation(Evaluation evaluation); + +} \ No newline at end of file diff --git a/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/mapper/InformationMapper.java b/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/mapper/InformationMapper.java deleted file mode 100644 index 5bdd035..0000000 --- a/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/mapper/InformationMapper.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.guandongzu.laundrymanagementsystem.mapper; - -import com.guandongzu.laundrymanagementsystem.pojo.Log; -import com.guandongzu.laundrymanagementsystem.pojo.Announcement; -import com.guandongzu.laundrymanagementsystem.pojo.AdminInfo; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Select; - -import java.util.List; - -@Mapper -public interface InformationMapper { - /** - * 公告 - */ - @Select("select * from notice") - List selectALl(); - /** - * 消息 - */ - @Select("select * from user_message_v1 where id = #{id}") - List selectAllMsg(Integer id); - - /** - * 系统日志 - */ - @Select("select * from log") - List selectAllLogs(); -} diff --git a/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/mapper/LogMapper.java b/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/mapper/LogMapper.java new file mode 100644 index 0000000..bbf5e06 --- /dev/null +++ b/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/mapper/LogMapper.java @@ -0,0 +1,16 @@ +package com.guandongzu.laundrymanagementsystem.mapper; + +import com.guandongzu.laundrymanagementsystem.pojo.Log; +import org.apache.ibatis.annotations.Insert; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface LogMapper { + + /** + * 为指定订单添加日志 + */ + @Insert("CALL LogOrderActivity(#{orderID}, #{state})") + void insertLogOnOrder(Log log); + +} \ No newline at end of file diff --git a/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/mapper/OrderMapper.java b/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/mapper/OrderMapper.java index 3cde2c3..dbcadd6 100644 --- a/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/mapper/OrderMapper.java +++ b/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/mapper/OrderMapper.java @@ -8,11 +8,13 @@ import com.guandongzu.laundrymanagementsystem.pojo.query.OrderUserInfo; import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.Update; import java.util.List; @Mapper public interface OrderMapper { + /** * 查看所有订单的基本信息 */ @@ -22,7 +24,7 @@ public interface OrderMapper { /** * 查看所有用户及其相关订单信息 */ - @Select("SELECT u.name, o.orderID, o.state FROM user u JOIN `order` o ON u.userID = o.orderID") + @Select("SELECT u.name, o.orderID, o.state FROM user u JOIN `order` o ON u.userID = o.userID") List selectAllUserOrderInfo(); /** @@ -59,4 +61,22 @@ public interface OrderMapper { "WHERE cost > (SELECT AVG(cost) FROM `order`)") List selectOrderAboveAverageCost(); -} + /** + * 插入新订单 + */ + @Insert("INSERT INTO `order`(userID, cost) VALUES(#{userID},#{cost})") + void insertNewOrder(Order order); + + /** + * 更新订单状态 + */ + @Update("CALL UpdateOrderState(#{orderID}, #{state})") + void updateOrderState(String state, int orderID); + + /** + * 根据userID查询订单信息 + */ + @Select("CALL GetUserOrders(#{userID})") + List selectOrderInfoByUserID(int userID); + +} \ No newline at end of file diff --git a/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/mapper/ReminderMapper.java b/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/mapper/ReminderMapper.java deleted file mode 100644 index 487a2b0..0000000 --- a/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/mapper/ReminderMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.guandongzu.laundrymanagementsystem.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.guandongzu.laundrymanagementsystem.pojo.Reminder; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface ReminderMapper extends BaseMapper { - -} diff --git a/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/mapper/ReservationMapper.java b/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/mapper/ReservationMapper.java index 872faa4..f92d33e 100644 --- a/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/mapper/ReservationMapper.java +++ b/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/mapper/ReservationMapper.java @@ -6,11 +6,13 @@ import com.guandongzu.laundrymanagementsystem.pojo.query.ReservationUserInfo; import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.Update; import java.util.List; @Mapper public interface ReservationMapper { + /** * 查看所有预约信息 */ @@ -29,9 +31,22 @@ public interface ReservationMapper { @Select("SELECT r.reservationID, u.email, r.applicationTime FROM reservation r JOIN user u ON r.userID = u.userID") List selectReservationWithUserEmailAndDate(); + /** + * 根据userID查找预约信息 + */ + @Select("SELECT * FROM reservation WHERE userID = #{userID}") + List selectReservationByUserID(int userID); + + /** + * 修改预约信息状态 + */ + @Update("UPDATE reservation SET examine = '是',reply = #{reply} WHERE reservationID = #{reservationID}") + void updateExamineState(String reply, int reservationID); + /** * 增加新预约 */ - @Insert("INSERT INTO reservation(userID, notes, applicationTime) VALUES(#{userID},#{notes},#{applicationTime})") + @Insert("CALL CreateReservation(#{userID}, #{notes}, #{applicationTime})") void insertNewReservation(Reservation reservation); -} + +} \ No newline at end of file diff --git a/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/mapper/UserMapper.java b/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/mapper/UserMapper.java index 91e689d..e360da1 100644 --- a/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/mapper/UserMapper.java +++ b/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/mapper/UserMapper.java @@ -2,12 +2,16 @@ package com.guandongzu.laundrymanagementsystem.mapper; import com.guandongzu.laundrymanagementsystem.pojo.User; import com.guandongzu.laundrymanagementsystem.pojo.UserInfo; -import org.apache.ibatis.annotations.*; +import org.apache.ibatis.annotations.Insert; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.Update; import java.util.List; @Mapper public interface UserMapper { + /** * 查看所有用户的基本信息 */ @@ -16,6 +20,7 @@ public interface UserMapper { /** * 查询所有性别为“女”的用户信息 + * * @return */ @Select("SELECT * FROM user WHERE sex=#{str}") @@ -53,6 +58,7 @@ public interface UserMapper { @Select("SELECT * FROM user u " + "WHERE EXISTS (SELECT 1 FROM reservation r WHERE r.userID = u.userID AND r.examine = '否')") List selectUserWithPendingReservations(); + /** * 根据姓名查找用户 */ @@ -64,10 +70,17 @@ public interface UserMapper { */ @Select("SELECT userID FROM user WHERE name = #{name}") int selectIdByName(String name); + /** * 更新个人信息 */ @Update("UPDATE user SET account = #{account},password = #{password}, name = #{name}, sex = #{sex}, email = #{email},phoneNumber = #{phoneNumber} WHERE userID = #{userID}") void updateUserInfo(User user); -} + /** + * 添加新用户 + */ + @Insert("CALL AddNewUser(#{account}, #{password}, #{name}, #{sex}, #{email}, #{phoneNumber})") + void addNewUser(User user); + +} \ No newline at end of file diff --git a/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/mapper/WmachineMapper.java b/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/mapper/WmachineMapper.java index de6028d..52681e1 100644 --- a/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/mapper/WmachineMapper.java +++ b/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/mapper/WmachineMapper.java @@ -1,7 +1,6 @@ package com.guandongzu.laundrymanagementsystem.mapper; import com.guandongzu.laundrymanagementsystem.pojo.Wmachine; -import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; @@ -9,9 +8,11 @@ import java.util.List; @Mapper public interface WmachineMapper { + /** * 查询所有洗衣机状态为“空闲”的洗衣机 */ @Select("SELECT * FROM wmachine WHERE state = '空闲'") List selectWmachineByStateFree(); + } diff --git a/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/pojo/Administrator.java b/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/pojo/Administrator.java index 605fbde..2fa0f43 100644 --- a/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/pojo/Administrator.java +++ b/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/pojo/Administrator.java @@ -8,9 +8,9 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor public class Administrator { - Integer adminID; - String account; - String password; - String name; - String phoneNumber; + private Integer adminID; + private String account; + private String password; + private String name; + private String phoneNumber; } diff --git a/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/pojo/Announcement.java b/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/pojo/Announcement.java index 6702d31..cc9ad2b 100644 --- a/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/pojo/Announcement.java +++ b/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/pojo/Announcement.java @@ -10,8 +10,8 @@ import java.time.LocalDateTime; @NoArgsConstructor @AllArgsConstructor public class Announcement { - Integer announcementID; - String title; - String content; - LocalDateTime addTime; + private Integer announcementID; + private String title; + private String content; + private LocalDateTime addTime; } diff --git a/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/pojo/Cloth.java b/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/pojo/Cloth.java index 082307f..42f5734 100644 --- a/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/pojo/Cloth.java +++ b/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/pojo/Cloth.java @@ -8,9 +8,9 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor public class Cloth { - Integer clothID; - String clothType; - Integer quantity; - String cleaningType; - String color; + private Integer clothID; + private String clothType; + private Integer quantity; + private String cleaningType; + private String color; } diff --git a/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/pojo/Evaluation.java b/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/pojo/Evaluation.java index c9bff1b..5d31120 100644 --- a/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/pojo/Evaluation.java +++ b/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/pojo/Evaluation.java @@ -8,9 +8,9 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor public class Evaluation { - Integer evaluationID; - String type; - Integer orderID; - Integer userID; - String content; + private Integer evaluationID; + private String type; + private Integer orderID; + private Integer userID; + private String content; } diff --git a/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/pojo/Log.java b/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/pojo/Log.java index cac18d8..99b7d26 100644 --- a/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/pojo/Log.java +++ b/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/pojo/Log.java @@ -10,8 +10,8 @@ import java.time.LocalDateTime; @NoArgsConstructor @AllArgsConstructor public class Log { - Integer logID; - Integer orderID; - LocalDateTime addTime; - String state; + private Integer logID; + private Integer orderID; + private LocalDateTime addTime; + private String state; } diff --git a/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/pojo/Order.java b/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/pojo/Order.java index d737f3a..3fe5a2a 100644 --- a/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/pojo/Order.java +++ b/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/pojo/Order.java @@ -10,9 +10,9 @@ import java.time.LocalDateTime; @NoArgsConstructor @AllArgsConstructor public class Order { - Integer orderID; - LocalDateTime addTime; - String state; - Integer userID; - Integer cost; + private Integer orderID; + private LocalDateTime addTime; + private String state; + private Integer userID; + private Integer cost; } diff --git a/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/pojo/Reminder.java b/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/pojo/Reminder.java index 8f72370..5af204a 100644 --- a/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/pojo/Reminder.java +++ b/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/pojo/Reminder.java @@ -10,9 +10,9 @@ import java.time.LocalDate; @NoArgsConstructor @AllArgsConstructor public class Reminder { - Integer reminderID; - String title; - String content; - LocalDate date; - Integer orderId; + private Integer reminderID; + private String title; + private String content; + private LocalDate date; + private Integer orderId; } diff --git a/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/pojo/Reservation.java b/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/pojo/Reservation.java index c515b32..3d4c58a 100644 --- a/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/pojo/Reservation.java +++ b/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/pojo/Reservation.java @@ -11,11 +11,11 @@ import java.time.LocalDateTime; @NoArgsConstructor @AllArgsConstructor public class Reservation { - Integer reservationId; - LocalDateTime addTime; - Integer userID; - String notes; - LocalDate applicationTime; - String examine; - String reply; + private Integer reservationId; + private LocalDateTime addTime; + private Integer userID; + private String notes; + private LocalDate applicationTime; + private String examine; + private String reply; } diff --git a/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/pojo/User.java b/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/pojo/User.java index 7216e91..820362d 100644 --- a/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/pojo/User.java +++ b/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/pojo/User.java @@ -10,12 +10,12 @@ import java.time.LocalDateTime; @NoArgsConstructor @AllArgsConstructor public class User { - Integer userID; - LocalDateTime addTime; - String account; - String password; - String name; - String sex; - String email; - String phoneNumber; + private Integer userID; + private LocalDateTime addTime; + private String account; + private String password; + private String name; + private String sex; + private String email; + private String phoneNumber; } diff --git a/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/pojo/Wmachine.java b/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/pojo/Wmachine.java index 4f20d57..f25d210 100644 --- a/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/pojo/Wmachine.java +++ b/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/pojo/Wmachine.java @@ -8,8 +8,8 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor public class Wmachine { - Integer wmachineID; - String state; - String workPhase; - String type; + private Integer wmachineID; + private String state; + private String workPhase; + private String type; } diff --git a/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/pojo/query/OrderLogInfo.java b/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/pojo/query/OrderLogInfo.java index 506b034..8b0722c 100644 --- a/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/pojo/query/OrderLogInfo.java +++ b/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/pojo/query/OrderLogInfo.java @@ -1,4 +1,5 @@ package com.guandongzu.laundrymanagementsystem.pojo.query; + import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -9,10 +10,10 @@ import java.time.LocalDateTime; @NoArgsConstructor @AllArgsConstructor public class OrderLogInfo { - Integer orderID; - LocalDateTime orderAddTime; - Integer cost; - Integer logID; - LocalDateTime logAddTime; - String logState; + private Integer orderID; + private LocalDateTime orderAddTime; + private Integer cost; + private Integer logID; + private LocalDateTime logAddTime; + private String logState; } diff --git a/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/pojo/query/OrderUserInfo.java b/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/pojo/query/OrderUserInfo.java index 76f8179..ce94d29 100644 --- a/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/pojo/query/OrderUserInfo.java +++ b/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/pojo/query/OrderUserInfo.java @@ -1,4 +1,5 @@ package com.guandongzu.laundrymanagementsystem.pojo.query; + import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -7,7 +8,7 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor public class OrderUserInfo { - Integer orderID; - String name; - String phoneNumber; + private Integer orderID; + private String name; + private String phoneNumber; } diff --git a/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/pojo/query/ReservationUserInfo.java b/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/pojo/query/ReservationUserInfo.java index 897c8cc..7d6823f 100644 --- a/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/pojo/query/ReservationUserInfo.java +++ b/laundrymanagementsystem/src/main/java/com/guandongzu/laundrymanagementsystem/pojo/query/ReservationUserInfo.java @@ -1,6 +1,7 @@ package com.guandongzu.laundrymanagementsystem.pojo.query; import java.time.LocalDate; + import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -9,7 +10,7 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor public class ReservationUserInfo { - Integer reservationID; - String email; - LocalDate applicationTime; + private Integer reservationID; + private String email; + private LocalDate applicationTime; } diff --git a/laundrymanagementsystem/src/main/resources/com/guandongzu/laundrymanagementsystem/mapper/ClothMapper.xml b/laundrymanagementsystem/src/main/resources/com/guandongzu/laundrymanagementsystem/mapper/ClothMapper.xml deleted file mode 100644 index 034d3c1..0000000 --- a/laundrymanagementsystem/src/main/resources/com/guandongzu/laundrymanagementsystem/mapper/ClothMapper.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - {call clothToMethod (#{clothId, mode=IN})} - - - {call preferential (#{order_id, mode=IN})} - - - {call upgradeVIP (#{userid, mode=IN})} - - - update reservation - - examine = #{examine}, - reply = #{reply}, - - where id = #{id} - - \ No newline at end of file diff --git a/laundrymanagementsystem/src/main/resources/com/guandongzu/laundrymanagementsystem/mapper/UserMapper.xml b/laundrymanagementsystem/src/main/resources/com/guandongzu/laundrymanagementsystem/mapper/UserMapper.xml deleted file mode 100644 index dd6baf9..0000000 --- a/laundrymanagementsystem/src/main/resources/com/guandongzu/laundrymanagementsystem/mapper/UserMapper.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - update user - - name = #{name}, - sex = #{sex}, - email = #{email}, - phoneNumber = #{phoneNumber}, - password = #{password} - - where id = #{id} - - - {call deleteUser(#{userid, mode=IN})} - - \ No newline at end of file diff --git a/laundrymanagementsystem/src/test/java/com/guandongzu/laundrymanagementsystem/LaundryManagementApplicationTests.java b/laundrymanagementsystem/src/test/java/com/guandongzu/laundrymanagementsystem/LaundryManagementApplicationTests.java index 403a596..875ac4f 100644 --- a/laundrymanagementsystem/src/test/java/com/guandongzu/laundrymanagementsystem/LaundryManagementApplicationTests.java +++ b/laundrymanagementsystem/src/test/java/com/guandongzu/laundrymanagementsystem/LaundryManagementApplicationTests.java @@ -10,11 +10,11 @@ import org.springframework.boot.test.context.SpringBootTest; import java.time.LocalDate; import java.util.List; -import java.util.Scanner; @SpringBootTest @Slf4j class LaundryManagementApplicationTests { + @Autowired private UserMapper userMapper; @Autowired @@ -22,8 +22,6 @@ class LaundryManagementApplicationTests { @Autowired private ClothMapper clothMapper; @Autowired - private InformationMapper reminderMapper; - @Autowired private AnnouncementMapper announcementMapper; @Autowired private OrderMapper orderMapper; @@ -33,14 +31,32 @@ class LaundryManagementApplicationTests { private WmachineMapper wmachineMapper; @Autowired private EvaluationMapper evaluationMapper; + @Autowired + private LogMapper logMapper; + //用户模块 + /** + * 创建新用户 + */ + @Test + void addNewUser() { + User user = new User(); + user.setAccount("123"); + user.setPassword("123"); + user.setName("test"); + user.setSex("男"); + user.setEmail("123@gmail.com"); + user.setPhoneNumber("17828947329"); + userMapper.addNewUser(user); + } + /** * 查看个人信息 */ @Test - void checkUserInfo() { + void checkMyUserInfo() { User user = userMapper.selectUserByName("王浩轩"); System.out.println(user); } @@ -49,24 +65,16 @@ class LaundryManagementApplicationTests { * 修改个人信息 */ @Test - void editUserInfo() { + void editMyUserInfo() { User user = userMapper.selectUserByName("王浩轩"); user.setAccount("1327677915"); userMapper.updateUserInfo(user); - System.out.println("修改后的信息:"+user); + System.out.println("修改后的信息:" + user); } /** * 创建预约信息 */ - - //Integer reservationId; - // LocalDateTime addTime; - // Integer userID; - // String notes; - // LocalDate applicationTime; - // String examine; - // String reply; @Test void createNewReservation() { Reservation reservation = new Reservation(); @@ -75,6 +83,47 @@ class LaundryManagementApplicationTests { reservation.setApplicationTime(LocalDate.parse("2024-12-31")); reservationMapper.insertNewReservation(reservation); } + + /** + * 查询自己的预约信息 + */ + @Test + void checkMyReservationInfo() { + List ReservationList = reservationMapper.selectReservationByUserID(userMapper.selectIdByName("王浩轩")); + ReservationList.forEach(System.out::println); + } + + /** + * 查询自己的订单信息 + */ + @Test + void checkMyOrderInfo() { + List OrderInfoList = orderMapper.selectOrderInfoByUserID(userMapper.selectIdByName("王浩轩")); + OrderInfoList.forEach(System.out::println); + } + + /** + * 提交评价 + */ + @Test + void addNewEvaluation() { + Evaluation evaluation = new Evaluation(); + evaluation.setType("二星"); + evaluation.setUserID(9); + evaluation.setOrderID(15); + evaluation.setContent("洗的有点太慢了，等了一个多星期才把衣服洗好，跟之前差太多了，而且有一块污渍还没洗干净"); + evaluationMapper.insertNewEvaluation(evaluation); + } + + /** + * 查看公告 + */ + @Test + void checkAnnouncement() { + List announcementList = announcementMapper.selectAllAnnouncement(); + announcementList.forEach(System.out::println); + } + /** * 集合比较1：查询所有评价类型为“四星”或“五星”的评价 */ @@ -110,6 +159,8 @@ class LaundryManagementApplicationTests { List evaluations = evaluationMapper.selectEvaluationByContentContainingGood(); evaluations.forEach(System.out::println); } + + //管理员模块 /** @@ -121,6 +172,54 @@ class LaundryManagementApplicationTests { userInfoList.forEach(System.out::println); } + /** + * 审核预约 + */ + @Test + void examineReservation() { + reservationMapper.updateExamineState("", 14); + } + + /** + * 创建订单 + */ + @Test + void createNewOrder() { + Order order = new Order(); + order.setUserID(1); + order.setCost(99); + orderMapper.insertNewOrder(order); + } + + /** + * 修改订单状态 + */ + @Test + void editOrderState() { + orderMapper.updateOrderState("已完成", 16); + } + + /** + * 更新公告 + */ + @Test + void editAnnouncement() { + Announcement announcement = announcementMapper.selectAnnouncementByID(12); + announcement.setTitle("ceshi"); + announcementMapper.updateAnnouncement(announcement); + } + + /** + * 添加新公告 + */ + @Test + void addNewAnnouncement() { + Announcement announcement = new Announcement(); + announcement.setTitle("测试"); + announcement.setContent("测试"); + announcementMapper.insertAnnouncement(announcement); + } + /** * 订单信息视图 */ @@ -130,6 +229,17 @@ class LaundryManagementApplicationTests { OrderDetailsList.forEach(System.out::println); } + /** + * 添加对应订单的日志 + */ + @Test + void addLogOnOrder() { + Log log = new Log(); + log.setOrderID(16); + log.setState("已完成"); + logMapper.insertLogOnOrder(log); + } + /** * 预约信息视图 */ @@ -300,6 +410,8 @@ class LaundryManagementApplicationTests { List users = userMapper.selectUserWithPendingReservations(); users.forEach(System.out::println); } + + //系统管理员模块 /** @@ -311,285 +423,4 @@ class LaundryManagementApplicationTests { adminInfoList.forEach(System.out::println); } - -// /** -// * 用户注册 -// */ -// @Test -// void register() { -// User user = new User(); -// user.setAccount("123456"); -// user.setPassword("123456"); -// user.setName("zhwsadff"); -// user.setSex("男"); -// user.setEmail("123jfasdhb@qq.com"); -// user.setPhoneNumber("18576290382"); -// String s = userMapper.selectByName(user.getName()); -// if (s == null) { -// log.info("注册成功"); -// userMapper.SaveUser(user); -// } else { -// log.info("重名了，注册失败！"); -// } -// } -// -// /** -// * 用户登录 -// */ -// @Test -// void login() { -// User user = new User(); -// user.setAccount("298427"); -// user.setPassword("fashba"); -// User u = userMapper.findUser(user); -// if (u == null) { -// log.info("请检查用户名和密码！"); -// } else { -// log.info("用户登陆成功！"); -// } -// } -// -// /** -// * 新增衣服，自动添加到清洗方式、预约表 -// */ -//// @Test -//// void addCloth() { -//// Cloth cloth = new Cloth(); -//// cloth.setSum(5); -//// cloth.setUserId(25); -//// cloth.setType("衬衫"); -//// Reservation reservation = new Reservation(); -//// reservation.setUserId(cloth.getUserId()); -//// reservation.setNotes("好好洗洗"); -//// -//// clothMapper.saveCloth(cloth); -//// clothMapper.saveRes(reservation); -//// clothMapper.saveMethod(cloth.getId()); -//// } -// -// /** -// * 用户查看、取消预约 -// */ -// @Test -// void findRes() { -// User user = new User(); -// user.setName("王浩轩"); -//// user.setId(1); -// -// List reservation = clothMapper.selectResById(user); -// log.info("用户的预约信息：{}", reservation); -// } -// -// @Test -// void deleteRes() { -// User user = new User(); -// user.setName("小张"); -//// user.setId(20); -// -// clothMapper.deleteRes(21); -// } -// -// /** -// * 查看订单 -// */ -// @Test -// void findOrd() { -// User user = new User(); -// user.setName("小张"); -//// user.setId(20); -// -//// List orders = clothMapper.selectOrdById(user.getId()); -//// log.info("用户订单：{}", orders); -// } -// -// /** -// * 查看系统公告 -// */ -// @Test -// void findNotice() { -// List announcements = reminderMapper.selectALl(); -// announcements.forEach(System.out::println); -// } -// -// /** -// * 查看并修改个人信息 -// */ -// @Test -// void findUser() { -// User user = new User(); -// user.setName("小孙"); -//// user.setId(25); -// -// User u = userMapper.findUserByid(user); -// log.info("用户：{}", u); -// } -// -// @Test -// void updateUser() { -// User user = new User(); -// user.setName("小孙"); -//// user.setId(25); -// user.setAccount("1244985"); -// user.setPassword("194852"); -// user.setSex("男"); -// user.setEmail("10122122@qq.com"); -// user.setPhoneNumber("102857395729"); -// -// userMapper.UpdateUser(user); -// } -// -// /** -// * 查看自己的消息 -// */ -// @Test -// void findMessage() { -// User user = new User(); -//// user.setId(18); -// -//// List adminInfos = infomationMapper.selectAllMsg(user.getId()); -//// adminInfos.forEach(System.out::println); -// } -// -// -// //管理员模块 -// -// /** -// * 查看和删除用户 -// */ -//// @Test -//// void findALlUsers() { -//// List userList = userMapper.selectAllUsers(); -//// userList.forEach(System.out::println); -//// } -// -// // 删除用户，调用存储过程 -// @Test -// void deleteUser() { -// userMapper.deleteUserById(19); -// } -// -// /** -// * 删改查用户的预约信息，当修改预约为成功后，自动加入到订单（根据优惠减钱，统计是否为vip）和中间表 -// */ -// @Test -// void updateRes() { -// Reservation r = clothMapper.selectResByIdReturnOne(25); -// r.setExamine("是"); -// r.setReply("预约成功啦"); -// Cloth cloth = new Cloth(); -//// cloth.setId(25); -// -// clothMapper.updateById(r); -// -// if ("是".equals(r.getExamine())) { -// Order o = new Order(); -//// o.setUserId(r.getUserId()); -// o.setCost(400); -// clothMapper.addOrder(o); -//// clothMapper.preferential(o.getId()); -//// clothMapper.upgrade(r.getUserId()); -//// clothMapper.insertIntoMid(r.getId(), o.getId(), cloth.getId()); -// } -// } -// -// /** -// * 删改查用户的订单信息 -// */ -// @Test -// void selectAllOrders() { -// Order order = orderMapper.selectById(126); -// log.info("订单：{}", order); -// } -// -// @Test -// void deleteOrders() { -// orderMapper.deleteById(1); -// } -// -// @Test -// void updateOrders() { -// Order o = new Order(); -//// o.setId(126); -// o.setCost(1000); -// orderMapper.updateById(o); -// } -// -// /** -// * 增删改查发给用户的消息 -// */ -//// @Autowired -//// private ReminderMapper reminderMapper; -// -//// @Test -//// void addMessage() { -//// Reminder msg = new Reminder(); -//// msg.setTitle("订单因为不可抗力失败了"); -//// msg.setContent("肥肠抱歉！"); -//// msg.setOrderId(125); -//// -//// reminderMapper.insert(msg); -//// } -//// -//// @Test -//// void updateMessage() { -//// Reminder msg = new Reminder(); -//// msg.setTitle("失败了"); -////// msg.setContent("肥肠抱歉！"); -////// msg.setId(12); -//// -//// reminderMapper.updateById(msg); -//// } -//// -//// @Test -//// void deleteMessage() { -//// Reminder msg = new Reminder(); -////// msg.setId(11); -//// -//// reminderMapper.deleteById(msg); -//// } -//// -//// /** -//// * 增删改查系统公告 -// */ -// @Test -// void addNotice() { -// Announcement announcement = new Announcement(); -// announcement.setTitle("1111231"); -// announcement.setContent("1241243"); -// -// announcementMapper.insert(announcement); -// } -// -// @Test -// void updateNotice() { -// Announcement announcement = new Announcement(); -// announcement.setTitle("沙克洗衣店开业大酬宾"); -//// notice.setContent("123"); -//// announcement.setId(1); -// -// announcementMapper.updateById(announcement); -// } -// -// @Test -// void deleteNotice() { -// Announcement announcement = new Announcement(); -//// announcement.setId(11); -// -// announcementMapper.deleteById(announcement); -// } -// -// /** -// * 查看系统日志 -// */ -// @Test -// void selectAllLogs() { -// List logs = reminderMapper.selectAllLogs(); -// logs.forEach(System.out::println); -// } -} - - - - - - +} \ No newline at end of file