1、优化宿舍信息管理

2、编写测试数据，进行相关测试
3、对接部分接口

src/main/java/com/chuanghai/repair/config/MyImgConfig.java

@@ -13,7 +13,7 @@ import org.springframework.context.annotation.Configuration;
 @Configuration
 @ConfigurationProperties(prefix = "img")
 @Data
-public class MyImgConfig {
+public class ImgConfig {
 
     /**
      * 图片保存地址

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

@@ -8,7 +8,6 @@ import com.chuanghai.repair.service.RepairsOrderService;
 import com.chuanghai.repair.service.RepairsWorkService;
 import com.chuanghai.repair.service.ServiceImpl.CacheManagerImpl;
 import com.chuanghai.repair.utils.CreateTokenUtil;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.http.HttpEntity;

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

@@ -1,10 +1,13 @@
 package com.chuanghai.repair.controller;
 
+import com.chuanghai.repair.entity.RepairsBuild;
+import com.chuanghai.repair.entity.RepairsFloor;
 import com.chuanghai.repair.entity.RepairsRoom;
-import com.chuanghai.repair.service.RepairsBuildRoomService;
+import com.chuanghai.repair.service.RepairsBuildFloorRoomService;
 import com.chuanghai.repair.utils.ReturnValueUtil;
 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;
@@ -23,37 +26,57 @@ import java.util.List;
 @RequestMapping("/build")
 public class BuildFloorRoomController {
 
-    @Resource(name ="repairsBuildRoomService" )
-    private RepairsBuildRoomService repairsBuildRoomService;
+    @Resource(name ="repairsBuildFloorRoomService" )
+    private RepairsBuildFloorRoomService repairsBuildFloorRoomService;
+
+
 
     /**
-     * 查询所有宿舍信息
-     * @return
+     * 查询所有楼栋信息  显示楼栋数
      */
-    @ApiOperation("宿舍信息")
-    @PostMapping(value = "/queryAllBuildRoom")
-    public ReturnValueUtil queryAllBuildRoom(){
-        List<RepairsRoom> roomList = null;
+    @ApiOperation("查询所有楼栋信息")
+    @PostMapping(value = "/queryAllBuild")
+    public ReturnValueUtil queryAllBuild(){
+        List<RepairsBuild> buildList = null;
         try {
-            roomList = repairsBuildRoomService.queryAllBuildRoom();
+            buildList = repairsBuildFloorRoomService.queryAllBuild();
         }catch (Exception e){
             e.printStackTrace();
         }
-        return ReturnValueUtil.returnObject(roomList);
+        return ReturnValueUtil.returnObject(buildList);
     }
 
     /**
-     * 查询所有楼栋信息  显示楼栋数
-     */
-
-
-    /**
      * 通过楼栋ID 查询相关楼栋的楼层情况  显示楼层数
      */
+    @ApiOperation("根据楼栋查询楼层信息")
+    @PostMapping(value = "/queryAllFloorByBuildID")
+    public ReturnValueUtil queryAllFloorByBuildID( @ApiParam(name = "楼栋ID", required = true)String buildId){
+        List<RepairsFloor> floorList = null;
+        try {
+            floorList = repairsBuildFloorRoomService.queryAllFloorByBuildID(buildId);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        return ReturnValueUtil.returnObject(floorList);
+    }
+
 
     /**
      * 通过楼层ID 查询相关楼层的房间情况  显示房间号
      */
+    @ApiOperation("根据楼层查询房间信息")
+    @PostMapping(value = "/queryAllRoomByFloorID")
+    public ReturnValueUtil queryAllRoomByFloorID( @ApiParam(name = "楼层ID", required = true)String floorId){
+        List<RepairsRoom> roomList = null;
+        try {
+            roomList = repairsBuildFloorRoomService.queryAllRoomByFloorID(floorId);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        return ReturnValueUtil.returnObject(roomList);
+    }
+
 
 
 

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

@@ -102,10 +102,10 @@ public class LoginController {
      * @return
      */
     @ApiIgnore  //使该接口隐藏
-    @ApiOperation("获取学生CardNumber")
+    @ApiOperation("获取CardNumber")
     @GetMapping("/getCardNumber")
     public String  getCardNumber(String wxcode, String state) {
-
+        System.out.println(wxcode);
         String cardNumberToken = "";
         String accessToken = "";
         try {
@@ -134,7 +134,6 @@ public class LoginController {
                     }
                 }
             }
-            System.out.println("accessToken: "+accessToken);
             Map<String, String> paramCardNumber = new HashMap<>();
             paramCardNumber.put("access_token", accessToken);
             paramCardNumber.put("scope", "snsapi_userinfo");
@@ -197,5 +196,4 @@ public class LoginController {
         return cardNumberToken;
     }
 
-
 }

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

@@ -3,6 +3,7 @@ package com.chuanghai.repair.controller;
 import com.chuanghai.repair.entity.RepairsNotice;
 import com.chuanghai.repair.service.RepairsNoticeService;
 import com.chuanghai.repair.utils.CreateTokenUtil;
+import com.chuanghai.repair.utils.ReturnValueUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -32,14 +33,14 @@ public class NoticeController {
     @Resource(name = "repairsNoticeService")
     private RepairsNoticeService repairsNoticeService;
 
-    @ApiOperation("添加公告")
+    @ApiOperation("发布公告")
     @PostMapping(value = "/addNotice")
-    public Boolean addNotice(HttpServletRequest request,
-                             @ApiParam(name = "公告内容", required = true) String noticeContent) {
+    public ReturnValueUtil addNotice(HttpServletRequest request,
+                                     @ApiParam(name = "公告内容", required = true) String noticeContent) {
         //flag false 添加失败  true 添加成功
         Boolean flag = Boolean.FALSE;
         try {
-            Integer adminId =Integer.parseInt(CreateTokenUtil.getHeadersInfo(request))  ;
+            Integer adminId = Integer.parseInt(CreateTokenUtil.getHeadersInfo(request));
             if (adminId != null) {
                 SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                 String noticeTime = df.format(new Date());
@@ -49,26 +50,26 @@ public class NoticeController {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return flag;
+        return ReturnValueUtil.returnBoolean(flag);
     }
 
-    @ApiOperation("发布公告")
+    @ApiOperation("查询公告")
     @PostMapping(value = "/releaseNotice")
     @CrossOrigin
-    public RepairsNotice releaseNotice() {
+    public ReturnValueUtil releaseNotice() {
         RepairsNotice repairsNotice = null;
         try {
             repairsNotice = repairsNoticeService.releaseNotice();
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return repairsNotice;
+        return ReturnValueUtil.returnObject(repairsNotice);
     }
 
     @ApiIgnore
     @ApiOperation("删除公告")
     @PostMapping(value = "/updateNotice")
-    public Boolean updateNotice(@ApiParam(name = "公告Id", required = true) String noticeId) {
+    public ReturnValueUtil updateNotice(@ApiParam(name = "公告Id", required = true) String noticeId) {
         Boolean flag = Boolean.FALSE;
         try {
             if (repairsNoticeService.updateNotice(noticeId) == null) {
@@ -77,15 +78,15 @@ public class NoticeController {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return flag;
+        return ReturnValueUtil.returnBoolean(flag);
     }
 
 
     @ApiIgnore
     @ApiOperation("修改公告")
     @PostMapping(value = "/alterNotice")
-    public Boolean alterNotice(@ApiParam(name = "公告内容", required = true) String noticeContent,
-                               @ApiParam(name = "公告Id", required = true) Integer noticeId) {
+    public ReturnValueUtil alterNotice(@ApiParam(name = "公告内容", required = true) String noticeContent,
+                                       @ApiParam(name = "公告Id", required = true) Integer noticeId) {
         //flag false 修改失败  true 修改成功
         Boolean flag = Boolean.FALSE;
         try {
@@ -98,19 +99,19 @@ public class NoticeController {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return flag;
+        return ReturnValueUtil.returnBoolean(flag);
     }
 
     @ApiIgnore
     @ApiOperation("查询全部公告")
     @PostMapping(value = "/queryAllNotice")
-    public List<RepairsNotice> queryAllNotice() {
-        List<RepairsNotice> repairsNotice = null;
+    public ReturnValueUtil queryAllNotice() {
+        List<RepairsNotice> noticeList = null;
         try {
-            repairsNotice = repairsNoticeService.queryAllNotice();
+            noticeList = repairsNoticeService.queryAllNotice();
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return repairsNotice;
+        return ReturnValueUtil.returnObject(noticeList);
     }
 }

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

@@ -1,7 +1,6 @@
 package com.chuanghai.repair.controller;
 
-import ch.qos.logback.core.net.SyslogOutputStream;
-import com.chuanghai.repair.config.MyImgConfig;
+import com.chuanghai.repair.config.ImgConfig;
 import com.chuanghai.repair.entity.RepairsFault;
 import com.chuanghai.repair.entity.RepairsOrder;
 import com.chuanghai.repair.entity.RepairsStudent;
@@ -11,7 +10,6 @@ import com.chuanghai.repair.service.RepairsStudentService;
 import com.chuanghai.repair.service.RepairsWorkService;
 import com.chuanghai.repair.utils.CreateTokenUtil;
 import com.chuanghai.repair.utils.ReturnValueUtil;
-import com.chuanghai.repair.utils.SubUtil;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -19,15 +17,12 @@ import io.swagger.annotations.ApiParam;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.io.File;
-import java.lang.reflect.Array;
 import java.util.*;
 import java.text.SimpleDateFormat;
 
@@ -52,7 +47,7 @@ public class OrderController {
     private RepairsWorkService repairsWorkService;
 
     @Resource
-    private MyImgConfig myImgConfig;
+    private ImgConfig imgConfig;
 
 
     //------------------------------------------- PC端管理员操作-------------------------------------------
@@ -63,9 +58,9 @@ public class OrderController {
      */
     @ApiOperation("PC端:查询订单")
     @PostMapping(value = "/queryAllOrderByDate")
-    public PageInfo<RepairsOrder> queryAllOrderByDate(@ApiParam(name = "查询日期") String time,
-                                                      @ApiParam(name = "当前页码")Integer pageNum,
-                                                      @ApiParam(name = "每页记录数")Integer pageSize) {
+    public ReturnValueUtil queryAllOrderByDate(@ApiParam(name = "查询日期") String time,
+                                                      @ApiParam(name = "当前页码") Integer pageNum,
+                                                      @ApiParam(name = "每页记录数") Integer pageSize) {
         pageNum = pageNum == null ? 1 : pageNum;
         pageSize = pageSize == null ? 5 : pageSize;
         PageInfo<RepairsOrder> pageInfoOrder = null;
@@ -94,7 +89,7 @@ public class OrderController {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return pageInfoOrder;
+        return ReturnValueUtil.returnObject(pageInfoOrder);
     }
 
     /**
@@ -103,39 +98,65 @@ public class OrderController {
      */
     @ApiOperation("PC端:派送订单查询")
     @PostMapping(value = "/queryAllOrderByStatus")
-    public PageInfo<RepairsOrder> queryAllOrderByDateStatus(@ApiParam(name = "当前页码")Integer pageNum,
-                                                            @ApiParam(name = "每页记录数")Integer pageSize) {
+    public ReturnValueUtil queryAllOrderByDateStatus(@ApiParam(name = "当前页码") Integer pageNum,
+                                                            @ApiParam(name = "每页记录数") Integer pageSize) {
         pageNum = pageNum == null ? 1 : pageNum;
         pageSize = pageSize == null ? 5 : pageSize;
         PageInfo<RepairsOrder> pageInfoOrder = null;
         try {
             String status = "0";
-            pageInfoOrder = repairsOrderService.queryAllOrderByDate(pageNum, pageSize,null, null, status);
+            pageInfoOrder = repairsOrderService.queryAllOrderByDate(pageNum, pageSize, null, null, status);
 
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return pageInfoOrder;
+        return ReturnValueUtil.returnObject(pageInfoOrder);
     }
 
-    /**通过请求中的 当前页码及每页记录数分页查询意见投诉
+    /**
+     * 通过请求中的 当前页码及每页记录数分页查询意见投诉
+     *
      * @return PageInfo<RepairsOrder>
      */
-    @ApiOperation("意见投诉查询")
+    @ApiOperation("维修工：用户评价")
+    @PostMapping(value = "/queryAllOrderByUserAdvice")
+    public ReturnValueUtil queryAllOrderByUserAdvice(HttpServletRequest request,
+                                                 @ApiParam(name = "当前页码") Integer pageNum,
+                                                 @ApiParam(name = "每页记录数") Integer pageSize) {
+        pageNum = pageNum == null ? 1 : pageNum;
+        pageSize = pageSize == null ? 5 : pageSize;
+        PageInfo<RepairsOrder> pageInfoOrder = null;
+        try {
+            String workID = CreateTokenUtil.getHeadersInfo(request);
+            pageInfoOrder = repairsOrderService.queryAllOrderByAdvice(workID,pageNum, pageSize);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return ReturnValueUtil.returnObject(pageInfoOrder);
+    }
+
+
+    /**
+     * 通过请求中的 当前页码及每页记录数分页查询意见投诉
+     *
+     * @return PageInfo<RepairsOrder>
+     */
+    @ApiOperation("PC端：意见投诉")
     @PostMapping(value = "/queryAllOrderByAdvice")
-    public PageInfo<RepairsOrder> queryAllOrderByAdvice(@ApiParam(name = "当前页码")Integer pageNum,
-                                                        @ApiParam(name = "每页记录数")Integer pageSize) {
+    public ReturnValueUtil queryAllOrderByAdvice(@ApiParam(name = "当前页码") Integer pageNum,
+                                                 @ApiParam(name = "每页记录数") Integer pageSize) {
         pageNum = pageNum == null ? 1 : pageNum;
         pageSize = pageSize == null ? 5 : pageSize;
         PageInfo<RepairsOrder> pageInfoOrder = null;
         try {
-            pageInfoOrder = repairsOrderService.queryAllOrderByAdvice(pageNum, pageSize);
+            pageInfoOrder = repairsOrderService.queryAllOrderByAdvice(null,pageNum, pageSize);
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return pageInfoOrder;
+        return ReturnValueUtil.returnObject(pageInfoOrder);
     }
 
+
     /**
      * 待接单 orderStatus = 1  须在维修工同意之后变为已接单
      *
@@ -185,9 +206,8 @@ public class OrderController {
      */
     @ApiOperation("PC端:退回订单")
     @PostMapping(value = "/updateOrderBack")
-    public ReturnValueUtil updateOrderBack(
-            @ApiParam(name = "订单ID", required = true) String orderId,
-            @ApiParam(name = "退回理由", required = true) String orderBack) {
+    public ReturnValueUtil updateOrderBack(@ApiParam(name = "订单ID", required = true) String orderId,
+                                           @ApiParam(name = "退回理由", required = true) String orderBack) {
         Boolean flag = Boolean.FALSE;
         try {
             if (!orderId.equals("")) {
@@ -219,9 +239,9 @@ public class OrderController {
      */
     @ApiOperation("学生:订单查询")
     @PostMapping(value = "/queryAllOrderByStudentId")
-    public PageInfo<RepairsOrder> queryAllOrderByStudentId(HttpServletRequest request,
-                                                           @ApiParam(name = "当前页码")Integer pageNum,
-                                                           @ApiParam(name = "每页记录数")Integer pageSize) {
+    public ReturnValueUtil queryAllOrderByStudentId(HttpServletRequest request,
+                                                           @ApiParam(name = "当前页码") Integer pageNum,
+                                                           @ApiParam(name = "每页记录数") Integer pageSize) {
         PageInfo<RepairsOrder> pageInfoOrder = null;
         pageNum = pageNum == null ? 1 : pageNum;
         pageSize = pageSize == null ? 5 : pageSize;
@@ -234,7 +254,7 @@ public class OrderController {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return pageInfoOrder;
+        return ReturnValueUtil.returnObject(pageInfoOrder);
     }
 
     /**
@@ -244,9 +264,9 @@ public class OrderController {
      */
     @ApiOperation("维修工:订单查询")
     @PostMapping(value = "/queryAllOrderByWorkId")
-    public PageInfo<RepairsOrder> queryAllOrderByWorkId(HttpServletRequest request,
-                                                 @ApiParam(name = "当前页码")Integer pageNum,
-                                                 @ApiParam(name = "每页记录数")Integer pageSize) {
+    public ReturnValueUtil queryAllOrderByWorkId(HttpServletRequest request,
+                                                        @ApiParam(name = "当前页码") Integer pageNum,
+                                                        @ApiParam(name = "每页记录数") Integer pageSize) {
         PageInfo<RepairsOrder> pageInfoOrder = null;
         pageNum = pageNum == null ? 1 : pageNum;
         pageSize = pageSize == null ? 5 : pageSize;
@@ -254,12 +274,12 @@ public class OrderController {
             String workId = CreateTokenUtil.getHeadersInfo(request);
             RepairsWork repairsWork = repairsWorkService.queryByWorkId(workId);
             String campus = repairsWork.getWorkCampus();
-            pageInfoOrder = repairsOrderService.queryAllOrderById(pageNum, pageSize,null, workId, campus);
+            pageInfoOrder = repairsOrderService.queryAllOrderById(pageNum, pageSize, null, workId, campus);
 
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return pageInfoOrder;
+        return ReturnValueUtil.returnObject(pageInfoOrder);
     }
 
 
@@ -302,7 +322,7 @@ public class OrderController {
                 repairsOrder = repairsOrderService.queryByOrderId(orderId);
                 String imageName = repairsOrder.getOrderImages();
                 if (StringUtils.hasText(imageName)) {
-                    repairsOrder.setOrderImages(myImgConfig.getShowHost() + imageName);
+                    repairsOrder.setOrderImages(imgConfig.getShowHost() + imageName);
                 }
             }
         } catch (Exception e) {
@@ -314,6 +334,7 @@ public class OrderController {
 
     /**
      * 获取请求头中的access_token解码的到card_number学生ID,将获取的订单信息新增到订单表中
+     *
      * @param request
      * @param orderType
      * @param orderExpectedTime
@@ -334,7 +355,7 @@ public class OrderController {
                                        @ApiParam(name = "学生宿舍", required = true) String dormNumber,
                                        @ApiParam(name = "楼栋楼层房间ID拼接1-2-10（1栋2层205）", required = true) String studentDormitory,
                                        @ApiParam(name = "订单备注") String orderNote,
-                                       @ApiParam(name = "故障图片 orderImages", required = true) List<MultipartFile> file) {
+                                       @ApiParam(name = "故障图片 ") List<MultipartFile> file) {
         Boolean flag = Boolean.FALSE;
         try {
             String cardNumber = CreateTokenUtil.getHeadersInfo(request);
@@ -360,38 +381,43 @@ public class OrderController {
             //获取原始图片的拓展名
             String fileNameSaveUrl = "";
             String type = "";
-            for (MultipartFile imageFile: file) {
-                String originalFilename = imageFile.getOriginalFilename();
-                int index = originalFilename.lastIndexOf('.') + 1;//获取地址.的前面的数字，从0开始
-                type = originalFilename.substring(index);//从地址.开始截取后缀
-                //图片的文件名称
-                String fileNameUrl =UUID.randomUUID().toString().replaceAll("-","")+ originalFilename+";";
-                //图片在数据库保存的名称
-                fileNameSaveUrl += fileNameUrl;
-                fileNameUrl = fileNameUrl.substring(0, fileNameUrl.lastIndexOf(";"));
-
-                //保存图片的路径（这是存在我项目中的images下了，你们可以设置路径）
-                String filePath = myImgConfig.getSaveLocation();
-                //生成新文件名字
-                // 封装上传文件位置的全路径
-                File targetFile = new File(filePath, fileNameUrl);
-                //把本地文件上传到封装上传文件位置的全路径
-                imageFile.transferTo(targetFile);
-            }
-            fileNameSaveUrl = fileNameSaveUrl.substring(0, fileNameSaveUrl.lastIndexOf(";"));
-
-            repairsOrder.setOrderImages(fileNameSaveUrl);
-            if (type.equals("jpg")|| type.equals("jpeg") || type.equals("png")
-                || type.equals("JPG")|| type.equals("JPEG") || type.equals("PNG") ) {
-                if (!fileNameSaveUrl.equals("")) {
-                    //prodectService.addProdect(prodect);
-                    repairsOrder = new RepairsOrder(orderId, fileNameSaveUrl, orderNote, orderExpectedTime,
-                            null, date, null, "0", null, "0",
-                            null, repairsStudent, repairsWork, repairsFault, orderType);
-                    repairsOrderService.insertOrder(repairsOrder);
-                    flag = Boolean.TRUE;
+            repairsOrder = new RepairsOrder(orderId, null, orderNote, orderExpectedTime,
+                    null, date, null, "0", null, "0",
+                    null, repairsStudent, repairsWork, repairsFault, orderType);
+            if(file == null){
+                repairsOrderService.insertOrder(repairsOrder);
+                flag = Boolean.TRUE;
+            }else {
+                for (MultipartFile imageFile : file) {
+                    String originalFilename = imageFile.getOriginalFilename();
+                    int index = originalFilename.lastIndexOf('.') + 1;//获取地址.的前面的数字，从0开始
+                    type = originalFilename.substring(index);//从地址.开始截取后缀
+                    //图片的文件名称
+                    String fileNameUrl = UUID.randomUUID().toString().replaceAll("-", "") + originalFilename + ";";
+                    //图片在数据库保存的名称
+                    fileNameSaveUrl += fileNameUrl;
+                    fileNameUrl = fileNameUrl.substring(0, fileNameUrl.lastIndexOf(";"));
+
+                    //保存图片的路径（这是存在我项目中的images下了，你们可以设置路径）
+                    String filePath = imgConfig.getSaveLocation();
+                    //生成新文件名字
+                    // 封装上传文件位置的全路径
+                    File targetFile = new File(filePath, fileNameUrl);
+                    //把本地文件上传到封装上传文件位置的全路径
+                    imageFile.transferTo(targetFile);
+                }
+                fileNameSaveUrl = fileNameSaveUrl.substring(0, fileNameSaveUrl.lastIndexOf(";"));
+                repairsOrder.setOrderImages(fileNameSaveUrl);
+                if (type.equals("jpg") || type.equals("jpeg") || type.equals("png")
+                        || type.equals("JPG") || type.equals("JPEG") || type.equals("PNG")) {
+                    if (!fileNameSaveUrl.equals("")) {
+                        repairsOrder.setOrderImages(fileNameSaveUrl);
+                        repairsOrderService.insertOrder(repairsOrder);
+                        flag = Boolean.TRUE;
+                    }
                 }
             }
+
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -399,7 +425,6 @@ public class OrderController {
     }
 
 
-
     /**
      * 修改订单状态  已完成 orderStatus = 3
      *
@@ -409,8 +434,7 @@ public class OrderController {
      */
     @ApiOperation("维修工:订单已完成")
     @PostMapping(value = "/updateOrderFinish")
-    public ReturnValueUtil updateOrderFinish(HttpServletRequest request,
-                                             @ApiParam(name = "订单ID", required = true) String orderId) {
+    public ReturnValueUtil updateOrderFinish(@ApiParam(name = "订单ID", required = true) String orderId) {
         Boolean flag = Boolean.FALSE;
         try {
             //当workId不为null时 数据库不会执行更新workId的sql

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

@@ -83,7 +83,7 @@ public class StudentController {
             String cardNumber = CreateTokenUtil.getHeadersInfo(request);
             RepairsStudent repairsStudent = repairsStudentService.queryByStudentId(cardNumber);
             if(repairsStudent.getStudentUpdateStatus().equals("0")){
-                flag = "跳转，完善个人信息";
+                flag = "跳转，请完善个人信息";
             }
         }catch (Exception e){
             e.printStackTrace();
@@ -109,4 +109,21 @@ public class StudentController {
         }
         return ReturnValueUtil.returnBoolean(flag);
     }
+
+    /**
+     * 通过学生ID查询学生信息
+     * @param studentId
+     * @return
+     */
+    @ApiOperation("查询学生信息")
+    @PostMapping(value = "/queryByStudentId")
+    public ReturnValueUtil queryByStudentId(@ApiParam(name = "学生ID", required = true)String studentId){
+        RepairsStudent repairsStudent = null;
+        try {
+            repairsStudent = repairsStudentService.queryByStudentId(studentId);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        return ReturnValueUtil.returnObject(repairsStudent);
+    }
 }

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

@@ -1,6 +1,5 @@
 package com.chuanghai.repair.controller;
 
-import com.chuanghai.repair.entity.RepairsOrder;
 import com.chuanghai.repair.entity.RepairsWork;
 import com.chuanghai.repair.service.RepairsWorkService;
 import com.chuanghai.repair.utils.ReturnValueUtil;
@@ -13,6 +12,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @Author: bingo
@@ -54,21 +55,19 @@ public class WorkController {
                 workCampus = "1";
             }
             if (!workName.equals("") && !workPhone.equals("")) {
+                RepairsWork testWork = repairsWorkService.queryByWorkNamePhone(workName, workPhone);
                 RepairsWork repairsWork = new RepairsWork(null, workName, workPassword, workPhone, "1", "0", workCampus);
-                RepairsWork testWork = repairsWorkService.queryByWorkName(repairsWork.getWorkName());
-                if (testWork != null) {
+                if (testWork == null) {
                     //匹配数据库中同名同手机的用户，相同则表示用户已存在注册失败，不同则用户继续注册
-                    if (!repairsWork.getWorkName().equals(testWork.getWorkName()) &&
-                            !repairsWork.getWorkPhone().equals(testWork.getWorkPhone())) {
-                        repairsWorkService.insertWork(repairsWork);
-                        flag = Boolean.TRUE;
-                    }
-                } else {
                     repairsWorkService.insertWork(repairsWork);
-                    flag = Boolean.TRUE;
+                } else {
+                    List<RepairsWork> workList = new ArrayList<>();
+                    repairsWork.setWorkId(testWork.getWorkId());
+                    workList.add(repairsWork);
+                    repairsWorkService.updateWork(workList);
                 }
+                flag = Boolean.TRUE;
             }
-
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -81,7 +80,7 @@ public class WorkController {
         Boolean flag = Boolean.FALSE;
         try {
             if (!workId.equals("")) {
-                repairsWorkService.updateWorkStatus(workId);
+                repairsWorkService.updateWorkStatus("0",workId);
                 flag = Boolean.TRUE;
             }
         } catch (Exception e) {
@@ -98,7 +97,7 @@ public class WorkController {
      */
     @ApiOperation("维修工查询")
     @PostMapping(value = "queryAllWorkStatus")
-    public PageInfo<RepairsWork> queryAllWorkStatus( @ApiParam(name = "当前页码")Integer pageNum,
+    public ReturnValueUtil queryAllWorkStatus( @ApiParam(name = "当前页码")Integer pageNum,
                                                      @ApiParam(name = "每页记录数")Integer pageSize) {
         pageNum = pageNum == null ? 1 : pageNum;
         pageSize = pageSize == null ? 5 : pageSize;
@@ -108,6 +107,6 @@ public class WorkController {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return pageInfoWork;
+        return ReturnValueUtil.returnObject(pageInfoWork);
     }
 }

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

@@ -3,7 +3,6 @@ package com.chuanghai.repair.entity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
-import java.util.Date;
 import javax.persistence.*;
 
 @NoArgsConstructor

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

@@ -3,10 +3,8 @@ package com.chuanghai.repair.entity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
-import java.lang.reflect.Array;
 import java.math.BigDecimal;
 import java.util.Date;
-import java.util.List;
 import javax.persistence.*;
 
 @NoArgsConstructor

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

@@ -2,12 +2,15 @@ package com.chuanghai.repair.mapper;
 
 import com.chuanghai.repair.entity.RepairsAdmin;
 import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
 
 @Mapper
 public interface RepairsAdminMapper {
 
+    /**
+     * 管理员登录
+     * @param phone
+     * @param password
+     * @return
+     */
     RepairsAdmin loginAdmin(String phone, String password);
 }

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

@@ -1,7 +0,0 @@
-package com.chuanghai.repair.mapper;
-
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface RepairsAdviceMapper {
-}

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

@@ -0,0 +1,15 @@
+package com.chuanghai.repair.mapper;
+
+import com.chuanghai.repair.entity.RepairsBuild;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface RepairsBuildMapper {
+    /**
+     * 查询所有楼栋信息
+     * @return
+     */
+    List<RepairsBuild> queryAllBuild();
+}

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

@@ -0,0 +1,15 @@
+package com.chuanghai.repair.mapper;
+
+import com.chuanghai.repair.entity.RepairsFloor;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface RepairsFloorMapper {
+    /**
+     * 查询所有宿舍信息
+     * @return
+     */
+    List<RepairsFloor> queryAllFloorByBuildID(String buildId);
+}

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

@@ -3,7 +3,6 @@ package com.chuanghai.repair.mapper;
 import com.chuanghai.repair.entity.RepairsNotice;
 import org.apache.ibatis.annotations.Mapper;
 
-import java.util.Date;
 import java.util.List;
 
 @Mapper

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

@@ -1,7 +1,6 @@
 package com.chuanghai.repair.mapper;
 
 import com.chuanghai.repair.entity.RepairsOrder;
-import com.github.pagehelper.PageInfo;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.HashMap;
@@ -94,6 +93,6 @@ public interface RepairsOrderMapper  {
      * 查询所有评价的订单信息
      * @return
      */
-    List<RepairsOrder> queryAllOrderByAdvice();
+    List<RepairsOrder> queryAllOrderByAdvice(String workID);
 
 }

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

@@ -1,16 +1,15 @@
 package com.chuanghai.repair.mapper;
 
-import com.chuanghai.repair.entity.RepairsBuild;
 import com.chuanghai.repair.entity.RepairsRoom;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
 
 @Mapper
-public interface RepairsBuildRoomMapper {
+public interface RepairsRoomMapper {
     /**
      * 查询所有宿舍信息
      * @return
      */
-    List<RepairsRoom> queryAllBuildRoom();
+    List<RepairsRoom> queryAllRoomByFloorID(String floorId);
 }

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

@@ -24,14 +24,6 @@ public interface RepairsWorkMapper {
      */
     Boolean insertWork(RepairsWork repairsWork) throws Exception;
 
-    /**
-     * 查找同名同电话的人判断维修工是否存在
-     *
-     * @param workName
-     * @return
-     * @throws Exception
-     */
-    RepairsWork queryByWorkName(String workName) throws Exception;
 
     /**
      * 逻辑删除维修工
@@ -40,7 +32,7 @@ public interface RepairsWorkMapper {
      * @return
      * @throws Exception
      */
-    Integer updateWorkStatus(String workId) throws Exception;
+    Integer updateWorkStatus(String workStatus, String workId) throws Exception;
 
     /**
      * @return
@@ -63,4 +55,20 @@ public interface RepairsWorkMapper {
      * @throws Exception
      */
     List<RepairsWork> queryAllWorkStatus() throws Exception;
+
+    /**
+     * 通过维修工的姓名和手机号查询指定的维修工
+      * @param workName
+     * @param workPhone
+     * @return
+     * @throws Exception
+     */
+    RepairsWork queryByWorkNamePhone(String workName, String workPhone) throws  Exception;
+
+    /**
+     * 更新维修工信息
+     * @param workList
+     * @throws Exception
+     */
+    void updateWork(List<RepairsWork> workList) throws Exception;
 }

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

@@ -1,9 +1,7 @@
 package com.chuanghai.repair.service;
 
 import com.chuanghai.repair.entity.RepairsAdmin;
-import org.springframework.stereotype.Service;
 
-import java.util.List;
 
 /**
  * @Author: bingo

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

@@ -1,5 +1,7 @@
 package com.chuanghai.repair.service;
 
+import com.chuanghai.repair.entity.RepairsBuild;
+import com.chuanghai.repair.entity.RepairsFloor;
 import com.chuanghai.repair.entity.RepairsRoom;
 
 import java.util.List;
@@ -12,9 +14,18 @@ import java.util.List;
  */
 public interface RepairsBuildFloorRoomService {
 
+
+    /**
+     * 查询所有楼栋信息  显示楼栋数
+     */
+    List<RepairsBuild> queryAllBuild()throws  Exception;
+
+    /**
+     * 通过楼栋ID 查询相关楼栋的楼层情况  显示楼层数
+     */
+    List<RepairsFloor> queryAllFloorByBuildID(String buildId) throws  Exception;
     /**
-     * 查询所有宿舍信息
-     * @return
+     * 通过楼层ID 查询相关楼层的房间情况  显示房间号
      */
-    List<RepairsRoom> queryAllBuildRoom() throws Exception;
+    List<RepairsRoom> queryAllRoomByFloorID(String floorId) throws Exception;
 }

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

@@ -2,7 +2,6 @@ package com.chuanghai.repair.service;
 
 import com.chuanghai.repair.entity.RepairsNotice;
 
-import java.util.Date;
 import java.util.List;
 
 /**

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

@@ -103,7 +103,7 @@ public interface RepairsOrderService {
      * 查询所有评价的订单信息
      * @return
      */
-    PageInfo<RepairsOrder> queryAllOrderByAdvice(Integer pageNum, Integer pageSize)throws Exception;
+    PageInfo<RepairsOrder> queryAllOrderByAdvice(String workID, Integer pageNum, Integer pageSize)throws Exception;
 
 
 

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

@@ -2,8 +2,6 @@ package com.chuanghai.repair.service;
 
 import com.chuanghai.repair.entity.RepairsWork;
 import com.github.pagehelper.PageInfo;
-import org.springframework.cache.annotation.Cacheable;
-import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;
 
@@ -33,13 +31,6 @@ public interface RepairsWorkService  {
      */
     Boolean insertWork (RepairsWork repairsWork) throws Exception;
 
-    /**
-     * 查找同名同电话的人判断维修工是否存在
-     * @param workName
-     * @return
-     * @throws Exception
-     */
-    RepairsWork queryByWorkName(String workName) throws Exception;
 
     /**
      * 逻辑删除维修工
@@ -47,7 +38,7 @@ public interface RepairsWorkService  {
      * @return
      * @throws Exception
      */
-    Integer updateWorkStatus(String workId) throws Exception;
+    Integer updateWorkStatus(String workStatus, String workId) throws Exception;
 
     /**
      *
@@ -71,4 +62,21 @@ public interface RepairsWorkService  {
      * @throws Exception
      */
     PageInfo<RepairsWork> queryAllWorkStatus(Integer pageNum, Integer pageSize) throws Exception;
+
+    /**
+     * 通过维修工的姓名和手机号查询指定的维修工
+     * @param workName
+     * @param workPhone
+     * @return
+     * @throws Exception
+     */
+    RepairsWork queryByWorkNamePhone(String workName, String workPhone) throws  Exception;
+
+
+    /**
+     * 更新维修工信息
+     * @param workList
+     * @throws Exception
+     */
+    void updateWork(List<RepairsWork> workList) throws Exception;
 }

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

@@ -2,7 +2,6 @@ package com.chuanghai.repair.service.ServiceImpl;
 
 import com.chuanghai.repair.entity.EntityCache;
 import com.chuanghai.repair.service.ICacheManager;
-import com.chuanghai.repair.utils.CreateTokenUtil;
 
 import java.util.Map;
 import java.util.Set;

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

@@ -3,11 +3,9 @@ package com.chuanghai.repair.service.ServiceImpl;
 import com.chuanghai.repair.entity.RepairsAdmin;
 import com.chuanghai.repair.mapper.RepairsAdminMapper;
 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;
 
 /**
  * @Author: bingo

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

@@ -1,8 +1,12 @@
 package com.chuanghai.repair.service.ServiceImpl;
 
+import com.chuanghai.repair.entity.RepairsBuild;
+import com.chuanghai.repair.entity.RepairsFloor;
 import com.chuanghai.repair.entity.RepairsRoom;
-import com.chuanghai.repair.mapper.RepairsBuildRoomMapper;
-import com.chuanghai.repair.service.RepairsBuildRoomService;
+import com.chuanghai.repair.mapper.RepairsBuildMapper;
+import com.chuanghai.repair.mapper.RepairsFloorMapper;
+import com.chuanghai.repair.mapper.RepairsRoomMapper;
+import com.chuanghai.repair.service.RepairsBuildFloorRoomService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -14,19 +18,45 @@ import java.util.List;
  * @Description: com.chuanghai.repair.service.ServiceImpl
  * @version: 1.0
  */
-@Service("repairsBuildRoomService")
-public class RepairsBuildFloorRoomServiceImpl implements RepairsBuildRoomService {
+@Service("repairsBuildFloorRoomService")
+public class RepairsBuildFloorRoomServiceImpl implements RepairsBuildFloorRoomService {
 
     @Resource
-    private RepairsBuildRoomMapper repairsBuildRoomMapper;
+    private RepairsBuildMapper repairsBuildMapper;
+
+    @Resource
+    private RepairsFloorMapper repairsFloorMapper;
+
+    @Resource
+    private RepairsRoomMapper repairsRoomMapper;
+
+
+
+    /**
+     * 查询所有楼栋信息  显示楼栋数
+     */
+    @Override
+    public List<RepairsBuild> queryAllBuild() throws Exception {
+        return repairsBuildMapper.queryAllBuild();
+    }
+
+    /**
+     * 通过楼栋ID 查询相关楼栋的楼层情况  显示楼层数
+     */
+    @Override
+    public List<RepairsFloor> queryAllFloorByBuildID(String buildId) throws Exception {
+        return repairsFloorMapper.queryAllFloorByBuildID(buildId);
+    }
 
     /**
-     * 查询所有宿舍信息
-     * @return
-     *
-     **/
+     * 通过楼层ID 查询相关楼层的房间情况  显示房间号
+     */
     @Override
-    public List<RepairsRoom> queryAllBuildRoom() throws Exception {
-        return repairsBuildRoomMapper.queryAllBuildRoom();
+    public List<RepairsRoom> queryAllRoomByFloorID(String floorId) throws Exception {
+        return repairsRoomMapper.queryAllRoomByFloorID(floorId);
     }
+
+
+
+
 }

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

@@ -3,7 +3,6 @@ package com.chuanghai.repair.service.ServiceImpl;
 import com.chuanghai.repair.entity.RepairsFault;
 import com.chuanghai.repair.mapper.RepairsFaultMapper;
 import com.chuanghai.repair.service.RepairsFaultService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

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

@@ -3,11 +3,9 @@ package com.chuanghai.repair.service.ServiceImpl;
 import com.chuanghai.repair.entity.RepairsNotice;
 import com.chuanghai.repair.mapper.RepairsNoticeMapper;
 import com.chuanghai.repair.service.RepairsNoticeService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.Date;
 import java.util.List;
 
 

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

@@ -1,14 +1,10 @@
 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 com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import io.swagger.models.auth.In;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -157,9 +153,9 @@ public class RepairsOrderServiceImpl implements RepairsOrderService {
      * @return
      */
     @Override
-    public PageInfo<RepairsOrder> queryAllOrderByAdvice(Integer pageNum, Integer pageSize) throws Exception {
+    public PageInfo<RepairsOrder> queryAllOrderByAdvice(String workID, Integer pageNum, Integer pageSize) throws Exception {
         PageHelper.startPage(pageNum, pageSize);//分页插件，专门用于myBatis分页
-        List<RepairsOrder> orderList = repairsOrderMapper.queryAllOrderByAdvice();
+        List<RepairsOrder> orderList = repairsOrderMapper.queryAllOrderByAdvice(workID);
         PageInfo<RepairsOrder> pageInfo = new PageInfo<>(orderList);
         return pageInfo;
     }

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

@@ -3,7 +3,6 @@ package com.chuanghai.repair.service.ServiceImpl;
 import com.chuanghai.repair.entity.RepairsStudent;
 import com.chuanghai.repair.mapper.RepairsStudentMapper;
 import com.chuanghai.repair.service.RepairsStudentService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

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

@@ -1,14 +1,10 @@
 package com.chuanghai.repair.service.ServiceImpl;
 
-import com.chuanghai.repair.entity.RepairsOrder;
 import com.chuanghai.repair.entity.RepairsWork;
 import com.chuanghai.repair.mapper.RepairsWorkMapper;
 import com.chuanghai.repair.service.RepairsWorkService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import io.swagger.annotations.ApiParam;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -51,17 +47,6 @@ public class RepairsWorkServiceImpl implements RepairsWorkService {
         return repairsWorkMapper.insertWork(repairsWork);
     }
 
-    /**
-     * 查找同名同电话的人判断维修工是否存在
-     *
-     * @param workName
-     * @return
-     * @throws Exception
-     */
-    @Override
-    public RepairsWork queryByWorkName(String workName) throws Exception {
-        return repairsWorkMapper.queryByWorkName(workName);
-    }
 
     /**
      * 逻辑删除维修工
@@ -71,8 +56,8 @@ public class RepairsWorkServiceImpl implements RepairsWorkService {
      * @throws Exception
      */
     @Override
-    public Integer updateWorkStatus(String workId) throws Exception {
-        return repairsWorkMapper.updateWorkStatus(workId);
+    public Integer updateWorkStatus(String workStatus, String workId) throws Exception {
+        return repairsWorkMapper.updateWorkStatus(workStatus,workId);
     }
 
     /**
@@ -103,4 +88,27 @@ public class RepairsWorkServiceImpl implements RepairsWorkService {
         PageInfo<RepairsWork> pageInfo = new PageInfo<>(repairsWorkList);
         return pageInfo;
     }
+
+
+    /**
+     * 通过维修工的姓名和手机号查询指定的维修工
+     * @param workName
+     * @param workPhone
+     * @return
+     * @throws Exception
+     */
+    @Override
+   public RepairsWork queryByWorkNamePhone(String workName, String workPhone) throws  Exception{
+        return repairsWorkMapper.queryByWorkNamePhone(workName,workPhone);
+    }
+
+
+    /**
+     * 更新维修工信息
+     * @param workList
+     * @throws Exception
+     */
+   public void updateWork(List<RepairsWork> workList) throws Exception{
+        repairsWorkMapper.updateWork(workList);
+   }
 }

src/main/java/com/chuanghai/repair/utils/CreateTokenUtil.java

@@ -4,8 +4,6 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.auth0.jwt.JWT;
 import com.auth0.jwt.algorithms.Algorithm;
-import com.chuanghai.repair.config.MyImgConfig;
-import com.chuanghai.repair.config.WeixiaoConfig;
 import com.sun.deploy.net.URLEncoder;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpEntity;
@@ -17,7 +15,6 @@ import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.client.RestTemplate;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.net.URI;
 import java.util.Date;
@@ -100,9 +97,6 @@ public class CreateTokenUtil {
         String access_token = "";
 
         try {
-
-           // String app_key = "EE28EE2C93296F4E";
-          //  String app_secret = "5071958561AA629530AAA31503088330";
             String grant_type = "authorization_code";
             String redirect_uri = "http://binguo.vaiwan.com/login/getAccessToken";
             String url = "https://open.wecard.qq.com/connect/oauth2/token"; //用于用户 获取基础的access_token
@@ -150,17 +144,13 @@ public String getAccessTokenGlobalA(String appKey, String appSecret, String oCod
     return accessTokenGlobal;
 }
 
-    //    @Scheduled(cron = "0 */1 * * * ?")
+
     @Scheduled(cron = "0 59 0/1 * * ?") //    每隔 1hour59minutes 执行一次刷新access_token
     public static String getAccessTokenGlobal() {
         String access_token_global = "";
         try {
-
-            //String app_key = "EE28EE2C93296F4E";
-           // String app_secret = "5071958561AA629530AAA31503088330";
             String grant_type = "client_credentials";
             String scope = "base";
-           // String ocode = "1015730314";
             String url = "https://open.wecard.qq.com/cgi-bin/oauth2/token"; //用于获取应用有效凭证
             Map<String, String> param = new HashMap<>();
             param.put("app_key", app_key);
@@ -184,7 +174,6 @@ public String getAccessTokenGlobalA(String appKey, String appSecret, String oCod
                     }
                 }
             }
-
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -224,11 +213,9 @@ public String getAccessTokenGlobalA(String appKey, String appSecret, String oCod
                     System.out.println("key:" + entry.getKey() + ":" + "value:" + entry.getValue());
                 }
             }
-
         } catch (Exception e) {
             e.printStackTrace();
         }
-
         return userInfoJSON;
     }
 
@@ -259,11 +246,11 @@ public String getAccessTokenGlobalA(String appKey, String appSecret, String oCod
 
 
     public static void main(String[] args) {
-        String id = "1000";
+        String id = "20200210260236";
         String userId = "userId";
         String token = getToken(id);
-     //   System.out.println(token);
-        String s = verify("eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2NDY5OTE2MjcsInVzZXJJZCI6IjM2MDcyMTE5OTgwMjE0MTYxOCJ9.YLVV0VSWvZl8DTZdYEIKr-5cKrU_8gl7na4VqhV8wwY", userId);
+        System.out.println(token);
+        String s = verify("eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2NDY5OTA1MDAsInVzZXJJZCI6IjEifQ.D4nAou3NRFKhqewVZODCJdsIafXgFiIrlC7CaxvCjbA", userId);
         System.out.println(s);
     }
 }

src/main/java/com/chuanghai/repair/utils/FileUtil.java

@@ -1,14 +1,6 @@
 package com.chuanghai.repair.utils;
 
-import com.chuanghai.repair.entity.RepairsOrder;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationEvent;
-import org.springframework.context.ApplicationListener;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.Ordered;
-import org.springframework.core.annotation.Order;
-import org.springframework.security.core.token.TokenService;
+
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;

src/main/java/com/chuanghai/repair/utils/ReturnValueUtil.java

@@ -6,7 +6,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.util.List;
 
 
 /**

src/main/java/com/chuanghai/repair/utils/SubUtil.java

@@ -1,34 +0,0 @@
-package com.chuanghai.repair.utils;
-
-/**
- * @Author: bingo
- * @Date: 2022/3/9 星期三 16:29
- * @Description: com.chuanghai.repair.utils
- * @version: 1.0
- */
-public class SubUtil {
-
-    //java截取某个字符之前的字符串
-    public static String  subBefore(String str){
-
-        //截取_之前字符串
-        String str1 = str.substring(0, str.lastIndexOf(";"));
-        return str1;
-    }
-
-    //java截取某个字符之后的字符串
-    public static String subAfter(String str){
-
-        int i = str.lastIndexOf(";");
-        String replaceFirst = str.substring(0,i);
-      //  String str2 = str.substring(str1.length()+1, str.length());
-        return replaceFirst;
-    }
-
-    public static void main(String[] args) {
-        String str = "1c843e1968548a88c41cbc80b5804ff_person.jpg;1drgdgfdfg41cbc80b5804ff_person.jpg;";
-        String str1 = str.substring(0, str.lastIndexOf(";"));
-        String str2 = str.substring(str1.length()+1, str.length());
-        System.out.println(str1);
-    }
-}

src/main/resources/mapper/RepairsBuildMapper.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://www.mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.chuanghai.repair.mapper.RepairsBuildMapper">
+    <resultMap id="BaseResultMap" type="com.chuanghai.repair.entity.RepairsBuild">
+        <!--
+          WARNING - @mbg.generated
+        -->
+        <id column="build_id" property="buildId"></id>
+        <result column="build_name" property="buildName" jdbcType="VARCHAR"/>
+
+    </resultMap>
+
+    <!--    查询所有宿舍信息-->
+    <select id="queryAllBuild" resultMap="BaseResultMap">
+        select * from repairs_build
+    </select>
+</mapper>

src/main/resources/mapper/RepairsFloorMapper.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://www.mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.chuanghai.repair.mapper.RepairsFloorMapper">
+    <resultMap id="BaseResultMap" type="com.chuanghai.repair.entity.RepairsFloor">
+        <!--
+          WARNING - @mbg.generated
+        -->
+        <id column="floor_id" property="floorId"></id>
+        <result column="floor_name" property="floorName" jdbcType="VARCHAR"/>
+        <association property="repairsBuild" javaType="com.chuanghai.repair.entity.RepairsBuild">
+            <id column="build_id" property="buildId"></id>
+            <result column="build_name" property="buildName" jdbcType="VARCHAR"/>
+        </association>
+
+    </resultMap>
+
+    <!--    通过楼栋ID 查询楼栋的楼层情况-->
+    <select id="queryAllFloorByBuildID" parameterType="java.lang.String" resultMap="BaseResultMap">
+        select fl.floor_id, fl.floor_name, bu.build_id from repairs_build bu,repairs_floor fl
+        where bu.build_id = fl.build_id
+        and bu.build_id = #{buildId}
+    </select>
+</mapper>

src/main/resources/mapper/RepairsOrderMapper.xml

@@ -247,12 +247,19 @@
     </resultMap>
 
 <!--    订单意见投诉查询-->
-    <select id="queryAllOrderByAdvice" resultMap="OrderAdviceMap">
+    <select id="queryAllOrderByAdvice" parameterType="java.lang.String" resultMap="OrderAdviceMap">
         select od.order_id,fa.fault_name,od.order_complete_time,wo.work_name,od.order_advice,st.dorm_number
         from repairs_order od,repairs_work wo,repairs_student st ,repairs_fault fa
-        where od.work_id = wo.work_id
-        and od.student_id = st.student_id
-        and od.fault_id = fa.fault_id
-        and order_advice is not null order by od.order_complete_time desc
+
+        <trim prefix="where" prefixOverrides="and" suffix="" suffixOverrides="">
+            od.work_id = wo.work_id
+            and od.student_id = st.student_id
+            and od.fault_id = fa.fault_id
+            and order_advice is not null
+            <if test="workID!='' and workID!=null">
+                and wo.work_id = #{workID}
+            </if>
+        </trim>
+         order by od.order_complete_time desc
     </select>
 </mapper>

src/main/resources/mapper/RepairsRoomMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://www.mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.chuanghai.repair.mapper.RepairsBuildRoomMapper">
+<mapper namespace="com.chuanghai.repair.mapper.RepairsRoomMapper">
     <resultMap id="BaseResultMap" type="com.chuanghai.repair.entity.RepairsRoom">
         <!--
           WARNING - @mbg.generated
@@ -18,8 +18,16 @@
         </association >
     </resultMap>
 
+    <resultMap id="queryAllRoomByFloorIDMap" type="com.chuanghai.repair.entity.RepairsRoom">
+        <!--
+          WARNING - @mbg.generated
+        -->
+        <id column="room_id" property="roomId" jdbcType="INTEGER"/>
+        <result column="room_name" property="roomName" jdbcType="VARCHAR"/>
+    </resultMap>
+
 <!--    查询所有宿舍信息-->
-    <select id="queryAllBuildRoom" resultMap="BaseResultMap">
-        select * from repairs_build bu,repairs_floor fl, repairs_room ro where bu.build_id = fl.build_id and fl.floor_id = ro.floor_id
+    <select id="queryAllRoomByFloorID" parameterType="java.lang.String" resultMap="queryAllRoomByFloorIDMap">
+        select room_id, room_name from repairs_room where floor_id = #{floorId}
     </select>
 </mapper>

src/main/resources/mapper/RepairsWorkMapper.xml

@@ -44,19 +44,9 @@
     </select>
 
 
-<!--    按维修工名字查找-->
-    <select id="queryByWorkName" parameterType="java.lang.String" resultMap="loginWorkMap">
-        select wo.work_name,wo.work_phone from repairs_work wo
-        <trim prefix="where" prefixOverrides="and" suffix="" suffixOverrides="">
-            <if test="workName!='' and workName!=null">
-                and work_name = #{workName}
-            </if>
-        </trim>
-    </select>
-
 <!--    维修工的状态更新  逻辑删除-->
     <select id="updateWorkStatus" parameterType="java.lang.String" resultType="Integer" >
-        update repairs_work wo set wo.work_status = 0 where wo.work_id = #{work_id}
+        update repairs_work wo set wo.work_status = #{workStatus} where wo.work_id = #{workId}
     </select>
 
 <!--    查询所有在岗的各类型维修工-->
@@ -72,4 +62,51 @@
     <select id="queryAllWorkStatus" resultMap="AllRepairsWorkMap">
         select * from repairs_work where work_status = 1
     </select>
+
+<!--    查询指定姓名手机号的维修工-->
+    <select id="queryByWorkNamePhone" parameterType="java.lang.String" resultMap="AllRepairsWorkMap">
+        select * from repairs_work where work_name = #{workName} and work_phone = #{workPhone}
+    </select>
+
+<!--    更新维修工全部信息-->
+    <update id="updateWork" parameterType="java.util.List" >
+        update repairs_work
+        <trim prefix="set" suffixOverrides=",">
+            <trim prefix="work_name=case" suffix="end,">
+                <foreach collection="list" item="item" index="index">
+                    when work_id = #{item.workId} then #{item.workName}
+                </foreach>
+            </trim>
+            <trim prefix="work_password=case" suffix="end,">
+                <foreach collection="list" item="item" index="index">
+                    when work_id = #{item.workId} then #{item.workPassword}
+                </foreach>
+            </trim>
+            <trim prefix="work_phone=case" suffix="end,">
+                <foreach collection="list" item="item" index="index">
+                    when work_id = #{item.workId} then #{item.workPhone}
+                </foreach>
+            </trim>
+            <trim prefix="work_status=case" suffix="end,">
+                <foreach collection="list" item="item" index="index">
+                    when work_id = #{item.workId} then #{item.workStatus}
+                </foreach>
+            </trim>
+            <trim prefix="work_type=case" suffix="end,">
+                <foreach collection="list" item="item" index="index">
+                    when work_id = #{item.workId} then #{item.workType}
+                </foreach>
+            </trim>
+            <trim prefix="work_campus=case" suffix="end,">
+                <foreach collection="list" item="item" index="index">
+                    when work_id = #{item.workId} then #{item.workCampus}
+                </foreach>
+            </trim>
+        </trim>
+        where work_id in
+        <foreach collection="list" index="index" item="item"
+                 separator="," open="(" close=")">
+            #{item.workId,jdbcType=VARCHAR}
+        </foreach>
+    </update>
 </mapper>