实现登录功能，部分订单查询功能

pom.xml

@@ -129,6 +129,17 @@
 
 <!-- 集成swagger-ui的依赖-->
         <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>1.5.21</version>
+        </dependency>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-models</artifactId>
+            <version>1.5.21</version>
+        </dependency>
+
+        <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger2</artifactId>
             <version>2.9.2</version>

src/main/java/com/chuanghai/repair/controller/LoginController.java

@@ -6,6 +6,7 @@ import com.chuanghai.repair.service.RepairsAdminService;
 import com.chuanghai.repair.service.RepairsWorkService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -43,7 +44,7 @@ public class LoginController {
      */
     @ApiOperation("管理员登录")
     @PostMapping(value = "/loginAdmin")
-    public RepairsAdmin loginAdmin(String phone, String password) {
+    public RepairsAdmin loginAdmin(@ApiParam("管理员手机号码")String phone,@ApiParam("管理员手机号码") String password) {
         RepairsAdmin repairsAdmin ;
         try {
             repairsAdmin =repairsAdminService.loginAdmin(phone, password);
@@ -62,7 +63,7 @@ public class LoginController {
      */
     @ApiOperation("维修工登录")
     @PostMapping(value = "/loginWork")
-    public RepairsWork loginWork(String phone, String password) {
+    public RepairsWork loginWork(@ApiParam("维修工手机号码") String phone,@ApiParam("维修工登录密码") String password) {
         RepairsWork repairsWork;
         try {
              repairsWork = repairsWorkService.loginWork(phone, password);

src/main/java/com/chuanghai/repair/controller/WorkController.java

@@ -4,6 +4,7 @@ import com.chuanghai.repair.entity.RepairsWork;
 import com.chuanghai.repair.service.RepairsWorkService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -33,14 +34,12 @@ public class WorkController {
      */
     @ApiOperation("维修工注册")
     @PostMapping(value = "/addWork")
-    Boolean addWork(RepairsWork repairsWork){
+    Boolean addWork(@ApiParam("维修工实体属性")RepairsWork repairsWork){
         Boolean flag =Boolean.FALSE;
         try {
 
             RepairsWork testWork = repairsWorkService.queryByWorkName(repairsWork.getWorkName());
             if(testWork!=null){
-                System.out.println(testWork.getWorkName()+"shujuku"+testWork.getWorkPhone());
-                System.out.println(repairsWork.getWorkName()+"tianjia"+repairsWork.getWorkPhone());
 
                 //匹配数据库中同名同手机的用户，相同则表示用户已存在注册失败，不同则用户继续注册
                 if(repairsWork.getWorkName().equals(testWork.getWorkName()) &&
@@ -62,12 +61,13 @@ public class WorkController {
 
     @ApiOperation("维修工删除")
     @PostMapping(value ="updateWorkStatus")
-    public Boolean updateWorkStatus(String workId){
+    Boolean updateWorkStatus(@ApiParam("维修工ID")String workId){
+        // flag  FALSE 删除失败  TRUE 删除成功
         Boolean flag = Boolean.FALSE;
         try {
-            if(repairsWorkService.updateWorkStatus(workId) == null){
+            repairsWorkService.updateWorkStatus(workId);
                 flag = Boolean.TRUE;
-            }
+
         }catch (Exception e){
             e.printStackTrace();
         }

src/main/java/com/chuanghai/repair/entity/RepairsOrder.java

@@ -45,6 +45,12 @@ public class RepairsOrder {
     private Date orderCompleteTime;
 
     /**
+     * 订单提交时间
+     */
+    @Column(name = "order_commit_time")
+    private Date orderCommitTime;
+
+    /**
      * 订单评价
      */
     @Column(name = "order_advice")
@@ -68,11 +74,6 @@ public class RepairsOrder {
     @Column(name = "order_price_status")
     private String orderPriceStatus;
 
-    /**
-     * 维修工ID
-     */
-    @Column(name = "work_id")
-    private Integer workId;
 
     /**
      * 退单理由
@@ -82,9 +83,22 @@ public class RepairsOrder {
 
     /**
      * 学生学号
+     * 订单与学生之间是  N:1
+     */
+    private RepairsStudent repairsStudent;
+
+    /**
+     * 维修工ID
+     * 订单与维修工之间 N:1
+     */
+    private RepairsWork repairsWork;
+
+
+    /**
+     * 故障类型ID
+     * 订单与故障类型之间是  N:1
      */
-    @Column(name = "student_id")
-    private String studentId;
+    private RepairsFault repairsFault;
 
 
 }

src/main/java/com/chuanghai/repair/entity/RepairsWork.java

@@ -1,5 +1,6 @@
 package com.chuanghai.repair.entity;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
 import javax.persistence.*;
@@ -16,6 +17,7 @@ public class RepairsWork {
     /**
      * 维修工ID
      */
+    @ApiModelProperty(value = "维修工ID")
     @Id
     @Column(name = "work_id")
     private Integer workId;
@@ -23,30 +25,35 @@ public class RepairsWork {
     /**
      * 维修工名称
      */
+    @ApiModelProperty(value = "维修工名称")
     @Column(name = "work_name")
     private String workName;
 
     /**
      * 维修工密码
      */
+    @ApiModelProperty(value = "维修工密码")
     @Column(name = "work_password")
     private String workPassword;
 
     /**
      * 维修工手机号码
      */
+    @ApiModelProperty(value = "维修工手机号码")
     @Column(name = "work_phone")
     private String workPhone;
 
     /**
      * 状态 1（在职）0（离职）
      */
+    @ApiModelProperty(value = "状态 1（在职）0（离职）")
     @Column(name = "work_status")
     private String workStatus;
 
     /**
      * 工人类型 0（水电工）1（木工）
      */
+    @ApiModelProperty(value ="维修工人类型 0（水电工）1（木工）" )
     @Column(name = "work_type")
     private String workType;
 

src/main/java/com/chuanghai/repair/mapper/RepairsOrderMapper.java

@@ -3,6 +3,26 @@ package com.chuanghai.repair.mapper;
 import com.chuanghai.repair.entity.RepairsOrder;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 @Mapper
 public interface RepairsOrderMapper  {
+
+    /**
+     * 通过学生ID查询订单
+     * @param studentId
+     * @return
+     * @throws Exception
+     */
+    List<RepairsOrder> queryByStudentIdOrder(String studentId,String tody,String tomorrow);
+
+
+    /**
+     * 通过订单ID修改订单评价
+     * @param orderId
+     * @param orderAdvice
+     * @return
+     */
+    Integer updateOrderAdvice(String orderId,String orderAdvice);
+
 }

src/main/java/com/chuanghai/repair/service/RepairsOrderService.java

@@ -1,5 +1,9 @@
 package com.chuanghai.repair.service;
 
+import com.chuanghai.repair.entity.RepairsOrder;
+
+import java.util.List;
+
 /**
  * @Author: bingo
  * @Date: 2022/2/23 星期三 17:29
@@ -7,4 +11,21 @@ package com.chuanghai.repair.service;
  * @version: 1.0
  */
 public interface RepairsOrderService {
+
+    /**
+     * 通过学生ID查询订单
+     * @param studentId
+     * @return
+     * @throws Exception
+     */
+    List<RepairsOrder> queryByStudentIdOrder(String studentId,String tody,String tomorrow) throws Exception;
+
+    /**
+     * 通过订单ID修改订单评价
+     * @param orderId
+     * @param orderAdvice
+     * @return
+     * @throws Exception
+     */
+    Integer updateOrderAdvice(String orderId,String orderAdvice) throws Exception;
 }

src/main/java/com/chuanghai/repair/service/ServiceImpl/RepairsAdminServiceImpl.java

@@ -6,6 +6,7 @@ import com.chuanghai.repair.service.RepairsAdminService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -17,13 +18,11 @@ import java.util.List;
 @Service("repairsAdminService")
 public class RepairsAdminServiceImpl implements RepairsAdminService {
 
-    @Autowired
+    @Resource
     private RepairsAdminMapper repairsAdminMapper;
 
     @Override
      public RepairsAdmin loginAdmin(String phone, String password){
-        System.out.println(password+"   "+phone);
-        System.out.println(repairsAdminMapper.loginAdmin(phone,password));
         return repairsAdminMapper.loginAdmin(phone,password);
      }
 }

src/main/java/com/chuanghai/repair/service/ServiceImpl/RepairsAdviceServiceImpl.java

@@ -5,6 +5,8 @@ import com.chuanghai.repair.service.RepairsAdviceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+
 /**
  * @Author: bingo
  * @Date: 2022/2/23 星期三 17:32
@@ -14,7 +16,7 @@ import org.springframework.stereotype.Service;
 @Service("repairsAdviceService")
 public class RepairsAdviceServiceImpl implements RepairsAdviceService {
 
-    @Autowired
+    @Resource
     private RepairsAdviceMapper repairsAdviceMapper;
 
 }

src/main/java/com/chuanghai/repair/service/ServiceImpl/RepairsBuildServiceImpl.java

@@ -5,6 +5,8 @@ import com.chuanghai.repair.service.RepairsBuildService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+
 /**
  * @Author: bingo
  * @Date: 2022/2/23 星期三 17:33
@@ -14,6 +16,6 @@ import org.springframework.stereotype.Service;
 @Service("repairsBuildService")
 public class RepairsBuildServiceImpl implements RepairsBuildService {
 
-    @Autowired
+    @Resource
     private RepairsBuildMapper repairsBuildMapper;
 }

src/main/java/com/chuanghai/repair/service/ServiceImpl/RepairsFaultServiceImpl.java

@@ -5,6 +5,8 @@ import com.chuanghai.repair.service.RepairsFaultService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+
 /**
  * @Author: bingo
  * @Date: 2022/2/23 星期三 17:33
@@ -14,6 +16,6 @@ import org.springframework.stereotype.Service;
 @Service("repairsFaultService")
 public class RepairsFaultServiceImpl implements RepairsFaultService {
 
-    @Autowired
+    @Resource
     private RepairsFaultMapper repairsFaultMapper;
 }

src/main/java/com/chuanghai/repair/service/ServiceImpl/RepairsFloorServiceImpl.java

@@ -5,6 +5,8 @@ import com.chuanghai.repair.service.RepairsFloorService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+
 /**
  * @Author: bingo
  * @Date: 2022/2/23 星期三 17:34
@@ -14,6 +16,6 @@ import org.springframework.stereotype.Service;
 @Service("repairsFloorService")
 public class RepairsFloorServiceImpl implements RepairsFloorService {
 
-    @Autowired
+    @Resource
     private RepairsFloorMapper repairsFloorMapper;
 }

src/main/java/com/chuanghai/repair/service/ServiceImpl/RepairsNoticeServiceImpl.java

@@ -5,6 +5,8 @@ import com.chuanghai.repair.service.RepairsNoticeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+
 
 /**
  * @Author: bingo
@@ -15,6 +17,6 @@ import org.springframework.stereotype.Service;
 @Service("repairsNoticeService")
 public class RepairsNoticeServiceImpl implements RepairsNoticeService {
 
-    @Autowired
+    @Resource
     private RepairsNoticeMapper repairsNoticeMapper;
 }

src/main/java/com/chuanghai/repair/service/ServiceImpl/RepairsOrderServiceImpl.java

@@ -1,11 +1,16 @@
 package com.chuanghai.repair.service.ServiceImpl;
 
+import com.chuanghai.repair.entity.RepairsOrder;
 import com.chuanghai.repair.mapper.RepairsAdminMapper;
+import com.chuanghai.repair.mapper.RepairsOrderMapper;
 import com.chuanghai.repair.service.RepairsAdminService;
 import com.chuanghai.repair.service.RepairsOrderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.List;
+
 /**
  * @Author: bingo
  * @Date: 2022/2/23 星期三 17:34
@@ -15,6 +20,29 @@ import org.springframework.stereotype.Service;
 @Service("repairsOrderService")
 public class RepairsOrderServiceImpl implements RepairsOrderService {
 
-    @Autowired
-    private RepairsAdminMapper repairsAdminMapper;
+    @Resource
+    private RepairsOrderMapper repairsOrderMapper;
+
+    /**
+     * 通过学生ID查询订单
+     * @param studentId
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public List<RepairsOrder> queryByStudentIdOrder(String studentId,String tody ,String tomorrow) throws Exception {
+        return repairsOrderMapper.queryByStudentIdOrder(studentId,tody,tomorrow);
+    }
+
+    /**
+     * 通过订单ID修改订单评价
+     * @param orderId
+     * @param orderAdvice
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public Integer updateOrderAdvice(String orderId, String orderAdvice) throws Exception {
+        return repairsOrderMapper.updateOrderAdvice(orderId,orderAdvice);
+    }
 }

src/main/java/com/chuanghai/repair/service/ServiceImpl/RepairsRoomServiceImpl.java

@@ -2,9 +2,10 @@ package com.chuanghai.repair.service.ServiceImpl;
 
 import com.chuanghai.repair.mapper.RepairsRoomMapper;
 import com.chuanghai.repair.service.RepairsRoomService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+
 /**
  * @Author: bingo
  * @Date: 2022/2/23 星期三 17:35
@@ -14,6 +15,6 @@ import org.springframework.stereotype.Service;
 @Service("repairsRoomService")
 public class RepairsRoomServiceImpl implements RepairsRoomService {
 
-    @Autowired
+    @Resource
     private RepairsRoomMapper repairsRoomMapper;
 }

src/main/java/com/chuanghai/repair/service/ServiceImpl/RepairsStudentServiceImpl.java

@@ -5,6 +5,8 @@ import com.chuanghai.repair.service.RepairsStudentService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+
 /**
  * @Author: bingo
  * @Date: 2022/2/23 星期三 17:35
@@ -14,6 +16,6 @@ import org.springframework.stereotype.Service;
 @Service("repairsStudentService")
 public class RepairsStudentServiceImpl implements RepairsStudentService {
 
-    @Autowired
+    @Resource
     private RepairsStudentMapper repairsStudentMapper;
 }

src/main/java/com/chuanghai/repair/service/ServiceImpl/RepairsWorkServiceImpl.java

@@ -3,9 +3,11 @@ package com.chuanghai.repair.service.ServiceImpl;
 import com.chuanghai.repair.entity.RepairsWork;
 import com.chuanghai.repair.mapper.RepairsWorkMapper;
 import com.chuanghai.repair.service.RepairsWorkService;
+import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -17,7 +19,7 @@ import java.util.List;
 @Service("repairsWorkService")
 public class RepairsWorkServiceImpl implements RepairsWorkService {
 
-    @Autowired
+    @Resource
     private RepairsWorkMapper repairsWorkMapper;
 
     /**
@@ -61,7 +63,6 @@ public class RepairsWorkServiceImpl implements RepairsWorkService {
      */
     @Override
     public Integer updateWorkStatus(String workId) throws Exception {
-        System.out.println(repairsWorkMapper.updateWorkStatus(workId));
         return repairsWorkMapper.updateWorkStatus(workId);
     }
 }

src/main/resources/application.yml

@@ -2,7 +2,7 @@
 #数据源配置
 spring:
   datasource:
-    url: jdbc:mysql://127.0.0.1:3306/repairs?characterEncoding=utf-8&serverTimezone=UTC&useSSL=FALSE
+    url: jdbc:mysql://127.0.0.1:3306/repairs?characterEncoding=utf-8&serverTimezone=UTC&useSSL=FALSE&useAffectedRows=TRUE
     driver-class-name: com.mysql.jdbc.Driver
 #    mysql6以上需要使用下面的连接配置
 #    driver-class-name: com.mysql.cj.jdbc.Driver

src/main/resources/mapper/RepairsOrderMapper.xml

@@ -10,11 +10,71 @@
         <result column="order_note" property="orderNote" jdbcType="VARCHAR"/>
         <result column="order_expected_time" property="orderExpectedTime" jdbcType="TIMESTAMP"/>
         <result column="order_complete_time" property="orderCompleteTime" jdbcType="TIMESTAMP"/>
+        <result column="order_commit_time" property="orderCommitTime" jdbcType="TIMESTAMP"/>
         <result column="order_advice" property="orderAdvice" jdbcType="VARCHAR"/>
         <result column="order_status" property="orderStatus" jdbcType="VARCHAR"/>
         <result column="order_price" property="orderPrice" jdbcType="DECIMAL"/>
         <result column="order_price_status" property="orderPriceStatus" jdbcType="VARCHAR"/>
         <result column="work_id" property="workId" jdbcType="INTEGER"/>
         <result column="student_id" property="studentId" jdbcType="VARCHAR"/>
+        <result column="order_back" property="orderBack" jdbcType="VARCHAR"/>
     </resultMap>
+
+    <resultMap id="OrderFaultStudentMap" type="com.chuanghai.repair.entity.RepairsOrder" >
+        <id column="order_id" property="orderId" jdbcType="VARCHAR"/>
+        <result column="order_images" property="orderImages" jdbcType="VARCHAR"/>
+        <result column="order_note" property="orderNote" jdbcType="VARCHAR"/>
+        <result column="order_expected_time" property="orderExpectedTime" jdbcType="TIMESTAMP"/>
+        <result column="order_complete_time" property="orderCompleteTime" jdbcType="TIMESTAMP"/>
+        <result column="order_commit_time" property="orderCommitTime" jdbcType="TIMESTAMP"/>
+
+        <result column="order_advice" property="orderAdvice" jdbcType="VARCHAR"/>
+        <result column="order_status" property="orderStatus" jdbcType="VARCHAR"/>
+        <result column="order_price" property="orderPrice" jdbcType="DECIMAL"/>
+        <result column="order_price_status" property="orderPriceStatus" jdbcType="VARCHAR"/>
+        <result column="order_back" property="orderBack" jdbcType="VARCHAR"/>
+<!--        订单与学生之间是  N:1 关系-->
+        <association  property="repairsStudent"  javaType="com.chuanghai.repair.entity.RepairsStudent">
+            <id column="student_id" property="studentId"></id>
+            <result column="student_build_floor_room" property="studentBuildFloorRoom" jdbcType="VARCHAR"/>
+        </association >
+<!--        订单与维修工之间是  N:1 关系-->
+        <association  property="repairsWork"  javaType="com.chuanghai.repair.entity.RepairsWork">
+            <id column="work_id" property="workId"></id>
+        </association >
+<!--        订单与故障类型之间是  N:1 关系-->
+        <association  property="repairsFault"  javaType="com.chuanghai.repair.entity.RepairsFault">
+            <id column="fault_id" property="faultId"></id>
+            <result column="fault_name" property="faultName" jdbcType="VARCHAR"/>
+        </association >
+
+    </resultMap>
+
+<!--    通过学生ID查询订单信息-->
+        <select id="queryByStudentIdOrder" parameterType="java.lang.String" resultMap="OrderFaultStudentMap">
+            select od.order_id, od.order_status,od.order_commit_time, fa.fault_name,st.student_build_floor_room, od.order_expected_time
+                from repairs_order od ,repairs_student st ,repairs_fault fa ,repairs_fault_order rfo
+                where od.student_id = st.student_id and od.order_id = rfo.order_id
+                and rfo.fault_id = fa.fault_id
+                and st.student_id = #{studentId}
+                and od.order_commit_time BETWEEN #{tody} and #{tomorrow}
+
+        </select>
+
+<!--    订单修后评价-->
+    <select id="updateOrderAdvice" parameterType="java.lang.String" resultType="java.lang.Integer">
+        update repairs_order
+        <set>
+            <if test="orderAdvice!='' and orderAdvice!= null">
+                order_advice = #{orderAdvice},
+            </if>
+        </set>
+        <trim prefix="where" prefixOverrides="and" suffix="" suffixOverrides="">
+            <if test="orderId!='' and orderId!=null">
+                and order_id = #{orderId}
+            </if>
+        </trim>
+    </select>
+
+
 </mapper>